From 87c50e529d82f272facb3efa7e3c6101d134d758 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 16:51:45 +0800
Subject: [PATCH 001/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 118 +++++++++++++++++++++---------------------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index ee4c491d9..f7ff10779 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -28,13 +28,13 @@ WORKING='[\033[34m*\033[0m]'
 PATH=/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export LANG=en_US.UTF-8
 
-mw_path={$SERVER_PATH}
-ROOT_PATH=$(dirname "$mw_path")
+PANEL_DIR={$SERVER_PATH}
+ROOT_PATH=$(dirname "$PANEL_DIR")
 PATH=$PATH:$mw_path/bin
 
 
-if [ -f $mw_path/bin/activate ];then
-    source $mw_path/bin/activate
+if [ -f ${PANEL_DIR}/bin/activate ];then
+    source ${PANEL_DIR}/bin/activate
     if [ "$?" != "0" ];then
         echo "load local python env fail!"
     fi
@@ -45,8 +45,8 @@ mw_start_panel()
     isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`
     if [ "$isStart" == '' ];then
         echo -e "starting mw-panel... \c"
-        cd $mw_path &&  gunicorn -c setting.py app:app
-        port=$(cat ${mw_path}/data/port.pl)
+        cd ${PANEL_DIR}/web &&  gunicorn -c setting.py app:app
+        port=$(cat ${PANEL_DIR}/data/port.pl)
         isStart=""
         while [[ "$isStart" == "" ]];
         do
@@ -61,7 +61,7 @@ mw_start_panel()
         if [ "$isStart" == '' ];then
             echo -e "\033[31mfailed\033[0m"
             echo '------------------------------------------------------'
-            tail -n 20 ${mw_path}/logs/error.log
+            tail -n 20 ${PANEL_DIR}/logs/panel_error.log
             echo '------------------------------------------------------'
             echo -e "\033[31mError: mw-panel service startup failed.\033[0m"
             return;
@@ -75,16 +75,16 @@ mw_start_panel()
 
 mw_start_task()
 {
-    isStart=$(ps aux |grep 'task.py'|grep -v grep|awk '{print $2}')
+    isStart=$(ps aux |grep 'panel_task.py'|grep -v grep|awk '{print $2}')
     if [ "$isStart" == '' ];then
         echo -e "starting mw-tasks... \c"
-        cd $mw_path && python3 task.py >> ${mw_path}/logs/task.log 2>&1 &
+        cd ${PANEL_DIR} && python3 panel_task.py >> ${PANEL_DIR}/logs/panel_task.log 2>&1 &
         sleep 0.3
-        isStart=$(ps aux |grep 'task.py'|grep -v grep|awk '{print $2}')
+        isStart=$(ps aux |grep 'panel_task.py'|grep -v grep|awk '{print $2}')
         if [ "$isStart" == '' ];then
             echo -e "\033[31mfailed\033[0m"
             echo '------------------------------------------------------'
-            tail -n 20 $mw_path/logs/task.log
+            tail -n 20 ${PANEL_DIR}/logs/panel_task.log
             echo '------------------------------------------------------'
             echo -e "\033[31mError: mw-tasks service startup failed.\033[0m"
             return;
@@ -110,7 +110,7 @@ mw_stop_task()
     fi
 
     echo -e "stopping mw-tasks... \c";
-    pids=$(ps aux | grep 'task.py'|grep -v grep|awk '{print $2}')
+    pids=$(ps aux | grep 'panel_task.py'|grep -v grep|awk '{print $2}')
     arr=($pids)
     for p in ${arr[@]}
     do
@@ -154,7 +154,7 @@ mw_status()
         echo -e "\033[31mmw not running\033[0m"
     fi
     
-    isStart=$(ps aux |grep 'task.py'|grep -v grep|awk '{print $2}')
+    isStart=$(ps aux |grep 'panel_task.py'|grep -v grep|awk '{print $2}')
     if [ "$isStart" != '' ];then
         echo -e "\033[32mmw-task (pid $isStart) already running\033[0m"
     else
@@ -174,7 +174,7 @@ mw_reload()
         do
                 kill -9 $p
         done
-        cd $mw_path && gunicorn -c setting.py app:app
+        cd ${PANEL_DIR}/web && gunicorn -c setting.py app:app
         isStart=`ps aux|grep 'gunicorn -c setting.py app:app'|grep -v grep|awk '{print $2}'`
         if [ "$isStart" == '' ];then
             echo -e "\033[31mfailed\033[0m"
@@ -192,27 +192,27 @@ mw_reload()
 }
 
 mw_close(){
-    echo 'True' > $mw_path/data/close.pl
+    echo 'True' > ${PANEL_DIR}/data/close.pl
 }
 
 mw_open()
 {
-    if [ -f $mw_path/data/close.pl ];then
-        rm -rf $mw_path/data/close.pl
+    if [ -f ${PANEL_DIR}/data/close.pl ];then
+        rm -rf ${PANEL_DIR}/data/close.pl
     fi
 }
 
 mw_unbind_domain()
 {
-    if [ -f $mw_path/data/bind_domain.pl ];then
-        rm -rf $mw_path/data/bind_domain.pl
+    if [ -f ${PANEL_DIR}/data/bind_domain.pl ];then
+        rm -rf ${PANEL_DIR}/data/bind_domain.pl
     fi
 }
 
 mw_unbind_ssl()
 {
-    if [ -f $mw_path/local ];then
-        rm -rf $mw_path/local
+    if [ -f ${PANEL_DIR}/local ];then
+        rm -rf ${PANEL_DIR}/local
     fi
 
     if [ -f $mw_path/nginx ];then
@@ -226,12 +226,12 @@ mw_unbind_ssl()
 
 error_logs()
 {
-	tail -n 100 $mw_path/logs/error.log
+	tail -n 100 ${PANEL_DIR}/logs/panel_error.log
 }
 
 mw_update()
 {
-    if [ -f $mw_path/task.py ];then
+    if [ -f ${PANEL_DIR}/task.py ];then
         echo "与后续版本差异太大,不再提供更新"
         exit 0
     fi
@@ -251,7 +251,7 @@ mw_update()
 
 mw_update_dev()
 {
-    if [ -f $mw_path/task.py ];then
+    if [ -f ${PANEL_DIR}/task.py ];then
         echo "与后续版本差异太大,不再提供更新"
         exit 0
     fi
@@ -267,14 +267,14 @@ mw_update_dev()
     else
         curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/update_dev.sh | bash
     fi
-    cd /www/server/mdserver-web
+    cd ${PANEL_DIR}
 }
 
 mw_update_venv()
 {
-    rm -rf /www/server/mdserver-web/bin
-    rm -rf /www/server/mdserver-web/lib64
-    rm -rf /www/server/mdserver-web/lib
+    rm -rf ${PANEL_DIR}/bin
+    rm -rf ${PANEL_DIR}/lib64
+    rm -rf ${PANEL_DIR}/lib
 
     LOCAL_ADDR=common
     cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"")
@@ -287,7 +287,7 @@ mw_update_venv()
     else
         curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/update_dev.sh | bash
     fi
-    cd /www/server/mdserver-web
+    cd ${PANEL_DIR}
 }
 
 mw_mirror()
@@ -303,7 +303,7 @@ mw_mirror()
     else
         bash <(curl --insecure -sSL https://gitee.com/SuperManito/LinuxMirrors/raw/main/ChangeMirrors.sh)
     fi
-    cd ${ROOT_PATH}/mdserver-web
+    cd ${ROOT_PATH}
 }
 
 mw_install_app()
@@ -338,12 +338,12 @@ mw_debug(){
     mw_force_kill
 
     port=7200    
-    if [ -f $mw_path/data/port.pl ];then
-        port=$(cat $mw_path/data/port.pl)
+    if [ -f ${PANEL_DIR}/data/port.pl ];then
+        port=$(cat ${PANEL_DIR}/data/port.pl)
     fi
 
-    if [ -d ${ROOT_PATH}/mdserver-web ];then
-        cd ${ROOT_PATH}/mdserver-web
+    if [ -d ${PANEL_DIR}/web ];then
+        cd ${PANEL_DIR}/web
     fi
     gunicorn -b :$port -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
 }
@@ -445,7 +445,7 @@ mw_connect_pgdb(){
     fi
 
 
-    pwd=$(cd ${ROOT_PATH}/mdserver-web && python3 ${ROOT_PATH}/mdserver-web/plugins/postgresql/index.py root_pwd)
+    pwd=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/plugins/postgresql/index.py root_pwd)
     export PGPASSWORD=${pwd}
     echo "${ROOT_PATH}/postgresql/bin/psql -U postgres -W"
     ${ROOT_PATH}/postgresql/bin/psql -U postgres -W
@@ -464,7 +464,7 @@ mw_mongodb(){
 
     AUTH_STR=""
     if [[ "$MGDB_AUTH" == "enabled" ]];then
-        pwd=$(cd ${ROOT_PATH}/mdserver-web && python3 ${ROOT_PATH}/mdserver-web/plugins/mongodb/index.py root_pwd)
+        pwd=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/plugins/mongodb/index.py root_pwd)
         AUTH_STR="-u root -p ${pwd}"
     fi
 
@@ -493,14 +493,14 @@ mw_redis(){
 }
 
 mw_venv(){
-    cd ${ROOT_PATH}/mdserver-web && source bin/activate
+    cd ${PANEL_DIR} && source bin/activate
 }
 
 mw_clean_lib(){
-    cd ${ROOT_PATH}/mdserver-web && rm -rf lib
-    cd ${ROOT_PATH}/mdserver-web && rm -rf lib64
-    cd ${ROOT_PATH}/mdserver-web && rm -rf bin
-    cd ${ROOT_PATH}/mdserver-web && rm -rf include
+    cd ${PANEL_DIR} && rm -rf lib
+    cd ${PANEL_DIR} && rm -rf lib64
+    cd ${PANEL_DIR} && rm -rf bin
+    cd ${PANEL_DIR} && rm -rf include
 }
 
 case "$1" in
@@ -540,35 +540,35 @@ case "$1" in
         port=7200
         scheme=http
 
-        if [ -f $mw_path/ssl/choose.pl ];then
+        if [ -f ${PANEL_DIR}/ssl/choose.pl ];then
             scheme=https
         fi
         
-        if [ -f $mw_path/data/port.pl ];then
-            port=$(cat $mw_path/data/port.pl)
+        if [ -f ${PANEL_DIR}/data/port.pl ];then
+            port=$(cat ${PANEL_DIR}/data/port.pl)
         fi
 
-        if [ ! -f $mw_path/data/default.pl ];then
+        if [ ! -f ${PANEL_DIR}/data/default.pl ];then
             echo -e "\033[33mInstall Failed\033[0m"
             exit 1
         fi
 
-        password=$(cat $mw_path/data/default.pl)
-        if [ -f $mw_path/data/domain.conf ];then
-            address=$(cat $mw_path/data/domain.conf)
+        password=$(cat ${PANEL_DIR}/data/default.pl)
+        if [ -f ${PANEL_DIR}/data/domain.conf ];then
+            address=$(cat ${PANEL_DIR}/data/domain.conf)
         fi
-        if [ -f $mw_path/data/admin_path.pl ];then
-            auth_path=$(cat $mw_path/data/admin_path.pl)
+        if [ -f ${PANEL_DIR}/data/admin_path.pl ];then
+            auth_path=$(cat ${PANEL_DIR}/data/admin_path.pl)
         fi
 	    
         if [ "$address" == "" ];then
-            v4=$(python3 $mw_path/tools.py getServerIp 4)
-            v6=$(python3 $mw_path/tools.py getServerIp 6)
+            v4=$(python3 ${PANEL_DIR}/tools.py getServerIp 4)
+            v6=$(python3 ${PANEL_DIR}/tools.py getServerIp 6)
 
             if [ "$v4" != "" ] && [ "$v6" != "" ]; then
 
-                if [ ! -f $mw_path/data/ipv6.pl ];then
-                    echo 'True' > $mw_path/data/ipv6.pl
+                if [ ! -f ${PANEL_DIR}/data/ipv6.pl ];then
+                    echo 'True' > ${PANEL_DIR}/data/ipv6.pl
                     mw_stop
                     mw_start
                 fi
@@ -578,9 +578,9 @@ case "$1" in
                 address="MW-Panel-Url: ${scheme}://$v4:$port$auth_path"
             elif [ "$v6" != "" ]; then
 
-                if [ ! -f $mw_path/data/ipv6.pl ];then
+                if [ ! -f ${PANEL_DIR}/data/ipv6.pl ];then
                     #  Need to restart ipv6 to take effect
-                    echo 'True' > $mw_path/data/ipv6.pl
+                    echo 'True' > ${PANEL_DIR}/data/ipv6.pl
                     mw_stop
                     mw_start
                 fi
@@ -597,8 +597,8 @@ case "$1" in
         echo -e "\033[32mMW-Panel default info!\033[0m"
         echo -e "=================================================================="
         echo -e "$address"
-        echo -e `python3 $mw_path/tools.py username`
-        echo -e `python3 $mw_path/tools.py password`
+        echo -e `python3 ${PANEL_DIR}/panel_tools.py username`
+        echo -e `python3 ${PANEL_DIR}/panel_tools.py password`
         # echo -e "password: $password"
         echo -e "\033[33mWarning:\033[0m"
         echo -e "\033[33mIf you cannot access the panel. \033[0m"
@@ -606,6 +606,6 @@ case "$1" in
         echo -e "=================================================================="
         ;;
     *)
-        cd $mw_path && python3 $mw_path/tools.py cli $1
+        cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py cli $1
         ;;
 esac

From c08a2965abbf59b271dab74ddc671ff5988b79be Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 16:54:42 +0800
Subject: [PATCH 002/965] Create update_new.sh

---
 scripts/update_new.sh | 134 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100755 scripts/update_new.sh

diff --git a/scripts/update_new.sh b/scripts/update_new.sh
new file mode 100755
index 000000000..1f8caa7aa
--- /dev/null
+++ b/scripts/update_new.sh
@@ -0,0 +1,134 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+# LANG=en_US.UTF-8
+is64bit=`getconf LONG_BIT`
+
+startTime=`date +%s`
+
+if [ -f /www/server/mdserver-web/tools.py ];then
+	echo -e "存在旧版代码,不能安装!,已知风险的情况下" 
+	echo -e "rm -rf /www/server/mdserver-web"
+	echo -e "可安装!" 
+	exit 0
+fi
+
+_os=`uname`
+echo "use system: ${_os}"
+
+if [ "$EUID" -ne 0 ]
+	then echo "Please run as root!"
+	exit
+fi
+
+if [ ${_os} != "Darwin" ] && [ ! -d /www/server/mdserver-web/logs ]; then
+	mkdir -p /www/server/mdserver-web/logs
+fi
+
+LOG_FILE=/var/log/mw-update.log
+
+{
+
+if [ ${_os} == "Darwin" ]; then
+	OSNAME='macos'
+elif grep -Eqi "openSUSE" /etc/*-release; then
+	OSNAME='opensuse'
+	zypper refresh
+elif grep -Eqi "EulerOS" /etc/*-release || grep -Eqi "openEuler" /etc/*-release; then
+	OSNAME='euler'
+elif grep -Eqi "FreeBSD" /etc/*-release; then
+	OSNAME='freebsd'
+elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "CentOS" /etc/*-release; then
+	OSNAME='centos'
+	yum install -y wget zip unzip
+elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then
+	OSNAME='rhel'
+	yum install -y wget zip unzip
+elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then
+	OSNAME='rhel'
+	yum install -y wget zip unzip
+elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eqi "AlmaLinux" /etc/*-release; then
+	OSNAME='rhel'
+	yum install -y wget zip unzip
+elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eqi "Amazon Linux" /etc/*-release; then
+	OSNAME='amazon'
+	yum install -y wget zip unzip
+elif grep -Eqi "Debian" /etc/issue || grep -Eqi "Debian" /etc/*-release; then
+	OSNAME='debian'
+	apt install -y wget zip unzip
+elif grep -Eqi "Ubuntu" /etc/issue || grep -Eqi "Ubuntu" /etc/*-release; then
+	OSNAME='ubuntu'
+	apt install -y wget zip unzip
+elif grep -Eqi "Raspbian" /etc/issue || grep -Eqi "Raspbian" /etc/*-release; then
+	OSNAME='raspbian'
+else
+	OSNAME='unknow'
+fi
+
+# HTTP_PREFIX="https://"
+# LOCAL_ADDR=common
+# ping  -c 1 github.com > /dev/null 2>&1
+# if [ "$?" != "0" ];then
+# 	LOCAL_ADDR=cn
+# 	HTTP_PREFIX="https://mirror.ghproxy.com/"
+# fi
+HTTP_PREFIX="https://"
+LOCAL_ADDR=common
+cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"")
+if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then
+	LOCAL_ADDR=cn
+	HTTP_PREFIX="https://mirror.ghproxy.com/"
+fi
+
+echo "local:${LOCAL_ADDR}"
+
+CP_CMD=/usr/bin/cp
+if [ -f /bin/cp ];then
+	CP_CMD=/bin/cp
+fi
+
+echo "update mdserver-web code start"
+
+if [ "$LOCAL_ADDR" != "common" ];then
+	wget --no-check-certificate -O /tmp/dev.zip https://code.midoks.icu/midoks/mdserver-web/archive/dev.zip
+	# curl --insecure -sSLo /tmp/dev.zip https://code.midoks.icu/midoks/mdserver-web/archive/dev.zip
+	cd /tmp && unzip /tmp/dev.zip
+
+	$CP_CMD -rf /tmp/mdserver-web/* /www/server/mdserver-web
+	rm -rf /tmp/master.zip
+	rm -rf /tmp/mdserver-web
+else
+	curl --insecure -sSLo /tmp/dev.zip ${HTTP_PREFIX}github.com/midoks/mdserver-web/archive/refs/heads/dev.zip
+	cd /tmp && unzip /tmp/dev.zip
+	$CP_CMD -rf /tmp/mdserver-web-dev/* /www/server/mdserver-web
+	rm -rf /tmp/dev.zip
+	rm -rf /tmp/mdserver-web-dev
+fi
+
+echo "update mdserver-web code end"
+
+rm -rf /tmp/dev.zip
+rm -rf /tmp/mdserver-web-dev
+
+#pip uninstall public
+echo "use system version: ${OSNAME}"
+cd /www/server/mdserver-web && bash scripts/update/${OSNAME}.sh
+
+bash /etc/rc.d/init.d/mw restart
+bash /etc/rc.d/init.d/mw default
+
+if [ -f /usr/bin/mw ];then
+	rm -rf /usr/bin/mw
+fi
+
+if [ ! -e /usr/bin/mw ]; then
+	if [ ! -f /usr/bin/mw ];then
+		ln -s /etc/rc.d/init.d/mw /usr/bin/mw
+	fi
+fi
+
+endTime=`date +%s`
+((outTime=($endTime-$startTime)/60))
+echo -e "Time consumed:\033[32m $outTime \033[0mMinute!"
+
+} 1> >(tee $LOG_FILE) 2>&1
\ No newline at end of file

From 4bd04eb71d678ec7ae390e93fa6c8faa7050a9bb Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 16:55:22 +0800
Subject: [PATCH 003/965] Update update_new.sh

---
 scripts/update_new.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/scripts/update_new.sh b/scripts/update_new.sh
index 1f8caa7aa..7c4d2ebd6 100755
--- a/scripts/update_new.sh
+++ b/scripts/update_new.sh
@@ -6,13 +6,6 @@ is64bit=`getconf LONG_BIT`
 
 startTime=`date +%s`
 
-if [ -f /www/server/mdserver-web/tools.py ];then
-	echo -e "存在旧版代码,不能安装!,已知风险的情况下" 
-	echo -e "rm -rf /www/server/mdserver-web"
-	echo -e "可安装!" 
-	exit 0
-fi
-
 _os=`uname`
 echo "use system: ${_os}"
 

From 71ab5920c83adb6a4d5922ebb70ab224b1953255 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 16:55:47 +0800
Subject: [PATCH 004/965] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1107bbb41..fbb8a397e 100644
--- a/README.md
+++ b/README.md
@@ -186,7 +186,7 @@ curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev
 
 
 curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_new.sh | bash
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_new.sh | bash
+curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update_new.sh | bash
 ```
 
 ### 捐赠地址 USDT（TRC20）

From b44fec18594d40891ccc380a669fa77a0fc4f9e1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 16:56:45 +0800
Subject: [PATCH 005/965] Update __init__.py

---
 web/utils/system/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/utils/system/__init__.py b/web/utils/system/__init__.py
index 0d5869331..de3430715 100644
--- a/web/utils/system/__init__.py
+++ b/web/utils/system/__init__.py
@@ -10,6 +10,7 @@
 
 import os
 import sys
+import re
 import time
 import math
 import psutil

From 6da09e708a40036a07192cfe05991a4a63378c4c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 16:58:51 +0800
Subject: [PATCH 006/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index f7ff10779..09be6cd68 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -562,8 +562,8 @@ case "$1" in
         fi
 	    
         if [ "$address" == "" ];then
-            v4=$(python3 ${PANEL_DIR}/tools.py getServerIp 4)
-            v6=$(python3 ${PANEL_DIR}/tools.py getServerIp 6)
+            v4=$(python3 ${PANEL_DIR}/panel_tools.py getServerIp 4)
+            v6=$(python3 ${PANEL_DIR}/panel_tools.py getServerIp 6)
 
             if [ "$v4" != "" ] && [ "$v6" != "" ]; then
 

From aa2380939094ac21b20dc95e0df3fd916f670e3e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 17:01:52 +0800
Subject: [PATCH 007/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 09be6cd68..bf0948df6 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -597,8 +597,8 @@ case "$1" in
         echo -e "\033[32mMW-Panel default info!\033[0m"
         echo -e "=================================================================="
         echo -e "$address"
-        echo -e `python3 ${PANEL_DIR}/panel_tools.py username`
-        echo -e `python3 ${PANEL_DIR}/panel_tools.py password`
+        echo -e `cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py username`
+        echo -e `cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py password`
         # echo -e "password: $password"
         echo -e "\033[33mWarning:\033[0m"
         echo -e "\033[33mIf you cannot access the panel. \033[0m"

From 328543852cbbc6cec1b684de930d59f383b8fc01 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 17:13:06 +0800
Subject: [PATCH 008/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index bf0948df6..1d2ace922 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -30,7 +30,9 @@ export LANG=en_US.UTF-8
 
 PANEL_DIR={$SERVER_PATH}
 ROOT_PATH=$(dirname "$PANEL_DIR")
-PATH=$PATH:$mw_path/bin
+PATH=$PATH:${PANEL_DIR}/bin
+
+echo ${PANEL_DIR}
 
 
 if [ -f ${PANEL_DIR}/bin/activate ];then

From 9fd7d2005106707a0c9991bd332b874bfca96147 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 17:16:47 +0800
Subject: [PATCH 009/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 1d2ace922..c73cbf5cd 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -564,8 +564,8 @@ case "$1" in
         fi
 	    
         if [ "$address" == "" ];then
-            v4=$(python3 ${PANEL_DIR}/panel_tools.py getServerIp 4)
-            v6=$(python3 ${PANEL_DIR}/panel_tools.py getServerIp 6)
+            v4=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py getServerIp 4)
+            v6=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py getServerIp 6)
 
             if [ "$v4" != "" ] && [ "$v6" != "" ]; then
 

From 14ee45918fbf781cad1e44a84f80dc0894bc388b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 17:18:19 +0800
Subject: [PATCH 010/965] Update panel_tools.py

---
 panel_tools.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index ff4fa3d79..171201b67 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -235,7 +235,6 @@ def set_panel_pwd(password, ncli=False):
 
 def show_panel_pwd():
     # 设置面板密码
-    import db
     sql = db.Sql()
     password = sql.table('users').where('id=?', (1,)).getField('password')
 
@@ -251,7 +250,6 @@ def show_panel_pwd():
 
 def set_panel_username(username=None):
     # 随机面板用户名
-    import db
     sql = db.Sql()
     if username:
         if len(username) < 5:

From d5e2f554f11ae03fc3aac6bb3e8865ba12171e2e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 17:21:19 +0800
Subject: [PATCH 011/965] update

---
 panel_tools.py        | 6 +-----
 scripts/init.d/mw.tpl | 2 --
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index 171201b67..558b9ac93 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -23,14 +23,10 @@ web_dir = os.getcwd() + "/web"
 os.chdir(web_dir)
 sys.path.append(web_dir)
 
+from admin import model
 import core.mw as mw
 import core.db as db
 
-# cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-# info = mw.execShell(cmd)
-# p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-# sys.path.append(p)
-
 INIT_DIR = "/etc/rc.d/init.d"
 if mw.isAppleSystem():
     INIT_DIR = mw.getPanelDir() + "/scripts/init.d"
diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index c73cbf5cd..f57c64f6e 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -32,8 +32,6 @@ PANEL_DIR={$SERVER_PATH}
 ROOT_PATH=$(dirname "$PANEL_DIR")
 PATH=$PATH:${PANEL_DIR}/bin
 
-echo ${PANEL_DIR}
-
 
 if [ -f ${PANEL_DIR}/bin/activate ];then
     source ${PANEL_DIR}/bin/activate

From 9ff26caa5f50d2ef0c0fad66f3af7991fc5c1d2b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 17:22:32 +0800
Subject: [PATCH 012/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index f57c64f6e..cf16e0b40 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -536,7 +536,7 @@ case "$1" in
     'venv') mw_update_venv;;
     'clean_lib') mw_clean_lib;;
     'default')
-        cd $mw_path
+        cd ${PANEL_DIR}
         port=7200
         scheme=http
 

From b0e9a13984b09dc9c32a535fb226f51a11414bb5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 17:26:01 +0800
Subject: [PATCH 013/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index cf16e0b40..f662fa7f1 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -573,9 +573,9 @@ case "$1" in
                     mw_start
                 fi
 
-                address="MW-Panel-Url-Ipv4: ${scheme}://$v4:$port$auth_path \nMW-Panel-Url-Ipv6: ${scheme}://[$v6]:$port$auth_path"
+                address="MW-PANEL-URL-Ipv4: ${scheme}://$v4:$port$auth_path \nMW-Panel-URL-Ipv6: ${scheme}://[$v6]:$port$auth_path"
             elif [ "$v4" != "" ]; then
-                address="MW-Panel-Url: ${scheme}://$v4:$port$auth_path"
+                address="MW-PANEL-URL: ${scheme}://$v4:$port$auth_path"
             elif [ "$v6" != "" ]; then
 
                 if [ ! -f ${PANEL_DIR}/data/ipv6.pl ];then
@@ -584,17 +584,17 @@ case "$1" in
                     mw_stop
                     mw_start
                 fi
-                address="MW-Panel-Url: ${scheme}://[$v6]:$port$auth_path"
+                address="MW-PANEL-URL: ${scheme}://[$v6]:$port$auth_path"
             else
-                address="MW-Panel-Url: ${scheme}://you-network-ip:$port$auth_path"
+                address="MW-PANEL-URL: ${scheme}://you-network-ip:$port$auth_path"
             fi
         else
-            address="MW-Panel-Url: ${scheme}://$address:$port$auth_path"
+            address="MW-PANEL-URL: ${scheme}://$address:$port$auth_path"
         fi
 
         show_panel_ip="$port|"
         echo -e "=================================================================="
-        echo -e "\033[32mMW-Panel default info!\033[0m"
+        echo -e "\033[32mMW-PANEL DEFAULT INFO!\033[0m"
         echo -e "=================================================================="
         echo -e "$address"
         echo -e `cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py username`

From 39c9a260cbc7b616f92ebd3a65aea831cc7f8c52 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 17:32:30 +0800
Subject: [PATCH 014/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 143 +++++++++++++++++++++---------------------
 1 file changed, 73 insertions(+), 70 deletions(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index f662fa7f1..c07de2f6d 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -503,6 +503,78 @@ mw_clean_lib(){
     cd ${PANEL_DIR} && rm -rf include
 }
 
+mw_default(){
+    cd ${PANEL_DIR}
+    port=7200
+    scheme=http
+
+    if [ -f ${PANEL_DIR}/ssl/choose.pl ];then
+        scheme=https
+    fi
+    
+    if [ -f ${PANEL_DIR}/data/port.pl ];then
+        port=$(cat ${PANEL_DIR}/data/port.pl)
+    fi
+
+    if [ ! -f ${PANEL_DIR}/data/default.pl ];then
+        echo -e "\033[33mInstall Failed\033[0m"
+        exit 1
+    fi
+
+    password=$(cat ${PANEL_DIR}/data/default.pl)
+    if [ -f ${PANEL_DIR}/data/domain.conf ];then
+        address=$(cat ${PANEL_DIR}/data/domain.conf)
+    fi
+    if [ -f ${PANEL_DIR}/data/admin_path.pl ];then
+        auth_path=$(cat ${PANEL_DIR}/data/admin_path.pl)
+    fi
+    
+    if [ "$address" == "" ];then
+        v4=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py getServerIp 4)
+        v6=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py getServerIp 6)
+
+        if [ "$v4" != "" ] && [ "$v6" != "" ]; then
+
+            if [ ! -f ${PANEL_DIR}/data/ipv6.pl ];then
+                echo 'True' > ${PANEL_DIR}/data/ipv6.pl
+                mw_stop
+                mw_start
+            fi
+
+            address="MW-PANEL-URL-Ipv4: ${scheme}://$v4:$port$auth_path \nMW-Panel-URL-Ipv6: ${scheme}://[$v6]:$port$auth_path"
+        elif [ "$v4" != "" ]; then
+            address="MW-PANEL-URL: ${scheme}://$v4:$port$auth_path"
+        elif [ "$v6" != "" ]; then
+
+            if [ ! -f ${PANEL_DIR}/data/ipv6.pl ];then
+                #  Need to restart ipv6 to take effect
+                echo 'True' > ${PANEL_DIR}/data/ipv6.pl
+                mw_stop
+                mw_start
+            fi
+            address="MW-PANEL-URL: ${scheme}://[$v6]:$port$auth_path"
+        else
+            address="MW-PANEL-URL: ${scheme}://you-network-ip:$port$auth_path"
+        fi
+    else
+        address="MW-PANEL-URL: ${scheme}://$address:$port$auth_path"
+    fi
+
+    show_panel_ip="$port|"
+    echo -e "=================================================================="
+    echo -e "\033[32mMW-PANEL DEFAULT INFO!\033[0m"
+    echo -e "=================================================================="
+    echo -e "$address"
+    echo -e `cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py username`
+    echo -e `cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py password`
+    # echo -e "password: $password"
+    echo -e "\033[33mWarning:\033[0m"
+    echo -e "\033[33mIf you cannot access the panel. \033[0m"
+    echo -e "\033[33mrelease the following port (${show_panel_ip}80|443|22) in the security group.\033[0m"
+    echo -e "=================================================================="
+    ;;
+}
+
 case "$1" in
     'start') mw_start;;
     'stop') mw_stop;;
@@ -535,76 +607,7 @@ case "$1" in
     'mongodb') mw_mongodb;;
     'venv') mw_update_venv;;
     'clean_lib') mw_clean_lib;;
-    'default')
-        cd ${PANEL_DIR}
-        port=7200
-        scheme=http
-
-        if [ -f ${PANEL_DIR}/ssl/choose.pl ];then
-            scheme=https
-        fi
-        
-        if [ -f ${PANEL_DIR}/data/port.pl ];then
-            port=$(cat ${PANEL_DIR}/data/port.pl)
-        fi
-
-        if [ ! -f ${PANEL_DIR}/data/default.pl ];then
-            echo -e "\033[33mInstall Failed\033[0m"
-            exit 1
-        fi
-
-        password=$(cat ${PANEL_DIR}/data/default.pl)
-        if [ -f ${PANEL_DIR}/data/domain.conf ];then
-            address=$(cat ${PANEL_DIR}/data/domain.conf)
-        fi
-        if [ -f ${PANEL_DIR}/data/admin_path.pl ];then
-            auth_path=$(cat ${PANEL_DIR}/data/admin_path.pl)
-        fi
-	    
-        if [ "$address" == "" ];then
-            v4=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py getServerIp 4)
-            v6=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py getServerIp 6)
-
-            if [ "$v4" != "" ] && [ "$v6" != "" ]; then
-
-                if [ ! -f ${PANEL_DIR}/data/ipv6.pl ];then
-                    echo 'True' > ${PANEL_DIR}/data/ipv6.pl
-                    mw_stop
-                    mw_start
-                fi
-
-                address="MW-PANEL-URL-Ipv4: ${scheme}://$v4:$port$auth_path \nMW-Panel-URL-Ipv6: ${scheme}://[$v6]:$port$auth_path"
-            elif [ "$v4" != "" ]; then
-                address="MW-PANEL-URL: ${scheme}://$v4:$port$auth_path"
-            elif [ "$v6" != "" ]; then
-
-                if [ ! -f ${PANEL_DIR}/data/ipv6.pl ];then
-                    #  Need to restart ipv6 to take effect
-                    echo 'True' > ${PANEL_DIR}/data/ipv6.pl
-                    mw_stop
-                    mw_start
-                fi
-                address="MW-PANEL-URL: ${scheme}://[$v6]:$port$auth_path"
-            else
-                address="MW-PANEL-URL: ${scheme}://you-network-ip:$port$auth_path"
-            fi
-        else
-            address="MW-PANEL-URL: ${scheme}://$address:$port$auth_path"
-        fi
-
-        show_panel_ip="$port|"
-        echo -e "=================================================================="
-        echo -e "\033[32mMW-PANEL DEFAULT INFO!\033[0m"
-        echo -e "=================================================================="
-        echo -e "$address"
-        echo -e `cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py username`
-        echo -e `cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py password`
-        # echo -e "password: $password"
-        echo -e "\033[33mWarning:\033[0m"
-        echo -e "\033[33mIf you cannot access the panel. \033[0m"
-        echo -e "\033[33mrelease the following port (${show_panel_ip}80|443|22) in the security group.\033[0m"
-        echo -e "=================================================================="
-        ;;
+    'default') mw_default;;
     *)
         cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py cli $1
         ;;

From 3d381b6dfa21c0a9e4078b37b599e581a5462e3f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 17:33:16 +0800
Subject: [PATCH 015/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index c07de2f6d..3565e4962 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -572,7 +572,6 @@ mw_default(){
     echo -e "\033[33mIf you cannot access the panel. \033[0m"
     echo -e "\033[33mrelease the following port (${show_panel_ip}80|443|22) in the security group.\033[0m"
     echo -e "=================================================================="
-    ;;
 }
 
 case "$1" in

From 386448d60c6c48239471f8207d635a9561a8050f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 17:34:15 +0800
Subject: [PATCH 016/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 3565e4962..d609da790 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -530,8 +530,8 @@ mw_default(){
     fi
     
     if [ "$address" == "" ];then
-        v4=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py getServerIp 4)
-        v6=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py getServerIp 6)
+        v4=$(python3 ${PANEL_DIR}/panel_tools.py getServerIp 4)
+        v6=$(python3 ${PANEL_DIR}/panel_tools.py getServerIp 6)
 
         if [ "$v4" != "" ] && [ "$v6" != "" ]; then
 
@@ -565,8 +565,8 @@ mw_default(){
     echo -e "\033[32mMW-PANEL DEFAULT INFO!\033[0m"
     echo -e "=================================================================="
     echo -e "$address"
-    echo -e `cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py username`
-    echo -e `cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py password`
+    echo -e `python3 ${PANEL_DIR}/panel_tools.py username`
+    echo -e `python3 ${PANEL_DIR}/panel_tools.py password`
     # echo -e "password: $password"
     echo -e "\033[33mWarning:\033[0m"
     echo -e "\033[33mIf you cannot access the panel. \033[0m"

From 759cbd1065ee0e9918e8ece35bf23490fc78a845 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 17:34:48 +0800
Subject: [PATCH 017/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index d609da790..b2830cb77 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -541,7 +541,7 @@ mw_default(){
                 mw_start
             fi
 
-            address="MW-PANEL-URL-Ipv4: ${scheme}://$v4:$port$auth_path \nMW-Panel-URL-Ipv6: ${scheme}://[$v6]:$port$auth_path"
+            address="MW-PANEL-URL-IPV4: ${scheme}://$v4:$port$auth_path \nMW-PANEL-URL-IPV6: ${scheme}://[$v6]:$port$auth_path"
         elif [ "$v4" != "" ]; then
             address="MW-PANEL-URL: ${scheme}://$v4:$port$auth_path"
         elif [ "$v6" != "" ]; then

From d767a4d4a2897a9117c3999806a33279f53d3799 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 18:14:31 +0800
Subject: [PATCH 018/965] update

---
 panel_tools.py              | 17 ++++++++-----
 web/admin/model/__init__.py |  4 ++-
 web/admin/model/user.py     | 51 +++++++++++++++++++++++++++++--------
 3 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index 558b9ac93..a6547e0c7 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -120,7 +120,7 @@ def mwcli(mw_input=0):
         input_user = mw_input_cmd("请输入新的面板用户名(>=5位)：")
         set_panel_username(input_user.strip())
     elif mw_input == 13:
-        os.system('tail -100 ' + mw.getPanelDir() + '/logs/error.log')
+        os.system('tail -100 ' + mw.getPanelDir() + '/logs/panel_error.log')
     elif mw_input == 20:
         basic_auth = 'data/basic_auth.json'
         if os.path.exists(basic_auth):
@@ -246,7 +246,6 @@ def show_panel_pwd():
 
 def set_panel_username(username=None):
     # 随机面板用户名
-    sql = db.Sql()
     if username:
         if len(username) < 5:
             print("|-错误，用户名长度不能少于5位")
@@ -255,15 +254,15 @@ def set_panel_username(username=None):
             print("|-错误，不能使用过于简单的用户名")
             return
 
-        sql.table('users').where('id=?', (1,)).setField('username', username)
+        model.setUserByRoot(name=username)
         print("|-新用户名: %s" % username)
         return
 
-    username = sql.table('users').where('id=?', (1,)).getField('username')
-    if username == 'admin':
+    info = model.getUserByRoot()
+    if info['name'] == 'admin':
         username = mw.getRandomString(8).lower()
-        sql.table('users').where('id=?', (1,)).setField('username', username)
-    print('username: ' + username)
+        model.setUserByRoot(name=username)
+    print('|-用户名: ' + info['name'])
 
 
 def getServerIp():
@@ -276,6 +275,10 @@ def getServerIp():
 
 
 if __name__ == "__main__":
+
+    if len(sys.argv) == 1:
+        print('ERROR: Parameter error!')
+        exit(-2)
     method = sys.argv[1]
     if method == 'panel':
         set_panel_pwd(sys.argv[2])
diff --git a/web/admin/model/__init__.py b/web/admin/model/__init__.py
index 45762ecbd..1d1af4dc7 100644
--- a/web/admin/model/__init__.py
+++ b/web/admin/model/__init__.py
@@ -21,7 +21,9 @@ from .task import addTask
 from .task import getTaskCount,getTaskUnexecutedCount,getTaskList,getTaskFirstByRun
 from .task import setTaskStatus,setTaskData
 
-from .user import getUserByName,getUserById,isLoginCheck
+from .user import isLoginCheck
+from .user import getUserByName,getUserById,getUserByRoot
+from .user import setUserByRoot
 
 from .temp_login import getTempLoginByToken,clearTempLogin
 
diff --git a/web/admin/model/user.py b/web/admin/model/user.py
index 241af678e..ac772206a 100644
--- a/web/admin/model/user.py
+++ b/web/admin/model/user.py
@@ -32,16 +32,6 @@ def getUserByName(name,
     row['update_time'] = item.update_time
     return row
 
-def isLoginCheck(username, password) -> bool:
-    info = getUserByName(data['username'])
-    if info is None:
-        return False
-
-    if info['password'] == mw.md5(password):
-        return True
-    return False
-
-
 def getUserById(id,
 ) -> None:
     '''
@@ -62,6 +52,47 @@ def getUserById(id,
     row['update_time'] = item.update_time
     return row
 
+def getUserByRoot() -> None:
+    '''
+    获取用户信息通过用户名
+    '''
+    return getUserById(1)
+
+def setUserByRoot(
+    name: str | None = None,
+    password: str | None =None,
+) -> bool:
+    '''
+    设置配置的值
+    :name -> str 名称 (必填)
+    :value -> object值 (必填)
+    :type -> str 类型 (可选|默认common)
+    '''
+    data = {}
+
+    if name is not None:
+        data['name'] = name
+
+    if name is not None:
+        data['password'] = mw.md5(password)
+    
+    db.session.query(Users).filter_by(Users.id==1).update(data)
+    db.session.commit()
+    db.session.close()
+    return True
+
+def isLoginCheck(username, password) -> bool:
+    info = getUserByName(data['username'])
+    if info is None:
+        return False
+
+    if info['password'] == mw.md5(password):
+        return True
+    return False
+
+
+
+
 def isLoginCheck(username, password) -> bool:
     info = getUserByName(data['username'])
     if info is None:

From fb8b5314e1d81ec51e81a80db1d9094b1e5bcef3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 18:18:12 +0800
Subject: [PATCH 019/965] Update panel_tools.py

---
 panel_tools.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index a6547e0c7..9576d8bd5 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -23,6 +23,8 @@ web_dir = os.getcwd() + "/web"
 os.chdir(web_dir)
 sys.path.append(web_dir)
 
+
+from admin import app
 from admin import model
 import core.mw as mw
 import core.db as db
@@ -274,8 +276,7 @@ def getServerIp():
     print(ip[0])
 
 
-if __name__ == "__main__":
-
+def main():
     if len(sys.argv) == 1:
         print('ERROR: Parameter error!')
         exit(-2)
@@ -301,3 +302,7 @@ if __name__ == "__main__":
         mwcli(clinum)
     else:
         print('ERROR: Parameter error')
+
+if __name__ == "__main__":
+    with app.app_context():
+        run()

From 559e549590bf3e093eafeea6eda811f0f96dd8a8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 18:18:58 +0800
Subject: [PATCH 020/965] Update panel_tools.py

---
 panel_tools.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panel_tools.py b/panel_tools.py
index 9576d8bd5..eedf44b38 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -305,4 +305,4 @@ def main():
 
 if __name__ == "__main__":
     with app.app_context():
-        run()
+        main()

From 9b1552269b40b9855b84c01a553d0fc6b3f03cfe Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 18:30:50 +0800
Subject: [PATCH 021/965] update

---
 panel_tools.py        | 6 ++++++
 scripts/init.d/mw.tpl | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index eedf44b38..a0e46a1f7 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -245,6 +245,10 @@ def show_panel_pwd():
         return
     print("password has been changed!")
 
+def show_panel_adminpath():
+    admin_path = model.getOption('admin_path')
+    print(admin_path)
+
 
 def set_panel_username(username=None):
     # 随机面板用户名
@@ -290,6 +294,8 @@ def main():
             set_panel_username()
     elif method == 'password':
         show_panel_pwd()
+    elif method == 'admin_path':
+        show_panel_adminpath()
     elif method == 'getServerIp':
         getServerIp()
     elif method == "cli":
diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index b2830cb77..cfea01021 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -522,12 +522,12 @@ mw_default(){
     fi
 
     password=$(cat ${PANEL_DIR}/data/default.pl)
+
     if [ -f ${PANEL_DIR}/data/domain.conf ];then
         address=$(cat ${PANEL_DIR}/data/domain.conf)
     fi
-    if [ -f ${PANEL_DIR}/data/admin_path.pl ];then
-        auth_path=$(cat ${PANEL_DIR}/data/admin_path.pl)
-    fi
+
+    admin_path=$(python3 ${PANEL_DIR}/panel_tools.py admin_path)
     
     if [ "$address" == "" ];then
         v4=$(python3 ${PANEL_DIR}/panel_tools.py getServerIp 4)

From 669bbfce937a12aa42eb9bbdbd5323306c144d90 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 18:34:35 +0800
Subject: [PATCH 022/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index cfea01021..97e9c83e5 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -527,8 +527,8 @@ mw_default(){
         address=$(cat ${PANEL_DIR}/data/domain.conf)
     fi
 
-    admin_path=$(python3 ${PANEL_DIR}/panel_tools.py admin_path)
-    
+    admin_path=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py admin_path)
+
     if [ "$address" == "" ];then
         v4=$(python3 ${PANEL_DIR}/panel_tools.py getServerIp 4)
         v6=$(python3 ${PANEL_DIR}/panel_tools.py getServerIp 6)

From f3552281c551f4ce669be0def2346f98519ea3c0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 18:35:07 +0800
Subject: [PATCH 023/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 97e9c83e5..7bbd1c9aa 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -528,7 +528,7 @@ mw_default(){
     fi
 
     admin_path=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py admin_path)
-
+    echo "admin_path:$admin_path"
     if [ "$address" == "" ];then
         v4=$(python3 ${PANEL_DIR}/panel_tools.py getServerIp 4)
         v6=$(python3 ${PANEL_DIR}/panel_tools.py getServerIp 6)

From 306d69bd3967c3e1b888400cd48bede7852357a9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 18:36:04 +0800
Subject: [PATCH 024/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 7bbd1c9aa..4a44f97ed 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -528,7 +528,6 @@ mw_default(){
     fi
 
     admin_path=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py admin_path)
-    echo "admin_path:$admin_path"
     if [ "$address" == "" ];then
         v4=$(python3 ${PANEL_DIR}/panel_tools.py getServerIp 4)
         v6=$(python3 ${PANEL_DIR}/panel_tools.py getServerIp 6)
@@ -541,9 +540,9 @@ mw_default(){
                 mw_start
             fi
 
-            address="MW-PANEL-URL-IPV4: ${scheme}://$v4:$port$auth_path \nMW-PANEL-URL-IPV6: ${scheme}://[$v6]:$port$auth_path"
+            address="MW-PANEL-URL-IPV4: ${scheme}://$v4:$port$admin_path \nMW-PANEL-URL-IPV6: ${scheme}://[$v6]:$port$admin_path"
         elif [ "$v4" != "" ]; then
-            address="MW-PANEL-URL: ${scheme}://$v4:$port$auth_path"
+            address="MW-PANEL-URL: ${scheme}://$v4:$port$admin_path"
         elif [ "$v6" != "" ]; then
 
             if [ ! -f ${PANEL_DIR}/data/ipv6.pl ];then
@@ -552,12 +551,12 @@ mw_default(){
                 mw_stop
                 mw_start
             fi
-            address="MW-PANEL-URL: ${scheme}://[$v6]:$port$auth_path"
+            address="MW-PANEL-URL: ${scheme}://[$v6]:$port$admin_path"
         else
-            address="MW-PANEL-URL: ${scheme}://you-network-ip:$port$auth_path"
+            address="MW-PANEL-URL: ${scheme}://you-network-ip:$port$admin_path"
         fi
     else
-        address="MW-PANEL-URL: ${scheme}://$address:$port$auth_path"
+        address="MW-PANEL-URL: ${scheme}://$address:$port$admin_path"
     fi
 
     show_panel_ip="$port|"

From 671859ad3c8fd7e627d33a656db82c3bd69b7d6d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 18:37:00 +0800
Subject: [PATCH 025/965] Update panel_tools.py

---
 panel_tools.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panel_tools.py b/panel_tools.py
index a0e46a1f7..1a77d62f7 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -247,7 +247,7 @@ def show_panel_pwd():
 
 def show_panel_adminpath():
     admin_path = model.getOption('admin_path')
-    print(admin_path)
+    print('/'+admin_path)
 
 
 def set_panel_username(username=None):

From 90a406e5e9e099cf330f616b12b3541ed3bcb2b8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 18:43:07 +0800
Subject: [PATCH 026/965] Update panel_tools.py

---
 panel_tools.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index 1a77d62f7..6e4c69bed 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -218,14 +218,11 @@ def open_ssh_port():
 
 
 def set_panel_pwd(password, ncli=False):
-    # 设置面板密码
-    import db
-    sql = db.Sql()
-    result = sql.table('users').where('id=?', (1,)).setField(
-        'password', mw.md5(password))
+    info = model.getUserByRoot()
     username = sql.table('users').where('id=?', (1,)).getField('username')
+    model.setUserByRoot(password=password)
     if ncli:
-        print("|-用户名: " + username)
+        print("|-用户名: " + info['name'])
         print("|-新密码: " + password)
     else:
         print(username)

From 0eea41ba85269f728bd8f9cd4d34fe625b0ac91a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 18:45:07 +0800
Subject: [PATCH 027/965] Update panel_tools.py

---
 panel_tools.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/panel_tools.py b/panel_tools.py
index 6e4c69bed..a6a28cfb3 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -219,7 +219,6 @@ def open_ssh_port():
 
 def set_panel_pwd(password, ncli=False):
     info = model.getUserByRoot()
-    username = sql.table('users').where('id=?', (1,)).getField('username')
     model.setUserByRoot(password=password)
     if ncli:
         print("|-用户名: " + info['name'])

From 3f3221a3df2314ad91a4332070700032cdd4c234 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 18:48:04 +0800
Subject: [PATCH 028/965] Update user.py

---
 web/admin/model/user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/model/user.py b/web/admin/model/user.py
index ac772206a..2592cc85d 100644
--- a/web/admin/model/user.py
+++ b/web/admin/model/user.py
@@ -76,7 +76,7 @@ def setUserByRoot(
     if name is not None:
         data['password'] = mw.md5(password)
     
-    db.session.query(Users).filter_by(Users.id==1).update(data)
+    db.session.query(Users).filter(Users.id==1).update(data)
     db.session.commit()
     db.session.close()
     return True

From b2f595dfb2419be683750d9a0b5408e0890e1bfa Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 18:52:46 +0800
Subject: [PATCH 029/965] Update user.py

---
 web/admin/model/user.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/admin/model/user.py b/web/admin/model/user.py
index 2592cc85d..e41b85a5a 100644
--- a/web/admin/model/user.py
+++ b/web/admin/model/user.py
@@ -60,7 +60,7 @@ def getUserByRoot() -> None:
 
 def setUserByRoot(
     name: str | None = None,
-    password: str | None =None,
+    password: str | None = None,
 ) -> bool:
     '''
     设置配置的值
@@ -76,7 +76,7 @@ def setUserByRoot(
     if name is not None:
         data['password'] = mw.md5(password)
     
-    db.session.query(Users).filter(Users.id==1).update(data)
+    Users.query.filter(Users.id==1).update(data)
     db.session.commit()
     db.session.close()
     return True

From f8f152affbb113ebd81ae8bba112cb91c488d9bf Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 18:56:49 +0800
Subject: [PATCH 030/965] Update user.py

---
 web/admin/model/user.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/admin/model/user.py b/web/admin/model/user.py
index e41b85a5a..fac67858e 100644
--- a/web/admin/model/user.py
+++ b/web/admin/model/user.py
@@ -75,10 +75,11 @@ def setUserByRoot(
 
     if name is not None:
         data['password'] = mw.md5(password)
+
+    print(data)
     
     Users.query.filter(Users.id==1).update(data)
     db.session.commit()
-    db.session.close()
     return True
 
 def isLoginCheck(username, password) -> bool:

From 0467d39c90637a8cfe711f6078b239b6bb5d0046 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 18:57:12 +0800
Subject: [PATCH 031/965] Update user.py

---
 web/admin/model/user.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/web/admin/model/user.py b/web/admin/model/user.py
index fac67858e..6fa1ec3e7 100644
--- a/web/admin/model/user.py
+++ b/web/admin/model/user.py
@@ -90,15 +90,3 @@ def isLoginCheck(username, password) -> bool:
     if info['password'] == mw.md5(password):
         return True
     return False
-
-
-
-
-def isLoginCheck(username, password) -> bool:
-    info = getUserByName(data['username'])
-    if info is None:
-        return False
-
-    if info['password'] == mw.md5(password):
-        return True
-    return False

From a4cdc1e03b9a4e0c3e9652a90a6c8df1834dea27 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 18:59:08 +0800
Subject: [PATCH 032/965] Update user.py

---
 web/admin/model/user.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/web/admin/model/user.py b/web/admin/model/user.py
index 6fa1ec3e7..5e9918736 100644
--- a/web/admin/model/user.py
+++ b/web/admin/model/user.py
@@ -73,10 +73,8 @@ def setUserByRoot(
     if name is not None:
         data['name'] = name
 
-    if name is not None:
+    if password is not None:
         data['password'] = mw.md5(password)
-
-    print(data)
     
     Users.query.filter(Users.id==1).update(data)
     db.session.commit()

From 205bb471016979eda5a50b4516f99b913e656265 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 19:00:21 +0800
Subject: [PATCH 033/965] Update user.py

---
 web/admin/model/user.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/admin/model/user.py b/web/admin/model/user.py
index 5e9918736..058e8fbd1 100644
--- a/web/admin/model/user.py
+++ b/web/admin/model/user.py
@@ -75,6 +75,9 @@ def setUserByRoot(
 
     if password is not None:
         data['password'] = mw.md5(password)
+
+    if not data:
+        return False
     
     Users.query.filter(Users.id==1).update(data)
     db.session.commit()

From 39b3936eca7618a981f5f51384626e2511a8672a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 19:04:14 +0800
Subject: [PATCH 034/965] Update adult_log.py

---
 web/utils/adult_log.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/adult_log.py b/web/utils/adult_log.py
index f1b4e4a80..303a99417 100644
--- a/web/utils/adult_log.py
+++ b/web/utils/adult_log.py
@@ -134,7 +134,7 @@ def parseAuditFile(log_name, result):
         log_list.append(_line)
     return log_list
 
-def getAuditLast(self, log_name):
+def getAuditLast(log_name):
     # 获取日志
     cmd = '''LANG=en_US.UTF-8 last -n 200 -x -f {} |grep -v 127.0.0.1|grep -v " begins"'''.format(
         '/var/log/' + log_name)

From 1bae404c5e12bb2941ed6b1703397da0cdef5851 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 19:06:54 +0800
Subject: [PATCH 035/965] Update adult_log.py

---
 web/utils/adult_log.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/adult_log.py b/web/utils/adult_log.py
index 303a99417..d69d1ccc5 100644
--- a/web/utils/adult_log.py
+++ b/web/utils/adult_log.py
@@ -173,7 +173,7 @@ def getAuditLast(log_name):
     # lastlog_list = sorted(lastlog_list,key=lambda x:x['时间'],reverse=True)
     return mw.returnData(True, 'ok!', lastlog_list)
 
-def getAuditLastLog(self):
+def getAuditLastLog():
     cmd = '''LANG=en_US.UTF-8 lastlog|grep -v Username'''
     result = mw.execShell(cmd)
     lastlog_list = []

From 1dc21b3c0ba8c2e0c5fd50a59ab9898d6040b646 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 21:14:26 +0800
Subject: [PATCH 036/965] Update __init__.py

---
 web/admin/site/__init__.py | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index 12ad0468f..42c3fddf1 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -59,4 +59,26 @@ def list():
 @blueprint.route('/get_site_types', endpoint='get_site_types',methods=['POST'])
 @panel_login_required
 def get_site_types():
-    return []
\ No newline at end of file
+    return []
+
+@blueprint.route('/get_cli_php_version', endpoint='get_cli_php_version',methods=['POST'])
+@panel_login_required
+def get_cli_php_version():
+    php_dir = mw.getServerDir() + '/php'
+    if not os.path.exists(php_dir):
+        return mw.returnData(False, '未安装PHP,无法设置')
+
+    php_bin = '/usr/bin/php'
+    php_versions = self.getPhpVersion()
+    php_versions = php_versions[1:]
+
+    if len(php_versions) < 1:
+        return mw.returnData(False, '未安装PHP,无法设置')
+
+    if os.path.exists(php_bin) and os.path.islink(php_bin):
+        link_re = os.readlink(php_bin)
+        for v in php_versions:
+            if link_re.find(v['version']) != -1:
+                return mw.returnData({"select": v, "versions": php_versions})
+
+    return mw.getJson({"select": php_versions[0],"versions": php_versions})
\ No newline at end of file

From e6598ff57d5ba87a5267265e9b215234ec5f144e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 21:16:25 +0800
Subject: [PATCH 037/965] update

---
 web/admin/site/__init__.py |  3 +-
 web/utils/site.py          | 60 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 web/utils/site.py

diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index 42c3fddf1..84389b84f 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -16,6 +16,7 @@ from admin.model import Sites
 from admin.user_login_check import panel_login_required
 
 from utils.mwplugin import MwPlugin
+from utils.site import site
 import core.mw as mw
 
 blueprint = Blueprint('site', __name__, url_prefix='/site', template_folder='../../templates/default')
@@ -69,7 +70,7 @@ def get_cli_php_version():
         return mw.returnData(False, '未安装PHP,无法设置')
 
     php_bin = '/usr/bin/php'
-    php_versions = self.getPhpVersion()
+    php_versions = site.getPhpVersion()
     php_versions = php_versions[1:]
 
     if len(php_versions) < 1:
diff --git a/web/utils/site.py b/web/utils/site.py
new file mode 100644
index 000000000..a9a5b0c24
--- /dev/null
+++ b/web/utils/site.py
@@ -0,0 +1,60 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+import sys
+import json
+import threading
+import multiprocessing
+
+from admin import model
+
+import core.mw as mw
+
+def getPhpVersion():
+    phpVersions = ('00', '52', '53', '54', '55',
+                   '56', '70', '71', '72', '73',
+                   '74', '80', '81', '82', '83',
+                   '84')
+    data = []
+    for val in phpVersions:
+        tmp = {}
+        if val == '00':
+            tmp['version'] = '00'
+            tmp['name'] = '纯静态'
+            data.append(tmp)
+
+        # 标准判断
+        checkPath = mw.getServerDir() + '/php/' + val + '/bin/php'
+        if os.path.exists(checkPath):
+            tmp['version'] = val
+            tmp['name'] = 'PHP-' + val
+            data.append(tmp)
+
+    # 其他PHP安装类型
+    conf_dir = mw.getServerDir() + "/web_conf/php/conf"
+    conf_list = os.listdir(conf_dir)
+    l = len(conf_list)
+    rep = r"enable-php-(.*?)\.conf"
+    for name in conf_list:
+        tmp = {}
+        try:
+            matchVer = re.search(rep, name).groups()[0]
+        except Exception as e:
+            continue
+
+        if matchVer in phpVersions:
+            continue
+
+        tmp['version'] = matchVer
+        tmp['name'] = 'PHP-' + matchVer
+        data.append(tmp)
+
+    return data
\ No newline at end of file

From 210dbfe164b090846cb3412900684694cd8a71ce Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 21:18:49 +0800
Subject: [PATCH 038/965] Update __init__.py

---
 web/admin/site/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index 84389b84f..566135b19 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -16,7 +16,7 @@ from admin.model import Sites
 from admin.user_login_check import panel_login_required
 
 from utils.mwplugin import MwPlugin
-from utils.site import site
+import utils.site as site
 import core.mw as mw
 
 blueprint = Blueprint('site', __name__, url_prefix='/site', template_folder='../../templates/default')

From 580235b105bfd667f91027d5f7614a3fa62f4967 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 21:24:14 +0800
Subject: [PATCH 039/965] Update __init__.py

---
 web/admin/site/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index 566135b19..de1ab88aa 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -8,6 +8,7 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
+import os
 
 from flask import Blueprint, render_template
 from flask import request

From c56c1c7274fa082eefc4e6f8dc9cecff14470d51 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 21:28:39 +0800
Subject: [PATCH 040/965] Update __init__.py

---
 web/admin/site/__init__.py | 40 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index de1ab88aa..9760ebc7d 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -83,4 +83,42 @@ def get_cli_php_version():
             if link_re.find(v['version']) != -1:
                 return mw.returnData({"select": v, "versions": php_versions})
 
-    return mw.getJson({"select": php_versions[0],"versions": php_versions})
\ No newline at end of file
+    return mw.getJson({"select": php_versions[0],"versions": php_versions})
+
+@blueprint.route('/get_cli_php_version', endpoint='get_cli_php_version',methods=['POST'])
+@panel_login_required
+def get_cli_php_version():
+    if mw.isAppleSystem():
+        return mw.returnData(False, "开发机不可设置!")
+
+    version = request.form.get('version', '')
+
+    php_bin = '/usr/bin/php'
+    php_bin_src = "/www/server/php/%s/bin/php" % version
+    php_ize = '/usr/bin/phpize'
+    php_ize_src = "/www/server/php/%s/bin/phpize" % version
+    php_fpm = '/usr/bin/php-fpm'
+    php_fpm_src = "/www/server/php/%s/sbin/php-fpm" % version
+    php_pecl = '/usr/bin/pecl'
+    php_pecl_src = "/www/server/php/%s/bin/pecl" % version
+    php_pear = '/usr/bin/pear'
+    php_pear_src = "/www/server/php/%s/bin/pear" % version
+    if not os.path.exists(php_bin_src):
+        return mw.returnData(False, '指定PHP版本未安装!')
+
+    is_chattr = mw.execShell('lsattr /usr|grep /usr/bin')[0].find('-i-')
+    if is_chattr != -1:
+        mw.execShell('chattr -i /usr/bin')
+    mw.execShell("rm -f " + php_bin + ' ' + php_ize + ' ' +
+                 php_fpm + ' ' + php_pecl + ' ' + php_pear)
+    mw.execShell("ln -sf %s %s" % (php_bin_src, php_bin))
+    mw.execShell("ln -sf %s %s" % (php_ize_src, php_ize))
+    mw.execShell("ln -sf %s %s" % (php_fpm_src, php_fpm))
+    mw.execShell("ln -sf %s %s" % (php_pecl_src, php_pecl))
+    mw.execShell("ln -sf %s %s" % (php_pear_src, php_pear))
+    if is_chattr != -1:
+        mw.execShell('chattr +i /usr/bin')
+    mw.writeLog('面板设置', '设置PHP-CLI版本为: %s' % version)
+    return mw.returnData(True, '设置成功!')
+
+

From d81764cc789920113ee557f171df2d75c969c5d1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 21:30:18 +0800
Subject: [PATCH 041/965] Update __init__.py

---
 web/admin/site/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index 9760ebc7d..4ec0f7db6 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -85,9 +85,9 @@ def get_cli_php_version():
 
     return mw.getJson({"select": php_versions[0],"versions": php_versions})
 
-@blueprint.route('/get_cli_php_version', endpoint='get_cli_php_version',methods=['POST'])
+@blueprint.route('/set_cli_php_version', endpoint='set_cli_php_version',methods=['POST'])
 @panel_login_required
-def get_cli_php_version():
+def set_cli_php_version():
     if mw.isAppleSystem():
         return mw.returnData(False, "开发机不可设置!")
 

From 8803d3ee03c53a31b67032562937a71806b011d1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Nov 2024 21:30:24 +0800
Subject: [PATCH 042/965] Update new_cli.sh

---
 new_cli.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/new_cli.sh b/new_cli.sh
index c5dd43844..63f4795c7 100755
--- a/new_cli.sh
+++ b/new_cli.sh
@@ -61,7 +61,7 @@ mw_start_debug(){
         port=$(cat ${DIR}/data/port.pl)
     fi
     # gunicorn -b :${port} -k gevent -w 1 app:app
-	cd web && gunicorn -b :${port} -w 1 app:app
+	cd ${DIR}/web && gunicorn -b :${port} -w 1 app:app
 }
 
 mw_start_debug2(){

From 31571a60e30917c69706add72390944d7de53b0d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 2 Nov 2024 02:19:58 +0800
Subject: [PATCH 043/965] update

---
 new_cli.sh                        |   5 +-
 panel_task.py                     |  27 ++-
 panel_tools.py                    |  17 +-
 scripts/init.d/mw.tpl             |   4 +-
 web/admin/crontab/__init__.py     |   4 +-
 web/admin/dashboard/__init__.py   |  25 ++-
 web/admin/firewall/__init__.py    |  17 +-
 web/admin/model/__init__.py       |   7 +
 web/admin/model/firewall.py       |  41 +++++
 web/admin/model/logs.py           |  12 +-
 web/admin/setting/setting.py      |  29 ++-
 web/admin/system/__init__.py      | 167 +----------------
 web/admin/system/system.py        | 158 ++++++++++++++++
 web/admin/system/upgrade.py       |  34 ++++
 web/core/mw.py                    |  10 +-
 web/setting.py                    |  16 +-
 web/templates/default/layout.html |  24 +--
 web/utils/firewall.py             | 108 ++++++++++-
 web/utils/system/__init__.py      | 287 +-----------------------------
 web/utils/system/main.py          | 153 ++++++++++++++++
 web/utils/system/monitor.py       |  21 +++
 web/utils/system/query.py         | 103 +++++++++++
 web/utils/system/stats.py         | 161 +++++++++++++++++
 23 files changed, 896 insertions(+), 534 deletions(-)
 create mode 100644 web/admin/model/firewall.py
 create mode 100644 web/admin/system/system.py
 create mode 100644 web/admin/system/upgrade.py
 create mode 100644 web/utils/system/main.py
 create mode 100644 web/utils/system/monitor.py
 create mode 100644 web/utils/system/query.py
 create mode 100644 web/utils/system/stats.py

diff --git a/new_cli.sh b/new_cli.sh
index 63f4795c7..8dcd7cd3f 100755
--- a/new_cli.sh
+++ b/new_cli.sh
@@ -3,6 +3,8 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/hom
 DIR=$(cd "$(dirname "$0")"; pwd)
 MDIR=$(dirname "$DIR")
 
+export LC_ALL="en_US.UTF-8"
+
 # echo $DIR
 
 PATH=$PATH:$DIR/bin
@@ -14,9 +16,6 @@ if [ -f ${DIR}/bin/activate ];then
 	fi
 fi
 
-export LC_ALL="en_US.UTF-8"
-
-
 mw_start_task()
 {
     isStart=$(ps aux |grep 'panel_task.py'|grep -v grep|awk '{print $2}')
diff --git a/panel_task.py b/panel_task.py
index b23038993..c5d18a68a 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -31,16 +31,6 @@ import core.mw as mw
 import core.db as db
 
 
-# print(mw.getPanelDir())
-
-# print sys.path
-
-# cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-# info = mw.execShell(cmd)
-# p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-# sys.path.append(p)
-
-
 global pre, timeoutCount, logPath, isTask, oldEdate, isCheck
 pre = 0
 timeoutCount = 0
@@ -85,9 +75,12 @@ def service_cmd(method):
         execShell(cmd + ' ' + method)
         return
 
-    cmd = mw.getRunDir() + '/scripts/init.d/mw'
+    cmd = mw.getPanelDir() + '/scripts/init.d/mw'
+    print(cmd)
     if os.path.exists(cmd):
-        execShell(cmd + ' ' + method)
+        print(cmd + ' ' + method)
+        data = execShell(cmd + ' ' + method)
+        print(data)
         return
 
 
@@ -573,7 +566,7 @@ def openrestyRestartAtOnce():
 
 # --------------------------------------Panel Restart Start   --------------------------------------------- #
 def restartPanelService():
-    restartTip = 'data/restart.pl'
+    restartTip = mw.getPanelDir()+'/data/restart.pl'
     while True:
         if os.path.exists(restartTip):
             os.remove(restartTip)
@@ -612,10 +605,10 @@ def run():
     # oar.start()
 
 
-    # # Panel Restart Start
-    # rps = threading.Thread(target=restartPanelService)
-    # rps = setDaemon(rps)
-    # rps.start()
+    # Panel Restart Start
+    rps = threading.Thread(target=restartPanelService)
+    rps = setDaemon(rps)
+    rps.start()
 
     # 面板后台任务
     startPanelTask()
diff --git a/panel_tools.py b/panel_tools.py
index a6a28cfb3..a56444a8f 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -228,16 +228,15 @@ def set_panel_pwd(password, ncli=False):
 
 
 def show_panel_pwd():
-    # 设置面板密码
-    sql = db.Sql()
-    password = sql.table('users').where('id=?', (1,)).getField('password')
+    # 面板密码展示
+    info = model.getUserByRoot()
+    defailt_pwd_file = mw.getPanelDir()+'/data/default.pl'
+    pwd = ''
+    if os.path.exists(defailt_pwd_file):
+        pwd = mw.readFile(defailt_pwd_file).strip()
 
-    file_pwd = ''
-    if os.path.exists('data/default.pl'):
-        file_pwd = mw.readFile('data/default.pl').strip()
-
-    if mw.md5(file_pwd) == password:
-        print('password: ' + file_pwd)
+    if mw.md5(pwd) == info['password']:
+        print('password: ' + pwd)
         return
     print("password has been changed!")
 
diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 4a44f97ed..236c57a63 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -104,7 +104,7 @@ mw_start()
 # /www/server/mdserver-web/tmp/panelTask.pl && service mw restart_task
 mw_stop_task()
 {
-    if [ -f $mw_path/tmp/panelTask.pl ];then
+    if [ -f ${PANEL_DIR}/tmp/panelTask.pl ];then
         echo -e "\033[32mthe task is running and cannot be stopped\033[0m"
         exit 0
     fi
@@ -123,7 +123,7 @@ mw_stop_panel()
 {
     echo -e "stopping mw-panel... \c";
 
-    pidfile=${mw_path}/logs/mw.pid
+    pidfile=${PANEL_DIR}/logs/mw.pid
     if [ -f $pidfile ];then
         pid=`cat $pidfile`
         kill -9 $pid > /dev/null 2>&1
diff --git a/web/admin/crontab/__init__.py b/web/admin/crontab/__init__.py
index 6162e7272..f10762d03 100644
--- a/web/admin/crontab/__init__.py
+++ b/web/admin/crontab/__init__.py
@@ -27,8 +27,8 @@ def list():
     page = request.args.get('p', 1)
     size = 10
     count = Crontab.query.count()
-    print(count)
+    # print(count)
     clist = Crontab.query.paginate(page=int(page), per_page=size)
-    print(clist)
+    # print(clist)
 
     return []
\ No newline at end of file
diff --git a/web/admin/dashboard/__init__.py b/web/admin/dashboard/__init__.py
index 0bf9fdee3..e3fd25933 100644
--- a/web/admin/dashboard/__init__.py
+++ b/web/admin/dashboard/__init__.py
@@ -32,6 +32,18 @@ blueprint = Blueprint('dashboard', __name__, url_prefix='/', template_folder='..
 def index():
     return render_template('default/index.html')
 
+# 安全路径
+@blueprint.route('/<path>',endpoint='admin_safe_path',methods=['GET'])
+def admin_safe_path(path):
+    db_path = model.getOption('admin_path')
+    if db_path == path:
+        return render_template('default/login.html')
+
+    unauthorized_status = model.getOption('unauthorized_status')
+    if unauthorized_status == '0':
+        return render_template('default/path.html')
+    return Response(status=int(unauthorized_status))
+
 # 仅针对webhook插件
 @blueprint.route("/hook", methods=['POST', 'GET'])
 def webhook():
@@ -63,19 +75,6 @@ def webhook():
     except Exception as e:
         return str(e)
 
-# 安全路径
-@blueprint.route('/<path>',endpoint='admin_safe_path',methods=['GET'])
-def admin_safe_path(path):
-    db_path = model.getOption('admin_path')
-    if db_path == path:
-        return render_template('default/login.html')
-
-    unauthorized_status = model.getOption('unauthorized_status')
-    if unauthorized_status == '0':
-        return render_template('default/path.html')
-    return Response(status=int(unauthorized_status))
-
-
 # ---------------------------------------------------------------------------------
 # 定义登录入口相关方法
 # ---------------------------------------------------------------------------------
diff --git a/web/admin/firewall/__init__.py b/web/admin/firewall/__init__.py
index 182390ce4..a14c0dff7 100644
--- a/web/admin/firewall/__init__.py
+++ b/web/admin/firewall/__init__.py
@@ -75,8 +75,21 @@ def set_ping():
     mf = MwFirewall.instance()
     return mf.setPing()
 
-
-
+# 添加放行端口
+@blueprint.route('/add_accept_port', endpoint='add_accept_port', methods=['POST'])
+@panel_login_required
+def add_accept_port():
+    mf = MwFirewall.instance()
+    if not mf.getFwStatus():
+        return mw.returnData(False, '防火墙启动时,才能添加规则!')
+
+    port = request.form.get('port', '').strip()
+    ps = request.form.get('ps', '').strip()
+    protocol = request.form.get('protocol', '').strip()
+    stype = request.form.get('type', '').strip()
+
+    data = mf.addAcceptPort(port, ps, stype, protocol=protocol)
+    return mw.getJson(data)
 
 
 
diff --git a/web/admin/model/__init__.py b/web/admin/model/__init__.py
index 1d1af4dc7..b0821ac6d 100644
--- a/web/admin/model/__init__.py
+++ b/web/admin/model/__init__.py
@@ -8,6 +8,7 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
+
 from .initdb import *
 
 from .logs import addLog,clearLog
@@ -25,5 +26,11 @@ from .user import isLoginCheck
 from .user import getUserByName,getUserById,getUserByRoot
 from .user import setUserByRoot
 
+from .firewall import addFirewall
+
 from .temp_login import getTempLoginByToken,clearTempLogin
 
+
+
+
+
diff --git a/web/admin/model/firewall.py b/web/admin/model/firewall.py
new file mode 100644
index 000000000..db7c36939
--- /dev/null
+++ b/web/admin/model/firewall.py
@@ -0,0 +1,41 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+from admin.model import db, Firewall
+
+import core.mw as mw
+
+
+
+def addFirewall(port,
+    protocol: str | None = 'tcp',
+    ps: str | None = '备注'
+) -> bool:
+    '''
+    设置配置的值
+    :port -> str 端口 (必填)
+    :protocol -> str 协议 (可选|tcp,udp,tcp/udp)
+    :ps -> str 备注 (可选)
+    '''
+    now_time = mw.formatDate()
+    add_data = Firewall(
+        port=port, 
+        protocol=protocol,
+        add_time=now_time,
+        update_time=now_time)
+    db.session.add(add_data)
+    db.session.commit()
+    return True
+
+
+def getFirewallCountByPort(port):
+    return Firewall.query.filter(Tasks.port==port).count()
+
+
diff --git a/web/admin/model/logs.py b/web/admin/model/logs.py
index 94f911966..54cda769f 100644
--- a/web/admin/model/logs.py
+++ b/web/admin/model/logs.py
@@ -13,13 +13,7 @@ import json
 import time
 
 from admin.model import db, Logs
-
-def formatDate(format="%Y-%m-%d %H:%M:%S", times=None):
-    # 格式化指定时间戳
-    if not times:
-        times = int(time.time())
-    time_local = time.localtime(times)
-    return time.strftime(format, time_local)
+import core.mw as mw
 
 def clearLog():
     try:
@@ -42,12 +36,12 @@ def addLog(type, log,
     :log -> str 日志内容 (必填)
     :uid -> int 用户ID
     '''
-    add_time = formatDate()
+    now_time = mw.formatDate()
     add_logs = Logs(
         uid=uid,
         log=log, 
         type=type,
-        add_time=add_time)
+        add_time=now_time)
     db.session.add(add_logs)
     db.session.commit()
     db.session.close()
diff --git a/web/admin/setting/setting.py b/web/admin/setting/setting.py
index 0e3b1a26b..05717339f 100644
--- a/web/admin/setting/setting.py
+++ b/web/admin/setting/setting.py
@@ -142,7 +142,7 @@ def set_basic_auth():
     return mw.returnData(True, '设置成功!')
 
 
-# 设置站点状态
+# 设置面板未登录状态
 @blueprint.route('/set_status_code', endpoint='set_status_code', methods=['POST'])
 @panel_login_required
 def set_status_code():
@@ -159,7 +159,32 @@ def set_status_code():
     model.setOption('unauthorized_status', str(status_code))
     mw.writeLog('面板设置', '将未授权响应状态码设置为:{0}:{1}'.format(status_code,info['text']))
     return mw.returnData(True, '设置成功!')
-        
 
+# 设置站点状态
+@blueprint.route('/set_port', endpoint='set_port', methods=['POST'])
+@panel_login_required
+def set_port():
+    port = request.form.get('port', '')
+    if port != mw.getHostPort():
+        import system_api
+        import firewall_api
 
+        sysCfgDir = mw.systemdCfgDir()
+        if os.path.exists(sysCfgDir + "/firewalld.service"):
+            if not firewall_api.firewall_api().getFwStatus():
+                return mw.returnData(False, 'firewalld必须先启动!')
+
+        # mw.setHostPort(port)
+
+        msg = mw.getInfo('放行端口[{1}]成功', (port,))
+        mw.writeLog("防火墙管理", msg)
+        addtime = time.strftime('%Y-%m-%d %X', time.localtime())
+        mw.M('firewall').add('port,ps,addtime', (port, "配置修改", addtime))
+
+        # firewall_api.firewall_api().addAcceptPort(port)
+        # firewall_api.firewall_api().firewallReload()
+
+        # system_api.system_api().restartMw()
+
+    return mw.returnJson(True, '端口保存成功!')
  
\ No newline at end of file
diff --git a/web/admin/system/__init__.py b/web/admin/system/__init__.py
index 840978ec2..47d29fb71 100644
--- a/web/admin/system/__init__.py
+++ b/web/admin/system/__init__.py
@@ -8,169 +8,6 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
-
-from flask import Blueprint, render_template
-from flask import request
-
-from admin.user_login_check import panel_login_required
-import admin.model.option as option
-
-import core.mw as mw
-import utils.system as sys
-
-
-blueprint = Blueprint('system', __name__, url_prefix='/system', template_folder='../../templates')
-
-# 获取系统的统计信息
-@blueprint.route('/system_total', endpoint='system_total')
-@panel_login_required
-def system_total():
-    data = sys.getMemInfo()
-    cpu = sys.getCpuInfo(interval=1)
-    data['cpuNum'] = cpu[1]
-    data['cpuRealUsed'] = cpu[0]
-    data['time'] = sys.getBootTime()
-    data['system'] = sys.getSystemVersion()
-    data['version'] = '0.0.1'
-    return data
-
-# 获取系统的网络流量信息
-@blueprint.route('/network', endpoint='network')
-@panel_login_required
-def network():
-    stat = {}
-    stat['cpu'] = sys.getCpuInfo()
-    stat['load'] = sys.getLoadAverage()
-    stat['mem'] = sys.getMemInfo()
-    stat['iostat'] = sys.stats().disk()
-    stat['network'] = sys.stats().network()
-    return stat
-
-# 获取系统的磁盘信息
-@blueprint.route('/disk_info', endpoint='disk_info')
-@panel_login_required
-def disk_info():
-    data = sys.getDiskInfo()
-    return data
-
-# 获取系统的负载统计信息
-@blueprint.route('/get_load_average', endpoint='get_load_average', methods=['GET'])
-@panel_login_required
-def get_load_average():
-    start = request.args.get('start', '')
-    end = request.args.get('end', '')
-    data = mw.M('load_average').dbPos(mw.getPanelDataDir(),'system')\
-        .where("addtime>=? AND addtime<=?", (start, end,))\
-        .field('id,pro,one,five,fifteen,addtime')\
-        .order('id asc').select()
-    # return self.toAddtime(data)
-    # print(data)
-    return data
-
-# 获取系统的磁盘IO统计信息
-@blueprint.route('/get_disk_io', endpoint='get_disk_io', methods=['GET'])
-@panel_login_required
-def get_disk_io():
-    start = request.args.get('start', '')
-    end = request.args.get('end', '')
-    data = mw.M('diskio').dbPos(mw.getPanelDataDir(),'system')\
-        .where("addtime>=? AND addtime<=?", (start, end))\
-        .field('id,read_count,write_count,read_bytes,write_bytes,read_time,write_time,addtime')\
-        .order('id asc').select()
-    return data
-
-# 获取系统的CPU/IO统计信息
-@blueprint.route('/get_cpu_io', endpoint='get_cpu_io', methods=['GET'])
-@panel_login_required
-def get_cpu_io():
-    start = request.args.get('start', '')
-    end = request.args.get('end', '')
-    data = mw.M('cpuio').dbPos(mw.getPanelDataDir(),'system')\
-        .where("addtime>=? AND addtime<=?",(start, end))\
-        .field('id,pro,mem,addtime')\
-        .order('id asc').select()
-    # return self.toAddtime(data)
-    # print(data)
-    return data
-
-
-# 获取系统网络IO统计信息
-@blueprint.route('/get_network_io', endpoint='get_network_io', methods=['GET'])
-@panel_login_required
-def get_network_io():
-    start = request.args.get('start', '')
-    end = request.args.get('end', '')
-    data = mw.M('network').dbPos(mw.getPanelDataDir(),'system')\
-        .where("addtime>=? AND addtime<=?", (start, end))\
-        .field('id,up,down,total_up,total_down,down_packets,up_packets,addtime')\
-        .order('id asc').select()
-    # return self.toAddtime(data)
-    # print(data)
-    return data
-
-# 获取系统网络IO统计信息
-@blueprint.route('/set_control', endpoint='set_control', methods=['POST'])
-@panel_login_required
-def set_control():
-    stype = request.form.get('type', '')
-    day = request.form.get('day', '')
-
-    if stype == '0':
-        option.setOption('monitor_status', 'close', type='monitor')
-        return mw.returnData(True, "设置成功!")
-    elif stype == '1':
-        _day = int(day)
-        if _day < 1:
-            return mw.returnData(False, "设置失败!")
-        option.setOption('monitor_day', day, type='monitor')
-        return mw.returnData(True, "设置成功!")
-    elif stype == '2':
-        option.setOption('monitor_only_netio', 'close', type='monitor')
-        return mw.returnData(True, "设置成功!")
-    elif stype == '3':
-        option.setOption('monitor_only_netio', 'open', type='monitor')
-        return mw.returnData(True, "设置成功!")
-    elif stype == 'del':
-        if not mw.isRestart():
-            return mw.returnData(False, '请等待所有安装任务完成再执行')
-        os.remove("data/system.db")
-
-        sql = db.Sql().dbfile('system')
-        csql = mw.readFile('data/sql/system.sql')
-        csql_list = csql.split(';')
-        for index in range(len(csql_list)):
-            sql.execute(csql_list[index], ())
-        return mw.returnData(True, "监控服务已关闭")
-    else:
-        monitor_status = option.getOption('monitor_status', default='open', type='monitor')
-        monitor_day = option.getOption('monitor_day', default='30', type='monitor')
-        monitor_only_netio = option.getOption('monitor_only_netio', default='open', type='monitor')
-        data = {}
-        data['day'] = monitor_day
-        if monitor_status == 'open':   
-            data['status'] = True
-        else:
-            data['status'] = False
-        if monitor_only_netio == 'open':
-            data['stat_all_status'] = True
-        else:
-            data['stat_all_status'] = False
-
-        return data
-
-    return mw.returnData(False, "异常!")
-
-    
-
-
-# 升级检测
-@blueprint.route('/update_server', endpoint='update_server')
-@panel_login_required
-def update_server():
-    panel_type = request.args.get('type', 'check')
-    version = request.args.get('version', '')
-
-    return mw.returnData(False, '已经是最新,无需更新!')
-
-
+from .system import *
+from .upgrade import *
 
diff --git a/web/admin/system/system.py b/web/admin/system/system.py
new file mode 100644
index 000000000..cd6e8a578
--- /dev/null
+++ b/web/admin/system/system.py
@@ -0,0 +1,158 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin.user_login_check import panel_login_required
+import admin.model.option as option
+
+import core.mw as mw
+import utils.system as sys
+
+
+blueprint = Blueprint('system', __name__, url_prefix='/system', template_folder='../../templates')
+
+# 获取系统的统计信息
+@blueprint.route('/system_total', endpoint='system_total')
+@panel_login_required
+def system_total():
+    data = sys.getMemInfo()
+    cpu = sys.getCpuInfo(interval=1)
+    data['cpuNum'] = cpu[1]
+    data['cpuRealUsed'] = cpu[0]
+    data['time'] = sys.getBootTime()
+    data['system'] = sys.getSystemVersion()
+    data['version'] = '0.0.1'
+    return data
+
+# 获取系统的网络流量信息
+@blueprint.route('/network', endpoint='network')
+@panel_login_required
+def network():
+    stat = {}
+    stat['cpu'] = sys.getCpuInfo()
+    stat['load'] = sys.getLoadAverage()
+    stat['mem'] = sys.getMemInfo()
+    stat['iostat'] = sys.stats().disk()
+    stat['network'] = sys.stats().network()
+    return stat
+
+# 获取系统的磁盘信息
+@blueprint.route('/disk_info', endpoint='disk_info')
+@panel_login_required
+def disk_info():
+    data = sys.getDiskInfo()
+    return data
+
+# 获取系统的负载统计信息
+@blueprint.route('/get_load_average', endpoint='get_load_average', methods=['GET'])
+@panel_login_required
+def get_load_average():
+    start = request.args.get('start', '')
+    end = request.args.get('end', '')
+    return sys.getLoadAverageByDB(start, end)
+
+# 获取系统的磁盘IO统计信息
+@blueprint.route('/get_disk_io', endpoint='get_disk_io', methods=['GET'])
+@panel_login_required
+def get_disk_io():
+    start = request.args.get('start', '')
+    end = request.args.get('end', '')
+    return sys.getDiskIoByDB(start, end)
+
+# 获取系统的CPU/IO统计信息
+@blueprint.route('/get_cpu_io', endpoint='get_cpu_io', methods=['GET'])
+@panel_login_required
+def get_cpu_io():
+    start = request.args.get('start', '')
+    end = request.args.get('end', '')
+    return sys.getCpuIoByDB(start, end)
+
+# 获取系统网络IO统计信息
+@blueprint.route('/get_network_io', endpoint='get_network_io', methods=['GET'])
+@panel_login_required
+def get_network_io():
+    start = request.args.get('start', '')
+    end = request.args.get('end', '')
+    return sys.getNetworkIoByDB(start, end)
+
+# 重启面板
+@blueprint.route('/restart', endpoint='restart', methods=['POST'])
+@panel_login_required
+def restart():
+    mw.restartMw()
+    return mw.returnData(True, '面板已重启!')
+
+# 重启面板
+@blueprint.route('/restart_server', endpoint='restart_server', methods=['POST'])
+@panel_login_required
+def restart_server():
+    mw.restartMw()
+    return mw.returnData(True, '面板已重启!')
+
+    
+
+# 设置
+@blueprint.route('/set_control', endpoint='set_control', methods=['POST'])
+@panel_login_required
+def set_control():
+    stype = request.form.get('type', '')
+    day = request.form.get('day', '')
+
+    if stype == '0':
+        option.setOption('monitor_status', 'close', type='monitor')
+        return mw.returnData(True, "设置成功!")
+    elif stype == '1':
+        _day = int(day)
+        if _day < 1:
+            return mw.returnData(False, "设置失败!")
+        option.setOption('monitor_day', day, type='monitor')
+        return mw.returnData(True, "设置成功!")
+    elif stype == '2':
+        option.setOption('monitor_only_netio', 'close', type='monitor')
+        return mw.returnData(True, "设置成功!")
+    elif stype == '3':
+        option.setOption('monitor_only_netio', 'open', type='monitor')
+        return mw.returnData(True, "设置成功!")
+    elif stype == 'del':
+        if not mw.isRestart():
+            return mw.returnData(False, '请等待所有安装任务完成再执行')
+        os.remove("data/system.db")
+
+        sql = db.Sql().dbfile('system')
+        csql = mw.readFile('data/sql/system.sql')
+        csql_list = csql.split(';')
+        for index in range(len(csql_list)):
+            sql.execute(csql_list[index], ())
+        return mw.returnData(True, "监控服务已关闭")
+    else:
+        monitor_status = option.getOption('monitor_status', default='open', type='monitor')
+        monitor_day = option.getOption('monitor_day', default='30', type='monitor')
+        monitor_only_netio = option.getOption('monitor_only_netio', default='open', type='monitor')
+        data = {}
+        data['day'] = monitor_day
+        if monitor_status == 'open':   
+            data['status'] = True
+        else:
+            data['status'] = False
+        if monitor_only_netio == 'open':
+            data['stat_all_status'] = True
+        else:
+            data['stat_all_status'] = False
+
+        return data
+
+    return mw.returnData(False, "异常!")
+
+
+
+
diff --git a/web/admin/system/upgrade.py b/web/admin/system/upgrade.py
new file mode 100644
index 000000000..82a00684d
--- /dev/null
+++ b/web/admin/system/upgrade.py
@@ -0,0 +1,34 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin.user_login_check import panel_login_required
+
+from admin import model
+
+import core.mw as mw
+import utils.system as sys
+
+from .system import blueprint
+
+# 升级检测
+@blueprint.route('/update_server', endpoint='update_server')
+@panel_login_required
+def update_server():
+    panel_type = request.args.get('type', 'check')
+    version = request.args.get('version', '')
+
+    return mw.returnData(False, '已经是最新,无需更新!')
+
+
+
diff --git a/web/core/mw.py b/web/core/mw.py
index 76693f045..94456abfb 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -487,8 +487,9 @@ def getPageObject(args, result='1,2,3,4,5,8'):
 
 
 def getHostPort():
-    if os.path.exists('data/port.pl'):
-        return readFile('data/port.pl').strip()
+    port_file = getPanelDir() + '/data/port.pl'
+    if os.path.exists(port_file):
+        return readFile(port_file).strip()
     return '7200'
 
 
@@ -627,6 +628,11 @@ def deDoubleCrypt(key, strings):
 
 # ------------------------------ openresty start -----------------------------
 
+def restartMw():
+    restart_file = getPanelDir()+'/data/restart.pl'
+    writeFile(restart_file, 'True')
+    return True
+
 def restartWeb():
     return opWeb("reload")
 
diff --git a/web/setting.py b/web/setting.py
index 1d6961488..d914c71a9 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -20,9 +20,8 @@ import os
 
 
 import core.mw as mw
-
-
 import utils.system as system 
+
 cpu_info = system.getCpuInfo()
 workers = cpu_info[1]
 
@@ -35,8 +34,9 @@ if not os.path.exists(log_dir):
 
 # default port
 mw_port = '7200'
-if os.path.exists(panel_dir+'/data/port.pl'):
-    mw_port = mw.readFile(panel_dir+'/data/port.pl')
+default_port_file = panel_dir+'/data/port.pl'
+if os.path.exists(default_port_file):
+    mw_port = mw.readFile(default_port_file)
     mw_port.strip()
 # else:
 #     import firewall_api
@@ -47,21 +47,21 @@ if os.path.exists(panel_dir+'/data/port.pl'):
 #     mw.writeFile('data/port.pl', mw_port)
 
 bind = []
-if os.path.exists('data/ipv6.pl'):
+default_ipv6_file = panel_dir+'/data/ipv6.pl'
+if os.path.exists(default_ipv6_file):
     bind.append('[0:0:0:0:0:0:0:0]:%s' % mw_port)
 else:
     bind.append('0.0.0.0:%s' % mw_port)
 
-print(mw_port)
 if workers > 2:
-    workers = 2
+    workers = 1
 
 threads = workers * 1
 backlog = 512
 reload = False
 daemon = True
 # worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
-timeout = 7200
+timeout = 600
 keepalive = 60
 preload_app = True
 capture_output = True
diff --git a/web/templates/default/layout.html b/web/templates/default/layout.html
index bf99ad9ec..b02f7540a 100755
--- a/web/templates/default/layout.html
+++ b/web/templates/default/layout.html
@@ -41,7 +41,7 @@
                     <ul class="menu">
                         <li id="memuA"><a class="menu_home" href="/">首页</a></li>
                         <li id="memuAsite"><a class="menu_web" href="/site/index">网站</a></li>
-                        <li id="memuAcontrol"><a class="menu_control" href="/monitor/index">监控</a></li>
+                        <li id="memuAmonitor"><a class="menu_control" href="/monitor/index">监控</a></li>
                         <li id="memuAfirewall"><a class="menu_firewall" href="/firewall/index">安全</a></li>
                         <li id="memuAfiles"><a class="menu_folder" href="/files/index">文件</a></li>
                         <li id="memuAlogs"><a class="menu_logs" href="/logs/index">日志</a></li>                        
@@ -53,7 +53,7 @@
                         </li>
                         {% endfor %}
                         <li id="memuAsoft"><a class="menu_soft" href="/soft/index">软件管理</a><span class="softnum">1</span></li>
-                        <li id="memuAconfig"><a class="menu_set" href="/setting/index">面板设置</a></li>
+                        <li id="memuAsetting"><a class="menu_set" href="/setting/index">面板设置</a></li>
                         <li><a class="menu_exit" href="javascript:;" id="signout">退出</a></li>
                     </ul>
                     <div id="newbtpc"></div>
@@ -137,26 +137,18 @@ $('.panel_ad_list_mode').click(function(){
 });
 
 
-function getUrlPath(){
-    var thisUrl = window.location.pathname;
-    console.log(thisUrl);
-    var pathArr = thisUrl.split('/');
-    return pathArr[pathArr.length - 1];
-}
-var thisPath = getUrlPath();
-// console.log(thisPath);
+var thisPath = window.location.pathname.trim()+window.location.search;
 if (thisPath.indexOf('?')>-1){
     var tag = $.getUrlParam('tag');
     if(tag != undefined){
         $('#memuAplugins_'+tag).css('background-color','#2c3138');
-    } else {
-        $('#memuA').css('background-color','#f2f2f2');
     }
 } else{
-    if(thisPath != undefined){
-        $('#memuA'+thisPath).css('background-color','#2c3138');
-    } else {
-        $('#memuA').css('background-color','#f2f2f2');
+    if(thisPath != '/'){
+        var pathArr = thisPath.substring(1).split('/');
+        $('#memuA'+pathArr[0]).css('background-color','#2c3138');
+    } else{
+        $('#memuA').css('background-color','#2c3138');
     }
 }
 </script>
diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 086f14d78..509b17ae6 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -11,6 +11,10 @@
 import os
 import re
 import threading
+import re
+import time
+
+from admin import model
 
 import core.mw as mw
 
@@ -43,6 +47,18 @@ class Firewall(object):
         elif mw.isAppleSystem():
             self.__isMac = True
 
+    def reload(self):
+        if self.__isUfw:
+            mw.execShell('/usr/sbin/ufw reload')
+            return
+        elif self.__isIptables:
+            mw.execShell('service iptables save')
+            mw.execShell('service iptables restart')
+        elif self.__isFirewalld:
+            mw.execShell('firewall-cmd --reload')
+        else:
+            pass
+
     def getFwStatus(self):
         if self.__isUfw:
             cmd = "/usr/sbin/ufw status| grep Status | awk -F ':' '{print $2}'"
@@ -134,4 +150,94 @@ class Firewall(object):
 
         mw.writeFile(filename, conf)
         mw.execShell('sysctl -p')
-        return mw.returnData(True, '设置成功!')
\ No newline at end of file
+        return mw.returnData(True, '设置成功!')
+
+    def setFw(self, status):
+        if self.__isIptables:
+            self.setFwIptables(status)
+            return mw.returnData(True, '设置成功!')
+
+        if status == '1':
+            if self.__isUfw:
+                mw.execShell('/usr/sbin/ufw disable')
+            elif self.__isFirewalld:
+                mw.execShell('systemctl stop firewalld.service')
+                mw.execShell('systemctl disable firewalld.service')
+            else:
+                pass
+        else:
+            if self.__isUfw:
+                mw.execShell("echo 'y'| ufw enable")
+            elif self.__isFirewalld:
+                mw.execShell('systemctl start firewalld.service')
+                mw.execShell('systemctl enable firewalld.service')
+            else:
+                pass
+        return mw.returnData(True, '设置成功!')
+
+    def addAcceptPortCmd(self, port,
+        protocol:str  | None ='tcp'
+    ):
+        if self.__isUfw:
+            if protocol == 'tcp':
+                mw.execShell('ufw allow ' + port + '/tcp')
+            if protocol == 'udp':
+                mw.execShell('ufw allow ' + port + '/udp')
+            if protocol == 'tcp/udp':
+                mw.execShell('ufw allow ' + port + '/tcp')
+                mw.execShell('ufw allow ' + port + '/udp')
+        elif self.__isFirewalld:
+            port = port.replace(':', '-')
+            if protocol == 'tcp':
+                cmd = 'firewall-cmd --permanent --zone=public --add-port=' + port + '/tcp'
+                mw.execShell(cmd)
+            if protocol == 'udp':
+                cmd = 'firewall-cmd --permanent --zone=public --add-port=' + port + '/udp'
+                mw.execShell(cmd)
+            if protocol == 'tcp/udp':
+                cmd = 'firewall-cmd --permanent --zone=public --add-port=' + port + '/tcp'
+                mw.execShell(cmd)
+                cmd = 'firewall-cmd --permanent --zone=public --add-port=' + port + '/udp'
+                mw.execShell(cmd)
+        elif self.__isIptables:
+            if protocol == 'tcp':
+                cmd = 'iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT'
+                mw.execShell(cmd)
+            if protocol == 'udp':
+                cmd = 'iptables -I INPUT -p udp -m state --state NEW -m udp --dport ' + port + ' -j ACCEPT'
+                mw.execShell(cmd)
+            if protocol == 'tcp/udp':
+                cmd = 'iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT'
+                mw.execShell(cmd)
+                cmd = 'iptables -I INPUT -p udp -m state --state NEW -m udp --dport ' + port + ' -j ACCEPT'
+                mw.execShell(cmd)
+        else:
+            pass
+        return True
+
+    # 添加放行端口
+    def addAcceptPort(self, port, ps, stype,
+        protocol: str  | None ='tcp'
+    ):
+        if not self.getFwStatus():
+            self.setFw(0)
+
+
+        rep = r"^\d{1,5}(:\d{1,5})?$"
+        if not re.search(rep, port):
+            return mw.returnData(False, '端口范围不正确!')
+
+        if model.getFirewallCountByPort(port) > 0:
+            return mw.returnData(False, '您要放行的端口已存在，无需重复放行!')
+
+        model.addFirewall(port,ps=ps,protocol=protocol)
+        self.addAcceptPortCmd(port, protocol=protocol)
+        self.reload()
+        
+        msg = mw.getInfo('放行端口[{1}][{2}]成功', (port, protocol,))
+        mw.writeLog("防火墙管理", msg)
+
+        return mw.returnData(True, '添加放行(' + port + ')端口成功!')
+
+
+
diff --git a/web/utils/system/__init__.py b/web/utils/system/__init__.py
index de3430715..7f612c99c 100644
--- a/web/utils/system/__init__.py
+++ b/web/utils/system/__init__.py
@@ -8,286 +8,7 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
-import os
-import sys
-import re
-import time
-import math
-import psutil
-
-
-import core.mw as mw
-
-def getDiskInfo():
-    # 取磁盘分区信息
-    temp = mw.execShell("df -h -P|grep '/'|grep -v tmpfs | grep -v devfs")[0]
-    tempInodes = mw.execShell("df -i -P|grep '/'|grep -v tmpfs | grep -v devfs")[0]
-    temp1 = temp.split('\n')
-    tempInodes1 = tempInodes.split('\n')
-    diskInfo = []
-    n = 0
-    cuts = ['/mnt/cdrom', '/boot', '/boot/efi', '/dev',
-            '/dev/shm', '/zroot', '/run/lock', '/run', '/run/shm', '/run/user']
-    for tmp in temp1:
-        n += 1
-        inodes = tempInodes1[n - 1].split()
-        disk = tmp.split()
-        if len(disk) < 5:
-            continue
-        if disk[1].find('M') != -1:
-            continue
-        if disk[1].find('K') != -1:
-            continue
-        if len(disk[5].split('/')) > 4:
-            continue
-        if disk[5] in cuts:
-            continue
-        arr = {}
-        arr['path'] = disk[5]
-        tmp1 = [disk[1], disk[2], disk[3], disk[4]]
-        arr['size'] = tmp1
-        arr['inodes'] = [inodes[1], inodes[2], inodes[3], inodes[4]]
-        diskInfo.append(arr)
-    return diskInfo
-
-class stats:
-    cache = {}
-
-    # 磁盘统计
-    def disk(self):
-        iokey = 'disk_stat'
-        diskInfo = {}
-        diskInfo['ALL'] = {}
-        diskInfo['ALL']['read_count'] = 0
-        diskInfo['ALL']['write_count'] = 0
-        diskInfo['ALL']['read_bytes'] = 0
-        diskInfo['ALL']['write_bytes'] = 0
-        diskInfo['ALL']['read_time'] = 0
-        diskInfo['ALL']['write_time'] = 0
-        diskInfo['ALL']['read_merged_count'] = 0
-        diskInfo['ALL']['write_merged_count'] = 0
-
-        try:
-            diskio = None
-            if iokey in self.cache:
-                diskio = self.cache[iokey]
-            
-            mtime = int(time.time())
-            if not diskio:
-                diskio = {}
-                diskio['info'] = None
-                diskio['time'] = mtime
-
-            diskio_cache = diskio['info']
-            stime = mtime - diskio['time']
-            if not stime: stime = 1
-
-            diskio_group = psutil.disk_io_counters(perdisk=True)
-            if not diskio_cache:
-                diskio_cache = diskio_group
-            
-            for disk_name in diskio_group.keys():
-                diskInfo[disk_name] = {}
-                # print('disk_name',disk_name)
-                # print(diskio_group[disk_name].write_time , diskio_cache[disk_name].write_time)
-                # print(diskio_group[disk_name].write_count , diskio_cache[disk_name].write_count)
-
-                diskInfo[disk_name]['read_count']   = int((diskio_group[disk_name].read_count - diskio_cache[disk_name].read_count) / stime)
-                diskInfo[disk_name]['write_count']  = int((diskio_group[disk_name].write_count - diskio_cache[disk_name].write_count) / stime)
-                diskInfo[disk_name]['read_bytes']   = int((diskio_group[disk_name].read_bytes - diskio_cache[disk_name].read_bytes) / stime)
-                diskInfo[disk_name]['write_bytes']  = int((diskio_group[disk_name].write_bytes - diskio_cache[disk_name].write_bytes) / stime)
-                diskInfo[disk_name]['read_time']    = int((diskio_group[disk_name].read_time - diskio_cache[disk_name].read_time) / stime)
-                diskInfo[disk_name]['write_time']   = int((diskio_group[disk_name].write_time - diskio_cache[disk_name].write_time) / stime)
-
-                if 'read_merged_count' in diskio_group[disk_name] and 'read_merged_count' in diskio_cache[disk_name]:
-                    diskInfo[disk_name]['read_merged_count'] = int((diskio_group[disk_name].read_merged_count - diskio_cache[disk_name].read_merged_count) / stime)
-                if 'write_merged_count' in diskio_group[disk_name] and 'write_merged_count' in diskio_cache[disk_name]:
-                    diskInfo[disk_name]['write_merged_count'] = int((diskio_group[disk_name].write_merged_count - diskio_cache[disk_name].write_merged_count) / stime)
-                
-                diskInfo['ALL']['read_count'] += diskInfo[disk_name]['read_count']
-                diskInfo['ALL']['write_count'] += diskInfo[disk_name]['write_count']
-                diskInfo['ALL']['read_bytes'] += diskInfo[disk_name]['read_bytes']
-                diskInfo['ALL']['write_bytes'] += diskInfo[disk_name]['write_bytes']
-                if diskInfo['ALL']['read_time'] < diskInfo[disk_name]['read_time']:
-                    diskInfo['ALL']['read_time'] = diskInfo[disk_name]['read_time']
-                if diskInfo['ALL']['write_time'] < diskInfo[disk_name]['write_time']:
-                    diskInfo['ALL']['write_time'] = diskInfo[disk_name]['write_time']
-
-                if 'read_merged_count' in diskInfo[disk_name] and 'read_merged_count' in diskInfo[disk_name]:
-                    diskInfo['ALL']['read_merged_count'] += diskInfo[disk_name]['read_merged_count']
-                if 'write_merged_count' in diskInfo[disk_name] and 'write_merged_count' in diskInfo[disk_name]:
-                    diskInfo['ALL']['write_merged_count'] += diskInfo[disk_name]['write_merged_count']
-
-            self.cache[iokey] = {'info':diskio_group,'time':mtime}
-        except Exception as e:
-            pass
-
-        return diskInfo
-
-    # 网络统计
-    def network(self):
-        netInfo = {}
-
-        netInfo['ALL'] = {}
-        netInfo['ALL']['up'] = 0
-        netInfo['ALL']['down'] = 0
-        netInfo['ALL']['upTotal'] = 0
-        netInfo['ALL']['downTotal'] = 0
-        netInfo['ALL']['upPackets'] = 0
-        netInfo['ALL']['downPackets'] = 0
-
-        mtime = time.time()
-        iokey = 'net_stat'
-        netio = None
-        if iokey in self.cache:
-            netio = self.cache[iokey]
-
-        if not netio:
-            netio = {}
-            netio['info'] = None
-            netio['all_io'] = None
-            netio['time'] = mtime
-
-        stime = mtime - netio['time']
-        if not stime: stime = 1
-
-        # print("new:",stime)
-        netio_group = psutil.net_io_counters(pernic=True).keys()
-
-        netio_cache = netio['info']
-        allio_cache = netio['all_io']
-        if not netio_cache:
-            netio_cache = {}
-
-        netio_group_t = {}
-        for name in netio_group:
-            netInfo[name] = {}
-
-            io_data = psutil.net_io_counters(pernic=True).get(name)
-            if not name in netio_cache:
-                netio_cache[name] = io_data
-
-            netio_group_t[name] = io_data
-
-            netInfo[name]['up'] = round(float((io_data[0] - netio_cache[name][0]) / stime), 2)
-            netInfo[name]['down'] = round(float((io_data[1] - netio_cache[name][1])/ stime), 2)
-
-            netInfo[name]['upTotal'] = io_data[0]
-            netInfo[name]['downTotal'] = io_data[1]
-            netInfo[name]['upPackets'] = io_data[2]
-            netInfo[name]['downPackets'] = io_data[3]
-
-        all_io = psutil.net_io_counters()[:4]
-        if not allio_cache:
-            allio_cache = all_io
-        
-        netInfo['ALL']['up'] = round(float((all_io[0] - allio_cache[0]) /stime), 2)
-        netInfo['ALL']['down'] = round(float((all_io[1] - allio_cache[1]) /stime), 2)
-        netInfo['ALL']['upTotal'] = all_io[0]
-        netInfo['ALL']['downTotal'] = all_io[1]
-        netInfo['ALL']['upPackets'] = all_io[2]
-        netInfo['ALL']['downPackets'] = all_io[3]
-
-        self.cache[iokey] = {'info':netio_group_t,'all_io':all_io,'time':mtime}
-        return netInfo
-
-
-
-def getLoadAverage():
-    c = os.getloadavg()
-    data = {}
-    data['one'] = round(float(c[0]), 2)
-    data['five'] = round(float(c[1]), 2)
-    data['fifteen'] = round(float(c[2]), 2)
-    data['max'] = psutil.cpu_count() * 2
-    data['limit'] = data['max']
-    data['safe'] = data['max'] * 0.75
-    return data
-
-def getSystemVersion():
-    # 取操作系统版本
-    current_os = mw.getOs()
-    # sys_temper = self.getSystemDeviceTemperature()
-    # print(sys_temper)
-    # mac
-    if current_os == 'darwin':
-        data = mw.execShell('sw_vers')[0]
-        data_list = data.strip().split("\n")
-        mac_version = ''
-        for x in data_list:
-            xlist = x.split("\t")
-            mac_version += xlist[len(xlist)-1] + ' '
-
-        arch_ver = mw.execShell("arch")
-        return mac_version + " (" + arch_ver[0].strip() + ")"
-
-    # freebsd
-    if current_os.startswith('freebsd'):
-        version = mw.execShell(
-            "cat /etc/*-release | grep PRETTY_NAME | awk -F = '{print $2}' | awk -F '\"' '{print $2}'")
-        arch_ver = mw.execShell(
-            "sysctl -a | egrep -i 'hw.machine_arch' | awk -F ':' '{print $2}'")
-        return version[0].strip() + " (" + arch_ver[0].strip() + ")"
-
-    redhat_series = '/etc/redhat-release'
-    if os.path.exists(redhat_series):
-        version = mw.readFile('/etc/redhat-release')
-        version = version.replace('release ', '').strip()
-
-        arch_ver = mw.execShell("arch")
-        return version + " (" + arch_ver[0].strip() + ")"
-
-    os_series = '/etc/os-release'
-    if os.path.exists(os_series):
-        version = mw.execShell(
-            "cat /etc/*-release | grep PRETTY_NAME | awk -F = '{print $2}' | awk -F '\"' '{print $2}'")
-
-        arch_ver = mw.execShell("arch")
-        return version[0].strip() + " (" + arch_ver[0].strip() + ")"
-
-def getBootTime():
-    # 取系统启动时间
-    uptime = mw.readFile('/proc/uptime')
-    if uptime == False:
-        start_time = psutil.boot_time()
-        run_time = time.time() - start_time
-    else:
-        run_time = uptime.split()[0]
-    tStr = float(run_time)
-    min = tStr / 60
-    hours = min / 60
-    days = math.floor(hours / 24)
-    hours = math.floor(hours - (days * 24))
-    min = math.floor(min - (days * 60 * 24) - (hours * 60))
-    return mw.getInfo('已不间断运行: {1}天{2}小时{3}分钟', (str(int(days)), str(int(hours)), str(int(min))))
-
-def getCpuInfo(interval=1):
-    # 取CPU信息
-    cpuCount = psutil.cpu_count()
-    cpuLogicalNum = psutil.cpu_count(logical=False)
-    used = psutil.cpu_percent(interval=interval)
-    cpuLogicalNum = 0
-    if os.path.exists('/proc/cpuinfo'):
-        c_tmp = mw.readFile('/proc/cpuinfo')
-        d_tmp = re.findall("physical id.+", c_tmp)
-        cpuLogicalNum = len(set(d_tmp))
-
-    used_all = psutil.cpu_percent(percpu=True)
-    cpu_name = mw.getCpuType() + " * {}".format(cpuLogicalNum)
-    return used, cpuCount, used_all, cpu_name, cpuCount, cpuLogicalNum
-
-def getMemInfo():
-    # 取内存信息
-    mem = psutil.virtual_memory()
-    if sys.platform == 'darwin':
-        memInfo = {'memTotal': mem.total}
-        memInfo['memRealUsed'] = memInfo['memTotal'] * (mem.percent / 100)
-    else:
-        memInfo = {
-            'memTotal': mem.total,
-            'memFree': mem.free,
-            'memBuffers': mem.buffers,
-            'memCached': mem.cached
-        }
-        memInfo['memRealUsed'] = memInfo['memTotal'] - memInfo['memFree'] - memInfo['memBuffers'] - memInfo['memCached']
-    return memInfo
\ No newline at end of file
+from .main import *
+from .query import *
+from .stats import *
+from .monitor import *
\ No newline at end of file
diff --git a/web/utils/system/main.py b/web/utils/system/main.py
new file mode 100644
index 000000000..4e7b8a7b4
--- /dev/null
+++ b/web/utils/system/main.py
@@ -0,0 +1,153 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+import sys
+import re
+import time
+import math
+import psutil
+
+
+import core.mw as mw
+
+def getDiskInfo():
+    # 取磁盘分区信息
+    temp = mw.execShell("df -h -P|grep '/'|grep -v tmpfs | grep -v devfs")[0]
+    tempInodes = mw.execShell("df -i -P|grep '/'|grep -v tmpfs | grep -v devfs")[0]
+    temp1 = temp.split('\n')
+    tempInodes1 = tempInodes.split('\n')
+    diskInfo = []
+    n = 0
+    cuts = ['/mnt/cdrom', '/boot', '/boot/efi', '/dev',
+            '/dev/shm', '/zroot', '/run/lock', '/run', '/run/shm', '/run/user']
+    for tmp in temp1:
+        n += 1
+        inodes = tempInodes1[n - 1].split()
+        disk = tmp.split()
+        if len(disk) < 5:
+            continue
+        if disk[1].find('M') != -1:
+            continue
+        if disk[1].find('K') != -1:
+            continue
+        if len(disk[5].split('/')) > 4:
+            continue
+        if disk[5] in cuts:
+            continue
+        arr = {}
+        arr['path'] = disk[5]
+        tmp1 = [disk[1], disk[2], disk[3], disk[4]]
+        arr['size'] = tmp1
+        arr['inodes'] = [inodes[1], inodes[2], inodes[3], inodes[4]]
+        diskInfo.append(arr)
+    return diskInfo
+
+
+def getLoadAverage():
+    c = os.getloadavg()
+    data = {}
+    data['one'] = round(float(c[0]), 2)
+    data['five'] = round(float(c[1]), 2)
+    data['fifteen'] = round(float(c[2]), 2)
+    data['max'] = psutil.cpu_count() * 2
+    data['limit'] = data['max']
+    data['safe'] = data['max'] * 0.75
+    return data
+
+def getSystemVersion():
+    # 取操作系统版本
+    current_os = mw.getOs()
+    # sys_temper = self.getSystemDeviceTemperature()
+    # print(sys_temper)
+    # mac
+    if current_os == 'darwin':
+        data = mw.execShell('sw_vers')[0]
+        data_list = data.strip().split("\n")
+        mac_version = ''
+        for x in data_list:
+            xlist = x.split("\t")
+            mac_version += xlist[len(xlist)-1] + ' '
+
+        arch_ver = mw.execShell("arch")
+        return mac_version + " (" + arch_ver[0].strip() + ")"
+
+    # freebsd
+    if current_os.startswith('freebsd'):
+        version = mw.execShell(
+            "cat /etc/*-release | grep PRETTY_NAME | awk -F = '{print $2}' | awk -F '\"' '{print $2}'")
+        arch_ver = mw.execShell(
+            "sysctl -a | egrep -i 'hw.machine_arch' | awk -F ':' '{print $2}'")
+        return version[0].strip() + " (" + arch_ver[0].strip() + ")"
+
+    redhat_series = '/etc/redhat-release'
+    if os.path.exists(redhat_series):
+        version = mw.readFile('/etc/redhat-release')
+        version = version.replace('release ', '').strip()
+
+        arch_ver = mw.execShell("arch")
+        return version + " (" + arch_ver[0].strip() + ")"
+
+    os_series = '/etc/os-release'
+    if os.path.exists(os_series):
+        version = mw.execShell(
+            "cat /etc/*-release | grep PRETTY_NAME | awk -F = '{print $2}' | awk -F '\"' '{print $2}'")
+
+        arch_ver = mw.execShell("arch")
+        return version[0].strip() + " (" + arch_ver[0].strip() + ")"
+
+def getBootTime():
+    # 取系统启动时间
+    uptime = mw.readFile('/proc/uptime')
+    if uptime == False:
+        start_time = psutil.boot_time()
+        run_time = time.time() - start_time
+    else:
+        run_time = uptime.split()[0]
+    tStr = float(run_time)
+    min = tStr / 60
+    hours = min / 60
+    days = math.floor(hours / 24)
+    hours = math.floor(hours - (days * 24))
+    min = math.floor(min - (days * 60 * 24) - (hours * 60))
+    return mw.getInfo('已不间断运行: {1}天{2}小时{3}分钟', (str(int(days)), str(int(hours)), str(int(min))))
+
+def getCpuInfo(interval=1):
+    # 取CPU信息
+    cpuCount = psutil.cpu_count()
+    cpuLogicalNum = psutil.cpu_count(logical=False)
+    used = psutil.cpu_percent(interval=interval)
+    cpuLogicalNum = 0
+    if os.path.exists('/proc/cpuinfo'):
+        c_tmp = mw.readFile('/proc/cpuinfo')
+        d_tmp = re.findall("physical id.+", c_tmp)
+        cpuLogicalNum = len(set(d_tmp))
+
+    used_all = psutil.cpu_percent(percpu=True)
+    cpu_name = mw.getCpuType() + " * {}".format(cpuLogicalNum)
+    return used, cpuCount, used_all, cpu_name, cpuCount, cpuLogicalNum
+
+def getMemInfo():
+    # 取内存信息
+    mem = psutil.virtual_memory()
+    if sys.platform == 'darwin':
+        memInfo = {'memTotal': mem.total}
+        memInfo['memRealUsed'] = memInfo['memTotal'] * (mem.percent / 100)
+    else:
+        memInfo = {
+            'memTotal': mem.total,
+            'memFree': mem.free,
+            'memBuffers': mem.buffers,
+            'memCached': mem.cached
+        }
+        memInfo['memRealUsed'] = memInfo['memTotal'] - memInfo['memFree'] - memInfo['memBuffers'] - memInfo['memCached']
+    return memInfo
+
+
diff --git a/web/utils/system/monitor.py b/web/utils/system/monitor.py
new file mode 100644
index 000000000..2f33b438a
--- /dev/null
+++ b/web/utils/system/monitor.py
@@ -0,0 +1,21 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+import sys
+import re
+import time
+import math
+import psutil
+
+import core.mw as mw
+
+
+
diff --git a/web/utils/system/query.py b/web/utils/system/query.py
new file mode 100644
index 000000000..9d2710070
--- /dev/null
+++ b/web/utils/system/query.py
@@ -0,0 +1,103 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+import sys
+import re
+import time
+import math
+import psutil
+
+
+import core.mw as mw
+
+# --------------------------------------------  数据查询相关 --------------------------------------------
+# 格式化addtime列
+def toAddtime(data, tomem=False):
+    import time
+    if tomem:
+        import psutil
+        mPre = (psutil.virtual_memory().total / 1024 / 1024) / 100
+    length = len(data)
+    he = 1
+    if length > 100:
+        he = 1
+    if length > 1000:
+        he = 3
+    if length > 10000:
+        he = 15
+    if he == 1:
+        for i in range(length):
+            data[i]['addtime'] = time.strftime(
+                '%m/%d %H:%M', time.localtime(float(data[i]['addtime'])))
+            if tomem and data[i]['mem'] > 100:
+                data[i]['mem'] = data[i]['mem'] / mPre
+
+        return data
+    else:
+        count = 0
+        tmp = []
+        for value in data:
+            if count < he:
+                count += 1
+                continue
+            value['addtime'] = time.strftime(
+                '%m/%d %H:%M', time.localtime(float(value['addtime'])))
+            if tomem and value['mem'] > 100:
+                value['mem'] = value['mem'] / mPre
+            tmp.append(value)
+            count = 0
+        return tmp
+
+# 格式化addtime列
+def toUseAddtime(data):
+    dlen = len(data)
+    for i in range(dlen):
+        data[i]['addtime'] = time.strftime('%m/%d %H:%M', time.localtime(float(data[i]['addtime'])))
+    return data
+
+def getLoadAverageByDB(start, end):
+    # 获取系统的负载统计信息
+    data = mw.M('load_average').dbPos(mw.getPanelDataDir(),'system')\
+        .where("addtime>=? AND addtime<=?", (start, end,))\
+        .field('pro,one,five,fifteen,addtime')\
+        .order('id asc').select()
+    data = toUseAddtime(data)
+    return data
+
+def getDiskIoByDB(start, end):
+    # 获取系统的磁盘IO统计信息
+    data = mw.M('diskio').dbPos(mw.getPanelDataDir(),'system')\
+        .where("addtime>=? AND addtime<=?", (start, end))\
+        .field('read_count,write_count,read_bytes,write_bytes,read_time,write_time,addtime')\
+        .order('id asc').select()
+    data = toUseAddtime(data)
+    return data
+
+def getCpuIoByDB(start, end):
+    # 获取系统的CPU/IO统计信息
+    data = mw.M('cpuio').dbPos(mw.getPanelDataDir(),'system')\
+        .where("addtime>=? AND addtime<=?",(start, end))\
+        .field('pro,mem,addtime')\
+        .order('id asc').select()
+    data = toUseAddtime(data)
+    return data
+
+def getNetworkIoByDB(start, end):
+    # 获取系统网络IO统计信息
+    # id,
+    data = mw.M('network').dbPos(mw.getPanelDataDir(),'system')\
+        .where("addtime>=? AND addtime<=?", (start, end))\
+        .field('up,down,total_up,total_down,down_packets,up_packets,addtime')\
+        .order('id asc').select()
+    data = toUseAddtime(data)
+    return data
+
+# --------------------------------------------  数据查询相关 --------------------------------------------
diff --git a/web/utils/system/stats.py b/web/utils/system/stats.py
new file mode 100644
index 000000000..123e5e80b
--- /dev/null
+++ b/web/utils/system/stats.py
@@ -0,0 +1,161 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+import sys
+import re
+import time
+import math
+import psutil
+
+import core.mw as mw
+
+class stats:
+    cache = {}
+
+    # 磁盘统计
+    def disk(self):
+        iokey = 'disk_stat'
+        diskInfo = {}
+        diskInfo['ALL'] = {}
+        diskInfo['ALL']['read_count'] = 0
+        diskInfo['ALL']['write_count'] = 0
+        diskInfo['ALL']['read_bytes'] = 0
+        diskInfo['ALL']['write_bytes'] = 0
+        diskInfo['ALL']['read_time'] = 0
+        diskInfo['ALL']['write_time'] = 0
+        diskInfo['ALL']['read_merged_count'] = 0
+        diskInfo['ALL']['write_merged_count'] = 0
+
+        try:
+            diskio = None
+            if iokey in self.cache:
+                diskio = self.cache[iokey]
+            
+            mtime = int(time.time())
+            if not diskio:
+                diskio = {}
+                diskio['info'] = None
+                diskio['time'] = mtime
+
+            diskio_cache = diskio['info']
+            stime = mtime - diskio['time']
+            if not stime: stime = 1
+
+            diskio_group = psutil.disk_io_counters(perdisk=True)
+            if not diskio_cache:
+                diskio_cache = diskio_group
+            
+            for disk_name in diskio_group.keys():
+                diskInfo[disk_name] = {}
+                # print('disk_name',disk_name)
+                # print(diskio_group[disk_name].write_time , diskio_cache[disk_name].write_time)
+                # print(diskio_group[disk_name].write_count , diskio_cache[disk_name].write_count)
+
+                diskInfo[disk_name]['read_count']   = int((diskio_group[disk_name].read_count - diskio_cache[disk_name].read_count) / stime)
+                diskInfo[disk_name]['write_count']  = int((diskio_group[disk_name].write_count - diskio_cache[disk_name].write_count) / stime)
+                diskInfo[disk_name]['read_bytes']   = int((diskio_group[disk_name].read_bytes - diskio_cache[disk_name].read_bytes) / stime)
+                diskInfo[disk_name]['write_bytes']  = int((diskio_group[disk_name].write_bytes - diskio_cache[disk_name].write_bytes) / stime)
+                diskInfo[disk_name]['read_time']    = int((diskio_group[disk_name].read_time - diskio_cache[disk_name].read_time) / stime)
+                diskInfo[disk_name]['write_time']   = int((diskio_group[disk_name].write_time - diskio_cache[disk_name].write_time) / stime)
+
+                if 'read_merged_count' in diskio_group[disk_name] and 'read_merged_count' in diskio_cache[disk_name]:
+                    diskInfo[disk_name]['read_merged_count'] = int((diskio_group[disk_name].read_merged_count - diskio_cache[disk_name].read_merged_count) / stime)
+                if 'write_merged_count' in diskio_group[disk_name] and 'write_merged_count' in diskio_cache[disk_name]:
+                    diskInfo[disk_name]['write_merged_count'] = int((diskio_group[disk_name].write_merged_count - diskio_cache[disk_name].write_merged_count) / stime)
+                
+                diskInfo['ALL']['read_count'] += diskInfo[disk_name]['read_count']
+                diskInfo['ALL']['write_count'] += diskInfo[disk_name]['write_count']
+                diskInfo['ALL']['read_bytes'] += diskInfo[disk_name]['read_bytes']
+                diskInfo['ALL']['write_bytes'] += diskInfo[disk_name]['write_bytes']
+                if diskInfo['ALL']['read_time'] < diskInfo[disk_name]['read_time']:
+                    diskInfo['ALL']['read_time'] = diskInfo[disk_name]['read_time']
+                if diskInfo['ALL']['write_time'] < diskInfo[disk_name]['write_time']:
+                    diskInfo['ALL']['write_time'] = diskInfo[disk_name]['write_time']
+
+                if 'read_merged_count' in diskInfo[disk_name] and 'read_merged_count' in diskInfo[disk_name]:
+                    diskInfo['ALL']['read_merged_count'] += diskInfo[disk_name]['read_merged_count']
+                if 'write_merged_count' in diskInfo[disk_name] and 'write_merged_count' in diskInfo[disk_name]:
+                    diskInfo['ALL']['write_merged_count'] += diskInfo[disk_name]['write_merged_count']
+
+            self.cache[iokey] = {'info':diskio_group,'time':mtime}
+        except Exception as e:
+            pass
+
+        return diskInfo
+
+    # 网络统计
+    def network(self):
+        netInfo = {}
+
+        netInfo['ALL'] = {}
+        netInfo['ALL']['up'] = 0
+        netInfo['ALL']['down'] = 0
+        netInfo['ALL']['upTotal'] = 0
+        netInfo['ALL']['downTotal'] = 0
+        netInfo['ALL']['upPackets'] = 0
+        netInfo['ALL']['downPackets'] = 0
+
+        mtime = time.time()
+        iokey = 'net_stat'
+        netio = None
+        if iokey in self.cache:
+            netio = self.cache[iokey]
+
+        if not netio:
+            netio = {}
+            netio['info'] = None
+            netio['all_io'] = None
+            netio['time'] = mtime
+
+        stime = mtime - netio['time']
+        if not stime: stime = 1
+
+        # print("new:",stime)
+        netio_group = psutil.net_io_counters(pernic=True).keys()
+
+        netio_cache = netio['info']
+        allio_cache = netio['all_io']
+        if not netio_cache:
+            netio_cache = {}
+
+        netio_group_t = {}
+        for name in netio_group:
+            netInfo[name] = {}
+
+            io_data = psutil.net_io_counters(pernic=True).get(name)
+            if not name in netio_cache:
+                netio_cache[name] = io_data
+
+            netio_group_t[name] = io_data
+
+            netInfo[name]['up'] = round(float((io_data[0] - netio_cache[name][0]) / stime), 2)
+            netInfo[name]['down'] = round(float((io_data[1] - netio_cache[name][1])/ stime), 2)
+
+            netInfo[name]['upTotal'] = io_data[0]
+            netInfo[name]['downTotal'] = io_data[1]
+            netInfo[name]['upPackets'] = io_data[2]
+            netInfo[name]['downPackets'] = io_data[3]
+
+        all_io = psutil.net_io_counters()[:4]
+        if not allio_cache:
+            allio_cache = all_io
+        
+        netInfo['ALL']['up'] = round(float((all_io[0] - allio_cache[0]) /stime), 2)
+        netInfo['ALL']['down'] = round(float((all_io[1] - allio_cache[1]) /stime), 2)
+        netInfo['ALL']['upTotal'] = all_io[0]
+        netInfo['ALL']['downTotal'] = all_io[1]
+        netInfo['ALL']['upPackets'] = all_io[2]
+        netInfo['ALL']['downPackets'] = all_io[3]
+
+        self.cache[iokey] = {'info':netio_group_t,'all_io':all_io,'time':mtime}
+        return netInfo
+
+

From 472f441c0e3e195efeed046778565c03a5f11c61 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 2 Nov 2024 02:47:47 +0800
Subject: [PATCH 044/965] update

---
 new_cli.sh                  | 6 +++---
 panel_task.py               | 6 +++---
 scripts/rememory.sh         | 2 +-
 web/app.py                  | 1 -
 web/utils/system/monitor.py | 6 ++++++
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/new_cli.sh b/new_cli.sh
index 8dcd7cd3f..33bfe5bd5 100755
--- a/new_cli.sh
+++ b/new_cli.sh
@@ -65,12 +65,12 @@ mw_start_debug(){
 
 mw_start_debug2(){
 	python3 panel_task.py >> $DIR/logs/panel_task.log 2>&1 &
-	gunicorn -b :7200 -w 1  app:app
+	cd ${DIR}/web && gunicorn -b :7200 -w 1  app:app
 }
 
 mw_start_debug3(){
-	gunicorn -c setting.py app:app
-	python3 panel_task.py
+	cd ${DIR}/web && gunicorn -c setting.py app:app
+	cd ${DIR} && python3 panel_task.py
 }
 
 
diff --git a/panel_task.py b/panel_task.py
index c5d18a68a..8382b29bb 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -584,9 +584,9 @@ def setDaemon(t):
 
 def run():
     # # 系统监控
-    # sysTask = threading.Thread(target=systemTask)
-    # sysTask = setDaemon(sysTask)
-    # sysTask.start()
+    sysTask = threading.Thread(target=systemTask)
+    sysTask = setDaemon(sysTask)
+    sysTask.start()
 
     # # PHP 502错误检查线程
     # php502 = threading.Thread(target=check502Task)
diff --git a/scripts/rememory.sh b/scripts/rememory.sh
index 933f7eff2..5311e7aa6 100755
--- a/scripts/rememory.sh
+++ b/scripts/rememory.sh
@@ -32,7 +32,7 @@ fi
 echo "OpenResty -- END"
 
 
-PHP_VER_LIST=(53 54 55 56 70 71 72 73 74 80 81)
+PHP_VER_LIST=(53 54 55 56 70 71 72 73 74 80 81 82 83 84)
 for PHP_VER in ${PHP_VER_LIST[@]}; do
 echo "PHP${PHP_VER} -- START"
 if [ -f /usr/lib/systemd/system/php${PHP_VER}.service ];then
diff --git a/web/app.py b/web/app.py
index b51d018a1..aa0fe2680 100644
--- a/web/app.py
+++ b/web/app.py
@@ -20,7 +20,6 @@ import os
 if sys.path[0] != os.path.dirname(os.path.realpath(__file__)):
     sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
 
-# print(sys.path)
 
 import config
 from admin import app, socketio
diff --git a/web/utils/system/monitor.py b/web/utils/system/monitor.py
index 2f33b438a..1abb5db39 100644
--- a/web/utils/system/monitor.py
+++ b/web/utils/system/monitor.py
@@ -18,4 +18,10 @@ import psutil
 import core.mw as mw
 
 
+class monitor:
+
+	def initDBFile():
+		pass
+
+
 

From 01b6ede03e920e3a3bcbbd12aa056f06af072290 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 2 Nov 2024 15:41:33 +0800
Subject: [PATCH 045/965] update

---
 plugins/openresty/info.json                  |   2 +-
 plugins/openresty/versions/1.27.1/install.sh | 180 +++++++++++++++++++
 2 files changed, 181 insertions(+), 1 deletion(-)
 create mode 100644 plugins/openresty/versions/1.27.1/install.sh

diff --git a/plugins/openresty/info.json b/plugins/openresty/info.json
index 8ddc42b42..139160771 100755
--- a/plugins/openresty/info.json
+++ b/plugins/openresty/info.json
@@ -12,6 +12,6 @@
 	"home":"http://openresty.org",
 	"date":"2017-11-24",
 	"pid": "1",
-	"versions": ["1.17.8","1.19.3","1.21.4","1.25.3"],
+	"versions": ["1.17.8","1.19.3","1.21.4","1.25.3","1.27.1"],
 	"updates": ["1.17.8.2","1.19.3.1","1.21.4.2","1.25.3.2"]
 }
\ No newline at end of file
diff --git a/plugins/openresty/versions/1.27.1/install.sh b/plugins/openresty/versions/1.27.1/install.sh
new file mode 100644
index 000000000..2183be696
--- /dev/null
+++ b/plugins/openresty/versions/1.27.1/install.sh
@@ -0,0 +1,180 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/openresty && bash install.sh install 1.21.4.2
+# cd /www/server/mdserver-web/plugins/openresty && bash install.sh install 1.21.4.2
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+sysName=`uname`
+action=$1
+type=$2
+
+VERSION=1.27.1.1
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+openrestyDir=${serverPath}/source/openresty
+
+Install_openresty()
+{
+	if [ -d $serverPath/openresty ];then
+		exit 0
+	fi
+	
+	# ----- cpu start ------
+	if [ -z "${cpuCore}" ]; then
+    	cpuCore="1"
+	fi
+
+	if [ -f /proc/cpuinfo ];then
+		cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+	fi
+
+	MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+	if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+	    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+	        cpuCore="${MEM_INFO}"
+	    fi
+	else
+	    cpuCore="1"
+	fi
+
+	if [ "$cpuCore" -gt "2" ];then
+		cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+	else
+		cpuCore="1"
+	fi
+	# ----- cpu end ------
+
+	mkdir -p ${openrestyDir}
+	echo '正在安装脚本文件...'
+
+	# wget -O openresty-1.21.4.1.tar.gz https://openresty.org/download/openresty-1.21.4.1.tar.gz
+	if [ ! -f ${openrestyDir}/openresty-${VERSION}.tar.gz ];then
+		wget --no-check-certificate -O ${openrestyDir}/openresty-${VERSION}.tar.gz https://openresty.org/download/openresty-${VERSION}.tar.gz -T 3
+	fi
+
+	DOWNLOAD_SIZE=`wc -c ${openrestyDir}/openresty-${VERSION}.tar.gz | awk '{print $1}'`
+	if [ "$DOWNLOAD_SIZE" == "0" ];then
+		echo 'download failed, download again'
+		rm -rf ${openrestyDir}/openresty-${VERSION}.tar.gz
+	fi
+
+	# Last Download Method
+	if [ ! -f ${openrestyDir}/openresty-${VERSION}.tar.gz ];then
+		wget --no-check-certificate -O ${openrestyDir}/openresty-${VERSION}.tar.gz http://dl.midoks.icu/soft/openresty/openresty-${VERSION}.tar.gz -T 3
+	fi
+
+	cd ${openrestyDir} && tar -zxvf openresty-${VERSION}.tar.gz
+
+	OPTIONS=''
+
+	opensslVersion="1.1.1p"
+	libresslVersion="3.9.1"
+	pcreVersion='8.38'
+	if [ "$sysName" == "Darwin" ];then
+
+		if [ ! -f ${openrestyDir}/pcre-${pcreVersion}.tar.gz ];then
+			wget --no-check-certificate -O ${openrestyDir}/pcre-${pcreVersion}.tar.gz https://netix.dl.sourceforge.net/project/pcre/pcre/${pcreVersion}/pcre-${pcreVersion}.tar.gz
+		fi
+
+		if [ ! -d ${openrestyDir}/pcre-${pcreVersion} ];then
+			cd ${openrestyDir} &&  tar -zxvf pcre-${pcreVersion}.tar.gz
+		fi
+		OPTIONS="${OPTIONS} --with-pcre=${openrestyDir}/pcre-${pcreVersion}"
+
+
+		if [ ! -f ${openrestyDir}/openssl-${opensslVersion}.tar.gz ];then
+	        wget --no-check-certificate -O ${openrestyDir}/openssl-${opensslVersion}.tar.gz https://www.openssl.org/source/openssl-${opensslVersion}.tar.gz
+	    fi
+
+	    if [ ! -d ${openrestyDir}/openssl-${opensslVersion} ];then
+			cd ${openrestyDir} &&  tar -zxvf openssl-${opensslVersion}.tar.gz
+		fi
+	    OPTIONS="${OPTIONS} --with-openssl=${openrestyDir}/openssl-${opensslVersion}"
+
+		# BREW_DIR=`which brew`
+		# BREW_DIR=${BREW_DIR/\/bin\/brew/}
+
+		# brew info openssl@1.1 | grep /opt/homebrew/Cellar/openssl@1.1 | cut -d \  -f 1 | awk 'END {print}'
+		# OPENSSL_LIB_DEPEND_DIR=`brew info openssl@1.1 | grep ${BREW_DIR}/Cellar/openssl@1.1 | cut -d \  -f 1 | awk 'END {print}'`
+		# OPTIONS="${OPTIONS} --with-openssl=${OPENSSL_LIB_DEPEND_DIR}"
+	else
+		if [ ! -f ${openrestyDir}/openssl-${opensslVersion}.tar.gz ];then
+	        wget --no-check-certificate -O ${openrestyDir}/openssl-${opensslVersion}.tar.gz https://www.openssl.org/source/openssl-${opensslVersion}.tar.gz
+	    fi
+
+	    if [ ! -d ${openrestyDir}/openssl-${opensslVersion} ];then
+			cd ${openrestyDir} &&  tar -zxvf openssl-${opensslVersion}.tar.gz
+		fi
+		OPTIONS="${OPTIONS} --with-openssl=${openrestyDir}/openssl-${opensslVersion}"
+
+	fi
+
+	if [[ "$VERSION" =~ "1.25.3" ]]; then
+		OPTIONS="${OPTIONS} --with-http_v3_module"
+
+		if [ ! -f ${openrestyDir}/libressl-${libresslVersion}.tar.gz ];then
+	        wget --no-check-certificate -O ${openrestyDir}/libressl-${libresslVersion}.tar.gz https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${libresslVersion}.tar.gz
+	    fi
+
+	    if [ ! -d ${openrestyDir}/libressl-${libresslVersion} ];then
+			cd ${openrestyDir} &&  tar -zxvf libressl-${libresslVersion}.tar.gz
+		fi
+	    
+	    OPTIONS="${OPTIONS} --with-cc-opt=-I${openrestyDir}/libressl-${libresslVersion}/libressl/build/include"
+	    OPTIONS="${OPTIONS} --with-cc-opt=-I${openrestyDir}/libressl-${libresslVersion}/libressl/build/lib"
+	fi
+
+
+	cd ${openrestyDir}/openresty-${VERSION} && ./configure \
+	--prefix=$serverPath/openresty \
+	$OPTIONS \
+	--with-stream \
+	--with-http_v2_module \
+	--with-http_ssl_module  \
+	--with-http_slice_module \
+	--with-http_stub_status_module \
+	--with-http_sub_module \
+	--with-http_realip_module
+	# --without-luajit-gc64
+	# --with-debug
+	# 用于调式
+
+	CMD_MAKE=`which gmake`
+	if [ "$?" == "0" ];then
+		gmake -j${cpuCore} && gmake install && gmake clean
+	else
+		make -j${cpuCore} && make install && make clean
+	fi
+
+
+    if [ -d ${openrestyDir}/pcre-${pcreVersion} ];then
+    	rm -rf ${openrestyDir}/pcre-${pcreVersion}
+    fi
+
+    if [ -d ${openrestyDir}/openssl-${opensslVersion} ];then
+    	rm -rf ${openrestyDir}/openssl-${opensslVersion}
+    fi
+
+    if [ -d ${openrestyDir}/libressl-${libresslVersion} ];then
+    	rm -rf ${openrestyDir}/libressl-${libresslVersion}
+    fi
+	echo '安装完成'
+}
+
+Uninstall_openresty()
+{
+	echo '卸载完成'
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_openresty
+else
+	Uninstall_openresty
+fi

From 07bca6cac8793b5e37427d2b2102875e4d808d82 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 2 Nov 2024 15:54:37 +0800
Subject: [PATCH 046/965] update

---
 plugins/openresty/info.json                |   2 +-
 plugins/openresty/versions/rmtp/install.sh | 180 +++++++++++++++++++++
 2 files changed, 181 insertions(+), 1 deletion(-)
 create mode 100644 plugins/openresty/versions/rmtp/install.sh

diff --git a/plugins/openresty/info.json b/plugins/openresty/info.json
index 139160771..dbb697869 100755
--- a/plugins/openresty/info.json
+++ b/plugins/openresty/info.json
@@ -12,6 +12,6 @@
 	"home":"http://openresty.org",
 	"date":"2017-11-24",
 	"pid": "1",
-	"versions": ["1.17.8","1.19.3","1.21.4","1.25.3","1.27.1"],
+	"versions": ["1.17.8","1.19.3","1.21.4","1.25.3","1.27.1","rmtp"],
 	"updates": ["1.17.8.2","1.19.3.1","1.21.4.2","1.25.3.2"]
 }
\ No newline at end of file
diff --git a/plugins/openresty/versions/rmtp/install.sh b/plugins/openresty/versions/rmtp/install.sh
new file mode 100644
index 000000000..f488be01b
--- /dev/null
+++ b/plugins/openresty/versions/rmtp/install.sh
@@ -0,0 +1,180 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/openresty && bash install.sh install 1.27.1.1
+# cd /www/server/mdserver-web/plugins/openresty && bash install.sh install 1.27.1.1
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+sysName=`uname`
+action=$1
+type=$2
+
+VERSION=1.27.1.1
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+openrestyDir=${serverPath}/source/openresty
+
+Install_openresty()
+{
+	if [ -d $serverPath/openresty ];then
+		exit 0
+	fi
+	
+	# ----- cpu start ------
+	if [ -z "${cpuCore}" ]; then
+    	cpuCore="1"
+	fi
+
+	if [ -f /proc/cpuinfo ];then
+		cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+	fi
+
+	MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+	if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+	    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+	        cpuCore="${MEM_INFO}"
+	    fi
+	else
+	    cpuCore="1"
+	fi
+
+	if [ "$cpuCore" -gt "2" ];then
+		cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+	else
+		cpuCore="1"
+	fi
+	# ----- cpu end ------
+
+	mkdir -p ${openrestyDir}
+	echo '正在安装脚本文件...'
+
+	# wget -O openresty-1.21.4.1.tar.gz https://openresty.org/download/openresty-1.21.4.1.tar.gz
+	if [ ! -f ${openrestyDir}/openresty-${VERSION}.tar.gz ];then
+		wget --no-check-certificate -O ${openrestyDir}/openresty-${VERSION}.tar.gz https://openresty.org/download/openresty-${VERSION}.tar.gz -T 3
+	fi
+
+	DOWNLOAD_SIZE=`wc -c ${openrestyDir}/openresty-${VERSION}.tar.gz | awk '{print $1}'`
+	if [ "$DOWNLOAD_SIZE" == "0" ];then
+		echo 'download failed, download again'
+		rm -rf ${openrestyDir}/openresty-${VERSION}.tar.gz
+	fi
+
+	# Last Download Method
+	if [ ! -f ${openrestyDir}/openresty-${VERSION}.tar.gz ];then
+		wget --no-check-certificate -O ${openrestyDir}/openresty-${VERSION}.tar.gz http://dl.midoks.icu/soft/openresty/openresty-${VERSION}.tar.gz -T 3
+	fi
+
+	cd ${openrestyDir} && tar -zxvf openresty-${VERSION}.tar.gz
+
+	OPTIONS=''
+
+	opensslVersion="1.1.1p"
+	libresslVersion="3.9.1"
+	pcreVersion='8.38'
+	if [ "$sysName" == "Darwin" ];then
+
+		if [ ! -f ${openrestyDir}/pcre-${pcreVersion}.tar.gz ];then
+			wget --no-check-certificate -O ${openrestyDir}/pcre-${pcreVersion}.tar.gz https://netix.dl.sourceforge.net/project/pcre/pcre/${pcreVersion}/pcre-${pcreVersion}.tar.gz
+		fi
+
+		if [ ! -d ${openrestyDir}/pcre-${pcreVersion} ];then
+			cd ${openrestyDir} &&  tar -zxvf pcre-${pcreVersion}.tar.gz
+		fi
+		OPTIONS="${OPTIONS} --with-pcre=${openrestyDir}/pcre-${pcreVersion}"
+
+
+		if [ ! -f ${openrestyDir}/openssl-${opensslVersion}.tar.gz ];then
+	        wget --no-check-certificate -O ${openrestyDir}/openssl-${opensslVersion}.tar.gz https://www.openssl.org/source/openssl-${opensslVersion}.tar.gz
+	    fi
+
+	    if [ ! -d ${openrestyDir}/openssl-${opensslVersion} ];then
+			cd ${openrestyDir} &&  tar -zxvf openssl-${opensslVersion}.tar.gz
+		fi
+	    OPTIONS="${OPTIONS} --with-openssl=${openrestyDir}/openssl-${opensslVersion}"
+
+		# BREW_DIR=`which brew`
+		# BREW_DIR=${BREW_DIR/\/bin\/brew/}
+
+		# brew info openssl@1.1 | grep /opt/homebrew/Cellar/openssl@1.1 | cut -d \  -f 1 | awk 'END {print}'
+		# OPENSSL_LIB_DEPEND_DIR=`brew info openssl@1.1 | grep ${BREW_DIR}/Cellar/openssl@1.1 | cut -d \  -f 1 | awk 'END {print}'`
+		# OPTIONS="${OPTIONS} --with-openssl=${OPENSSL_LIB_DEPEND_DIR}"
+	else
+		if [ ! -f ${openrestyDir}/openssl-${opensslVersion}.tar.gz ];then
+	        wget --no-check-certificate -O ${openrestyDir}/openssl-${opensslVersion}.tar.gz https://www.openssl.org/source/openssl-${opensslVersion}.tar.gz
+	    fi
+
+	    if [ ! -d ${openrestyDir}/openssl-${opensslVersion} ];then
+			cd ${openrestyDir} &&  tar -zxvf openssl-${opensslVersion}.tar.gz
+		fi
+		OPTIONS="${OPTIONS} --with-openssl=${openrestyDir}/openssl-${opensslVersion}"
+
+	fi
+
+	if [[ "$VERSION" =~ "1.25.3" ]]; then
+		OPTIONS="${OPTIONS} --with-http_v3_module"
+
+		if [ ! -f ${openrestyDir}/libressl-${libresslVersion}.tar.gz ];then
+	        wget --no-check-certificate -O ${openrestyDir}/libressl-${libresslVersion}.tar.gz https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${libresslVersion}.tar.gz
+	    fi
+
+	    if [ ! -d ${openrestyDir}/libressl-${libresslVersion} ];then
+			cd ${openrestyDir} &&  tar -zxvf libressl-${libresslVersion}.tar.gz
+		fi
+	    
+	    OPTIONS="${OPTIONS} --with-cc-opt=-I${openrestyDir}/libressl-${libresslVersion}/libressl/build/include"
+	    OPTIONS="${OPTIONS} --with-cc-opt=-I${openrestyDir}/libressl-${libresslVersion}/libressl/build/lib"
+	fi
+
+
+	cd ${openrestyDir}/openresty-${VERSION} && ./configure \
+	--prefix=$serverPath/openresty \
+	$OPTIONS \
+	--with-stream \
+	--with-http_v2_module \
+	--with-http_ssl_module  \
+	--with-http_slice_module \
+	--with-http_stub_status_module \
+	--with-http_sub_module \
+	--with-http_realip_module
+	# --without-luajit-gc64
+	# --with-debug
+	# 用于调式
+
+	CMD_MAKE=`which gmake`
+	if [ "$?" == "0" ];then
+		gmake -j${cpuCore} && gmake install && gmake clean
+	else
+		make -j${cpuCore} && make install && make clean
+	fi
+
+
+    if [ -d ${openrestyDir}/pcre-${pcreVersion} ];then
+    	rm -rf ${openrestyDir}/pcre-${pcreVersion}
+    fi
+
+    if [ -d ${openrestyDir}/openssl-${opensslVersion} ];then
+    	rm -rf ${openrestyDir}/openssl-${opensslVersion}
+    fi
+
+    if [ -d ${openrestyDir}/libressl-${libresslVersion} ];then
+    	rm -rf ${openrestyDir}/libressl-${libresslVersion}
+    fi
+	echo '安装完成'
+}
+
+Uninstall_openresty()
+{
+	echo '卸载完成'
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_openresty
+else
+	Uninstall_openresty
+fi

From b66ab079ed58873fd018462c665ff5294ea427d2 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 2 Nov 2024 15:58:50 +0800
Subject: [PATCH 047/965] Update install.sh

---
 plugins/openresty/versions/rmtp/install.sh | 64 +++++++++++++---------
 1 file changed, 37 insertions(+), 27 deletions(-)

diff --git a/plugins/openresty/versions/rmtp/install.sh b/plugins/openresty/versions/rmtp/install.sh
index f488be01b..6c950453d 100644
--- a/plugins/openresty/versions/rmtp/install.sh
+++ b/plugins/openresty/versions/rmtp/install.sh
@@ -27,7 +27,7 @@ Install_openresty()
 	
 	# ----- cpu start ------
 	if [ -z "${cpuCore}" ]; then
-    	cpuCore="1"
+		cpuCore="1"
 	fi
 
 	if [ -f /proc/cpuinfo ];then
@@ -36,11 +36,11 @@ Install_openresty()
 
 	MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
 	if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
-	    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
-	        cpuCore="${MEM_INFO}"
-	    fi
+		if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+			cpuCore="${MEM_INFO}"
+		fi
 	else
-	    cpuCore="1"
+		cpuCore="1"
 	fi
 
 	if [ "$cpuCore" -gt "2" ];then
@@ -89,13 +89,13 @@ Install_openresty()
 
 
 		if [ ! -f ${openrestyDir}/openssl-${opensslVersion}.tar.gz ];then
-	        wget --no-check-certificate -O ${openrestyDir}/openssl-${opensslVersion}.tar.gz https://www.openssl.org/source/openssl-${opensslVersion}.tar.gz
-	    fi
+			wget --no-check-certificate -O ${openrestyDir}/openssl-${opensslVersion}.tar.gz https://www.openssl.org/source/openssl-${opensslVersion}.tar.gz
+		fi
 
-	    if [ ! -d ${openrestyDir}/openssl-${opensslVersion} ];then
+		if [ ! -d ${openrestyDir}/openssl-${opensslVersion} ];then
 			cd ${openrestyDir} &&  tar -zxvf openssl-${opensslVersion}.tar.gz
 		fi
-	    OPTIONS="${OPTIONS} --with-openssl=${openrestyDir}/openssl-${opensslVersion}"
+		OPTIONS="${OPTIONS} --with-openssl=${openrestyDir}/openssl-${opensslVersion}"
 
 		# BREW_DIR=`which brew`
 		# BREW_DIR=${BREW_DIR/\/bin\/brew/}
@@ -105,10 +105,10 @@ Install_openresty()
 		# OPTIONS="${OPTIONS} --with-openssl=${OPENSSL_LIB_DEPEND_DIR}"
 	else
 		if [ ! -f ${openrestyDir}/openssl-${opensslVersion}.tar.gz ];then
-	        wget --no-check-certificate -O ${openrestyDir}/openssl-${opensslVersion}.tar.gz https://www.openssl.org/source/openssl-${opensslVersion}.tar.gz
-	    fi
+			wget --no-check-certificate -O ${openrestyDir}/openssl-${opensslVersion}.tar.gz https://www.openssl.org/source/openssl-${opensslVersion}.tar.gz
+		fi
 
-	    if [ ! -d ${openrestyDir}/openssl-${opensslVersion} ];then
+		if [ ! -d ${openrestyDir}/openssl-${opensslVersion} ];then
 			cd ${openrestyDir} &&  tar -zxvf openssl-${opensslVersion}.tar.gz
 		fi
 		OPTIONS="${OPTIONS} --with-openssl=${openrestyDir}/openssl-${opensslVersion}"
@@ -119,17 +119,27 @@ Install_openresty()
 		OPTIONS="${OPTIONS} --with-http_v3_module"
 
 		if [ ! -f ${openrestyDir}/libressl-${libresslVersion}.tar.gz ];then
-	        wget --no-check-certificate -O ${openrestyDir}/libressl-${libresslVersion}.tar.gz https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${libresslVersion}.tar.gz
-	    fi
+			wget --no-check-certificate -O ${openrestyDir}/libressl-${libresslVersion}.tar.gz https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${libresslVersion}.tar.gz
+		fi
 
-	    if [ ! -d ${openrestyDir}/libressl-${libresslVersion} ];then
+		if [ ! -d ${openrestyDir}/libressl-${libresslVersion} ];then
 			cd ${openrestyDir} &&  tar -zxvf libressl-${libresslVersion}.tar.gz
 		fi
-	    
-	    OPTIONS="${OPTIONS} --with-cc-opt=-I${openrestyDir}/libressl-${libresslVersion}/libressl/build/include"
-	    OPTIONS="${OPTIONS} --with-cc-opt=-I${openrestyDir}/libressl-${libresslVersion}/libressl/build/lib"
+		
+		OPTIONS="${OPTIONS} --with-cc-opt=-I${openrestyDir}/libressl-${libresslVersion}/libressl/build/include"
+		OPTIONS="${OPTIONS} --with-cc-opt=-I${openrestyDir}/libressl-${libresslVersion}/libressl/build/lib"
 	fi
 
+	# rtmp推流功能
+	if [ ! -f ${openrestyDir}/nginx-rtmp-module.tar.gz ];then
+		wget --no-check-certificate -O ${openrestyDir}/nginx-rtmp-module.tar.gz https://github.com/arut/nginx-rtmp-module/archive/refs/tags/v1.2.2.tar.gz
+	fi
+
+	if [ ! -d ${openrestyDir}/nginx-rtmp-module.tar.gz ];then
+		cd ${openrestyDir} &&  tar -zxvf nginx-rtmp-module.tar.gz
+	fi
+	OPTIONS="${OPTIONS} --add-module=${openrestyDir}/nginx-rtmp-module"
+
 
 	cd ${openrestyDir}/openresty-${VERSION} && ./configure \
 	--prefix=$serverPath/openresty \
@@ -153,17 +163,17 @@ Install_openresty()
 	fi
 
 
-    if [ -d ${openrestyDir}/pcre-${pcreVersion} ];then
-    	rm -rf ${openrestyDir}/pcre-${pcreVersion}
-    fi
+	if [ -d ${openrestyDir}/pcre-${pcreVersion} ];then
+		rm -rf ${openrestyDir}/pcre-${pcreVersion}
+	fi
 
-    if [ -d ${openrestyDir}/openssl-${opensslVersion} ];then
-    	rm -rf ${openrestyDir}/openssl-${opensslVersion}
-    fi
+	if [ -d ${openrestyDir}/openssl-${opensslVersion} ];then
+		rm -rf ${openrestyDir}/openssl-${opensslVersion}
+	fi
 
-    if [ -d ${openrestyDir}/libressl-${libresslVersion} ];then
-    	rm -rf ${openrestyDir}/libressl-${libresslVersion}
-    fi
+	if [ -d ${openrestyDir}/libressl-${libresslVersion} ];then
+		rm -rf ${openrestyDir}/libressl-${libresslVersion}
+	fi
 	echo '安装完成'
 }
 

From c6418069fbb49f669cd7b5c7efe9c99d78f0a291 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 2 Nov 2024 16:01:48 +0800
Subject: [PATCH 048/965] Update install.sh

---
 plugins/openresty/versions/rmtp/install.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/openresty/versions/rmtp/install.sh b/plugins/openresty/versions/rmtp/install.sh
index 6c950453d..9050814de 100644
--- a/plugins/openresty/versions/rmtp/install.sh
+++ b/plugins/openresty/versions/rmtp/install.sh
@@ -131,14 +131,15 @@ Install_openresty()
 	fi
 
 	# rtmp推流功能
+	nginx_rtmp_ver=1.2.2
 	if [ ! -f ${openrestyDir}/nginx-rtmp-module.tar.gz ];then
-		wget --no-check-certificate -O ${openrestyDir}/nginx-rtmp-module.tar.gz https://github.com/arut/nginx-rtmp-module/archive/refs/tags/v1.2.2.tar.gz
+		wget --no-check-certificate -O ${openrestyDir}/nginx-rtmp-module.tar.gz https://github.com/arut/nginx-rtmp-module/archive/refs/tags/v${nginx_rtmp_ver}.tar.gz
 	fi
 
 	if [ ! -d ${openrestyDir}/nginx-rtmp-module.tar.gz ];then
 		cd ${openrestyDir} &&  tar -zxvf nginx-rtmp-module.tar.gz
 	fi
-	OPTIONS="${OPTIONS} --add-module=${openrestyDir}/nginx-rtmp-module"
+	OPTIONS="${OPTIONS} --add-module=${openrestyDir}/nginx-rtmp-module-${nginx_rtmp_ver}"
 
 
 	cd ${openrestyDir}/openresty-${VERSION} && ./configure \

From 2a19a8f93d7ac934965240d064dadfbbceff9beb Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 2 Nov 2024 16:03:58 +0800
Subject: [PATCH 049/965] Update install.sh

---
 plugins/openresty/versions/rmtp/install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/openresty/versions/rmtp/install.sh b/plugins/openresty/versions/rmtp/install.sh
index 9050814de..93b0f2a0f 100644
--- a/plugins/openresty/versions/rmtp/install.sh
+++ b/plugins/openresty/versions/rmtp/install.sh
@@ -175,6 +175,10 @@ Install_openresty()
 	if [ -d ${openrestyDir}/libressl-${libresslVersion} ];then
 		rm -rf ${openrestyDir}/libressl-${libresslVersion}
 	fi
+
+	if [ -d ${openrestyDir}/nginx-rtmp-module-${nginx_rtmp_ver} ];then
+		rm -rf ${openrestyDir}/nginx-rtmp-module-${nginx_rtmp_ver}
+	fi
 	echo '安装完成'
 }
 

From 6b378a9712d91c96d712135f74d5a5301799a906 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 2 Nov 2024 16:12:55 +0800
Subject: [PATCH 050/965] update

---
 plugins/openresty/info.json                          | 2 +-
 plugins/openresty/versions/{rmtp => rtmp}/install.sh | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename plugins/openresty/versions/{rmtp => rtmp}/install.sh (100%)

diff --git a/plugins/openresty/info.json b/plugins/openresty/info.json
index dbb697869..5f9e808aa 100755
--- a/plugins/openresty/info.json
+++ b/plugins/openresty/info.json
@@ -12,6 +12,6 @@
 	"home":"http://openresty.org",
 	"date":"2017-11-24",
 	"pid": "1",
-	"versions": ["1.17.8","1.19.3","1.21.4","1.25.3","1.27.1","rmtp"],
+	"versions": ["1.17.8","1.19.3","1.21.4","1.25.3","1.27.1","rtmp"],
 	"updates": ["1.17.8.2","1.19.3.1","1.21.4.2","1.25.3.2"]
 }
\ No newline at end of file
diff --git a/plugins/openresty/versions/rmtp/install.sh b/plugins/openresty/versions/rtmp/install.sh
similarity index 100%
rename from plugins/openresty/versions/rmtp/install.sh
rename to plugins/openresty/versions/rtmp/install.sh

From 083f5e22710f8b922bd2a305825b7b33b77d6a65 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 2 Nov 2024 16:13:16 +0800
Subject: [PATCH 051/965] update

---
 web/admin/__init__.py             |  1 +
 web/admin/setup/__init__.py       |  1 +
 web/admin/setup/init_db_system.py | 16 ++++++++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 web/admin/setup/init_db_system.py

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index d8f3ff159..87dd08ffd 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -93,6 +93,7 @@ with app.app_context():
     if setup_db_required:
         setup.init_admin_user()
         setup.init_option()
+setup.init_db_system()
 
 app.config['BASIC_AUTH_OPEN'] = False
 with app.app_context():
diff --git a/web/admin/setup/__init__.py b/web/admin/setup/__init__.py
index 234f2f7de..7cd824ba3 100644
--- a/web/admin/setup/__init__.py
+++ b/web/admin/setup/__init__.py
@@ -10,4 +10,5 @@
 
 from .user import init_admin_user
 from .option import init_option
+from .init_db_system import init_db_system
 
diff --git a/web/admin/setup/init_db_system.py b/web/admin/setup/init_db_system.py
new file mode 100644
index 000000000..bcce3db89
--- /dev/null
+++ b/web/admin/setup/init_db_system.py
@@ -0,0 +1,16 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+from utils.system import monitor
+
+
+def init_db_system():
+	monitor.instance().initDBFile()
+	return True
\ No newline at end of file

From 5788693e6cc2657103ac19110869d97c7d877bba Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 2 Nov 2024 16:14:29 +0800
Subject: [PATCH 052/965] Update install.sh

---
 plugins/openresty/versions/rtmp/install.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/openresty/versions/rtmp/install.sh b/plugins/openresty/versions/rtmp/install.sh
index 93b0f2a0f..eab364971 100644
--- a/plugins/openresty/versions/rtmp/install.sh
+++ b/plugins/openresty/versions/rtmp/install.sh
@@ -179,6 +179,11 @@ Install_openresty()
 	if [ -d ${openrestyDir}/nginx-rtmp-module-${nginx_rtmp_ver} ];then
 		rm -rf ${openrestyDir}/nginx-rtmp-module-${nginx_rtmp_ver}
 	fi
+
+	if [ -d $openrestyDir/openresty-${VERSION} ];then
+		rm -rf $openrestyDir/openresty-${VERSION}
+	fi
+	
 	echo '安装完成'
 }
 

From fa64dfb89b77d8b79d56b3aa525c6ba51f40a8e0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 2 Nov 2024 16:15:21 +0800
Subject: [PATCH 053/965] update

---
 plugins/openresty/install.sh                 | 1 -
 plugins/openresty/versions/1.17.8/install.sh | 5 +++++
 plugins/openresty/versions/1.19.3/install.sh | 4 ++++
 plugins/openresty/versions/1.21.4/install.sh | 4 ++++
 plugins/openresty/versions/1.25.3/install.sh | 4 ++++
 plugins/openresty/versions/1.27.1/install.sh | 4 ++++
 6 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/plugins/openresty/install.sh b/plugins/openresty/install.sh
index 3c72e5451..35680f32d 100755
--- a/plugins/openresty/install.sh
+++ b/plugins/openresty/install.sh
@@ -57,5 +57,4 @@ if [ "${action}" == "install" ] && [ -d $serverPath/openresty ];then
 	#初始化 
 	cd ${rootPath} && python3 ${rootPath}/plugins/openresty/index.py start
 	cd ${rootPath} && python3 ${rootPath}/plugins/openresty/index.py initd_install
-	rm -rf $openrestyDir/openresty-${VERSION}
 fi
diff --git a/plugins/openresty/versions/1.17.8/install.sh b/plugins/openresty/versions/1.17.8/install.sh
index d3bf95aab..4259f71ea 100644
--- a/plugins/openresty/versions/1.17.8/install.sh
+++ b/plugins/openresty/versions/1.17.8/install.sh
@@ -149,6 +149,11 @@ Install_openresty()
     if [ -d ${openrestyDir}/libressl-${libresslVersion} ];then
     	rm -rf ${openrestyDir}/libressl-${libresslVersion}
     fi
+
+    if [ -d $openrestyDir/openresty-${VERSION} ];then
+		rm -rf $openrestyDir/openresty-${VERSION}
+	fi
+	
 	echo '安装完成'
 }
 
diff --git a/plugins/openresty/versions/1.19.3/install.sh b/plugins/openresty/versions/1.19.3/install.sh
index 9934e2a6c..555a7a609 100644
--- a/plugins/openresty/versions/1.19.3/install.sh
+++ b/plugins/openresty/versions/1.19.3/install.sh
@@ -150,6 +150,10 @@ Install_openresty()
     if [ -d ${openrestyDir}/libressl-${libresslVersion} ];then
     	rm -rf ${openrestyDir}/libressl-${libresslVersion}
     fi
+
+    if [ -d $openrestyDir/openresty-${VERSION} ];then
+		rm -rf $openrestyDir/openresty-${VERSION}
+	fi
 	echo '安装完成'
 }
 
diff --git a/plugins/openresty/versions/1.21.4/install.sh b/plugins/openresty/versions/1.21.4/install.sh
index 531e38368..817699157 100644
--- a/plugins/openresty/versions/1.21.4/install.sh
+++ b/plugins/openresty/versions/1.21.4/install.sh
@@ -149,6 +149,10 @@ Install_openresty()
     if [ -d ${openrestyDir}/libressl-${libresslVersion} ];then
     	rm -rf ${openrestyDir}/libressl-${libresslVersion}
     fi
+
+    if [ -d $openrestyDir/openresty-${VERSION} ];then
+		rm -rf $openrestyDir/openresty-${VERSION}
+	fi
 	echo '安装完成'
 }
 
diff --git a/plugins/openresty/versions/1.25.3/install.sh b/plugins/openresty/versions/1.25.3/install.sh
index 9c5224662..473fe1938 100644
--- a/plugins/openresty/versions/1.25.3/install.sh
+++ b/plugins/openresty/versions/1.25.3/install.sh
@@ -164,6 +164,10 @@ Install_openresty()
     if [ -d ${openrestyDir}/libressl-${libresslVersion} ];then
     	rm -rf ${openrestyDir}/libressl-${libresslVersion}
     fi
+
+    if [ -d $openrestyDir/openresty-${VERSION} ];then
+		rm -rf $openrestyDir/openresty-${VERSION}
+	fi
 	echo '安装完成'
 }
 
diff --git a/plugins/openresty/versions/1.27.1/install.sh b/plugins/openresty/versions/1.27.1/install.sh
index 2183be696..8e4d01ca6 100644
--- a/plugins/openresty/versions/1.27.1/install.sh
+++ b/plugins/openresty/versions/1.27.1/install.sh
@@ -164,6 +164,10 @@ Install_openresty()
     if [ -d ${openrestyDir}/libressl-${libresslVersion} ];then
     	rm -rf ${openrestyDir}/libressl-${libresslVersion}
     fi
+
+    if [ -d $openrestyDir/openresty-${VERSION} ];then
+		rm -rf $openrestyDir/openresty-${VERSION}
+	fi
 	echo '安装完成'
 }
 

From 18e59ef377f064f62b5b890743797975c78a5954 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 2 Nov 2024 16:16:31 +0800
Subject: [PATCH 054/965] up

---
 web/core/db.py               | 24 +++++++-----
 web/core/mw.py               |  4 +-
 web/utils/system/__init__.py |  2 +-
 web/utils/system/main.py     | 17 +++++++++
 web/utils/system/monitor.py  | 72 +++++++++++++++++++++++++++++++++++-
 5 files changed, 105 insertions(+), 14 deletions(-)

diff --git a/web/core/db.py b/web/core/db.py
index 10bddcc09..e5c1107a8 100755
--- a/web/core/db.py
+++ b/web/core/db.py
@@ -12,11 +12,18 @@
 # sqlite3操作
 # ---------------------------------------------------------------------------------
 
-
-import sqlite3
 import os
 import sys
+import sqlite3
 
+import core.mw as mw
+
+def getPanelDir():
+    return os.path.dirname(os.getcwd())
+
+def getTracebackInfo():
+    import traceback
+    return traceback.format_exc()
 
 class Sql():
     #------------------------------
@@ -33,7 +40,7 @@ class Sql():
     __OPT_PARAM = ()            # where值
 
     def __init__(self):
-        self.__DB_FILE = '../data/default.db'
+        self.__DB_FILE = getPanelDir()+'/data/panel.db'
 
     def __getConn(self):
         # 取数据库对象
@@ -42,7 +49,7 @@ class Sql():
                 self.__DB_CONN = sqlite3.connect(self.__DB_FILE)
                 self.__DB_CONN.text_factory = str
         except Exception as ex:
-            # print(mw.getTracebackInfo())
+            print(getTracebackInfo())
             return "error: " + str(ex)
 
     def changeTextFactoryToBytes(self):
@@ -51,14 +58,12 @@ class Sql():
 
     def autoTextFactory(self):
         if sys.version_info[0] == 3:
-            self.__DB_CONN.text_factory = lambda x: str(
-                x, encoding="utf-8", errors='ignore')
+            self.__DB_CONN.text_factory = lambda x: str(x, encoding="utf-8", errors='ignore')
         else:
-            self.__DB_CONN.text_factory = lambda x: unicode(
-                x, "utf-8", "ignore")
+            self.__DB_CONN.text_factory = lambda x: unicode(x, "utf-8", "ignore")
 
     def dbfile(self, name):
-        self.__DB_FILE = 'data/' + name + '.db'
+        self.__DB_FILE = getPanelDir()+'/data/' + name + '.db'
         return self
 
     def dbPos(self, path, name, suffix_name = 'db'):
@@ -192,7 +197,6 @@ class Sql():
     def getField(self, keyName):
         # 取回指定字段
         result = self.field(keyName).select()
-        # print(result)
         if len(result) == 1:
             return result[0][keyName]
         return result
diff --git a/web/core/mw.py b/web/core/mw.py
index 94456abfb..2350a22e7 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -584,9 +584,11 @@ def writeDbLog(stype, msg, args=(), uid=1):
         return False
 
 
-def M(table):
+def M(table=''):
     import core.db as db
     sql = db.Sql()
+    if table == '':
+        return sql
     return sql.table(table)
 
 
diff --git a/web/utils/system/__init__.py b/web/utils/system/__init__.py
index 7f612c99c..d631fb713 100644
--- a/web/utils/system/__init__.py
+++ b/web/utils/system/__init__.py
@@ -11,4 +11,4 @@
 from .main import *
 from .query import *
 from .stats import *
-from .monitor import *
\ No newline at end of file
+from .monitor import monitor
\ No newline at end of file
diff --git a/web/utils/system/main.py b/web/utils/system/main.py
index 4e7b8a7b4..f2a29203b 100644
--- a/web/utils/system/main.py
+++ b/web/utils/system/main.py
@@ -150,4 +150,21 @@ def getMemInfo():
         memInfo['memRealUsed'] = memInfo['memTotal'] - memInfo['memFree'] - memInfo['memBuffers'] - memInfo['memCached']
     return memInfo
 
+def getMemUsed():
+    # 取内存使用率
+    try:
+        import psutil
+        mem = psutil.virtual_memory()
+
+        if mw.getOs() == 'darwin':
+            return mem.percent
+
+        memInfo = {'memTotal': mem.total / 1024 / 1024, 'memFree': mem.free / 1024 / 1024,
+                   'memBuffers': mem.buffers / 1024 / 1024, 'memCached': mem.cached / 1024 / 1024}
+        tmp = memInfo['memTotal'] - memInfo['memFree'] - \
+            memInfo['memBuffers'] - memInfo['memCached']
+        tmp1 = memInfo['memTotal'] / 100
+        return (tmp / tmp1)
+    except Exception as ex:
+        return 1
 
diff --git a/web/utils/system/monitor.py b/web/utils/system/monitor.py
index 1abb5db39..45dd57912 100644
--- a/web/utils/system/monitor.py
+++ b/web/utils/system/monitor.py
@@ -14,14 +14,82 @@ import re
 import time
 import math
 import psutil
+import threading
+
+
+from .main import getMemUsed
 
 import core.mw as mw
+import core.db as db
 
 
+
+# 监控系统数据入库
 class monitor:
 
-	def initDBFile():
-		pass
+    _dbfile = mw.getPanelDataDir() + '/system.db'
+    _diskinfo = None
+
+    def __init__(self):
+        pass
+
+    # lock
+    _instance_lock = threading.Lock()
+
+    @classmethod
+    def instance(cls, *args, **kwargs):
+        if not hasattr(monitor, "_instance"):
+            with monitor._instance_lock:
+                if not hasattr(monitor, "_instance"):
+                    monitor._instance = monitor(*args, **kwargs)
+        return monitor._instance
+
+    def initDBFile(self):
+        if os.path.exists(self._dbfile):
+            return True
+        sql_file = mw.getPanelDataDir() + '/sql/system.sql'
+        sql = db.Sql().dbPos(mw.getPanelDataDir(),'system')
+        csql = mw.readFile(sql_file)
+        csql_list = csql.split(';')
+        for index in range(len(csql_list)):
+            sql.execute(csql_list[index], ())
+        return True
+
+    # def safeRun(self):
+    #     self.initDBFile()
+
+    #     monitor_day =mw.M('option').field('name').where('name=?',('monitor_day',)).getField('value')
+    #     print(monitor_day)
+    #     print("monitor data", mw.formatDate())
+
+    def getDiskInfo(self):
+        if self._diskinfo is None:
+            self._diskinfo = psutil.disk_io_counters()
+
+    def run(self):
+        self.initDBFile()
+        monitor_day = mw.M('option').field('name').where('name=?',('monitor_day',)).getField('value')
+        print(monitor_day)
+        print("monitor data", mw.formatDate())
+
+        now_info = {}
+        # 取当前CPU Io
+        now_info['used'] = psutil.cpu_percent(interval=1)
+        now_info['mem'] = getMemUsed()
+
+        network_io = psutil.net_io_counters()[:4]
+        diskio = psutil.disk_io_counters()
+
+        print(network_io)
+        print(now_info)
+        print(diskio)
+        # if tmp['used'] > 80:
+        #     panel_title = mw.getConfig('title')
+        #     ip = mw.getHostAddr()
+        #     now_time = mw.getDateFromNow()
+        #     msg = now_time + '|节点[' + panel_title + ':' + ip + \
+        #         ']处于高负载[' + str(tmp['used']) + '],请排查原因!'
+        #     mw.notifyMessage(msg, '面板监控', 600)
 
 
 

From d7b7c572b0226cdd57a469f44bb835a8ed671ca0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 00:59:26 +0800
Subject: [PATCH 055/965] update

---
 panel_task.py               |  22 ++++--
 web/static/app/control.js   |   3 +-
 web/utils/system/monitor.py | 131 ++++++++++++++++++++++++++++++------
 web/utils/system/query.py   |   2 +-
 4 files changed, 131 insertions(+), 27 deletions(-)

diff --git a/panel_task.py b/panel_task.py
index 8382b29bb..84d39bd4f 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -346,12 +346,10 @@ def systemTask():
 
                     # LoadAverage
                     load_average = sm.getLoadAverage()
-                    lpro = round(
-                        (load_average['one'] / load_average['max']) * 100, 2)
+                    lpro = round((load_average['one'] / load_average['max']) * 100, 2)
                     if lpro > 100:
                         lpro = 100
-                    sql.table('load_average').add('pro,one,five,fifteen,addtime', (lpro, load_average[
-                        'one'], load_average['five'], load_average['fifteen'], addtime))
+                    sql.table('load_average').add('pro,one,five,fifteen,addtime', (lpro, load_average['one'], load_average['five'], load_average['fifteen'], addtime))
 
                     lpro = None
                     load_average = None
@@ -381,6 +379,20 @@ def systemTask():
         time.sleep(30)
         systemTask()
 
+def systemTask2():
+    # 系统监控任务
+    try:
+        from  utils.system import monitor
+        while True:
+            monitor.instance().run()
+            time.sleep(5)
+    except Exception as ex:
+        print(str(ex))
+        mw.writeFile('logs/sys_interrupt.pl', str(ex))
+        restartMw()
+        time.sleep(30)
+        systemTask2()
+
 
 # -------------------------------------- PHP监控 start --------------------------------------------- #
 # 502错误检查线程
@@ -584,7 +596,7 @@ def setDaemon(t):
 
 def run():
     # # 系统监控
-    sysTask = threading.Thread(target=systemTask)
+    sysTask = threading.Thread(target=systemTask2)
     sysTask = setDaemon(sysTask)
     sysTask.start()
 
diff --git a/web/static/app/control.js b/web/static/app/control.js
index 4b68cd96b..9ee2e8807 100755
--- a/web/static/app/control.js
+++ b/web/static/app/control.js
@@ -490,7 +490,8 @@ function network(b,e){
 		option = {
 			tooltip: {
 				trigger: 'axis',
-				axisPointer: { type: 'cross' }
+				axisPointer: { type: 'cross' },
+				formatter:"时间：{b0}<br />{a0}: {c0} Kb/s<br />{a1}: {c1} Kb/s", 
 			},
 			legend: {
 				data:[lan.index.net_up,lan.index.net_down]
diff --git a/web/utils/system/monitor.py b/web/utils/system/monitor.py
index 45dd57912..ea5ba96c8 100644
--- a/web/utils/system/monitor.py
+++ b/web/utils/system/monitor.py
@@ -29,6 +29,7 @@ class monitor:
 
     _dbfile = mw.getPanelDataDir() + '/system.db'
     _diskinfo = None
+    _netinfo = None
 
     def __init__(self):
         pass
@@ -55,41 +56,131 @@ class monitor:
             sql.execute(csql_list[index], ())
         return True
 
+    def getMonitorDay(self):
+        monitor_day = mw.M('option').field('name').where('name=?',('monitor_day',)).getField('value')
+        return int(monitor_day)
+
+    def isOnlyNetIoStats(self):
+        monitor_only_netio = mw.M('option').field('name').where('name=?',('monitor_only_netio',)).getField('value')
+        if monitor_only_netio == 'open':
+            return True
+        return False
+
     # def safeRun(self):
     #     self.initDBFile()
 
     #     monitor_day =mw.M('option').field('name').where('name=?',('monitor_day',)).getField('value')
     #     print(monitor_day)
     #     print("monitor data", mw.formatDate())
+    def psutilNetIoCounters(self):
+        '''
+        统计网卡流量
+        '''
+        if self.isOnlyNetIoStats():
+            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 getDiskInfo(self):
+        now_diskinfo = psutil.disk_io_counters()
         if self._diskinfo is None:
-            self._diskinfo = psutil.disk_io_counters()
+            self._diskinfo = now_diskinfo
+
+        info = {}
+        info['read_count'] = now_diskinfo.read_count - self._diskinfo.read_count
+        info['write_count'] = now_diskinfo.write_count - self._diskinfo.write_count
+        info['read_bytes'] = now_diskinfo.read_bytes - self._diskinfo.read_bytes
+        info['write_bytes'] = now_diskinfo.write_bytes - self._diskinfo.write_bytes
+        info['read_time'] = now_diskinfo.read_time - self._diskinfo.read_time
+        info['write_time'] = now_diskinfo.write_time - self._diskinfo.write_time
+
+        self._diskinfo = now_diskinfo
+        return info
+
+    def getNetIoInfo(self):
+        # 取当前网络Io
+        net_io = self.psutilNetIoCounters()
+        if not self._netinfo:
+            self._netinfo = net_io
+        info = {}
+        info['upTotal'] = net_io[0]
+        info['downTotal'] = net_io[1]
+        info['up'] = round(float((net_io[0] - self._netinfo[0]) / 1024), 2)
+        info['down'] = round(float((net_io[1] - self._netinfo[1]) / 1024), 2)
+        info['downPackets'] = net_io[3]
+        info['upPackets'] = net_io[2]
+
+        self._netinfo = net_io
+        return info
+
+    def getLoadAverage(self):
+        c = os.getloadavg()
+        data = {}
+        data['one'] = round(float(c[0]), 2)
+        data['five'] = round(float(c[1]), 2)
+        data['fifteen'] = round(float(c[2]), 2)
+        data['max'] = psutil.cpu_count() * 2
+        data['limit'] = data['max']
+        data['safe'] = data['max'] * 0.75
+        return data
 
     def run(self):
         self.initDBFile()
-        monitor_day = mw.M('option').field('name').where('name=?',('monitor_day',)).getField('value')
-        print(monitor_day)
-        print("monitor data", mw.formatDate())
-
-        now_info = {}
+        monitor_day = self.getMonitorDay()
+        
+        info = {}
         # 取当前CPU Io
-        now_info['used'] = psutil.cpu_percent(interval=1)
-        now_info['mem'] = getMemUsed()
+        info['used'] = psutil.cpu_percent(interval=1)
+        info['mem'] = getMemUsed()
 
-        network_io = psutil.net_io_counters()[:4]
-        diskio = psutil.disk_io_counters()
+        netio = self.getNetIoInfo()
+        diskio = self.getDiskInfo()
+
+        addtime = int(time.time())
+        deltime = addtime - (monitor_day * 86400)
+
+        # CPU/内存数据入库
+        cpu_mem_data = (info['used'], info['mem'], addtime)
+        cmd_objm = mw.M('cpuio').dbPos(mw.getPanelDataDir(),'system')
+        cmd_objm.add('pro,mem,addtime', cpu_mem_data)
+        cmd_objm.where("addtime<?", (deltime,)).delete()
+
+        # 网络数据入库
+        netio_data = (netio['up'] / 5, netio['down'] / 5, netio['upTotal'], netio['downTotal'], netio['downPackets'], netio['upPackets'], addtime)
+        network_objm = mw.M('network').dbPos(mw.getPanelDataDir(),'system')
+        network_objm.add('up,down,total_up,total_down,down_packets,up_packets,addtime', netio_data)
+        network_objm.where("addtime<?", (deltime,)).delete()
+
+        # 磁盘数据入库
+        disk_data = (diskio['read_count'], diskio['write_count'], diskio['read_bytes'], diskio['write_bytes'], diskio['read_time'], diskio['write_time'], addtime)
+        disk_objm = mw.M('diskio').dbPos(mw.getPanelDataDir(),'system')
+        disk_objm.add('read_count,write_count,read_bytes,write_bytes,read_time,write_time,addtime', disk_data)
+        disk_objm.where("addtime<?", (deltime,)).delete()
+
+        # 负载数据入库
+        load_data = self.getLoadAverage()
+        lpro = round((load_data['one'] / load_data['max']) * 100, 2)
+        if lpro > 100:
+            lpro = 100
+        load_objm = mw.M('load_average').dbPos(mw.getPanelDataDir(),'system')
+        load_objm.add('pro,one,five,fifteen,addtime', (lpro, load_data['one'], load_data['five'], load_data['fifteen'], addtime))
+        load_objm.where("addtime<?", (deltime,)).delete()
+        return True
 
-        print(network_io)
-        print(now_info)
-        print(diskio)
-        # if tmp['used'] > 80:
-        #     panel_title = mw.getConfig('title')
-        #     ip = mw.getHostAddr()
-        #     now_time = mw.getDateFromNow()
-        #     msg = now_time + '|节点[' + panel_title + ':' + ip + \
-        #         ']处于高负载[' + str(tmp['used']) + '],请排查原因!'
-        #     mw.notifyMessage(msg, '面板监控', 600)
 
 
 
diff --git a/web/utils/system/query.py b/web/utils/system/query.py
index 9d2710070..71ddec03b 100644
--- a/web/utils/system/query.py
+++ b/web/utils/system/query.py
@@ -60,7 +60,7 @@ def toAddtime(data, tomem=False):
 def toUseAddtime(data):
     dlen = len(data)
     for i in range(dlen):
-        data[i]['addtime'] = time.strftime('%m/%d %H:%M', time.localtime(float(data[i]['addtime'])))
+        data[i]['addtime'] = time.strftime('%m/%d %H:%M:%S', time.localtime(float(data[i]['addtime'])))
     return data
 
 def getLoadAverageByDB(start, end):

From 5e53c637c3b0e2c8dbd892870f2cb7a51ec83c82 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 01:28:19 +0800
Subject: [PATCH 056/965] update

---
 web/admin/setting/setting.py       | 12 ++++++++++++
 web/static/app/control.js          |  2 +-
 web/templates/default/setting.html |  2 +-
 web/utils/config.py                |  1 +
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/web/admin/setting/setting.py b/web/admin/setting/setting.py
index 05717339f..e0419fc77 100644
--- a/web/admin/setting/setting.py
+++ b/web/admin/setting/setting.py
@@ -160,6 +160,18 @@ def set_status_code():
     mw.writeLog('面板设置', '将未授权响应状态码设置为:{0}:{1}'.format(status_code,info['text']))
     return mw.returnData(True, '设置成功!')
 
+# 设置面板调式模式
+@blueprint.route('/open_debug', endpoint='open_debug', methods=['POST'])
+@panel_login_required
+def open_debug():
+    debug = model.getOption('debug',default='close')
+    if debug == 'open':
+        model.setOption('debug','close')
+        return mw.returnData(True, '开发模式关闭!')
+    model.setOption('debug','open')
+    return mw.returnData(True, '开发模式开启!')
+
+
 # 设置站点状态
 @blueprint.route('/set_port', endpoint='set_port', methods=['POST'])
 @panel_login_required
diff --git a/web/static/app/control.js b/web/static/app/control.js
index 9ee2e8807..9737dac81 100755
--- a/web/static/app/control.js
+++ b/web/static/app/control.js
@@ -504,7 +504,7 @@ function network(b,e){
 			},
 			yAxis: {
 				type: 'value',
-				name: lan.index.unit+':KB/s',
+				name: '单位:KB/s',
 				boundaryGap: [0, '100%'],
 				splitLine:{ lineStyle:{ color:"#ddd" } },
 				axisLine:{ lineStyle:{ color:"#666" } }
diff --git a/web/templates/default/setting.html b/web/templates/default/setting.html
index f99eca262..88ae611bc 100755
--- a/web/templates/default/setting.html
+++ b/web/templates/default/setting.html
@@ -17,7 +17,7 @@
 				<div class="ss-text pull-left mr50">
 					<em>开发模式</em>
 					<div class="ssh-item">
-                        <input class="btswitch btswitch-ios" id="debugMode" type="checkbox" {{data['debug']}}>
+                        <input class="btswitch btswitch-ios" id="debugMode" type="checkbox" {%if data['debug']=='open'%}checked{%endif%}>
                         <label class="btswitch-btn" for="debugMode" onclick="debugMode()"></label>
                     </div>
 				</div>
diff --git a/web/utils/config.py b/web/utils/config.py
index 91bed8319..da4fd00f6 100644
--- a/web/utils/config.py
+++ b/web/utils/config.py
@@ -48,6 +48,7 @@ def getGlobalVar():
     data['site_path'] = model.getOption('site_path', default=mw.getFatherDir()+'/wwwroot')
     data['backup_path'] = model.getOption('backup_path', default=mw.getFatherDir()+'/backup')
     data['admin_path'] = '/'+model.getOption('admin_path', default='')
+    data['debug'] = model.getOption('debug', default='close')
     data['site_count'] = model.getSitesCount()
     data['port'] = mw.getHostPort()
 

From 179bc05e09768a5d9d5d98a7a8c03da4bdcb48a5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 01:34:10 +0800
Subject: [PATCH 057/965] Update mw.py

---
 web/core/mw.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index 2350a22e7..37eb5307b 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -520,10 +520,9 @@ def isDebugMode():
     if isAppleSystem():
         return True
 
-    debugPath = getPanelDir() + "/data/debug.pl"
-    if os.path.exists(debugPath):
+    debug = M('option').field('name').where('name=?',('debug',)).getField('value')
+    if debug == 'open':
         return True
-
     return False
 
 def isNumber(s):

From 7f5b45fbdc450f9c7e7c1e3a12c828c4a0770931 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 02:01:20 +0800
Subject: [PATCH 058/965] Update monitor.py

---
 web/utils/system/monitor.py | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/web/utils/system/monitor.py b/web/utils/system/monitor.py
index ea5ba96c8..92db6abe6 100644
--- a/web/utils/system/monitor.py
+++ b/web/utils/system/monitor.py
@@ -66,12 +66,6 @@ class monitor:
             return True
         return False
 
-    # def safeRun(self):
-    #     self.initDBFile()
-
-    #     monitor_day =mw.M('option').field('name').where('name=?',('monitor_day',)).getField('value')
-    #     print(monitor_day)
-    #     print("monitor data", mw.formatDate())
     def psutilNetIoCounters(self):
         '''
         统计网卡流量
@@ -80,18 +74,12 @@ class monitor:
             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]
+                    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))])
+            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]
 

From 745d95bbcb4779c4644b3f4b20449d7218932ae8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 02:20:52 +0800
Subject: [PATCH 059/965] Update __init__.py

---
 web/admin/files/__init__.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/web/admin/files/__init__.py b/web/admin/files/__init__.py
index bd14375c8..f7baeeb0a 100644
--- a/web/admin/files/__init__.py
+++ b/web/admin/files/__init__.py
@@ -12,6 +12,9 @@ import os
 
 from flask import Blueprint, render_template
 from flask import request
+from flask import make_response
+from flask import send_file
+from flask import send_from_directory
 
 
 from admin import model
@@ -119,6 +122,19 @@ def delete_dir():
     path = request.form.get('path', '')
     return file.dirDelete(path)
 
+# 删除文件
+@blueprint.route('/download', endpoint='download', methods=['GET'])
+@panel_login_required
+def download():
+    filename = request.args.get('filename', '')
+    if not os.path.exists(filename):
+        return ''
+    is_attachment = True
+    if filename.endswith(".svg"):
+        is_attachment = False
+
+    response = make_response(send_from_directory(os.path.dirname(filename), os.path.basename(filename), as_attachment=is_attachment))
+    return response
 
 # 回收站文件
 @blueprint.route('/get_recycle_bin', endpoint='get_recycle_bin', methods=['POST'])

From 06d43efd7f50ec2a37046aad8c1a762b0f6ae9dd Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 03:06:40 +0800
Subject: [PATCH 060/965] update

---
 data/sql/system.sql                |  4 ++--
 web/admin/setting/setting.py       | 12 ++++++++++++
 web/templates/default/setting.html |  2 +-
 web/utils/config.py                |  1 +
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/data/sql/system.sql b/data/sql/system.sql
index 06ef0a595..ccade955a 100755
--- a/data/sql/system.sql
+++ b/data/sql/system.sql
@@ -1,7 +1,7 @@
 CREATE TABLE IF NOT EXISTS `network` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `up` INTEGER,
-  `down` INTEGER,
+  `up` REAL,
+  `down` REAL,
   `total_up` INTEGER,
   `total_down` INTEGER,
   `down_packets` INTEGER,
diff --git a/web/admin/setting/setting.py b/web/admin/setting/setting.py
index e0419fc77..1019daa07 100644
--- a/web/admin/setting/setting.py
+++ b/web/admin/setting/setting.py
@@ -172,6 +172,18 @@ def open_debug():
     return mw.returnData(True, '开发模式开启!')
 
 
+# 设置面板开关
+@blueprint.route('/close_panel', endpoint='close_panel', methods=['POST'])
+@panel_login_required
+def close_panel():
+    admin_close = model.getOption('admin_close',default='no')
+    if admin_close == 'no':
+        model.setOption('admin_close','yes')
+        return mw.returnData(True, '开启面板成功!')
+    model.setOption('admin_close','no')
+    return mw.returnData(True, '关闭面板成功!')
+
+
 # 设置站点状态
 @blueprint.route('/set_port', endpoint='set_port', methods=['POST'])
 @panel_login_required
diff --git a/web/templates/default/setting.html b/web/templates/default/setting.html
index 88ae611bc..c001f7375 100755
--- a/web/templates/default/setting.html
+++ b/web/templates/default/setting.html
@@ -10,7 +10,7 @@
 				<div class="ss-text pull-left mr50">
 					<em>关闭面板</em>
 					<div class="ssh-item">
-                        <input class="btswitch btswitch-ios" id="closePl" type="checkbox">
+                        <input class="btswitch btswitch-ios" id="closePl" type="checkbox" {%if data['admin_close']=='yes' %}checked{%endif%}>
                         <label class="btswitch-btn" for="closePl" onclick="closePanel()"></label>
                     </div>
 				</div>
diff --git a/web/utils/config.py b/web/utils/config.py
index da4fd00f6..e11857bf5 100644
--- a/web/utils/config.py
+++ b/web/utils/config.py
@@ -49,6 +49,7 @@ def getGlobalVar():
     data['backup_path'] = model.getOption('backup_path', default=mw.getFatherDir()+'/backup')
     data['admin_path'] = '/'+model.getOption('admin_path', default='')
     data['debug'] = model.getOption('debug', default='close')
+    data['admin_close'] = model.getOption('admin_close', default='no')
     data['site_count'] = model.getSitesCount()
     data['port'] = mw.getHostPort()
 

From 7f68067f679ffe15902c43fbbe9db7902e042c9a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 03:17:02 +0800
Subject: [PATCH 061/965] update

---
 web/admin/system/system.py  | 15 ++++++---------
 web/core/mw.py              |  8 +++++++-
 web/utils/system/monitor.py |  5 +++++
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/web/admin/system/system.py b/web/admin/system/system.py
index cd6e8a578..1198a5227 100644
--- a/web/admin/system/system.py
+++ b/web/admin/system/system.py
@@ -8,17 +8,20 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
+import os
 
 from flask import Blueprint, render_template
 from flask import request
 
 from admin.user_login_check import panel_login_required
-import admin.model.option as option
+from utils.system import monitor
 
+import admin.model.option as option
 import core.mw as mw
 import utils.system as sys
 
 
+
 blueprint = Blueprint('system', __name__, url_prefix='/system', template_folder='../../templates')
 
 # 获取系统的统计信息
@@ -126,14 +129,8 @@ def set_control():
     elif stype == 'del':
         if not mw.isRestart():
             return mw.returnData(False, '请等待所有安装任务完成再执行')
-        os.remove("data/system.db")
-
-        sql = db.Sql().dbfile('system')
-        csql = mw.readFile('data/sql/system.sql')
-        csql_list = csql.split(';')
-        for index in range(len(csql_list)):
-            sql.execute(csql_list[index], ())
-        return mw.returnData(True, "监控服务已关闭")
+        monitor.instance().clearDbFile()
+        return mw.returnData(True, "清空记录成功!")
     else:
         monitor_status = option.getOption('monitor_status', default='open', type='monitor')
         monitor_day = option.getOption('monitor_day', default='30', type='monitor')
diff --git a/web/core/mw.py b/web/core/mw.py
index 37eb5307b..840595c44 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -541,7 +541,13 @@ def isNumber(s):
 
     return False
 
-
+def isRestart():
+    # 检查是否允许重启
+    num = M('tasks').where('status!=?', ('1',)).count()
+    if num > 0:
+        return False
+    return True
+    
 # 检查端口是否占用
 def isOpenPort(port):
     import socket
diff --git a/web/utils/system/monitor.py b/web/utils/system/monitor.py
index 92db6abe6..224806a0d 100644
--- a/web/utils/system/monitor.py
+++ b/web/utils/system/monitor.py
@@ -45,6 +45,11 @@ class monitor:
                     monitor._instance = monitor(*args, **kwargs)
         return monitor._instance
 
+    def clearDbFile(self):
+        os.remove(self._dbfile)
+        self.initDBFile()
+        return True
+
     def initDBFile(self):
         if os.path.exists(self._dbfile):
             return True

From bed1d7ee85d69dd76085e6ccce1cb8ae731c4308 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 03:25:08 +0800
Subject: [PATCH 062/965] Update system.sql

---
 data/sql/system.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/sql/system.sql b/data/sql/system.sql
index ccade955a..2258520fb 100755
--- a/data/sql/system.sql
+++ b/data/sql/system.sql
@@ -1,7 +1,7 @@
 CREATE TABLE IF NOT EXISTS `network` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `up` REAL,
-  `down` REAL,
+  `up` TEXT,
+  `down` TEXT,
   `total_up` INTEGER,
   `total_down` INTEGER,
   `down_packets` INTEGER,

From 122bef53fff44e1349211ee2748814ab1bcc3633 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 03:25:21 +0800
Subject: [PATCH 063/965] Update system.sql

---
 data/sql/system.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/sql/system.sql b/data/sql/system.sql
index 2258520fb..f16ececbd 100755
--- a/data/sql/system.sql
+++ b/data/sql/system.sql
@@ -11,8 +11,8 @@ CREATE TABLE IF NOT EXISTS `network` (
 
 CREATE TABLE IF NOT EXISTS `cpuio` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `pro` INTEGER,
-  `mem` INTEGER,
+  `pro` TEXT,
+  `mem` TEXT,
   `addtime` INTEGER
 );
 

From b020f4c502436d6f7c5e159467882c6124aaa774 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 03:31:47 +0800
Subject: [PATCH 064/965] Update system.py

---
 web/admin/system/system.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/system/system.py b/web/admin/system/system.py
index 1198a5227..125563e2b 100644
--- a/web/admin/system/system.py
+++ b/web/admin/system/system.py
@@ -130,7 +130,7 @@ def set_control():
         if not mw.isRestart():
             return mw.returnData(False, '请等待所有安装任务完成再执行')
         monitor.instance().clearDbFile()
-        return mw.returnData(True, "清空记录成功!")
+        return mw.returnData(True, "清空监控记录成功!")
     else:
         monitor_status = option.getOption('monitor_status', default='open', type='monitor')
         monitor_day = option.getOption('monitor_day', default='30', type='monitor')

From fa6900a937dee0cd800b3b6c28aa44459b62f9ab Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 03:34:21 +0800
Subject: [PATCH 065/965] Update monitor.py

---
 web/utils/system/monitor.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/utils/system/monitor.py b/web/utils/system/monitor.py
index 224806a0d..3a4f05173 100644
--- a/web/utils/system/monitor.py
+++ b/web/utils/system/monitor.py
@@ -138,6 +138,8 @@ class monitor:
         info = {}
         # 取当前CPU Io
         info['used'] = psutil.cpu_percent(interval=1)
+        info['used'] = round(info['used'], 2)
+        
         info['mem'] = getMemUsed()
 
         netio = self.getNetIoInfo()

From 9a9faa6a3355b158ac26bd2d0dbe87834740322d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 03:38:07 +0800
Subject: [PATCH 066/965] Update monitor.py

---
 web/utils/system/monitor.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/utils/system/monitor.py b/web/utils/system/monitor.py
index 3a4f05173..95a8d6e1c 100644
--- a/web/utils/system/monitor.py
+++ b/web/utils/system/monitor.py
@@ -141,6 +141,7 @@ class monitor:
         info['used'] = round(info['used'], 2)
         
         info['mem'] = getMemUsed()
+        info['mem'] = round(info['mem'], 2)
 
         netio = self.getNetIoInfo()
         diskio = self.getDiskInfo()

From ed90f9a0875fe55a1174f7be7f1f7743a17dc2a9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 14:57:20 +0800
Subject: [PATCH 067/965] Update system.sql

---
 data/sql/system.sql | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/data/sql/system.sql b/data/sql/system.sql
index f16ececbd..75fe9557f 100755
--- a/data/sql/system.sql
+++ b/data/sql/system.sql
@@ -8,6 +8,7 @@ CREATE TABLE IF NOT EXISTS `network` (
   `up_packets` INTEGER,
   `addtime` INTEGER
 );
+CREATE INDEX addtime_idx ON network(`addtime`);
 
 CREATE TABLE IF NOT EXISTS `cpuio` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -15,6 +16,7 @@ CREATE TABLE IF NOT EXISTS `cpuio` (
   `mem` TEXT,
   `addtime` INTEGER
 );
+CREATE INDEX addtime_idx ON cpuio(`addtime`);
 
 CREATE TABLE IF NOT EXISTS `diskio` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -26,6 +28,7 @@ CREATE TABLE IF NOT EXISTS `diskio` (
   `write_time` INTEGER,
   `addtime` INTEGER
 );
+CREATE INDEX addtime_idx ON diskio(`addtime`);
 
 CREATE TABLE IF NOT EXISTS `load_average` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -34,4 +37,5 @@ CREATE TABLE IF NOT EXISTS `load_average` (
   `five` REAL,
   `fifteen` REAL,
   `addtime` INTEGER
-);
\ No newline at end of file
+);
+CREATE INDEX addtime_idx ON load_average(`addtime`);
\ No newline at end of file

From 3ce1289c441d488397f6688e76c691e328d46e7f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 18:14:25 +0800
Subject: [PATCH 068/965] update

---
 panel_task.py                   | 166 +-------------------------------
 panel_tools.py                  |   8 +-
 web/admin/__init__.py           |   6 ++
 web/admin/dashboard/__init__.py |   6 +-
 web/admin/model/__init__.py     |   2 +-
 web/admin/model/option.py       |   1 -
 web/admin/model/task.py         |  20 ++++
 web/admin/setup/__init__.py     |   1 +
 web/admin/setup/init_cmd.py     |  54 +++++++++++
 web/admin/setup/option.py       |   8 +-
 web/admin/task/__init__.py      |  12 ++-
 web/core/mw.py                  |  67 ++++++++++---
 web/static/app/public.js        |   2 +-
 web/thisdb/__init__.py          |  11 +++
 web/thisdb/option.py            |  28 ++++++
 web/utils/file.py               |   2 +-
 web/utils/task.py               |  54 +++++++++++
 17 files changed, 260 insertions(+), 188 deletions(-)
 create mode 100644 web/admin/setup/init_cmd.py
 create mode 100644 web/thisdb/__init__.py
 create mode 100644 web/thisdb/option.py
 create mode 100644 web/utils/task.py

diff --git a/panel_task.py b/panel_task.py
index 84d39bd4f..263e9366f 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -117,7 +117,7 @@ def mw_async(f):
 @mw_async
 def restartMw():
     time.sleep(1)
-    cmd = mw.getRunDir() + '/scripts/init.d/mw reload &'
+    cmd = mw.getPanelDir() + '/scripts/init.d/mw reload &'
     mw.execShell(cmd)
 
 
@@ -225,173 +225,15 @@ def siteEdate():
 
 
 def systemTask():
+    from  utils.system import monitor
     # 系统监控任务
     try:
-        import system_api
-        import psutil
-        sm = system_api.system_api()
-        filename = 'data/control.conf'
-
-        sql = db.Sql().dbfile('system')
-        csql = mw.readFile('data/sql/system.sql')
-        csql_list = csql.split(';')
-        for index in range(len(csql_list)):
-            sql.execute(csql_list[index], ())
-
-        cpuIo = cpu = {}
-        cpuCount = psutil.cpu_count()
-        used = count = 0
-        reloadNum = 0
-        network_up = network_down = diskio_1 = diskio_2 = networkInfo = cpuInfo = diskInfo = None
-        while True:
-            if not os.path.exists(filename):
-                time.sleep(10)
-                continue
-
-            day = 30
-            try:
-                day = int(mw.readFile(filename))
-                if day < 1:
-                    time.sleep(10)
-                    continue
-            except:
-                day = 30
-
-            tmp = {}
-            # 取当前CPU Io
-            tmp['used'] = psutil.cpu_percent(interval=1)
-            if tmp['used'] > 80:
-                panel_title = mw.getConfig('title')
-                ip = mw.getHostAddr()
-                now_time = mw.getDateFromNow()
-                msg = now_time + '|节点[' + panel_title + ':' + ip + \
-                    ']处于高负载[' + str(tmp['used']) + '],请排查原因!'
-                mw.notifyMessage(msg, '面板监控', 600)
-
-            if not cpuInfo:
-                tmp['mem'] = sm.getMemUsed()
-                cpuInfo = tmp
-
-            if cpuInfo['used'] < tmp['used']:
-                tmp['mem'] = sm.getMemUsed()
-                cpuInfo = tmp
-
-            # 取当前网络Io
-            networkIo = sm.psutilNetIoCounters()
-            if not network_up:
-                network_up = networkIo[0]
-                network_down = networkIo[1]
-            tmp = {}
-            tmp['upTotal'] = networkIo[0]
-            tmp['downTotal'] = networkIo[1]
-            tmp['up'] = round(float((networkIo[0] - network_up) / 1024), 2)
-            tmp['down'] = round(float((networkIo[1] - network_down) / 1024), 2)
-            tmp['downPackets'] = networkIo[3]
-            tmp['upPackets'] = networkIo[2]
-
-            network_up = networkIo[0]
-            network_down = networkIo[1]
-
-            if not networkInfo:
-                networkInfo = tmp
-            if (tmp['up'] + tmp['down']) > (networkInfo['up'] + networkInfo['down']):
-                networkInfo = tmp
-            # 取磁盘Io
-            # if os.path.exists('/proc/diskstats'):
-            diskio_2 = psutil.disk_io_counters()
-            if not diskio_1:
-                diskio_1 = diskio_2
-            tmp = {}
-            tmp['read_count'] = diskio_2.read_count - diskio_1.read_count
-            tmp['write_count'] = diskio_2.write_count - diskio_1.write_count
-            tmp['read_bytes'] = diskio_2.read_bytes - diskio_1.read_bytes
-            tmp['write_bytes'] = diskio_2.write_bytes - diskio_1.write_bytes
-            tmp['read_time'] = diskio_2.read_time - diskio_1.read_time
-            tmp['write_time'] = diskio_2.write_time - diskio_1.write_time
-
-            if not diskInfo:
-                diskInfo = tmp
-            else:
-                diskInfo['read_count'] += tmp['read_count']
-                diskInfo['write_count'] += tmp['write_count']
-                diskInfo['read_bytes'] += tmp['read_bytes']
-                diskInfo['write_bytes'] += tmp['write_bytes']
-                diskInfo['read_time'] += tmp['read_time']
-                diskInfo['write_time'] += tmp['write_time']
-            diskio_1 = diskio_2
-
-            # print diskInfo
-            if count >= 12:
-                try:
-                    addtime = int(time.time())
-                    deltime = addtime - (day * 86400)
-
-                    data = (cpuInfo['used'], cpuInfo['mem'], addtime)
-                    sql.table('cpuio').add('pro,mem,addtime', data)
-                    sql.table('cpuio').where("addtime<?", (deltime,)).delete()
-
-                    data = (networkInfo['up'] / 5, networkInfo['down'] / 5, networkInfo['upTotal'], networkInfo[
-                        'downTotal'], networkInfo['downPackets'], networkInfo['upPackets'], addtime)
-                    sql.table('network').add(
-                        'up,down,total_up,total_down,down_packets,up_packets,addtime', data)
-                    sql.table('network').where(
-                        "addtime<?", (deltime,)).delete()
-                    # if os.path.exists('/proc/diskstats'):
-                    data = (diskInfo['read_count'], diskInfo['write_count'], diskInfo['read_bytes'], diskInfo[
-                        'write_bytes'], diskInfo['read_time'], diskInfo['write_time'], addtime)
-                    sql.table('diskio').add(
-                        'read_count,write_count,read_bytes,write_bytes,read_time,write_time,addtime', data)
-                    sql.table('diskio').where(
-                        "addtime<?", (deltime,)).delete()
-
-                    # LoadAverage
-                    load_average = sm.getLoadAverage()
-                    lpro = round((load_average['one'] / load_average['max']) * 100, 2)
-                    if lpro > 100:
-                        lpro = 100
-                    sql.table('load_average').add('pro,one,five,fifteen,addtime', (lpro, load_average['one'], load_average['five'], load_average['fifteen'], addtime))
-
-                    lpro = None
-                    load_average = None
-                    cpuInfo = None
-                    networkInfo = None
-                    diskInfo = None
-                    count = 0
-                    reloadNum += 1
-                    if reloadNum > 1440:
-                        reloadNum = 0
-                        mw.writeFile('logs/sys_interrupt.pl',
-                                     "reload num:" + str(reloadNum))
-                        restartMw()
-                except Exception as ex:
-                    print(str(ex))
-                    mw.writeFile('logs/sys_interrupt.pl', str(ex))
-
-            del(tmp)
-            time.sleep(5)
-            count += 1
-    except Exception as ex:
-        print(str(ex))
-        mw.writeFile('logs/sys_interrupt.pl', str(ex))
-
-        restartMw()
-
-        time.sleep(30)
-        systemTask()
-
-def systemTask2():
-    # 系统监控任务
-    try:
-        from  utils.system import monitor
         while True:
             monitor.instance().run()
             time.sleep(5)
     except Exception as ex:
-        print(str(ex))
-        mw.writeFile('logs/sys_interrupt.pl', str(ex))
-        restartMw()
         time.sleep(30)
-        systemTask2()
+        systemTask()
 
 
 # -------------------------------------- PHP监控 start --------------------------------------------- #
@@ -596,7 +438,7 @@ def setDaemon(t):
 
 def run():
     # # 系统监控
-    sysTask = threading.Thread(target=systemTask2)
+    sysTask = threading.Thread(target=systemTask)
     sysTask = setDaemon(sysTask)
     sysTask.start()
 
diff --git a/panel_tools.py b/panel_tools.py
index a56444a8f..89208170a 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -26,6 +26,7 @@ sys.path.append(web_dir)
 
 from admin import app
 from admin import model
+import thisdb
 import core.mw as mw
 import core.db as db
 
@@ -241,7 +242,7 @@ def show_panel_pwd():
     print("password has been changed!")
 
 def show_panel_adminpath():
-    admin_path = model.getOption('admin_path')
+    admin_path = thisdb.getOption('admin_path')
     print('/'+admin_path)
 
 
@@ -289,6 +290,8 @@ def main():
             set_panel_username()
     elif method == 'password':
         show_panel_pwd()
+    elif method == 'test':
+        thisdb.getOption('admin_path')
     elif method == 'admin_path':
         show_panel_adminpath()
     elif method == 'getServerIp':
@@ -305,5 +308,4 @@ def main():
         print('ERROR: Parameter error')
 
 if __name__ == "__main__":
-    with app.app_context():
-        main()
+    main()
diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 87dd08ffd..55b5d89ba 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -93,8 +93,10 @@ with app.app_context():
     if setup_db_required:
         setup.init_admin_user()
         setup.init_option()
+setup.init_cmd()
 setup.init_db_system()
 
+
 app.config['BASIC_AUTH_OPEN'] = False
 with app.app_context():
     basic_auth = model.getOptionByJson('basic_auth', default={'open':False})
@@ -155,6 +157,7 @@ def page_unauthorized(error):
 # 设置模板全局变量
 @app.context_processor
 def inject_global_variables():
+    start_t = time.time()
     ver = config.APP_VERSION;
     if mw.isDebugMode():
         ver = ver + str(time.time())
@@ -165,6 +168,9 @@ def inject_global_variables():
         'title' : 'MW面板',
         'ip' : '127.0.0.1'
     }
+
+    end_t = time.time()
+    print("cos:"+str(end_t-start_t))
     return dict(config=g_config, data=data)
 
 
diff --git a/web/admin/dashboard/__init__.py b/web/admin/dashboard/__init__.py
index e3fd25933..c77e84623 100644
--- a/web/admin/dashboard/__init__.py
+++ b/web/admin/dashboard/__init__.py
@@ -36,6 +36,10 @@ def index():
 @blueprint.route('/<path>',endpoint='admin_safe_path',methods=['GET'])
 def admin_safe_path(path):
     db_path = model.getOption('admin_path')
+
+    if isLogined():
+       return redirect('/')
+
     if db_path == path:
         return render_template('default/login.html')
 
@@ -63,7 +67,7 @@ def webhook():
 
     wh_install_path = mw.getServerDir() + '/webhook'
     if not os.path.exists(wh_install_path):
-        return mw.returnJson(False, '请先安装WebHook插件!')
+        return mw.returnData(False, '请先安装WebHook插件!')
 
     package = mw.getPanelDir() + "/plugins/webhook"
     if not package in sys.path:
diff --git a/web/admin/model/__init__.py b/web/admin/model/__init__.py
index b0821ac6d..e2bb5f82e 100644
--- a/web/admin/model/__init__.py
+++ b/web/admin/model/__init__.py
@@ -19,7 +19,7 @@ from .option import setOption
 from .sites import getSitesCount
 
 from .task import addTask
-from .task import getTaskCount,getTaskUnexecutedCount,getTaskList,getTaskFirstByRun
+from .task import getTaskCount,getTaskUnexecutedCount,getTaskList,getTaskFirstByRun,getTaskRunList
 from .task import setTaskStatus,setTaskData
 
 from .user import isLoginCheck
diff --git a/web/admin/model/option.py b/web/admin/model/option.py
index 98a229217..cbb277be5 100644
--- a/web/admin/model/option.py
+++ b/web/admin/model/option.py
@@ -71,5 +71,4 @@ def setOption(name, value,
     
     db.session.query(Option).filter_by(name=name, type=type).update({"value":value})
     db.session.commit()
-    db.session.close()
     return True
\ No newline at end of file
diff --git a/web/admin/model/task.py b/web/admin/model/task.py
index 66edfd33c..c3ba9ccc7 100644
--- a/web/admin/model/task.py
+++ b/web/admin/model/task.py
@@ -88,6 +88,26 @@ def getTaskList(
         rows.append(t)
     return rows
 
+def getTaskRunList(
+    page: int | None = 1,
+    size: int | None = 10,
+):
+    pagination = Tasks.query.filter(Tasks.status!=1).order_by(Tasks.id.asc()).paginate(page=int(page), per_page=int(size))
+  
+    rows = []
+    for item in pagination.items:
+        t = {}
+        t['id'] = item.id
+        t['name'] = item.name
+        t['type'] = item.type
+        t['cmd'] = item.cmd
+        t['start'] = item.start
+        t['end'] = item.end
+        t['status'] = item.status
+        t['add_time'] = item.add_time
+        rows.append(t)
+    return rows
+
 
 
 
diff --git a/web/admin/setup/__init__.py b/web/admin/setup/__init__.py
index 7cd824ba3..e8ab0677a 100644
--- a/web/admin/setup/__init__.py
+++ b/web/admin/setup/__init__.py
@@ -11,4 +11,5 @@
 from .user import init_admin_user
 from .option import init_option
 from .init_db_system import init_db_system
+from .init_cmd import init_cmd
 
diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
new file mode 100644
index 000000000..434528a09
--- /dev/null
+++ b/web/admin/setup/init_cmd.py
@@ -0,0 +1,54 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+import shutil
+
+import core.mw as mw
+
+def contentReplace(src, dst):
+    content = mw.readFile(src)
+    content = content.replace("{$SERVER_PATH}", mw.getFatherDir())
+
+    content += "\n# make:{0}".format(mw.formatDate())
+    mw.writeFile(dst, content)
+
+
+def init_cmd():
+    script = mw.getPanelDir() + '/scripts/init.d/mw.tpl'
+    script_bin = mw.getPanelDir() + '/scripts/init.d/mw'
+    contentReplace(script, script_bin)
+    mw.execShell('chmod +x ' + script_bin)
+
+    # 在linux系统中,确保/etc/init.d存在
+    if not mw.isAppleSystem() and not os.path.exists("/etc/rc.d/init.d"):
+        mw.execShell('mkdir -p /etc/rc.d/init.d')
+
+    if not mw.isAppleSystem() and not os.path.exists("/etc/init.d"):
+        mw.execShell('mkdir -p /etc/init.d')
+
+    # initd
+    if os.path.exists('/etc/rc.d/init.d'):
+        initd_bin = '/etc/rc.d/init.d/mw'
+        if not os.path.exists(initd_bin):
+            shutil.copyfile(script_bin, initd_bin)
+            mw.execShell('chmod +x ' + initd_bin)
+        # 加入自启动
+        mw.execShell('which chkconfig && chkconfig --add mw')
+
+    if os.path.exists('/etc/init.d'):
+        initd_bin = '/etc/init.d/mw'
+        if not os.path.exists(initd_bin):
+            import shutil
+            shutil.copyfile(script_bin, initd_bin)
+            mw.execShell('chmod +x ' + initd_bin)
+        # 加入自启动
+        mw.execShell('which update-rc.d && update-rc.d -f mw defaults')
+    return True
\ No newline at end of file
diff --git a/web/admin/setup/option.py b/web/admin/setup/option.py
index 10d739875..87f691471 100644
--- a/web/admin/setup/option.py
+++ b/web/admin/setup/option.py
@@ -34,9 +34,6 @@ def init_option():
     # basic auth 配置
     model.setOption('basic_auth', json.dumps({'open':False}))
 
-
-
-
     # 开启后台任务
     # model.setOption('run_bg_task', 'close')
 
@@ -50,7 +47,10 @@ def init_option():
 
     # 初始化安全路径
     model.setOption('admin_path', mw.getRandomString(8))
-    model.setOption('server_ip', '127.0.0.1')
+
+
+    ip = mw.getLocalIp()
+    model.setOption('server_ip', ip)
 
     # 默认备份目录
     model.setOption('backup_path', mw.getFatherDir()+'/backup')
diff --git a/web/admin/task/__init__.py b/web/admin/task/__init__.py
index 2cb6ea08e..e90f33a89 100644
--- a/web/admin/task/__init__.py
+++ b/web/admin/task/__init__.py
@@ -17,6 +17,7 @@ from admin.model import db,Tasks
 from admin.user_login_check import panel_login_required
 
 import core.mw as mw
+import utils.task as MwTasks
 
 blueprint = Blueprint('task', __name__, url_prefix='/task', template_folder='../../templates/default')
 
@@ -98,9 +99,16 @@ def get_task_speed():
         data['isDownload'] = False
 
 
-    data['task'] = model.getTaskList(status=-1)
+    data['task'] = model.getTaskRunList()
     return data
-    
+
+@blueprint.route('/remove_task', endpoint='remove_task', methods=['POST'])
+@panel_login_required
+def remove_task():
+    task_id = request.form.get('id', '')
+    if task_id == '':
+        return mw.returnData(False, '任务ID不能为空!')
+    return MwTasks.removeTask(task_id)
 
 
     
\ No newline at end of file
diff --git a/web/core/mw.py b/web/core/mw.py
index 840595c44..287c9bae7 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -199,10 +199,6 @@ def writeFile(filename, content, mode='w+'):
     except Exception as e:
         return False
 
-def triggerTask():
-    isTask = getPanelDir() + '/tmp/panelTask.pl'
-    writeFile(isTask, 'True')
-
 
 def systemdCfgDir():
     # ubuntu
@@ -263,6 +259,39 @@ def getClientIp():
     from flask import request
     return request.remote_addr.replace('::ffff:', '')
 
+def getLocalIp():
+    filename = getPanelDir()+'/data/iplist.txt'
+    try:
+        ipaddress = readFile(filename)
+        if not ipaddress or ipaddress == '127.0.0.1':
+            cmd = "curl --insecure -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 --insecure -6 -sS --connect-timeout 5 -m 60 https://v6r.ipip.net/?format=text"
+        ip = execShell(cmd)
+        result = ip[0].strip()
+        if result == '':
+            return '127.0.0.1'
+        writeFile(filename, result)
+        return result
+    finally:
+        pass
+    return '127.0.0.1'
+
+
+def inArray(arrays, searchStr):
+    # 搜索数据中是否存在
+    for key in arrays:
+        if key == searchStr:
+            return True
+
+    return False
 
 def getJson(data):
     import json
@@ -541,13 +570,6 @@ def isNumber(s):
 
     return False
 
-def isRestart():
-    # 检查是否允许重启
-    num = M('tasks').where('status!=?', ('1',)).count()
-    if num > 0:
-        return False
-    return True
-    
 # 检查端口是否占用
 def isOpenPort(port):
     import socket
@@ -633,13 +655,33 @@ def deDoubleCrypt(key, strings):
         writeFileLog(getTracebackInfo())
         return strings
 
-# ------------------------------ openresty start -----------------------------
+# ------------------------------   panel start  -----------------------------
+
+def isRestart():
+    # 检查是否允许重启
+    num = M('tasks').where('status!=?', ('1',)).count()
+    if num > 0:
+        return False
+    return True
+
+def triggerTask():
+    isTask = getPanelDir() + '/tmp/panelTask.pl'
+    writeFile(isTask, 'True')
+
+def restartTask():
+    initd = getPanelDir() + '/scripts/init.d/mw'
+    if os.path.exists(initd):
+        cmd = initd + ' ' + 'restart_task'
+        os.system(cmd)
+    return True
 
 def restartMw():
     restart_file = getPanelDir()+'/data/restart.pl'
     writeFile(restart_file, 'True')
     return True
+# ------------------------------    panel end    -----------------------------
 
+# ------------------------------ openresty start -----------------------------
 def restartWeb():
     return opWeb("reload")
 
@@ -667,6 +709,7 @@ def opWeb(method):
         return True
 
     return False
+
 def opLuaMake(cmd_name):
     path = getServerDir() + '/web_conf/nginx/lua/lua.conf'
     root_dir = getServerDir() + '/web_conf/nginx/lua/' + cmd_name
diff --git a/web/static/app/public.js b/web/static/app/public.js
index cb8eaae70..8516508d4 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -941,7 +941,7 @@ function removeTask(b) {
 		time: 0,
 		shade: [0.3, "#000"]
 	});
-	$.post("/files/remove_task", "id=" + b, function(c) {
+	$.post("/task/remove_task", "id=" + b, function(c) {
 		layer.close(a);
 		layer.msg(c.msg, {
 			icon: c.status ? 1 : 5
diff --git a/web/thisdb/__init__.py b/web/thisdb/__init__.py
new file mode 100644
index 000000000..ebaf86032
--- /dev/null
+++ b/web/thisdb/__init__.py
@@ -0,0 +1,11 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+from .option import *
\ No newline at end of file
diff --git a/web/thisdb/option.py b/web/thisdb/option.py
new file mode 100644
index 000000000..1c197d1ce
--- /dev/null
+++ b/web/thisdb/option.py
@@ -0,0 +1,28 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+
+import core.mw as mw
+
+def getOption(name,
+    type: str | None = 'common',
+    default : str | None = None
+) -> str:
+    '''
+    获取配置的值
+    :name -> str 名称 (必填)
+    :type -> str 类型 (可选|默认common)
+    :default -> str 默认值 (可选)
+    '''
+    data = mw.M('option').field('name').where('name=? and type=?',(name, type,)).getField('value')
+
+    if len(data) == 0:
+        return default
+    return data
\ No newline at end of file
diff --git a/web/utils/file.py b/web/utils/file.py
index 4638252ef..56aa0a13a 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -397,4 +397,4 @@ def setMode(path):
     s_path = os.path.dirname(path)
     p_stat = os.stat(s_path)
     os.chown(path, p_stat.st_uid, p_stat.st_gid)
-    os.chmod(path, p_stat.st_mode)
\ No newline at end of file
+    os.chmod(path, p_stat.st_mode)
diff --git a/web/utils/task.py b/web/utils/task.py
new file mode 100644
index 000000000..49e269647
--- /dev/null
+++ b/web/utils/task.py
@@ -0,0 +1,54 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+import pwd
+import time
+
+import core.mw as mw
+
+# 删除进程下的所有进程
+def removeTaskRecursion(pid):
+    cmd = "ps -ef|grep %s | grep -v grep |sed -n '2,1p' | awk '{print $2}'" % pid
+    sub_pid = mw.execShell(cmd)
+    if sub_pid[0].strip() == '':
+        return 'ok'
+
+    if sub_pid[0].strip() == pid :
+        return 'ok'
+
+    removeTaskRecursion(sub_pid[0].strip())
+    mw.execShell('kill -9 ' + sub_pid[0].strip())
+    return sub_pid[0].strip()
+
+# 删除任务
+def removeTask(task_id):
+    try:
+        name = mw.M('tasks').where('id=?', (task_id,)).getField('name')
+        status = mw.M('tasks').where('id=?', (task_id,)).getField('status')
+        mw.M('tasks').delete(task_id)
+        if str(status) == '-1':
+            cmd = "ps aux | grep 'panel_task.py' | grep -v grep |awk '{print $2}'"
+            task_pid = mw.execShell(cmd)
+            task_list = task_pid[0].strip().split("\n")
+            for i in range(len(task_list)):
+                removeTaskRecursion(task_list[i])
+                t = mw.execShell('kill -9 ' + task_list[i])
+                print(t)
+            mw.triggerTask()
+            mw.restartTask()
+    except Exception as e:
+        mw.restartTask()
+
+    # 删除日志
+    task_log = mw.getPanelDir() + "/tmp/panelTask.pl"
+    if os.path.exists(task_log):
+        os.remove(task_log)
+    return mw.returnData(True, '任务已删除!')
\ No newline at end of file

From 514518e278dc12d3486c5dce7357b5615b64c3c9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 18:36:16 +0800
Subject: [PATCH 069/965] Update user.py

---
 web/admin/setup/user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/setup/user.py b/web/admin/setup/user.py
index f31f85a27..e18008d30 100644
--- a/web/admin/setup/user.py
+++ b/web/admin/setup/user.py
@@ -21,7 +21,7 @@ def init_admin_user():
     if not data:
         name = mw.getRandomString(8).lower()
         password = mw.getRandomString(8).lower()
-        file_pass_pl = mw.getPanelDataDir() + '/default_new.pl'
+        file_pass_pl = mw.getPanelDataDir() + '/default.pl'
         mw.writeFile(file_pass_pl, password)
         insert_time = mw.formatDate()
         login_ip = '127.0.0.1'

From 063263d924fb03b8cb95652f5d09e47398acf331 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 18:45:36 +0800
Subject: [PATCH 070/965] update

---
 panel_tools.py         |  6 ++--
 web/thisdb/__init__.py |  3 +-
 web/thisdb/user.py     | 62 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 web/thisdb/user.py

diff --git a/panel_tools.py b/panel_tools.py
index 89208170a..c8491bbcc 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -256,14 +256,14 @@ def set_panel_username(username=None):
             print("|-错误，不能使用过于简单的用户名")
             return
 
-        model.setUserByRoot(name=username)
+        thisdb.setUserByRoot(name=username)
         print("|-新用户名: %s" % username)
         return
 
-    info = model.getUserByRoot()
+    info = thisdb.getUserByRoot()
     if info['name'] == 'admin':
         username = mw.getRandomString(8).lower()
-        model.setUserByRoot(name=username)
+        thisdb.setUserByRoot(name=username)
     print('|-用户名: ' + info['name'])
 
 
diff --git a/web/thisdb/__init__.py b/web/thisdb/__init__.py
index ebaf86032..8892e9129 100644
--- a/web/thisdb/__init__.py
+++ b/web/thisdb/__init__.py
@@ -8,4 +8,5 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
-from .option import *
\ No newline at end of file
+from .option import *
+from .user import *
\ No newline at end of file
diff --git a/web/thisdb/user.py b/web/thisdb/user.py
new file mode 100644
index 000000000..0270a9021
--- /dev/null
+++ b/web/thisdb/user.py
@@ -0,0 +1,62 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import core.mw as mw
+
+
+def getUserById(id,
+) -> None:
+    '''
+    获取用户信息通过用户名
+    '''
+    users_field = 'id,name,password,login_ip,login_time,phone,email,add_time,update_time'
+    item =  mw.M('users').field(users_field).where('id=?', (1,)).select()
+    if len(item) == 0:
+        return None
+    row = {}
+    row['id'] = item[0]['id']
+    row['name'] = item[0]['name']
+    row['password'] = item[0]['password']
+    row['login_ip'] = item[0]['login_ip']
+    row['login_time'] = item[0]['login_time']
+    row['phone'] = item[0]['phone']
+    row['email'] = item[0]['email']
+    row['add_time'] = item[0]['add_time']
+    row['update_time'] = item[0]['update_time']
+    return row
+
+
+def getUserByRoot() -> None:
+    '''
+    获取用户信息通过用户名
+    '''
+    return getUserById(1)
+
+def setUserByRoot(
+    name: str | None = None,
+    password: str | None = None,
+) -> bool:
+    '''
+    设置配置的值
+    :name -> str 名称 (必填)
+    :value -> object值 (必填)
+    :type -> str 类型 (可选|默认common)
+    '''
+    data = {}
+    if name is not None:
+        mw.M('users').where('id=?', (1,)).setField('username', name)
+
+    if password is not None:
+        pwd = mw.md5(password)
+        mw.M('users').where('id=?', (1,)).setField('password', pwd)
+
+    if not data:
+        return False
+    return True
\ No newline at end of file

From 91612a84657ef3295e7f4c4edc2a3e9236f0a936 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 18:46:41 +0800
Subject: [PATCH 071/965] Update user.py

---
 web/thisdb/user.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/web/thisdb/user.py b/web/thisdb/user.py
index 0270a9021..e95ab8975 100644
--- a/web/thisdb/user.py
+++ b/web/thisdb/user.py
@@ -10,6 +10,26 @@
 
 import core.mw as mw
 
+def getUserByName(name,
+) -> None:
+    '''
+    获取用户信息通过用户名
+    '''
+    users_field = 'id,name,password,login_ip,login_time,phone,email,add_time,update_time'
+    item =  mw.M('users').field(users_field).where('name=?', (name,)).select()
+    if len(item) == 0:
+        return None
+    row = {}
+    row['id'] = item[0]['id']
+    row['name'] = item[0]['name']
+    row['password'] = item[0]['password']
+    row['login_ip'] = item[0]['login_ip']
+    row['login_time'] = item[0]['login_time']
+    row['phone'] = item[0]['phone']
+    row['email'] = item[0]['email']
+    row['add_time'] = item[0]['add_time']
+    row['update_time'] = item[0]['update_time']
+    return row
 
 def getUserById(id,
 ) -> None:

From 7c696c24f3ac9a1d877cf91463c8bb788a79cf2a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 18:48:17 +0800
Subject: [PATCH 072/965] Update panel_tools.py

---
 panel_tools.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panel_tools.py b/panel_tools.py
index c8491bbcc..413d39917 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -230,7 +230,7 @@ def set_panel_pwd(password, ncli=False):
 
 def show_panel_pwd():
     # 面板密码展示
-    info = model.getUserByRoot()
+    info = thisdb.getUserByRoot()
     defailt_pwd_file = mw.getPanelDir()+'/data/default.pl'
     pwd = ''
     if os.path.exists(defailt_pwd_file):

From 0c6fb48989000cac8681b455aa78cecc28e32321 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 18:57:50 +0800
Subject: [PATCH 073/965] update

---
 scripts/init.d/mw.tpl | 2 +-
 web/core/mw.py        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 236c57a63..79a566f59 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -104,7 +104,7 @@ mw_start()
 # /www/server/mdserver-web/tmp/panelTask.pl && service mw restart_task
 mw_stop_task()
 {
-    if [ -f ${PANEL_DIR}/tmp/panelTask.pl ];then
+    if [ -f ${PANEL_DIR}/logs/panel_task.lock ];then
         echo -e "\033[32mthe task is running and cannot be stopped\033[0m"
         exit 0
     fi
diff --git a/web/core/mw.py b/web/core/mw.py
index 287c9bae7..7f581af31 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -665,7 +665,7 @@ def isRestart():
     return True
 
 def triggerTask():
-    isTask = getPanelDir() + '/tmp/panelTask.pl'
+    isTask = getPanelDir() + '/logs/panel_task.lock'
     writeFile(isTask, 'True')
 
 def restartTask():

From 52e98f6d4110660e492937d570ab1b98e27f48f7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 19:15:37 +0800
Subject: [PATCH 074/965] update

---
 web/admin/setting/setting.py | 14 ++++++++++++++
 web/utils/config.py          |  8 ++++++++
 2 files changed, 22 insertions(+)

diff --git a/web/admin/setting/setting.py b/web/admin/setting/setting.py
index 1019daa07..ed4910d31 100644
--- a/web/admin/setting/setting.py
+++ b/web/admin/setting/setting.py
@@ -183,6 +183,20 @@ def close_panel():
     model.setOption('admin_close','no')
     return mw.returnData(True, '关闭面板成功!')
 
+# 设置IPV6状态
+@blueprint.route('/set_ipv6_status', endpoint='set_ipv6_status', methods=['POST'])
+@panel_login_required
+def set_ipv6_status():
+    __file = mw.getCommonFile()
+    ipv6_file = __file['ipv6']
+    if os.path.exists(ipv6_file):
+        os.remove(ipv6_file)
+        mw.returnData('面板设置', '关闭面板IPv6兼容!')
+    else:
+        mw.writeFile(ipv6_file, 'True')
+        mw.writeLog('面板设置', '开启面板IPv6兼容!')
+    mw.restartMw()
+    return mw.returnData(True, '设置成功!')
 
 # 设置站点状态
 @blueprint.route('/set_port', endpoint='set_port', methods=['POST'])
diff --git a/web/utils/config.py b/web/utils/config.py
index e11857bf5..5bdb8b049 100644
--- a/web/utils/config.py
+++ b/web/utils/config.py
@@ -8,6 +8,8 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
+import os
+
 from admin import model
 
 import core.mw as mw
@@ -53,6 +55,12 @@ def getGlobalVar():
     data['site_count'] = model.getSitesCount()
     data['port'] = mw.getHostPort()
 
+    __file = mw.getCommonFile()
+    if os.path.exists(__file['ipv6']):
+        data['ipv6'] = 'checked'
+    else:
+        data['ipv6'] = ''
+
     # 获取未认证状态信息
     unauthorized_status = model.getOption('unauthorized_status', default='0')
     data['unauthorized_status'] = getUnauthStatus(code=unauthorized_status)

From 63145c736f03e9fc37cdb37302ea656b85ccea28 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 19:33:16 +0800
Subject: [PATCH 075/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index 434528a09..2818b3a2d 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -37,18 +37,19 @@ def init_cmd():
     # initd
     if os.path.exists('/etc/rc.d/init.d'):
         initd_bin = '/etc/rc.d/init.d/mw'
-        if not os.path.exists(initd_bin):
-            shutil.copyfile(script_bin, initd_bin)
-            mw.execShell('chmod +x ' + initd_bin)
+        print(script_bin, initd_bin)
+        shutil.copyfile(script_bin, initd_bin)
+        mw.execShell('chmod +x ' + initd_bin)
+
+
         # 加入自启动
         mw.execShell('which chkconfig && chkconfig --add mw')
 
     if os.path.exists('/etc/init.d'):
         initd_bin = '/etc/init.d/mw'
-        if not os.path.exists(initd_bin):
-            import shutil
-            shutil.copyfile(script_bin, initd_bin)
-            mw.execShell('chmod +x ' + initd_bin)
+        print(script_bin, initd_bin)
+        shutil.copyfile(script_bin, initd_bin)
+        mw.execShell('chmod +x ' + initd_bin)
         # 加入自启动
         mw.execShell('which update-rc.d && update-rc.d -f mw defaults')
     return True
\ No newline at end of file

From 0f89246b17659c4d785aebddde60bdbca55908e7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 19:36:09 +0800
Subject: [PATCH 076/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index 2818b3a2d..cf674617a 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -37,7 +37,6 @@ def init_cmd():
     # initd
     if os.path.exists('/etc/rc.d/init.d'):
         initd_bin = '/etc/rc.d/init.d/mw'
-        print(script_bin, initd_bin)
         shutil.copyfile(script_bin, initd_bin)
         mw.execShell('chmod +x ' + initd_bin)
 
@@ -47,7 +46,6 @@ def init_cmd():
 
     if os.path.exists('/etc/init.d'):
         initd_bin = '/etc/init.d/mw'
-        print(script_bin, initd_bin)
         shutil.copyfile(script_bin, initd_bin)
         mw.execShell('chmod +x ' + initd_bin)
         # 加入自启动

From 6114bcd9bcfdab60cb9b10efe9f9e8bf8c804038 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 19:36:17 +0800
Subject: [PATCH 077/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index cf674617a..d13e6785f 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -39,8 +39,6 @@ def init_cmd():
         initd_bin = '/etc/rc.d/init.d/mw'
         shutil.copyfile(script_bin, initd_bin)
         mw.execShell('chmod +x ' + initd_bin)
-
-
         # 加入自启动
         mw.execShell('which chkconfig && chkconfig --add mw')
 

From 8f0be8a475a6b1858a98af83cf45428c9586ef8a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 19:39:49 +0800
Subject: [PATCH 078/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index d13e6785f..fd75bc2fb 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -15,7 +15,7 @@ import core.mw as mw
 
 def contentReplace(src, dst):
     content = mw.readFile(src)
-    content = content.replace("{$SERVER_PATH}", mw.getFatherDir())
+    content = content.replace("{$SERVER_PATH}", mw.getPanelDir())
 
     content += "\n# make:{0}".format(mw.formatDate())
     mw.writeFile(dst, content)

From 0b6cdec4ce4d6e899c574fecefb0f85282de2364 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 19:50:58 +0800
Subject: [PATCH 079/965] Update __init__.py

---
 web/admin/__init__.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 55b5d89ba..949734855 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -99,9 +99,13 @@ setup.init_db_system()
 
 app.config['BASIC_AUTH_OPEN'] = False
 with app.app_context():
-    basic_auth = model.getOptionByJson('basic_auth', default={'open':False})
-    if basic_auth['open']:
-        app.config['BASIC_AUTH_OPEN'] = True
+    try:
+        basic_auth = model.getOptionByJson('basic_auth', default={'open':False})
+        if basic_auth['open']:
+            app.config['BASIC_AUTH_OPEN'] = True
+    except Exception as e:
+        pass
+    
 
 
 # 加载模块

From 044eb2b65fdb2c1d3283799a25f71f90c6987a5e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 20:21:35 +0800
Subject: [PATCH 080/965] up

---
 panel_tools.py         |  6 +++---
 web/thisdb/__init__.py |  3 ++-
 web/thisdb/init.py     | 13 +++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 web/thisdb/init.py

diff --git a/panel_tools.py b/panel_tools.py
index 413d39917..5e66b6458 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -237,9 +237,9 @@ def show_panel_pwd():
         pwd = mw.readFile(defailt_pwd_file).strip()
 
     if mw.md5(pwd) == info['password']:
-        print('password: ' + pwd)
+        print('|-password: ' + pwd)
         return
-    print("password has been changed!")
+    print("* password has been changed!")
 
 def show_panel_adminpath():
     admin_path = thisdb.getOption('admin_path')
@@ -264,7 +264,7 @@ def set_panel_username(username=None):
     if info['name'] == 'admin':
         username = mw.getRandomString(8).lower()
         thisdb.setUserByRoot(name=username)
-    print('|-用户名: ' + info['name'])
+    print('|-username: ' + info['name'])
 
 
 def getServerIp():
diff --git a/web/thisdb/__init__.py b/web/thisdb/__init__.py
index 8892e9129..47539da16 100644
--- a/web/thisdb/__init__.py
+++ b/web/thisdb/__init__.py
@@ -8,5 +8,6 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
+from .init import *
 from .option import *
-from .user import *
\ No newline at end of file
+from .user import *
diff --git a/web/thisdb/init.py b/web/thisdb/init.py
new file mode 100644
index 000000000..6fa7431ff
--- /dev/null
+++ b/web/thisdb/init.py
@@ -0,0 +1,13 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+
+def initPanelData():
+	pass
\ No newline at end of file

From 39603f367f3960e29443baff97d1060fa8c2db44 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 20:24:45 +0800
Subject: [PATCH 081/965] Update panel_tools.py

---
 panel_tools.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index 5e66b6458..f54266e9a 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -222,8 +222,8 @@ def set_panel_pwd(password, ncli=False):
     info = model.getUserByRoot()
     model.setUserByRoot(password=password)
     if ncli:
-        print("|-用户名: " + info['name'])
-        print("|-新密码: " + password)
+        print("|-username: " + info['name'])
+        print("|-password: " + password)
     else:
         print(username)
 
@@ -257,7 +257,7 @@ def set_panel_username(username=None):
             return
 
         thisdb.setUserByRoot(name=username)
-        print("|-新用户名: %s" % username)
+        print("|-username: %s" % username)
         return
 
     info = thisdb.getUserByRoot()

From c77d409317ff8abe3f8b575ea541f4b40c09ff0d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 21:16:13 +0800
Subject: [PATCH 082/965] up

---
 web/admin/setting/setting.py |  3 ++-
 web/thisdb/__init__.py       |  1 +
 web/thisdb/option.py         | 34 ++++++++++++++++++++++++++++++++--
 web/thisdb/sites.py          | 15 +++++++++++++++
 web/utils/config.py          | 25 +++++++++++++------------
 5 files changed, 63 insertions(+), 15 deletions(-)
 create mode 100644 web/thisdb/sites.py

diff --git a/web/admin/setting/setting.py b/web/admin/setting/setting.py
index ed4910d31..72010d808 100644
--- a/web/admin/setting/setting.py
+++ b/web/admin/setting/setting.py
@@ -191,6 +191,7 @@ def set_ipv6_status():
     ipv6_file = __file['ipv6']
     if os.path.exists(ipv6_file):
         os.remove(ipv6_file)
+        mw.writeLog('面板设置', '关闭面板IPv6兼容!')
         mw.returnData('面板设置', '关闭面板IPv6兼容!')
     else:
         mw.writeFile(ipv6_file, 'True')
@@ -222,7 +223,7 @@ def set_port():
         # firewall_api.firewall_api().addAcceptPort(port)
         # firewall_api.firewall_api().firewallReload()
 
-        # system_api.system_api().restartMw()
+        mw.restartMw()
 
     return mw.returnJson(True, '端口保存成功!')
  
\ No newline at end of file
diff --git a/web/thisdb/__init__.py b/web/thisdb/__init__.py
index 47539da16..fa43ddfe9 100644
--- a/web/thisdb/__init__.py
+++ b/web/thisdb/__init__.py
@@ -11,3 +11,4 @@
 from .init import *
 from .option import *
 from .user import *
+from .sites import *
diff --git a/web/thisdb/option.py b/web/thisdb/option.py
index 1c197d1ce..033a13925 100644
--- a/web/thisdb/option.py
+++ b/web/thisdb/option.py
@@ -8,7 +8,8 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
-
+import os
+import json
 import core.mw as mw
 
 def getOption(name,
@@ -25,4 +26,33 @@ def getOption(name,
 
     if len(data) == 0:
         return default
-    return data
\ No newline at end of file
+    return data
+
+
+def getOptionByJson(name,
+    type: str | None = 'common',
+    default : object | None = None
+) -> object:
+    '''
+    获取配置的值,返回对象类型
+    :name -> str 名称 (必填)
+    :type -> str 类型 (可选|默认common)
+    :default -> str 默认值 (可选)
+    '''
+    data = mw.M('option').field('name').where('name=? and type=?',(name, type,)).getField('value')
+    if len(data) == 0:
+        return default
+    if data is not None:
+        return json.loads(data)
+
+def setOption(name, value,
+    type: str | None = 'common'
+) -> bool:
+    '''
+    设置配置的值
+    :name -> str 名称 (必填)
+    :value -> object值 (必填)
+    :type -> str 类型 (可选|默认common)
+    '''
+    mw.M('option').field('name').where('name=? and type=?',(name, type,)).setField('value', value)
+    return True
\ No newline at end of file
diff --git a/web/thisdb/sites.py b/web/thisdb/sites.py
new file mode 100644
index 000000000..b1f5a7082
--- /dev/null
+++ b/web/thisdb/sites.py
@@ -0,0 +1,15 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import core.mw as mw
+
+def getSitesCount():
+	return mw.M('sites').count()
+
diff --git a/web/utils/config.py b/web/utils/config.py
index 5bdb8b049..878dc74d3 100644
--- a/web/utils/config.py
+++ b/web/utils/config.py
@@ -13,6 +13,7 @@ import os
 from admin import model
 
 import core.mw as mw
+import thisdb
 
 def getUnauthStatus(
     code: str | None = '0'
@@ -44,15 +45,15 @@ def getGlobalVar():
     获取全局变量
     '''
     data = {}
-    data['title'] = model.getOption('title', default='后羿面板')
-    data['ip'] = model.getOption('server_ip', default='127.0.0.1')
+    data['title'] = thisdb.getOption('title', default='后羿面板')
+    data['ip'] = thisdb.getOption('server_ip', default='127.0.0.1')
 
-    data['site_path'] = model.getOption('site_path', default=mw.getFatherDir()+'/wwwroot')
-    data['backup_path'] = model.getOption('backup_path', default=mw.getFatherDir()+'/backup')
-    data['admin_path'] = '/'+model.getOption('admin_path', default='')
-    data['debug'] = model.getOption('debug', default='close')
-    data['admin_close'] = model.getOption('admin_close', default='no')
-    data['site_count'] = model.getSitesCount()
+    data['site_path'] = thisdb.getOption('site_path', default=mw.getFatherDir()+'/wwwroot')
+    data['backup_path'] = thisdb.getOption('backup_path', default=mw.getFatherDir()+'/backup')
+    data['admin_path'] = '/'+thisdb.getOption('admin_path', default='')
+    data['debug'] = thisdb.getOption('debug', default='close')
+    data['admin_close'] = thisdb.getOption('admin_close', default='no')
+    data['site_count'] = thisdb.getSitesCount()
     data['port'] = mw.getHostPort()
 
     __file = mw.getCommonFile()
@@ -62,16 +63,16 @@ def getGlobalVar():
         data['ipv6'] = ''
 
     # 获取未认证状态信息
-    unauthorized_status = model.getOption('unauthorized_status', default='0')
+    unauthorized_status = thisdb.getOption('unauthorized_status', default='0')
     data['unauthorized_status'] = getUnauthStatus(code=unauthorized_status)
-    data['basic_auth'] = model.getOptionByJson('basic_auth', default={'open':False})
+    data['basic_auth'] = thisdb.getOptionByJson('basic_auth', default={'open':False})
 
     # 服务器时间
     sformat = 'date +"%Y-%m-%d %H:%M:%S %Z %z"'
     data['systemdate'] = mw.execShell(sformat)[0].strip()
 
 
-    data['hook_menu'] = model.getOptionByJson('hook_menu',type='hook',default=[])
-    data['hook_global_static'] = model.getOptionByJson('hook_global_static',type='hook',default=[])
+    data['hook_menu'] = thisdb.getOptionByJson('hook_menu',type='hook',default=[])
+    data['hook_global_static'] = thisdb.getOptionByJson('hook_global_static',type='hook',default=[])
     
     return data
\ No newline at end of file

From 3ae8f0253e3c7e3a0954cb8f3fa956c4b067b65b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 22:21:41 +0800
Subject: [PATCH 083/965] up

---
 class/core/crontab_api.py            |  3 +--
 data/sql/default.sql                 | 33 +++++++++++++----------
 web/admin/crontab/__init__.py        | 17 +++++++++++-
 web/admin/plugins/__init__.py        |  2 +-
 web/admin/setting/setting.py         |  6 +++--
 web/admin/site/__init__.py           |  2 +-
 web/thisdb/__init__.py               |  1 +
 web/thisdb/tasks.py                  | 39 ++++++++++++++++++++++++++++
 web/utils/crontab.py                 |  9 +++++++
 web/utils/firewall.py                |  2 +-
 web/utils/{mwplugin.py => plugin.py} | 19 +++++++-------
 11 files changed, 103 insertions(+), 30 deletions(-)
 create mode 100644 web/thisdb/tasks.py
 create mode 100644 web/utils/crontab.py
 rename web/utils/{mwplugin.py => plugin.py} (97%)

diff --git a/class/core/crontab_api.py b/class/core/crontab_api.py
index c9f7d682d..ba77196a2 100755
--- a/class/core/crontab_api.py
+++ b/class/core/crontab_api.py
@@ -500,8 +500,7 @@ class crontab_api:
 
     # 取任务构造Month
     def month(self, param):
-        cuonConfig = "{0} {1} {2} * * ".format(
-            param['minute'], param['hour'], param['where1'])
+        cuonConfig = "{0} {1} {2} * * ".format(param['minute'], param['hour'], param['where1'])
         return cuonConfig
 
     # 取执行脚本
diff --git a/data/sql/default.sql b/data/sql/default.sql
index daa5e4521..1acdaa795 100755
--- a/data/sql/default.sql
+++ b/data/sql/default.sql
@@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS `backup` (
   `pid` INTEGER,
   `filename` TEXT,
   `size` INTEGER,
-  `addtime` TEXT
+  `add_time` TEXT
 );
 
 CREATE TABLE IF NOT EXISTS `binding` (
@@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS `binding` (
   `domain` TEXT,
   `path` TEXT,
   `port` INTEGER,
-  `addtime` TEXT
+  `add_time` TEXT
 );
 
 
@@ -27,7 +27,6 @@ CREATE TABLE IF NOT EXISTS `crontab` (
   `where_hour` INTEGER,
   `where_minute` INTEGER,
   `echo` TEXT,
-  `addtime` TEXT,
   `status` INTEGER DEFAULT '1',
   `save` INTEGER DEFAULT '3',
   `backup_to` TEXT DEFAULT 'off', 
@@ -35,6 +34,7 @@ CREATE TABLE IF NOT EXISTS `crontab` (
   `sbody` TEXT,
   'stype' TEXT,
   `urladdress` TEXT
+  `add_time` TEXT
 );
 
 CREATE TABLE IF NOT EXISTS `firewall` (
@@ -42,12 +42,12 @@ CREATE TABLE IF NOT EXISTS `firewall` (
   `port` TEXT,
   `protocol` TEXT DEFAULT 'tcp',
   `ps` TEXT,
-  `addtime` TEXT
+  `add_time` TEXT
 );
 
 ALTER TABLE `firewall` ADD COLUMN `protocol` TEXT DEFAULT 'tcp';
 
-INSERT INTO `firewall` (`id`, `port`, `protocol`, `ps`, `addtime`) VALUES
+INSERT INTO `firewall` (`id`, `port`, `protocol`, `ps`, `add_time`) VALUES
 (1, '80',  'tcp','网站默认端口', '0000-00-00 00:00:00'),
 (2, '443', 'tcp/udp', 'HTTPS', '0000-00-00 00:00:00');
 
@@ -58,7 +58,7 @@ CREATE TABLE IF NOT EXISTS `logs` (
   `type` TEXT,
   `log` TEXT,
   `uid` INTEGER DEFAULT '1',
-  `addtime` TEXT
+  `add_time` TEXT
 );
 ALTER TABLE `logs` ADD COLUMN `uid` INTEGER DEFAULT '1';
 
@@ -73,7 +73,7 @@ CREATE TABLE IF NOT EXISTS `sites` (
   `edate` TEXT,
   `ssl_effective_date` TEXT,
   `ssl_expiration_date` TEXT,
-  `addtime` TEXT
+  `add_time` TEXT
 );
 
 ALTER TABLE `sites` ADD COLUMN `ssl_effective_date` TEXT DEFAULT '';
@@ -89,7 +89,7 @@ CREATE TABLE IF NOT EXISTS `domain` (
   `pid` INTEGER,
   `name` TEXT,
   `port` INTEGER,
-  `addtime` TEXT
+  `add_time` TEXT
 );
 
 CREATE TABLE IF NOT EXISTS `users` (
@@ -110,11 +110,11 @@ CREATE TABLE IF NOT EXISTS `tasks` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `name` 			TEXT,
   `type`			TEXT,
-  `status` 		TEXT,
-  `addtime` 	TEXT,
   `start` 	  INTEGER,
   `end` 	    INTEGER,
-  `execstr` 	TEXT
+  `cmd` 	    TEXT,
+  `status`    INTEGER,
+  `add_time`  INTEGER
 );
 
 CREATE TABLE IF NOT EXISTS `temp_login` (
@@ -126,7 +126,7 @@ CREATE TABLE IF NOT EXISTS `temp_login` (
   `login_addr`  REAL,
   `logout_time` INTEGER,
   `expire`  INTEGER,
-  `addtime` INTEGER
+  `add_time` INTEGER
 );
 
 CREATE TABLE IF NOT EXISTS `panel` (
@@ -136,5 +136,12 @@ CREATE TABLE IF NOT EXISTS `panel` (
   `username` TEXT,
   `password` TEXT,
   `click` INTEGER,
-  `addtime` INTEGER
+  `add_time` INTEGER
+);
+
+CREATE TABLE IF NOT EXISTS `option` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` TEXT,
+  `type` TEXT,
+  `value` TEXT
 );
diff --git a/web/admin/crontab/__init__.py b/web/admin/crontab/__init__.py
index f10762d03..782623ca2 100644
--- a/web/admin/crontab/__init__.py
+++ b/web/admin/crontab/__init__.py
@@ -31,4 +31,19 @@ def list():
     clist = Crontab.query.paginate(page=int(page), per_page=size)
     # print(clist)
 
-    return []
\ No newline at end of file
+    return []
+
+
+@blueprint.route('/add', endpoint='add', methods=['GET','POST'])
+@panel_login_required
+def add():
+    page = request.args.get('p', 1)
+    size = 10
+    count = Crontab.query.count()
+    # print(count)
+    clist = Crontab.query.paginate(page=int(page), per_page=size)
+    # print(clist)
+
+    return []
+
+
diff --git a/web/admin/plugins/__init__.py b/web/admin/plugins/__init__.py
index 8e8a1a1e2..77baaf6f1 100644
--- a/web/admin/plugins/__init__.py
+++ b/web/admin/plugins/__init__.py
@@ -14,7 +14,7 @@ import json
 from flask import Blueprint, render_template
 from flask import request
 
-from utils.mwplugin import MwPlugin
+from utils.plugin import plugin as MwPlugin
 from admin.user_login_check import panel_login_required
 
 from admin import model
diff --git a/web/admin/setting/setting.py b/web/admin/setting/setting.py
index 72010d808..f6e663e27 100644
--- a/web/admin/setting/setting.py
+++ b/web/admin/setting/setting.py
@@ -18,9 +18,11 @@ from flask import request
 from admin import model
 from admin.user_login_check import panel_login_required
 
+
 import core.mw as mw
 import utils.config as utils_config
 
+
 # 默认页面
 blueprint = Blueprint('setting', __name__, url_prefix='/setting', template_folder='../../templates')
 @blueprint.route('/index', endpoint='index')
@@ -218,12 +220,12 @@ def set_port():
         msg = mw.getInfo('放行端口[{1}]成功', (port,))
         mw.writeLog("防火墙管理", msg)
         addtime = time.strftime('%Y-%m-%d %X', time.localtime())
-        mw.M('firewall').add('port,ps,addtime', (port, "配置修改", addtime))
+        mw.M('firewall').add('port,ps,add_time', (port, "配置修改", add_time))
 
         # firewall_api.firewall_api().addAcceptPort(port)
         # firewall_api.firewall_api().firewallReload()
 
         mw.restartMw()
 
-    return mw.returnJson(True, '端口保存成功!')
+    return mw.returnData(True, '端口保存成功!')
  
\ No newline at end of file
diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index 4ec0f7db6..d51580a0c 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -16,7 +16,7 @@ from flask import request
 from admin.model import Sites
 from admin.user_login_check import panel_login_required
 
-from utils.mwplugin import MwPlugin
+from utils.plugin import plugin as MwPlugin
 import utils.site as site
 import core.mw as mw
 
diff --git a/web/thisdb/__init__.py b/web/thisdb/__init__.py
index fa43ddfe9..9022ba603 100644
--- a/web/thisdb/__init__.py
+++ b/web/thisdb/__init__.py
@@ -12,3 +12,4 @@ from .init import *
 from .option import *
 from .user import *
 from .sites import *
+from .tasks import *
diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
new file mode 100644
index 000000000..7dcab2a21
--- /dev/null
+++ b/web/thisdb/tasks.py
@@ -0,0 +1,39 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import core.mw as mw
+
+def addTask(
+    name: str | None = '常用任务',
+    cmd: str | None = None,
+    type: str | None = 'execshell',
+    status: int | None = 0,
+):
+    '''
+    添加后台任务
+    :name -> str 类型
+    :cmd -> str 日志内容 (必填)
+    :type -> str 用户ID
+    '''
+    if cmd is None:
+        return False
+
+    add_time = mw.formatDate()
+    insert_data = {
+        'name':name,
+        'type':type,
+        'cmd':cmd,
+        'start':0,
+        'end':0,
+        'status':status,
+        'add_time':add_time,
+    }
+    mw.M('tasks').insert(insert_data)
+    return True
\ No newline at end of file
diff --git a/web/utils/crontab.py b/web/utils/crontab.py
new file mode 100644
index 000000000..b15af4bdb
--- /dev/null
+++ b/web/utils/crontab.py
@@ -0,0 +1,9 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 509b17ae6..e100925ad 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -230,7 +230,7 @@ class Firewall(object):
         if model.getFirewallCountByPort(port) > 0:
             return mw.returnData(False, '您要放行的端口已存在，无需重复放行!')
 
-        model.addFirewall(port,ps=ps,protocol=protocol)
+        model.addFirewall(port, ps=ps,protocol=protocol)
         self.addAcceptPortCmd(port, protocol=protocol)
         self.reload()
         
diff --git a/web/utils/mwplugin.py b/web/utils/plugin.py
similarity index 97%
rename from web/utils/mwplugin.py
rename to web/utils/plugin.py
index 6a2ff736b..81eda5a51 100644
--- a/web/utils/mwplugin.py
+++ b/web/utils/plugin.py
@@ -18,8 +18,9 @@ from admin import model
 
 import core.mw as mw
 import admin.model.option as option
+import thisdb
 
-class pa_thread(threading.Thread):
+class pg_thread(threading.Thread):
 
     def __init__(self, func, args, name=''):
         threading.Thread.__init__(self)
@@ -34,7 +35,7 @@ class pa_thread(threading.Thread):
         except Exception:
             return None
 
-class MwPlugin(object):
+class plugin(object):
 
     def_plugin_type = [
         {
@@ -88,11 +89,11 @@ class MwPlugin(object):
 
     @classmethod
     def instance(cls, *args, **kwargs):
-        if not hasattr(MwPlugin, "_instance"):
-            with MwPlugin._instance_lock:
-                if not hasattr(MwPlugin, "_instance"):
-                    MwPlugin._instance = MwPlugin(*args, **kwargs)
-        return MwPlugin._instance
+        if not hasattr(plugin, "_instance"):
+            with plugin._instance_lock:
+                if not hasattr(plugin, "_instance"):
+                    plugin._instance = plugin(*args, **kwargs)
+        return plugin._instance
 
     """插件类初始化"""
     def __init__(self):
@@ -260,7 +261,7 @@ class MwPlugin(object):
 
         self.hookInstall(info_data)
         title = '{0}[{1}-{2}]'.format(msg_head,name,version)
-        model.addTask(name=title,cmd=exec_bash, status=0)
+        thisdb.addTask(name=title,cmd=exec_bash, status=0)
 
         # 调式日志
         mw.debugLog(exec_bash)
@@ -494,7 +495,7 @@ class MwPlugin(object):
             threads = []
             ntmp_list = range(len(info))
             for i in ntmp_list:
-                t = pa_thread(self.checkStatusThreads,(info[i], i))
+                t = pg_thread(self.checkStatusThreads,(info[i], i))
                 threads.append(t)
 
             for i in ntmp_list:

From 06abfd92f28587a1d307e979bde0aea615e7485b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 23:44:05 +0800
Subject: [PATCH 084/965] update

---
 class/core/mw.py             |  19 +-
 panel_task.py                | 163 +++-----------
 web/core/mw.py               |  71 +++++-
 web/utils/crontab.py         |   2 +
 web/utils/php/fcgi_client.py | 408 +++++++++++++++++++++++++++++++++++
 web/utils/php/fpm.py         | 209 ++++++++++++++++++
 6 files changed, 731 insertions(+), 141 deletions(-)
 create mode 100644 web/utils/php/fcgi_client.py
 create mode 100644 web/utils/php/fpm.py

diff --git a/class/core/mw.py b/class/core/mw.py
index a4441260e..99fe840ab 100755
--- a/class/core/mw.py
+++ b/class/core/mw.py
@@ -602,7 +602,7 @@ def writeLog(stype, msg, args=()):
 
 
 def writeFileLog(msg, path=None, limit_size=50 * 1024 * 1024, save_limit=3):
-    log_file = getServerDir() + '/mdserver-web/logs/debug.log'
+    log_file = getPanelDir() + '/logs/debug.log'
     if path != None:
         log_file = path
 
@@ -632,14 +632,15 @@ def writeFileLog(msg, path=None, limit_size=50 * 1024 * 1024, save_limit=3):
 
 def writeDbLog(stype, msg, args=(), uid=1):
     try:
-        import time
-        import db
-        import json
-        sql = db.Sql()
-        mdate = time.strftime('%Y-%m-%d %X', time.localtime())
-        wmsg = getInfo(msg, args)
-        data = (stype, wmsg, uid, mdate)
-        result = sql.table('logs').add('type,log,uid,addtime', data)
+        add_time = formatDate()
+        format_msg = getInfo(msg, args)
+        add_data = {
+            'type':stype,
+            'msg':format_msg,
+            'uid':uid,
+            'add_time':add_time,
+        }
+        result = M('logs').insert(add_data)
         return True
     except Exception as e:
         return False
diff --git a/panel_task.py b/panel_task.py
index 263e9366f..67344a002 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -27,16 +27,10 @@ sys.path.append(web_dir)
 from admin import app
 from admin import model
 
+import thisdb
 import core.mw as mw
 import core.db as db
 
-
-global pre, timeoutCount, logPath, isTask, oldEdate, isCheck
-pre = 0
-timeoutCount = 0
-isCheck = 0
-oldEdate = None
-
 g_log_file = mw.getPanelTaskLog()
 isTask = mw.getMWLogs() + '/panelTask.pl'
 
@@ -44,30 +38,8 @@ if not os.path.exists(g_log_file):
     os.system("touch " + g_log_file)
 
 def execShell(cmdstring, cwd=None, timeout=None, shell=True):
-    try:
-        global g_log_file
-        import shlex
-        import datetime
-        import subprocess
-
-        if timeout:
-            end_time = datetime.datetime.now() + datetime.timedelta(seconds=timeout)
-
-        cmd = cmdstring + ' > ' + g_log_file + ' 2>&1'
-        sub = subprocess.Popen(cmd, cwd=cwd, stdin=subprocess.PIPE, shell=shell, bufsize=4096)
-        while sub.poll() is None:
-            time.sleep(0.1)
-
-        data = sub.communicate()
-        # python3 fix 返回byte数据
-        if isinstance(data[0], bytes):
-            t1 = str(data[0], encoding='utf-8')
-
-        if isinstance(data[1], bytes):
-            t2 = str(data[1], encoding='utf-8')
-        return (t1, t2)
-    except Exception as e:
-        return (None, None)
+    cmd = cmdstring + ' > ' + g_log_file + ' 2>&1'
+    return mw.execShell(cmd)
 
 def service_cmd(method):
     cmd = '/etc/init.d/mw'
@@ -76,37 +48,12 @@ def service_cmd(method):
         return
 
     cmd = mw.getPanelDir() + '/scripts/init.d/mw'
-    print(cmd)
     if os.path.exists(cmd):
         print(cmd + ' ' + method)
         data = execShell(cmd + ' ' + method)
         print(data)
         return
 
-
-def openresty_cmd(method = 'reload'):
-    # 检查是否安装
-    odir = mw.getServerDir() + '/openresty'
-    if not os.path.exists(odir):
-        return False
-
-    # systemd
-    systemd = mw.systemdCfgDir()+'/openresty.service'
-    if os.path.exists(systemd):
-        execShell('systemctl ' + method + ' openresty')
-        return True
-
-    sys_initd = '/etc/init.d/openresty'
-    if os.path.exists(sys_initd):
-        os.system(sys_initd + ' ' + method)
-        return True
-
-    install_initd = mw.getServerDir()+'/openresty/init.d/openresty'
-    if os.path.exists(install_initd):
-        os.system(install_initd + ' ' + method)
-        return True
-    return False
-
 def mw_async(f):
     def wrapper(*args, **kwargs):
         thr = threading.Thread(target=f, args=args, kwargs=kwargs)
@@ -225,8 +172,8 @@ def siteEdate():
 
 
 def systemTask():
-    from  utils.system import monitor
     # 系统监控任务
+    from  utils.system import monitor
     try:
         while True:
             monitor.instance().run()
@@ -240,10 +187,11 @@ def systemTask():
 # 502错误检查线程
 def check502Task():
     try:
+        check_file = mw.getPanelDir() + '/data/502Task.pl'
         while True:
-            if os.path.exists(mw.getPanelDir() + '/data/502Task.pl'):
+            if os.path.exists(check_file):
                 check502()
-            time.sleep(30)
+            time.sleep(10)
     except:
         time.sleep(30)
         check502Task()
@@ -257,8 +205,8 @@ def check502():
             '82', '83', '84'
         ]
         for ver in verlist:
-            sdir = mw.getServerDir()
-            php_path = sdir + '/php/' + ver + '/sbin/php-fpm'
+            server_dir = mw.getServerDir()
+            php_path = server_dir + '/php/' + ver + '/sbin/php-fpm'
             if not os.path.exists(php_path):
                 continue
             if checkPHPVersion(ver):
@@ -266,13 +214,14 @@ def check502():
             if startPHPVersion(ver):
                 print('检测到PHP-' + ver + '处理异常,已自动修复!')
                 mw.writeLog('PHP守护程序', '检测到PHP-' + ver + '处理异常,已自动修复!')
+
     except Exception as e:
-        print(str(e))
+        mw.writeLog('PHP守护程序', '自动修复异常:'+str(e))
 
 
 # 处理指定PHP版本
 def startPHPVersion(version):
-    sdir = mw.getServerDir()
+    server_dir = mw.getServerDir()
     try:
         # system
         phpService = mw.systemdCfgDir() + '/php' + version + '.service'
@@ -282,8 +231,8 @@ def startPHPVersion(version):
                 return True
 
         # initd
-        fpm = sdir + '/php/init.d/php' + version
-        php_path = sdir + '/php/' + version + '/sbin/php-fpm'
+        fpm = server_dir + '/php/init.d/php' + version
+        php_path = server_dir + '/php/' + version + '/sbin/php-fpm'
         if not os.path.exists(php_path):
             if os.path.exists(fpm):
                 os.remove(fpm)
@@ -296,7 +245,6 @@ def startPHPVersion(version):
         os.system(fpm + ' reload')
         if checkPHPVersion(version):
             return True
-
         # 尝试重启服务
         cgi = '/tmp/php-cgi-' + version + '.sock'
         pid = sdir + '/php/' + version + '/var/run/php-fpm.pid'
@@ -316,47 +264,18 @@ def startPHPVersion(version):
         if os.path.exists(cgi):
             return True
     except Exception as e:
-        print(str(e))
+        mw.writeLog('PHP守护程序', '自动修复异常:'+str(e))
         return True
 
 
-def getFpmConfFile(version):
-    return mw.getServerDir() + '/php/' + version + '/etc/php-fpm.d/www.conf'
-
-
-def getFpmAddress(version):
-    fpm_address = '/tmp/php-cgi-{}.sock'.format(version)
-    php_fpm_file = getFpmConfFile(version)
-    try:
-        content = readFile(php_fpm_file)
-        tmp = re.findall(r"listen\s*=\s*(.+)", content)
-        if not tmp:
-            return fpm_address
-        if tmp[0].find('sock') != -1:
-            return fpm_address
-        if tmp[0].find(':') != -1:
-            listen_tmp = tmp[0].split(':')
-            if bind:
-                fpm_address = (listen_tmp[0], int(listen_tmp[1]))
-            else:
-                fpm_address = ('127.0.0.1', int(listen_tmp[1]))
-        else:
-            fpm_address = ('127.0.0.1', int(tmp[0]))
-        return fpm_address
-    except:
-        return fpm_address
-
-
 def checkPHPVersion(version):
     # 检查指定PHP版本
     try:
-        sock = getFpmAddress(version)
+        sock = mw.getFpmAddress(version)
         data = mw.requestFcgiPHP(sock, '/phpfpm_status_' + version + '?json')
         result = str(data, encoding='utf-8')
     except Exception as e:
         result = 'Bad Gateway'
-
-    # print(version,result)
     # 检查openresty
     if result.find('Bad Gateway') != -1:
         return False
@@ -366,24 +285,9 @@ def checkPHPVersion(version):
     # 检查Web服务是否启动
     if result.find('Connection refused') != -1:
         return False
-    #     global isTask
-    #     if os.path.exists(isTask):
-    #         isStatus = mw.readFile(isTask)
-    #         if isStatus == 'True':
-    #             return True
-
-    #     # systemd
-    #     systemd = mw.systemdCfgDir() + '/openresty.service'
-    #     if os.path.exists(systemd):
-    #         execShell('systemctl reload openresty')
-    #         return True
-    #     # initd
-    #     initd = '/etc/init.d/openresty'
-    #     if os.path.exists(initd):
-    #         os.system(initd + ' reload')
     return True
 
-# --------------------------------------PHP监控 end--------------------------------------------- #
+# -------------------------------------- PHP监控 end --------------------------------------------- #
 
 
 # --------------------------------------OpenResty Auto Restart Start --------------------------------------------- #
@@ -396,11 +300,10 @@ def openrestyAutoRestart():
             if not os.path.exists(odir):
                 time.sleep(86400)
                 continue
-
-            openresty_cmd('reload')
+            mw.opWeb('reload')
             time.sleep(86400)
     except Exception as e:
-        print(str(e))
+        mw.writeLog('OpenResty检测', '自动修复异常:'+str(e))
         time.sleep(86400)
 
 # --------------------------------------OpenResty Auto Restart End   --------------------------------------------- #
@@ -409,11 +312,11 @@ def openrestyAutoRestart():
 
 
 def openrestyRestartAtOnce():
-    restart_nginx_tip = 'data/restart_nginx.pl'
+    restart_nginx_tip = mw.getPanelDir()+'/data/restart_nginx.pl'
     while True:
         if os.path.exists(restart_nginx_tip):
             os.remove(restart_nginx_tip)
-            openresty_cmd('reload')
+            mw.opWeb('reload')
         time.sleep(1)
 # -----------------------------------   OpenResty Restart At Once End   ------------------------------------------ #
 
@@ -424,7 +327,7 @@ def restartPanelService():
     while True:
         if os.path.exists(restartTip):
             os.remove(restartTip)
-            service_cmd('restart_panel')
+            mw.panelCmd('restart_panel')
         time.sleep(1)
 # --------------------------------------Panel Restart End   --------------------------------------------- #
 
@@ -443,20 +346,20 @@ def run():
     sysTask.start()
 
     # # PHP 502错误检查线程
-    # php502 = threading.Thread(target=check502Task)
-    # php502 = setDaemon(php502)
-    # php502.start()
+    php502 = threading.Thread(target=check502Task)
+    php502 = setDaemon(php502)
+    php502.start()
 
-    # # OpenResty Restart At Once Start
-    # oraos = threading.Thread(target=openrestyRestartAtOnce)
-    # oraos = setDaemon(oraos)
-    # oraos.start()
+    # OpenResty Restart At Once Start
+    oraos = threading.Thread(target=openrestyRestartAtOnce)
+    oraos = setDaemon(oraos)
+    oraos.start()
 
 
-    # # OpenResty Auto Restart Start
-    # oar = threading.Thread(target=openrestyAutoRestart)
-    # oar = setDaemon(oar)
-    # oar.start()
+    # OpenResty Auto Restart Start
+    oar = threading.Thread(target=openrestyAutoRestart)
+    oar = setDaemon(oar)
+    oar.start()
 
 
     # Panel Restart Start
diff --git a/web/core/mw.py b/web/core/mw.py
index 7f581af31..0138b1e87 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -679,6 +679,18 @@ def restartMw():
     restart_file = getPanelDir()+'/data/restart.pl'
     writeFile(restart_file, 'True')
     return True
+
+def panelCmd(method):
+    cmd = '/etc/init.d/mw'
+    if os.path.exists(cmd):
+        execShell(cmd + ' ' + method)
+        return
+
+    cmd = mw.getPanelDir() + '/scripts/init.d/mw'
+    if os.path.exists(cmd):
+        data = execShell(cmd + ' ' + method)
+        return
+
 # ------------------------------    panel end    -----------------------------
 
 # ------------------------------ openresty start -----------------------------
@@ -696,14 +708,19 @@ def opWeb(method):
         return False
 
     # systemd
-    systemd = '/lib/systemd/system/openresty.service'
+    systemd = systemdCfgDir() + '/openresty.service'
     if os.path.exists(systemd):
         execShell('systemctl ' + method + ' openresty')
         return True
 
+
+    sys_initd = '/etc/init.d/openresty'
+    if os.path.exists(sys_initd):
+        os.system(sys_initd + ' ' + method)
+        return True
+
     # initd
     initd = getServerDir() + '/openresty/init.d/openresty'
-
     if os.path.exists(initd):
         execShell(initd + ' ' + method)
         return True
@@ -766,9 +783,59 @@ def opLuaMakeAll():
 
 # ------------------------------ openresty end -----------------------------
 
+# ---------------------------------------------------------------------------------
+# PHP START
+# ---------------------------------------------------------------------------------
+
+def getFpmConfFile(version):
+    return getServerDir() + '/php/' + version + '/etc/php-fpm.d/www.conf'
+
+def getFpmAddress(version):
+    fpm_address = '/tmp/php-cgi-{}.sock'.format(version)
+    php_fpm_file = getFpmConfFile(version)
+    try:
+        content = readFile(php_fpm_file)
+        tmp = re.findall(r"listen\s*=\s*(.+)", content)
+        if not tmp:
+            return fpm_address
+        if tmp[0].find('sock') != -1:
+            return fpm_address
+        if tmp[0].find(':') != -1:
+            listen_tmp = tmp[0].split(':')
+            if bind:
+                fpm_address = (listen_tmp[0], int(listen_tmp[1]))
+            else:
+                fpm_address = ('127.0.0.1', int(listen_tmp[1]))
+        else:
+            fpm_address = ('127.0.0.1', int(tmp[0]))
+        return fpm_address
+    except:
+        return fpm_address
+
+def requestFcgiPHP(sock, uri, document_root='/tmp', method='GET', pdata=b''):
+    # 直接请求到PHP-FPM
+    # version php版本
+    # uri 请求uri
+    # filename 要执行的php文件
+    # args 请求参数
+    # method 请求方式
+
+    import utils.php.fpm as fpm
+    p = fpm.fpm(sock, document_root)
+
+    if type(pdata) == dict:
+        pdata = url_encode(pdata)
+    result = p.load_url_public(uri, pdata, method)
+    return result
+# ---------------------------------------------------------------------------------
+# PHP END
+# ---------------------------------------------------------------------------------
+
+
 # ---------------------------------------------------------------------------------
 # 数据库 START
 # ---------------------------------------------------------------------------------
+
 def getMyORM():
     '''
     获取MySQL资源的ORM
diff --git a/web/utils/crontab.py b/web/utils/crontab.py
index b15af4bdb..57a654e17 100644
--- a/web/utils/crontab.py
+++ b/web/utils/crontab.py
@@ -7,3 +7,5 @@
 # ---------------------------------------------------------------------------------
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
+
+
diff --git a/web/utils/php/fcgi_client.py b/web/utils/php/fcgi_client.py
new file mode 100644
index 000000000..f1e0c67e7
--- /dev/null
+++ b/web/utils/php/fcgi_client.py
@@ -0,0 +1,408 @@
+# Copyright (c) 2006 Allan Saddi <allan@saddi.com>
+# 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+#
+# $Id$
+#
+# Copyright (c) 2011 Vladimir Rusinov <vladimir@greenmice.info>
+
+__author__ = 'Allan Saddi <allan@saddi.com>'
+__version__ = '$Revision$'
+import sys
+import select
+import struct
+import socket
+import errno
+import types
+
+
+__all__ = ['FCGIApp']
+
+# Constants from the spec.
+FCGI_LISTENSOCK_FILENO = 0
+
+FCGI_HEADER_LEN = 8
+
+FCGI_VERSION_1 = 1
+
+FCGI_BEGIN_REQUEST = 1
+FCGI_ABORT_REQUEST = 2
+FCGI_END_REQUEST = 3
+FCGI_PARAMS = 4
+FCGI_STDIN = 5
+FCGI_STDOUT = 6
+FCGI_STDERR = 7
+FCGI_DATA = 8
+FCGI_GET_VALUES = 9
+FCGI_GET_VALUES_RESULT = 10
+FCGI_UNKNOWN_TYPE = 11
+FCGI_MAXTYPE = FCGI_UNKNOWN_TYPE
+
+FCGI_NULL_REQUEST_ID = 0
+
+FCGI_KEEP_CONN = 1
+
+FCGI_RESPONDER = 1
+FCGI_AUTHORIZER = 2
+FCGI_FILTER = 3
+
+FCGI_REQUEST_COMPLETE = 0
+FCGI_CANT_MPX_CONN = 1
+FCGI_OVERLOADED = 2
+FCGI_UNKNOWN_ROLE = 3
+
+FCGI_MAX_CONNS = 'FCGI_MAX_CONNS'
+FCGI_MAX_REQS = 'FCGI_MAX_REQS'
+FCGI_MPXS_CONNS = 'FCGI_MPXS_CONNS'
+
+FCGI_Header = '!BBHHBx'
+FCGI_BeginRequestBody = '!HB5x'
+FCGI_EndRequestBody = '!LB3x'
+FCGI_UnknownTypeBody = '!B7x'
+
+FCGI_BeginRequestBody_LEN = struct.calcsize(FCGI_BeginRequestBody)
+FCGI_EndRequestBody_LEN = struct.calcsize(FCGI_EndRequestBody)
+FCGI_UnknownTypeBody_LEN = struct.calcsize(FCGI_UnknownTypeBody)
+
+if __debug__:
+    import time
+
+    # Set non-zero to write debug output to a file.
+    DEBUG = 0
+    DEBUGLOG = '/www/server/mdserver-web/logs/fastcgi.log'
+
+    def _debug(level, msg):
+        if DEBUG < level:
+            return
+
+        try:
+            f = open(DEBUGLOG, 'a')
+            f.write('%sfcgi: %s\n' % (time.ctime()[4:-4], msg))
+            f.close()
+        except:
+            pass
+
+
+def decode_pair(s, pos=0):
+    """
+    Decodes a name/value pair.
+
+    The number of bytes decoded as well as the name/value pair
+    are returned.
+    """
+    nameLength = ord(s[pos])
+    if nameLength & 128:
+        nameLength = struct.unpack('!L', s[pos:pos + 4])[0] & 0x7fffffff
+        pos += 4
+    else:
+        pos += 1
+
+    valueLength = ord(s[pos])
+    if valueLength & 128:
+        valueLength = struct.unpack('!L', s[pos:pos + 4])[0] & 0x7fffffff
+        pos += 4
+    else:
+        pos += 1
+
+    name = s[pos:pos + nameLength]
+    pos += nameLength
+    value = s[pos:pos + valueLength]
+    pos += valueLength
+
+    return (pos, (name, value))
+
+
+def encode_pair(name, value):
+    """
+    Encodes a name/value pair.
+
+    The encoded string is returned.
+    """
+    nameLength = len(name)
+    if nameLength < 128:
+        s = chr(nameLength).encode()
+    else:
+        s = struct.pack('!L', nameLength | 0x80000000)
+
+    valueLength = len(value)
+    if valueLength < 128:
+        s += chr(valueLength).encode()
+    else:
+        s += struct.pack('!L', valueLength | 0x80000000)
+
+    return s + name + value
+
+
+class Record(object):
+    """
+    A FastCGI Record.
+
+    Used for encoding/decoding records.
+    """
+
+    def __init__(self, type=FCGI_UNKNOWN_TYPE, requestId=FCGI_NULL_REQUEST_ID):
+        self.version = FCGI_VERSION_1
+        self.type = type
+        self.requestId = requestId
+        self.contentLength = 0
+        self.paddingLength = 0
+        self.contentData = ''
+
+    def _recvall(sock, length):
+        """
+        Attempts to receive length bytes from a socket, blocking if necessary.
+        (Socket may be blocking or non-blocking.)
+        """
+        dataList = []
+        recvLen = 0
+        while length:
+            try:
+                data = sock.recv(length)
+            except socket.error as e:
+                if e[0] == errno.EAGAIN:
+                    select.select([sock], [], [])
+                    continue
+                else:
+                    raise
+            if not data:  # EOF
+                break
+            dataList.append(data)
+            dataLen = len(data)
+            recvLen += dataLen
+            length -= dataLen
+        return b''.join(dataList), recvLen
+    _recvall = staticmethod(_recvall)
+
+    def read(self, sock):
+        """Read and decode a Record from a socket."""
+        try:
+            header, length = self._recvall(sock, FCGI_HEADER_LEN)
+        except:
+            raise EOFError
+
+        if length < FCGI_HEADER_LEN:
+            raise EOFError
+
+        self.version, self.type, self.requestId, self.contentLength, \
+            self.paddingLength = struct.unpack(FCGI_Header, header)
+
+        if __debug__:
+            _debug(9, 'read: fd = %d, type = %d, requestId = %d, '
+                   'contentLength = %d' %
+                   (sock.fileno(), self.type, self.requestId,
+                    self.contentLength))
+
+        if self.contentLength:
+            try:
+                self.contentData, length = self._recvall(sock,
+                                                         self.contentLength)
+            except:
+                raise EOFError
+
+            if length < self.contentLength:
+                raise EOFError
+
+        if self.paddingLength:
+            try:
+                self._recvall(sock, self.paddingLength)
+            except:
+                raise EOFError
+
+    def _sendall(sock, data):
+        """
+        Writes data to a socket and does not return until all the data is sent.
+        """
+        length = len(data)
+        while length:
+            try:
+                sent = sock.send(data)
+            except socket.error as e:
+                if e[0] == errno.EAGAIN:
+                    select.select([], [sock], [])
+                    continue
+                else:
+                    raise
+            data = data[sent:]
+            length -= sent
+    _sendall = staticmethod(_sendall)
+
+    def write(self, sock):
+        """Encode and write a Record to a socket."""
+        self.paddingLength = -self.contentLength & 7
+
+        if __debug__:
+            _debug(9, 'write: fd = %d, type = %d, requestId = %d, '
+                   'contentLength = %d' %
+                   (sock.fileno(), self.type, self.requestId,
+                    self.contentLength))
+
+        header = struct.pack(FCGI_Header, self.version, self.type,
+                             self.requestId, self.contentLength,
+                             self.paddingLength)
+        self._sendall(sock, header)
+        if self.contentLength:
+            self._sendall(sock, self.contentData)
+        if self.paddingLength:
+            self._sendall(sock, b'\x00' * self.paddingLength)
+
+
+class FCGIApp(object):
+
+    def __init__(self, connect=None, host=None, port=None, filterEnviron=True):
+        if host is not None:
+            assert port is not None
+            connect = (host, port)
+
+        self._connect = connect
+        self._filterEnviron = filterEnviron
+
+    def __call__(self, environ, io, start_response=None):
+        # For sanity's sake, we don't care about FCGI_MPXS_CONN
+        # (connection multiplexing). For every request, we obtain a new
+        # transport socket, perform the request, then discard the socket.
+        # This is, I believe, how mod_fastcgi does things...
+
+        sock = self._getConnection()
+
+        # Since this is going to be the only request on this connection,
+        # set the request ID to 1.
+        requestId = 1
+
+        # Begin the request
+        rec = Record(FCGI_BEGIN_REQUEST, requestId)
+        rec.contentData = struct.pack(FCGI_BeginRequestBody, FCGI_RESPONDER, 0)
+        rec.contentLength = FCGI_BeginRequestBody_LEN
+        rec.write(sock)
+
+        # Filter WSGI environ and send it as FCGI_PARAMS
+        if self._filterEnviron:
+            params = self._defaultFilterEnviron(environ)
+        else:
+            params = self._lightFilterEnviron(environ)
+        # TODO: Anything not from environ that needs to be sent also?
+        # return '200 OK',[],str(params),''
+        self._fcgiParams(sock, requestId, params)
+        self._fcgiParams(sock, requestId, {})
+
+        # Transfer wsgi.input to FCGI_STDIN
+        content_length = int(environ.get('CONTENT_LENGTH') or 0)
+        s = ''
+        #io = StringIO(stdin)
+        while True:
+            if not io:
+                break
+            chunk_size = min(content_length, 4096)
+            s = io.read(chunk_size)
+            content_length -= len(s)
+            rec = Record(FCGI_STDIN, requestId)
+            rec.contentData = s
+            rec.contentLength = len(s)
+            rec.write(sock)
+            if not s:
+                break
+        # Empty FCGI_DATA stream
+        rec = Record(FCGI_DATA, requestId)
+        rec.write(sock)
+        return sock
+
+    def _getConnection(self):
+        if self._connect is not None:
+            # The simple case. Create a socket and connect to the
+            # application.
+            if isinstance(self._connect, str):
+                sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+                sock.connect(self._connect)
+            elif hasattr(socket, 'create_connection'):
+                sock = socket.create_connection(self._connect)
+            else:
+                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                sock.connect(self._connect)
+            return sock
+
+        # To be done when I have more time...
+        # , 'Launching and managing FastCGI programs not yet implemented'
+        raise NotImplementedError
+
+    def _fcgiGetValues(self, sock, vars):
+        # Construct FCGI_GET_VALUES record
+        outrec = Record(FCGI_GET_VALUES)
+        data = []
+        for name in vars:
+            data.append(encode_pair(name, ''))
+        data = ''.join(data)
+        outrec.contentData = data
+        outrec.contentLength = len(data)
+        outrec.write(sock)
+
+        # Await response
+        inrec = Record()
+        inrec.read(sock)
+        result = {}
+        if inrec.type == FCGI_GET_VALUES_RESULT:
+            pos = 0
+            while pos < inrec.contentLength:
+                pos, (name, value) = decode_pair(inrec.contentData, pos)
+                result[name] = value
+        return result
+
+    def _fcgiParams(self, sock, requestId, params):
+        rec = Record(FCGI_PARAMS, requestId)
+        data = []
+        for name, value in params.items():
+            data.append(encode_pair(name.encode(
+                'latin-1'), value.encode('latin-1')))
+        data = b''.join(data)
+        rec.contentData = data
+        rec.contentLength = len(data)
+        rec.write(sock)
+
+    _environPrefixes = ['SERVER_', 'HTTP_', 'REQUEST_', 'REMOTE_', 'PATH_',
+                        'CONTENT_', 'DOCUMENT_', 'SCRIPT_']
+    _environCopies = ['SCRIPT_NAME', 'QUERY_STRING', 'AUTH_TYPE']
+    _environRenames = []
+
+    def _defaultFilterEnviron(self, environ):
+        result = {}
+        for n in environ.keys():
+            iv = False
+            for p in self._environPrefixes:
+                if n.startswith(p):
+                    result[n] = environ[n]
+                    iv = True
+            if n in self._environCopies:
+                result[n] = environ[n]
+                iv = True
+            if n in self._environRenames:
+                result[self._environRenames[n]] = environ[n]
+                iv = True
+            if not iv:
+                result[n] = environ[n]
+
+        return result
+
+    def _lightFilterEnviron(self, environ):
+        result = {}
+        for n in environ.keys():
+            if n.upper() == n:
+                result[n] = environ[n]
+        return result
diff --git a/web/utils/php/fpm.py b/web/utils/php/fpm.py
new file mode 100644
index 000000000..66f72494e
--- /dev/null
+++ b/web/utils/php/fpm.py
@@ -0,0 +1,209 @@
+# coding:utf-8
+
+
+import json
+import os
+import time
+import re
+import sys
+import time
+import struct
+
+from .fcgi_client import FCGIApp
+
+FCGI_Header = '!BBHHBx'
+
+if sys.version_info[0] == 2:
+    try:
+        from cStringIO import StringIO
+    except:
+        from StringIO import StringIO
+else:
+    from io import BytesIO as StringIO
+
+
+def get_header_data(sock):
+    '''
+        @name 获取头部32KB数据
+        @param sock socketobject(fastcgi套接字对象)
+        @return bytes
+    '''
+    headers_data = b''
+    total_len = 0
+    header_len = 1024 * 128
+    while True:
+        fastcgi_header = sock.recv(8)
+        if not fastcgi_header:
+            break
+        if len(fastcgi_header) != 8:
+            headers_data += fastcgi_header
+            break
+        fast_pack = struct.unpack(FCGI_Header, fastcgi_header)
+        if fast_pack[1] == 3:
+            break
+
+        tlen = fast_pack[3]
+        while tlen > 0:
+            sd = sock.recv(tlen)
+            if not sd:
+                break
+            headers_data += sd
+            tlen -= len(sd)
+
+        total_len += fast_pack[3]
+        if fast_pack[4]:
+            sock.recv(fast_pack[4])
+        if total_len > header_len:
+            break
+    return headers_data
+
+
+def format_header_data(headers_data):
+    '''
+        @name 格式化响应头
+        @param headers_data bytes(fastcgi头部32KB数据)
+        @return status int(响应状态), headers dict(响应头), bdata bytes(格式化响应头后的多余数据)
+    '''
+    status = '200 OK'
+    headers = {}
+    pos = 0
+    while True:
+        eolpos = headers_data.find(b'\n', pos)
+        if eolpos < 0:
+            break
+        line = headers_data[pos:eolpos - 1]
+        pos = eolpos + 1
+        line = line.strip()
+        if len(line) < 2:
+            break
+        if line.find(b':') == -1:
+            continue
+        header, value = line.split(b':', 1)
+        header = header.strip()
+        value = value.strip()
+        if isinstance(header, bytes):
+            header = header.decode()
+            value = value.decode()
+        if header == 'Status':
+            status = value
+            if status.find(' ') < 0:
+                status += ' BTPanel'
+        else:
+            headers[header] = value
+    bdata = headers_data[pos:]
+    status = int(status.split(' ')[0])
+    return status, headers, bdata
+
+
+def resp_sock(sock, bdata):
+    '''
+        @name 以流的方式发送剩余数据
+        @param sock socketobject(fastcgi套接字对象)
+        @param bdata bytes(格式化响应头后的多余数据)
+        @return yield bytes
+    '''
+    # 发送除响应头以外的多余头部数据
+    yield bdata
+    while True:
+        fastcgi_header = sock.recv(8)
+        if not fastcgi_header:
+            break
+        if len(fastcgi_header) != 8:
+            yield fastcgi_header
+            break
+        fast_pack = struct.unpack(FCGI_Header, fastcgi_header)
+        if fast_pack[1] == 3:
+            break
+        tlen = fast_pack[3]
+        while tlen > 0:
+            sd = sock.recv(tlen)
+            if not sd:
+                break
+            tlen -= len(sd)
+            if sd:
+                yield sd
+
+        if fast_pack[4]:
+            sock.recv(fast_pack[4])
+    sock.close()
+
+
+class fpm(object):
+
+    def __init__(self, sock=None, document_root='', last_path=''):
+        '''
+            @name 实例化FPM对象
+            @param sock string(unixsocket路径)
+            @param document_root string(PHP文档根目录)
+            @return FPM
+        '''
+        if sock:
+            self.fcgi_sock = sock
+            if document_root[-1:] != '/':
+                document_root += '/'
+            self.document_root = document_root
+            self.last_path = last_path
+
+    def load_url_public(self, url, content=b'', method='GET', content_type='application/x-www-form-urlencoded'):
+        '''
+            @name 转发URL到PHP-FPM 公共
+            @param url string(URI地址)
+            @param content stream(POST数据io对象)
+            @return fastcgi-socket
+        '''
+        fcgi = FCGIApp(connect=self.fcgi_sock)
+        try:
+            script_name, query_string = url.split('?')
+        except ValueError:
+            script_name = url
+            query_string = ''
+
+        content_length = len(content)
+        if content:
+            content = StringIO(content)
+
+        env = {
+            'SCRIPT_FILENAME': '%s%s' % (self.document_root, script_name),
+            'QUERY_STRING': query_string,
+            'REQUEST_METHOD': method,
+            'SCRIPT_NAME': self.last_path + script_name,
+            'REQUEST_URI': url,
+            'GATEWAY_INTERFACE': 'CGI/1.1',
+            'SERVER_SOFTWARE': 'MW-PANEL',
+            'REDIRECT_STATUS': '200',
+            'CONTENT_TYPE': content_type,
+            'CONTENT_LENGTH': str(content_length),
+            'DOCUMENT_URI': script_name,
+            'DOCUMENT_ROOT': self.document_root,
+            'SERVER_PROTOCOL': 'HTTP/1.1',
+            'REMOTE_ADDR': '127.0.0.1',
+            'REMOTE_PORT': '7200',
+            'SERVER_ADDR': '127.0.0.1',
+            'SERVER_PORT': '80',
+            'SERVER_NAME': 'MW-Panel'
+        }
+
+        fpm_sock = fcgi(env, content)
+
+        _data = b''
+        while True:
+            fastcgi_header = fpm_sock.recv(8)
+            if not fastcgi_header:
+                break
+            if len(fastcgi_header) != 8:
+                _data += fastcgi_header
+                break
+            fast_pack = struct.unpack(FCGI_Header, fastcgi_header)
+            if fast_pack[1] == 3:
+                break
+            tlen = fast_pack[3]
+            while tlen > 0:
+                sd = fpm_sock.recv(tlen)
+                if not sd:
+                    break
+                tlen -= len(sd)
+                _data += sd
+            if fast_pack[4]:
+                fpm_sock.recv(fast_pack[4])
+        status, headers, data = format_header_data(_data)
+        return data

From 83ae4562fad3e0b66328a7eb22b54861c3cfb73e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 23:56:25 +0800
Subject: [PATCH 085/965] update

---
 web/core/mw.py     |  4 ++--
 web/thisdb/logs.py | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 web/thisdb/logs.py

diff --git a/web/core/mw.py b/web/core/mw.py
index 0138b1e87..e5b83f08b 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -602,9 +602,9 @@ def writeLog(stype, msg, args=()):
 
 def writeDbLog(stype, msg, args=(), uid=1):
     try:
-        from admin import model
+        import thisdb
         format_msg = getInfo(msg, args)
-        model.addLog(stype, format_msg, uid)
+        thisdb.addLog(stype, format_msg, uid)
         return True
     except Exception as e:
         print("writeDbLog:"+str(e))
diff --git a/web/thisdb/logs.py b/web/thisdb/logs.py
new file mode 100644
index 000000000..e7440f041
--- /dev/null
+++ b/web/thisdb/logs.py
@@ -0,0 +1,36 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+
+
+import core.mw as mw
+
+def clearLog():
+    mw.M('logs').where('id>?', (0,)).delete()
+    return True
+
+def addLog(type, log,
+    uid: int | None = 1
+) -> str:
+    '''
+    添加日志
+    :type -> str 类型 (必填)
+    :log -> str 日志内容 (必填)
+    :uid -> int 用户ID
+    '''
+    add_time = mw.formatDate()
+    insert_data = {
+        'name':name,
+        'type':type,
+        'log':log,
+        'add_time':add_time,
+    }
+    mw.M('logs').insert(insert_data)
+    return True
\ No newline at end of file

From 4a7fea3b4ce18de65c5f205deea7687083f04f31 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 3 Nov 2024 23:59:22 +0800
Subject: [PATCH 086/965] Update __init__.py

---
 web/thisdb/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/thisdb/__init__.py b/web/thisdb/__init__.py
index 9022ba603..a2517d0f7 100644
--- a/web/thisdb/__init__.py
+++ b/web/thisdb/__init__.py
@@ -13,3 +13,4 @@ from .option import *
 from .user import *
 from .sites import *
 from .tasks import *
+from .logs import *

From d795dd7d4724c0cf49ffa162e80ea9ba6479c9e9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 4 Nov 2024 00:02:30 +0800
Subject: [PATCH 087/965] Update logs.py

---
 web/thisdb/logs.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/thisdb/logs.py b/web/thisdb/logs.py
index e7440f041..967373068 100644
--- a/web/thisdb/logs.py
+++ b/web/thisdb/logs.py
@@ -27,7 +27,6 @@ def addLog(type, log,
     '''
     add_time = mw.formatDate()
     insert_data = {
-        'name':name,
         'type':type,
         'log':log,
         'add_time':add_time,

From 477b8b1f73c4c83ac53178c3934145c830168ec7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 4 Nov 2024 00:13:21 +0800
Subject: [PATCH 088/965] Update mw.py

---
 web/core/mw.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index e5b83f08b..787a50926 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -590,12 +590,12 @@ def debugLog(*data):
 def writeLog(stype, msg, args=()):
     # 写日志
     uid = 0
-    try:
-        from flask import session
-        if 'uid' in session:
-            uid = session['uid']
-    except Exception as e:
-        print("writeLog:"+str(e))
+    # try:
+    #     from flask import session
+    #     if 'uid' in session:
+    #         uid = session['uid']
+    # except Exception as e:
+    #     print("writeLog:"+str(e))
         # pass
         # writeFileLog(getTracebackInfo())
     return writeDbLog(stype, msg, args, uid)

From 795bee7de36549b0d586bb715580a46dadeeae72 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 4 Nov 2024 00:27:32 +0800
Subject: [PATCH 089/965] update

---
 .gitignore                  |  4 +++-
 data/default_new.pl         |  1 +
 web/admin/files/__init__.py |  7 +++++++
 web/core/mw.py              | 25 +++++++++++++++++++++++++
 web/utils/file.py           | 33 +++++++++++++++++++++++++++------
 5 files changed, 63 insertions(+), 7 deletions(-)
 create mode 100644 data/default_new.pl

diff --git a/.gitignore b/.gitignore
index 63aba0e20..5de67f7af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -161,6 +161,7 @@ data/api.json
 data/bind_domain.pl
 data/unauthorized_status.pl
 data/auth_secret.pl
+data/panelSpeed.pl
 
 plugins/vip_*
 plugins/own_*
@@ -185,4 +186,5 @@ plugins/goedge-node
 plugins/goedge-happy
 plugins/dztasks
 
-data/default_new.pl
+
+
diff --git a/data/default_new.pl b/data/default_new.pl
new file mode 100644
index 000000000..d72607a41
--- /dev/null
+++ b/data/default_new.pl
@@ -0,0 +1 @@
+88rr2g7e
\ No newline at end of file
diff --git a/web/admin/files/__init__.py b/web/admin/files/__init__.py
index f7baeeb0a..42d0b3a20 100644
--- a/web/admin/files/__init__.py
+++ b/web/admin/files/__init__.py
@@ -156,6 +156,13 @@ def recycle_bin():
     return file.toggleRecycleBin()
 
 
+# 回收站文件
+@blueprint.route('/close_recycle_bin', endpoint='close_recycle_bin', methods=['POST'])
+@panel_login_required
+def close_recycle_bin():
+    return file.closeRecycleBin()
+
+
 
 
 
diff --git a/web/core/mw.py b/web/core/mw.py
index 787a50926..4b6c875a4 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -610,6 +610,31 @@ def writeDbLog(stype, msg, args=(), uid=1):
         print("writeDbLog:"+str(e))
         return False
 
+def writeSpeed(title, used, total, speed=0):
+    path = getPanelDir()
+    speed_file= path + '/data/panelSpeed.pl'
+    # 写进度
+    if not title:
+        data = {'title': None, 'progress': 0,'total': 0, 'used': 0, 'speed': 0}
+    else:
+        progress = int((100.0 * used / total))
+        data = {'title': title, 'progress': progress,'total': total, 'used': used, 'speed': speed}
+    writeFile(speed_file, json.dumps(data))
+    return True
+
+
+def getSpeed():
+    path = getPanelDir()
+    speed_file= path + '/data/panelSpeed.pl'
+    # 取进度
+    path = getPanelDir()
+    data = readFile(speed_file)
+    if not data:
+        data = json.dumps({'title': None, 'progress': 0,'total': 0, 'used': 0, 'speed': 0})
+        writeFile(speed_file, data)
+    return json.loads(data)
+
+
 
 def M(table=''):
     import core.db as db
diff --git a/web/utils/file.py b/web/utils/file.py
index 56aa0a13a..69203efeb 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -15,6 +15,7 @@ import time
 from admin import model
 
 import core.mw as mw
+import thisdb
 
 def getFileBody(path):
     if not os.path.exists(path):
@@ -284,7 +285,7 @@ def fileDelete(path):
         mw.execShell(cmd)
 
     try:
-        recycle_bin = model.getOption('recycle_bin')
+        recycle_bin = thisdb.getOption('recycle_bin')
         if recycle_bin == 'open':
             if mvRecycleBin(path):
                 return mw.returnData(True, '已将文件移动到回收站!')
@@ -303,7 +304,7 @@ def dirDelete(path):
     if path.find('.user.ini'):
         os.system("which chattr && chattr -i '" + path + "'")
     try:
-        recycle_bin = model.getOption('recycle_bin')
+        recycle_bin = thisdb.getOption('recycle_bin')
         if recycle_bin == 'open':
             if mvRecycleBin(path):
                 return mw.returnData(True, '已将文件移动到回收站!')
@@ -315,19 +316,19 @@ def dirDelete(path):
 
 # 关闭
 def toggleRecycleBin():
-    recycle_bin = model.getOption('recycle_bin')
+    recycle_bin = thisdb.getOption('recycle_bin')
     if recycle_bin == 'open':
-        model.setOption('recycle_bin','close')
+        thisdb.setOption('recycle_bin','close')
         mw.writeLog('文件管理', '已关闭回收站功能!')
         return mw.returnData(True, '已关闭回收站功能!')
     else:
-        model.setOption('recycle_bin','open')
+        thisdb.setOption('recycle_bin','open')
         mw.writeLog('文件管理', '已开启回收站功能!')
         return mw.returnData(True, '已开启回收站功能!')
 
 def getRecycleBin():
     rb_dir = mw.getRecycleBinDir()
-    recycle_bin = model.getOption('recycle_bin')
+    recycle_bin = thisdb.getOption('recycle_bin')
 
     data = {}
     data['dirs'] = []
@@ -392,6 +393,26 @@ def reRecycleBin(path):
         mw.writeLog('文件管理', msg)
         return mw.returnData(False, '恢复失败!')
 
+
+def closeRecycleBin():
+    rb_dir = mw.getRecycleBinDir()
+    mw.execShell('which chattr && chattr -R -i ' + rb_dir)
+    rlist = os.listdir(rb_dir)
+    i = 0
+    l = len(rlist)
+    for name in rlist:
+        i += 1
+        path = rb_dir + '/' + name
+        mw.writeSpeed(name, i, l)
+        if os.path.isdir(path):
+            shutil.rmtree(path)
+        else:
+            os.remove(path)
+    mw.writeSpeed(None, 0, 0)
+    mw.writeLog('文件管理', '已清空回收站!')
+    return mw.returnJson(True, '已清空回收站!')
+
+
 # 设置文件和目录权限
 def setMode(path):
     s_path = os.path.dirname(path)

From 98a53b863910ad9a1d8a6f6e3cd3ca47cad3433c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 4 Nov 2024 00:28:52 +0800
Subject: [PATCH 090/965] Update mw.py

---
 web/core/mw.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index 4b6c875a4..e935077c7 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -604,7 +604,7 @@ def writeDbLog(stype, msg, args=(), uid=1):
     try:
         import thisdb
         format_msg = getInfo(msg, args)
-        thisdb.addLog(stype, format_msg, uid)
+        thisdb.addLog(stype, format_msg, uid=uid)
         return True
     except Exception as e:
         print("writeDbLog:"+str(e))

From f37cd39a659e8d996f21f4a74a265f77d9ba4be1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 4 Nov 2024 00:32:57 +0800
Subject: [PATCH 091/965] Update new_cli.sh

---
 new_cli.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/new_cli.sh b/new_cli.sh
index 33bfe5bd5..ca5296567 100755
--- a/new_cli.sh
+++ b/new_cli.sh
@@ -63,12 +63,12 @@ mw_start_debug(){
 	cd ${DIR}/web && gunicorn -b :${port} -w 1 app:app
 }
 
-mw_start_debug2(){
+mw_start_panel(){
 	python3 panel_task.py >> $DIR/logs/panel_task.log 2>&1 &
 	cd ${DIR}/web && gunicorn -b :7200 -w 1  app:app
 }
 
-mw_start_debug3(){
+mw_start_bgtask(){
 	cd ${DIR}/web && gunicorn -c setting.py app:app
 	cd ${DIR} && python3 panel_task.py
 }
@@ -101,12 +101,12 @@ case "$1" in
 		mw_stop 
 		mw_start_debug
 		;;
-	'debug2') 
+	'panel') 
 		mw_stop 
-		mw_start_debug2
+		mw_start_panel
 		;;
-	'debug3') 
+	'task') 
 		mw_stop 
-		mw_start_debug3
+		mw_start_bgtask
 		;;
 esac
\ No newline at end of file

From b58d4577422278124623e08b5c9e5580cbcc757f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 4 Nov 2024 00:33:15 +0800
Subject: [PATCH 092/965] Update new_cli.sh

---
 new_cli.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/new_cli.sh b/new_cli.sh
index ca5296567..2505806f5 100755
--- a/new_cli.sh
+++ b/new_cli.sh
@@ -39,7 +39,7 @@ mw_start_task()
 }
 
 mw_start(){
-	cd web && gunicorn -c setting.py app:app
+	cd ${DIR}/web && gunicorn -c setting.py app:app
 	#安全启动
 	mw_start_task
 }

From 1826adf50ea615a80bd752b5eec751faa03bf3cb Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 4 Nov 2024 01:21:17 +0800
Subject: [PATCH 093/965] Update install.sh

---
 plugins/php/versions/83/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/php/versions/83/install.sh b/plugins/php/versions/83/install.sh
index 415ebf780..218b88925 100755
--- a/plugins/php/versions/83/install.sh
+++ b/plugins/php/versions/83/install.sh
@@ -127,7 +127,7 @@ echo "$sourcePath/php/php${PHP_VER}"
 
 if [ ! -d $serverPath/php/${PHP_VER} ];then
 	cd $sourcePath/php/php${PHP_VER}
-	./buildconf --force
+	# ./buildconf --force
 	./configure \
 	--prefix=$serverPath/php/${PHP_VER} \
 	--exec-prefix=$serverPath/php/${PHP_VER} \

From d4cfd90ccda62d0f72e5cb72532a19e008a116f7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 4 Nov 2024 19:08:39 +0800
Subject: [PATCH 094/965] update

---
 class/core/crontab_api.py        |   3 +-
 data/control.conf                |   1 -
 data/default_new.pl              |   1 -
 data/recycle_bin.pl              |   1 -
 data/sql/default.sql             |  24 +-
 new_cli.sh                       |   1 -
 panel_task.py                    |  32 +--
 panel_tools.py                   |   4 +-
 web/admin/__init__.py            |  26 +-
 web/admin/common.py              |   5 +-
 web/admin/crontab/__init__.py    |  60 +++--
 web/admin/dashboard/__init__.py  | 234 +----------------
 web/admin/dashboard/dashboard.py |  81 ++++++
 web/admin/dashboard/login.py     | 189 ++++++++++++++
 web/admin/logs/__init__.py       |  27 +-
 web/admin/setting/setting.py     |  40 +--
 web/admin/setup/option.py        |  35 ++-
 web/admin/setup/user.py          |  22 +-
 web/admin/site/__init__.py       |  24 +-
 web/admin/system/system.py       |  16 +-
 web/admin/task/__init__.py       |   3 +-
 web/admin/user_login_check.py    |   4 +-
 web/core/db.py                   |  52 +++-
 web/static/app/crontab.js        |   5 +-
 web/thisdb/__init__.py           |   1 +
 web/thisdb/crontab.py            |  43 ++++
 web/thisdb/init.py               |  16 +-
 web/thisdb/logs.py               |  29 ++-
 web/thisdb/option.py             |  17 +-
 web/thisdb/sites.py              |  35 ++-
 web/thisdb/tasks.py              |  35 +++
 web/thisdb/temp_login.py         |  33 +++
 web/thisdb/user.py               |  68 +++--
 web/utils/crontab.py             | 419 +++++++++++++++++++++++++++++++
 web/utils/plugin.py              |  51 ++--
 35 files changed, 1158 insertions(+), 479 deletions(-)
 delete mode 100644 data/control.conf
 delete mode 100644 data/default_new.pl
 delete mode 100755 data/recycle_bin.pl
 create mode 100644 web/admin/dashboard/dashboard.py
 create mode 100644 web/admin/dashboard/login.py
 create mode 100644 web/thisdb/crontab.py
 create mode 100644 web/thisdb/temp_login.py

diff --git a/class/core/crontab_api.py b/class/core/crontab_api.py
index ba77196a2..d9556241a 100755
--- a/class/core/crontab_api.py
+++ b/class/core/crontab_api.py
@@ -40,8 +40,7 @@ class crontab_api:
         startPage = (int(p) - 1) * psize
         pageInfo = str(startPage) + ',' + str(psize)
 
-        _list = mw.M('crontab').where('', ()).field(
-            self.field).limit(pageInfo).order('id desc').select()
+        _list = mw.M('crontab').where('', ()).field(self.field).limit(pageInfo).order('id desc').select()
 
         data = []
         for i in range(len(_list)):
diff --git a/data/control.conf b/data/control.conf
deleted file mode 100644
index 8580e7b68..000000000
--- a/data/control.conf
+++ /dev/null
@@ -1 +0,0 @@
-30
\ No newline at end of file
diff --git a/data/default_new.pl b/data/default_new.pl
deleted file mode 100644
index d72607a41..000000000
--- a/data/default_new.pl
+++ /dev/null
@@ -1 +0,0 @@
-88rr2g7e
\ No newline at end of file
diff --git a/data/recycle_bin.pl b/data/recycle_bin.pl
deleted file mode 100755
index 4791ed555..000000000
--- a/data/recycle_bin.pl
+++ /dev/null
@@ -1 +0,0 @@
-True
\ No newline at end of file
diff --git a/data/sql/default.sql b/data/sql/default.sql
index 1acdaa795..bc99e4163 100755
--- a/data/sql/default.sql
+++ b/data/sql/default.sql
@@ -33,8 +33,9 @@ CREATE TABLE IF NOT EXISTS `crontab` (
   `sname` TEXT,
   `sbody` TEXT,
   'stype' TEXT,
-  `urladdress` TEXT
-  `add_time` TEXT
+  `url_address` TEXT,
+  `add_time` TEXT,
+  `update_time` TEXT
 );
 
 CREATE TABLE IF NOT EXISTS `firewall` (
@@ -60,7 +61,6 @@ CREATE TABLE IF NOT EXISTS `logs` (
   `uid` INTEGER DEFAULT '1',
   `add_time` TEXT
 );
-ALTER TABLE `logs` ADD COLUMN `uid` INTEGER DEFAULT '1';
 
 CREATE TABLE IF NOT EXISTS `sites` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -73,12 +73,10 @@ CREATE TABLE IF NOT EXISTS `sites` (
   `edate` TEXT,
   `ssl_effective_date` TEXT,
   `ssl_expiration_date` TEXT,
-  `add_time` TEXT
+  `add_time` TEXT,
+  `update_time` TEXT
 );
 
-ALTER TABLE `sites` ADD COLUMN `ssl_effective_date` TEXT DEFAULT '';
-ALTER TABLE `sites` ADD COLUMN `ssl_expiration_date` TEXT DEFAULT '';
-
 CREATE TABLE IF NOT EXISTS `site_types` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `name` TEXT
@@ -94,18 +92,16 @@ CREATE TABLE IF NOT EXISTS `domain` (
 
 CREATE TABLE IF NOT EXISTS `users` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `username` TEXT,
+  `name` TEXT,
   `password` TEXT,
   `login_ip` TEXT,
   `login_time` TEXT,
   `phone` TEXT,
-  `email` TEXT
+  `email` TEXT,
+  `add_time` INTEGER,
+  `update_time` INTEGER
 );
 
-INSERT INTO `users` (`id`, `username`, `password`, `login_ip`, `login_time`, `phone`, `email`) VALUES
-(1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '192.168.0.10', '2022-02-02 00:00:00', 0, 'midoks@163.com');
-
-
 CREATE TABLE IF NOT EXISTS `tasks` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `name` 			TEXT,
@@ -145,3 +141,5 @@ CREATE TABLE IF NOT EXISTS `option` (
   `type` TEXT,
   `value` TEXT
 );
+
+CREATE UNIQUE INDEX name_idx ON option(name);
diff --git a/new_cli.sh b/new_cli.sh
index 2505806f5..4d6a96388 100755
--- a/new_cli.sh
+++ b/new_cli.sh
@@ -64,7 +64,6 @@ mw_start_debug(){
 }
 
 mw_start_panel(){
-	python3 panel_task.py >> $DIR/logs/panel_task.log 2>&1 &
 	cd ${DIR}/web && gunicorn -b :7200 -w 1  app:app
 }
 
diff --git a/panel_task.py b/panel_task.py
index 67344a002..9432db180 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -41,26 +41,12 @@ def execShell(cmdstring, cwd=None, timeout=None, shell=True):
     cmd = cmdstring + ' > ' + g_log_file + ' 2>&1'
     return mw.execShell(cmd)
 
-def service_cmd(method):
-    cmd = '/etc/init.d/mw'
-    if os.path.exists(cmd):
-        execShell(cmd + ' ' + method)
-        return
-
-    cmd = mw.getPanelDir() + '/scripts/init.d/mw'
-    if os.path.exists(cmd):
-        print(cmd + ' ' + method)
-        data = execShell(cmd + ' ' + method)
-        print(data)
-        return
-
 def mw_async(f):
     def wrapper(*args, **kwargs):
         thr = threading.Thread(target=f, args=args, kwargs=kwargs)
         thr.start()
     return wrapper
 
-
 @mw_async
 def restartMw():
     time.sleep(1)
@@ -68,7 +54,6 @@ def restartMw():
     mw.execShell(cmd)
 
 
-
 def downloadFile(url, filename):
     # 下载文件
     try:
@@ -115,23 +100,23 @@ def writeLogs(data):
 
 def runPanelTask():
     try:
-        bash_list = model.getTaskList(status=-1)
+        bash_list = thisdb.getTaskList(status=-1)
         for task in bash_list:
-            model.setTaskStatus(task['id'], 0)
+            thisdb.setTaskStatus(task['id'], 0)
 
-        run_list = model.getTaskList(status=0)
+        run_list = thisdb.getTaskList(status=0)
         for run_task in run_list:
             start = int(time.time())
-            model.setTaskData(run_task['id'], start=start)
-            model.setTaskStatus(run_task['id'], -1)
+            thisdb.setTaskData(run_task['id'], start=start)
+            thisdb.setTaskStatus(run_task['id'], -1)
             if run_task['type'] == 'download':
                 argv = run_task['cmd'].split('|mw|')
                 downloadFile(argv[0], argv[1])
             elif run_task['type'] == 'execshell':
                 execShell(run_task['cmd'])
             end = int(time.time())
-            model.setTaskData(run_task['id'], end=end)
-            model.setTaskStatus(run_task['id'], 1)
+            thisdb.setTaskData(run_task['id'], end=end)
+            thisdb.setTaskStatus(run_task['id'], 1)
     except Exception as e:
         print(str(e))
 
@@ -371,6 +356,5 @@ def run():
     startPanelTask()
 
 if __name__ == "__main__":
-    with app.app_context():
-        run()
+    run()
     
diff --git a/panel_tools.py b/panel_tools.py
index f54266e9a..ec54c05f4 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -190,7 +190,7 @@ def mwcli(mw_input=0):
             cont = re.sub("\"53\"", "\"52\",\"53\"", cont)
             cont = re.sub("\"5.3.29\"", "\"5.2.17\",\"5.3.29\"", cont)
             mw.writeFile(php_conf, cont)
-            print("|-执行PHP52显示成功!")
+            mw.echoInfo("执行PHP52显示成功!")
     elif mw_input == 101:
         php_conf = 'plugins/php/info.json'
         if os.path.exists(php_conf):
@@ -198,7 +198,7 @@ def mwcli(mw_input=0):
             cont = re.sub("\"52\",", "", cont)
             cont = re.sub("\"5.2.17\",", cont)
             mw.writeFile(php_conf, cont)
-            print("|-执行PHP52隐藏成功!")
+            mw.echoInfo("执行PHP52隐藏成功!")
     elif mw_input == 200:
         os.system(INIT_CMD + " mirror")
     elif mw_input == 201:
diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 949734855..2c3d468c9 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -31,8 +31,9 @@ from flask_migrate import Migrate
 from flask_caching import Cache
 from werkzeug.local import LocalProxy
 
-from admin import model
+# from admin import model
 from admin import setup
+import thisdb
 
 from admin.model import db as sys_db
 
@@ -68,12 +69,13 @@ app.config['SESSION_COOKIE_NAME'] = "MW_VER_1"
 app.config['PERMANENT_SESSION_LIFETIME'] = timedelta(days=31)
 
 # db的配置
-app.config['SQLALCHEMY_DATABASE_URI'] = mw.getSqitePrefix()+config.SQLITE_PATH+"?timeout=20"  # 使用 SQLite 数据库
+# app.config['SQLALCHEMY_DATABASE_URI'] = mw.getSqitePrefix()+config.SQLITE_PATH+"?timeout=20"  # 使用 SQLite 数据库
 app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = True
 
+
 # 初始化db
-sys_db.init_app(app)
-Migrate(app, sys_db)
+# sys_db.init_app(app)
+# Migrate(app, sys_db)
 
 
 # 检查数据库是否存在。如果没有就创建它。
@@ -84,15 +86,15 @@ if not os.path.isfile(config.SQLITE_PATH):
 # with app.app_context():
 #     sys_db.create_all()
 
-with app.app_context():
-    if setup_db_required:
-        sys_db.create_all()
+# with app.app_context():
+#     if setup_db_required:
+#         sys_db.create_all()
 
-# 初始化用户信息
-with app.app_context():
-    if setup_db_required:
-        setup.init_admin_user()
-        setup.init_option()
+if setup_db_required:
+    # 初始化用户信息
+    thisdb.initPanelData()
+    setup.init_admin_user()
+    setup.init_option()
 setup.init_cmd()
 setup.init_db_system()
 
diff --git a/web/admin/common.py b/web/admin/common.py
index c1692c081..cc1be06db 100644
--- a/web/admin/common.py
+++ b/web/admin/common.py
@@ -10,13 +10,14 @@
 
 import time
 
-from admin import model
+# from admin import model
 from admin import session
+import thisdb
 
 def isLogined():
     if 'login' in session  and session['login'] == True and 'username' in session:
         username = session['username']
-        info = model.getUserByName(username)
+        info = thisdb.getUserByName(username)
         if info is None:
             return False
 
diff --git a/web/admin/crontab/__init__.py b/web/admin/crontab/__init__.py
index 782623ca2..3e8232e40 100644
--- a/web/admin/crontab/__init__.py
+++ b/web/admin/crontab/__init__.py
@@ -13,7 +13,10 @@ from flask import Blueprint, render_template
 from flask import request
 
 from admin.user_login_check import panel_login_required
-from admin.model import Crontab
+
+from utils.crontab import crontab as MwCrontab
+import core.mw as mw
+import thisdb
 
 blueprint = Blueprint('crontab', __name__, url_prefix='/crontab', template_folder='../../templates/default')
 @blueprint.route('/index', endpoint='index')
@@ -24,26 +27,51 @@ def index():
 @blueprint.route('/list', endpoint='list', methods=['GET','POST'])
 @panel_login_required
 def list():
-    page = request.args.get('p', 1)
-    size = 10
-    count = Crontab.query.count()
-    # print(count)
-    clist = Crontab.query.paginate(page=int(page), per_page=size)
-    # print(clist)
+    page = request.args.get('p', '1').strip()
+    limit = request.args.get('limit', '10').strip()
+    return MwCrontab.instance().getCrontabList(page=int(page),size=int(limit))
 
-    return []
+# 插件列表
+@blueprint.route('/logs', endpoint='logs', methods=['GET','POST'])
+def logs(self):
+    sid = request.form.get('id', '')
+    echo = mw.M('crontab').where("id=?", (sid,)).field('echo').find()
+    logFile = mw.getServerDir() + '/cron/' + echo['echo'] + '.log'
+    if not os.path.exists(logFile):
+        return mw.returnData(False, '当前日志为空!')
+    log = mw.getLastLine(logFile, 500)
+    return mw.returnData(True, log)
 
+# 获取计划任务
+@blueprint.route('/del', endpoint='del', methods=['GET','POST'])
+def crontab_del():
+    task_id = request.form.get('id', '')   
+    return MwCrontab.instance().delete(task_id) 
 
+# 获取计划任务
+@blueprint.route('/get_crond_find', endpoint='get_crond_find', methods=['GET','POST'])
+def get_crond_find():
+    sid = request.form.get('id', '')
+    data = MwCrontab.instance().getCrondFind(sid)
+    return data
+
+# 添加计划任务
 @blueprint.route('/add', endpoint='add', methods=['GET','POST'])
 @panel_login_required
 def add():
-    page = request.args.get('p', 1)
-    size = 10
-    count = Crontab.query.count()
-    # print(count)
-    clist = Crontab.query.paginate(page=int(page), per_page=size)
-    # print(clist)
-
-    return []
+    request_data = {}
+    request_data['name'] = request.form.get('name', '')
+    request_data['type'] = request.form.get('type', '')
+    request_data['week'] = request.form.get('week', '')
+    request_data['where1'] = request.form.get('where1', '')
+    request_data['hour'] = request.form.get('hour', '')
+    request_data['minute'] = request.form.get('minute', '')
+    request_data['save'] = request.form.get('save', '')
+    request_data['backup_to'] = request.form.get('backupTo', '')
+    request_data['stype'] = request.form.get('sType', '')
+    request_data['sname'] = request.form.get('sName', '')
+    request_data['sbody'] = request.form.get('sBody', '')
+    request_data['url_address'] = request.form.get('urladdress', '')
+    return MwCrontab.instance().add(request_data)
 
 
diff --git a/web/admin/dashboard/__init__.py b/web/admin/dashboard/__init__.py
index c77e84623..77a962a50 100644
--- a/web/admin/dashboard/__init__.py
+++ b/web/admin/dashboard/__init__.py
@@ -8,236 +8,6 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
-import io
-import time
 
-from flask import Blueprint, render_template
-from flask import make_response
-from flask import redirect
-from flask import Response
-from flask import request,g
-
-from admin.common import isLogined
-from admin.user_login_check import panel_login_required
-from admin import cache,session
-from admin import model
-from admin.model import db,TempLogin,Users
-
-import core.mw as mw
-
-
-blueprint = Blueprint('dashboard', __name__, url_prefix='/', template_folder='../../templates')
-@blueprint.route('/')
-@panel_login_required
-def index():
-    return render_template('default/index.html')
-
-# 安全路径
-@blueprint.route('/<path>',endpoint='admin_safe_path',methods=['GET'])
-def admin_safe_path(path):
-    db_path = model.getOption('admin_path')
-
-    if isLogined():
-       return redirect('/')
-
-    if db_path == path:
-        return render_template('default/login.html')
-
-    unauthorized_status = model.getOption('unauthorized_status')
-    if unauthorized_status == '0':
-        return render_template('default/path.html')
-    return Response(status=int(unauthorized_status))
-
-# 仅针对webhook插件
-@blueprint.route("/hook", methods=['POST', 'GET'])
-def webhook():
-    # 兼容获取关键数据
-    access_key = request.args.get('access_key', '').strip()
-    if access_key == '':
-        access_key = request.form.get('access_key', '').strip()
-
-    params = request.args.get('params', '').strip()
-    if params == '':
-        params = request.form.get('params', '').strip()
-
-    input_args = {
-        'access_key': access_key,
-        'params': params,
-    }
-
-    wh_install_path = mw.getServerDir() + '/webhook'
-    if not os.path.exists(wh_install_path):
-        return mw.returnData(False, '请先安装WebHook插件!')
-
-    package = mw.getPanelDir() + "/plugins/webhook"
-    if not package in sys.path:
-        sys.path.append(package)
-        
-    try:
-        import webhook_index
-        return webhook_index.runShellArgs(input_args)
-    except Exception as e:
-        return str(e)
-
-# ---------------------------------------------------------------------------------
-# 定义登录入口相关方法
-# ---------------------------------------------------------------------------------
-
-def getErrorNum(key, limit=None):
-    key = mw.md5(key)
-    num = cache.get(key)
-    if not num:
-        num = 0
-    if not limit:
-        return num
-    if limit > num:
-        return True
-    return False
-
-
-def setErrorNum(key, empty=False, expire=3600):
-    key = mw.md5(key)
-    num = cache.get(key)
-    if not num:
-        num = 0
-    else:
-        if empty:
-            cache.delete(key)
-            return True
-    cache.set(key, num + 1, expire)
-    return True
-
-def login_temp_user(token):
-    if len(token) != 32:
-        return '错误的参数!'
-
-    skey = mw.getClientIp() + '_temp_login'
-    if not getErrorNum(skey, 10):
-        return '连续10次验证失败，禁止1小时'
-
-    stime = int(time.time())
-
-    tmp_data = model.getTempLoginByToken(token)
-    if not tmp_data:
-        setErrorNum(skey)
-        return '验证失败!'
-
-    if stime > int(tmp_data['expire']):
-        setErrorNum(skey)
-        return "过期"
-
-    user_data = model.getUserById(1)
-
-    login_addr = mw.getClientIp() + ":" + str(request.environ.get('REMOTE_PORT'))
-    mw.writeLog('用户临时登录', "登录成功,帐号:{1},登录IP:{2}",(user_data['name'], login_addr))
-
-    TempLogin.query.filter(TempLogin.id==tmp_data['id']).update({"login_time": stime, 'state': 1, 'login_addr': login_addr})
-    db.session.commit()
-    
-    session['login'] = True
-    session['username'] = user_data['name']
-    session['tmp_login'] = True
-    session['tmp_login_id'] = str(tmp_data['id'])
-    session['tmp_login_expire'] = int(tmp_data['expire'])
-    session['uid'] = user_data['id']
-    
-    return redirect('/')
-
-# 登录页: 当设置了安全路径,本页失效。
-@blueprint.route('/login')
-def login():
-
-    # 临时登录功能
-    token = request.args.get('tmp_token', '').strip()
-    if token != '':
-        return login_temp_user(token)
-
-    # 注销登录
-    signout = request.args.get('signout', '')
-    if signout == 'True':
-        session.clear()
-        session['login'] = False
-        session['overdue'] = 0
-
-    db_path = model.getOption('admin_path')
-    if db_path == '':
-        return render_template('default/login.html')
-    else:
-        unauthorized_status = model.getOption('unauthorized_status')
-        if unauthorized_status == '0':
-            return render_template('default/path.html')
-        return Response(status=int(unauthorized_status))
-
-# 验证码
-@blueprint.route('/code')
-def code():
-    import utils.vilidate as vilidate
-    vie = vilidate.vieCode()
-    codeImage = vie.GetCodeImage(80, 4)
-    out = io.BytesIO()
-    codeImage[0].save(out, "png")
-    session['code'] = mw.md5(''.join(codeImage[1]).lower())
-
-    img = Response(out.getvalue(), headers={'Content-Type': 'image/png'})
-    return make_response(img)
-
-# 检查是否登录
-@blueprint.route('/check_login',methods=['GET','POST'])
-def check_login():
-    if isLogined():
-        return mw.returnData(True,'已登录')
-    return mw.returnData(False,'未登录')
-
-# 执行登录操作
-@blueprint.route('/do_login', endpoint='do_login', methods=['POST'])
-def do_login():
-    username = request.form.get('username', '').strip()
-    password = request.form.get('password', '').strip()
-    code = request.form.get('code', '').strip()
-
-    login_cache_count = 5
-    login_cache_limit = cache.get('login_cache_limit')
-
-    if 'code' in session:
-        if session['code'] != mw.md5(code):
-            if login_cache_limit == None:
-                login_cache_limit = 1
-            else:
-                login_cache_limit = int(login_cache_limit) + 1
-
-            if login_cache_limit >= login_cache_count:
-                model.setOption('admin_close', 'yes')
-                return mw.returnJson(False, '面板已经关闭!')
-
-            cache.set('login_cache_limit', login_cache_limit, timeout=10000)
-            login_cache_limit = cache.get('login_cache_limit')
-            login_err_msg = mw.getInfo("验证码错误,您还可以尝试[{1}]次!", (str(login_cache_count - login_cache_limit)))
-            mw.writeLog('用户登录', login_err_msg)
-            return mw.returnData(False, login_err_msg)
-
-    info = model.getUserByName(username)
-    password = mw.md5(password)
-
-    if info['name'] != username or info['password'] != password:
-        msg = "<a style='color: red'>密码错误</a>,帐号:{1},密码:{2},登录IP:{3}", (('****', '******', request.remote_addr))
-
-        if login_cache_limit == None:
-            login_cache_limit = 1
-        else:
-            login_cache_limit = int(login_cache_limit) + 1
-
-        if login_cache_limit >= login_cache_count:
-            model.setOption('admin_close', 'yes')
-            return mw.returnData(False, '面板已经关闭!')
-
-        cache.set('login_cache_limit', login_cache_limit, timeout=10000)
-        login_cache_limit = cache.get('login_cache_limit')
-        mw.writeLog('用户登录', mw.getInfo(msg))
-        return mw.returnData(-1, mw.getInfo("用户名或密码错误,您还可以尝试[{1}]次!", (str(login_cache_count - login_cache_limit))))
-
-
-    session['login'] = True
-    session['username'] = info['name']
-    session['overdue'] = int(time.time()) + 7 * 24 * 60 * 60
-
-    return mw.returnJson(1, '登录成功,正在跳转...')
+from .dashboard import *
+from .login import *
diff --git a/web/admin/dashboard/dashboard.py b/web/admin/dashboard/dashboard.py
new file mode 100644
index 000000000..cf1c82f0f
--- /dev/null
+++ b/web/admin/dashboard/dashboard.py
@@ -0,0 +1,81 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import io
+import time
+
+from flask import Blueprint, render_template
+from flask import make_response
+from flask import redirect
+from flask import Response
+from flask import request,g
+
+from admin.common import isLogined
+from admin.user_login_check import panel_login_required
+from admin import cache,session
+from admin import model
+from admin.model import db,TempLogin,Users
+
+import core.mw as mw
+import thisdb
+
+
+blueprint = Blueprint('dashboard', __name__, url_prefix='/', template_folder='../../templates')
+@blueprint.route('/')
+@panel_login_required
+def index():
+    return render_template('default/index.html')
+
+# 安全路径
+@blueprint.route('/<path>',endpoint='admin_safe_path',methods=['GET'])
+def admin_safe_path(path):
+    db_path = thisdb.getOption('admin_path')
+    if isLogined():
+       return redirect('/')
+
+    print(db_path,path)
+    if db_path == path:
+        return render_template('default/login.html')
+
+    unauthorized_status = thisdb.getOption('unauthorized_status')
+    if unauthorized_status == '0':
+        return render_template('default/path.html')
+    return Response(status=int(unauthorized_status))
+
+# 仅针对webhook插件
+@blueprint.route("/hook", methods=['POST', 'GET'])
+def webhook():
+    # 兼容获取关键数据
+    access_key = request.args.get('access_key', '').strip()
+    if access_key == '':
+        access_key = request.form.get('access_key', '').strip()
+
+    params = request.args.get('params', '').strip()
+    if params == '':
+        params = request.form.get('params', '').strip()
+
+    input_args = {
+        'access_key': access_key,
+        'params': params,
+    }
+
+    wh_install_path = mw.getServerDir() + '/webhook'
+    if not os.path.exists(wh_install_path):
+        return mw.returnData(False, '请先安装WebHook插件!')
+
+    package = mw.getPanelDir() + "/plugins/webhook"
+    if not package in sys.path:
+        sys.path.append(package)
+        
+    try:
+        import webhook_index
+        return webhook_index.runShellArgs(input_args)
+    except Exception as e:
+        return str(e)
diff --git a/web/admin/dashboard/login.py b/web/admin/dashboard/login.py
new file mode 100644
index 000000000..7f1abe8eb
--- /dev/null
+++ b/web/admin/dashboard/login.py
@@ -0,0 +1,189 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import io
+import time
+
+from flask import Blueprint, render_template
+from flask import make_response
+from flask import redirect
+from flask import Response
+from flask import request,g
+
+from admin.common import isLogined
+from admin.user_login_check import panel_login_required
+from admin import cache,session
+from admin import model
+from admin.model import db,TempLogin,Users
+
+import core.mw as mw
+import thisdb
+
+from .dashboard import blueprint
+
+
+def getErrorNum(key, limit=None):
+    key = mw.md5(key)
+    num = cache.get(key)
+    if not num:
+        num = 0
+    if not limit:
+        return num
+    if limit > num:
+        return True
+    return False
+
+
+def setErrorNum(key, empty=False, expire=3600):
+    key = mw.md5(key)
+    num = cache.get(key)
+    if not num:
+        num = 0
+    else:
+        if empty:
+            cache.delete(key)
+            return True
+    cache.set(key, num + 1, expire)
+    return True
+
+def login_temp_user(token):
+    if len(token) != 32:
+        return '错误的参数!'
+
+    skey = mw.getClientIp() + '_temp_login'
+    if not getErrorNum(skey, 10):
+        return '连续10次验证失败，禁止1小时'
+
+    stime = int(time.time())
+
+    tmp_data = model.getTempLoginByToken(token)
+    if not tmp_data:
+        setErrorNum(skey)
+        return '验证失败!'
+
+    if stime > int(tmp_data['expire']):
+        setErrorNum(skey)
+        return "过期"
+
+    user_data = thisdb.getUserById(1)
+
+    login_addr = mw.getClientIp() + ":" + str(request.environ.get('REMOTE_PORT'))
+    mw.writeLog('用户临时登录', "登录成功,帐号:{1},登录IP:{2}",(user_data['name'], login_addr))
+
+    TempLogin.query.filter(TempLogin.id==tmp_data['id']).update({"login_time": stime, 'state': 1, 'login_addr': login_addr})
+    db.session.commit()
+    
+    session['login'] = True
+    session['username'] = user_data['name']
+    session['tmp_login'] = True
+    session['tmp_login_id'] = str(tmp_data['id'])
+    session['tmp_login_expire'] = int(tmp_data['expire'])
+    session['uid'] = user_data['id']
+    
+    return redirect('/')
+
+# 登录页: 当设置了安全路径,本页失效。
+@blueprint.route('/login')
+def login():
+
+    # 临时登录功能
+    token = request.args.get('tmp_token', '').strip()
+    if token != '':
+        return login_temp_user(token)
+
+    # 注销登录
+    signout = request.args.get('signout', '')
+    if signout == 'True':
+        session.clear()
+        session['login'] = False
+        session['overdue'] = 0
+
+    db_path = model.getOption('admin_path')
+    if db_path == '':
+        return render_template('default/login.html')
+    else:
+        unauthorized_status = model.getOption('unauthorized_status')
+        if unauthorized_status == '0':
+            return render_template('default/path.html')
+        return Response(status=int(unauthorized_status))
+
+# 验证码
+@blueprint.route('/code')
+def code():
+    import utils.vilidate as vilidate
+    vie = vilidate.vieCode()
+    codeImage = vie.GetCodeImage(80, 4)
+    out = io.BytesIO()
+    codeImage[0].save(out, "png")
+    session['code'] = mw.md5(''.join(codeImage[1]).lower())
+
+    img = Response(out.getvalue(), headers={'Content-Type': 'image/png'})
+    return make_response(img)
+
+# 检查是否登录
+@blueprint.route('/check_login',methods=['GET','POST'])
+def check_login():
+    if isLogined():
+        return mw.returnData(True,'已登录')
+    return mw.returnData(False,'未登录')
+
+# 执行登录操作
+@blueprint.route('/do_login', endpoint='do_login', methods=['POST'])
+def do_login():
+    username = request.form.get('username', '').strip()
+    password = request.form.get('password', '').strip()
+    code = request.form.get('code', '').strip()
+
+    login_cache_count = 5
+    login_cache_limit = cache.get('login_cache_limit')
+
+    if 'code' in session:
+        if session['code'] != mw.md5(code):
+            if login_cache_limit == None:
+                login_cache_limit = 1
+            else:
+                login_cache_limit = int(login_cache_limit) + 1
+
+            if login_cache_limit >= login_cache_count:
+                model.setOption('admin_close', 'yes')
+                return mw.returnJson(False, '面板已经关闭!')
+
+            cache.set('login_cache_limit', login_cache_limit, timeout=10000)
+            login_cache_limit = cache.get('login_cache_limit')
+            login_err_msg = mw.getInfo("验证码错误,您还可以尝试[{1}]次!", (str(login_cache_count - login_cache_limit)))
+            mw.writeLog('用户登录', login_err_msg)
+            return mw.returnData(False, login_err_msg)
+
+    info = thisdb.getUserByName(username)
+    password = mw.md5(password)
+
+    if info['name'] != username or info['password'] != password:
+        msg = "<a style='color: red'>密码错误</a>,帐号:{1},密码:{2},登录IP:{3}", (('****', '******', request.remote_addr))
+
+        if login_cache_limit == None:
+            login_cache_limit = 1
+        else:
+            login_cache_limit = int(login_cache_limit) + 1
+
+        if login_cache_limit >= login_cache_count:
+            model.setOption('admin_close', 'yes')
+            return mw.returnData(False, '面板已经关闭!')
+
+        cache.set('login_cache_limit', login_cache_limit, timeout=10000)
+        login_cache_limit = cache.get('login_cache_limit')
+        mw.writeLog('用户登录', mw.getInfo(msg))
+        return mw.returnData(-1, mw.getInfo("用户名或密码错误,您还可以尝试[{1}]次!", (str(login_cache_count - login_cache_limit))))
+
+
+    session['login'] = True
+    session['username'] = info['name']
+    session['overdue'] = int(time.time()) + 7 * 24 * 60 * 60
+
+    return mw.returnJson(1, '登录成功,正在跳转...')
diff --git a/web/admin/logs/__init__.py b/web/admin/logs/__init__.py
index eb988b6e4..67c75234b 100644
--- a/web/admin/logs/__init__.py
+++ b/web/admin/logs/__init__.py
@@ -14,11 +14,9 @@ from flask import request
 
 from admin.user_login_check import panel_login_required
 
-from admin import model
-from admin.model import db, Logs
-
 import core.mw as mw
 import utils.adult_log as adult_log
+import thisdb
 
 # 日志页面
 blueprint = Blueprint('logs', __name__, url_prefix='/logs', template_folder='../../templates')
@@ -36,33 +34,18 @@ def get_log_list():
     size = request.form.get('limit', '10').strip()
     search = request.form.get('search', '').strip()
 
-    count = Logs.query.filter_by().count()
-    if search != '':
-        pagination = Logs.query.filter_by(Logs.type.like(search) or Logs.log.like(search)).paginate(page=int(p), per_page=int(size))
-    else:
-        pagination = Logs.query.filter_by().order_by(Logs.id.desc()).paginate(page=int(p), per_page=int(size))
-  
-    rows = []
-    for item in pagination.items:
-        t = {}
-        t['id'] = item.id
-        t['type'] = item.type
-        t['log'] = item.log
-        t['uid'] = item.uid
-        t['add_time'] = item.add_time
-        rows.append(t)
+    info = thisdb.getLogsList(page=int(p),size=int(size), search=search)
 
     data = {}
-    data['data'] = rows
-    data['page'] = mw.getPage({'count':count,'tojs':'getLogs','p':p})
+    data['data'] = info['list']
+    data['page'] = mw.getPage({'count':info['count'],'tojs':'getLogs','p':p,'row':size})
     return data
 
 # 日志清空
 @blueprint.route('/del_panel_logs', endpoint='del_panel_logs', methods=['POST'])
 @panel_login_required
 def del_panel_logs():
-    model.clearLog()
-    # mw.M('logs').dbPos(mw.getPanelDataDir(),'panel').where('id>?', (0,)).delete()
+    thisdb.clearLog()
     mw.writeLog('面板设置', '面板操作日志已清空!')
     return mw.returnData(True, '面板操作日志已清空!')
 
diff --git a/web/admin/setting/setting.py b/web/admin/setting/setting.py
index f6e663e27..3b2d81a0f 100644
--- a/web/admin/setting/setting.py
+++ b/web/admin/setting/setting.py
@@ -16,10 +16,12 @@ from flask import Blueprint, render_template
 from flask import request
 
 from admin import model
+
 from admin.user_login_check import panel_login_required
 
 
 import core.mw as mw
+import thisdb
 import utils.config as utils_config
 
 
@@ -41,9 +43,9 @@ def get_panel_list():
 @panel_login_required
 def set_webname():
     webname = request.form.get('webname', '')
-    src_webname = model.getOption('title')
+    src_webname = thisdb.getOption('title')
     if webname != src_webname:
-        model.setOption('title', webname)
+        thisdb.setOption('title', webname)
     return mw.returnData(True, '面板别名保存成功!')
 
 # 设置服务器IP
@@ -51,9 +53,9 @@ def set_webname():
 @panel_login_required
 def set_ip():
     host_ip = request.form.get('host_ip', '')
-    src_host_ip = model.getOption('server_ip')
+    src_host_ip = thisdb.getOption('server_ip')
     if host_ip != src_host_ip:
-        model.setOption('server_ip', host_ip)
+        thisdb.setOption('server_ip', host_ip)
     return mw.returnData(True, 'IP保存成功!')
 
 # 默认备份目录
@@ -61,9 +63,9 @@ def set_ip():
 @panel_login_required
 def set_backup_dir():
     backup_path = request.form.get('backup_path', '')
-    src_backup_path = model.getOption('backup_path')
+    src_backup_path = thisdb.getOption('backup_path')
     if backup_path != src_backup_path:
-        model.setOption('backup_path', backup_path)
+        thisdb.setOption('backup_path', backup_path)
     return mw.returnData(True, '修改默认备份目录成功!')
 
 # 默认站点目录
@@ -71,9 +73,9 @@ def set_backup_dir():
 @panel_login_required
 def set_www_dir():
     sites_path = request.form.get('sites_path', '')
-    src_sites_path = model.getOption('sites_path')
+    src_sites_path = thisdb.getOption('sites_path')
     if sites_path != src_sites_path:
-        model.setOption('sites_path', sites_path)
+        thisdb.setOption('sites_path', sites_path)
     return mw.returnData(True, '修改默认建站目录成功!')
 
 
@@ -102,9 +104,9 @@ def set_admin_path():
         if not re.match(r"^/[\w]+$", admin_path):
             return mw.returnData(False, '入口地址格式不正确,示例: /mw_rand')
     
-    src_admin_path = model.getOption('admin_path')
+    src_admin_path = thisdb.getOption('admin_path')
     if admin_path != src_admin_path:
-        model.setOption('admin_path', admin_path[1:])
+        thisdb.setOption('admin_path', admin_path[1:])
     return mw.returnData(True, '修改成功!')
 
 
@@ -125,7 +127,7 @@ def set_basic_auth():
         is_open = False
 
     if basic_open == 'false':
-        model.setOption('basic_auth', json.dumps({'open':False}))
+        thisdb.setOption('basic_auth', json.dumps({'open':False}))
         mw.writeLog('面板设置', '设置BasicAuth状态为: %s' % is_open)
         return mw.returnData(True, '删除BasicAuth成功!')
 
@@ -139,7 +141,7 @@ def set_basic_auth():
     data['basic_pwd'] = mw.md5(basic_pwd + salt)
     data['open'] = is_open
 
-    model.setOption('basic_auth', json.dumps(data))
+    thisdb.setOption('basic_auth', json.dumps(data))
     mw.writeLog('面板设置', '设置BasicAuth状态为: %s' % is_open)
     return mw.returnData(True, '设置成功!')
 
@@ -158,7 +160,7 @@ def set_status_code():
         return mw.returnData(False, '状态码范围错误!')
 
     info = utils_config.getUnauthStatus(code=str(status_code))
-    model.setOption('unauthorized_status', str(status_code))
+    thisdb.setOption('unauthorized_status', str(status_code))
     mw.writeLog('面板设置', '将未授权响应状态码设置为:{0}:{1}'.format(status_code,info['text']))
     return mw.returnData(True, '设置成功!')
 
@@ -166,11 +168,11 @@ def set_status_code():
 @blueprint.route('/open_debug', endpoint='open_debug', methods=['POST'])
 @panel_login_required
 def open_debug():
-    debug = model.getOption('debug',default='close')
+    debug = thisdb.getOption('debug',default='close')
     if debug == 'open':
-        model.setOption('debug','close')
+        thisdb.setOption('debug','close')
         return mw.returnData(True, '开发模式关闭!')
-    model.setOption('debug','open')
+    thisdb.setOption('debug','open')
     return mw.returnData(True, '开发模式开启!')
 
 
@@ -178,11 +180,11 @@ def open_debug():
 @blueprint.route('/close_panel', endpoint='close_panel', methods=['POST'])
 @panel_login_required
 def close_panel():
-    admin_close = model.getOption('admin_close',default='no')
+    admin_close = thisdb.getOption('admin_close',default='no')
     if admin_close == 'no':
-        model.setOption('admin_close','yes')
+        thisdb.setOption('admin_close','yes')
         return mw.returnData(True, '开启面板成功!')
-    model.setOption('admin_close','no')
+    thisdb.setOption('admin_close','no')
     return mw.returnData(True, '关闭面板成功!')
 
 # 设置IPV6状态
diff --git a/web/admin/setup/option.py b/web/admin/setup/option.py
index 87f691471..da08bedd0 100644
--- a/web/admin/setup/option.py
+++ b/web/admin/setup/option.py
@@ -12,50 +12,47 @@ import json
 
 from flask import request
 
-from admin import model
-from admin.model import db, Users
-
 import core.mw as mw
+import thisdb
 
 def init_option():
-    model.setOption('title', '后羿面板')
-    model.setOption('recycle_bin', 'open')
-    model.setOption('template', 'default')
+    thisdb.setOption('title', '后羿面板')
+    thisdb.setOption('recycle_bin', 'open')
+    thisdb.setOption('template', 'default')
 
     # 后台面板是否关闭
-    model.setOption('admin_close', 'no')
+    thisdb.setOption('admin_close', 'no')
 
     # 未认证状态码
-    model.setOption('unauthorized_status', '0')
+    thisdb.setOption('unauthorized_status', '0')
 
     # 调式模式,默认关闭
-    model.setOption('debug', 'close')
+    thisdb.setOption('debug', 'close')
 
     # basic auth 配置
-    model.setOption('basic_auth', json.dumps({'open':False}))
+    thisdb.setOption('basic_auth', json.dumps({'open':False}))
 
     # 开启后台任务
     # model.setOption('run_bg_task', 'close')
 
     # 首页展示初始化
-    model.setOption('display_index', '[]')
+    thisdb.setOption('display_index', '[]')
 
     # 监控默认配置
-    model.setOption('monitor_status', 'open', type='monitor')
-    model.setOption('monitor_day', '30', type='monitor')
-    model.setOption('monitor_only_netio', 'open', type='monitor')
+    thisdb.setOption('monitor_status', 'open', type='monitor')
+    thisdb.setOption('monitor_day', '30', type='monitor')
+    thisdb.setOption('monitor_only_netio', 'open', type='monitor')
 
     # 初始化安全路径
-    model.setOption('admin_path', mw.getRandomString(8))
+    thisdb.setOption('admin_path', mw.getRandomString(8))
 
 
     ip = mw.getLocalIp()
-    model.setOption('server_ip', ip)
+    thisdb.setOption('server_ip', ip)
 
     # 默认备份目录
-    model.setOption('backup_path', mw.getFatherDir()+'/backup')
+    thisdb.setOption('backup_path', mw.getFatherDir()+'/backup')
     # 默认站点目录
-    model.setOption('site_path', mw.getFatherDir()+'/wwwroot')
+    thisdb.setOption('site_path', mw.getFatherDir()+'/wwwroot')
     
-
     return True
\ No newline at end of file
diff --git a/web/admin/setup/user.py b/web/admin/setup/user.py
index e18008d30..7c2092ace 100644
--- a/web/admin/setup/user.py
+++ b/web/admin/setup/user.py
@@ -14,28 +14,10 @@ from admin import model
 from admin.model import db, Users
 
 import core.mw as mw
+import thisdb
 
 # 初始化用户信息
 def init_admin_user():
-    data = Users.query.filter_by(id=1).first()
-    if not data:
-        name = mw.getRandomString(8).lower()
-        password = mw.getRandomString(8).lower()
-        file_pass_pl = mw.getPanelDataDir() + '/default.pl'
-        mw.writeFile(file_pass_pl, password)
-        insert_time = mw.formatDate()
-        login_ip = '127.0.0.1'
-        add_user = Users(
-            name=name, 
-            password=mw.md5(password),
-            login_ip=login_ip,
-            login_time=insert_time,
-            phone='',
-            email='',
-            add_time=insert_time,
-            update_time=insert_time)
-        db.session.add(add_user)
-        db.session.commit()
-        db.session.close()
+    thisdb.initAdminUser()
     return True
 
diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index d51580a0c..6036672f2 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -19,6 +19,7 @@ from admin.user_login_check import panel_login_required
 from utils.plugin import plugin as MwPlugin
 import utils.site as site
 import core.mw as mw
+import thisdb
 
 blueprint = Blueprint('site', __name__, url_prefix='/site', template_folder='../../templates/default')
 @blueprint.route('/index', endpoint='index')
@@ -34,28 +35,11 @@ def list():
     type_id = request.form.get('type_id', '0').strip()
     search = request.form.get('search', '').strip()
 
-    count = Sites.query.count()
-    pagination = Sites.query.paginate(page=int(p), per_page=int(limit))
-
-    site_list = []
-    for item in pagination.items:
-        t = {}
-        t['id'] = item.id
-        t['name'] = item.name
-        t['path'] = item.path
-        t['index'] = item.index
-        t['ps'] = item.ps
-        t['edate'] = item.edate
-        t['type_id'] = item.type_id
-        t['status'] = item.status
-        t['add_time'] = item.add_time
-        t['update_time'] = item.update_time
-        site_list.append(t)
+    info = thisdb.getSitesList(page=int(p),size=int(limit),type_id=int(type_id), search=search)
 
     data = {}
-    data['data'] = site_list
-    data['page'] = mw.getPage({'count':count,'tojs':'getWeb','p':p, 'row':limit})
-
+    data['data'] = info['list']
+    data['page'] = mw.getPage({'count':info['count'],'tojs':'getWeb','p':p, 'row':limit})
     return data
 
 @blueprint.route('/get_site_types', endpoint='get_site_types',methods=['POST'])
diff --git a/web/admin/system/system.py b/web/admin/system/system.py
index 125563e2b..d224e408d 100644
--- a/web/admin/system/system.py
+++ b/web/admin/system/system.py
@@ -16,9 +16,9 @@ from flask import request
 from admin.user_login_check import panel_login_required
 from utils.system import monitor
 
-import admin.model.option as option
 import core.mw as mw
 import utils.system as sys
+import thisdb
 
 
 
@@ -112,19 +112,19 @@ def set_control():
     day = request.form.get('day', '')
 
     if stype == '0':
-        option.setOption('monitor_status', 'close', type='monitor')
+        thisdb.setOption('monitor_status', 'close', type='monitor')
         return mw.returnData(True, "设置成功!")
     elif stype == '1':
         _day = int(day)
         if _day < 1:
             return mw.returnData(False, "设置失败!")
-        option.setOption('monitor_day', day, type='monitor')
+        thisdb.setOption('monitor_day', day, type='monitor')
         return mw.returnData(True, "设置成功!")
     elif stype == '2':
-        option.setOption('monitor_only_netio', 'close', type='monitor')
+        thisdb.setOption('monitor_only_netio', 'close', type='monitor')
         return mw.returnData(True, "设置成功!")
     elif stype == '3':
-        option.setOption('monitor_only_netio', 'open', type='monitor')
+        thisdb.setOption('monitor_only_netio', 'open', type='monitor')
         return mw.returnData(True, "设置成功!")
     elif stype == 'del':
         if not mw.isRestart():
@@ -132,9 +132,9 @@ def set_control():
         monitor.instance().clearDbFile()
         return mw.returnData(True, "清空监控记录成功!")
     else:
-        monitor_status = option.getOption('monitor_status', default='open', type='monitor')
-        monitor_day = option.getOption('monitor_day', default='30', type='monitor')
-        monitor_only_netio = option.getOption('monitor_only_netio', default='open', type='monitor')
+        monitor_status = thisdb.getOption('monitor_status', default='open', type='monitor')
+        monitor_day = thisdb.getOption('monitor_day', default='30', type='monitor')
+        monitor_only_netio = thisdb.getOption('monitor_only_netio', default='open', type='monitor')
         data = {}
         data['day'] = monitor_day
         if monitor_status == 'open':   
diff --git a/web/admin/task/__init__.py b/web/admin/task/__init__.py
index e90f33a89..0567a7531 100644
--- a/web/admin/task/__init__.py
+++ b/web/admin/task/__init__.py
@@ -18,6 +18,7 @@ from admin.user_login_check import panel_login_required
 
 import core.mw as mw
 import utils.task as MwTasks
+import thisdb
 
 blueprint = Blueprint('task', __name__, url_prefix='/task', template_folder='../../templates/default')
 
@@ -25,7 +26,7 @@ blueprint = Blueprint('task', __name__, url_prefix='/task', template_folder='../
 @blueprint.route('/count', endpoint='task_count')
 @panel_login_required
 def task_count():
-    return str(model.getTaskUnexecutedCount())
+    return str(thisdb.getTaskUnexecutedCount())
 
 
 @blueprint.route('/list', endpoint='list', methods=['POST'])
diff --git a/web/admin/user_login_check.py b/web/admin/user_login_check.py
index 63fbb096d..c2ba5b1dd 100644
--- a/web/admin/user_login_check.py
+++ b/web/admin/user_login_check.py
@@ -14,17 +14,17 @@ from flask import Response
 
 from functools import wraps
 
-from admin import model
 from admin import session
 from admin.common import isLogined
 
+import thisdb
 
 def panel_login_required(func):
 
     @wraps(func)
     def wrapper(*args, **kwargs):
         if not isLogined():
-            unauthorized_status = model.getOption('unauthorized_status')
+            unauthorized_status = thisdb.getOption('unauthorized_status')
             if unauthorized_status == '0':
                 return render_template('default/path.html')
             return Response(status=int(unauthorized_status))
diff --git a/web/core/db.py b/web/core/db.py
index e5c1107a8..5962ac56a 100755
--- a/web/core/db.py
+++ b/web/core/db.py
@@ -120,6 +120,21 @@ class Sql():
             self.__OPT_FIELD = field
         return self
 
+    def getDbField(self,name):
+        sql = "PRAGMA table_info(%s)" % name
+        result = self.__DB_CONN.execute(sql)
+        data = result.fetchall()
+
+        fields = []
+        for i in data:
+            fields.append(i[1])
+        return fields
+
+    def getDbFieldString(self,name):
+        fields = self.getDbField(name)
+        return ','.join(fields)
+        
+
     def select(self):
         # 查询数据集
         self.__getConn()
@@ -130,25 +145,40 @@ class Sql():
             # print(self.__OPT_PARAM)
             result = self.__DB_CONN.execute(sql, self.__OPT_PARAM)
             data = result.fetchall()
+            if len(data) == 0:
+                return data
+
             # 构造字曲系列
             if self.__OPT_FIELD != "*":
                 field = self.__OPT_FIELD.split(',')
                 tmp = []
                 for row in data:
                     i = 0
-                    tmp1 = {}
+                    t = {}
                     for key in field:
-                        tmp1[key] = row[i]
+                        t[key] = row[i]
                         i += 1
-                    tmp.append(tmp1)
-                    del(tmp1)
+                    tmp.append(t)
+                    del(t)
                 data = tmp
                 del(tmp)
             else:
-                # 将元组转换成列表
-                tmp = map(list, data)
+                field = self.getDbField(self.__DB_TABLE)
+                tmp = []
+                for row in data:
+                    i = 0
+                    t = {}
+                    for key in field:
+                        t[key] = row[i]
+                        i += 1
+                    tmp.append(t)
+                    del(t)
                 data = tmp
                 del(tmp)
+                # 将元组转换成列表
+                # tmp = map(list, data)
+                # data = tmp
+                # del(tmp)
             self.__close()
             return data
         except Exception as ex:
@@ -162,7 +192,8 @@ class Sql():
             sql = "SELECT " + self.__OPT_FIELD + " FROM " + self.__DB_TABLE + \
                 self.__OPT_WHERE + self.__OPT_GROUP + self.__OPT_ORDER + self.__OPT_LIMIT
 
-            if os.path.exists('data/debug.pl'):
+            debug = getPanelDir()+'/data/debug.pl'
+            if os.path.exists(debug):
                 print(sql, self.__OPT_PARAM)
             result = self.__DB_CONN.execute(sql, self.__OPT_PARAM)
             data = result.fetchall()
@@ -199,7 +230,7 @@ class Sql():
         result = self.field(keyName).select()
         if len(result) == 1:
             return result[0][keyName]
-        return result
+        return None
 
     def setField(self, keyName, keyValue):
         # 更新指定字段
@@ -210,7 +241,7 @@ class Sql():
         result = self.limit("1").select()
         if len(result) == 1:
             return result[0]
-        return result
+        return None
 
     def count(self):
         # 取行数
@@ -237,7 +268,8 @@ class Sql():
             self.__DB_CONN.commit()
             return last_id
         except Exception as ex:
-            return "error: " + str(ex)
+            print(str(ex))
+            return 0
 
     # 插入数据
     def insert(self, pdata):
diff --git a/web/static/app/crontab.js b/web/static/app/crontab.js
index 1d6302e1f..b8aea37d1 100755
--- a/web/static/app/crontab.js
+++ b/web/static/app/crontab.js
@@ -83,6 +83,7 @@ function getBackupName(hook_data, name){
 function getCronData(page){
 	var load = layer.msg(lan.public.the,{icon:16,time:0,shade: [0.3, '#000']});
 	$.post("/crontab/list?p="+page,'', function(rdata){
+		console.log(rdata);
 		layer.close(load);
 		var cbody = "";
 		if(rdata == ""){
@@ -115,7 +116,7 @@ function getCronData(page){
 					<td>"+rdata.data[i].cycle+"</td>\
 					<td>"+cron_save +"</td>\
 					<td>"+cron_backupto+"</td>\
-					<td>"+rdata.data[i].addtime+"</td>\
+					<td>"+rdata.data[i].add_time+"</td>\
 					<td>\
 						<a href=\"javascript:startTask("+rdata.data[i].id+");\" class='btlink'>执行</a> | \
 						<a href=\"javascript:editTaskInfo('"+rdata.data[i].id+"');\" class='btlink'>编辑</a> | \
@@ -341,7 +342,7 @@ function planAdd(){
 	
 	$("#cronConfig input[name='sName']").val(sName);
 	layer.msg('正在添加,请稍候...!',{icon:16,time:0,shade: [0.3, '#000']});
-	var data = $("#cronConfig").serialize() + '&sBody='+sBody + '&urladdress=' + urladdress;
+	var data = $("#cronConfig").serialize() + '&sBody='+sBody;
 	// console.log(data);
 	$.post('/crontab/add',data,function(rdata){
 		if(!rdata.status) {
diff --git a/web/thisdb/__init__.py b/web/thisdb/__init__.py
index a2517d0f7..85125f384 100644
--- a/web/thisdb/__init__.py
+++ b/web/thisdb/__init__.py
@@ -14,3 +14,4 @@ from .user import *
 from .sites import *
 from .tasks import *
 from .logs import *
+from .crontab import *
diff --git a/web/thisdb/crontab.py b/web/thisdb/crontab.py
new file mode 100644
index 000000000..27dad974f
--- /dev/null
+++ b/web/thisdb/crontab.py
@@ -0,0 +1,43 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+
+import core.mw as mw
+
+__field = 'id,name,type,where1,where_hour,where_minute,echo,status,save,backup_to,stype,sname,sbody,url_address,add_time,update_time'
+
+def addCrontab(data):
+    now_time = mw.formatDate()
+    data['add_time'] = now_time
+    data['update_time'] = now_time
+    return mw.M('crontab').insert(data)
+
+def getCrond(id):
+    return mw.M('crontab').where('id=?', (id,)).field(__field).find()
+
+def deleteCronById(id):
+    mw.M('crontab').where("id=?", (id,)).delete()
+    return True
+
+def getCrontabList(
+    page:int | None = 1,
+    size:int | None = 10,
+):
+    start = (int(page) - 1) * size
+    limit = str(start) + ',' + str(size)
+
+    cron_list = mw.M('crontab').field(__field).limit(limit).order('id desc').select()
+    count = mw.M('crontab').count()
+
+    data = {}
+    data['count'] = count
+    data['list'] = cron_list
+    return data
\ No newline at end of file
diff --git a/web/thisdb/init.py b/web/thisdb/init.py
index 6fa7431ff..a007d27e1 100644
--- a/web/thisdb/init.py
+++ b/web/thisdb/init.py
@@ -8,6 +8,20 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
+import os
+
+import core.mw as mw
+
 
 def initPanelData():
-	pass
\ No newline at end of file
+    _dbfile = mw.getPanelDataDir() + '/panel.db'
+    if os.path.exists(_dbfile):
+        return True
+    sql_file = mw.getPanelDataDir() + '/sql/default.sql'
+    sql = mw.M().dbPos(mw.getPanelDataDir(),'panel')
+    csql = mw.readFile(sql_file)
+    csql_list = csql.split(';')
+    for index in range(len(csql_list)):
+        print(index)
+        sql.execute(csql_list[index], ())
+    return True
\ No newline at end of file
diff --git a/web/thisdb/logs.py b/web/thisdb/logs.py
index 967373068..d23d59719 100644
--- a/web/thisdb/logs.py
+++ b/web/thisdb/logs.py
@@ -8,6 +8,7 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
+import json
 
 
 import core.mw as mw
@@ -32,4 +33,30 @@ def addLog(type, log,
         'add_time':add_time,
     }
     mw.M('logs').insert(insert_data)
-    return True
\ No newline at end of file
+    return True
+
+def getLogsList(
+    page:int | None = 1,
+    size:int | None = 10,
+    search: str | None = ''
+):
+    sql_where = ''
+    if search != '' :
+        sql_where = " type like '%" + search + "%' or log like '%" + search + "%' "
+
+    field = 'id,type,log,uid,add_time'
+    dbM = dbC = mw.M('logs').field(field)
+
+    if sql_where != '':
+        count = mw.M('logs').field(field).where(sql_where).count()
+    else:
+        count = mw.M('logs').field(field).count()
+
+    start = (int(page) - 1) * (int(size))
+    limit = str(start) + ',' +str(size)
+    logs_list = mw.M('logs').field(field).limit(limit).order('id desc').select()
+
+    data = {}
+    data['list'] = logs_list
+    data['count'] = count
+    return data
\ No newline at end of file
diff --git a/web/thisdb/option.py b/web/thisdb/option.py
index 033a13925..767078425 100644
--- a/web/thisdb/option.py
+++ b/web/thisdb/option.py
@@ -23,8 +23,7 @@ def getOption(name,
     :default -> str 默认值 (可选)
     '''
     data = mw.M('option').field('name').where('name=? and type=?',(name, type,)).getField('value')
-
-    if len(data) == 0:
+    if data is None:
         return default
     return data
 
@@ -40,7 +39,7 @@ def getOptionByJson(name,
     :default -> str 默认值 (可选)
     '''
     data = mw.M('option').field('name').where('name=? and type=?',(name, type,)).getField('value')
-    if len(data) == 0:
+    if data is None:
         return default
     if data is not None:
         return json.loads(data)
@@ -54,5 +53,15 @@ def setOption(name, value,
     :value -> object值 (必填)
     :type -> str 类型 (可选|默认common)
     '''
-    mw.M('option').field('name').where('name=? and type=?',(name, type,)).setField('value', value)
+
+    data = mw.M('option').field('name,type,value').where('name=? and type=?',(name, type,)).find()
+    if data is not None:
+        mw.M('option').field('name').where('name=? and type=?',(name, type,)).setField('value', value)
+        return True
+    add_option = {
+        'name':name,
+        'type':type,
+        'value':value
+    }
+    mw.M('option').insert(add_option)
     return True
\ No newline at end of file
diff --git a/web/thisdb/sites.py b/web/thisdb/sites.py
index b1f5a7082..e20f30071 100644
--- a/web/thisdb/sites.py
+++ b/web/thisdb/sites.py
@@ -11,5 +11,38 @@
 import core.mw as mw
 
 def getSitesCount():
-	return mw.M('sites').count()
+    return mw.M('sites').count()
+
+
+def getSitesList(
+    page:int | None = 1,
+    size:int | None = 10,
+    type_id:int | None = 0,
+    search: str | None = ''
+):
+    sql_where = ''
+    if search != '' :
+        sql_where = " name like '%" + search + "%' or ps like '%" + search + "%' "
+    if type_id != '' and int(type_id) >= 0 and search != '' :
+        sql_where = sql_where + " and type_id=" + str(type_id) + ""
+    if type_id != '' and int(type_id) >= 0:
+        sql_where = " type_id=" + str(type_id)
+
+
+    dbM = dbC = mw.M('sites').field('id,name,path,status,ps,edate,type_id,add_time,update_time')
+
+    if sql_where != '':
+        count = dbC.where(sql_where).count()
+    else:
+        count = dbC.count()
+
+    start = (int(page) - 1) * (int(size))
+    limit = str(start) + ',' +str(size)
+    site_list = dbM.limit(limit).order('id desc').select()
+
+    
+    data = {}
+    data['list'] = site_list
+    data['count'] = count
+    return data
 
diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index 7dcab2a21..c209794d7 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -10,6 +10,10 @@
 
 import core.mw as mw
 
+# 未执行任务总数
+def getTaskUnexecutedCount() -> int:
+    return mw.M('tasks').where('status!=?',(1,)).count()
+
 def addTask(
     name: str | None = '常用任务',
     cmd: str | None = None,
@@ -36,4 +40,35 @@ def addTask(
         'add_time':add_time,
     }
     mw.M('tasks').insert(insert_data)
+    return True
+
+
+def getTaskList(
+    status: int | None = 1,
+    page: int | None = 1,
+    size: int | None = 10,
+):
+    start = (page - 1) * size
+    limit = str(start) + ',' + str(size)
+
+    field = 'id,name,type,start,end,status,add_time'
+    data = mw.M('tasks').where('', ()).field(field).limit(limit).order('id asc').select()
+    return data
+
+
+
+def setTaskStatus(id,
+    status: int | None = 0
+):
+    mw.M('tasks').where('id=?',(id,)).update({'status':status})
+    return True
+
+def setTaskData(id,
+    start: int | None = None,
+    end: int | None = None,
+):
+    if start is not None:
+        mw.M('tasks').where('id=?',(id,)).update({'start':start})
+    if end is not None:
+        mw.M('tasks').where('id=?',(id,)).update({'end':end})
     return True
\ No newline at end of file
diff --git a/web/thisdb/temp_login.py b/web/thisdb/temp_login.py
new file mode 100644
index 000000000..ab75c3923
--- /dev/null
+++ b/web/thisdb/temp_login.py
@@ -0,0 +1,33 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import time
+
+from admin.model import db, TempLogin
+
+import core.mw as mw
+
+def getTempLoginByToken(token,
+) -> None:
+    '''
+    获取用户信息通过用户名
+    '''
+    field = 'id,addtime,expire,login_time,login_addr,state,add_time'
+    data = mw.M('temp_login').where('token=?', (token,)).field(field).order('id asc').select()
+    return data
+
+def clearTempLogin()->bool:
+    '''
+    清空过期数据
+    '''
+
+    now_time = int(time.time())
+    mw.M('temp_login').where('expire<?', (now_time)).delete()
+    return True
\ No newline at end of file
diff --git a/web/thisdb/user.py b/web/thisdb/user.py
index e95ab8975..519a3476c 100644
--- a/web/thisdb/user.py
+++ b/web/thisdb/user.py
@@ -10,25 +10,49 @@
 
 import core.mw as mw
 
+# 初始化用户信息
+def initAdminUser():
+    data = mw.M('users').field('id').where('id=?', (1,)).find()
+    if data is None:
+        name = mw.getRandomString(8).lower()
+        password = mw.getRandomString(8).lower()
+        insert_time = mw.formatDate()
+        login_ip = '127.0.0.1'
+        add_user = {
+            'name':name, 
+            'password':mw.md5(password),
+            'login_ip':login_ip,
+            'login_time':insert_time,
+            'phone':'',
+            'email':'',
+            'add_time':insert_time,
+            'update_time':insert_time
+        }
+        file_pass_pl = mw.getPanelDataDir() + '/default.pl'
+        mw.writeFile(file_pass_pl, password)
+        mw.M('users').insert(add_user)
+    return True
+
+
 def getUserByName(name,
 ) -> None:
     '''
     获取用户信息通过用户名
     '''
     users_field = 'id,name,password,login_ip,login_time,phone,email,add_time,update_time'
-    item =  mw.M('users').field(users_field).where('name=?', (name,)).select()
-    if len(item) == 0:
+    data =  mw.M('users').field(users_field).where('name=?', (name,)).find()
+    if data is None:
         return None
     row = {}
-    row['id'] = item[0]['id']
-    row['name'] = item[0]['name']
-    row['password'] = item[0]['password']
-    row['login_ip'] = item[0]['login_ip']
-    row['login_time'] = item[0]['login_time']
-    row['phone'] = item[0]['phone']
-    row['email'] = item[0]['email']
-    row['add_time'] = item[0]['add_time']
-    row['update_time'] = item[0]['update_time']
+    row['id'] = data['id']
+    row['name'] = data['name']
+    row['password'] = data['password']
+    row['login_ip'] = data['login_ip']
+    row['login_time'] = data['login_time']
+    row['phone'] = data['phone']
+    row['email'] = data['email']
+    row['add_time'] = data['add_time']
+    row['update_time'] = data['update_time']
     return row
 
 def getUserById(id,
@@ -37,19 +61,19 @@ def getUserById(id,
     获取用户信息通过用户名
     '''
     users_field = 'id,name,password,login_ip,login_time,phone,email,add_time,update_time'
-    item =  mw.M('users').field(users_field).where('id=?', (1,)).select()
-    if len(item) == 0:
+    data =  mw.M('users').field(users_field).where('id=?', (1,)).find()
+    if data is None:
         return None
     row = {}
-    row['id'] = item[0]['id']
-    row['name'] = item[0]['name']
-    row['password'] = item[0]['password']
-    row['login_ip'] = item[0]['login_ip']
-    row['login_time'] = item[0]['login_time']
-    row['phone'] = item[0]['phone']
-    row['email'] = item[0]['email']
-    row['add_time'] = item[0]['add_time']
-    row['update_time'] = item[0]['update_time']
+    row['id'] = data['id']
+    row['name'] = data['name']
+    row['password'] = data['password']
+    row['login_ip'] = data['login_ip']
+    row['login_time'] = data['login_time']
+    row['phone'] = data['phone']
+    row['email'] = data['email']
+    row['add_time'] = data['add_time']
+    row['update_time'] = data['update_time']
     return row
 
 
diff --git a/web/utils/crontab.py b/web/utils/crontab.py
index 57a654e17..f9b2d14d5 100644
--- a/web/utils/crontab.py
+++ b/web/utils/crontab.py
@@ -8,4 +8,423 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
+import os
+import sys
+import time
+import json
+import threading
+import multiprocessing
+
+from admin import model
+
+import core.mw as mw
+import thisdb
+
+class crontab(object):
+        # lock
+    _instance_lock = threading.Lock()
+
+    @classmethod
+    def instance(cls, *args, **kwargs):
+        if not hasattr(crontab, "_instance"):
+            with crontab._instance_lock:
+                if not hasattr(crontab, "_instance"):
+                    crontab._instance = crontab(*args, **kwargs)
+        return crontab._instance
+
+    # 获取指定任务数据
+    def getCrondFind(self, cron_id):
+        return thisdb.getCrond(cron_id)
+
+    def add(self, data):
+        if len(data['name']) < 1:
+            return mw.returnData(False, '任务名称不能为空!')
+
+        is_check_pass, msg = self.cronCheck(data)
+        if not is_check_pass:
+            return mw.returnData(is_check_pass, msg)
+
+        cmd, title = self.getCrondCycle(data)
+        cron_path = mw.getServerDir() + '/cron'
+        cron_name = self.getShell(data)
+
+        cmd += ' ' + cron_path + '/' + cron_name + ' >> ' + cron_path + '/' + cron_name + '.log 2>&1'
+
+        if not mw.isAppleSystem():
+            data = self.writeShell(cmd)
+            if not data['status']:
+                return data
+            self.crondReload()
+
+        add_dbdata = {}
+        add_dbdata['name'] = data['name']
+        add_dbdata['type'] = data['type']
+        add_dbdata['where1'] = data['where1']
+        add_dbdata['where_hour'] = data['hour']
+        add_dbdata['where_minute'] = data['minute']
+        add_dbdata['save'] = data['save']
+        add_dbdata['backup_to'] = data['backup_to']
+        add_dbdata['sname'] = data['sname']
+        add_dbdata['sbody'] = data['sbody']
+        add_dbdata['stype'] = data['stype']
+        add_dbdata['echo'] = cron_name
+        add_dbdata['url_address'] = data['url_address']
+
+        tid = thisdb.addCrontab(add_dbdata)
+        if tid > 0:
+            return mw.returnData(True, '添加成功')
+        return mw.returnData(False, '添加失败')
+
+    def delete(self, tid):
+        data = thisdb.getCrond(tid)
+        if not self.removeForCrond(data['echo']):
+            return mw.returnData(False, '无法写入文件，请检查是否开启了系统加固功能!')
+
+        cron_path = mw.getServerDir() + '/cron'
+        cron_file = cron_path + '/' + data['echo']
+
+        if os.path.exists(cron_file):
+            os.remove(cron_file)
+        cron_file = cron_path + '/' + data['echo'] + '.log'
+        if os.path.exists(cron_file):
+            os.remove(cron_file)
+
+        thisdb.deleteCronById(tid)
+        msg = mw.getInfo('删除计划任务[{1}]成功!', (data['name'],))
+        mw.writeLog('计划任务', msg)
+        return mw.returnData(True, msg)
+
+    def getCrontabHuman(self, data):
+        rdata = []
+        for i in range(len(data)):
+            t = data[i]
+            if t['type'] == "day":
+                t['type'] = '每天'
+                t['cycle'] = mw.getInfo('每天, {1}点{2}分 执行', (str(t['where_hour']), str(t['where_minute'])))
+            elif t['type'] == "day-n":
+                t['type'] = mw.getInfo('每{1}天', (str(t['where1']),))
+                t['cycle'] = mw.getInfo('每隔{1}天, {2}点{3}分 执行',  (str(t['where1']), str(t['where_hour']), str(t['where_minute'])))
+            elif t['type'] == "hour":
+                t['type'] = '每小时'
+                t['cycle'] = mw.getInfo('每小时, 第{1}分钟 执行', (str(t['where_minute']),))
+            elif t['type'] == "hour-n":
+                t['type'] = mw.getInfo('每{1}小时', (str(t['where1']),))
+                t['cycle'] = mw.getInfo('每{1}小时, 第{2}分钟 执行', (str(t['where1']), str(t['where_minute'])))
+            elif t['type'] == "minute-n":
+                t['type'] = mw.getInfo('每{1}分钟', (str(t['where1']),))
+                t['cycle'] = mw.getInfo('每隔{1}分钟执行', (str(t['where1']),))
+            elif t['type'] == "week":
+                t['type'] = '每周'
+                if not t['where1']:
+                    t['where1'] = '0'
+                t['cycle'] = mw.getInfo('每周{1}, {2}点{3}分执行', (self.toWeek(int(t['where1'])), str(t['where_hour']), str(t['where_minute'])))
+            elif t['type'] == "month":
+                t['type'] = '每月'
+                t['cycle'] = mw.getInfo('每月, {1}日 {2}点{3}分执行', (str(t['where1']), str(t['where_hour']), str(t['where_minute'])))
+            rdata.append(t)
+        return rdata
+
+    # 从crond删除
+    def removeForCrond(self, echo):
+        if mw.isAppleSystem():
+            return True
+
+        u_file = '/var/spool/cron/crontabs/root'
+        if not os.path.exists(u_file):
+            file = '/var/spool/cron/root'
+            if not os.path.exists(file):
+                return False
+        else:
+            file = u_file
+
+        conf = mw.readFile(file)
+        rep = ".+" + str(echo) + ".+\n"
+        conf = re.sub(rep, "", conf)
+        if not mw.writeFile(file, conf):
+            return False
+        self.crondReload()
+        return True
+
+    def getCrontabList(self,
+        page:int | None = 1,
+        size:int | None = 10
+    ):
+        info = thisdb.getCrontabList(page=int(page),size=int(size))
+
+        rdata = {}
+        rdata['data'] = self.getCrontabHuman(info['list'])
+        rdata['page'] = mw.getPage({'count':info['count'],'tojs':'getCronData','p':page,'row':size})
+        return rdata
+
+    def getCrondCycle(self, params):
+        cron_cmd = ''
+        title = ''
+        if params['type'] == "day":
+            cron_cmd = self.getDay(params)
+            title = '每天'
+        elif params['type'] == "day-n":
+            cron_cmd = self.getDay_N(params)
+            title = mw.getInfo('每{1}天', (params['where1'],))
+        elif params['type'] == "hour":
+            cron_cmd = self.getHour(params)
+            title = '每小时'
+        elif params['type'] == "hour-n":
+            cron_cmd = self.getHour_N(params)
+            title = '每小时'
+        elif params['type'] == "minute-n":
+            cron_cmd = self.minute_N(params)
+        elif params['type'] == "week":
+            params['where1'] = params['week']
+            cron_cmd = self.week(params)
+        elif params['type'] == "month":
+            cron_cmd = self.month(params)
+        return cron_cmd, title
+
+    # 转换大写星期
+    def toWeek(self, num):
+        wheres = {
+            0:   '日',
+            1:   '一',
+            2:   '二',
+            3:   '三',
+            4:   '四',
+            5:   '五',
+            6:   '六'
+        }
+        try:
+            return wheres[num]
+        except:
+            return ''
+
+    # 取任务构造Day
+    def getDay(self, param):
+        cmd = "{0} {1} * * * ".format(param['minute'], param['hour'])
+        return cmd
+
+    # 取任务构造Day_n
+    def getDay_N(self, param):
+        cmd = "{0} {1} */{2} * * ".format(param['minute'], param['hour'], param['where1'])
+        return cmd
+
+    # 取任务构造Hour
+    def getHour(self, param):
+        cmd = "{0} * * * * ".format(param['minute'])
+        return cmd
+
+    # 取任务构造Hour-N
+    def getHour_N(self, param):
+        cmd = "{0} */{1} * * * ".format(param['minute'], param['where1'])
+        return cmd
+
+    # 取任务构造Minute-N
+    def minute_N(self, param):
+        cmd = "*/{0} * * * * ".format(param['where1'])
+        return cmd
+
+    # 取任务构造week
+    def week(self, param):
+        cmd = "{0} {1} * * {2}".format(param['minute'], param['hour'], param['week'])
+        return cmd
+
+    # 取任务构造Month
+    def month(self, param):
+        cmd = "{0} {1} {2} * * ".format(param['minute'], param['hour'], param['where1'])
+        return cmd
+
+    # 参数校验
+    def cronCheck(self, params):
+        if params['stype'] == 'site' or params['stype'] == 'database' or params['stype'].find('database_') > -1 or params['stype'] == 'logs' or params['stype'] == 'path':
+            if params['save'] == '':
+                return False, '保留份数不能为空!'
+
+        if params['type'] == 'day':
+            if params['hour'] == '':
+                return False, '小时不能为空!'
+            if params['minute'] == '':
+                return False, '分钟不能为空!'
+
+        if params['type'] == 'day-n':
+            if params['where1'] == '':
+                return False, '天不能为空!'
+            if params['hour'] == '':
+                return False, '小时不能为空!'
+            if params['minute'] == '':
+                return False, '分钟不能为空!'
+        if params['type'] == 'hour':
+            if params['minute'] == '':
+                return False, '分钟不能为空!'
+
+        if params['type'] == 'hour-n':
+            if params['where1'] == '':
+                return False, '小时不能为空!'
+            if params['minute'] == '':
+                return False, '分钟不能为空!'
+
+        if params['type'] == 'minute-n':
+            if params['where1'] == '':
+                return False, '分钟不能为空!'
+
+        if params['type'] == 'week':
+            if params['hour'] == '':
+                return False, '小时不能为空!'
+            if params['minute'] == '':
+                return False, '分钟不能为空!'
+
+        if params['type'] == 'month':
+            if params['where1'] == '':
+                return False, '日不能为空!'
+            if params['hour'] == '':
+                return False, '小时不能为空!'
+            if params['minute'] == '':
+                return False, '分钟不能为空!'
+        return True, 'OK'
+
+
+    # 取执行脚本
+    def getShell(self, param):
+        # try:
+        stype = param['stype']
+        if stype == 'toFile':
+            shell = param.sFile
+        else:
+            head = "#!/bin/bash\nPATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin\nexport PATH\n"
+
+            start_head = '''
+SCRIPT_RUN_TIME="0s"
+MW_ToSeconds()
+{
+    SEC=$1
+    if [ $SEC -lt 60 ]; then
+       SCRIPT_RUN_TIME="${SEC}s"
+    elif [ $SEC -ge 60 ] && [ $SEC -lt 3600 ];then
+       SCRIPT_RUN_TIME="$(( SEC / 60 ))m$(( SEC % 60 ))s"
+    elif [ $SEC -ge 3600 ]; then
+       SCRIPT_RUN_TIME="$(( SEC / 3600 ))h$(( (SEC % 3600) / 60 ))m$(( (SEC % 3600) % 60 ))s"
+    fi
+}
+START_MW_SHELL_TIME=`date +%s`
+'''
+
+            source_bin_activate = '''
+export LANG=en_US.UTF-8
+MW_PATH=%s/bin/activate
+if [ -f $MW_PATH ];then
+    source $MW_PATH
+fi''' % (mw.getPanelDir(),)
+
+            head = head + start_head + source_bin_activate + "\n"
+            log = '.log'
+
+            #所有
+            if param['sname'] == 'ALL':
+                log = ''
+
+            script_dir = mw.getPanelDir() + "/scripts"
+            source_stype = 'database'
+            if stype.find('database_') > -1:
+                plugin_name = stype.replace('database_', '')
+                script_dir = mw.getPanelDir() + "/plugins/" + plugin_name + "/scripts"
+
+                source_stype = stype
+                stype = 'database'
+
+            wheres = {
+                'path': head + "python3 " + script_dir + "/backup.py path " + param['sname'] + " " + str(param['save']),
+                'site':   head + "python3 " + script_dir + "/backup.py site " + param['sname'] + " " + str(param['save']),
+                'database': head + "python3 " + script_dir + "/backup.py 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'
+            }
+            if param['backup_to'] != 'localhost':
+                cfile = mw.getPluginDir() + "/" + \
+                    param['backup_to'] + "/index.py"
+
+                wheres['path'] = head + "python3 " + cfile + \
+                    " path " + param['sname'] + " " + str(param['save'])
+                wheres['site'] = head + "python3 " + cfile + \
+                    " site " + param['sname'] + " " + str(param['save'])
+                wheres['database'] = head + "python3 " + cfile + " " + \
+                    source_stype + " " + \
+                    param['sname'] + " " + str(param['save'])
+            try:
+                shell = wheres[stype]
+            except:
+                if stype == 'toUrl':
+                    shell = head + "curl -sS --connect-timeout 10 -m 60 '" + \
+                        param['urladdress'] + "'"
+                else:
+                    shell = head + param['sbody'].replace("\r\n", "\n")
+
+            shell += '''
+echo "----------------------------------------------------------------------------"
+endDate=`date +"%Y-%m-%d %H:%M:%S"`
+END_MW_SHELL_TIME=`date +"%s"`
+((SHELL_COS_TIME=($END_MW_SHELL_TIME-$START_MW_SHELL_TIME)))
+MW_ToSeconds $SHELL_COS_TIME
+echo "★[$endDate] Successful | Script Run [$SCRIPT_RUN_TIME] "
+echo "----------------------------------------------------------------------------"
+'''
+        cron_path = mw.getServerDir() + '/cron'
+        if not os.path.exists(cron_path):
+            mw.execShell('mkdir -p ' + cron_path)
+
+        if not 'echo' in param:
+            cron_name = mw.md5(mw.md5(str(time.time()) + '_mw'))
+        else:
+            cron_name = param['echo']
+        file = cron_path + '/' + cron_name
+        mw.writeFile(file, self.checkScript(shell))
+        mw.execShell('chmod 750 ' + file)
+        return cron_name
+
+    # 检查脚本
+    def checkScript(self, shell):
+        keys = ['shutdown', 'init 0', 'mkfs', 'passwd',
+                'chpasswd', '--stdin', 'mkfs.ext', 'mke2fs']
+        for key in keys:
+            shell = shell.replace(key, '[***]')
+        return shell
+
+
+
+    # 将Shell脚本写到文件
+    def writeShell(self, config):
+        file = '/var/spool/cron/crontabs/root'
+        current_os = mw.getOs()
+        if current_os == 'darwin':
+            file = '/etc/crontab'
+        elif current_os.startswith("freebsd"):
+            file = '/var/cron/tabs/root'
+
+        if not os.path.exists(file):
+            file = '/var/spool/cron/root'
+
+        if not os.path.exists(file):
+            mw.writeFile(file, '')
+        conf = mw.readFile(file)
+        conf += str(config) + "\n"
+        if mw.writeFile(file, conf):
+            if not os.path.exists(file):
+                mw.execShell("chmod 600 '" + file +"' && chown root.root " + file)
+            else:
+                mw.execShell("chmod 600 '" + file +"' && chown root.crontab " + file)
+            return mw.returnData(True, 'ok')
+        return mw.returnData(False, '文件写入失败,请检查是否开启系统加固功能!')
+
+    # 重载配置
+    def crondReload(self):
+        if mw.isAppleSystem():
+            if os.path.exists('/etc/crontab'):
+                pass
+        else:
+            if os.path.exists('/etc/init.d/crond'):
+                mw.execShell('/etc/init.d/crond reload')
+            elif os.path.exists('/etc/init.d/cron'):
+                mw.execShell('service cron restart')
+            else:
+                mw.execShell("systemctl reload crond")
+
+
+
+
 
diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index 81eda5a51..3c0bf683e 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -17,7 +17,6 @@ import multiprocessing
 from admin import model
 
 import core.mw as mw
-import admin.model.option as option
 import thisdb
 
 class pg_thread(threading.Thread):
@@ -108,7 +107,7 @@ class plugin(object):
         self.__index_data = json.loads(mw.readFile(self.__index))
 
     def getIndexList(self):
-        indexList = option.getOptionByJson('display_index')
+        indexList = thisdb.getOptionByJson('display_index')
         plist = []
         for i in indexList:
             tmp = i.split('-')
@@ -152,30 +151,30 @@ class plugin(object):
 
     def addIndex(self, name, version):
         vname = name + '-' + version
-        indexList = option.getOptionByJson('display_index')
+        indexList = thisdb.getOptionByJson('display_index',default=[])
+
         if vname in indexList:
             return mw.returnData(False, '请不要重复添加!')
         if len(indexList) > 12:
             return mw.returnData(False, '首页最多只能显示12个软件!')
 
         indexList.append(vname)
-        option.setOption('display_index', json.dumps(indexList))
+
+        thisdb.setOption('display_index', json.dumps(indexList))
         return mw.returnData(True, '添加成功!')
 
     def removeIndex(self, name, version):
         vname = name + '-' + version
-        indexList = option.getOptionByJson('display_index')
+        indexList = thisdb.getOptionByJson('display_index')
         if not vname in indexList:
             return mw.returnData(True, '删除成功!!')
         indexList.remove(vname)
-
-        print(indexList)
-        option.setOption('display_index', json.dumps(indexList))
+        thisdb.setOption('display_index', json.dumps(indexList))
         return mw.returnData(True, '删除成功!')
 
     def hookInstallOption(self, hook_name, info):
         hn_name = 'hook_'+hook_name
-        src_data = option.getOptionByJson(hn_name,type='hook',default=[])
+        src_data = thisdb.getOptionByJson(hn_name,type='hook',default=[])
         isNeedAdd = True
         for x in range(len(src_data)):
             if src_data[x]['title'] == info['title'] and src_data[x]['name'] == info['name']:
@@ -184,17 +183,17 @@ class plugin(object):
         if isNeedAdd:
             src_data.append(info)
 
-        option.setOption(hn_name, json.dumps(src_data), type='hook')
+        thisdb.setOption(hn_name, json.dumps(src_data), type='hook')
         return True
 
     def hookUninstallOption(self, hook_name, info):
         hn_name = 'hook_'+hook_name
-        src_data = option.getOptionByJson(hn_name,type='hook',default=[])
+        src_data = thisdb.getOptionByJson(hn_name,type='hook',default=[])
         for idx in range(len(src_data)):
             if src_data[idx]['name'] == info['name']:
                 src_data.remove(src_data[idx])
                 break
-        option.setOption(hn_name, json.dumps(src_data), type='hook')
+        thisdb.setOption(hn_name, json.dumps(src_data), type='hook')
         return True
 
     def hookInstall(self, info):
@@ -316,7 +315,7 @@ class plugin(object):
         return ''
 
     def checkIndexList(self, name, version):
-        indexList = option.getOptionByJson('display_index')
+        indexList = thisdb.getOptionByJson('display_index',default=[])
         for i in indexList:
             t = i.split('-')
             if t[0] == name:
@@ -426,15 +425,28 @@ class plugin(object):
         return pInfo
 
     def makeCoexistData(self, data):
-        plugins_t = []
+        plugins = []
         if type(data['versions']) == list and 'coexist' in data and data['coexist']:
             data_t = self.makeCoexist(data)
             for index in range(len(data_t)):
-                plugins_t.append(data_t[index])
+                plugins.append(data_t[index])
         else:
             pg = self.getPluginInfo(data)
-            plugins_t.append(pg)
-        return plugins_t
+            plugins.append(pg)
+        return plugins
+
+    def makeCoexistDataInstalled(self, data):
+        plugins = []
+        if type(data['versions']) == list and 'coexist' in data and data['coexist']:
+            data_t = self.makeCoexist(data)
+            for index in range(len(data_t)):
+                if data_t[index]['setup']:
+                    plugins.append(data_t[index])
+        else:
+            pg = self.getPluginInfo(data)
+            if pg['setup']:
+                plugins.append(pg)
+        return plugins
 
     # 对多版本共存进行处理
     def makeCoexistList(self, data,
@@ -449,12 +461,11 @@ class plugin(object):
         if plugin_type == None or plugin_type == '0':
             return self.makeCoexistData(data)
         # 已经安装
-        if plugin_type == '-1':
-            return self.makeCoexistData(data)
+        if str(plugin_type) == '-1':
+            return self.makeCoexistDataInstalled(data)
         return plugins_t
 
 
-
     def getPluginList(self, name,
         keyword: str | None = None,
         type: str | None = None,

From b1dd7ea60956bc8e94a66d576791faf2f279c0d7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 00:16:19 +0800
Subject: [PATCH 095/965] update

---
 data/sql/default.sql           |   7 +-
 web/admin/__init__.py          |  26 ++--
 web/admin/crontab/__init__.py  |  82 +++++++++----
 web/admin/firewall/__init__.py |  26 +---
 web/config.py                  |   3 +
 web/core/mw.py                 |   7 ++
 web/static/app/crontab.js      |   1 -
 web/static/app/public.js       |  52 ++++----
 web/thisdb/__init__.py         |   1 +
 web/thisdb/crontab.py          |  11 +-
 web/thisdb/firewall.py         |  55 +++++++++
 web/utils/crontab.py           | 212 +++++++++++++++++++++++++++------
 web/utils/firewall.py          |  13 +-
 13 files changed, 366 insertions(+), 130 deletions(-)
 create mode 100644 web/thisdb/firewall.py

diff --git a/data/sql/default.sql b/data/sql/default.sql
index bc99e4163..ec3bc47d0 100755
--- a/data/sql/default.sql
+++ b/data/sql/default.sql
@@ -43,14 +43,15 @@ CREATE TABLE IF NOT EXISTS `firewall` (
   `port` TEXT,
   `protocol` TEXT DEFAULT 'tcp',
   `ps` TEXT,
-  `add_time` TEXT
+  `add_time` TEXT,
+  `update_time` TEXT
 );
 
 ALTER TABLE `firewall` ADD COLUMN `protocol` TEXT DEFAULT 'tcp';
 
 INSERT INTO `firewall` (`id`, `port`, `protocol`, `ps`, `add_time`) VALUES
-(1, '80',  'tcp','网站默认端口', '0000-00-00 00:00:00'),
-(2, '443', 'tcp/udp', 'HTTPS', '0000-00-00 00:00:00');
+(1, '80',  'tcp','网站默认端口', '0000-00-00 00:00:00','0000-00-00 00:00:00'),
+(2, '443', 'tcp/udp', 'HTTPS', '0000-00-00 00:00:00','0000-00-00 00:00:00');
 
 
 
diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 2c3d468c9..359557fea 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -100,13 +100,12 @@ setup.init_db_system()
 
 
 app.config['BASIC_AUTH_OPEN'] = False
-with app.app_context():
-    try:
-        basic_auth = model.getOptionByJson('basic_auth', default={'open':False})
-        if basic_auth['open']:
-            app.config['BASIC_AUTH_OPEN'] = True
-    except Exception as e:
-        pass
+try:
+    basic_auth = model.getOptionByJson('basic_auth', default={'open':False})
+    if basic_auth['open']:
+        app.config['BASIC_AUTH_OPEN'] = True
+except Exception as e:
+    pass
     
 
 
@@ -127,6 +126,7 @@ def sendAuthenticated():
 
 @app.before_request
 def requestCheck():
+    config.APP_START_TIME=time.time()
     # 自定义basic auth认证
     if app.config['BASIC_AUTH_OPEN']:
         basic_auth = model.getOptionByJson('basic_auth', default={'open':False})
@@ -152,6 +152,8 @@ def requestCheck():
 def requestAfter(response):
     response.headers['soft'] = config.APP_NAME
     response.headers['mw-version'] = config.APP_VERSION
+    if mw.isDebugMode():
+        response.headers['mw-debug-cos'] = time.time() - config.APP_START_TIME
     return response
 
 
@@ -163,20 +165,16 @@ def page_unauthorized(error):
 # 设置模板全局变量
 @app.context_processor
 def inject_global_variables():
-    start_t = time.time()
-    ver = config.APP_VERSION;
+    app_ver = config.APP_VERSION
     if mw.isDebugMode():
-        ver = ver + str(time.time())
+        app_ver = app_ver + str(time.time())
 
     data = utils_config.getGlobalVar()
     g_config = {
-        'version': ver,
+        'version': app_ver,
         'title' : 'MW面板',
         'ip' : '127.0.0.1'
     }
-
-    end_t = time.time()
-    print("cos:"+str(end_t-start_t))
     return dict(config=g_config, data=data)
 
 
diff --git a/web/admin/crontab/__init__.py b/web/admin/crontab/__init__.py
index 3e8232e40..b1b76ba98 100644
--- a/web/admin/crontab/__init__.py
+++ b/web/admin/crontab/__init__.py
@@ -23,40 +23,82 @@ blueprint = Blueprint('crontab', __name__, url_prefix='/crontab', template_folde
 def index():
     return render_template('crontab.html')
 
-# 插件列表
-@blueprint.route('/list', endpoint='list', methods=['GET','POST'])
+# 计划任务列表
+@blueprint.route('/list', endpoint='list', methods=['POST'])
 @panel_login_required
 def list():
     page = request.args.get('p', '1').strip()
     limit = request.args.get('limit', '10').strip()
     return MwCrontab.instance().getCrontabList(page=int(page),size=int(limit))
 
-# 插件列表
-@blueprint.route('/logs', endpoint='logs', methods=['GET','POST'])
-def logs(self):
-    sid = request.form.get('id', '')
-    echo = mw.M('crontab').where("id=?", (sid,)).field('echo').find()
-    logFile = mw.getServerDir() + '/cron/' + echo['echo'] + '.log'
-    if not os.path.exists(logFile):
-        return mw.returnData(False, '当前日志为空!')
-    log = mw.getLastLine(logFile, 500)
-    return mw.returnData(True, log)
+# 计划任务日志
+@blueprint.route('/logs', endpoint='logs', methods=['POST'])
+def logs():
+    cron_id = request.form.get('id', '')
+    return MwCrontab.instance().cronLog(cron_id)
 
-# 获取计划任务
-@blueprint.route('/del', endpoint='del', methods=['GET','POST'])
+# 删除计划任务
+@blueprint.route('/del', endpoint='del', methods=['POST'])
 def crontab_del():
-    task_id = request.form.get('id', '')   
-    return MwCrontab.instance().delete(task_id) 
+    cron_id = request.form.get('id', '')   
+    return MwCrontab.instance().delete(cron_id)
+
+# 删除计划任务日志
+@blueprint.route('/del_logs', endpoint='del_logs', methods=['POST'])
+def del_logs():
+    cron_id = request.form.get('id', '')   
+    return MwCrontab.instance().delLogs(cron_id)
+
+
+# 设置计划任务状态
+@blueprint.route('/set_cron_status', endpoint='set_cron_status', methods=['POST'])
+def set_cron_status():
+    cron_id = request.form.get('id', '')   
+    return MwCrontab.instance().setCronStatus(cron_id)
+
+# 设置计划任务状态
+@blueprint.route('/get_data_list', endpoint='get_data_list', methods=['POST'])
+def get_data_list():
+    stype = request.form.get('type', '')
+    return MwCrontab.instance().getDataList(stype)
+
 
 # 获取计划任务
-@blueprint.route('/get_crond_find', endpoint='get_crond_find', methods=['GET','POST'])
+@blueprint.route('/get_crond_find', endpoint='get_crond_find', methods=['POST'])
 def get_crond_find():
-    sid = request.form.get('id', '')
-    data = MwCrontab.instance().getCrondFind(sid)
+    cron_id = request.form.get('id', '')
+    data = MwCrontab.instance().getCrondFind(cron_id)
     return data
 
+# 修改计划任务
+@blueprint.route('/modify_crond', endpoint='modify_crond', methods=['POST'])
+def modify_crond():
+    request_data = {}
+    
+    request_data['name'] = request.form.get('name', '')
+    request_data['type'] = request.form.get('type', '')
+    request_data['week'] = request.form.get('week', '')
+    request_data['where1'] = request.form.get('where1', '')
+    request_data['hour'] = request.form.get('hour', '')
+    request_data['minute'] = request.form.get('minute', '')
+    request_data['save'] = request.form.get('save', '')
+    request_data['backup_to'] = request.form.get('backupTo', '')
+    request_data['stype'] = request.form.get('stype', '')
+    request_data['sname'] = request.form.get('sname', '')
+    request_data['sbody'] = request.form.get('sbody', '')
+    request_data['url_address'] = request.form.get('urladdress', '')
+    cron_id = request.form.get('id', '')
+    data = MwCrontab.instance().modifyCrond(cron_id,request_data)
+    return data
+
+# 执行计划任务
+@blueprint.route('/start_task', endpoint='start_task', methods=['POST'])
+def start_task():
+    cron_id = request.form.get('id', '')
+    return MwCrontab.instance().startTask(cron_id)
+
 # 添加计划任务
-@blueprint.route('/add', endpoint='add', methods=['GET','POST'])
+@blueprint.route('/add', endpoint='add', methods=['POST'])
 @panel_login_required
 def add():
     request_data = {}
diff --git a/web/admin/firewall/__init__.py b/web/admin/firewall/__init__.py
index a14c0dff7..8cd65a986 100644
--- a/web/admin/firewall/__init__.py
+++ b/web/admin/firewall/__init__.py
@@ -33,25 +33,7 @@ def index():
 def get_list():
     p = request.form.get('p', '1').strip()
     limit = request.form.get('limit', '10').strip()
-
-    count = Firewall.query.filter_by().count()
-    pagination = Firewall.query.filter_by().paginate(page=int(p), per_page=int(limit))
-  
-    rows = []
-    for item in pagination.items:
-        t = {}
-        t['id'] = item.id
-        t['port'] = item.port
-        t['protocol'] = item.protocol
-        t['ps'] = item.ps
-        t['add_time'] = item.add_time
-        t['update_time'] = item.update_time
-        rows.append(t)
-
-    data = {}
-    data['data'] = rows
-    data['page'] = mw.getPage({'count':count,'tojs':'getLogs','p':p,'row':limit})
-    return data
+    return MwFirewall.instance().getList(p,limit)
 
 # 获取站点日志目录
 @blueprint.route('/get_www_path', endpoint='get_www_path', methods=['POST'])
@@ -64,8 +46,7 @@ def get_www_path():
 @blueprint.route('/get_ssh_info', endpoint='get_ssh_info', methods=['POST'])
 @panel_login_required
 def get_ssh_info():
-    mf = MwFirewall.instance()
-    return mf.getSshInfo()
+    return MwFirewall.instance().getSshInfo()
 
 
 # 切换ping开关
@@ -88,8 +69,7 @@ def add_accept_port():
     protocol = request.form.get('protocol', '').strip()
     stype = request.form.get('type', '').strip()
 
-    data = mf.addAcceptPort(port, ps, stype, protocol=protocol)
-    return mw.getJson(data)
+    return mf.addAcceptPort(port, ps, stype, protocol=protocol)
 
 
 
diff --git a/web/config.py b/web/config.py
index 1b84db8df..82aa42513 100644
--- a/web/config.py
+++ b/web/config.py
@@ -60,3 +60,6 @@ SQLITE_PATH = os.path.join(DATA_DIR, APP_SQLITE_NAME + '.db')
 DEFAULT_SERVER = '127.0.0.1'
 DEFAULT_SERVER_PORT = 7201
 
+# APP启动时间
+APP_START_TIME=0
+
diff --git a/web/core/mw.py b/web/core/mw.py
index e935077c7..8b970cab6 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -97,6 +97,13 @@ def getServerDir():
 def getLogsDir():
     return getFatherDir() + '/wwwlogs'
 
+def getWwwDir():
+    file = getPanelDir() + '/data/site.pl'
+    if os.path.exists(file):
+        return readFile(file).strip()
+    return getFatherDir() + '/wwwroot'
+
+    
 def getRecycleBinDir():
     rb_dir = getFatherDir() + '/recycle_bin'
     if not os.path.exists(rb_dir):
diff --git a/web/static/app/crontab.js b/web/static/app/crontab.js
index b8aea37d1..fe21632c4 100755
--- a/web/static/app/crontab.js
+++ b/web/static/app/crontab.js
@@ -83,7 +83,6 @@ function getBackupName(hook_data, name){
 function getCronData(page){
 	var load = layer.msg(lan.public.the,{icon:16,time:0,shade: [0.3, '#000']});
 	$.post("/crontab/list?p="+page,'', function(rdata){
-		console.log(rdata);
 		layer.close(load);
 		var cbody = "";
 		if(rdata == ""){
diff --git a/web/static/app/public.js b/web/static/app/public.js
index 8516508d4..6188975cf 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -259,7 +259,6 @@ function getFormatTime(tm, format) {
 
 
 function changePathCallback(default_dir, callback) {
-
 	var c = layer.open({
 		type: 1,
 		area: "650px",
@@ -276,7 +275,7 @@ function changePathCallback(default_dir, callback) {
 					</div>\
 					<div class='path-con'>\
 						<div class='path-con-left'>\
-						<dl><dt id='changecomlist' onclick='backMyComputer()'>计算机</dt></dl>\
+							<dl><dt id='changecomlist' onclick='backMyComputer()'>计算机</dt></dl>\
 						</div>\
 						<div class='path-con-right'>\
 							<ul class='default' id='computerDefautl'></ul>\
@@ -387,14 +386,15 @@ function getDiskList(b) {
 	var a = "";
 	var c = "path=" + b + "&disk=True";
 	$.post("/files/get_dir", c, function(h) {
-		if(h.DISK != undefined) {
-			for(var f = 0; f < h.DISK.length; f++) {
-				a += "<dd onclick=\"getDiskList('" + h.DISK[f].path + "')\"><span class='glyphicon glyphicon-hdd'></span>&nbsp;" + h.DISK[f].path + "</dd>"
-			}
-			$("#changecomlist").html(a)
-		}
-		for(var f = 0; f < h.DIR.length; f++) {
-			var g = h.DIR[f].split(";");
+		// console.log(h);
+		// if(h.dir != undefined) {
+		// 	for(var f = 0; f < h.dir.length; f++) {
+		// 		a += "<dd onclick=\"getDiskList('" + h.dir[f].path + "')\"><span class='glyphicon glyphicon-hdd'></span>&nbsp;" + h.dir[f].path + "</dd>";
+		// 	}
+		// 	$("#changecomlist").html(a);
+		// }
+		for(var f = 0; f < h.dir.length; f++) {
+			var g = h.dir[f].split(";");
 			var e = g[0];
 		
 			if(isChineseChar(e)) {
@@ -408,16 +408,16 @@ function getDiskList(b) {
 			}
 
 			d += "<tr>\
-				<td onclick=\"getDiskList('" + h.PATH + "/" + g[0] + "')\" title='" + g[0] + "'>\
+				<td onclick=\"getDiskList('" + h.path + "/" + g[0] + "')\" title='" + g[0] + "'>\
 					<span class='glyphicon glyphicon-folder-open'></span>" + e + "</td><td>" + getLocalTime(g[2]) + "</td>\
 				<td>" + g[3] + "</td>\
 				<td>" + g[4] + "</td>\
-				<td><span class='delfile-btn' onclick=\"NewDelFile('" + h.PATH + "/" + g[0] + "')\">X</span></td>\
+				<td><span class='delfile-btn' onclick=\"NewDelFile('" + h.path + "/" + g[0] + "')\">X</span></td>\
 			</tr>";
 		}
-		if(h.FILES != null && h.FILES != "") {
-			for(var f = 0; f < h.FILES.length; f++) {
-				var g = h.FILES[f].split(";");
+		if(h.files != null && h.files != "") {
+			for(var f = 0; f < h.files.length; f++) {
+				var g = h.files[f].split(";");
 				var e = g[0];
 				if(isChineseChar(e)) {
 					if(e.length > 10) {
@@ -441,10 +441,10 @@ function getDiskList(b) {
 		$(".default").hide();
 		$(".file-list").show();
 		$("#tbody").html(d);
-		if(h.PATH.substr(h.PATH.length - 1, 1) != "/") {
-			h.PATH += "/";
+		if(h.path.substr(h.path.length - 1, 1) != "/") {
+			h.path += "/";
 		}
-		$("#PathPlace").find("span").html(h.PATH);
+		$("#PathPlace").find("span").html(h.path);
 		activeDisk();
 		return;
 	},'json');
@@ -530,10 +530,11 @@ function activeDisk() {
 }
 
 function backMyComputer() {
-	$(".default").show();
-	$(".file-list").hide();
-	$("#PathPlace").find("span").html("");
-	activeDisk();
+	// $(".default").show();
+	// $(".file-list").hide();
+	// $("#PathPlace").find("span").html("");
+	// activeDisk();
+	return;
 }
 
 function backFile() {
@@ -1601,13 +1602,6 @@ function activeDisk() {
 }
 
 
-function backMyComputer() {
-	$(".default").show();
-	$(".file-list").hide();
-	$("#PathPlace").find("span").html("");
-	activeDisk();
-}
-
 //检查登陆状态
 function check_login(){
 	$.post('/check_login',{},function(rdata){
diff --git a/web/thisdb/__init__.py b/web/thisdb/__init__.py
index 85125f384..8958fa60f 100644
--- a/web/thisdb/__init__.py
+++ b/web/thisdb/__init__.py
@@ -15,3 +15,4 @@ from .sites import *
 from .tasks import *
 from .logs import *
 from .crontab import *
+from .firewall import *
diff --git a/web/thisdb/crontab.py b/web/thisdb/crontab.py
index 27dad974f..32f755598 100644
--- a/web/thisdb/crontab.py
+++ b/web/thisdb/crontab.py
@@ -20,6 +20,14 @@ def addCrontab(data):
     data['update_time'] = now_time
     return mw.M('crontab').insert(data)
 
+def setCrontabData(cron_id, data):
+    mw.M('crontab').where('id=?', (cron_id,)).update(data)
+    return True
+
+def setCrontabStatus(cron_id, status):
+    mw.M('crontab').where('id=?', (cron_id,)).update({'status':status})
+    return True
+
 def getCrond(id):
     return mw.M('crontab').where('id=?', (id,)).field(__field).find()
 
@@ -40,4 +48,5 @@ def getCrontabList(
     data = {}
     data['count'] = count
     data['list'] = cron_list
-    return data
\ No newline at end of file
+    return data
+
diff --git a/web/thisdb/firewall.py b/web/thisdb/firewall.py
new file mode 100644
index 000000000..88c7b0c39
--- /dev/null
+++ b/web/thisdb/firewall.py
@@ -0,0 +1,55 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import core.mw as mw
+
+__FIELD = 'id,port,protocol,ps,add_time,update_time'
+
+def getFirewallList(
+    page:int | None = 1,
+    size:int | None = 10,
+):
+    start = (int(page) - 1) * (int(size))
+    limit = str(start) + ',' +str(size)
+
+    firewall_list = mw.M('firewall').field(__FIELD).limit(limit).order('id desc').select()
+    count = mw.M('firewall').count()
+
+    data = {}
+    data['count'] = count
+    data['list'] = firewall_list
+    return data
+
+def addFirewall(port,
+    protocol: str | None = 'tcp',
+    ps: str | None = '备注'
+) -> bool:
+    '''
+    设置配置的值
+    :port -> str 端口 (必填)
+    :protocol -> str 协议 (可选|tcp,udp,tcp/udp)
+    :ps -> str 备注 (可选)
+    '''
+    now_time = mw.formatDate()
+    insert_data = {
+        'port':port,
+        'protocol':protocol,
+        'ps':ps,
+        'add_time':now_time,
+        'update_time':now_time,
+    }
+    mw.M('firewall').insert(insert_data)
+    return True
+
+
+def getFirewallCountByPort(port):
+    return mw.M('firewall').where('port=?',(port,)).count()
+
+
diff --git a/web/utils/crontab.py b/web/utils/crontab.py
index f9b2d14d5..4a8b6035f 100644
--- a/web/utils/crontab.py
+++ b/web/utils/crontab.py
@@ -10,6 +10,7 @@
 
 import os
 import sys
+import re
 import time
 import json
 import threading
@@ -20,6 +21,7 @@ from admin import model
 import core.mw as mw
 import thisdb
 
+
 class crontab(object):
         # lock
     _instance_lock = threading.Lock()
@@ -32,6 +34,119 @@ class crontab(object):
                     crontab._instance = crontab(*args, **kwargs)
         return crontab._instance
 
+    def modifyCrond(self,cron_id,data):
+        if len(data['name']) < 1:
+            return mw.returnData(False, '任务名称不能为空!')
+
+        is_check_pass, msg = self.cronCheck(data)
+        if not is_check_pass:
+            return mw.returnData(is_check_pass, msg)
+
+        info = thisdb.getCrond(cron_id)
+
+        dbdata = {}
+        dbdata['name'] = data['name']
+        dbdata['type'] = data['type']
+        dbdata['where1'] = data['where1']
+        dbdata['where_hour'] = data['hour']
+        dbdata['where_minute'] = data['minute']
+        dbdata['save'] = data['save']
+        dbdata['backup_to'] = data['backup_to']
+        dbdata['sname'] = data['sname']
+        dbdata['sbody'] = data['sbody']
+        dbdata['stype'] = data['stype']
+        dbdata['url_address'] = data['url_address']
+
+        if not self.removeForCrond(info['echo']):
+            return mw.returnData(False, '无法写入文件，是否开启了系统加固功能!')
+
+        thisdb.setCrontabData(cron_id, dbdata)
+        self.syncToCrond(cron_id)
+        msg = '修改计划任务[' + data['name'] + ']成功'
+        mw.writeLog('计划任务', msg)
+        return mw.returnData(True, msg)
+
+    # 取数据列表
+    def getDataList(self,stype=''):
+    
+        bak_data = []
+        if stype == 'site' or stype == 'sites' or stype == 'database' or stype.find('database_') > -1 or stype == 'path':
+            hookPath = mw.getPanelDataDir() + "/hook_backup.json"
+            if os.path.exists(hookPath):
+                t = mw.readFile(hookPath)
+                bak_data = json.loads(t)
+
+        if stype == 'database' or stype.find('database_') > -1:
+            sqlite3_name = 'mysql'
+            path = mw.getServerDir() + '/mysql'
+            if stype != 'database':
+                soft_name = stype.replace('database_', '')
+                path = mw.getServerDir() + '/' + soft_name
+
+                if soft_name == 'postgresql':
+                    sqlite3_name = 'pgsql'
+
+                if soft_name == 'mongodb':
+                    sqlite3_name = 'mongodb'
+
+            db_list = {}
+            db_list['orderOpt'] = bak_data
+
+            if not os.path.exists(path + '/' + sqlite3_name + '.db'):
+                db_list['data'] = []
+            else:
+                db_list['data'] = mw.M('databases').dbPos(path, sqlite3_name).field('name,ps').select()
+            return mw.getJson(db_list)
+
+        if stype == 'path':
+            db_list = {}
+            db_list['data'] = [{"name": mw.getWwwDir(), "ps": "www"}]
+            db_list['orderOpt'] = bak_data
+            return mw.getJson(db_list)
+
+        data = {}
+        data['orderOpt'] = bak_data
+
+        default_db = 'sites'
+        data['data'] = mw.M(default_db).field('name,ps').select()
+        return mw.getJson(data)
+
+    def setCronStatus(self,cron_id):
+        data = thisdb.getCrond(cron_id)
+
+        status = 1
+        status_msg = '开启'
+        if data['status'] == status:
+            status = 0
+            status_msg = '关闭'
+            self.removeForCrond(data['echo'])
+        else:
+            data['status'] = 1
+            self.syncToCrond(cron_id)
+
+        thisdb.setCrontabStatus(cron_id, status)
+
+        msg = '修改计划任务[' + data['name'] + ']状态为[' + str(status_msg) + ']'
+        mw.writeLog('计划任务', msg)
+        return mw.returnJson(True, msg)
+
+
+    def cronLog(self, cron_id):
+        data = thisdb.getCrond(cron_id)
+        log_file = mw.getServerDir() + '/cron/' + data['echo'] + '.log'
+        if not os.path.exists(log_file):
+            return mw.returnData(False, '当前日志为空!')
+        content = mw.getLastLine(log_file, 500)
+        return mw.returnData(True, content)
+
+    def startTask(self, cron_id):
+        data = thisdb.getCrond(cron_id)
+        cmd_file = mw.getServerDir() + '/cron/' + data['echo']
+        os.system('chmod +x ' + cmd_file)
+        os.system('nohup ' + cmd_file + ' >> ' + cmd_file + '.log 2>&1 &')
+        return mw.returnData(True, '计划任务【%s】已执行!' % data['name'])
+
+
     # 获取指定任务数据
     def getCrondFind(self, cron_id):
         return thisdb.getCrond(cron_id)
@@ -78,7 +193,7 @@ class crontab(object):
     def delete(self, tid):
         data = thisdb.getCrond(tid)
         if not self.removeForCrond(data['echo']):
-            return mw.returnData(False, '无法写入文件，请检查是否开启了系统加固功能!')
+            return mw.returnData(False, '无法写入文件，是否开启了系统加固功能!')
 
         cron_path = mw.getServerDir() + '/cron'
         cron_file = cron_path + '/' + data['echo']
@@ -94,6 +209,17 @@ class crontab(object):
         mw.writeLog('计划任务', msg)
         return mw.returnData(True, msg)
 
+
+    def delLogs(self,cron_id):
+        try:
+            data = thisdb.getCrond(cron_id)
+            log_file = mw.getServerDir() + '/cron/' + data['echo'] + '.log'
+            if os.path.exists(log_file):
+                os.remove(log_file)
+            return mw.returnData(True, '任务日志已清空!')
+        except:
+            return mw.returnData(False, '任务日志清空失败!')
+
     def getCrontabHuman(self, data):
         rdata = []
         for i in range(len(data)):
@@ -129,18 +255,23 @@ class crontab(object):
         if mw.isAppleSystem():
             return True
 
-        u_file = '/var/spool/cron/crontabs/root'
-        if not os.path.exists(u_file):
-            file = '/var/spool/cron/root'
-            if not os.path.exists(file):
-                return False
-        else:
-            file = u_file
+        cron_file = [
+            '/var/spool/cron/crontabs/root',
+            '/var/spool/cron/root',
+        ]
 
-        conf = mw.readFile(file)
+        file = ''
+        for i in cron_file:
+            if os.path.exists(file):
+                file = i
+
+        if file == '':
+            return False
+
+        content = mw.readFile(file)
         rep = ".+" + str(echo) + ".+\n"
-        conf = re.sub(rep, "", conf)
-        if not mw.writeFile(file, conf):
+        content = re.sub(rep, "", content)
+        if not mw.writeFile(file, content):
             return False
         self.crondReload()
         return True
@@ -288,7 +419,6 @@ class crontab(object):
             shell = param.sFile
         else:
             head = "#!/bin/bash\nPATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin\nexport PATH\n"
-
             start_head = '''
 SCRIPT_RUN_TIME="0s"
 MW_ToSeconds()
@@ -336,22 +466,16 @@ fi''' % (mw.getPanelDir(),)
                 'rememory': head + "/bin/bash " + script_dir + '/rememory.sh'
             }
             if param['backup_to'] != 'localhost':
-                cfile = mw.getPluginDir() + "/" + \
-                    param['backup_to'] + "/index.py"
+                cfile = mw.getPluginDir() + "/" + param['backup_to'] + "/index.py"
 
-                wheres['path'] = head + "python3 " + cfile + \
-                    " path " + param['sname'] + " " + str(param['save'])
-                wheres['site'] = head + "python3 " + cfile + \
-                    " site " + param['sname'] + " " + str(param['save'])
-                wheres['database'] = head + "python3 " + cfile + " " + \
-                    source_stype + " " + \
-                    param['sname'] + " " + str(param['save'])
+                wheres['path'] = head + "python3 " + cfile + " path " + param['sname'] + " " + str(param['save'])
+                wheres['site'] = head + "python3 " + cfile + " site " + param['sname'] + " " + str(param['save'])
+                wheres['database'] = head + "python3 " + cfile + " " + source_stype + " " + param['sname'] + " " + str(param['save'])
             try:
                 shell = wheres[stype]
             except:
                 if stype == 'toUrl':
-                    shell = head + "curl -sS --connect-timeout 10 -m 60 '" + \
-                        param['urladdress'] + "'"
+                    shell = head + "curl -sS --connect-timeout 10 -m 60 '" + param['urladdress'] + "'"
                 else:
                     shell = head + param['sbody'].replace("\r\n", "\n")
 
@@ -381,19 +505,19 @@ echo "--------------------------------------------------------------------------
     def checkScript(self, shell):
         keys = ['shutdown', 'init 0', 'mkfs', 'passwd',
                 'chpasswd', '--stdin', 'mkfs.ext', 'mke2fs']
-        for key in keys:
-            shell = shell.replace(key, '[***]')
+        for k in keys:
+            shell = shell.replace(k, '[***]')
         return shell
 
-
-
     # 将Shell脚本写到文件
-    def writeShell(self, config):
+    def writeShell(self, bash_script):
+        if mw.isAppleSystem():
+            return mw.returnData(True, 'ok')
         file = '/var/spool/cron/crontabs/root'
-        current_os = mw.getOs()
-        if current_os == 'darwin':
+        sys_os = mw.getOs()
+        if sys_os == 'darwin':
             file = '/etc/crontab'
-        elif current_os.startswith("freebsd"):
+        elif sys_os.startswith("freebsd"):
             file = '/var/cron/tabs/root'
 
         if not os.path.exists(file):
@@ -401,15 +525,16 @@ echo "--------------------------------------------------------------------------
 
         if not os.path.exists(file):
             mw.writeFile(file, '')
-        conf = mw.readFile(file)
-        conf += str(config) + "\n"
-        if mw.writeFile(file, conf):
+
+        content = mw.readFile(file)
+        content += str(bash_script) + "\n"
+        if mw.writeFile(file, content):
             if not os.path.exists(file):
                 mw.execShell("chmod 600 '" + file +"' && chown root.root " + file)
             else:
                 mw.execShell("chmod 600 '" + file +"' && chown root.crontab " + file)
             return mw.returnData(True, 'ok')
-        return mw.returnData(False, '文件写入失败,请检查是否开启系统加固功能!')
+        return mw.returnData(False, '文件写入失败,是否开启系统加固功能!')
 
     # 重载配置
     def crondReload(self):
@@ -424,7 +549,22 @@ echo "--------------------------------------------------------------------------
             else:
                 mw.execShell("systemctl reload crond")
 
+    def syncToCrond(self, cron_id):
+        info = thisdb.getCrond(cron_id)
+        if 'status' in info:
+            if info['status'] == 0:
+                return False
 
+        if 'where_hour' in info:
+            info['hour'] = info['where_hour']
+            info['minute'] = info['where_minute']
+            info['week'] = info['where1']
 
-
+        cmd, _ = self.getCrondCycle(info)
+        cron_path = mw.getServerDir() + '/cron'
+        cron_name = self.getShell(info)
+        cmd += ' ' + cron_path + '/' + cron_name + ' >> ' + cron_path + '/' + cron_name + '.log 2>&1'
+        self.writeShell(cmd)
+        self.crondReload()
+        return True
 
diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index e100925ad..715810947 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -14,9 +14,9 @@ import threading
 import re
 import time
 
-from admin import model
 
 import core.mw as mw
+import thisdb
 
 class Firewall(object):
 
@@ -47,6 +47,14 @@ class Firewall(object):
         elif mw.isAppleSystem():
             self.__isMac = True
 
+    def getList(self, page=1,size=10):
+        info = thisdb.getFirewallList(page=page, size=size)
+
+        rdata = {}
+        rdata['data'] = info['list']
+        rdata['page'] = mw.getPage({'count':info['count'],'tojs':'showAccept','p':page,'row':size})
+        return rdata
+
     def reload(self):
         if self.__isUfw:
             mw.execShell('/usr/sbin/ufw reload')
@@ -236,8 +244,7 @@ class Firewall(object):
         
         msg = mw.getInfo('放行端口[{1}][{2}]成功', (port, protocol,))
         mw.writeLog("防火墙管理", msg)
-
-        return mw.returnData(True, '添加放行(' + port + ')端口成功!')
+        return mw.returnData(True, msg)
 
 
 

From fbe2da1cd832e9db08f9c142b9b549c91c3a70f8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 00:38:22 +0800
Subject: [PATCH 096/965] update

---
 web/admin/firewall/__init__.py |  9 ++-------
 web/admin/task/__init__.py     | 22 +---------------------
 web/thisdb/tasks.py            |  9 +++++++--
 web/utils/firewall.py          |  6 +++---
 web/utils/task.py              |  9 +++++++++
 5 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/web/admin/firewall/__init__.py b/web/admin/firewall/__init__.py
index 8cd65a986..5002551a4 100644
--- a/web/admin/firewall/__init__.py
+++ b/web/admin/firewall/__init__.py
@@ -53,23 +53,18 @@ def get_ssh_info():
 @blueprint.route('/set_ping', endpoint='set_ping', methods=['POST'])
 @panel_login_required
 def set_ping():
-    mf = MwFirewall.instance()
-    return mf.setPing()
+    return MwFirewall.instance().setPing()
 
 # 添加放行端口
 @blueprint.route('/add_accept_port', endpoint='add_accept_port', methods=['POST'])
 @panel_login_required
 def add_accept_port():
-    mf = MwFirewall.instance()
-    if not mf.getFwStatus():
-        return mw.returnData(False, '防火墙启动时,才能添加规则!')
-
     port = request.form.get('port', '').strip()
     ps = request.form.get('ps', '').strip()
     protocol = request.form.get('protocol', '').strip()
     stype = request.form.get('type', '').strip()
 
-    return mf.addAcceptPort(port, ps, stype, protocol=protocol)
+    return MwFirewall.instance().addAcceptPort(port, ps, stype, protocol=protocol)
 
 
 
diff --git a/web/admin/task/__init__.py b/web/admin/task/__init__.py
index 0567a7531..d0cff30e3 100644
--- a/web/admin/task/__init__.py
+++ b/web/admin/task/__init__.py
@@ -35,27 +35,7 @@ def list():
     p = request.form.get('p', '1')
     limit = request.form.get('limit', '10').strip()
     search = request.form.get('search', '').strip()
-
-    count = Tasks.query.filter_by().count()
-    pagination = Tasks.query.filter_by().order_by(Tasks.id.desc()).paginate(page=int(p), per_page=int(limit))
-  
-    rows = []
-    for item in pagination.items:
-        t = {}
-        t['id'] = item.id
-        t['name'] = item.name
-        t['type'] = item.type
-        t['cmd'] = item.cmd
-        t['start'] = item.start
-        t['end'] = item.end
-        t['status'] = item.status
-        t['add_time'] = item.add_time
-        rows.append(t)
-
-    data = {}
-    data['data'] = rows
-    data['page'] = mw.getPage({'count':count,'tojs':'remind','p':p})
-    return data
+    return MwTasks.getTaskList(int(p), int(limit))
 
 @blueprint.route('/get_exec_log', endpoint='get_exec_log', methods=['POST'])
 @panel_login_required
diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index c209794d7..59168762d 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -52,8 +52,13 @@ def getTaskList(
     limit = str(start) + ',' + str(size)
 
     field = 'id,name,type,start,end,status,add_time'
-    data = mw.M('tasks').where('', ()).field(field).limit(limit).order('id asc').select()
-    return data
+    task_list = mw.M('tasks').where('', ()).field(field).limit(limit).order('id asc').select()
+    count = mw.M('tasks').where('', ()).count()
+
+    rdata = {}
+    rdata['list'] = task_list
+    rdata['count'] = count
+    return rdata
 
 
 
diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 715810947..fcb48cca3 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -229,16 +229,16 @@ class Firewall(object):
     ):
         if not self.getFwStatus():
             self.setFw(0)
-
+            return mw.returnData(False, '防火墙启动时,才能添加规则!')
 
         rep = r"^\d{1,5}(:\d{1,5})?$"
         if not re.search(rep, port):
             return mw.returnData(False, '端口范围不正确!')
 
-        if model.getFirewallCountByPort(port) > 0:
+        if thisdb.getFirewallCountByPort(port) > 0:
             return mw.returnData(False, '您要放行的端口已存在，无需重复放行!')
 
-        model.addFirewall(port, ps=ps,protocol=protocol)
+        thisdb.addFirewall(port, ps=ps,protocol=protocol)
         self.addAcceptPortCmd(port, protocol=protocol)
         self.reload()
         
diff --git a/web/utils/task.py b/web/utils/task.py
index 49e269647..a069aa963 100644
--- a/web/utils/task.py
+++ b/web/utils/task.py
@@ -13,6 +13,15 @@ import pwd
 import time
 
 import core.mw as mw
+import thisdb
+
+def getTaskList(page=1,size=10):
+    info = thisdb.getTaskList(page=page, size=size)
+
+    rdata = {}
+    rdata['data'] = info['list']
+    rdata['page'] = mw.getPage({'count':info['count'],'tojs':'remind','p':page,'row':size})
+    return rdata
 
 # 删除进程下的所有进程
 def removeTaskRecursion(pid):

From 9cf9b5367181535768c093bf0f48c1b5d3bd13ff Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 00:46:25 +0800
Subject: [PATCH 097/965] update

---
 web/admin/task/__init__.py | 10 +++++-----
 web/thisdb/tasks.py        | 28 ++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/web/admin/task/__init__.py b/web/admin/task/__init__.py
index d0cff30e3..e06404184 100644
--- a/web/admin/task/__init__.py
+++ b/web/admin/task/__init__.py
@@ -47,15 +47,15 @@ def get_exec_log():
 @blueprint.route('/get_task_speed', endpoint='get_task_speed', methods=['POST'])
 @panel_login_required
 def get_task_speed():
-    count = model.getTaskUnexecutedCount()
+    count = thisdb.getTaskUnexecutedCount()
     if count == 0:
         return mw.returnData(False, '当前没有任务队列在执行-2!')
     
-    row = model.getTaskFirstByRun()
+    row = thisdb.getTaskFirstByRun()
     if row is None:
         return mw.returnData(False, '当前没有任务队列在执行-3!')
 
-    task_logfile = mw.getPanelTaskLog()
+    task_logfile = thisdb.getPanelTaskLog()
 
     data = {}
     data['name'] = row['name']
@@ -72,7 +72,7 @@ def get_task_speed():
                     break
             except Exception as e:
                 if i == 2:
-                    model.setTaskStatus(row['id'],0)
+                    thisdb.setTaskStatus(row['id'],0)
                     return mw.returnData(False, '当前没有任务队列在执行-4:' + str(e))
             time.sleep(0.5)
     else:
@@ -80,7 +80,7 @@ def get_task_speed():
         data['isDownload'] = False
 
 
-    data['task'] = model.getTaskRunList()
+    data['task'] = thisdb.getTaskRunList()
     return data
 
 @blueprint.route('/remove_task', endpoint='remove_task', methods=['POST'])
diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index 59168762d..2f551204a 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -10,6 +10,12 @@
 
 import core.mw as mw
 
+def getTaskCount(
+        status: int | None = -1
+    ) -> int:
+    return mw.M('tasks').where('status=?',(1,)).count()
+
+
 # 未执行任务总数
 def getTaskUnexecutedCount() -> int:
     return mw.M('tasks').where('status!=?',(1,)).count()
@@ -60,6 +66,28 @@ def getTaskList(
     rdata['count'] = count
     return rdata
 
+def getTaskFirstByRun() -> None:
+    field = 'id,name,type,start,end,status,add_time'
+    data = mw.M('tasks').where('status=?', (-1,)).field(field).order('id asc').find()
+    if item is None:
+        return None
+    return data
+
+def getTaskRunList(
+    page: int | None = 1,
+    size: int | None = 10,
+):
+    start = (page - 1) * size
+    limit = str(start) + ',' + str(size)
+
+    field = 'id,name,type,start,end,status,add_time'
+    task_list = mw.M('tasks').where('', ()).field(field).limit(limit).order('id desc').select()
+    count = mw.M('tasks').where('', ()).count()
+
+    rdata = {}
+    rdata['list'] = task_list
+    rdata['count'] = count
+    return rdata
 
 
 def setTaskStatus(id,

From 39c634ab14ac56e4d7be974d53c5aeea74515069 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 00:51:55 +0800
Subject: [PATCH 098/965] Update panel_tools.py

---
 panel_tools.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index ec54c05f4..45af39793 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -23,12 +23,8 @@ web_dir = os.getcwd() + "/web"
 os.chdir(web_dir)
 sys.path.append(web_dir)
 
-
-from admin import app
-from admin import model
-import thisdb
 import core.mw as mw
-import core.db as db
+import thisdb
 
 INIT_DIR = "/etc/rc.d/init.d"
 if mw.isAppleSystem():

From 8010ead35af5d4a7f523500681c774473063fecc Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 00:58:40 +0800
Subject: [PATCH 099/965] update

---
 panel_task.py       | 48 ++++++++++++++++++++++-----------------------
 web/thisdb/tasks.py | 12 ++++++++++++
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/panel_task.py b/panel_task.py
index 9432db180..8022b403a 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -24,12 +24,8 @@ web_dir = os.getcwd() + "/web"
 os.chdir(web_dir)
 sys.path.append(web_dir)
 
-from admin import app
-from admin import model
-
-import thisdb
 import core.mw as mw
-import core.db as db
+import thisdb
 
 g_log_file = mw.getPanelTaskLog()
 isTask = mw.getMWLogs() + '/panelTask.pl'
@@ -118,7 +114,7 @@ def runPanelTask():
             thisdb.setTaskData(run_task['id'], end=end)
             thisdb.setTaskStatus(run_task['id'], 1)
     except Exception as e:
-        print(str(e))
+        print(mw.getTracebackInfo())
 
     # 站点过期检查
     # siteEdate()
@@ -130,7 +126,7 @@ def startPanelTask():
             runPanelTask()
             time.sleep(1)
     except Exception as e:
-        print(str(e))
+        print(mw.getTracebackInfo())
         time.sleep(10)
         startPanelTask()
 
@@ -164,6 +160,7 @@ def systemTask():
             monitor.instance().run()
             time.sleep(5)
     except Exception as ex:
+        print(mw.getTracebackInfo())
         time.sleep(30)
         systemTask()
 
@@ -249,6 +246,7 @@ def startPHPVersion(version):
         if os.path.exists(cgi):
             return True
     except Exception as e:
+        print(mw.getTracebackInfo())
         mw.writeLog('PHP守护程序', '自动修复异常:'+str(e))
         return True
 
@@ -326,31 +324,31 @@ def setDaemon(t):
 
 def run():
     # # 系统监控
-    sysTask = threading.Thread(target=systemTask)
-    sysTask = setDaemon(sysTask)
-    sysTask.start()
+    # sysTask = threading.Thread(target=systemTask)
+    # sysTask = setDaemon(sysTask)
+    # sysTask.start()
 
     # # PHP 502错误检查线程
-    php502 = threading.Thread(target=check502Task)
-    php502 = setDaemon(php502)
-    php502.start()
+    # php502 = threading.Thread(target=check502Task)
+    # php502 = setDaemon(php502)
+    # php502.start()
 
-    # OpenResty Restart At Once Start
-    oraos = threading.Thread(target=openrestyRestartAtOnce)
-    oraos = setDaemon(oraos)
-    oraos.start()
+    # # OpenResty Restart At Once Start
+    # oraos = threading.Thread(target=openrestyRestartAtOnce)
+    # oraos = setDaemon(oraos)
+    # oraos.start()
 
 
-    # OpenResty Auto Restart Start
-    oar = threading.Thread(target=openrestyAutoRestart)
-    oar = setDaemon(oar)
-    oar.start()
+    # # OpenResty Auto Restart Start
+    # oar = threading.Thread(target=openrestyAutoRestart)
+    # oar = setDaemon(oar)
+    # oar.start()
 
 
-    # Panel Restart Start
-    rps = threading.Thread(target=restartPanelService)
-    rps = setDaemon(rps)
-    rps.start()
+    # # Panel Restart Start
+    # rps = threading.Thread(target=restartPanelService)
+    # rps = setDaemon(rps)
+    # rps.start()
 
     # 面板后台任务
     startPanelTask()
diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index 2f551204a..fb01d65fe 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -57,6 +57,18 @@ def getTaskList(
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)
 
+    field = 'id,name,type,start,end,status,add_time'
+    task_list = mw.M('tasks').where('', ()).field(field).limit(limit).order('id asc').select()
+    return task_list
+
+def getTaskPage(
+    status: int | None = 1,
+    page: int | None = 1,
+    size: int | None = 10,
+):
+    start = (page - 1) * size
+    limit = str(start) + ',' + str(size)
+
     field = 'id,name,type,start,end,status,add_time'
     task_list = mw.M('tasks').where('', ()).field(field).limit(limit).order('id asc').select()
     count = mw.M('tasks').where('', ()).count()

From 6f232aa46e1ef511372006279a87c875fd5934f2 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 00:59:38 +0800
Subject: [PATCH 100/965] Update panel_task.py

---
 panel_task.py | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/panel_task.py b/panel_task.py
index 8022b403a..da7f96d7b 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -37,6 +37,15 @@ def execShell(cmdstring, cwd=None, timeout=None, shell=True):
     cmd = cmdstring + ' > ' + g_log_file + ' 2>&1'
     return mw.execShell(cmd)
 
+def writeLogs(data):
+    # 写输出日志
+    try:
+        fp = open(g_log_file, 'w+')
+        fp.write(data)
+        fp.close()
+    except:
+        pass
+
 def mw_async(f):
     def wrapper(*args, **kwargs):
         thr = threading.Thread(target=f, args=args, kwargs=kwargs)
@@ -72,7 +81,6 @@ def downloadFile(url, filename):
         writeLogs(str(e))
     return True
 
-
 def downloadHook(count, blockSize, totalSize):
     # 下载文件进度回调
     global pre
@@ -83,17 +91,6 @@ def downloadHook(count, blockSize, totalSize):
     speed = {'total': totalSize, 'used': used, 'pre': pre1}
     writeLogs(json.dumps(speed))
 
-
-def writeLogs(data):
-    # 写输出日志
-    try:
-        fp = open(g_log_file, 'w+')
-        fp.write(data)
-        fp.close()
-    except:
-        pass
-
-
 def runPanelTask():
     try:
         bash_list = thisdb.getTaskList(status=-1)

From 910defe18b21bcdf5a7ee4be56f932df28d07852 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 01:03:37 +0800
Subject: [PATCH 101/965] update

---
 panel_task.py              | 40 +++++++++++++++++++-------------------
 web/admin/task/__init__.py |  2 +-
 web/utils/task.py          |  4 ++--
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/panel_task.py b/panel_task.py
index da7f96d7b..2ee2a3f6a 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -320,32 +320,32 @@ def setDaemon(t):
     return t
 
 def run():
-    # # 系统监控
-    # sysTask = threading.Thread(target=systemTask)
-    # sysTask = setDaemon(sysTask)
-    # sysTask.start()
+    # 系统监控
+    sysTask = threading.Thread(target=systemTask)
+    sysTask = setDaemon(sysTask)
+    sysTask.start()
 
-    # # PHP 502错误检查线程
-    # php502 = threading.Thread(target=check502Task)
-    # php502 = setDaemon(php502)
-    # php502.start()
+    # PHP 502错误检查线程
+    php502 = threading.Thread(target=check502Task)
+    php502 = setDaemon(php502)
+    php502.start()
 
-    # # OpenResty Restart At Once Start
-    # oraos = threading.Thread(target=openrestyRestartAtOnce)
-    # oraos = setDaemon(oraos)
-    # oraos.start()
+    # OpenResty Restart At Once Start
+    oraos = threading.Thread(target=openrestyRestartAtOnce)
+    oraos = setDaemon(oraos)
+    oraos.start()
 
 
-    # # OpenResty Auto Restart Start
-    # oar = threading.Thread(target=openrestyAutoRestart)
-    # oar = setDaemon(oar)
-    # oar.start()
+    # OpenResty Auto Restart Start
+    oar = threading.Thread(target=openrestyAutoRestart)
+    oar = setDaemon(oar)
+    oar.start()
 
 
-    # # Panel Restart Start
-    # rps = threading.Thread(target=restartPanelService)
-    # rps = setDaemon(rps)
-    # rps.start()
+    # Panel Restart Start
+    rps = threading.Thread(target=restartPanelService)
+    rps = setDaemon(rps)
+    rps.start()
 
     # 面板后台任务
     startPanelTask()
diff --git a/web/admin/task/__init__.py b/web/admin/task/__init__.py
index e06404184..64cd42ad1 100644
--- a/web/admin/task/__init__.py
+++ b/web/admin/task/__init__.py
@@ -35,7 +35,7 @@ def list():
     p = request.form.get('p', '1')
     limit = request.form.get('limit', '10').strip()
     search = request.form.get('search', '').strip()
-    return MwTasks.getTaskList(int(p), int(limit))
+    return MwTasks.getTaskPage(int(p), int(limit))
 
 @blueprint.route('/get_exec_log', endpoint='get_exec_log', methods=['POST'])
 @panel_login_required
diff --git a/web/utils/task.py b/web/utils/task.py
index a069aa963..a6ddbd990 100644
--- a/web/utils/task.py
+++ b/web/utils/task.py
@@ -15,8 +15,8 @@ import time
 import core.mw as mw
 import thisdb
 
-def getTaskList(page=1,size=10):
-    info = thisdb.getTaskList(page=page, size=size)
+def getTaskPage(page=1,size=10):
+    info = thisdb.getTaskPage(page=page, size=size)
 
     rdata = {}
     rdata['data'] = info['list']

From ef7b680e37e7f389212069e4c1bd65ffd6894ec7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 01:12:04 +0800
Subject: [PATCH 102/965] update

---
 panel_task.py       |  2 +-
 web/thisdb/tasks.py | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/panel_task.py b/panel_task.py
index 2ee2a3f6a..bea5152da 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -99,6 +99,7 @@ def runPanelTask():
 
         run_list = thisdb.getTaskList(status=0)
         for run_task in run_list:
+            print(run_task)
             start = int(time.time())
             thisdb.setTaskData(run_task['id'], start=start)
             thisdb.setTaskStatus(run_task['id'], -1)
@@ -157,7 +158,6 @@ def systemTask():
             monitor.instance().run()
             time.sleep(5)
     except Exception as ex:
-        print(mw.getTracebackInfo())
         time.sleep(30)
         systemTask()
 
diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index fb01d65fe..179a525e0 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -10,6 +10,8 @@
 
 import core.mw as mw
 
+__FIELD = 'id,name,type,start,end,cmd,status,add_time'
+
 def getTaskCount(
         status: int | None = -1
     ) -> int:
@@ -56,9 +58,7 @@ def getTaskList(
 ):
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)
-
-    field = 'id,name,type,start,end,status,add_time'
-    task_list = mw.M('tasks').where('', ()).field(field).limit(limit).order('id asc').select()
+    task_list = mw.M('tasks').where('', ()).field(__FIELD).limit(limit).order('id asc').select()
     return task_list
 
 def getTaskPage(
@@ -68,9 +68,7 @@ def getTaskPage(
 ):
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)
-
-    field = 'id,name,type,start,end,status,add_time'
-    task_list = mw.M('tasks').where('', ()).field(field).limit(limit).order('id asc').select()
+    task_list = mw.M('tasks').where('', ()).field(__FIELD).limit(limit).order('id asc').select()
     count = mw.M('tasks').where('', ()).count()
 
     rdata = {}
@@ -79,8 +77,7 @@ def getTaskPage(
     return rdata
 
 def getTaskFirstByRun() -> None:
-    field = 'id,name,type,start,end,status,add_time'
-    data = mw.M('tasks').where('status=?', (-1,)).field(field).order('id asc').find()
+    data = mw.M('tasks').where('status=?', (-1,)).field(__FIELD).order('id asc').find()
     if item is None:
         return None
     return data
@@ -92,8 +89,7 @@ def getTaskRunList(
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)
 
-    field = 'id,name,type,start,end,status,add_time'
-    task_list = mw.M('tasks').where('', ()).field(field).limit(limit).order('id desc').select()
+    task_list = mw.M('tasks').where('', ()).field(__FIELD).limit(limit).order('id desc').select()
     count = mw.M('tasks').where('', ()).count()
 
     rdata = {}

From 72c6dbabab36883830bdd1857770794721f92467 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 01:15:17 +0800
Subject: [PATCH 103/965] update

---
 web/admin/task/__init__.py |  2 +-
 web/thisdb/tasks.py        | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/web/admin/task/__init__.py b/web/admin/task/__init__.py
index 64cd42ad1..68598414c 100644
--- a/web/admin/task/__init__.py
+++ b/web/admin/task/__init__.py
@@ -55,7 +55,7 @@ def get_task_speed():
     if row is None:
         return mw.returnData(False, '当前没有任务队列在执行-3!')
 
-    task_logfile = thisdb.getPanelTaskLog()
+    task_logfile = mw.getPanelTaskLog()
 
     data = {}
     data['name'] = row['name']
diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index 179a525e0..f7f1b64a9 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -78,7 +78,7 @@ def getTaskPage(
 
 def getTaskFirstByRun() -> None:
     data = mw.M('tasks').where('status=?', (-1,)).field(__FIELD).order('id asc').find()
-    if item is None:
+    if data is None:
         return None
     return data
 
@@ -88,6 +88,15 @@ def getTaskRunList(
 ):
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)
+    task_list = mw.M('tasks').where('', ()).field(__FIELD).limit(limit).order('id desc').select()
+    return task_list
+
+def getTaskRunPage(
+    page: int | None = 1,
+    size: int | None = 10,
+):
+    start = (page - 1) * size
+    limit = str(start) + ',' + str(size)
 
     task_list = mw.M('tasks').where('', ()).field(__FIELD).limit(limit).order('id desc').select()
     count = mw.M('tasks').where('', ()).count()

From 6bf4371a2b3726b97ba959a4d7ec5a943d041801 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 01:15:40 +0800
Subject: [PATCH 104/965] Update panel_task.py

---
 panel_task.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panel_task.py b/panel_task.py
index bea5152da..19274a646 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -99,7 +99,6 @@ def runPanelTask():
 
         run_list = thisdb.getTaskList(status=0)
         for run_task in run_list:
-            print(run_task)
             start = int(time.time())
             thisdb.setTaskData(run_task['id'], start=start)
             thisdb.setTaskStatus(run_task['id'], -1)
@@ -113,6 +112,7 @@ def runPanelTask():
             thisdb.setTaskStatus(run_task['id'], 1)
     except Exception as e:
         print(mw.getTracebackInfo())
+        time.sleep(10)
 
     # 站点过期检查
     # siteEdate()

From 36bd8d8a1fef9975b366c78dbffdfd78d62100cc Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 01:16:08 +0800
Subject: [PATCH 105/965] Update panel_task.py

---
 panel_task.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/panel_task.py b/panel_task.py
index 19274a646..e299fe77c 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -112,7 +112,6 @@ def runPanelTask():
             thisdb.setTaskStatus(run_task['id'], 1)
     except Exception as e:
         print(mw.getTracebackInfo())
-        time.sleep(10)
 
     # 站点过期检查
     # siteEdate()

From 8d2e70c31ed7efbe62685c43ef0cb1ae15ea97e6 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 01:16:17 +0800
Subject: [PATCH 106/965] Update panel_task.py

---
 panel_task.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/panel_task.py b/panel_task.py
index e299fe77c..933180432 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -123,7 +123,6 @@ def startPanelTask():
             runPanelTask()
             time.sleep(1)
     except Exception as e:
-        print(mw.getTracebackInfo())
         time.sleep(10)
         startPanelTask()
 

From f217c07d129c55064e9492803c3595f4b66496c0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 01:19:09 +0800
Subject: [PATCH 107/965] Update tasks.py

---
 web/thisdb/tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index f7f1b64a9..10a8f5150 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -68,7 +68,7 @@ def getTaskPage(
 ):
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)
-    task_list = mw.M('tasks').where('', ()).field(__FIELD).limit(limit).order('id asc').select()
+    task_list = mw.M('tasks').where('', ()).field(__FIELD).limit(limit).order('id desc').select()
     count = mw.M('tasks').where('', ()).count()
 
     rdata = {}

From fed4a4ae48c2b96c6599e97d3e9a63bf6e93d042 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 01:20:54 +0800
Subject: [PATCH 108/965] Update tasks.py

---
 web/thisdb/tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index 10a8f5150..f7f1b64a9 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -68,7 +68,7 @@ def getTaskPage(
 ):
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)
-    task_list = mw.M('tasks').where('', ()).field(__FIELD).limit(limit).order('id desc').select()
+    task_list = mw.M('tasks').where('', ()).field(__FIELD).limit(limit).order('id asc').select()
     count = mw.M('tasks').where('', ()).count()
 
     rdata = {}

From 024dedabaff25ad49d4e85dc187bb05fc0316906 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 01:26:45 +0800
Subject: [PATCH 109/965] update

---
 web/admin/setup/sql/default.sql | 146 ++++++++++++++++++++++++++++++++
 web/admin/setup/sql/system.sql  |  41 +++++++++
 web/thisdb/init.py              |   3 +-
 web/utils/system/monitor.py     |   2 +-
 4 files changed, 189 insertions(+), 3 deletions(-)
 create mode 100755 web/admin/setup/sql/default.sql
 create mode 100755 web/admin/setup/sql/system.sql

diff --git a/web/admin/setup/sql/default.sql b/web/admin/setup/sql/default.sql
new file mode 100755
index 000000000..ec3bc47d0
--- /dev/null
+++ b/web/admin/setup/sql/default.sql
@@ -0,0 +1,146 @@
+
+CREATE TABLE IF NOT EXISTS `backup` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `type` INTEGER,
+  `name` TEXT,
+  `pid` INTEGER,
+  `filename` TEXT,
+  `size` INTEGER,
+  `add_time` TEXT
+);
+
+CREATE TABLE IF NOT EXISTS `binding` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `pid` INTEGER,
+  `domain` TEXT,
+  `path` TEXT,
+  `port` INTEGER,
+  `add_time` TEXT
+);
+
+
+CREATE TABLE IF NOT EXISTS `crontab` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` TEXT,
+  `type` TEXT,
+  `where1` TEXT,
+  `where_hour` INTEGER,
+  `where_minute` INTEGER,
+  `echo` TEXT,
+  `status` INTEGER DEFAULT '1',
+  `save` INTEGER DEFAULT '3',
+  `backup_to` TEXT DEFAULT 'off', 
+  `sname` TEXT,
+  `sbody` TEXT,
+  'stype' TEXT,
+  `url_address` TEXT,
+  `add_time` TEXT,
+  `update_time` TEXT
+);
+
+CREATE TABLE IF NOT EXISTS `firewall` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `port` TEXT,
+  `protocol` TEXT DEFAULT 'tcp',
+  `ps` TEXT,
+  `add_time` TEXT,
+  `update_time` TEXT
+);
+
+ALTER TABLE `firewall` ADD COLUMN `protocol` TEXT DEFAULT 'tcp';
+
+INSERT INTO `firewall` (`id`, `port`, `protocol`, `ps`, `add_time`) VALUES
+(1, '80',  'tcp','网站默认端口', '0000-00-00 00:00:00','0000-00-00 00:00:00'),
+(2, '443', 'tcp/udp', 'HTTPS', '0000-00-00 00:00:00','0000-00-00 00:00:00');
+
+
+
+CREATE TABLE IF NOT EXISTS `logs` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `type` TEXT,
+  `log` TEXT,
+  `uid` INTEGER DEFAULT '1',
+  `add_time` TEXT
+);
+
+CREATE TABLE IF NOT EXISTS `sites` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` TEXT,
+  `path` TEXT,
+  `status` TEXT,
+  `index` TEXT,
+  `type_id` INTEGER,
+  `ps` TEXT,
+  `edate` TEXT,
+  `ssl_effective_date` TEXT,
+  `ssl_expiration_date` TEXT,
+  `add_time` TEXT,
+  `update_time` TEXT
+);
+
+CREATE TABLE IF NOT EXISTS `site_types` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` TEXT
+);
+
+CREATE TABLE IF NOT EXISTS `domain` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `pid` INTEGER,
+  `name` TEXT,
+  `port` INTEGER,
+  `add_time` TEXT
+);
+
+CREATE TABLE IF NOT EXISTS `users` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` TEXT,
+  `password` TEXT,
+  `login_ip` TEXT,
+  `login_time` TEXT,
+  `phone` TEXT,
+  `email` TEXT,
+  `add_time` INTEGER,
+  `update_time` INTEGER
+);
+
+CREATE TABLE IF NOT EXISTS `tasks` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` 			TEXT,
+  `type`			TEXT,
+  `start` 	  INTEGER,
+  `end` 	    INTEGER,
+  `cmd` 	    TEXT,
+  `status`    INTEGER,
+  `add_time`  INTEGER
+);
+
+CREATE TABLE IF NOT EXISTS `temp_login` (
+  `id`  INTEGER PRIMARY KEY AUTOINCREMENT,
+  `token` REAL,
+  `salt`  REAL,
+  `state` INTEGER,
+  `login_time`  INTEGER,
+  `login_addr`  REAL,
+  `logout_time` INTEGER,
+  `expire`  INTEGER,
+  `add_time` INTEGER
+);
+
+CREATE TABLE IF NOT EXISTS `panel` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `title` TEXT,
+  `url` TEXT,
+  `username` TEXT,
+  `password` TEXT,
+  `click` INTEGER,
+  `add_time` INTEGER
+);
+
+CREATE TABLE IF NOT EXISTS `option` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` TEXT,
+  `type` TEXT,
+  `value` TEXT
+);
+
+CREATE UNIQUE INDEX name_idx ON option(name);
diff --git a/web/admin/setup/sql/system.sql b/web/admin/setup/sql/system.sql
new file mode 100755
index 000000000..75fe9557f
--- /dev/null
+++ b/web/admin/setup/sql/system.sql
@@ -0,0 +1,41 @@
+CREATE TABLE IF NOT EXISTS `network` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `up` TEXT,
+  `down` TEXT,
+  `total_up` INTEGER,
+  `total_down` INTEGER,
+  `down_packets` INTEGER,
+  `up_packets` INTEGER,
+  `addtime` INTEGER
+);
+CREATE INDEX addtime_idx ON network(`addtime`);
+
+CREATE TABLE IF NOT EXISTS `cpuio` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `pro` TEXT,
+  `mem` TEXT,
+  `addtime` INTEGER
+);
+CREATE INDEX addtime_idx ON cpuio(`addtime`);
+
+CREATE TABLE IF NOT EXISTS `diskio` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `read_count` INTEGER,
+  `write_count` INTEGER,
+  `read_bytes` INTEGER,
+  `write_bytes` INTEGER,
+  `read_time` INTEGER,
+  `write_time` INTEGER,
+  `addtime` INTEGER
+);
+CREATE INDEX addtime_idx ON diskio(`addtime`);
+
+CREATE TABLE IF NOT EXISTS `load_average` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `pro` REAL,
+  `one` REAL,
+  `five` REAL,
+  `fifteen` REAL,
+  `addtime` INTEGER
+);
+CREATE INDEX addtime_idx ON load_average(`addtime`);
\ No newline at end of file
diff --git a/web/thisdb/init.py b/web/thisdb/init.py
index a007d27e1..fac16d6bf 100644
--- a/web/thisdb/init.py
+++ b/web/thisdb/init.py
@@ -17,11 +17,10 @@ def initPanelData():
     _dbfile = mw.getPanelDataDir() + '/panel.db'
     if os.path.exists(_dbfile):
         return True
-    sql_file = mw.getPanelDataDir() + '/sql/default.sql'
+    sql_file = mw.getPanelDir() + '/web/admin/setup/sql/default.sql'
     sql = mw.M().dbPos(mw.getPanelDataDir(),'panel')
     csql = mw.readFile(sql_file)
     csql_list = csql.split(';')
     for index in range(len(csql_list)):
-        print(index)
         sql.execute(csql_list[index], ())
     return True
\ No newline at end of file
diff --git a/web/utils/system/monitor.py b/web/utils/system/monitor.py
index 95a8d6e1c..801aaabfe 100644
--- a/web/utils/system/monitor.py
+++ b/web/utils/system/monitor.py
@@ -53,7 +53,7 @@ class monitor:
     def initDBFile(self):
         if os.path.exists(self._dbfile):
             return True
-        sql_file = mw.getPanelDataDir() + '/sql/system.sql'
+        sql_file = mw.getPanelDir() + '/web/admin/setup/sql/system.sql'
         sql = db.Sql().dbPos(mw.getPanelDataDir(),'system')
         csql = mw.readFile(sql_file)
         csql_list = csql.split(';')

From 91327c50f0ad4cb6821a011c7c71c1eada63defe Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 01:34:27 +0800
Subject: [PATCH 110/965] Update install.sh

---
 plugins/mosquitto/install.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/mosquitto/install.sh b/plugins/mosquitto/install.sh
index 6510720c6..37a795254 100755
--- a/plugins/mosquitto/install.sh
+++ b/plugins/mosquitto/install.sh
@@ -13,8 +13,6 @@ echo "use system: ${sysName}"
 # cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/mosquitto && bash install.sh install 2.0.18
 # cd /www/mdserver-web/plugins/mosquitto && bash install.sh install 2.0.18
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 VERSION=$2
 
 Install_App()
@@ -27,7 +25,7 @@ Install_App()
 		useradd -g mosquitto mosquitto
 	fi
 
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 
 	if [ ! -f $serverPath/source/mosquitto-${VERSION}.tar.gz ];then
@@ -55,7 +53,7 @@ Install_App()
 	
 	if [ -d $serverPath/mosquitto ];then
 		echo "${VERSION}" > $serverPath/mosquitto/version.pl
-		echo '安装完成' > $install_tmp
+		echo '安装mosquitto完成'
 
 
 		cd ${rootPath} && python3 ${rootPath}/plugins/mosquitto/index.py start
@@ -77,7 +75,7 @@ Uninstall_App()
 	fi
 
 	rm -rf $serverPath/mosquitto
-	echo "uninstall mosquitto" > $install_tmp
+	echo "卸载mosquitto成功"
 }
 
 action=$1

From 4d4465060997e3b75021ae57c0d21ee5683a8478 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 01:35:39 +0800
Subject: [PATCH 111/965] Update install.sh

---
 plugins/docker/install.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/docker/install.sh b/plugins/docker/install.sh
index 7b9bc7499..c0679a66e 100755
--- a/plugins/docker/install.sh
+++ b/plugins/docker/install.sh
@@ -10,7 +10,6 @@ serverPath=$(dirname "$rootPath")
 # cd /www/server/mdserver-web/plugins/docker && /bin/bash install.sh uninstall 1.0
 # cd /www/server/mdserver-web/plugins/docker && /bin/bash install.sh install 1.0
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 if [ -f ${rootPath}/bin/activate ];then
@@ -46,7 +45,7 @@ Install_Docker()
 	# 	exit 0
 	# fi
 
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 
 	if [ ! -d  $serverPath/docker ];then
@@ -59,7 +58,7 @@ Install_Docker()
 	
 	if [ -d $serverPath/docker ];then
 		echo "${VERSION}" > $serverPath/docker/version.pl
-		echo '安装完成' > $install_tmp
+		echo '安装Docker完成'
 
 		cd ${rootPath} && python3 ${rootPath}/plugins/docker/index.py start
 		cd ${rootPath} && python3 ${rootPath}/plugins/docker/index.py initd_install
@@ -94,7 +93,7 @@ Uninstall_Docker()
 	# docker-ce
 
 	rm -rf $serverPath/docker
-	echo "Uninstall_Docker" > $install_tmp
+	echo "卸载Docker"
 }
 
 action=$1

From 804f7646d14b0c1feec8e174a847661c9073f95e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 01:39:07 +0800
Subject: [PATCH 112/965] update

---
 plugins/php-apt/index_php_apt.py | 7 +++++--
 plugins/php-yum/index_php_yum.py | 7 +++++--
 plugins/php/index_php.py         | 8 +++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/plugins/php-apt/index_php_apt.py b/plugins/php-apt/index_php_apt.py
index 97ade4c7d..0be394d49 100755
--- a/plugins/php-apt/index_php_apt.py
+++ b/plugins/php-apt/index_php_apt.py
@@ -11,8 +11,11 @@ import shutil
 # reload(sys)
 # sys.setdefaultencoding('utf8')
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+try:
+    sys.path.append(os.getcwd() + "/class/core")
+    import mw
+except Exception as e:
+    import core.mw as mw
 
 if mw.isAppleSystem():
     cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
diff --git a/plugins/php-yum/index_php_yum.py b/plugins/php-yum/index_php_yum.py
index 0600580d6..5a421e423 100755
--- a/plugins/php-yum/index_php_yum.py
+++ b/plugins/php-yum/index_php_yum.py
@@ -11,8 +11,11 @@ import shutil
 # reload(sys)
 # sys.setdefaultencoding('utf8')
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+try:
+    sys.path.append(os.getcwd() + "/class/core")
+    import mw
+except Exception as e:
+    import core.mw as mw
 
 if mw.isAppleSystem():
     cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
diff --git a/plugins/php/index_php.py b/plugins/php/index_php.py
index 5ffba3af6..bfd9bca31 100755
--- a/plugins/php/index_php.py
+++ b/plugins/php/index_php.py
@@ -10,9 +10,11 @@ import shutil
 
 # reload(sys)
 # sys.setdefaultencoding('utf8')
-
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+try:
+    sys.path.append(os.getcwd() + "/class/core")
+    import mw
+except Exception as e:
+    import core.mw as mw
 
 if mw.isAppleSystem():
     cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''

From 534af4f017b37711bbe2c081338c1ecbb429f8cc Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 01:39:21 +0800
Subject: [PATCH 113/965] Update index_php_yum.py

---
 plugins/php-yum/index_php_yum.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/plugins/php-yum/index_php_yum.py b/plugins/php-yum/index_php_yum.py
index 5a421e423..1a77fb329 100755
--- a/plugins/php-yum/index_php_yum.py
+++ b/plugins/php-yum/index_php_yum.py
@@ -17,12 +17,6 @@ try:
 except Exception as e:
     import core.mw as mw
 
-if mw.isAppleSystem():
-    cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-    info = mw.execShell(cmd)
-    p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-    sys.path.append(p)
-
 app_debug = False
 if mw.isAppleSystem():
     app_debug = True

From ec70d3e9555d750822a93c241f2e751bee071f09 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 01:42:09 +0800
Subject: [PATCH 114/965] Update firewall.js

---
 web/static/app/firewall.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/static/app/firewall.js b/web/static/app/firewall.js
index 07f7230f1..cdd78f0d9 100755
--- a/web/static/app/firewall.js
+++ b/web/static/app/firewall.js
@@ -301,8 +301,8 @@ function showAccept(page,search) {
 						<td>" + data.data[i].protocol + "</td>\
 						<td>" + (data.data[i].port.indexOf('.') == -1?'放行端口'+':['+data.data[i].port+']':'屏蔽IP'+':['+data.data[i].port+']') + "</td>\
 						<td>" + status + "</td>\
-						<td>" + data.data[i].addtime + "</td>\
 						<td>" + data.data[i].ps + "</td>\
+						<td>" + data.data[i].add_time + "</td>\
 						<td class='text-right'><a href='javascript:;' class='btlink' onclick=\"delAcceptPort(" + data.data[i].id + ",'" + data.data[i].port + "','"+data.data[i].protocol+"')\">删除</a></td>\
 					</tr>";
 		}

From f6c4f3b2ee149d9483100d68e5100b5bb7102579 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 01:44:04 +0800
Subject: [PATCH 115/965] Update mw.py

---
 web/core/mw.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/web/core/mw.py b/web/core/mw.py
index 8b970cab6..7fcca6dd0 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -375,6 +375,14 @@ def getHostAddr():
         return readFile(ip_text).strip()
     return '127.0.0.1'
 
+def setMode(filename, mode):
+    # 设置文件权限
+    if not os.path.exists(filename):
+        return False
+    mode = int(str(mode), 8)
+    os.chmod(filename, mode)
+    return True
+
 def getSqitePrefix():
     WIN = sys.platform.startswith('win')
     if WIN:  # 如果是 Windows 系统，使用三个斜线
@@ -383,6 +391,26 @@ def getSqitePrefix():
         prefix = 'sqlite:////'
     return prefix
 
+def checkPort(port):
+    # 检查端口是否合法
+    ports = ['21', '443', '888']
+    if port in ports:
+        return False
+    intport = int(port)
+    if intport < 1 or intport > 65535:
+        return False
+    return True
+
+def getStrBetween(startStr, endStr, srcStr):
+    # 字符串取中间
+    start = srcStr.find(startStr)
+    if start == -1:
+        return None
+    end = srcStr.find(endStr)
+    if end == -1:
+        return None
+    return srcStr[start + 1:end]
+
 def getCpuType():
     cpuType = ''
     if isAppleSystem():

From 0c9eae860f09845f162d2b836b74f3fe23b8c920 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 01:45:22 +0800
Subject: [PATCH 116/965] Update mw.py

---
 web/core/mw.py | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/web/core/mw.py b/web/core/mw.py
index 7fcca6dd0..5dffe2e97 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -375,6 +375,49 @@ def getHostAddr():
         return readFile(ip_text).strip()
     return '127.0.0.1'
 
+def checkIp(ip):
+    # 检查是否为IPv4地址
+    import re
+    p = re.compile(r'^((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$')
+    if p.match(ip):
+        return True
+    else:
+        return False
+
+def createLinuxUser(user, group):
+    execShell("groupadd {}".format(group))
+    execShell('useradd -s /sbin/nologin -g {} {}'.format(user, group))
+    return True
+
+
+def setOwn(filename, user, group=None):
+    if isAppleSystem():
+        return True
+
+    # 设置用户组
+    if not os.path.exists(filename):
+        return False
+    from pwd import getpwnam
+    try:
+        user_info = getpwnam(user)
+        user = user_info.pw_uid
+        if group:
+            user_info = getpwnam(group)
+        group = user_info.pw_gid
+    except:
+        if user == 'www':
+            createLinuxUser(user)
+        # 如果指定用户或组不存在，则使用www
+        try:
+            user_info = getpwnam('www')
+        except:
+            createLinuxUser(user)
+            user_info = getpwnam('www')
+        user = user_info.pw_uid
+        group = user_info.pw_gid
+    os.chown(filename, user, group)
+    return True
+    
 def setMode(filename, mode):
     # 设置文件权限
     if not os.path.exists(filename):

From 2fe3ed54079a98969342b930721c5782276103da Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 02:28:06 +0800
Subject: [PATCH 117/965] update

---
 panel_task.py         | 5 +++--
 scripts/init.d/mw.tpl | 2 +-
 web/core/db.py        | 8 ++++++--
 web/thisdb/tasks.py   | 6 +++---
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/panel_task.py b/panel_task.py
index 933180432..ff94e5fcc 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -107,6 +107,7 @@ def runPanelTask():
                 downloadFile(argv[0], argv[1])
             elif run_task['type'] == 'execshell':
                 execShell(run_task['cmd'])
+            print(run_task)
             end = int(time.time())
             thisdb.setTaskData(run_task['id'], end=end)
             thisdb.setTaskStatus(run_task['id'], 1)
@@ -121,9 +122,9 @@ def startPanelTask():
     try:
         while True:
             runPanelTask()
-            time.sleep(1)
+            time.sleep(5)
     except Exception as e:
-        time.sleep(10)
+        time.sleep(30)
         startPanelTask()
 
 # 网站到期处理
diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 79a566f59..722179492 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -345,7 +345,7 @@ mw_debug(){
     if [ -d ${PANEL_DIR}/web ];then
         cd ${PANEL_DIR}/web
     fi
-    gunicorn -b :$port -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
+    gunicorn -b :$port -w 1  app:app
 }
 
 
diff --git a/web/core/db.py b/web/core/db.py
index 5962ac56a..27b97ae9e 100755
--- a/web/core/db.py
+++ b/web/core/db.py
@@ -56,6 +56,10 @@ class Sql():
         self.__DB_CONN.text_factory = bytes
         return True
 
+    def debug(self, debug=False):
+        self.__debug = debug
+        return self
+
     def autoTextFactory(self):
         if sys.version_info[0] == 3:
             self.__DB_CONN.text_factory = lambda x: str(x, encoding="utf-8", errors='ignore')
@@ -341,8 +345,8 @@ class Sql():
             opt = opt[0:len(opt) - 1]
             sql = "UPDATE " + self.__DB_TABLE + " SET " + opt + self.__OPT_WHERE
 
-            # import mw
-            # mw.writeFile('/tmp/test.pl', sql)
+            if self.__debug:
+                print(sql, param)
 
             # 处理拼接WHERE与UPDATE参数
             tmp = list(param)
diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index f7f1b64a9..5eb895542 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -58,7 +58,7 @@ def getTaskList(
 ):
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)
-    task_list = mw.M('tasks').where('', ()).field(__FIELD).limit(limit).order('id asc').select()
+    task_list = mw.M('tasks').where('status=?', (status,)).field(__FIELD).limit(limit).order('id asc').select()
     return task_list
 
 def getTaskPage(
@@ -107,10 +107,10 @@ def getTaskRunPage(
     return rdata
 
 
-def setTaskStatus(id,
+def setTaskStatus(task_id,
     status: int | None = 0
 ):
-    mw.M('tasks').where('id=?',(id,)).update({'status':status})
+    mw.M('tasks').where('id=?',(task_id,)).update({'status':status})
     return True
 
 def setTaskData(id,

From a0a4292cb873e9843b696639a8659e238c738f02 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 02:28:22 +0800
Subject: [PATCH 118/965] Update panel_task.py

---
 panel_task.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panel_task.py b/panel_task.py
index ff94e5fcc..6b410dc84 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -107,7 +107,7 @@ def runPanelTask():
                 downloadFile(argv[0], argv[1])
             elif run_task['type'] == 'execshell':
                 execShell(run_task['cmd'])
-            print(run_task)
+            # print(run_task)
             end = int(time.time())
             thisdb.setTaskData(run_task['id'], end=end)
             thisdb.setTaskStatus(run_task['id'], 1)

From 1ec2c333841f1d93a112daf2a40ab8d3f5b55a4a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 02:30:46 +0800
Subject: [PATCH 119/965] Update tasks.py

---
 web/thisdb/tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index 5eb895542..821c6121d 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -68,7 +68,7 @@ def getTaskPage(
 ):
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)
-    task_list = mw.M('tasks').where('', ()).field(__FIELD).limit(limit).order('id asc').select()
+    task_list = mw.M('tasks').where('', ()).field(__FIELD).limit(limit).order('id desc').select()
     count = mw.M('tasks').where('', ()).count()
 
     rdata = {}

From e477a69b983f9359be345d69caa2163ba4743666 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 02:33:23 +0800
Subject: [PATCH 120/965] Update tasks.py

---
 web/thisdb/tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index 821c6121d..3f8a9fa54 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -88,7 +88,7 @@ def getTaskRunList(
 ):
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)
-    task_list = mw.M('tasks').where('', ()).field(__FIELD).limit(limit).order('id desc').select()
+    task_list = mw.M('tasks').where('status!=?', (1)).field(__FIELD).limit(limit).order('id asc').select()
     return task_list
 
 def getTaskRunPage(

From 1a3972fa21126537a0374671809733ef72432505 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 02:35:16 +0800
Subject: [PATCH 121/965] Update tasks.py

---
 web/thisdb/tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index 3f8a9fa54..c27466cb5 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -88,7 +88,7 @@ def getTaskRunList(
 ):
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)
-    task_list = mw.M('tasks').where('status!=?', (1)).field(__FIELD).limit(limit).order('id asc').select()
+    task_list = mw.M('tasks').where('status!=?', (1,)).field(__FIELD).limit(limit).order('id asc').select()
     return task_list
 
 def getTaskRunPage(

From a09a9d5889e5cea0edb1e2acbb98e99d3a9240d9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 02:35:36 +0800
Subject: [PATCH 122/965] Update tasks.py

---
 web/thisdb/tasks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index c27466cb5..0533ae66e 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -98,8 +98,8 @@ def getTaskRunPage(
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)
 
-    task_list = mw.M('tasks').where('', ()).field(__FIELD).limit(limit).order('id desc').select()
-    count = mw.M('tasks').where('', ()).count()
+    task_list = mw.M('tasks').where('status!=?', (1,)).field(__FIELD).limit(limit).order('id desc').select()
+    count = mw.M('tasks').where('status!=?', (1,)).count()
 
     rdata = {}
     rdata['list'] = task_list

From a4079c09ef3ff8650f3791178a5075578cfd4ec7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 02:37:39 +0800
Subject: [PATCH 123/965] Update tasks.py

---
 web/thisdb/tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index 0533ae66e..44c4c1722 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -98,7 +98,7 @@ def getTaskRunPage(
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)
 
-    task_list = mw.M('tasks').where('status!=?', (1,)).field(__FIELD).limit(limit).order('id desc').select()
+    task_list = mw.M('tasks').where('status!=?', (1,)).field(__FIELD).limit(limit).order('id asc').select()
     count = mw.M('tasks').where('status!=?', (1,)).count()
 
     rdata = {}

From 9ce92eb69e8b634fbfce551a48f659082257f81a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 02:56:12 +0800
Subject: [PATCH 124/965] update

---
 panel_task.py                  |  1 -
 web/admin/firewall/__init__.py | 10 ++++++
 web/core/mw.py                 | 28 +++++++++-------
 web/utils/firewall.py          | 59 ++++++++++++++++++++++++++++++++++
 4 files changed, 86 insertions(+), 12 deletions(-)

diff --git a/panel_task.py b/panel_task.py
index 6b410dc84..d60b4bc97 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -107,7 +107,6 @@ def runPanelTask():
                 downloadFile(argv[0], argv[1])
             elif run_task['type'] == 'execshell':
                 execShell(run_task['cmd'])
-            # print(run_task)
             end = int(time.time())
             thisdb.setTaskData(run_task['id'], end=end)
             thisdb.setTaskStatus(run_task['id'], 1)
diff --git a/web/admin/firewall/__init__.py b/web/admin/firewall/__init__.py
index 5002551a4..435e706ae 100644
--- a/web/admin/firewall/__init__.py
+++ b/web/admin/firewall/__init__.py
@@ -66,6 +66,16 @@ def add_accept_port():
 
     return MwFirewall.instance().addAcceptPort(port, ps, stype, protocol=protocol)
 
+# 添加放行端口
+@blueprint.route('/del_accept_port', endpoint='del_accept_port', methods=['POST'])
+@panel_login_required
+def del_accept_port():
+    port = request.form.get('port', '').strip()
+    firewall_id = request.form.get('id', '').strip()
+    protocol = request.form.get('protocol', '').strip()
+    return MwFirewall.instance().delAcceptPort(firewall_id, port, protocol=protocol)
+
+
 
 
 
diff --git a/web/core/mw.py b/web/core/mw.py
index 5dffe2e97..87574b7b0 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -87,28 +87,34 @@ def getMWLogs():
 def getPanelTmp():
     return getPanelDir() + '/tmp'
 
-def getPanelTaskLog():
-    return getMWLogs() + '/panel_task.log'
-
-
 def getServerDir():
     return getFatherDir() + '/server'
 
 def getLogsDir():
     return getFatherDir() + '/wwwlogs'
 
+def getRecycleBinDir():
+    rb_dir = getFatherDir() + '/recycle_bin'
+    if not os.path.exists(rb_dir):
+        os.system('mkdir -p ' + rb_dir)
+    return rb_dir
+
+def getPanelTaskLog():
+    return getMWLogs() + '/panel_task.log'
+
 def getWwwDir():
     file = getPanelDir() + '/data/site.pl'
     if os.path.exists(file):
         return readFile(file).strip()
     return getFatherDir() + '/wwwroot'
 
-    
-def getRecycleBinDir():
-    rb_dir = getFatherDir() + '/recycle_bin'
-    if not os.path.exists(rb_dir):
-        os.system('mkdir -p ' + rb_dir)
-    return rb_dir
+
+def getPanelPort():
+    port_file = mw.getPanelDir()+'/data/port.pl'
+    port = mw.readFile(port_file).strip()
+    if not port:
+        return 7200
+    return int(port)
 
 def getRandomString(length):
     # 取随机字符串
@@ -417,7 +423,7 @@ def setOwn(filename, user, group=None):
         group = user_info.pw_gid
     os.chown(filename, user, group)
     return True
-    
+
 def setMode(filename, mode):
     # 设置文件权限
     if not os.path.exists(filename):
diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index fcb48cca3..0d32abdeb 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -246,5 +246,64 @@ class Firewall(object):
         mw.writeLog("防火墙管理", msg)
         return mw.returnData(True, msg)
 
+    def delAcceptPort(self, firewall_id, port,
+        protocol: str  | None ='tcp'
+    ):
+        panel_port = mw.getPanelPort()
+
+        if(port == panel_port):
+            return mw.returnData(False, '失败，不能删除当前面板端口!')
+        try:
+            self.delAcceptPortCmd(port, protocol)
+            mw.M('firewall').where("id=?", (firewall_id,)).delete()
+            return mw.returnData(True, '删除成功!')
+        except Exception as e:
+            return mw.returnData(False, '删除失败!:' + str(e))
+
+    def delAcceptPortCmd(self, port,
+        protocol: str  | None ='tcp'
+    ):
+        if self.__isUfw:
+            if protocol == 'tcp':
+                mw.execShell('ufw delete allow ' + port + '/tcp')
+            if protocol == 'udp':
+                mw.execShell('ufw delete allow ' + port + '/udp')
+            if protocol == 'tcp/udp':
+                mw.execShell('ufw delete allow ' + port + '/tcp')
+                mw.execShell('ufw delete allow ' + port + '/udp')
+        elif self.__isFirewalld:
+            port = port.replace(':', '-')
+            if protocol == 'tcp':
+                mw.execShell(
+                    'firewall-cmd --permanent --zone=public --remove-port=' + port + '/tcp')
+            if protocol == 'udp':
+                mw.execShell(
+                    'firewall-cmd --permanent --zone=public --remove-port=' + port + '/udp')
+            if protocol == 'tcp/udp':
+                mw.execShell(
+                    'firewall-cmd --permanent --zone=public --remove-port=' + port + '/tcp')
+                mw.execShell(
+                    'firewall-cmd --permanent --zone=public --remove-port=' + port + '/udp')
+        elif self.__isIptables:
+            if protocol == 'tcp':
+                mw.execShell(
+                    'iptables -D INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT')
+            if protocol == 'udp':
+                mw.execShell(
+                    'iptables -D INPUT -p udp -m state --state NEW -m udp --dport ' + port + ' -j ACCEPT')
+            if protocol == 'tcp/udp':
+                mw.execShell(
+                    'iptables -D INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT')
+                mw.execShell(
+                    'iptables -D INPUT -p udp -m state --state NEW -m udp --dport ' + port + ' -j ACCEPT')
+        else:
+            pass
+
+        mw.M('firewall').where("port=?", (port,)).delete()
+        msg = mw.getInfo('删除防火墙放行端口[{1}][{2}]成功!', (port, protocol,))
+        mw.writeLog("防火墙管理", msg)
+        self.reload()
+        return True
+
 
 

From f9b7526007e511482e52022184fa355a795dd204 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 02:59:41 +0800
Subject: [PATCH 125/965] Update mw.py

---
 web/core/mw.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index 87574b7b0..d8773b439 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -110,8 +110,8 @@ def getWwwDir():
 
 
 def getPanelPort():
-    port_file = mw.getPanelDir()+'/data/port.pl'
-    port = mw.readFile(port_file).strip()
+    port_file = getPanelDir()+'/data/port.pl'
+    port = readFile(port_file).strip()
     if not port:
         return 7200
     return int(port)

From d83e7b69058ccb9111019bb33629a464cd64f11b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 03:00:02 +0800
Subject: [PATCH 126/965] Update firewall.py

---
 web/utils/firewall.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 0d32abdeb..9b39ac475 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -251,7 +251,7 @@ class Firewall(object):
     ):
         panel_port = mw.getPanelPort()
 
-        if(port == panel_port):
+        if(int(port) == int(panel_port)):
             return mw.returnData(False, '失败，不能删除当前面板端口!')
         try:
             self.delAcceptPortCmd(port, protocol)

From 82ee20b1a9ba6d7e5774418b59784bd1039d5f0d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 03:29:36 +0800
Subject: [PATCH 127/965] update

---
 plugins/openresty/index.html |   2 +-
 plugins/openresty/index.py   |  38 +++++++++---
 web/core/mw.py               | 108 ++++++++++++++++++++++++++++++++++-
 3 files changed, 137 insertions(+), 11 deletions(-)

diff --git a/plugins/openresty/index.html b/plugins/openresty/index.html
index 30803d9f1..086bec6de 100755
--- a/plugins/openresty/index.html
+++ b/plugins/openresty/index.html
@@ -1,5 +1,5 @@
 <div class="bt-form">
-	<div class='plugin_version'></div>
+	<!-- <div class='plugin_version'></div> -->
 	<div class="bt-w-main">
 		<div class="bt-w-menu">
 			<p class="bgw" onclick="orPluginService('openresty',$('.plugin_version').attr('version'));">服务</p>
diff --git a/plugins/openresty/index.py b/plugins/openresty/index.py
index 217634a6f..778324890 100755
--- a/plugins/openresty/index.py
+++ b/plugins/openresty/index.py
@@ -8,8 +8,12 @@ import threading
 import subprocess
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+
+web_dir = os.getcwd() + "/web"
+sys.path.append(web_dir)
+os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
@@ -41,18 +45,19 @@ def getInitDFile():
 
 def getArgs():
     args = sys.argv[2:]
+    # print(args)
     tmp = {}
     args_len = len(args)
 
     if args_len == 1:
         t = args[0].strip('{').strip('}')
-        t = t.split(':')
+        t = t.split(':',2)
         tmp[t[0]] = t[1]
     elif args_len > 1:
         for i in range(len(args)):
-            t = args[i].split(':')
+            t = args[i].split(':',2)
             tmp[t[0]] = t[1]
-
+    # print(tmp)
     return tmp
 
 
@@ -398,16 +403,25 @@ def initdUinstall():
     mw.execShell('systemctl disable openresty')
     return 'ok'
 
+def getNgxStatusPort():
+    ngx_status_file = mw.getServerDir() + '/web_conf/nginx/vhost/0.nginx_status.conf'
+    content = mw.readFile(ngx_status_file)
+    rep = r'listen\s*(.*);'
+    tmp = re.search(rep, content)
+    port =  tmp.groups()[0].strip()
+    return port
+
 
 def runInfo():
     op_status = status()
     if op_status == 'stop':
         return mw.returnJson(False, "未启动!")
 
+    port = getNgxStatusPort()
     # 取Openresty负载状态
     try:
-        url = 'http://127.0.0.1/nginx_status'
-        result = mw.httpGet(url, timeout=1)
+        url = 'http://127.0.0.1:%s/nginx_status' % port
+        result = mw.httpGet(url, timeout=3)
         tmp = result.split()
         data = {}
         data['active'] = tmp[2]
@@ -419,8 +433,7 @@ def runInfo():
         data['Waiting'] = tmp[15]
         return mw.getJson(data)
     except Exception as e:
-
-        url = 'http://' + mw.getHostAddr() + '/nginx_status'
+        url = 'http://' + mw.getHostAddr() + ':%s/nginx_status' % port
         result = mw.httpGet(url)
         tmp = result.split()
         data = {}
@@ -550,6 +563,13 @@ def installPreInspection():
 
 
 if __name__ == "__main__":
+    version_pl = getServerDir() + "/version.pl"
+    if not os.path.exists(version_pl):
+        print('error')
+        exit(-1) 
+    version = mw.readFile(version_pl)
+
+
     func = sys.argv[1]
     if func == 'status':
         print(status())
diff --git a/web/core/mw.py b/web/core/mw.py
index d8773b439..8ec077999 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -199,7 +199,7 @@ def readFile(filename):
         fp.close()
         return fBody
     except Exception as e:
-        # print(e)
+        print(e)
         return False
 
 def writeFile(filename, content, mode='w+'):
@@ -764,6 +764,112 @@ def deDoubleCrypt(key, strings):
         writeFileLog(getTracebackInfo())
         return strings
 
+# ------------------------------   network start  -----------------------------
+
+def HttpGet(url, timeout=10):
+    """
+    发送GET请求
+    @url 被请求的URL地址(必需)
+    @timeout 超时时间默认60秒
+    return string
+    """
+    if sys.version_info[0] == 2:
+        try:
+            import urllib2
+            import ssl
+            if sys.version_info[0] == 2:
+                reload(urllib2)
+                reload(ssl)
+            try:
+                ssl._create_default_https_context = ssl._create_unverified_context
+            except:
+                pass
+            response = urllib2.urlopen(url, timeout=timeout)
+            return response.read()
+        except Exception as ex:
+            return str(ex)
+    else:
+        try:
+            import urllib.request
+            import ssl
+            try:
+                ssl._create_default_https_context = ssl._create_unverified_context
+            except:
+                pass
+            response = urllib.request.urlopen(url, timeout=timeout)
+            result = response.read()
+            if type(result) == bytes:
+                result = result.decode('utf-8')
+            return result
+        except Exception as ex:
+            return str(ex)
+
+
+def HttpGet2(url, timeout):
+    import urllib.request
+
+    try:
+        import ssl
+        try:
+            ssl._create_default_https_context = ssl._create_unverified_context
+        except:
+            pass
+        req = urllib.request.urlopen(url, timeout=timeout)
+        result = req.read().decode('utf-8')
+        return result
+
+    except Exception as e:
+        return str(e)
+
+
+def httpGet(url, timeout=10):
+    return HttpGet2(url, timeout)
+
+
+def HttpPost(url, data, timeout=10):
+    """
+    发送POST请求
+    @url 被请求的URL地址(必需)
+    @data POST参数，可以是字符串或字典(必需)
+    @timeout 超时时间默认60秒
+    return string
+    """
+    if sys.version_info[0] == 2:
+        try:
+            import urllib
+            import urllib2
+            import ssl
+            ssl._create_default_https_context = ssl._create_unverified_context
+            data = urllib.urlencode(data)
+            req = urllib2.Request(url, data)
+            response = urllib2.urlopen(req, timeout=timeout)
+            return response.read()
+        except Exception as ex:
+            return str(ex)
+    else:
+        try:
+            import urllib.request
+            import ssl
+            try:
+                ssl._create_default_https_context = ssl._create_unverified_context
+            except:
+                pass
+            data = urllib.parse.urlencode(data).encode('utf-8')
+            req = urllib.request.Request(url, data)
+            response = urllib.request.urlopen(req, timeout=timeout)
+            result = response.read()
+            if type(result) == bytes:
+                result = result.decode('utf-8')
+            return result
+        except Exception as ex:
+            return str(ex)
+
+
+def httpPost(url, data, timeout=10):
+    return HttpPost(url, data, timeout)
+
+# ------------------------------   network end  -----------------------------
+
 # ------------------------------   panel start  -----------------------------
 
 def isRestart():

From bcfdd2216138268a7cd54a86bebc28ed9a1e5f15 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 6 Nov 2024 02:08:35 +0800
Subject: [PATCH 128/965] update

---
 new_cli.sh                             |  8 ++-
 panel_tools.py                         |  7 +-
 web/admin/dashboard/login.py           | 46 ++++++++++---
 web/admin/setting/secondary_verifiy.py | 44 +++++++++----
 web/admin/setup/option.py              |  3 +
 web/admin/site/__init__.py             | 45 ++++++++++++-
 web/core/db.py                         |  2 +
 web/core/mw.py                         | 13 ++++
 web/static/app/config.js               |  4 +-
 web/templates/default/login.html       |  2 +-
 web/templates/default/setting.html     |  6 +-
 web/thisdb/user.py                     | 15 +++--
 web/utils/config.py                    |  4 ++
 web/utils/site.py                      | 91 +++++++++++++++-----------
 web/utils/system/main.py               |  9 +--
 15 files changed, 217 insertions(+), 82 deletions(-)

diff --git a/new_cli.sh b/new_cli.sh
index 4d6a96388..77c21ddf6 100755
--- a/new_cli.sh
+++ b/new_cli.sh
@@ -51,7 +51,7 @@ mw_start_debug(){
 	fi
 
 	python3 panel_task.py >> $DIR/logs/panel_task.log 2>&1 &
-	port=7200    
+	port=7200
     if [ -f /www/server/mdserver-web/data/port.pl ];then
         port=$(cat /www/server/mdserver-web/data/port.pl)
     fi
@@ -64,7 +64,11 @@ mw_start_debug(){
 }
 
 mw_start_panel(){
-	cd ${DIR}/web && gunicorn -b :7200 -w 1  app:app
+	port=7200
+	if [ -f ${DIR}/data/port.pl ];then
+        port=$(cat ${DIR}/data/port.pl)
+    fi
+	cd ${DIR}/web && gunicorn -b :${port} -w 1  app:app
 }
 
 mw_start_bgtask(){
diff --git a/panel_tools.py b/panel_tools.py
index 45af39793..cd2e3734f 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -158,9 +158,10 @@ def mwcli(mw_input=0):
         open_ssh_port()
         print("|-已开启!")
     elif mw_input == 26:
-        auth_secret = 'data/auth_secret.pl'
-        if os.path.exists(auth_secret):
-            os.remove(auth_secret)
+        two_step_verification = thisdb.getOptionByJson('two_step_verification', default={'open':False})
+        if two_step_verification['open']:
+            two_step_verification['open'] = False
+            thisdb.setOption('two_step_verification', json.dumps(two_step_verification))
             print("|-关闭二次验证成功!")
         else:
             print("|-二次验证已关闭!")
diff --git a/web/admin/dashboard/login.py b/web/admin/dashboard/login.py
index 7f1abe8eb..746560ce2 100644
--- a/web/admin/dashboard/login.py
+++ b/web/admin/dashboard/login.py
@@ -20,8 +20,6 @@ from flask import request,g
 from admin.common import isLogined
 from admin.user_login_check import panel_login_required
 from admin import cache,session
-from admin import model
-from admin.model import db,TempLogin,Users
 
 import core.mw as mw
 import thisdb
@@ -63,7 +61,7 @@ def login_temp_user(token):
 
     stime = int(time.time())
 
-    tmp_data = model.getTempLoginByToken(token)
+    tmp_data = thisdb.getTempLoginByToken(token)
     if not tmp_data:
         setErrorNum(skey)
         return '验证失败!'
@@ -73,12 +71,10 @@ def login_temp_user(token):
         return "过期"
 
     user_data = thisdb.getUserById(1)
-
     login_addr = mw.getClientIp() + ":" + str(request.environ.get('REMOTE_PORT'))
     mw.writeLog('用户临时登录', "登录成功,帐号:{1},登录IP:{2}",(user_data['name'], login_addr))
 
-    TempLogin.query.filter(TempLogin.id==tmp_data['id']).update({"login_time": stime, 'state': 1, 'login_addr': login_addr})
-    db.session.commit()
+    mw.M('temp_login').where('id=?',(tmp_data['id'],)).update({"login_time": stime, 'state': 1, 'login_addr': login_addr})
     
     session['login'] = True
     session['username'] = user_data['name']
@@ -105,11 +101,11 @@ def login():
         session['login'] = False
         session['overdue'] = 0
 
-    db_path = model.getOption('admin_path')
+    db_path = thisdb.getOption('admin_path')
     if db_path == '':
         return render_template('default/login.html')
     else:
-        unauthorized_status = model.getOption('unauthorized_status')
+        unauthorized_status = thisdb.getOption('unauthorized_status')
         if unauthorized_status == '0':
             return render_template('default/path.html')
         return Response(status=int(unauthorized_status))
@@ -134,6 +130,32 @@ def check_login():
         return mw.returnData(True,'已登录')
     return mw.returnData(False,'未登录')
 
+@blueprint.route("/verify_login", methods=['POST'])
+def verifyLogin():
+    import pyotp
+
+    username = request.form.get('username', '').strip()
+    password = request.form.get('password', '').strip()
+    password = mw.md5(password)
+
+    info = thisdb.getUserByRoot()
+    if info['name'] != username or info['password'] != password:
+        return mw.returnJson(-1, "密码错误?")
+
+    auth = request.form.get('auth', '').strip()    
+    two_step_verification = thisdb.getOptionByJson('two_step_verification', default={'open':False})
+    if two_step_verification['open']:
+        sec = mw.deDoubleCrypt('mdserver-web', two_step_verification['secret'])
+        totp = pyotp.TOTP(sec)
+        if totp.verify(auth):
+            session['login'] = True
+            session['username'] = info['name']
+            session['overdue'] = int(time.time()) + 7 * 24 * 60 * 60
+
+            thisdb.updateUserLoginTime()
+            return mw.returnData(1, '二次验证成功!')
+    return mw.returnData(-1, '二次验证失败!')
+
 # 执行登录操作
 @blueprint.route('/do_login', endpoint='do_login', methods=['POST'])
 def do_login():
@@ -181,9 +203,15 @@ def do_login():
         mw.writeLog('用户登录', mw.getInfo(msg))
         return mw.returnData(-1, mw.getInfo("用户名或密码错误,您还可以尝试[{1}]次!", (str(login_cache_count - login_cache_limit))))
 
+    cache.delete('login_cache_limit')
+    # 二步验证密钥
+    two_step_verification = thisdb.getOptionByJson('two_step_verification', default={'open':False})
+    if two_step_verification['open']:
+        return mw.returnData(2, '需要两步验证!')
 
     session['login'] = True
     session['username'] = info['name']
     session['overdue'] = int(time.time()) + 7 * 24 * 60 * 60
-
+    
+    thisdb.updateUserLoginTime()
     return mw.returnJson(1, '登录成功,正在跳转...')
diff --git a/web/admin/setting/secondary_verifiy.py b/web/admin/setting/secondary_verifiy.py
index 562383706..2e170bf56 100644
--- a/web/admin/setting/secondary_verifiy.py
+++ b/web/admin/setting/secondary_verifiy.py
@@ -25,30 +25,48 @@ import core.mw as mw
 import utils.config as utils_config
 
 from .setting import blueprint
+import thisdb
 
-
+# 获取二次验证信息
 @blueprint.route('/get_auth_secret', endpoint='get_auth_secret', methods=['POST'])
 @panel_login_required
 def get_auth_secret():
-    reset = request.form.get('reset', '')
-    __file = mw.getCommonFile()
-
     import pyotp
-    auth = __file['auth_secret']
+
+    reset = request.form.get('reset', '')
     tag = 'mdserver-web'
-    if os.path.exists(auth) and reset != '1':
-        content = mw.readFile(auth)
-        sec = mw.deDoubleCrypt(tag,content)
+    two_step_verification = thisdb.getOptionByJson('two_step_verification', default={'open':False})
+
+    if 'secret' in two_step_verification and reset != '1':
+        secret = mw.deDoubleCrypt(tag, two_step_verification['secret'])
     else:
-        sec = pyotp.random_base32()
-        crypt_data = mw.enDoubleCrypt(tag, sec)
-        mw.writeFile(auth, crypt_data)
+        secret = pyotp.random_base32()
+        crypt_data = mw.enDoubleCrypt(tag, secret)
+        two_step_verification['secret'] = crypt_data
+        thisdb.setOption('two_step_verification', json.dumps(two_step_verification))
 
     ip = mw.getHostAddr()
-    url = pyotp.totp.TOTP(sec).provisioning_uri(name=ip, issuer_name=tag)
+    url = pyotp.totp.TOTP(secret).provisioning_uri(name=ip, issuer_name=tag)
 
     rdata = {}
-    rdata['secret'] = sec
+    rdata['secret'] = secret
     rdata['url'] = url
     return mw.returnData(True, '设置成功!', rdata)
+
+
+# 设置二次验证，加强安全登录
+@blueprint.route('/set_auth_secret', endpoint='set_auth_secret', methods=['POST'])
+@panel_login_required
+def set_auth_secret():
+    two_step_verification = thisdb.getOptionByJson('two_step_verification', default={'open':False})
+    if two_step_verification['open']:
+        two_step_verification['open'] = False
+        thisdb.setOption('two_step_verification', json.dumps(two_step_verification))
+        return mw.returnData(True, '关闭成功!', 0)
+    else:
+        two_step_verification['open'] = True
+        thisdb.setOption('two_step_verification', json.dumps(two_step_verification))
+        return mw.returnData(True, '开启成功!', 1)
+
+
         
\ No newline at end of file
diff --git a/web/admin/setup/option.py b/web/admin/setup/option.py
index da08bedd0..9a433961e 100644
--- a/web/admin/setup/option.py
+++ b/web/admin/setup/option.py
@@ -32,6 +32,9 @@ def init_option():
     # basic auth 配置
     thisdb.setOption('basic_auth', json.dumps({'open':False}))
 
+    # 二步验证|默认关闭
+    thisdb.setOption('two_step_verification', json.dumps({'open':False}))
+
     # 开启后台任务
     # model.setOption('run_bg_task', 'close')
 
diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index 6036672f2..3bdf5979d 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -26,7 +26,7 @@ blueprint = Blueprint('site', __name__, url_prefix='/site', template_folder='../
 def index():
     return render_template('site.html')
 
-# 插件列表
+# 站点列表
 @blueprint.route('/list', endpoint='list', methods=['GET','POST'])
 @panel_login_required
 def list():
@@ -42,11 +42,54 @@ def list():
     data['page'] = mw.getPage({'count':info['count'],'tojs':'getWeb','p':p, 'row':limit})
     return data
 
+#添加站点
+@blueprint.route('/add', endpoint='add',methods=['POST'])
+@panel_login_required
+def add():
+    webname = request.form.get('webinfo', '')
+    ps = request.form.get('ps', '')
+    path = request.form.get('path', '')
+    version = request.form.get('version', '')
+    port = request.form.get('port', '')
+    return []
+
+# 获取站点类型
 @blueprint.route('/get_site_types', endpoint='get_site_types',methods=['POST'])
 @panel_login_required
 def get_site_types():
     return []
 
+# 获取站点根目录
+@blueprint.route('/get_root_dir', endpoint='get_root_dir',methods=['POST'])
+@panel_login_required
+def get_root_dir():
+    data = {}
+    data['dir'] = mw.getWwwDir()
+    return data
+
+# 检查OpenResty安装/启动状态
+@blueprint.route('/check_web_status', endpoint='check_web_status',methods=['POST'])
+@panel_login_required
+def check_web_status():
+    '''
+    创建站点检查web服务
+    '''
+    if not mw.isInstalledWeb():
+        return mw.returnJson(False, '请安装并启动OpenResty服务!')
+
+    # 这个快点
+    pid = mw.getServerDir() + '/openresty/nginx/logs/nginx.pid'
+    if not os.path.exists(pid):
+        return mw.returnData(False, '请启动OpenResty服务!')
+    return mw.returnData(True, 'OK')
+
+# 获取PHP版本
+@blueprint.route('/get_php_version', endpoint='get_php_version',methods=['POST'])
+@panel_login_required
+def get_php_version():
+    return site.getPhpVersion()
+
+
 @blueprint.route('/get_cli_php_version', endpoint='get_cli_php_version',methods=['POST'])
 @panel_login_required
 def get_cli_php_version():
diff --git a/web/core/db.py b/web/core/db.py
index 27b97ae9e..6550f77c8 100755
--- a/web/core/db.py
+++ b/web/core/db.py
@@ -39,6 +39,8 @@ class Sql():
     __OPT_FIELD = "*"           # field条件
     __OPT_PARAM = ()            # where值
 
+    __debug = False
+
     def __init__(self):
         self.__DB_FILE = getPanelDir()+'/data/panel.db'
 
diff --git a/web/core/mw.py b/web/core/mw.py
index 8ec077999..603456371 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -909,6 +909,19 @@ def panelCmd(method):
 # ------------------------------    panel end    -----------------------------
 
 # ------------------------------ openresty start -----------------------------
+
+def checkWebConfig():
+    op_dir = getServerDir() + '/openresty/nginx'
+    # "ulimit -n 10240 && " +
+    cmd = op_dir + "/sbin/nginx -t -c " + op_dir + "/conf/nginx.conf"
+    result = execShell(cmd)
+    searchStr = 'test is successful'
+    if result[1].find(searchStr) == -1:
+        msg = getInfo('配置文件错误: {1}', (result[1],))
+        writeLog("软件管理", msg)
+        return result[1]
+    return True
+
 def restartWeb():
     return opWeb("reload")
 
diff --git a/web/static/app/config.js b/web/static/app/config.js
index 066a16dbe..542437619 100755
--- a/web/static/app/config.js
+++ b/web/static/app/config.js
@@ -1236,13 +1236,13 @@ function setTempAccess(){
 	});
 }
 
-//二次验证
+//二步验证
 function setAuthBind(){
 	$.post('/setting/get_auth_secret', {}, function(rdata){
 		console.log(rdata);
 		var tip = layer.open({
 			area: ['500px', '355px'],
-			title: '二次验证设置',
+			title: '二步验证设置',
 			closeBtn:1,
 			shift: 0,
 			type: 1,
diff --git a/web/templates/default/login.html b/web/templates/default/login.html
index fb471f309..c361e6c3c 100755
--- a/web/templates/default/login.html
+++ b/web/templates/default/login.html
@@ -231,7 +231,7 @@ $('#login-button').click(function(){
 			layer.prompt({
 			 	formType: 3,
 			 	value: '',
-			 	title: '二次验证',
+			 	title: '二步验证',
 			}, function(value, index, elem){
 			 	$.post('/verify_login',{'auth':value,'username':username,'password':password},function(vdata){
 			 		if (vdata.status < 0){
diff --git a/web/templates/default/setting.html b/web/templates/default/setting.html
index c001f7375..588d1eeb0 100755
--- a/web/templates/default/setting.html
+++ b/web/templates/default/setting.html
@@ -149,11 +149,11 @@
 				</p>
 
 				<p class="mtb15">
-					<span class="set-tit text-right" title="二次验证" style="float: left;">二次验证</span>
-					<input class="btswitch btswitch-ios" id="cfg_panel_auth" type="checkbox" {{data['auth_secret']}}/>
+					<span class="set-tit text-right" title="二步验证" style="float: left;">二步验证</span>
+					<input class="btswitch btswitch-ios" id="cfg_panel_auth" type="checkbox" {% if data['two_step_verification']['open'] %}checked{% endif %}/>
 	                <label class="btswitch-btn ml5" for="cfg_panel_auth" style="float: left;margin-top:4px;" onclick="setAuthSecretApi()"></label>
 					<button type="button" class="btn btn-default btn-xs panel_api_btn" style="vertical-align: middle; margin-left: 10px" onclick="setAuthBind();">绑定设置</button>
-					<span class="set-info c7">二次验证，加强安全登录</span>
+					<span class="set-info c7">二步验证，加强安全登录</span>
 				</p>
 			</div>
 
diff --git a/web/thisdb/user.py b/web/thisdb/user.py
index 519a3476c..ac94b222b 100644
--- a/web/thisdb/user.py
+++ b/web/thisdb/user.py
@@ -10,9 +10,11 @@
 
 import core.mw as mw
 
+__field = 'id,name,password,login_ip,login_time,phone,email,add_time,update_time'
+
 # 初始化用户信息
 def initAdminUser():
-    data = mw.M('users').field('id').where('id=?', (1,)).find()
+    data = mw.M('users').field(__field).where('id=?', (1,)).find()
     if data is None:
         name = mw.getRandomString(8).lower()
         password = mw.getRandomString(8).lower()
@@ -39,8 +41,7 @@ def getUserByName(name,
     '''
     获取用户信息通过用户名
     '''
-    users_field = 'id,name,password,login_ip,login_time,phone,email,add_time,update_time'
-    data =  mw.M('users').field(users_field).where('name=?', (name,)).find()
+    data =  mw.M('users').field(__field).where('name=?', (name,)).find()
     if data is None:
         return None
     row = {}
@@ -60,8 +61,7 @@ def getUserById(id,
     '''
     获取用户信息通过用户名
     '''
-    users_field = 'id,name,password,login_ip,login_time,phone,email,add_time,update_time'
-    data =  mw.M('users').field(users_field).where('id=?', (1,)).find()
+    data =  mw.M('users').field(__field).where('id=?', (1,)).find()
     if data is None:
         return None
     row = {}
@@ -83,6 +83,11 @@ def getUserByRoot() -> None:
     '''
     return getUserById(1)
 
+def updateUserLoginTime():
+    now_time = mw.formatDate()
+    mw.M('users').field(__field).where('id=?', (1,)).update({'login_time',now_time})
+    return True
+
 def setUserByRoot(
     name: str | None = None,
     password: str | None = None,
diff --git a/web/utils/config.py b/web/utils/config.py
index 878dc74d3..89ffabb85 100644
--- a/web/utils/config.py
+++ b/web/utils/config.py
@@ -62,10 +62,14 @@ def getGlobalVar():
     else:
         data['ipv6'] = ''
 
+    # 获取ROOT用户名
+    data['username'] = mw.M('users').where("id=?", (1,)).getField('name')
+
     # 获取未认证状态信息
     unauthorized_status = thisdb.getOption('unauthorized_status', default='0')
     data['unauthorized_status'] = getUnauthStatus(code=unauthorized_status)
     data['basic_auth'] = thisdb.getOptionByJson('basic_auth', default={'open':False})
+    data['two_step_verification'] = thisdb.getOptionByJson('two_step_verification', default={'open':False})
 
     # 服务器时间
     sformat = 'date +"%Y-%m-%d %H:%M:%S %Z %z"'
diff --git a/web/utils/site.py b/web/utils/site.py
index a9a5b0c24..0d76ec0ff 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -18,43 +18,56 @@ from admin import model
 
 import core.mw as mw
 
-def getPhpVersion():
-    phpVersions = ('00', '52', '53', '54', '55',
-                   '56', '70', '71', '72', '73',
-                   '74', '80', '81', '82', '83',
-                   '84')
-    data = []
-    for val in phpVersions:
-        tmp = {}
-        if val == '00':
-            tmp['version'] = '00'
-            tmp['name'] = '纯静态'
+
+class sites(object):
+    # lock
+    _instance_lock = threading.Lock()
+
+    @classmethod
+    def instance(cls, *args, **kwargs):
+        if not hasattr(sites, "_instance"):
+            with sites._instance_lock:
+                if not hasattr(sites, "_instance"):
+                    sites._instance = sites(*args, **kwargs)
+        return sites._instance
+
+
+    def getPhpVersion(self):
+        phpVersions = ('00', '52', '53', '54', '55',
+                       '56', '70', '71', '72', '73',
+                       '74', '80', '81', '82', '83',
+                       '84')
+        data = []
+        for val in phpVersions:
+            tmp = {}
+            if val == '00':
+                tmp['version'] = '00'
+                tmp['name'] = '纯静态'
+                data.append(tmp)
+
+            # 标准判断
+            checkPath = mw.getServerDir() + '/php/' + val + '/bin/php'
+            if os.path.exists(checkPath):
+                tmp['version'] = val
+                tmp['name'] = 'PHP-' + val
+                data.append(tmp)
+
+        # 其他PHP安装类型
+        conf_dir = mw.getServerDir() + "/web_conf/php/conf"
+        conf_list = os.listdir(conf_dir)
+        l = len(conf_list)
+        rep = r"enable-php-(.*?)\.conf"
+        for name in conf_list:
+            tmp = {}
+            try:
+                matchVer = re.search(rep, name).groups()[0]
+            except Exception as e:
+                continue
+
+            if matchVer in phpVersions:
+                continue
+
+            tmp['version'] = matchVer
+            tmp['name'] = 'PHP-' + matchVer
             data.append(tmp)
-
-        # 标准判断
-        checkPath = mw.getServerDir() + '/php/' + val + '/bin/php'
-        if os.path.exists(checkPath):
-            tmp['version'] = val
-            tmp['name'] = 'PHP-' + val
-            data.append(tmp)
-
-    # 其他PHP安装类型
-    conf_dir = mw.getServerDir() + "/web_conf/php/conf"
-    conf_list = os.listdir(conf_dir)
-    l = len(conf_list)
-    rep = r"enable-php-(.*?)\.conf"
-    for name in conf_list:
-        tmp = {}
-        try:
-            matchVer = re.search(rep, name).groups()[0]
-        except Exception as e:
-            continue
-
-        if matchVer in phpVersions:
-            continue
-
-        tmp['version'] = matchVer
-        tmp['name'] = 'PHP-' + matchVer
-        data.append(tmp)
-
-    return data
\ No newline at end of file
+        return data
\ No newline at end of file
diff --git a/web/utils/system/main.py b/web/utils/system/main.py
index f2a29203b..8ace24d77 100644
--- a/web/utils/system/main.py
+++ b/web/utils/system/main.py
@@ -105,12 +105,13 @@ def getSystemVersion():
 
 def getBootTime():
     # 取系统启动时间
-    uptime = mw.readFile('/proc/uptime')
-    if uptime == False:
+    if os.path.exists('/proc/uptime'):
+        uptime = mw.readFile('/proc/uptime')
+        run_time = uptime.split()[0]
+    else:
         start_time = psutil.boot_time()
         run_time = time.time() - start_time
-    else:
-        run_time = uptime.split()[0]
+        
     tStr = float(run_time)
     min = tStr / 60
     hours = min / 60

From accdb5834d8be41a5d665efeb11c577ff33f5571 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 6 Nov 2024 20:58:22 +0800
Subject: [PATCH 129/965] up

---
 web/admin/setting/temp_login.py |  55 ++----
 web/admin/setup/sql/default.sql |   4 +-
 web/admin/site/__init__.py      |  77 ++++----
 web/core/mw.py                  |  31 ++++
 web/static/app/site.js          |   4 +-
 web/thisdb/__init__.py          |   4 +
 web/thisdb/binding.py           |  37 ++++
 web/thisdb/domain.py            |  30 ++++
 web/thisdb/sites.py             |  43 ++++-
 web/thisdb/temp_login.py        |  50 +++++-
 web/thisdb/user.py              |   2 +-
 web/utils/site.py               | 303 +++++++++++++++++++++++++++++++-
 12 files changed, 556 insertions(+), 84 deletions(-)
 create mode 100644 web/thisdb/binding.py
 create mode 100644 web/thisdb/domain.py

diff --git a/web/admin/setting/temp_login.py b/web/admin/setting/temp_login.py
index 51f12a268..95156b579 100644
--- a/web/admin/setting/temp_login.py
+++ b/web/admin/setting/temp_login.py
@@ -23,6 +23,7 @@ from admin.user_login_check import panel_login_required
 
 import core.mw as mw
 import utils.config as utils_config
+import thisdb
 
 from .setting import blueprint
 
@@ -34,24 +35,11 @@ def get_temp_login():
     p = request.form.get('page', '1').strip()
     tojs = request.form.get('tojs', '').strip()
 
-    count = TempLogin.query.filter_by().count()
-    pagination = TempLogin.query.filter_by().order_by(TempLogin.expire.desc()).paginate(page=int(p), per_page=int(limit))
-  
-    rows = []
-    for item in pagination.items:
-        t = {}
-        t['id'] = item.id
-        t['salt'] = item.salt
-        t['state'] = item.state
-        t['expire'] = item.expire
-        t['login_time'] = item.login_time
-        t['login_addr'] = item.login_addr
-        t['add_time'] = item.add_time
-        rows.append(t)
+    info = thisdb.getTempLoginPage(int(p), int(limit))
 
     data = {}
-    data['data'] = rows
-    data['page'] = mw.getPage({'count':count,'tojs':'setTempAccessReq','p':p,'row':limit})
+    data['data'] = info['list']
+    data['page'] = mw.getPage({'count':info['count'],'tojs':'setTempAccessReq','p':p,'row':limit})
     return data
 
 @blueprint.route('/set_temp_login', endpoint='set_temp_login', methods=['POST'])
@@ -59,38 +47,27 @@ def get_temp_login():
 def set_temp_login():
     # if 'tmp_login_expire' in session:
     #     return mw.returnData(False, '没有权限')
+    
+
+    thisdb.clearTempLogin()
+
     start_time = int(time.time())
-    model.clearTempLogin()
+    expire = start_time+3600
+    
+    rand_str = mw.getRandomString(48)
+    token = mw.md5(rand_str)
 
-
-    token = mw.getRandomString(48)
-    salt = mw.getRandomString(12)
-
-    expire=start_time+3600
-    make_token = mw.md5(token + salt)
-    add_tl = TempLogin(
-        token=make_token,
-        salt=salt,
-        state=0,
-        login_time=0,
-        login_addr='',
-        expire=expire,
-        add_time=start_time)
-    r = db.session.add(add_tl)
-    db.session.commit()
-
-    if r is None:
+    r = thisdb.addTempLogin(token, expire)
+    if r > 0:
         mw.writeLog('面板设置', '生成临时连接,过期时间:{}'.format(mw.formatDate(times=expire)))
-        return {'status': True, 'msg': "临时连接已生成", 'token': make_token, 'expire': expire}
+        return {'status': True, 'msg': "临时连接已生成", 'token': token, 'expire': expire}
     return mw.returnData(False, '连接生成失败')
 
 @blueprint.route('/remove_temp_login', endpoint='remove_temp_login', methods=['POST'])
 @panel_login_required
 def remove_temp_login():
     tl_id = request.form.get('id', '10').strip()
-
-    r = TempLogin.query.filter(TempLogin.id == tl_id).delete()
-    db.session.commit()
+    r = thisdb.deleteTempLoginById(tl_id)
     if r > 0:
         mw.writeLog('面板设置', '删除临时登录连接')
         return mw.returnData(True, '删除成功')
diff --git a/web/admin/setup/sql/default.sql b/web/admin/setup/sql/default.sql
index ec3bc47d0..794ede180 100755
--- a/web/admin/setup/sql/default.sql
+++ b/web/admin/setup/sql/default.sql
@@ -12,9 +12,9 @@ CREATE TABLE IF NOT EXISTS `backup` (
 CREATE TABLE IF NOT EXISTS `binding` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `pid` INTEGER,
+  `port` INTEGER,
   `domain` TEXT,
   `path` TEXT,
-  `port` INTEGER,
   `add_time` TEXT
 );
 
@@ -49,7 +49,7 @@ CREATE TABLE IF NOT EXISTS `firewall` (
 
 ALTER TABLE `firewall` ADD COLUMN `protocol` TEXT DEFAULT 'tcp';
 
-INSERT INTO `firewall` (`id`, `port`, `protocol`, `ps`, `add_time`) VALUES
+INSERT INTO `firewall` (`id`, `port`, `protocol`, `ps`, `add_time`, `update_time`) VALUES
 (1, '80',  'tcp','网站默认端口', '0000-00-00 00:00:00','0000-00-00 00:00:00'),
 (2, '443', 'tcp/udp', 'HTTPS', '0000-00-00 00:00:00','0000-00-00 00:00:00');
 
diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index 3bdf5979d..7752645d5 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -17,6 +17,7 @@ from admin.model import Sites
 from admin.user_login_check import panel_login_required
 
 from utils.plugin import plugin as MwPlugin
+from utils.site import sites as MwSites
 import utils.site as site
 import core.mw as mw
 import thisdb
@@ -42,7 +43,7 @@ def list():
     data['page'] = mw.getPage({'count':info['count'],'tojs':'getWeb','p':p, 'row':limit})
     return data
 
-#添加站点
+# 添加站点
 @blueprint.route('/add', endpoint='add',methods=['POST'])
 @panel_login_required
 def add():
@@ -51,7 +52,15 @@ def add():
     path = request.form.get('path', '')
     version = request.form.get('version', '')
     port = request.form.get('port', '')
-    return []
+    return MwSites.instance().add(webname, port, ps, path, version)
+
+# 站点删除
+@blueprint.route('/delete', endpoint='delete',methods=['POST'])
+@panel_login_required
+def delete():
+    site_id = request.form.get('id', '')
+    path = request.form.get('path', '')
+    return MwSites.instance().delete(site_id, path)
 
 # 获取站点类型
 @blueprint.route('/get_site_types', endpoint='get_site_types',methods=['POST'])
@@ -87,9 +96,39 @@ def check_web_status():
 @blueprint.route('/get_php_version', endpoint='get_php_version',methods=['POST'])
 @panel_login_required
 def get_php_version():
-    return site.getPhpVersion()
+    return MwSites.instance().getPhpVersion()
 
 
+# 设置网站到期
+@blueprint.route('/set_end_date', endpoint='set_end_date',methods=['POST'])
+@panel_login_required
+def set_end_date():
+    site_id = request.form.get('id', '')
+    edate = request.form.get('edate', '')
+    return MwSites.instance().setEndDate(site_id, edate)
+
+
+# 设置网站备注
+@blueprint.route('/set_ps', endpoint='set_ps',methods=['POST'])
+@panel_login_required
+def set_ps():
+    site_id = request.form.get('id', '')
+    ps = request.form.get('ps', '')
+    return MwSites.instance().setPs(site_id, ps)
+
+
+# 设置默认网站信息
+@blueprint.route('/get_default_site', endpoint='get_default_site',methods=['POST'])
+@panel_login_required
+def get_default_site():
+    return MwSites.instance().getDefaultSite()
+
+@blueprint.route('/set_default_site', endpoint='set_default_site',methods=['POST'])
+@panel_login_required
+def set_default_site():
+    name = request.form.get('name', '')
+    return MwSites.instance().setDefaultSite(name)
+
 @blueprint.route('/get_cli_php_version', endpoint='get_cli_php_version',methods=['POST'])
 @panel_login_required
 def get_cli_php_version():
@@ -98,7 +137,7 @@ def get_cli_php_version():
         return mw.returnData(False, '未安装PHP,无法设置')
 
     php_bin = '/usr/bin/php'
-    php_versions = site.getPhpVersion()
+    php_versions = MwSites.instance().getPhpVersion()
     php_versions = php_versions[1:]
 
     if len(php_versions) < 1:
@@ -117,35 +156,7 @@ def get_cli_php_version():
 def set_cli_php_version():
     if mw.isAppleSystem():
         return mw.returnData(False, "开发机不可设置!")
-
     version = request.form.get('version', '')
-
-    php_bin = '/usr/bin/php'
-    php_bin_src = "/www/server/php/%s/bin/php" % version
-    php_ize = '/usr/bin/phpize'
-    php_ize_src = "/www/server/php/%s/bin/phpize" % version
-    php_fpm = '/usr/bin/php-fpm'
-    php_fpm_src = "/www/server/php/%s/sbin/php-fpm" % version
-    php_pecl = '/usr/bin/pecl'
-    php_pecl_src = "/www/server/php/%s/bin/pecl" % version
-    php_pear = '/usr/bin/pear'
-    php_pear_src = "/www/server/php/%s/bin/pear" % version
-    if not os.path.exists(php_bin_src):
-        return mw.returnData(False, '指定PHP版本未安装!')
-
-    is_chattr = mw.execShell('lsattr /usr|grep /usr/bin')[0].find('-i-')
-    if is_chattr != -1:
-        mw.execShell('chattr -i /usr/bin')
-    mw.execShell("rm -f " + php_bin + ' ' + php_ize + ' ' +
-                 php_fpm + ' ' + php_pecl + ' ' + php_pear)
-    mw.execShell("ln -sf %s %s" % (php_bin_src, php_bin))
-    mw.execShell("ln -sf %s %s" % (php_ize_src, php_ize))
-    mw.execShell("ln -sf %s %s" % (php_fpm_src, php_fpm))
-    mw.execShell("ln -sf %s %s" % (php_pecl_src, php_pecl))
-    mw.execShell("ln -sf %s %s" % (php_pear_src, php_pear))
-    if is_chattr != -1:
-        mw.execShell('chattr +i /usr/bin')
-    mw.writeLog('面板设置', '设置PHP-CLI版本为: %s' % version)
-    return mw.returnData(True, '设置成功!')
+    return MwSites.instance().setCliPhpVersion(version)
 
 
diff --git a/web/core/mw.py b/web/core/mw.py
index 603456371..c4c3e2450 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -879,6 +879,33 @@ def isRestart():
         return False
     return True
 
+def getAcmeDir():
+    acme = '/root/.acme.sh'
+    if isAppleSystem():
+        cmd = "who | sed -n '2, 1p' |awk '{print $1}'"
+        user = execShell(cmd)[0].strip()
+        acme = '/Users/' + user + '/.acme.sh'
+    if not os.path.exists(acme):
+        acme = '/.acme.sh'
+    return acme
+
+
+def getAcmeDomainDir(domain):
+    acme_dir = getAcmeDir()
+    acme_domain = acme_dir + '/' + domain
+    acme_domain_ecc = acme_domain + '_ecc'
+    if os.path.exists(acme_domain_ecc):
+        acme_domain = acme_domain_ecc
+    return acme_domain
+
+
+def fileNameCheck(filename):
+    f_strs = [';', '&', '<', '>']
+    for fs in f_strs:
+        if filename.find(fs) != -1:
+            return False
+    return True
+
 def triggerTask():
     isTask = getPanelDir() + '/logs/panel_task.lock'
     writeFile(isTask, 'True')
@@ -925,6 +952,10 @@ def checkWebConfig():
 def restartWeb():
     return opWeb("reload")
 
+def deleteFile(file):
+    if os.path.exists(file):
+        os.remove(file)
+
 def isInstalledWeb():
     path = getServerDir() + '/openresty/nginx/sbin/nginx'
     if os.path.exists(path):
diff --git a/web/static/app/site.js b/web/static/app/site.js
index 815774ad8..cf7e05ae7 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -72,14 +72,14 @@ $('#site_search').click(function(){
 			var idname = data.data[i].name.replace(/\./g,'_');
 			
 			body = "<tr><td><input type='checkbox' name='id' title='"+data.data[i].name+"' onclick='checkSelect();' value='" + data.data[i].id + "'></td>\
-					<td><a class='btlink webtips' href='javascript:;' onclick=\"webEdit(" + data.data[i].id + ",'" + data.data[i].name + "','" + data.data[i].edate + "','" + data.data[i].addtime + "')\" title='"+data.data[i].name+"'>" + shortwebname + "</td>\
+					<td><a class='btlink webtips' href='javascript:;' onclick=\"webEdit(" + data.data[i].id + ",'" + data.data[i].name + "','" + data.data[i].edate + "','" + data.data[i].add_time + "')\" title='"+data.data[i].name+"'>" + shortwebname + "</td>\
 					<td>" + status + "</td>\
 					<td>" + backup + "</td>\
 					<td><a class='btlink' title='打开目录"+data.data[i].path+"' href=\"javascript:openPath('"+data.data[i].path+"');\">" + shortpath + "</a></td>\
 					<td><a class='btlink setTimes' id='site_"+data.data[i].id+"' data-ids='"+data.data[i].id+"'>" + web_end_time + "</a></td>\
 					<td><a class='btlinkbed' href='javascript:;' data-id='"+data.data[i].id+"'>" + data.data[i].ps + "</a></td>\
 					<td style='text-align:right; color:#bbb'>\
-					<a href='javascript:;' class='btlink' onclick=\"webEdit(" + data.data[i].id + ",'" + data.data[i].name + "','" + data.data[i].edate + "','" + data.data[i].addtime + "')\">设置</a>\
+					<a href='javascript:;' class='btlink' onclick=\"webEdit(" + data.data[i].id + ",'" + data.data[i].name + "','" + data.data[i].edate + "','" + data.data[i].add_time + "')\">设置</a>\
                         | <a href='javascript:;' class='btlink' onclick=\"webDelete('" + data.data[i].id + "','" + data.data[i].name + "')\" title='删除站点'>删除</a>\
 					</td></tr>"
 			
diff --git a/web/thisdb/__init__.py b/web/thisdb/__init__.py
index 8958fa60f..3b6f2b8a4 100644
--- a/web/thisdb/__init__.py
+++ b/web/thisdb/__init__.py
@@ -11,8 +11,12 @@
 from .init import *
 from .option import *
 from .user import *
+
 from .sites import *
+from .domain import *
+
 from .tasks import *
 from .logs import *
 from .crontab import *
 from .firewall import *
+from .temp_login import *
diff --git a/web/thisdb/binding.py b/web/thisdb/binding.py
new file mode 100644
index 000000000..5b536b465
--- /dev/null
+++ b/web/thisdb/binding.py
@@ -0,0 +1,37 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import core.mw as mw
+
+__FIELD = 'id,pid,domain,port,path,add_time'
+
+def addBinding(pid, domain, port, path):
+    now_time = mw.getDateFromNow()
+    insert_data = {
+        'pid': pid,
+        'domain': domain,
+        'port':port,
+        'path':path,
+        'add_time': now_time,
+    }
+    return mw.M('binding').insert(insert_data)
+
+
+def getBindingListBySiteId(site_id):
+    task_list = mw.M('binding').where('pid=?', (site_id,)).field(__FIELD).select()
+    return task_list
+
+
+
+def deleteBindingId(domain_id):
+    return mw.M('binding').where("id=?", (domain_id,)).delete()
+
+def deleteBindingBySiteId(site_id):
+    return mw.M('binding').where("pid=?", (site_id,)).delete()
diff --git a/web/thisdb/domain.py b/web/thisdb/domain.py
new file mode 100644
index 000000000..ec7d40115
--- /dev/null
+++ b/web/thisdb/domain.py
@@ -0,0 +1,30 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import core.mw as mw
+
+__FIELD = 'id,pid,name,port,add_time'
+
+def addDomain(pid, name, port):
+    now_time = mw.getDateFromNow()
+    insert_data = {
+        'pid': pid,
+        'name': name,
+        'port':port,
+        'add_time': now_time,
+    }
+    return mw.M('domain').insert(insert_data)
+
+
+def deleteDomainId(domain_id):
+    return mw.M('domain').where("id=?", (domain_id,)).delete()
+
+def deleteDomainBySiteId(site_id):
+    return mw.M('domain').where("pid=?", (site_id,)).delete()
diff --git a/web/thisdb/sites.py b/web/thisdb/sites.py
index e20f30071..332f6b1a5 100644
--- a/web/thisdb/sites.py
+++ b/web/thisdb/sites.py
@@ -10,10 +10,35 @@
 
 import core.mw as mw
 
+__FIELD = 'id,name,path,status,ps,edate,type_id,add_time,update_time'
+
 def getSitesCount():
     return mw.M('sites').count()
 
 
+def getSitesById(site_id):
+    return mw.M('sites').field(__FIELD).where("id=?", (site_id,)).find()
+
+def addSites(name, path):
+    now_time = mw.getDateFromNow()
+    insert_data = {
+        'name': name,
+        'path': path,
+        'status': 1,
+        'ps':name,
+        'type_id':0,
+        'edate':'0000-00-00',
+        'add_time': now_time,
+        'update_time': now_time
+    }
+    return mw.M('sites').insert(insert_data)
+
+
+def isSitesExist(name):
+    if mw.M('sites').where("name=?", (name,)).count() > 0:
+        return True
+    return False
+
 def getSitesList(
     page:int | None = 1,
     size:int | None = 10,
@@ -29,7 +54,7 @@ def getSitesList(
         sql_where = " type_id=" + str(type_id)
 
 
-    dbM = dbC = mw.M('sites').field('id,name,path,status,ps,edate,type_id,add_time,update_time')
+    dbM = dbC = mw.M('sites').field(__FIELD)
 
     if sql_where != '':
         count = dbC.where(sql_where).count()
@@ -46,3 +71,19 @@ def getSitesList(
     data['count'] = count
     return data
 
+
+def deleteSitesById(site_id):
+    return mw.M('sites').where("id=?", (site_id,)).delete()
+
+def setSitesData(site_id,
+    edate: str | None = None,
+    ps: str | None = None,
+):
+    update_data = {}
+    if edate is not None:
+        update_data['edate'] = edate
+    if ps is not None:
+        update_data['ps'] = ps
+
+    return mw.M('sites').where('id=?',(site_id,)).update(update_data)
+
diff --git a/web/thisdb/temp_login.py b/web/thisdb/temp_login.py
index ab75c3923..b6ac4e840 100644
--- a/web/thisdb/temp_login.py
+++ b/web/thisdb/temp_login.py
@@ -10,19 +10,61 @@
 
 import time
 
-from admin.model import db, TempLogin
-
 import core.mw as mw
 
+__FIELD = 'id,token,salt,state,login_time,login_addr,logout_time,expire,add_time'
+
+def addTempLogin(
+    token:str | None = None,
+    expire:int | None = None
+):
+    if expire is None:
+        start_time = int(time.time())
+        expire=start_time+3600
+
+    if token is None:
+        salt = mw.getRandomString(12)
+        r = mw.getRandomString(48)
+        token = mw.md5(r + salt)
+    
+    now_time = mw.formatDate()
+    insert_data = {
+        'token':token,
+        'salt':'0',
+        'state':0,
+        'login_time':0,
+        'login_addr':'',
+        'expire':expire,
+        'add_time':now_time,
+    }
+
+    return mw.M('temp_login').insert(insert_data)
+
+def getTempLoginPage(
+    page: int | None = 1,
+    size: int | None = 10,
+):
+    start = (page - 1) * size
+    limit = str(start) + ',' + str(size)
+    tl_list = mw.M('temp_login').where('', ()).field(__FIELD).limit(limit).order('id desc').select()
+    count = mw.M('temp_login').where('', ()).count()
+
+    rdata = {}
+    rdata['list'] = tl_list
+    rdata['count'] = count
+    return rdata
+
 def getTempLoginByToken(token,
 ) -> None:
     '''
     获取用户信息通过用户名
     '''
-    field = 'id,addtime,expire,login_time,login_addr,state,add_time'
-    data = mw.M('temp_login').where('token=?', (token,)).field(field).order('id asc').select()
+    data = mw.M('temp_login').where('token=?', (token,)).field(__FIELD).order('id asc').find()
     return data
 
+def deleteTempLoginById(id) :
+    return mw.M('temp_login').where('id=?', (id,)).delete()
+
 def clearTempLogin()->bool:
     '''
     清空过期数据
diff --git a/web/thisdb/user.py b/web/thisdb/user.py
index ac94b222b..3cbaa4bc2 100644
--- a/web/thisdb/user.py
+++ b/web/thisdb/user.py
@@ -85,7 +85,7 @@ def getUserByRoot() -> None:
 
 def updateUserLoginTime():
     now_time = mw.formatDate()
-    mw.M('users').field(__field).where('id=?', (1,)).update({'login_time',now_time})
+    mw.M('users').field(__field).where('id=?', (1,)).update({'login_time':now_time})
     return True
 
 def setUserByRoot(
diff --git a/web/utils/site.py b/web/utils/site.py
index 0d76ec0ff..c8562459a 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -10,13 +10,14 @@
 
 import os
 import sys
+import re
 import json
+import time
 import threading
 import multiprocessing
 
-from admin import model
-
 import core.mw as mw
+import thisdb
 
 
 class sites(object):
@@ -31,6 +32,304 @@ class sites(object):
                     sites._instance = sites(*args, **kwargs)
         return sites._instance
 
+    def __init__(self):
+        # nginx conf
+        self.setupPath = mw.getServerDir() + '/web_conf'
+        self.logsPath = mw.getLogsDir()
+
+        self.vhostPath = vhost = self.setupPath + '/nginx/vhost'
+        if not os.path.exists(vhost):
+            mw.execShell("mkdir -p " + vhost + " && chmod -R 755 " + vhost)
+        self.rewritePath = rewrite = self.setupPath + '/nginx/rewrite'
+        if not os.path.exists(rewrite):
+            mw.execShell("mkdir -p " + rewrite + " && chmod -R 755 " + rewrite)
+
+        self.passPath = passwd = self.setupPath + '/nginx/pass'
+        if not os.path.exists(passwd):
+            mw.execShell("mkdir -p " + passwd + " && chmod -R 755 " + passwd)
+
+        self.redirectPath = redirect = self.setupPath + '/nginx/redirect'
+        if not os.path.exists(redirect):
+            mw.execShell("mkdir -p " + redirect +" && chmod -R 755 " + redirect)
+
+        self.proxyPath = proxy = self.setupPath + '/nginx/proxy'
+        if not os.path.exists(proxy):
+            mw.execShell("mkdir -p " + proxy + " && chmod -R 755 " + proxy)
+
+        # ssl conf
+        self.sslDir = self.setupPath + '/ssl'
+        self.sslLetsDir = self.setupPath + '/letsencrypt'
+        if not os.path.exists(self.sslLetsDir):
+            mw.execShell("mkdir -p " + self.sslLetsDir +" && chmod -R 755 " + self.sslLetsDir)
+
+    # 域名编码转换
+    def toPunycode(self, domain):
+        if sys.version_info[0] == 2:
+            domain = domain.encode('utf8')
+        tmp = domain.split('.')
+        newdomain = ''
+        for dkey in tmp:
+            # 匹配非ascii字符
+            match = re.search(u"[\x80-\xff]+", dkey)
+            if not match:
+                newdomain += dkey + '.'
+            else:
+                newdomain += 'xn--' + dkey.decode('utf-8').encode('punycode') + '.'
+        return newdomain[0:-1]
+
+    # 中文路径处理
+    def toPunycodePath(self, path):
+        if sys.version_info[0] == 2:
+            path = path.encode('utf-8')
+        if os.path.exists(path):
+            return path
+        match = re.search(u"[\x80-\xff]+", path)
+        if not match:
+            return path
+        npath = ''
+        for ph in path.split('/'):
+            npath += '/' + self.toPunycode(ph)
+        return npath.replace('//', '/')
+
+    def getHostConf(self, siteName):
+        return self.vhostPath + '/' + siteName + '.conf'
+
+    def getRewriteConf(self, siteName):
+        return self.rewritePath + '/' + siteName + '.conf'
+
+    def getRedirectDataPath(self, siteName):
+        return "{}/{}/data.json".format(self.redirectPath, siteName)
+
+    def getRedirectPath(self, siteName):
+        return "{}/{}".format(self.redirectPath, siteName)
+
+    def getProxyDataPath(self, siteName):
+        return "{}/{}/data.json".format(self.proxyPath, siteName)
+
+    def getProxyPath(self, siteName):
+        return "{}/{}".format(self.proxyPath, siteName)
+
+    def getDirBindRewrite(self, siteName, dirname):
+        return self.rewritePath + '/' + siteName + '_' + dirname + '.conf'
+
+    def getIndexConf(self):
+        return mw.getServerDir() + '/openresty/nginx/conf/nginx.conf'
+
+    # 路径处理
+    def getPath(self, path):
+        if path[-1] == '/':
+            return path[0:-1]
+        return path
+
+    def createRootDir(self, path):
+        autoInit = False
+        if not os.path.exists(path):
+            autoInit = True
+            os.makedirs(path)
+        if not mw.isAppleSystem():
+            mw.execShell('chown -R www:www ' + path)
+
+        if autoInit:
+            mw.writeFile(path + '/index.html', 'Work has started!!!')
+            mw.execShell('chmod -R 755 ' + path)
+
+    def add(self, webname, port, ps, path, version):
+        site_root_dir = mw.getWwwDir()
+        if site_root_dir == path.rstrip('/'):
+            return mw.returnData(False, '不要以网站根目录创建站点!')
+
+        print(webname, port, ps, path, version)
+        siteMenu = json.loads(webname)
+
+        self.siteName = self.toPunycode(siteMenu['domain'].strip().split(':')[0]).strip()
+        self.sitePath = self.toPunycodePath(self.getPath(path.replace(' ', '')))
+        self.sitePort = port.strip().replace(' ', '')
+        self.phpVersion = version
+
+        if thisdb.isSitesExist(self.siteName):
+            return mw.returnData(False, '您添加的站点[%s]已存在!' % self.siteName)
+
+        pid = thisdb.addSites(self.siteName, self.sitePath)
+        if pid < 1:
+            return mw.returnData(False, '添加失败!') 
+
+
+        self.createRootDir(self.sitePath)
+        self.nginxAddConf()
+
+        # 主域名配置
+        thisdb.addDomain(pid, self.siteName, self.sitePort)
+
+        # 绑定域名配置
+
+        # 添加更多域名
+        # for domain in siteMenu['domainlist']:
+        #     thisdb.addDomain(pid, self.siteName, self.sitePort)
+
+        mw.restartWeb()
+        # return mw.returnData(False, '开发中!')
+        return mw.returnData(True, '添加成功')
+
+
+    def deleteWSLogs(self, webname):
+        assLogPath = mw.getLogsDir() + '/' + webname + '.log'
+        errLogPath = mw.getLogsDir() + '/' + webname + '.error.log'
+        confFile = self.setupPath + '/nginx/vhost/' + webname + '.conf'
+        rewriteFile = self.setupPath + '/nginx/rewrite/' + webname + '.conf'
+        passFile = self.setupPath + '/nginx/pass/' + webname + '.conf'
+        keyPath = self.sslDir + webname + '/privkey.pem'
+        certPath = self.sslDir + webname + '/fullchain.pem'
+        logs = [assLogPath,
+                errLogPath,
+                confFile,
+                rewriteFile,
+                passFile,
+                keyPath,
+                certPath]
+        for i in logs:
+            mw.deleteFile(i)
+
+        # 重定向目录
+        redirectDir = self.setupPath + '/nginx/redirect/' + webname
+        if os.path.exists(redirectDir):
+            mw.execShell('rm -rf ' + redirectDir)
+        # 代理目录
+        proxyDir = self.setupPath + '/nginx/proxy/' + webname
+        if os.path.exists(proxyDir):
+            mw.execShell('rm -rf ' + proxyDir)
+
+    def delete(self, site_id, path):
+        info = thisdb.getSitesById(site_id)
+        webname = info['name']
+        self.deleteWSLogs(webname)
+
+        if path == '1':
+            rootPath = mw.getWwwDir() + '/' + webname
+            mw.execShell('rm -rf ' + rootPath)
+
+        # ssl
+        ssl_dir = self.sslDir + '/' + webname
+        if os.path.exists(ssl_dir):
+            mw.execShell('rm -rf ' + ssl_dir)
+
+        ssl_lets_dir = self.sslLetsDir + '/' + webname
+        if os.path.exists(ssl_lets_dir):
+            mw.execShell('rm -rf ' + ssl_lets_dir)
+
+        ssl_acme_dir = mw.getAcmeDir() + '/' + webname
+        if os.path.exists(ssl_acme_dir):
+            mw.execShell('rm -rf ' + ssl_acme_dir)
+
+        thisdb.deleteSitesById(site_id)
+        thisdb.deleteDomainBySiteId(site_id)
+
+        binding_list = thisdb.getBindingListBySiteId(site_id)
+        for x in binding_list:
+            tag = mw.getLogsDir() + "/" + webname + "_" + x['domain']
+            wlog = tag + ".log"
+            wlog_error = tag + ".error.log"
+
+            if os.path.exists(wlog):
+                mw.execShell('rm -rf ' + wlog)
+            if os.path.exists(wlog_error):
+                mw.execShell('rm -rf ' + wlog_error)
+
+        thisdb.deleteBindingBySiteId(site_id)
+        mw.restartWeb()
+        return mw.returnData(True, '站点【%s】删除成功!' % webname)
+
+    def nginxAddConf(self):
+        source_tpl = mw.getRunDir() + '/data/tpl/nginx.conf'
+        vhost_file = self.vhostPath + '/' + self.siteName + '.conf'
+        content = mw.readFile(source_tpl)
+
+        content = content.replace('{$PORT}', self.sitePort)
+        content = content.replace('{$SERVER_NAME}', self.siteName)
+        content = content.replace('{$ROOT_DIR}', self.sitePath)
+        content = content.replace('{$PHP_DIR}', self.setupPath + '/php')
+        content = content.replace('{$PHPVER}', self.phpVersion)
+        content = content.replace('{$OR_REWRITE}', self.rewritePath)
+        # content = content.replace('{$OR_REDIRECT}', self.redirectPath)
+        # content = content.replace('{$OR_PROXY}', self.proxyPath)
+
+        logsPath = mw.getLogsDir()
+        content = content.replace('{$LOGPATH}', logsPath)
+        mw.writeFile(vhost_file, content)
+
+    # 设置网站过期
+    def setEndDate(self, site_id, end_date):
+        info = thisdb.getSitesById(site_id)
+        thisdb.setSitesData(site_id, edate=end_date)
+        mw.writeLog('网站', '设置成功,站点【{1}】到期【{2}】后将自动停止!', (info['name'], end_date,))
+        return mw.returnData(True, '设置成功,站点到期后将自动停止!')
+
+    # 设置网站备注
+    def setPs(self, site_id, ps):
+        if thisdb.setSitesData(site_id, ps=ps):
+            return mw.returnData(True, '修改成功!')
+        return mw.returnData(False, '修改失败!')
+
+    # 获取默认站点
+    def getDefaultSite(self):
+        data = {}
+        data['sites'] = mw.M('sites').field('name').order('id desc').select()
+        data['default_site'] = thisdb.getOption('default_site', default='')
+        return mw.getJson(data)
+
+    def setDefaultSite(self, name):
+        # 清理旧的
+        default_site = thisdb.getOption('default_site', default='')
+        if default_site:
+            path = self.getHostConf(default_site)
+            if os.path.exists(path):
+                conf = mw.readFile(path)
+                rep = r"listen\s+80.+;"
+                conf = re.sub(rep, 'listen 80;', conf, 1)
+                rep = r"listen\s+443.+;"
+                conf = re.sub(rep, 'listen 443 ssl;', conf, 1)
+                mw.writeFile(path, conf)
+
+        path = self.getHostConf(name)
+        if os.path.exists(path):
+            conf = mw.readFile(path)
+            rep = r"listen\s+80\s*;"
+            conf = re.sub(rep, 'listen 80 default_server;', conf, 1)
+            rep = r"listen\s+443\s*ssl\s*\w*\s*;"
+            conf = re.sub(rep, 'listen 443 ssl default_server;', conf, 1)
+            mw.writeFile(path, conf)
+
+        thisdb.setOption('default_site', name)
+        mw.restartWeb()
+        return mw.returnJson(True, '设置成功!')
+
+    def setCliPhpVersion(self, version):
+        php_bin = '/usr/bin/php'
+        php_bin_src = "/www/server/php/%s/bin/php" % version
+        php_ize = '/usr/bin/phpize'
+        php_ize_src = "/www/server/php/%s/bin/phpize" % version
+        php_fpm = '/usr/bin/php-fpm'
+        php_fpm_src = "/www/server/php/%s/sbin/php-fpm" % version
+        php_pecl = '/usr/bin/pecl'
+        php_pecl_src = "/www/server/php/%s/bin/pecl" % version
+        php_pear = '/usr/bin/pear'
+        php_pear_src = "/www/server/php/%s/bin/pear" % version
+        if not os.path.exists(php_bin_src):
+            return mw.returnData(False, '指定PHP版本未安装!')
+
+        is_chattr = mw.execShell('lsattr /usr|grep /usr/bin')[0].find('-i-')
+        if is_chattr != -1:
+            mw.execShell('chattr -i /usr/bin')
+        mw.execShell("rm -f " + php_bin + ' ' + php_ize + ' ' + php_fpm + ' ' + php_pecl + ' ' + php_pear)
+        mw.execShell("ln -sf %s %s" % (php_bin_src, php_bin))
+        mw.execShell("ln -sf %s %s" % (php_ize_src, php_ize))
+        mw.execShell("ln -sf %s %s" % (php_fpm_src, php_fpm))
+        mw.execShell("ln -sf %s %s" % (php_pecl_src, php_pecl))
+        mw.execShell("ln -sf %s %s" % (php_pear_src, php_pear))
+        if is_chattr != -1:
+            mw.execShell('chattr +i /usr/bin')
+        mw.writeLog('面板设置', '设置PHP-CLI版本为: %s' % version)
+        return mw.returnData(True, '设置成功!')
+
 
     def getPhpVersion(self):
         phpVersions = ('00', '52', '53', '54', '55',

From e994cd80f11bb26bc0e65ba01c775e09549af19a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 7 Nov 2024 03:09:47 +0800
Subject: [PATCH 130/965] Update panel_tools.py

---
 panel_tools.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index cd2e3734f..ef4416085 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -23,9 +23,11 @@ web_dir = os.getcwd() + "/web"
 os.chdir(web_dir)
 sys.path.append(web_dir)
 
+from utils.firewall import firewall as MwFirewall
 import core.mw as mw
 import thisdb
 
+
 INIT_DIR = "/etc/rc.d/init.d"
 if mw.isAppleSystem():
     INIT_DIR = mw.getPanelDir() + "/scripts/init.d"
@@ -98,10 +100,9 @@ def mwcli(mw_input=0):
         in_port = mw_input_cmd("请输入新的面板端口：")
         in_port_int = int(in_port.strip())
         if in_port_int < 65536 and in_port_int > 0:
-            import firewall_api
-            firewall_api.firewall_api().addAcceptPortArgs(
-                in_port, 'WEB面板[TOOLS修改]', 'port')
-            mw.writeFile('data/port.pl', in_port)
+            MwFirewall.instance().addAcceptPort(in_port, 'WEB面板[TOOLS修改]', 'port')
+            panel_port = mw.getPanelDir() + '/data/port.pl'
+            mw.writeFile(panel_port, in_port)
             os.system(INIT_CMD + " restart_panel")
             os.system(INIT_CMD + " default")
         else:
@@ -181,7 +182,7 @@ def mwcli(mw_input=0):
         if not run_cmd:
             mw.echoInfo("未检测到防火墙!")
     elif mw_input == 100:
-        php_conf = 'plugins/php/info.json'
+        php_conf = mw.getPanelDir() + '/plugins/php/info.json'
         if os.path.exists(php_conf):
             cont = mw.readFile(php_conf)
             cont = re.sub("\"53\"", "\"52\",\"53\"", cont)
@@ -189,7 +190,7 @@ def mwcli(mw_input=0):
             mw.writeFile(php_conf, cont)
             mw.echoInfo("执行PHP52显示成功!")
     elif mw_input == 101:
-        php_conf = 'plugins/php/info.json'
+        php_conf = mw.getPanelDir() + '/plugins/php/info.json'
         if os.path.exists(php_conf):
             cont = mw.readFile(php_conf)
             cont = re.sub("\"52\",", "", cont)
@@ -203,7 +204,7 @@ def mwcli(mw_input=0):
 
 
 def open_ssh_port():
-    import firewall_api
+    
     find_ssh_port_cmd = "cat /etc/ssh/sshd_config | grep '^Port \\d*' | tail -1"
     cmd_data = mw.execShell(find_ssh_port_cmd)
     ssh_port = cmd_data[0].replace("Port ", '').strip()
@@ -211,13 +212,13 @@ def open_ssh_port():
         ssh_port = '22'
 
     print("|-SSH端口: "+ str(ssh_port))
-    firewall_api.firewall_api().addAcceptPortArgs(ssh_port, 'SSH远程管理服务', 'port')
+    MwFirewall.instance().addAcceptPort(ssh_port, 'SSH远程管理服务', 'port')
     return True
 
 
 def set_panel_pwd(password, ncli=False):
-    info = model.getUserByRoot()
-    model.setUserByRoot(password=password)
+    info = thisdb.getUserByRoot()
+    thisdb.setUserByRoot(password=password)
     if ncli:
         print("|-username: " + info['name'])
         print("|-password: " + password)

From 881facdfa87fd6688cd30abeceff4ca0bfec8b5e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 7 Nov 2024 03:50:50 +0800
Subject: [PATCH 131/965] update

---
 web/admin/site/__init__.py | 33 ++++++++++++++++++++++++++++++
 web/thisdb/__init__.py     |  1 +
 web/thisdb/domain.py       |  3 +++
 web/utils/site.py          | 41 +++++++++++++++++++++++++++++++++++++-
 4 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index 7752645d5..9695c359c 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -76,6 +76,31 @@ def get_root_dir():
     data['dir'] = mw.getWwwDir()
     return data
 
+# 获取站点配置
+@blueprint.route('/get_host_conf', endpoint='get_host_conf',methods=['POST'])
+@panel_login_required
+def get_host_conf():
+    siteName = request.form.get('siteName', '')      
+    host = MwSites.instance().getHostConf(siteName)
+    return {'host': host}
+
+
+# 获取站点PHP版本
+@blueprint.route('/get_site_php_version', endpoint='get_site_php_version',methods=['POST'])
+@panel_login_required
+def get_site_php_version():
+    siteName = request.form.get('siteName', '')      
+    return MwSites.instance().getSitePhpVersion(siteName)
+
+
+# 设置站点PHP版本
+@blueprint.route('/set_php_version', endpoint='set_php_version',methods=['POST'])
+@panel_login_required
+def set_php_version():
+    siteName = request.form.get('siteName', '')
+    version = request.form.get('version', '') 
+    return MwSites.instance().setPhpVersion(siteName,version)
+
 # 检查OpenResty安装/启动状态
 @blueprint.route('/check_web_status', endpoint='check_web_status',methods=['POST'])
 @panel_login_required
@@ -123,6 +148,14 @@ def set_ps():
 def get_default_site():
     return MwSites.instance().getDefaultSite()
 
+# 站点删除
+@blueprint.route('/get_domain', endpoint='get_domain',methods=['POST'])
+@panel_login_required
+def get_domain():
+    site_id = request.form.get('id', '')
+    return MwSites.instance().getDomain(site_id)
+
+
 @blueprint.route('/set_default_site', endpoint='set_default_site',methods=['POST'])
 @panel_login_required
 def set_default_site():
diff --git a/web/thisdb/__init__.py b/web/thisdb/__init__.py
index 3b6f2b8a4..451473e59 100644
--- a/web/thisdb/__init__.py
+++ b/web/thisdb/__init__.py
@@ -14,6 +14,7 @@ from .user import *
 
 from .sites import *
 from .domain import *
+from .binding import *
 
 from .tasks import *
 from .logs import *
diff --git a/web/thisdb/domain.py b/web/thisdb/domain.py
index ec7d40115..0bb9ef126 100644
--- a/web/thisdb/domain.py
+++ b/web/thisdb/domain.py
@@ -22,6 +22,9 @@ def addDomain(pid, name, port):
     }
     return mw.M('domain').insert(insert_data)
 
+def getDomainByPid(pid):
+    return mw.M('domain').where("pid=?", (pid,)).field(__FIELD).select()
+
 
 def deleteDomainId(domain_id):
     return mw.M('domain').where("id=?", (domain_id,)).delete()
diff --git a/web/utils/site.py b/web/utils/site.py
index c8562459a..c66e94c21 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -200,6 +200,7 @@ class sites(object):
 
     def delete(self, site_id, path):
         info = thisdb.getSitesById(site_id)
+        print(info)
         webname = info['name']
         self.deleteWSLogs(webname)
 
@@ -239,7 +240,8 @@ class sites(object):
         return mw.returnData(True, '站点【%s】删除成功!' % webname)
 
     def nginxAddConf(self):
-        source_tpl = mw.getRunDir() + '/data/tpl/nginx.conf'
+        source_tpl = mw.getPanelDir() + '/data/tpl/nginx.conf'
+        print(source_tpl)
         vhost_file = self.vhostPath + '/' + self.siteName + '.conf'
         content = mw.readFile(source_tpl)
 
@@ -276,6 +278,43 @@ class sites(object):
         data['default_site'] = thisdb.getOption('default_site', default='')
         return mw.getJson(data)
 
+
+    # 获取域名列表
+    def getDomain(self, pid):
+        return thisdb.getDomainByPid(pid)
+
+
+    def getSitePhpVersion(self, siteName):
+        conf = mw.readFile(self.getHostConf(siteName))
+        rep = r"enable-php-(.*)\.conf"
+        find_php_cnf = re.search(rep, conf)
+
+        def_pver = '00'
+        if find_php_cnf:
+            tmp = find_php_cnf.groups()
+            def_pver = tmp[0]
+            
+        data = {}
+        data['phpversion'] = def_pver
+        return data
+
+
+    def setPhpVersion(self, siteName, version):
+        # nginx
+        file = self.getHostConf(siteName)
+        conf = mw.readFile(file)
+        if conf:
+            rep = r"enable-php-(.*)\.conf"
+            tmp = re.search(rep, conf).group()
+            conf = conf.replace(tmp, 'enable-php-' + version + '.conf')
+            mw.writeFile(file, conf)
+
+        msg = mw.getInfo('成功切换网站[{1}]的PHP版本为PHP-{2}', (siteName, version))
+        mw.writeLog("网站管理", msg)
+        mw.restartWeb()
+        return mw.returnJson(True, msg)
+
+
     def setDefaultSite(self, name):
         # 清理旧的
         default_site = thisdb.getOption('default_site', default='')

From 8609033d37cdfd45cc02123d9314a97ac0840f26 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 7 Nov 2024 03:53:09 +0800
Subject: [PATCH 132/965] Update binding.py

---
 web/thisdb/binding.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/thisdb/binding.py b/web/thisdb/binding.py
index 5b536b465..ea968812d 100644
--- a/web/thisdb/binding.py
+++ b/web/thisdb/binding.py
@@ -10,6 +10,8 @@
 
 import core.mw as mw
 
+# 站点-子目录绑定
+
 __FIELD = 'id,pid,domain,port,path,add_time'
 
 def addBinding(pid, domain, port, path):

From 35c42d94c6b3089989c95b888c45a58087929831 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 7 Nov 2024 03:54:37 +0800
Subject: [PATCH 133/965] Update site.py

---
 web/utils/site.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index c66e94c21..af7b00f3d 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -262,7 +262,7 @@ class sites(object):
     def setEndDate(self, site_id, end_date):
         info = thisdb.getSitesById(site_id)
         thisdb.setSitesData(site_id, edate=end_date)
-        mw.writeLog('网站', '设置成功,站点【{1}】到期【{2}】后将自动停止!', (info['name'], end_date,))
+        mw.writeLog('网站管理', '设置成功,站点【{1}】到期【{2}】后将自动停止!', (info['name'], end_date,))
         return mw.returnData(True, '设置成功,站点到期后将自动停止!')
 
     # 设置网站备注
@@ -276,8 +276,7 @@ class sites(object):
         data = {}
         data['sites'] = mw.M('sites').field('name').order('id desc').select()
         data['default_site'] = thisdb.getOption('default_site', default='')
-        return mw.getJson(data)
-
+        return data
 
     # 获取域名列表
     def getDomain(self, pid):

From 1b4785ec527a50e3668fbf387b498d66f1a2d02f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 7 Nov 2024 03:54:48 +0800
Subject: [PATCH 134/965] Update site.py

---
 web/utils/site.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index af7b00f3d..a7c60fe0b 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -311,7 +311,7 @@ class sites(object):
         msg = mw.getInfo('成功切换网站[{1}]的PHP版本为PHP-{2}', (siteName, version))
         mw.writeLog("网站管理", msg)
         mw.restartWeb()
-        return mw.returnJson(True, msg)
+        return mw.returnData(True, msg)
 
 
     def setDefaultSite(self, name):

From fa614fcf8821277d6f3f86435c2d5c4df317e528 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 7 Nov 2024 03:55:16 +0800
Subject: [PATCH 135/965] Update site.py

---
 web/utils/site.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index a7c60fe0b..4636a6381 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -338,7 +338,7 @@ class sites(object):
 
         thisdb.setOption('default_site', name)
         mw.restartWeb()
-        return mw.returnJson(True, '设置成功!')
+        return mw.returnData(True, '设置成功!')
 
     def setCliPhpVersion(self, version):
         php_bin = '/usr/bin/php'

From 43420b7c3876a4232f62f32331eefaa57af03d99 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 8 Nov 2024 18:15:31 +0800
Subject: [PATCH 136/965] update

---
 web/admin/setting/__init__.py      |  1 +
 web/admin/setting/notify_email.py  | 79 ++++++++++++++++++++++++++++++
 web/admin/setup/option.py          |  4 ++
 web/static/app/config.js           | 27 +++++-----
 web/templates/default/setting.html |  2 +-
 web/utils/config.py                |  4 ++
 6 files changed, 102 insertions(+), 15 deletions(-)
 create mode 100644 web/admin/setting/notify_email.py

diff --git a/web/admin/setting/__init__.py b/web/admin/setting/__init__.py
index adfb25a3e..c516d49bf 100644
--- a/web/admin/setting/__init__.py
+++ b/web/admin/setting/__init__.py
@@ -12,6 +12,7 @@ from .setting import *
 from .temp_login import *
 from .timezone import *
 from .secondary_verifiy import *
+from .notify_email import *
 
 
 
diff --git a/web/admin/setting/notify_email.py b/web/admin/setting/notify_email.py
new file mode 100644
index 000000000..26437672e
--- /dev/null
+++ b/web/admin/setting/notify_email.py
@@ -0,0 +1,79 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import re
+import json
+import os
+import time
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin import session
+from admin.user_login_check import panel_login_required
+
+import core.mw as mw
+import utils.config as utils_config
+
+from .setting import blueprint
+import thisdb
+
+# 获取邮件信息
+@blueprint.route('/get_notify_email', endpoint='get_notify_email', methods=['POST'])
+@panel_login_required
+def get_notify_email():
+    notify_email = thisdb.getOptionByJson('notify_email', default={'open':False}, type='notify')
+
+    decrypt_data = mw.deDoubleCrypt('email', notify_email['cfg'])
+    notify_email['email'] =  json.loads(decrypt_data)
+    return mw.returnData(True,'ok',notify_email)
+
+
+# 设置邮件信息
+@blueprint.route('/set_notify_email', endpoint='set_notify_email', methods=['POST'])
+@panel_login_required
+def set_notify_email():
+    tag = request.form.get('tag', '').strip()
+    data = request.form.get('data', '').strip()
+
+    crypt_data = mw.enDoubleCrypt(tag, data)
+    
+    notify_email = thisdb.getOptionByJson('notify_email', default={'open':False}, type='notify')
+    notify_email['cfg'] = crypt_data
+
+    thisdb.setOption('notify_email', json.dumps(notify_email), type='notify')
+    return mw.returnData(True,'设置成功')
+
+
+# 设置邮件测试
+@blueprint.route('/set_notify_email_test', endpoint='set_notify_email_test', methods=['POST'])
+@panel_login_required
+def set_notify_email_test():
+    return mw.returnData(True,'设置成功')
+
+
+# 切换邮件开关
+@blueprint.route('/set_notify_email_enable', endpoint='set_notify_email_enable', methods=['POST'])
+@panel_login_required
+def set_notify_email_enable():
+    tag = request.form.get('tag', '').strip()
+    data = request.form.get('data', '').strip()
+
+    notify_email = thisdb.getOptionByJson('notify_email', default={'open':False}, type='notify')
+
+    if notify_email['open']:
+        op_action = '关闭'
+        notify_email['open'] = False
+    else:
+        op_action = '开启'
+        notify_email['open'] = True
+
+    thisdb.setOption('notify_email', json.dumps(notify_email), type='notify')
+    return mw.returnData(True, op_action+'成功')
\ No newline at end of file
diff --git a/web/admin/setup/option.py b/web/admin/setup/option.py
index 9a433961e..8a3439d0d 100644
--- a/web/admin/setup/option.py
+++ b/web/admin/setup/option.py
@@ -57,5 +57,9 @@ def init_option():
     thisdb.setOption('backup_path', mw.getFatherDir()+'/backup')
     # 默认站点目录
     thisdb.setOption('site_path', mw.getFatherDir()+'/wwwroot')
+
+
+    # 邮件通知
+    thisdb.setOption('notify_email', json.dumps({'open':False}), type='notify')
     
     return True
\ No newline at end of file
diff --git a/web/static/app/config.js b/web/static/app/config.js
index 542437619..c8594eaff 100755
--- a/web/static/app/config.js
+++ b/web/static/app/config.js
@@ -543,7 +543,7 @@ function setPanelSSL(){
 function setNotifyApi(tag, obj){
 	var enable = $(obj).prop("checked");
 	// console.log(tag,obj,enable);
-	$.post('/setting/set_notify_enable', {'tag':tag, 'enable':enable},function(rdata){
+	$.post('/setting/set_notify_email_enable', {'tag':tag, 'enable':enable},function(rdata){
 		showMsg(rdata.msg, function(){
 			if (rdata.status){}
 		} ,{icon:rdata.status?1:2}, 1000);
@@ -637,7 +637,7 @@ function getTgbot(){
 
 function getEmailCfg(){
 	var loadT = layer.msg('正在获取邮件配置信息...',{icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/setting/get_notify',{},function(data){
+	$.post('/setting/get_notify_email',{},function(data){
 		layer.close(loadT);
 
 		var smtp_host = 'smtp.163.com';
@@ -651,14 +651,13 @@ function getEmailCfg(){
 
 		if (data.status){
 			if (typeof(data['data']['email']) !='undefined'){
-				smtp_host = data['data']['email']['data']['smtp_host'];
-				smtp_port = data['data']['email']['data']['smtp_port'];
-				username = data['data']['email']['data']['username'];
-				password = data['data']['email']['data']['password'];
-				to_mail_addr = data['data']['email']['data']['to_mail_addr'];
+				smtp_host = data['data']['email']['smtp_host'];
+				smtp_port = data['data']['email']['smtp_port'];
+				username = data['data']['email']['username'];
+				password = data['data']['email']['password'];
+				to_mail_addr = data['data']['email']['to_mail_addr'];
 
-
-				var smtp_ssl = data['data']['email']['data']['smtp_ssl'];
+				var smtp_ssl = data['data']['email']['smtp_ssl'];
 				if (smtp_ssl == 'ssl'){
 					smtp_ssl_no = '';
 					smtp_ssl_yes = 'checked';
@@ -742,13 +741,13 @@ function getEmailCfg(){
 					return false;
 				}
 
-				$.post('/config/set_notify',{'tag':'email', 'data':JSON.stringify(pdata)},function(rdata){
+				$.post('/setting/set_notify_email',{'tag':'email', 'data':JSON.stringify(pdata)},function(rdata){
 					showMsg(rdata.msg, function(){
 						if (rdata.status){
 							layer.close(index);
 						}
 					},{icon:rdata.status?1:2},2000);
-				});
+				},'json');
 			},
 
 			btn3:function(index){
@@ -791,17 +790,17 @@ function getEmailCfg(){
 					layer.msg('验证测试不能为空!', {icon:2});
 					return false;
 				}
-				$.post('/config/set_notify_test',{'tag':'email', 'data':JSON.stringify(pdata)},function(rdata){
+				$.post('/setting/set_notify_email_test',{'tag':'email', 'data':JSON.stringify(pdata)},function(rdata){
 					showMsg(rdata.msg, function(){
 						if (rdata.status){
 							layer.close(index);
 						}
 					},{icon:rdata.status?1:2},2000);
-				});
+				},'json');
 				return false;
 			}
 		});
-	});
+	},'json');
 }
 
 function getPanelSSL(){
diff --git a/web/templates/default/setting.html b/web/templates/default/setting.html
index 588d1eeb0..1e908c07d 100755
--- a/web/templates/default/setting.html
+++ b/web/templates/default/setting.html
@@ -172,7 +172,7 @@
 
 				<p class="mtb15">
 					<span class="set-tit text-right" title="绑定账号" style="float: left;">邮件通知</span>
-						<input id="cfg_email" name="cfg_email" onclick="setNotifyApi('email',this)" class="btswitch btswitch-ios" type="checkbox" {{data['notify_email_enable']}}>
+						<input id="cfg_email" name="cfg_email" onclick="setNotifyApi('email',this)" class="btswitch btswitch-ios" type="checkbox" {% if data['notify_email']['open'] %}checked{% endif %}>
 						<label class="btswitch-btn ml5" for="cfg_email" style="float: left;margin-top:4px;"></label>
 	                <button ype="button" class="btn btn-default btn-xs panel_api_btn" style="vertical-align: middle; margin-left: 10px" onclick="getEmailCfg();">邮件配置</button>
 					<span class="set-info c7">邮件通知</span>
diff --git a/web/utils/config.py b/web/utils/config.py
index 89ffabb85..5d6737b2d 100644
--- a/web/utils/config.py
+++ b/web/utils/config.py
@@ -78,5 +78,9 @@ def getGlobalVar():
 
     data['hook_menu'] = thisdb.getOptionByJson('hook_menu',type='hook',default=[])
     data['hook_global_static'] = thisdb.getOptionByJson('hook_global_static',type='hook',default=[])
+
+
+    # 邮件通知设置
+    data['notify_email'] = thisdb.getOptionByJson('notify_email', default={'open':False}, type='notify')
     
     return data
\ No newline at end of file

From d5a8efff0e2f2e9c8a5728b27b610194f76d0e70 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 8 Nov 2024 18:22:01 +0800
Subject: [PATCH 137/965] update

---
 web/admin/setting/notify_email.py |   8 +-
 web/core/mw.py                    | 168 ++++++++++++++++++++++++++++++
 web/utils/email.py                |  43 ++++++++
 3 files changed, 218 insertions(+), 1 deletion(-)
 create mode 100644 web/utils/email.py

diff --git a/web/admin/setting/notify_email.py b/web/admin/setting/notify_email.py
index 26437672e..a71bceb10 100644
--- a/web/admin/setting/notify_email.py
+++ b/web/admin/setting/notify_email.py
@@ -56,8 +56,14 @@ def set_notify_email():
 @blueprint.route('/set_notify_email_test', endpoint='set_notify_email_test', methods=['POST'])
 @panel_login_required
 def set_notify_email_test():
-    return mw.returnData(True,'设置成功')
+    tag = request.form.get('tag', '').strip()
+    tag_data = request.form.get('data', '').strip()
 
+    data = json.loads(tag_data)
+    test_pass = mw.emailNotifyTest(data)
+    if test_pass:
+        return mw.returnData(True, '验证成功')
+    return mw.returnData(False, '验证失败')
 
 # 切换邮件开关
 @blueprint.route('/set_notify_email_enable', endpoint='set_notify_email_enable', methods=['POST'])
diff --git a/web/core/mw.py b/web/core/mw.py
index c4c3e2450..deab5a480 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -1106,6 +1106,174 @@ def getMyORM():
 # 数据库 START
 # ---------------------------------------------------------------------------------
 
+##################### notify  start #########################################
+
+
+def initNotifyConfig():
+    p = getNotifyPath()
+    if not os.path.exists(p):
+        writeFile(p, '{}')
+    return True
+
+
+def getNotifyPath():
+    path = 'data/notify.json'
+    return path
+
+
+def getNotifyData(is_parse=False):
+    initNotifyConfig()
+    notify_file = getNotifyPath()
+    notify_data = readFile(notify_file)
+
+    data = json.loads(notify_data)
+
+    if is_parse:
+        tag_list = ['tgbot', 'email']
+        for t in tag_list:
+            if t in data and 'cfg' in data[t]:
+                data[t]['data'] = json.loads(deDoubleCrypt(t, data[t]['cfg']))
+    return data
+
+
+def writeNotify(data):
+    p = getNotifyPath()
+    return writeFile(p, json.dumps(data))
+
+
+def tgbotNotifyChatID():
+    data = getNotifyData(True)
+    if 'tgbot' in data and 'enable' in data['tgbot']:
+        if data['tgbot']['enable']:
+            t = data['tgbot']['data']
+            return t['chat_id']
+    return ''
+
+
+def tgbotNotifyObject():
+    data = getNotifyData(True)
+    if 'tgbot' in data and 'enable' in data['tgbot']:
+        if data['tgbot']['enable']:
+            t = data['tgbot']['data']
+            import telebot
+            bot = telebot.TeleBot(app_token)
+            return True, bot
+    return False, None
+
+
+def tgbotNotifyMessage(app_token, chat_id, msg):
+    import telebot
+    bot = telebot.TeleBot(app_token)
+    try:
+        data = bot.send_message(chat_id, msg)
+        return True
+    except Exception as e:
+        writeFileLog(str(e))
+    return False
+
+
+def tgbotNotifyHttpPost(app_token, chat_id, msg):
+    try:
+        url = 'https://api.telegram.org/bot' + app_token + '/sendMessage'
+        post_data = {
+            'chat_id': chat_id,
+            'text': msg,
+        }
+        rdata = httpPost(url, post_data)
+        return True
+    except Exception as e:
+        writeFileLog(str(e))
+    return False
+
+
+def tgbotNotifyTest(app_token, chat_id):
+    msg = 'MW-通知验证测试OK'
+    return tgbotNotifyHttpPost(app_token, chat_id, msg)
+
+
+def emailNotifyMessage(data):
+    '''
+    邮件通知
+    '''
+    import utils.email as email
+    try:
+        if data['smtp_ssl'] == 'ssl':
+            email.sendSSL(data['smtp_host'], data['smtp_port'],
+                           data['username'], data['password'],
+                           data['to_mail_addr'], data['subject'], data['content'])
+        else:
+            email.send(data['smtp_host'], data['smtp_port'],
+                        data['username'], data['password'],
+                        data['to_mail_addr'], data['subject'], data['content'])
+        return True
+    except Exception as e:
+        print(getTracebackInfo())
+    return False
+
+
+def emailNotifyTest(data):
+    # print(data)
+    data['subject'] = 'MW通知测试'
+    data['content'] = data['mail_test']
+    return emailNotifyMessage(data)
+
+
+def notifyMessageTry(msg, stype='common', trigger_time=300, is_write_log=True):
+
+    lock_file = getPanelTmp() + '/notify_lock.json'
+    if not os.path.exists(lock_file):
+        writeFile(lock_file, '{}')
+
+    lock_data = json.loads(readFile(lock_file))
+    if stype in lock_data:
+        diff_time = time.time() - lock_data[stype]['do_time']
+        if diff_time >= trigger_time:
+            lock_data[stype]['do_time'] = time.time()
+        else:
+            return False
+    else:
+        lock_data[stype] = {'do_time': time.time()}
+
+    writeFile(lock_file, json.dumps(lock_data))
+
+    if is_write_log:
+        writeLog("通知管理[" + stype + "]", msg)
+
+    data = getNotifyData(True)
+    # tag_list = ['tgbot', 'email']
+    # tagbot
+    do_notify = False
+    if 'tgbot' in data and 'enable' in data['tgbot']:
+        if data['tgbot']['enable']:
+            t = data['tgbot']['data']
+            i = sys.version_info
+
+            # telebot 在python小于3.7无法使用
+            if i[0] < 3 or i[1] < 7:
+                do_notify = tgbotNotifyHttpPost(
+                    t['app_token'], t['chat_id'], msg)
+            else:
+                do_notify = tgbotNotifyMessage(
+                    t['app_token'], t['chat_id'], msg)
+
+    if 'email' in data and 'enable' in data['email']:
+        if data['email']['enable']:
+            t = data['email']['data']
+            t['subject'] = 'MW通知'
+            t['content'] = msg
+            do_notify = emailNotifyMessage(t)
+    return do_notify
+
+
+def notifyMessage(msg, stype='common', trigger_time=300, is_write_log=True):
+    try:
+        return notifyMessageTry(msg, stype, trigger_time, is_write_log)
+    except Exception as e:
+        writeFileLog(getTracebackInfo())
+        return False
+
+
+##################### notify  end #########################################
 
 # ---------------------------------------------------------------------------------
 # 打印相关 START
diff --git a/web/utils/email.py b/web/utils/email.py
new file mode 100644
index 000000000..6ba7b62d5
--- /dev/null
+++ b/web/utils/email.py
@@ -0,0 +1,43 @@
+# coding: utf-8
+
+import smtplib
+
+from email import encoders
+from email.header import Header
+from email.mime.text import MIMEText
+from email.utils import parseaddr, formataddr
+
+
+def _format_addr(s):
+    name, addr = parseaddr(s)
+    return formataddr((Header(name, 'utf-8').encode(), addr))
+
+
+def send(smtp_host, smtp_port, username, password, to_mail, subject, content):
+
+    smtp = smtplib.SMTP()
+    smtp.connect(smtp_host, port=smtp_port)
+    smtp.login(user=username, password=password)
+
+    msg = MIMEText(content, 'plain', 'utf-8')
+    msg['From'] = _format_addr(username)
+    msg['To'] = _format_addr(to_mail)
+    msg['Subject'] = Header(subject, 'utf-8').encode()
+
+    smtp.sendmail(from_addr=username, to_addrs=to_mail, msg=msg.as_string())
+    return True
+
+
+def sendSSL(smtp_host, smtp_port, username, password, to_mail, subject, content):
+
+    smtp = smtplib.SMTP_SSL(smtp_host, port=smtp_port)
+    smtp.login(user=username, password=password)
+
+    msg = MIMEText(content, 'plain', 'utf-8')
+    msg['From'] = _format_addr(username)
+    msg['To'] = _format_addr(to_mail)
+    msg['Subject'] = Header(subject, 'utf-8').encode()
+
+    smtp.sendmail(from_addr=username, to_addrs=to_mail, msg=msg.as_string())
+    smtp.quit()
+    return True

From 8f1ec01b585d5d622a06c68ccda5b394222d8f59 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 8 Nov 2024 18:26:46 +0800
Subject: [PATCH 138/965] update

---
 web/admin/setting/notify_email.py | 4 ++--
 web/core/mw.py                    | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/web/admin/setting/notify_email.py b/web/admin/setting/notify_email.py
index a71bceb10..ce38e1cb4 100644
--- a/web/admin/setting/notify_email.py
+++ b/web/admin/setting/notify_email.py
@@ -61,9 +61,9 @@ def set_notify_email_test():
 
     data = json.loads(tag_data)
     test_pass = mw.emailNotifyTest(data)
-    if test_pass:
+    if test_pass == True:
         return mw.returnData(True, '验证成功')
-    return mw.returnData(False, '验证失败')
+    return mw.returnData(False, '验证失败:'+test_pass)
 
 # 切换邮件开关
 @blueprint.route('/set_notify_email_enable', endpoint='set_notify_email_enable', methods=['POST'])
diff --git a/web/core/mw.py b/web/core/mw.py
index deab5a480..3dc278889 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -1198,16 +1198,19 @@ def emailNotifyMessage(data):
     import utils.email as email
     try:
         if data['smtp_ssl'] == 'ssl':
-            email.sendSSL(data['smtp_host'], data['smtp_port'],
+            r = email.sendSSL(data['smtp_host'], data['smtp_port'],
                            data['username'], data['password'],
                            data['to_mail_addr'], data['subject'], data['content'])
         else:
-            email.send(data['smtp_host'], data['smtp_port'],
+            r = email.send(data['smtp_host'], data['smtp_port'],
                         data['username'], data['password'],
                         data['to_mail_addr'], data['subject'], data['content'])
+
+            print(r)
         return True
     except Exception as e:
         print(getTracebackInfo())
+        return str(e)
     return False
 
 

From 8ed2f6848b93d87b66e81f4e4ada2328a5a4e654 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 8 Nov 2024 19:26:16 +0800
Subject: [PATCH 139/965] update

---
 web/admin/site/__init__.py |  42 ++++++++++++++
 web/static/app/site.js     |   2 +-
 web/utils/site.py          | 111 +++++++++++++++++++++++++++++++++++++
 3 files changed, 154 insertions(+), 1 deletion(-)

diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index 9695c359c..060f6dede 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -76,6 +76,48 @@ def get_root_dir():
     data['dir'] = mw.getWwwDir()
     return data
 
+# 获取站点默认文档
+@blueprint.route('/get_index', endpoint='get_index',methods=['POST'])
+@panel_login_required
+def get_index():
+    site_id = request.form.get('id', '')
+    data = {}
+    index = MwSites.instance().getIndex(site_id)
+    data['index'] = index
+    return data
+
+# 获取站点默认文档
+@blueprint.route('/set_index', endpoint='set_index',methods=['POST'])
+@panel_login_required
+def set_index():
+    site_id = request.form.get('id', '')
+    index = request.form.get('index', '')
+    return MwSites.instance().setIndex(site_id, index)
+
+# 获取站点默认文档
+@blueprint.route('/get_limit_net', endpoint='get_limit_net',methods=['POST'])
+@panel_login_required
+def get_limit_net():
+    site_id = request.form.get('id', '')
+    return  MwSites.instance().getLimitNet(site_id)
+
+# 获取站点默认文档
+@blueprint.route('/set_limit_net', endpoint='set_limit_net',methods=['POST'])
+@panel_login_required
+def set_limit_net():
+    site_id = request.form.get('id', '')
+    perserver = request.form.get('perserver', '')
+    perip = request.form.get('perip', '')
+    limit_rate = request.form.get('limit_rate', '')
+    return MwSites.instance().setLimitNet(site_id, perserver,perip,limit_rate)
+
+# 获取站点默认文档
+@blueprint.route('/close_limit_net', endpoint='close_limit_net',methods=['POST'])
+@panel_login_required
+def close_limit_net():
+    site_id = request.form.get('id', '')
+    return  MwSites.instance().closeLimitNet(site_id)
+
 # 获取站点配置
 @blueprint.route('/get_host_conf', endpoint='get_host_conf',methods=['POST'])
 @panel_login_required
diff --git a/web/static/app/site.js b/web/static/app/site.js
index cf7e05ae7..1284891a8 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -1246,7 +1246,7 @@ function saveLimitNet(id, type){
 	if(isChecked == undefined || type == 1 ){
 		var data = 'id='+id+'&perserver='+$("input[name='perserver']").val()+'&perip='+$("input[name='perip']").val()+'&limit_rate='+$("input[name='limit_rate']").val();
 		var loadT = layer.msg(lan.public.config,{icon:16,time:10000})
-		$.post('/site/save_limit_net',data,function(rdata){
+		$.post('/site/set_limit_net',data,function(rdata){
 			layer.close(loadT);
 			limitNet(id);
 			layer.msg(rdata.msg,{icon:rdata.status?1:2});
diff --git a/web/utils/site.py b/web/utils/site.py
index 4636a6381..c1d05a092 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -115,6 +115,7 @@ class sites(object):
     def getIndexConf(self):
         return mw.getServerDir() + '/openresty/nginx/conf/nginx.conf'
 
+
     # 路径处理
     def getPath(self, path):
         if path[-1] == '/':
@@ -297,6 +298,116 @@ class sites(object):
         data['phpversion'] = def_pver
         return data
 
+    def getIndex(self, site_id):
+        info = thisdb.getSitesById(site_id)
+        file = self.getHostConf(info['name'])
+        conf = mw.readFile(file)
+        rep = r"\s+index\s+(.+);"
+        tmp = re.search(rep, conf).groups()
+        return tmp[0].replace(' ', ',')
+
+    def setIndex(self, site_id, index):
+        if index.find('.') == -1:
+            return mw.returnData(False,  '默认文档格式不正确，例：index.html')
+
+        index = index.replace(' ', '')
+        index = index.replace(',,', ',')
+
+        if len(index) < 3:
+            return mw.returnData(False,  '默认文档不能为空!')
+
+        info = thisdb.getSitesById(site_id)
+        siteName = info['name']
+        index_l = index.replace(",", " ")
+        file = self.getHostConf(siteName)
+        conf = mw.readFile(file)
+        if conf:
+            rep = r"\s+index\s+.+;"
+            conf = re.sub(rep, "\n\tindex " + index_l + ";", conf)
+            mw.writeFile(file, conf)
+
+        mw.writeLog('网站管理', '站点[{1}]设置{2}成功', (siteName, index_l))
+        return mw.returnJson(True,  '设置成功!')
+
+    def getLimitNet(self, site_id):
+        info = thisdb.getSitesById(site_id)
+        siteName = info['name']
+        filename = self.getHostConf(siteName)
+        # 站点总并发
+        data = {}
+        conf = mw.readFile(filename)
+        try:
+            rep = r"\s+limit_conn\s+perserver\s+([0-9]+);"
+            tmp = re.search(rep, conf).groups()
+            data['perserver'] = int(tmp[0])
+
+            # IP并发限制
+            rep = r"\s+limit_conn\s+perip\s+([0-9]+);"
+            tmp = re.search(rep, conf).groups()
+            data['perip'] = int(tmp[0])
+
+            # 请求并发限制
+            rep = r"\s+limit_rate\s+([0-9]+)\w+;"
+            tmp = re.search(rep, conf).groups()
+            data['limit_rate'] = int(tmp[0])
+        except:
+            data['perserver'] = 0
+            data['perip'] = 0
+            data['limit_rate'] = 0
+        return data
+
+    def setLimitNet(self, site_id, perserver, perip, limit_rate):
+        str_perserver = 'limit_conn perserver ' + perserver + ';'
+        str_perip = 'limit_conn perip ' + perip + ';'
+        str_limit_rate = 'limit_rate ' + limit_rate + 'k;'
+
+        info = thisdb.getSitesById(site_id)
+        siteName = info['name']
+
+        filename = self.getHostConf(siteName)
+        conf = mw.readFile(filename)
+        if(conf.find('limit_conn perserver') != -1):
+            # 替换总并发
+            rep = r"limit_conn\s+perserver\s+([0-9]+);"
+            conf = re.sub(rep, str_perserver, conf)
+
+            # 替换IP并发限制
+            rep = r"limit_conn\s+perip\s+([0-9]+);"
+            conf = re.sub(rep, str_perip, conf)
+
+            # 替换请求流量限制
+            rep = r"limit_rate\s+([0-9]+)\w+;"
+            conf = re.sub(rep, str_limit_rate, conf)
+        else:
+            conf = conf.replace('#error_page 404/404.html;', "#error_page 404/404.html;\n    " +
+                                str_perserver + "\n    " + str_perip + "\n    " + str_limit_rate)
+
+        mw.writeFile(filename, conf)
+        mw.restartWeb()
+        mw.writeLog('网站管理', '网站[{1}]流量限制已开启!', (siteName,))
+        return mw.returnData(True, '设置成功!')
+        
+    def closeLimitNet(self, site_id):
+        info = thisdb.getSitesById(site_id)
+        siteName = info['name']
+
+        filename = self.getHostConf(siteName)
+        conf = mw.readFile(filename)
+        # 清理总并发
+        rep = r"\s+limit_conn\s+perserver\s+([0-9]+);"
+        conf = re.sub(rep, '', conf)
+
+        # 清理IP并发限制
+        rep = r"\s+limit_conn\s+perip\s+([0-9]+);"
+        conf = re.sub(rep, '', conf)
+
+        # 清理请求流量限制
+        rep = r"\s+limit_rate\s+([0-9]+)\w+;"
+        conf = re.sub(rep, '', conf)
+        mw.writeFile(filename, conf)
+        mw.restartWeb()
+        mw.writeLog('网站管理', '网站[{1}]流量限制已关闭!', (siteName,))
+        return mw.returnData(True, '已关闭流量限制!')
 
     def setPhpVersion(self, siteName, version):
         # nginx

From 5c24373a3200c3264f2bf58efb149c379ce217c2 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 8 Nov 2024 19:35:48 +0800
Subject: [PATCH 140/965] Update __init__.py

---
 web/admin/site/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index 060f6dede..894ee36b5 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -224,7 +224,7 @@ def get_cli_php_version():
             if link_re.find(v['version']) != -1:
                 return mw.returnData({"select": v, "versions": php_versions})
 
-    return mw.getJson({"select": php_versions[0],"versions": php_versions})
+    return {"select": php_versions[0],"versions": php_versions}
 
 @blueprint.route('/set_cli_php_version', endpoint='set_cli_php_version',methods=['POST'])
 @panel_login_required

From e1e7fd51cd06bba576dc032c6ef3cdb2418b953e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 8 Nov 2024 19:56:37 +0800
Subject: [PATCH 141/965] update

---
 web/admin/site/__init__.py | 31 +++++++++++++++++++++++--------
 web/core/db.py             |  7 +++++--
 web/thisdb/domain.py       |  3 ++-
 web/utils/site.py          | 12 +++++++++++-
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index 894ee36b5..ebefe1e3f 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -183,6 +183,28 @@ def set_ps():
     ps = request.form.get('ps', '')
     return MwSites.instance().setPs(site_id, ps)
 
+# 站点绑定域名
+@blueprint.route('/get_domain', endpoint='get_domain',methods=['POST'])
+@panel_login_required
+def get_domain():
+    site_id = request.form.get('pid', '')
+    return MwSites.instance().getDomain(site_id)
+
+# 获取默认为静态列表
+@blueprint.route('/get_rewrite_list', endpoint='get_rewrite_list',methods=['POST'])
+@panel_login_required
+def get_rewrite_list():
+    return MwSites.instance().getRewriteList()
+
+# 获取默认为静态列表
+@blueprint.route('/get_rewrite_conf', endpoint='get_rewrite_conf',methods=['POST'])
+@panel_login_required
+def get_rewrite_conf():
+    siteName = request.form.get('siteName', '')
+    rewrite = MwSites.instance().getRewriteConf(siteName)
+    return {'rewrite': rewrite}
+
+
 
 # 设置默认网站信息
 @blueprint.route('/get_default_site', endpoint='get_default_site',methods=['POST'])
@@ -190,14 +212,7 @@ def set_ps():
 def get_default_site():
     return MwSites.instance().getDefaultSite()
 
-# 站点删除
-@blueprint.route('/get_domain', endpoint='get_domain',methods=['POST'])
-@panel_login_required
-def get_domain():
-    site_id = request.form.get('id', '')
-    return MwSites.instance().getDomain(site_id)
-
-
+# 设置默认站
 @blueprint.route('/set_default_site', endpoint='set_default_site',methods=['POST'])
 @panel_login_required
 def set_default_site():
diff --git a/web/core/db.py b/web/core/db.py
index 6550f77c8..0d63b222b 100755
--- a/web/core/db.py
+++ b/web/core/db.py
@@ -147,8 +147,11 @@ class Sql():
         try:
             sql = "SELECT " + self.__OPT_FIELD + " FROM " + self.__DB_TABLE + \
                 self.__OPT_WHERE + self.__OPT_GROUP + self.__OPT_ORDER + self.__OPT_LIMIT
-            # print(sql)
-            # print(self.__OPT_PARAM)
+
+            if self.__debug:
+                print(sql)
+                print(self.__OPT_PARAM)
+                
             result = self.__DB_CONN.execute(sql, self.__OPT_PARAM)
             data = result.fetchall()
             if len(data) == 0:
diff --git a/web/thisdb/domain.py b/web/thisdb/domain.py
index 0bb9ef126..fb163a624 100644
--- a/web/thisdb/domain.py
+++ b/web/thisdb/domain.py
@@ -23,7 +23,8 @@ def addDomain(pid, name, port):
     return mw.M('domain').insert(insert_data)
 
 def getDomainByPid(pid):
-    return mw.M('domain').where("pid=?", (pid,)).field(__FIELD).select()
+    # .debug(True)
+    return mw.M('domain').field(__FIELD).where("pid=?", (pid,)).select()
 
 
 def deleteDomainId(domain_id):
diff --git a/web/utils/site.py b/web/utils/site.py
index c1d05a092..e27219977 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -281,8 +281,18 @@ class sites(object):
 
     # 获取域名列表
     def getDomain(self, pid):
-        return thisdb.getDomainByPid(pid)
+        data =  thisdb.getDomainByPid(pid)
+        return data
 
+    def getRewriteList(self):
+        rewriteList = {}
+        rewriteList['rewrite'] = []
+        rewriteList['rewrite'].append('0.当前')
+        rewrite_nginx_dir = mw.getPanelDir() + '/rewrite/nginx'
+        for ds in os.listdir(rewrite_nginx_dir):
+            rewriteList['rewrite'].append(ds[0:len(ds) - 5])
+        rewriteList['rewrite'] = sorted(rewriteList['rewrite'])
+        return rewriteList
 
     def getSitePhpVersion(self, siteName):
         conf = mw.readFile(self.getHostConf(siteName))

From 03e37a2b8887f9b4ae395f6b1b92c9b408c5cf26 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 8 Nov 2024 20:06:42 +0800
Subject: [PATCH 142/965] Update __init__.py

---
 web/admin/site/__init__.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index ebefe1e3f..373d29cce 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -196,7 +196,7 @@ def get_domain():
 def get_rewrite_list():
     return MwSites.instance().getRewriteList()
 
-# 获取默认为静态列表
+# 获取站点Rewrite配置
 @blueprint.route('/get_rewrite_conf', endpoint='get_rewrite_conf',methods=['POST'])
 @panel_login_required
 def get_rewrite_conf():
@@ -204,8 +204,6 @@ def get_rewrite_conf():
     rewrite = MwSites.instance().getRewriteConf(siteName)
     return {'rewrite': rewrite}
 
-
-
 # 设置默认网站信息
 @blueprint.route('/get_default_site', endpoint='get_default_site',methods=['POST'])
 @panel_login_required

From 260c37f63b6a4d477f89ce9c04137582ffca0889 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 8 Nov 2024 21:29:01 +0800
Subject: [PATCH 143/965] update

---
 web/admin/files/__init__.py | 18 +------
 web/admin/site/__init__.py  | 30 ++++++++++++
 web/core/mw.py              | 37 ++++++++++++++
 web/utils/file.py           | 19 +++++++
 web/utils/site.py           | 98 +++++++++++++++++++++++++++++++++++++
 5 files changed, 185 insertions(+), 17 deletions(-)

diff --git a/web/admin/files/__init__.py b/web/admin/files/__init__.py
index 42d0b3a20..12c7ce63a 100644
--- a/web/admin/files/__init__.py
+++ b/web/admin/files/__init__.py
@@ -42,23 +42,7 @@ def save_body():
     path = request.form.get('path', '')
     data = request.form.get('data', '')
     encoding = request.form.get('encoding', '')
-    if not os.path.exists(path):
-        return mw.returnData(False, '文件不存在')
-    try:
-        if encoding == 'ascii':
-            encoding = 'utf-8'
-
-        data = data.encode(encoding, errors='ignore').decode(encoding)
-        fp = open(path, 'w+', encoding=encoding)
-        fp.write(data)
-        fp.close()
-
-        if path.find("web_conf") > 0:
-            mw.restartWeb()
-        mw.writeLog('文件管理', '文件[{1}]保存成功', (path,))
-        return mw.returnData(True, '文件保存成功')
-    except Exception as ex:
-        return mw.returnData(False, '文件保存错误:' + str(ex))
+    return file.saveBody(path,data,encoding)
 
 # 获取文件内容(最新行数)
 @blueprint.route('/get_last_body', endpoint='get_file_last_body', methods=['POST'])
diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index 373d29cce..076608ccc 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -126,6 +126,14 @@ def get_host_conf():
     host = MwSites.instance().getHostConf(siteName)
     return {'host': host}
 
+# 设置站点配置
+@blueprint.route('/save_host_conf', endpoint='save_host_conf',methods=['POST'])
+@panel_login_required
+def save_host_conf():
+    path = request.form.get('path', '')
+    data = request.form.get('data', '')
+    encoding = request.form.get('encoding', '')
+    return MwSites.instance().saveHostConf(path,data,encoding)
 
 # 获取站点PHP版本
 @blueprint.route('/get_site_php_version', endpoint='get_site_php_version',methods=['POST'])
@@ -204,6 +212,28 @@ def get_rewrite_conf():
     rewrite = MwSites.instance().getRewriteConf(siteName)
     return {'rewrite': rewrite}
 
+# 获取防盗链信息
+@blueprint.route('/get_security', endpoint='get_security',methods=['POST'])
+@panel_login_required
+def get_security():
+    site_id = request.form.get('id', '')
+    return MwSites.instance().getSecurity(site_id)
+
+# 设置防盗链
+@blueprint.route('/set_security', endpoint='set_security',methods=['POST'])
+@panel_login_required
+def set_security():
+    fix = request.form.get('fix', '')
+    domains = request.form.get('domains', '')
+    status = request.form.get('status', '')
+    name = request.form.get('name', '')
+    none = request.form.get('none', '')
+    site_id = request.form.get('id', '')
+    return MwSites.instance().setSecurity(site_id, fix, domains, status, none)
+
+
+
+
 # 设置默认网站信息
 @blueprint.route('/get_default_site', endpoint='get_default_site',methods=['POST'])
 @panel_login_required
diff --git a/web/core/mw.py b/web/core/mw.py
index 3dc278889..50f6561ff 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -213,6 +213,43 @@ def writeFile(filename, content, mode='w+'):
         return False
 
 
+def backFile(file, act=None):
+    """
+        @name 备份配置文件
+        @param file 需要备份的文件
+        @param act 如果存在，则备份一份作为默认配置
+    """
+    file_type = "_bak"
+    if act:
+        file_type = "_def"
+
+    # print("cp -p {0} {1}".format(file, file + file_type))
+    execShell("cp -p {0} {1}".format(file, file + file_type))
+
+
+def removeBackFile(file, act=None):
+    """
+        @name 删除备份配置文件
+        @param file 需要删除备份文件
+        @param act 如果存在，则还原默认配置
+    """
+    file_type = "_bak"
+    if act:
+        file_type = "_def"
+    execShell("rm -rf {0}".format(file + file_type))
+
+
+def restoreFile(file, act=None):
+    """
+        @name 还原配置文件
+        @param file 需要还原的文件
+        @param act 如果存在，则还原默认配置
+    """
+    file_type = "_bak"
+    if act:
+        file_type = "_def"
+    execShell("cp -p {1} {0}".format(file, file + file_type))
+
 def systemdCfgDir():
     # ubuntu
     cfg_dir = '/lib/systemd/system'
diff --git a/web/utils/file.py b/web/utils/file.py
index 69203efeb..d962bf9f6 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -47,6 +47,25 @@ def getFileBody(path):
         return mw.returnData(False, '文件未正常打开!')
     return mw.returnData(True, 'OK', data)
 
+def saveBody(path, data, encoding):
+    if not os.path.exists(path):
+        return mw.returnData(False, '文件不存在')
+    try:
+        if encoding == 'ascii':
+            encoding = 'utf-8'
+
+        data = data.encode(encoding, errors='ignore').decode(encoding)
+        fp = open(path, 'w+', encoding=encoding)
+        fp.write(data)
+        fp.close()
+
+        if path.find("web_conf") > 0:
+            mw.restartWeb()
+        mw.writeLog('文件管理', '文件[{1}]保存成功', (path,))
+        return mw.returnData(True, '文件保存成功')
+    except Exception as ex:
+        return mw.returnData(False, '文件保存错误:' + str(ex))
+
 # 获取文件权限描述
 def getFileStatsDesc(
     filename: str | None = None,
diff --git a/web/utils/site.py b/web/utils/site.py
index e27219977..51baf563d 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -94,6 +94,21 @@ class sites(object):
     def getHostConf(self, siteName):
         return self.vhostPath + '/' + siteName + '.conf'
 
+    def saveHostConf(self, path, data, encoding):
+        import utils.file as file
+        mw.backFile(path)
+        rdata = file.saveBody(path, data, encoding)
+
+        if rdata['status']:
+            isError = mw.checkWebConfig()
+            if isError != True:
+                mw.restoreFile(path)
+                msg = 'ERROR: 检测到配置文件有错误,请先排除后再操作<br><br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>'
+                return mw.returnData(False, msg)
+            mw.restartWeb()
+            mw.removeBackFile(path)
+        return rdata
+
     def getRewriteConf(self, siteName):
         return self.rewritePath + '/' + siteName + '.conf'
 
@@ -294,6 +309,89 @@ class sites(object):
         rewriteList['rewrite'] = sorted(rewriteList['rewrite'])
         return rewriteList
 
+    def getSecurity(self, site_id):
+        info = thisdb.getSitesById(site_id)
+        name = info['name']
+        filename = self.getHostConf(name)
+        conf = mw.readFile(filename)
+        data = {}
+        if conf.find('SECURITY-START') != -1:
+            rep = "#SECURITY-START(\n|.){1,500}#SECURITY-END"
+            tmp = re.search(rep, conf).group()
+            data['fix'] = re.search(r"\(.+\)\$", tmp).group().replace('(', '').replace(')$', '').replace('|', ',')
+
+            data['status'] = False
+            data['none'] = False
+
+            valid_referers = re.search(
+                r"valid_referers\s+(.+);\n", tmp)
+            valid_referers_none = re.search(
+                r"valid_referers\s+none\s+blocked\s+(.+);\n", tmp)
+
+            if valid_referers or valid_referers_none:
+                data['status'] = True
+
+            if valid_referers_none:
+                domain_t = valid_referers_none.groups()[0].split()
+                data['domains'] = ','.join(domain_t)
+                data['none'] = True
+            elif valid_referers:
+                domain_t = valid_referers.groups()[0].split()
+                data['domains'] = ','.join(domain_t)
+                data['none'] = False
+        else:
+            data['fix'] = 'gif|jpg|jpeg|png|bmp|swf|js|css|ttf|woff2'
+            domains = thisdb.getDomainByPid(site_id)
+            tmp = []
+            for domain in domains:
+                tmp.append(domain['name'])
+            data['domains'] = ','.join(tmp)
+            data['status'] = False
+            data['none'] = False
+        return data
+
+    def setSecurity(self, site_id, fix, domains, status, none=''):
+        info = thisdb.getSitesById(site_id)
+        name = info['name']
+
+        if len(fix) < 2:
+            return mw.returnData(False, 'URL后缀不能为空!')
+
+        file = self.getHostConf(name)
+        if os.path.exists(file):
+            conf = mw.readFile(file)
+            if status == 'false':
+                rep = r"\s{0,4}#SECURITY-START(\n|.){1,500}#SECURITY-END\n?"
+                conf = re.sub(rep, '', conf)
+                mw.writeLog('网站管理', '站点[' + name + ']已关闭防盗链设置!')
+            else:
+                rep = r"\s{0,4}#SECURITY-START(\n|.){1,500}#SECURITY-END\n?"
+                conf = re.sub(rep, '', conf)
+
+                valid_referers = domains.strip().replace(',', ' ')
+                if none == 'true':
+                    valid_referers = 'none blocked ' + valid_referers
+
+                pre_path = self.setupPath + "/php/conf"
+                re_path = r"include\s+" + pre_path + "/enable-php-"
+                rconf = r'''#SECURITY-START 防盗链配置
+    location ~ .*\.(%s)$
+    {
+        expires      30d;
+        access_log /dev/null;
+        valid_referers %s;
+        if ($invalid_referer){
+           return 404;
+        }
+    }
+    #SECURITY-END
+    include %s/enable-php-''' % (fix.strip().replace(',', '|'), valid_referers, pre_path)
+                conf = re.sub(re_path, rconf, conf)
+                mw.writeLog('网站管理', '站点[' + name + ']已开启防盗链!')
+            mw.writeFile(file, conf)
+        mw.restartWeb()
+        return mw.returnData(True, '设置成功!')
+
     def getSitePhpVersion(self, siteName):
         conf = mw.readFile(self.getHostConf(siteName))
         rep = r"enable-php-(.*)\.conf"

From f1a74e6275e62616eb1145163125e5634defbbae Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 9 Nov 2024 01:27:32 +0800
Subject: [PATCH 144/965] update

---
 web/admin/site/__init__.py   | 272 +----------------------------------
 web/admin/site/site.py       | 272 +++++++++++++++++++++++++++++++++++
 web/admin/site/site_types.py |  40 ++++++
 web/thisdb/__init__.py       |   1 +
 web/thisdb/site_types.py     |  19 +++
 web/utils/site.py            |  12 ++
 6 files changed, 346 insertions(+), 270 deletions(-)
 create mode 100644 web/admin/site/site.py
 create mode 100644 web/admin/site/site_types.py
 create mode 100644 web/thisdb/site_types.py

diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index 076608ccc..bacb102b1 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -8,273 +8,5 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
-import os
-
-from flask import Blueprint, render_template
-from flask import request
-
-from admin.model import Sites
-from admin.user_login_check import panel_login_required
-
-from utils.plugin import plugin as MwPlugin
-from utils.site import sites as MwSites
-import utils.site as site
-import core.mw as mw
-import thisdb
-
-blueprint = Blueprint('site', __name__, url_prefix='/site', template_folder='../../templates/default')
-@blueprint.route('/index', endpoint='index')
-def index():
-    return render_template('site.html')
-
-# 站点列表
-@blueprint.route('/list', endpoint='list', methods=['GET','POST'])
-@panel_login_required
-def list():
-    p = request.form.get('p', '1')
-    limit = request.form.get('limit', '10')
-    type_id = request.form.get('type_id', '0').strip()
-    search = request.form.get('search', '').strip()
-
-    info = thisdb.getSitesList(page=int(p),size=int(limit),type_id=int(type_id), search=search)
-
-    data = {}
-    data['data'] = info['list']
-    data['page'] = mw.getPage({'count':info['count'],'tojs':'getWeb','p':p, 'row':limit})
-    return data
-
-# 添加站点
-@blueprint.route('/add', endpoint='add',methods=['POST'])
-@panel_login_required
-def add():
-    webname = request.form.get('webinfo', '')
-    ps = request.form.get('ps', '')
-    path = request.form.get('path', '')
-    version = request.form.get('version', '')
-    port = request.form.get('port', '')
-    return MwSites.instance().add(webname, port, ps, path, version)
-
-# 站点删除
-@blueprint.route('/delete', endpoint='delete',methods=['POST'])
-@panel_login_required
-def delete():
-    site_id = request.form.get('id', '')
-    path = request.form.get('path', '')
-    return MwSites.instance().delete(site_id, path)
-
-# 获取站点类型
-@blueprint.route('/get_site_types', endpoint='get_site_types',methods=['POST'])
-@panel_login_required
-def get_site_types():
-    return []
-
-# 获取站点根目录
-@blueprint.route('/get_root_dir', endpoint='get_root_dir',methods=['POST'])
-@panel_login_required
-def get_root_dir():
-    data = {}
-    data['dir'] = mw.getWwwDir()
-    return data
-
-# 获取站点默认文档
-@blueprint.route('/get_index', endpoint='get_index',methods=['POST'])
-@panel_login_required
-def get_index():
-    site_id = request.form.get('id', '')
-    data = {}
-    index = MwSites.instance().getIndex(site_id)
-    data['index'] = index
-    return data
-
-# 获取站点默认文档
-@blueprint.route('/set_index', endpoint='set_index',methods=['POST'])
-@panel_login_required
-def set_index():
-    site_id = request.form.get('id', '')
-    index = request.form.get('index', '')
-    return MwSites.instance().setIndex(site_id, index)
-
-# 获取站点默认文档
-@blueprint.route('/get_limit_net', endpoint='get_limit_net',methods=['POST'])
-@panel_login_required
-def get_limit_net():
-    site_id = request.form.get('id', '')
-    return  MwSites.instance().getLimitNet(site_id)
-
-# 获取站点默认文档
-@blueprint.route('/set_limit_net', endpoint='set_limit_net',methods=['POST'])
-@panel_login_required
-def set_limit_net():
-    site_id = request.form.get('id', '')
-    perserver = request.form.get('perserver', '')
-    perip = request.form.get('perip', '')
-    limit_rate = request.form.get('limit_rate', '')
-    return MwSites.instance().setLimitNet(site_id, perserver,perip,limit_rate)
-
-# 获取站点默认文档
-@blueprint.route('/close_limit_net', endpoint='close_limit_net',methods=['POST'])
-@panel_login_required
-def close_limit_net():
-    site_id = request.form.get('id', '')
-    return  MwSites.instance().closeLimitNet(site_id)
-
-# 获取站点配置
-@blueprint.route('/get_host_conf', endpoint='get_host_conf',methods=['POST'])
-@panel_login_required
-def get_host_conf():
-    siteName = request.form.get('siteName', '')      
-    host = MwSites.instance().getHostConf(siteName)
-    return {'host': host}
-
-# 设置站点配置
-@blueprint.route('/save_host_conf', endpoint='save_host_conf',methods=['POST'])
-@panel_login_required
-def save_host_conf():
-    path = request.form.get('path', '')
-    data = request.form.get('data', '')
-    encoding = request.form.get('encoding', '')
-    return MwSites.instance().saveHostConf(path,data,encoding)
-
-# 获取站点PHP版本
-@blueprint.route('/get_site_php_version', endpoint='get_site_php_version',methods=['POST'])
-@panel_login_required
-def get_site_php_version():
-    siteName = request.form.get('siteName', '')      
-    return MwSites.instance().getSitePhpVersion(siteName)
-
-
-# 设置站点PHP版本
-@blueprint.route('/set_php_version', endpoint='set_php_version',methods=['POST'])
-@panel_login_required
-def set_php_version():
-    siteName = request.form.get('siteName', '')
-    version = request.form.get('version', '') 
-    return MwSites.instance().setPhpVersion(siteName,version)
-
-# 检查OpenResty安装/启动状态
-@blueprint.route('/check_web_status', endpoint='check_web_status',methods=['POST'])
-@panel_login_required
-def check_web_status():
-    '''
-    创建站点检查web服务
-    '''
-    if not mw.isInstalledWeb():
-        return mw.returnJson(False, '请安装并启动OpenResty服务!')
-
-    # 这个快点
-    pid = mw.getServerDir() + '/openresty/nginx/logs/nginx.pid'
-    if not os.path.exists(pid):
-        return mw.returnData(False, '请启动OpenResty服务!')
-    return mw.returnData(True, 'OK')
-
-# 获取PHP版本
-@blueprint.route('/get_php_version', endpoint='get_php_version',methods=['POST'])
-@panel_login_required
-def get_php_version():
-    return MwSites.instance().getPhpVersion()
-
-
-# 设置网站到期
-@blueprint.route('/set_end_date', endpoint='set_end_date',methods=['POST'])
-@panel_login_required
-def set_end_date():
-    site_id = request.form.get('id', '')
-    edate = request.form.get('edate', '')
-    return MwSites.instance().setEndDate(site_id, edate)
-
-
-# 设置网站备注
-@blueprint.route('/set_ps', endpoint='set_ps',methods=['POST'])
-@panel_login_required
-def set_ps():
-    site_id = request.form.get('id', '')
-    ps = request.form.get('ps', '')
-    return MwSites.instance().setPs(site_id, ps)
-
-# 站点绑定域名
-@blueprint.route('/get_domain', endpoint='get_domain',methods=['POST'])
-@panel_login_required
-def get_domain():
-    site_id = request.form.get('pid', '')
-    return MwSites.instance().getDomain(site_id)
-
-# 获取默认为静态列表
-@blueprint.route('/get_rewrite_list', endpoint='get_rewrite_list',methods=['POST'])
-@panel_login_required
-def get_rewrite_list():
-    return MwSites.instance().getRewriteList()
-
-# 获取站点Rewrite配置
-@blueprint.route('/get_rewrite_conf', endpoint='get_rewrite_conf',methods=['POST'])
-@panel_login_required
-def get_rewrite_conf():
-    siteName = request.form.get('siteName', '')
-    rewrite = MwSites.instance().getRewriteConf(siteName)
-    return {'rewrite': rewrite}
-
-# 获取防盗链信息
-@blueprint.route('/get_security', endpoint='get_security',methods=['POST'])
-@panel_login_required
-def get_security():
-    site_id = request.form.get('id', '')
-    return MwSites.instance().getSecurity(site_id)
-
-# 设置防盗链
-@blueprint.route('/set_security', endpoint='set_security',methods=['POST'])
-@panel_login_required
-def set_security():
-    fix = request.form.get('fix', '')
-    domains = request.form.get('domains', '')
-    status = request.form.get('status', '')
-    name = request.form.get('name', '')
-    none = request.form.get('none', '')
-    site_id = request.form.get('id', '')
-    return MwSites.instance().setSecurity(site_id, fix, domains, status, none)
-
-
-
-
-# 设置默认网站信息
-@blueprint.route('/get_default_site', endpoint='get_default_site',methods=['POST'])
-@panel_login_required
-def get_default_site():
-    return MwSites.instance().getDefaultSite()
-
-# 设置默认站
-@blueprint.route('/set_default_site', endpoint='set_default_site',methods=['POST'])
-@panel_login_required
-def set_default_site():
-    name = request.form.get('name', '')
-    return MwSites.instance().setDefaultSite(name)
-
-@blueprint.route('/get_cli_php_version', endpoint='get_cli_php_version',methods=['POST'])
-@panel_login_required
-def get_cli_php_version():
-    php_dir = mw.getServerDir() + '/php'
-    if not os.path.exists(php_dir):
-        return mw.returnData(False, '未安装PHP,无法设置')
-
-    php_bin = '/usr/bin/php'
-    php_versions = MwSites.instance().getPhpVersion()
-    php_versions = php_versions[1:]
-
-    if len(php_versions) < 1:
-        return mw.returnData(False, '未安装PHP,无法设置')
-
-    if os.path.exists(php_bin) and os.path.islink(php_bin):
-        link_re = os.readlink(php_bin)
-        for v in php_versions:
-            if link_re.find(v['version']) != -1:
-                return mw.returnData({"select": v, "versions": php_versions})
-
-    return {"select": php_versions[0],"versions": php_versions}
-
-@blueprint.route('/set_cli_php_version', endpoint='set_cli_php_version',methods=['POST'])
-@panel_login_required
-def set_cli_php_version():
-    if mw.isAppleSystem():
-        return mw.returnData(False, "开发机不可设置!")
-    version = request.form.get('version', '')
-    return MwSites.instance().setCliPhpVersion(version)
-
-
+from .site import *
+from .site_types import *
\ No newline at end of file
diff --git a/web/admin/site/site.py b/web/admin/site/site.py
new file mode 100644
index 000000000..8d628c74e
--- /dev/null
+++ b/web/admin/site/site.py
@@ -0,0 +1,272 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin.model import Sites
+from admin.user_login_check import panel_login_required
+
+from utils.plugin import plugin as MwPlugin
+from utils.site import sites as MwSites
+import utils.site as site
+import core.mw as mw
+import thisdb
+
+blueprint = Blueprint('site', __name__, url_prefix='/site', template_folder='../../templates/default')
+@blueprint.route('/index', endpoint='index')
+def index():
+    return render_template('site.html')
+
+# 站点列表
+@blueprint.route('/list', endpoint='list', methods=['GET','POST'])
+@panel_login_required
+def list():
+    p = request.form.get('p', '1')
+    limit = request.form.get('limit', '10')
+    type_id = request.form.get('type_id', '0').strip()
+    search = request.form.get('search', '').strip()
+
+    info = thisdb.getSitesList(page=int(p),size=int(limit),type_id=int(type_id), search=search)
+
+    data = {}
+    data['data'] = info['list']
+    data['page'] = mw.getPage({'count':info['count'],'tojs':'getWeb','p':p, 'row':limit})
+    return data
+
+# 添加站点
+@blueprint.route('/add', endpoint='add',methods=['POST'])
+@panel_login_required
+def add():
+    webname = request.form.get('webinfo', '')
+    ps = request.form.get('ps', '')
+    path = request.form.get('path', '')
+    version = request.form.get('version', '')
+    port = request.form.get('port', '')
+    return MwSites.instance().add(webname, port, ps, path, version)
+
+# 站点删除
+@blueprint.route('/delete', endpoint='delete',methods=['POST'])
+@panel_login_required
+def delete():
+    site_id = request.form.get('id', '')
+    path = request.form.get('path', '')
+    return MwSites.instance().delete(site_id, path)
+
+# 获取站点根目录
+@blueprint.route('/get_root_dir', endpoint='get_root_dir',methods=['POST'])
+@panel_login_required
+def get_root_dir():
+    data = {}
+    data['dir'] = mw.getWwwDir()
+    return data
+
+# 获取站点默认文档
+@blueprint.route('/get_index', endpoint='get_index',methods=['POST'])
+@panel_login_required
+def get_index():
+    site_id = request.form.get('id', '')
+    data = {}
+    index = MwSites.instance().getIndex(site_id)
+    data['index'] = index
+    return data
+
+# 获取站点默认文档
+@blueprint.route('/set_index', endpoint='set_index',methods=['POST'])
+@panel_login_required
+def set_index():
+    site_id = request.form.get('id', '')
+    index = request.form.get('index', '')
+    return MwSites.instance().setIndex(site_id, index)
+
+# 获取站点默认文档
+@blueprint.route('/get_limit_net', endpoint='get_limit_net',methods=['POST'])
+@panel_login_required
+def get_limit_net():
+    site_id = request.form.get('id', '')
+    return  MwSites.instance().getLimitNet(site_id)
+
+# 获取站点默认文档
+@blueprint.route('/set_limit_net', endpoint='set_limit_net',methods=['POST'])
+@panel_login_required
+def set_limit_net():
+    site_id = request.form.get('id', '')
+    perserver = request.form.get('perserver', '')
+    perip = request.form.get('perip', '')
+    limit_rate = request.form.get('limit_rate', '')
+    return MwSites.instance().setLimitNet(site_id, perserver,perip,limit_rate)
+
+# 获取站点默认文档
+@blueprint.route('/close_limit_net', endpoint='close_limit_net',methods=['POST'])
+@panel_login_required
+def close_limit_net():
+    site_id = request.form.get('id', '')
+    return  MwSites.instance().closeLimitNet(site_id)
+
+# 获取站点配置
+@blueprint.route('/get_host_conf', endpoint='get_host_conf',methods=['POST'])
+@panel_login_required
+def get_host_conf():
+    siteName = request.form.get('siteName', '')      
+    host = MwSites.instance().getHostConf(siteName)
+    return {'host': host}
+
+# 设置站点配置
+@blueprint.route('/save_host_conf', endpoint='save_host_conf',methods=['POST'])
+@panel_login_required
+def save_host_conf():
+    path = request.form.get('path', '')
+    data = request.form.get('data', '')
+    encoding = request.form.get('encoding', '')
+    return MwSites.instance().saveHostConf(path,data,encoding)
+
+# 获取站点PHP版本
+@blueprint.route('/get_site_php_version', endpoint='get_site_php_version',methods=['POST'])
+@panel_login_required
+def get_site_php_version():
+    siteName = request.form.get('siteName', '')      
+    return MwSites.instance().getSitePhpVersion(siteName)
+
+
+# 设置站点PHP版本
+@blueprint.route('/set_php_version', endpoint='set_php_version',methods=['POST'])
+@panel_login_required
+def set_php_version():
+    siteName = request.form.get('siteName', '')
+    version = request.form.get('version', '') 
+    return MwSites.instance().setPhpVersion(siteName,version)
+
+# 检查OpenResty安装/启动状态
+@blueprint.route('/check_web_status', endpoint='check_web_status',methods=['POST'])
+@panel_login_required
+def check_web_status():
+    '''
+    创建站点检查web服务
+    '''
+    if not mw.isInstalledWeb():
+        return mw.returnJson(False, '请安装并启动OpenResty服务!')
+
+    # 这个快点
+    pid = mw.getServerDir() + '/openresty/nginx/logs/nginx.pid'
+    if not os.path.exists(pid):
+        return mw.returnData(False, '请启动OpenResty服务!')
+    return mw.returnData(True, 'OK')
+
+# 获取PHP版本
+@blueprint.route('/get_php_version', endpoint='get_php_version',methods=['POST'])
+@panel_login_required
+def get_php_version():
+    return MwSites.instance().getPhpVersion()
+
+
+# 设置网站到期
+@blueprint.route('/set_end_date', endpoint='set_end_date',methods=['POST'])
+@panel_login_required
+def set_end_date():
+    site_id = request.form.get('id', '')
+    edate = request.form.get('edate', '')
+    return MwSites.instance().setEndDate(site_id, edate)
+
+
+# 设置网站备注
+@blueprint.route('/set_ps', endpoint='set_ps',methods=['POST'])
+@panel_login_required
+def set_ps():
+    site_id = request.form.get('id', '')
+    ps = request.form.get('ps', '')
+    return MwSites.instance().setPs(site_id, ps)
+
+# 站点绑定域名
+@blueprint.route('/get_domain', endpoint='get_domain',methods=['POST'])
+@panel_login_required
+def get_domain():
+    site_id = request.form.get('pid', '')
+    return MwSites.instance().getDomain(site_id)
+
+# 获取默认为静态列表
+@blueprint.route('/get_rewrite_list', endpoint='get_rewrite_list',methods=['POST'])
+@panel_login_required
+def get_rewrite_list():
+    return MwSites.instance().getRewriteList()
+
+# 获取站点Rewrite配置
+@blueprint.route('/get_rewrite_conf', endpoint='get_rewrite_conf',methods=['POST'])
+@panel_login_required
+def get_rewrite_conf():
+    siteName = request.form.get('siteName', '')
+    rewrite = MwSites.instance().getRewriteConf(siteName)
+    return {'rewrite': rewrite}
+
+# 获取防盗链信息
+@blueprint.route('/get_security', endpoint='get_security',methods=['POST'])
+@panel_login_required
+def get_security():
+    site_id = request.form.get('id', '')
+    return MwSites.instance().getSecurity(site_id)
+
+# 设置防盗链
+@blueprint.route('/set_security', endpoint='set_security',methods=['POST'])
+@panel_login_required
+def set_security():
+    fix = request.form.get('fix', '')
+    domains = request.form.get('domains', '')
+    status = request.form.get('status', '')
+    name = request.form.get('name', '')
+    none = request.form.get('none', '')
+    site_id = request.form.get('id', '')
+    return MwSites.instance().setSecurity(site_id, fix, domains, status, none)
+
+
+# 设置默认网站信息
+@blueprint.route('/get_default_site', endpoint='get_default_site',methods=['POST'])
+@panel_login_required
+def get_default_site():
+    return MwSites.instance().getDefaultSite()
+
+# 设置默认站
+@blueprint.route('/set_default_site', endpoint='set_default_site',methods=['POST'])
+@panel_login_required
+def set_default_site():
+    name = request.form.get('name', '')
+    return MwSites.instance().setDefaultSite(name)
+
+@blueprint.route('/get_cli_php_version', endpoint='get_cli_php_version',methods=['POST'])
+@panel_login_required
+def get_cli_php_version():
+    php_dir = mw.getServerDir() + '/php'
+    if not os.path.exists(php_dir):
+        return mw.returnData(False, '未安装PHP,无法设置')
+
+    php_bin = '/usr/bin/php'
+    php_versions = MwSites.instance().getPhpVersion()
+    php_versions = php_versions[1:]
+
+    if len(php_versions) < 1:
+        return mw.returnData(False, '未安装PHP,无法设置')
+
+    if os.path.exists(php_bin) and os.path.islink(php_bin):
+        link_re = os.readlink(php_bin)
+        for v in php_versions:
+            if link_re.find(v['version']) != -1:
+                return mw.returnData({"select": v, "versions": php_versions})
+
+    return {"select": php_versions[0],"versions": php_versions}
+
+@blueprint.route('/set_cli_php_version', endpoint='set_cli_php_version',methods=['POST'])
+@panel_login_required
+def set_cli_php_version():
+    if mw.isAppleSystem():
+        return mw.returnData(False, "开发机不可设置!")
+    version = request.form.get('version', '')
+    return MwSites.instance().setCliPhpVersion(version)
+
+
diff --git a/web/admin/site/site_types.py b/web/admin/site/site_types.py
new file mode 100644
index 000000000..62104549a
--- /dev/null
+++ b/web/admin/site/site_types.py
@@ -0,0 +1,40 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin.user_login_check import panel_login_required
+
+from utils.plugin import plugin as MwPlugin
+from utils.site import sites as MwSites
+import utils.site as site
+import core.mw as mw
+import thisdb
+
+from .site import blueprint
+
+# 获取网站分类
+@blueprint.route('/get_site_types', endpoint='get_site_types',methods=['POST'])
+@panel_login_required
+def get_site_types():
+    data = thisdb.getSiteTypesList()
+    data.insert(0, {"id": 0, "name": "默认分类"})
+    return data
+
+
+# 添加网站分类
+@blueprint.route('/add_site_type', endpoint='add_site_type',methods=['POST'])
+@panel_login_required
+def add_site_type():
+    name = request.form.get('name', '').strip()
+    return MwSites.instance().addSiteTypes(name)
\ No newline at end of file
diff --git a/web/thisdb/__init__.py b/web/thisdb/__init__.py
index 451473e59..31924c2de 100644
--- a/web/thisdb/__init__.py
+++ b/web/thisdb/__init__.py
@@ -21,3 +21,4 @@ from .logs import *
 from .crontab import *
 from .firewall import *
 from .temp_login import *
+from .site_types import *
diff --git a/web/thisdb/site_types.py b/web/thisdb/site_types.py
new file mode 100644
index 000000000..82d64267e
--- /dev/null
+++ b/web/thisdb/site_types.py
@@ -0,0 +1,19 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+__FIELD = 'id,name'
+
+import core.mw as mw
+
+def getSiteTypesList():
+    # .debug(True)
+    return mw.M('site_types').field(__FIELD).order("id asc").select()
+
+
diff --git a/web/utils/site.py b/web/utils/site.py
index 51baf563d..4c49b7c7a 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -587,6 +587,18 @@ class sites(object):
         mw.writeLog('面板设置', '设置PHP-CLI版本为: %s' % version)
         return mw.returnData(True, '设置成功!')
 
+    def addSiteTypes(name):
+        if not name:
+            return mw.returnData(False, "分类名称不能为空")
+        if len(name) > 18:
+            return mw.returnData(False, "分类名称长度不能超过6个汉字或18位字母")
+        if mw.M('site_types').count() >= 10:
+            return mw.returnData(False, '最多添加10个分类!')
+        if mw.M('site_types').where('name=?', (name,)).count() > 0:
+            return mw.returnData(False, "指定分类名称已存在!")
+        mw.M('site_types').add("name", (name,))
+        return mw.returnData(True, '添加成功!')
+
 
     def getPhpVersion(self):
         phpVersions = ('00', '52', '53', '54', '55',

From 020c8da4262dc4534ede3288c26cdc3425a48c16 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 9 Nov 2024 17:18:57 +0800
Subject: [PATCH 145/965] update

---
 web/admin/setting/__init__.py      |  1 +
 web/admin/setting/notify_tgbot.py  | 85 ++++++++++++++++++++++++++++++
 web/admin/setup/option.py          |  4 +-
 web/core/mw.py                     | 29 ++++++++++
 web/static/app/config.js           | 27 ++++++----
 web/templates/default/setting.html |  4 +-
 web/utils/config.py                |  1 +
 7 files changed, 139 insertions(+), 12 deletions(-)
 create mode 100644 web/admin/setting/notify_tgbot.py

diff --git a/web/admin/setting/__init__.py b/web/admin/setting/__init__.py
index c516d49bf..8e01f4bc0 100644
--- a/web/admin/setting/__init__.py
+++ b/web/admin/setting/__init__.py
@@ -13,6 +13,7 @@ from .temp_login import *
 from .timezone import *
 from .secondary_verifiy import *
 from .notify_email import *
+from .notify_tgbot import *
 
 
 
diff --git a/web/admin/setting/notify_tgbot.py b/web/admin/setting/notify_tgbot.py
new file mode 100644
index 000000000..f3bc11a5d
--- /dev/null
+++ b/web/admin/setting/notify_tgbot.py
@@ -0,0 +1,85 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import re
+import json
+import os
+import time
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin import session
+from admin.user_login_check import panel_login_required
+
+import core.mw as mw
+import utils.config as utils_config
+
+from .setting import blueprint
+import thisdb
+
+# 获取邮件信息
+@blueprint.route('/get_notify_tgbot', endpoint='get_notify_tgbot', methods=['POST'])
+@panel_login_required
+def get_notify_tgbot():
+    notify_tgbot = thisdb.getOptionByJson('notify_tgbot', default={'open':False}, type='notify')
+    if 'cfg' in notify_tgbot:
+        decrypt_data = mw.deDoubleCrypt('tgbot', notify_tgbot['cfg'])
+        notify_tgbot['tgbot'] =  json.loads(decrypt_data)
+    else:
+        notify_tgbot['tgbot'] = []
+    return mw.returnData(True,'ok',notify_tgbot)
+
+
+# 设置邮件信息
+@blueprint.route('/set_notify_tgbot', endpoint='set_notify_tgbot', methods=['POST'])
+@panel_login_required
+def set_notify_tgbot():
+    data = request.form.get('data', '').strip()
+
+    crypt_data = mw.enDoubleCrypt('tgbot', data)
+    
+    notify_tgbot = thisdb.getOptionByJson('notify_tgbot', default={'open':False}, type='notify')
+    notify_tgbot['cfg'] = crypt_data
+
+    thisdb.setOption('notify_tgbot', json.dumps(notify_tgbot), type='notify')
+    return mw.returnData(True,'设置成功')
+
+
+# 设置邮件测试
+@blueprint.route('/set_notify_tgbot_test', endpoint='set_notify_tgbot_test', methods=['POST'])
+@panel_login_required
+def set_notify_tgbot_test():
+    tag_data = request.form.get('data', '').strip()
+
+    tmp = json.loads(tag_data)
+    test_pass = mw.tgbotNotifyTest(tmp['app_token'], tmp['chat_id'])
+    if test_pass == True:
+        return mw.returnData(True, '验证成功')
+    return mw.returnData(False, '验证失败:'+test_pass)
+
+# 切换邮件开关
+@blueprint.route('/set_notify_tgbot_enable', endpoint='set_notify_tgbot_enable', methods=['POST'])
+@panel_login_required
+def set_notify_tgbot_enable():
+    tag = request.form.get('tag', '').strip()
+    data = request.form.get('data', '').strip()
+
+    notify_tgbot = thisdb.getOptionByJson('notify_tgbot', default={'open':False}, type='notify')
+
+    if notify_tgbot['open']:
+        op_action = '关闭'
+        notify_tgbot['open'] = False
+    else:
+        op_action = '开启'
+        notify_tgbot['open'] = True
+
+    thisdb.setOption('notify_tgbot', json.dumps(notify_tgbot), type='notify')
+    return mw.returnData(True, op_action+'成功')
\ No newline at end of file
diff --git a/web/admin/setup/option.py b/web/admin/setup/option.py
index 8a3439d0d..09968a64d 100644
--- a/web/admin/setup/option.py
+++ b/web/admin/setup/option.py
@@ -59,7 +59,9 @@ def init_option():
     thisdb.setOption('site_path', mw.getFatherDir()+'/wwwroot')
 
 
-    # 邮件通知
+    # 异步邮件通知
     thisdb.setOption('notify_email', json.dumps({'open':False}), type='notify')
+    # 异步Telegram Bot 通知
+    thisdb.setOption('notify_tgbot', json.dumps({'open':False}), type='notify')
     
     return True
\ No newline at end of file
diff --git a/web/core/mw.py b/web/core/mw.py
index 50f6561ff..70f0e391a 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -721,6 +721,34 @@ def writeLog(stype, msg, args=()):
         # writeFileLog(getTracebackInfo())
     return writeDbLog(stype, msg, args, uid)
 
+def writeFileLog(msg, path=None, limit_size=50 * 1024 * 1024, save_limit=3):
+    log_file = getPanelDir() + '/logs/debug.log'
+    if path != None:
+        log_file = path
+
+    if os.path.exists(log_file):
+        size = os.path.getsize(log_file)
+        if size > limit_size:
+            log_file_rename = log_file + "_" + \
+                time.strftime("%Y-%m-%d_%H%M%S") + '.log'
+            os.rename(log_file, log_file_rename)
+            logs = sorted(glob.glob(log_file + "_*"))
+            count = len(logs)
+            save_limit = count - save_limit
+            for i in range(count):
+                if i > save_limit:
+                    break
+                os.remove(logs[i])
+                # print('|---多余日志[' + logs[i] + ']已删除!')
+
+    f = open(log_file, 'ab+')
+    msg += "\n"
+    if __name__ == '__main__':
+        print(msg)
+    f.write(msg.encode('utf-8'))
+    f.close()
+    return True
+
 def writeDbLog(stype, msg, args=(), uid=1):
     try:
         import thisdb
@@ -1220,6 +1248,7 @@ def tgbotNotifyHttpPost(app_token, chat_id, msg):
         return True
     except Exception as e:
         writeFileLog(str(e))
+        return str(e)
     return False
 
 
diff --git a/web/static/app/config.js b/web/static/app/config.js
index c8594eaff..b3c662b9c 100755
--- a/web/static/app/config.js
+++ b/web/static/app/config.js
@@ -540,10 +540,19 @@ function setPanelSSL(){
 	});
 }
 
-function setNotifyApi(tag, obj){
+function setNotifyTgbot(obj){
 	var enable = $(obj).prop("checked");
-	// console.log(tag,obj,enable);
-	$.post('/setting/set_notify_email_enable', {'tag':tag, 'enable':enable},function(rdata){
+	$.post('/setting/set_notify_tgbot_enable', {'enable':enable},function(rdata){
+		showMsg(rdata.msg, function(){
+			if (rdata.status){}
+		} ,{icon:rdata.status?1:2}, 1000);
+	},'json');
+}
+
+
+function setNotifyEmail(obj){
+	var enable = $(obj).prop("checked");
+	$.post('/setting/set_notify_email_enable', {'enable':enable},function(rdata){
 		showMsg(rdata.msg, function(){
 			if (rdata.status){}
 		} ,{icon:rdata.status?1:2}, 1000);
@@ -552,16 +561,16 @@ function setNotifyApi(tag, obj){
 
 function getTgbot(){
 	var loadT = layer.msg('正在获取TgBot信息...',{icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/setting/get_notify',{},function(data){
+	$.post('/setting/get_notify_tgbot',{},function(data){
 		layer.close(loadT);
 
 		var app_token = '';
 		var chat_id = '';
 
 		if (data.status){
-			if (typeof(data['data']['tgbot']) !='undefined'){
-				app_token = data['data']['tgbot']['data']['app_token'];
-				chat_id = data['data']['tgbot']['data']['chat_id'];
+			if (data['data']['tgbot'].length != 0){
+				app_token = data['data']['tgbot']['app_token'];
+				chat_id = data['data']['tgbot']['chat_id'];
 			}
 		}
 
@@ -598,7 +607,7 @@ function getTgbot(){
 					return false;
 				}
 
-				$.post('/setting/set_notify',{'tag':'tgbot', 'data':JSON.stringify(pdata)},function(rdata){
+				$.post('/setting/set_notify_tgbot',{'tag':'tgbot', 'data':JSON.stringify(pdata)},function(rdata){
 					showMsg(rdata.msg, function(){
 						if (rdata.status){
 							layer.close(index);
@@ -622,7 +631,7 @@ function getTgbot(){
 					return false;
 				}
 
-				$.post('/setting/set_notify_test',{'tag':'tgbot', 'data':JSON.stringify(pdata)},function(rdata){
+				$.post('/setting/set_notify_tgbot_test',{'tag':'tgbot', 'data':JSON.stringify(pdata)},function(rdata){
 					showMsg(rdata.msg, function(){
 						if (rdata.status){
 							layer.close(index);
diff --git a/web/templates/default/setting.html b/web/templates/default/setting.html
index 1e908c07d..a831407d8 100755
--- a/web/templates/default/setting.html
+++ b/web/templates/default/setting.html
@@ -164,7 +164,7 @@
 
 				<p class="mtb15">
 					<span class="set-tit text-right" title="TelegramBot" style="float: left;">TG机器人通知</span>
-						<input id="cfg_tgbot" name="cfg_tgbot" onclick="setNotifyApi('tgbot',this)" class="btswitch btswitch-ios" type="checkbox" {{data['notify_tgbot_enable']}}>
+						<input id="cfg_tgbot" name="cfg_tgbot" onclick="setNotifyTgbot(this)" class="btswitch btswitch-ios" type="checkbox" {% if data['notify_tgbot']['open'] %}checked{% endif %}>
 						<label class="btswitch-btn ml5" for="cfg_tgbot" style="float: left;margin-top:4px;"></label>
 	                <button ype="button" class="btn btn-default btn-xs panel_api_btn" style="vertical-align: middle; margin-left: 10px" onclick="getTgbot();">TelegramBot配置</button>
 					<span class="set-info c7">Telegram Bot机器人通知【<b style="color:red;">国内可能无法使用</b>】</span>
@@ -172,7 +172,7 @@
 
 				<p class="mtb15">
 					<span class="set-tit text-right" title="绑定账号" style="float: left;">邮件通知</span>
-						<input id="cfg_email" name="cfg_email" onclick="setNotifyApi('email',this)" class="btswitch btswitch-ios" type="checkbox" {% if data['notify_email']['open'] %}checked{% endif %}>
+						<input id="cfg_email" name="cfg_email" onclick="setNotifyEmail(this)" class="btswitch btswitch-ios" type="checkbox" {% if data['notify_email']['open'] %}checked{% endif %}>
 						<label class="btswitch-btn ml5" for="cfg_email" style="float: left;margin-top:4px;"></label>
 	                <button ype="button" class="btn btn-default btn-xs panel_api_btn" style="vertical-align: middle; margin-left: 10px" onclick="getEmailCfg();">邮件配置</button>
 					<span class="set-info c7">邮件通知</span>
diff --git a/web/utils/config.py b/web/utils/config.py
index 5d6737b2d..bc8307893 100644
--- a/web/utils/config.py
+++ b/web/utils/config.py
@@ -82,5 +82,6 @@ def getGlobalVar():
 
     # 邮件通知设置
     data['notify_email'] = thisdb.getOptionByJson('notify_email', default={'open':False}, type='notify')
+    data['notify_tgbot'] = thisdb.getOptionByJson('notify_tgbot', default={'open':False}, type='notify')
     
     return data
\ No newline at end of file

From 8233ba99df8d69df81e3575a2303aed48ed6249f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 9 Nov 2024 19:02:08 +0800
Subject: [PATCH 146/965] update

---
 web/admin/site/__init__.py     |  3 ++-
 web/admin/site/site_default.py | 37 ++++++++++++++++++++++++++
 web/admin/site/site_types.py   | 47 +++++++++++++++++++++++++++++++++-
 web/static/app/site.js         | 26 ++++++++++---------
 4 files changed, 99 insertions(+), 14 deletions(-)
 create mode 100644 web/admin/site/site_default.py

diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index bacb102b1..0a4953884 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -9,4 +9,5 @@
 # ---------------------------------------------------------------------------------
 
 from .site import *
-from .site_types import *
\ No newline at end of file
+from .site_types import *
+from .site_default import *
\ No newline at end of file
diff --git a/web/admin/site/site_default.py b/web/admin/site/site_default.py
new file mode 100644
index 000000000..c3cc30ca3
--- /dev/null
+++ b/web/admin/site/site_default.py
@@ -0,0 +1,37 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin.user_login_check import panel_login_required
+
+from utils.plugin import plugin as MwPlugin
+from utils.site import sites as MwSites
+import utils.site as site
+import core.mw as mw
+import thisdb
+
+from .site import blueprint
+
+@blueprint.route('/get_site_doc', endpoint='get_site_doc',methods=['POST'])
+def get_site_doc():
+    stype = request.form.get('type', '0').strip()
+    vlist = []
+    vlist.append('')
+    vlist.append(mw.getServerDir() +'/openresty/nginx/html/index.html')
+    vlist.append(mw.getServerDir() + '/openresty/nginx/html/404.html')
+    vlist.append(mw.getServerDir() +'/openresty/nginx/html/index.html')
+    vlist.append(mw.getServerDir() + '/web_conf/stop/index.html')
+    data = {}
+    data['path'] = vlist[int(stype)]
+    return mw.returnData(True, 'ok', data)
\ No newline at end of file
diff --git a/web/admin/site/site_types.py b/web/admin/site/site_types.py
index 62104549a..8c3202e1e 100644
--- a/web/admin/site/site_types.py
+++ b/web/admin/site/site_types.py
@@ -9,6 +9,7 @@
 # ---------------------------------------------------------------------------------
 
 import os
+import json
 
 from flask import Blueprint, render_template
 from flask import request
@@ -37,4 +38,48 @@ def get_site_types():
 @panel_login_required
 def add_site_type():
     name = request.form.get('name', '').strip()
-    return MwSites.instance().addSiteTypes(name)
\ No newline at end of file
+    return MwSites.instance().addSiteTypes(name)
+
+
+# 添加网站分类
+@blueprint.route('/remove_site_type', endpoint='remove_site_type',methods=['POST'])
+@panel_login_required
+def remove_site_type():
+    site_type_id = request.form.get('id', '')
+    if mw.M('site_types').where('id=?', (site_type_id,)).count() == 0:
+        return mw.returnData(False, "指定分类不存在!")
+    mw.M('site_types').where('id=?', (site_type_id,)).delete()
+    mw.M("sites").where("type_id=?", (site_type_id,)).save("type_id", (0,))
+    return mw.returnData(True, "分类已删除!")
+
+# 添加网站分类
+@blueprint.route('/modify_site_type_name', endpoint='modify_site_type_name',methods=['POST'])
+@panel_login_required
+def modify_site_type_name():
+    name = request.form.get('name', '').strip()
+    site_type_id = request.form.get('id', '')
+    if not name:
+        return mw.returnData(False, "分类名称不能为空")
+    if len(name) > 18:
+        return mw.returnData(False, "分类名称长度不能超过6个汉字或18位字母")
+    if mw.M('site_types').where('id=?', (site_type_id,)).count() == 0:
+        return mw.returnData(False, "指定分类不存在!")
+    mw.M('site_types').where('id=?', (site_type_id,)).setField('name', name)
+    return mw.returnData(True, "修改成功!")
+
+# 添加网站分类
+@blueprint.route('/set_site_type', endpoint='set_site_type',methods=['POST'])
+@panel_login_required
+def set_site_type():
+    # 设置指定站点的分类
+    site_ids = request.form.get('site_ids', '')
+    site_type_id = request.form.get('id', '')
+    site_ids = json.loads(site_ids)
+    for site_id in site_ids:
+        mw.M('sites').where('id=?', (site_id,)).setField('type_id', site_type_id)
+    return mw.returnData(True, "设置成功!")
+
+
+
+
+
diff --git a/web/static/app/site.js b/web/static/app/site.js
index 1284891a8..0a4041353 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -2704,22 +2704,24 @@ function siteDefaultPage(){
 		closeBtn: 1,
 		shift: 0,
 		content: '<div class="changeDefault pd20">\
-						<button class="btn btn-default btn-sm mg10" style="width:188px" onclick="changeDefault(1)">默认文档</button>\
-						<button class="btn btn-default btn-sm mg10" style="width:188px" onclick="changeDefault(2)">404错误页</button>\
-						<button class="btn btn-default btn-sm mg10" style="width:188px" onclick="changeDefault(3)">空白页</button>\
-						<button class="btn btn-default btn-sm mg10" style="width:188px" onclick="changeDefault(4)">默认站点停止页</button>\
-				</div>'
+			<button class="btn btn-default btn-sm mg10" style="width:188px" onclick="changeDefault(1,this)">默认文档</button>\
+			<button class="btn btn-default btn-sm mg10" style="width:188px" onclick="changeDefault(2,this)">404错误页</button>\
+			<button class="btn btn-default btn-sm mg10" style="width:188px" onclick="changeDefault(3,this)">空白页</button>\
+			<button class="btn btn-default btn-sm mg10" style="width:188px" onclick="changeDefault(4,this)">默认站点停止页</button>\
+		</div>'
 	});
 }
 
-function changeDefault(type){
+function changeDefault(type, obj){
+	$(obj).attr('disabled', true);
 	$.post('/site/get_site_doc','type='+type, function(rdata){
-		showMsg('操作成功!',function(){
-			if (rdata.status){
-				vhref = rdata.data.path;
-				onlineEditFile(0,vhref);
-			}
-		},{icon:rdata.status?1:2});
+		setTimeout(function(){
+			$(obj).attr('disabled', false);
+		},3000);
+		if (rdata.status){
+			var path = rdata.data.path;
+			onlineEditFile(0,path);
+		}
 	},'json');
 }
 

From d50d8abab8c2d8029641398523696d726602b58f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 9 Nov 2024 23:25:16 +0800
Subject: [PATCH 147/965] update

---
 plugins/openresty/index.py   |   7 +-
 web/admin/files/__init__.py  |   8 +
 web/admin/site/php.py        |  59 +++++++
 web/admin/site/site.py       |  96 ++++++++----
 web/admin/site/site_types.py |   4 +-
 web/core/mw.py               |   6 +-
 web/static/app/site.js       |  55 +++----
 web/thisdb/site_types.py     |   9 ++
 web/thisdb/sites.py          |   4 +
 web/utils/file.py            |  55 +++++++
 web/utils/site.py            | 292 ++++++++++++++++++++++++++++++++---
 11 files changed, 510 insertions(+), 85 deletions(-)
 create mode 100644 web/admin/site/php.py

diff --git a/plugins/openresty/index.py b/plugins/openresty/index.py
index 778324890..2b2ea8b59 100755
--- a/plugins/openresty/index.py
+++ b/plugins/openresty/index.py
@@ -10,8 +10,9 @@ import re
 
 
 web_dir = os.getcwd() + "/web"
-sys.path.append(web_dir)
-os.chdir(web_dir)
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
 import core.mw as mw
 
@@ -132,7 +133,7 @@ def checkAuthEq(file, owner='root'):
 
 
 def confReplace():
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
     content = mw.readFile(getConfTpl())
     content = content.replace('{$SERVER_PATH}', service_path)
 
diff --git a/web/admin/files/__init__.py b/web/admin/files/__init__.py
index 12c7ce63a..d81227f80 100644
--- a/web/admin/files/__init__.py
+++ b/web/admin/files/__init__.py
@@ -82,6 +82,14 @@ def get_dir():
     dir_list['page'] = mw.getPage({'p':page, 'row': row, 'tojs':'getFiles', 'count': dir_list['count']}, '1,2,3,4,5,6,7,8')
     return dir_list
 
+# 创建目录
+@blueprint.route('/create_dir', endpoint='create_dir', methods=['POST'])
+@panel_login_required
+def create_dir():
+    path = request.form.get('path', '')
+    return file.createDir(path)
+
+
 # 获取站点日志目录
 @blueprint.route('/get_dir_size', endpoint='get_dir_size', methods=['POST'])
 @panel_login_required
diff --git a/web/admin/site/php.py b/web/admin/site/php.py
new file mode 100644
index 000000000..2425086c9
--- /dev/null
+++ b/web/admin/site/php.py
@@ -0,0 +1,59 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+import json
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin.user_login_check import panel_login_required
+
+from utils.plugin import plugin as MwPlugin
+from utils.site import sites as MwSites
+import utils.site as site
+import core.mw as mw
+import thisdb
+
+from .site import blueprint
+
+@blueprint.route('/get_cli_php_version', endpoint='get_cli_php_version',methods=['POST'])
+@panel_login_required
+def get_cli_php_version():
+    php_dir = mw.getServerDir() + '/php'
+    if not os.path.exists(php_dir):
+        return mw.returnData(False, '未安装PHP,无法设置')
+
+    php_bin = '/usr/bin/php'
+    php_versions = MwSites.instance().getPhpVersion()
+    php_versions = php_versions[1:]
+
+    if len(php_versions) < 1:
+        return mw.returnData(False, '未安装PHP,无法设置')
+
+    if os.path.exists(php_bin) and os.path.islink(php_bin):
+        link_re = os.readlink(php_bin)
+        for v in php_versions:
+            if link_re.find(v['version']) != -1:
+                return mw.returnData({"select": v, "versions": php_versions})
+
+    return {"select": php_versions[0],"versions": php_versions}
+
+@blueprint.route('/set_cli_php_version', endpoint='set_cli_php_version',methods=['POST'])
+@panel_login_required
+def set_cli_php_version():
+    if mw.isAppleSystem():
+        return mw.returnData(False, "开发机不可设置!")
+    version = request.form.get('version', '')
+    return MwSites.instance().setCliPhpVersion(version)
+
+
+
+
diff --git a/web/admin/site/site.py b/web/admin/site/site.py
index 8d628c74e..c3e0972e6 100644
--- a/web/admin/site/site.py
+++ b/web/admin/site/site.py
@@ -167,7 +167,6 @@ def check_web_status():
 def get_php_version():
     return MwSites.instance().getPhpVersion()
 
-
 # 设置网站到期
 @blueprint.route('/set_end_date', endpoint='set_end_date',methods=['POST'])
 @panel_login_required
@@ -206,6 +205,71 @@ def get_rewrite_conf():
     rewrite = MwSites.instance().getRewriteConf(siteName)
     return {'rewrite': rewrite}
 
+# 获取Rewrite模版名
+@blueprint.route('/get_rewrite_tpl', endpoint='get_rewrite_tpl',methods=['POST'])
+@panel_login_required
+def get_php_version():
+    tplname = request.form.get('tplname', '')
+    return MwSites.instance().getRewriteTpl(tplname)
+
+# 获取网站目录
+@blueprint.route('/get_dir_user_ini', endpoint='get_dir_user_ini',methods=['POST'])
+@panel_login_required
+def get_dir_user_ini():
+    site_id = request.form.get('id', '')
+    return MwSites.instance().getDirUserIni(site_id)
+
+# 设置防跨站攻击
+@blueprint.route('/set_dir_user_ini', endpoint='set_dir_user_ini',methods=['POST'])
+@panel_login_required
+def set_dir_user_ini():
+    path = request.form.get('path', '')
+    run_path = request.form.get('run_path', '')
+    return MwSites.instance().setDirUserIni(path,run_path)
+
+# 网站日志开关
+@blueprint.route('/logs_open', endpoint='logs_open',methods=['POST'])
+@panel_login_required
+def logs_open():
+    site_id = request.form.get('id', '')
+    return MwSites.instance().logsOpen(site_id)
+
+# 设置网站路径
+@blueprint.route('/set_path', endpoint='set_path',methods=['POST'])
+@panel_login_required
+def set_path():
+    site_id = request.form.get('id', '')
+    path = request.form.get('path', '')
+    return MwSites.instance().setSitePath(site_id, path)
+
+
+# 设置网站路径
+@blueprint.route('/set_site_run_path', endpoint='set_site_run_path',methods=['POST'])
+@panel_login_required
+def set_site_run_path():
+    site_id = request.form.get('id', '')
+    run_path = request.form.get('run_path', '')
+    return MwSites.instance().setSiteRunPath(site_id, run_path)
+
+
+
+
+# 设置网站 - 开启密码访问
+@blueprint.route('/set_has_pwd', endpoint='set_has_pwd',methods=['POST'])
+@panel_login_required
+def set_has_pwd():
+    site_id = request.form.get('id', '')
+    username = request.form.get('username', '')
+    password = request.form.get('password', '')
+    return MwSites.instance().setHasPwd(site_id, username, password)
+
+# 设置网站 - 关闭密码访问
+@blueprint.route('/close_has_pwd', endpoint='close_has_pwd',methods=['POST'])
+@panel_login_required
+def close_has_pwd():
+    site_id = request.form.get('id', '')
+    return MwSites.instance().closeHasPwd(site_id)
+
 # 获取防盗链信息
 @blueprint.route('/get_security', endpoint='get_security',methods=['POST'])
 @panel_login_required
@@ -239,34 +303,4 @@ def set_default_site():
     name = request.form.get('name', '')
     return MwSites.instance().setDefaultSite(name)
 
-@blueprint.route('/get_cli_php_version', endpoint='get_cli_php_version',methods=['POST'])
-@panel_login_required
-def get_cli_php_version():
-    php_dir = mw.getServerDir() + '/php'
-    if not os.path.exists(php_dir):
-        return mw.returnData(False, '未安装PHP,无法设置')
-
-    php_bin = '/usr/bin/php'
-    php_versions = MwSites.instance().getPhpVersion()
-    php_versions = php_versions[1:]
-
-    if len(php_versions) < 1:
-        return mw.returnData(False, '未安装PHP,无法设置')
-
-    if os.path.exists(php_bin) and os.path.islink(php_bin):
-        link_re = os.readlink(php_bin)
-        for v in php_versions:
-            if link_re.find(v['version']) != -1:
-                return mw.returnData({"select": v, "versions": php_versions})
-
-    return {"select": php_versions[0],"versions": php_versions}
-
-@blueprint.route('/set_cli_php_version', endpoint='set_cli_php_version',methods=['POST'])
-@panel_login_required
-def set_cli_php_version():
-    if mw.isAppleSystem():
-        return mw.returnData(False, "开发机不可设置!")
-    version = request.form.get('version', '')
-    return MwSites.instance().setCliPhpVersion(version)
-
 
diff --git a/web/admin/site/site_types.py b/web/admin/site/site_types.py
index 8c3202e1e..41e3c4396 100644
--- a/web/admin/site/site_types.py
+++ b/web/admin/site/site_types.py
@@ -52,7 +52,7 @@ def remove_site_type():
     mw.M("sites").where("type_id=?", (site_type_id,)).save("type_id", (0,))
     return mw.returnData(True, "分类已删除!")
 
-# 添加网站分类
+# 修改网站分类
 @blueprint.route('/modify_site_type_name', endpoint='modify_site_type_name',methods=['POST'])
 @panel_login_required
 def modify_site_type_name():
@@ -67,7 +67,7 @@ def modify_site_type_name():
     mw.M('site_types').where('id=?', (site_type_id,)).setField('name', name)
     return mw.returnData(True, "修改成功!")
 
-# 添加网站分类
+# 设置网站分类
 @blueprint.route('/set_site_type', endpoint='set_site_type',methods=['POST'])
 @panel_login_required
 def set_site_type():
diff --git a/web/core/mw.py b/web/core/mw.py
index 70f0e391a..f723c7bbd 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -288,7 +288,11 @@ def md5(content):
     except Exception as ex:
         return False
 
-
+def hasPwd(password):
+    # 加密密码字符
+    import crypt
+    return crypt.crypt(password, password)
+    
 def getFileMd5(filename):
     # 文件的MD5值
     if not os.path.isfile(filename):
diff --git a/web/static/app/site.js b/web/static/app/site.js
index 0a4041353..63ed78bb5 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -351,30 +351,30 @@ function webAddPage(type) {
 
 //修改网站目录
 function webPathEdit(id){
-	$.post('/site/get_dir_user_ini','&id='+id, function(data){
-		var userini = data['data'];
-		var webpath = userini['path'];
-		var siteName = userini['name'];
-		var runPath = userini['runPath']['runPath'];
-		var userinicheckeds = userini.userini?'checked':'';
-		var logscheckeds = userini.logs?'checked':'';
-		var opt = ''
+	$.post('/site/get_dir_user_ini','id='+id, function(data){
+		var data = data['data'];
+		var site_path = data['path'];
+		var site_name = data['name'];
+		var run_path = data['run_path']['run_path'];
+		var user_ini_checked = data.user_ini?'checked':'';
+		var logs_checked = data.logs?'checked':'';
+		var opt = '';
 		var selected = '';
-		for(var i=0;i<userini.runPath.dirs.length;i++){
+		for(var i=0;i<data.run_path.dirs.length;i++){
 			selected = '';
-			if(userini.runPath.dirs[i] == userini.runPath.runPath){ 
+			if(data.run_path.dirs[i] == data.run_path.path){ 
 				selected = 'selected';
 			}
-			opt += '<option value="'+ userini.runPath.dirs[i] +'" '+selected+'>'+ userini.runPath.dirs[i] +'</option>'
+			opt += '<option value="'+ data.run_path.dirs[i] +'" '+selected+'>'+ data.run_path.dirs[i] +'</option>';
 		}
-		var webPathHtml = "<div class='webedit-box soft-man-con'>\
+		var content = "<div class='webedit-box soft-man-con'>\
 					<div class='label-input-group ptb10'>\
-						<input type='checkbox' name='userini' id='userini'"+userinicheckeds+" /><label class='mr20' for='userini' style='font-weight:normal'>防跨站攻击(open_basedir)</label>\
-						<input type='checkbox' name='logs' id='logs'"+logscheckeds+" /><label for='logs' style='font-weight:normal'>写访问日志</label>\
+						<input type='checkbox' name='userini' id='userini'"+user_ini_checked+" /><label class='mr20' for='userini' style='font-weight:normal'>防跨站攻击(open_basedir)</label>\
+						<input type='checkbox' name='logs' id='logs'"+logs_checked+" /><label for='logs' style='font-weight:normal'>写访问日志</label>\
 					</div>\
 					<div class='line mt10'>\
 						<span class='mr5'>网站目录</span>\
-						<input class='bt-input-text mr5' type='text' style='width:50%' placeholder='网站根目录' value='"+webpath+"' name='webdir' id='inputPath'>\
+						<input class='bt-input-text mr5' type='text' style='width:50%' placeholder='网站根目录' value='"+site_path+"' name='webdir' id='inputPath'>\
 						<span onclick='changePath(&quot;inputPath&quot;)' class='glyphicon glyphicon-folder-open cursor mr20'></span>\
 						<button class='btn btn-success btn-sm' onclick='setSitePath("+id+")'>保存</button>\
 					</div>\
@@ -389,11 +389,11 @@ function webPathEdit(id){
 					</ul>"
 					+'<div class="user_pw_tit" style="margin-top: -8px;padding-top: 11px;">'
 						+'<span class="tit">密码访问</span>'
-						+'<span class="btswitch-p"><input '+(userini.pass?'checked':'')+' class="btswitch btswitch-ios" id="pathSafe" type="checkbox">'
+						+'<span class="btswitch-p"><input '+(data.pass?'checked':'')+' class="btswitch btswitch-ios" id="pathSafe" type="checkbox">'
 							+'<label class="btswitch-btn phpmyadmin-btn" for="pathSafe" onclick="pathSafe('+id+')"></label>'
 						+'</span>'
 					+'</div>'
-					+'<div class="user_pw" style="margin-top: 10px;display:'+(userini.pass?'block;':'none;')+'">'
+					+'<div class="user_pw" style="margin-top: 10px;display:'+(data.pass?'block;':'none;')+'">'
 						+'<p><span>授权账号</span><input id="username_get" class="bt-input-text" name="username_get" value="" type="text" placeholder="不修改请留空"></p>'
 						+'<p><span>访问密码</span><input id="password_get_1" class="bt-input-text" name="password_get_1" value="" type="password" placeholder="不修改请留空"></p>'
 						+'<p><span>重复密码</span><input id="password_get_2" class="bt-input-text" name="password_get_1" value="" type="password" placeholder="不修改请留空"></p>'
@@ -401,14 +401,11 @@ function webPathEdit(id){
 					+'</div>'
 				+'</div>';
 
-		$("#webedit-con").html(webPathHtml);		
+		$("#webedit-con").html(content);		
 		$("#userini").change(function(){
-			$.post('/site/set_dir_user_ini',{
-				'path':webpath,
-				'runPath':runPath,
-			},function(userini){
-				layer.msg(userini.msg+'<p style="color:red;">注意：设置防跨站需要重启PHP才能生效!</p>',{icon:userini.status?1:2});
-				tryRestartPHP(siteName);
+			$.post('/site/set_dir_user_ini',{'path':site_path,'run_path':run_path,},function(userini){
+				layer.msg(data.msg+'<p style="color:red;">注意：设置防跨站需要重启PHP才能生效!</p>',{icon:data.status?1:2});
+				tryRestartPHP(site_name);
 			},'json');
 		});
 		
@@ -458,10 +455,9 @@ function setPathSafe(id){
 function setSiteRunPath(id){
 	var NewPath = $("#runPath").val();
 	var loadT = layer.msg(lan.public.the,{icon:16,time:10000,shade: [0.3, '#000']});
-	$.post('/site/set_site_run_path','id='+id+'&runPath='+NewPath,function(rdata){
+	$.post('/site/set_site_run_path','id='+id+'&run_path='+NewPath,function(rdata){
 		layer.close(loadT);
-		var ico = rdata.status?1:2;
-		layer.msg(rdata.msg,{icon:ico});
+		layer.msg(rdata.msg,{icon:rdata.status?1:2});
 	},'json');
 }
 
@@ -2898,7 +2894,7 @@ function tryRestartPHP(siteName){
 		var phpversion = data.phpversion;
 
 		if (phpversion == "00"){
-			return
+			return;
 		}
 		
 		var php_sign = 'php';
@@ -2915,11 +2911,10 @@ function tryRestartPHP(siteName){
 		var reqData = {name: php_sign, func:'restart'}
 		reqData['version'] = phpversion;
 
-		// console.log(reqData);
 		var loadT = layer.msg('尝试自动重启PHP['+phpversion+']...', { icon: 16, time: 0, shade: 0.3 });
 		$.post('/plugins/run', reqData, function(data) {
 			layer.close(loadT);
-	        layer.msg(data.msg,{icon:data.status?1:2,time:3000,shade: [0.3, '#000']});
+	        layer.msg( 'PHP['+phpversion+']'+(data.status?'重启成功!':'重启失败!'),{icon:data.status?1:2,time:3000,shade: [0.3, '#000']});
 	    },'json');
 	},'json');
 }
\ No newline at end of file
diff --git a/web/thisdb/site_types.py b/web/thisdb/site_types.py
index 82d64267e..54751f64d 100644
--- a/web/thisdb/site_types.py
+++ b/web/thisdb/site_types.py
@@ -12,6 +12,15 @@ __FIELD = 'id,name'
 
 import core.mw as mw
 
+def addSiteTypes(name):
+    return mw.M('site_types').add("name", (name,))
+
+def getSiteTypesCount():
+    return mw.M('site_types').count()
+
+def getSiteTypesCountByName(name):
+    return mw.M('site_types').where('name=?', (name,)).count()
+
 def getSiteTypesList():
     # .debug(True)
     return mw.M('site_types').field(__FIELD).order("id asc").select()
diff --git a/web/thisdb/sites.py b/web/thisdb/sites.py
index 332f6b1a5..f212e1d02 100644
--- a/web/thisdb/sites.py
+++ b/web/thisdb/sites.py
@@ -78,6 +78,7 @@ def deleteSitesById(site_id):
 def setSitesData(site_id,
     edate: str | None = None,
     ps: str | None = None,
+    path: str | None = None,
 ):
     update_data = {}
     if edate is not None:
@@ -85,5 +86,8 @@ def setSitesData(site_id,
     if ps is not None:
         update_data['ps'] = ps
 
+    if path is not None:
+        update_data['path'] = path
+
     return mw.M('sites').where('id=?',(site_id,)).update(update_data)
 
diff --git a/web/utils/file.py b/web/utils/file.py
index d962bf9f6..691479979 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -17,6 +17,61 @@ from admin import model
 import core.mw as mw
 import thisdb
 
+def setFileAccept(filename):
+    auth = 'www:www'
+    if mw.getOs() == 'darwin':
+        user = mw.execShell("who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
+        auth = user + ':staff'
+    os.system('chown -R ' + auth + ' ' + filename)
+    os.system('chmod -R 755 ' + filename)
+
+def createDir(path):
+    try:
+        if not checkFileName(path):
+            return mw.returnData(False, '目录名中不能包含特殊字符!')
+        if os.path.exists(path):
+            return mw.returnData(False, '指定目录已存在!')
+        os.makedirs(path)
+        setFileAccept(path)
+        msg = mw.getInfo('创建目录[{1}]成功!', (path,))
+        mw.writeLog('文件管理', msg)
+        return mw.returnData(True, '目录创建成功!')
+    except Exception as e:
+        print(e)
+        return mw.returnData(False, '目录创建失败!')
+
+# 检查敏感目录
+def checkDir(path):
+    path = path.replace('//', '/')
+    if path[-1:] == '/':
+        path = path[:-1]
+
+    sense_dir = ('',
+        '/',
+        '/*',
+        '/www',
+        '/root',
+        '/boot',
+        '/bin',
+        '/etc',
+        '/home',
+        '/dev',
+        '/sbin',
+        '/var',
+        '/usr',
+        '/tmp',
+        '/sys',
+        '/proc',
+        '/media',
+        '/mnt',
+        '/opt',
+        '/lib',
+        '/srv',
+        '/selinux',
+        '/www/server',
+        mw.getRootDir())
+    return not path in sense_dir
+
 def getFileBody(path):
     if not os.path.exists(path):
         return mw.returnData(False, '文件不存在', (path,))
diff --git a/web/utils/site.py b/web/utils/site.py
index 4c49b7c7a..e5452e005 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -187,7 +187,7 @@ class sites(object):
         return mw.returnData(True, '添加成功')
 
 
-    def deleteWSLogs(self, webname):
+    def deleteALlLogs(self, webname):
         assLogPath = mw.getLogsDir() + '/' + webname + '.log'
         errLogPath = mw.getLogsDir() + '/' + webname + '.error.log'
         confFile = self.setupPath + '/nginx/vhost/' + webname + '.conf'
@@ -216,13 +216,12 @@ class sites(object):
 
     def delete(self, site_id, path):
         info = thisdb.getSitesById(site_id)
-        print(info)
         webname = info['name']
-        self.deleteWSLogs(webname)
+        self.deleteALlLogs(webname)
 
         if path == '1':
-            rootPath = mw.getWwwDir() + '/' + webname
-            mw.execShell('rm -rf ' + rootPath)
+            web_root_path = mw.getWwwDir() + '/' + webname
+            mw.execShell('rm -rf ' + web_root_path)
 
         # ssl
         ssl_dir = self.sslDir + '/' + webname
@@ -243,13 +242,13 @@ class sites(object):
         binding_list = thisdb.getBindingListBySiteId(site_id)
         for x in binding_list:
             tag = mw.getLogsDir() + "/" + webname + "_" + x['domain']
-            wlog = tag + ".log"
-            wlog_error = tag + ".error.log"
+            site_log = tag + ".log"
+            site_error = tag + ".error.log"
 
-            if os.path.exists(wlog):
-                mw.execShell('rm -rf ' + wlog)
-            if os.path.exists(wlog_error):
-                mw.execShell('rm -rf ' + wlog_error)
+            if os.path.exists(site_log):
+                mw.execShell('rm -rf ' + site_log)
+            if os.path.exists(site_error):
+                mw.execShell('rm -rf ' + site_error)
 
         thisdb.deleteBindingBySiteId(site_id)
         mw.restartWeb()
@@ -274,6 +273,22 @@ class sites(object):
         content = content.replace('{$LOGPATH}', logsPath)
         mw.writeFile(vhost_file, content)
 
+        # 和反代配置冲突 && 默认伪静态为空
+#         rewrite_content = '''
+# location /{
+#     if ($PHP_ENV != "1"){
+#         break;
+#     }
+
+#     if (!-e $request_filename) {
+#        rewrite  ^(.*)$  /index.php/$1  last;
+#        break;
+#     }
+# }
+# '''
+        rewrite_file = self.getRewriteConf(self.siteName)
+        mw.writeFile(rewrite_file, '')
+
     # 设置网站过期
     def setEndDate(self, site_id, end_date):
         info = thisdb.getSitesById(site_id)
@@ -299,6 +314,13 @@ class sites(object):
         data =  thisdb.getDomainByPid(pid)
         return data
 
+    # 获取模版名内容
+    def getRewriteTpl(self, tplname):
+        file = mw.getPanelDir() + '/rewrite/nginx/' + tplname + '.conf'
+        if not os.path.exists(file):
+            return mw.returnData(False, '模版不存在!')
+        return mw.returnData(True, 'OK', file)
+
     def getRewriteList(self):
         rewriteList = {}
         rewriteList['rewrite'] = []
@@ -309,6 +331,237 @@ class sites(object):
         rewriteList['rewrite'] = sorted(rewriteList['rewrite'])
         return rewriteList
 
+    # 取日志状态
+    def getLogsStatus(self, siteName):
+        filename = self.getHostConf(siteName)
+        conf = mw.readFile(filename)
+        if conf.find('#ErrorLog') != -1:
+            return False
+        if conf.find("access_log  off") != -1:
+            return False
+        return True
+
+    # 取目录加密状态
+    def getHasPwd(self, siteName):
+        filename = self.getHostConf(siteName)
+        conf = mw.readFile(filename)
+        if conf.find('#AUTH_START') != -1:
+            return True
+        return False
+
+    # 取当站点前运行目录
+    def getSiteRunPath(self, site_name, site_path):
+        filename = self.getHostConf(site_name)
+        if os.path.exists(filename):
+            conf = mw.readFile(filename)
+            rep = r'\s*root\s*(.+);'
+            path = re.search(rep, conf).groups()[0]
+
+        data = {}
+        if site_path == path:
+            data['path'] = '/'
+        else:
+            data['path'] = path.replace(site_path, '')
+
+        dirnames = []
+        dirnames.append('/')
+        for filename in os.listdir(site_path):
+            try:
+                file_path = site_path + '/' + filename
+                if os.path.islink(file_path):
+                    continue
+                if os.path.isdir(file_path):
+                    dirnames.append('/' + filename)
+            except:
+                pass
+
+        data['dirs'] = dirnames
+        return data
+
+    def getDirUserIni(self, site_id):
+
+        info = thisdb.getSitesById(site_id)
+
+        path = info['path']
+        name = info['name']
+        data = {}
+        data['logs'] = self.getLogsStatus(name)
+        data['run_path'] = self.getSiteRunPath(name, path)
+
+        data['user_ini'] = False
+        if os.path.exists(path + '/.user.ini'):
+            data['user_ini'] = True
+
+        if data['run_path']['path'] != '/':
+            user_ini = path + data['run_path']['path'] + '/.user.ini'
+            if os.path.exists(user_ini):
+                data['userini'] = True
+
+        data['pass'] = self.getHasPwd(name)
+        data['path'] = path
+        data['name'] = name
+        return mw.returnData(True, 'OK', data)
+
+    # 清除多余user.ini
+    def delUserInI(self, path, up=0):
+        filename = path + '/.user.ini'
+        if os.path.exists(filename):
+            mw.execShell("which chattr && chattr -i " + filename)
+            os.remove(filename)
+        
+        for f in os.listdir(path):
+            try:
+                npath = path + '/' + f
+                if os.path.isdir(npath):
+                    if up < 100:
+                        self.delUserInI(npath, up + 1)
+
+                user_ini = npath + '/.user.ini'
+                print('ff:',user_ini)
+                if not os.path.exists(user_ini):
+                    continue
+                mw.execShell('which chattr && chattr -i ' + user_ini)
+                os.remove(user_ini)
+            except:
+                continue
+        return True
+
+
+    # 设置目录防御
+    def addDirUserIni(self, site_path, run_path):
+        new_path = site_path + run_path
+        filename = new_path + '/.user.ini'
+        if os.path.exists(filename):
+            return mw.returnData(True, '已打开防跨站设置!')
+
+        open_path = 'open_basedir={}/:{}/'.format(new_path, site_path)
+        if run_path == '/' or run_path == '':
+            open_path = 'open_basedir={}/'.format(site_path)
+
+        mw.writeFile(filename, open_path + ':/www/server/php:/tmp/:/proc/')
+        mw.execShell("which chattr && chattr +i " + filename)
+
+    def setDirUserIni(self, site_path, run_path):
+        filename = site_path + '/.user.ini'
+        if os.path.exists(filename):
+            self.delUserInI(site_path)
+            return mw.returnData(True, '已清除防跨站设置!')
+        self.addDirUserIni(site_path, run_path)
+        return mw.returnData(True, '已打开防跨站设置!')
+
+    def logsOpen(self, site_id):
+        info = thisdb.getSitesById(site_id)
+        name = info['name']
+
+        filename = self.getHostConf(name)
+        if os.path.exists(filename):
+            conf = mw.readFile(filename)
+            rep = self.logsPath + '/' + name + '.log'
+            if conf.find(rep) != -1:
+                conf = conf.replace(rep + ' main', 'off')
+            else:
+                conf = conf.replace('access_log  off', 'access_log  ' + rep + ' main')
+            mw.writeFile(filename, conf)
+
+        mw.restartWeb()
+        return mw.returnData(True, '操作成功!')
+
+    def setSitePath(self, site_id, path):
+        path = self.getPath(path)
+        if path == "" or site_id == '0':
+            return mw.returnData(False,  "目录不能为空!")
+
+        import utils.file as file
+        if not file.checkDir(path):
+            return mw.returnData(False,  "不能以系统关键目录作为站点目录")
+
+        info = thisdb.getSitesById(site_id)
+        if info['path'] == path:
+            return mw.returnData(False,  "与原路径一致，无需修改!")
+        conf_file = self.getHostConf(info['name'])
+        content = mw.readFile(conf_file)
+        if content:
+            content = content.replace(info['path'], path)
+            mw.writeFile(file, content)
+
+        thisdb.setSitesData(site_id, path=path)
+        msg = mw.getInfo('修改网站[{1}]物理路径成功!', (info['name'],))
+        mw.writeLog('网站管理', msg)
+        mw.restartWeb()
+        return mw.returnData(True,  "设置成功!")
+
+    # 设置当前站点运行目录
+    def setSiteRunPath(self, site_id, run_path):
+        info = thisdb.getSitesById(site_id)
+        site_name = info['name']
+        site_path = info['path']
+
+        new_path = site_path + run_path
+
+        # 处理Nginx
+        filename = self.getHostConf(site_name)
+        if os.path.exists(filename):
+            conf = mw.readFile(filename)
+            rep = r'\s*root\s*(.+);'
+            path = re.search(rep, conf).groups()[0]
+            conf = conf.replace(path, new_path)
+            mw.writeFile(filename, conf)
+
+        self.setSitePath(site_path, run_path)
+        mw.restartWeb()
+        return mw.returnData(True, '设置成功!')
+
+    # 设置目录加密
+    def setHasPwd(self, site_id, username, password):
+        if len(username.strip()) == 0 or len(password.strip()) == 0:
+            return mw.returnData(False, '用户名或密码不能为空!')
+
+        info = thisdb.getSitesById(site_id)
+        siteName = info['name']
+        filename = self.passPath + '/' + siteName + '.pass'
+        passconf = username + ':' + mw.hasPwd(password)
+
+        configFile = self.getHostConf(siteName)
+        # 处理Nginx配置
+        conf = mw.readFile(configFile)
+        if conf:
+            rep = '#error_page   404   /404.html;'
+            if conf.find(rep) == -1:
+                rep = '#error_page 404/404.html;'
+            data = '''
+    #AUTH_START
+    auth_basic "Authorization";
+    auth_basic_user_file %s;
+    #AUTH_END''' % (filename,)
+            conf = conf.replace(rep, rep + data)
+            mw.writeFile(configFile, conf)
+        # 写密码配置
+        passDir = self.passPath
+        if not os.path.exists(passDir):
+            mw.execShell('mkdir -p ' + passDir)
+        mw.writeFile(filename, passconf)
+
+        msg = mw.getInfo('设置网站[{1}]为需要密码认证!', (siteName,))
+        mw.writeLog("网站管理", msg)
+        mw.restartWeb()
+        return mw.returnData(True, '设置成功!')
+
+    # 取消目录加密
+    def closeHasPwd(self, site_id):
+        info = thisdb.getSitesById(site_id)
+        siteName = info['name']
+        configFile = self.getHostConf(siteName)
+        if os.path.exists(configFile):
+            conf = mw.readFile(configFile)
+            rep = r"\n\s*#AUTH_START(.|\n){1,200}#AUTH_END"
+            conf = re.sub(rep, '', conf)
+            mw.writeFile(configFile, conf)
+
+        msg = mw.getInfo('清除网站[{1}]的密码认证!', (siteName,))
+        mw.writeLog("网站管理", msg)
+        mw.restartWeb()
+        return mw.returnData(True, '设置成功!')
+
     def getSecurity(self, site_id):
         info = thisdb.getSitesById(site_id)
         name = info['name']
@@ -323,10 +576,8 @@ class sites(object):
             data['status'] = False
             data['none'] = False
 
-            valid_referers = re.search(
-                r"valid_referers\s+(.+);\n", tmp)
-            valid_referers_none = re.search(
-                r"valid_referers\s+none\s+blocked\s+(.+);\n", tmp)
+            valid_referers = re.search(r"valid_referers\s+(.+);\n", tmp)
+            valid_referers_none = re.search(r"valid_referers\s+none\s+blocked\s+(.+);\n", tmp)
 
             if valid_referers or valid_referers_none:
                 data['status'] = True
@@ -592,11 +843,16 @@ class sites(object):
             return mw.returnData(False, "分类名称不能为空")
         if len(name) > 18:
             return mw.returnData(False, "分类名称长度不能超过6个汉字或18位字母")
-        if mw.M('site_types').count() >= 10:
+
+        all_count = thisdb.getSiteTypesCount()
+        if all_count >= 10:
             return mw.returnData(False, '最多添加10个分类!')
-        if mw.M('site_types').where('name=?', (name,)).count() > 0:
+
+        name_count = thisdb.getSiteTypesCountByName(name)
+        if name_count > 0:
             return mw.returnData(False, "指定分类名称已存在!")
-        mw.M('site_types').add("name", (name,))
+
+        thisdb.addSiteTypes(name)
         return mw.returnData(True, '添加成功!')
 
 

From 433ad507e7c7f1eae8fc060973b725effc44e190 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 9 Nov 2024 23:31:56 +0800
Subject: [PATCH 148/965] update

---
 web/admin/site/__init__.py |  4 +++-
 web/admin/site/logs.py     | 45 ++++++++++++++++++++++++++++++++++++++
 web/utils/site.py          | 14 ++++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 web/admin/site/logs.py

diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index 0a4953884..b4691d745 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -10,4 +10,6 @@
 
 from .site import *
 from .site_types import *
-from .site_default import *
\ No newline at end of file
+from .site_default import *
+from .php import *
+from .logs import *
\ No newline at end of file
diff --git a/web/admin/site/logs.py b/web/admin/site/logs.py
new file mode 100644
index 000000000..4ae249cf5
--- /dev/null
+++ b/web/admin/site/logs.py
@@ -0,0 +1,45 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+import json
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin.user_login_check import panel_login_required
+
+from utils.plugin import plugin as MwPlugin
+from utils.site import sites as MwSites
+import utils.site as site
+import core.mw as mw
+import thisdb
+
+from .site import blueprint
+
+@blueprint.route('/get_logs', endpoint='get_logs',methods=['POST'])
+@panel_login_required
+def get_logs():
+    siteName = request.form.get('siteName', '')
+    return MwSites.instance().getLogs(siteName)
+
+
+@blueprint.route('/get_error_logs', endpoint='get_error_logs',methods=['POST'])
+@panel_login_required
+def get_error_logs():
+    siteName = request.form.get('siteName', '')
+    return MwSites.instance().getErrorLogs(siteName)
+
+
+
+
+
+
+
diff --git a/web/utils/site.py b/web/utils/site.py
index e5452e005..d6785d6aa 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -314,6 +314,20 @@ class sites(object):
         data =  thisdb.getDomainByPid(pid)
         return data
 
+    # 获取日志内容
+    def getLogs(self, siteName):
+        logPath = mw.getLogsDir() + '/' + siteName + '.log'
+        if not os.path.exists(logPath):
+            return mw.returnData(False, '日志为空')
+        return mw.returnData(True, mw.getLastLine(logPath, 100))
+
+    # 获取错误日志内容
+    def getErrorLogs(self, siteName):
+        logPath = mw.getLogsDir() + '/' + siteName + '.error.log'
+        if not os.path.exists(logPath):
+            return mw.returnData(False, '日志为空')
+        return mw.returnData(True, mw.getLastLine(logPath, 100))
+
     # 获取模版名内容
     def getRewriteTpl(self, tplname):
         file = mw.getPanelDir() + '/rewrite/nginx/' + tplname + '.conf'

From e5ed04ce319b0d9d40d8576f39280bbe31e4254b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 10 Nov 2024 02:15:35 +0800
Subject: [PATCH 149/965] update

---
 web/admin/site/__init__.py |   5 +-
 web/admin/site/dir.py      |  83 ++++++++++++
 web/admin/site/redirect.py |  58 ++++++++
 web/admin/site/site.py     |  17 ---
 web/admin/site/ssl.py      |  33 +++++
 web/core/db.py             |   3 +-
 web/static/app/site.js     |  33 ++---
 web/thisdb/binding.py      |  18 ++-
 web/thisdb/domain.py       |   6 +-
 web/utils/site.py          | 265 ++++++++++++++++++++++++++++++++++++-
 10 files changed, 469 insertions(+), 52 deletions(-)
 create mode 100644 web/admin/site/dir.py
 create mode 100644 web/admin/site/redirect.py
 create mode 100644 web/admin/site/ssl.py

diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index b4691d745..f98b21bb5 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -12,4 +12,7 @@ from .site import *
 from .site_types import *
 from .site_default import *
 from .php import *
-from .logs import *
\ No newline at end of file
+from .logs import *
+from .dir import *
+from .redirect import *
+from .ssl import *
\ No newline at end of file
diff --git a/web/admin/site/dir.py b/web/admin/site/dir.py
new file mode 100644
index 000000000..19c153f06
--- /dev/null
+++ b/web/admin/site/dir.py
@@ -0,0 +1,83 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+import json
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin.user_login_check import panel_login_required
+
+from utils.plugin import plugin as MwPlugin
+from utils.site import sites as MwSites
+import utils.site as site
+import core.mw as mw
+import thisdb
+
+from .site import blueprint
+
+# 获取网站目录
+@blueprint.route('/get_dir_user_ini', endpoint='get_dir_user_ini',methods=['POST'])
+@panel_login_required
+def get_dir_user_ini():
+    site_id = request.form.get('id', '')
+    return MwSites.instance().getDirUserIni(site_id)
+
+# 设置防跨站攻击
+@blueprint.route('/set_dir_user_ini', endpoint='set_dir_user_ini',methods=['POST'])
+@panel_login_required
+def set_dir_user_ini():
+    path = request.form.get('path', '')
+    run_path = request.form.get('run_path', '')
+    return MwSites.instance().setDirUserIni(path,run_path)
+
+# 获取子目录绑定
+@blueprint.route('/get_dir_binding', endpoint='get_dir_binding',methods=['POST'])
+@panel_login_required
+def get_dir_binding():
+    site_id = request.form.get('id', '')
+    return MwSites.instance().getDirBinding(site_id)
+
+
+# 添加子目录绑定
+@blueprint.route('/add_dir_bind', endpoint='add_dir_bind',methods=['POST'])
+@panel_login_required
+def add_dir_bind():
+    site_id = request.form.get('id', '')
+    domain = request.form.get('domain', '')
+    dir_name = request.form.get('dir_name', '')
+    return MwSites.instance().addDirBind(site_id,domain,dir_name)
+
+
+# 获取目录绑定rewrite
+@blueprint.route('/get_dir_bind_rewrite', endpoint='get_dir_bind_rewrite',methods=['POST'])
+@panel_login_required
+def get_dir_bind_rewrite():
+    binding_id = request.form.get('id', '')
+    add = request.form.get('add', '')
+    return MwSites.instance().getDirBindingRewrite(binding_id,add)
+
+
+# 获取目录绑定rewrite
+@blueprint.route('/del_dir_bind', endpoint='del_dir_bind',methods=['POST'])
+@panel_login_required
+def del_dir_bind():
+    binding_id = request.form.get('id', '')
+    return MwSites.instance().delDirBinding(binding_id)
+
+
+
+
+
+
+
+
+
diff --git a/web/admin/site/redirect.py b/web/admin/site/redirect.py
new file mode 100644
index 000000000..c74983ed4
--- /dev/null
+++ b/web/admin/site/redirect.py
@@ -0,0 +1,58 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+import json
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin.user_login_check import panel_login_required
+
+from utils.plugin import plugin as MwPlugin
+from utils.site import sites as MwSites
+import utils.site as site
+import core.mw as mw
+import thisdb
+
+from .site import blueprint
+
+# 获取重定向列表
+@blueprint.route('/get_redirect', endpoint='get_redirect', methods=['POST'])
+@panel_login_required
+def get_redirect():
+    site_name = request.form.get("siteName", '')
+    return MwSites.instance().getRedirect(site_name)
+
+# 设置重定向列表
+@blueprint.route('/set_redirect', endpoint='set_redirect', methods=['POST'])
+@panel_login_required
+def set_redirect():
+    site_name = request.form.get("siteName", '')
+    site_from = request.form.get("from", '')
+    to = request.form.get("to", '')                 # redirect to
+    type = request.form.get("type", '')             # path / domain
+    r_type = request.form.get("r_type", '')         # redirect type
+    keep_path = request.form.get("keep_path", '')   # keep path
+    return MwSites.instance().setRedirect(site_name, site_from, to, type, r_type, keep_path)
+
+# 设置重定向配置
+@blueprint.route('/get_redirect_conf', endpoint='get_redirect_conf', methods=['POST'])
+@panel_login_required
+def get_redirect_conf():
+    site_name = request.form.get("siteName", '')
+    rid = request.form.get("id", '')
+    return MwSites.instance().getRedirectConf(site_name, rid) 
+
+
+
+
+
+
diff --git a/web/admin/site/site.py b/web/admin/site/site.py
index c3e0972e6..6cbde59e0 100644
--- a/web/admin/site/site.py
+++ b/web/admin/site/site.py
@@ -212,21 +212,6 @@ def get_php_version():
     tplname = request.form.get('tplname', '')
     return MwSites.instance().getRewriteTpl(tplname)
 
-# 获取网站目录
-@blueprint.route('/get_dir_user_ini', endpoint='get_dir_user_ini',methods=['POST'])
-@panel_login_required
-def get_dir_user_ini():
-    site_id = request.form.get('id', '')
-    return MwSites.instance().getDirUserIni(site_id)
-
-# 设置防跨站攻击
-@blueprint.route('/set_dir_user_ini', endpoint='set_dir_user_ini',methods=['POST'])
-@panel_login_required
-def set_dir_user_ini():
-    path = request.form.get('path', '')
-    run_path = request.form.get('run_path', '')
-    return MwSites.instance().setDirUserIni(path,run_path)
-
 # 网站日志开关
 @blueprint.route('/logs_open', endpoint='logs_open',methods=['POST'])
 @panel_login_required
@@ -252,8 +237,6 @@ def set_site_run_path():
     return MwSites.instance().setSiteRunPath(site_id, run_path)
 
 
-
-
 # 设置网站 - 开启密码访问
 @blueprint.route('/set_has_pwd', endpoint='set_has_pwd',methods=['POST'])
 @panel_login_required
diff --git a/web/admin/site/ssl.py b/web/admin/site/ssl.py
new file mode 100644
index 000000000..7c9b0ad82
--- /dev/null
+++ b/web/admin/site/ssl.py
@@ -0,0 +1,33 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+import json
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin.user_login_check import panel_login_required
+
+from utils.plugin import plugin as MwPlugin
+from utils.site import sites as MwSites
+import utils.site as site
+import core.mw as mw
+import thisdb
+
+from .site import blueprint
+
+
+
+
+
+
+
+
diff --git a/web/core/db.py b/web/core/db.py
index 0d63b222b..2cd72efa8 100755
--- a/web/core/db.py
+++ b/web/core/db.py
@@ -191,7 +191,8 @@ class Sql():
             self.__close()
             return data
         except Exception as ex:
-            return "error: " + str(ex)
+            # return "error: " + str(ex)
+            return []
 
     def inquiry(self, input_field=''):
         # 查询数据集
diff --git a/web/static/app/site.js b/web/static/app/site.js
index 63ed78bb5..798e536d1 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -1347,13 +1347,13 @@ function showRewrite(rdata){
 //添加子目录绑定
 function addDirBinding(id){
 	var domain = $("input[name='domain']").val();
-	var dirName = $("select[name='dirName']").val();
-	if(domain == '' || dirName == '' || dirName == null){
+	var dir_name = $("select[name='dirName']").val();
+	if(domain == '' || dir_name == '' || dir_name == null){
 		layer.msg(lan.site.d_s_empty,{icon:2});
 		return;
 	}
 	
-	var data = 'id='+id+'&domain='+domain+'&dirName='+dirName;
+	var data = 'id='+id+'&domain='+domain+'&dir_name='+dir_name;
 	$.post('/site/add_dir_bind',data,function(rdata){
 		dirBinding(id);
 		layer.msg(rdata.msg,{icon:rdata.status?1:2});
@@ -1421,6 +1421,7 @@ function to301(siteName, type, obj){
 			$('.btn-colse-prosy').click(function() {
 				layer.close(redirect_form);
 			});
+
 			$('.btn-submit-redirect').click(function() {
 				var keep_path = $('[name="keep_path"]').prop('checked') ? 1 : 0;
 				var r_type = $('[name="r_type"]').val();
@@ -1428,24 +1429,14 @@ function to301(siteName, type, obj){
 				var from = $('[name="from"]').val();
 				var to = $('[name="to"]').val();
 				
-				$.post('/site/set_redirect', {
-					siteName: siteName,
-					type: type,
-					r_type: r_type,
-					from: from,
-					to: to,
-					keep_path: keep_path
-				}, function(res) {
-					res = JSON.parse(res);
-					if (res.status) {
+				$.post('/site/set_redirect', {siteName: siteName,type: type,r_type: r_type,from: from,to: to,keep_path: keep_path}, function(data) {
+					if (data.status) {
 						layer.close(redirect_form);
-						to301(siteName)
+						to301(siteName);
 					} else {
-						layer.msg(res.msg, {
-							icon: 2
-						});
+						layer.msg(data.msg, {icon: 2});
 					}
-				});
+				},'json');
 			});
 		}, 100);
 	}
@@ -1455,14 +1446,13 @@ function to301(siteName, type, obj){
 			siteName: siteName,
 			id: obj,
 		}, function(res) {
-			res = JSON.parse(res);
 			if (res.status == true) {
 				layer.msg('删除成功', {time: 1000,icon: 1});
 				to301(siteName);
 			} else {
 				layer.msg(res.msg, {time: 1000,icon: 2});
 			}
-		});
+		},'json');
 		return
 	}
 
@@ -1471,7 +1461,6 @@ function to301(siteName, type, obj){
 		var data = {siteName: siteName,id: obj};
 		$.post('/site/get_redirect_conf', data, function(res) {
 			layer.close(laoding);
-			res = JSON.parse(res);
 			if (res.status == true) {
 				var mBody = "<div class='webEdit-box' style='padding: 20px'>\
 				<textarea style='height: 320px; width: 445px; margin-left: 20px; line-height:18px' id='configRedirectBody'>"+res.data.result+"</textarea>\
@@ -2326,7 +2315,7 @@ function opSSL(type, id, siteName, callback){
 			var key = '';
 			var csr = '';
 			var loadT = layer.msg('正在提交任务...',{icon:16,time:0,shade: [0.3, '#000']});
-			$.post('site/get_ssl','site_name='+siteName,function(data){
+			$.post('/site/get_ssl','site_name='+siteName,function(data){
 				layer.close(loadT);
 				var rdata = data['data'];
 
diff --git a/web/thisdb/binding.py b/web/thisdb/binding.py
index ea968812d..689989530 100644
--- a/web/thisdb/binding.py
+++ b/web/thisdb/binding.py
@@ -14,6 +14,10 @@ import core.mw as mw
 
 __FIELD = 'id,pid,domain,port,path,add_time'
 
+def getBindingCountByDomain(name):
+    # .debug(True)
+    return mw.M('binding').where("domain=?", (name,)).count()
+
 def addBinding(pid, domain, port, path):
     now_time = mw.getDateFromNow()
     insert_data = {
@@ -25,15 +29,17 @@ def addBinding(pid, domain, port, path):
     }
     return mw.M('binding').insert(insert_data)
 
-
 def getBindingListBySiteId(site_id):
-    task_list = mw.M('binding').where('pid=?', (site_id,)).field(__FIELD).select()
-    return task_list
+    # .debug(True)
+    binding_list = mw.M('binding').field(__FIELD).where('pid=?', (site_id,)).select()
+    return binding_list
+
+def getBindingById(site_id):
+    return mw.M('binding').where("id=?", (site_id,)).field(__FIELD).find()
 
 
-
-def deleteBindingId(domain_id):
-    return mw.M('binding').where("id=?", (domain_id,)).delete()
+def deleteBindingById(binding_id):
+    return mw.M('binding').where("id=?", (binding_id,)).delete()
 
 def deleteBindingBySiteId(site_id):
     return mw.M('binding').where("pid=?", (site_id,)).delete()
diff --git a/web/thisdb/domain.py b/web/thisdb/domain.py
index fb163a624..bdf3e47d2 100644
--- a/web/thisdb/domain.py
+++ b/web/thisdb/domain.py
@@ -12,6 +12,10 @@ import core.mw as mw
 
 __FIELD = 'id,pid,name,port,add_time'
 
+def getDomainCountByName(name):
+    # .debug(True)
+    return mw.M('domain').where("name=?", (name,)).count()
+
 def addDomain(pid, name, port):
     now_time = mw.getDateFromNow()
     insert_data = {
@@ -25,7 +29,7 @@ def addDomain(pid, name, port):
 def getDomainByPid(pid):
     # .debug(True)
     return mw.M('domain').field(__FIELD).where("pid=?", (pid,)).select()
-
+    
 
 def deleteDomainId(domain_id):
     return mw.M('domain').where("id=?", (domain_id,)).delete()
diff --git a/web/utils/site.py b/web/utils/site.py
index d6785d6aa..807b03993 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -124,8 +124,8 @@ class sites(object):
     def getProxyPath(self, siteName):
         return "{}/{}".format(self.proxyPath, siteName)
 
-    def getDirBindRewrite(self, siteName, dirname):
-        return self.rewritePath + '/' + siteName + '_' + dirname + '.conf'
+    def getDirBindRewrite(self, site_name, dir_name):
+        return self.rewritePath + '/' + site_name + '_' + dir_name + '.conf'
 
     def getIndexConf(self):
         return mw.getServerDir() + '/openresty/nginx/conf/nginx.conf'
@@ -256,8 +256,7 @@ class sites(object):
 
     def nginxAddConf(self):
         source_tpl = mw.getPanelDir() + '/data/tpl/nginx.conf'
-        print(source_tpl)
-        vhost_file = self.vhostPath + '/' + self.siteName + '.conf'
+        vhost_file = self.getHostConf(self.siteName)
         content = mw.readFile(source_tpl)
 
         content = content.replace('{$PORT}', self.sitePort)
@@ -463,6 +462,154 @@ class sites(object):
         self.addDirUserIni(site_path, run_path)
         return mw.returnData(True, '已打开防跨站设置!')
 
+
+    def getDirBinding(self, site_id):
+        info = thisdb.getSitesById(site_id)
+        path = info['path']
+        if not os.path.exists(path):
+            checks = ['/', '/usr', '/etc']
+            if path in checks:
+                data = {}
+                data['dirs'] = []
+                data['binding'] = []
+                return mw.returnData(True, 'OK', data)
+            os.system('mkdir -p ' + path)
+            os.system('chmod 755 ' + path)
+            os.system('chown www:www ' + path)
+            siteName = info['name']
+            mw.writeLog('网站管理', '站点[' + siteName + '],根目录[' + path + ']不存在,已重新创建!')
+
+        dirnames = []
+        for filename in os.listdir(path):
+            try:
+                filePath = path + '/' + filename
+                if os.path.islink(filePath):
+                    continue
+                if os.path.isdir(filePath):
+                    dirnames.append(filename)
+            except:
+                pass
+
+        data = {}
+        data['dirs'] = dirnames
+        data['binding'] = thisdb.getBindingListBySiteId(site_id)
+        return mw.returnJson(True, 'OK', data)
+
+    def addDirBind(self, site_id, domain, dir_name):
+        domain_split = domain.split(':')
+        domain = domain_split[0]
+        port = '80'
+        if len(domain_split) > 1:
+            port = domain_split[1]
+        if dir_name == '':
+            mw.returnData(False, '目录不能为空!')
+
+        reg = r"^([\w\-\*]{1,100}\.){1,4}(\w{1,10}|\w{1,10}\.\w{1,10})$"
+        if not re.match(reg, domain):
+            return mw.returnData(False, '主域名格式不正确!')
+
+        info = thisdb.getSitesById(site_id)
+        webdir = info['path'] + '/' + dir_name
+
+        if thisdb.getBindingCountByDomain(domain):
+            return mw.returnData(False, '您添加的域名在子目录已存在!')
+
+        if thisdb.getDomainCountByName(domain) > 0:
+            return mw.returnData(False, '您添加的域名已存在!')
+
+        filename = self.getHostConf(info['name'])
+        conf = mw.readFile(filename)
+        if conf:
+            rep = r"enable-php-([0-9]{2,3})\.conf"
+            domain_split = re.search(rep, conf).groups()
+            version = domain_split[0]
+
+            source_dirbind_tpl = mw.getPanelDir() + '/data/tpl/nginx_dirbind.conf'
+            content = mw.readFile(source_dirbind_tpl)
+            content = content.replace('{$PORT}', port)
+            content = content.replace('{$PHPVER}', version)
+            content = content.replace('{$DIRBIND}', domain)
+            content = content.replace('{$ROOT_DIR}', webdir)
+            content = content.replace('{$SERVER_MAIN}', info['name'])
+            content = content.replace('{$OR_REWRITE}', self.rewritePath)
+            content = content.replace('{$PHP_DIR}', self.setupPath + '/php')
+            content = content.replace('{$LOGPATH}', mw.getLogsDir())
+
+            conf += "\r\n" + content
+            mw.backFile(filename)
+            mw.writeFile(filename, conf)
+        conf = mw.readFile(filename)
+
+        # 检查配置是否有误
+        isError = mw.checkWebConfig()
+        if isError != True:
+            mw.restoreFile(filename)
+            msg = 'ERROR: <br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>'
+            return mw.returnData(False, msg)
+
+        thisdb.addBinding(site_id,domain,port,dir_name)
+        msg = mw.getInfo('网站[{1}]子目录[{2}]绑定到[{3}]',(info['name'], dir_name, domain))
+        mw.writeLog('网站管理', msg)
+        mw.restartWeb()
+        mw.removeBackFile(filename)
+        return mw.returnData(True, '添加成功!')
+
+    # 取子目录Rewrite
+    def getDirBindingRewrite(self, binding_id, add):
+        binding_info = thisdb.getBindingById(binding_id)
+        info = thisdb.getSitesById(binding_info['pid'])
+
+        filename = self.getDirBindRewrite(info['name'], binding_info['path'])
+        if add == '1':
+            mw.writeFile(filename, '')
+            file = self.getHostConf(info['name'])
+            conf = mw.readFile(file)
+            domain = binding_info['domain']
+            rep = "\n#BINDING-" + domain + "-START(.|\n)+BINDING-" + domain + "-END"
+            tmp = re.search(rep, conf).group()
+            dirConf = tmp.replace('rewrite/' + info['name'] + '.conf;', 'rewrite/' + info['name'] + '_' + binding_info['path'] + '.conf;')
+            conf = conf.replace(tmp, dirConf)
+            mw.writeFile(file, conf)
+        data = {}
+        data['rewrite_dir'] = self.rewritePath
+        data['status'] = False
+        if os.path.exists(filename):
+            data['status'] = True
+            data['data'] = mw.readFile(filename)
+            data['rlist'] = []
+            for ds in os.listdir(self.rewritePath):
+                if ds[0:1] == '.':
+                    continue
+                if ds == 'list.txt':
+                    continue
+                data['rlist'].append(ds[0:len(ds) - 5])
+            data['filename'] = filename
+        return data
+
+    def delDirBinding(self, binding_id):
+
+        binding_info = thisdb.getBindingById(binding_id)
+        info = thisdb.getSitesById(binding_info['pid'])
+
+        filename = self.getHostConf(info['name'])
+        conf = mw.readFile(filename)
+        if conf:
+            rep = r"\s*.+BINDING-" + binding_info['domain'] + "-START(.|\n)+BINDING-" + binding_info['domain'] + "-END"
+            conf = re.sub(rep, '', conf)
+            mw.writeFile(filename, conf)
+
+        filename = self.getDirBindRewrite(info['name'],  binding_info['path'])
+        if os.path.exists(filename):
+            os.remove(filename)
+        
+        msg = mw.getInfo('删除网站[{1}]子目录[{2}]绑定',(info['name'], binding_info['path']))
+        mw.writeLog('网站管理', msg)
+        mw.restartWeb()
+
+        thisdb.deleteBindingById(binding_id)
+        return mw.returnJson(True, '删除成功!')
+
+
     def logsOpen(self, site_id):
         info = thisdb.getSitesById(site_id)
         name = info['name']
@@ -782,6 +929,116 @@ class sites(object):
         mw.writeLog('网站管理', '网站[{1}]流量限制已关闭!', (siteName,))
         return mw.returnData(True, '已关闭流量限制!')
 
+
+    # 获取重定向配置
+    def getRedirect(self, siteName):
+        redirect_file = self.getRedirectDataPath(siteName)
+        if not os.path.exists(redirect_file):
+            mw.execShell("mkdir {}/{}".format(self.redirectPath, siteName))
+            return mw.returnData(True, "no exists!", {"result": [], "count": 0})
+
+        content = mw.readFile(redirect_file)
+        data = json.loads(content)
+        # 处理301信息
+        return mw.returnData(True, "ok", {"result": data, "count": len(data)})
+
+    # 操作 重定向配置
+    def operateRedirectConf(self, siteName, method='start'):
+        vhost_file = self.getHostConf(siteName)
+        content = mw.readFile(vhost_file)
+
+        cnf_301 = '''#301-START
+    include %s/*.conf;
+    #301-END''' % (self.getRedirectPath( siteName))
+
+        cnf_301_source = '#301-START'
+        # print('operateRedirectConf', content.find('#301-END'))
+        if content.find('#301-END') != -1:
+            if method == 'stop':
+                rep = '#301-START(\n|.){1,500}#301-END'
+                content = re.sub(rep, '#301-START', content)
+        else:
+            if method == 'start':
+                content = re.sub(cnf_301_source, cnf_301, content)
+
+        mw.writeFile(vhost_file, content)
+
+    # get redirect status
+    def setRedirect(self, siteName, site_from, to, type, r_type, keep_path):
+        if siteName == '' or site_from == '' or to == '' or type == '' or r_type == '':
+            return mw.returnData(False, "必填项不能为空!")
+
+        redirect_file = self.getRedirectDataPath(siteName)
+        content = mw.readFile(redirect_file) if os.path.exists(redirect_file) else ""
+        data = json.loads(content) if content != "" else []
+
+        _r_type = 0 if r_type == "301" else 1
+        _type_code = 0 if type == "path" else 1
+        _keep_path = 1 if keep_path == "1" else 0
+
+        # check if domain exists in site
+        if _type_code == 1:
+            pid = mw.M('domain').where("name=?", (_siteName,)).field('id,pid,name,port,addtime').select()
+            site_domain_lists = mw.M('domain').where("pid=?", (pid[0]['pid'],)).field('name').select()
+            found = False
+            for item in site_domain_lists:
+                if item['name'] == _from:
+                    found = True
+                    break
+            if found == False:
+                return mw.returnData(False, "域名不存在!")
+
+        file_content = ""
+        # path
+        if _type_code == 0:
+            redirect_type = "permanent" if _r_type == 0 else "redirect"
+            if not site_from.startswith("/"):
+                site_from = "/{}".format(site_from)
+            if _keep_path == 1:
+                to = "{}$1".format(to)
+                site_from = "{}(.*)".format(site_from)
+            file_content = "rewrite ^{} {} {};".format(site_from, to, redirect_type)
+        # domain
+        else:
+            if _keep_path == 1:
+                _to = "{}$request_uri".format(_to)
+
+            redirect_type = "301" if _type_code == 0 else "302"
+            _if = "if ($host ~ '^{}')".format(site_from)
+            _return = "return {} {}; ".format(redirect_type, to)
+            file_content = _if + "{\r\n    " + _return + "\r\n}"
+
+        _id = mw.md5("{}+{}".format(file_content, siteName))
+
+        # 防止规则重复
+        for item in data:
+            if item["r_from"] == site_from:
+                return mw.returnData(False, "重复的规则!")
+
+        rep = r"http(s)?\:\/\/([a-zA-Z0-9][-a-zA-Z0-9]{0,62}\.)+([a-zA-Z0-9][a-zA-Z0-9]{0,62})+.?"
+        if not re.match(rep, to):
+            return mw.returnData(False, "错误的目标地址")
+
+        # write data json file
+        data.append({"r_from": site_from, "type": _type_code, "r_type": _type_code,"r_to": to, 'keep_path': _keep_path, 'id': _id})
+        mw.writeFile(redirect_file, json.dumps(data))
+        mw.writeFile("{}/{}.conf".format(self.getRedirectPath(siteName), _id), file_content)
+
+        self.operateRedirectConf(siteName, 'start')
+        mw.restartWeb()
+        return mw.returnData(True, "设置成功")
+
+    def getRedirectConf(self,siteName, rid):
+        if rid == '' or siteName == '':
+            return mw.returnData(False, "必填项不能为空!")
+
+        path = self.getRedirectPath(siteName)
+        conf = "{}/{}.conf".format(path, rid)
+        data = mw.readFile(conf)
+        if data == False:
+            return mw.returnData(False, "获取失败!")
+        return mw.returnData(True, "ok", {"result": data})
+
     def setPhpVersion(self, siteName, version):
         # nginx
         file = self.getHostConf(siteName)

From e6af36a34b9614f201c07948ca85b9c561d78845 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 10 Nov 2024 02:26:15 +0800
Subject: [PATCH 150/965] Update panel_task.py

---
 panel_task.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panel_task.py b/panel_task.py
index d60b4bc97..afb5f96b3 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -224,7 +224,7 @@ def startPHPVersion(version):
             return True
         # 尝试重启服务
         cgi = '/tmp/php-cgi-' + version + '.sock'
-        pid = sdir + '/php/' + version + '/var/run/php-fpm.pid'
+        pid = server_dir + '/php/' + version + '/var/run/php-fpm.pid'
         data = mw.execShell("ps -ef | grep php/" + version +" | grep -v grep|grep -v python |awk '{print $2}'")
         if data[0] != '':
             os.system("ps -ef | grep php/" + version + " | grep -v grep|grep -v python |awk '{print $2}' | xargs kill ")

From c2a8b9523143ef19b122de2850fff86e7d1bfb79 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 10 Nov 2024 13:19:03 +0800
Subject: [PATCH 151/965] update

---
 panel_tools.py               |   2 +-
 web/admin/setting/setting.py |  31 +++++-
 web/static/app/config.js     | 187 +++++++++++++++++------------------
 web/thisdb/user.py           |   7 ++
 4 files changed, 130 insertions(+), 97 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index ef4416085..731174d94 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -23,7 +23,7 @@ web_dir = os.getcwd() + "/web"
 os.chdir(web_dir)
 sys.path.append(web_dir)
 
-from utils.firewall import firewall as MwFirewall
+from utils.firewall import Firewall as MwFirewall
 import core.mw as mw
 import thisdb
 
diff --git a/web/admin/setting/setting.py b/web/admin/setting/setting.py
index 3b2d81a0f..727ef6169 100644
--- a/web/admin/setting/setting.py
+++ b/web/admin/setting/setting.py
@@ -15,8 +15,7 @@ import os
 from flask import Blueprint, render_template
 from flask import request
 
-from admin import model
-
+from admin import session
 from admin.user_login_check import panel_login_required
 
 
@@ -203,6 +202,34 @@ def set_ipv6_status():
     mw.restartMw()
     return mw.returnData(True, '设置成功!')
 
+# 设置面板用户
+@blueprint.route('/set_name', endpoint='set_name', methods=['POST'])
+@panel_login_required
+def set_name():
+    name1 = request.form.get('name1', '')
+    name2 = request.form.get('name2', '')
+    if name1 != name2:
+        return mw.returnData(False, '两次输入的用户名不一致，请重新输入!')
+    if len(name1) < 3:
+        return mw.returnData(False, '用户名长度不能少于3位')
+    thisdb.setUserByName(session['username'], name1)
+    session['username'] = name1
+    return mw.returnData(True, '用户修改成功!')
+
+@blueprint.route('/set_password', endpoint='set_password', methods=['POST'])
+@panel_login_required
+def set_password():
+    password1 = request.form.get('password1', '')
+    password2 = request.form.get('password2', '')
+    if password1 != password2:
+        return mw.returnData(False, '两次输入的密码不一致，请重新输入!')
+    if len(password1) < 5:
+        return mw.returnData(False, '用户密码不能小于5位!')
+
+    thisdb.setUserPwdByName(session['username'], password1)
+    return mw.returnData(True, '密码修改成功!')
+
+
 # 设置站点状态
 @blueprint.route('/set_port', endpoint='set_port', methods=['POST'])
 @panel_login_required
diff --git a/web/static/app/config.js b/web/static/app/config.js
index b3c662b9c..ac64e1822 100755
--- a/web/static/app/config.js
+++ b/web/static/app/config.js
@@ -310,126 +310,125 @@ function modifyAuthPath() {
     });
 }
 
-function setPassword(a) {
-	if(a == 1) {
-		p1 = $("#p1").val();
-		p2 = $("#p2").val();
-		if(p1 == "" || p1.length < 8) {
-			layer.msg('面板密码不能少于8位!', {icon: 2});
-			return
-		}
-		
-		//准备弱口令匹配元素
-		var checks = ['admin888','123123123','12345678','45678910','87654321','asdfghjkl','password','qwerqwer'];
-		pchecks = 'abcdefghijklmnopqrstuvwxyz1234567890';
-		for(var i=0;i<pchecks.length;i++){
-			checks.push(pchecks[i]+pchecks[i]+pchecks[i]+pchecks[i]+pchecks[i]+pchecks[i]+pchecks[i]+pchecks[i]);
-		}
-		
-		//检查弱口令
-		cps = p1.toLowerCase();
-		var isError = "";
-		for(var i=0;i<checks.length;i++){
-			if(cps == checks[i]){
-				isError += '['+checks[i]+'] ';
-			}
-		}
-		
-		if(isError != ""){
-			layer.msg('面板密码不能为弱口令'+isError,{icon:5});
-			return;
-		}
-			
-		if(p1 != p2) {
-			layer.msg('两次输入的密码不一致', {icon: 2});
-			return;
-		}
-		$.post("/setting/set_password", "password1=" + encodeURIComponent(p1) + "&password2=" + encodeURIComponent(p2), function(b) {
-			if(b.status) {
-				layer.closeAll();
-				layer.msg(b.msg, {icon: 1});
-			} else {
-				layer.msg(b.msg, {icon: 2});
-			}
-		},'json');
-		return;
-	}
+function setPassword() {
 	layer.open({
 		type: 1,
-		area: "290px",
+		area: ["350px",'auto'],
 		title: '修改密码',
 		closeBtn: 1,
 		shift: 5,
 		shadeClose: false,
-		content: "<div class='bt-form pd20 pb70'>\
+		btn:["修改","关闭","随机"],
+		content: "<div class='bt-form'>\
 				<div class='line'>\
 					<span class='tname'>密码</span>\
-					<div class='info-r'><input class='bt-input-text' type='text' name='password1' id='p1' value='' placeholder='新的密码' style='width:100%'/></div>\
+					<div class='info-r'><input class='bt-input-text' type='text' name='password1' id='p1' value='' placeholder='新的密码' style='width:70%'/></div>\
 				</div>\
 				<div class='line'>\
 					<span class='tname'>重复</span>\
-					<div class='info-r'><input class='bt-input-text' type='text' name='password2' id='p2' value='' placeholder='再输一次' style='width:100%' /></div>\
+					<div class='info-r'><input class='bt-input-text' type='text' name='password2' id='p2' value='' placeholder='再输一次' style='width:70%' /></div>\
 				</div>\
-				<div class='bt-form-submit-btn'>\
-					<span style='float: left;' title='随机密码' class='btn btn-default btn-sm' onclick='randPwd(10)'>随机</span>\
-					<button type='button' class='btn btn-danger btn-sm' onclick=\"layer.closeAll()\">关闭</button>\
-					<button type='button' class='btn btn-success btn-sm' onclick=\"setPassword(1)\">修改</button>\
-				</div>\
-			</div>"
+			</div>",
+		yes:function(){
+			var p1 = $("#p1").val();
+			var p2 = $("#p2").val();
+			if(p1 == "" || p1.length < 8) {
+				layer.msg('面板密码不能少于8位!', {icon: 2});
+				return
+			}
+			
+			//准备弱口令匹配元素
+			var checks = ['admin888','123123123','12345678','45678910','87654321','asdfghjkl','password','qwerqwer'];
+			pchecks = 'abcdefghijklmnopqrstuvwxyz1234567890';
+			for(var i=0;i<pchecks.length;i++){
+				checks.push(pchecks[i]+pchecks[i]+pchecks[i]+pchecks[i]+pchecks[i]+pchecks[i]+pchecks[i]+pchecks[i]);
+			}
+			
+			//检查弱口令
+			cps = p1.toLowerCase();
+			var isError = "";
+			for(var i=0;i<checks.length;i++){
+				if(cps == checks[i]){
+					isError += '['+checks[i]+'] ';
+				}
+			}
+			
+			if(isError != ""){
+				layer.msg('面板密码不能为弱口令'+isError,{icon:5});
+				return;
+			}
+				
+			if(p1 != p2) {
+				layer.msg('两次输入的密码不一致', {icon: 2});
+				return;
+			}
+			$.post("/setting/set_password", "password1=" + encodeURIComponent(p1) + "&password2=" + encodeURIComponent(p2), function(b) {
+				if(b.status) {
+					layer.closeAll();
+					layer.msg(b.msg, {icon: 1});
+				} else {
+					layer.msg(b.msg, {icon: 2});
+				}
+			},'json');
+			return;
+		},
+		btn3: function(){
+			var pwd = randomStrPwd(12);
+			$("#p1").val(pwd);
+			$("#p2").val(pwd);
+			layer.msg('请在修改前记录好您的新密码!',{time:2000});
+			return false;
+		}
 	});
 }
 
-
-function randPwd(){
-	var pwd = randomStrPwd(12);
-	$("#p1").val(pwd);
-	$("#p2").val(pwd);
-	layer.msg(lan.bt.pass_rep_ps,{time:2000})
-}
-
-function setUserName(a) {
-	if(a == 1) {
-		p1 = $("#p1").val();
-		p2 = $("#p2").val();
-		if(p1 == "" || p1.length < 3) {
-			layer.msg('用户名长度不能少于3位', {icon: 2});
-			return;
-		}
-		if(p1 != p2) {
-			layer.msg('两次输入的用户名不一致', {icon: 2});
-			return;
-		}
-		$.post("/setting/set_name", "name1=" + encodeURIComponent(p1) + "&name2=" + encodeURIComponent(p2), function(b) {
-			if(b.status) {
-				layer.closeAll();
-				layer.msg(b.msg, {icon: 1});
-				$("input[name='username_']").val(p1)
-			} else {
-				layer.msg(b.msg, {icon: 2});
-			}
-		},'json');
-		return
-	}
+function setUserName() {
 	layer.open({
 		type: 1,
-		area: "290px",
+		area: ["350px",'auto'],
 		title: '修改面板用户名',
 		closeBtn: 1,
 		shift: 5,
 		shadeClose: false,
-		content: "<div class='bt-form pd20 pb70'>\
+		btn:["确定","取消","随机"],
+		content: "<div class='bt-form pd20'>\
 			<div class='line'><span class='tname'>用户名</span>\
-				<div class='info-r'><input class='bt-input-text' type='text' name='password1' id='p1' value='' placeholder='新的用户名' style='width:100%'/></div>\
+				<div class='info-r'><input class='bt-input-text' type='text' name='password1' id='p1' value='' placeholder='新的用户名' style='width:70%'/></div>\
 			</div>\
 			<div class='line'>\
 				<span class='tname'>重复</span>\
-				<div class='info-r'><input class='bt-input-text' type='text' name='password2' id='p2' value='' placeholder='再输一次' style='width:100%'/></div>\
+				<div class='info-r'><input class='bt-input-text' type='text' name='password2' id='p2' value='' placeholder='再输一次' style='width:70%'/></div>\
 			</div>\
-			<div class='bt-form-submit-btn'>\
-				<button type='button' class='btn btn-danger btn-sm' onclick=\"layer.closeAll()\">关闭</button>\
-				<button type='button' class='btn btn-success btn-sm' onclick=\"setUserName(1)\">修改</button>\
-			</div>\
-		</div>"
+		</div>",
+		yes: function(){
+			p1 = $("#p1").val();
+			p2 = $("#p2").val();
+			if(p1 == "" || p1.length < 3) {
+				layer.msg('用户名长度不能少于3位', {icon: 2});
+				return;
+			}
+			if(p1 != p2) {
+				layer.msg('两次输入的用户名不一致', {icon: 2});
+				return;
+			}
+			$.post("/setting/set_name", "name1=" + encodeURIComponent(p1) + "&name2=" + encodeURIComponent(p2), function(b) {
+				if(b.status) {
+					layer.closeAll();
+					layer.msg(b.msg, {icon: 1});
+					$("input[name='username_']").val(p1)
+				} else {
+					layer.msg(b.msg, {icon: 2});
+				}
+			},'json');
+			return
+		},
+		btn3:function(){
+			var pwd = randomStrPwd(12);
+			$("#p1").val(pwd);
+			$("#p2").val(pwd);
+			layer.msg('请在修改前记录好您的用户名!',{time:2000});
+			return false;
+		}
 	})
 }
 
diff --git a/web/thisdb/user.py b/web/thisdb/user.py
index 3cbaa4bc2..ebf74532a 100644
--- a/web/thisdb/user.py
+++ b/web/thisdb/user.py
@@ -88,6 +88,13 @@ def updateUserLoginTime():
     mw.M('users').field(__field).where('id=?', (1,)).update({'login_time':now_time})
     return True
 
+def setUserByName(name, new_name):
+    return mw.M('users').where("name=?", (name,)).setField('name', new_name.strip())
+
+def setUserPwdByName(name, password):
+    pwd = mw.md5(password)
+    return mw.M('users').where("name=?", (name,)).setField('password', pwd)
+
 def setUserByRoot(
     name: str | None = None,
     password: str | None = None,

From 23b3f213b6a75e6b58c47c2eecc74262b52387ea Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 10 Nov 2024 14:15:53 +0800
Subject: [PATCH 152/965] Update panel_tools.py

---
 panel_tools.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panel_tools.py b/panel_tools.py
index 731174d94..8697b747b 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -237,7 +237,7 @@ def show_panel_pwd():
     if mw.md5(pwd) == info['password']:
         print('|-password: ' + pwd)
         return
-    print("* password has been changed!")
+    print("*-password has been changed!")
 
 def show_panel_adminpath():
     admin_path = thisdb.getOption('admin_path')

From 3a1a3f657911018ad36c4e9cea82044fdc25aee5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 10 Nov 2024 17:32:00 +0800
Subject: [PATCH 153/965] update

---
 web/admin/site/__init__.py |   1 +
 web/admin/site/proxy.py    |  69 ++++++++++
 web/admin/site/redirect.py |  15 ++-
 web/utils/site.py          | 253 ++++++++++++++++++++++++++++++++++++-
 4 files changed, 335 insertions(+), 3 deletions(-)
 create mode 100644 web/admin/site/proxy.py

diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index f98b21bb5..f7b5c7397 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -15,4 +15,5 @@ from .php import *
 from .logs import *
 from .dir import *
 from .redirect import *
+from .proxy import *
 from .ssl import *
\ No newline at end of file
diff --git a/web/admin/site/proxy.py b/web/admin/site/proxy.py
new file mode 100644
index 000000000..704a9da4a
--- /dev/null
+++ b/web/admin/site/proxy.py
@@ -0,0 +1,69 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+import json
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin.user_login_check import panel_login_required
+
+from utils.plugin import plugin as MwPlugin
+from utils.site import sites as MwSites
+import utils.site as site
+import core.mw as mw
+import thisdb
+
+from .site import blueprint
+
+
+# 获取代理列表
+@blueprint.route('/get_proxy_list', endpoint='get_proxy_list', methods=['POST'])
+@panel_login_required
+def get_proxy_list():
+    site_name = request.form.get("siteName", '')
+    return MwSites.instance().getProxyList(site_name)
+
+# 获取代理列表
+@blueprint.route('/set_proxy', endpoint='set_proxy', methods=['POST'])
+@panel_login_required
+def set_proxy():
+    site_name = request.form.get('siteName', '')
+    site_from = request.form.get('from', '')
+    to = request.form.get('to', '')
+    host = request.form.get('host', '')
+    name = request.form.get('name', '')
+    open_proxy = request.form.get('open_proxy', '')
+    open_cache = request.form.get('open_cache', '')
+    cache_time = request.form.get('cache_time', '')
+    pid = request.form.get('id', '')
+    return MwSites.instance().setProxy(site_name,site_from,to,host,name,open_proxy, open_cache,cache_time, pid)
+
+# 获取代理配置
+@blueprint.route('/get_proxy_conf', endpoint='get_proxy_conf', methods=['POST'])
+@panel_login_required
+def get_proxy_conf():
+    site_name = request.form.get("siteName", '')
+    rid = request.form.get("id", '')
+    return MwSites.instance().getProxyConf(site_name, rid)
+
+
+# 删除代理配置
+@blueprint.route('/del_proxy', endpoint='del_proxy', methods=['POST'])
+@panel_login_required
+def del_proxy():
+    site_name = request.form.get("siteName", '')
+    rid = request.form.get("id", '')
+    return MwSites.instance().delProxy(site_name, rid)
+
+
+
+
diff --git a/web/admin/site/redirect.py b/web/admin/site/redirect.py
index c74983ed4..ad6bdca19 100644
--- a/web/admin/site/redirect.py
+++ b/web/admin/site/redirect.py
@@ -43,13 +43,24 @@ def set_redirect():
     keep_path = request.form.get("keep_path", '')   # keep path
     return MwSites.instance().setRedirect(site_name, site_from, to, type, r_type, keep_path)
 
-# 设置重定向配置
+# 获取重定向配置
 @blueprint.route('/get_redirect_conf', endpoint='get_redirect_conf', methods=['POST'])
 @panel_login_required
 def get_redirect_conf():
     site_name = request.form.get("siteName", '')
     rid = request.form.get("id", '')
-    return MwSites.instance().getRedirectConf(site_name, rid) 
+    return MwSites.instance().getRedirectConf(site_name, rid)
+
+# 删除重定向配置
+@blueprint.route('/del_redirect', endpoint='del_redirect', methods=['POST'])
+@panel_login_required
+def del_redirect():
+    site_name = request.form.get("siteName", '')
+    rid = request.form.get("id", '')
+    return MwSites.instance().delRedirect(site_name, rid)
+
+
+
 
 
 
diff --git a/web/utils/site.py b/web/utils/site.py
index 807b03993..f876760f2 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1028,7 +1028,7 @@ class sites(object):
         mw.restartWeb()
         return mw.returnData(True, "设置成功")
 
-    def getRedirectConf(self,siteName, rid):
+    def getRedirectConf(self, siteName, rid):
         if rid == '' or siteName == '':
             return mw.returnData(False, "必填项不能为空!")
 
@@ -1039,6 +1039,257 @@ class sites(object):
             return mw.returnData(False, "获取失败!")
         return mw.returnData(True, "ok", {"result": data})
 
+        # 删除指定重定向
+    def delRedirect(self,siteName, rid):
+        if rid == '' or siteName == '':
+            return mw.returnData(False, "必填项不能为空!")
+
+        try:
+            data_path = self.getRedirectDataPath(siteName)
+            data_content = mw.readFile(data_path) if os.path.exists(data_path) else ""
+            data = json.loads(data_content) if data_content != "" else []
+            for item in data:
+                if item["id"] == rid:
+                    data.remove(item)
+                    break
+            # write database
+            mw.writeFile(data_path, json.dumps(data))
+            # data is empty ,should stop
+            if len(data) == 0:
+                self.operateRedirectConf(siteName, 'stop')
+            # remove conf file
+            mw.execShell("rm -rf {}/{}.conf".format(self.getRedirectPath(siteName), rid))
+        except Exception as e:
+            return mw.returnData(False, "删除失败:"+str(e))
+        return mw.returnData(True, "删除成功!")
+
+    # 读取 网站 反向代理列表
+    def getProxyList(self, site_name):
+        data_path = self.getProxyDataPath(site_name)
+
+        if not os.path.exists(data_path):
+            mw.execShell("mkdir {}/{}".format(self.proxyPath, site_name))
+            return mw.returnData(True, "", {"result": [], "count": 0})
+
+        content = mw.readFile(data_path)
+        data = json.loads(content)
+        tmp = []
+        for proxy in data:
+            proxy_dir = "{}/{}".format(self.proxyPath, site_name)
+            proxy_dir_file = proxy_dir + '/' + proxy['id'] + '.conf'
+            if os.path.exists(proxy_dir_file):
+                proxy['status'] = True
+            else:
+                proxy['status'] = False
+            tmp.append(proxy)
+        return mw.returnData(True, "ok", {"result": data, "count": len(data)})
+
+    # 操作 反向代理配置
+    def operateProxyConf(self, site_name, method='start'):
+        vhost_file = self.getHostConf(site_name)
+        content = mw.readFile(vhost_file)
+
+        proxy_cnf = '''#PROXY-START
+    include %s/*.conf;
+    #PROXY-END''' % (self.getProxyPath(site_name))
+
+        proxy_cnf_source = '#PROXY-START'
+
+        if content.find('#PROXY-END') != -1:
+            if method == 'stop':
+                rep = '#PROXY-START(\n|.){1,500}#PROXY-END'
+                content = re.sub(rep, '#PROXY-START', content)
+        else:
+            if method == 'start':
+                content = re.sub(proxy_cnf_source, proxy_cnf, content)
+
+        mw.writeFile(vhost_file, content)
+
+    # 设置 网站 反向代理列表
+    def setProxy(self, site_name, site_from, to, host, name, open_proxy, open_cache, cache_time, pid):
+        from urllib.parse import urlparse
+        if  site_name == "" or site_from == "" or to == "" or host == "" or name == "":
+            return mw.returnData(False, "必填项不能为空")
+
+        rep = r"http(s)?\:\/\/([a-zA-Z0-9][-a-zA-Z0-9]{0,62}\.)+([a-zA-Z0-9][a-zA-Z0-9]{0,62})+.?"
+        if not re.match(rep, to):
+            return mw.returnData(False, "错误的目标地址!")
+
+        # get host from url
+        try:
+            if host == "$host":
+                host_tmp = urlparse(_to)
+                host = host_tmp.netloc
+        except:
+            return mw.returnData(False, "错误的目标地址")
+
+        proxy_site_path = self.getProxyDataPath(site_name)
+        data_content = mw.readFile(proxy_site_path) if os.path.exists(proxy_site_path) else ""
+        data = json.loads(data_content) if data_content != "" else []
+
+        proxy_action = 'add'
+        if pid == "":
+            pid = mw.md5("{}".format(name))
+        else:
+            proxy_action = 'edit'
+
+        if proxy_action == "add":
+            for item in data:
+                if item["name"] == name:
+                    return mw.returnData(False, "名称重复!!")
+                if item["from"] == site_from:
+                    return mw.returnData(False, "代理目录已存在!!")
+
+        tpl = "#PROXY-START\n\
+location ^~ {from} {\n\
+    proxy_pass {to};\n\
+    proxy_set_header Host {host};\n\
+    proxy_ssl_server_name on;\n\
+    proxy_set_header X-Real-IP $remote_addr;\n\
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;\n\
+    proxy_set_header REMOTE-HOST $remote_addr;\n\
+    proxy_set_header Upgrade $http_upgrade;\n\
+    proxy_set_header Connection $connection_upgrade;\n\
+    proxy_http_version 1.1;\n\
+    \n\
+    add_header X-Cache $upstream_cache_status;\n\
+    \n\
+     {proxy_cache}\n\
+}\n\
+# PROXY-END"
+
+        tpl_proxy_cache = "\n\
+    if ( $uri ~* \\.(gif|png|jpg|css|js|woff|woff2)$\" )\n\
+    {\n\
+        expires {cache_time}m;\n\
+    }\n\
+    proxy_ignore_headers Set-Cookie Cache-Control expires;\n\
+    proxy_cache mw_cache;\n\
+    proxy_cache_key \"$host$uri$is_args$args\";\n\
+    proxy_cache_valid 200 304 301 302 {cache_time}m;\n\
+"
+
+        tpl_proxy_nocache = "\n\
+    set $static_files_app 0; \n\
+    if ( $uri ~* \\.(gif|png|jpg|css|js|woff|woff2)$\" )\n\
+    {\n\
+        set $static_files_app 1;\n\
+        expires 12h;\n\
+    }\n\
+    if ( $static_files_app = 0 )\n\
+    {\n\
+        add_header Cache-Control no-cache;\n\
+    }\n\
+"
+
+        # replace
+        if site_from[0] != '/':
+            site_from = '/' + site_from
+        tpl = tpl.replace("{from}", site_from, 999)
+        tpl = tpl.replace("{to}", to)
+        tpl = tpl.replace("{host}", host, 999)
+        tpl = tpl.replace("{cache_time}", cache_time, 999)
+
+        if open_cache == 'on':
+            tpl_proxy_cache = tpl_proxy_cache.replace("{cache_time}", cache_time, 999)
+            tpl = tpl.replace("{proxy_cache}", tpl_proxy_cache, 999)
+        else:
+            tpl = tpl.replace("{proxy_cache}", tpl_proxy_nocache, 999)
+
+
+        conf_proxy = "{}/{}.conf".format(self.getProxyPath(site_name), pid)
+        conf_bk = "{}/{}.conf.txt".format(self.getProxyPath(site_name), pid)
+        mw.writeFile(conf_proxy, tpl)
+
+        rule_test = mw.checkWebConfig()
+        if rule_test != True:
+            os.remove(conf_proxy)
+            return mw.returnData(False, "OpenResty配置测试不通过, 请重试: {}".format(rule_test))
+
+        if proxy_action == "add":
+            # 添加代理
+            pid = mw.md5("{}".format(name))
+            for item in data:
+                if item["name"] == name:
+                    return mw.returnData(False, "名称重复!")
+                if item["from"] == site_from:
+                    return mw.returnData(False, "代理目录已存在!")
+            data.append({
+                "name": name,
+                "from": site_from,
+                "to": to,
+                "host": host,
+                "open_cache": open_cache,
+                "open_proxy": open_proxy,
+                "cache_time": cache_time,
+                "id": pid,
+            })
+        else:
+            # 修改代理
+            dindex = -1
+            for x in range(len(data)):
+                if data[x]["id"] == pid:
+                    dindex = x
+                    break
+            if dindex < 0:
+                return mw.returnData(False, "异常请求")
+            data[dindex]['from'] = site_from
+            data[dindex]['to'] = to
+            data[dindex]['host'] = host
+            data[dindex]['open_cache'] = open_cache
+            data[dindex]['open_proxy'] = open_proxy
+            data[dindex]['cache_time'] = cache_time
+
+        if open_proxy != 'on':
+            os.rename(conf_proxy, conf_bk)
+
+        mw.writeFile(proxy_site_path, json.dumps(data))
+        self.operateProxyConf(site_name, 'start')
+        mw.restartWeb()
+        return mw.returnData(True, "ok", {"hash": pid})
+
+    def getProxyConf(self, site_name, pid):
+        if pid == '' or site_name == '':
+            return mw.returnData(False, "必填项不能为空!")
+
+        conf_file = "{}/{}/{}.conf".format(self.proxyPath, site_name, pid)
+        if not os.path.exists(conf_file):
+            conf_file = "{}/{}/{}.conf.txt".format(self.proxyPath, site_name, pid)
+
+        if not os.path.exists(conf_file):
+            return mw.returnData(False, "获取失败!")
+
+        data = mw.readFile(conf_file)
+        return mw.returnData(True, "ok", {"result": data})
+
+    def delProxy(self, site_name, pid):
+        if pid == '' or site_name == '':
+            return mw.returnData(False, "必填项不能为空!")
+
+        try:
+            data_path = self.getProxyDataPath(site_name)
+            data_content = mw.readFile(data_path) if os.path.exists(data_path) else ""
+            data = json.loads(data_content) if data_content != "" else []
+            for item in data:
+                if item["id"] == pid:
+                    data.remove(item)
+                    break
+            # write database
+            mw.writeFile(data_path, json.dumps(data))
+
+            # data is empty,should stop
+            if len(data) == 0:
+                self.operateProxyConf(site_name, 'stop')
+            # remove conf file
+            cmd = "rm -rf {}/{}.conf*".format(self.getProxyPath(site_name), pid)
+            mw.execShell(cmd)
+        except:
+            return mw.returnData(False, "删除反代失败!")
+
+        mw.restartWeb()
+        return mw.returnData(True, "删除反代成功!")
+
+
     def setPhpVersion(self, siteName, version):
         # nginx
         file = self.getHostConf(siteName)

From 9945425f99cb99c68ab2efd6c0f46646b11dd949 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 10 Nov 2024 18:28:34 +0800
Subject: [PATCH 154/965] update

---
 class/core/mw.py      |  6 ++---
 web/admin/site/ssl.py |  9 +++++++
 web/core/mw.py        | 62 +++++++++++++++++++++++++++++++++++++++++++
 web/utils/site.py     | 58 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 131 insertions(+), 4 deletions(-)

diff --git a/class/core/mw.py b/class/core/mw.py
index 99fe840ab..40bc1771f 100755
--- a/class/core/mw.py
+++ b/class/core/mw.py
@@ -1832,11 +1832,9 @@ def getCertName(certPath):
             if hasattr(issuer, 'O'):
                 result['issuer'] = issuer.O
         # 取到期时间
-        result['notAfter'] = strfDate(
-            bytes.decode(x509.get_notAfter())[:-1])
+        result['notAfter'] = strfDate(bytes.decode(x509.get_notAfter())[:-1])
         # 取申请时间
-        result['notBefore'] = strfDate(
-            bytes.decode(x509.get_notBefore())[:-1])
+        result['notBefore'] = strfDate(bytes.decode(x509.get_notBefore())[:-1])
         # 取可选名称
         result['dns'] = []
         for i in range(x509.get_extension_count()):
diff --git a/web/admin/site/ssl.py b/web/admin/site/ssl.py
index 7c9b0ad82..23d98e958 100644
--- a/web/admin/site/ssl.py
+++ b/web/admin/site/ssl.py
@@ -25,6 +25,15 @@ import thisdb
 from .site import blueprint
 
 
+# 删除代理配置
+@blueprint.route('/get_ssl', endpoint='get_ssl', methods=['POST'])
+@panel_login_required
+def get_ssl():
+    site_name = request.form.get('site_name', '')
+    ssl_type = request.form.get('ssl_type', '')
+    return MwSites.instance().getSsl(site_name, ssl_type)
+
+
 
 
 
diff --git a/web/core/mw.py b/web/core/mw.py
index f723c7bbd..60342257e 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -1175,6 +1175,68 @@ def getMyORM():
 # 数据库 START
 # ---------------------------------------------------------------------------------
 
+##################### ssl start #########################################
+# 获取证书名称
+def getCertName(certPath):
+    if not os.path.exists(certPath):
+        return None
+    try:
+        import OpenSSL
+        result = {}
+        x509 = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, readFile(certPath))
+        # 取产品名称
+        issuer = x509.get_issuer()
+        result['issuer'] = ''
+        if hasattr(issuer, 'CN'):
+            result['issuer'] = issuer.CN
+        if not result['issuer']:
+            is_key = [b'0', '0']
+            issue_comp = issuer.get_components()
+            if len(issue_comp) == 1:
+                is_key = [b'CN', 'CN']
+            for iss in issue_comp:
+                if iss[0] in is_key:
+                    result['issuer'] = iss[1].decode()
+                    break
+        if not result['issuer']:
+            if hasattr(issuer, 'O'):
+                result['issuer'] = issuer.O
+        # 取到期时间
+        result['notAfter'] = strfDate(
+            bytes.decode(x509.get_notAfter())[:-1])
+        # 取申请时间
+        result['notBefore'] = strfDate(
+            bytes.decode(x509.get_notBefore())[:-1])
+        # 取可选名称
+        result['dns'] = []
+        for i in range(x509.get_extension_count()):
+            s_name = x509.get_extension(i)
+            if s_name.get_short_name() in [b'subjectAltName', 'subjectAltName']:
+                s_dns = str(s_name).split(',')
+                for d in s_dns:
+                    result['dns'].append(d.split(':')[1])
+        subject = x509.get_subject().get_components()
+        # 取主要认证名称
+        if len(subject) == 1:
+            result['subject'] = subject[0][1].decode()
+        else:
+            if not result['dns']:
+                for sub in subject:
+                    if sub[0] == b'CN':
+                        result['subject'] = sub[1].decode()
+                        break
+                if 'subject' in result:
+                    result['dns'].append(result['subject'])
+            else:
+                result['subject'] = result['dns'][0]
+        result['endtime'] = int(int(time.mktime(time.strptime(
+            result['notAfter'], "%Y-%m-%d")) - time.time()) / 86400)
+        return result
+    except Exception as e:
+        writeFileLog(getTracebackInfo())
+        return None
+##################### ssl  end #########################################
+        
 ##################### notify  start #########################################
 
 
diff --git a/web/utils/site.py b/web/utils/site.py
index f876760f2..8445e960d 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1290,6 +1290,64 @@ location ^~ {from} {\n\
         return mw.returnData(True, "删除反代成功!")
 
 
+
+    # 是否跳转到https
+    def isToHttps(self, site_name):
+        file = self.getHostConf(site_name)
+        conf = mw.readFile(file)
+        if conf:
+            # if conf.find('HTTP_TO_HTTPS_START') != -1:
+            #     return True
+            if conf.find('$server_port !~ 443') != -1:
+                return True
+        return False
+
+    def getSsl(self, site_name, ssl_type):
+
+        path = self.sslDir + '/' + site_name
+
+        file = self.getHostConf(site_name)
+        content = mw.readFile(file)
+
+        key_text = 'ssl_certificate'
+        status = True
+        stype = 0
+        if content.find(key_text) == -1:
+            status = False
+            stype = -1
+
+        to_https = self.isToHttps(site_name)
+
+        sid = mw.M('sites').where("name=?", (site_name,)).getField('id')
+        domains = mw.M('domain').where("pid=?", (sid,)).field('name').select()
+
+        csr_path = path + '/fullchain.pem'  # 生成证书路径
+        key_path = path + '/privkey.pem'    # 密钥文件路径
+
+        cert_data = None
+        if ssl_type == 'lets':
+            csr_path = self.sslLetsDir + '/' + site_name + '/fullchain.pem'  # 生成证书路径
+            key_path = self.sslLetsDir + '/' + site_name + '/privkey.pem'    # 密钥文件路径
+        elif ssl_type == 'acme':
+            acme_dir = mw.getAcmeDomainDir(site_name)
+            csr_path = acme_dir + '/fullchain.cer'  # 生成证书路径
+            key_path = acme_dir + '/' + site_name + '.key'    # 密钥文件路径
+
+        key = mw.readFile(key_path)
+        csr = mw.readFile(csr_path)
+        cert_data = mw.getCertName(csr_path)
+        data = {
+            'status': status,
+            'domain': domains,
+            'key': key,
+            'csr': csr,
+            'type': stype,
+            'httpTohttps': to_https,
+            'cert_data': cert_data,
+        }
+        return mw.returnData(True, 'OK', data)
+
+
     def setPhpVersion(self, siteName, version):
         # nginx
         file = self.getHostConf(siteName)

From 08336eb2ee48e1d9fdf14496b8274f245caf1516 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 10 Nov 2024 19:13:53 +0800
Subject: [PATCH 155/965] Update firewall.html

---
 web/templates/default/firewall.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/templates/default/firewall.html b/web/templates/default/firewall.html
index e0b1e5224..8aa674fea 100755
--- a/web/templates/default/firewall.html
+++ b/web/templates/default/firewall.html
@@ -92,7 +92,7 @@
 								<option value="port">放行端口</option>
 								<option value="address">屏蔽</option>
 							</select>
-							<input type="text" class="bt-input-text mr5" style="width: 117px;" id="AcceptPort" placeholder="端口">
+							<input type="number" class="bt-input-text mr5" style="width: 117px;" id="AcceptPort" placeholder="端口">
 							<input type="text" class="bt-input-text mr5" id="Ps" placeholder="备注/说明">
 							<select class="bt-input-text c5 mr5" name="protocol" style="width:80px;">
 								<option value="tcp">tcp</option>

From d8a2e91922adc5f35c469264a9084a8b701889d8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 10 Nov 2024 19:33:56 +0800
Subject: [PATCH 156/965] update

---
 web/static/app/firewall.js          | 4 ++--
 web/templates/default/firewall.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/static/app/firewall.js b/web/static/app/firewall.js
index cdd78f0d9..4bb37b538 100755
--- a/web/static/app/firewall.js
+++ b/web/static/app/firewall.js
@@ -312,8 +312,8 @@ function showAccept(page,search) {
 		}
 
 
-		$("#firewallBody").html(body);
-		$("#firewallPage").html(data.page);
+		$("#firewall_body").html(body);
+		$("#firewall_page").html(data.page);
 	},'json');
 }
 
diff --git a/web/templates/default/firewall.html b/web/templates/default/firewall.html
index 8aa674fea..32b0a4a44 100755
--- a/web/templates/default/firewall.html
+++ b/web/templates/default/firewall.html
@@ -103,9 +103,9 @@
 							<span id="f-ps" class="c9" style="margin-left: 10px;">说明: 支持放行端口范围，如: 3000:3500</span>
 						</div>
                         <div class="tablescroll">
-                            <table id="firewallBody" class="table table-hover" style="min-width: 640px;border: 0 none;"></table>
+                            <table id="firewall_body" class="table table-hover" style="min-width: 640px;border: 0 none;"></table>
                         </div>
-                        <div id="firewallPage" class="dataTables_paginate paging_bootstrap page firewallBody" style="margin-bottom:0"></div>
+                        <div id="firewall_page" class="dataTables_paginate paging_bootstrap page firewall_body" style="margin-bottom:0"></div>
                     </div>
                 </div>
             </div>

From 8520bfcd27b842e730d1f194f4aab5d68dae1e36 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 10 Nov 2024 20:05:21 +0800
Subject: [PATCH 157/965] update

---
 web/admin/files/__init__.py         |  6 +++++-
 web/static/app/firewall.js          | 17 ++++++++---------
 web/templates/default/firewall.html | 21 +++++++++++----------
 web/utils/file.py                   | 12 +++++++++++-
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/web/admin/files/__init__.py b/web/admin/files/__init__.py
index d81227f80..ec8ea3802 100644
--- a/web/admin/files/__init__.py
+++ b/web/admin/files/__init__.py
@@ -155,7 +155,11 @@ def close_recycle_bin():
     return file.closeRecycleBin()
 
 
-
+# 日志清空
+@blueprint.route('/close_logs', endpoint='close_logs', methods=['POST'])
+@panel_login_required
+def close_logs():
+    return file.closeLogs()
 
 
 
diff --git a/web/static/app/firewall.js b/web/static/app/firewall.js
index 4bb37b538..2f5b2437f 100755
--- a/web/static/app/firewall.js
+++ b/web/static/app/firewall.js
@@ -297,21 +297,20 @@ function showAccept(page,search) {
 					break;
 			}
 			body += "<tr>\
-						<td><em class='dlt-num'>" + data.data[i].id + "</em></td>\
-						<td>" + data.data[i].protocol + "</td>\
-						<td>" + (data.data[i].port.indexOf('.') == -1?'放行端口'+':['+data.data[i].port+']':'屏蔽IP'+':['+data.data[i].port+']') + "</td>\
-						<td>" + status + "</td>\
-						<td>" + data.data[i].ps + "</td>\
-						<td>" + data.data[i].add_time + "</td>\
-						<td class='text-right'><a href='javascript:;' class='btlink' onclick=\"delAcceptPort(" + data.data[i].id + ",'" + data.data[i].port + "','"+data.data[i].protocol+"')\">删除</a></td>\
-					</tr>";
+				<td><em class='dlt-num'>" + data.data[i].id + "</em></td>\
+				<td>" + data.data[i].protocol + "</td>\
+				<td>" + (data.data[i].port.indexOf('.') == -1?'放行端口'+':['+data.data[i].port+']':'屏蔽IP'+':['+data.data[i].port+']') + "</td>\
+				<td>" + status + "</td>\
+				<td>" + data.data[i].ps + "</td>\
+				<td>" + data.data[i].add_time + "</td>\
+				<td class='text-right'><a href='javascript:;' class='btlink' onclick=\"delAcceptPort(" + data.data[i].id + ",'" + data.data[i].port + "','"+data.data[i].protocol+"')\">删除</a></td>\
+			</tr>";
 		}
 
 		if (data.data.length == 0){
 			body = '<tr><td colspan="5" style="text-align: center;">当前没有数据</td></tr>';
 		}
 
-
 		$("#firewall_body").html(body);
 		$("#firewall_page").html(data.page);
 	},'json');
diff --git a/web/templates/default/firewall.html b/web/templates/default/firewall.html
index 32b0a4a44..811df6531 100755
--- a/web/templates/default/firewall.html
+++ b/web/templates/default/firewall.html
@@ -13,14 +13,16 @@
 	color:#666;
 	margin: 0 30px;
 }
+
 .weblog span{
 	margin-right:5px;
 }
+
 .weblog a{
 	color:#20a53a;
 }
 .firewall-port-box{
-	margin-bottom:15px;
+	margin-bottom:5px;
 }
 </style>
 <div class="main-content">
@@ -66,14 +68,13 @@
 			</div>
 
 			<div class="mr20 pull-left" style="border-right: 1px solid #ccc; padding-right: 20px;">
-				<form>
-					<div class="ss-text pull-left">
-						<em>启用防火墙</em>
-						<div class='ssh-item' id="firewall_status">
-							<input class='btswitch btswitch-ios' id='firewall_status' type='checkbox'><label class='btswitch-btn sshswitch' for='firewall_status' ></label>
-						</div>
+				<div class="ss-text pull-left">
+					<em>启用防火墙</em>
+					<div class='ssh-item' id="firewall_status">
+						<input class='btswitch btswitch-ios' id='firewall_status' type='checkbox'>
+						<label class='btswitch-btn sshswitch' for='firewall_status'></label>
 					</div>
-				</form>
+				</div>
 			</div>
 
 			<div class="weblog" id='firewall_weblog'></div>
@@ -102,10 +103,10 @@
 							<button id="toAccept" onclick="addAcceptPort();" class="btn btn-default btn-sm va0" type="button">放行</button>
 							<span id="f-ps" class="c9" style="margin-left: 10px;">说明: 支持放行端口范围，如: 3000:3500</span>
 						</div>
-                        <div class="tablescroll">
+                        <div class="tablescroll" style="border-top-width: 0px;">
                             <table id="firewall_body" class="table table-hover" style="min-width: 640px;border: 0 none;"></table>
                         </div>
-                        <div id="firewall_page" class="dataTables_paginate paging_bootstrap page firewall_body" style="margin-bottom:0"></div>
+                        <div id="firewall_page" class="dataTables_paginate paging_bootstrap page firewall_body" style="margin-bottom:0px;"></div>
                     </div>
                 </div>
             </div>
diff --git a/web/utils/file.py b/web/utils/file.py
index 691479979..de7a9325e 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -322,7 +322,7 @@ def getDirSize(filePath, size=0):
 # 获取目录大小(bash)
 def getDirSizeByBash(path):
     tmp = mw.execShell('du -sh ' + path)
-    return tmp[0].split()[0]
+    return tmp[0].split()[0].lower()
 
 # 计算文件数量
 def getCount(path, search = None):
@@ -493,3 +493,13 @@ def setMode(path):
     p_stat = os.stat(s_path)
     os.chown(path, p_stat.st_uid, p_stat.st_gid)
     os.chmod(path, p_stat.st_mode)
+
+
+def closeLogs():
+    log_file = mw.getLogsDir()
+    os.system('rm -rf ' + log_file + '/*')
+    mw.opWeb('reload')
+    # os.system('kill -USR1 `cat ' + mw.getServerDir() +'/openresty/nginx/logs/nginx.pid`')
+    mw.writeLog('文件管理', '网站日志已被清空!')
+    tmp = getDirSizeByBash(log_file)
+    return mw.returnData(True, tmp)

From a9f10842e7158a985ab5901c2130f577df3164f0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 10 Nov 2024 20:35:58 +0800
Subject: [PATCH 158/965] Update files.js

---
 web/static/app/files.js | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/web/static/app/files.js b/web/static/app/files.js
index 5b0a5aec1..6bb9abf32 100755
--- a/web/static/app/files.js
+++ b/web/static/app/files.js
@@ -1,15 +1,8 @@
-// console.log(lan);
-
 //判断磁盘数量超出宽度
 function isDiskWidth(){
-	var comlistWidth = $("#comlist").width();
-	var bodyWidth = $(".file-box").width();
-	if(comlistWidth + 530 > bodyWidth){
-		$("#comlist").css({"width":bodyWidth-530+"px","height":"34px","overflow":"auto"});
-	}
-	else{
-		$("#comlist").removeAttr("style");
-	}
+	var comlist_width = $("#comlist").width();
+	var body_width = $(".file-box").width();
+	$("#comlist").css({"width":(body_width-520)+"px","height":"34px","overflow":"auto"});
 }
 
 //打开回收站
@@ -227,7 +220,9 @@ function getFileName(name){
 function reisImage(fileName){
 	var exts = ['jpg','jpeg','png','bmp','gif','tiff','ico'];
 	for(var i=0; i<exts.length; i++){
-		if(fileName == exts[i]) return true
+		if(fileName == exts[i]) {
+			return true;
+		}
 	}
 	return false;
 }

From 97b23b71485eeb78ab33179c976c2b2d0cefdd21 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 10 Nov 2024 20:36:48 +0800
Subject: [PATCH 159/965] Update files.js

---
 web/static/app/files.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/static/app/files.js b/web/static/app/files.js
index 6bb9abf32..85e1ef806 100755
--- a/web/static/app/files.js
+++ b/web/static/app/files.js
@@ -1051,7 +1051,9 @@ function createDir(type, path) {
 				</div>',
 		success:function(){
 			$("#newDirName").focus().keyup(function(e){
-				if(e.keyCode == 13) $("#createDirBtn").click();
+				if(e.keyCode == 13) {
+					$("#createDirBtn").click();
+				}
 			});
 		}
 	});

From af29e865e82584b6c1d8f5e241cce17d727555d9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 10 Nov 2024 22:43:08 +0800
Subject: [PATCH 160/965] update

---
 web/admin/setup/sql/default.sql | 20 ++++++++---
 web/static/app/config.js        | 14 ++++----
 web/thisdb/__init__.py          |  6 ++--
 web/thisdb/app.py               | 60 +++++++++++++++++++++++++++++++++
 4 files changed, 86 insertions(+), 14 deletions(-)
 create mode 100644 web/thisdb/app.py

diff --git a/web/admin/setup/sql/default.sql b/web/admin/setup/sql/default.sql
index 794ede180..074484838 100755
--- a/web/admin/setup/sql/default.sql
+++ b/web/admin/setup/sql/default.sql
@@ -99,8 +99,8 @@ CREATE TABLE IF NOT EXISTS `users` (
   `login_time` TEXT,
   `phone` TEXT,
   `email` TEXT,
-  `add_time` INTEGER,
-  `update_time` INTEGER
+  `add_time` TEXT,
+  `update_time` TEXT
 );
 
 CREATE TABLE IF NOT EXISTS `tasks` (
@@ -111,7 +111,7 @@ CREATE TABLE IF NOT EXISTS `tasks` (
   `end` 	    INTEGER,
   `cmd` 	    TEXT,
   `status`    INTEGER,
-  `add_time`  INTEGER
+  `add_time`  TEXT
 );
 
 CREATE TABLE IF NOT EXISTS `temp_login` (
@@ -123,7 +123,7 @@ CREATE TABLE IF NOT EXISTS `temp_login` (
   `login_addr`  REAL,
   `logout_time` INTEGER,
   `expire`  INTEGER,
-  `add_time` INTEGER
+  `add_time` TEXT
 );
 
 CREATE TABLE IF NOT EXISTS `panel` (
@@ -133,7 +133,17 @@ CREATE TABLE IF NOT EXISTS `panel` (
   `username` TEXT,
   `password` TEXT,
   `click` INTEGER,
-  `add_time` INTEGER
+  `add_time` TEXT
+);
+
+CREATE TABLE IF NOT EXISTS `app` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `app_id` TEXT,
+  `app_secret` TEXT,
+  `white_list` TEXT,
+  `status` INTEGER,
+  `add_time` TEXT,
+  `update_time` TEXT
 );
 
 CREATE TABLE IF NOT EXISTS `option` (
diff --git a/web/static/app/config.js b/web/static/app/config.js
index ac64e1822..30850558e 100755
--- a/web/static/app/config.js
+++ b/web/static/app/config.js
@@ -268,13 +268,13 @@ function modifyAuthPath() {
         btn:['提交','关闭', '随机生成'],
         shadeClose: false,
         content: '<div class="bt-form bt-form pd20">\
-                    <div class="line ">\
-                        <span class="tname">入口地址</span>\
-                        <div class="info-r">\
-                            <input name="auth_path_set" class="bt-input-text mr5" type="text" style="width: 311px" value="' + auth_path + '">\
-                        </div>\
-                    </div>\
-                </div>',
+            <div class="line ">\
+                <span class="tname">入口地址</span>\
+                <div class="info-r">\
+                    <input name="auth_path_set" class="bt-input-text mr5" type="text" style="width: 311px" value="' + auth_path + '">\
+                </div>\
+            </div>\
+        </div>',
         yes:function(index){
         	var auth_path = $("input[name='auth_path_set']").val();
 		    if (auth_path == '/' || auth_path == ''){
diff --git a/web/thisdb/__init__.py b/web/thisdb/__init__.py
index 31924c2de..33f664b8b 100644
--- a/web/thisdb/__init__.py
+++ b/web/thisdb/__init__.py
@@ -10,9 +10,9 @@
 
 from .init import *
 from .option import *
-from .user import *
 
 from .sites import *
+from .site_types import *
 from .domain import *
 from .binding import *
 
@@ -20,5 +20,7 @@ from .tasks import *
 from .logs import *
 from .crontab import *
 from .firewall import *
+
 from .temp_login import *
-from .site_types import *
+from .user import *
+from .app import *
diff --git a/web/thisdb/app.py b/web/thisdb/app.py
new file mode 100644
index 000000000..8f34d7ed3
--- /dev/null
+++ b/web/thisdb/app.py
@@ -0,0 +1,60 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import core.mw as mw
+
+__FIELD = 'id,app_id,app_secret,status,add_time,update_time'
+
+def addApp(app_id,app_secret):
+	now_time = mw.getDateFromNow()
+    add_data = {
+        'app_id': app_id,
+        'app_secret': app_secret,
+        'status': 1,
+        'add_time': now_time,
+        'update_time': now_time
+    }
+    return mw.M('app').insert(add_data)
+
+def getAppList(
+	page:int | None = 1,
+    size:int | None = 10,
+):	
+	m = mw.M('app').field(__FIELD)
+
+	start = (int(page) - 1) * (int(size))
+    limit = str(start) + ',' +str(size)
+	app_list = m.limit(limit).order('id desc').select()
+	count = m.count()
+
+	data = {}
+    data['list'] = app_list
+    data['count'] = count
+    return data
+
+def getAppById(aid):
+	return mw.M('app').field(__FIELD).where("id=?", (aid,)).find()
+
+def deleteAppById(aid):
+    return mw.M('app').where("id=?", (aid,)).delete()
+
+def setAppData(aid,
+    status: str | None = None,
+    app_id: str | None = None,
+    app_secret: str | None = None,
+):
+    up_data = {}
+    if status is not None:
+        up_data['status'] = status
+    if app_id is not None:
+        up_data['app_id'] = app_id
+    if app_secret is not None:
+        up_data['app_secret'] = app_secret
+    return mw.M('app').where('id=?',(aid,)).update(up_data)

From f511b8e44f02ebcea616fb12b929507c100923ea Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 10 Nov 2024 22:48:41 +0800
Subject: [PATCH 161/965] Update app.py

---
 web/thisdb/app.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/web/thisdb/app.py b/web/thisdb/app.py
index 8f34d7ed3..be4f5ace0 100644
--- a/web/thisdb/app.py
+++ b/web/thisdb/app.py
@@ -13,7 +13,7 @@ import core.mw as mw
 __FIELD = 'id,app_id,app_secret,status,add_time,update_time'
 
 def addApp(app_id,app_secret):
-	now_time = mw.getDateFromNow()
+    now_time = mw.getDateFromNow()
     add_data = {
         'app_id': app_id,
         'app_secret': app_secret,
@@ -24,23 +24,23 @@ def addApp(app_id,app_secret):
     return mw.M('app').insert(add_data)
 
 def getAppList(
-	page:int | None = 1,
+    page:int | None = 1,
     size:int | None = 10,
-):	
-	m = mw.M('app').field(__FIELD)
+):  
+    m = mw.M('app').field(__FIELD)
 
-	start = (int(page) - 1) * (int(size))
+    start = (int(page) - 1) * (int(size))
     limit = str(start) + ',' +str(size)
-	app_list = m.limit(limit).order('id desc').select()
-	count = m.count()
+    app_list = m.limit(limit).order('id desc').select()
+    count = m.count()
 
-	data = {}
+    data = {}
     data['list'] = app_list
     data['count'] = count
     return data
 
 def getAppById(aid):
-	return mw.M('app').field(__FIELD).where("id=?", (aid,)).find()
+    return mw.M('app').field(__FIELD).where("id=?", (aid,)).find()
 
 def deleteAppById(aid):
     return mw.M('app').where("id=?", (aid,)).delete()

From 111aaa768a94dfaa31e2bdca92d4fd0c1dea6042 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 11 Nov 2024 00:48:54 +0800
Subject: [PATCH 162/965] update

---
 panel_task.py                      |   3 +
 web/admin/__init__.py              |  22 +----
 web/admin/setting/__init__.py      |   9 +-
 web/admin/setting/app.py           |  55 +++++++++++
 web/admin/setup/__init__.py        |  16 +++
 web/admin/setup/sql/default.sql    |  10 +-
 web/static/app/config.js           | 152 +++++++++++++++++++++++++++++
 web/templates/default/setting.html |   2 +-
 web/thisdb/app.py                  |   5 +-
 9 files changed, 239 insertions(+), 35 deletions(-)
 create mode 100644 web/admin/setting/app.py

diff --git a/panel_task.py b/panel_task.py
index afb5f96b3..97c64e853 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -27,6 +27,9 @@ sys.path.append(web_dir)
 import core.mw as mw
 import thisdb
 
+from admin import setup
+setup.init()
+
 g_log_file = mw.getPanelTaskLog()
 isTask = mw.getMWLogs() + '/panelTask.pl'
 
diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 359557fea..8d40a7f32 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -76,27 +76,7 @@ app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = True
 # 初始化db
 # sys_db.init_app(app)
 # Migrate(app, sys_db)
-
-
-# 检查数据库是否存在。如果没有就创建它。
-setup_db_required = False
-if not os.path.isfile(config.SQLITE_PATH):
-    setup_db_required = True
-
-# with app.app_context():
-#     sys_db.create_all()
-
-# with app.app_context():
-#     if setup_db_required:
-#         sys_db.create_all()
-
-if setup_db_required:
-    # 初始化用户信息
-    thisdb.initPanelData()
-    setup.init_admin_user()
-    setup.init_option()
-setup.init_cmd()
-setup.init_db_system()
+setup.init()
 
 
 app.config['BASIC_AUTH_OPEN'] = False
diff --git a/web/admin/setting/__init__.py b/web/admin/setting/__init__.py
index 8e01f4bc0..1627e3b8f 100644
--- a/web/admin/setting/__init__.py
+++ b/web/admin/setting/__init__.py
@@ -9,15 +9,12 @@
 # ---------------------------------------------------------------------------------
 
 from .setting import *
+
 from .temp_login import *
 from .timezone import *
 from .secondary_verifiy import *
+
 from .notify_email import *
 from .notify_tgbot import *
+from .app import *
 
-
-
-
-
-
- 
\ No newline at end of file
diff --git a/web/admin/setting/app.py b/web/admin/setting/app.py
new file mode 100644
index 000000000..7fd802822
--- /dev/null
+++ b/web/admin/setting/app.py
@@ -0,0 +1,55 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import re
+import json
+import os
+import time
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin import session
+from admin.user_login_check import panel_login_required
+
+import core.mw as mw
+import utils.config as utils_config
+
+from .setting import blueprint
+import thisdb
+
+
+# 获取APP列表
+@blueprint.route('/get_app_list', endpoint='get_app_list', methods=['POST'])
+@panel_login_required
+def get_app_list():
+    limit = request.form.get('limit', '5').strip()
+    page = request.form.get('page', '1').strip()
+    tojs = request.form.get('tojs', '').strip()
+
+    info = thisdb.getAppList(page=int(page),size=int(limit))
+    data = {}
+    data['data'] = info['list']
+    data['page'] = mw.getPage({'count':info['count'],'tojs':tojs,'p':page,'row':limit})
+    return data
+
+
+# 获取APP列表
+@blueprint.route('/add_app', endpoint='add_app', methods=['POST'])
+@panel_login_required
+def add_app():
+    app_id = request.form.get('app_id', '').strip()
+    app_secret = request.form.get('app_secret', '1').strip()
+    limit_addr = request.form.get('limit_addr', '').strip()
+
+    rid = thisdb.addApp(app_id,app_secret,limit_addr)
+    if rid > 0:
+        return mw.returnData(True, '添加成功!')
+    return mw.returnData(False, '添加失败!')
diff --git a/web/admin/setup/__init__.py b/web/admin/setup/__init__.py
index e8ab0677a..6747b01d4 100644
--- a/web/admin/setup/__init__.py
+++ b/web/admin/setup/__init__.py
@@ -8,8 +8,24 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
+import os
+
 from .user import init_admin_user
 from .option import init_option
 from .init_db_system import init_db_system
 from .init_cmd import init_cmd
 
+
+import thisdb
+import config
+
+def init():
+	# 检查数据库是否存在。如果没有就创建它。
+	if not os.path.isfile(config.SQLITE_PATH):
+	    # 初始化用户信息
+	    thisdb.initPanelData()
+	    init_admin_user()
+	    init_option()
+	init_cmd()
+	init_db_system()
+
diff --git a/web/admin/setup/sql/default.sql b/web/admin/setup/sql/default.sql
index 074484838..ab2b3baae 100755
--- a/web/admin/setup/sql/default.sql
+++ b/web/admin/setup/sql/default.sql
@@ -37,6 +37,7 @@ CREATE TABLE IF NOT EXISTS `crontab` (
   `add_time` TEXT,
   `update_time` TEXT
 );
+CREATE UNIQUE INDEX name_idx ON crontab(name);
 
 CREATE TABLE IF NOT EXISTS `firewall` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -46,15 +47,12 @@ CREATE TABLE IF NOT EXISTS `firewall` (
   `add_time` TEXT,
   `update_time` TEXT
 );
-
-ALTER TABLE `firewall` ADD COLUMN `protocol` TEXT DEFAULT 'tcp';
+CREATE UNIQUE INDEX port_idx ON firewall(port);
 
 INSERT INTO `firewall` (`id`, `port`, `protocol`, `ps`, `add_time`, `update_time`) VALUES
 (1, '80',  'tcp','网站默认端口', '0000-00-00 00:00:00','0000-00-00 00:00:00'),
 (2, '443', 'tcp/udp', 'HTTPS', '0000-00-00 00:00:00','0000-00-00 00:00:00');
 
-
-
 CREATE TABLE IF NOT EXISTS `logs` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `type` TEXT,
@@ -77,11 +75,13 @@ CREATE TABLE IF NOT EXISTS `sites` (
   `add_time` TEXT,
   `update_time` TEXT
 );
+CREATE UNIQUE INDEX name_idx ON sites(name);
 
 CREATE TABLE IF NOT EXISTS `site_types` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `name` TEXT
 );
+CREATE UNIQUE INDEX name_idx ON site_types(name);
 
 CREATE TABLE IF NOT EXISTS `domain` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -145,6 +145,7 @@ CREATE TABLE IF NOT EXISTS `app` (
   `add_time` TEXT,
   `update_time` TEXT
 );
+CREATE UNIQUE INDEX app_id_idx ON app(app_id);
 
 CREATE TABLE IF NOT EXISTS `option` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -152,5 +153,4 @@ CREATE TABLE IF NOT EXISTS `option` (
   `type` TEXT,
   `value` TEXT
 );
-
 CREATE UNIQUE INDEX name_idx ON option(name);
diff --git a/web/static/app/config.js b/web/static/app/config.js
index 30850558e..8db5b183e 100755
--- a/web/static/app/config.js
+++ b/web/static/app/config.js
@@ -1472,3 +1472,155 @@ function setPanelApi(){
 		} ,{icon:rdata.status?1:2}, 1000);
 	},'json');
 }
+
+
+function getAppList(page) {
+	if (typeof(page) == 'undefined'){
+		page = 1;
+	}
+
+	$.post('/setting/get_app_list', {page:page}, function(rdata){
+		console.log(rdata);
+		if ( typeof(rdata.status) !='undefined' && !rdata.status){
+			showMsg(rdata.msg,function(){
+				layer.closeAll();
+			},{icon:2}, 2000);
+			return;
+		}
+
+		var tbody = '';
+		for (var i = 0; i < rdata.data.length; i++) {
+
+			tbody += '<tr>';
+			tbody += '<td>' + (rdata.data[i]['login_addr']||'未登陆') +'</td>';
+
+			tbody += '<td>';
+			switch (parseInt(rdata.data[i]['state'])) {
+				case 0:
+					tbody += '<a style="color:green;">待使用</a>';
+					break;
+				case 1:
+					tbody += '<a style="color:brown;">已使用</a>';
+					break;
+				case -1:
+					tbody += '<a>已过期</a>';
+					break;
+			}
+			tbody += '</td>';
+
+			tbody += '<td>' + (getLocalTime(rdata.data[i]['login_time'])||'未登陆') +'</td>';
+			tbody += '<td>' + getLocalTime(rdata.data[i]['expire']) +'</td>';
+
+			tbody += '<td>';
+
+			if (rdata.data[i]['state'] == '1' ){
+				tbody += '<a class="btlink" onclick="getTempAccessLogs(\''+rdata.data[i]['id']+'\')">操作日志</a>';
+			} else{
+				tbody += '<a class="btlink" onclick="removeTempAccess(\''+rdata.data[i]['id']+'\')">删除</a>';
+			}
+			
+			tbody += '</td>';
+
+			tbody += '</tr>';
+		}
+
+		$('#temp_login_view_tbody').html(tbody);
+		$('.temp_login_view_page').html(rdata.page);
+	},'json');
+}
+
+function addApp(){
+	var msg = '<span style="color:red">注意1：滥用临时授权可能导致安全风险。</br>注意2：请勿在公共场合发布临时授权连接</span></br>即将创建临时授权连接，继续吗？';
+	layer.confirm(msg,{title:'风险提示',closeBtn:1,icon:13,}, function(create_layer) {
+		layer.close(create_layer);
+		layer.open({
+			area: '570px',
+			title: '添加应用',
+			shift: 0,
+			type: 1,
+			content: '<div class="bt-form pd20">\
+		<div class="line">\
+			<span class="tname">应用ID</span>\
+			<div class="info-r">\
+				<input class="bt-input-text mr5" name="app_id" type="text" style="width: 310px;" disabled>\
+				<button class="btn btn-success btn-xs app_id" style="margin-left: -50px;">重置</button>\
+			</div>\
+		</div>\
+		<div class="line">\
+			<span class="tname">应用密钥</span>\
+			<div class="info-r">\
+				<input class="bt-input-text mr5" name="app_secret" type="text" style="width: 310px;" disabled>\
+				<button class="btn btn-success btn-xs app_secret" style="margin-left: -50px;">重置</button>\
+			</div>\
+		</div>\
+		<div class="line">\
+			<span class="tname" style="width: 90px; overflow: initial; height: 20px; line-height: 20px;">IP白名单<br/>(每行1个)</span>\
+			<div class="info-r"><textarea class="bt-input-text" name="api_limit_addr" style="width: 310px; height: 80px; line-height: 20px; padding: 5px 8px;"></textarea></div>\
+		</div>\
+		<div class="line">\
+			<span class="tname"></span>\
+			<div class="info-r"><button class="btn btn-success btn-sm save_app_data">保存配置</button></div>\
+		</div>\
+		<ul class="help-info-text c7">\
+			<li>开启API后，必需在IP白名单列表中的IP才能访问面板API接口</li>\
+			<li style="color: red;">请谨慎在生产环境开启，这可能增加服务器安全风险；</li>\
+		</ul>\
+	</div>',
+			success:function(){
+				$('input[name="app_id"]').val(getRandomString(10));
+				$('input[name="app_secret"]').val(getRandomString(20));
+
+				$('.app_id').click(function(){
+					$('input[name="app_id"]').val(getRandomString(10));
+				});
+
+				$('.app_secret').click(function(){
+					$('input[name="app_secret"]').val(getRandomString(20));
+				});
+
+				$('.save_app_data').click(function(){
+					var app_id = $('input[name="app_id"]').val();
+					var app_secret = $('input[name="app_secret"]').val();
+					var limit_addr = $('textarea[name="api_limit_addr"]').val();
+					$.post('/setting/add_app', {'app_id':app_id,'app_secret':app_secret,'limit_addr':limit_addr},function(rdata){
+						showMsg(rdata.msg, function(){} ,{icon:rdata.status?1:2}, 2000);
+					},'json');
+				});
+
+			}
+		});
+	});
+}
+
+function appPage(){
+	layer.open({
+		area: ['700px', '380px'],
+		title: 'APP应用管理',
+		closeBtn:1,
+		shift: 0,
+		type: 1,
+		content: "<div class='login_view_table pd20'>\
+			<button class='btn btn-success btn-sm app_add'>添加</button>\
+			<div class='divtable mt10'>\
+				<table class='table table-hover'>\
+					<thead>\
+					<tr>\
+						<th>登录IP</th>\
+						<th>状态</th><th>登录时间</th>\
+						<th>过期时间</th>\
+						<th style='text-align:right;'>操作</th>\
+					</tr>\
+					</thead>\
+					<tbody id='temp_login_view_tbody'></tbody>\
+				</table>\
+				<div class='temp_login_view_page page'></div>\
+			</div>\
+		</div>",
+		success:function(){
+			getAppList();
+			$('.app_add').click(function(){
+				addApp();
+			});
+		}
+	});
+}
diff --git a/web/templates/default/setting.html b/web/templates/default/setting.html
index a831407d8..61d4a659a 100755
--- a/web/templates/default/setting.html
+++ b/web/templates/default/setting.html
@@ -131,7 +131,7 @@
 					<span class="set-tit text-right" title="API接口" style="float: left;">API接口</span>
 					<input class="btswitch btswitch-ios" id="cfg_panel_api" type="checkbox" {{data['api_token']}}/>
 	                <label class="btswitch-btn ml5" for="cfg_panel_api" style="float: left;margin-top:4px;" onclick="setPanelApi()"></label>
-	                <button ype="button" class="btn btn-default btn-xs panel_api_btn" style="vertical-align: middle; margin-left: 10px" onclick="showPanelApi();">API接口配置</button>
+	                <button ype="button" class="btn btn-default btn-xs panel_api_btn" style="vertical-align: middle; margin-left: 10px" onclick="appPage();">APP应用管理</button>
 					<span class="set-info c7">提供面板API接口访问的支持</span>
 				</p>
 
diff --git a/web/thisdb/app.py b/web/thisdb/app.py
index be4f5ace0..4350f194a 100644
--- a/web/thisdb/app.py
+++ b/web/thisdb/app.py
@@ -10,14 +10,15 @@
 
 import core.mw as mw
 
-__FIELD = 'id,app_id,app_secret,status,add_time,update_time'
+__FIELD = 'id,app_id,app_secret,white_list,status,add_time,update_time'
 
-def addApp(app_id,app_secret):
+def addApp(app_id,app_secret,white_list):
     now_time = mw.getDateFromNow()
     add_data = {
         'app_id': app_id,
         'app_secret': app_secret,
         'status': 1,
+        'white_list':white_list,
         'add_time': now_time,
         'update_time': now_time
     }

From 89d6bbd3172099328a2ecd4dbd5d2861e39f79ea Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 11 Nov 2024 00:56:03 +0800
Subject: [PATCH 163/965] Update default.sql

---
 web/admin/setup/sql/default.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/admin/setup/sql/default.sql b/web/admin/setup/sql/default.sql
index ab2b3baae..a9b8cb531 100755
--- a/web/admin/setup/sql/default.sql
+++ b/web/admin/setup/sql/default.sql
@@ -138,6 +138,7 @@ CREATE TABLE IF NOT EXISTS `panel` (
 
 CREATE TABLE IF NOT EXISTS `app` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` TEXT,
   `app_id` TEXT,
   `app_secret` TEXT,
   `white_list` TEXT,
@@ -145,6 +146,7 @@ CREATE TABLE IF NOT EXISTS `app` (
   `add_time` TEXT,
   `update_time` TEXT
 );
+CREATE UNIQUE INDEX name_idx ON app(name);
 CREATE UNIQUE INDEX app_id_idx ON app(app_id);
 
 CREATE TABLE IF NOT EXISTS `option` (

From 8f1396bb8b75db033c0021d4b87e526692a9f79f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 11 Nov 2024 22:18:32 +0800
Subject: [PATCH 164/965] up

---
 web/admin/setting/app.py |  13 ++-
 web/static/app/config.js | 182 +++++++++++++++++++--------------------
 2 files changed, 101 insertions(+), 94 deletions(-)

diff --git a/web/admin/setting/app.py b/web/admin/setting/app.py
index 7fd802822..3be1210cd 100644
--- a/web/admin/setting/app.py
+++ b/web/admin/setting/app.py
@@ -32,7 +32,7 @@ import thisdb
 def get_app_list():
     limit = request.form.get('limit', '5').strip()
     page = request.form.get('page', '1').strip()
-    tojs = request.form.get('tojs', '').strip()
+    tojs = request.form.get('tojs', 'getAppList').strip()
 
     info = thisdb.getAppList(page=int(page),size=int(limit))
     data = {}
@@ -53,3 +53,14 @@ def add_app():
     if rid > 0:
         return mw.returnData(True, '添加成功!')
     return mw.returnData(False, '添加失败!')
+
+
+# 获取APP列表
+@blueprint.route('/delete_app', endpoint='delete_app', methods=['POST'])
+@panel_login_required
+def delete_app():
+    aid = request.form.get('id', '').strip()
+    rid = thisdb.deleteAppById(aid)
+    if rid > 0:
+        return mw.returnData(True, '删除成功!')
+    return mw.returnData(False, '删除失败!')
diff --git a/web/static/app/config.js b/web/static/app/config.js
index 8db5b183e..452d4624d 100755
--- a/web/static/app/config.js
+++ b/web/static/app/config.js
@@ -1474,146 +1474,142 @@ function setPanelApi(){
 }
 
 
+function deleteApp(id){
+	layer.confirm('您确定要删除吗？',{title:'删除应用',closeBtn:2,icon:13,cancel:function(){}}, function() {
+		$.post('/setting/delete_app', {'id':id},function(rdata){
+			layer.msg(rdata.msg,{icon:rdata.status?1:2});
+			if (rdata.status){
+				getAppList();
+			}
+		},'json');
+	});
+}
+
 function getAppList(page) {
+
 	if (typeof(page) == 'undefined'){
 		page = 1;
 	}
 
 	$.post('/setting/get_app_list', {page:page}, function(rdata){
-		console.log(rdata);
-		if ( typeof(rdata.status) !='undefined' && !rdata.status){
-			showMsg(rdata.msg,function(){
-				layer.closeAll();
-			},{icon:2}, 2000);
-			return;
-		}
-
 		var tbody = '';
 		for (var i = 0; i < rdata.data.length; i++) {
+			var row = rdata.data[i];
 
 			tbody += '<tr>';
-			tbody += '<td>' + (rdata.data[i]['login_addr']||'未登陆') +'</td>';
 
-			tbody += '<td>';
-			switch (parseInt(rdata.data[i]['state'])) {
-				case 0:
-					tbody += '<a style="color:green;">待使用</a>';
-					break;
-				case 1:
-					tbody += '<a style="color:brown;">已使用</a>';
-					break;
-				case -1:
-					tbody += '<a>已过期</a>';
-					break;
-			}
-			tbody += '</td>';
+			tbody += '<td>' + row['app_id'] +'</td>';
+			tbody += '<td>' + row['app_secret'] +'</td>';
+			tbody += '<td>' + row['white_list'] +'</td>';
 
-			tbody += '<td>' + (getLocalTime(rdata.data[i]['login_time'])||'未登陆') +'</td>';
-			tbody += '<td>' + getLocalTime(rdata.data[i]['expire']) +'</td>';
-
-			tbody += '<td>';
-
-			if (rdata.data[i]['state'] == '1' ){
-				tbody += '<a class="btlink" onclick="getTempAccessLogs(\''+rdata.data[i]['id']+'\')">操作日志</a>';
-			} else{
-				tbody += '<a class="btlink" onclick="removeTempAccess(\''+rdata.data[i]['id']+'\')">删除</a>';
+			if (row['status'] == 1){
+				tbody += '<td><a class="btlink">已开启</a></td>';
+			} else {
+				tbody += '<td><a style="color:red;">已关闭</a></td>';
 			}
 			
+			tbody += '<td>' + row['add_time'] +'</td>';
+
+			tbody += '<td>';
+			tbody += '<a class="btlink" onclick="deleteApp(\''+row['id']+'\')" style="float:right;">删除</a>';
 			tbody += '</td>';
 
 			tbody += '</tr>';
 		}
 
-		$('#temp_login_view_tbody').html(tbody);
-		$('.temp_login_view_page').html(rdata.page);
+		$('#app_list_body tbody').html(tbody);
+		$('#app_list_body .page').html(rdata.page);
 	},'json');
 }
 
 function addApp(){
-	var msg = '<span style="color:red">注意1：滥用临时授权可能导致安全风险。</br>注意2：请勿在公共场合发布临时授权连接</span></br>即将创建临时授权连接，继续吗？';
-	layer.confirm(msg,{title:'风险提示',closeBtn:1,icon:13,}, function(create_layer) {
-		layer.close(create_layer);
-		layer.open({
-			area: '570px',
-			title: '添加应用',
-			shift: 0,
-			type: 1,
-			content: '<div class="bt-form pd20">\
-		<div class="line">\
-			<span class="tname">应用ID</span>\
-			<div class="info-r">\
-				<input class="bt-input-text mr5" name="app_id" type="text" style="width: 310px;" disabled>\
-				<button class="btn btn-success btn-xs app_id" style="margin-left: -50px;">重置</button>\
-			</div>\
+	layer.open({
+		area: '570px',
+		title: '添加应用',
+		shift: 0,
+		type: 1,
+		content: '<div class="bt-form pd20">\
+	<div class="line">\
+		<span class="tname">应用ID</span>\
+		<div class="info-r">\
+			<input class="bt-input-text mr5" name="app_id" type="text" style="width: 310px;" disabled>\
+			<button class="btn btn-success btn-xs app_id" style="margin-left: -50px;">重置</button>\
 		</div>\
-		<div class="line">\
-			<span class="tname">应用密钥</span>\
-			<div class="info-r">\
-				<input class="bt-input-text mr5" name="app_secret" type="text" style="width: 310px;" disabled>\
-				<button class="btn btn-success btn-xs app_secret" style="margin-left: -50px;">重置</button>\
-			</div>\
+	</div>\
+	<div class="line">\
+		<span class="tname">应用密钥</span>\
+		<div class="info-r">\
+			<input class="bt-input-text mr5" name="app_secret" type="text" style="width: 310px;" disabled>\
+			<button class="btn btn-success btn-xs app_secret" style="margin-left: -50px;">重置</button>\
 		</div>\
-		<div class="line">\
-			<span class="tname" style="width: 90px; overflow: initial; height: 20px; line-height: 20px;">IP白名单<br/>(每行1个)</span>\
-			<div class="info-r"><textarea class="bt-input-text" name="api_limit_addr" style="width: 310px; height: 80px; line-height: 20px; padding: 5px 8px;"></textarea></div>\
-		</div>\
-		<div class="line">\
-			<span class="tname"></span>\
-			<div class="info-r"><button class="btn btn-success btn-sm save_app_data">保存配置</button></div>\
-		</div>\
-		<ul class="help-info-text c7">\
-			<li>开启API后，必需在IP白名单列表中的IP才能访问面板API接口</li>\
-			<li style="color: red;">请谨慎在生产环境开启，这可能增加服务器安全风险；</li>\
-		</ul>\
-	</div>',
-			success:function(){
+	</div>\
+	<div class="line">\
+		<span class="tname" style="width: 90px; overflow: initial; height: 20px; line-height: 20px;">IP白名单<br/>(每行1个)</span>\
+		<div class="info-r"><textarea class="bt-input-text" name="api_limit_addr" style="width: 310px; height: 80px; line-height: 20px; padding: 5px 8px;"></textarea></div>\
+	</div>\
+	<div class="line">\
+		<span class="tname"></span>\
+		<div class="info-r"><button class="btn btn-success btn-sm save_app_data">保存配置</button></div>\
+	</div>\
+	<ul class="help-info-text c7">\
+		<li>开启API后，必需在IP白名单列表中的IP才能访问面板API接口</li>\
+		<li style="color: red;">请谨慎在生产环境开启，这可能增加服务器安全风险；</li>\
+	</ul>\
+</div>',
+		success:function(obj,cur_layer){
+			$('input[name="app_id"]').val(getRandomString(10));
+			$('input[name="app_secret"]').val(getRandomString(20));
+
+			$('.app_id').click(function(){
 				$('input[name="app_id"]').val(getRandomString(10));
+			});
+
+			$('.app_secret').click(function(){
 				$('input[name="app_secret"]').val(getRandomString(20));
+			});
 
-				$('.app_id').click(function(){
-					$('input[name="app_id"]').val(getRandomString(10));
-				});
+			$('.save_app_data').click(function(){
+				var app_id = $('input[name="app_id"]').val();
+				var app_secret = $('input[name="app_secret"]').val();
+				var limit_addr = $('textarea[name="api_limit_addr"]').val();
+				$.post('/setting/add_app', {'app_id':app_id,'app_secret':app_secret,'limit_addr':limit_addr},function(rdata){
+					showMsg(rdata.msg, function(){
+						if (rdata.status){
+							getAppList();
+							layer.close(cur_layer);
+						}
+					} ,{icon:rdata.status?1:2}, 2000);
+				},'json');
+			});
 
-				$('.app_secret').click(function(){
-					$('input[name="app_secret"]').val(getRandomString(20));
-				});
-
-				$('.save_app_data').click(function(){
-					var app_id = $('input[name="app_id"]').val();
-					var app_secret = $('input[name="app_secret"]').val();
-					var limit_addr = $('textarea[name="api_limit_addr"]').val();
-					$.post('/setting/add_app', {'app_id':app_id,'app_secret':app_secret,'limit_addr':limit_addr},function(rdata){
-						showMsg(rdata.msg, function(){} ,{icon:rdata.status?1:2}, 2000);
-					},'json');
-				});
-
-			}
-		});
+		}
 	});
 }
 
 function appPage(){
 	layer.open({
-		area: ['700px', '380px'],
+		area: ['900px', '380px'],
 		title: 'APP应用管理',
 		closeBtn:1,
 		shift: 0,
 		type: 1,
 		content: "<div class='login_view_table pd20'>\
 			<button class='btn btn-success btn-sm app_add'>添加</button>\
-			<div class='divtable mt10'>\
+			<div class='divtable mt10' id='app_list_body'>\
 				<table class='table table-hover'>\
 					<thead>\
 					<tr>\
-						<th>登录IP</th>\
-						<th>状态</th><th>登录时间</th>\
-						<th>过期时间</th>\
+						<th>应用ID</th>\
+						<th>应用密钥</th>\
+						<th>白名单</th>\
+						<th>状态</th>\
+						<th>添加时间</th>\
 						<th style='text-align:right;'>操作</th>\
 					</tr>\
 					</thead>\
-					<tbody id='temp_login_view_tbody'></tbody>\
+					<tbody></tbody>\
 				</table>\
-				<div class='temp_login_view_page page'></div>\
+				<div class='page'></div>\
 			</div>\
 		</div>",
 		success:function(){

From 0f5e196e3f710875b3c151b215e967ad1d39ddc3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 11 Nov 2024 23:48:44 +0800
Subject: [PATCH 165/965] update

---
 web/admin/dashboard/__init__.py    |   1 +
 web/admin/dashboard/dashboard.py   |   1 -
 web/admin/dashboard/ssh.py         |  35 +++
 web/admin/files/__init__.py        | 167 +----------
 web/admin/files/files.py           | 181 +++++++++++
 web/admin/files/recycle.py         |  61 ++++
 web/admin/setting/app.py           |  12 +-
 web/admin/setup/option.py          |   3 +
 web/core/mw.py                     | 187 ++++++++++++
 web/static/app/config.js           |  16 +-
 web/templates/default/setting.html |   4 +-
 web/thisdb/app.py                  |   7 +
 web/utils/file.py                  |  20 +-
 web/utils/ssh/ssh_local.py         | 120 ++++++++
 web/utils/ssh/ssh_terminal.py      | 467 +++++++++++++++++++++++++++++
 15 files changed, 1108 insertions(+), 174 deletions(-)
 create mode 100644 web/admin/dashboard/ssh.py
 create mode 100644 web/admin/files/files.py
 create mode 100644 web/admin/files/recycle.py
 create mode 100644 web/utils/ssh/ssh_local.py
 create mode 100644 web/utils/ssh/ssh_terminal.py

diff --git a/web/admin/dashboard/__init__.py b/web/admin/dashboard/__init__.py
index 77a962a50..259b242db 100644
--- a/web/admin/dashboard/__init__.py
+++ b/web/admin/dashboard/__init__.py
@@ -11,3 +11,4 @@
 
 from .dashboard import *
 from .login import *
+from .ssh import *
diff --git a/web/admin/dashboard/dashboard.py b/web/admin/dashboard/dashboard.py
index cf1c82f0f..21d9e7264 100644
--- a/web/admin/dashboard/dashboard.py
+++ b/web/admin/dashboard/dashboard.py
@@ -20,7 +20,6 @@ from flask import request,g
 from admin.common import isLogined
 from admin.user_login_check import panel_login_required
 from admin import cache,session
-from admin import model
 from admin.model import db,TempLogin,Users
 
 import core.mw as mw
diff --git a/web/admin/dashboard/ssh.py b/web/admin/dashboard/ssh.py
new file mode 100644
index 000000000..f68d661ee
--- /dev/null
+++ b/web/admin/dashboard/ssh.py
@@ -0,0 +1,35 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+from admin import socketio
+from admin.common import isLogined
+
+
+@socketio.on('webssh_websocketio')
+def webssh_websocketio(data):
+    if not isLogined():
+        emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'})
+        return
+    import utils.ssh.ssh_terminal as ssh_terminal
+    shell_client = ssh_terminal.ssh_terminal.instance()
+    shell_client.run(request.sid, data)
+    return
+
+
+@socketio.on('webssh')
+def webssh(data):
+    if not isLogined():
+        emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'})
+        return None
+
+    import utils.ssh.ssh_local as ssh_local
+    shell = ssh_local.ssh_local.instance()
+    shell.run(data)
+    return
\ No newline at end of file
diff --git a/web/admin/files/__init__.py b/web/admin/files/__init__.py
index ec8ea3802..450673456 100644
--- a/web/admin/files/__init__.py
+++ b/web/admin/files/__init__.py
@@ -8,168 +8,5 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
-import os
-
-from flask import Blueprint, render_template
-from flask import request
-from flask import make_response
-from flask import send_file
-from flask import send_from_directory
-
-
-from admin import model
-from admin.user_login_check import panel_login_required
-import core.mw as mw
-import utils.file as file
-
-blueprint = Blueprint('files', __name__, url_prefix='/files', template_folder='../../templates/default')
-@blueprint.route('/index', endpoint='index')
-@panel_login_required
-def index():
-    return render_template('files.html')
-
-# 获取文件内容
-@blueprint.route('/get_body', endpoint='get_file_body', methods=['POST'])
-@panel_login_required
-def get_file_body():
-    path = request.form.get('path', '')
-    return file.getFileBody(path)
-
-# 获取文件内容
-@blueprint.route('/save_body', endpoint='save_body', methods=['POST'])
-@panel_login_required
-def save_body():
-    path = request.form.get('path', '')
-    data = request.form.get('data', '')
-    encoding = request.form.get('encoding', '')
-    return file.saveBody(path,data,encoding)
-
-# 获取文件内容(最新行数)
-@blueprint.route('/get_last_body', endpoint='get_file_last_body', methods=['POST'])
-@panel_login_required
-def get_file_last_body():
-    path = request.form.get('path', '')
-    line = request.form.get('line', '100')
-
-    if not os.path.exists(path):
-        return mw.returnData(False, '文件不存在', (path,))
-
-    try:
-        data = mw.getLastLine(path, int(line))
-        return mw.returnData(True, 'OK', data)
-    except Exception as ex:
-        return mw.returnData(False, '无法正确读取文件!' + str(ex))
-
-
-# 获取文件列表
-@blueprint.route('/get_dir', endpoint='get_dir', methods=['POST'])
-@panel_login_required
-def get_dir():
-    path = request.form.get('path', '')
-    if not os.path.exists(path):
-        path = mw.getFatherDir() + '/wwwroot'
-    search = request.args.get('search', '').strip().lower()
-    search_all = request.args.get('all', '').strip().lower()
-    page = request.args.get('p', '1').strip().lower()
-    row = request.args.get('row', '10')
-    order = request.form.get('order', '')
-
-    if search_all == 'yes' and search != '':
-        dir_list = file.getAllDirList(path, int(page), int(row),order, search)
-    else:
-        dir_list = file.getDirList(path, int(page), int(row),order, search)
-
-    dir_list['page'] = mw.getPage({'p':page, 'row': row, 'tojs':'getFiles', 'count': dir_list['count']}, '1,2,3,4,5,6,7,8')
-    return dir_list
-
-# 创建目录
-@blueprint.route('/create_dir', endpoint='create_dir', methods=['POST'])
-@panel_login_required
-def create_dir():
-    path = request.form.get('path', '')
-    return file.createDir(path)
-
-
-# 获取站点日志目录
-@blueprint.route('/get_dir_size', endpoint='get_dir_size', methods=['POST'])
-@panel_login_required
-def get_dir_size():
-    path = request.form.get('path', '')
-    size = file.getDirSize(path)
-    return mw.returnData(True, mw.toSize(size))
-
-
-# 删除文件
-@blueprint.route('/delete', endpoint='delete', methods=['POST'])
-@panel_login_required
-def delete():
-    path = request.form.get('path', '')
-    return file.fileDelete(path)
-
-
-# 删除文件
-@blueprint.route('/delete_dir', endpoint='delete_dir', methods=['POST'])
-@panel_login_required
-def delete_dir():
-    path = request.form.get('path', '')
-    return file.dirDelete(path)
-
-# 删除文件
-@blueprint.route('/download', endpoint='download', methods=['GET'])
-@panel_login_required
-def download():
-    filename = request.args.get('filename', '')
-    if not os.path.exists(filename):
-        return ''
-    is_attachment = True
-    if filename.endswith(".svg"):
-        is_attachment = False
-
-    response = make_response(send_from_directory(os.path.dirname(filename), os.path.basename(filename), as_attachment=is_attachment))
-    return response
-
-# 回收站文件
-@blueprint.route('/get_recycle_bin', endpoint='get_recycle_bin', methods=['POST'])
-@panel_login_required
-def get_recycle_bin():
-    return file.getRecycleBin()
-
-# 回收站文件恢复
-@blueprint.route('/re_recycle_bin', endpoint='re_recycle_bin', methods=['POST'])
-@panel_login_required
-def re_recycle_bin():
-    path = request.form.get('path', '')
-    return file.reRecycleBin(path)
-
-# 回收站文件
-@blueprint.route('/recycle_bin', endpoint='recycle_bin', methods=['POST'])
-@panel_login_required
-def recycle_bin():
-    return file.toggleRecycleBin()
-
-
-# 回收站文件
-@blueprint.route('/close_recycle_bin', endpoint='close_recycle_bin', methods=['POST'])
-@panel_login_required
-def close_recycle_bin():
-    return file.closeRecycleBin()
-
-
-# 日志清空
-@blueprint.route('/close_logs', endpoint='close_logs', methods=['POST'])
-@panel_login_required
-def close_logs():
-    return file.closeLogs()
-
-
-
-
-
-
-
-
-
-
-
-
-
+from .files import *
+from .recycle import *
diff --git a/web/admin/files/files.py b/web/admin/files/files.py
new file mode 100644
index 000000000..5f87e58a4
--- /dev/null
+++ b/web/admin/files/files.py
@@ -0,0 +1,181 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+
+from flask import Blueprint, render_template
+from flask import request
+from flask import make_response
+from flask import send_file
+from flask import send_from_directory
+
+from werkzeug.utils import secure_filename
+
+from admin.user_login_check import panel_login_required
+import core.mw as mw
+import utils.file as file
+
+blueprint = Blueprint('files', __name__, url_prefix='/files', template_folder='../../templates/default')
+@blueprint.route('/index', endpoint='index')
+@panel_login_required
+def index():
+    return render_template('files.html')
+
+# 获取文件内容
+@blueprint.route('/get_body', endpoint='get_file_body', methods=['POST'])
+@panel_login_required
+def get_file_body():
+    path = request.form.get('path', '')
+    return file.getFileBody(path)
+
+# 获取文件内容
+@blueprint.route('/save_body', endpoint='save_body', methods=['POST'])
+@panel_login_required
+def save_body():
+    path = request.form.get('path', '')
+    data = request.form.get('data', '')
+    encoding = request.form.get('encoding', '')
+    return file.saveBody(path,data,encoding)
+
+# 获取文件内容(最新行数)
+@blueprint.route('/get_last_body', endpoint='get_file_last_body', methods=['POST'])
+@panel_login_required
+def get_file_last_body():
+    path = request.form.get('path', '')
+    line = request.form.get('line', '100')
+
+    if not os.path.exists(path):
+        return mw.returnData(False, '文件不存在', (path,))
+
+    try:
+        data = mw.getLastLine(path, int(line))
+        return mw.returnData(True, 'OK', data)
+    except Exception as ex:
+        return mw.returnData(False, '无法正确读取文件!' + str(ex))
+
+
+# 获取文件列表
+@blueprint.route('/get_dir', endpoint='get_dir', methods=['POST'])
+@panel_login_required
+def get_dir():
+    path = request.form.get('path', '')
+    if not os.path.exists(path):
+        path = mw.getFatherDir() + '/wwwroot'
+    search = request.args.get('search', '').strip().lower()
+    search_all = request.args.get('all', '').strip().lower()
+    page = request.args.get('p', '1').strip().lower()
+    row = request.args.get('row', '10')
+    order = request.form.get('order', '')
+
+    if search_all == 'yes' and search != '':
+        dir_list = file.getAllDirList(path, int(page), int(row),order, search)
+    else:
+        dir_list = file.getDirList(path, int(page), int(row),order, search)
+
+    dir_list['page'] = mw.getPage({'p':page, 'row': row, 'tojs':'getFiles', 'count': dir_list['count']}, '1,2,3,4,5,6,7,8')
+    return dir_list
+
+
+# 上传文件
+@blueprint.route('/upload_file', endpoint='upload_file', methods=['POST'])
+@panel_login_required
+def upload_file():
+    path = request.args.get('path', '')
+    if not os.path.exists(path):
+        os.makedirs(path)
+    f = request.files['zunfile']
+    filename = os.path.join(path, f.filename)
+
+    s_path = path
+    if os.path.exists(filename):
+        s_path = filename
+    p_stat = os.stat(s_path)
+
+    # print(filename)
+    f.save(filename)
+    os.chown(filename, p_stat.st_uid, p_stat.st_gid)
+    os.chmod(filename, p_stat.st_mode)
+
+    msg = mw.getInfo('上传文件[{1}] 到 [{2}]成功!', (filename, path))
+    mw.writeLog('文件管理', msg)
+    return mw.returnData(True, '上传成功!')
+
+# 创建文件
+@blueprint.route('/create_file', endpoint='create_file', methods=['POST'])
+@panel_login_required
+def create_file():
+    path = request.form.get('path', '')
+    return file.createFile(path)
+
+
+# 创建目录
+@blueprint.route('/create_dir', endpoint='create_dir', methods=['POST'])
+@panel_login_required
+def create_dir():
+    path = request.form.get('path', '')
+    return file.createDir(path)
+
+
+# 获取站点日志目录
+@blueprint.route('/get_dir_size', endpoint='get_dir_size', methods=['POST'])
+@panel_login_required
+def get_dir_size():
+    path = request.form.get('path', '')
+    size = file.getDirSize(path)
+    return mw.returnData(True, mw.toSize(size))
+
+
+# 删除文件
+@blueprint.route('/delete', endpoint='delete', methods=['POST'])
+@panel_login_required
+def delete():
+    path = request.form.get('path', '')
+    return file.fileDelete(path)
+
+
+# 删除文件
+@blueprint.route('/delete_dir', endpoint='delete_dir', methods=['POST'])
+@panel_login_required
+def delete_dir():
+    path = request.form.get('path', '')
+    return file.dirDelete(path)
+
+# 删除文件
+@blueprint.route('/download', endpoint='download', methods=['GET'])
+@panel_login_required
+def download():
+    filename = request.args.get('filename', '')
+    if not os.path.exists(filename):
+        return ''
+    is_attachment = True
+    if filename.endswith(".svg"):
+        is_attachment = False
+
+    response = make_response(send_from_directory(os.path.dirname(filename), os.path.basename(filename), as_attachment=is_attachment))
+    return response
+
+# 日志清空
+@blueprint.route('/close_logs', endpoint='close_logs', methods=['POST'])
+@panel_login_required
+def close_logs():
+    return file.closeLogs()
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/admin/files/recycle.py b/web/admin/files/recycle.py
new file mode 100644
index 000000000..5cc69fb67
--- /dev/null
+++ b/web/admin/files/recycle.py
@@ -0,0 +1,61 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+
+from flask import Blueprint, render_template
+from flask import request
+from flask import make_response
+from flask import send_file
+from flask import send_from_directory
+
+from admin.user_login_check import panel_login_required
+import core.mw as mw
+import utils.file as file
+
+from .files import blueprint
+# 回收站文件
+@blueprint.route('/get_recycle_bin', endpoint='get_recycle_bin', methods=['POST'])
+@panel_login_required
+def get_recycle_bin():
+    return file.getRecycleBin()
+
+# 回收站文件恢复
+@blueprint.route('/re_recycle_bin', endpoint='re_recycle_bin', methods=['POST'])
+@panel_login_required
+def re_recycle_bin():
+    path = request.form.get('path', '')
+    return file.reRecycleBin(path)
+
+# 回收站文件
+@blueprint.route('/recycle_bin', endpoint='recycle_bin', methods=['POST'])
+@panel_login_required
+def recycle_bin():
+    return file.toggleRecycleBin()
+
+# 回收站文件
+@blueprint.route('/close_recycle_bin', endpoint='close_recycle_bin', methods=['POST'])
+@panel_login_required
+def close_recycle_bin():
+    return file.closeRecycleBin()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/admin/setting/app.py b/web/admin/setting/app.py
index 3be1210cd..441f068bf 100644
--- a/web/admin/setting/app.py
+++ b/web/admin/setting/app.py
@@ -41,7 +41,7 @@ def get_app_list():
     return data
 
 
-# 获取APP列表
+# 添加APP列表
 @blueprint.route('/add_app', endpoint='add_app', methods=['POST'])
 @panel_login_required
 def add_app():
@@ -54,6 +54,16 @@ def add_app():
         return mw.returnData(True, '添加成功!')
     return mw.returnData(False, '添加失败!')
 
+# 添加APP列表
+@blueprint.route('/toggle_app_status', endpoint='toggle_app_status', methods=['POST'])
+@panel_login_required
+def toggle_app_status():
+    aid = request.form.get('id', '').strip()
+    rid = thisdb.toggleAppStatus(aid)
+    if rid > 0:
+        return mw.returnData(True, '切换成功!')
+    return mw.returnData(False, '切换失败!')
+
 
 # 获取APP列表
 @blueprint.route('/delete_app', endpoint='delete_app', methods=['POST'])
diff --git a/web/admin/setup/option.py b/web/admin/setup/option.py
index 09968a64d..65c7ccf7c 100644
--- a/web/admin/setup/option.py
+++ b/web/admin/setup/option.py
@@ -49,7 +49,10 @@ def init_option():
     # 初始化安全路径
     thisdb.setOption('admin_path', mw.getRandomString(8))
 
+    # API是否开启|默认关闭
+    thisdb.setOption('api', 'no')
 
+    # 获取服务器IP
     ip = mw.getLocalIp()
     thisdb.setOption('server_ip', ip)
 
diff --git a/web/core/mw.py b/web/core/mw.py
index 60342257e..f3310d32c 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -1235,7 +1235,194 @@ def getCertName(certPath):
     except Exception as e:
         writeFileLog(getTracebackInfo())
         return None
+
+def createLocalSSL():
+    if not os.path.exists('ssl/local'):
+        execShell('mkdir -p ssl/local')
+
+
+    # 自签证书
+    # if os.path.exists('ssl/local/input.pl'):
+    #     return True
+
+    client_ip = getClientIp()
+
+    import OpenSSL
+    key = OpenSSL.crypto.PKey()
+    key.generate_key(OpenSSL.crypto.TYPE_RSA, 2048)
+    cert = OpenSSL.crypto.X509()
+    cert.set_serial_number(0)
+    
+    if client_ip == '127.0.0.1':
+        cert.get_subject().CN = '127.0.0.1'
+    else:
+        cert.get_subject().CN = getLocalIp()
+    
+    cert.set_issuer(cert.get_subject())
+    cert.gmtime_adj_notBefore(0)
+    cert.gmtime_adj_notAfter(86400 * 3650)
+    cert.set_pubkey(key)
+    cert.sign(key, 'md5')
+    cert_ca = OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_PEM, cert)
+    private_key = OpenSSL.crypto.dump_privatekey(OpenSSL.crypto.FILETYPE_PEM, key)
+    if len(cert_ca) > 100 and len(private_key) > 100:
+        writeFile('ssl/local/cert.pem', cert_ca, 'wb+')
+        writeFile('ssl/local/private.pem', private_key, 'wb+')
+        return True
+    return False
+
+
+def getSSHPort():
+    try:
+        file = '/etc/ssh/sshd_config'
+        conf = readFile(file)
+        rep = "(#*)?Port\\s+([0-9]+)\\s*\n"
+        port = re.search(rep, conf).groups(0)[1]
+        return int(port)
+    except:
+        return 22
+
+
+def getSSHStatus():
+    if os.path.exists('/usr/bin/apt-get'):
+        status = execShell("service ssh status | grep -P '(dead|stop)'")
+    else:
+        import system_api
+        version = system_api.system_api().getSystemVersion()
+        if version.find(' Mac ') != -1:
+            return True
+        if version.find(' 7.') != -1:
+            status = execShell("systemctl status sshd.service | grep 'dead'")
+        else:
+            status = execShell(
+                "/etc/init.d/sshd status | grep -e 'stopped' -e '已停'")
+    if len(status[0]) > 3:
+        status = False
+    else:
+        status = True
+    return status
+
 ##################### ssl  end #########################################
+
+def getGlibcVersion():
+    try:
+        cmd_result = execShell("ldd --version")[0]
+        if not cmd_result: return ''
+        glibc_version = cmd_result.split("\n")[0].split()[-1]
+    except:
+        return ''
+    return glibc_version
+
+##################### ssh  start #########################################
+def getSshDir():
+    if isAppleSystem():
+        user = execShell("who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
+        return '/Users/' + user + '/.ssh'
+    return '/root/.ssh'
+
+
+def processExists(pname, exe=None, cmdline=None):
+    # 进程是否存在
+    try:
+        import psutil
+        pids = psutil.pids()
+        for pid in pids:
+            try:
+                p = psutil.Process(pid)
+                if p.name() == pname:
+                    if not exe and not cmdline:
+                        return True
+                    else:
+                        if exe:
+                            if p.exe() == exe:
+                                return True
+                        if cmdline:
+                            if cmdline in p.cmdline():
+                                return True
+            except:
+                pass
+        return False
+    except:
+        return True
+
+
+def createRsa():
+    # ssh-keygen -t rsa -P "" -C "midoks@163.com"
+    ssh_dir = getSshDir()
+    # mw.execShell("rm -f /root/.ssh/*")
+    if not os.path.exists(ssh_dir + '/authorized_keys'):
+        execShell('touch ' + ssh_dir + '/authorized_keys')
+
+    if not os.path.exists(ssh_dir + '/id_rsa.pub') and os.path.exists(ssh_dir + '/id_rsa'):
+        execShell('echo y | ssh-keygen -q -t rsa -P "" -f ' +
+                  ssh_dir + '/id_rsa')
+    else:
+        execShell('ssh-keygen -q -t rsa -P "" -f ' + ssh_dir + '/id_rsa')
+
+    execShell('cat ' + ssh_dir + '/id_rsa.pub >> ' +
+              ssh_dir + '/authorized_keys')
+    execShell('chmod 600 ' + ssh_dir + '/authorized_keys')
+
+
+def createSshInfo():
+    ssh_dir = getSshDir()
+    if not os.path.exists(ssh_dir + '/id_rsa') or not os.path.exists(ssh_dir + '/id_rsa.pub'):
+        createRsa()
+
+    # 检查是否写入authorized_keys
+    data = execShell("cat " + ssh_dir + "/id_rsa.pub | awk '{print $3}'")
+    if data[0] != "":
+        cmd = "cat " + ssh_dir + "/authorized_keys | grep " + data[0]
+        ak_data = execShell(cmd)
+        if ak_data[0] == "":
+            cmd = 'cat ' + ssh_dir + '/id_rsa.pub >> ' + ssh_dir + '/authorized_keys'
+            execShell(cmd)
+            execShell('chmod 600 ' + ssh_dir + '/authorized_keys')
+
+
+def connectSsh():
+    import paramiko
+    ssh = paramiko.SSHClient()
+    createSshInfo()
+    ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+
+    port = getSSHPort()
+    try:
+        ssh.connect('127.0.0.1', port, timeout=5)
+    except Exception as e:
+        ssh.connect('localhost', port, timeout=5)
+    except Exception as e:
+        ssh.connect(getHostAddr(), port, timeout=30)
+    except Exception as e:
+        return False
+
+    shell = ssh.invoke_shell(term='xterm', width=83, height=21)
+    shell.setblocking(0)
+    return shell
+
+
+def clearSsh():
+    # 服务器IP
+    ip = getHostAddr()
+    sh = '''
+#!/bin/bash
+PLIST=`who | grep localhost | awk '{print $2}'`
+for i in $PLIST
+do
+    ps -t /dev/$i |grep -v TTY | awk '{print $1}' | xargs kill -9
+done
+
+# getHostAddr
+PLIST=`who | grep "${ip}" | awk '{print $2}'`
+for i in $PLIST
+do
+    ps -t /dev/$i |grep -v TTY | awk '{print $1}' | xargs kill -9
+done
+'''
+    if not isAppleSystem():
+        info = execShell(sh)
+        print(info[0], info[1])
+##################### ssh  end   #########################################
         
 ##################### notify  start #########################################
 
diff --git a/web/static/app/config.js b/web/static/app/config.js
index 452d4624d..4c3783e6b 100755
--- a/web/static/app/config.js
+++ b/web/static/app/config.js
@@ -1467,7 +1467,7 @@ function setPanelApi(){
 	$.post('/setting/set_panel_token', {'op_type':"2"},function(rdata){
 		showMsg(rdata.msg, function(){
 			if (rdata.status){
-				showPanelApi();
+				addApp();
 			}
 		} ,{icon:rdata.status?1:2}, 1000);
 	},'json');
@@ -1485,6 +1485,16 @@ function deleteApp(id){
 	});
 }
 
+function toggleAppstatus(id){
+	$.post('/setting/toggle_app_status', {id:id}, function(rdata){
+		showMsg(rdata.msg, function(){
+			if (rdata.status){
+				getAppList();
+			}
+		} ,{icon:rdata.status?1:2}, 2000);
+	},'json');
+}
+
 function getAppList(page) {
 
 	if (typeof(page) == 'undefined'){
@@ -1503,9 +1513,9 @@ function getAppList(page) {
 			tbody += '<td>' + row['white_list'] +'</td>';
 
 			if (row['status'] == 1){
-				tbody += '<td><a class="btlink">已开启</a></td>';
+				tbody += '<td><a class="btlink" onclick="toggleAppstatus('+row['id']+');">已开启</a></td>';
 			} else {
-				tbody += '<td><a style="color:red;">已关闭</a></td>';
+				tbody += '<td><a style="color:red;" onclick="toggleAppstatus('+row['id']+');">已关闭</a></td>';
 			}
 			
 			tbody += '<td>' + row['add_time'] +'</td>';
diff --git a/web/templates/default/setting.html b/web/templates/default/setting.html
index 61d4a659a..eb8bd401c 100755
--- a/web/templates/default/setting.html
+++ b/web/templates/default/setting.html
@@ -131,7 +131,7 @@
 					<span class="set-tit text-right" title="API接口" style="float: left;">API接口</span>
 					<input class="btswitch btswitch-ios" id="cfg_panel_api" type="checkbox" {{data['api_token']}}/>
 	                <label class="btswitch-btn ml5" for="cfg_panel_api" style="float: left;margin-top:4px;" onclick="setPanelApi()"></label>
-	                <button ype="button" class="btn btn-default btn-xs panel_api_btn" style="vertical-align: middle; margin-left: 10px" onclick="appPage();">APP应用管理</button>
+	                <button ype="button" class="btn btn-default btn-xs" style="vertical-align: middle; margin-left: 10px" onclick="appPage();">APP应用管理</button>
 					<span class="set-info c7">提供面板API接口访问的支持</span>
 				</p>
 
@@ -152,7 +152,7 @@
 					<span class="set-tit text-right" title="二步验证" style="float: left;">二步验证</span>
 					<input class="btswitch btswitch-ios" id="cfg_panel_auth" type="checkbox" {% if data['two_step_verification']['open'] %}checked{% endif %}/>
 	                <label class="btswitch-btn ml5" for="cfg_panel_auth" style="float: left;margin-top:4px;" onclick="setAuthSecretApi()"></label>
-					<button type="button" class="btn btn-default btn-xs panel_api_btn" style="vertical-align: middle; margin-left: 10px" onclick="setAuthBind();">绑定设置</button>
+					<button type="button" class="btn btn-default btn-xs" style="vertical-align: middle; margin-left: 10px" onclick="setAuthBind();">绑定设置</button>
 					<span class="set-info c7">二步验证，加强安全登录</span>
 				</p>
 			</div>
diff --git a/web/thisdb/app.py b/web/thisdb/app.py
index 4350f194a..f75b2faf7 100644
--- a/web/thisdb/app.py
+++ b/web/thisdb/app.py
@@ -46,6 +46,13 @@ def getAppById(aid):
 def deleteAppById(aid):
     return mw.M('app').where("id=?", (aid,)).delete()
 
+def toggleAppStatus(aid):
+    info = mw.M('app').field(__FIELD).where("id=?", (aid,)).find()
+    if info['status'] == 1:
+        return mw.M('app').where('id=?',(aid,)).update({'status':0})
+    return mw.M('app').where('id=?',(aid,)).update({'status':1})
+
+
 def setAppData(aid,
     status: str | None = None,
     app_id: str | None = None,
diff --git a/web/utils/file.py b/web/utils/file.py
index de7a9325e..02adcaac4 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -11,8 +11,7 @@
 import os
 import pwd
 import time
-
-from admin import model
+import shutil
 
 import core.mw as mw
 import thisdb
@@ -25,6 +24,23 @@ def setFileAccept(filename):
     os.system('chown -R ' + auth + ' ' + filename)
     os.system('chmod -R 755 ' + filename)
 
+def createFile(file_path):
+    try:
+        if not checkFileName(file_path):
+            return mw.returnData(False, '文件名中不能包含特殊字符!')
+        if os.path.exists(file_path):
+            return mw.returnData(False, '指定文件已存在!')
+        _path = os.path.dirname(file_path)
+        if not os.path.exists(_path):
+            os.makedirs(_path)
+        open(file_path, 'w+').close()
+        setFileAccept(file)
+        msg = mw.getInfo('创建文件[{1}]成功!', (file_path,))
+        mw.writeLog('文件管理', msg)
+        return mw.returnData(True, '文件创建成功!')
+    except Exception as e:
+        return mw.returnData(True, '文件创建失败:'+str(e))
+
 def createDir(path):
     try:
         if not checkFileName(path):
diff --git a/web/utils/ssh/ssh_local.py b/web/utils/ssh/ssh_local.py
new file mode 100644
index 000000000..2201881b7
--- /dev/null
+++ b/web/utils/ssh/ssh_local.py
@@ -0,0 +1,120 @@
+# coding: utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+# ---------------------------------------------------------------------------------
+# SSH终端操作
+# ---------------------------------------------------------------------------------
+
+import json
+import time
+import os
+import sys
+import socket
+import threading
+import re
+
+from io import BytesIO, StringIO
+
+import core.mw as mw
+import paramiko
+
+from flask_socketio import SocketIO, emit, send
+
+
+class ssh_local(object):
+
+    __debug_file = 'logs/ssh_local.log'
+    __log_type = 'SSH终端'
+
+    __ssh = None
+
+    # lock
+    _instance_lock = threading.Lock()
+
+    def __init__(self):
+        pass
+
+    @classmethod
+    def instance(cls, *args, **kwargs):
+        if not hasattr(ssh_local, "_instance"):
+            with ssh_local._instance_lock:
+                if not hasattr(ssh_local, "_instance"):
+                    ssh_local._instance = ssh_local(*args, **kwargs)
+        return ssh_local._instance
+
+    def debug(self, msg):
+        msg = "{} - {}:{} => {} \n".format(mw.formatDate(),
+                                           self.__host, self.__port, msg)
+        if not mw.isDebugMode():
+            return
+        mw.writeFile(self.__debug_file, msg, 'a+')
+
+    def returnMsg(self, status, msg):
+        return {'status': status, 'msg': msg}
+
+
+    def connectSsh(self):
+        import paramiko
+        ssh = paramiko.SSHClient()
+        mw.createSshInfo()
+        ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+
+        port = mw.getSSHPort()
+        try:
+            ssh.connect('127.0.0.1', port, timeout=5)
+        except Exception as e:
+            ssh.connect('localhost', port, timeout=5)
+        except Exception as e:
+            ssh.connect(mw.getHostAddr(), port, timeout=30)
+        except Exception as e:
+            return False
+
+        shell = ssh.invoke_shell(term='xterm', width=83, height=21)
+        shell.setblocking(0)
+        return shell
+
+    def send(self):
+        pass
+
+    def close(self):
+        try:
+            if self.__ssh:
+                self.__ssh.close()
+        except:
+            pass
+
+    def wsSend(self, recv):
+        try:
+            t = recv.decode("utf-8")
+            return emit('server_response', {'data': t})
+        except Exception as e:
+            return emit('server_response', {'data': recv})
+
+    def wsSendConnect(self):
+        return emit('connect', {'data': 'ok'})
+
+    def wsSendReConnect(self):
+        return emit('reconnect', {'data': 'ok'})
+
+
+    def run(self, info):
+        if not self.__ssh:
+            self.__ssh = self.connectSsh()
+
+        if self.__ssh.exit_status_ready():
+            self.__ssh = self.connectSsh()
+
+        self.__ssh.send(info)
+        try:
+            time.sleep(0.005)
+            recv = self.__ssh.recv(8192)
+            return self.wsSend(recv)
+        except Exception as ex:
+            return self.wsSend('')
diff --git a/web/utils/ssh/ssh_terminal.py b/web/utils/ssh/ssh_terminal.py
new file mode 100644
index 000000000..4419860dc
--- /dev/null
+++ b/web/utils/ssh/ssh_terminal.py
@@ -0,0 +1,467 @@
+# coding: utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+# ---------------------------------------------------------------------------------
+# SSH终端操作
+# ---------------------------------------------------------------------------------
+
+import json
+import time
+import os
+import sys
+import socket
+import threading
+import re
+
+from io import BytesIO, StringIO
+
+import core.mw as mw
+import paramiko
+
+from flask_socketio import SocketIO, emit, send
+
+
+class ssh_terminal(object):
+
+    __debug_file = 'logs/ssh_terminal.log'
+    __log_type = 'SSH终端'
+
+    # websocketio 唯一标识
+    __sid = ''
+
+    __host = None
+    __type = '0'
+    __port = 22
+    __user = None
+    __pass = None
+    __pkey = None
+    __key_passwd = None
+
+    __rep_ssh_config = False
+    __rep_ssh_service = False
+    __sshd_config_backup = None
+
+    __ssh = None
+    __tp = None
+    __ps = None
+
+    __ssh_list = {}
+    __ssh_last_request_time = {}
+
+    # lock
+    _instance_lock = threading.Lock()
+
+    def __init__(self):
+        ht = threading.Thread(target=self.heartbeat)
+        ht.start()
+
+    @classmethod
+    def instance(cls, *args, **kwargs):
+        if not hasattr(ssh_terminal, "_instance"):
+            with ssh_terminal._instance_lock:
+                if not hasattr(ssh_terminal, "_instance"):
+                    ssh_terminal._instance = ssh_terminal(*args, **kwargs)
+        return ssh_terminal._instance
+
+    def debug(self, msg):
+        msg = "{} - {}:{} => {} \n".format(mw.formatDate(),
+                                           self.__host, self.__port, msg)
+        if not mw.isDebugMode():
+            return
+        mw.writeFile(self.__debug_file, msg, 'a+')
+
+    def returnMsg(self, status, msg):
+        return {'status': status, 'msg': msg}
+
+    def restartSsh(self, act='reload'):
+        '''
+        重启ssh 无参数传递
+        '''
+        version = mw.readFile('/etc/redhat-release')
+        if not os.path.exists('/etc/redhat-release'):
+            mw.execShell('service ssh ' + act)
+        elif version.find(' 7.') != -1 or version.find(' 8.') != -1:
+            mw.execShell("systemctl " + act + " sshd.service")
+        else:
+            mw.execShell("/etc/init.d/sshd " + act)
+
+    def isRunning(self, rep=False):
+        try:
+            if rep and self.__rep_ssh_service:
+                self.restartSsh('stop')
+                return True
+
+            status = self.getSshStatus()
+            if not status:
+                self.restartSsh('start')
+                self.__rep_ssh_service = True
+                return True
+            return False
+        except:
+            return False
+
+    def setSshdConfig(self, rep=False):
+        self.isRunning(rep)
+        if rep and not self.__rep_ssh_config:
+            return False
+
+        try:
+            sshd_config_file = '/etc/ssh/sshd_config'
+            if not os.path.exists(sshd_config_file):
+                return False
+
+            sshd_config = mw.readFile(sshd_config_file)
+            if not sshd_config:
+                return False
+
+            if rep:
+                if self.__sshd_config_backup:
+                    mw.writeFile(sshd_config_file, self.__sshd_config_backup)
+                    self.restartSsh()
+                return True
+
+            pin = r'^\s*PubkeyAuthentication\s+(yes|no)'
+            pubkey_status = re.findall(pin, sshd_config, re.I)
+            if pubkey_status:
+                if pubkey_status[0] == 'yes':
+                    pubkey_status = True
+                else:
+                    pubkey_status = False
+
+            pin = r'^\s*RSAAuthentication\s+(yes|no)'
+            rsa_status = re.findall(pin, sshd_config, re.I)
+            if rsa_status:
+                if rsa_status[0] == 'yes':
+                    rsa_status = True
+                else:
+                    rsa_status = False
+
+            self._sshd_config_backup = sshd_config
+            is_write = False
+            if not pubkey_status:
+                sshd_config = re.sub(
+                    r'\n#?PubkeyAuthentication\s\w+', '\nPubkeyAuthentication yes', sshd_config)
+                is_write = True
+            if not rsa_status:
+                sshd_config = re.sub(
+                    r'\n#?RSAAuthentication\s\w+', '\nRSAAuthentication yes', sshd_config)
+                is_write = True
+
+            if is_write:
+                mw.writeFile(sshd_config_file, sshd_config)
+                self.__rep_ssh_config = True
+                self.restartSsh()
+            else:
+                self.__sshd_config_backup = None
+            return True
+        except:
+            return False
+
+    def setSid(self, sid):
+        self.__sid = sid
+
+    def connect(self, sid):
+        # self.connectBySocket()
+        if self.__host in ['127.0.0.1', 'localhost']:
+            return self.connectLocalSsh(sid)
+        else:
+            return self.connectBySocket(sid)
+
+    def connectLocalSsh(self, sid):
+        mw.createSshInfo()
+        self.__ps = paramiko.SSHClient()
+        self.__ps.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+
+        self.__port = mw.getSSHPort()
+        try:
+            self.__ps.connect(self.__host, self.__port, timeout=60)
+        except Exception as e:
+            self.__ps.connect('127.0.0.1', self.__port)
+        except Exception as e:
+            self.__ps.connect('localhost', self.__port)
+        except Exception as e:
+            self.setSshdConfig(True)
+            self.__ps.close()
+            e = str(e)
+            if e.find('websocket error!') != -1:
+                return self.returnMsg(True, '连接成功')
+            if e.find('Authentication timeout') != -1:
+                self.debug("认证超时{}".format(e))
+                return self.returnMsg(False, '认证超时,请按回车重试!{}'.format(e))
+            if e.find('Connection reset by peer') != -1:
+                self.debug('目标服务器主动拒绝连接')
+                return self.returnMsg(False, '目标服务器主动拒绝连接')
+            if e.find('Error reading SSH protocol banner') != -1:
+                self.debug('协议头响应超时')
+                return self.returnMsg(False, '协议头响应超时，与目标服务器之间的网络质量太糟糕：' + e)
+            if not e:
+                self.debug('SSH协议握手超时')
+                return self.returnMsg(False, "SSH协议握手超时，与目标服务器之间的网络质量太糟糕")
+            err = mw.getTracebackInfo()
+            self.debug(err)
+            return self.returnMsg(False, "未知错误: {}".format(err))
+
+        self.debug('local-ssh:认证成功，正在构建会话通道')
+        ssh = self.__ps.invoke_shell(
+            term='xterm', width=83, height=21)
+        ssh.setblocking(0)
+        self.__ssh_list[sid] = ssh
+        mw.writeLog(self.__log_type, '成功登录到SSH服务器 [{}:{}]'.format(
+            self.__host, self.__port))
+        self.debug('local-ssh:通道已构建')
+        return self.returnMsg(True, '连接成功!')
+
+    def connectBySocket(self, sid):
+        if not self.__host:
+            return self.returnMsg(False, '错误的连接地址')
+        if not self.__user:
+            self.__user = 'root'
+        if not self.__port:
+            self.__port = 22
+
+        self.setSshdConfig(True)
+        num = 0
+        while num < 5:
+            num += 1
+            try:
+                self.debug('正在尝试第{}次连接'.format(num))
+                if self.__rep_ssh_config:
+                    time.sleep(0.1)
+                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                sock.settimeout(2 + num)
+                sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 8192)
+                sock.connect((self.__host, self.__port))
+                break
+            except Exception as e:
+                if num == 5:
+                    self.setSshdConfig(True)
+                    self.debug('重试连接失败,{}'.format(e))
+                    return self.returnMsg(False, '连接目标服务器失败, {}:{}'.format(self.__host, self.__port))
+                else:
+                    time.sleep(0.2)
+
+        # print(self.__host, sock)
+        self.__tp = paramiko.Transport(sock)
+        try:
+            self.__tp.start_client()
+            self.__tp.banner_timeout = 60
+            if not self.__pass and not self.__pkey:
+                return self.returnMsg(False, '密码或私钥不能都为空: {}:{}'.format(self.__host, self.__port))
+
+            if self.__pkey != '' and self.__type != '0':
+                self.debug('正在认证私钥')
+                p_file = StringIO(str(self.__pkey.replace('\\n', '\n')))
+                # p_file = "/tmp/t_ssh_pkey.txt"
+                # mw.writeFile(p_file, self.__pkey.replace('\\n', '\n'))
+                # mw.execShell('chmod 600 ' + p_file)
+                try:
+                    p_file.seek(0)
+                    pkey = paramiko.RSAKey.from_private_key(p_file)
+                except:
+                    try:
+                        p_file.seek(0)  # 重置游标
+                        pkey = paramiko.Ed25519Key.from_private_key(
+                            p_file)
+                    except:
+                        try:
+                            p_file.seek(0)
+                            pkey = paramiko.ECDSAKey.from_private_key(p_file)
+                        except:
+                            p_file.seek(0)
+                            pkey = paramiko.DSSKey.from_private_key(p_file)
+
+                self.__tp.auth_publickey(username=self.__user, key=pkey)
+            else:
+                try:
+                    self.__tp.auth_none(self.__user)
+                except Exception as e:
+                    e = str(e)
+                    if e.find('keyboard-interactive') >= 0:
+                        self._auth_interactive()
+                    else:
+                        self.debug('正在认证密码')
+                        self.__tp.auth_password(
+                            username=self.__user, password=self.__pass)
+        except Exception as e:
+            self.setSshdConfig(True)
+            self.__tp.close()
+            e = str(e)
+            # print(e)
+            if e.find('Authentication timeout') != -1:
+                self.debug("认证超时{}".format(e))
+                return self.returnMsg(False, '认证超时,请按回车重试!{}'.format(e))
+            if e.find('Authentication failed') != -1:
+                self.debug('认证失败{}'.format(e))
+                return self.returnMsg(False, '帐号或密码错误: {}'.format(e + "," + self.__user + "@" + self.__host + ":" + str(self.__port)))
+            if e.find('Bad authentication type; allowed types') != -1:
+                self.debug('认证失败{}'.format(e))
+                if self.__host in ['127.0.0.1', 'localhost'] and self.__pass == 'none':
+                    return self.returnMsg(False, '帐号或密码错误: {}'.format("Authentication failed ," + self.__user + "@" + self.__host + ":" + str(self.__port)))
+                return self.returnMsg(False, '不支持的身份验证类型: {}'.format(e))
+            if e.find('Connection reset by peer') != -1:
+                self.debug('目标服务器主动拒绝连接')
+                return self.returnMsg(False, '目标服务器主动拒绝连接')
+            if e.find('Error reading SSH protocol banner') != -1:
+                self.debug('协议头响应超时')
+                return self.returnMsg(False, '协议头响应超时，与目标服务器之间的网络质量太糟糕：' + e)
+            if not e:
+                self.debug('SSH协议握手超时')
+                return self.returnMsg(False, "SSH协议握手超时，与目标服务器之间的网络质量太糟糕")
+            err = mw.getTracebackInfo()
+            self.debug(err)
+            return self.returnMsg(False, "未知错误: {}".format(err))
+
+        self.debug('认证成功，正在构建会话通道')
+
+        ssh = self.__tp.open_session()
+        ssh.get_pty(term='xterm', width=100, height=34)
+        ssh.invoke_shell()
+        self.__ssh_list[sid] = ssh
+        mw.writeLog(self.__log_type, '成功登录到SSH服务器 [{}:{}]'.format(
+            self.__host, self.__port))
+        self.debug('通道已构建')
+        return self.returnMsg(True, '连接成功.')
+
+    def getSshInfo(self, file):
+        rdata = mw.readFile(file)
+        destr = mw.deDoubleCrypt('mdserver-web', rdata)
+        return json.loads(destr)
+
+    def setAttr(self, sid, info):
+        self.__host = info['host'].strip()
+
+        # 外部连接获取
+        if not self.__host in ['127.0.0.1', 'localhost']:
+            dst_info = mw.getServerDir() + '/webssh/host/' + self.__host + '/info.json'
+            if os.path.exists(dst_info):
+                info = self.getSshInfo(dst_info)
+
+        if 'type' in info:
+            self.__type = info['type']
+
+        if 'port' in info:
+            self.__port = int(info['port'])
+        if 'username' in info:
+            self.__user = info['username']
+        if 'pkey' in info:
+            self.__pkey = info['pkey']
+        if 'password' in info:
+            self.__pass = info['password']
+        if 'pkey_passwd' in info:
+            self.__key_passwd = info['pkey_passwd']
+
+        # print(self.__host, self.__pass, self.__key_passwd)
+        try:
+            result = self.connect(sid)
+            # print(result)
+        except Exception as ex:
+            if str(ex).find("NoneType") == -1:
+                raise ex
+        return result
+
+    def send(self):
+        pass
+
+    def close(self):
+        try:
+            if self.__ssh:
+                self.__ssh.close()
+            if self.__tp:  # 关闭宿主服务
+                self.__tp.close()
+            if self.__ps:
+                self.__ps.close()
+        except:
+            pass
+
+    def resize(self, sid, data):
+        try:
+            self.__ssh_list[sid].resize_pty(
+                width=data['cols'], height=data['rows'])
+            return True
+        except:
+            return False
+
+    def wsSend(self, recv):
+        try:
+            t = recv.decode("utf-8")
+            return emit('server_response', {'data': t})
+        except Exception as e:
+            return emit('server_response', {'data': recv})
+
+    def wsSendConnect(self):
+        return emit('connect', {'data': 'ok'})
+
+    def wsSendReConnect(self):
+        return emit('reconnect', {'data': 'ok'})
+
+    def heartbeat(self):
+        # limit_cos = 10
+        while True:
+            time.sleep(3)
+            cur_time = time.time()
+            for x in list(self.__ssh_list.keys()):
+                ssh_last_time = self.__ssh_last_request_time[x]
+                sid_off_cos = cur_time - ssh_last_time
+
+                # print("heartbeat off cos :", x, sid_off_cos)
+                if sid_off_cos > 3:
+                    cur_ssh = self.__ssh_list[x]
+                    if not cur_ssh:
+                        del(self.__ssh_list[x])
+                        del(self.__ssh_last_request_time[x])
+                        continue
+
+                    if cur_ssh.exit_status_ready():
+                        del(self.__ssh_list[x])
+                        del(self.__ssh_last_request_time[x])
+                        continue
+
+                    cur_ssh.send("exit\r\n")
+                    del(self.__ssh_list[x])
+                    del(self.__ssh_last_request_time[x])
+
+    def run(self, sid, info):
+        self.__sid = sid
+        if not self.__sid:
+            return self.wsSend('WebSocketIO无效')
+
+        self.__ssh_last_request_time[sid] = time.time()
+        if not sid in self.__ssh_list:
+            if type(info) == dict and 'host' in info:
+                result = self.setAttr(sid, info)
+                if result['status']:
+                    return self.wsSendConnect()
+                else:
+                    return self.wsSend(result['msg'])
+            else:
+                return self.wsSendReConnect()
+
+        result = self.returnMsg(False, '')
+        if sid in self.__ssh_list:
+            if 'resize' in info:
+                self.resize(sid, info)
+            result = self.returnMsg(True, '已连接')
+            if result['status']:
+                if type(info) == str:
+                    time.sleep(0.1)
+                    cur_ssh = self.__ssh_list[sid]
+                    if cur_ssh.exit_status_ready():
+                        self.wsSend("logout\r\n")
+                        del(self.__ssh_list[sid])
+                        return
+                    cur_ssh.send(info)
+                    try:
+                        time.sleep(0.005)
+                        recv = cur_ssh.recv(8192)
+                        return self.wsSend(recv)
+                    except Exception as ex:
+                        return self.wsSend('')
+            else:
+                return self.wsSend(result['msg'])

From 7b37a86acb75adc99d154ae2c5598baaeac06ab5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 00:09:20 +0800
Subject: [PATCH 166/965] update

---
 scripts/old/install.sh        | 178 ++++++++++++++++++++++++++++++++++
 web/admin/__init__.py         |   6 ++
 web/admin/dashboard/ssh.py    |   2 +
 web/admin/plugins/__init__.py |   4 +-
 web/utils/plugin.py           |   2 -
 5 files changed, 188 insertions(+), 4 deletions(-)
 create mode 100644 scripts/old/install.sh

diff --git a/scripts/old/install.sh b/scripts/old/install.sh
new file mode 100644
index 000000000..6bd55eaa9
--- /dev/null
+++ b/scripts/old/install.sh
@@ -0,0 +1,178 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+# LANG=en_US.UTF-8
+is64bit=`getconf LONG_BIT`
+
+VERSION=0.17.3
+
+LOG_FILE=/var/log/mw-install.log
+
+{
+
+if [ -f /etc/motd ];then
+    echo "welcome to mdserver-web panel" > /etc/motd
+fi
+
+startTime=`date +%s`
+
+_os=`uname`
+echo "use system: ${_os}"
+
+if [ ${_os} == "Darwin" ]; then
+	OSNAME='macos'
+elif grep -Eqi "openSUSE" /etc/*-release; then
+	OSNAME='opensuse'
+	zypper refresh
+	zypper install cron wget curl zip unzip
+elif grep -Eqi "FreeBSD" /etc/*-release; then
+	OSNAME='freebsd'
+	pkg install -y wget curl zip unzip unrar rar
+elif grep -Eqi "EulerOS" /etc/*-release || grep -Eqi "openEuler" /etc/*-release; then
+	OSNAME='euler'
+	yum install -y wget curl zip unzip tar crontabs
+elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "CentOS" /etc/*-release; then
+	OSNAME='rhel'
+	yum install -y wget curl zip unzip tar crontabs
+elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then
+	OSNAME='rhel'
+	yum install -y wget curl zip unzip tar crontabs
+elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then
+	OSNAME='rhel'
+	yum install -y wget curl zip unzip tar crontabs
+elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eqi "AlmaLinux" /etc/*-release; then
+	OSNAME='rhel'
+	yum install -y wget curl zip unzip tar crontabs
+elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eqi "Amazon Linux" /etc/*-release; then
+	OSNAME='amazon'
+	yum install -y wget curl zip unzip tar crontabs
+elif grep -Eqi "Debian" /etc/issue || grep -Eqi "Debian" /etc/os-release; then
+	OSNAME='debian'
+	apt update -y
+	apt install -y wget curl zip unzip tar cron
+elif grep -Eqi "Ubuntu" /etc/issue || grep -Eqi "Ubuntu" /etc/os-release; then
+	OSNAME='ubuntu'
+	apt update -y
+	apt install -y wget curl zip unzip tar cron
+else
+	OSNAME='unknow'
+fi
+
+if [ "$EUID" -ne 0 ] && [ "$OSNAME" != "macos" ];then 
+	echo "Please run as root!"
+ 	exit
+fi
+
+
+# HTTP_PREFIX="https://"
+# LOCAL_ADDR=common
+# ping  -c 1 github.com > /dev/null 2>&1
+# if [ "$?" != "0" ];then
+# 	LOCAL_ADDR=cn
+# 	HTTP_PREFIX="https://mirror.ghproxy.com/"
+# fi
+
+HTTP_PREFIX="https://"
+LOCAL_ADDR=common
+cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"")
+if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then
+	LOCAL_ADDR=cn
+    HTTP_PREFIX="https://mirror.ghproxy.com/"
+fi
+
+echo "local:${LOCAL_ADDR}"
+
+if [ $OSNAME != "macos" ];then
+	if id www &> /dev/null ;then 
+	    echo ""
+	else
+	    groupadd www
+		useradd -g www -s /usr/sbin/nologin www
+	fi
+
+	mkdir -p /www/server
+	mkdir -p /www/wwwroot
+	mkdir -p /www/wwwlogs
+	mkdir -p /www/backup/database
+	mkdir -p /www/backup/site
+
+	# https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/install.sh
+	if [ ! -d /www/server/mdserver-web ];then
+		if [ "$LOCAL_ADDR" == "common" ];then
+			curl --insecure -sSLo /tmp/master.zip ${HTTP_PREFIX}github.com/midoks/mdserver-web/archive/refs/tags/${VERSION}.zip
+			cd /tmp && unzip /tmp/master.zip
+			mv -f /tmp/mdserver-web-master /www/server/mdserver-web
+			rm -rf /tmp/master.zip
+			rm -rf /tmp/mdserver-web-master
+		else
+			# curl --insecure -sSLo /tmp/master.zip https://code.midoks.icu/midoks/mdserver-web/archive/master.zip
+			wget --no-check-certificate -O /tmp/master.zip https://code.midoks.icu/midoks/mdserver-web/archive/master.zip
+			cd /tmp && unzip /tmp/master.zip
+			mv -f /tmp/mdserver-web /www/server/mdserver-web
+			rm -rf /tmp/master.zip
+			rm -rf /tmp/mdserver-web
+		fi
+
+		
+	fi
+
+	# install acme.sh
+	if [ ! -d /root/.acme.sh ];then
+	    if [ "$LOCAL_ADDR" != "common" ];then
+	        curl --insecure -sSLo /tmp/acme.tar.gz https://gitee.com/neilpang/acme.sh/repository/archive/master.tar.gz
+	        tar xvzf /tmp/acme.tar.gz -C /tmp
+	        cd /tmp/acme.sh-master
+	        bash acme.sh install
+	    fi
+
+	    if [ ! -d /root/.acme.sh ];then
+	        curl  https://get.acme.sh | sh
+	    fi
+	fi
+fi
+
+echo "use system version: ${OSNAME}"
+if [ "${OSNAME}" == "macos" ];then
+	curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/master/scripts/install/macos.sh | bash
+else
+	cd /www/server/mdserver-web && bash scripts/install/${OSNAME}.sh
+fi
+
+if [ "${OSNAME}" == "macos" ];then
+	echo "macos end"
+	exit 0
+fi
+
+cd /www/server/mdserver-web && bash cli.sh start
+isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`
+n=0
+while [ ! -f /etc/rc.d/init.d/mw ];
+do
+    echo -e ".\c"
+    sleep 1
+    let n+=1
+    if [ $n -gt 20 ];then
+    	echo -e "start mw fail"
+    	exit 1
+    fi
+done
+
+cd /www/server/mdserver-web && bash /etc/rc.d/init.d/mw stop
+cd /www/server/mdserver-web && bash /etc/rc.d/init.d/mw start
+cd /www/server/mdserver-web && bash /etc/rc.d/init.d/mw default
+
+sleep 2
+if [ ! -e /usr/bin/mw ]; then
+	if [ -f /etc/rc.d/init.d/mw ];then
+		ln -s /etc/rc.d/init.d/mw /usr/bin/mw
+	fi
+fi
+
+endTime=`date +%s`
+((outTime=(${endTime}-${startTime})/60))
+echo -e "Time consumed:\033[32m $outTime \033[0mMinute!"
+
+} 1> >(tee $LOG_FILE) 2>&1
+
+echo -e "\nInstall completed. If error occurs, please contact us with the log file mw-install.log ."
+echo "安装完毕，如果出现错误，请带上同目录下的安装日志 mw-install.log 联系我们反馈."
\ No newline at end of file
diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 8d40a7f32..20495c45d 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -215,6 +215,12 @@ app.logger.debug("Python syspath: %s", sys.path)
 # OK
 socketio.init_app(app, cors_allowed_origins="*")
 
+from gevent.pywsgi import WSGIServer
+from geventwebsocket.handler import WebSocketHandler
+http_server = WSGIServer(('0.0.0.0', config.DEFAULT_SERVER_PORT), app, handler_class=WebSocketHandler)
+http_server.serve_forever()
+socketio.run(app, host=HOST, port=PORT)
+
 # def create_app(app_name = None):
 #     
 #     if not app_name:
diff --git a/web/admin/dashboard/ssh.py b/web/admin/dashboard/ssh.py
index f68d661ee..86bfd30b0 100644
--- a/web/admin/dashboard/ssh.py
+++ b/web/admin/dashboard/ssh.py
@@ -8,6 +8,8 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
+from flask import request
+
 from admin import socketio
 from admin.common import isLogined
 
diff --git a/web/admin/plugins/__init__.py b/web/admin/plugins/__init__.py
index 77baaf6f1..8092e015a 100644
--- a/web/admin/plugins/__init__.py
+++ b/web/admin/plugins/__init__.py
@@ -17,10 +17,10 @@ from flask import request
 from utils.plugin import plugin as MwPlugin
 from admin.user_login_check import panel_login_required
 
-from admin import model
 
 import core.mw as mw
 import utils.config as utils_config
+import thisdb
 
 
 blueprint = Blueprint('plugins', __name__, url_prefix='/plugins', template_folder='../../templates/default')
@@ -131,7 +131,7 @@ def menu():
     pg = MwPlugin.instance()
     tag = request.args.get('tag', '')
 
-    hook_menu = model.getOptionByJson('hook_menu',type='hook',default=[])
+    hook_menu = thisdb.getOptionByJson('hook_menu',type='hook',default=[])
     content = ''
     for menu_data in hook_menu:
         if tag == menu_data['name'] and 'path' in menu_data:
diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index 3c0bf683e..a9b4a9a55 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -14,8 +14,6 @@ import json
 import threading
 import multiprocessing
 
-from admin import model
-
 import core.mw as mw
 import thisdb
 

From c182635fd6fbb9b37fc4b29981c39b292d4dd994 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 00:10:16 +0800
Subject: [PATCH 167/965] Update README.md

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index fbb8a397e..6338925f6 100644
--- a/README.md
+++ b/README.md
@@ -189,6 +189,11 @@ curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev
 curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update_new.sh | bash
 ```
 
+### 旧版安装
+```
+curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/old/install.sh | bash
+```
+
 ### 捐赠地址 USDT（TRC20）
 
 TVbNgrpeGBGZVm5gTLa21ADP7RpnPFhjya

From 6e88b3b0c53f44f79cb7dfc3c2774755c6b7d67b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 00:15:08 +0800
Subject: [PATCH 168/965] Create update.sh

---
 scripts/old/update.sh | 117 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 scripts/old/update.sh

diff --git a/scripts/old/update.sh b/scripts/old/update.sh
new file mode 100644
index 000000000..079aa5924
--- /dev/null
+++ b/scripts/old/update.sh
@@ -0,0 +1,117 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+# LANG=en_US.UTF-8
+is64bit=`getconf LONG_BIT`
+
+startTime=`date +%s`
+
+VERSION=0.17.3
+
+_os=`uname`
+echo "use system: ${_os}"
+
+if [ "$EUID" -ne 0 ]
+  then echo "Please run as root!"
+  exit
+fi
+
+if [ ${_os} != "Darwin" ] && [ ! -d /www/server/mdserver-web/logs ]; then
+	mkdir -p /www/server/mdserver-web/logs
+fi
+
+LOG_FILE=/var/log/mw-update.log
+
+{
+
+if [ ${_os} == "Darwin" ]; then
+	OSNAME='macos'
+elif grep -Eqi "openSUSE" /etc/*-release; then
+	OSNAME='opensuse'
+	zypper refresh
+elif grep -Eqi "EulerOS" /etc/*-release || grep -Eqi "openEuler" /etc/*-release; then
+	OSNAME='euler'
+elif grep -Eqi "FreeBSD" /etc/*-release; then
+	OSNAME='freebsd'
+elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "CentOS" /etc/*-release; then
+	OSNAME='rhel'
+	yum install -y wget zip unzip
+elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then
+	OSNAME='rhel'
+	yum install -y wget zip unzip
+elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then
+	OSNAME='rhel'
+	yum install -y wget zip unzip
+elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eqi "AlmaLinux" /etc/*-release; then
+	OSNAME='rhel'
+	yum install -y wget zip unzip
+elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eqi "Amazon Linux" /etc/*-release; then
+	OSNAME='amazon'
+	yum install -y wget zip unzip
+elif grep -Eqi "Debian" /etc/issue || grep -Eqi "Debian" /etc/*-release; then
+	OSNAME='debian'
+	apt install -y wget zip unzip
+elif grep -Eqi "Ubuntu" /etc/issue || grep -Eqi "Ubuntu" /etc/*-release; then
+	OSNAME='ubuntu'
+	apt install -y wget zip unzip
+elif grep -Eqi "Raspbian" /etc/issue || grep -Eqi "Raspbian" /etc/*-release; then
+	OSNAME='raspbian'
+else
+	OSNAME='unknow'
+fi
+
+
+HTTP_PREFIX="https://"
+LOCAL_ADDR=common
+cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"")
+if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then
+	LOCAL_ADDR=cn
+	HTTP_PREFIX="https://mirror.ghproxy.com/"
+fi
+echo "local:${LOCAL_ADDR}"
+
+CP_CMD=/usr/bin/cp
+if [ -f /bin/cp ];then
+		CP_CMD=/bin/cp
+fi
+
+if [ "$LOCAL_ADDR" != "common" ];then
+	# curl --insecure -sSLo /tmp/master.zip https://code.midoks.icu/midoks/mdserver-web/archive/master.zip
+	wget --no-check-certificate -O /tmp/master.zip github.com/midoks/mdserver-web/archive/refs/tags/${VERSION}.zip
+	cd /tmp && unzip /tmp/master.zip
+
+	$CP_CMD -rf /tmp/mdserver-web/* /www/server/mdserver-web
+	rm -rf /tmp/master.zip
+	rm -rf /tmp/mdserver-web
+else
+	curl --insecure -sSLo /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
+
+	cd /tmp && unzip /tmp/master.zip
+	$CP_CMD -rf /tmp/mdserver-web-master/* /www/server/mdserver-web
+	rm -rf /tmp/master.zip
+	rm -rf /tmp/mdserver-web-master
+fi
+
+
+#pip uninstall public
+echo "use system version: ${OSNAME}"
+cd /www/server/mdserver-web && bash scripts/update/${OSNAME}.sh
+
+bash /etc/rc.d/init.d/mw restart
+bash /etc/rc.d/init.d/mw default
+
+if [ -f /usr/bin/mw ];then
+	rm -rf /usr/bin/mw
+fi
+
+if [ ! -e /usr/bin/mw ]; then
+	if [ ! -f /usr/bin/mw ];then
+		ln -s /etc/rc.d/init.d/mw /usr/bin/mw
+	fi
+fi
+
+endTime=`date +%s`
+((outTime=($endTime-$startTime)/60))
+echo -e "Time consumed:\033[32m $outTime \033[0mMinute!"
+
+} 1> >(tee $LOG_FILE) 2>&1
\ No newline at end of file

From 96fcdb8af304dd5a77c8114b44629188ce8dc020 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 00:15:37 +0800
Subject: [PATCH 169/965] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6338925f6..b4d210106 100644
--- a/README.md
+++ b/README.md
@@ -192,6 +192,7 @@ curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev
 ### 旧版安装
 ```
 curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/old/install.sh | bash
+curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/old/update.sh | bash
 ```
 
 ### 捐赠地址 USDT（TRC20）

From 990199ec894a33bf15cda7025716d3d9d35b2c31 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 01:00:06 +0800
Subject: [PATCH 170/965] update

---
 new_cli.sh                      |   5 +-
 web/admin/__init__.py           | 100 ++++++++------------------------
 web/admin/dashboard/__init__.py |   1 -
 web/admin/dashboard/ssh.py      |  37 ------------
 web/admin/ssh.py                |  39 +++++++++++++
 web/setting.py                  |  27 ++++-----
 6 files changed, 80 insertions(+), 129 deletions(-)
 delete mode 100644 web/admin/dashboard/ssh.py
 create mode 100644 web/admin/ssh.py

diff --git a/new_cli.sh b/new_cli.sh
index 77c21ddf6..97b66ee1d 100755
--- a/new_cli.sh
+++ b/new_cli.sh
@@ -60,7 +60,7 @@ mw_start_debug(){
         port=$(cat ${DIR}/data/port.pl)
     fi
     # gunicorn -b :${port} -k gevent -w 1 app:app
-	cd ${DIR}/web && gunicorn -b :${port} -w 1 app:app
+	cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1 app:app
 }
 
 mw_start_panel(){
@@ -68,7 +68,8 @@ mw_start_panel(){
 	if [ -f ${DIR}/data/port.pl ];then
         port=$(cat ${DIR}/data/port.pl)
     fi
-	cd ${DIR}/web && gunicorn -b :${port} -w 1  app:app
+	# cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
+	cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1  app:app
 }
 
 mw_start_bgtask(){
diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 20495c45d..e7f47b7f6 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -17,36 +17,27 @@ import logging
 from datetime import timedelta
 
 from flask import Flask
+from flask import request
+from flask import Response
 
 from flask_socketio import SocketIO, emit, send
 from flask import Flask, abort, current_app, session, url_for
 from flask import Blueprint, render_template
 from flask import render_template_string
 
-from flask import request
-from flask import Response
+
 
 
 from flask_migrate import Migrate
 from flask_caching import Cache
 from werkzeug.local import LocalProxy
 
-# from admin import model
 from admin import setup
-import thisdb
-
-from admin.model import db as sys_db
-
 
 import core.mw as mw
 import config
 import utils.config as utils_config
-
-root_dir = mw.getRunDir()
-
-socketio = SocketIO(manage_session=False, async_mode='threading',
-                    logger=False, engineio_logger=False, debug=False,
-                    ping_interval=25, ping_timeout=120)
+import thisdb
 
 
 app = Flask(__name__, template_folder='templates/default')
@@ -79,6 +70,13 @@ app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = True
 setup.init()
 
 
+# webssh
+socketio = SocketIO()
+socketio.init_app(app)
+from .ssh import websshRun
+websshRun()
+
+
 app.config['BASIC_AUTH_OPEN'] = False
 try:
     basic_auth = model.getOptionByJson('basic_auth', default={'open':False})
@@ -158,68 +156,11 @@ def inject_global_variables():
     return dict(config=g_config, data=data)
 
 
-# from flasgger import Swagger
-# api = Api(app, version='1.0', title='API', description='API 文档')
-# Swagger(app)
-
-# @app.route('/colors/<palette>/')
-# def colors(palette):
-#     """
-#     根据调色板名称返回颜色列表
-#     ---
-#     parameters:
-#       - name: palette
-#         in: path
-#         type: string
-#         enum: ['all', 'rgb', 'cmyk']
-#         required: true
-#         default: all
-#     definitions:
-#       Palette:
-#         type: object
-#         properties:
-#           palette_name:
-#             type: array
-#             items:
-#               $ref: '#/definitions/Color'
-#       Color:
-#         type: string
-#     responses:
-#       200:
-#         description: 返回的颜色列表，可按调色板过滤
-#         schema:
-#           $ref: '#/definitions/Palette'
-#         examples:
-#           rgb: ['red', 'green', 'blue']
-#     """
-#     all_colors = {
-#         'cmyk': ['cyan', 'magenta', 'yellow', 'black'],
-#         'rgb': ['red', 'green', 'blue']
-#     }
-#     if palette == 'all':
-#         result = all_colorselse
-#         result = {palette: all_colors.get(palette)}
-#     return jsonify(result)
-
-
-
-
-# Log the startup
-app.logger.info('########################################################')
-app.logger.info('Starting %s v%s...', config.APP_NAME, config.APP_VERSION)
-app.logger.info('########################################################')
-app.logger.debug("Python syspath: %s", sys.path)
-
-
-
-# OK
-socketio.init_app(app, cors_allowed_origins="*")
-
-from gevent.pywsgi import WSGIServer
-from geventwebsocket.handler import WebSocketHandler
-http_server = WSGIServer(('0.0.0.0', config.DEFAULT_SERVER_PORT), app, handler_class=WebSocketHandler)
-http_server.serve_forever()
-socketio.run(app, host=HOST, port=PORT)
+# from gevent.pywsgi import WSGIServer
+# from geventwebsocket.handler import WebSocketHandler
+# http_server = WSGIServer(('0.0.0.0', config.DEFAULT_SERVER_PORT), app, handler_class=WebSocketHandler)
+# http_server.serve_forever()
+# socketio.run(app, host='0.0.0.0', port=PORT)
 
 # def create_app(app_name = None):
 #     
@@ -230,4 +171,11 @@ socketio.run(app, host=HOST, port=PORT)
 #     cli_mode = False
 #     if app_name.endswith('-cli'):
 #         cli_mode = True
-#     return app
\ No newline at end of file
+#     return app
+
+
+# Log the startup
+app.logger.info('########################################################')
+app.logger.info('Starting %s v%s...', config.APP_NAME, config.APP_VERSION)
+app.logger.info('########################################################')
+app.logger.debug("Python syspath: %s", sys.path)
\ No newline at end of file
diff --git a/web/admin/dashboard/__init__.py b/web/admin/dashboard/__init__.py
index 259b242db..77a962a50 100644
--- a/web/admin/dashboard/__init__.py
+++ b/web/admin/dashboard/__init__.py
@@ -11,4 +11,3 @@
 
 from .dashboard import *
 from .login import *
-from .ssh import *
diff --git a/web/admin/dashboard/ssh.py b/web/admin/dashboard/ssh.py
deleted file mode 100644
index 86bfd30b0..000000000
--- a/web/admin/dashboard/ssh.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-from flask import request
-
-from admin import socketio
-from admin.common import isLogined
-
-
-@socketio.on('webssh_websocketio')
-def webssh_websocketio(data):
-    if not isLogined():
-        emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'})
-        return
-    import utils.ssh.ssh_terminal as ssh_terminal
-    shell_client = ssh_terminal.ssh_terminal.instance()
-    shell_client.run(request.sid, data)
-    return
-
-
-@socketio.on('webssh')
-def webssh(data):
-    if not isLogined():
-        emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'})
-        return None
-
-    import utils.ssh.ssh_local as ssh_local
-    shell = ssh_local.ssh_local.instance()
-    shell.run(data)
-    return
\ No newline at end of file
diff --git a/web/admin/ssh.py b/web/admin/ssh.py
new file mode 100644
index 000000000..3da737368
--- /dev/null
+++ b/web/admin/ssh.py
@@ -0,0 +1,39 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+
+from flask_socketio import SocketIO, emit, send
+from flask import request
+
+from admin import app,socketio
+from .common import isLogined
+
+def websshRun():
+    @socketio.on('webssh_websocketio')
+    def webssh_websocketio(data):
+        if not isLogined():
+            emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'})
+            return
+        import utils.ssh.ssh_terminal as ssh_terminal
+        shell_client = ssh_terminal.ssh_terminal.instance()
+        shell_client.run(request.sid, data)
+        return
+
+
+    @socketio.on('webssh')
+    def webssh(data):
+        if not isLogined():
+            emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'})
+            return None
+
+        import utils.ssh.ssh_local as ssh_local
+        shell = ssh_local.ssh_local.instance()
+        shell.run(data)
+        return
diff --git a/web/setting.py b/web/setting.py
index d914c71a9..332e17387 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -33,25 +33,25 @@ if not os.path.exists(log_dir):
     os.mkdir(log_dir)
 
 # default port
-mw_port = '7200'
+panel_port = '7200'
 default_port_file = panel_dir+'/data/port.pl'
 if os.path.exists(default_port_file):
-    mw_port = mw.readFile(default_port_file)
-    mw_port.strip()
-# else:
-#     import firewall_api
-#     import common
-#     common.initDB()
-#     mw_port = str(random.randint(10000, 65530))
-#     firewall_api.firewall_api().addAcceptPortArgs(mw_port, 'WEB面板', 'port')
-#     mw.writeFile('data/port.pl', mw_port)
+    panel_port = mw.readFile(default_port_file)
+    panel_port.strip()
+else:
+    from utils.firewall import Firewall as MwFirewall
+    import common
+    common.initDB()
+    mw_port = str(random.randint(10000, 65530))
+    MwFirewall.instance().addAcceptPort(panel_port, 'WEB面板', 'port')
+    mw.writeFile('data/port.pl', panel_port)
 
 bind = []
 default_ipv6_file = panel_dir+'/data/ipv6.pl'
 if os.path.exists(default_ipv6_file):
-    bind.append('[0:0:0:0:0:0:0:0]:%s' % mw_port)
+    bind.append('[0:0:0:0:0:0:0:0]:%s' % panel_port)
 else:
-    bind.append('0.0.0.0:%s' % mw_port)
+    bind.append('0.0.0.0:%s' % panel_port)
 
 if workers > 2:
     workers = 1
@@ -61,6 +61,7 @@ backlog = 512
 reload = False
 daemon = True
 # worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
+worker_class = 'eventlet'
 timeout = 600
 keepalive = 60
 preload_app = True
@@ -69,4 +70,4 @@ access_log_format = '%(t)s %(p)s %(h)s "%(r)s" %(s)s %(L)s %(b)s %(f)s" "%(a)s"'
 loglevel = 'info'
 errorlog = log_dir + '/panel_error.log'
 accesslog = log_dir + '/panel.log'
-pidfile = log_dir + '/mw.pid'
+pidfile = log_dir + '/panel.pid'

From b03f7abcb825278eccefd6c4a49007a3c8779583 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 01:03:49 +0800
Subject: [PATCH 171/965] Update requirements.txt

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index 20e997e8a..d50874f51 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,6 +12,7 @@ flask-caching>=1.10.1
 cache==1.0.3
 gevent>=22.10.2
 gevent-websocket==0.10.1
+eventlet>=0.24.1
 psutil==5.9.1
 chardet==3.0.4
 SQLAlchemy==2.*

From 17a9f07f04bd91dbe599d549a88a7be95c92b60f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 01:06:31 +0800
Subject: [PATCH 172/965] Update app.py

---
 web/app.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/web/app.py b/web/app.py
index aa0fe2680..cc166c571 100644
--- a/web/app.py
+++ b/web/app.py
@@ -9,21 +9,18 @@
 # ---------------------------------------------------------------------------------
 
 import sys
+import os
 
+from admin import app, socketio
+import config
 
 if sys.version_info < (3, 6):
     raise RuntimeError('This application must be run under Python 3.6 or later.')
 
-import os
-
 # 我们需要在sys.path中包含根目录，以确保我们可以找到在独立运行时运行时所需的一切。
 if sys.path[0] != os.path.dirname(os.path.realpath(__file__)):
     sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
 
-
-import config
-from admin import app, socketio
-
 # print(config.DEFAULT_SERVER,config.DEFAULT_SERVER_PORT)
 # app = create_app()
 def main():

From 49bfb5b3a8ccae6bea49934b8e5944787a483f2f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 01:12:15 +0800
Subject: [PATCH 173/965] update

---
 web/utils/ssh/ssh_local.py    | 2 +-
 web/utils/ssh/ssh_terminal.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/utils/ssh/ssh_local.py b/web/utils/ssh/ssh_local.py
index 2201881b7..48e4e663e 100644
--- a/web/utils/ssh/ssh_local.py
+++ b/web/utils/ssh/ssh_local.py
@@ -39,7 +39,7 @@ class ssh_local(object):
     _instance_lock = threading.Lock()
 
     def __init__(self):
-        pass
+        self.__debug_file = mw.getPanelDir()+ '/logs/ssh_terminal.log'
 
     @classmethod
     def instance(cls, *args, **kwargs):
diff --git a/web/utils/ssh/ssh_terminal.py b/web/utils/ssh/ssh_terminal.py
index 4419860dc..e683e60c0 100644
--- a/web/utils/ssh/ssh_terminal.py
+++ b/web/utils/ssh/ssh_terminal.py
@@ -30,7 +30,7 @@ from flask_socketio import SocketIO, emit, send
 
 class ssh_terminal(object):
 
-    __debug_file = 'logs/ssh_terminal.log'
+    __debug_file =  'logs/ssh_terminal.log'
     __log_type = 'SSH终端'
 
     # websocketio 唯一标识
@@ -59,6 +59,7 @@ class ssh_terminal(object):
     _instance_lock = threading.Lock()
 
     def __init__(self):
+        self.__debug_file = mw.getPanelDir()+ '/logs/ssh_terminal.log'
         ht = threading.Thread(target=self.heartbeat)
         ht.start()
 

From 0da42e9ec82f5ae61531c47fb141552aedcdaef3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 01:21:14 +0800
Subject: [PATCH 174/965] Update __init__.py

---
 web/admin/firewall/__init__.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/web/admin/firewall/__init__.py b/web/admin/firewall/__init__.py
index 435e706ae..006119c0b 100644
--- a/web/admin/firewall/__init__.py
+++ b/web/admin/firewall/__init__.py
@@ -66,7 +66,7 @@ def add_accept_port():
 
     return MwFirewall.instance().addAcceptPort(port, ps, stype, protocol=protocol)
 
-# 添加放行端口
+# 删除放行端口
 @blueprint.route('/del_accept_port', endpoint='del_accept_port', methods=['POST'])
 @panel_login_required
 def del_accept_port():
@@ -76,7 +76,14 @@ def del_accept_port():
     return MwFirewall.instance().delAcceptPort(firewall_id, port, protocol=protocol)
 
 
-
+# 设置防火墙状态
+@blueprint.route('/set_fw', endpoint='set_fw', methods=['POST'])
+@panel_login_required
+def set_fw():
+    if mw.isAppleSystem():
+        return mw.returnData(True, '开发机不能设置!')
+    status = request.form.get('status', '1')
+    return MwFirewall.instance().setFw(status)
 
 
 

From 1616d4d191b2b1787c52a652fe6797491d31b2b3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 01:36:30 +0800
Subject: [PATCH 175/965] update

---
 web/admin/firewall/__init__.py |  2 --
 web/admin/setup/__init__.py    |  4 ++++
 web/utils/firewall.py          | 10 ++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/web/admin/firewall/__init__.py b/web/admin/firewall/__init__.py
index 006119c0b..d57c998c7 100644
--- a/web/admin/firewall/__init__.py
+++ b/web/admin/firewall/__init__.py
@@ -13,8 +13,6 @@ from flask import Blueprint, render_template
 from flask import request
 
 from admin.user_login_check import panel_login_required
-from admin.model import db, Firewall
-
 
 from utils.firewall import Firewall as MwFirewall
 
diff --git a/web/admin/setup/__init__.py b/web/admin/setup/__init__.py
index 6747b01d4..cd0d5d2b5 100644
--- a/web/admin/setup/__init__.py
+++ b/web/admin/setup/__init__.py
@@ -15,6 +15,7 @@ from .option import init_option
 from .init_db_system import init_db_system
 from .init_cmd import init_cmd
 
+from utils.firewall import Firewall as MwFirewall
 
 import thisdb
 import config
@@ -29,3 +30,6 @@ def init():
 	init_cmd()
 	init_db_system()
 
+	# 自动识别防火墙配置
+	MwFirewall.instance().aIF()
+
diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 9b39ac475..4e7bd014f 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -47,6 +47,16 @@ class Firewall(object):
         elif mw.isAppleSystem():
             self.__isMac = True
 
+    # 自动识别防火墙配置 | Automatically identify firewall
+    def aIF():
+        if self.__isFirewalld:
+            self.AIF_Firewalld()
+
+    def AIF_Firewalld():
+        # firewall-cmd --list-all | grep '  ports'
+        data = mw.execShell("firewall-cmd --list-all | grep '  ports'")
+        print(data)
+
     def getList(self, page=1,size=10):
         info = thisdb.getFirewallList(page=page, size=size)
 

From 687f16e1efd5bfec8c06dc479ad56f0958c64c45 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 01:37:59 +0800
Subject: [PATCH 176/965] Update firewall.py

---
 web/utils/firewall.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 4e7bd014f..7b12014e3 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -48,11 +48,11 @@ class Firewall(object):
             self.__isMac = True
 
     # 自动识别防火墙配置 | Automatically identify firewall
-    def aIF():
+    def aIF(self):
         if self.__isFirewalld:
             self.AIF_Firewalld()
 
-    def AIF_Firewalld():
+    def AIF_Firewalld(self):
         # firewall-cmd --list-all | grep '  ports'
         data = mw.execShell("firewall-cmd --list-all | grep '  ports'")
         print(data)

From 1cc8ac17f3e21140dec60d89afc0b20a6d6c850a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 01:42:02 +0800
Subject: [PATCH 177/965] update

---
 web/admin/__init__.py | 28 ++++++++++++++++++++++------
 web/admin/ssh.py      | 39 ---------------------------------------
 2 files changed, 22 insertions(+), 45 deletions(-)
 delete mode 100644 web/admin/ssh.py

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index e7f47b7f6..d472efabd 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -63,20 +63,36 @@ app.config['PERMANENT_SESSION_LIFETIME'] = timedelta(days=31)
 # app.config['SQLALCHEMY_DATABASE_URI'] = mw.getSqitePrefix()+config.SQLITE_PATH+"?timeout=20"  # 使用 SQLite 数据库
 app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = True
 
-
 # 初始化db
-# sys_db.init_app(app)
-# Migrate(app, sys_db)
 setup.init()
 
-
 # webssh
 socketio = SocketIO()
 socketio.init_app(app)
-from .ssh import websshRun
-websshRun()
+
+@socketio.on('webssh_websocketio')
+def webssh_websocketio(data):
+    if not isLogined():
+        emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'})
+        return
+    import utils.ssh.ssh_terminal as ssh_terminal
+    shell_client = ssh_terminal.ssh_terminal.instance()
+    shell_client.run(request.sid, data)
+    return
 
 
+@socketio.on('webssh')
+def webssh(data):
+    if not isLogined():
+        emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'})
+        return None
+
+    import utils.ssh.ssh_local as ssh_local
+    shell = ssh_local.ssh_local.instance()
+    shell.run(data)
+    return
+
+# BASIC AUTH
 app.config['BASIC_AUTH_OPEN'] = False
 try:
     basic_auth = model.getOptionByJson('basic_auth', default={'open':False})
diff --git a/web/admin/ssh.py b/web/admin/ssh.py
deleted file mode 100644
index 3da737368..000000000
--- a/web/admin/ssh.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-
-from flask_socketio import SocketIO, emit, send
-from flask import request
-
-from admin import app,socketio
-from .common import isLogined
-
-def websshRun():
-    @socketio.on('webssh_websocketio')
-    def webssh_websocketio(data):
-        if not isLogined():
-            emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'})
-            return
-        import utils.ssh.ssh_terminal as ssh_terminal
-        shell_client = ssh_terminal.ssh_terminal.instance()
-        shell_client.run(request.sid, data)
-        return
-
-
-    @socketio.on('webssh')
-    def webssh(data):
-        if not isLogined():
-            emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'})
-            return None
-
-        import utils.ssh.ssh_local as ssh_local
-        shell = ssh_local.ssh_local.instance()
-        shell.run(data)
-        return

From c9288e8dbeb2f5a6e6ab92f0d93f940015ac4ecc Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 01:42:53 +0800
Subject: [PATCH 178/965] Update __init__.py

---
 web/admin/__init__.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index d472efabd..b3f26b3e0 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -14,25 +14,24 @@ import json
 import time
 import uuid
 import logging
+
 from datetime import timedelta
 
 from flask import Flask
 from flask import request
 from flask import Response
-
-from flask_socketio import SocketIO, emit, send
 from flask import Flask, abort, current_app, session, url_for
 from flask import Blueprint, render_template
 from flask import render_template_string
 
-
-
+from flask_socketio import SocketIO, emit, send
 
 from flask_migrate import Migrate
 from flask_caching import Cache
 from werkzeug.local import LocalProxy
 
 from admin import setup
+from admin.common import isLogined
 
 import core.mw as mw
 import config
@@ -40,6 +39,7 @@ import utils.config as utils_config
 import thisdb
 
 
+
 app = Flask(__name__, template_folder='templates/default')
 
 # 缓存配置

From 98f7c4810ef294e5f6bd2cfd2a657a240f5fbbc0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 14:33:19 +0800
Subject: [PATCH 179/965] Update __init__.py

---
 web/admin/__init__.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index b3f26b3e0..b057e135a 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -171,13 +171,6 @@ def inject_global_variables():
     }
     return dict(config=g_config, data=data)
 
-
-# from gevent.pywsgi import WSGIServer
-# from geventwebsocket.handler import WebSocketHandler
-# http_server = WSGIServer(('0.0.0.0', config.DEFAULT_SERVER_PORT), app, handler_class=WebSocketHandler)
-# http_server.serve_forever()
-# socketio.run(app, host='0.0.0.0', port=PORT)
-
 # def create_app(app_name = None):
 #     
 #     if not app_name:

From e6f1bbfabeb57460cb64f635ce15df1a3c288ace Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 15:40:58 +0800
Subject: [PATCH 180/965] Update __init__.py

---
 web/admin/__init__.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index b057e135a..776c95b9d 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -171,17 +171,6 @@ def inject_global_variables():
     }
     return dict(config=g_config, data=data)
 
-# def create_app(app_name = None):
-#     
-#     if not app_name:
-#         app_name = config.APP_NAME
-
-#     # Check if app is created for CLI operations or Web
-#     cli_mode = False
-#     if app_name.endswith('-cli'):
-#         cli_mode = True
-#     return app
-
 
 # Log the startup
 app.logger.info('########################################################')

From 2d32d8dbb29f9e2ffebae73d1ccd311ee0f86e48 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 20:05:34 +0800
Subject: [PATCH 181/965] update

---
 web/admin/firewall/__init__.py |  8 ++++++++
 web/utils/firewall.py          | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/web/admin/firewall/__init__.py b/web/admin/firewall/__init__.py
index d57c998c7..331529267 100644
--- a/web/admin/firewall/__init__.py
+++ b/web/admin/firewall/__init__.py
@@ -53,6 +53,14 @@ def get_ssh_info():
 def set_ping():
     return MwFirewall.instance().setPing()
 
+
+# 修改ssh端口
+@blueprint.route('/set_ssh_port', endpoint='set_ssh_port', methods=['POST'])
+@panel_login_required
+def set_ssh_port():
+    port = request.form.get('port', '1').strip()
+    return MwFirewall.instance().setSshPort(port)
+
 # 添加放行端口
 @blueprint.route('/add_accept_port', endpoint='add_accept_port', methods=['POST'])
 @panel_login_required
diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 7b12014e3..bd67c8efe 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -170,6 +170,25 @@ class Firewall(object):
         mw.execShell('sysctl -p')
         return mw.returnData(True, '设置成功!')
 
+    def setSshPort(self, port):
+        if int(port) < 22 or int(port) > 65535:
+            return mw.returnData(False, '端口范围必需在22-65535之间!')
+
+        ports = ['21', '25', '80', '443', '888']
+        if port in ports:
+            return mw.returnData(False, '(' + port + ')' + '特殊端口不可设置!')
+
+        file = '/etc/ssh/sshd_config'
+        conf = mw.readFile(file)
+
+        rep = r"#*Port\s+([0-9]+)\s*\n"
+        conf = re.sub(rep, "Port " + port + "\n", conf)
+        mw.writeFile(file, conf)
+
+        self.addAcceptPort(port, 'SSH端口修改', 'port')
+        self.reload()
+        return mw.returnData(True, '修改成功!')
+
     def setFw(self, status):
         if self.__isIptables:
             self.setFwIptables(status)

From 31ac0c2542daaeae59e329749ebc19436559071f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 20:21:12 +0800
Subject: [PATCH 182/965] Update firewall.py

---
 web/utils/firewall.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index bd67c8efe..0cdc41b12 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -55,7 +55,8 @@ class Firewall(object):
     def AIF_Firewalld(self):
         # firewall-cmd --list-all | grep '  ports'
         data = mw.execShell("firewall-cmd --list-all | grep '  ports'")
-        print(data)
+        all_port = data[0].strip()
+        print(all_port)
 
     def getList(self, page=1,size=10):
         info = thisdb.getFirewallList(page=page, size=size)

From b10e1ba8cc945cf72d7495d2193b7a4eb8a02a83 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 20:24:48 +0800
Subject: [PATCH 183/965] update

---
 cli.sh     |  60 +++++++++++++++------------
 new_cli.sh | 116 -----------------------------------------------------
 2 files changed, 34 insertions(+), 142 deletions(-)
 delete mode 100755 new_cli.sh

diff --git a/cli.sh b/cli.sh
index a06e18550..97b66ee1d 100755
--- a/cli.sh
+++ b/cli.sh
@@ -3,31 +3,31 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/hom
 DIR=$(cd "$(dirname "$0")"; pwd)
 MDIR=$(dirname "$DIR")
 
+export LC_ALL="en_US.UTF-8"
+
+# echo $DIR
 
 PATH=$PATH:$DIR/bin
-if [ -f bin/activate ];then
-	source bin/activate
+if [ -f ${DIR}/bin/activate ];then
+	source ${DIR}/bin/activate
 
 	if [ "$?" != "0" ];then
 		echo "load local python env fail!"
 	fi
 fi
 
-export LC_ALL="en_US.UTF-8"
-
-
 mw_start_task()
 {
-    isStart=$(ps aux |grep 'task.py'|grep -v grep|awk '{print $2}')
+    isStart=$(ps aux |grep 'panel_task.py'|grep -v grep|awk '{print $2}')
     if [ "$isStart" == '' ];then
         echo -e "starting mw-tasks... \c"
-        cd $DIR && python3 task.py >> ${DIR}/logs/task.log 2>&1 &
+        cd $DIR && python3 panel_task.py >> ${DIR}/logs/panel_task.log 2>&1 &
         sleep 0.3
-        isStart=$(ps aux |grep 'task.py'|grep -v grep|awk '{print $2}')
+        isStart=$(ps aux |grep 'panel_task.py'|grep -v grep|awk '{print $2}')
         if [ "$isStart" == '' ];then
             echo -e "\033[31mfailed\033[0m"
             echo '------------------------------------------------------'
-            tail -n 20 $DIR/logs/task.log
+            tail -n 20 $DIR/logs/panel_task.log
             echo '------------------------------------------------------'
             echo -e "\033[31mError: mw-tasks service startup failed.\033[0m"
             return;
@@ -39,34 +39,42 @@ mw_start_task()
 }
 
 mw_start(){
-	gunicorn -c setting.py app:app
+	cd ${DIR}/web && gunicorn -c setting.py app:app
 	#安全启动
 	mw_start_task
 }
 
 
 mw_start_debug(){
-	if [ ! -f $DIR/logs/task.log ];then
-		echo '' > $DIR/logs/task.log
+	if [ ! -f $DIR/logs/panel_task.log ];then
+		echo '' > $DIR/logs/panel_task.log
 	fi
 
-	python3 task.py >> $DIR/logs/task.log 2>&1 &
-	port=7200    
+	python3 panel_task.py >> $DIR/logs/panel_task.log 2>&1 &
+	port=7200
     if [ -f /www/server/mdserver-web/data/port.pl ];then
         port=$(cat /www/server/mdserver-web/data/port.pl)
     fi
+
+    if [ -f ${DIR}/data/port.pl ];then
+        port=$(cat ${DIR}/data/port.pl)
+    fi
     # gunicorn -b :${port} -k gevent -w 1 app:app
-	gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 app:app
+	cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1 app:app
 }
 
-mw_start_debug2(){
-	python3 task.py >> $DIR/logs/task.log 2>&1 &
-	gunicorn -b :7200 -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
+mw_start_panel(){
+	port=7200
+	if [ -f ${DIR}/data/port.pl ];then
+        port=$(cat ${DIR}/data/port.pl)
+    fi
+	# cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
+	cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1  app:app
 }
 
-mw_start_debug3(){
-	gunicorn -c setting.py app:app
-	python3 task.py
+mw_start_bgtask(){
+	cd ${DIR}/web && gunicorn -c setting.py app:app
+	cd ${DIR} && python3 panel_task.py
 }
 
 
@@ -78,7 +86,7 @@ mw_stop()
 	    kill -9 $i > /dev/null 2>&1
 	done
 
-	pids=`ps -ef|grep task.py | grep -v grep |awk '{print $2}'`
+	pids=`ps -ef|grep panel_task.py | grep -v grep |awk '{print $2}'`
 	arr=($pids)
     for p in ${arr[@]}
     do
@@ -97,12 +105,12 @@ case "$1" in
 		mw_stop 
 		mw_start_debug
 		;;
-	'debug2') 
+	'panel') 
 		mw_stop 
-		mw_start_debug2
+		mw_start_panel
 		;;
-	'debug3') 
+	'task') 
 		mw_stop 
-		mw_start_debug3
+		mw_start_bgtask
 		;;
 esac
\ No newline at end of file
diff --git a/new_cli.sh b/new_cli.sh
deleted file mode 100755
index 97b66ee1d..000000000
--- a/new_cli.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/bash
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
-DIR=$(cd "$(dirname "$0")"; pwd)
-MDIR=$(dirname "$DIR")
-
-export LC_ALL="en_US.UTF-8"
-
-# echo $DIR
-
-PATH=$PATH:$DIR/bin
-if [ -f ${DIR}/bin/activate ];then
-	source ${DIR}/bin/activate
-
-	if [ "$?" != "0" ];then
-		echo "load local python env fail!"
-	fi
-fi
-
-mw_start_task()
-{
-    isStart=$(ps aux |grep 'panel_task.py'|grep -v grep|awk '{print $2}')
-    if [ "$isStart" == '' ];then
-        echo -e "starting mw-tasks... \c"
-        cd $DIR && python3 panel_task.py >> ${DIR}/logs/panel_task.log 2>&1 &
-        sleep 0.3
-        isStart=$(ps aux |grep 'panel_task.py'|grep -v grep|awk '{print $2}')
-        if [ "$isStart" == '' ];then
-            echo -e "\033[31mfailed\033[0m"
-            echo '------------------------------------------------------'
-            tail -n 20 $DIR/logs/panel_task.log
-            echo '------------------------------------------------------'
-            echo -e "\033[31mError: mw-tasks service startup failed.\033[0m"
-            return;
-        fi
-        echo -e "\033[32mdone\033[0m"
-    else
-        echo "starting mw-tasks... mw-tasks (pid $(echo $isStart)) already running"
-    fi
-}
-
-mw_start(){
-	cd ${DIR}/web && gunicorn -c setting.py app:app
-	#安全启动
-	mw_start_task
-}
-
-
-mw_start_debug(){
-	if [ ! -f $DIR/logs/panel_task.log ];then
-		echo '' > $DIR/logs/panel_task.log
-	fi
-
-	python3 panel_task.py >> $DIR/logs/panel_task.log 2>&1 &
-	port=7200
-    if [ -f /www/server/mdserver-web/data/port.pl ];then
-        port=$(cat /www/server/mdserver-web/data/port.pl)
-    fi
-
-    if [ -f ${DIR}/data/port.pl ];then
-        port=$(cat ${DIR}/data/port.pl)
-    fi
-    # gunicorn -b :${port} -k gevent -w 1 app:app
-	cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1 app:app
-}
-
-mw_start_panel(){
-	port=7200
-	if [ -f ${DIR}/data/port.pl ];then
-        port=$(cat ${DIR}/data/port.pl)
-    fi
-	# cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
-	cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1  app:app
-}
-
-mw_start_bgtask(){
-	cd ${DIR}/web && gunicorn -c setting.py app:app
-	cd ${DIR} && python3 panel_task.py
-}
-
-
-mw_stop()
-{
-	PLIST=`ps -ef|grep app:app |grep -v grep|awk '{print $2}'`
-	for i in $PLIST
-	do
-	    kill -9 $i > /dev/null 2>&1
-	done
-
-	pids=`ps -ef|grep panel_task.py | grep -v grep |awk '{print $2}'`
-	arr=($pids)
-    for p in ${arr[@]}
-    do
-    	kill -9 $p > /dev/null 2>&1
-    done
-}
-
-case "$1" in
-    'start') mw_start;;
-    'stop') mw_stop;;
-    'restart') 
-		mw_stop 
-		mw_start
-		;;
-	'debug') 
-		mw_stop 
-		mw_start_debug
-		;;
-	'panel') 
-		mw_stop 
-		mw_start_panel
-		;;
-	'task') 
-		mw_stop 
-		mw_start_bgtask
-		;;
-esac
\ No newline at end of file

From 29c65c0e7c99d3c0e4b60be63f4fce7b24100cee Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 20:24:57 +0800
Subject: [PATCH 184/965] update

---
 task.py  | 633 -------------------------------------------------------
 tools.py | 303 --------------------------
 2 files changed, 936 deletions(-)
 delete mode 100755 task.py
 delete mode 100755 tools.py

diff --git a/task.py b/task.py
deleted file mode 100755
index 71691f088..000000000
--- a/task.py
+++ /dev/null
@@ -1,633 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 计划任务
-# ---------------------------------------------------------------------------------
-
-import sys
-import os
-import json
-import time
-import threading
-import psutil
-
-if sys.version_info[0] == 2:
-    reload(sys)
-    sys.setdefaultencoding('utf-8')
-
-
-sys.path.append(os.getcwd() + "/class/core")
-import mw
-import db
-
-# print sys.path
-
-# cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-# info = mw.execShell(cmd)
-# p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-# sys.path.append(p)
-
-
-global pre, timeoutCount, logPath, isTask, oldEdate, isCheck
-pre = 0
-timeoutCount = 0
-isCheck = 0
-oldEdate = None
-
-logPath = os.getcwd() + '/tmp/panelExec.log'
-isTask = os.getcwd() + '/tmp/panelTask.pl'
-
-if not os.path.exists(os.getcwd() + "/tmp"):
-    os.system('mkdir -p ' + os.getcwd() + "/tmp")
-
-if not os.path.exists(logPath):
-    os.system("touch " + logPath)
-
-
-def service_cmd(method):
-    cmd = '/etc/init.d/mw'
-    if os.path.exists(cmd):
-        execShell(cmd + ' ' + method)
-        return
-
-    cmd = mw.getRunDir() + '/scripts/init.d/mw'
-    if os.path.exists(cmd):
-        execShell(cmd + ' ' + method)
-        return
-
-
-def openresty_cmd(method = 'reload'):
-    # 检查是否安装
-    odir = mw.getServerDir() + '/openresty'
-    if not os.path.exists(odir):
-        return False
-
-    # systemd
-    systemd = mw.systemdCfgDir()+'/openresty.service'
-    if os.path.exists(systemd):
-        execShell('systemctl ' + method + ' openresty')
-        return True
-
-    sys_initd = '/etc/init.d/openresty'
-    if os.path.exists(sys_initd):
-        os.system(sys_initd + ' ' + method)
-        return True
-
-    install_initd = mw.getServerDir()+'/openresty/init.d/openresty'
-    if os.path.exists(install_initd):
-        os.system(install_initd + ' ' + method)
-        return True
-    return False
-
-def mw_async(f):
-    def wrapper(*args, **kwargs):
-        thr = threading.Thread(target=f, args=args, kwargs=kwargs)
-        thr.start()
-    return wrapper
-
-
-@mw_async
-def restartMw():
-    time.sleep(1)
-    cmd = mw.getRunDir() + '/scripts/init.d/mw reload &'
-    mw.execShell(cmd)
-
-
-def execShell(cmdstring, cwd=None, timeout=None, shell=True):
-    try:
-        global logPath
-        import shlex
-        import datetime
-        import subprocess
-
-        if timeout:
-            end_time = datetime.datetime.now() + datetime.timedelta(seconds=timeout)
-
-        cmd = cmdstring + ' > ' + logPath + ' 2>&1'
-        sub = subprocess.Popen(
-            cmd, cwd=cwd, stdin=subprocess.PIPE, shell=shell, bufsize=4096)
-        while sub.poll() is None:
-            time.sleep(0.1)
-
-        data = sub.communicate()
-        # python3 fix 返回byte数据
-        if isinstance(data[0], bytes):
-            t1 = str(data[0], encoding='utf-8')
-
-        if isinstance(data[1], bytes):
-            t2 = str(data[1], encoding='utf-8')
-        return (t1, t2)
-    except Exception as e:
-        return (None, None)
-
-
-def downloadFile(url, filename):
-    # 下载文件
-    try:
-        import urllib
-        import socket
-        socket.setdefaulttimeout(300)
-
-        headers = (
-            'User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36')
-        opener = urllib.request.build_opener()
-        opener.addheaders = [headers]
-        urllib.request.install_opener(opener)
-
-        urllib.request.urlretrieve(
-            url, filename=filename, reporthook=downloadHook)
-
-        if not mw.isAppleSystem():
-            os.system('chown www.www ' + filename)
-
-        writeLogs('done')
-    except Exception as e:
-        writeLogs(str(e))
-
-
-def downloadHook(count, blockSize, totalSize):
-    # 下载文件进度回调
-    global pre
-    used = count * blockSize
-    pre1 = int((100.0 * used / totalSize))
-    if pre == (100 - pre1):
-        return
-    speed = {'total': totalSize, 'used': used, 'pre': pre1}
-    writeLogs(json.dumps(speed))
-
-
-def writeLogs(logMsg):
-    # 写输出日志
-    try:
-        global logPath
-        fp = open(logPath, 'w+')
-        fp.write(logMsg)
-        fp.close()
-    except:
-        pass
-
-
-def runTask():
-    global isTask
-    try:
-        if os.path.exists(isTask):
-            sql = db.Sql()
-            sql.table('tasks').where(
-                "status=?", ('-1',)).setField('status', '0')
-            taskArr = sql.table('tasks').where("status=?", ('0',)).field(
-                'id,type,execstr').order("id asc").select()
-            for value in taskArr:
-                start = int(time.time())
-                if not sql.table('tasks').where("id=?", (value['id'],)).count():
-                    continue
-                sql.table('tasks').where("id=?", (value['id'],)).save(
-                    'status,start', ('-1', start))
-                if value['type'] == 'download':
-                    argv = value['execstr'].split('|mw|')
-                    downloadFile(argv[0], argv[1])
-                elif value['type'] == 'execshell':
-                    execShell(value['execstr'])
-                end = int(time.time())
-                sql.table('tasks').where("id=?", (value['id'],)).save(
-                    'status,end', ('1', end))
-
-                if(sql.table('tasks').where("status=?", ('0')).count() < 1):
-                    os.system('rm -f ' + isTask)
-
-            sql.close()
-    except Exception as e:
-        print(str(e))
-
-    # 站点过期检查
-    siteEdate()
-
-
-def startTask():
-    # 任务队列
-    try:
-        while True:
-            runTask()
-            time.sleep(2)
-    except Exception as e:
-        time.sleep(60)
-        startTask()
-
-
-def siteEdate():
-    # 网站到期处理
-    global oldEdate
-    try:
-        if not oldEdate:
-            oldEdate = mw.readFile('data/edate.pl')
-        if not oldEdate:
-            oldEdate = '0000-00-00'
-        mEdate = time.strftime('%Y-%m-%d', time.localtime())
-        if oldEdate == mEdate:
-            return False
-        edateSites = mw.M('sites').where('edate>? AND edate<? AND (status=? OR status=?)',
-                                         ('0000-00-00', mEdate, 1, '正在运行')).field('id,name').select()
-        import site_api
-        for site in edateSites:
-            site_api.site_api().stop(site['id'], site['name'])
-        oldEdate = mEdate
-        mw.writeFile('data/edate.pl', mEdate)
-    except Exception as e:
-        print(str(e))
-
-
-def systemTask():
-    # 系统监控任务
-    try:
-        import system_api
-        import psutil
-        sm = system_api.system_api()
-        filename = 'data/control.conf'
-
-        sql = db.Sql().dbfile('system')
-        csql = mw.readFile('data/sql/system.sql')
-        csql_list = csql.split(';')
-        for index in range(len(csql_list)):
-            sql.execute(csql_list[index], ())
-
-        cpuIo = cpu = {}
-        cpuCount = psutil.cpu_count()
-        used = count = 0
-        reloadNum = 0
-        network_up = network_down = diskio_1 = diskio_2 = networkInfo = cpuInfo = diskInfo = None
-        while True:
-            if not os.path.exists(filename):
-                time.sleep(10)
-                continue
-
-            day = 30
-            try:
-                day = int(mw.readFile(filename))
-                if day < 1:
-                    time.sleep(10)
-                    continue
-            except:
-                day = 30
-
-            tmp = {}
-            # 取当前CPU Io
-            tmp['used'] = psutil.cpu_percent(interval=1)
-            if tmp['used'] > 80:
-                panel_title = mw.getConfig('title')
-                ip = mw.getHostAddr()
-                now_time = mw.getDateFromNow()
-                msg = now_time + '|节点[' + panel_title + ':' + ip + \
-                    ']处于高负载[' + str(tmp['used']) + '],请排查原因!'
-                mw.notifyMessage(msg, '面板监控', 600)
-
-            if not cpuInfo:
-                tmp['mem'] = sm.getMemUsed()
-                cpuInfo = tmp
-
-            if cpuInfo['used'] < tmp['used']:
-                tmp['mem'] = sm.getMemUsed()
-                cpuInfo = tmp
-
-            # 取当前网络Io
-            networkIo = sm.psutilNetIoCounters()
-            if not network_up:
-                network_up = networkIo[0]
-                network_down = networkIo[1]
-            tmp = {}
-            tmp['upTotal'] = networkIo[0]
-            tmp['downTotal'] = networkIo[1]
-            tmp['up'] = round(float((networkIo[0] - network_up) / 1024), 2)
-            tmp['down'] = round(float((networkIo[1] - network_down) / 1024), 2)
-            tmp['downPackets'] = networkIo[3]
-            tmp['upPackets'] = networkIo[2]
-
-            network_up = networkIo[0]
-            network_down = networkIo[1]
-
-            if not networkInfo:
-                networkInfo = tmp
-            if (tmp['up'] + tmp['down']) > (networkInfo['up'] + networkInfo['down']):
-                networkInfo = tmp
-            # 取磁盘Io
-            # if os.path.exists('/proc/diskstats'):
-            diskio_2 = psutil.disk_io_counters()
-            if not diskio_1:
-                diskio_1 = diskio_2
-            tmp = {}
-            tmp['read_count'] = diskio_2.read_count - diskio_1.read_count
-            tmp['write_count'] = diskio_2.write_count - diskio_1.write_count
-            tmp['read_bytes'] = diskio_2.read_bytes - diskio_1.read_bytes
-            tmp['write_bytes'] = diskio_2.write_bytes - diskio_1.write_bytes
-            tmp['read_time'] = diskio_2.read_time - diskio_1.read_time
-            tmp['write_time'] = diskio_2.write_time - diskio_1.write_time
-
-            if not diskInfo:
-                diskInfo = tmp
-            else:
-                diskInfo['read_count'] += tmp['read_count']
-                diskInfo['write_count'] += tmp['write_count']
-                diskInfo['read_bytes'] += tmp['read_bytes']
-                diskInfo['write_bytes'] += tmp['write_bytes']
-                diskInfo['read_time'] += tmp['read_time']
-                diskInfo['write_time'] += tmp['write_time']
-            diskio_1 = diskio_2
-
-            # print diskInfo
-            if count >= 12:
-                try:
-                    addtime = int(time.time())
-                    deltime = addtime - (day * 86400)
-
-                    data = (cpuInfo['used'], cpuInfo['mem'], addtime)
-                    sql.table('cpuio').add('pro,mem,addtime', data)
-                    sql.table('cpuio').where("addtime<?", (deltime,)).delete()
-
-                    data = (networkInfo['up'] / 5, networkInfo['down'] / 5, networkInfo['upTotal'], networkInfo[
-                        'downTotal'], networkInfo['downPackets'], networkInfo['upPackets'], addtime)
-                    sql.table('network').add(
-                        'up,down,total_up,total_down,down_packets,up_packets,addtime', data)
-                    sql.table('network').where(
-                        "addtime<?", (deltime,)).delete()
-                    # if os.path.exists('/proc/diskstats'):
-                    data = (diskInfo['read_count'], diskInfo['write_count'], diskInfo['read_bytes'], diskInfo[
-                        'write_bytes'], diskInfo['read_time'], diskInfo['write_time'], addtime)
-                    sql.table('diskio').add(
-                        'read_count,write_count,read_bytes,write_bytes,read_time,write_time,addtime', data)
-                    sql.table('diskio').where(
-                        "addtime<?", (deltime,)).delete()
-
-                    # LoadAverage
-                    load_average = sm.getLoadAverage()
-                    lpro = round(
-                        (load_average['one'] / load_average['max']) * 100, 2)
-                    if lpro > 100:
-                        lpro = 100
-                    sql.table('load_average').add('pro,one,five,fifteen,addtime', (lpro, load_average[
-                        'one'], load_average['five'], load_average['fifteen'], addtime))
-
-                    lpro = None
-                    load_average = None
-                    cpuInfo = None
-                    networkInfo = None
-                    diskInfo = None
-                    count = 0
-                    reloadNum += 1
-                    if reloadNum > 1440:
-                        reloadNum = 0
-                        mw.writeFile('logs/sys_interrupt.pl',
-                                     "reload num:" + str(reloadNum))
-                        restartMw()
-                except Exception as ex:
-                    print(str(ex))
-                    mw.writeFile('logs/sys_interrupt.pl', str(ex))
-
-            del(tmp)
-            time.sleep(5)
-            count += 1
-    except Exception as ex:
-        print(str(ex))
-        mw.writeFile('logs/sys_interrupt.pl', str(ex))
-
-        restartMw()
-
-        time.sleep(30)
-        systemTask()
-
-
-# -------------------------------------- PHP监控 start --------------------------------------------- #
-# 502错误检查线程
-def check502Task():
-    try:
-        while True:
-            if os.path.exists(mw.getRunDir() + '/data/502Task.pl'):
-                check502()
-            time.sleep(30)
-    except:
-        time.sleep(30)
-        check502Task()
-
-
-def check502():
-    try:
-        verlist = [
-            '52', '53', '54', '55', '56', '70',
-            '71', '72', '73', '74', '80', '81', 
-            '82', '83'
-        ]
-        for ver in verlist:
-            sdir = mw.getServerDir()
-            php_path = sdir + '/php/' + ver + '/sbin/php-fpm'
-            if not os.path.exists(php_path):
-                continue
-            if checkPHPVersion(ver):
-                continue
-            if startPHPVersion(ver):
-                print('检测到PHP-' + ver + '处理异常,已自动修复!')
-                mw.writeLog('PHP守护程序', '检测到PHP-' + ver + '处理异常,已自动修复!')
-    except Exception as e:
-        print(str(e))
-
-
-# 处理指定PHP版本
-def startPHPVersion(version):
-    sdir = mw.getServerDir()
-    try:
-        # system
-        phpService = mw.systemdCfgDir() + '/php' + version + '.service'
-        if os.path.exists(phpService):
-            mw.execShell("systemctl restart php" + version)
-            if checkPHPVersion(version):
-                return True
-
-        # initd
-        fpm = sdir + '/php/init.d/php' + version
-        php_path = sdir + '/php/' + version + '/sbin/php-fpm'
-        if not os.path.exists(php_path):
-            if os.path.exists(fpm):
-                os.remove(fpm)
-            return False
-
-        if not os.path.exists(fpm):
-            return False
-
-        # 尝试重载服务
-        os.system(fpm + ' reload')
-        if checkPHPVersion(version):
-            return True
-
-        # 尝试重启服务
-        cgi = '/tmp/php-cgi-' + version + '.sock'
-        pid = sdir + '/php/' + version + '/var/run/php-fpm.pid'
-        data = mw.execShell("ps -ef | grep php/" + version +" | grep -v grep|grep -v python |awk '{print $2}'")
-        if data[0] != '':
-            os.system("ps -ef | grep php/" + version + " | grep -v grep|grep -v python |awk '{print $2}' | xargs kill ")
-        time.sleep(0.5)
-        if not os.path.exists(cgi):
-            os.system('rm -f ' + cgi)
-        if not os.path.exists(pid):
-            os.system('rm -f ' + pid)
-        os.system(fpm + ' start')
-        if checkPHPVersion(version):
-            return True
-
-        # 检查是否正确启动
-        if os.path.exists(cgi):
-            return True
-    except Exception as e:
-        print(str(e))
-        return True
-
-
-def getFpmConfFile(version):
-    return mw.getServerDir() + '/php/' + version + '/etc/php-fpm.d/www.conf'
-
-
-def getFpmAddress(version):
-    fpm_address = '/tmp/php-cgi-{}.sock'.format(version)
-    php_fpm_file = getFpmConfFile(version)
-    try:
-        content = readFile(php_fpm_file)
-        tmp = re.findall(r"listen\s*=\s*(.+)", content)
-        if not tmp:
-            return fpm_address
-        if tmp[0].find('sock') != -1:
-            return fpm_address
-        if tmp[0].find(':') != -1:
-            listen_tmp = tmp[0].split(':')
-            if bind:
-                fpm_address = (listen_tmp[0], int(listen_tmp[1]))
-            else:
-                fpm_address = ('127.0.0.1', int(listen_tmp[1]))
-        else:
-            fpm_address = ('127.0.0.1', int(tmp[0]))
-        return fpm_address
-    except:
-        return fpm_address
-
-
-def checkPHPVersion(version):
-    # 检查指定PHP版本
-    try:
-        sock = getFpmAddress(version)
-        data = mw.requestFcgiPHP(sock, '/phpfpm_status_' + version + '?json')
-        result = str(data, encoding='utf-8')
-    except Exception as e:
-        result = 'Bad Gateway'
-
-    # print(version,result)
-    # 检查openresty
-    if result.find('Bad Gateway') != -1:
-        return False
-    if result.find('HTTP Error 404: Not Found') != -1:
-        return False
-
-    # 检查Web服务是否启动
-    if result.find('Connection refused') != -1:
-        return False
-    #     global isTask
-    #     if os.path.exists(isTask):
-    #         isStatus = mw.readFile(isTask)
-    #         if isStatus == 'True':
-    #             return True
-
-    #     # systemd
-    #     systemd = mw.systemdCfgDir() + '/openresty.service'
-    #     if os.path.exists(systemd):
-    #         execShell('systemctl reload openresty')
-    #         return True
-    #     # initd
-    #     initd = '/etc/init.d/openresty'
-    #     if os.path.exists(initd):
-    #         os.system(initd + ' reload')
-    return True
-
-# --------------------------------------PHP监控 end--------------------------------------------- #
-
-
-# --------------------------------------OpenResty Auto Restart Start --------------------------------------------- #
-# 解决acme.sh续签后,未起效。
-def openrestyAutoRestart():
-    try:
-        while True:
-            # 检查是否安装
-            odir = mw.getServerDir() + '/openresty'
-            if not os.path.exists(odir):
-                time.sleep(86400)
-                continue
-
-            openresty_cmd('reload')
-            time.sleep(86400)
-    except Exception as e:
-        print(str(e))
-        time.sleep(86400)
-
-# --------------------------------------OpenResty Auto Restart End   --------------------------------------------- #
-
-# ------------------------------------  OpenResty Restart At Once Start ------------------------------------------ #
-
-
-def openrestyRestartAtOnce():
-    restart_nginx_tip = 'data/restart_nginx.pl'
-    while True:
-        if os.path.exists(restart_nginx_tip):
-            os.remove(restart_nginx_tip)
-            openresty_cmd('reload')
-        time.sleep(1)
-# -----------------------------------   OpenResty Restart At Once End   ------------------------------------------ #
-
-
-# --------------------------------------Panel Restart Start   --------------------------------------------- #
-def restartPanelService():
-    restartTip = 'data/restart.pl'
-    while True:
-        if os.path.exists(restartTip):
-            os.remove(restartTip)
-            service_cmd('restart_panel')
-        time.sleep(1)
-# --------------------------------------Panel Restart End   --------------------------------------------- #
-
-
-def setDaemon(t):
-    if sys.version_info.major == 3 and sys.version_info.minor >= 10:
-        t.daemon = True
-    else:
-        t.setDaemon(True)
-    return t
-
-if __name__ == "__main__":
-
-    # 系统监控
-    sysTask = threading.Thread(target=systemTask)
-    sysTask = setDaemon(sysTask)
-    sysTask.start()
-
-    # PHP 502错误检查线程
-    php502 = threading.Thread(target=check502Task)
-    php502 = setDaemon(php502)
-    php502.start()
-
-    # OpenResty Restart At Once Start
-    oraos = threading.Thread(target=openrestyRestartAtOnce)
-    oraos = setDaemon(oraos)
-    oraos.start()
-
-
-    # OpenResty Auto Restart Start
-    oar = threading.Thread(target=openrestyAutoRestart)
-    oar = setDaemon(oar)
-    oar.start()
-
-
-    # Panel Restart Start
-    rps = threading.Thread(target=restartPanelService)
-    rps = setDaemon(rps)
-    rps.start()
-
-    startTask()
diff --git a/tools.py b/tools.py
deleted file mode 100755
index 6a050f9d9..000000000
--- a/tools.py
+++ /dev/null
@@ -1,303 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 工具箱
-# ---------------------------------------------------------------------------------
-
-
-import sys
-import os
-import json
-import time
-import re
-
-sys.path.append(os.getcwd() + "/class/core")
-import mw
-import db
-
-# cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-# info = mw.execShell(cmd)
-# p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-# sys.path.append(p)
-
-INIT_DIR = "/etc/rc.d/init.d"
-if mw.isAppleSystem():
-    INIT_DIR = mw.getRunDir() + "/scripts/init.d"
-
-INIT_CMD = INIT_DIR + "/mw"
-
-
-def mw_input_cmd(msg):
-    if sys.version_info[0] == 2:
-        in_val = raw_input(msg)
-    else:
-        in_val = input(msg)
-    return in_val
-
-
-def mwcli(mw_input=0):
-    raw_tip = "======================================================"
-    if not mw_input:
-        print("===============mdserver-web cli tools=================")
-        print("(1)      重启面板服务")
-        print("(2)      停止面板服务")
-        print("(3)      启动面板服务")
-        print("(4)      重载面板服务")
-        print("(5)      修改面板端口")
-        print("(10)     查看面板默认信息")
-        print("(11)     修改面板密码")
-        print("(12)     修改面板用户名")
-        print("(13)     显示面板错误日志")
-        print("(20)     关闭BasicAuth认证")
-        print("(21)     解除域名绑定")
-        print("(22)     解除面板SSL绑定")
-        print("(23)     开启IPV6支持")
-        print("(24)     关闭IPV6支持")
-        print("(25)     开启防火墙SSH端口")
-        print("(26)     关闭二次验证")
-        print("(27)     查看防火墙信息")
-        print("(100)    开启PHP52显示")
-        print("(101)    关闭PHP52显示")
-        print("(200)    切换Linux系统软件源")
-        print("(201)    简单速度测试")
-        print("(0)      取消")
-        print(raw_tip)
-        try:
-            mw_input = input("请输入命令编号：")
-            if sys.version_info[0] == 3:
-                mw_input = int(mw_input)
-        except:
-            mw_input = 0
-
-    nums = [
-        1, 2, 3, 4, 5, 10, 11, 12, 13,
-        20, 21, 22, 23, 24, 25, 26, 27,
-        100, 101, 
-        200, 201
-    ]
-    if not mw_input in nums:
-        print(raw_tip)
-        print("已取消!")
-        exit()
-
-    if mw_input == 1:
-        os.system(INIT_CMD + " restart")
-    elif mw_input == 2:
-        os.system(INIT_CMD + " stop")
-    elif mw_input == 3:
-        os.system(INIT_CMD + " start")
-    elif mw_input == 4:
-        os.system(INIT_CMD + " reload")
-    elif mw_input == 5:
-        in_port = mw_input_cmd("请输入新的面板端口：")
-        in_port_int = int(in_port.strip())
-        if in_port_int < 65536 and in_port_int > 0:
-            import firewall_api
-            firewall_api.firewall_api().addAcceptPortArgs(
-                in_port, 'WEB面板[TOOLS修改]', 'port')
-            mw.writeFile('data/port.pl', in_port)
-            os.system(INIT_CMD + " restart_panel")
-            os.system(INIT_CMD + " default")
-        else:
-            print("|-端口范围在0-65536之间")
-        return
-    elif mw_input == 10:
-        os.system(INIT_CMD + " default")
-    elif mw_input == 11:
-        input_pwd = mw_input_cmd("请输入新的面板密码：")
-        if len(input_pwd.strip()) < 5:
-            print("|-错误，密码长度不能小于5位")
-            return
-        set_panel_pwd(input_pwd.strip(), True)
-    elif mw_input == 12:
-        input_user = mw_input_cmd("请输入新的面板用户名(>=5位)：")
-        set_panel_username(input_user.strip())
-    elif mw_input == 13:
-        os.system('tail -100 ' + mw.getRunDir() + '/logs/error.log')
-    elif mw_input == 20:
-        basic_auth = 'data/basic_auth.json'
-        if os.path.exists(basic_auth):
-            os.remove(basic_auth)
-            os.system(INIT_CMD + " restart")
-            print("|-关闭basic_auth成功")
-    elif mw_input == 21:
-        bind_domain = 'data/bind_domain.pl'
-        if os.path.exists(bind_domain):
-            os.remove(bind_domain)
-            os.system(INIT_CMD + " unbind_domain")
-            print("|-解除域名绑定成功")
-    elif mw_input == 22:
-        ssl_choose = 'ssl/choose.pl'
-        if os.path.exists(ssl_choose):
-            os.remove(ssl_choose)
-            os.system(INIT_CMD + " unbind_ssl")
-            print("|-解除面板SSL绑定成功")
-    elif mw_input == 23:
-        listen_ipv6 = 'data/ipv6.pl'
-        if not os.path.exists(listen_ipv6):
-            mw.writeFile(listen_ipv6,'True')
-            os.system(INIT_CMD + " restart")
-            print("|-开启IPv6支持了")
-        else:
-            print("|-已开启IPv6支持!")
-    elif mw_input == 24:
-        listen_ipv6 = 'data/ipv6.pl'
-        if not os.path.exists(listen_ipv6):
-            print("|-已关闭IPv6支持!")
-        else:
-            os.remove(listen_ipv6)
-            os.system(INIT_CMD + " restart")
-            print("|-关闭IPv6支持了")
-    elif mw_input == 25:
-        open_ssh_port()
-        print("|-已开启!")
-    elif mw_input == 26:
-        auth_secret = 'data/auth_secret.pl'
-        if os.path.exists(auth_secret):
-            os.remove(auth_secret)
-            print("|-关闭二次验证成功!")
-        else:
-            print("|-二次验证已关闭!")
-    elif mw_input == 27:
-        cmd = 'which ufw'
-        run_cmd = False
-        find_cmd =  mw.execShell(cmd)
-        if find_cmd[0].strip() != '':
-            run_cmd = True
-            os.system('ufw status')
-
-        cmd = 'which firewall-cmd'
-        find_cmd =  mw.execShell(cmd)
-        if find_cmd[0].strip() != '':
-            run_cmd = True
-            os.system('firewall-cmd --list-all')
-        if not run_cmd:
-            mw.echoInfo("未检测到防火墙!")
-    elif mw_input == 100:
-        php_conf = 'plugins/php/info.json'
-        if os.path.exists(php_conf):
-            cont = mw.readFile(php_conf)
-            cont = re.sub("\"53\"", "\"52\",\"53\"", cont)
-            cont = re.sub("\"5.3.29\"", "\"5.2.17\",\"5.3.29\"", cont)
-            mw.writeFile(php_conf, cont)
-            print("|-执行PHP52显示成功!")
-    elif mw_input == 101:
-        php_conf = 'plugins/php/info.json'
-        if os.path.exists(php_conf):
-            cont = mw.readFile(php_conf)
-            cont = re.sub("\"52\",", "", cont)
-            cont = re.sub("\"5.2.17\",", cont)
-            mw.writeFile(php_conf, cont)
-            print("|-执行PHP52隐藏成功!")
-    elif mw_input == 200:
-        os.system(INIT_CMD + " mirror")
-    elif mw_input == 201:
-        os.system('curl -Lso- bench.sh | bash')
-
-
-def open_ssh_port():
-    import firewall_api
-    find_ssh_port_cmd = "cat /etc/ssh/sshd_config | grep '^Port \\d*' | tail -1"
-    cmd_data = mw.execShell(find_ssh_port_cmd)
-    ssh_port = cmd_data[0].replace("Port ", '').strip()
-    if ssh_port == '':
-        ssh_port = '22'
-
-    print("|-SSH端口: "+ str(ssh_port))
-    firewall_api.firewall_api().addAcceptPortArgs(ssh_port, 'SSH远程管理服务', 'port')
-    return True
-
-
-def set_panel_pwd(password, ncli=False):
-    # 设置面板密码
-    import db
-    sql = db.Sql()
-    result = sql.table('users').where('id=?', (1,)).setField(
-        'password', mw.md5(password))
-    username = sql.table('users').where('id=?', (1,)).getField('username')
-    if ncli:
-        print("|-用户名: " + username)
-        print("|-新密码: " + password)
-    else:
-        print(username)
-
-
-def show_panel_pwd():
-    # 设置面板密码
-    import db
-    sql = db.Sql()
-    password = sql.table('users').where('id=?', (1,)).getField('password')
-
-    file_pwd = ''
-    if os.path.exists('data/default.pl'):
-        file_pwd = mw.readFile('data/default.pl').strip()
-
-    if mw.md5(file_pwd) == password:
-        print('password: ' + file_pwd)
-        return
-    print("password has been changed!")
-
-
-def set_panel_username(username=None):
-    # 随机面板用户名
-    import db
-    sql = db.Sql()
-    if username:
-        if len(username) < 5:
-            print("|-错误，用户名长度不能少于5位")
-            return
-        if username in ['admin', 'root']:
-            print("|-错误，不能使用过于简单的用户名")
-            return
-
-        sql.table('users').where('id=?', (1,)).setField('username', username)
-        print("|-新用户名: %s" % username)
-        return
-
-    username = sql.table('users').where('id=?', (1,)).getField('username')
-    if username == 'admin':
-        username = mw.getRandomString(8).lower()
-        sql.table('users').where('id=?', (1,)).setField('username', username)
-    print('username: ' + username)
-
-
-def getServerIp():
-    version = sys.argv[2]
-    # ip = mw.execShell(
-    #     "curl --insecure -{} -sS --connect-timeout 5 -m 60 https://v6r.ipip.net/?format=text".format(version))
-    ip = mw.execShell(
-        "curl --insecure -{} -sS --connect-timeout 5 -m 60 https://ip.cachecha.com/?format=text".format(version))
-    print(ip[0])
-
-
-if __name__ == "__main__":
-    method = sys.argv[1]
-    if method == 'panel':
-        set_panel_pwd(sys.argv[2])
-    elif method == 'username':
-        if len(sys.argv) > 2:
-            set_panel_username(sys.argv[2])
-        else:
-            set_panel_username()
-    elif method == 'password':
-        show_panel_pwd()
-    elif method == 'getServerIp':
-        getServerIp()
-    elif method == "cli":
-        clinum = 0
-        try:
-            if len(sys.argv) > 2:
-                clinum = int(sys.argv[2]) if sys.argv[2][:6] else sys.argv[2]
-        except:
-            clinum = sys.argv[2]
-        mwcli(clinum)
-    else:
-        print('ERROR: Parameter error')

From b9371e9b947fa040a4af63cde7918c559e4dc8e9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 22:40:15 +0800
Subject: [PATCH 185/965] Update firewall.py

---
 web/utils/firewall.py | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 0cdc41b12..38b61d83f 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -54,9 +54,31 @@ class Firewall(object):
 
     def AIF_Firewalld(self):
         # firewall-cmd --list-all | grep '  ports'
-        data = mw.execShell("firewall-cmd --list-all | grep '  ports'")
-        all_port = data[0].strip()
-        print(all_port)
+        t = mw.execShell("firewall-cmd --list-all | grep '  ports'")
+        all_port = t[0].strip()
+        data = all_port.split(":")
+        ports_str = data[1]
+        ports_list = ports_str.strip().split(' ')
+
+        ports_all = []
+        for pinfo in ports_list:
+            info = pinfo.split('/')
+
+            is_same = False
+            for i in range(len(ports_all)):
+                if ports_all[i]['port'] == info[0] and ports_all[i]['protocol'] != info[1]:
+                    ports_all[i]['protocol'] = ports_all[i]['protocol']+'/'+info[1]
+                    is_same = True
+
+            if not is_same:
+                t = {}
+                t['port'] = info[0]
+                t['protocol'] = info[1]
+                ports_all.append(t)
+
+        for add_info in ports_all:
+            if thisdb.getFirewallCountByPort(add_info['port']) == 0:
+                thisdb.addFirewall(add_info['port'], ps='自动识别',protocol=add_info['protocol'])
 
     def getList(self, page=1,size=10):
         info = thisdb.getFirewallList(page=page, size=size)

From 28def91c7d04016c5fc5b21da51a5fc2aad01b1f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 12 Nov 2024 22:56:40 +0800
Subject: [PATCH 186/965] Update __init__.py

---
 web/admin/__init__.py | 51 +++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 776c95b9d..a33c569ff 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -66,32 +66,6 @@ app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = True
 # 初始化db
 setup.init()
 
-# webssh
-socketio = SocketIO()
-socketio.init_app(app)
-
-@socketio.on('webssh_websocketio')
-def webssh_websocketio(data):
-    if not isLogined():
-        emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'})
-        return
-    import utils.ssh.ssh_terminal as ssh_terminal
-    shell_client = ssh_terminal.ssh_terminal.instance()
-    shell_client.run(request.sid, data)
-    return
-
-
-@socketio.on('webssh')
-def webssh(data):
-    if not isLogined():
-        emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'})
-        return None
-
-    import utils.ssh.ssh_local as ssh_local
-    shell = ssh_local.ssh_local.instance()
-    shell.run(data)
-    return
-
 # BASIC AUTH
 app.config['BASIC_AUTH_OPEN'] = False
 try:
@@ -171,6 +145,31 @@ def inject_global_variables():
     }
     return dict(config=g_config, data=data)
 
+# webssh
+socketio = SocketIO()
+socketio.init_app(app)
+
+@socketio.on('webssh_websocketio')
+def webssh_websocketio(data):
+    if not isLogined():
+        emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'})
+        return
+    import utils.ssh.ssh_terminal as ssh_terminal
+    shell_client = ssh_terminal.ssh_terminal.instance()
+    shell_client.run(request.sid, data)
+    return
+
+
+@socketio.on('webssh')
+def webssh(data):
+    if not isLogined():
+        emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'})
+        return None
+
+    import utils.ssh.ssh_local as ssh_local
+    shell = ssh_local.ssh_local.instance()
+    shell.run(data)
+    return
 
 # Log the startup
 app.logger.info('########################################################')

From 289f7361600df4049f8f41381c409132552a4e1a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 13 Nov 2024 14:25:22 +0800
Subject: [PATCH 187/965] Update setting.py

---
 web/setting.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/web/setting.py b/web/setting.py
index 332e17387..7d4fa956f 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -40,10 +40,8 @@ if os.path.exists(default_port_file):
     panel_port.strip()
 else:
     from utils.firewall import Firewall as MwFirewall
-    import common
-    common.initDB()
     mw_port = str(random.randint(10000, 65530))
-    MwFirewall.instance().addAcceptPort(panel_port, 'WEB面板', 'port')
+    MwFirewall.instance().addAcceptPort(panel_port, 'Panel端口', 'port')
     mw.writeFile('data/port.pl', panel_port)
 
 bind = []

From c8b9dd2ae99ba6e87aeb4e302e1f56d58ad60829 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 13 Nov 2024 14:25:29 +0800
Subject: [PATCH 188/965] Update setting.py

---
 web/setting.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/setting.py b/web/setting.py
index 7d4fa956f..c56853617 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -41,7 +41,7 @@ if os.path.exists(default_port_file):
 else:
     from utils.firewall import Firewall as MwFirewall
     mw_port = str(random.randint(10000, 65530))
-    MwFirewall.instance().addAcceptPort(panel_port, 'Panel端口', 'port')
+    MwFirewall.instance().addAcceptPort(panel_port, 'PANEL端口', 'port')
     mw.writeFile('data/port.pl', panel_port)
 
 bind = []

From bfc1974043c93acb04489d10146dc9a634f85593 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 13 Nov 2024 14:27:27 +0800
Subject: [PATCH 189/965] Update setting.py

---
 web/setting.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/setting.py b/web/setting.py
index c56853617..5afb73d0a 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -27,7 +27,6 @@ workers = cpu_info[1]
 
 panel_dir = mw.getPanelDir()
 
-
 log_dir = mw.getMWLogs()
 if not os.path.exists(log_dir):
     os.mkdir(log_dir)

From f685054a9a5a3c18aba21496d21a417d8ca1b932 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 13 Nov 2024 14:45:53 +0800
Subject: [PATCH 190/965] update

---
 web/admin/setting/app.py | 13 +++++++++++++
 web/core/mw.py           |  3 +++
 web/setting.py           |  2 +-
 web/static/app/config.js |  2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/web/admin/setting/app.py b/web/admin/setting/app.py
index 441f068bf..5b025a3e4 100644
--- a/web/admin/setting/app.py
+++ b/web/admin/setting/app.py
@@ -25,6 +25,17 @@ import utils.config as utils_config
 from .setting import blueprint
 import thisdb
 
+# 设置API
+@blueprint.route('/set_panel_api', endpoint='set_panel_api', methods=['POST'])
+@panel_login_required
+def set_panel_api():
+    admin_api = thisdb.getOption('api', default='no')
+    if admin_api == 'no':
+        thisdb.setOption('api', 'yes')
+        return mw.returnData(True, '开启API成功!')
+    thisdb.setOption('api', 'no')
+    return mw.returnData(True, '开启API成功!')
+
 
 # 获取APP列表
 @blueprint.route('/get_app_list', endpoint='get_app_list', methods=['POST'])
@@ -48,6 +59,8 @@ def add_app():
     app_id = request.form.get('app_id', '').strip()
     app_secret = request.form.get('app_secret', '1').strip()
     limit_addr = request.form.get('limit_addr', '').strip()
+    if limit_addr == '':
+        return mw.returnData(False, 'IP限制不能为空!')
 
     rid = thisdb.addApp(app_id,app_secret,limit_addr)
     if rid > 0:
diff --git a/web/core/mw.py b/web/core/mw.py
index f3310d32c..0d7a8f6a2 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -84,6 +84,9 @@ def getPanelDataDir():
 def getMWLogs():
     return getPanelDir() + '/logs'
 
+def getPanelLogs():
+    return getPanelDir() + '/logs'
+
 def getPanelTmp():
     return getPanelDir() + '/tmp'
 
diff --git a/web/setting.py b/web/setting.py
index 5afb73d0a..929e1e547 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -41,7 +41,7 @@ else:
     from utils.firewall import Firewall as MwFirewall
     mw_port = str(random.randint(10000, 65530))
     MwFirewall.instance().addAcceptPort(panel_port, 'PANEL端口', 'port')
-    mw.writeFile('data/port.pl', panel_port)
+    mw.writeFile(default_port_file panel_port)
 
 bind = []
 default_ipv6_file = panel_dir+'/data/ipv6.pl'
diff --git a/web/static/app/config.js b/web/static/app/config.js
index 4c3783e6b..a56a25a10 100755
--- a/web/static/app/config.js
+++ b/web/static/app/config.js
@@ -1464,7 +1464,7 @@ function showPanelApi(){
 
 function setPanelApi(){
 	var cfg_panel_api = $('#cfg_panel_api').prop("checked");
-	$.post('/setting/set_panel_token', {'op_type':"2"},function(rdata){
+	$.post('/setting/set_panel_api', {},function(rdata){
 		showMsg(rdata.msg, function(){
 			if (rdata.status){
 				addApp();

From ee64e55ecaf6b3d3137d0e61d1596debe41b1b3b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 13 Nov 2024 19:28:56 +0800
Subject: [PATCH 191/965] update

---
 web/admin/__init__.py              | 18 +++++++++
 web/config.py                      |  7 +++-
 web/utils/email.py                 | 11 +++++-
 web/utils/enhanced_log_rotation.py | 61 ++++++++++++++++++++++++++++++
 4 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 web/utils/enhanced_log_rotation.py

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index a33c569ff..dc2770ff0 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -171,6 +171,24 @@ def webssh(data):
     shell.run(data)
     return
 
+# File logging
+logger = logging.getLogger('werkzeug')
+logger.setLevel(config.CONSOLE_LOG_LEVEL)
+
+from utils.enhanced_log_rotation import EnhancedRotatingFileHandler
+fh = EnhancedRotatingFileHandler(config.LOG_FILE,
+                                 config.LOG_ROTATION_SIZE,
+                                 config.LOG_ROTATION_AGE,
+                                 config.LOG_ROTATION_MAX_LOG_FILES)
+fh.setLevel(config.FILE_LOG_LEVEL)
+app.logger.addHandler(fh)
+logger.addHandler(fh)
+
+# Console logging
+ch = logging.StreamHandler()
+ch.setLevel(config.CONSOLE_LOG_LEVEL)
+ch.setFormatter(logging.Formatter(config.CONSOLE_LOG_FORMAT))
+
 # Log the startup
 app.logger.info('########################################################')
 app.logger.info('Starting %s v%s...', config.APP_NAME, config.APP_VERSION)
diff --git a/web/config.py b/web/config.py
index 82aa42513..60d4b98f2 100644
--- a/web/config.py
+++ b/web/config.py
@@ -46,11 +46,14 @@ DATA_DIR = mw.getPanelDataDir()
 # 日志文件名。这将进入数据目录，服务器模式下的非Windows平台除外。
 LOG_FILE = os.path.join(mw.getMWLogs(), APP_LOG_NAME + '.log')
 
+CONSOLE_LOG_FORMAT = '%(asctime)s: %(levelname)s\t%(name)s:\t%(message)s'
+FILE_LOG_FORMAT = '%(asctime)s: %(levelname)s\t%(name)s:\t%(message)s'
+
 # 日志旋转设置日志文件将根据LOG_ROTATION_SIZE和LOG_ROTATION_AGE的值进行切换。
 # 旋转的文件将以格式命名Y-m-d_H-M-S
-LOG_ROTATION_SIZE = 10  # MBs
+LOG_ROTATION_SIZE = 1  # MBs
 LOG_ROTATION_AGE = 1440  # minutes
-LOG_ROTATION_MAX_LOG_FILES = 90  # 要保留的最大备份数
+LOG_ROTATION_MAX_LOG_FILES = 5  # 要保留的最大备份数
 
 # 用于存储用户帐户和设置的SQLite数据库的默认路径。
 # 此默认设置将文件放置在与此相同的目录中 配置文件，但会生成一个在整个应用程序中使用的绝对路径。
diff --git a/web/utils/email.py b/web/utils/email.py
index 6ba7b62d5..9112622cb 100644
--- a/web/utils/email.py
+++ b/web/utils/email.py
@@ -1,4 +1,13 @@
-# coding: utf-8
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
 
 import smtplib
 
diff --git a/web/utils/enhanced_log_rotation.py b/web/utils/enhanced_log_rotation.py
new file mode 100644
index 000000000..1dfa449c0
--- /dev/null
+++ b/web/utils/enhanced_log_rotation.py
@@ -0,0 +1,61 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+
+import re
+from logging import handlers
+
+
+class EnhancedRotatingFileHandler(handlers.TimedRotatingFileHandler,
+                                  handlers.RotatingFileHandler):
+    """
+    Handler for logging to a set of files, which switches from one file
+    to the next when the current file reaches a certain size, or at certain
+    timed intervals
+    @filename - log file name
+    @max_bytes - file size in bytes to rotate  file
+    @interval - Duration to rotate file
+    @backup_count - Maximum number of files to retain
+    @encoding - file encoding
+    @when -  'when' events supported:
+            # S - Seconds
+            # M - Minutes
+            # H - Hours
+            # D - Days
+            # midnight - roll over at midnight
+            # W{0-6} - roll over on a certain day; 0 - Monday
+    Here we are defaulting rotation with minutes interval
+    """
+    def __init__(self, filename, max_bytes=1, interval=60, backup_count=0,
+                 encoding=None, when='M'):
+        max_bytes = max_bytes * 1024 * 1024
+        handlers.TimedRotatingFileHandler.__init__(self, filename=filename,
+                                                   when=when,
+                                                   interval=interval,
+                                                   backupCount=backup_count,
+                                                   encoding=encoding)
+
+        handlers.RotatingFileHandler.__init__(self, filename=filename,
+                                              mode='a',
+                                              maxBytes=max_bytes,
+                                              backupCount=backup_count,
+                                              encoding=encoding)
+
+    # Time & Size combined rollover
+    def shouldRollover(self, record):
+        return handlers.TimedRotatingFileHandler.shouldRollover(self, record) \
+            or handlers.RotatingFileHandler.shouldRollover(self, record)
+
+    # Roll overs current file
+    def doRollover(self):
+        self.suffix = "%Y-%m-%d_%H-%M-%S"
+        self.extMatch = r"^\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2}(\.\w+)?$"
+        self.extMatch = re.compile(self.extMatch, re.ASCII)
+        handlers.TimedRotatingFileHandler.doRollover(self)
\ No newline at end of file

From bf6aa155050ee206f38f5896b45e79aad13dd813 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 14 Nov 2024 15:00:30 +0800
Subject: [PATCH 192/965] Update crontab.js

---
 web/static/app/crontab.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/static/app/crontab.js b/web/static/app/crontab.js
index fe21632c4..87d5e4866 100755
--- a/web/static/app/crontab.js
+++ b/web/static/app/crontab.js
@@ -85,8 +85,8 @@ function getCronData(page){
 	$.post("/crontab/list?p="+page,'', function(rdata){
 		layer.close(load);
 		var cbody = "";
-		if(rdata == ""){
-			cbody="<tr><td colspan='9' style='text-align: center;'>"+lan.crontab.task_empty+"</td></tr>";
+		if(rdata.data.length == 0){
+			cbody="<tr><td colspan='9' style='text-align: center;'>当前没有计划任务</td></tr>";
 		} else {
 			for(var i=0;i<rdata.data.length;i++){
 				//状态

From 4602b9fc07cdc54ae98bd33b90696d5e3f6a768e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 14 Nov 2024 15:14:10 +0800
Subject: [PATCH 193/965] Update crontab.js

---
 web/static/app/crontab.js | 49 ++-------------------------------------
 1 file changed, 2 insertions(+), 47 deletions(-)

diff --git a/web/static/app/crontab.js b/web/static/app/crontab.js
index 87d5e4866..cf469fcaa 100755
--- a/web/static/app/crontab.js
+++ b/web/static/app/crontab.js
@@ -357,51 +357,6 @@ function planAdd(){
 	},'json');
 }
 
-//批量添加任务
-// function allAddCrontab(dataList,successCount,errorMsg){
-// 	if(dataList.length < 1) {
-// 		layer.msg(lan.get('add_all_task_ok',[successCount]),{icon:1});
-// 		return;
-// 	}
-// 	var loadT = layer.msg(lan.get('add',[dataList[0]]),{icon:16,time:0,shade: [0.3, '#000']});
-// 	var sType = $(".planjs").find("b").attr("val");
-// 	var minute = parseInt($("#cronConfig input[name='minute']").val());
-// 	var hour = parseInt($("#cronConfig input[name='hour']").val());
-// 	var sTitle = (sType == 'site')?lan.crontab.backup_site:lan.crontab.backup_database;
-// 	if(sType == 'logs') sTitle = lan.crontab.backup_log;
-// 	minute += 5;
-// 	if(hour !== '' && minute > 59){
-// 		if(hour >= 23) hour = 0;
-// 		$("#cronConfig input[name='hour']").val(hour+1);
-// 		minute = 5;
-// 	}
-// 	$("#cronConfig input[name='minute']").val(minute);
-// 	$("#cronConfig input[name='name']").val(sTitle + '['+dataList[0]+']');
-// 	$("#cronConfig input[name='sName']").val(dataList[0]);
-// 	var pdata = $("#cronConfig").serialize() + '&sBody=&urladdress=';
-// 	$.ajax({
-// 		type:'POST',
-// 		url:'/crontab/add',
-// 		data:pdata,
-// 		async: true,
-// 		success:function(frdata){
-// 			layer.close(loadT);
-// 			if(frdata.status){
-// 				successCount++;
-// 				getCronData(1);
-// 			}else{
-// 				if(!errorMsg){
-// 					errorMsg = '<br><p>'+lan.crontab.backup_all_err+'</p>';
-// 				}
-// 				errorMsg += '<li>'+dataList[0]+' -> '+frdata.msg+'</li>'
-// 			}
-			
-// 			dataList.splice(0,1);
-// 			allAddCrontab(dataList,successCount,errorMsg);
-// 		}
-// 	});
-// }
-
 initDropdownMenu();
 function initDropdownMenu(){
 	$(".dropdown ul li a").click(function(){
@@ -1118,8 +1073,8 @@ function toUrl(){
 //释放内存
 function rememory(){
 	$(".planname input[name='name']").removeAttr('readonly style').val("");
-	$(".planname input[name='name']").val(lan.crontab.mem);
-	$("#implement").html(lan.crontab.mem_ps);
+	$(".planname input[name='name']").val('释放内存');
+	$("#implement").html('释放PHP、MYSQL、PURE-FTPD、APACHE、NGINX的内存占用,建议在每天半夜执行!');
 	return;
 }
 //上传

From f6ff18dd8dc73f668401d97f0faaf07ed2618623 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 14 Nov 2024 15:14:53 +0800
Subject: [PATCH 194/965] Update crontab.js

---
 web/static/app/crontab.js | 170 +++++++++++++++++++-------------------
 1 file changed, 85 insertions(+), 85 deletions(-)

diff --git a/web/static/app/crontab.js b/web/static/app/crontab.js
index cf469fcaa..24682b4c6 100755
--- a/web/static/app/crontab.js
+++ b/web/static/app/crontab.js
@@ -736,85 +736,85 @@ function editTaskInfo(id){
 				shadeClose:false,
 				closeBtn:1,
 				content:'<div class="setting-con ptb20">\
-							<div class="clearfix plan ptb10">\
-								<span class="typename c4 pull-left f14 text-right mr20">任务类型</span>\
-								<div class="dropdown stype_list pull-left mr20">\
-									<button class="btn btn-default dropdown-toggle" type="button" id="excode" data-toggle="dropdown" style="width:auto" disabled="disabled">\
-										<b val="'+ obj.from.type +'">'+ sTypeName +'</b>\
-										<span class="caret"></span>\
-									</button>\
-									<ul class="dropdown-menu" role="menu" aria-labelledby="sType">'+ sTypeDom +'</ul>\
-								</div>\
+					<div class="clearfix plan ptb10">\
+						<span class="typename c4 pull-left f14 text-right mr20">任务类型</span>\
+						<div class="dropdown stype_list pull-left mr20">\
+							<button class="btn btn-default dropdown-toggle" type="button" id="excode" data-toggle="dropdown" style="width:auto" disabled="disabled">\
+								<b val="'+ obj.from.type +'">'+ sTypeName +'</b>\
+								<span class="caret"></span>\
+							</button>\
+							<ul class="dropdown-menu" role="menu" aria-labelledby="sType">'+ sTypeDom +'</ul>\
+						</div>\
+					</div>\
+					<div class="clearfix plan ptb10">\
+						<span class="typename c4 pull-left f14 text-right mr20">任务名称</span>\
+						<div class="planname pull-left"><input type="text" name="name" class="bt-input-text sName_create" value="'+ obj.from.name +'"></div>\
+					</div>\
+					<div class="clearfix plan ptb10">\
+						<span class="typename c4 pull-left f14 text-right mr20">执行周期</span>\
+						<div class="dropdown  pull-left mr20">\
+							<button class="btn btn-default dropdown-toggle cycle_btn" type="button" data-toggle="dropdown" style="width:94px">\
+								<b val="'+ obj.from.stype +'">'+ cycleName +'</b>\
+								<span class="caret"></span>\
+							</button>\
+							<ul class="dropdown-menu" role="menu" aria-labelledby="cycle">'+ cycleDom +'</ul>\
+						</div>\
+						<div class="pull-left optional_week">\
+							<div class="dropdown week_btn pull-left mr20" style="display:'+ (obj.from.type == "week"  ?'block;':'none') +'">\
+								<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" >\
+									<b val="'+ obj.from.week +'">'+ weekName +'</b> \
+									<span class="caret"></span>\
+								</button>\
+								<ul class="dropdown-menu" role="menu" aria-labelledby="week">'+ weekDom +'</ul>\
 							</div>\
-							<div class="clearfix plan ptb10">\
-								<span class="typename c4 pull-left f14 text-right mr20">任务名称</span>\
-								<div class="planname pull-left"><input type="text" name="name" class="bt-input-text sName_create" value="'+ obj.from.name +'"></div>\
+							<div class="plan_hms pull-left mr20 bt-input-text where1_input" style="display:'+ (obj.from.type == "day-n" || obj.from.type == 'month' ?'block;':'none') +'"><span><input type="number" name="where1" class="where1_create" value="'+obj.from.where1 +'" maxlength="2" max="23" min="0"></span> <span class="name">日</span> </div>\
+							<div class="plan_hms pull-left mr20 bt-input-text hour_input" style="display:'+ (obj.from.type == "day" || obj.from.type == 'day-n' || obj.from.type == 'hour-n' || obj.from.type == 'week' || obj.from.type == 'month'?'block;':'none') +'"><span><input type="number" name="hour" class="hour_create" value="'+ ( obj.from.type == 'hour-n' ? obj.from.where1 : obj.from.hour ) +'" maxlength="2" max="23" min="0"></span> <span class="name">时</span> </div>\
+							<div class="plan_hms pull-left mr20 bt-input-text minute_input"><span><input type="number" name="minute" class="minute_create" value="'+ (obj.from.type == 'minute-n' ? obj.from.where1 : obj.from.minute)+'" maxlength="2" max="59" min="0"></span> <span class="name">分</span> </div>\
+						</div>\
+					</div>\
+					<div class="clearfix plan ptb10 site_list" style="display:none">\
+						<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 sname" type="button"  data-toggle="dropdown" style="width:auto" disabled="disabled">\
+								<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>\
+						</div>\
+						<div class="info-r" style="float: left;margin-right: 25px;display:'+ (obj.from.sType == "path"?'block;':'none') +'">\
+							<input id="inputPath" class="bt-input-text mr5 " type="text" name="path" value="'+ obj.from.sName +'" placeholder="备份目录" style="width:208px;height:33px;" disabled="disabled">\
+						</div>\
+						'+changeDir+'\
+						<div class="textname pull-left mr20">备份到</div>\
+							<div class="dropdown  pull-left mr20">\
+								<button class="btn btn-default dropdown-toggle backup_btn" type="button"  data-toggle="dropdown" style="width:auto;">\
+									<b val="'+ obj.from.backup_to +'">'+ backupsName +'</b>\
+									<span class="caret"></span>\
+								</button>\
+								<ul class="dropdown-menu" role="menu" aria-labelledby="backupTo">'+ backupsDom +'</ul>\
 							</div>\
-							<div class="clearfix plan ptb10">\
-								<span class="typename c4 pull-left f14 text-right mr20">执行周期</span>\
-								<div class="dropdown  pull-left mr20">\
-									<button class="btn btn-default dropdown-toggle cycle_btn" type="button" data-toggle="dropdown" style="width:94px">\
-										<b val="'+ obj.from.stype +'">'+ cycleName +'</b>\
-										<span class="caret"></span>\
-									</button>\
-									<ul class="dropdown-menu" role="menu" aria-labelledby="cycle">'+ cycleDom +'</ul>\
-								</div>\
-								<div class="pull-left optional_week">\
-									<div class="dropdown week_btn pull-left mr20" style="display:'+ (obj.from.type == "week"  ?'block;':'none') +'">\
-										<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" >\
-											<b val="'+ obj.from.week +'">'+ weekName +'</b> \
-											<span class="caret"></span>\
-										</button>\
-										<ul class="dropdown-menu" role="menu" aria-labelledby="week">'+ weekDom +'</ul>\
-									</div>\
-									<div class="plan_hms pull-left mr20 bt-input-text where1_input" style="display:'+ (obj.from.type == "day-n" || obj.from.type == 'month' ?'block;':'none') +'"><span><input type="number" name="where1" class="where1_create" value="'+obj.from.where1 +'" maxlength="2" max="23" min="0"></span> <span class="name">日</span> </div>\
-									<div class="plan_hms pull-left mr20 bt-input-text hour_input" style="display:'+ (obj.from.type == "day" || obj.from.type == 'day-n' || obj.from.type == 'hour-n' || obj.from.type == 'week' || obj.from.type == 'month'?'block;':'none') +'"><span><input type="number" name="hour" class="hour_create" value="'+ ( obj.from.type == 'hour-n' ? obj.from.where1 : obj.from.hour ) +'" maxlength="2" max="23" min="0"></span> <span class="name">时</span> </div>\
-									<div class="plan_hms pull-left mr20 bt-input-text minute_input"><span><input type="number" name="minute" class="minute_create" value="'+ (obj.from.type == 'minute-n' ? obj.from.where1 : obj.from.minute)+'" maxlength="2" max="59" min="0"></span> <span class="name">分</span> </div>\
-								</div>\
+							<div class="textname pull-left mr20">保留最新</div>\
+							<div class="plan_hms pull-left mr20 bt-input-text">\
+								<span><input type="number" name="save" class="save_create" value="'+ obj.from.save +'" maxlength="4" max="100" min="1"></span><span class="name">份</span>\
 							</div>\
-							<div class="clearfix plan ptb10 site_list" style="display:none">\
-								<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 sname" type="button"  data-toggle="dropdown" style="width:auto" disabled="disabled">\
-										<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>\
-								</div>\
-								<div class="info-r" style="float: left;margin-right: 25px;display:'+ (obj.from.sType == "path"?'block;':'none') +'">\
-									<input id="inputPath" class="bt-input-text mr5 " type="text" name="path" value="'+ obj.from.sName +'" placeholder="备份目录" style="width:208px;height:33px;" disabled="disabled">\
-								</div>\
-								'+changeDir+'\
-								<div class="textname pull-left mr20">备份到</div>\
-									<div class="dropdown  pull-left mr20">\
-										<button class="btn btn-default dropdown-toggle backup_btn" type="button"  data-toggle="dropdown" style="width:auto;">\
-											<b val="'+ obj.from.backup_to +'">'+ backupsName +'</b>\
-											<span class="caret"></span>\
-										</button>\
-										<ul class="dropdown-menu" role="menu" aria-labelledby="backupTo">'+ backupsDom +'</ul>\
-									</div>\
-									<div class="textname pull-left mr20">保留最新</div>\
-									<div class="plan_hms pull-left mr20 bt-input-text">\
-										<span><input type="number" name="save" class="save_create" value="'+ obj.from.save +'" maxlength="4" max="100" min="1"></span><span class="name">份</span>\
-									</div>\
-								</div>\
-							</div>\
-							<div class="clearfix plan ptb10"  style="display:'+ (obj.from.stype == "toShell"?'block;':'none') +'">\
-								<span class="typename controls c4 pull-left f14 text-right mr20">脚本内容</span>\
-								<div style="line-height:34px"><textarea class="txtsjs bt-input-text sBody_create" name="sbody">'+ obj.from.sbody +'</textarea></div>\
-							</div>\
-							<div class="clearfix plan ptb10" style="display:'+ (obj.from.stype == "rememory"?'block;':'none') +'">\
-								<span class="typename controls c4 pull-left f14 text-right mr20">提示</span>\
-								<div style="line-height:34px">释放PHP、MYSQL、PURE-FTPD、OpenResty的内存占用,建议在每天半夜执行!</div>\
-							</div>\
-							<div class="clearfix plan ptb10" style="display:'+ (obj.from.stype == "toUrl"?'block;':'none') +'">\
-								<span class="typename controls c4 pull-left f14 text-right mr20">URL地址</span>\
-								<div style="line-height:34px"><input type="text" style="width:400px; height:34px" class="bt-input-text url_create" name="urladdress"  placeholder="URL地址" value="'+ obj.from.urladdress +'"></div>\
-							</div>\
-							<div class="clearfix plan ptb10">\
-								<div class="bt-submit plan-submits " style="margin-left: 141px;">保存编辑</div>\
-							</div>\
-						</div>',
+						</div>\
+					</div>\
+					<div class="clearfix plan ptb10"  style="display:'+ (obj.from.stype == "toShell"?'block;':'none') +'">\
+						<span class="typename controls c4 pull-left f14 text-right mr20">脚本内容</span>\
+						<div style="line-height:34px"><textarea class="txtsjs bt-input-text sBody_create" name="sbody">'+ obj.from.sbody +'</textarea></div>\
+					</div>\
+					<div class="clearfix plan ptb10" style="display:'+ (obj.from.stype == "rememory"?'block;':'none') +'">\
+						<span class="typename controls c4 pull-left f14 text-right mr20">提示</span>\
+						<div style="line-height:34px">释放PHP、MYSQL、PURE-FTPD、OpenResty的内存占用,建议在每天半夜执行!</div>\
+					</div>\
+					<div class="clearfix plan ptb10" style="display:'+ (obj.from.stype == "toUrl"?'block;':'none') +'">\
+						<span class="typename controls c4 pull-left f14 text-right mr20">URL地址</span>\
+						<div style="line-height:34px"><input type="text" style="width:400px; height:34px" class="bt-input-text url_create" name="urladdress"  placeholder="URL地址" value="'+ obj.from.urladdress +'"></div>\
+					</div>\
+					<div class="clearfix plan ptb10">\
+						<div class="bt-submit plan-submits " style="margin-left: 141px;">保存编辑</div>\
+					</div>\
+				</div>',
 
 				success:function(){
 
@@ -1024,26 +1024,26 @@ function toWeek(){
 //指定1
 function toWhere1(ix){
 	var mBody ='<div class="plan_hms pull-left mr20 bt-input-text">\
-					<span><input type="number" name="where1" value="3" maxlength="2" max="31" min="0"></span>\
-					<span class="name">'+ix+'</span>\
-				</div>';
+		<span><input type="number" name="where1" value="3" maxlength="2" max="31" min="0"></span>\
+		<span class="name">'+ix+'</span>\
+	</div>';
 	$("#ptime").append(mBody);
 }
 //小时
 function toHour(){
 	var mBody = '<div class="plan_hms pull-left mr20 bt-input-text">\
-					<span><input type="number" name="hour" value="1" maxlength="2" max="23" min="0"></span>\
-					<span class="name">小时</span>\
-					</div>';
+	<span><input type="number" name="hour" value="1" maxlength="2" max="23" min="0"></span>\
+	<span class="name">小时</span>\
+	</div>';
 	$("#ptime").append(mBody);
 }
 
 //分钟
 function toMinute(){
 	var mBody = '<div class="plan_hms pull-left mr20 bt-input-text">\
-					<span><input type="number" name="minute" value="30" maxlength="2" max="59" min="0"></span>\
-					<span class="name">分钟</span>\
-					</div>';
+	<span><input type="number" name="minute" value="30" maxlength="2" max="59" min="0"></span>\
+	<span class="name">分钟</span>\
+	</div>';
 	$("#ptime").append(mBody);
 	
 }

From 0eed51452aa4b2f66cf6c222ee0e5cc507ce783a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 14 Nov 2024 16:51:43 +0800
Subject: [PATCH 195/965] Update setting.py

---
 web/setting.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/setting.py b/web/setting.py
index 929e1e547..46672561d 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -41,7 +41,7 @@ else:
     from utils.firewall import Firewall as MwFirewall
     mw_port = str(random.randint(10000, 65530))
     MwFirewall.instance().addAcceptPort(panel_port, 'PANEL端口', 'port')
-    mw.writeFile(default_port_file panel_port)
+    mw.writeFile(default_port_file, panel_port)
 
 bind = []
 default_ipv6_file = panel_dir+'/data/ipv6.pl'

From 8ae54e30d0257de3746c592bffdd95d9139afc2a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 20 Nov 2024 16:40:06 +0800
Subject: [PATCH 196/965] update

---
 web/admin/crontab/__init__.py    |  5 ++--
 web/admin/dashboard/dashboard.py |  3 +-
 web/admin/files/files.py         |  6 ++--
 web/admin/firewall/__init__.py   |  6 ++--
 web/admin/logs/__init__.py       |  4 +--
 web/admin/monitor/__init__.py    |  7 +++--
 web/admin/plugins/__init__.py    |  5 ++--
 web/admin/setting/setting.py     |  3 +-
 web/admin/site/dir.py            |  2 +-
 web/admin/site/logs.py           |  2 +-
 web/admin/site/php.py            |  2 +-
 web/admin/site/proxy.py          |  2 +-
 web/admin/site/redirect.py       |  2 +-
 web/admin/site/site.py           |  9 +++++-
 web/admin/site/site_default.py   |  2 +-
 web/admin/site/site_types.py     |  1 -
 web/admin/site/ssl.py            |  9 ++++--
 web/admin/soft/__init__.py       |  5 +++-
 web/thisdb/sites.py              | 16 +++++++++++
 web/utils/site.py                | 49 ++++++++++++++++++++++++++++----
 20 files changed, 109 insertions(+), 31 deletions(-)

diff --git a/web/admin/crontab/__init__.py b/web/admin/crontab/__init__.py
index b1b76ba98..17f506fba 100644
--- a/web/admin/crontab/__init__.py
+++ b/web/admin/crontab/__init__.py
@@ -18,10 +18,11 @@ from utils.crontab import crontab as MwCrontab
 import core.mw as mw
 import thisdb
 
-blueprint = Blueprint('crontab', __name__, url_prefix='/crontab', template_folder='../../templates/default')
+blueprint = Blueprint('crontab', __name__, url_prefix='/crontab', template_folder='../../templates')
 @blueprint.route('/index', endpoint='index')
 def index():
-    return render_template('crontab.html')
+    name = thisdb.getOption('template', default='default')
+    return render_template('%s/crontab.html' % name)
 
 # 计划任务列表
 @blueprint.route('/list', endpoint='list', methods=['POST'])
diff --git a/web/admin/dashboard/dashboard.py b/web/admin/dashboard/dashboard.py
index 21d9e7264..eb5b3d4fc 100644
--- a/web/admin/dashboard/dashboard.py
+++ b/web/admin/dashboard/dashboard.py
@@ -30,7 +30,8 @@ blueprint = Blueprint('dashboard', __name__, url_prefix='/', template_folder='..
 @blueprint.route('/')
 @panel_login_required
 def index():
-    return render_template('default/index.html')
+    name = thisdb.getOption('template', default='default')
+    return render_template('%s/index.html' % name)
 
 # 安全路径
 @blueprint.route('/<path>',endpoint='admin_safe_path',methods=['GET'])
diff --git a/web/admin/files/files.py b/web/admin/files/files.py
index 5f87e58a4..cfe8e83c4 100644
--- a/web/admin/files/files.py
+++ b/web/admin/files/files.py
@@ -21,12 +21,14 @@ from werkzeug.utils import secure_filename
 from admin.user_login_check import panel_login_required
 import core.mw as mw
 import utils.file as file
+import thisdb
 
-blueprint = Blueprint('files', __name__, url_prefix='/files', template_folder='../../templates/default')
+blueprint = Blueprint('files', __name__, url_prefix='/files', template_folder='../../templates')
 @blueprint.route('/index', endpoint='index')
 @panel_login_required
 def index():
-    return render_template('files.html')
+    name = thisdb.getOption('template', default='default')
+    return render_template('%s/files.html' % name)
 
 # 获取文件内容
 @blueprint.route('/get_body', endpoint='get_file_body', methods=['POST'])
diff --git a/web/admin/firewall/__init__.py b/web/admin/firewall/__init__.py
index 331529267..7cb6fdd2d 100644
--- a/web/admin/firewall/__init__.py
+++ b/web/admin/firewall/__init__.py
@@ -17,12 +17,14 @@ from admin.user_login_check import panel_login_required
 from utils.firewall import Firewall as MwFirewall
 
 import core.mw as mw
+import thisdb
 
-blueprint = Blueprint('firewall', __name__, url_prefix='/firewall', template_folder='../../templates/default')
+blueprint = Blueprint('firewall', __name__, url_prefix='/firewall', template_folder='../../templates')
 @blueprint.route('/index', endpoint='index')
 @panel_login_required
 def index():
-    return render_template('firewall.html')
+    name = thisdb.getOption('template', default='default')
+    return render_template('%s/firewall.html' % name)
 
 
 # 防火墙列表
diff --git a/web/admin/logs/__init__.py b/web/admin/logs/__init__.py
index 67c75234b..22993f2a8 100644
--- a/web/admin/logs/__init__.py
+++ b/web/admin/logs/__init__.py
@@ -23,8 +23,8 @@ blueprint = Blueprint('logs', __name__, url_prefix='/logs', template_folder='../
 @blueprint.route('/index', endpoint='index')
 @panel_login_required
 def index():
-    return render_template('default/logs.html')
-
+    name = thisdb.getOption('template', default='default')
+    return render_template('%s/logs.html' % name)
 
 # 日志列表
 @blueprint.route('/get_log_list', endpoint='get_log_list', methods=['POST'])
diff --git a/web/admin/monitor/__init__.py b/web/admin/monitor/__init__.py
index 0a540268a..29fcb5e0e 100644
--- a/web/admin/monitor/__init__.py
+++ b/web/admin/monitor/__init__.py
@@ -13,8 +13,11 @@ from flask import Blueprint, render_template
 
 from admin.user_login_check import panel_login_required
 
-blueprint = Blueprint('monitor', __name__, url_prefix='/monitor', template_folder='../../templates/default')
+import thisdb
+
+blueprint = Blueprint('monitor', __name__, url_prefix='/monitor', template_folder='../../templates')
 @blueprint.route('/index', endpoint='index')
 @panel_login_required
 def index():
-    return render_template('monitor.html')
\ No newline at end of file
+    name = thisdb.getOption('template', default='default')
+    return render_template('%s/monitor.html' % name)
\ No newline at end of file
diff --git a/web/admin/plugins/__init__.py b/web/admin/plugins/__init__.py
index 8092e015a..e35a9fb9b 100644
--- a/web/admin/plugins/__init__.py
+++ b/web/admin/plugins/__init__.py
@@ -23,11 +23,12 @@ import utils.config as utils_config
 import thisdb
 
 
-blueprint = Blueprint('plugins', __name__, url_prefix='/plugins', template_folder='../../templates/default')
+blueprint = Blueprint('plugins', __name__, url_prefix='/plugins', template_folder='../../templates')
 @blueprint.route('/index', endpoint='index')
 @panel_login_required
 def index():
-    return render_template('plugins.html')
+    name = thisdb.getOption('template', default='default')
+    return render_template('%s/plugins.html' % name)
 
 # 初始化检查,首页提示选择安装
 @blueprint.route('/init', endpoint='init', methods=['POST'])
diff --git a/web/admin/setting/setting.py b/web/admin/setting/setting.py
index 727ef6169..6f07c3e60 100644
--- a/web/admin/setting/setting.py
+++ b/web/admin/setting/setting.py
@@ -29,7 +29,8 @@ blueprint = Blueprint('setting', __name__, url_prefix='/setting', template_folde
 @blueprint.route('/index', endpoint='index')
 @panel_login_required
 def index():
-    return render_template('default/setting.html')
+    name = thisdb.getOption('template', default='default')
+    return render_template('%s/setting.html' % name)
 
 @blueprint.route('/get_panel_list', endpoint='get_panel_list', methods=['POST'])
 @panel_login_required
diff --git a/web/admin/site/dir.py b/web/admin/site/dir.py
index 19c153f06..6156e71de 100644
--- a/web/admin/site/dir.py
+++ b/web/admin/site/dir.py
@@ -18,7 +18,7 @@ from admin.user_login_check import panel_login_required
 
 from utils.plugin import plugin as MwPlugin
 from utils.site import sites as MwSites
-import utils.site as site
+
 import core.mw as mw
 import thisdb
 
diff --git a/web/admin/site/logs.py b/web/admin/site/logs.py
index 4ae249cf5..e916022a8 100644
--- a/web/admin/site/logs.py
+++ b/web/admin/site/logs.py
@@ -18,7 +18,7 @@ from admin.user_login_check import panel_login_required
 
 from utils.plugin import plugin as MwPlugin
 from utils.site import sites as MwSites
-import utils.site as site
+
 import core.mw as mw
 import thisdb
 
diff --git a/web/admin/site/php.py b/web/admin/site/php.py
index 2425086c9..8934185a0 100644
--- a/web/admin/site/php.py
+++ b/web/admin/site/php.py
@@ -18,7 +18,7 @@ from admin.user_login_check import panel_login_required
 
 from utils.plugin import plugin as MwPlugin
 from utils.site import sites as MwSites
-import utils.site as site
+
 import core.mw as mw
 import thisdb
 
diff --git a/web/admin/site/proxy.py b/web/admin/site/proxy.py
index 704a9da4a..55e267693 100644
--- a/web/admin/site/proxy.py
+++ b/web/admin/site/proxy.py
@@ -18,7 +18,7 @@ from admin.user_login_check import panel_login_required
 
 from utils.plugin import plugin as MwPlugin
 from utils.site import sites as MwSites
-import utils.site as site
+
 import core.mw as mw
 import thisdb
 
diff --git a/web/admin/site/redirect.py b/web/admin/site/redirect.py
index ad6bdca19..b1b2e4b72 100644
--- a/web/admin/site/redirect.py
+++ b/web/admin/site/redirect.py
@@ -18,7 +18,7 @@ from admin.user_login_check import panel_login_required
 
 from utils.plugin import plugin as MwPlugin
 from utils.site import sites as MwSites
-import utils.site as site
+
 import core.mw as mw
 import thisdb
 
diff --git a/web/admin/site/site.py b/web/admin/site/site.py
index 6cbde59e0..2fe533c98 100644
--- a/web/admin/site/site.py
+++ b/web/admin/site/site.py
@@ -18,7 +18,6 @@ from admin.user_login_check import panel_login_required
 
 from utils.plugin import plugin as MwPlugin
 from utils.site import sites as MwSites
-import utils.site as site
 import core.mw as mw
 import thisdb
 
@@ -136,6 +135,13 @@ def get_site_php_version():
     siteName = request.form.get('siteName', '')      
     return MwSites.instance().getSitePhpVersion(siteName)
 
+# 获取站点PHP版本
+@blueprint.route('/get_site_domains', endpoint='get_site_domains',methods=['POST'])
+@panel_login_required
+def get_site_domains():
+    site_id = request.form.get('id', '')
+    data = thisdb.getSitesDomainById(site_id)
+    return mw.returnData(True, 'OK', data)
 
 # 设置站点PHP版本
 @blueprint.route('/set_php_version', endpoint='set_php_version',methods=['POST'])
@@ -287,3 +293,4 @@ def set_default_site():
     return MwSites.instance().setDefaultSite(name)
 
 
+
diff --git a/web/admin/site/site_default.py b/web/admin/site/site_default.py
index c3cc30ca3..293d128fd 100644
--- a/web/admin/site/site_default.py
+++ b/web/admin/site/site_default.py
@@ -17,7 +17,7 @@ from admin.user_login_check import panel_login_required
 
 from utils.plugin import plugin as MwPlugin
 from utils.site import sites as MwSites
-import utils.site as site
+
 import core.mw as mw
 import thisdb
 
diff --git a/web/admin/site/site_types.py b/web/admin/site/site_types.py
index 41e3c4396..90d360d60 100644
--- a/web/admin/site/site_types.py
+++ b/web/admin/site/site_types.py
@@ -18,7 +18,6 @@ from admin.user_login_check import panel_login_required
 
 from utils.plugin import plugin as MwPlugin
 from utils.site import sites as MwSites
-import utils.site as site
 import core.mw as mw
 import thisdb
 
diff --git a/web/admin/site/ssl.py b/web/admin/site/ssl.py
index 23d98e958..10dd57579 100644
--- a/web/admin/site/ssl.py
+++ b/web/admin/site/ssl.py
@@ -18,14 +18,13 @@ from admin.user_login_check import panel_login_required
 
 from utils.plugin import plugin as MwPlugin
 from utils.site import sites as MwSites
-import utils.site as site
 import core.mw as mw
 import thisdb
 
 from .site import blueprint
 
 
-# 删除代理配置
+# 获取证书信息
 @blueprint.route('/get_ssl', endpoint='get_ssl', methods=['POST'])
 @panel_login_required
 def get_ssl():
@@ -33,6 +32,12 @@ def get_ssl():
     ssl_type = request.form.get('ssl_type', '')
     return MwSites.instance().getSsl(site_name, ssl_type)
 
+# 获取证书列表
+@blueprint.route('/get_cert_list', endpoint='get_cert_list', methods=['GET','POST'])
+@panel_login_required
+def get_cert_list():
+    return MwSites.instance().getCertList()
+
 
 
 
diff --git a/web/admin/soft/__init__.py b/web/admin/soft/__init__.py
index 09a417826..21d7bb903 100644
--- a/web/admin/soft/__init__.py
+++ b/web/admin/soft/__init__.py
@@ -13,8 +13,11 @@ from flask import Blueprint, render_template
 
 from admin.user_login_check import panel_login_required
 
+import thisdb
+
 blueprint = Blueprint('soft', __name__, url_prefix='/soft', template_folder='../../templates')
 @blueprint.route('/index', endpoint='index')
 @panel_login_required
 def index():
-    return render_template('default/soft.html')
\ No newline at end of file
+    name = thisdb.getOption('template', default='default')
+    return render_template('%s/soft.html' % name)
\ No newline at end of file
diff --git a/web/thisdb/sites.py b/web/thisdb/sites.py
index f212e1d02..8ea9f7986 100644
--- a/web/thisdb/sites.py
+++ b/web/thisdb/sites.py
@@ -19,6 +19,22 @@ def getSitesCount():
 def getSitesById(site_id):
     return mw.M('sites').field(__FIELD).where("id=?", (site_id,)).find()
 
+def getSitesByName(site_name):
+    return mw.M('sites').field(__FIELD).where("name=?", (site_name,)).find()
+
+def getSitesDomainById(site_id):
+    data = {}
+    domains = mw.M('domain').where('pid=?', (site_id,)).field('name,id').select()
+    binding = mw.M('binding').where('pid=?', (site_id,)).field('domain,id').select()
+    for b in binding:
+        t = {}
+        t['name'] = b['domain']
+        t['id'] = b['id']
+        domains.append(t)
+    data['domains'] = domains
+    data['email'] = mw.M('users').getField('email')
+    return data
+
 def addSites(name, path):
     now_time = mw.getDateFromNow()
     insert_data = {
diff --git a/web/utils/site.py b/web/utils/site.py
index 8445e960d..3c860e4e4 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1318,8 +1318,8 @@ location ^~ {from} {\n\
 
         to_https = self.isToHttps(site_name)
 
-        sid = mw.M('sites').where("name=?", (site_name,)).getField('id')
-        domains = mw.M('domain').where("pid=?", (sid,)).field('name').select()
+        info = thisdb.getSitesByName(site_name)
+        domains = mw.M('domain').where("pid=?", (info['id'],)).field('name').select()
 
         csr_path = path + '/fullchain.pem'  # 生成证书路径
         key_path = path + '/privkey.pem'    # 密钥文件路径
@@ -1330,11 +1330,19 @@ location ^~ {from} {\n\
             key_path = self.sslLetsDir + '/' + site_name + '/privkey.pem'    # 密钥文件路径
         elif ssl_type == 'acme':
             acme_dir = mw.getAcmeDomainDir(site_name)
-            csr_path = acme_dir + '/fullchain.cer'  # 生成证书路径
-            key_path = acme_dir + '/' + site_name + '.key'    # 密钥文件路径
+            csr_path = acme_dir + '/fullchain.cer'              # ACME生成证书路径
+            key_path = acme_dir + '/' + site_name + '.key'      # ACME密钥文件路径
+
+        if os.path.exists(key_path):
+            key = mw.readFile(key_path)
+        else:
+            key = ''
+
+        if os.path.exists(csr_path):
+            csr = mw.readFile(csr_path)
+        else:
+            csr = ''
 
-        key = mw.readFile(key_path)
-        csr = mw.readFile(csr_path)
         cert_data = mw.getCertName(csr_path)
         data = {
             'status': status,
@@ -1347,6 +1355,35 @@ location ^~ {from} {\n\
         }
         return mw.returnData(True, 'OK', data)
 
+    def getCertList(self):
+        try:
+            vpath = self.sslDir
+            if not os.path.exists(vpath):
+                os.system('mkdir -p ' + vpath)
+            data = []
+            for d in os.listdir(vpath):
+
+                # keyPath = self.sslDir + siteName + '/privkey.pem'
+                # certPath = self.sslDir + siteName + '/fullchain.pem'
+
+                keyPath = vpath + '/' + d + '/privkey.pem'
+                certPath = vpath + '/' + d + '/fullchain.pem'
+                if os.path.exists(keyPath) and os.path.exists(certPath):
+                    self.saveCert(keyPath, certPath)
+
+                mpath = vpath + '/' + d + '/info.json'
+                if not os.path.exists(mpath):
+                    continue
+
+                tmp = mw.readFile(mpath)
+                if not tmp:
+                    continue
+                tmp1 = json.loads(tmp)
+                data.append(tmp1)
+            return mw.returnData(True, 'OK', data)
+        except:
+            return mw.returnData(True, 'OK', [])
+
 
     def setPhpVersion(self, siteName, version):
         # nginx

From 98fbaa099f0a6d933f8a3d05b13eacae1d3c3882 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 21 Nov 2024 02:54:46 +0800
Subject: [PATCH 197/965] update

---
 web/admin/setup/option.py  |   3 +
 web/admin/site/__init__.py |   5 +-
 web/admin/site/ssl.py      |   7 +
 web/admin/site/ssl_acme.py |  52 ++++
 web/static/app/site.js     | 620 +++++++++++++++++++++----------------
 web/thisdb/sites.py        |   4 +-
 web/utils/site.py          | 212 ++++++++++++-
 7 files changed, 628 insertions(+), 275 deletions(-)
 create mode 100644 web/admin/site/ssl_acme.py

diff --git a/web/admin/setup/option.py b/web/admin/setup/option.py
index 65c7ccf7c..93a02551a 100644
--- a/web/admin/setup/option.py
+++ b/web/admin/setup/option.py
@@ -20,6 +20,9 @@ def init_option():
     thisdb.setOption('recycle_bin', 'open')
     thisdb.setOption('template', 'default')
 
+    # SSL邮件地址
+    thisdb.setOption('ssl_email', '')
+
     # 后台面板是否关闭
     thisdb.setOption('admin_close', 'no')
 
diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index f7b5c7397..31844ce93 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -11,9 +11,12 @@
 from .site import *
 from .site_types import *
 from .site_default import *
+
 from .php import *
 from .logs import *
 from .dir import *
 from .redirect import *
 from .proxy import *
-from .ssl import *
\ No newline at end of file
+
+from .ssl import *
+from .ssl_acme import *
\ No newline at end of file
diff --git a/web/admin/site/ssl.py b/web/admin/site/ssl.py
index 10dd57579..724df7b1e 100644
--- a/web/admin/site/ssl.py
+++ b/web/admin/site/ssl.py
@@ -39,6 +39,13 @@ def get_cert_list():
     return MwSites.instance().getCertList()
 
 
+# 获取证书配置
+@blueprint.route('/get_dnsapi', endpoint='get_dnsapi', methods=['GET','POST'])
+@panel_login_required
+def get_dnsapi():
+    return MwSites.instance().getDnsapi()
+
+
 
 
 
diff --git a/web/admin/site/ssl_acme.py b/web/admin/site/ssl_acme.py
new file mode 100644
index 000000000..98aa599fc
--- /dev/null
+++ b/web/admin/site/ssl_acme.py
@@ -0,0 +1,52 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+import json
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin.user_login_check import panel_login_required
+
+from utils.plugin import plugin as MwPlugin
+from utils.site import sites as MwSites
+import core.mw as mw
+import thisdb
+
+from .site import blueprint
+
+
+# 获取ACME日志
+@blueprint.route('/get_acme_logs', endpoint='get_acme_logs', methods=['POST'])
+@panel_login_required
+def get_acme_logs():
+    log_file = mw.getPanelDir() + '/logs/acme.log'
+    if not os.path.exists(log_file):
+        mw.execShell('touch ' + log_file)
+    return mw.returnData(True, 'OK', log_file)
+
+
+@blueprint.route('/create_acme', endpoint='create_acme', methods=['POST'])
+@panel_login_required
+def create_acme():
+    site_name = request.form.get('siteName', '')
+    domains = request.form.get('domains', '')
+    force = request.form.get('force', '')
+    renew = request.form.get('renew', '')
+    email = request.form.get('email', '')
+    return MwSites.instance().createAcme(site_name, domains,force,renew,email)
+
+
+
+
+
+
+
diff --git a/web/static/app/site.js b/web/static/app/site.js
index 798e536d1..c44577a6b 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -2037,16 +2037,222 @@ function renewSSL(type,id,siteName){
 }
 
 function fileCheck(){
-
+	$('#dnsapi_option').css('display','none');
 }
 
 function dnsCheck(){
+	$('#dnsapi_option').css('display','block');
+}
+
+function renderDnsapiHtml(data){
+	console.log(data);
+	layer.open({
+        type: 1,
+        area: '500px',
+        title: '设置'+data['title']+'接口',
+        closeBtn: 1,
+        shift: 5,
+        shadeClose: true,
+        btn:["确定","取消"],
+        content: "<form class='bt-form pd15'>\
+			<div class='line'>\
+			    <span class='tname'>DNSAPI类型</span>\
+			    <div class='info-r'>\
+			        <select class='bt-input-text mr5' name='type' style='width:100%;'>\
+			            <option name='cf'>"+data['name']+"</option>\
+			        </select>\
+			    </div>\
+			</div>\
+			<div class='line' id='dnsapi_option'>\
+			    <span class='tname'>CF_Key</span>\
+			    <div class='info-r'>\
+			        <input name='v1' class='bt-input-text mr5' style='width:100%;' placeholder='请输入对应值' type='text'>\
+			    </div>\
+			    <span class='tname'>CF_Email</span>\
+			    <div class='info-r'>\
+			        <input name='v2' class='bt-input-text mr5' style='width:100%;' placeholder='请输入对应值' type='text'>\
+			    </div>\
+			</div>\
+			<div class='line'>\
+				<div>\
+					<ul class='help-info-text c7' style='margin-top:0px;'>\
+						<li>使用【"+data['title']+"】的API接口自动解析申请SSL</li>\
+					</ul>\
+				</div>\
+			</div>\
+		</form>",
+        success:function(){
+            
+        },
+        yes:function(index) {
+            
+        }
+    });
 
 }
 
-//SSL
-function opSSL(type, id, siteName, callback){
+function renderDnsapi(){
+	$.post('/site/get_dnsapi', {}, function(data){
+		var dnsapi_option = '';
+		for (var i = 0; i < data.length; i++) {
+			dnsapi_option+='<option value="'+data[i]['name']+'" index="'+i+'">'+data[i]['title']+'</option>';
+		}
 
+		$('#dnsapi_option select').html(dnsapi_option);
+
+		$('#dnsapi_option select').on('change',function(){
+			var val = $(this).val();
+			var index = $('#dnsapi_option option:selected').attr('index');
+			if (val == 'none'){
+				$('#dnsapi_option button').css('display','none');
+			} else {
+				$('#dnsapi_option button').css('display','inline-block');
+			}
+			renderDnsapiHtml(data[index]);
+		});
+
+		$('#dnsapi_set').on('click', function(){
+			var index = $('#dnsapi_option option:selected').attr('index');
+			renderDnsapiHtml(data[index]);
+		});
+	},'json');
+}
+
+function opSSLAcme(type, id, siteName, callback){
+	var acme =  '<div class="apply_ssl">\
+		<div class="label-input-group">\
+			<div class="line mtb10">\
+				<span class="tname text-center">验证方式</span>\
+				<div style="margin-top:7px;display:inline-block">\
+					<input type="radio" name="dns_type" onclick="fileCheck()" id="check_file" checked="checked"/>\
+  					<label class="mr20" for="check_file" style="font-weight:normal">文件验证</label></label>\
+  					<input type="radio" name="dns_type" onclick="dnsCheck()" id="check_dns"/>\
+  					<label class="mr20" for="check_dns" style="font-weight:normal">DNS验证</label></label>\
+  				</div>\
+	  		</div>\
+	  		<div class="line mtb10" id="dnsapi_option" style="display:none;">\
+				<span class="tname text-center"></span>\
+				<div style="margin-top:7px;display:inline-block">\
+					<select class="bt-input-text mr20">\
+						<option value="none">手动解析</option>\
+					</select>\
+					<button id="dnsapi_set" class="btn btn-default btn-sm btn-title" style="display:none;">配置</button>\
+  				</div>\
+	  		</div>\
+  			<div class="check_message line">\
+  				<div style="margin-left:100px">\
+  					<input type="checkbox" name="checkDomain" id="checkDomain" checked="">\
+  					<label class="mr20" for="checkDomain" style="font-weight:normal">提前校验域名(提前发现问题,减少失败率)</label>\
+  				</div>\
+  			</div>\
+  		</div>\
+  		<div class="line mtb10">\
+  			<span class="tname text-center">邮箱</span>\
+  			<input class="bt-input-text" style="width:240px;" type="text" name="admin_email" />\
+  		</div>\
+  		<div class="line mtb10">\
+  			<span class="tname text-center">域名</span>\
+  			<ul id="ymlist" style="padding: 5px 10px;max-height:180px;overflow:auto; width:240px;border:#ccc 1px solid;border-radius:3px"></ul>\
+  		</div>\
+  		<div class="line mtb10" style="margin-left:100px">\
+  			<button class="btn btn-success btn-sm letsApply">申请</button>\
+  		</div>\
+		<ul class="help-info-text c7" id="lets_help">\
+			<li>申请之前，请确保域名已解析，如未解析会导致审核失败</li>\
+			<li>由ACME免费申请证书，有效期3个月，支持多域名。默认会自动续签</li>\
+			<li>若您的站点使用了CDN或301重定向会导致续签失败</li>\
+			<li>在未指定SSL默认站点时,未开启SSL的站点使用HTTPS会直接访问到已开启SSL的站点</li></ul>\
+	 	</ul>\
+	</div>';
+
+	$(".tab-con").html(acme);
+
+	renderDnsapi();
+
+	$.post('/site/get_ssl','site_name='+siteName+'&ssl_type=acme', function(data){
+		var rdata = data['data'];
+		if(rdata.csr == false){
+			$.post('/site/get_site_domains','id='+id, function(rdata) {
+				var data = rdata['data'];
+				var opt='';
+				for(var i=0;i<data.domains.length;i++){
+					var isIP = isValidIP(data.domains[i].name);
+					var x = isContains(data.domains[i].name, '*');
+					if(!isIP && !x){
+						opt += '<li style="line-height:26px">\
+							<input type="checkbox" style="margin-right:5px; vertical-align:-2px" value="'+data.domains[i].name+'">'+data.domains[i].name
+						+'</li>';
+					}
+				}
+				$("input[name='admin_email']").val(data.email);
+				$("#ymlist").html(opt);
+				$("#ymlist li input").click(function(e){
+					e.stopPropagation();
+				})
+				$("#ymlist li").click(function(){
+					var o = $(this).find("input");
+					if(o.prop("checked")){
+						o.prop("checked",false)
+					}
+					else{
+						o.prop("checked",true);
+					}
+				})
+				$(".letsApply").click(function(){
+					var c = $("#ymlist input[type='checkbox']");
+					var str = [];
+					var domains = '';
+					for(var i=0; i<c.length; i++){
+						if(c[i].checked){
+							str.push(c[i].value);
+						}
+					}
+					domains = JSON.stringify(str);
+					newAcmeSSL(siteName, id, domains);
+				});
+
+				if (typeof (callback) != 'undefined'){
+					callback(rdata);
+				}
+			},'json');
+			return;
+		}
+		var acme = '<div class="myKeyCon ptb15">\
+				<div class="ssl_state_info" style="display:none;"></div>\
+				<div class="custom_certificate_info">\
+					<div class="ssl-con-key pull-left mr20" readonly>密钥(KEY)<br><textarea id="key" class="bt-input-text">'+rdata.key+'</textarea></div>\
+					<div class="ssl-con-key pull-left" readonly>证书(PEM格式)<br><textarea id="csr" class="bt-input-text">'+rdata.csr+'</textarea></div>\
+				</div>\
+				<div class="ssl-btn pull-left mtb15" style="width:100%">\
+					<button class="btn btn-success btn-sm" onclick="deploySSL(\'acme\','+id+',\''+siteName+'\')">部署</button>\
+					<button class="btn btn-success btn-sm" onclick="deleteSSL(\'acme\','+id+',\''+siteName+'\')">删除</button>\
+				</div>\
+			</div>\
+			<ul class="help-info-text c7 pull-left">\
+				<li>已为您自动生成ACME免费证书</li>\
+				<li>由ACME免费申请证书，有效期3个月，支持多域名。默认会自动续签</li>\
+				<li>如需使用其他SSL,请切换其他证书后粘贴您的KEY以及PEM内容，然后保存即可。</li>\
+			</ul>';
+		$(".tab-con").html(acme);
+
+		if (rdata['cert_data']){
+			var issuer = rdata['cert_data']['issuer'].split(" ");
+			var domains = rdata['cert_data']['dns'].join("、");
+
+			var cert_data = "<div class='state_info_flex'>\
+				<div class='state_item'><span>证书品牌：</span><span class='ellipsis_text'>"+issuer[0]+"</span></div>\
+				<div class='state_item'><span>到期时间：</span><span class='btlink'>剩余"+rdata['cert_data']['endtime']+"天到期</span></div>\
+			</div>\
+			<div class='state_info_flex'>\
+				<div class='state_item'><span>认证域名：</span><span class='ellipsis_text'>"+domains+"</span></div>\
+			</div>";
+			$(".ssl_state_info").html(cert_data);
+			$(".ssl_state_info").css('display','block');
+		}
+	},'json');
+}
+
+function opSSLNow(type, id, siteName, callback){
 	var now = '<div class="myKeyCon ptb15">\
 			<div class="ssl_state_info" style="display:none;"></div>\
 		<div class="custom_certificate_info">\
@@ -2061,10 +2267,66 @@ function opSSL(type, id, siteName, callback){
 		<li>粘贴您的*.key以及*.pem内容，然后保存即可。</li>\
 		<li>如果浏览器提示证书链不完整,请检查是否正确拼接PEM证书</li><li>PEM格式证书 = 域名证书.crt + 根证书(root_bundle).crt</li>\
 		<li>在未指定SSL默认站点时,未开启SSL的站点使用HTTPS会直接访问到已开启SSL的站点</li>\
-	</ul>';	
+	</ul>';
 
-	// 	<input type="radio" name="c_type" onclick="dnsCheck()" id="check_dns"/>\
-	// <label class="mr20" for="check_dns" style="font-weight:normal">DNS验证</label></label>\
+	$(".tab-con").html(now);
+	var key = '';
+	var csr = '';
+	var loadT = layer.msg('正在提交任务...',{icon:16,time:0,shade: [0.3, '#000']});
+	$.post('/site/get_ssl','site_name='+siteName,function(data){
+		layer.close(loadT);
+		var rdata = data['data'];
+
+		if (rdata['cert_data']){
+			var issuer = rdata['cert_data']['issuer'].split(" ");
+			var domains = rdata['cert_data']['dns'].join("、");
+
+			var cert_data = "<div class='state_info_flex'>\
+				<div class='state_item'><span>证书品牌：</span><span class='ellipsis_text'>"+issuer[0]+"</span></div>\
+				<div class='state_item'><span>到期时间：</span><span class='btlink'>剩余"+rdata['cert_data']['endtime']+"天到期</span></div>\
+			</div>\
+			<div class='state_info_flex'>\
+				<div class='state_item'><span>认证域名：</span><span class='ellipsis_text'>"+domains+"</span></div>\
+				<div class='state_item'><span>强制HTTPS：</span><span class='switch'>\
+					<input class='btswitch btswitch-ios' id='toHttps' type='checkbox'>\
+                    <label class='btswitch-btn' for='toHttps' onclick=\"httpToHttps('" + siteName + "')\">\
+				</span></div>\
+			</div>";
+			$(".ssl_state_info").html(cert_data);
+			$(".ssl_state_info").css('display','block');
+		}
+
+		if(rdata.key == false){
+			rdata.key = '';
+		} else {
+			$(".ssl-btn").append('<button style=\'margin-left:3px;\' class="btn btn-success btn-sm" onclick="deleteSSL(\'now\','+id+',\''+siteName+'\')">删除</button>');
+		}
+
+		if(rdata.csr == false){
+			rdata.csr = '';
+		}
+		$("#key").val(rdata.key);
+		$("#csr").val(rdata.csr);
+
+		$("#toHttps").attr('checked',rdata.httpTohttps);
+		if(rdata.status){
+			$('.warning_info').css('display','none');
+			
+			$(".ssl-btn").append("<button class='btn btn-success btn-sm' onclick=\"ocSSL('close_ssl_conf','"+siteName+"')\" style='margin-left:3px;'>关闭SSL</button>");
+			$('#now_ssl').html('当前证书 - <i style="color:#20a53a;">[已部署SSL]</i>');
+		} else{
+			$('.warning_info').css('display','block');
+			$('#now_ssl').html('当前证书 - <i style="color:red;">[未部署SSL]</i>');
+		}
+
+
+		if (typeof (callback) != 'undefined'){
+			callback(rdata);
+		}
+	},'json');
+}
+
+function opSSLLet(type, id, siteName, callback){
 	var lets =  '<div class="apply_ssl">\
 		<div class="label-input-group">\
 			<div class="line mtb10">\
@@ -2102,274 +2364,96 @@ function opSSL(type, id, siteName, callback){
 	  	</ul>\
   	</div>';
 
-  	// <input type="radio" name="c_type" onclick="dnsCheck()" id="check_dns"/>\
-	// <label class="mr20" for="check_dns" style="font-weight:normal">DNS验证</label></label>\
-	var acme =  '<div class="apply_ssl">\
-		<div class="label-input-group">\
-			<div class="line mtb10">\
-				<form>\
-					<span class="tname text-center">验证方式</span>\
-					<div style="margin-top:7px;display:inline-block">\
-						<input type="radio" name="c_type" onclick="fileCheck()" id="check_file" checked="checked" />\
-	  					<label class="mr20" for="check_file" style="font-weight:normal">文件验证</label></label>\
-	  				</div>\
-	  			</form>\
-	  		</div>\
-  			<div class="check_message line">\
-  				<div style="margin-left:100px">\
-  					<input type="checkbox" name="checkDomain" id="checkDomain" checked="">\
-  					<label class="mr20" for="checkDomain" style="font-weight:normal">提前校验域名(提前发现问题,减少失败率)</label>\
-  				</div>\
-  			</div>\
-  		</div>\
-  		<div class="line mtb10">\
-  			<span class="tname text-center">管理员邮箱</span>\
-  			<input class="bt-input-text" style="width:240px;" type="text" name="admin_email" />\
-  		</div>\
-  		<div class="line mtb10">\
-  			<span class="tname text-center">域名</span>\
-  			<ul id="ymlist" style="padding: 5px 10px;max-height:180px;overflow:auto; width:240px;border:#ccc 1px solid;border-radius:3px"></ul>\
-  		</div>\
-  		<div class="line mtb10" style="margin-left:100px">\
-  			<button class="btn btn-success btn-sm letsApply">申请</button>\
-  		</div>\
-		<ul class="help-info-text c7" id="lets_help">\
-			<li>申请之前，请确保域名已解析，如未解析会导致审核失败</li>\
-			<li>由ACME免费申请证书，有效期3个月，支持多域名。默认会自动续签</li>\
-			<li>若您的站点使用了CDN或301重定向会导致续签失败</li>\
-			<li>在未指定SSL默认站点时,未开启SSL的站点使用HTTPS会直接访问到已开启SSL的站点</li></ul>\
-	 	</ul>\
-	</div>';
-
-			
-	switch(type){
-		case 'lets':
-			$(".tab-con").html(lets);
-			$.post('/site/get_ssl',  'site_name='+siteName+'&ssl_type=lets', function(data){
-				var rdata = data['data'];
-				if(rdata.csr == false){
-					$.post('/site/get_site_domains','id='+id, function(rdata) {
-						var data = rdata['data'];
-						var opt='';
-						for(var i=0;i<data.domains.length;i++){
-							var isIP = isValidIP(data.domains[i].name);
-							var x = isContains(data.domains[i].name, '*');
-							if(!isIP && !x){
-								opt+='<li style="line-height:26px"><input type="checkbox" style="margin-right:5px; vertical-align:-2px" value="'+data.domains[i].name+'">'+data.domains[i].name+'</li>'
-							}
+  	$(".tab-con").html(lets);
+	$.post('/site/get_ssl',  'site_name='+siteName+'&ssl_type=lets', function(data){
+		var rdata = data['data'];
+		if(rdata.csr == false){
+			$.post('/site/get_site_domains','id='+id, function(rdata) {
+				var data = rdata['data'];
+				var opt='';
+				for(var i=0;i<data.domains.length;i++){
+					var isIP = isValidIP(data.domains[i].name);
+					var x = isContains(data.domains[i].name, '*');
+					if(!isIP && !x){
+						opt+='<li style="line-height:26px"><input type="checkbox" style="margin-right:5px; vertical-align:-2px" value="'+data.domains[i].name+'">'+data.domains[i].name+'</li>'
+					}
+				}
+				$("input[name='admin_email']").val(data.email);
+				$("#ymlist").html(opt);
+				$("#ymlist li input").click(function(e){
+					e.stopPropagation();
+				})
+				$("#ymlist li").click(function(){
+					var o = $(this).find("input");
+					if(o.prop("checked")){
+						o.prop("checked",false)
+					}
+					else{
+						o.prop("checked",true);
+					}
+				})
+				$(".letsApply").click(function(){
+					var c = $("#ymlist input[type='checkbox']");
+					var str = [];
+					var domains = '';
+					for(var i=0; i<c.length; i++){
+						if(c[i].checked){
+							str.push(c[i].value);
 						}
-						$("input[name='admin_email']").val(data.email);
-						$("#ymlist").html(opt);
-						$("#ymlist li input").click(function(e){
-							e.stopPropagation();
-						})
-						$("#ymlist li").click(function(){
-							var o = $(this).find("input");
-							if(o.prop("checked")){
-								o.prop("checked",false)
-							}
-							else{
-								o.prop("checked",true);
-							}
-						})
-						$(".letsApply").click(function(){
-							var c = $("#ymlist input[type='checkbox']");
-							var str = [];
-							var domains = '';
-							for(var i=0; i<c.length; i++){
-								if(c[i].checked){
-									str.push(c[i].value);
-								}
-							}
-							domains = JSON.stringify(str);
-							newSSL(siteName, id, domains);
-						});
-
-						if (typeof (callback) != 'undefined'){
-							callback(rdata);
-						}
-					},'json');
-					return;
-				}
-				var lets = '<div class="myKeyCon ptb15">\
-						<div class="ssl_state_info" style="display:none;"></div>\
-						<div class="custom_certificate_info">\
-							<div class="ssl-con-key pull-left mr20" readonly>密钥(KEY)<br><textarea id="key" class="bt-input-text">'+rdata.key+'</textarea></div>\
-							<div class="ssl-con-key pull-left" readonly>证书(PEM格式)<br><textarea id="csr" class="bt-input-text">'+rdata.csr+'</textarea></div>\
-						</div>\
-						<div class="ssl-btn pull-left mtb15" style="width:100%">\
-							<button class="btn btn-success btn-sm" onclick="deploySSL(\'lets\','+id+',\''+siteName+'\')">部署</button>\
-							<button class="btn btn-success btn-sm" onclick="renewSSL(\'lets\','+id+',\''+siteName+'\')">续期</button>\
-							<button class="btn btn-success btn-sm" onclick="deleteSSL(\'lets\','+id+',\''+siteName+'\')">删除</button>\
-						</div>\
-					</div>\
-					<ul class="help-info-text c7 pull-left">\
-						<li>已为您自动生成Let\'s Encrypt免费证书</li>\
-						<li>由Let\'s Encrypt免费申请证书，有效期3个月，支持多域名。默认会自动续签</li>\
-						<li>如需使用其他SSL,请切换其他证书后粘贴您的KEY以及PEM内容，然后保存即可。</li>\
-					</ul>';
-				$(".tab-con").html(lets);
-
-				if (rdata['cert_data']){
-					var issuer = rdata['cert_data']['issuer'].split(" ");
-					var domains = rdata['cert_data']['dns'].join("、");
-
-					var cert_data = "<div class='state_info_flex'>\
-						<div class='state_item'><span>证书品牌：</span><span class='ellipsis_text'>"+issuer[0]+"</span></div>\
-						<div class='state_item'><span>到期时间：</span><span class='btlink'>剩余"+rdata['cert_data']['endtime']+"天到期</span></div>\
-					</div>\
-					<div class='state_info_flex'>\
-						<div class='state_item'><span>认证域名：</span><span class='ellipsis_text'>"+domains+"</span></div>\
-					</div>";
-					$(".ssl_state_info").html(cert_data);
-					$(".ssl_state_info").css('display','block');
-				}
-			},'json');			
-			break;
-		case 'acme':
-			$(".tab-con").html(acme);
-			$.post('/site/get_ssl',  'site_name='+siteName+'&ssl_type=acme', function(data){
-				var rdata = data['data'];
-				if(rdata.csr == false){
-					$.post('/site/get_site_domains','id='+id, function(rdata) {
-						var data = rdata['data'];
-						var opt='';
-						for(var i=0;i<data.domains.length;i++){
-							var isIP = isValidIP(data.domains[i].name);
-							var x = isContains(data.domains[i].name, '*');
-							if(!isIP && !x){
-								opt += '<li style="line-height:26px">\
-									<input type="checkbox" style="margin-right:5px; vertical-align:-2px" value="'+data.domains[i].name+'">'+data.domains[i].name
-								+'</li>';
-							}
-						}
-						$("input[name='admin_email']").val(data.email);
-						$("#ymlist").html(opt);
-						$("#ymlist li input").click(function(e){
-							e.stopPropagation();
-						})
-						$("#ymlist li").click(function(){
-							var o = $(this).find("input");
-							if(o.prop("checked")){
-								o.prop("checked",false)
-							}
-							else{
-								o.prop("checked",true);
-							}
-						})
-						$(".letsApply").click(function(){
-							var c = $("#ymlist input[type='checkbox']");
-							var str = [];
-							var domains = '';
-							for(var i=0; i<c.length; i++){
-								if(c[i].checked){
-									str.push(c[i].value);
-								}
-							}
-							domains = JSON.stringify(str);
-							newAcmeSSL(siteName, id, domains);
-						});
-
-						if (typeof (callback) != 'undefined'){
-							callback(rdata);
-						}
-					},'json');
-					return;
-				}
-				var acme = '<div class="myKeyCon ptb15">\
-						<div class="ssl_state_info" style="display:none;"></div>\
-						<div class="custom_certificate_info">\
-							<div class="ssl-con-key pull-left mr20" readonly>密钥(KEY)<br><textarea id="key" class="bt-input-text">'+rdata.key+'</textarea></div>\
-							<div class="ssl-con-key pull-left" readonly>证书(PEM格式)<br><textarea id="csr" class="bt-input-text">'+rdata.csr+'</textarea></div>\
-						</div>\
-						<div class="ssl-btn pull-left mtb15" style="width:100%">\
-							<button class="btn btn-success btn-sm" onclick="deploySSL(\'acme\','+id+',\''+siteName+'\')">部署</button>\
-							<button class="btn btn-success btn-sm" onclick="deleteSSL(\'acme\','+id+',\''+siteName+'\')">删除</button>\
-						</div>\
-					</div>\
-					<ul class="help-info-text c7 pull-left">\
-						<li>已为您自动生成ACME免费证书</li>\
-						<li>由ACME免费申请证书，有效期3个月，支持多域名。默认会自动续签</li>\
-						<li>如需使用其他SSL,请切换其他证书后粘贴您的KEY以及PEM内容，然后保存即可。</li>\
-					</ul>';
-				$(".tab-con").html(acme);
-
-				if (rdata['cert_data']){
-					var issuer = rdata['cert_data']['issuer'].split(" ");
-					var domains = rdata['cert_data']['dns'].join("、");
-
-					var cert_data = "<div class='state_info_flex'>\
-						<div class='state_item'><span>证书品牌：</span><span class='ellipsis_text'>"+issuer[0]+"</span></div>\
-						<div class='state_item'><span>到期时间：</span><span class='btlink'>剩余"+rdata['cert_data']['endtime']+"天到期</span></div>\
-					</div>\
-					<div class='state_info_flex'>\
-						<div class='state_item'><span>认证域名：</span><span class='ellipsis_text'>"+domains+"</span></div>\
-					</div>";
-					$(".ssl_state_info").html(cert_data);
-					$(".ssl_state_info").css('display','block');
-				}
-			},'json');			
-			break;
-		case 'now':
-			$(".tab-con").html(now);
-			var key = '';
-			var csr = '';
-			var loadT = layer.msg('正在提交任务...',{icon:16,time:0,shade: [0.3, '#000']});
-			$.post('/site/get_ssl','site_name='+siteName,function(data){
-				layer.close(loadT);
-				var rdata = data['data'];
-
-				if (rdata['cert_data']){
-					var issuer = rdata['cert_data']['issuer'].split(" ");
-					var domains = rdata['cert_data']['dns'].join("、");
-
-					var cert_data = "<div class='state_info_flex'>\
-						<div class='state_item'><span>证书品牌：</span><span class='ellipsis_text'>"+issuer[0]+"</span></div>\
-						<div class='state_item'><span>到期时间：</span><span class='btlink'>剩余"+rdata['cert_data']['endtime']+"天到期</span></div>\
-					</div>\
-					<div class='state_info_flex'>\
-						<div class='state_item'><span>认证域名：</span><span class='ellipsis_text'>"+domains+"</span></div>\
-						<div class='state_item'><span>强制HTTPS：</span><span class='switch'>\
-							<input class='btswitch btswitch-ios' id='toHttps' type='checkbox'>\
-		                    <label class='btswitch-btn' for='toHttps' onclick=\"httpToHttps('" + siteName + "')\">\
-						</span></div>\
-					</div>";
-					$(".ssl_state_info").html(cert_data);
-					$(".ssl_state_info").css('display','block');
-				}
-
-				if(rdata.key == false){
-					rdata.key = '';
-				} else {
-					$(".ssl-btn").append('<button style=\'margin-left:3px;\' class="btn btn-success btn-sm" onclick="deleteSSL(\'now\','+id+',\''+siteName+'\')">删除</button>');
-				}
-
-				if(rdata.csr == false){
-					rdata.csr = '';
-				}
-				$("#key").val(rdata.key);
-				$("#csr").val(rdata.csr);
-
-				$("#toHttps").attr('checked',rdata.httpTohttps);
-				if(rdata.status){
-					$('.warning_info').css('display','none');
-					
-					$(".ssl-btn").append("<button class='btn btn-success btn-sm' onclick=\"ocSSL('close_ssl_conf','"+siteName+"')\" style='margin-left:3px;'>关闭SSL</button>");
-					$('#now_ssl').html('当前证书 - <i style="color:#20a53a;">[已部署SSL]</i>');
-				} else{
-					$('.warning_info').css('display','block');
-					$('#now_ssl').html('当前证书 - <i style="color:red;">[未部署SSL]</i>');
-				}
-
+					}
+					domains = JSON.stringify(str);
+					newSSL(siteName, id, domains);
+				});
 
 				if (typeof (callback) != 'undefined'){
 					callback(rdata);
 				}
 			},'json');
-			break;
-		default:
-			layer.msg("错误类型", {icon:5});
-			break;
+			return;
+		}
+		var lets = '<div class="myKeyCon ptb15">\
+				<div class="ssl_state_info" style="display:none;"></div>\
+				<div class="custom_certificate_info">\
+					<div class="ssl-con-key pull-left mr20" readonly>密钥(KEY)<br><textarea id="key" class="bt-input-text">'+rdata.key+'</textarea></div>\
+					<div class="ssl-con-key pull-left" readonly>证书(PEM格式)<br><textarea id="csr" class="bt-input-text">'+rdata.csr+'</textarea></div>\
+				</div>\
+				<div class="ssl-btn pull-left mtb15" style="width:100%">\
+					<button class="btn btn-success btn-sm" onclick="deploySSL(\'lets\','+id+',\''+siteName+'\')">部署</button>\
+					<button class="btn btn-success btn-sm" onclick="renewSSL(\'lets\','+id+',\''+siteName+'\')">续期</button>\
+					<button class="btn btn-success btn-sm" onclick="deleteSSL(\'lets\','+id+',\''+siteName+'\')">删除</button>\
+				</div>\
+			</div>\
+			<ul class="help-info-text c7 pull-left">\
+				<li>已为您自动生成Let\'s Encrypt免费证书</li>\
+				<li>由Let\'s Encrypt免费申请证书，有效期3个月，支持多域名。默认会自动续签</li>\
+				<li>如需使用其他SSL,请切换其他证书后粘贴您的KEY以及PEM内容，然后保存即可。</li>\
+			</ul>';
+		$(".tab-con").html(lets);
+
+		if (rdata['cert_data']){
+			var issuer = rdata['cert_data']['issuer'].split(" ");
+			var domains = rdata['cert_data']['dns'].join("、");
+
+			var cert_data = "<div class='state_info_flex'>\
+				<div class='state_item'><span>证书品牌：</span><span class='ellipsis_text'>"+issuer[0]+"</span></div>\
+				<div class='state_item'><span>到期时间：</span><span class='btlink'>剩余"+rdata['cert_data']['endtime']+"天到期</span></div>\
+			</div>\
+			<div class='state_info_flex'>\
+				<div class='state_item'><span>认证域名：</span><span class='ellipsis_text'>"+domains+"</span></div>\
+			</div>";
+			$(".ssl_state_info").html(cert_data);
+			$(".ssl_state_info").css('display','block');
+		}
+	},'json');
+}
+
+//SSL
+function opSSL(type, id, siteName, callback){
+	switch(type){
+		case 'lets':opSSLLet(type, id, siteName, callback);break;
+		case 'acme':opSSLAcme(type, id, siteName, callback);break;
+		case 'now':opSSLNow(type, id, siteName, callback);break;
+		default:layer.msg("错误类型", {icon:5});break;
 	}
 }
 
diff --git a/web/thisdb/sites.py b/web/thisdb/sites.py
index 8ea9f7986..487b54897 100644
--- a/web/thisdb/sites.py
+++ b/web/thisdb/sites.py
@@ -10,6 +10,8 @@
 
 import core.mw as mw
 
+from .option  import getOption
+
 __FIELD = 'id,name,path,status,ps,edate,type_id,add_time,update_time'
 
 def getSitesCount():
@@ -32,7 +34,7 @@ def getSitesDomainById(site_id):
         t['id'] = b['id']
         domains.append(t)
     data['domains'] = domains
-    data['email'] = mw.M('users').getField('email')
+    data['email'] = getOption('ssl_email', default='')
     return data
 
 def addSites(name, path):
diff --git a/web/utils/site.py b/web/utils/site.py
index 3c860e4e4..dd865fe7c 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -137,6 +137,18 @@ class sites(object):
             return path[0:-1]
         return path
 
+    def getSitePath(self, siteName):
+        file = self.getHostConf(siteName)
+        if os.path.exists(file):
+            conf = mw.readFile(file)
+            rep = r'\s*root\s*(.+);'
+            find_cnf = re.search(rep, conf)
+            if not find_cnf:
+                return ''
+            path = find_cnf.groups()[0]
+            return path
+        return ''
+
     def createRootDir(self, path):
         autoInit = False
         if not os.path.exists(path):
@@ -1319,7 +1331,7 @@ location ^~ {from} {\n\
         to_https = self.isToHttps(site_name)
 
         info = thisdb.getSitesByName(site_name)
-        domains = mw.M('domain').where("pid=?", (info['id'],)).field('name').select()
+        domains = mw.M('domain').field('name').where("pid=?", (info['id'],)).select()
 
         csr_path = path + '/fullchain.pem'  # 生成证书路径
         key_path = path + '/privkey.pem'    # 密钥文件路径
@@ -1333,15 +1345,13 @@ location ^~ {from} {\n\
             csr_path = acme_dir + '/fullchain.cer'              # ACME生成证书路径
             key_path = acme_dir + '/' + site_name + '.key'      # ACME密钥文件路径
 
+        key = ''
         if os.path.exists(key_path):
             key = mw.readFile(key_path)
-        else:
-            key = ''
 
+        csr = ''
         if os.path.exists(csr_path):
             csr = mw.readFile(csr_path)
-        else:
-            csr = ''
 
         cert_data = mw.getCertName(csr_path)
         data = {
@@ -1472,6 +1482,198 @@ location ^~ {from} {\n\
         thisdb.addSiteTypes(name)
         return mw.returnData(True, '添加成功!')
 
+    def getDnsapi(self):
+        dnsapi_data = thisdb.getOptionByJson('dnsapi', default={})
+        dnsapi_option = [
+            {"name":"none", "title":'手动解析', 'key':''},
+            {"name":"dns_ali", "title":'Aliyun', 'key':'Ali_Key:Ali_Secret'},
+            {"name":"dns_cf", "title":'cloudflare', 'key':'CF_Key:CF_Email'},
+            {"name":"dns_dp", "title":'dnspod/国内', 'key':'DP_Id:DP_Key'},
+            {"name":"dns_dpi", "title":'dnspod/国际', 'key':'DPI_Id:DPI_Key'},
+            {"name":"dns_gd", "title":'GoDaddy', 'key':'GD_Key:GD_Secret'},
+            {"name":"dns_pdns", "title":'PowerDNS', 'key':'PDNS_Url:PDNS_ServerId:PDNS_Token:PDNS_Ttl'},
+            {"name":"dns_lua", "title":'LuaDNS', 'key':'LUA_Key:LUA_Email'},
+            {"name":"dns_me", "title":'DNSMadeEasy', 'key':'ME_Key:ME_Secret'},
+            {"name":"dns_aws", "title":'Amazon Route53', 'key':'AWS_ACCESS_KEY_ID:AWS_SECRET_ACCESS_KEY'},
+            {"name":"dns_ispconfig", "title":'ISPConfig', 'key':'ISPC_User:ISPC_Password:ISPC_Api:ISPC_Api_Insecure'},
+            {"name":"dns_ad", "title":'Alwaysdata', 'key':'AD_API_KEY'},
+            {"name":"dns_linode_v4", "title":'Linode', 'key':'LINODE_V4_API_KEY'},
+            {"name":"dns_freedns", "title":'FreeDNS', 'key':'FREEDNS_User:FREEDNS_Password'},
+            {"name":"dns_cyon", "title":'cyon.ch', 'key':'CY_Username:CY_Password:CY_OTP_Secret'},
+            {"name":"dns_gandi_livedns", "title":'LiveDNS', 'key':'GANDI_LIVEDNS_TOKEN'},
+            {"name":"dns_knot", "title":'Knot', 'key':'KNOT_SERVER:KNOT_KEY'},
+            {"name":"dns_dgon", "title":'DigitalOcean', 'key':'DO_API_KEY'},
+            {"name":"dns_cloudns", "title":'ClouDNS.net', 'key':'CLOUDNS_SUB_AUTH_ID:CLOUDNS_AUTH_PASSWORD'},
+            {"name":"dns_namesilo", "title":'Namesilo', 'key':'Namesilo_Key'},
+            {"name":"dns_azure", "title":'Azure', 'key':'AZUREDNS_SUBSCRIPTIONID:AZUREDNS_TENANTID:AZUREDNS_APPID:AZUREDNS_CLIENTSECRET'},
+            {"name":"dns_selectel", "title":'selectel.com', 'key':'SL_Key'},
+            {"name":"dns_zonomi", "title":'zonomi.com', 'key':'ZM_Key'},
+            {"name":"dns_kinghost", "title":'KingHost', 'key':'KINGHOST_Username:KINGHOST_Password'},
+            {"name":"dns_zilore", "title":'Zilore', 'key':'Zilore_Key'},
+            {"name":"dns_gcloud", "title":'Google Cloud DNS', 'key':'CLOUDSDK_ACTIVE_CONFIG_NAME'},
+            {"name":"dns_mydnsjp", "title":'MyDNS.JP', 'key':'MYDNSJP_MasterID:MYDNSJP_Password'},
+            {"name":"dns_doapi", "title":'do.de', 'key':'DO_LETOKEN'},
+            {"name":"dns_online", "title":'Online', 'key':'ONLINE_API_KEY'},
+            {"name":"dns_cn", "title":'Core-Networks', 'key':'CN_User:CN_Password'},
+            {"name":"dns_ultra", "title":'UltraDNS', 'key':'ULTRA_USR:ULTRA_PWD'},
+            {"name":"dns_hetzner", "title":'Hetzner', 'key':'HETZNER_Token'},
+            {"name":"dns_ddnss", "title":'DDNSS.de', 'key':'DDNSS_Token'},
+        ];
+
+        for i in range(len(dnsapi_option)):
+            dval = dnsapi_option[i]['key']
+            dname = dnsapi_option[i]['name']
+            if dname == 'none':
+                continue
+
+            keys = dval.split(':')
+            data = {}
+            if dname in dnsapi_data:
+                dnsapi_option[i]['data'] = dnsapi_data[dname]
+                dnsapi_option[i]['title'] = dnsapi_option[i]['title'] + '[已配置]'
+            else:
+                t = {}
+                for field in keys:
+                    t[field] = ''
+                dnsapi_option[i]['data'] = t
+        return dnsapi_option
+
+    def createAcme(self, site_name, domains, force, renew, input_email):
+        domains = json.loads(domains)
+
+        print(site_name,domains,input_email,renew,force)
+        email = thisdb.getOption('ssl_email', default='')
+        if input_email.strip() != '':
+            thisdb.setOption('ssl_email', input_email)
+            email = input_email
+
+        if not len(domains):
+            return mw.returnData(False, '请选择域名')
+
+        file = self.getHostConf(site_name)
+        if os.path.exists(file):
+            siteConf = mw.readFile(file)
+            if siteConf.find('301-END') != -1:
+                return mw.returnData(False, '检测到您的站点做了301重定向设置，请先关闭重定向!')
+
+            # 检测存在反向代理
+            data_path = self.getProxyDataPath(site_name)
+            data_content = mw.readFile(data_path)
+            if data_content != False:
+                try:
+                    data = json.loads(data_content)
+                except:
+                    pass
+                for proxy in data:
+                    proxy_dir = "{}/{}".format(self.proxyPath, site_name)
+                    proxy_dir_file = proxy_dir + '/' + proxy['id'] + '.conf'
+                    if os.path.exists(proxy_dir_file):
+                        return mw.returnData(False, '检测到您的站点做了反向代理设置，请先关闭反向代理!')
+
+        siteInfo = thisdb.getSitesByName(site_name)
+        path = self.getSitePath(site_name)
+        if path == '':
+            return mw.returnData(False, '【'+site_name+'】配置文件,异常!')
+
+        srcPath = siteInfo['path']
+
+        # 检测acme是否安装
+        acme_dir = mw.getAcmeDir()
+        if not os.path.exists(acme_dir):
+            try:
+                mw.execShell("curl -sS curl https://get.acme.sh | sh")
+            except:
+                pass
+        if not os.path.exists(acme_dir):
+            return mw.returnData(False, '尝试自动安装ACME失败,请通过以下命令尝试手动安装<p>安装命令: curl https://get.acme.sh | sh</p>')
+
+        # 避免频繁执行
+        checkAcmeRun = mw.execShell('ps -ef|grep acme.sh |grep -v grep')
+        if checkAcmeRun[0] != '':
+            return mw.returnData(False, '正在申请或更新SSL中...')
+
+        if force == 'true':
+            force_bool = True
+
+        if renew == 'true':
+            execStr = acme_dir + "/acme.sh --renew --yes-I-know-dns-manual-mode-enough-go-ahead-please"
+        else:
+            execStr = acme_dir + "/acme.sh --issue --force"
+
+        # 确定主域名顺序
+        domainsTmp = []
+        if site_name in domains:
+            domainsTmp.append(site_name)
+        for domainTmp in domains:
+            if domainTmp == site_name:
+                continue
+            domainsTmp.append(domainTmp)
+        domains = domainsTmp
+
+        domainCount = 0
+        for domain in domains:
+            if mw.checkIp(domain):
+                continue
+            if domain.find('*.') != -1:
+                return mw.returnData(False, '泛域名不能使用【文件验证】的方式申请证书!')
+            execStr += ' -w ' + path
+            execStr += ' -d ' + domain
+            domainCount += 1
+        if domainCount == 0:
+            return mw.returnData(False, '请选择域名(不包括IP地址与泛域名)!')
+
+        log_file = mw.getPanelDir() + '/logs/acme.log'
+        mw.writeFile(log_file, "开始ACME申请...\n", "wb+")
+        cmd = 'export ACCOUNT_EMAIL=' + email + ' && ' + execStr + ' >> ' + log_file
+        # print(domains)
+        # print(cmd)
+        result = mw.execShell(cmd)
+
+        src_path = mw.getAcmeDomainDir(domains[0])
+        src_cert = src_path + '/fullchain.cer'
+        src_key = src_path + '/' + domains[0] + '.key'
+        src_cert.replace("\\*", "*")
+
+        msg = '签发失败,您尝试申请证书的失败次数已达上限!<p>1、检查域名是否绑定到对应站点</p>\
+            <p>2、检查域名是否正确解析到本服务器,或解析还未完全生效</p>\
+            <p>3、如果您的站点设置了反向代理,或使用了CDN,请先将其关闭</p>\
+            <p>4、如果您的站点设置了301重定向,请先将其关闭</p>\
+            <p>5、如果以上检查都确认没有问题，请尝试更换DNS服务商</p>'
+        if not os.path.exists(src_cert):
+            data = {}
+            data['err'] = result
+            data['out'] = result[0]
+            data['msg'] = msg
+            data['result'] = {}
+            if result[1].find('new-authz error:') != -1:
+                data['result'] = json.loads(
+                    re.search("{.+}", result[1]).group())
+                if data['result']['status'] == 429:
+                    data['msg'] = msg
+            data['status'] = False
+            return mw.getJson(data)
+
+        dst_path = self.sslDir + '/' + site_name
+        dst_cert = dst_path + "/fullchain.pem"  # 生成证书路径
+        dst_key = dst_path + "/privkey.pem"  # 密钥文件路径
+
+        if not os.path.exists(dst_path):
+            mw.execShell("mkdir -p " + dst_path)
+
+        mw.buildSoftLink(src_cert, dst_cert, True)
+        mw.buildSoftLink(src_key, dst_key, True)
+        mw.execShell('echo "acme" > "' + dst_path + '/README"')
+
+        # 写入配置文件
+        result = self.setSslConf(site_name)
+        if not result['status']:
+            return mw.getJson(result)
+        result['csr'] = mw.readFile(src_cert)
+        result['key'] = mw.readFile(src_key)
+
+        mw.restartWeb()
+        return mw.returnData(True, '证书已更新!', result)
+
 
     def getPhpVersion(self):
         phpVersions = ('00', '52', '53', '54', '55',

From 4c1e2a206d08959157f2b800a963ccf05ebac2af Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 22 Nov 2024 01:09:42 +0800
Subject: [PATCH 198/965] up

---
 web/admin/site/ssl.py      |  10 +++-
 web/admin/site/ssl_acme.py |   4 +-
 web/static/app/site.js     | 118 +++++++++++++++++++++++++------------
 web/utils/site.py          | 105 ++++++++++++++++++++-------------
 4 files changed, 155 insertions(+), 82 deletions(-)

diff --git a/web/admin/site/ssl.py b/web/admin/site/ssl.py
index 724df7b1e..15b6a129d 100644
--- a/web/admin/site/ssl.py
+++ b/web/admin/site/ssl.py
@@ -39,12 +39,20 @@ def get_cert_list():
     return MwSites.instance().getCertList()
 
 
-# 获取证书配置
+# 获取DNSAPI
 @blueprint.route('/get_dnsapi', endpoint='get_dnsapi', methods=['GET','POST'])
 @panel_login_required
 def get_dnsapi():
     return MwSites.instance().getDnsapi()
 
+# 设置DNSAPI
+@blueprint.route('/set_dnsapi', endpoint='set_dnsapi', methods=['GET','POST'])
+@panel_login_required
+def set_dnsapi():
+    type = request.form.get('type', '')
+    data = request.form.get('data')
+    return MwSites.instance().setDnsapi(type,data)
+
 
 
 
diff --git a/web/admin/site/ssl_acme.py b/web/admin/site/ssl_acme.py
index 98aa599fc..81938bde1 100644
--- a/web/admin/site/ssl_acme.py
+++ b/web/admin/site/ssl_acme.py
@@ -42,7 +42,9 @@ def create_acme():
     force = request.form.get('force', '')
     renew = request.form.get('renew', '')
     email = request.form.get('email', '')
-    return MwSites.instance().createAcme(site_name, domains,force,renew,email)
+    apply_type = request.form.get('apply_type', 'file')
+    dnspai = request.form.get('dnspai','') 
+    return MwSites.instance().createAcme(site_name, domains,force,renew,apply_type,dnspai, email)
 
 
 
diff --git a/web/static/app/site.js b/web/static/app/site.js
index c44577a6b..11e432136 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -2036,16 +2036,20 @@ function renewSSL(type,id,siteName){
 	});	
 }
 
-function fileCheck(){
-	$('#dnsapi_option').css('display','none');
-}
 
-function dnsCheck(){
-	$('#dnsapi_option').css('display','block');
-}
 
 function renderDnsapiHtml(data){
-	console.log(data);
+
+	var fields = data.data;
+	var fields_html = '';
+
+	for (var d in fields) {
+		fields_html += "<span class='tname'>"+d+"</span>\
+	    <div class='info-r'>\
+	        <input name='"+d+"' class='bt-input-text mr5' style='width:100%;' value='"+fields[d]+"' type='text'>\
+	    </div>";
+	}
+
 	layer.open({
         type: 1,
         area: '500px',
@@ -2058,20 +2062,13 @@ function renderDnsapiHtml(data){
 			<div class='line'>\
 			    <span class='tname'>DNSAPI类型</span>\
 			    <div class='info-r'>\
-			        <select class='bt-input-text mr5' name='type' style='width:100%;'>\
+			        <select class='bt-input-text mr5' name='type_name' style='width:100%;'>\
 			            <option name='cf'>"+data['name']+"</option>\
 			        </select>\
 			    </div>\
 			</div>\
 			<div class='line' id='dnsapi_option'>\
-			    <span class='tname'>CF_Key</span>\
-			    <div class='info-r'>\
-			        <input name='v1' class='bt-input-text mr5' style='width:100%;' placeholder='请输入对应值' type='text'>\
-			    </div>\
-			    <span class='tname'>CF_Email</span>\
-			    <div class='info-r'>\
-			        <input name='v2' class='bt-input-text mr5' style='width:100%;' placeholder='请输入对应值' type='text'>\
-			    </div>\
+			    "+fields_html+"\
 			</div>\
 			<div class='line'>\
 				<div>\
@@ -2081,17 +2078,29 @@ function renderDnsapiHtml(data){
 				</div>\
 			</div>\
 		</form>",
-        success:function(){
-            
-        },
-        yes:function(index) {
-            
+        yes:function(index,l) {
+            var type_name = $('select[name="type_name"]').val();
+            var data_field = {};
+            for (var d in fields) {
+            	data_field[d] = $('input[name="'+d+'"]').val();
+			}
+
+            $.post('/site/set_dnsapi', {'type':type_name,'data':JSON.stringify(data_field)}, function(rdata){
+            	showMsg(rdata.msg, function(){
+            		if (rdata.status){
+            			layer.close(index);
+            			renderDnsapi();
+            		}
+            	},{icon:rdata.status?1:2});
+            },'json');
         }
     });
 
 }
 
 function renderDnsapi(){
+	$('#dnsapi_set').css('display', 'none');
+
 	$.post('/site/get_dnsapi', {}, function(data){
 		var dnsapi_option = '';
 		for (var i = 0; i < data.length; i++) {
@@ -2099,7 +2108,6 @@ function renderDnsapi(){
 		}
 
 		$('#dnsapi_option select').html(dnsapi_option);
-
 		$('#dnsapi_option select').on('change',function(){
 			var val = $(this).val();
 			var index = $('#dnsapi_option option:selected').attr('index');
@@ -2107,8 +2115,10 @@ function renderDnsapi(){
 				$('#dnsapi_option button').css('display','none');
 			} else {
 				$('#dnsapi_option button').css('display','inline-block');
+				if (!(data[index]['title'].indexOf('[')>0)){
+					renderDnsapiHtml(data[index]);					
+				}
 			}
-			renderDnsapiHtml(data[index]);
 		});
 
 		$('#dnsapi_set').on('click', function(){
@@ -2124,21 +2134,27 @@ function opSSLAcme(type, id, siteName, callback){
 			<div class="line mtb10">\
 				<span class="tname text-center">验证方式</span>\
 				<div style="margin-top:7px;display:inline-block">\
-					<input type="radio" name="dns_type" onclick="fileCheck()" id="check_file" checked="checked"/>\
+					<input type="radio" name="apply_type" value="file" id="check_file" checked="checked"/>\
   					<label class="mr20" for="check_file" style="font-weight:normal">文件验证</label></label>\
-  					<input type="radio" name="dns_type" onclick="dnsCheck()" id="check_dns"/>\
+  					<input type="radio" name="apply_type" value="dns" id="check_dns"/>\
   					<label class="mr20" for="check_dns" style="font-weight:normal">DNS验证</label></label>\
   				</div>\
 	  		</div>\
 	  		<div class="line mtb10" id="dnsapi_option" style="display:none;">\
-				<span class="tname text-center"></span>\
+				<span class="tname text-center" style="line-height: 42px;">选择DNS接口</span>\
 				<div style="margin-top:7px;display:inline-block">\
-					<select class="bt-input-text mr20">\
+					<select name="dnspai" class="bt-input-text mr20">\
 						<option value="none">手动解析</option>\
 					</select>\
 					<button id="dnsapi_set" class="btn btn-default btn-sm btn-title" style="display:none;">配置</button>\
   				</div>\
 	  		</div>\
+  			<div class="check_message line" id="wildcard_domain_block" style="display:none;">\
+  				<div style="margin-left:100px">\
+  					<input type="checkbox" name="wildcard_domain" id="wildcard_domain" checked="checked">\
+  					<label class="mr20" for="wildcard_domain" style="font-weight:normal">自动组合泛域名</label>\
+  				</div>\
+  			</div>\
   			<div class="check_message line">\
   				<div style="margin-left:100px">\
   					<input type="checkbox" name="checkDomain" id="checkDomain" checked="">\
@@ -2167,6 +2183,18 @@ function opSSLAcme(type, id, siteName, callback){
 
 	$(".tab-con").html(acme);
 
+	$('input[name="apply_type"]').on('change', function(){
+		var val = $(this).val();
+		if (val == 'file'){
+			$('#dnsapi_option').css('display','none');
+			$('#wildcard_domain_block').css('display','none');
+		} else {
+			$('#dnsapi_option').css('display','block');
+			$('#wildcard_domain_block').css('display','block');
+		}
+	});
+
+
 	renderDnsapi();
 
 	$.post('/site/get_ssl','site_name='+siteName+'&ssl_type=acme', function(data){
@@ -2346,7 +2374,7 @@ function opSSLLet(type, id, siteName, callback){
   			</div>\
   		</div>\
   		<div class="line mtb10">\
-  			<span class="tname text-center">管理员邮箱</span>\
+  			<span class="tname text-center">邮箱</span>\
   			<input class="bt-input-text" style="width:240px;" type="text" name="admin_email" />\
   		</div>\
   		<div class="line mtb10">\
@@ -2512,19 +2540,31 @@ function newSSL(siteName, id, domains){
 function newAcmeSSL(siteName, id, domains){
 	showSpeedWindow('正在由ACME申请...', 'site.get_acme_logs', function(layers,index){
 		var force = '';
-		if($("#checkDomain").prop("checked")){
-			force = '&force=true';
-		}
 		var email = $("input[name='admin_email']").val();
-		$.post('/site/create_acme','siteName='+siteName+'&domains='+domains+'&email='+email + force,function(rdata){
-			layer.close(index);
-			if(rdata.status){
-				showMsg(rdata.msg, function(){
+		var apply_type = $('input[name="apply_type"]:checked').val();
+
+		var pdata = {};
+		pdata['siteName'] = siteName;
+		pdata['domains'] = domains;
+		pdata['email'] = email;
+		pdata['apply_type'] = apply_type;
+		if($("#checkDomain").prop("checked")){
+			pdata['force'] = 'true';
+		}
+
+		if (apply_type == 'dns'){
+			pdata['dnspai'] = $('#dnsapi_option option:selected').val();
+		}
+
+		console.log(pdata);
+		$.post('/site/create_acme',pdata,function(rdata){
+			console.log(rdata);
+			showMsg(rdata.msg, function(){
+				layer.close(index);
+				if(rdata.status){	
 					$(".tab-nav span:first-child").click();
-				},{icon:1}, 2000);
-				return;
-			}
-			layer.msg(rdata.msg,{icon:2,area:'500px',time:0,shade:0.3,shadeClose:true});
+				}
+			},{icon:rdata.status?1:2}, 3000);
 		},'json');
 	});
 }
diff --git a/web/utils/site.py b/web/utils/site.py
index dd865fe7c..54f20ed48 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1490,34 +1490,34 @@ location ^~ {from} {\n\
             {"name":"dns_cf", "title":'cloudflare', 'key':'CF_Key:CF_Email'},
             {"name":"dns_dp", "title":'dnspod/国内', 'key':'DP_Id:DP_Key'},
             {"name":"dns_dpi", "title":'dnspod/国际', 'key':'DPI_Id:DPI_Key'},
-            {"name":"dns_gd", "title":'GoDaddy', 'key':'GD_Key:GD_Secret'},
-            {"name":"dns_pdns", "title":'PowerDNS', 'key':'PDNS_Url:PDNS_ServerId:PDNS_Token:PDNS_Ttl'},
-            {"name":"dns_lua", "title":'LuaDNS', 'key':'LUA_Key:LUA_Email'},
-            {"name":"dns_me", "title":'DNSMadeEasy', 'key':'ME_Key:ME_Secret'},
-            {"name":"dns_aws", "title":'Amazon Route53', 'key':'AWS_ACCESS_KEY_ID:AWS_SECRET_ACCESS_KEY'},
-            {"name":"dns_ispconfig", "title":'ISPConfig', 'key':'ISPC_User:ISPC_Password:ISPC_Api:ISPC_Api_Insecure'},
-            {"name":"dns_ad", "title":'Alwaysdata', 'key':'AD_API_KEY'},
-            {"name":"dns_linode_v4", "title":'Linode', 'key':'LINODE_V4_API_KEY'},
-            {"name":"dns_freedns", "title":'FreeDNS', 'key':'FREEDNS_User:FREEDNS_Password'},
-            {"name":"dns_cyon", "title":'cyon.ch', 'key':'CY_Username:CY_Password:CY_OTP_Secret'},
-            {"name":"dns_gandi_livedns", "title":'LiveDNS', 'key':'GANDI_LIVEDNS_TOKEN'},
-            {"name":"dns_knot", "title":'Knot', 'key':'KNOT_SERVER:KNOT_KEY'},
-            {"name":"dns_dgon", "title":'DigitalOcean', 'key':'DO_API_KEY'},
-            {"name":"dns_cloudns", "title":'ClouDNS.net', 'key':'CLOUDNS_SUB_AUTH_ID:CLOUDNS_AUTH_PASSWORD'},
-            {"name":"dns_namesilo", "title":'Namesilo', 'key':'Namesilo_Key'},
-            {"name":"dns_azure", "title":'Azure', 'key':'AZUREDNS_SUBSCRIPTIONID:AZUREDNS_TENANTID:AZUREDNS_APPID:AZUREDNS_CLIENTSECRET'},
-            {"name":"dns_selectel", "title":'selectel.com', 'key':'SL_Key'},
-            {"name":"dns_zonomi", "title":'zonomi.com', 'key':'ZM_Key'},
-            {"name":"dns_kinghost", "title":'KingHost', 'key':'KINGHOST_Username:KINGHOST_Password'},
-            {"name":"dns_zilore", "title":'Zilore', 'key':'Zilore_Key'},
-            {"name":"dns_gcloud", "title":'Google Cloud DNS', 'key':'CLOUDSDK_ACTIVE_CONFIG_NAME'},
-            {"name":"dns_mydnsjp", "title":'MyDNS.JP', 'key':'MYDNSJP_MasterID:MYDNSJP_Password'},
-            {"name":"dns_doapi", "title":'do.de', 'key':'DO_LETOKEN'},
-            {"name":"dns_online", "title":'Online', 'key':'ONLINE_API_KEY'},
-            {"name":"dns_cn", "title":'Core-Networks', 'key':'CN_User:CN_Password'},
-            {"name":"dns_ultra", "title":'UltraDNS', 'key':'ULTRA_USR:ULTRA_PWD'},
-            {"name":"dns_hetzner", "title":'Hetzner', 'key':'HETZNER_Token'},
-            {"name":"dns_ddnss", "title":'DDNSS.de', 'key':'DDNSS_Token'},
+            # {"name":"dns_gd", "title":'GoDaddy', 'key':'GD_Key:GD_Secret'},
+            # {"name":"dns_pdns", "title":'PowerDNS', 'key':'PDNS_Url:PDNS_ServerId:PDNS_Token:PDNS_Ttl'},
+            # {"name":"dns_lua", "title":'LuaDNS', 'key':'LUA_Key:LUA_Email'},
+            # {"name":"dns_me", "title":'DNSMadeEasy', 'key':'ME_Key:ME_Secret'},
+            # {"name":"dns_aws", "title":'Amazon Route53', 'key':'AWS_ACCESS_KEY_ID:AWS_SECRET_ACCESS_KEY'},
+            # {"name":"dns_ispconfig", "title":'ISPConfig', 'key':'ISPC_User:ISPC_Password:ISPC_Api:ISPC_Api_Insecure'},
+            # {"name":"dns_ad", "title":'Alwaysdata', 'key':'AD_API_KEY'},
+            # {"name":"dns_linode_v4", "title":'Linode', 'key':'LINODE_V4_API_KEY'},
+            # {"name":"dns_freedns", "title":'FreeDNS', 'key':'FREEDNS_User:FREEDNS_Password'},
+            # {"name":"dns_cyon", "title":'cyon.ch', 'key':'CY_Username:CY_Password:CY_OTP_Secret'},
+            # {"name":"dns_gandi_livedns", "title":'LiveDNS', 'key':'GANDI_LIVEDNS_TOKEN'},
+            # {"name":"dns_knot", "title":'Knot', 'key':'KNOT_SERVER:KNOT_KEY'},
+            # {"name":"dns_dgon", "title":'DigitalOcean', 'key':'DO_API_KEY'},
+            # {"name":"dns_cloudns", "title":'ClouDNS.net', 'key':'CLOUDNS_SUB_AUTH_ID:CLOUDNS_AUTH_PASSWORD'},
+            # {"name":"dns_namesilo", "title":'Namesilo', 'key':'Namesilo_Key'},
+            # {"name":"dns_azure", "title":'Azure', 'key':'AZUREDNS_SUBSCRIPTIONID:AZUREDNS_TENANTID:AZUREDNS_APPID:AZUREDNS_CLIENTSECRET'},
+            # {"name":"dns_selectel", "title":'selectel.com', 'key':'SL_Key'},
+            # {"name":"dns_zonomi", "title":'zonomi.com', 'key':'ZM_Key'},
+            # {"name":"dns_kinghost", "title":'KingHost', 'key':'KINGHOST_Username:KINGHOST_Password'},
+            # {"name":"dns_zilore", "title":'Zilore', 'key':'Zilore_Key'},
+            # {"name":"dns_gcloud", "title":'Google Cloud DNS', 'key':'CLOUDSDK_ACTIVE_CONFIG_NAME'},
+            # {"name":"dns_mydnsjp", "title":'MyDNS.JP', 'key':'MYDNSJP_MasterID:MYDNSJP_Password'},
+            # {"name":"dns_doapi", "title":'do.de', 'key':'DO_LETOKEN'},
+            # {"name":"dns_online", "title":'Online', 'key':'ONLINE_API_KEY'},
+            # {"name":"dns_cn", "title":'Core-Networks', 'key':'CN_User:CN_Password'},
+            # {"name":"dns_ultra", "title":'UltraDNS', 'key':'ULTRA_USR:ULTRA_PWD'},
+            # {"name":"dns_hetzner", "title":'Hetzner', 'key':'HETZNER_Token'},
+            # {"name":"dns_ddnss", "title":'DDNSS.de', 'key':'DDNSS_Token'},
         ];
 
         for i in range(len(dnsapi_option)):
@@ -1538,17 +1538,39 @@ location ^~ {from} {\n\
                 dnsapi_option[i]['data'] = t
         return dnsapi_option
 
-    def createAcme(self, site_name, domains, force, renew, input_email):
+    def setDnsapi(self, type, data):
+        dnsapi_data = thisdb.getOptionByJson('dnsapi', default={})
+        dnsapi_data[type] = json.loads(data)
+        thisdb.setOption('dnsapi',json.dumps(dnsapi_data))
+        return mw.returnData(True, '设置成功!')
+
+
+    def acmeLogFile(self):
+        return mw.getPanelDir() + '/logs/acme.log'
+
+    def writeAcmeLog(self,msg):
+        log_file = self.acmeLogFile()
+        mw.writeFile(log_file, msg+"\n", "wb+")
+        return True
+
+    def createAcmeMultiDomin(self):
+        pass
+
+    def createAcmeFile(self):
+        pass
+
+    def createAcmeDns(self):
+        pass
+
+    def createAcme(self, site_name, domains,force,renew, apply_type, dnspai, email):
         domains = json.loads(domains)
-
-        print(site_name,domains,input_email,renew,force)
-        email = thisdb.getOption('ssl_email', default='')
-        if input_email.strip() != '':
-            thisdb.setOption('ssl_email', input_email)
-            email = input_email
-
-        if not len(domains):
+        if len(domains) < 1:
             return mw.returnData(False, '请选择域名')
+        if email.strip() != '':
+            thisdb.setOption('ssl_email', email)
+
+        print(site_name, domains,force,renew,apply_type, dnspai, email)
+        
 
         file = self.getHostConf(site_name)
         if os.path.exists(file):
@@ -1622,11 +1644,12 @@ location ^~ {from} {\n\
         if domainCount == 0:
             return mw.returnData(False, '请选择域名(不包括IP地址与泛域名)!')
 
-        log_file = mw.getPanelDir() + '/logs/acme.log'
-        mw.writeFile(log_file, "开始ACME申请...\n", "wb+")
+        self.writeAcmeLog('开始ACME申请...')
+        log_file = self.acmeLogFile()
         cmd = 'export ACCOUNT_EMAIL=' + email + ' && ' + execStr + ' >> ' + log_file
-        # print(domains)
-        # print(cmd)
+        print(domains)
+        print(cmd)
+        return mw.returnData(False, '测试中!')
         result = mw.execShell(cmd)
 
         src_path = mw.getAcmeDomainDir(domains[0])

From 0862df318291725b8886ce248dd2f2de83966c73 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 22 Nov 2024 01:39:37 +0800
Subject: [PATCH 199/965] Update site.py

---
 web/utils/site.py | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 54f20ed48..2fb0df438 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1556,18 +1556,8 @@ location ^~ {from} {\n\
     def createAcmeMultiDomin(self):
         pass
 
-    def createAcmeFile(self):
-        pass
-
-    def createAcmeDns(self):
-        pass
-
-    def createAcme(self, site_name, domains,force,renew, apply_type, dnspai, email):
-        domains = json.loads(domains)
-        if len(domains) < 1:
-            return mw.returnData(False, '请选择域名')
-        if email.strip() != '':
-            thisdb.setOption('ssl_email', email)
+    def createAcmeFile(self, site_name, domains,force,renew, apply_type, dnspai, email):
+        
 
         print(site_name, domains,force,renew,apply_type, dnspai, email)
         
@@ -1697,6 +1687,34 @@ location ^~ {from} {\n\
         mw.restartWeb()
         return mw.returnData(True, '证书已更新!', result)
 
+    def createAcmeDns(self, site_name, domains, force, renew, dnspai):
+        dnsapi_option = thisdb.getOptionByJson('dnsapi', default={})
+        if not dnspai in dnsapi_option:
+            return mw.returnData(False, dnspai+'未设置')
+
+        dnsapi_data = dnsapi_option[dnspai]
+        for k in dnsapi_data:
+            if dnsapi_data[k] == '':
+                return mw.returnData(False, k+'为空!')
+
+
+        print(dnsapi_data)
+        print(domains)
+        return mw.returnData(False, '测试中!')
+
+    def createAcme(self, site_name, domains,force,renew, apply_type, dnspai, email):
+        domains = json.loads(domains)
+        if len(domains) < 1:
+            return mw.returnData(False, '请选择域名')
+        if email.strip() != '':
+            thisdb.setOption('ssl_email', email)
+
+        if apply_type == 'file':
+            return self.createAcmeFile(site_name, domains,force,renew, apply_type, dnspai, email)
+        elif apply_type == 'dns':
+            return self.createAcmeDns(site_name, domains, force, renew, dnspai)
+        return mw.returnData(False, '异常请求') 
+
 
     def getPhpVersion(self):
         phpVersions = ('00', '52', '53', '54', '55',

From 4a16502269a23ffbe2e1f76cc84b5a97c5d9705b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 22 Nov 2024 21:47:33 +0800
Subject: [PATCH 200/965] up

---
 web/admin/site/dir.py  |   9 ---
 web/admin/site/site.py |  19 ++++++
 web/static/app/site.js |  12 ++--
 web/thisdb/domain.py   |   4 ++
 web/thisdb/sites.py    |  11 +++-
 web/utils/site.py      | 127 +++++++++++++++++++++++++++++++++++++++++
 6 files changed, 165 insertions(+), 17 deletions(-)

diff --git a/web/admin/site/dir.py b/web/admin/site/dir.py
index 6156e71de..5cc7d15a7 100644
--- a/web/admin/site/dir.py
+++ b/web/admin/site/dir.py
@@ -15,8 +15,6 @@ from flask import Blueprint, render_template
 from flask import request
 
 from admin.user_login_check import panel_login_required
-
-from utils.plugin import plugin as MwPlugin
 from utils.site import sites as MwSites
 
 import core.mw as mw
@@ -74,10 +72,3 @@ def del_dir_bind():
     return MwSites.instance().delDirBinding(binding_id)
 
 
-
-
-
-
-
-
-
diff --git a/web/admin/site/site.py b/web/admin/site/site.py
index 2fe533c98..051d0f9bd 100644
--- a/web/admin/site/site.py
+++ b/web/admin/site/site.py
@@ -53,6 +53,25 @@ def add():
     port = request.form.get('port', '')
     return MwSites.instance().add(webname, port, ps, path, version)
 
+# 添加站点 - 域名
+@blueprint.route('/add_domain', endpoint='add_domain',methods=['POST'])
+@panel_login_required
+def add_domain():
+    domain = request.form.get('domain', '')
+    site_name = request.form.get('site_name', '')
+    site_id = request.form.get('id', '')
+    return MwSites.instance().addDomain(site_id, site_name, domain)
+
+# 删除站点 - 域名
+@blueprint.route('/del_domain', endpoint='del_domain',methods=['POST'])
+@panel_login_required
+def del_domain():
+    site_name = request.form.get('site_name', '')
+    site_id = request.form.get('id', '')
+    domain = request.form.get('domain', '')
+    port = request.form.get('port', '')
+    return MwSites.instance().delDomain(site_id, site_name, domain, port)
+
 # 站点删除
 @blueprint.route('/delete', endpoint='delete',methods=['POST'])
 @panel_login_required
diff --git a/web/static/app/site.js b/web/static/app/site.js
index 11e432136..50c8eeb13 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -691,7 +691,7 @@ function checkDomain() {
  * @param {Int} id  网站ID
  * @param {String} webname 主域名
  */
-function domainAdd(id, webname,type) {
+function domainAdd(id, webname, type) {
 	var Domain = $("#newdomain").val().split("\n");
 
 	var domainlist = '';
@@ -706,7 +706,7 @@ function domainAdd(id, webname,type) {
 
 	domainlist = domainlist.substring(0,domainlist.length-1);
 	var loadT = layer.load();
-	var data = "domain=" + domainlist + "&webname=" + webname + "&id=" + id;
+	var data = "domain=" + domainlist + "&site_name=" + webname + "&id=" + id;
 	$.post('/site/add_domain', data, function(retuls) {
 		layer.close(loadT);
 		domainEdit(id, webname, retuls.msg, retuls.status);
@@ -726,10 +726,9 @@ function delDomain(wid, wname, domain, port,type) {
 		layer.msg(lan.site.domain_last_cannot);
 	}
 	layer.confirm(lan.site.domain_del_confirm,{icon:3,closeBtn:2}, function(index) {
-		var url = "/site/del_domain"
-		var data = "id=" + wid + "&webname=" + wname + "&domain=" + domain + "&port=" + port;
-		var loadT = layer.msg(lan.public.the_del,{time:0,icon:16});
-		$.post(url,data, function(ret) {
+		var data = "id=" + wid + "&site_name=" + wname + "&domain=" + domain + "&port=" + port;
+		var loadT = layer.msg('您真的要从站点中删除这个域名吗？',{time:0,icon:16});
+		$.post('/site/del_domain', data, function(ret) {
 			layer.close(loadT);
 			layer.msg(ret.msg,{icon:ret.status?1:2})
 			if(type == 1){
@@ -2039,7 +2038,6 @@ function renewSSL(type,id,siteName){
 
 
 function renderDnsapiHtml(data){
-
 	var fields = data.data;
 	var fields_html = '';
 
diff --git a/web/thisdb/domain.py b/web/thisdb/domain.py
index bdf3e47d2..e78995cfb 100644
--- a/web/thisdb/domain.py
+++ b/web/thisdb/domain.py
@@ -16,6 +16,10 @@ def getDomainCountByName(name):
     # .debug(True)
     return mw.M('domain').where("name=?", (name,)).count()
 
+def getDomainCountBySiteId(site_id):
+    # .debug(True)
+    return mw.M('domain').where("pid=?", (site_id,)).count()
+
 def addDomain(pid, name, port):
     now_time = mw.getDateFromNow()
     insert_data = {
diff --git a/web/thisdb/sites.py b/web/thisdb/sites.py
index 487b54897..20c316012 100644
--- a/web/thisdb/sites.py
+++ b/web/thisdb/sites.py
@@ -14,10 +14,19 @@ from .option  import getOption
 
 __FIELD = 'id,name,path,status,ps,edate,type_id,add_time,update_time'
 
+def checkSitesDomainIsExist(domain, port):
+    nums = mw.M('domain').where("name=? AND port=?", (domain, port,)).count()
+    if nums>0:
+        return True
+
+    nums = mw.M('binding').where("name=? AND port=?", (domain, port,)).count()
+    if nums>0:
+        return True
+    return False
+
 def getSitesCount():
     return mw.M('sites').count()
 
-
 def getSitesById(site_id):
     return mw.M('sites').field(__FIELD).where("id=?", (site_id,)).find()
 
diff --git a/web/utils/site.py b/web/utils/site.py
index 2fb0df438..501a28f66 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -62,6 +62,25 @@ class sites(object):
         if not os.path.exists(self.sslLetsDir):
             mw.execShell("mkdir -p " + self.sslLetsDir +" && chmod -R 755 " + self.sslLetsDir)
 
+
+    def runHook(self, hook_name, func_name):
+        # 站点操作Hook
+        hook_cfg = thisdb.getOptionByJson('hook_site_cb',type='hook',default=[])
+        hook_num = len(hook_cfg)
+        if hook_num == 0:
+            return
+
+        from utils.plugin import plugin as MwPlugin
+        pa = MwPlugin.instance()
+
+        for x in range(hook_num):
+            hook_data = hook_cfg[x]
+            if func_name in hook_data:
+                app_name = hook_data["name"]
+                run_func = hook_data[func_name]['func']
+                pa.run(app_name, run_func)
+        return True
+
     # 域名编码转换
     def toPunycode(self, domain):
         if sys.version_info[0] == 2:
@@ -198,6 +217,99 @@ class sites(object):
         # return mw.returnData(False, '开发中!')
         return mw.returnData(True, '添加成功')
 
+    def nginxAddDomain(self, site_name, domain, port):
+        file = self.getHostConf(site_name)
+        conf = mw.readFile(file)
+        if not conf:
+            return
+
+        # 添加域名
+        rep = r"server_name\s*(.*);"
+        tmp = re.search(rep, conf).group()
+        domains = tmp.split(' ')
+        if not mw.inArray(domains, domain):
+            newServerName = tmp.replace(';', ' ' + domain + ';')
+            conf = conf.replace(tmp, newServerName)
+
+        # 添加端口
+        rep = r"listen\s+([0-9]+)\s*[default_server]*\s*;"
+        tmp = re.findall(rep, conf)
+        if not mw.inArray(tmp, port):
+            listen = re.search(rep, conf).group()
+            conf = conf.replace(
+                listen, listen + "\n\tlisten " + port + ';')
+        # 保存配置文件
+        mw.writeFile(file, conf)
+        return True
+
+    def addDomain(self, site_id, site_name, domain):
+        isError = mw.checkWebConfig()
+        if isError != True:
+            msg = 'ERROR: 检测到配置文件有错误,请先排除后再操作<br><br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>'
+            return mw.returnData(False, msg)
+
+        domains = domain.split(',')
+        for d in domains:
+            if d == '':
+                continue
+            d = d.split(':')
+            name = self.toPunycode(d[0])
+            port = '80'
+            if len(d) == 2:
+                port = d[1]
+
+            if not mw.checkPort(port):
+                return mw.returnData(False, '端口范围不合法!')
+
+            reg = r"^([\w\-\*]{1,100}\.){1,4}([\w\-]{1,24}|[\w\-]{1,24}\.[\w\-]{1,24})$"
+            if not re.match(reg, name):
+                return mw.returnData(False, '域名格式不正确!')
+
+            if thisdb.checkSitesDomainIsExist(name, port):
+                return mw.returnData(False, '您添加的域名[{}:{}],已使用。请仔细检查!'.format(name, port))
+
+            self.nginxAddDomain(site_name, name, port)
+
+            msg = mw.getInfo('网站[{1}]添加域名[{2}]成功!', (site_name, name))
+            mw.writeLog('网站管理', msg)
+            thisdb.addDomain(site_id, name, port)
+
+        mw.restartWeb()
+        self.runHook('site_cb', 'add')
+        return mw.returnData(True, '域名添加成功!')
+
+    def delDomain(self, site_id, site_name, domain, port):
+        domain_nums = thisdb.getDomainCountBySiteId(site_id)
+        if domain_nums == 1:
+            return mw.returnData(False, '最后一个域名不能删除!')
+
+        info = mw.M('domain').field('id,name').where("pid=? AND name=? AND port=?",(site_id, domain, port)).find()
+
+        file = self.getHostConf(site_name)
+        conf = mw.readFile(file)
+        if conf:
+            # 删除域名
+            rep = r"server_name\s+(.+);"
+            tmp = re.search(rep, conf).group()
+            newServerName = tmp.replace(' ' + domain + ';', ';')
+            newServerName = newServerName.replace(' ' + domain + ' ', ' ')
+            conf = conf.replace(tmp, newServerName)
+
+            # 删除端口
+            rep = r"listen\s+([0-9]+);"
+            tmp = re.findall(rep, conf)
+            port_nums = mw.M('domain').where('pid=? AND port=?', (site_id, port)).count()
+            if mw.inArray(tmp, port) == True and port_nums < 2:
+                rep = r"\n*\s+listen\s+" + port + ";"
+                conf = re.sub(rep, '', conf)
+            # 保存配置
+            mw.writeFile(file, conf)
+
+        thisdb.deleteDomainId(info['id'])
+        msg = mw.getInfo('网站[{1}]删除域名[{2}:{3}]成功!', (site_name, domain, port))
+        mw.writeLog('网站管理', msg)
+        mw.restartWeb()
+        return mw.returnData(True, '站点删除成功!')
 
     def deleteALlLogs(self, webname):
         assLogPath = mw.getLogsDir() + '/' + webname + '.log'
@@ -1687,6 +1799,15 @@ location ^~ {from} {\n\
         mw.restartWeb()
         return mw.returnData(True, '证书已更新!', result)
 
+    def getDnsapiExportVar(self, data):
+        def_var = ''
+        for k in data:
+            def_var += 'export '+k+'="'+data[k]+'"\n'
+        return def_var
+
+    def getDomainRootName(self, domain):
+        pass
+
     def createAcmeDns(self, site_name, domains, force, renew, dnspai):
         dnsapi_option = thisdb.getOptionByJson('dnsapi', default={})
         if not dnspai in dnsapi_option:
@@ -1697,9 +1818,15 @@ location ^~ {from} {\n\
             if dnsapi_data[k] == '':
                 return mw.returnData(False, k+'为空!')
 
+        cmd = self.getDnsapiExportVar(dnsapi_data)
+
+        for d in domains:
+            print(d)
+            cmd += 'acme.sh --issue --dns '+str(dnspai)+' -d '+d+' -d "*.'+d+'" --force'
 
         print(dnsapi_data)
         print(domains)
+        print(cmd)
         return mw.returnData(False, '测试中!')
 
     def createAcme(self, site_name, domains,force,renew, apply_type, dnspai, email):

From ed375271d2481d0004fb3ccd4823466822efefc5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 23 Nov 2024 17:42:03 +0800
Subject: [PATCH 201/965] Update site.py

---
 web/utils/site.py | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 501a28f66..3cfa99822 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1597,11 +1597,12 @@ location ^~ {from} {\n\
     def getDnsapi(self):
         dnsapi_data = thisdb.getOptionByJson('dnsapi', default={})
         dnsapi_option = [
-            {"name":"none", "title":'手动解析', 'key':''},
-            {"name":"dns_ali", "title":'Aliyun', 'key':'Ali_Key:Ali_Secret'},
-            {"name":"dns_cf", "title":'cloudflare', 'key':'CF_Key:CF_Email'},
-            {"name":"dns_dp", "title":'dnspod/国内', 'key':'DP_Id:DP_Key'},
-            {"name":"dns_dpi", "title":'dnspod/国际', 'key':'DPI_Id:DPI_Key'},
+            {"name":"none", "title":'手动解析', 'key':'', 'help':''},
+            {"name":"dns_ali", "title":'Aliyun', 'key':'Ali_Key:Ali_Secret', 'help':'阿里云控制台》用户头像》accesskeys按指引获取AccessKey/SecretKey'},
+            {"name":"dns_cf", "title":'cloudflare', 'key':'CF_Key:CF_Email', 'help':'CloudFlare后台获取Global API Key'},
+            {"name":"dns_dp", "title":'dnspod/国内', 'key':'DP_Id:DP_Key','help':'DnsPod后台》用户中心》安全设置，开启API Token'},
+            {"name":"dns_dpi", "title":'dnspod/国际', 'key':'DPI_Id:DPI_Key','help':'DnsPod后台》用户中心》安全设置，开启API Token'},
+            {"name":"dns_tencent", "title":"腾讯云DNS", 'key':'Tencent_SecretId:Tencent_SecretKey', 'help':'腾讯云后台获取通行证'},
             # {"name":"dns_gd", "title":'GoDaddy', 'key':'GD_Key:GD_Secret'},
             # {"name":"dns_pdns", "title":'PowerDNS', 'key':'PDNS_Url:PDNS_ServerId:PDNS_Token:PDNS_Ttl'},
             # {"name":"dns_lua", "title":'LuaDNS', 'key':'LUA_Key:LUA_Email'},
@@ -1806,9 +1807,13 @@ location ^~ {from} {\n\
         return def_var
 
     def getDomainRootName(self, domain):
-        pass
+        s = domain.split('.')
+        count = len(s)
+        last_index = count - 1
+        top_domain =  s[last_index-1]+'.'+s[last_index]
+        return top_domain
 
-    def createAcmeDns(self, site_name, domains, force, renew, dnspai):
+    def createAcmeDns(self, site_name, domains, dnspai, force, renew):
         dnsapi_option = thisdb.getOptionByJson('dnsapi', default={})
         if not dnspai in dnsapi_option:
             return mw.returnData(False, dnspai+'未设置')
@@ -1821,8 +1826,8 @@ location ^~ {from} {\n\
         cmd = self.getDnsapiExportVar(dnsapi_data)
 
         for d in domains:
-            print(d)
-            cmd += 'acme.sh --issue --dns '+str(dnspai)+' -d '+d+' -d "*.'+d+'" --force'
+            top_domain = self.getDomainRootName(d)
+            cmd += 'acme.sh --issue --dns '+str(dnspai)+' -d '+top_domain+' -d "*.'+top_domain+'" --force'
 
         print(dnsapi_data)
         print(domains)
@@ -1839,7 +1844,7 @@ location ^~ {from} {\n\
         if apply_type == 'file':
             return self.createAcmeFile(site_name, domains,force,renew, apply_type, dnspai, email)
         elif apply_type == 'dns':
-            return self.createAcmeDns(site_name, domains, force, renew, dnspai)
+            return self.createAcmeDns(site_name, domains, dnspai,force, renew)
         return mw.returnData(False, '异常请求') 
 
 

From 5b2e40404dcde570569077c55d4b3fabe8227ef3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 23 Nov 2024 23:15:25 +0800
Subject: [PATCH 202/965] update

---
 web/admin/site/ssl_acme.py |   3 +-
 web/admin/site/ssl_let.py  |  55 +++++++
 web/core/mw.py             | 178 +++++++++++++++++++++-
 web/static/app/site.js     | 246 +++++++++++++++++-------------
 web/utils/site.py          | 297 +++++++++++++++++++++++++++++++++----
 5 files changed, 640 insertions(+), 139 deletions(-)
 create mode 100644 web/admin/site/ssl_let.py

diff --git a/web/admin/site/ssl_acme.py b/web/admin/site/ssl_acme.py
index 81938bde1..fea23b068 100644
--- a/web/admin/site/ssl_acme.py
+++ b/web/admin/site/ssl_acme.py
@@ -42,9 +42,10 @@ def create_acme():
     force = request.form.get('force', '')
     renew = request.form.get('renew', '')
     email = request.form.get('email', '')
+    wildcard_domain = request.form.get('wildcard_domain','')
     apply_type = request.form.get('apply_type', 'file')
     dnspai = request.form.get('dnspai','') 
-    return MwSites.instance().createAcme(site_name, domains,force,renew,apply_type,dnspai, email)
+    return MwSites.instance().createAcme(site_name, domains, force, renew, apply_type, dnspai, email, wildcard_domain)
 
 
 
diff --git a/web/admin/site/ssl_let.py b/web/admin/site/ssl_let.py
new file mode 100644
index 000000000..dda93e6fa
--- /dev/null
+++ b/web/admin/site/ssl_let.py
@@ -0,0 +1,55 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+import json
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin.user_login_check import panel_login_required
+
+from utils.plugin import plugin as MwPlugin
+from utils.site import sites as MwSites
+import core.mw as mw
+import thisdb
+
+from .site import blueprint
+
+
+# 获取ACME日志
+@blueprint.route('/get_let_logs', endpoint='get_let_logs', methods=['POST'])
+@panel_login_required
+def get_let_logs():
+    log_file = MwSites.instance().letLogFile()
+    if not os.path.exists(log_file):
+        mw.execShell('touch ' + log_file)
+    return mw.returnData(True, 'OK', log_file)
+
+
+@blueprint.route('/create_let', endpoint='create_let', methods=['POST'])
+@panel_login_required
+def create_let():
+    site_name = request.form.get('siteName', '')
+    domains = request.form.get('domains', '')
+    force = request.form.get('force', '')
+    renew = request.form.get('renew', '')
+    email = request.form.get('email', '')
+    wildcard_domain = request.form.get('wildcard_domain','')
+    apply_type = request.form.get('apply_type', 'file')
+    dnspai = request.form.get('dnspai','') 
+    return MwSites.instance().createLet(site_name, domains, force, renew, apply_type, dnspai, email, wildcard_domain)
+
+
+
+
+
+
+
diff --git a/web/core/mw.py b/web/core/mw.py
index 0d7a8f6a2..fc9efa08d 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -836,6 +836,166 @@ def deDoubleCrypt(key, strings):
         writeFileLog(getTracebackInfo())
         return strings
 
+def aesEncrypt(data, key='ABCDEFGHIJKLMNOP', vi='0102030405060708'):
+    # aes加密
+    # @param data 被加密的数据
+    # @param key 加解密密匙 16位
+    # @param vi 16位
+
+    from cryptography.hazmat.primitives import padding
+    from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+    from cryptography.hazmat.backends import default_backend
+
+    if not isinstance(data, bytes):
+        data = data.encode()
+
+    # AES_CBC_KEY = os.urandom(32)
+    # AES_CBC_IV = os.urandom(16)
+
+    AES_CBC_KEY = key.encode()
+    AES_CBC_IV = vi.encode()
+
+    # print("AES_CBC_KEY:", AES_CBC_KEY)
+    # print("AES_CBC_IV:", AES_CBC_IV)
+
+    padder = padding.PKCS7(algorithms.AES.block_size).padder()
+    padded_data = padder.update(data) + padder.finalize()
+
+    cipher = Cipher(algorithms.AES(AES_CBC_KEY),
+                    modes.CBC(AES_CBC_IV),
+                    backend=default_backend())
+    encryptor = cipher.encryptor()
+
+    edata = encryptor.update(padded_data)
+
+    # print(edata)
+    # print(str(edata))
+    # print(edata.decode())
+    return edata
+
+
+def aesDecrypt(data, key='ABCDEFGHIJKLMNOP', vi='0102030405060708'):
+    # aes加密
+    # @param data 被解密的数据
+    # @param key 加解密密匙 16位
+    # @param vi 16位
+
+    from cryptography.hazmat.primitives import padding
+    from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+    from cryptography.hazmat.backends import default_backend
+
+    from cryptography.hazmat.primitives import padding
+    from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+    from cryptography.hazmat.backends import default_backend
+
+    if not isinstance(data, bytes):
+        data = data.encode()
+
+    AES_CBC_KEY = key.encode()
+    AES_CBC_IV = vi.encode()
+
+    cipher = Cipher(algorithms.AES(AES_CBC_KEY),
+                    modes.CBC(AES_CBC_IV),
+                    backend=default_backend())
+    decryptor = cipher.decryptor()
+
+    ddata = decryptor.update(data)
+
+    unpadder = padding.PKCS7(algorithms.AES.block_size).unpadder()
+    data = unpadder.update(ddata)
+
+    try:
+        uppadded_data = data + unpadder.finalize()
+    except ValueError:
+        raise Exception('无效的加密信息!')
+
+    return uppadded_data
+
+def aesEncrypt_Crypto(data, key, vi):
+    # 该方法保留，暂时不使用
+    # aes加密
+    # @param data 被加密的数据
+    # @param key 加解密密匙 16位
+    # @param vi 16位
+
+    from Crypto.Cipher import AES
+    cryptor = AES.new(key.encode('utf8'), AES.MODE_CBC, vi.encode('utf8'))
+    # 判断是否含有中文
+    zhmodel = re.compile(u'[\u4e00-\u9fff]')
+    match = zhmodel.search(data)
+    if match == None:
+        # 无中文时
+        add = 16 - len(data) % 16
+        pad = lambda s: s + add * chr(add)
+        data = pad(data)
+        enctext = cryptor.encrypt(data.encode('utf8'))
+    else:
+        # 含有中文时
+        data = data.encode()
+        add = 16 - len(data) % 16
+        data = data + add * (chr(add)).encode()
+        enctext = cryptor.encrypt(data)
+    encodestrs = base64.b64encode(enctext).decode('utf8')
+    return encodestrs
+
+
+def aesDecrypt_Crypto(data, key, vi):
+    # 该方法保留，暂时不使用
+    # aes加密
+    # @param data 被加密的数据
+    # @param key 加解密密匙 16位
+    # @param vi 16位
+
+    from crypto.Cipher import AES
+    data = data.encode('utf8')
+    encodebytes = base64.urlsafe_b64decode(data)
+    cipher = AES.new(key.encode('utf8'), AES.MODE_CBC, vi.encode('utf8'))
+    text_decrypted = cipher.decrypt(encodebytes)
+    # 判断是否含有中文
+    zhmodel = re.compile(u'[\u4e00-\u9fff]')
+    match = zhmodel.search(text_decrypted)
+    if match == False:
+        # 无中文时补位
+        unpad = lambda s: s[0:-s[-1]]
+        text_decrypted = unpad(text_decrypted)
+    text_decrypted = text_decrypted.decode('utf8').rstrip()  # 去掉补位的右侧空格
+    return text_decrypted
+
+def getDefault(data,val,def_val=''):
+    if val in data:
+        return data[val]
+    return def_val
+
+def encodeImage(imgsrc, newsrc):
+    # 图片加密
+    import struct
+    old_fp = open(imgsrc, 'rb')
+    imgFile = old_fp.read()
+    old_fp.close()
+
+    new_fp = open(newsrc,"wb")
+    for x in imgFile:
+        value = x ^ 86
+        value = hex(value)
+        s = struct.pack('B',int(value,16))
+        new_fp.write(s)
+    new_fp.close()
+    return True
+    
+def buildSoftLink(src, dst, force=False):
+    '''
+    建立软连接
+    '''
+    if not os.path.exists(src):
+        return False
+
+    if os.path.exists(dst) and force:
+        os.remove(dst)
+
+    if not os.path.exists(dst):
+        execShell('ln -sf "' + src + '" "' + dst + '"')
+        return True
+    return False
 # ------------------------------   network start  -----------------------------
 
 def HttpGet(url, timeout=10):
@@ -1009,6 +1169,14 @@ def panelCmd(method):
 
 # ------------------------------ openresty start -----------------------------
 
+def getOpVer():
+    version = ''
+    version_file_pl = getServerDir() + '/openresty/version.pl'
+    if os.path.exists(version_file_pl):
+        version = readFile(version_file_pl)
+        version = version.strip()
+    return version
+
 def checkWebConfig():
     op_dir = getServerDir() + '/openresty/nginx'
     # "ulimit -n 10240 && " +
@@ -1179,6 +1347,10 @@ def getMyORM():
 # ---------------------------------------------------------------------------------
 
 ##################### ssl start #########################################
+
+def strfDate(sdate):
+    return time.strftime('%Y-%m-%d', time.strptime(sdate, '%Y%m%d%H%M%S'))
+
 # 获取证书名称
 def getCertName(certPath):
     if not os.path.exists(certPath):
@@ -1205,11 +1377,9 @@ def getCertName(certPath):
             if hasattr(issuer, 'O'):
                 result['issuer'] = issuer.O
         # 取到期时间
-        result['notAfter'] = strfDate(
-            bytes.decode(x509.get_notAfter())[:-1])
+        result['notAfter'] = strfDate(bytes.decode(x509.get_notAfter())[:-1])
         # 取申请时间
-        result['notBefore'] = strfDate(
-            bytes.decode(x509.get_notBefore())[:-1])
+        result['notBefore'] = strfDate(bytes.decode(x509.get_notBefore())[:-1])
         # 取可选名称
         result['dns'] = []
         for i in range(x509.get_extension_count()):
diff --git a/web/static/app/site.js b/web/static/app/site.js
index 50c8eeb13..30abea07c 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -2119,13 +2119,87 @@ function renderDnsapi(){
 			}
 		});
 
-		$('#dnsapi_set').on('click', function(){
+		$('#dnsapi_set').unbind('click').on('click', function(){
 			var index = $('#dnsapi_option option:selected').attr('index');
 			renderDnsapiHtml(data[index]);
 		});
 	},'json');
 }
 
+function opSSLNow(type, id, siteName, callback){
+	var now = '<div class="myKeyCon ptb15">\
+			<div class="ssl_state_info" style="display:none;"></div>\
+		<div class="custom_certificate_info">\
+			<div class="ssl-con-key pull-left mr20">密钥(KEY)<br><textarea id="key" class="bt-input-text"></textarea></div>\
+			<div class="ssl-con-key pull-left">证书(PEM格式)<br><textarea id="csr" class="bt-input-text"></textarea></div>\
+		</div>\
+		<div class="ssl-btn pull-left mtb15" style="width:100%">\
+			<button class="btn btn-success btn-sm" onclick="saveSSL(\''+siteName+'\')">保存</button>\
+		</div>\
+	</div>\
+	<ul class="help-info-text c7 pull-left">\
+		<li>粘贴您的*.key以及*.pem内容，然后保存即可。</li>\
+		<li>如果浏览器提示证书链不完整,请检查是否正确拼接PEM证书</li><li>PEM格式证书 = 域名证书.crt + 根证书(root_bundle).crt</li>\
+		<li>在未指定SSL默认站点时,未开启SSL的站点使用HTTPS会直接访问到已开启SSL的站点</li>\
+	</ul>';
+
+	$(".tab-con").html(now);
+	var key = '';
+	var csr = '';
+	var loadT = layer.msg('正在提交任务...',{icon:16,time:0,shade: [0.3, '#000']});
+	$.post('/site/get_ssl','site_name='+siteName,function(data){
+		layer.close(loadT);
+		var rdata = data['data'];
+
+		if (rdata['cert_data']){
+			var issuer = rdata['cert_data']['issuer'].split(" ");
+			var domains = rdata['cert_data']['dns'].join("、");
+
+			var cert_data = "<div class='state_info_flex'>\
+				<div class='state_item'><span>证书品牌：</span><span class='ellipsis_text'>"+issuer[0]+"</span></div>\
+				<div class='state_item'><span>到期时间：</span><span class='btlink'>剩余"+rdata['cert_data']['endtime']+"天到期</span></div>\
+			</div>\
+			<div class='state_info_flex'>\
+				<div class='state_item'><span>认证域名：</span><span class='ellipsis_text'>"+domains+"</span></div>\
+				<div class='state_item'><span>强制HTTPS：</span><span class='switch'>\
+					<input class='btswitch btswitch-ios' id='toHttps' type='checkbox'>\
+                    <label class='btswitch-btn' for='toHttps' onclick=\"httpToHttps('" + siteName + "')\">\
+				</span></div>\
+			</div>";
+			$(".ssl_state_info").html(cert_data);
+			$(".ssl_state_info").css('display','block');
+		}
+
+		if(rdata.key == false){
+			rdata.key = '';
+		} else {
+			$(".ssl-btn").append('<button style=\'margin-left:3px;\' class="btn btn-success btn-sm" onclick="deleteSSL(\'now\','+id+',\''+siteName+'\')">删除</button>');
+		}
+
+		if(rdata.csr == false){
+			rdata.csr = '';
+		}
+		$("#key").val(rdata.key);
+		$("#csr").val(rdata.csr);
+
+		$("#toHttps").attr('checked',rdata.httpTohttps);
+		if(rdata.status){
+			$('.warning_info').css('display','none');
+			
+			$(".ssl-btn").append("<button class='btn btn-success btn-sm' onclick=\"ocSSL('close_ssl_conf','"+siteName+"')\" style='margin-left:3px;'>关闭SSL</button>");
+			$('#now_ssl').html('当前证书 - <i style="color:#20a53a;">[已部署SSL]</i>');
+		} else{
+			$('.warning_info').css('display','block');
+			$('#now_ssl').html('当前证书 - <i style="color:red;">[未部署SSL]</i>');
+		}
+
+
+		if (typeof (callback) != 'undefined'){
+			callback(rdata);
+		}
+	},'json');
+}
+
 function opSSLAcme(type, id, siteName, callback){
 	var acme =  '<div class="apply_ssl">\
 		<div class="label-input-group">\
@@ -2192,7 +2266,6 @@ function opSSLAcme(type, id, siteName, callback){
 		}
 	});
 
-
 	renderDnsapi();
 
 	$.post('/site/get_ssl','site_name='+siteName+'&ssl_type=acme', function(data){
@@ -2278,92 +2351,33 @@ function opSSLAcme(type, id, siteName, callback){
 	},'json');
 }
 
-function opSSLNow(type, id, siteName, callback){
-	var now = '<div class="myKeyCon ptb15">\
-			<div class="ssl_state_info" style="display:none;"></div>\
-		<div class="custom_certificate_info">\
-			<div class="ssl-con-key pull-left mr20">密钥(KEY)<br><textarea id="key" class="bt-input-text"></textarea></div>\
-			<div class="ssl-con-key pull-left">证书(PEM格式)<br><textarea id="csr" class="bt-input-text"></textarea></div>\
-		</div>\
-		<div class="ssl-btn pull-left mtb15" style="width:100%">\
-			<button class="btn btn-success btn-sm" onclick="saveSSL(\''+siteName+'\')">保存</button>\
-		</div>\
-	</div>\
-	<ul class="help-info-text c7 pull-left">\
-		<li>粘贴您的*.key以及*.pem内容，然后保存即可。</li>\
-		<li>如果浏览器提示证书链不完整,请检查是否正确拼接PEM证书</li><li>PEM格式证书 = 域名证书.crt + 根证书(root_bundle).crt</li>\
-		<li>在未指定SSL默认站点时,未开启SSL的站点使用HTTPS会直接访问到已开启SSL的站点</li>\
-	</ul>';
-
-	$(".tab-con").html(now);
-	var key = '';
-	var csr = '';
-	var loadT = layer.msg('正在提交任务...',{icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/site/get_ssl','site_name='+siteName,function(data){
-		layer.close(loadT);
-		var rdata = data['data'];
-
-		if (rdata['cert_data']){
-			var issuer = rdata['cert_data']['issuer'].split(" ");
-			var domains = rdata['cert_data']['dns'].join("、");
-
-			var cert_data = "<div class='state_info_flex'>\
-				<div class='state_item'><span>证书品牌：</span><span class='ellipsis_text'>"+issuer[0]+"</span></div>\
-				<div class='state_item'><span>到期时间：</span><span class='btlink'>剩余"+rdata['cert_data']['endtime']+"天到期</span></div>\
-			</div>\
-			<div class='state_info_flex'>\
-				<div class='state_item'><span>认证域名：</span><span class='ellipsis_text'>"+domains+"</span></div>\
-				<div class='state_item'><span>强制HTTPS：</span><span class='switch'>\
-					<input class='btswitch btswitch-ios' id='toHttps' type='checkbox'>\
-                    <label class='btswitch-btn' for='toHttps' onclick=\"httpToHttps('" + siteName + "')\">\
-				</span></div>\
-			</div>";
-			$(".ssl_state_info").html(cert_data);
-			$(".ssl_state_info").css('display','block');
-		}
-
-		if(rdata.key == false){
-			rdata.key = '';
-		} else {
-			$(".ssl-btn").append('<button style=\'margin-left:3px;\' class="btn btn-success btn-sm" onclick="deleteSSL(\'now\','+id+',\''+siteName+'\')">删除</button>');
-		}
-
-		if(rdata.csr == false){
-			rdata.csr = '';
-		}
-		$("#key").val(rdata.key);
-		$("#csr").val(rdata.csr);
-
-		$("#toHttps").attr('checked',rdata.httpTohttps);
-		if(rdata.status){
-			$('.warning_info').css('display','none');
-			
-			$(".ssl-btn").append("<button class='btn btn-success btn-sm' onclick=\"ocSSL('close_ssl_conf','"+siteName+"')\" style='margin-left:3px;'>关闭SSL</button>");
-			$('#now_ssl').html('当前证书 - <i style="color:#20a53a;">[已部署SSL]</i>');
-		} else{
-			$('.warning_info').css('display','block');
-			$('#now_ssl').html('当前证书 - <i style="color:red;">[未部署SSL]</i>');
-		}
-
-
-		if (typeof (callback) != 'undefined'){
-			callback(rdata);
-		}
-	},'json');
-}
-
 function opSSLLet(type, id, siteName, callback){
 	var lets =  '<div class="apply_ssl">\
 		<div class="label-input-group">\
 			<div class="line mtb10">\
-				<form>\
-					<span class="tname text-center">验证方式</span>\
-					<div style="margin-top:7px;display:inline-block">\
-						<input type="radio" name="c_type" onclick="fileCheck()" id="check_file" checked="checked" />\
-	  					<label class="mr20" for="check_file" style="font-weight:normal">文件验证</label></label>\
-	  				</div>\
-	  			</form>\
+				<span class="tname text-center">验证方式</span>\
+				<div style="margin-top:7px;display:inline-block">\
+					<input type="radio" name="apply_type" value="file" id="check_file" checked="checked"/>\
+  					<label class="mr20" for="check_file" style="font-weight:normal">文件验证</label></label>\
+  					<input type="radio" name="apply_type" value="dns" id="check_dns"/>\
+  					<label class="mr20" for="check_dns" style="font-weight:normal">DNS验证</label></label>\
+  				</div>\
 	  		</div>\
+	  		<div class="line mtb10" id="dnsapi_option" style="display:none;">\
+				<span class="tname text-center" style="line-height: 42px;">选择DNS接口</span>\
+				<div style="margin-top:7px;display:inline-block">\
+					<select name="dnspai" class="bt-input-text mr20">\
+						<option value="none">手动解析</option>\
+					</select>\
+					<button id="dnsapi_set" class="btn btn-default btn-sm btn-title" style="display:none;">配置</button>\
+  				</div>\
+	  		</div>\
+	  		<div class="check_message line" id="wildcard_domain_block" style="display:none;">\
+  				<div style="margin-left:100px">\
+  					<input type="checkbox" name="wildcard_domain" id="wildcard_domain" checked="checked">\
+  					<label class="mr20" for="wildcard_domain" style="font-weight:normal">自动组合泛域名</label>\
+  				</div>\
+  			</div>\
   			<div class="check_message line">\
   				<div style="margin-left:100px">\
   					<input type="checkbox" name="checkDomain" id="checkDomain" checked="">\
@@ -2391,6 +2405,20 @@ function opSSLLet(type, id, siteName, callback){
   	</div>';
 
   	$(".tab-con").html(lets);
+
+  	$('input[name="apply_type"]').on('change', function(){
+		var val = $(this).val();
+		if (val == 'file'){
+			$('#dnsapi_option').css('display','none');
+			$('#wildcard_domain_block').css('display','none');
+		} else {
+			$('#dnsapi_option').css('display','block');
+			$('#wildcard_domain_block').css('display','block');
+		}
+	});
+
+	renderDnsapi();
+
 	$.post('/site/get_ssl',  'site_name='+siteName+'&ssl_type=lets', function(data){
 		var rdata = data['data'];
 		if(rdata.csr == false){
@@ -2517,46 +2545,58 @@ function ocSSL(action,siteName){
 //生成SSL
 function newSSL(siteName, id, domains){
 	showSpeedWindow('正在申请...', 'site.get_let_logs', function(layers,index){
-		var force = '';
-		if ($("#checkDomain").prop("checked")){
-			force = '&force=true';
+		var pdata = {};
+		pdata['siteName'] = siteName;
+		pdata['domains'] = domains;
+		pdata['email'] = $("input[name='admin_email']").val();
+		
+		if($("#checkDomain").prop("checked")){
+			pdata['force'] = 'true';
 		}
-		var email = $("input[name='admin_email']").val();
-		$.post('/site/create_let','siteName='+siteName+'&domains='+domains+'&email='+email + force,function(rdata){
-			layer.close(index);
-			if(rdata.status){
-				showMsg(rdata.msg, function(){
+
+		if($("#wildcard_domain").prop("checked")){
+			pdata['wildcard_domain'] = 'true'; 
+		}
+
+		var apply_type = $('input[name="apply_type"]:checked').val();
+		pdata['apply_type'] = apply_type;
+		if (apply_type == 'dns'){
+			pdata['dnspai'] = $('#dnsapi_option option:selected').val();
+		}
+
+		$.post('/site/create_let',pdata,function(rdata){
+			showMsg(rdata.msg, function(){
+				layer.close(index);
+				if(rdata.status){	
 					$(".tab-nav span:first-child").click();
-				},{icon:1}, 2000);
-				return;
-			}
-			layer.msg(rdata.msg,{icon:2,area:'500px',time:0,shade:0.3,shadeClose:true});
+				}
+			},{icon:rdata.status?1:2}, 3000);
 		},'json');
 	});
 }
 
 function newAcmeSSL(siteName, id, domains){
 	showSpeedWindow('正在由ACME申请...', 'site.get_acme_logs', function(layers,index){
-		var force = '';
-		var email = $("input[name='admin_email']").val();
-		var apply_type = $('input[name="apply_type"]:checked').val();
-
 		var pdata = {};
 		pdata['siteName'] = siteName;
 		pdata['domains'] = domains;
-		pdata['email'] = email;
-		pdata['apply_type'] = apply_type;
+		pdata['email'] = $("input[name='admin_email']").val();
+		
 		if($("#checkDomain").prop("checked")){
 			pdata['force'] = 'true';
 		}
 
+		if($("#wildcard_domain").prop("checked")){
+			pdata['wildcard_domain'] = 'true'; 
+		}
+
+		var apply_type = $('input[name="apply_type"]:checked').val();
+		pdata['apply_type'] = apply_type;
 		if (apply_type == 'dns'){
 			pdata['dnspai'] = $('#dnsapi_option option:selected').val();
 		}
 
-		console.log(pdata);
 		$.post('/site/create_acme',pdata,function(rdata){
-			console.log(rdata);
 			showMsg(rdata.msg, function(){
 				layer.close(index);
 				if(rdata.status){	
diff --git a/web/utils/site.py b/web/utils/site.py
index 3cfa99822..cf88d95ef 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -419,6 +419,74 @@ class sites(object):
         mw.writeLog('网站管理', '设置成功,站点【{1}】到期【{2}】后将自动停止!', (info['name'], end_date,))
         return mw.returnData(True, '设置成功,站点到期后将自动停止!')
 
+    # ssl相关方法 start
+    def setSslConf(self, site_name):
+        file = self.getHostConf(site_name)
+        conf = mw.readFile(file)
+
+        version = mw.getOpVer()
+
+        keyPath = self.sslDir + '/' + site_name + '/privkey.pem'
+        certPath = self.sslDir + '/' + site_name + '/fullchain.pem'
+        if conf:
+            if conf.find('ssl_certificate') == -1:
+                # ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE;
+                # add_header Alt-Svc 'h3=":443";ma=86400,h3-29=":443";ma=86400';
+                http3Header = """
+    add_header Strict-Transport-Security "max-age=63072000";
+    add_header Alt-Svc 'h3=":443";ma=86400';
+"""
+                if not version.startswith('1.25'):
+                    http3Header = '';
+
+                sslStr = """#error_page 404/404.html;
+    ssl_certificate    %s;
+    ssl_certificate_key  %s;
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+    ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305;
+    ssl_prefer_server_ciphers on;
+    ssl_session_cache shared:SSL:10m;
+    ssl_session_timeout 10m;
+    %s
+    error_page 497  https://$host$request_uri;""" % (certPath, keyPath, http3Header)
+            if(conf.find('ssl_certificate') != -1):
+                return mw.returnData(True, 'SSL开启成功!')
+
+            conf = conf.replace('#error_page 404/404.html;', sslStr)
+
+            rep = r"listen\s+([0-9]+)\s*[default_server|reuseport]*;"
+            tmp = re.findall(rep, conf)
+            if not mw.inArray(tmp, '443'):
+                listen = re.search(rep, conf).group()
+                
+                if version.startswith('1.25'):
+                    http_ssl = "\n\tlisten 443 ssl;"
+                    http_ssl = http_ssl + "\n\tlisten [::]:443 ssl;"
+                    http_ssl = http_ssl + "\n\tlisten 443 quic;"
+                    http_ssl = http_ssl + "\n\tlisten [::]:443 quic;"
+                    http_ssl = http_ssl + "\n\thttp2 on;"
+                else:
+                    http_ssl = "\n\tlisten 443 ssl http2;"
+                    http_ssl = http_ssl + "\n\tlisten [::]:443 ssl http2;"
+
+
+                conf = conf.replace(listen, listen + http_ssl)
+
+            mw.backFile(file)
+            mw.writeFile(file, conf)
+            isError = mw.checkWebConfig()
+            if(isError != True):
+                mw.restoreFile(file)
+                return mw.returnData(False, '证书错误: <br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>')
+
+        self.saveCert(keyPath, certPath)
+
+        msg = mw.getInfo('网站[{1}]开启SSL成功!', (site_name,))
+        mw.writeLog('网站管理', msg)
+
+        mw.restartWeb()
+        return mw.returnData(True, 'SSL开启成功!')
+
     # 设置网站备注
     def setPs(self, site_id, ps):
         if thisdb.setSitesData(site_id, ps=ps):
@@ -1466,6 +1534,7 @@ location ^~ {from} {\n\
             csr = mw.readFile(csr_path)
 
         cert_data = mw.getCertName(csr_path)
+        # print(csr_path,cert_data)
         data = {
             'status': status,
             'domain': domains,
@@ -1477,6 +1546,21 @@ location ^~ {from} {\n\
         }
         return mw.returnData(True, 'OK', data)
 
+    def saveCert(self, keyPath, certPath):
+        try:
+            certInfo = mw.getCertName(certPath)
+            if not certInfo:
+                return mw.returnData(False, '证书解析失败!')
+            vpath = self.sslDir + '/' + certInfo['subject'].strip()
+            if not os.path.exists(vpath):
+                os.system('mkdir -p ' + vpath)
+            mw.writeFile(vpath + '/privkey.pem', mw.readFile(keyPath))
+            mw.writeFile(vpath + '/fullchain.pem', mw.readFile(certPath))
+            mw.writeFile(vpath + '/info.json', json.dumps(certInfo))
+            return mw.returnData(True, '证书保存成功!')
+        except Exception as e:
+            return mw.returnData(False, '证书保存失败!')
+
     def getCertList(self):
         try:
             vpath = self.sslDir
@@ -1657,7 +1741,6 @@ location ^~ {from} {\n\
         thisdb.setOption('dnsapi',json.dumps(dnsapi_data))
         return mw.returnData(True, '设置成功!')
 
-
     def acmeLogFile(self):
         return mw.getPanelDir() + '/logs/acme.log'
 
@@ -1666,13 +1749,20 @@ location ^~ {from} {\n\
         mw.writeFile(log_file, msg+"\n", "wb+")
         return True
 
+    def letLogFile(self):
+        return mw.getPanelDir() + '/logs/letsencrypt.log'
+
+    def writeLetLog(self,msg):
+        log_file = self.letLogFile()
+        mw.writeFile(log_file, msg+"\n", "wb+")
+        return True
+
     def createAcmeMultiDomin(self):
         pass
 
-    def createAcmeFile(self, site_name, domains,force,renew, apply_type, dnspai, email):
-        
+    def createAcmeFile(self, site_name, domains, email, force, renew):
 
-        print(site_name, domains,force,renew,apply_type, dnspai, email)
+        print(site_name, domains,force,renew, email)
         
 
         file = self.getHostConf(site_name)
@@ -1702,20 +1792,7 @@ location ^~ {from} {\n\
 
         srcPath = siteInfo['path']
 
-        # 检测acme是否安装
-        acme_dir = mw.getAcmeDir()
-        if not os.path.exists(acme_dir):
-            try:
-                mw.execShell("curl -sS curl https://get.acme.sh | sh")
-            except:
-                pass
-        if not os.path.exists(acme_dir):
-            return mw.returnData(False, '尝试自动安装ACME失败,请通过以下命令尝试手动安装<p>安装命令: curl https://get.acme.sh | sh</p>')
-
-        # 避免频繁执行
-        checkAcmeRun = mw.execShell('ps -ef|grep acme.sh |grep -v grep')
-        if checkAcmeRun[0] != '':
-            return mw.returnData(False, '正在申请或更新SSL中...')
+        
 
         if force == 'true':
             force_bool = True
@@ -1813,7 +1890,7 @@ location ^~ {from} {\n\
         top_domain =  s[last_index-1]+'.'+s[last_index]
         return top_domain
 
-    def createAcmeDns(self, site_name, domains, dnspai, force, renew):
+    def createAcmeDns(self, site_name, domains, dnspai, wildcard_domain, force, renew):
         dnsapi_option = thisdb.getOptionByJson('dnsapi', default={})
         if not dnspai in dnsapi_option:
             return mw.returnData(False, dnspai+'未设置')
@@ -1823,29 +1900,187 @@ location ^~ {from} {\n\
             if dnsapi_data[k] == '':
                 return mw.returnData(False, k+'为空!')
 
-        cmd = self.getDnsapiExportVar(dnsapi_data)
-
+        acme_dir = mw.getAcmeDir()
         for d in domains:
-            top_domain = self.getDomainRootName(d)
-            cmd += 'acme.sh --issue --dns '+str(dnspai)+' -d '+top_domain+' -d "*.'+top_domain+'" --force'
+            cmd = '''
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin:%s
+export PATH
+''' % (acme_dir,)
 
-        print(dnsapi_data)
-        print(domains)
-        print(cmd)
-        return mw.returnData(False, '测试中!')
+            cmd += self.getDnsapiExportVar(dnsapi_data)
+            if wildcard_domain == 'true':
+                top_domain = self.getDomainRootName(d)
+                cmd += 'acme.sh --issue --dns '+str(dnspai)+' -d '+top_domain+' -d "*.'+top_domain+'"'
+                d = top_domain
+            else:
+                cmd += 'acme.sh --issue --dns '+str(dnspai)+' -d '+d
 
-    def createAcme(self, site_name, domains,force,renew, apply_type, dnspai, email):
+            log_file = self.acmeLogFile()
+            cmd +=  ' >> ' + log_file
+            print(cmd)
+            result = mw.execShell(cmd)
+            print(result)
+
+            # acme源的ssl证书
+            src_path = mw.getAcmeDomainDir(d)
+            src_cert = src_path + '/fullchain.cer'
+            src_key = src_path + '/' + d + '.key'
+            src_cert.replace("\\*", "*")
+
+            msg = '签发失败,您尝试申请证书的失败次数已达上限!\
+                <p>1、检查域名是否正确解析到本服务器,或解析还未完全生效</p>\
+                <p>2、如果以上检查都确认没有问题，请尝试更换DNS服务商</p>'
+            if not os.path.exists(src_cert):
+                data = {}
+                data['err'] = result
+                data['out'] = result[0]
+                data['msg'] = msg
+                data['result'] = {}
+                if result[1].find('new-authz error:') != -1:
+                    data['result'] = json.loads(re.search("{.+}", result[1]).group())
+                    if data['result']['status'] == 429:
+                        data['msg'] = msg
+                data['status'] = False
+                return data
+
+            # acme源建立软链接(目标)
+            dst_path = self.sslDir + '/' + site_name
+            dst_cert = dst_path + "/fullchain.pem"  # 生成证书路径
+            dst_key = dst_path + "/privkey.pem"  # 密钥文件路径
+
+            if not os.path.exists(dst_path):
+                mw.execShell("mkdir -p " + dst_path)
+
+            mw.buildSoftLink(src_cert, dst_cert, True)
+            mw.buildSoftLink(src_key, dst_key, True)
+            mw.execShell('echo "acme" > "' + dst_path + '/README"')
+
+            # 写入配置文件
+            result = self.setSslConf(site_name)
+            if not result['status']:
+                return result
+            result['csr'] = mw.readFile(src_cert)
+            result['key'] = mw.readFile(src_key)
+
+        mw.restartWeb()
+        return mw.returnData(True, '证书已更新!', result)
+
+    def createAcme(self, site_name, domains,force,renew, apply_type, dnspai, email, wildcard_domain):
         domains = json.loads(domains)
         if len(domains) < 1:
             return mw.returnData(False, '请选择域名')
         if email.strip() != '':
             thisdb.setOption('ssl_email', email)
 
+        # 检测acme是否安装
+        acme_dir = mw.getAcmeDir()
+        if not os.path.exists(acme_dir):
+            try:
+                mw.execShell("curl -sS curl https://get.acme.sh | sh")
+            except:
+                pass
+        if not os.path.exists(acme_dir):
+            return mw.returnData(False, '尝试自动安装ACME失败,请通过以下命令尝试手动安装<p>安装命令: curl https://get.acme.sh | sh</p>')
+
+        # 避免频繁执行
+        checkAcmeRun = mw.execShell('ps -ef|grep acme.sh |grep -v grep')
+        if checkAcmeRun[0] != '':
+            return mw.returnData(False, '正在申请或更新SSL中...')
+
         if apply_type == 'file':
-            return self.createAcmeFile(site_name, domains,force,renew, apply_type, dnspai, email)
+            return self.createAcmeFile(site_name, domains, email,force,renew)
         elif apply_type == 'dns':
-            return self.createAcmeDns(site_name, domains, dnspai,force, renew)
-        return mw.returnData(False, '异常请求') 
+            return self.createAcmeDns(site_name, domains, dnspai, wildcard_domain,force, renew)
+        return mw.returnData(False, '异常请求')
+
+    def createLet(self, site_name, domains, force, renew, apply_type, dnspai, email, wildcard_domain):
+        siteName = request.form.get('siteName', '')
+        domains = request.form.get('domains', '')
+        force = request.form.get('force', '')
+        renew = request.form.get('renew', '')
+        email_args = request.form.get('email', '')
+
+        domains = json.loads(domains)
+        email = mw.M('users').getField('email')
+        if email_args.strip() != '':
+            mw.M('users').setField('email', email_args)
+            email = email_args
+
+        if not len(domains):
+            return mw.returnJson(False, '请选择域名')
+
+        host_conf_file = self.getHostConf(siteName)
+        if os.path.exists(host_conf_file):
+            siteConf = mw.readFile(host_conf_file)
+            if siteConf.find('301-END') != -1:
+                return mw.returnJson(False, '检测到您的站点做了301重定向设置，请先关闭重定向!')
+
+            # 检测存在反向代理
+            data_path = self.getProxyDataPath(siteName)
+            data_content = mw.readFile(data_path)
+            if data_content != False:
+                try:
+                    data = json.loads(data_content)
+                except:
+                    pass
+                for proxy in data:
+                    proxy_dir = "{}/{}".format(self.proxyPath, siteName)
+                    proxy_dir_file = proxy_dir + '/' + proxy['id'] + '.conf'
+                    if os.path.exists(proxy_dir_file):
+                        return mw.returnJson(False, '检测到您的站点做了反向代理设置，请先关闭反向代理!')
+
+            # fix binddir domain ssl apply question
+            mw.backFile(host_conf_file)
+            auth_to = self.getSitePath(siteName)
+            rep = r"\s*root\s*(.+);"
+            replace_root = "\n\troot " + auth_to + ";"
+            siteConf = re.sub(rep, replace_root, siteConf)
+            mw.writeFile(host_conf_file, siteConf)
+            mw.restartWeb()
+
+        to_args = {
+            'domains': domains,
+            'auth_type': 'http',
+            'auth_to': auth_to,
+        }
+
+        src_letpath = mw.getServerDir() + '/web_conf/letsencrypt/' + siteName
+        src_csrpath = src_letpath + "/fullchain.pem"  # 生成证书路径
+        src_keypath = src_letpath + "/privkey.pem"  # 密钥文件路径
+
+        dst_letpath = self.sslDir + '/' + siteName
+        dst_csrpath = dst_letpath + '/fullchain.pem'
+        dst_keypath = dst_letpath + '/privkey.pem'
+
+        if not os.path.exists(src_letpath):
+            import cert_api
+            data = cert_api.cert_api().applyCertApi(to_args)
+            mw.restoreFile(host_conf_file)
+            if not data['status']:
+                msg = data['msg']
+                if type(data['msg']) != str:
+                    msg = data['msg'][0]
+                    emsg = data['msg'][1]['challenges'][0]['error']
+                    msg = msg + '<p><span>响应状态:</span>' + str(emsg['status']) + '</p><p><span>错误类型:</span>' + emsg[
+                        'type'] + '</p><p><span>错误代码:</span>' + emsg['detail'] + '</p>'
+                return mw.returnJson(data['status'], msg, data['msg'])
+
+        mw.execShell('mkdir -p ' + dst_letpath)
+        mw.buildSoftLink(src_csrpath, dst_csrpath, True)
+        mw.buildSoftLink(src_keypath, dst_keypath, True)
+        mw.execShell('echo "lets" > "' + dst_letpath + '/README"')
+
+        # 写入配置文件
+        result = self.setSslConf(siteName)
+        if not result['status']:
+            return mw.getJson(result)
+
+        result['csr'] = mw.readFile(src_csrpath)
+        result['key'] = mw.readFile(src_keypath)
+
+        mw.restartWeb()
+        return mw.returnData(data['status'], data['msg'], result)
 
 
     def getPhpVersion(self):

From f510d23c9266873401f9bfc290059b507e893568 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 23 Nov 2024 23:18:03 +0800
Subject: [PATCH 203/965] Update site.py

---
 web/utils/site.py | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index cf88d95ef..2b81081ab 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1995,29 +1995,21 @@ export PATH
         return mw.returnData(False, '异常请求')
 
     def createLet(self, site_name, domains, force, renew, apply_type, dnspai, email, wildcard_domain):
-        siteName = request.form.get('siteName', '')
-        domains = request.form.get('domains', '')
-        force = request.form.get('force', '')
-        renew = request.form.get('renew', '')
-        email_args = request.form.get('email', '')
-
         domains = json.loads(domains)
-        email = mw.M('users').getField('email')
-        if email_args.strip() != '':
-            mw.M('users').setField('email', email_args)
-            email = email_args
+        if len(domains) < 1:
+            return mw.returnData(False, '请选择域名')
+        if email.strip() != '':
+            thisdb.setOption('ssl_email', email)
 
-        if not len(domains):
-            return mw.returnJson(False, '请选择域名')
 
-        host_conf_file = self.getHostConf(siteName)
+        host_conf_file = self.getHostConf(site_name)
         if os.path.exists(host_conf_file):
             siteConf = mw.readFile(host_conf_file)
             if siteConf.find('301-END') != -1:
                 return mw.returnJson(False, '检测到您的站点做了301重定向设置，请先关闭重定向!')
 
             # 检测存在反向代理
-            data_path = self.getProxyDataPath(siteName)
+            data_path = self.getProxyDataPath(site_name)
             data_content = mw.readFile(data_path)
             if data_content != False:
                 try:
@@ -2025,14 +2017,14 @@ export PATH
                 except:
                     pass
                 for proxy in data:
-                    proxy_dir = "{}/{}".format(self.proxyPath, siteName)
+                    proxy_dir = "{}/{}".format(self.proxyPath, site_name)
                     proxy_dir_file = proxy_dir + '/' + proxy['id'] + '.conf'
                     if os.path.exists(proxy_dir_file):
                         return mw.returnJson(False, '检测到您的站点做了反向代理设置，请先关闭反向代理!')
 
             # fix binddir domain ssl apply question
             mw.backFile(host_conf_file)
-            auth_to = self.getSitePath(siteName)
+            auth_to = self.getSitePath(site_name)
             rep = r"\s*root\s*(.+);"
             replace_root = "\n\troot " + auth_to + ";"
             siteConf = re.sub(rep, replace_root, siteConf)
@@ -2045,11 +2037,11 @@ export PATH
             'auth_to': auth_to,
         }
 
-        src_letpath = mw.getServerDir() + '/web_conf/letsencrypt/' + siteName
+        src_letpath = mw.getServerDir() + '/web_conf/letsencrypt/' + site_name
         src_csrpath = src_letpath + "/fullchain.pem"  # 生成证书路径
         src_keypath = src_letpath + "/privkey.pem"  # 密钥文件路径
 
-        dst_letpath = self.sslDir + '/' + siteName
+        dst_letpath = self.sslDir + '/' + site_name
         dst_csrpath = dst_letpath + '/fullchain.pem'
         dst_keypath = dst_letpath + '/privkey.pem'
 
@@ -2064,7 +2056,7 @@ export PATH
                     emsg = data['msg'][1]['challenges'][0]['error']
                     msg = msg + '<p><span>响应状态:</span>' + str(emsg['status']) + '</p><p><span>错误类型:</span>' + emsg[
                         'type'] + '</p><p><span>错误代码:</span>' + emsg['detail'] + '</p>'
-                return mw.returnJson(data['status'], msg, data['msg'])
+                return mw.returnData(data['status'], msg, data['msg'])
 
         mw.execShell('mkdir -p ' + dst_letpath)
         mw.buildSoftLink(src_csrpath, dst_csrpath, True)
@@ -2072,9 +2064,9 @@ export PATH
         mw.execShell('echo "lets" > "' + dst_letpath + '/README"')
 
         # 写入配置文件
-        result = self.setSslConf(siteName)
+        result = self.setSslConf(site_name)
         if not result['status']:
-            return mw.getJson(result)
+            return result
 
         result['csr'] = mw.readFile(src_csrpath)
         result['key'] = mw.readFile(src_keypath)

From 33c67f90db9a4e054f4f6c54ad2c8006850436b5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 23 Nov 2024 23:48:13 +0800
Subject: [PATCH 204/965] Create cert.py

---
 web/utils/cert/cert.py | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 web/utils/cert/cert.py

diff --git a/web/utils/cert/cert.py b/web/utils/cert/cert.py
new file mode 100644
index 000000000..b69881868
--- /dev/null
+++ b/web/utils/cert/cert.py
@@ -0,0 +1,10 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+

From 9765cb99ea503f15eede96ea9f4e5012c3861dc7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 00:19:18 +0800
Subject: [PATCH 205/965] Update site.js

---
 web/static/app/site.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/static/app/site.js b/web/static/app/site.js
index 30abea07c..79fdd3441 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -1967,12 +1967,13 @@ function setCertSsl(certName,siteName){
 
 //ssl
 function setSSL(id,siteName){
+	// <span onclick="opSSL(\'lets\','+id+',\''+siteName+'\')">Let\'s Encrypt</span>
 	var sslHtml = '<div class="warning_info mb10" style="display:none;">\
 					<p>温馨提示：当前站点未开启SSL证书访问，站点访问可能存在风险。<button class="btn btn-success btn-xs ml10 cutTabView">申请证书</button></p>\
 				</div>\
 				<div class="tab-nav" style="margin-top: 10px;">\
 					<span class="on" id="now_ssl" onclick="opSSL(\'now\','+id+',\''+siteName+'\')">当前证书 - <i class="error">[未部署SSL]</i></span>\
-					<span onclick="opSSL(\'lets\','+id+',\''+siteName+'\')">Let\'s Encrypt</span>\
+					\
 					<span onclick="opSSL(\'acme\','+id+',\''+siteName+'\')">ACME</span>\
 					<span id="ssl_admin" onclick="sslAdmin(\''+siteName+'\')">证书夹</span>'
 					+ '<div class="ss-text pull-right mr30" style="position: relative;top:-4px">\

From cf7323cf1299e7c2e1fdf23fd39081ce2e7fe2fb Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 00:19:45 +0800
Subject: [PATCH 206/965] Update site.js

---
 web/static/app/site.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/static/app/site.js b/web/static/app/site.js
index 79fdd3441..eeb3cdd3b 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -1968,6 +1968,7 @@ function setCertSsl(certName,siteName){
 //ssl
 function setSSL(id,siteName){
 	// <span onclick="opSSL(\'lets\','+id+',\''+siteName+'\')">Let\'s Encrypt</span>
+	// 暂时关闭 Let 申请模式
 	var sslHtml = '<div class="warning_info mb10" style="display:none;">\
 					<p>温馨提示：当前站点未开启SSL证书访问，站点访问可能存在风险。<button class="btn btn-success btn-xs ml10 cutTabView">申请证书</button></p>\
 				</div>\

From c1607752b29677ec982463c486f43fc76a40967e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 00:44:39 +0800
Subject: [PATCH 207/965] update

---
 web/admin/files/files.py | 40 ++++++++++++++++++++++++++++++++++++++--
 web/utils/file.py        | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/web/admin/files/files.py b/web/admin/files/files.py
index cfe8e83c4..326ff7e9c 100644
--- a/web/admin/files/files.py
+++ b/web/admin/files/files.py
@@ -19,6 +19,8 @@ from flask import send_from_directory
 from werkzeug.utils import secure_filename
 
 from admin.user_login_check import panel_login_required
+from admin import session
+
 import core.mw as mw
 import utils.file as file
 import thisdb
@@ -31,9 +33,43 @@ def index():
     return render_template('%s/files.html' % name)
 
 # 获取文件内容
-@blueprint.route('/get_body', endpoint='get_file_body', methods=['POST'])
+@blueprint.route('/check_exists_files', endpoint='check_exists_files', methods=['POST'])
 @panel_login_required
-def get_file_body():
+def check_exists_files():
+    dfile = request.form.get('dfile', '')
+    filename = request.form.get('filename', '')
+    data = []
+    filesx = []
+    if filename == '':
+        filesx = json.loads(session['selected']['data'])
+    else:
+        filesx.append(filename)
+
+    for fn in filesx:
+        if fn == '.':
+            continue
+        filename = dfile + '/' + fn
+        if os.path.exists(filename):
+            tmp = {}
+            stat = os.stat(filename)
+            tmp['filename'] = fn
+            tmp['size'] = os.path.getsize(filename)
+            tmp['mtime'] = str(int(stat.st_mtime))
+            data.append(tmp)
+    return mw.returnData(True, 'ok', data)
+
+# 获取文件内容
+@blueprint.route('/copy_file', endpoint='copy_file', methods=['POST'])
+@panel_login_required
+def copy_file():
+    sfile = request.form.get('sfile', '')
+    dfile = request.form.get('dfile', '')
+    return file.copyFile(sfile, dfile)
+
+# 获取文件内容
+@blueprint.route('/get_body', endpoint='get_body', methods=['POST'])
+@panel_login_required
+def get_body():
     path = request.form.get('path', '')
     return file.getFileBody(path)
 
diff --git a/web/utils/file.py b/web/utils/file.py
index 02adcaac4..a9adf31ea 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -16,6 +16,45 @@ import shutil
 import core.mw as mw
 import thisdb
 
+def copyDir(src_file, dst_file):
+    if not os.path.exists(src_file):
+        return mw.returnData(False, '指定目录不存在!')
+
+    if os.path.exists(dst_file):
+        return mw.returnData(False, '指定目录已存在!')
+
+    import shutil
+    try:
+        shutil.copytree(src_file, dst_file)
+        stat = os.stat(src_file)
+        os.chown(dst_file, stat.st_uid, stat.st_gid)
+        msg = mw.getInfo('复制目录[{1}]到[{2}]成功!', (src_file, dst_file))
+        mw.writeLog('文件管理', msg)
+        return mw.returnData(True, '目录复制成功!')
+    except:
+        return mw.returnData(False, '目录复制失败!')
+
+def copyFile(src_file, dst_file):
+    if src_file == dst_file:
+        return mw.returnJson(False, '源与目的一致!')
+
+    if not os.path.exists(src_file):
+        return mw.returnJson(False, '指定文件不存在!')
+
+    if os.path.isdir(src_file):
+        return copyDir(src_file, dst_file)
+
+    try:
+        import shutil
+        shutil.copyfile(src_file, dst_file)
+        msg = mw.getInfo('复制文件[{1}]到[{2}]成功!', (src_file, dst_file,))
+        mw.writeLog('文件管理', msg)
+        stat = os.stat(src_file)
+        os.chown(dst_file, stat.st_uid, stat.st_gid)
+        return mw.returnData(True, '文件复制成功!')
+    except:
+        return mw.returnData(False, '文件复制失败!')
+
 def setFileAccept(filename):
     auth = 'www:www'
     if mw.getOs() == 'darwin':

From b0568926764757c255789d586366de86ea382b6f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 02:57:18 +0800
Subject: [PATCH 208/965] update

---
 data/tpl/nginx.conf    | 11 ++++++-----
 web/admin/site/site.py |  4 ++--
 web/static/app/site.js |  3 +--
 web/utils/site.py      | 23 ++++++++---------------
 4 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/data/tpl/nginx.conf b/data/tpl/nginx.conf
index 1e4655be1..5da306f9d 100755
--- a/data/tpl/nginx.conf
+++ b/data/tpl/nginx.conf
@@ -28,7 +28,6 @@ server
     include {$OR_REWRITE}/{$SERVER_NAME}.conf;
     #REWRITE-END
     
-    
     #禁止访问的文件或目录
     location ~ ^/(\.user.ini|\.htaccess|\.git|\.svn|\.project|LICENSE|README.md)
     {
@@ -39,12 +38,14 @@ server
     location ~ \.well-known{
         allow all;
     }
-    
-    location ~ .*\\.(gif|jpg|jpeg|png|bmp|swf|js|css|ttf|woff2)$
+
+    location ~ .*\.(gif|jpg|jpeg|png|bmp|swf|js|css|ttf|woff2)$
     {
-        expires 30d;
-        error_log /dev/null; 
+        expires      30d;
         access_log /dev/null;
+        if ($invalid_referer){
+           return 404;
+        }
     }
     
     access_log  {$LOGPATH}/{$SERVER_NAME}.log main;
diff --git a/web/admin/site/site.py b/web/admin/site/site.py
index 051d0f9bd..0650bda16 100644
--- a/web/admin/site/site.py
+++ b/web/admin/site/site.py
@@ -46,12 +46,12 @@ def list():
 @blueprint.route('/add', endpoint='add',methods=['POST'])
 @panel_login_required
 def add():
-    webname = request.form.get('webinfo', '')
+    webinfo = request.form.get('webinfo', '')
     ps = request.form.get('ps', '')
     path = request.form.get('path', '')
     version = request.form.get('version', '')
     port = request.form.get('port', '')
-    return MwSites.instance().add(webname, port, ps, path, version)
+    return MwSites.instance().add(webinfo, port, ps, path, version)
 
 # 添加站点 - 域名
 @blueprint.route('/add_domain', endpoint='add_domain',methods=['POST'])
diff --git a/web/static/app/site.js b/web/static/app/site.js
index eeb3cdd3b..cd19d997f 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -1117,9 +1117,8 @@ function getSiteErrorLogs(siteName){
 
 //防盗链
 function security(id,name){
-	var loadT = layer.msg(lan.site.the_msg,{icon:16,time:0,shade: [0.3, '#000']});
+	var loadT = layer.msg('正在提交任务...',{icon:16,time:0,shade: [0.3, '#000']});
 	$.post('/site/get_security',{id:id,name:name},function(rdata){
-		console.log(rdata);
 		layer.close(loadT);
 		var mbody = '<div>'
 					+'<p style="margin-bottom:8px"><span style="display: inline-block; width: 60px;">URL后缀</span><input class="bt-input-text" type="text" name="sec_fix" value="'+rdata.fix+'" style="margin-left: 5px;width: 425px;height: 30px;margin-right:10px;'+(rdata.status?'background-color: #eee;':'')+'" placeholder="多个请用逗号隔开,例：png,jpeg,jpg,gif,zip" '+(rdata.status?'readonly':'')+'></p>'
diff --git a/web/utils/site.py b/web/utils/site.py
index 2b81081ab..345cc5b1f 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -180,15 +180,14 @@ class sites(object):
             mw.writeFile(path + '/index.html', 'Work has started!!!')
             mw.execShell('chmod -R 755 ' + path)
 
-    def add(self, webname, port, ps, path, version):
+    def add(self, site_info, port, ps, path, version):
         site_root_dir = mw.getWwwDir()
         if site_root_dir == path.rstrip('/'):
             return mw.returnData(False, '不要以网站根目录创建站点!')
 
-        print(webname, port, ps, path, version)
-        siteMenu = json.loads(webname)
+        site_info = json.loads(site_info)
 
-        self.siteName = self.toPunycode(siteMenu['domain'].strip().split(':')[0]).strip()
+        self.siteName = self.toPunycode(site_info['domain'].strip().split(':')[0]).strip()
         self.sitePath = self.toPunycodePath(self.getPath(path.replace(' ', '')))
         self.sitePort = port.strip().replace(' ', '')
         self.phpVersion = version
@@ -196,25 +195,20 @@ class sites(object):
         if thisdb.isSitesExist(self.siteName):
             return mw.returnData(False, '您添加的站点[%s]已存在!' % self.siteName)
 
-        pid = thisdb.addSites(self.siteName, self.sitePath)
-        if pid < 1:
+        site_id = thisdb.addSites(self.siteName, self.sitePath)
+        if site_id < 1:
             return mw.returnData(False, '添加失败!') 
 
-
         self.createRootDir(self.sitePath)
         self.nginxAddConf()
 
         # 主域名配置
-        thisdb.addDomain(pid, self.siteName, self.sitePort)
-
-        # 绑定域名配置
-
+        thisdb.addDomain(site_id, self.siteName, self.sitePort)
         # 添加更多域名
-        # for domain in siteMenu['domainlist']:
-        #     thisdb.addDomain(pid, self.siteName, self.sitePort)
+        for domain in site_info['domainlist']:
+            self.addDomain(site_id, self.siteName, domain)
 
         mw.restartWeb()
-        # return mw.returnData(False, '开发中!')
         return mw.returnData(True, '添加成功')
 
     def nginxAddDomain(self, site_name, domain, port):
@@ -957,7 +951,6 @@ class sites(object):
     def setSecurity(self, site_id, fix, domains, status, none=''):
         info = thisdb.getSitesById(site_id)
         name = info['name']
-
         if len(fix) < 2:
             return mw.returnData(False, 'URL后缀不能为空!')
 

From 6246cc84d51ab02007a8dca7bf6da6d9edd75202 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 03:20:34 +0800
Subject: [PATCH 209/965] Update notify_email.py

---
 web/admin/setting/notify_email.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/web/admin/setting/notify_email.py b/web/admin/setting/notify_email.py
index ce38e1cb4..9bd8b3f2b 100644
--- a/web/admin/setting/notify_email.py
+++ b/web/admin/setting/notify_email.py
@@ -31,8 +31,12 @@ import thisdb
 def get_notify_email():
     notify_email = thisdb.getOptionByJson('notify_email', default={'open':False}, type='notify')
 
-    decrypt_data = mw.deDoubleCrypt('email', notify_email['cfg'])
-    notify_email['email'] =  json.loads(decrypt_data)
+    if 'cfg' in notify_email:
+        decrypt_data = mw.deDoubleCrypt('email', notify_email['cfg'])
+        notify_email['email'] =  json.loads(decrypt_data)
+    else:
+        notify_email['email'] = {'smtp_host':'','smtp_port':'','smtp_ssl':'','to_mail_addr':'','username':'','password':''}
+    
     return mw.returnData(True,'ok',notify_email)
 
 

From 08ac6ea08c4e011d0e7ed123d318f37ef76f02de Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 03:49:53 +0800
Subject: [PATCH 210/965] update

---
 cli.sh                |  9 +++++----
 web/admin/__init__.py |  8 ++++++--
 web/app.py            | 12 ++++++++++++
 web/setting.py        |  4 ++--
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/cli.sh b/cli.sh
index 97b66ee1d..6b848c6c3 100755
--- a/cli.sh
+++ b/cli.sh
@@ -59,8 +59,8 @@ mw_start_debug(){
     if [ -f ${DIR}/data/port.pl ];then
         port=$(cat ${DIR}/data/port.pl)
     fi
-    # gunicorn -b :${port} -k gevent -w 1 app:app
-	cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1 app:app
+    cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1 app:app
+	# cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 app:app
 }
 
 mw_start_panel(){
@@ -68,8 +68,9 @@ mw_start_panel(){
 	if [ -f ${DIR}/data/port.pl ];then
         port=$(cat ${DIR}/data/port.pl)
     fi
-	# cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
-	cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1  app:app
+	# cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1  app:app
+	cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
+	
 }
 
 mw_start_bgtask(){
diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index dc2770ff0..6bb30f1a0 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -38,7 +38,9 @@ import config
 import utils.config as utils_config
 import thisdb
 
-
+# from threading import Lock
+# thread = None
+# thread_lock = Lock()
 
 app = Flask(__name__, template_folder='templates/default')
 
@@ -51,7 +53,9 @@ from whitenoise import WhiteNoise
 app.wsgi_app = WhiteNoise(app.wsgi_app, root="../web/static/", prefix="static/", max_age=604800)
 
 # session配置
-app.secret_key = uuid.UUID(int=uuid.getnode()).hex[-12:]
+# app.secret_key = uuid.UUID(int=uuid.getnode()).hex[-12:]
+app.config['SECRET_KEY'] = uuid.UUID(int=uuid.getnode()).hex[-12:]
+
 # app.config['sessions'] = dict()
 app.config['SESSION_PERMANENT'] = True
 app.config['SESSION_USE_SIGNER'] = True
diff --git a/web/app.py b/web/app.py
index cc166c571..a6f5f7610 100644
--- a/web/app.py
+++ b/web/app.py
@@ -14,6 +14,13 @@ import os
 from admin import app, socketio
 import config
 
+from gevent.pywsgi import WSGIServer
+from geventwebsocket.handler import WebSocketHandler
+
+# from gevent import monkey
+# monkey.patch_all()
+
+
 if sys.version_info < (3, 6):
     raise RuntimeError('This application must be run under Python 3.6 or later.')
 
@@ -24,6 +31,11 @@ if sys.path[0] != os.path.dirname(os.path.realpath(__file__)):
 # print(config.DEFAULT_SERVER,config.DEFAULT_SERVER_PORT)
 # app = create_app()
 def main():
+    # http_server = WSGIServer(
+    #         (HOST, PORT), app, handler_class=WebSocketHandler)
+    # http_server.serve_forever()
+    # socketio.run(app, host=HOST, port=PORT)
+        
     socketio.run(
         app,
         debug=config.DEBUG,
diff --git a/web/setting.py b/web/setting.py
index 46672561d..31a634367 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -57,8 +57,8 @@ threads = workers * 1
 backlog = 512
 reload = False
 daemon = True
-# worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
-worker_class = 'eventlet'
+worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
+# worker_class = 'eventlet'
 timeout = 600
 keepalive = 60
 preload_app = True

From 2cf2a893e6f3aed56b3fec08162469bde4d831c9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 03:53:23 +0800
Subject: [PATCH 211/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 722179492..4ba5b9339 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -345,7 +345,7 @@ mw_debug(){
     if [ -d ${PANEL_DIR}/web ];then
         cd ${PANEL_DIR}/web
     fi
-    gunicorn -b :$port -w 1  app:app
+    gunicorn -b :$port -k eventlet -w 1  app:app
 }
 
 

From d8bf989f835d63e1b55a2410eb11e190e5597707 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 04:06:53 +0800
Subject: [PATCH 212/965] update

---
 web/admin/firewall/__init__.py | 11 +++++++++++
 web/utils/firewall.py          | 28 ++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/web/admin/firewall/__init__.py b/web/admin/firewall/__init__.py
index 7cb6fdd2d..deafbf12f 100644
--- a/web/admin/firewall/__init__.py
+++ b/web/admin/firewall/__init__.py
@@ -93,5 +93,16 @@ def set_fw():
     status = request.form.get('status', '1')
     return MwFirewall.instance().setFw(status)
 
+@blueprint.route('/set_fw', endpoint='set_fw', methods=['POST'])
+@panel_login_required
+def set_fw():
+    if mw.isAppleSystem():
+        return mw.returnData(True, '开发机不能设置!')
+    status = request.form.get('status', '1')
+    return MwFirewall.instance().setSshPassStatus(status)
+
+
+
+
 
 
diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 38b61d83f..6b9fb15f4 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -357,5 +357,33 @@ class Firewall(object):
         self.reload()
         return True
 
+    def setSshPassStatus(self, status):
+        msg = '禁止密码登陆成功'
+        if status == "1":
+            msg = '开启密码登陆成功'
+
+        file = '/etc/ssh/sshd_config'
+        if not os.path.exists(file):
+            return mw.returnJson(False, '无法设置!')
+
+        conf = mw.readFile(file)
+
+        pass_rep = r"PasswordAuthentication\s+(\w*)\s*\n"
+        pass_status = re.search(pass_rep, conf)
+        if not pass_status:
+            rep = r"(#)?PasswordAuthentication\s+(\w*)\s*\n"
+            conf = re.sub(rep, "PasswordAuthentication yes\n", conf)
+
+        if status == '1':
+            rep = r"PasswordAuthentication\s+(\w*)\s*\n"
+            conf = re.sub(rep, "PasswordAuthentication yes\n", conf)
+        else:
+            rep = r"PasswordAuthentication\s+(\w*)\s*\n"
+            conf = re.sub(rep, "PasswordAuthentication no\n", conf)
+        mw.writeFile(file, conf)
+        mw.execShell("systemctl restart sshd.service")
+        mw.writeLog("SSH管理", msg)
+        return mw.returnJson(True, msg)
+
 
 

From 9f6cd7589369b29120a568f48171a66548821754 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 04:13:22 +0800
Subject: [PATCH 213/965] update

---
 web/admin/firewall/__init__.py |  4 +--
 web/static/app/firewall.js     | 62 ++++++++++++++++++++--------------
 web/utils/firewall.py          | 12 ++++++-
 3 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/web/admin/firewall/__init__.py b/web/admin/firewall/__init__.py
index deafbf12f..68b898855 100644
--- a/web/admin/firewall/__init__.py
+++ b/web/admin/firewall/__init__.py
@@ -93,9 +93,9 @@ def set_fw():
     status = request.form.get('status', '1')
     return MwFirewall.instance().setFw(status)
 
-@blueprint.route('/set_fw', endpoint='set_fw', methods=['POST'])
+@blueprint.route('/set_ssh_pass_status', endpoint='set_ssh_pass_status', methods=['POST'])
 @panel_login_required
-def set_fw():
+def set_ssh_pass_status():
     if mw.isAppleSystem():
         return mw.returnData(True, '开发机不能设置!')
     status = request.form.get('status', '1')
diff --git a/web/static/app/firewall.js b/web/static/app/firewall.js
index 2f5b2437f..3936a7b45 100755
--- a/web/static/app/firewall.js
+++ b/web/static/app/firewall.js
@@ -53,33 +53,43 @@ function sshMgr(){
 	$.post('/firewall/get_ssh_info', '', function(rdata){
 		var ssh_status = rdata.status ? 'checked':'';
 		var pass_prohibit_status = rdata.pass_prohibit_status ? 'checked':'';
+		var pubkey_prohibit_status = rdata.pubkey_prohibit_status ? 'checked':'';
 		var con = '<div class="pd15">\
-                <div class="divtable">\
-                    <table class="table table-hover waftable">\
-                        <thead><tr><th>名称</th><th width="80">状态</th></tr></thead>\
-                        <tbody>\
-                            <tr>\
-                                <td>启动SSH</td>\
-                                <td>\
-                                    <div class="ssh-item" style="margin-left:0">\
-                                        <input class="btswitch btswitch-ios" id="sshswitch" type="checkbox" '+ssh_status+'>\
-                                        <label class="btswitch-btn" for="sshswitch" onclick=\'setMstscStatus()\'></label>\
-                                    </div>\
-                                </td>\
-                            </tr>\
-                            <tr>\
-                                <td>禁止密码登陆</td>\
-                                <td>\
-                                    <div class="ssh-item" style="margin-left:0">\
-                                        <input class="btswitch btswitch-ios" id="pass_status" type="checkbox" '+pass_prohibit_status+'>\
-                                        <label class="btswitch-btn" for="pass_status" onclick=\'setSshPassStatus()\'></label>\
-                                    </div>\
-                                </td>\
-                            </tr>\
-                        </tbody>\
-                    </table>\
-                </div>\
-            </div>';
+            <div class="divtable">\
+                <table class="table table-hover waftable">\
+                    <thead><tr><th>名称</th><th width="80">状态</th></tr></thead>\
+                    <tbody>\
+                        <tr>\
+                            <td>启动SSH</td>\
+                            <td>\
+                                <div class="ssh-item" style="margin-left:0">\
+                                    <input class="btswitch btswitch-ios" id="sshswitch" type="checkbox" '+ssh_status+'>\
+                                    <label class="btswitch-btn" for="sshswitch" onclick=\'setMstscStatus()\'></label>\
+                                </div>\
+                            </td>\
+                        </tr>\
+                        <tr>\
+                            <td>禁止密码登陆</td>\
+                            <td>\
+                                <div class="ssh-item" style="margin-left:0">\
+                                    <input class="btswitch btswitch-ios" id="pass_status" type="checkbox" '+pass_prohibit_status+'>\
+                                    <label class="btswitch-btn" for="pass_status" onclick=\'setSshPassStatus()\'></label>\
+                                </div>\
+                            </td>\
+                        </tr>\
+                        <tr>\
+                            <td>禁止密钥登陆</td>\
+                            <td>\
+                                <div class="ssh-item" style="margin-left:0">\
+                                    <input class="btswitch btswitch-ios" id="pass_status" type="checkbox" '+pubkey_prohibit_status+'>\
+                                    <label class="btswitch-btn" for="pass_status" onclick=\'setSshPassStatus()\'></label>\
+                                </div>\
+                            </td>\
+                        </tr>\
+                    </tbody>\
+                </table>\
+            </div>\
+        </div>';
         layer.open({
 	        type: 1,
 	        title: "SSH管理",
diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 6b9fb15f4..983dbe155 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -157,8 +157,8 @@ class Firewall(object):
         if ssh_status[0] != '':
             status = False
 
-        data['pass_prohibit_status'] = False
         # 密码登陆配置检查
+        data['pass_prohibit_status'] = False
         pass_rep = r"PasswordAuthentication\s+(\w*)\s*\n"
         pass_status = re.search(pass_rep, conf)
         if pass_status:
@@ -167,6 +167,16 @@ class Firewall(object):
         else:
             data['pass_prohibit_status'] = True
 
+        # 密钥登陆配置检查
+        data['pubkey_prohibit_status'] = False
+        pass_rep = r"PubkeyAuthentication\s+(\w*)\s*\n"
+        pass_status = re.search(pass_rep, conf)
+        if pass_status:
+            if pass_status and pass_status.groups(0)[0].strip() == 'no':
+                data['pubkey_prohibit_status'] = True
+        else:
+            data['pubkey_prohibit_status'] = True
+
         data['port'] = port
         data['status'] = status
         data['ping'] = isPing

From 92f9a2b9a29adc4f9f07beed85c8acff425b535e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 04:17:05 +0800
Subject: [PATCH 214/965] update

---
 web/admin/firewall/__init__.py |  9 +++++++++
 web/static/app/firewall.js     | 37 ++++++++++++++++++++++++++++++----
 web/utils/firewall.py          | 30 ++++++++++++++++++++++++++-
 3 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/web/admin/firewall/__init__.py b/web/admin/firewall/__init__.py
index 68b898855..0e5fd77ea 100644
--- a/web/admin/firewall/__init__.py
+++ b/web/admin/firewall/__init__.py
@@ -101,6 +101,15 @@ def set_ssh_pass_status():
     status = request.form.get('status', '1')
     return MwFirewall.instance().setSshPassStatus(status)
 
+@blueprint.route('/set_ssh_pubkey_status', endpoint='set_ssh_pubkey_status', methods=['POST'])
+@panel_login_required
+def set_ssh_pubkey_status():
+    if mw.isAppleSystem():
+        return mw.returnData(True, '开发机不能设置!')
+    status = request.form.get('status', '1')
+    return MwFirewall.instance().setSshPubkeyStatus(status)
+
+
 
 
 
diff --git a/web/static/app/firewall.js b/web/static/app/firewall.js
index 3936a7b45..fe9d1a22f 100755
--- a/web/static/app/firewall.js
+++ b/web/static/app/firewall.js
@@ -49,7 +49,6 @@ $("#firewalldType").change(function(){
 
 
 function sshMgr(){
-
 	$.post('/firewall/get_ssh_info', '', function(rdata){
 		var ssh_status = rdata.status ? 'checked':'';
 		var pass_prohibit_status = rdata.pass_prohibit_status ? 'checked':'';
@@ -81,8 +80,8 @@ function sshMgr(){
                             <td>禁止密钥登陆</td>\
                             <td>\
                                 <div class="ssh-item" style="margin-left:0">\
-                                    <input class="btswitch btswitch-ios" id="pass_status" type="checkbox" '+pubkey_prohibit_status+'>\
-                                    <label class="btswitch-btn" for="pass_status" onclick=\'setSshPassStatus()\'></label>\
+                                    <input class="btswitch btswitch-ios" id="pubkey_status" type="checkbox" '+pubkey_prohibit_status+'>\
+                                    <label class="btswitch-btn" for="pubkey_status" onclick=\'setSshPubkeyStatus()\'></label>\
                                 </div>\
                             </td>\
                         </tr>\
@@ -100,7 +99,6 @@ function sshMgr(){
 	        success:function(){
 	        },
 	    });
-
 	},'json');
 }
 
@@ -283,6 +281,37 @@ function setSshPassStatus(){
 	});
 }
 
+/**
+ * 设置远程服务状态
+ * @param {Int} state 0.启用 1.关闭
+ */
+function setSshPubkeyStatus(){
+	status = $("#pubkey_status").prop("checked")==true?1:0;
+	var msg = status==1?'开启密码登陆,继续吗？':'确定禁止密码登陆吗？';
+	layer.confirm(msg,{title:'警告',closeBtn:2,cancel:function(){
+		if(status == 0){
+			$("#pubkey_status").prop("checked",false);
+		} else {
+			$("#pubkey_status").prop("checked",true);
+		}
+	}},function(index){
+		if(index > 0){
+			layer.msg('正在处理,请稍候...',{icon:16,time:20000});
+			$.post('/firewall/set_ssh_pubkey_status','status='+status,function(rdata){
+				layer.msg(rdata.msg,{icon:rdata.status?1:2});
+			},'json');
+		}
+	},function(){
+		if(status == 0){
+			$("#pubkey_status").prop("checked",false);
+		} else {
+			$("#pubkey_status").prop("checked",true);
+		}
+	});
+}
+
+
+
 /**
  * 取回数据
  * @param {Int} page  分页号
diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 983dbe155..7a1906a75 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -393,7 +393,35 @@ class Firewall(object):
         mw.writeFile(file, conf)
         mw.execShell("systemctl restart sshd.service")
         mw.writeLog("SSH管理", msg)
-        return mw.returnJson(True, msg)
+        return mw.returnData(True, msg)
+
+    def setSshPubkeyStatus(self, status):
+        msg = '禁止密钥登陆成功'
+        if status == "1":
+            msg = '开启密钥登陆成功'
+
+        file = '/etc/ssh/sshd_config'
+        if not os.path.exists(file):
+            return mw.returnJson(False, '无法设置!')
+
+        content = mw.readFile(file)
+
+        pubkey_rep = r"PubkeyAuthentication\s+(\w*)\s*\n"
+        pubkey_status = re.search(pubkey_rep, content)
+        if not pubkey_status:
+            rep = r"(#)?PubkeyAuthentication\s+(\w*)\s*\n"
+            content = re.sub(rep, "PubkeyAuthentication yes\n", content)
+
+        if status == '1':
+            rep = r"PubkeyAuthentication\s+(\w*)\s*\n"
+            content = re.sub(rep, "PubkeyAuthentication yes\n", content)
+        else:
+            rep = r"PubkeyAuthentication\s+(\w*)\s*\n"
+            content = re.sub(rep, "PubkeyAuthentication no\n", content)
+        mw.writeFile(file, content)
+        mw.execShell("systemctl restart sshd.service")
+        mw.writeLog("SSH管理", msg)
+        return mw.returnData(True, msg)
 
 
 

From ba96b38a82c91e8cb99dfa59f53b82930e61ab76 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 04:18:02 +0800
Subject: [PATCH 215/965] Update firewall.js

---
 web/static/app/firewall.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/static/app/firewall.js b/web/static/app/firewall.js
index fe9d1a22f..cb5ad5fa6 100755
--- a/web/static/app/firewall.js
+++ b/web/static/app/firewall.js
@@ -92,7 +92,7 @@ function sshMgr(){
         layer.open({
 	        type: 1,
 	        title: "SSH管理",
-	        area: ['300px', '230px'],
+	        area: ['300px', '260px'],
 	        closeBtn: 1,
 	        shadeClose: false,
 	        content: '<div id="ssh_list">'+con+'</div>',

From 7ef0b5a9ae0c39e73cf7579da488d682ac107dcf Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 04:19:22 +0800
Subject: [PATCH 216/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index 31ccc059f..ffe400f04 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0
+APP_SMALL_VERSION = 0.1
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From 21af7b2c1cc1a0dc6b23bc9dc406efee096f188e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 04:21:44 +0800
Subject: [PATCH 217/965] Update setting.py

---
 web/setting.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/setting.py b/web/setting.py
index 31a634367..46672561d 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -57,8 +57,8 @@ threads = workers * 1
 backlog = 512
 reload = False
 daemon = True
-worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
-# worker_class = 'eventlet'
+# worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
+worker_class = 'eventlet'
 timeout = 600
 keepalive = 60
 preload_app = True

From 339d9e829e599ea79770cac9fc6e1db8fa6a2471 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 04:24:12 +0800
Subject: [PATCH 218/965] Update cli.sh

---
 cli.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cli.sh b/cli.sh
index 6b848c6c3..d4a3f95dc 100755
--- a/cli.sh
+++ b/cli.sh
@@ -68,8 +68,8 @@ mw_start_panel(){
 	if [ -f ${DIR}/data/port.pl ];then
         port=$(cat ${DIR}/data/port.pl)
     fi
-	# cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1  app:app
-	cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
+	cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1  app:app
+	# cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
 	
 }
 

From c639d2736e2cdcd19b80bc20e75a9563b473b813 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 04:24:46 +0800
Subject: [PATCH 219/965] update

---
 route/__init__.py                             |  628 --
 route/static/app/config.js                    | 1457 ----
 route/static/app/control.js                   |  867 ---
 route/static/app/crontab.js                   | 1131 ---
 route/static/app/files.js                     | 1864 -----
 route/static/app/firewall.js                  |  370 -
 route/static/app/index.js                     | 1463 ----
 route/static/app/logs.js                      |  205 -
 route/static/app/public.js                    | 2784 --------
 route/static/app/site.js                      | 2923 --------
 route/static/app/soft.js                      |  517 --
 route/static/app/upload.js                    |  238 -
 .../css/bootstrap-theme.min.css               |    5 -
 .../bootstrap-3.3.5/css/bootstrap.min.css     |    5 -
 route/static/bootstrap-3.3.5/css/index.html   |   13 -
 .../fonts/glyphicons-halflings-regular.eot    |  Bin 20127 -> 0 bytes
 .../fonts/glyphicons-halflings-regular.svg    |    1 -
 .../fonts/glyphicons-halflings-regular.ttf    |  Bin 45404 -> 0 bytes
 .../fonts/glyphicons-halflings-regular.woff   |  Bin 23424 -> 0 bytes
 .../fonts/glyphicons-halflings-regular.woff2  |  Bin 18028 -> 0 bytes
 route/static/bootstrap-3.3.5/fonts/index.html |   13 -
 route/static/bootstrap-3.3.5/index.html       |   13 -
 route/static/build/addons/attach/attach.js    |  141 -
 route/static/build/addons/attach/index.html   |   93 -
 route/static/build/addons/attach/package.json |    5 -
 route/static/build/addons/fit/fit.js          |   81 -
 route/static/build/addons/fit/package.json    |    5 -
 .../build/addons/fullscreen/fullscreen.css    |   10 -
 .../build/addons/fullscreen/fullscreen.js     |   50 -
 .../build/addons/fullscreen/package.json      |    5 -
 route/static/build/addons/search/search.js    |  116 -
 .../static/build/addons/search/search.js.map  |    1 -
 .../build/addons/terminado/package.json       |    5 -
 .../build/addons/terminado/terminado.js       |  134 -
 .../build/addons/winptyCompat/winptyCompat.js |   29 -
 .../addons/winptyCompat/winptyCompat.js.map   |    1 -
 route/static/build/addons/zmodem/demo/app.js  |   87 -
 .../build/addons/zmodem/demo/index.html       |  128 -
 route/static/build/addons/zmodem/demo/main.js |  383 -
 route/static/build/addons/zmodem/zmodem.js    |  108 -
 route/static/build/xterm.css                  |  124 -
 route/static/build/xterm.js                   | 6241 -----------------
 route/static/build/xterm.js.map               |    1 -
 .../static/codemirror/addon/dialog/dialog.css |    1 -
 .../static/codemirror/addon/dialog/dialog.js  |    1 -
 .../static/codemirror/addon/dialog/index.html |   13 -
 .../codemirror/addon/display/autorefresh.js   |    1 -
 .../codemirror/addon/display/fullscreen.css   |    1 -
 .../codemirror/addon/display/fullscreen.js    |    1 -
 .../codemirror/addon/display/index.html       |   13 -
 .../static/codemirror/addon/display/panel.js  |    1 -
 .../codemirror/addon/display/placeholder.js   |    1 -
 .../static/codemirror/addon/display/rulers.js |    1 -
 .../codemirror/addon/edit/closebrackets.js    |    1 -
 .../static/codemirror/addon/edit/closetag.js  |    1 -
 .../codemirror/addon/edit/continuelist.js     |    1 -
 route/static/codemirror/addon/edit/editAll.js |    1 -
 route/static/codemirror/addon/edit/index.html |   13 -
 .../codemirror/addon/edit/matchbrackets.js    |    1 -
 .../static/codemirror/addon/edit/matchtags.js |    1 -
 .../codemirror/addon/edit/trailingspace.js    |    1 -
 .../codemirror/addon/hint/anyword-hint.js     |    1 -
 .../static/codemirror/addon/hint/css-hint.js  |    1 -
 .../static/codemirror/addon/hint/html-hint.js |    1 -
 route/static/codemirror/addon/hint/index.html |   13 -
 .../codemirror/addon/hint/javascript-hint.js  |    1 -
 .../codemirror/addon/hint/show-hint.css       |    1 -
 .../static/codemirror/addon/hint/show-hint.js |    1 -
 .../static/codemirror/addon/hint/sql-hint.js  |    1 -
 .../static/codemirror/addon/hint/xml-hint.js  |    1 -
 route/static/codemirror/addon/index.html      |   13 -
 .../addon/scroll/annotatescrollbar.js         |    1 -
 .../static/codemirror/addon/scroll/index.html |   13 -
 .../codemirror/addon/scroll/scrollpastend.js  |    1 -
 .../addon/scroll/simplescrollbars.css         |    1 -
 .../addon/scroll/simplescrollbars.js          |    1 -
 .../static/codemirror/addon/search/index.html |   13 -
 .../codemirror/addon/search/jump-to-line.js   |    1 -
 .../addon/search/match-highlighter.js         |    1 -
 .../addon/search/matchesonscrollbar.css       |    1 -
 .../addon/search/matchesonscrollbar.js        |    1 -
 .../static/codemirror/addon/search/search.js  |    1 -
 .../codemirror/addon/search/searchcursor.js   |    1 -
 route/static/codemirror/index.html            |   13 -
 route/static/codemirror/lib/codemirror.css    |    4 -
 route/static/codemirror/lib/codemirror.js     |    1 -
 route/static/codemirror/lib/index.html        |   13 -
 route/static/codemirror/mode/index.html       |   13 -
 route/static/codemirror/mode/modeAll.js       |    1 -
 route/static/css/ensite.css                   | 3703 ----------
 route/static/css/index.html                   |    0
 route/static/css/install.css                  |  181 -
 route/static/css/login.css                    |  539 --
 route/static/css/site.css                     | 5211 --------------
 route/static/favicon.ico                      |  Bin 9662 -> 0 bytes
 route/static/images/ico-ts-cpu-active.png     |  Bin 780 -> 0 bytes
 route/static/images/ico-ts-cpu.png            |  Bin 645 -> 0 bytes
 route/static/images/ico-ts-disk-active.png    |  Bin 1072 -> 0 bytes
 route/static/images/ico-ts-disk.png           |  Bin 758 -> 0 bytes
 route/static/images/ico-ts-mem-active.png     |  Bin 503 -> 0 bytes
 route/static/images/ico-ts-mem.png            |  Bin 359 -> 0 bytes
 route/static/images/ico-ts-refresh.png        |  Bin 1185 -> 0 bytes
 route/static/images/ico-ts-score.gif          |  Bin 9773 -> 0 bytes
 route/static/images/ico-ts-score.jpg          |  Bin 3961 -> 0 bytes
 route/static/images/ico-ts-score1.png         |  Bin 2061 -> 0 bytes
 route/static/images/ico-ts-score2.png         |  Bin 2191 -> 0 bytes
 route/static/images/ico-ts-score3.png         |  Bin 2119 -> 0 bytes
 route/static/images/index.html                |   13 -
 route/static/images/logo.png                  |  Bin 1939 -> 0 bytes
 route/static/images/move.png                  |  Bin 105 -> 0 bytes
 route/static/images/right.png                 |  Bin 396 -> 0 bytes
 route/static/images/weixin.png                |  Bin 2139 -> 0 bytes
 route/static/img/Detailsbg.png                |  Bin 110 -> 0 bytes
 route/static/img/DrawRecordord.png            |  Bin 95 -> 0 bytes
 route/static/img/account.png                  |  Bin 414 -> 0 bytes
 route/static/img/alipay_zz.png                |  Bin 7307 -> 0 bytes
 route/static/img/ico-close.png                |  Bin 260 -> 0 bytes
 route/static/img/ico-computer.png             |  Bin 246 -> 0 bytes
 route/static/img/ico-copy.png                 |  Bin 281 -> 0 bytes
 route/static/img/ico-home.png                 |  Bin 243 -> 0 bytes
 route/static/img/ico-success.png              |  Bin 585 -> 0 bytes
 route/static/img/ico/ico-access.png           |  Bin 1331 -> 0 bytes
 route/static/img/ico/ico-apk.png              |  Bin 1010 -> 0 bytes
 route/static/img/ico/ico-avi.png              |  Bin 1139 -> 0 bytes
 route/static/img/ico/ico-bmp.png              |  Bin 1027 -> 0 bytes
 route/static/img/ico/ico-bt.png               |  Bin 1166 -> 0 bytes
 route/static/img/ico/ico-c.png                |  Bin 1037 -> 0 bytes
 route/static/img/ico/ico-cdr.png              |  Bin 1035 -> 0 bytes
 route/static/img/ico/ico-cpp.png              |  Bin 1057 -> 0 bytes
 route/static/img/ico/ico-cs.png               |  Bin 1085 -> 0 bytes
 route/static/img/ico/ico-doc.png              |  Bin 1158 -> 0 bytes
 route/static/img/ico/ico-docx.png             |  Bin 1195 -> 0 bytes
 route/static/img/ico/ico-flv.png              |  Bin 1116 -> 0 bytes
 route/static/img/ico/ico-gif.png              |  Bin 973 -> 0 bytes
 route/static/img/ico/ico-htm.png              |  Bin 1066 -> 0 bytes
 route/static/img/ico/ico-html.png             |  Bin 1072 -> 0 bytes
 route/static/img/ico/ico-java.png             |  Bin 1417 -> 0 bytes
 route/static/img/ico/ico-jpeg.png             |  Bin 1018 -> 0 bytes
 route/static/img/ico/ico-jpg.png              |  Bin 1007 -> 0 bytes
 route/static/img/ico/ico-js.png               |  Bin 1107 -> 0 bytes
 route/static/img/ico/ico-ltr.png              |  Bin 233 -> 0 bytes
 route/static/img/ico/ico-mht.png              |  Bin 1061 -> 0 bytes
 route/static/img/ico/ico-mkv.png              |  Bin 1247 -> 0 bytes
 route/static/img/ico/ico-mov.png              |  Bin 1175 -> 0 bytes
 route/static/img/ico/ico-mp4.png              |  Bin 1147 -> 0 bytes
 route/static/img/ico/ico-mpeg.png             |  Bin 1177 -> 0 bytes
 route/static/img/ico/ico-mpg.png              |  Bin 1168 -> 0 bytes
 route/static/img/ico/ico-pdf.png              |  Bin 1086 -> 0 bytes
 route/static/img/ico/ico-php.png              |  Bin 1318 -> 0 bytes
 route/static/img/ico/ico-png.png              |  Bin 1023 -> 0 bytes
 route/static/img/ico/ico-pptx.png             |  Bin 1127 -> 0 bytes
 route/static/img/ico/ico-psd.png              |  Bin 1119 -> 0 bytes
 route/static/img/ico/ico-rm.png               |  Bin 1129 -> 0 bytes
 route/static/img/ico/ico-rmvb.png             |  Bin 1209 -> 0 bytes
 route/static/img/ico/ico-rocket.gif           |  Bin 1079 -> 0 bytes
 route/static/img/ico/ico-swf.png              |  Bin 964 -> 0 bytes
 route/static/img/ico/ico-url.png              |  Bin 1152 -> 0 bytes
 route/static/img/ico/ico-webm.png             |  Bin 1214 -> 0 bytes
 route/static/img/ico/ico-webp.png             |  Bin 1060 -> 0 bytes
 route/static/img/ico/ico-wma.png              |  Bin 978 -> 0 bytes
 route/static/img/ico/ico-wmv.png              |  Bin 1211 -> 0 bytes
 route/static/img/ico/ico-xls.png              |  Bin 1121 -> 0 bytes
 route/static/img/ico/ico-xlsx.png             |  Bin 1163 -> 0 bytes
 route/static/img/ico/ico-xml.png              |  Bin 1095 -> 0 bytes
 route/static/img/ico/index.html               |   13 -
 route/static/img/ico/menu_icon_control.png    |  Bin 327 -> 0 bytes
 .../img/ico/menu_icon_control_active.gif      |  Bin 805 -> 0 bytes
 .../img/ico/menu_icon_control_active.png      |  Bin 316 -> 0 bytes
 route/static/img/ico/menu_icon_data.png       |  Bin 347 -> 0 bytes
 .../static/img/ico/menu_icon_data_active.gif  |  Bin 936 -> 0 bytes
 .../static/img/ico/menu_icon_data_active.png  |  Bin 330 -> 0 bytes
 route/static/img/ico/menu_icon_day.png        |  Bin 291 -> 0 bytes
 route/static/img/ico/menu_icon_day_active.gif |  Bin 568 -> 0 bytes
 route/static/img/ico/menu_icon_day_active.png |  Bin 271 -> 0 bytes
 route/static/img/ico/menu_icon_exit.png       |  Bin 240 -> 0 bytes
 .../static/img/ico/menu_icon_exit_active.gif  |  Bin 545 -> 0 bytes
 .../static/img/ico/menu_icon_exit_active.png  |  Bin 232 -> 0 bytes
 route/static/img/ico/menu_icon_firewall.png   |  Bin 324 -> 0 bytes
 .../img/ico/menu_icon_firewall_active.gif     |  Bin 550 -> 0 bytes
 .../img/ico/menu_icon_firewall_active.png     |  Bin 310 -> 0 bytes
 route/static/img/ico/menu_icon_folder.png     |  Bin 274 -> 0 bytes
 .../img/ico/menu_icon_folder_active.gif       |  Bin 719 -> 0 bytes
 .../img/ico/menu_icon_folder_active.png       |  Bin 239 -> 0 bytes
 route/static/img/ico/menu_icon_ftp.png        |  Bin 384 -> 0 bytes
 route/static/img/ico/menu_icon_ftp_active.gif |  Bin 1054 -> 0 bytes
 route/static/img/ico/menu_icon_ftp_active.png |  Bin 365 -> 0 bytes
 route/static/img/ico/menu_icon_home.png       |  Bin 271 -> 0 bytes
 .../static/img/ico/menu_icon_home_active.gif  |  Bin 976 -> 0 bytes
 .../static/img/ico/menu_icon_home_active.png  |  Bin 308 -> 0 bytes
 route/static/img/ico/menu_icon_log.png        |  Bin 188 -> 0 bytes
 route/static/img/ico/menu_icon_log_active.png |  Bin 180 -> 0 bytes
 route/static/img/ico/menu_icon_set.png        |  Bin 319 -> 0 bytes
 route/static/img/ico/menu_icon_set_active.gif |  Bin 1923 -> 0 bytes
 route/static/img/ico/menu_icon_set_active.png |  Bin 308 -> 0 bytes
 route/static/img/ico/menu_icon_soft.png       |  Bin 303 -> 0 bytes
 .../static/img/ico/menu_icon_soft_active.gif  |  Bin 955 -> 0 bytes
 .../static/img/ico/menu_icon_soft_active.png  |  Bin 311 -> 0 bytes
 route/static/img/ico/menu_icon_web.png        |  Bin 363 -> 0 bytes
 route/static/img/ico/menu_icon_web_active.gif |  Bin 766 -> 0 bytes
 route/static/img/ico/menu_icon_web_active.png |  Bin 343 -> 0 bytes
 route/static/img/ico/rocket_min.png           |  Bin 435 -> 0 bytes
 route/static/img/ico_line.png                 |  Bin 145 -> 0 bytes
 route/static/img/icon-item.png                |  Bin 224 -> 0 bytes
 route/static/img/icon3.png                    |  Bin 330 -> 0 bytes
 route/static/img/icon4.png                    |  Bin 358 -> 0 bytes
 route/static/img/index.html                   |    0
 route/static/img/ing.gif                      |  Bin 131 -> 0 bytes
 route/static/img/ings.gif                     |  Bin 131 -> 0 bytes
 route/static/img/label-icon.png               |  Bin 305 -> 0 bytes
 route/static/img/loading.gif                  |  Bin 1785 -> 0 bytes
 route/static/img/morebtn.png                  |  Bin 530 -> 0 bytes
 route/static/img/ns-loading.gif               |  Bin 1513 -> 0 bytes
 route/static/img/ref-icon.png                 |  Bin 349 -> 0 bytes
 route/static/img/return-icon.png              |  Bin 363 -> 0 bytes
 route/static/img/safety_ico.png               |  Bin 410 -> 0 bytes
 route/static/img/ser-icon.png                 |  Bin 275 -> 0 bytes
 route/static/img/soft_ico/ico-app.png         |  Bin 581 -> 0 bytes
 route/static/img/soft_ico/ico-beta.png        |  Bin 398 -> 0 bytes
 route/static/img/soft_ico/ico-cmd-hover.png   |  Bin 178 -> 0 bytes
 route/static/img/soft_ico/ico-cmd.png         |  Bin 181 -> 0 bytes
 route/static/img/soft_ico/ico-deployment.png  |  Bin 422 -> 0 bytes
 .../static/img/soft_ico/ico-load_leveling.png |  Bin 477 -> 0 bytes
 route/static/img/soft_ico/ico-log.png         |  Bin 308 -> 0 bytes
 route/static/img/soft_ico/ico-logs.png        |  Bin 753 -> 0 bytes
 route/static/img/soft_ico/ico-mongodb.png     |  Bin 808 -> 0 bytes
 route/static/img/soft_ico/ico-node.png        |  Bin 1423 -> 0 bytes
 route/static/img/soft_ico/ico-phpsafe.png     |  Bin 1169 -> 0 bytes
 route/static/img/soft_ico/ico-pm2.png         |  Bin 870 -> 0 bytes
 route/static/img/soft_ico/ico-psync.png       |  Bin 280 -> 0 bytes
 route/static/img/soft_ico/ico-rsync.png       |  Bin 835 -> 0 bytes
 route/static/img/soft_ico/ico-safelogin.png   |  Bin 603 -> 0 bytes
 route/static/img/soft_ico/ico-score.png       |  Bin 457 -> 0 bytes
 .../static/img/soft_ico/ico-task_manager.png  |  Bin 320 -> 0 bytes
 route/static/img/soft_ico/ico-test.png        |  Bin 654 -> 0 bytes
 route/static/img/soft_ico/ico-tomcat.png      |  Bin 2286 -> 0 bytes
 route/static/img/soft_ico/ico-txcos.png       |  Bin 3136 -> 0 bytes
 route/static/img/soft_ico/ico-webhook.png     |  Bin 653 -> 0 bytes
 route/static/img/soft_ico/index.html          |   13 -
 route/static/img/success-pic.png              |  Bin 3726 -> 0 bytes
 route/static/img/tip_suu.png                  |  Bin 2862 -> 0 bytes
 route/static/img/weixin_zz.jpg                |  Bin 60575 -> 0 bytes
 route/static/index.html                       |   13 -
 route/static/js/Validform_v5.3.2_min.js       |    8 -
 route/static/js/bootstrap.min.js              |    7 -
 route/static/js/clipboard.min.js              |    7 -
 route/static/js/echarts.min.js                |   45 -
 route/static/js/jquery-1.10.2.min.js          |    5 -
 route/static/js/jquery-qrcode-0.18.0.min.js   |    2 -
 route/static/js/jquery-ui.min.js              |   13 -
 route/static/js/jquery.contextify.min.js      |    6 -
 route/static/js/jquery.contextify.min.js.map  |    1 -
 route/static/js/jquery.cookie-1.4.1.min.js    |    2 -
 route/static/js/jquery.dragsort-0.5.2.min.js  |    3 -
 route/static/js/jquery.fly.min.js             |    4 -
 route/static/js/requestAnimationFrame.js      |   27 -
 route/static/js/socket.io.min.js              |    7 -
 route/static/js/socket.io.min.js.map          |    1 -
 route/static/js/term-websocketio.js           |  136 -
 route/static/js/term.js                       |  158 -
 route/static/js/xm-select.js                  |    8 -
 .../static/language/Simplified_Chinese/lan.js | 1016 ---
 .../language/Simplified_Chinese/log.json      |  123 -
 .../language/Simplified_Chinese/public.json   |  303 -
 .../language/Simplified_Chinese/template.json |  299 -
 route/static/language/index.html              |    0
 route/static/language/list.json               |    4 -
 route/static/language/zh-cn.js                |   19 -
 route/static/laydate/index.html               |   13 -
 route/static/laydate/laydate.js               |    1 -
 .../laydate/theme/default/font/iconfont.eot   |  Bin 2456 -> 0 bytes
 .../laydate/theme/default/font/iconfont.svg   |    1 -
 .../laydate/theme/default/font/iconfont.ttf   |  Bin 2272 -> 0 bytes
 .../laydate/theme/default/font/iconfont.woff  |  Bin 1492 -> 0 bytes
 .../laydate/theme/default/font/index.html     |   13 -
 route/static/laydate/theme/default/index.html |   13 -
 .../static/laydate/theme/default/laydate.css  |    2 -
 route/static/laydate/theme/index.html         |   13 -
 route/static/layer/extend/index.html          |   13 -
 route/static/layer/extend/layer.ext.js        |    2 -
 route/static/layer/index.html                 |   13 -
 route/static/layer/layer.js                   |    2 -
 route/static/layer/mobile/index.html          |   13 -
 route/static/layer/mobile/layer.js            |    2 -
 route/static/layer/mobile/need/index.html     |   13 -
 route/static/layer/mobile/need/layer.css      |    1 -
 route/static/layer/skin/default/close.png     |  Bin 581 -> 0 bytes
 .../static/layer/skin/default/close_hover.png |  Bin 767 -> 0 bytes
 route/static/layer/skin/default/icon-ext.png  |  Bin 2713 -> 0 bytes
 route/static/layer/skin/default/icon.png      |  Bin 6864 -> 0 bytes
 route/static/layer/skin/default/index.html    |   13 -
 route/static/layer/skin/default/layer.css     |    1 -
 route/static/layer/skin/default/loading-0.gif |  Bin 5310 -> 0 bytes
 route/static/layer/skin/default/loading-1.gif |  Bin 699 -> 0 bytes
 route/static/layer/skin/default/loading-2.gif |  Bin 1785 -> 0 bytes
 route/static/layer/skin/index.html            |   13 -
 route/static/layer/skin/layer.css             |    7 -
 route/static/layer/skin/layer.ext.css         |    8 -
 route/static/logo.png                         |  Bin 22782 -> 0 bytes
 route/static/mdw.jpg                          |  Bin 66905 -> 0 bytes
 route/templates/default/close.html            |   13 -
 route/templates/default/config.html           |  196 -
 route/templates/default/control.html          |  176 -
 route/templates/default/crontab.html          |  155 -
 route/templates/default/files.html            |  113 -
 route/templates/default/firewall.html         |  117 -
 route/templates/default/index.html            |  171 -
 route/templates/default/layout.html           |  208 -
 route/templates/default/login.html            |  257 -
 route/templates/default/logs.html             |  189 -
 route/templates/default/path.html             |   16 -
 route/templates/default/plugin_menu.html      |    4 -
 route/templates/default/site.html             |   75 -
 route/templates/default/soft.html             |   58 -
 route/templates/index.html                    |    1 -
 314 files changed, 36210 deletions(-)
 delete mode 100755 route/__init__.py
 delete mode 100755 route/static/app/config.js
 delete mode 100755 route/static/app/control.js
 delete mode 100755 route/static/app/crontab.js
 delete mode 100755 route/static/app/files.js
 delete mode 100755 route/static/app/firewall.js
 delete mode 100755 route/static/app/index.js
 delete mode 100644 route/static/app/logs.js
 delete mode 100755 route/static/app/public.js
 delete mode 100755 route/static/app/site.js
 delete mode 100755 route/static/app/soft.js
 delete mode 100755 route/static/app/upload.js
 delete mode 100755 route/static/bootstrap-3.3.5/css/bootstrap-theme.min.css
 delete mode 100755 route/static/bootstrap-3.3.5/css/bootstrap.min.css
 delete mode 100755 route/static/bootstrap-3.3.5/css/index.html
 delete mode 100755 route/static/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.eot
 delete mode 100755 route/static/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.svg
 delete mode 100755 route/static/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.ttf
 delete mode 100755 route/static/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff
 delete mode 100755 route/static/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff2
 delete mode 100755 route/static/bootstrap-3.3.5/fonts/index.html
 delete mode 100755 route/static/bootstrap-3.3.5/index.html
 delete mode 100755 route/static/build/addons/attach/attach.js
 delete mode 100755 route/static/build/addons/attach/index.html
 delete mode 100755 route/static/build/addons/attach/package.json
 delete mode 100755 route/static/build/addons/fit/fit.js
 delete mode 100755 route/static/build/addons/fit/package.json
 delete mode 100755 route/static/build/addons/fullscreen/fullscreen.css
 delete mode 100755 route/static/build/addons/fullscreen/fullscreen.js
 delete mode 100755 route/static/build/addons/fullscreen/package.json
 delete mode 100755 route/static/build/addons/search/search.js
 delete mode 100755 route/static/build/addons/search/search.js.map
 delete mode 100755 route/static/build/addons/terminado/package.json
 delete mode 100755 route/static/build/addons/terminado/terminado.js
 delete mode 100755 route/static/build/addons/winptyCompat/winptyCompat.js
 delete mode 100755 route/static/build/addons/winptyCompat/winptyCompat.js.map
 delete mode 100755 route/static/build/addons/zmodem/demo/app.js
 delete mode 100755 route/static/build/addons/zmodem/demo/index.html
 delete mode 100755 route/static/build/addons/zmodem/demo/main.js
 delete mode 100755 route/static/build/addons/zmodem/zmodem.js
 delete mode 100755 route/static/build/xterm.css
 delete mode 100755 route/static/build/xterm.js
 delete mode 100755 route/static/build/xterm.js.map
 delete mode 100755 route/static/codemirror/addon/dialog/dialog.css
 delete mode 100755 route/static/codemirror/addon/dialog/dialog.js
 delete mode 100755 route/static/codemirror/addon/dialog/index.html
 delete mode 100755 route/static/codemirror/addon/display/autorefresh.js
 delete mode 100755 route/static/codemirror/addon/display/fullscreen.css
 delete mode 100755 route/static/codemirror/addon/display/fullscreen.js
 delete mode 100755 route/static/codemirror/addon/display/index.html
 delete mode 100755 route/static/codemirror/addon/display/panel.js
 delete mode 100755 route/static/codemirror/addon/display/placeholder.js
 delete mode 100755 route/static/codemirror/addon/display/rulers.js
 delete mode 100755 route/static/codemirror/addon/edit/closebrackets.js
 delete mode 100755 route/static/codemirror/addon/edit/closetag.js
 delete mode 100755 route/static/codemirror/addon/edit/continuelist.js
 delete mode 100755 route/static/codemirror/addon/edit/editAll.js
 delete mode 100755 route/static/codemirror/addon/edit/index.html
 delete mode 100755 route/static/codemirror/addon/edit/matchbrackets.js
 delete mode 100755 route/static/codemirror/addon/edit/matchtags.js
 delete mode 100755 route/static/codemirror/addon/edit/trailingspace.js
 delete mode 100755 route/static/codemirror/addon/hint/anyword-hint.js
 delete mode 100755 route/static/codemirror/addon/hint/css-hint.js
 delete mode 100755 route/static/codemirror/addon/hint/html-hint.js
 delete mode 100755 route/static/codemirror/addon/hint/index.html
 delete mode 100755 route/static/codemirror/addon/hint/javascript-hint.js
 delete mode 100755 route/static/codemirror/addon/hint/show-hint.css
 delete mode 100755 route/static/codemirror/addon/hint/show-hint.js
 delete mode 100755 route/static/codemirror/addon/hint/sql-hint.js
 delete mode 100755 route/static/codemirror/addon/hint/xml-hint.js
 delete mode 100755 route/static/codemirror/addon/index.html
 delete mode 100755 route/static/codemirror/addon/scroll/annotatescrollbar.js
 delete mode 100755 route/static/codemirror/addon/scroll/index.html
 delete mode 100755 route/static/codemirror/addon/scroll/scrollpastend.js
 delete mode 100755 route/static/codemirror/addon/scroll/simplescrollbars.css
 delete mode 100755 route/static/codemirror/addon/scroll/simplescrollbars.js
 delete mode 100755 route/static/codemirror/addon/search/index.html
 delete mode 100755 route/static/codemirror/addon/search/jump-to-line.js
 delete mode 100755 route/static/codemirror/addon/search/match-highlighter.js
 delete mode 100755 route/static/codemirror/addon/search/matchesonscrollbar.css
 delete mode 100755 route/static/codemirror/addon/search/matchesonscrollbar.js
 delete mode 100755 route/static/codemirror/addon/search/search.js
 delete mode 100755 route/static/codemirror/addon/search/searchcursor.js
 delete mode 100755 route/static/codemirror/index.html
 delete mode 100755 route/static/codemirror/lib/codemirror.css
 delete mode 100755 route/static/codemirror/lib/codemirror.js
 delete mode 100755 route/static/codemirror/lib/index.html
 delete mode 100755 route/static/codemirror/mode/index.html
 delete mode 100755 route/static/codemirror/mode/modeAll.js
 delete mode 100755 route/static/css/ensite.css
 delete mode 100755 route/static/css/index.html
 delete mode 100755 route/static/css/install.css
 delete mode 100755 route/static/css/login.css
 delete mode 100755 route/static/css/site.css
 delete mode 100644 route/static/favicon.ico
 delete mode 100755 route/static/images/ico-ts-cpu-active.png
 delete mode 100755 route/static/images/ico-ts-cpu.png
 delete mode 100755 route/static/images/ico-ts-disk-active.png
 delete mode 100755 route/static/images/ico-ts-disk.png
 delete mode 100755 route/static/images/ico-ts-mem-active.png
 delete mode 100755 route/static/images/ico-ts-mem.png
 delete mode 100755 route/static/images/ico-ts-refresh.png
 delete mode 100755 route/static/images/ico-ts-score.gif
 delete mode 100755 route/static/images/ico-ts-score.jpg
 delete mode 100755 route/static/images/ico-ts-score1.png
 delete mode 100755 route/static/images/ico-ts-score2.png
 delete mode 100755 route/static/images/ico-ts-score3.png
 delete mode 100755 route/static/images/index.html
 delete mode 100755 route/static/images/logo.png
 delete mode 100755 route/static/images/move.png
 delete mode 100755 route/static/images/right.png
 delete mode 100755 route/static/images/weixin.png
 delete mode 100755 route/static/img/Detailsbg.png
 delete mode 100755 route/static/img/DrawRecordord.png
 delete mode 100755 route/static/img/account.png
 delete mode 100644 route/static/img/alipay_zz.png
 delete mode 100755 route/static/img/ico-close.png
 delete mode 100755 route/static/img/ico-computer.png
 delete mode 100755 route/static/img/ico-copy.png
 delete mode 100755 route/static/img/ico-home.png
 delete mode 100755 route/static/img/ico-success.png
 delete mode 100755 route/static/img/ico/ico-access.png
 delete mode 100755 route/static/img/ico/ico-apk.png
 delete mode 100755 route/static/img/ico/ico-avi.png
 delete mode 100755 route/static/img/ico/ico-bmp.png
 delete mode 100755 route/static/img/ico/ico-bt.png
 delete mode 100755 route/static/img/ico/ico-c.png
 delete mode 100755 route/static/img/ico/ico-cdr.png
 delete mode 100755 route/static/img/ico/ico-cpp.png
 delete mode 100755 route/static/img/ico/ico-cs.png
 delete mode 100755 route/static/img/ico/ico-doc.png
 delete mode 100755 route/static/img/ico/ico-docx.png
 delete mode 100755 route/static/img/ico/ico-flv.png
 delete mode 100755 route/static/img/ico/ico-gif.png
 delete mode 100755 route/static/img/ico/ico-htm.png
 delete mode 100755 route/static/img/ico/ico-html.png
 delete mode 100755 route/static/img/ico/ico-java.png
 delete mode 100755 route/static/img/ico/ico-jpeg.png
 delete mode 100755 route/static/img/ico/ico-jpg.png
 delete mode 100755 route/static/img/ico/ico-js.png
 delete mode 100755 route/static/img/ico/ico-ltr.png
 delete mode 100755 route/static/img/ico/ico-mht.png
 delete mode 100755 route/static/img/ico/ico-mkv.png
 delete mode 100755 route/static/img/ico/ico-mov.png
 delete mode 100755 route/static/img/ico/ico-mp4.png
 delete mode 100755 route/static/img/ico/ico-mpeg.png
 delete mode 100755 route/static/img/ico/ico-mpg.png
 delete mode 100755 route/static/img/ico/ico-pdf.png
 delete mode 100755 route/static/img/ico/ico-php.png
 delete mode 100755 route/static/img/ico/ico-png.png
 delete mode 100755 route/static/img/ico/ico-pptx.png
 delete mode 100755 route/static/img/ico/ico-psd.png
 delete mode 100755 route/static/img/ico/ico-rm.png
 delete mode 100755 route/static/img/ico/ico-rmvb.png
 delete mode 100755 route/static/img/ico/ico-rocket.gif
 delete mode 100755 route/static/img/ico/ico-swf.png
 delete mode 100755 route/static/img/ico/ico-url.png
 delete mode 100755 route/static/img/ico/ico-webm.png
 delete mode 100755 route/static/img/ico/ico-webp.png
 delete mode 100755 route/static/img/ico/ico-wma.png
 delete mode 100755 route/static/img/ico/ico-wmv.png
 delete mode 100755 route/static/img/ico/ico-xls.png
 delete mode 100755 route/static/img/ico/ico-xlsx.png
 delete mode 100755 route/static/img/ico/ico-xml.png
 delete mode 100755 route/static/img/ico/index.html
 delete mode 100755 route/static/img/ico/menu_icon_control.png
 delete mode 100755 route/static/img/ico/menu_icon_control_active.gif
 delete mode 100755 route/static/img/ico/menu_icon_control_active.png
 delete mode 100755 route/static/img/ico/menu_icon_data.png
 delete mode 100755 route/static/img/ico/menu_icon_data_active.gif
 delete mode 100755 route/static/img/ico/menu_icon_data_active.png
 delete mode 100755 route/static/img/ico/menu_icon_day.png
 delete mode 100755 route/static/img/ico/menu_icon_day_active.gif
 delete mode 100755 route/static/img/ico/menu_icon_day_active.png
 delete mode 100755 route/static/img/ico/menu_icon_exit.png
 delete mode 100755 route/static/img/ico/menu_icon_exit_active.gif
 delete mode 100755 route/static/img/ico/menu_icon_exit_active.png
 delete mode 100755 route/static/img/ico/menu_icon_firewall.png
 delete mode 100755 route/static/img/ico/menu_icon_firewall_active.gif
 delete mode 100755 route/static/img/ico/menu_icon_firewall_active.png
 delete mode 100755 route/static/img/ico/menu_icon_folder.png
 delete mode 100755 route/static/img/ico/menu_icon_folder_active.gif
 delete mode 100755 route/static/img/ico/menu_icon_folder_active.png
 delete mode 100755 route/static/img/ico/menu_icon_ftp.png
 delete mode 100755 route/static/img/ico/menu_icon_ftp_active.gif
 delete mode 100755 route/static/img/ico/menu_icon_ftp_active.png
 delete mode 100755 route/static/img/ico/menu_icon_home.png
 delete mode 100755 route/static/img/ico/menu_icon_home_active.gif
 delete mode 100755 route/static/img/ico/menu_icon_home_active.png
 delete mode 100755 route/static/img/ico/menu_icon_log.png
 delete mode 100755 route/static/img/ico/menu_icon_log_active.png
 delete mode 100755 route/static/img/ico/menu_icon_set.png
 delete mode 100755 route/static/img/ico/menu_icon_set_active.gif
 delete mode 100755 route/static/img/ico/menu_icon_set_active.png
 delete mode 100755 route/static/img/ico/menu_icon_soft.png
 delete mode 100755 route/static/img/ico/menu_icon_soft_active.gif
 delete mode 100755 route/static/img/ico/menu_icon_soft_active.png
 delete mode 100755 route/static/img/ico/menu_icon_web.png
 delete mode 100755 route/static/img/ico/menu_icon_web_active.gif
 delete mode 100755 route/static/img/ico/menu_icon_web_active.png
 delete mode 100755 route/static/img/ico/rocket_min.png
 delete mode 100755 route/static/img/ico_line.png
 delete mode 100755 route/static/img/icon-item.png
 delete mode 100755 route/static/img/icon3.png
 delete mode 100755 route/static/img/icon4.png
 delete mode 100755 route/static/img/index.html
 delete mode 100755 route/static/img/ing.gif
 delete mode 100755 route/static/img/ings.gif
 delete mode 100755 route/static/img/label-icon.png
 delete mode 100755 route/static/img/loading.gif
 delete mode 100755 route/static/img/morebtn.png
 delete mode 100755 route/static/img/ns-loading.gif
 delete mode 100755 route/static/img/ref-icon.png
 delete mode 100755 route/static/img/return-icon.png
 delete mode 100755 route/static/img/safety_ico.png
 delete mode 100755 route/static/img/ser-icon.png
 delete mode 100755 route/static/img/soft_ico/ico-app.png
 delete mode 100755 route/static/img/soft_ico/ico-beta.png
 delete mode 100755 route/static/img/soft_ico/ico-cmd-hover.png
 delete mode 100755 route/static/img/soft_ico/ico-cmd.png
 delete mode 100755 route/static/img/soft_ico/ico-deployment.png
 delete mode 100755 route/static/img/soft_ico/ico-load_leveling.png
 delete mode 100755 route/static/img/soft_ico/ico-log.png
 delete mode 100755 route/static/img/soft_ico/ico-logs.png
 delete mode 100755 route/static/img/soft_ico/ico-mongodb.png
 delete mode 100755 route/static/img/soft_ico/ico-node.png
 delete mode 100755 route/static/img/soft_ico/ico-phpsafe.png
 delete mode 100755 route/static/img/soft_ico/ico-pm2.png
 delete mode 100755 route/static/img/soft_ico/ico-psync.png
 delete mode 100755 route/static/img/soft_ico/ico-rsync.png
 delete mode 100755 route/static/img/soft_ico/ico-safelogin.png
 delete mode 100755 route/static/img/soft_ico/ico-score.png
 delete mode 100755 route/static/img/soft_ico/ico-task_manager.png
 delete mode 100755 route/static/img/soft_ico/ico-test.png
 delete mode 100755 route/static/img/soft_ico/ico-tomcat.png
 delete mode 100755 route/static/img/soft_ico/ico-txcos.png
 delete mode 100755 route/static/img/soft_ico/ico-webhook.png
 delete mode 100755 route/static/img/soft_ico/index.html
 delete mode 100755 route/static/img/success-pic.png
 delete mode 100755 route/static/img/tip_suu.png
 delete mode 100644 route/static/img/weixin_zz.jpg
 delete mode 100755 route/static/index.html
 delete mode 100755 route/static/js/Validform_v5.3.2_min.js
 delete mode 100755 route/static/js/bootstrap.min.js
 delete mode 100755 route/static/js/clipboard.min.js
 delete mode 100644 route/static/js/echarts.min.js
 delete mode 100755 route/static/js/jquery-1.10.2.min.js
 delete mode 100755 route/static/js/jquery-qrcode-0.18.0.min.js
 delete mode 100755 route/static/js/jquery-ui.min.js
 delete mode 100755 route/static/js/jquery.contextify.min.js
 delete mode 100755 route/static/js/jquery.contextify.min.js.map
 delete mode 100644 route/static/js/jquery.cookie-1.4.1.min.js
 delete mode 100755 route/static/js/jquery.dragsort-0.5.2.min.js
 delete mode 100755 route/static/js/jquery.fly.min.js
 delete mode 100755 route/static/js/requestAnimationFrame.js
 delete mode 100644 route/static/js/socket.io.min.js
 delete mode 100644 route/static/js/socket.io.min.js.map
 delete mode 100644 route/static/js/term-websocketio.js
 delete mode 100644 route/static/js/term.js
 delete mode 100755 route/static/js/xm-select.js
 delete mode 100755 route/static/language/Simplified_Chinese/lan.js
 delete mode 100755 route/static/language/Simplified_Chinese/log.json
 delete mode 100755 route/static/language/Simplified_Chinese/public.json
 delete mode 100755 route/static/language/Simplified_Chinese/template.json
 delete mode 100755 route/static/language/index.html
 delete mode 100755 route/static/language/list.json
 delete mode 100755 route/static/language/zh-cn.js
 delete mode 100755 route/static/laydate/index.html
 delete mode 100755 route/static/laydate/laydate.js
 delete mode 100755 route/static/laydate/theme/default/font/iconfont.eot
 delete mode 100755 route/static/laydate/theme/default/font/iconfont.svg
 delete mode 100755 route/static/laydate/theme/default/font/iconfont.ttf
 delete mode 100755 route/static/laydate/theme/default/font/iconfont.woff
 delete mode 100755 route/static/laydate/theme/default/font/index.html
 delete mode 100755 route/static/laydate/theme/default/index.html
 delete mode 100755 route/static/laydate/theme/default/laydate.css
 delete mode 100755 route/static/laydate/theme/index.html
 delete mode 100755 route/static/layer/extend/index.html
 delete mode 100755 route/static/layer/extend/layer.ext.js
 delete mode 100755 route/static/layer/index.html
 delete mode 100755 route/static/layer/layer.js
 delete mode 100755 route/static/layer/mobile/index.html
 delete mode 100755 route/static/layer/mobile/layer.js
 delete mode 100755 route/static/layer/mobile/need/index.html
 delete mode 100755 route/static/layer/mobile/need/layer.css
 delete mode 100755 route/static/layer/skin/default/close.png
 delete mode 100755 route/static/layer/skin/default/close_hover.png
 delete mode 100755 route/static/layer/skin/default/icon-ext.png
 delete mode 100755 route/static/layer/skin/default/icon.png
 delete mode 100755 route/static/layer/skin/default/index.html
 delete mode 100755 route/static/layer/skin/default/layer.css
 delete mode 100755 route/static/layer/skin/default/loading-0.gif
 delete mode 100755 route/static/layer/skin/default/loading-1.gif
 delete mode 100755 route/static/layer/skin/default/loading-2.gif
 delete mode 100755 route/static/layer/skin/index.html
 delete mode 100755 route/static/layer/skin/layer.css
 delete mode 100755 route/static/layer/skin/layer.ext.css
 delete mode 100644 route/static/logo.png
 delete mode 100644 route/static/mdw.jpg
 delete mode 100755 route/templates/default/close.html
 delete mode 100755 route/templates/default/config.html
 delete mode 100755 route/templates/default/control.html
 delete mode 100755 route/templates/default/crontab.html
 delete mode 100755 route/templates/default/files.html
 delete mode 100755 route/templates/default/firewall.html
 delete mode 100755 route/templates/default/index.html
 delete mode 100755 route/templates/default/layout.html
 delete mode 100755 route/templates/default/login.html
 delete mode 100644 route/templates/default/logs.html
 delete mode 100755 route/templates/default/path.html
 delete mode 100644 route/templates/default/plugin_menu.html
 delete mode 100755 route/templates/default/site.html
 delete mode 100755 route/templates/default/soft.html
 delete mode 100644 route/templates/index.html

diff --git a/route/__init__.py b/route/__init__.py
deleted file mode 100755
index bffc16e33..000000000
--- a/route/__init__.py
+++ /dev/null
@@ -1,628 +0,0 @@
-# coding:utf-8
-
-import sys
-import io
-import os
-import time
-import shutil
-import uuid
-import json
-import traceback
-import socket
-
-# reload(sys)
-#  sys.setdefaultencoding('utf-8')
-import paramiko
-from datetime import timedelta
-
-from flask import Flask
-from flask import render_template
-from flask import make_response
-from flask import Response
-from flask import session
-from flask import request
-from flask import redirect
-from flask import url_for
-from flask import render_template_string, abort
-from flask_caching import Cache
-from flask_session import Session
-# from flask_compress import Compress
-
-from whitenoise import WhiteNoise
-
-sys.path.append(os.getcwd() + "/class/core")
-
-import db
-import mw
-import config_api
-
-import common
-common.init()
-
-app = Flask(__name__, template_folder='templates/default')
-app.config.version = config_api.config_api().getVersion()
-# Compress(app)
-
-app.wsgi_app = WhiteNoise(
-    app.wsgi_app, root="route/static/", prefix="static/", max_age=604800)
-
-cache = Cache(config={'CACHE_TYPE': 'simple'})
-cache.init_app(app, config={'CACHE_TYPE': 'simple'})
-
-try:
-    from flask_sqlalchemy import SQLAlchemy
-    app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////tmp/py_mw_session.db'
-    app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = True
-    app.config['SESSION_TYPE'] = 'sqlalchemy'
-    app.config['SESSION_SQLALCHEMY'] = sdb
-    app.config['SESSION_SQLALCHEMY_TABLE'] = 'session'
-    sdb = SQLAlchemy(app)
-    sdb.create_all()
-except:
-    app.config['SESSION_TYPE'] = 'filesystem'
-    app.config['SESSION_FILE_DIR'] = '/tmp/py_mw_session_' + str(sys.version_info[0])
-    app.config['SESSION_FILE_THRESHOLD'] = 1024
-    app.config['SESSION_FILE_MODE'] = 384
-
-app.secret_key = uuid.UUID(int=uuid.getnode()).hex[-12:]
-app.config['SESSION_PERMANENT'] = True
-app.config['SESSION_USE_SIGNER'] = True
-app.config['SESSION_KEY_PREFIX'] = 'MW_:'
-app.config['SESSION_COOKIE_NAME'] = "MW_VER_1"
-app.config['PERMANENT_SESSION_LIFETIME'] = timedelta(days=31)
-
-if mw.isAppleSystem():
-    app.config['DEBUG'] = True
-
-# Session(app)
-
-# 设置BasicAuth
-basic_auth_conf = 'data/basic_auth.json'
-app.config['BASIC_AUTH_OPEN'] = False
-if os.path.exists(basic_auth_conf):
-    try:
-        ba_conf = json.loads(mw.readFile(basic_auth_conf))
-        # print(ba_conf)
-        app.config['BASIC_AUTH_USERNAME'] = ba_conf['basic_user']
-        app.config['BASIC_AUTH_PASSWORD'] = ba_conf['basic_pwd']
-        app.config['BASIC_AUTH_OPEN'] = ba_conf['open']
-        app.config['BASIC_AUTH_FORCE'] = True
-    except Exception as e:
-        print(e)
-
-# socketio
-from flask_socketio import SocketIO, emit, send
-socketio = SocketIO()
-socketio.init_app(app)
-
-# sockets
-from flask_sockets import Sockets
-sockets = Sockets(app)
-
-# from gevent.pywsgi import WSGIServer
-# from geventwebsocket.handler import WebSocketHandler
-# http_server = WSGIServer(('0.0.0.0', '7200'), app,
-#                          handler_class=WebSocketHandler)
-# http_server.serve_forever()
-
-# debug macosx dev
-if mw.isDebugMode():
-    app.debug = True
-    app.config.version = app.config.version + str(time.time())
-
-# ----------  error function start -----------------
-
-
-def getErrorNum(key, limit=None):
-    key = mw.md5(key)
-    num = cache.get(key)
-    if not num:
-        num = 0
-    if not limit:
-        return num
-    if limit > num:
-        return True
-    return False
-
-
-def setErrorNum(key, empty=False, expire=3600):
-    key = mw.md5(key)
-    num = cache.get(key)
-    if not num:
-        num = 0
-    else:
-        if empty:
-            cache.delete(key)
-            return True
-    cache.set(key, num + 1, expire)
-    return True
-# ----------  error function end -----------------
-
-
-def funConvert(fun):
-    block = fun.split('_')
-    func = block[0]
-    for x in range(len(block) - 1):
-        suf = block[x + 1].title()
-        func += suf
-    return func
-
-
-def sendAuthenticated():
-    # 发送http认证信息
-    request_host = mw.getHostAddr()
-    result = Response(
-        '', 401, {'WWW-Authenticate': 'Basic realm="%s"' % request_host.strip()})
-    if not 'login' in session and not 'admin_auth' in session:
-        session.clear()
-    return result
-
-
-@app.before_request
-def requestCheck():
-    # Flask请求勾子
-    if app.config['BASIC_AUTH_OPEN']:
-        auth = request.authorization
-        if request.path in ['/download', '/hook', '/down']:
-            return
-
-        if not auth:
-            return sendAuthenticated()
-        salt = '_md_salt'
-        if mw.md5(auth.username.strip() + salt) != app.config['BASIC_AUTH_USERNAME'] \
-                or mw.md5(auth.password.strip() + salt) != app.config['BASIC_AUTH_PASSWORD']:
-            return sendAuthenticated()
-
-    domain_check = mw.checkDomainPanel()
-    if domain_check:
-        return domain_check
-
-
-@app.after_request
-def requestAfter(response):
-    response.headers['soft'] = 'mdserver-web'
-    response.headers['mw-version'] = app.config.version
-    return response
-
-
-def isLogined():
-    if 'login' in session and 'username' in session and session['login'] == True:
-        userInfo = mw.M('users').where("id=?", (1,)).field('id,username,password').find()
-        # print(userInfo)
-        if userInfo['username'] != session['username']:
-            return False
-
-        now_time = int(time.time())
-
-        if 'overdue' in session and now_time > session['overdue']:
-            # 自动续期
-            session['overdue'] = int(time.time()) + 7 * 24 * 60 * 60
-            return False
-
-        if 'tmp_login_expire' in session and now_time > int(session['tmp_login_expire']):
-            session.clear()
-            return False
-
-        return True
-
-    # if os.path.exists('data/api_login.txt'):
-    #     content = mw.readFile('data/api_login.txt')
-    #     session['login'] = True
-    #     session['username'] = content
-    #     os.remove('data/api_login.txt')
-    return False
-
-
-def publicObject(toObject, func, action=None, get=None):
-    name = funConvert(func) + 'Api'
-    try:
-        if hasattr(toObject, name):
-            efunc = 'toObject.' + name + '()'
-            data = eval(efunc)
-            return data
-        data = {'msg': '404,not find api[' + name + ']', "status": False}
-        return mw.getJson(data)
-    except Exception as e:
-        # API发生错误记录
-        if mw.isDebugMode():
-            print(traceback.print_exc())
-        data = {'msg': '访问异常:' + str(mw.getTracebackInfo()) + '!', "status": False}
-        return mw.getJson(data)
-
-
-# @app.route("/debug")
-# def debug():
-#     print(sys.version_info)
-#     print(session)
-#     os = mw.getOs()
-#     print(os)
-#     return mw.getLocalIp()
-
-@app.route("/.well-known/acme-challenge/<val>")
-def wellknow(val=None):
-    # 申请面板ssl使用
-    f = mw.getRunDir() + "/tmp/.well-known/acme-challenge/" + val
-    if os.path.exists(f):
-        return mw.readFile(f)
-    return ''
-
-
-@app.route("/hook", methods=['POST', 'GET'])
-def webhook():
-    # 仅针对webhook插件
-
-    # 兼容获取关键数据
-    access_key = request.args.get('access_key', '').strip()
-    if access_key == '':
-        access_key = request.form.get('access_key', '').strip()
-
-    params = request.args.get('params', '').strip()
-    if params == '':
-        params = request.form.get('params', '').strip()
-
-    input_args = {
-        'access_key': access_key,
-        'params': params,
-    }
-
-    wh_install_path = mw.getServerDir() + '/webhook'
-    if not os.path.exists(wh_install_path):
-        return mw.returnJson(False, '请先安装WebHook插件!')
-
-    package = os.getcwd() + "/plugins/webhook"
-    if not package in sys.path:
-        sys.path.append(package)
-        
-    try:
-        import webhook_index
-        return webhook_index.runShellArgs(input_args)
-    except Exception as e:
-        return str(e)
-
-
-@app.route('/close')
-def close():
-    if not os.path.exists('data/close.pl'):
-        return redirect('/')
-    data = {}
-    data['cmd'] = 'rm -rf ' + mw.getRunDir() + '/data/close.pl'
-    return render_template('close.html', data=data)
-
-
-@app.route("/code")
-def code():
-    import vilidate
-    vie = vilidate.vieCode()
-    codeImage = vie.GetCodeImage(80, 4)
-    # try:
-    #     from cStringIO import StringIO
-    # except:
-    #     from StringIO import StringIO
-
-    out = io.BytesIO()
-    codeImage[0].save(out, "png")
-    session['code'] = mw.md5(''.join(codeImage[1]).lower())
-
-    img = Response(out.getvalue(), headers={'Content-Type': 'image/png'})
-    return make_response(img)
-
-
-@app.route("/check_login", methods=['POST'])
-def checkLogin():
-    if isLogined():
-        return "true"
-    return "false"
-
-
-@app.route("/verify_login", methods=['POST'])
-def verifyLogin():
-    username = request.form.get('username', '').strip()
-    password = request.form.get('password', '').strip()
-    password = mw.md5(password)
-
-    userInfo = mw.M('users').where("id=?", (1,)).field('id,username,password').find()
-    if userInfo['username'] != username or userInfo['password'] != password:
-        return mw.returnJson(-1, "密码错误?")
-
-    auth = request.form.get('auth', '').strip()
-
-    import pyotp
-    auth_file = 'data/auth_secret.pl'
-    if os.path.exists(auth_file):
-        content = mw.readFile(auth_file)
-        sec = mw.deDoubleCrypt('mdserver-web', content)
-        totp = pyotp.TOTP(sec)
-        if totp.verify(auth):
-            userInfo = mw.M('users').where("id=?", (1,)).field('id,username,password').find()
-            session['login'] = True
-            session['username'] = userInfo['username']
-            session['overdue'] = int(time.time()) + 7 * 24 * 60 * 60
-            return mw.returnJson(1, '二次验证成功!')
-
-    return mw.returnJson(-1, '二次验证失败!')
-    
-
-@app.route("/do_login", methods=['POST'])
-def doLogin():
-    login_cache_count = 5
-    login_cache_limit = cache.get('login_cache_limit')
-
-    filename = 'data/close.pl'
-    if os.path.exists(filename):
-        return mw.returnJson(False, '面板已经关闭!')
-
-    username = request.form.get('username', '').strip()
-    password = request.form.get('password', '').strip()
-    code = request.form.get('code', '').strip()
-    # print(session)
-    if 'code' in session:
-        if session['code'] != mw.md5(code):
-            if login_cache_limit == None:
-                login_cache_limit = 1
-            else:
-                login_cache_limit = int(login_cache_limit) + 1
-
-            if login_cache_limit >= login_cache_count:
-                mw.writeFile(filename, 'True')
-                return mw.returnJson(False, '面板已经关闭!')
-
-            cache.set('login_cache_limit', login_cache_limit, timeout=10000)
-            login_cache_limit = cache.get('login_cache_limit')
-            code_msg = mw.getInfo("验证码错误,您还可以尝试[{1}]次!", (str(
-                login_cache_count - login_cache_limit)))
-            mw.writeLog('用户登录', code_msg)
-            return mw.returnJson(False, code_msg)
-
-    userInfo = mw.M('users').where("id=?", (1,)).field('id,username,password').find()
-    password = mw.md5(password)
-
-    if userInfo['username'] != username or userInfo['password'] != password:
-        msg = "<a style='color: red'>密码错误</a>,帐号:{1},密码:{2},登录IP:{3}", ((
-            '****', '******', request.remote_addr))
-
-        if login_cache_limit == None:
-            login_cache_limit = 1
-        else:
-            login_cache_limit = int(login_cache_limit) + 1
-
-        if login_cache_limit >= login_cache_count:
-            mw.writeFile(filename, 'True')
-            return mw.returnJson(False, '面板已经关闭!')
-
-        cache.set('login_cache_limit', login_cache_limit, timeout=10000)
-        login_cache_limit = cache.get('login_cache_limit')
-        mw.writeLog('用户登录', mw.getInfo(msg))
-        return mw.returnJson(-1, mw.getInfo("用户名或密码错误,您还可以尝试[{1}]次!", (str(login_cache_count - login_cache_limit))))
-
-
-
-    cache.delete('login_cache_limit')
-    # 二次验证密钥
-    auth_secret = 'data/auth_secret.pl'                   
-    if os.path.exists(auth_secret):
-        return mw.returnJson(2, '绑定二次验证了...')
-    
-    session['login'] = True
-    session['username'] = userInfo['username']
-    session['overdue'] = int(time.time()) + 7 * 24 * 60 * 60
-
-    # fix 跳转时,数据消失，可能是跨域问题
-    # mw.writeFile('data/api_login.txt', userInfo['username'])
-    return mw.returnJson(1, '登录成功,正在跳转...')
-
-
-@app.errorhandler(404)
-def page_unauthorized(error):
-    return render_template_string('404 not found', error_info=error), 404
-
-
-def get_admin_safe():
-    path = 'data/admin_path.pl'
-    if os.path.exists(path):
-        cont = mw.readFile(path)
-        cont = cont.strip().strip('/')
-        return (True, cont)
-    return (False, '')
-
-
-def admin_safe_path(path, req, data, pageFile):
-    if path != req and not isLogined():
-        if data['status_code'] == '0':
-            return render_template('path.html')
-        else:
-            return Response(status=int(data['status_code']))
-
-    if not isLogined():
-        return render_template('login.html', data=data)
-
-    if not req in pageFile:
-        return redirect('/')
-
-    return render_template(req + '.html', data=data)
-
-
-def login_temp_user(token):
-    if len(token) != 48:
-        return '错误的参数!'
-
-    skey = mw.getClientIp() + '_temp_login'
-    if not getErrorNum(skey, 10):
-        return '连续10次验证失败，禁止1小时'
-
-    stime = int(time.time())
-    data = mw.M('temp_login').where('state=? and expire>?',(0, stime)).field('id,token,salt,expire,addtime').find()
-    if not data:
-        setErrorNum(skey)
-        return '验证失败!'
-
-    if stime > int(data['expire']):
-        setErrorNum(skey)
-        return "过期"
-
-    r_token = mw.md5(token + data['salt'])
-    if r_token != data['token']:
-        setErrorNum(skey)
-        return '验证失败!'
-
-    userInfo = mw.M('users').where("id=?", (1,)).field('id,username').find()
-    session['login'] = True
-    session['username'] = userInfo['username']
-    session['tmp_login'] = True
-    session['tmp_login_id'] = str(data['id'])
-    session['tmp_login_expire'] = int(data['expire'])
-    session['uid'] = data['id']
-
-    login_addr = mw.getClientIp() + ":" + str(request.environ.get('REMOTE_PORT'))
-    mw.writeLog('用户登录', "登录成功,帐号:{1},登录IP:{2}",
-                (userInfo['username'], login_addr))
-    mw.M('temp_login').where('id=?', (data['id'],)).update(
-        {"login_time": stime, 'state': 1, 'login_addr': login_addr})
-
-    # print(session)
-    return redirect('/')
-
-
-@app.route('/api/<reqClass>/<reqAction>', methods=['POST', 'GET'])
-def api(reqClass=None, reqAction=None, reqData=None):
-    comReturn = common.local()
-    if comReturn:
-        return comReturn
-
-    import config_api
-    isOk, data = config_api.config_api().checkPanelToken()
-    if not isOk:
-        return mw.returnJson(False, '未开启API')
-
-    request_time = request.form.get('request_time', '')
-    request_token = request.form.get('request_token', '')
-    request_ip = request.remote_addr
-    request_ip = request_ip.replace('::ffff:', '')
-
-    # print(request_time, request_token)
-    if not mw.inArray(data['limit_addr'], request_ip):
-        return mw.returnJson(False, 'IP校验失败,您的访问IP为[' + request_ip + ']')
-
-    local_token = mw.deCrypt(data['token'], data['token_crypt'])
-    token_md5 = mw.md5(str(request_time) + mw.md5(local_token))
-
-    if not (token_md5 == request_token):
-        return mw.returnJson(False, '密钥错误')
-
-    if reqClass == None:
-        return mw.returnJson(False, '请指定请求方法类')
-
-    if reqAction == None:
-        return mw.returnJson(False, '请指定请求方法')
-
-    classFile = ('config_api', 'crontab_api', 'files_api', 'firewall_api',
-                 'plugins_api', 'system_api', 'site_api', 'task_api',
-                 'logs_api')
-    className = reqClass + '_api'
-    if not className in classFile:
-        return mw.returnJson(False, 'external api request error')
-
-    eval_str = "__import__('" + className + "')." + className + '()'
-    newInstance = eval(eval_str)
-
-    try:
-        return publicObject(newInstance, reqAction)
-    except Exception as e:
-        return mw.getTracebackInfo()
-
-
-@app.route('/<reqClass>/<reqAction>', methods=['POST', 'GET'])
-@app.route('/<reqClass>/', methods=['POST', 'GET'])
-@app.route('/<reqClass>', methods=['POST', 'GET'])
-@app.route('/', methods=['POST', 'GET'])
-def index(reqClass=None, reqAction=None, reqData=None):
-
-    comReturn = common.local()
-    if comReturn:
-        return comReturn
-
-    # 页面请求
-    if reqAction == None:
-        import config_api
-        data = config_api.config_api().get()
-
-        if reqClass == None:
-            reqClass = 'index'
-
-        pageFile = ('config', 'control', 'crontab', 'files', 'logs', 'firewall',
-                    'index', 'plugins', 'login', 'system', 'site', 'cert', 'ssl', 'task', 'soft')
-
-        if reqClass == 'login':
-            token = request.args.get('tmp_token', '').strip()
-            if token != '':
-                return login_temp_user(token)
-
-        # 设置了安全路径
-        ainfo = get_admin_safe()
-
-        # 登录页
-        if reqClass == 'login':
-
-            signout = request.args.get('signout', '')
-            if signout == 'True':
-                session.clear()
-                session['login'] = False
-                session['overdue'] = 0
-
-            if ainfo[0]:
-                return admin_safe_path(ainfo[1], reqClass, data, pageFile)
-
-            return render_template('login.html', data=data)
-
-        if ainfo[0]:
-            return admin_safe_path(ainfo[1], reqClass, data, pageFile)
-
-        if not reqClass in pageFile:
-            return redirect('/')
-
-        if not isLogined():
-            return redirect('/login')
-
-        return render_template(reqClass + '.html', data=data)
-
-    if not isLogined():
-        return 'error request!'
-
-    # API请求
-    classFile = ('config_api', 'crontab_api', 'files_api', 'logs_api', 'firewall_api',
-                 'plugins_api', 'system_api', 'site_api', 'task_api', 'vip_api')
-    className = reqClass + '_api'
-    if not className in classFile:
-        return "api error request"
-
-    eval_str = "__import__('" + className + "')." + className + '()'
-    newInstance = eval(eval_str)
-
-    return publicObject(newInstance, reqAction)
-
-
-##################### ssh  start ###########################
-
-@socketio.on('webssh_websocketio')
-def webssh_websocketio(data):
-    if not isLogined():
-        emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'})
-        return
-
-    import ssh_terminal
-    shell_client = ssh_terminal.ssh_terminal.instance()
-    shell_client.run(request.sid, data)
-    return
-
-
-@socketio.on('webssh')
-def webssh(data):
-    if not isLogined():
-        emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'})
-        return None
-
-    import ssh_local
-    shell = ssh_local.ssh_local.instance()
-    shell.run(data)
-    return
-
-##################### ssh  end ###########################
diff --git a/route/static/app/config.js b/route/static/app/config.js
deleted file mode 100755
index 31f8b2077..000000000
--- a/route/static/app/config.js
+++ /dev/null
@@ -1,1457 +0,0 @@
-/** op **/
-// $(".set-submit").click(function(){
-// 	var data = $("#set_config").serialize();
-// 	layer.msg('正在保存配置...',{icon:16,time:0,shade: [0.3, '#000']});
-// 	$.post('/config/set',data,function(rdata){
-// 		layer.closeAll();
-// 		layer.msg(rdata.msg,{icon:rdata.status?1:2});
-// 		if(rdata.status){
-// 			setTimeout(function(){
-// 				window.location.href = ((window.location.protocol.indexOf('https') != -1)?'https://':'http://') + rdata.data.host + window.location.pathname;
-// 			},2500);
-// 		}
-// 	},'json');
-// });
-
-$('input[name="webname"]').change(function(){
-	var webname = $(this).val();
-	$('.btn_webname').removeAttr('disabled');
-	$('.btn_webname').unbind().click(function(){
-		$.post('/config/set_webname','webname='+webname, function(rdata){
-			showMsg(rdata.msg,function(){window.location.reload();},{icon:rdata.status?1:2},2000);
-		},'json');
-	});
-});
-
-
-$('input[name="host_ip"]').change(function(){
-	var host_ip = $(this).val();
-	$('.btn_host_ip').removeAttr('disabled');
-	$('.btn_host_ip').unbind().click(function(){
-		$.post('/config/set_ip','host_ip='+host_ip, function(rdata){
-			showMsg(rdata.msg,function(){window.location.reload();},{icon:rdata.status?1:2},2000);
-		},'json');
-	});
-});
-
-$('input[name="port"]').change(function(){
-	var port = $(this).val();
-	var old_port = $(this).data('port');
-	$('.btn_port').removeAttr('disabled');
-	$('.btn_port').unbind().click(function(){
-		$.post('/config/set_port','port='+port, function(rdata){
-			showMsg(rdata.msg,function(){
-				window.location.href = window.location.href.replace(old_port,port);
-				// window.location.reload();
-			},{icon:rdata.status?1:2},5000);
-		},'json');
-	});
-});
-
-$('input[name="sites_path"]').change(function(){
-	var sites_path = $(this).val();
-	$('.btn_sites_path').removeAttr('disabled');
-	$('.btn_sites_path').unbind().click(function(){
-		$.post('/config/set_www_dir','sites_path='+sites_path, function(rdata){
-			showMsg(rdata.msg,function(){window.location.reload();},{icon:rdata.status?1:2},2000);
-		},'json');
-	});
-});
-
-
-$('input[name="backup_path"]').change(function(){
-	var backup_path = $(this).val();
-	$('.btn_backup_path').removeAttr('disabled');
-	$('.btn_backup_path').unbind().click(function(){
-		$.post('/config/set_backup_dir','backup_path='+backup_path, function(rdata){
-			showMsg(rdata.msg,function(){window.location.reload();},{icon:rdata.status?1:2},2000);
-		},'json');
-	});
-});
-
-
-$('input[name="bind_domain"]').change(function(){
-	var domain = $(this).val();
-	$('.btn_bind_domain').removeAttr('disabled');
-	$('.btn_bind_domain').unbind().click(function(){
-		$.post('/config/set_panel_domain','domain='+domain, function(rdata){
-			showMsg(rdata.msg,function(){
-				window.location.href = rdata.data;
-			},{icon:rdata.status?1:2},5000);
-		},'json');
-	});
-});
-
-$('input[name="bind_ssl"]').click(function(){
-	var panel_ssl = $(this).prop("checked");
-	$(this).prop("checked",!panel_ssl);
-
-	//开启证书
-	if (panel_ssl){
-		// <option value="1">ACME</option>
-		layer.open({
-			type:1,
-			closeBtn: 1,
-			title:"开启SSL证书",
-			area: ['600px','440px'],
-			btn: ["开启SSL证书访问"],
-			maxmin:false,
-			shadeClose: true,
-			content: '<div class="bt-form" style="padding: 25px 40px;">\
-				<div style="text-align: center;">\
-					<h3 style="font-size: 20px;color: #333;margin-left: 5px;">【开启SSL证书】保护面板访问安全</h3>\
-				</div>\
-				<ul class="help-info-text c7 pd15" style="color: #333;font-size: 14px;background: #F5F7FA;margin-top: 24px;padding: 10px 20px 10px 20px;border-radius: 2px;">\
-					<li>自签证书访问步骤：</li>\
-					<li>1. 部署SSL证书</li>\
-					<li>2. 浏览器地址栏修改为https://访问</li>\
-					<li>3. 如提醒风险（正常现象）点击【高级】或【详情】</li>\
-					<li>4.【继续访问】或【接收风险并继续】</li>\
-				</ul>\
-				<div class="pt10" style="margin-top: 20px;">\
-					<div class="line" style="font-size: 14px;">\
-						<span class="tname" style="width: 78px;">类型</span>\
-						<div class="info-r" style="margin-left: 78px;">\
-							<select class="bt-input-text mr5" name="cert_type" style="width: 440px;">\
-								<option value="0">自签证书 (推荐，浏览器会提示不安全。可忽略，请放心开启)</option>\
-							</select>\
-						</div>\
-					</div>\
-					<ul class="help-info-text c7 sslSafeTips">\
-						<li><span>开启后导致面板不能访问，可以点击查看</span></li>\
-						<li>自签证书不被浏览器信任，显示不安全是正常现象</li>\
-					</ul>\
-				</div>\
-			</div>',
-			yes: function(){
-
-				var cert_type = $('select[name=cert_type]').val();
-				$.post('/config/set_panel_local_ssl',{'cert_type':cert_type}, function(rdata){
-					// console.log(rdata);
-					var to_https = window.location.href.replace('http','https');
-					showMsg(rdata.msg,function(){
-						if (rdata.status){
-							window.location.href = to_https;
-						}
-					},{icon:rdata.status?1:2},5000);
-				},'json');
-	
-			}
-		});
-	} else { 
-		//关闭SSL
-		layer.open({
-			type:1,
-			closeBtn: 1,
-			title:"关闭SSL证书",
-			area: ['480px','280px'],
-			btn: ["确定","取消"],
-			shadeClose: true,
-			content: '<div class="bt-form" style="padding: 25px 40px;">\
-				<div class="hint_title" style="font-size: 15px;color: #111;text-align:center;">\
-					<div class="hint_con">关闭SSL极易被抓包攻击导致账号密码泄露，请勿关闭</div>\
-				</div>\
-				<div class="confirm-info-box" style="background-color: #f0f0f0;clear: both;font-size: 14px;height: 105px;line-height: 26px;padding: 20px 20px;margin-top: 20px;">\
-					<div>请手动输入【<span style="color: #fc6d26;">我要关闭</span>】，完成验证</div>\
-					<input onpaste="return false;" id="prompt_input_box" style="height: 30px;line-height: 30px;margin-top: 5px;width: 360px;color: #444;outline: none;border: 1px solid #ccc;padding: 0 5px;" type="text" value="" autocomplete="off">\
-				</div>\
-			</div>',
-			yes: function(index){
-				var val = $('#prompt_input_box').val();
-				if (val != '我要关闭'){
-					layer.msg("关闭SSL失败!");
-					return;
-				}
-
-				$.post('/config/close_panel_ssl',{}, function(rdata){
-					var to_http = window.location.href.replace('https','http');
-					showMsg(rdata.msg,function(){
-						if (rdata.status){
-							window.location.href = to_http;
-						}
-					},{icon:rdata.status?1:2},5000);
-				},'json');
-			}
-		});
-	}
-
-});
-
-/** op **/
-
-
-// VIP -- start
-function setVipInfo(){
-	layer.open({
-		type: 1,
-		area: "400px",
-		title: 'VIP登录',
-		closeBtn: 1,
-		shift: 5,
-		btn:["登录","关闭"],
-		shadeClose: false,
-		content: "<div class='bt-form pd20'>\
-				<div class='line'>\
-					<span class='tname'>用户名</span>\
-					<div class='info-r'><input class='bt-input-text' type='text' name='username' value='' style='width:85%' autocomplete='off'/></div>\
-				</div>\
-				<div class='line'>\
-					<span class='tname'>密码</span>\
-					<div class='info-r'><input class='bt-input-text' type='password' name='password' value='' style='width:85%' autocomplete='off'/></div>\
-				</div>\
-			</div>",
-		yes:function(index){
-			var pdata = {};
-
-			pdata['username'] = $('input[name="username"]').val();
-			pdata['password'] = $('input[name="password"]').val();
-
-			if (pdata['username'] == ''){
-				layer.msg('用户名不能为空!', {icon:2});
-				return false;
-			}
-
-			if (pdata['password'] == ''){
-				layer.msg('密码不能为空!', {icon:2});
-				return false;
-			}
-
-			$.post('/vip/login',{'username':pdata['username'], 'password':pdata['password']},function(rdata){
-				showMsg(rdata.msg, function(){
-					if (rdata.status){
-						layer.close(index);
-					}
-				},{icon:rdata.status?1:2},2000);
-			},'json');
-		},
-	});
-}
-// VIP -- end
-
-
-//关闭面板
-function closePanel(){
-	layer.confirm('关闭面板会导致您无法访问面板 ,您真的要关闭Linux面板吗？',{title:'关闭面板',closeBtn:2,icon:13,cancel:function(){
-		$("#closePl").prop("checked",false);
-	}}, function() {
-		$.post('/config/close_panel','',function(rdata){
-			layer.msg(rdata.msg,{icon:rdata.status?1:2});
-			setTimeout(function(){
-				window.location.reload();
-			},1000);
-		},'json');
-	},function(){
-		$("#closePl").prop("checked",false);
-	});
-}
-
-//开发模式
-function debugMode(){
-	var loadT = layer.msg('正在发送请求,请稍候...', { icon: 16, time: 0, shade: [0.3, '#000'] });
-    $.post('/config/open_debug', {}, function (rdata) {
-        layer.close(loadT);
-        showMsg(rdata.msg, function(){
-			window.location.reload();
-		} ,{icon:rdata.status?1:2}, 1000);
-    },'json');
-}
-
-
-function modifyAuthPath() {
-    var auth_path = $("#admin_path").val();
-    layer.open({
-        type: 1,
-        area: "500px",
-        title: "修改安全入口",
-        closeBtn: 1,
-        shift: 5,
-        btn:['提交','关闭'],
-        shadeClose: false,
-        content: '<div class="bt-form bt-form pd20">\
-                    <div class="line ">\
-                        <span class="tname">入口地址</span>\
-                        <div class="info-r">\
-                            <input name="auth_path_set" class="bt-input-text mr5" type="text" style="width: 311px" value="' + auth_path + '">\
-                        </div>\
-                    </div>\
-                </div>',
-        yes:function(index){
-        	var auth_path = $("input[name='auth_path_set']").val();
-		    if (auth_path == '/' || auth_path == ''){
-		    	layer.confirm('警告，关闭安全入口等于直接暴露你的后台地址在外网，十分危险, 您真的要这样更改吗？',{title:'安全入口修改',closeBtn:1,icon:13,
-		    	cancel:function(){
-				}}, function() {
-					var loadT = layer.msg(lan.config.config_save, { icon: 16, time: 0, shade: [0.3, '#000'] });
-				    $.post('/config/set_admin_path', { admin_path: auth_path }, function (rdata) {
-				    	showMsg(rdata.msg, function(){
-				    		layer.close(index);
-				    		layer.close(loadT);
-				    		$("#admin_path").val(auth_path);
-				    	},{ icon: rdata.status ? 1 : 2 }, 2000);
-					},'json');
-				});
-		    	return;
-		    } else {
-		    	var loadT = layer.msg(lan.config.config_save, { icon: 16, time: 0, shade: [0.3, '#000'] });
-			    $.post('/config/set_admin_path', { admin_path: auth_path }, function (rdata) {
-			    	showMsg(rdata.msg, function(){
-			    		layer.close(index);
-			    		layer.close(loadT);
-			    		$("#admin_path").val(auth_path);
-			    	},{ icon: rdata.status ? 1 : 2 }, 2000);
-			    },'json');
-		    }
-        }
-    });
-}
-
-function setPassword(a) {
-	if(a == 1) {
-		p1 = $("#p1").val();
-		p2 = $("#p2").val();
-		if(p1 == "" || p1.length < 8) {
-			layer.msg('面板密码不能少于8位!', {icon: 2});
-			return
-		}
-		
-		//准备弱口令匹配元素
-		var checks = ['admin888','123123123','12345678','45678910','87654321','asdfghjkl','password','qwerqwer'];
-		pchecks = 'abcdefghijklmnopqrstuvwxyz1234567890';
-		for(var i=0;i<pchecks.length;i++){
-			checks.push(pchecks[i]+pchecks[i]+pchecks[i]+pchecks[i]+pchecks[i]+pchecks[i]+pchecks[i]+pchecks[i]);
-		}
-		
-		//检查弱口令
-		cps = p1.toLowerCase();
-		var isError = "";
-		for(var i=0;i<checks.length;i++){
-			if(cps == checks[i]){
-				isError += '['+checks[i]+'] ';
-			}
-		}
-		
-		if(isError != ""){
-			layer.msg('面板密码不能为弱口令'+isError,{icon:5});
-			return;
-		}
-			
-		if(p1 != p2) {
-			layer.msg('两次输入的密码不一致', {icon: 2});
-			return;
-		}
-		$.post("/config/set_password", "password1=" + encodeURIComponent(p1) + "&password2=" + encodeURIComponent(p2), function(b) {
-			if(b.status) {
-				layer.closeAll();
-				layer.msg(b.msg, {icon: 1});
-			} else {
-				layer.msg(b.msg, {icon: 2});
-			}
-		},'json');
-		return;
-	}
-	layer.open({
-		type: 1,
-		area: "290px",
-		title: '修改密码',
-		closeBtn: 1,
-		shift: 5,
-		shadeClose: false,
-		content: "<div class='bt-form pd20 pb70'>\
-				<div class='line'>\
-					<span class='tname'>密码</span>\
-					<div class='info-r'><input class='bt-input-text' type='text' name='password1' id='p1' value='' placeholder='新的密码' style='width:100%'/></div>\
-				</div>\
-				<div class='line'>\
-					<span class='tname'>重复</span>\
-					<div class='info-r'><input class='bt-input-text' type='text' name='password2' id='p2' value='' placeholder='再输一次' style='width:100%' /></div>\
-				</div>\
-				<div class='bt-form-submit-btn'>\
-					<span style='float: left;' title='随机密码' class='btn btn-default btn-sm' onclick='randPwd(10)'>随机</span>\
-					<button type='button' class='btn btn-danger btn-sm' onclick=\"layer.closeAll()\">关闭</button>\
-					<button type='button' class='btn btn-success btn-sm' onclick=\"setPassword(1)\">修改</button>\
-				</div>\
-			</div>"
-	});
-}
-
-
-function randPwd(){
-	var pwd = randomStrPwd(12);
-	$("#p1").val(pwd);
-	$("#p2").val(pwd);
-	layer.msg(lan.bt.pass_rep_ps,{time:2000})
-}
-
-function setUserName(a) {
-	if(a == 1) {
-		p1 = $("#p1").val();
-		p2 = $("#p2").val();
-		if(p1 == "" || p1.length < 3) {
-			layer.msg('用户名长度不能少于3位', {icon: 2});
-			return;
-		}
-		if(p1 != p2) {
-			layer.msg('两次输入的用户名不一致', {icon: 2});
-			return;
-		}
-		$.post("/config/set_name", "name1=" + encodeURIComponent(p1) + "&name2=" + encodeURIComponent(p2), function(b) {
-			if(b.status) {
-				layer.closeAll();
-				layer.msg(b.msg, {icon: 1});
-				$("input[name='username_']").val(p1)
-			} else {
-				layer.msg(b.msg, {icon: 2});
-			}
-		},'json');
-		return
-	}
-	layer.open({
-		type: 1,
-		area: "290px",
-		title: '修改面板用户名',
-		closeBtn: 1,
-		shift: 5,
-		shadeClose: false,
-		content: "<div class='bt-form pd20 pb70'>\
-			<div class='line'><span class='tname'>用户名</span>\
-				<div class='info-r'><input class='bt-input-text' type='text' name='password1' id='p1' value='' placeholder='新的用户名' style='width:100%'/></div>\
-			</div>\
-			<div class='line'>\
-				<span class='tname'>重复</span>\
-				<div class='info-r'><input class='bt-input-text' type='text' name='password2' id='p2' value='' placeholder='再输一次' style='width:100%'/></div>\
-			</div>\
-			<div class='bt-form-submit-btn'>\
-				<button type='button' class='btn btn-danger btn-sm' onclick=\"layer.closeAll()\">关闭</button>\
-				<button type='button' class='btn btn-success btn-sm' onclick=\"setUserName(1)\">修改</button>\
-			</div>\
-		</div>"
-	})
-}
-
-function setTimezone(){
-	layer.open({
-		type: 1,
-		area: ["400px","200px"],
-		title: '设置服务器时区',
-		closeBtn: 1,
-		shift: 5,
-		shadeClose: false,
-		btn:["确定","取消","同步"],
-		content: "<div class='bt-form pd20'>\
-			<div class='line'>\
-				<span class='tname'>时区</span>\
-				<div class='info-r'>\
-					<select class='bt-input-text mr5' name='timezone' style='width: 250px;'></select>\
-				</div>\
-			</div>\
-		</div>",
-		success:function(){
-			var tbody = '';
-			$.post('/config/get_timezone_list', {}, function (rdata) {
-		        for (var i = 0; i < rdata.length; i++) {
-
-		        	if (rdata[i] == 'Asia/Shanghai'){
-		        		tbody += '<option value="'+rdata[i]+'" selected="selected">'+rdata[i]+'</option>';
-		        	} else {
-		        		tbody += '<option value="'+rdata[i]+'">'+rdata[i]+'</option>';
-		        	}
-		        	
-		        }
-		        $('select[name="timezone"]').append(tbody);
-		    },'json');
-	    },
-        yes:function(index){
-		    var loadT = layer.msg("正在设置时区...", { icon: 16, time: 0, shade: [0.3, '#000'] });
-		    var timezone = $('select[name="timezone"]').val();
-		    $.post('/config/set_timezone', { timezone: timezone }, function (rdata) {
-		    	showMsg(rdata.msg, function(){
-		    		layer.close(index);
-		    		layer.close(loadT);
-		    		location.reload();
-		    	},{ icon: rdata.status ? 1 : 2 }, 2000);
-		    },'json');
-        },
-        btn3:function(){
-        	var loadT = layer.msg('正在同步时间...',{icon:16,time:0,shade: [0.3, '#000']});
-			$.post('/config/sync_date','',function(rdata){
-				layer.close(loadT);
-				layer.msg(rdata.msg,{icon:rdata.status?1:2});
-				setTimeout(function(){window.location.reload();},1500);
-			},'json');
-        }
-	})
-}
-
-
-function setIPv6() {
-    var loadT = layer.msg('正在配置,请稍候...', { icon: 16, time: 0, shade: [0.3, '#000'] });
-    $.post('/config/set_ipv6_status', {}, function (rdata) {
-        layer.close(loadT);
-        layer.msg(rdata.msg, {icon:rdata.status?1:2});
-        setTimeout(function(){window.location.reload();},5000);
-    },'json');
-}
-
-
-//设置面板SSL
-function setPanelSSL(){
-	var status = $("#sshswitch").prop("checked")==true?1:0;
-	var msg = $("#panelSSL").attr('checked')?'关闭SSL后,必需使用http协议访问面板,继续吗?':'<a style="font-weight: bolder;font-size: 16px;">危险！此功能不懂别开启!</a>\
-	<li style="margin-top: 12px;color:red;">必须要用到且了解此功能才决定自己是否要开启!</li>\
-	<li>面板SSL是自签证书，不被浏览器信任，显示不安全是正常现象</li>\
-	<li>开启后导致面板不能访问，可以点击下面链接了解解决方法</li>\
-	<p style="margin-top: 10px;">\
-		<input type="checkbox" id="checkSSL" /><label style="font-weight: 400;margin: 3px 5px 0px;" for="checkSSL">我已了经解详情,并愿意承担风险</label>\
-	</p>';
-	layer.confirm(msg,{title:'设置面板SSL',closeBtn:1,icon:3,area:'550px',cancel:function(){
-		$("#panelSSL").prop("checked", status == 0?false:true);
-	}},function(){
-		if(window.location.protocol.indexOf('https') == -1){
-			if(!$("#checkSSL").prop('checked')){
-				layer.msg(lan.config.ssl_ps,{icon:2});
-				return false;
-			}
-		}
-		var loadT = layer.msg('正在安装并设置SSL组件,这需要几分钟时间...',{icon:16,time:0,shade: [0.3, '#000']});
-		$.post('/config/set_panel_ssl','',function(rdata){
-			layer.close(loadT);
-			layer.msg(rdata.msg,{icon:rdata.status?1:5});
-			if(rdata.status === true){
-				$.post('/system/restart','',function (rdata) {
-                    layer.close(loadT);
-                    layer.msg(rdata.msg);
-                    setTimeout(function(){
-						window.location.href = ((window.location.protocol.indexOf('https') != -1)?'http://':'https://') + window.location.host + window.location.pathname;
-					},3000);
-                },'json');
-			}
-		},'json');
-	},function(){
-		if(status == 0){
-			$("#panelSSL").prop("checked",false);
-		}else{
-			$("#panelSSL").prop("checked",true);
-		}
-	});
-}
-
-function setNotifyApi(tag, obj){
-	var enable = $(obj).prop("checked");
-	// console.log(tag,obj,enable);
-	$.post('/config/set_notify_enable', {'tag':tag, 'enable':enable},function(rdata){
-		showMsg(rdata.msg, function(){
-			if (rdata.status){}
-		} ,{icon:rdata.status?1:2}, 1000);
-	},'json');
-}
-
-function getTgbot(){
-	var loadT = layer.msg('正在获取TgBot信息...',{icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/config/get_notify',{},function(data){
-		layer.close(loadT);
-
-		var app_token = '';
-		var chat_id = '';
-
-		if (data.status){
-			if (typeof(data['data']['tgbot']) !='undefined'){
-				app_token = data['data']['tgbot']['data']['app_token'];
-				chat_id = data['data']['tgbot']['data']['chat_id'];
-			}
-		}
-
-		layer.open({
-			type: 1,
-			area: "500px",
-			title: 'TgBot配置',
-			closeBtn: 1,
-			shift: 5,
-			btn:["确定","关闭","验证"],
-			shadeClose: false,
-			content: "<div class='bt-form pd20'>\
-					<div class='line'>\
-						<span class='tname'>APP_TOKEN</span>\
-						<div class='info-r'><input class='bt-input-text' type='text' name='app_token' value='"+app_token+"' style='width:100%'/></div>\
-					</div>\
-					<div class='line'>\
-						<span class='tname'>CHAT_ID</span>\
-						<div class='info-r'><input class='bt-input-text' type='text' name='chat_id' value='"+chat_id+"' style='width:100%' /></div>\
-					</div>\
-				</div>",
-			yes:function(index){
-				var pdata = {};
-				pdata['app_token'] = $('input[name="app_token"]').val();
-				pdata['chat_id'] = $('input[name="chat_id"]').val();
-
-				if (pdata['app_token'] == ''){
-					layer.msg('app_token不能为空!', {icon:2});
-					return false;
-				}
-
-				if (pdata['chat_id'] == ''){
-					layer.msg('chat_id不能为空!', {icon:2});
-					return false;
-				}
-
-				$.post('/config/set_notify',{'tag':'tgbot', 'data':JSON.stringify(pdata)},function(rdata){
-					showMsg(rdata.msg, function(){
-						if (rdata.status){
-							layer.close(index);
-						}
-					},{icon:rdata.status?1:2},2000);
-				});
-			},
-
-			btn3:function(index){
-				var pdata = {};
-				pdata['app_token'] = $('input[name="app_token"]').val();
-				pdata['chat_id'] = $('input[name="chat_id"]').val();
-
-				if (pdata['app_token'] == ''){
-					layer.msg('app_token不能为空!', {icon:2});
-					return false;
-				}
-
-				if (pdata['chat_id'] == ''){
-					layer.msg('chat_id不能为空!', {icon:2});
-					return false;
-				}
-
-				$.post('/config/set_notify_test',{'tag':'tgbot', 'data':JSON.stringify(pdata)},function(rdata){
-					showMsg(rdata.msg, function(){
-						if (rdata.status){
-							layer.close(index);
-						}
-					},{icon:rdata.status?1:2},2000);
-				});
-				return false;
-			}
-		});
-	});
-}
-
-function getEmailCfg(){
-	var loadT = layer.msg('正在获取邮件配置信息...',{icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/config/get_notify',{},function(data){
-		layer.close(loadT);
-
-		var smtp_host = 'smtp.163.com';
-		var smtp_port = '25';
-		var username = 'admin';
-		var password = '';
-		var to_mail_addr = '';
-
-		var smtp_ssl_no = 'checked';
-		var smtp_ssl_yes = '';
-
-		if (data.status){
-			if (typeof(data['data']['email']) !='undefined'){
-				smtp_host = data['data']['email']['data']['smtp_host'];
-				smtp_port = data['data']['email']['data']['smtp_port'];
-				username = data['data']['email']['data']['username'];
-				password = data['data']['email']['data']['password'];
-				to_mail_addr = data['data']['email']['data']['to_mail_addr'];
-
-
-				var smtp_ssl = data['data']['email']['data']['smtp_ssl'];
-				if (smtp_ssl == 'ssl'){
-					smtp_ssl_no = '';
-					smtp_ssl_yes = 'checked';
-				}
-			}
-		}
-
-		layer.open({
-			type: 1,
-			area: "500px",
-			title: '邮件配置',
-			closeBtn: 1,
-			shift: 5,
-			btn:["确定","关闭","验证"],
-			shadeClose: false,
-			content: "<div class='bt-form pd20'>\
-					<div class='line'>\
-						<span class='tname'>SMTP服务器</span>\
-						<div class='info-r'><input class='bt-input-text' type='text' name='smtp_host' value='"+smtp_host+"' style='width:100%'/></div>\
-					</div>\
-					<div class='line'>\
-						<span class='tname'>SMTP安全</span>\
-						<div class='info-r checkbox'>\
-							<label><input name='smtp_ssl' type='radio' value='' style='margin-right: 4px;' "+smtp_ssl_no+">None</label>\
-							<label><input name='smtp_ssl' type='radio' value='ssl' style='margin-right: 4px;' "+smtp_ssl_yes+">SSL</label>\
-						</div>\
-					</div>\
-					<div class='line'>\
-						<span class='tname'>SMTP端口</span>\
-						<div class='info-r'><input class='bt-input-text' type='text' name='smtp_port' value='"+smtp_port+"' style='width:100%' /></div>\
-					</div>\
-					<div class='line'>\
-						<span class='tname'>用户名</span>\
-						<div class='info-r'><input class='bt-input-text' type='text' name='username' value='"+username+"' style='width:100%' autocomplete='off'/></div>\
-					</div>\
-					<div class='line'>\
-						<span class='tname'>授权码</span>\
-						<div class='info-r'><input class='bt-input-text' type='password' name='password' value='"+password+"' style='width:100%' autocomplete='off'/></div>\
-					</div>\
-					<div class='line'>\
-						<span class='tname'>发送地址</span>\
-						<div class='info-r'><input class='bt-input-text' type='text' name='to_mail_addr' value='"+to_mail_addr+"' style='width:100%' autocomplete='off'/></div>\
-					</div>\
-					<div class='line'>\
-						<span class='tname'>验证测试</span>\
-						<div class='info-r'>\
-							<textarea class='bt-input-text' name='mail_test' style='width:100%; height: 80px; line-height: 20px; padding: 5px 8px;'>验证测试</textarea></div>\
-					</div>\
-				</div>",
-			yes:function(index){
-				var pdata = {};
-				pdata['smtp_host'] = $('input[name="smtp_host"]').val();
-				pdata['smtp_port'] = $('input[name="smtp_port"]').val();
-				pdata['smtp_ssl'] = $('input[name="smtp_ssl"]:checked').val();
-				pdata['username'] = $('input[name="username"]').val();
-				pdata['password'] = $('input[name="password"]').val();
-				pdata['to_mail_addr'] = $('input[name="to_mail_addr"]').val();
-
-				if (pdata['smtp_host'] == ''){
-					layer.msg('SMTP服务器不能为空!', {icon:2});
-					return false;
-				}
-
-				if (pdata['smtp_port'] == ''){
-					layer.msg('SMTP端口不能为空!', {icon:2});
-					return false;
-				}
-
-				if (pdata['username'] == ''){
-					layer.msg('用户名不能为空!', {icon:2});
-					return false;
-				}
-
-				if (pdata['password'] == ''){
-					layer.msg('授权码不能为空!', {icon:2});
-					return false;
-				}
-
-				if (pdata['to_mail_addr'] == ''){
-					layer.msg('发送地址不能为空!', {icon:2});
-					return false;
-				}
-
-				$.post('/config/set_notify',{'tag':'email', 'data':JSON.stringify(pdata)},function(rdata){
-					showMsg(rdata.msg, function(){
-						if (rdata.status){
-							layer.close(index);
-						}
-					},{icon:rdata.status?1:2},2000);
-				});
-			},
-
-			btn3:function(index){
-				var pdata = {};
-				pdata['smtp_host'] = $('input[name="smtp_host"]').val();
-				pdata['smtp_port'] = $('input[name="smtp_port"]').val();
-				pdata['smtp_ssl'] = $('input[name="smtp_ssl"]:checked').val();
-				pdata['username'] = $('input[name="username"]').val();
-				pdata['password'] = $('input[name="password"]').val();
-				pdata['to_mail_addr'] = $('input[name="to_mail_addr"]').val();
-				pdata['mail_test'] = $('textarea[name="mail_test"]').val();
-
-
-				if (pdata['smtp_host'] == ''){
-					layer.msg('SMTP服务器不能为空!', {icon:2});
-					return false;
-				}
-
-				if (pdata['smtp_port'] == ''){
-					layer.msg('SMTP端口不能为空!', {icon:2});
-					return false;
-				}
-
-				if (pdata['username'] == ''){
-					layer.msg('用户名不能为空!', {icon:2});
-					return false;
-				}
-
-				if (pdata['password'] == ''){
-					layer.msg('授权码不能为空!', {icon:2});
-					return false;
-				}
-
-				if (pdata['to_mail_addr'] == ''){
-					layer.msg('发送地址不能为空!', {icon:2});
-					return false;
-				}
-
-				if (pdata['mail_test'] == ''){
-					layer.msg('验证测试不能为空!', {icon:2});
-					return false;
-				}
-				$.post('/config/set_notify_test',{'tag':'email', 'data':JSON.stringify(pdata)},function(rdata){
-					showMsg(rdata.msg, function(){
-						if (rdata.status){
-							layer.close(index);
-						}
-					},{icon:rdata.status?1:2},2000);
-				});
-				return false;
-			}
-		});
-	});
-}
-
-function getPanelSSL(){
-	var loadT = layer.msg('正在获取证书信息...',{icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/config/get_panel_ssl',{},function(cert){
-		layer.close(loadT);
-
-		// console.log(cert);
-		var choose = cert['choose'];
-		var choose_local = '';
-		var choose_nginx = '';
-
-		if (choose == 'local'){
-			cert = cert['local'];
-			choose_local = 'selected="selected"';
-		} else if (choose == 'nginx') {
-			cert = cert['nginx'];
-			choose_nginx = 'selected="selected"';
-		} else {
-			cert = cert['local'];
-		}
-
-		var cert_data = '';
-
-		// <div class='state_item'>\
-		// 	<span>强制HTTPS：</span>\
-		// 	<span class='switch'>\
-		// 		<input class='btswitch btswitch-ios' id='toHttps' type='checkbox' "+cert['is_https']+">\
-		// 		<label class='btswitch-btn set_panel_http_to_https' for='toHttps'></label>\
-		// 	</span>\
-		// </div>\
-		if (cert['info']){
-			cert_data = "<div class='ssl_state_info'><div class='state_info_flex'>\
-				<div class='state_item'><span>证书品牌：</span>\
-				<span class='ellipsis_text ssl_issue'>"+cert['info']['issuer']+"</span></div>\
-				<div class='state_item'><span>到期时间：</span>\
-				<span class='btlink ssl_endtime'>剩余"+cert['info']['endtime']+"天到期</span></div>\
-			</div>\
-			<div class='state_info_flex'>\
-				<div class='state_item'><span>认证域名：</span>\
-				<span class='ellipsis_text ssl_subject'>"+cert['info']['subject']+"</span></div>\
-			</div></div>";
-		}
-
-		// <button class="btn btn-success btn-sm apply-lets-ssl">申请ACME证书</button>\
-		// <option value="nginx" '+choose_nginx+'>OpenResty</option>\
-		var certBody = '<div class="tab-con">\
-			<div class="myKeyCon ptb15">\
-				'+cert_data+'\
-				<div class="custom_certificate_info">\
-					<div class="ssl-con-key pull-left mr20">密钥(KEY)<br>\
-						<textarea id="key" class="bt-input-text">'+cert.privateKey+'</textarea>\
-					</div>\
-					<div class="ssl-con-key pull-left">证书(PEM格式)<br>\
-						<textarea id="csr" class="bt-input-text">'+cert.certPem+'</textarea>\
-					</div>\
-				</div>\
-				<div class="ssl-btn pull-left mtb15" style="width:100%">\
-					<button class="btn btn-success btn-sm save-panel-ssl">保存</button>\
-					<button class="btn btn-success btn-sm del-panel-ssl">删除</button>\
-					<select class="bt-input-text" name="choose" style="width:100px;">\
-						<option value="local" '+choose_local+'>本地</option>\
-					</select>\
-				</div>\
-			</div>\
-			<ul class="help-info-text c7 pull-left">\
-				<li>粘贴您的*.key以及*.pem内容，然后保存即可。</li>\
-				<li>如果浏览器提示证书链不完整,请检查是否正确拼接PEM证书</li><li>PEM格式证书 = 域名证书.crt + 根证书(root_bundle).crt</li>\
-			</ul>\
-		</div>'
-		layer.open({
-			type: 1,
-			area: "600px",
-			title: '自定义面板证书',
-			closeBtn: 1,
-			shift: 5,
-			shadeClose: false,
-			content:certBody,
-			success:function(layero, layer_id){
-
-
-				//保存SSL
-				$('.save-panel-ssl').click(function(){
-					var data = {
-						privateKey:$("#key").val(),
-						certPem:$("#csr").val()
-					}
-
-					layer.confirm('选择保存面板SSL方式?', 
-					{
-						title:'提示', 
-						shade:0.001,
-						btn: ['本地SSL', '取消'],//'OpenResty'
-						btn3:function(){
-							data['choose'] = 'nginx';
-							var loadT = layer.msg('正在安装并设置SSL组件,这需要几分钟时间...',{icon:16,time:0,shade: [0.3, '#000']});
-							$.post('/config/save_panel_ssl',data,function(rdata){
-								layer.close(loadT);
-								if(rdata.status){
-									layer.closeAll();
-								}
-								layer.msg(rdata.msg,{icon:rdata.status?1:2});
-							},'json');
-						},
-					},
-					function(index) {
-						data['choose'] = 'local';
-				    	var loadT = layer.msg('正在安装并设置SSL组件,这需要几分钟时间...',{icon:16,time:0,shade: [0.3, '#000']});
-						$.post('/config/save_panel_ssl',data,function(rdata){
-							layer.close(loadT);
-							if(rdata.status){
-								layer.closeAll();
-							}
-							layer.msg(rdata.msg,{icon:rdata.status?1:2});
-						},'json');
-				    },
-				    function(index) {
-				        layer.close(index);
-				    });
-				});
-
-				//删除SSL
-				$('.del-panel-ssl').click(function(){
-
-					layer.confirm('选择删除面板SSL方式?', 
-					{
-						title:'提示', 
-						shade:0.001,
-						btn: ['本地SSL', '取消'],//, 'OpenResty'
-						btn3:function(){
-							var data = {};
-							data['choose'] = 'nginx';
-							var loadT = layer.msg('正在删除面板SSL【nginx】...',{icon:16,time:0,shade: [0.3, '#000']});
-							$.post('/config/del_panel_ssl',data,function(rdata){
-								layer.close(loadT);
-								if(rdata.status){
-									layer.closeAll();
-								}
-								layer.msg(rdata.msg,{icon:rdata.status?1:2});
-							},'json');
-						},
-					},
-					function(index) {
-						var data = {};
-						data['choose'] = 'local';
-						var loadT = layer.msg('正在删除面板SSL【本地】...',{icon:16,time:0,shade: [0.3, '#000']});
-						$.post('/config/del_panel_ssl',data,function(rdata){
-							console.log(rdata);
-							layer.close(loadT);
-							showMsg(rdata.msg, function(){
-								if(rdata.status){
-									location.href = rdata.data;
-								}
-							},{icon:rdata.status?1:2},3000);
-						},'json');
-				    },
-				    function(index) {
-				        layer.close(index);
-				    });
-
-					
-				});
-
-				// // 设置面板SSL的Http
-				// $('.set_panel_http_to_https').click(function(){
-				// 	var https = $('#toHttps').prop('checked');
-				// 	$.post('/config/set_panel_http_to_https',{'https':https},function(rdata){
-				// 		layer.close(loadT);
-				// 		if(rdata.status){
-				// 			layer.closeAll();
-				// 		}
-				// 		layer.msg(rdata.msg,{icon:rdata.status?1:2});
-				// 	},'json');
-				// });
-
-				// //申请Lets证书
-				// $('.apply-lets-ssl').click(function(){
-				// 	showSpeedWindow('正在申请...', 'site.get_let_logs', function(layers,index){
-				// 		$.post('/config/apply_panel_acme_ssl',{},function(rdata){
-				// 			layer.close(loadT);
-				// 			if(rdata.status){
-				// 				layer.close(index);
-				// 				var tdata = rdata['data'];
-				// 				$('.ssl_issue').text(tdata['info']['issuer']);
-				// 				$('.ssl_endtime').text("剩余"+tdata['info']['endtime']+"天到期");
-				// 				$('.ssl_subject').text(tdata['info']['subject']);
-
-				// 				$('textarea[name="key"]').val(tdata['info']['privateKey']);
-				// 				$('textarea[name="csr"]').val(tdata['info']['certPem']);
-				// 			}
-				// 			layer.msg(rdata.msg,{icon:rdata.status?1:2});
-				// 		},'json');
-				// 	});
-				// });
-			}
-		});
-	},'json');
-}
-
-
-function removeTempAccess(id){
-	$.post('/config/remove_temp_login', {id:id}, function(rdata){
-		showMsg(rdata.msg, function(){
-			setTempAccessReq();
-		},{ icon: rdata.status ? 1 : 2 }, 2000);
-	},'json');
-}
-
-function getTempAccessLogsReq(id){
-	$.post('/config/get_temp_login_logs', {id:id}, function(rdata){			
-		var tbody = '';
-		for (var i = 0; i < rdata.data.length; i++) {
-
-			tbody += '<tr>';
-			tbody += '<td>' + (rdata.data[i]['type']) +'</td>';
-			tbody += '<td>' + rdata.data[i]['addtime'] +'</td>';
-			tbody += '<td>'+ rdata.data[i]['log'] +'</td>';
-			tbody += '</tr>';
-		}
-		$('#logs_list').html(tbody);
-
-	},'json');
-}
-
-function getTempAccessLogs(id){
-
-	layer.open({
-		area: ['700px', '250px'],
-		title: '临时授权管理',
-		closeBtn:1,
-		shift: 0,
-		type: 1,
-		content: "<div class='pd20'>\
-					<button class='btn btn-success btn-sm refresh_log'>刷新日志</button>\
-					<div class='divtable mt10'>\
-						<table class='table table-hover'>\
-							<thead>\
-								<tr><th>操作类型</th><th>操作时间</th><th>日志</th></tr>\
-							</thead>\
-							<tbody id='logs_list'></tbody>\
-						</table>\
-					</div>\
-				</div>",
-		success:function(){
-			getTempAccessLogsReq(id);
-			$('.refresh_log').click(function(){
-				getTempAccessLogsReq(id);
-			});
-		}
-	});
-}
-
-function setTempAccessReq(page){
-	if (typeof(page) == 'undefined'){
-		page = 1;
-	}
-
-	$.post('/config/get_temp_login', {page:page}, function(rdata){
-		if ( typeof(rdata.status) !='undefined' && !rdata.status){
-			showMsg(rdata.msg,function(){
-				layer.closeAll();
-			},{icon:2}, 2000);
-			return;
-		}
-
-		var tbody = '';
-		for (var i = 0; i < rdata.data.length; i++) {
-
-			tbody += '<tr>';
-			tbody += '<td>' + (rdata.data[i]['login_addr']||'未登陆') +'</td>';
-
-			tbody += '<td>';
-			switch (parseInt(rdata.data[i]['state'])) {
-				case 0:
-					tbody += '<a style="color:green;">待使用</a>';
-					break;
-				case 1:
-					tbody += '<a style="color:brown;">已使用</a>';
-					break;
-				case -1:
-					tbody += '<a>已过期</a>';
-					break;
-			}
-			tbody += '</td>';
-
-			tbody += '<td>' + (getLocalTime(rdata.data[i]['login_time'])||'未登陆') +'</td>';
-			tbody += '<td>' + getLocalTime(rdata.data[i]['expire']) +'</td>';
-
-			tbody += '<td>';
-
-			if (rdata.data[i]['state'] == '1' ){
-				tbody += '<a class="btlink" onclick="getTempAccessLogs(\''+rdata.data[i]['id']+'\')">操作日志</a>';
-			} else{
-				tbody += '<a class="btlink" onclick="removeTempAccess(\''+rdata.data[i]['id']+'\')">删除</a>';
-			}
-			
-			tbody += '</td>';
-
-			tbody += '</tr>';
-		}
-
-		$('#temp_login_view_tbody').html(tbody);
-		$('.temp_login_view_page').html(rdata.page);
-	},'json');
-}
-
-function setStatusCode(o){
-	var code = $(o).data('code');
-    layer.open({
-        type: 1,
-        area: ['420px', '220px'],
-        title: "设置未认证时的响应状态",
-        closeBtn: 1,
-        shift: 5,
-        btn:['提交','关闭'],
-        shadeClose: false,
-        content: '<div class="bt-form bt-form pd20">\
-                    <div class="line">\
-                        <span class="tname">相应状态</span>\
-                        <div class="info-r">\
-                            <select class="bt-input-text mr5" name="status_code" style="width: 250px;"></select>\
-                        </div>\
-                    </div>\
-                    <ul class="help-info-text c7"><li style="color: red;">用于未登录且未正确输入安全入口时的响应,用于隐藏面板特征</li></ul>\
-                </div>',
-        success:function(){
-        	var msg_list = [
-        		{'code':'0','msg':'默认-安全入口错误提示'},
-        		{'code':'403','msg':'403-拒绝访问'},
-        		{'code':'404','msg':'404-页面不存在'},
-        		{'code':'416','msg':'416-无效的请求'},
-        		{'code':'408','msg':'408-客户端超时'},
-        		{'code':'400','msg':'400-客户端请求错误'},
-        		{'code':'401','msg':'401-未授权访问'},
-        	];
-
-        	var tbody = '';
-        	for(i in msg_list){
-        		if (msg_list[i]['code'] == code){
-        			tbody += '<option value="'+msg_list[i]['code']+'" selected>'+msg_list[i]['msg']+'</option>';
-        		} else{
-        			tbody += '<option value="'+msg_list[i]['code']+'">'+msg_list[i]['msg']+'</option>';
-        		}
-        		
-        	}
-        	$('select[name="status_code"]').append(tbody);
-        },
-        yes:function(index){
-		    var loadT = layer.msg("正在设置未认证时的响应状态", { icon: 16, time: 0, shade: [0.3, '#000'] });
-		    var status_code = $('select[name="status_code"]').val();
-		    $.post('/config/set_status_code', { status_code: status_code }, function (rdata) {
-		    	showMsg(rdata.msg, function(){
-		    		layer.close(index);
-		    		layer.close(loadT);
-		    		location.reload();
-		    	},{ icon: rdata.status ? 1 : 2 }, 2000);
-		    },'json');
-        }
-    });
-}
-
-function setTempAccess(){
-	layer.open({
-		area: ['700px', '250px'],
-		title: '临时授权管理',
-		closeBtn:1,
-		shift: 0,
-		type: 1,
-		content: "<div class=\"login_view_table pd20\">\
-					<button class=\"btn btn-success btn-sm create_temp_login\">临时访问授权</button>\
-					<div class=\"divtable mt10\">\
-						<table class=\"table table-hover\">\
-							<thead>\
-								<tr><th>登录IP</th><th>状态</th><th>登录时间</th><th>过期时间</th><th style=\"text-align:right;\">操作</th></tr>\
-							</thead>\
-							<tbody id=\"temp_login_view_tbody\"></tbody>\
-						</table>\
-						<div class=\"temp_login_view_page page\"></div>\
-					</div>\
-				</div>",
-		success:function(){
-			setTempAccessReq();
-
-			$('.create_temp_login').click(function(){
-				layer.confirm('<span style="color:red">注意1：滥用临时授权可能导致安全风险。</br>注意2：请勿在公共场合发布临时授权连接</span></br>即将创建临时授权连接，继续吗？',
-				{
-					title:'风险提示',
-					closeBtn:1,
-					icon:13,
-				}, function(create_temp_login_layer) {
-					$.post('/config/set_temp_login', {}, function(rdata){
-						layer.close(create_temp_login_layer);
-						setTempAccessReq();
-						layer.open({
-							area: '570px',
-							title: '创建临时授权',
-							shift: 0,
-							type: 1,
-							content: "<div class='bt-form create_temp_view pd15'>\
-									<div class='line'>\
-										<span class='tname'>临时授权地址</span>\
-										<div>\
-											<textarea id='temp_link' class='bt-input-text mr20' style='margin: 0px;width: 500px;height: 50px;line-height: 19px;'></textarea>\
-										</div>\
-									</div>\
-									<div class='line'><button type='submit' class='btn btn-success btn-sm btn-copy-temp-link' data-clipboard-text=''>复制地址</button></div>\
-									<ul class='help-info-text c7 ptb15'>\
-										<li>临时授权生成后1小时内使用有效，为一次性授权，使用后立即失效</li>\
-										<li>使用临时授权登录面板后1小时内拥有面板所有权限，请勿在公共场合发布临时授权连接</li>\
-										<li>授权连接信息仅在此处显示一次，若在使用前忘记，请重新生成</li>\
-									</ul>\
-								</div>",
-							success:function(){
-								var temp_link = "".concat(location.origin, "/login?tmp_token=").concat(rdata.token);
-								$('#temp_link').val(temp_link);
-
-								copyText(temp_link);
-								$('.btn-copy-temp-link').click(function(){
-									copyText(temp_link);
-								});
-							}
-						});
-					},'json');
-				});
-			});
-		}
-	});
-}
-
-//二次验证
-function setAuthBind(){
-	$.post('/config/get_auth_secret', {}, function(rdata){
-		console.log(rdata);
-		var tip = layer.open({
-			area: ['500px', '355px'],
-			title: '二次验证设置',
-			closeBtn:1,
-			shift: 0,
-			type: 1,
-			content: '<div class="bt-form pd20">\
-		<div class="line">\
-			<span class="tname">绑定密钥</span>\
-			<div class="info-r">\
-				<input class="bt-input-text mr5" name="secret" type="text" style="width: 310px;" disabled>\
-				<button class="btn btn-success btn-xs reset_secret" style="margin-left: -50px;">重置</button>\
-			</div>\
-		</div>\
-		<div class="line">\
-			<span class="tname" style="width: 90px; overflow: initial; height: 20px; line-height: 20px;">二维码</span>\
-			<div class="info-r"><div class="qrcode"></div></div>\
-		</div>\
-		<ul class="help-info-text c7">\
-		</ul>\
-	</div>',
-			success:function(layero,index){
-
-				$('input[name="secret"]').val(rdata.data['secret']);
-				$('.qrcode').qrcode({ text: rdata.data['url']});
-
-				$('.reset_secret').click(function(){
-					layer.confirm('您确定要重置当前密钥吗？<br/><span style="color: red; ">重置密钥后，已关联密钥产品，将失效，请重新添加新密钥至产品。</span>',{title:'重置密钥',closeBtn:2,icon:13,cancel:function(){
-					}}, function() {
-						$.post('/config/get_auth_secret', {'reset':"1"},function(rdata){
-							showMsg("接口密钥已生成，重置密钥后，已关联密钥产品，将失效，请重新添加新密钥至产品。", function(){
-								$('input[name="secret"]').val(rdata.data['secret']);
-								$('.qrcode').html('').qrcode({ text: rdata.data['url']});
-							} ,{icon:1}, 2000);
-						},'json');
-					});
-				});
-			},
-		});
-
-	},'json');
-}
-
-function setAuthSecretApi(){
-	var cfg_panel_auth = $('#cfg_panel_auth').prop("checked");
-	$.post('/config/set_auth_secret', {'op_type':"2"},function(rdata){
-		showMsg(rdata.msg, function(){
-			if (rdata.data == 1){
-				setAuthBind();
-			}
-		} ,{icon:rdata.status?1:2}, 1000);
-	},'json');
-}
-
-function setBasicAuthTip(callback){
-	var tip = layer.open({
-		area: ['500px', '385px'],
-		title: '开启BasicAuth认证提示',
-		closeBtn:0,
-		shift: 0,
-		type: 1,
-		content: '<div class="bt-form pd20">\
-		<div class="mb15">\
-			<h3 class="layer-info-title">风险操作！此功能不懂请勿开启！</h3>\
-		</div>\
-		<ul class="help-info-text c7 explain-describe-list pd15">\
-			<li style="color: red;">必须要用到且了解此功能才决定自己是否要开启!</li>\
-			<li>开启后，以任何方式访问面板，将先要求输入BasicAuth用户名和密码</li>\
-			<li>开启后，能有效防止面板被扫描发现，但并不能代替面板本身的帐号密码</li>\
-			<li>请牢记BasicAuth密码，一但忘记将无法访问面板</li>\
-			<li>如忘记密码，可在SSH通过mw命令来关闭BasicAuth验证</li>\
-		</ul>\
-		<div class="mt10 plr15 agreement-box" id="checkBasicAuth">\
-			<input class="bt-input-text mr5" name="agreement" type="checkbox" value="false" id="agreement_more">\
-			<label for="agreement_more"><span>我已经了解详情,并愿意承担风险</span></label>\
-		</div>\
-	</div>',
-		btn:["确定","取消"],
-		yes:function(l,index){
-			is_agree = $('#agreement_more').prop("checked");
-			if (is_agree){
-				layer.close(tip);
-				callback();
-			}
-			return is_agree;
-		},
-		btn2: function(index, layero){
-		    $('#cfg_basic_auth').prop("checked", false);
-		}
-	});
-}
-
-function setBasicAuth(){
-
-	var basic_auth = $('#cfg_basic_auth').prop("checked");
-	if (!basic_auth){
-		setBasicAuthTip(function(){
-			var tip = layer.open({
-				area: ['500px', '385px'],
-				title: '配置BasicAuth认证',
-				closeBtn:1,
-				shift: 0,
-				type: 1,
-				content: '<div class="bt-form pd20">\
-			<div class="line">\
-				<span class="tname">用户名</span>\
-				<div class="info-r"><input class="bt-input-text mr5" name="basic_user" type="text" placeholder="请设置用户名" style="width: 280px;"></div>\
-			</div>\
-			<div class="line">\
-				<span class="tname">密码</span>\
-				<div class="info-r"><input class="bt-input-text mr5" name="basic_pwd" type="text" placeholder="请设置密码" style="width: 280px;"></div>\
-			</div>\
-			<div class="line">\
-				<span class="tname"></span>\
-				<div class="info-r"><button class="btn btn-success btn-sm save_auth_cfg">保存配置</button></div>\
-			</div>\
-			<ul class="help-info-text c7">\
-				<li style="color: red;">注意：请不要在这里使用您的常用密码，这可能导致密码泄漏！</li>\
-				<li>开启后，以任何方式访问面板，将先要求输入BasicAuth用户名和密码</li>\
-				<li>开启后，能有效防止面板被扫描发现，但并不能代替面板本身的帐号密码</li>\
-				<li>请牢记BasicAuth密码，一但忘记将无法访问面板</li><li>如忘记密码，可在SSH通过mw命令来关闭BasicAuth验证</li>\
-			</ul>\
-		</div>',
-				success:function(){
-					$('.save_auth_cfg').click(function(){
-						var basic_user = $('input[name="basic_user"]').val();
-						var basic_pwd = $('input[name="basic_pwd"]').val();
-						$.post('/config/set_basic_auth', {'basic_user':basic_user,'basic_pwd':basic_pwd},function(rdata){
-							showMsg(rdata.msg, function(){
-								window.location.reload();
-							} ,{icon:rdata.status?1:2}, 2000);
-						},'json');
-					});
-				},
-				cancel:function(){
-					$('#cfg_basic_auth').prop("checked", false);
-				},
-			});
-		});
-	} else {
-	    layer.confirm('关闭BasicAuth认证后，面板登录将不再验证BasicAuth基础认证，这将会导致面板安全性下降，继续操作！', 
-	    {btn: ['确定', '取消'], title: "是否关闭BasicAuth认证?", icon:13}, function (index) {
-	    	var basic_user = '';
-			var basic_pwd = '';
-			$.post('/config/set_basic_auth', {'is_open':'false'},function(rdata){
-				showMsg(rdata.msg, function(){
-					layer.close(index);
-					window.location.reload();
-				} ,{icon:rdata.status?1:2}, 2000);
-			},'json');
-	    },function(){
-	    	$('#cfg_basic_auth').prop("checked", true);
-	    });
-	}
-}
-
-function showPanelApi(){
-	$.post('/config/get_panel_token', '', function(rdata){
-		var tip = layer.open({
-			area: ['500px', '355px'],
-			title: '配置面板API',
-			closeBtn:1,
-			shift: 0,
-			type: 1,
-			content: '<div class="bt-form pd20">\
-		<div class="line">\
-			<span class="tname">接口密钥</span>\
-			<div class="info-r">\
-				<input class="bt-input-text mr5" name="token" type="text" style="width: 310px;" disabled>\
-				<button class="btn btn-success btn-xs reset_token" style="margin-left: -50px;">重置</button>\
-			</div>\
-		</div>\
-		<div class="line">\
-			<span class="tname" style="width: 90px; overflow: initial; height: 20px; line-height: 20px;">IP白名单<br/>(每行1个)</span>\
-			<div class="info-r"><textarea class="bt-input-text" name="api_limit_addr" style="width: 310px; height: 80px; line-height: 20px; padding: 5px 8px;"></textarea></div>\
-		</div>\
-		<div class="line">\
-			<span class="tname"></span>\
-			<div class="info-r"><button class="btn btn-success btn-sm save_api">保存配置</button></div>\
-		</div>\
-		<ul class="help-info-text c7">\
-			<li>开启API后，必需在IP白名单列表中的IP才能访问面板API接口</li>\
-			<li style="color: red;">请不要在生产环境开启，这可能增加服务器安全风险；</li>\
-		</ul>\
-	</div>',
-			success:function(layero,index){
-
-				$('input[name="token"]').val(rdata.data.token);
-				$('textarea[name="api_limit_addr"]').val(rdata.data.limit_addr);
-
-
-				$('.reset_token').click(function(){
-					layer.confirm('您确定要重置当前密钥吗？<br/><span style="color: red; ">重置密钥后，已关联密钥产品，将失效，请重新添加新密钥至产品。</span>',{title:'重置密钥',closeBtn:2,icon:13,cancel:function(){
-					}}, function() {
-						$.post('/config/set_panel_token', {'op_type':"1"},function(rdata){
-							showMsg("接口密钥已生成，重置密钥后，已关联密钥产品，将失效，请重新添加新密钥至产品。", function(){
-								$('input[name="token"]').val(rdata.data);
-							} ,{icon:1}, 2000);
-						},'json');
-					});
-				});
-
-				$('.save_api').click(function(){
-					var limit_addr = $('textarea[name="api_limit_addr"]').val();
-					$.post('/config/set_panel_token', {'op_type':"3",'limit_addr':limit_addr},function(rdata){
-						showMsg(rdata.msg, function(){
-						} ,{icon:rdata.status?1:2}, 2000);
-					},'json');
-				});
-			},
-		});
-	},'json');	
-}
-
-
-function setPanelApi(){
-	var cfg_panel_api = $('#cfg_panel_api').prop("checked");
-	$.post('/config/set_panel_token', {'op_type':"2"},function(rdata){
-		showMsg(rdata.msg, function(){
-			if (rdata.status){
-				showPanelApi();
-			}
-		} ,{icon:rdata.status?1:2}, 1000);
-	},'json');
-}
diff --git a/route/static/app/control.js b/route/static/app/control.js
deleted file mode 100755
index 4b68cd96b..000000000
--- a/route/static/app/control.js
+++ /dev/null
@@ -1,867 +0,0 @@
-//默认显示7天周期图表
-
-setTimeout(function(){
-	Wday(0,'getload');
-},100);
-setTimeout(function(){
-	Wday(0,'cpu');
-},200);
-setTimeout(function(){
-	Wday(0,'mem');
-},500);
-setTimeout(function(){
-	Wday(0,'disk');
-},100);
-setTimeout(function(){
-	Wday(0,'network');
-},1500);
-
-
-$(".searcTime .st").click(function(){
-	var status = $(this).data('status');
-	if (status == 'show'){
-		$(this).next().hide();
-		$(this).data('status','hide');
-	} else{
-		$(this).next().show();
-		$(this).data('status','show');
-	}
-});
-
-//自定义时间-切换
-$(".searcTime .st").hover(function(){
-	$(this).data('status','show');
-	$(this).next().show();
-},function(){
-	// $(this).next().hide();
-	// $(this).next().hover(function(){
-	// 	$(this).show();
-	// },function(){
-	// 	$(this).hide();
-	// })
-})
-
-$(".searcTime .gt").click(function(){
-	$(this).addClass("on").siblings().removeClass("on");
-})
-
-
-//渲染日期时间范围 start
-var render_dlist = [
-	'loadbtn_rtime',
-	'cpubtn_rtime',
-	'membtn_rtime',
-	'diskbtn_rtime',
-	'networkbtn_rtime'
-];
-
-for (var i = 0; i < render_dlist.length; i++) {
-	
-	laydate.render({
-		elem: '#'+render_dlist[i]
-		,type: 'datetime'
-		,range: true
-	});
-
-
-	var b = getBeforeDate(28).replaceAll('/','-') + " 00:00:00";
-	var e = getBeforeDate(0).replaceAll('/','-') + " 23:59:59";
-
-	$('#'+render_dlist[i]).val(b + ' - ' + e);
-}
-//渲染日期时间范围 end
-
-
-$('.sbtn').click(function(){
-	$(".searcTime .st").next().hide();
-
-	var rtime = $(this).parent().find(".rtime").val();
-	var rarr = rtime.split(' - ');
-
-	var b = (new Date(rarr[0]).getTime())/1000;
-	var e = (new Date(rarr[1]).getTime())/1000;
-
-	b = Math.round(b);
-	e = Math.round(e);
-
-	if ($(this).hasClass('loadbtn')){
-		getload(b,e);
-	} else if ($(this).hasClass('cpubtn')){
-		cpu(b,e);
-	}else if ($(this).hasClass('membtn')){
-		mem(b,e);
-	} else if ($(this).hasClass('diskbtn')){
-		disk(b,e);
-	}
-});
-
-//指定天数
-function Wday(day,name){
-	var now = (new Date().getTime())/1000;
-	if(day==0){
-		var b = (new Date(getToday() + " 00:00:01").getTime())/1000;
-			b = Math.round(b);
-		var e = Math.round(now);
-	}
-	if(day==1){
-		var b = (new Date(getBeforeDate(day) + " 00:00:01").getTime())/1000;
-		var e = (new Date(getBeforeDate(day) + " 23:59:59").getTime())/1000;
-		b = Math.round(b);
-		e = Math.round(e);
-	}
-	else{
-		var b = (new Date(getBeforeDate(day) + " 00:00:01").getTime())/1000;
-			b = Math.round(b);
-		var e = Math.round(now);
-	}
-	switch (name){
-		case "cpu":
-			cpu(b, e);
-			break;
-		case "mem":
-			mem(b, e);
-			break;
-		case "disk":
-			disk(b, e);
-			break;
-		case "network":
-			network(b, e);
-			break;
-		case "getload":
-			getload(b, e);
-			break;
-	}
-}
-
-function getToday(){
-   var mydate = new Date();
-   var str = "" + mydate.getFullYear() + "/";
-   str += (mydate.getMonth()+1) + "/";
-   str += mydate.getDate();
-   return str;
-}
-
-getStatus();
-//取监控状态
-function getStatus(){
-	loadT = layer.msg('正在读取,请稍候...',{icon:16,time:0})
-	$.post('/system/set_control','type=-1',function(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(\"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>");
-		}
-
-		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>");
-		}
-
-		$("#save_day").val(rdata.day);
-
-	},'json');
-}
-
-
-//设置监控状态
-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})
-	$.post('/system/set_control','type='+type+'&day='+day,function(rdata){
-		showMsg(rdata.msg, function(){
-			layer.close(loadT);
-		},{icon:rdata.status?1:2})
-	},'json');
-}
-
-
-//清理记录
-function closeControl(){
-	layer.confirm('您真的清空所有监控记录吗？',{title:'清空记录',icon:3,closeBtn:1}, function() {
-		loadT = layer.msg('正在处理,请稍候...',{icon:16,time:0})
-		$.post('/system/set_control','type=del',function(rdata){
-			showMsg(rdata.msg, function(){
-				layer.close(loadT);
-			},{icon:rdata.status?1:2})
-		},'json');
-	});
-}
-
-
-//定义周期时间
-function getBeforeDate(n){
-    var n = n;
-    var d = new Date();
-    var year = d.getFullYear();
-    var mon=d.getMonth()+1;
-    var day=d.getDate();
-    if(day <= n){
-		if(mon>1) {
-		  	mon = mon-1;
-		} else {
-			year = year-1;
-			mon = 12;
-		}
-	}
-	d.setDate(d.getDate()-n);
-	year = d.getFullYear();
-	mon=d.getMonth()+1;
-	day=d.getDate();
-  	s = year+"/"+(mon<10?('0'+mon):mon)+"/"+(day<10?('0'+day):day);
-	return s;
-}
-//cpu
-function cpu(b,e){
-	$.get('/system/get_cpu_io?start='+b+'&end='+e,function(rdata){
-		var myChartCpu = echarts.init(document.getElementById('cupview'));
-		var xData = [];
-		var yData = [];
-		//var zData = [];
-		
-		for(var i = 0; i < rdata.length; i++){
-			xData.push(rdata[i].addtime);
-			yData.push(rdata[i].pro);
-			//zData.push(rdata[i].mem);
-		}
-		option = {
-			tooltip: {
-				trigger: 'axis',
-				axisPointer: { type: 'cross' },
-				formatter: '{b}<br />{a}: {c}%'
-			},
-			xAxis: {
-				type: 'category',
-				boundaryGap: false,
-				data: xData,
-				axisLine:{ lineStyle:{ color:"#666"} } 
-			},
-			yAxis: {
-				type: 'value',
-				name: lan.public.pre,
-				boundaryGap: [0, '100%'],
-				min:0,
-				max: 100,
-				splitLine:{ lineStyle:{ color:"#ddd" } },
-				axisLine:{ lineStyle:{ color:"#666" } }
-			},
-			dataZoom: [{
-				type: 'inside',
-				start: 0,
-				end: 100,
-				zoomLock:true
-			}, {
-				start: 0,
-				end: 100,
-				handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-				handleSize: '80%',
-				handleStyle: {
-					color: '#fff',
-					shadowBlur: 3,
-					shadowColor: 'rgba(0, 0, 0, 0.6)',
-					shadowOffsetX: 2,
-					shadowOffsetY: 2
-				}
-			}],
-			series: [
-				{
-					name:'CPU',
-					type:'line',
-					smooth:true,
-					symbol: 'none',
-					sampling: 'average',
-					itemStyle: { normal: { color: 'rgb(0, 153, 238)' } },
-					data: yData
-				}
-			]
-		};
-		myChartCpu.setOption(option);
-	   window.addEventListener("resize",function(){
-			myChartCpu.resize();
-		});
-	},'json');
-}
-
-//内存
-function mem(b,e){
-	$.get('/system/get_cpu_io?start='+b+'&end='+e,function(rdata){
-		var myChartMen = echarts.init(document.getElementById('memview'));
-		var xData = [];
-		//var yData = [];
-		var zData = [];
-		
-		for(var i = 0; i < rdata.length; i++){
-			xData.push(rdata[i].addtime);
-			//yData.push(rdata[i].pro);
-			zData.push(rdata[i].mem);
-		}
-		option = {
-			tooltip: {
-				trigger: 'axis',
-				axisPointer: { type: 'cross' },
-				formatter: '{b}<br />{a}: {c}%'
-			},
-			xAxis: {
-				type: 'category',
-				boundaryGap: false,
-				data: xData,
-				axisLine:{ lineStyle:{ color:"#666" } }
-			},
-			yAxis: {
-				type: 'value',
-				name: lan.public.pre,
-				boundaryGap: [0, '100%'],
-				min:0,
-				max: 100,
-				splitLine:{ lineStyle:{ color:"#ddd" } },
-				axisLine:{ lineStyle:{ color:"#666" } }
-			},
-			dataZoom: [{
-				type: 'inside',
-				start: 0,
-				end: 100,
-				zoomLock:true
-			}, {
-				start: 0,
-				end: 100,
-				handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-				handleSize: '80%',
-				handleStyle: {
-					color: '#fff',
-					shadowBlur: 3,
-					shadowColor: 'rgba(0, 0, 0, 0.6)',
-					shadowOffsetX: 2,
-					shadowOffsetY: 2
-				}
-			}],
-			series: [
-				{
-					name:lan.index.process_mem,
-					type:'line',
-					smooth:true,
-					symbol: 'none',
-					sampling: 'average',
-					itemStyle: { normal: { color: 'rgb(0, 153, 238)' } },
-					data: zData
-				}
-			]
-		};
-		myChartMen.setOption(option);
-		window.addEventListener("resize",function(){
-			myChartMen.resize();
-		});
-	},'json');
-}
-
-//磁盘io
-function disk(b,e){
-	$.get('/system/get_disk_io?start='+b+'&end='+e,function(rdata){
-		var myChartDisk = echarts.init(document.getElementById('diskview'));
-		var rData = [];
-		var wData = [];
-		var xData = [];
-		//var yData = [];
-		//var zData = [];
-		
-		for(var i = 0; i < rdata.length; i++){
-			rData.push((rdata[i].read_bytes/1024/60).toFixed(3));
-			wData.push((rdata[i].write_bytes/1024/60).toFixed(3));
-			xData.push(rdata[i].addtime);
-			//yData.push(rdata[i].read_count);
-			//zData.push(rdata[i].write_count);
-		}
-		option = {
-			tooltip: {
-				trigger: 'axis',
-				axisPointer: {
-					type: 'cross'
-				},
-				formatter:"时间：{b0}<br />{a0}: {c0} Kb/s<br />{a1}: {c1} Kb/s", 
-			},
-			legend: {
-				data:['读取字节数','写入字节数']
-			},
-			xAxis: {
-				type: 'category',
-				boundaryGap: false,
-				data: xData,
-				axisLine:{ lineStyle:{ color:"#666" }}
-			},
-			yAxis: {
-				type: 'value',
-				name: '单位:KB/s',
-				boundaryGap: [0, '100%'],
-				splitLine:{ lineStyle:{ color:"#ddd"} },
-				axisLine:{ lineStyle:{ color:"#666" } }
-			},
-			dataZoom: [{
-				type: 'inside',
-				start: 0,
-				end: 100,
-				zoomLock:true
-			}, {
-				start: 0,
-				end: 100,
-				handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-				handleSize: '80%',
-				handleStyle: {
-					color: '#fff',
-					shadowBlur: 3,
-					shadowColor: 'rgba(0, 0, 0, 0.6)',
-					shadowOffsetX: 2,
-					shadowOffsetY: 2
-				}
-			}],
-			series: [
-				{
-					name:'读取字节数',
-					type:'line',
-					smooth:true,
-					symbol: 'none',
-					sampling: 'average',
-					itemStyle: { normal: { color: 'rgb(255, 70, 131)' } },
-					data: rData
-				},
-				{
-					name:'写入字节数',
-					type:'line',
-					smooth:true,
-					symbol: 'none',
-					sampling: 'average',
-					itemStyle: { normal: { color: 'rgba(46, 165, 186, .7)'} },
-					data: wData
-				}
-			]
-		};
-		myChartDisk.setOption(option);
-		window.addEventListener("resize",function(){
-			myChartDisk.resize();
-		});
-	},'json');
-}
-
-//网络Io
-function network(b,e){
-	$.get('/system/get_network_io?start='+b+'&end='+e,function(rdata){
-		var myChartNetwork = echarts.init(document.getElementById('network'));
-		var aData = [];
-		var bData = [];
-		var cData = [];
-		var dData = [];
-		var xData = [];
-		var yData = [];
-		var zData = [];
-		
-		for(var i = 0; i < rdata.length; i++){
-			aData.push(rdata[i].total_up);
-			bData.push(rdata[i].total_down);
-			cData.push(rdata[i].down_packets);
-			dData.push(rdata[i].up_packets);
-			xData.push(rdata[i].addtime);
-			yData.push(rdata[i].up);
-			zData.push(rdata[i].down);
-		}
-		option = {
-			tooltip: {
-				trigger: 'axis',
-				axisPointer: { type: 'cross' }
-			},
-			legend: {
-				data:[lan.index.net_up,lan.index.net_down]
-			},
-			xAxis: {
-				type: 'category',
-				boundaryGap: false,
-				data: xData,
-				axisLine:{ lineStyle:{ color:"#666" } }
-			},
-			yAxis: {
-				type: 'value',
-				name: lan.index.unit+':KB/s',
-				boundaryGap: [0, '100%'],
-				splitLine:{ lineStyle:{ color:"#ddd" } },
-				axisLine:{ lineStyle:{ color:"#666" } }
-			},
-			dataZoom: [{
-				type: 'inside',
-				start: 0,
-				end: 100,
-				zoomLock:true
-			}, {
-				start: 0,
-				end: 100,
-				handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-				handleSize: '80%',
-				handleStyle: {
-					color: '#fff',
-					shadowBlur: 3,
-					shadowColor: 'rgba(0, 0, 0, 0.6)',
-					shadowOffsetX: 2,
-					shadowOffsetY: 2
-				}
-			}],
-			series: [
-				{
-					name:lan.index.net_up,
-					type:'line',
-					smooth:true,
-					symbol: 'none',
-					sampling: 'average',
-					itemStyle: { normal: { color: 'rgb(255, 140, 0)' } },
-					data: yData
-				},
-				{
-					name:lan.index.net_down,
-					type:'line',
-					smooth:true,
-					symbol: 'none',
-					sampling: 'average',
-					itemStyle: { normal: { color: 'rgb(30, 144, 255)' } },
-					data: zData
-				}
-			]
-		};
-		myChartNetwork.setOption(option);
-		window.addEventListener("resize",function(){
-			myChartNetwork.resize();
-		});
-	},'json');
-}
-//负载
-function getload_old(b,e){
-	$.get('/system/get_load_average?start='+b+'&end='+e,function(rdata){
-		var myChartgetload = echarts.init(document.getElementById('getloadview'));
-		var aData = [];
-		var bData = [];
-		var xData = [];
-		var yData = [];
-		var zData = [];
-		
-		for(var i = 0; i < rdata.length; i++){
-			xData.push(rdata[i].addtime);
-			yData.push(rdata[i].pro);
-			zData.push(rdata[i].one);
-			aData.push(rdata[i].five);
-			bData.push(rdata[i].fifteen);
-		}
-		option = {
-			tooltip: {
-				trigger: 'axis'
-			},
-			calculable: true,
-			legend: {
-				data:['系统资源使用率','1分钟','5分钟','15分钟'],
-				selectedMode: 'single',
-			},
-			xAxis: {
-				type: 'category',
-				boundaryGap: false,
-				data: xData,
-				axisLine:{
-					lineStyle:{
-						color:"#666"
-					}
-				}
-			},
-			yAxis: {
-				type: 'value',
-				name: '',
-				boundaryGap: [0, '100%'],
-				splitLine:{
-					lineStyle:{
-						color:"#ddd"
-					}
-				},
-				axisLine:{
-					lineStyle:{
-						color:"#666"
-					}
-				}
-			},
-			dataZoom: [{
-				type: 'inside',
-				start: 0,
-				end: 100,
-				zoomLock:true
-			}, {
-				start: 0,
-				end: 100,
-				handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-				handleSize: '80%',
-				handleStyle: {
-					color: '#fff',
-					shadowBlur: 3,
-					shadowColor: 'rgba(0, 0, 0, 0.6)',
-					shadowOffsetX: 2,
-					shadowOffsetY: 2
-				}
-			}],
-			series: [
-				{
-					name:'系统资源使用率',
-					type:'line',
-					smooth:true,
-					symbol: 'none',
-					sampling: 'average',
-					itemStyle: {
-						normal: {
-							color: 'rgb(255, 140, 0)'
-						}
-					},
-					data: yData
-				},
-				{
-					name:'1分钟',
-					type:'line',
-					smooth:true,
-					symbol: 'none',
-					sampling: 'average',
-					itemStyle: {
-						normal: {
-							color: 'rgb(30, 144, 255)'
-						}
-					},
-					data: zData
-				},
-				{
-					name:'5分钟',
-					type:'line',
-					smooth:true,
-					symbol: 'none',
-					sampling: 'average',
-					itemStyle: {
-						normal: {
-							color: 'rgb(0, 178, 45)'
-						}
-					},
-					data: aData
-				},
-				{
-					name:'15分钟',
-					type:'line',
-					smooth:true,
-					symbol: 'none',
-					sampling: 'average',
-					itemStyle: {
-						normal: {
-							color: 'rgb(147, 38, 255)'
-						}
-					},
-					data: bData
-				}
-			]
-		};
-		myChartgetload.setOption(option);
-		window.addEventListener("resize",function(){
-			myChartgetload.resize();
-		});
-	},'json');
-}
-//系统负载
-function getload(b,e){
-	$.get('/system/get_load_average?start='+b+'&end='+e,function(rdata){
-		var myChartgetload = echarts.init(document.getElementById('getloadview'));
-		var aData = [];
-		var bData = [];
-		var xData = [];
-		var yData = [];
-		var zData = [];
-		
-		for(var i = 0; i < rdata.length; i++){
-			xData.push(rdata[i].addtime);
-			yData.push(rdata[i].pro);
-			zData.push(rdata[i].one);
-			aData.push(rdata[i].five);
-			bData.push(rdata[i].fifteen);
-		}
-		option = {
-			animation: false,
-			tooltip: {
-				trigger: 'axis',
-				axisPointer: {
-	                type: 'cross'
-	            }
-			},
-			legend: {
-				data:['1分钟','5分钟','15分钟'],
-				right:'16%',
-				top:'10px'
-			},
-			axisPointer: {
-				link: {xAxisIndex: 'all'},
-				lineStyle: {
-					color: '#aaaa',
-					width: 1
-				}
-			},
-			grid: [{ // 直角坐标系内绘图网格
-					top: '60px',
-					left: '5%',
-					right: '55%',
-					width: '40%',
-					height: 'auto'
-				},
-				{
-					top: '60px',
-					left: '55%',
-					width: '40%',
-					height: 'auto'
-				}
-			],
-			xAxis: [
-
-				{ // 直角坐标系grid的x轴
-					type: 'category',
-					axisLine: {
-						lineStyle: {
-							color: '#666'
-						}
-					},
-					data: xData
-				},
-				{ // 直角坐标系grid的x轴
-					type: 'category',
-					gridIndex: 1,
-					axisLine: {
-						lineStyle: {
-							color: '#666'
-						}
-					},
-					data: xData
-				},
-			],
-			yAxis: [{
-					scale: true,
-					name: '资源使用率%',
-					splitLine: { // y轴网格显示
-						show: true,
-						lineStyle:{
-							color:"#ddd"
-						}
-					},
-					nameTextStyle: { // 坐标轴名样式
-						color: '#666',
-						fontSize: 12,
-						align: 'left'
-					},
-					axisLine:{
-						lineStyle:{
-							color: '#666',
-						}
-					}
-				},
-				{
-					scale: true,
-					name: '负载详情',
-					gridIndex: 1,
-					splitLine: { // y轴网格显示
-						show: true,
-						lineStyle:{
-							color:"#ddd"
-						}
-					},
-					nameTextStyle: { // 坐标轴名样式
-						color: '#666',
-						fontSize: 12,
-						align: 'left'
-					},
-					axisLine:{
-						lineStyle:{
-							color: '#666',
-						}
-					}
-				},
-			],
-			dataZoom: [{
-				type: 'inside',
-				start: 0,
-				end: 100,
-				xAxisIndex:[0,1],
-				zoomLock:true
-			}, {
-				xAxisIndex: [0, 1],
-	            type: 'slider',
-				start: 0,
-				end: 100,
-				handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-				handleSize: '80%',
-				handleStyle: {
-					color: '#fff',
-					shadowBlur: 3,
-					shadowColor: 'rgba(0, 0, 0, 0.6)',
-					shadowOffsetX: 2,
-					shadowOffsetY: 2
-				},
-				left:'5%',
-				right:'5%'
-			}],
-			series: [
-				{
-					name: '资源使用率%',
-					type: 'line',
-					lineStyle: { normal: { width: 2, color: 'rgb(255, 140, 0)'}},
-					itemStyle: {normal: { color: 'rgb(255, 140, 0)' }},
-					data: yData
-				},
-				{
-					xAxisIndex: 1,
-					yAxisIndex: 1,
-					name: '1分钟',
-					type: 'line',
-					lineStyle: { normal: {width: 2,color: 'rgb(30, 144, 255)' }},
-					itemStyle: { normal: { color: 'rgb(30, 144, 255)'} },
-					data: zData
-				},
-				{
-					xAxisIndex: 1,
-					yAxisIndex: 1,
-					name: '5分钟',
-					type: 'line',
-					lineStyle: { normal: { width: 2, color: 'rgb(0, 178, 45)'} },
-					itemStyle: { normal: { color: 'rgb(0, 178, 45)' } },
-					data: aData
-				},
-				{
-					xAxisIndex: 1,
-					yAxisIndex: 1,
-					name: '15分钟',
-					type: 'line',
-					lineStyle: { normal: { width: 2, color: 'rgb(147, 38, 255)'}},
-					itemStyle: { normal: { color: 'rgb(147, 38, 255)' } },
-					data: bData
-				}
-			],
-			textStyle: { color: '#666',fontSize: 12}
-		}
-		myChartgetload.setOption(option);
-		window.addEventListener("resize",function(){
-			myChartgetload.resize();
-		})
-	},'json');
-}
\ No newline at end of file
diff --git a/route/static/app/crontab.js b/route/static/app/crontab.js
deleted file mode 100755
index 8db9e9fe1..000000000
--- a/route/static/app/crontab.js
+++ /dev/null
@@ -1,1131 +0,0 @@
-var num = 0;
-//查看任务日志
-function getLogs(id){
-
-	var reqTimer = null;
-	var reqCount = 0;
-
-	var tips = layer.msg('正在获取,请稍候...',{icon:16,time:0,shade: [0.3, '#000']});
-	var req_log_args = 'id='+id;
-	function requestLogs(layerIndex){
-    	
-		$.post('/crontab/logs', req_log_args, function(rdata){
-
-			if (reqCount == 0){
-				layer.close(tips);
-			}
-			
-			if(!rdata.status) {
-				layer.close(layerIndex);
-				layer.msg(rdata.msg,{icon:2, time:2000});
-				clearInterval(reqTimer);
-				return;
-			};
-
-			if (rdata.msg == ''){
-				rdata.msg = '暂无数据!';
-			}
-
-			$("#crontab_log").html(rdata.msg);
-			//滚动到最低
-			var ob = document.getElementById('crontab_log');
-            ob.scrollTop = ob.scrollHeight; 
-			reqCount++;
-		},'json');
-
-    }
-
-
-	layer.open({
-		type:1,
-		title:"任务执行日志",
-		area: ['60%','500px'], 
-		shadeClose:false,
-		btn:["清空","关闭"],
-		closeBtn:1,
-		end: function(){
-        	if (reqTimer){
-        		clearInterval(reqTimer);
-        	}
-        },
-		content:'<div class="setchmod bt-form" style="padding:5px;">'
-			+'<pre id="crontab_log" style="overflow: auto; border: 0px none; line-height:23px;padding: 5px; margin: 0px; white-space: pre-wrap; height: 395px; background-color: rgb(51,51,51);color:#f1f1f1;border-radius:0px;font-family:"></pre>'
-			// +'<div class="bt-form-submit-btn" style="margin-top: 0px;">'
-			// +'<button type="button" class="btn btn-success btn-sm" onclick="closeLogs('+id+')">清空</button>'
-			// +'<button type="button" class="btn btn-danger btn-sm" onclick="layer.closeAll()">关闭</button>'
-		    // +'</div>'
-		+'</div>',
-		success:function(index,layer_index){
-	    	requestLogs(layer_index);
-	    	reqTimer = setInterval(function(){
-	    		requestLogs(layer_index);
-	    	},3000);
-        },
-
-		yes:function(index){
-			clearInterval(reqTimer);
-			closeLogs(id);
-			layer.close(index);
-		},
-	});
-}
-
-
-function getBackupName(hook_data, name){
-	for (var i = 0; i < hook_data.length; i++) {
-		if (hook_data[i]['name'] == name){
-			return hook_data[i]['title'];
-		}
-	}
-	return name;
-}
-
-function getCronData(page){
-	var load = layer.msg(lan.public.the,{icon:16,time:0,shade: [0.3, '#000']});
-	$.post("/crontab/list?p="+page,'', function(rdata){
-		layer.close(load);
-		var cbody = "";
-		if(rdata == ""){
-			cbody="<tr><td colspan='6'>"+lan.crontab.task_empty+"</td></tr>";
-		} else {
-			for(var i=0;i<rdata.data.length;i++){
-				//状态
-				var status = rdata.data[i]['status'] == '1' ?
-				'<span class="btOpen" onclick="setTaskStatus(' + rdata.data[i].id + ',0)" style="color:rgb(92, 184, 92);cursor:pointer" title="停用该计划任务">正常<span class="glyphicon glyphicon-play"></span></span>' 
-				:'<span onclick="setTaskStatus('+ rdata.data[i].id +',1)" class="btClose" style="color:red;cursor:pointer" title="启用该计划任务">停用<span style="color:rgb(255, 0, 0);" class="glyphicon glyphicon-pause"></span></span>';
-
-
-				var cron_save = '--';
-				if (rdata.data[i]['save'] != ''){
-					cron_save = rdata.data[i]['save']+'份';
-				}
-
-				var cron_backupto = '-';
-				if (rdata.data[i]['stype'] == 'site' || rdata.data[i]['stype']=='path' ||  rdata.data[i]['stype']=='database' || rdata.data[i]['stype'].indexOf('database_')>-1 ){
-					cron_backupto = '本地磁盘';
-					if (rdata.data[i]['backup_to'] != 'localhost'){
-						cron_backupto = getBackupName(rdata['backup_hook'],rdata.data[i]['backup_to']);
-					}
-				}
-
-				cbody += "<tr><td><input type='checkbox' onclick='checkSelect();' title='"+rdata.data[i].name+"' name='id' value='"+rdata.data[i].id+"'></td>\
-					<td>"+rdata.data[i].name+"</td>\
-					<td>"+status+"</td>\
-					<td>"+rdata.data[i].type+"</td>\
-					<td>"+rdata.data[i].cycle+"</td>\
-					<td>"+cron_save +"</td>\
-					<td>"+cron_backupto+"</td>\
-					<td>"+rdata.data[i].addtime+"</td>\
-					<td>\
-						<a href=\"javascript:startTask("+rdata.data[i].id+");\" class='btlink'>执行</a> | \
-						<a href=\"javascript:editTaskInfo('"+rdata.data[i].id+"');\" class='btlink'>编辑</a> | \
-						<a href=\"javascript:getLogs("+rdata.data[i].id+");\" class='btlink'>日志</a> | \
-						<a href=\"javascript:planDel("+rdata.data[i].id+" ,'"+rdata.data[i].name.replace('\\','\\\\').replace("'","\\'").replace('"','')+"');\" class='btlink'>删除</a>\
-					</td>\
-				</tr>";
-			}
-		}
-		$('#cronbody').html(cbody);
-		$('#softPage').html(rdata.list);
-	},'json');
-}
-
-// 设置计划任务状态
-function setTaskStatus(id,status){
-	var confirm = layer.confirm(status == '0'?'计划任务暂停后将无法继续运行，您真的要停用这个计划任务吗？':'该计划任务已停用，是否要启用这个计划任务', {title:'提示',icon:3,closeBtn:1},function(index) {
-		if (index > 0) {
-			var loadT = layer.msg('正在设置状态，请稍后...',{icon:16,time:0,shade: [0.3, '#000']});
-			$.post('/crontab/set_cron_status',{id:id},function(rdata){
-
-				if (!rdata.status){
-					layer.msg(rdata.msg,{icon:rdata.status?1:2});
-					return;
-				}
-
-				showMsg(rdata.msg,function(){
-					layer.close(loadT);
-					layer.close(confirm);
-					getCronData(1);
-				},{icon:rdata.status?1:2},2000);
-
-			},'json');
-		}
-	});
-}
-
-//执行任务脚本
-function startTask(id){
-	var loadT = layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']});
-	var data='id='+id;
-	$.post('/crontab/start_task',data,function(rdata){
-		showMsg(rdata.msg, function(){
-		},{icon:rdata.status?1:2,time:2000});
-	},'json');
-}
-
-
-//清空日志
-function closeLogs(id){
-	var loadT = layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']});
-	var data='id='+id;
-	$.post('/crontab/del_logs',data,function(rdata){
-		showMsg(rdata.msg, function(){
-			// layer.closeAll();
-		},{icon:rdata.status?1:2,time:2000});
-	},'json');
-}
-
-
-//删除
-function planDel(id,name){
-	safeMessage(lan.get('del',[name]),'您确定要删除该任务吗?',function(){
-		var load = layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']});
-		var data='id='+id;
-		$.post('/crontab/del',data,function(rdata){
-			showMsg(rdata.msg, function(){
-				layer.closeAll();
-				getCronData(1);
-			},{icon:rdata.status?1:2,time:2000});
-		},'json');
-	});
-}
-	
-function isURL(str_url){
-	var strRegex = '^(https|http|ftp|rtsp|mms)?://.+';
-	var re=new RegExp(strRegex);
-	if (re.test(str_url)){
-		return (true);
-	}else{
-		return (false);
-	}
-}
-
-
-//提交
-function planAdd(){
-	var name = $(".planname input[name='name']").val();
-	if(name == ''){
-		$(".planname input[name='name']").focus();
-		layer.msg('任务名称不能为空!',{icon:2});
-		return;
-	}
-	$("#cronConfig input[name='name']").val(name);
-	
-	var type = $(".plancycle").find("b").attr("val");
-	$("#cronConfig input[name='type']").val(type);
-
-	
-	var is1;
-	var is2 = 1;
-	switch(type){
-		case 'day-n':
-			is1=31;
-			break;
-		case 'hour-n':
-			is1=23;
-			break;
-		case 'minute-n':
-			is1=59;
-			break;
-		case 'month':
-			is1=31;
-			break;
-	}
-	
-	var where1 = $('#excode_week b').attr('val');
-	$("#cronConfig input[name='where1']").val(where1);
-
-	if(where1 > is1 || where1 < is2){
-		$("#ptime input[name='where1']").focus();
-		layer.msg('表单不合法,请重新输入!',{icon:2});
-		return;
-	}
-	
-	var hour = $("#ptime input[name='hour']").val();
-	if(hour > 23 || hour < 0){
-		$("#ptime input[name='hour']").focus();
-		layer.msg('小时值不合法!',{icon:2});
-		return;
-	}
-	$("#cronConfig input[name='hour']").val(hour);
-	var minute = $("#ptime input[name='minute']").val();
-	if(minute > 59 || minute < 0){
-		$("#ptime input[name='minute']").focus();
-		layer.msg('分钟值不合法!',{icon:2});
-		return;
-	}
-	$("#cronConfig input[name='minute']").val(minute);
-	
-	var save = $("#save").val();
-	if(save < 0){
-		layer.msg('不能有负数!',{icon:2});
-		return;
-	}
-	
-	$("#cronConfig input[name='save']").val(save);
-	$("#cronConfig input[name='week']").val($(".planweek").find("b").attr("val"));
-
-	var sType = $(".planjs").find("b").attr("val");
-	var sBody = encodeURIComponent($("#implement textarea[name='sBody']").val());
-
-	if (sType == 'toShell'){
-		if(sBody == ''){
-			$("#implement textarea[name='sBody']").focus();
-			layer.msg('脚本代码不能为空!',{icon:2});
-			return;
-		}
-	}
-
-	if(sType == 'toFile'){
-		if($("#viewfile").val() == ''){
-			layer.msg('请选择脚本文件!',{icon:2});
-			return;
-		}
-	}
-	
-	var urladdress = $("#urladdress").val();
-	if(sType == 'toUrl'){
-		if(!isURL(urladdress)){
-			layer.msg('URL地址不正确!',{icon:2});
-			$("implement textarea[name='urladdress']").focus();
-			return;
-		}
-	}
-	// urladdress = encodeURIComponent(urladdress);
-	$("#cronConfig input[name='urladdress']").val(urladdress);
-	$("#cronConfig input[name='sType']").val(sType);
-	$("#cronConfig textarea[name='sBody']").val(decodeURIComponent(sBody));
-	
-	if(sType == 'site' || sType == 'database' || sType == 'path'){
-		var backupTo = $(".planBackupTo").find("b").attr("val");
-		$("#backupTo").val(backupTo);
-	}
-	
-	var sName = $("#sName").attr("val");
-	
-	// if(sName == 'backupAll'){
-	// 	var alist = $("ul[aria-labelledby='backdata'] li a");
-	// 	var dataList = new Array();
-	// 	for(var i=1;i<alist.length;i++){
-	// 		var tmp = alist[i].getAttribute('value');
-	// 		dataList.push(tmp);
-	// 	}
-	// 	if(dataList.length < 1){
-	// 		layer.msg('对象列表为空，无法继续!',{icon:5});
-	// 		return;
-	// 	}
-	// 	allAddCrontab(dataList,0,'');
-	// 	return;
-	// }
-
-	if (type == 'minute-n'){
-		var where1 = $("#ptime input[name='where1']").val();
-		$("#cronConfig input[name='where1']").val(where1);
-	}
-
-	if (type == 'day-n'){
-		var where1 = $("#ptime input[name='where1']").val();
-		$("#cronConfig input[name='where1']").val(where1);
-	}
-
-	if (type == 'hour-n'){
-		var where1 = $("#ptime input[name='where1']").val();
-		$("#cronConfig input[name='where1']").val(where1);
-	}
-
-	if (type == 'month'){
-		var where1 = $("#ptime input[name='where1']").val();
-		$("#cronConfig input[name='where1']").val(where1);
-	}
-	
-	
-	$("#cronConfig input[name='sName']").val(sName);
-	layer.msg('正在添加,请稍候...!',{icon:16,time:0,shade: [0.3, '#000']});
-	var data = $("#cronConfig").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});
-			return;
-		}
-
-		showMsg(rdata.msg, function(){
-			layer.closeAll();
-			getCronData(1);
-		},{icon:rdata.status?1:2}, 2000);
-
-	},'json');
-}
-
-//批量添加任务
-// function allAddCrontab(dataList,successCount,errorMsg){
-// 	if(dataList.length < 1) {
-// 		layer.msg(lan.get('add_all_task_ok',[successCount]),{icon:1});
-// 		return;
-// 	}
-// 	var loadT = layer.msg(lan.get('add',[dataList[0]]),{icon:16,time:0,shade: [0.3, '#000']});
-// 	var sType = $(".planjs").find("b").attr("val");
-// 	var minute = parseInt($("#cronConfig input[name='minute']").val());
-// 	var hour = parseInt($("#cronConfig input[name='hour']").val());
-// 	var sTitle = (sType == 'site')?lan.crontab.backup_site:lan.crontab.backup_database;
-// 	if(sType == 'logs') sTitle = lan.crontab.backup_log;
-// 	minute += 5;
-// 	if(hour !== '' && minute > 59){
-// 		if(hour >= 23) hour = 0;
-// 		$("#cronConfig input[name='hour']").val(hour+1);
-// 		minute = 5;
-// 	}
-// 	$("#cronConfig input[name='minute']").val(minute);
-// 	$("#cronConfig input[name='name']").val(sTitle + '['+dataList[0]+']');
-// 	$("#cronConfig input[name='sName']").val(dataList[0]);
-// 	var pdata = $("#cronConfig").serialize() + '&sBody=&urladdress=';
-// 	$.ajax({
-// 		type:'POST',
-// 		url:'/crontab/add',
-// 		data:pdata,
-// 		async: true,
-// 		success:function(frdata){
-// 			layer.close(loadT);
-// 			if(frdata.status){
-// 				successCount++;
-// 				getCronData(1);
-// 			}else{
-// 				if(!errorMsg){
-// 					errorMsg = '<br><p>'+lan.crontab.backup_all_err+'</p>';
-// 				}
-// 				errorMsg += '<li>'+dataList[0]+' -> '+frdata.msg+'</li>'
-// 			}
-			
-// 			dataList.splice(0,1);
-// 			allAddCrontab(dataList,successCount,errorMsg);
-// 		}
-// 	});
-// }
-
-initDropdownMenu();
-function initDropdownMenu(){
-	$(".dropdown ul li a").click(function(){
-		var txt = $(this).text();
-		var type = $(this).attr("value");
-		$(this).parents(".dropdown").find("button b").text(txt).attr("val",type);
-		switch(type){
-			case 'day':
-				closeOpt();
-				toHour();
-				toMinute();
-				break;
-			case 'day-n':
-				closeOpt();
-				toWhere1('天');
-				toHour();
-				toMinute();
-				break;
-			case 'hour':
-				closeOpt();
-				toMinute();
-				break;
-			case 'hour-n':
-				closeOpt();
-				toWhere1('小时');
-				toMinute();
-				break;
-			case 'minute-n':
-				closeOpt();
-				toWhere1('分钟');
-				break;
-			case 'week':
-				closeOpt();
-				toWeek();
-				toHour();
-				toMinute();
-				break;
-			case 'month':
-				closeOpt();
-				toWhere1('日');
-				toHour();
-				toMinute();
-				break;
-			case 'toFile':
-				toFile();
-				break;
-			case 'toShell':
-				toShell();
-				$(".controls").html('脚本内容');
-				break;
-			case 'rememory':
-				rememory();
-				$(".controls").html('提示');
-				break;
-			case 'site':
-				toBackup('sites');
-				$(".controls").html('备份网站');
-				break;
-			case 'database_mariadb':
-			case 'database_mongodb':
-			case 'database_postgresql':
-			case 'database_mysql-apt':
-			case 'database_mysql-yum':
-			case 'database':
-				toBackup(type);
-				$(".controls").html('备份数据库');
-				break;
-			case 'path':
-				toBackup('path');
-				$(".controls").html('备份目录');
-				break;
-			case 'logs':
-				toLogsHtml('logs');
-				$(".controls").html('切割网站');
-				break;
-			case 'toUrl':
-				toUrl();
-				$(".controls").html('URL地址');
-				break;
-		}
-	});
-}
-
-
-//备份
-function toLogsHtml(type){
-	var sMsg = "";
-	switch(type){
-		case 'sites':
-			sMsg = '备份网站';
-			sType = "sites";
-			break;
-		case 'database_mariadb':
-		case 'database_mongodb':
-		case 'database_postgresql':
-		case 'database_mysql-apt':
-		case 'database_mysql-yum':
-		case 'database':
-			sMsg = '备份数据库';
-			suffix = type.replace('database','')
-			if (suffix != ''){
-				suffix = suffix.replace('_','')
-				sMsg = '备份数据库['+suffix+']';
-			}
-			sType = type;
-			break;
-		case 'logs':
-			sMsg = '切割日志';
-			sType = "logs";
-			break;
-		case 'path':
-			sMsg = '备份目录';
-			sType = "path";
-			break;
-	}
-	var data = 'type='+sType;
-
-	$.post('/crontab/get_data_list',data,function(rdata){
-		$(".planname input[name='name']").attr('readonly','true').css({"background-color":"#f6f6f6","color":"#666"});
-		var sOpt = "";
-		if(rdata.data.length == 0){
-			layer.msg(lan.public.list_empty,{icon:2})
-			return;
-		}
-
-		for(var i=0;i<rdata.data.length;i++){
-			if(i==0){
-				$(".planname input[name='name']").val(sMsg+'['+rdata.data[i].name+']');
-			}
-			sOpt += '<li><a role="menuitem" tabindex="-1" href="javascript:;" value="'+rdata.data[i].name+'">'+rdata.data[i].name+'['+rdata.data[i].ps+']</a></li>';			
-		}
-
-		
-		if (sType != 'path'){
-			sOpt = '<li><a role="menuitem" tabindex="-1" href="javascript:;" value="ALL">所有</a></li>' + sOpt;
-		}
-		
-		var orderOpt = '';
-		for (var i=0;i<rdata.orderOpt.length;i++){
-			orderOpt += '<li><a role="menuitem" tabindex="-1" href="javascript:;" value="'+rdata.orderOpt[i].name+'">'+rdata.orderOpt[i].title+'</a></li>'
-		}
-		
-		
-		var changeDir = '';
-		if (sType == 'path'){
-			changeDir = '<span class="glyphicon glyphicon-folder-open cursor mr20 changePathDir" style="float:left;line-height: 30px;"></span>';
-		}
-
-		var sBody = '<div class="dropdown pull-left mr20 check">\
-					  <button class="btn btn-default dropdown-toggle sname" type="button" id="backdata" data-toggle="dropdown" style="width:auto">\
-						<b id="sName" val="'+rdata.data[0].name+'">'+rdata.data[0].name+'['+rdata.data[0].ps+']</b> <span class="caret"></span>\
-					  </button>\
-					  <ul class="dropdown-menu" role="menu" aria-labelledby="backdata">'+sOpt+'</ul>\
-					</div>\
-					'+ changeDir +'\
-					</div>\
-					<div class="textname pull-left mr20">保留最新</div><div class="plan_hms pull-left mr20 bt-input-text">\
-					<span><input type="number" name="save" id="save" value="3" maxlength="4" max="100" min="1"></span>\
-					<span class="name">份</span>\
-					</div>';
-		$("#implement").html(sBody);
-		getselectname();
-
-		$('.changePathDir').click(function(){
-			changePathCallback($('#sName').val(),function(select_dir){
-				$(".planname input[name='name']").val('备份目录['+select_dir+']');
-				$('#implement .sname b').attr('val',select_dir).text(select_dir);
-			});
-		});
-
-
-		$(".dropdown ul li a").click(function(){
-			var sName = $("#sName").attr("val");
-			if(!sName) return;
-			$(".planname input[name='name']").val(sMsg+'['+sName+']');
-		});
-	},'json');
-
-}
-
-//备份
-function toBackup(type){
-	var sMsg = "";
-	switch(type){
-		case 'sites':
-			sMsg = '备份网站';
-			sType = "sites";
-			break;
-		case 'database_mariadb':
-		case 'database_mongodb':
-		case 'database_postgresql':
-		case 'database_mysql-apt':
-		case 'database_mysql-yum':
-		case 'database':
-			sMsg = '备份数据库';
-			suffix = type.replace('database','')
-			if (suffix != ''){
-				suffix = suffix.replace('_','')
-				sMsg = '备份数据库['+suffix+']';
-			}
-			sType = type;
-			break;
-		case 'logs':
-			sMsg = '切割日志';
-			sType = "logs";
-			break;
-		case 'path':
-			sMsg = '备份目录';
-			sType = "path";
-			break;
-	}
-	var data = 'type='+sType;
-
-	$.post('/crontab/get_data_list',data,function(rdata){
-		$(".planname input[name='name']").attr('readonly','true').css({"background-color":"#f6f6f6","color":"#666"});
-		var sOpt = "";
-		if(rdata.data.length == 0){
-			layer.msg(lan.public.list_empty,{icon:2})
-			return;
-		}
-
-		for(var i=0;i<rdata.data.length;i++){
-			if(i==0){
-				$(".planname input[name='name']").val(sMsg+'['+rdata.data[i].name+']');
-			}
-			sOpt += '<li><a role="menuitem" tabindex="-1" href="javascript:;" value="'+rdata.data[i].name+'">'+rdata.data[i].name+'['+rdata.data[i].ps+']</a></li>';			
-		}
-
-		
-		if (sType != 'path'){
-			sOpt = '<li><a role="menuitem" tabindex="-1" href="javascript:;" value="ALL">所有</a></li>' + sOpt;
-		}
-		
-		var orderOpt = '';
-		for (var i=0;i<rdata.orderOpt.length;i++){
-			orderOpt += '<li><a role="menuitem" tabindex="-1" href="javascript:;" value="'+rdata.orderOpt[i].name+'">'+rdata.orderOpt[i].title+'</a></li>'
-		}
-		
-		
-		var changeDir = '';
-		if (sType == 'path'){
-			changeDir = '<span class="glyphicon glyphicon-folder-open cursor mr20 changePathDir" style="float:left;line-height: 30px;"></span>';
-		}
-
-		var sBody = '<div class="dropdown pull-left mr20 check">\
-					  <button class="btn btn-default dropdown-toggle sname" type="button" id="backdata" data-toggle="dropdown" style="width:auto">\
-						<b id="sName" val="'+rdata.data[0].name+'">'+rdata.data[0].name+'['+rdata.data[0].ps+']</b> <span class="caret"></span>\
-					  </button>\
-					  <ul class="dropdown-menu" role="menu" aria-labelledby="backdata">'+sOpt+'</ul>\
-					</div>\
-					'+ changeDir +'\
-					<div class="textname pull-left mr20">备份到</div>\
-					<div class="dropdown planBackupTo pull-left mr20">\
-					  <button class="btn btn-default dropdown-toggle" type="button" id="excode" data-toggle="dropdown" style="width:auto;">\
-						<b val="localhost">服务器磁盘</b><span class="caret"></span>\
-					  </button>\
-					  <ul class="dropdown-menu" role="menu" aria-labelledby="excode">\
-						<li><a role="menuitem" tabindex="-1" href="javascript:;" value="localhost">服务器磁盘</a></li>\
-						'+ orderOpt +'\
-					  </ul>\
-					</div>\
-					<div class="textname pull-left mr20">保留最新</div><div class="plan_hms pull-left mr20 bt-input-text">\
-					<span><input type="number" name="save" id="save" value="3" maxlength="4" max="100" min="1"></span>\
-					<span class="name">份</span>\
-					</div>';
-		$("#implement").html(sBody);
-		getselectname();
-
-		$('.changePathDir').click(function(){
-			changePathCallback($('#sName').val(),function(select_dir){
-				$(".planname input[name='name']").val('备份目录['+select_dir+']');
-				$('#implement .sname b').attr('val',select_dir).text(select_dir);
-			});
-		});
-
-
-		$(".dropdown ul li a").click(function(){
-			var sName = $("#sName").attr("val");
-			if(!sName) return;
-			$(".planname input[name='name']").val(sMsg+'['+sName+']');
-		});
-	},'json');
-
-}
-
-
-// 编辑计划任务
-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('get_crond_find:', rdata);
-		var sTypeName = '',sTypeDom = '',cycleName = '',cycleDom = '',weekName = '',weekDom = '',sNameName ='',sNameDom = '',backupsName = '',backupsDom ='';
-		obj = {
-			from:{
-				id:rdata.id,
-				name: rdata.name,
-				type: rdata['type'],
-				stype: rdata.stype,
-				where1: rdata.where1,
-				hour: rdata.where_hour,
-				minute: rdata.where_minute,
-				week: rdata.where1,
-				sbody: rdata.sbody,
-				sname: rdata.sname,
-				backup_to: rdata.backup_to,
-				save: rdata.save,
-				urladdress: rdata.urladdress,
-			},
-			sTypeArray:[['toShell','Shell脚本'],['site','备份网站'],['database','备份数据库'],['logs','日志切割'],['path','备份目录'],['rememory','释放内存'],['toUrl','访问URL']],
-			cycleArray:[['day','每天'],['day-n','N天'],['hour','每小时'],['hour-n','N小时'],['minute-n','N分钟'],['week','每星期'],['month','每月']],
-			weekArray:[[1,'周一'],[2,'周二'],[3,'周三'],[4,'周四'],[5,'周五'],[6,'周六'],[7,'周日']],
-			sNameArray:[],
-			backupsArray:[],
-			create:function(callback){
-				if (obj.from['stype'].indexOf('database_')>-1){
-					name = obj.from['stype'].replace('database_','');
-					sTypeName = '备份数据库['+name+']';
-					sTypeDom += '<li><a role="menuitem"  href="javascript:;" value="'+ obj.from['stype'] +'">'+ sTypeName +'</a></li>';
-				} else {
-					for(var i = 0; i <obj['sTypeArray'].length; i++){
-						if(obj.from['stype'] == obj['sTypeArray'][i][0]){
-							sTypeName  = obj['sTypeArray'][i][1];
-						}
-						sTypeDom += '<li><a role="menuitem"  href="javascript:;" value="'+ obj['sTypeArray'][i][0] +'">'+ obj['sTypeArray'][i][1] +'</a></li>';
-					}
-				}
-
-				for(var i = 0; i <obj['cycleArray'].length; i++){
-					if(obj.from['type'] == obj['cycleArray'][i][0])  cycleName  = obj['cycleArray'][i][1];
-					cycleDom += '<li><a role="menuitem"  href="javascript:;" value="'+ obj['cycleArray'][i][0] +'">'+ obj['cycleArray'][i][1] +'</a></li>';
-				}
-
-				for(var i = 0; i <obj['weekArray'].length; i++){
-					if(obj.from['week'] == obj['weekArray'][i][0])  weekName  = obj['weekArray'][i][1];
-					weekDom += '<li><a role="menuitem"  href="javascript:;" value="'+ obj['weekArray'][i][0] +'">'+ obj['weekArray'][i][1] +'</a></li>';
-				}
-
-				if(obj.from.stype == 'site' || obj.from.stype == 'database' || obj.from.stype == 'path' || obj.from.stype == 'logs' || obj.from['stype'].indexOf('database_')>-1){
-					$.post('/crontab/get_data_list',{type:obj.from.stype},function(rdata){
-						// console.log(rdata);
-						obj.sNameArray = rdata.data;
-						obj.sNameArray.unshift({name:'ALL',ps:'所有'});
-						obj.backupsArray = rdata.orderOpt;
-						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'];
-							}
-							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]['name'])  {
-								backupsName  = obj['backupsArray'][i]['title'];
-							}
-							backupsDom += '<li><a role="menuitem"  href="javascript:;" value="'+ obj['backupsArray'][i]['name'] +'">'+ obj['backupsArray'][i]['title'] +'</a></li>';
-						}
-						callback();
-					},'json');
-				}else{
-					callback();
-				}
-			}
-		};
-		obj.create(function(){
-
-			var changeDir = '';
-			if (obj.from.stype == 'path'){
-				changeDir = '<span class="glyphicon glyphicon-folder-open cursor mr20 changePathDir" style="float:left;line-height: 30px;"></span>';
-			}
-
-			layer.open({
-				type:1,
-				title:'编辑计划任务-['+rdata.name+']',
-				area: ['850px','440px'], 
-				skin:'layer-create-content',
-				shadeClose:false,
-				closeBtn:1,
-				content:'<div class="setting-con ptb20">\
-							<div class="clearfix plan ptb10">\
-								<span class="typename c4 pull-left f14 text-right mr20">任务类型</span>\
-								<div class="dropdown stype_list pull-left mr20">\
-									<button class="btn btn-default dropdown-toggle" type="button" id="excode" data-toggle="dropdown" style="width:auto" disabled="disabled">\
-										<b val="'+ obj.from.type +'">'+ sTypeName +'</b>\
-										<span class="caret"></span>\
-									</button>\
-									<ul class="dropdown-menu" role="menu" aria-labelledby="sType">'+ sTypeDom +'</ul>\
-								</div>\
-							</div>\
-							<div class="clearfix plan ptb10">\
-								<span class="typename c4 pull-left f14 text-right mr20">任务名称</span>\
-								<div class="planname pull-left"><input type="text" name="name" class="bt-input-text sName_create" value="'+ obj.from.name +'"></div>\
-							</div>\
-							<div class="clearfix plan ptb10">\
-								<span class="typename c4 pull-left f14 text-right mr20">执行周期</span>\
-								<div class="dropdown  pull-left mr20">\
-									<button class="btn btn-default dropdown-toggle cycle_btn" type="button" data-toggle="dropdown" style="width:94px">\
-										<b val="'+ obj.from.stype +'">'+ cycleName +'</b>\
-										<span class="caret"></span>\
-									</button>\
-									<ul class="dropdown-menu" role="menu" aria-labelledby="cycle">'+ cycleDom +'</ul>\
-								</div>\
-								<div class="pull-left optional_week">\
-									<div class="dropdown week_btn pull-left mr20" style="display:'+ (obj.from.type == "week"  ?'block;':'none') +'">\
-										<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" >\
-											<b val="'+ obj.from.week +'">'+ weekName +'</b> \
-											<span class="caret"></span>\
-										</button>\
-										<ul class="dropdown-menu" role="menu" aria-labelledby="week">'+ weekDom +'</ul>\
-									</div>\
-									<div class="plan_hms pull-left mr20 bt-input-text where1_input" style="display:'+ (obj.from.type == "day-n" || obj.from.type == 'month' ?'block;':'none') +'"><span><input type="number" name="where1" class="where1_create" value="'+obj.from.where1 +'" maxlength="2" max="23" min="0"></span> <span class="name">日</span> </div>\
-									<div class="plan_hms pull-left mr20 bt-input-text hour_input" style="display:'+ (obj.from.type == "day" || obj.from.type == 'day-n' || obj.from.type == 'hour-n' || obj.from.type == 'week' || obj.from.type == 'month'?'block;':'none') +'"><span><input type="number" name="hour" class="hour_create" value="'+ ( obj.from.type == 'hour-n' ? obj.from.where1 : obj.from.hour ) +'" maxlength="2" max="23" min="0"></span> <span class="name">时</span> </div>\
-									<div class="plan_hms pull-left mr20 bt-input-text minute_input"><span><input type="number" name="minute" class="minute_create" value="'+ (obj.from.type == 'minute-n' ? obj.from.where1 : obj.from.minute)+'" maxlength="2" max="59" min="0"></span> <span class="name">分</span> </div>\
-								</div>\
-							</div>\
-							<div class="clearfix plan ptb10 site_list" style="display:none">\
-								<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 sname" type="button"  data-toggle="dropdown" style="width:auto" disabled="disabled">\
-										<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>\
-								</div>\
-								<div class="info-r" style="float: left;margin-right: 25px;display:'+ (obj.from.sType == "path"?'block;':'none') +'">\
-									<input id="inputPath" class="bt-input-text mr5 " type="text" name="path" value="'+ obj.from.sName +'" placeholder="备份目录" style="width:208px;height:33px;" disabled="disabled">\
-								</div>\
-								'+changeDir+'\
-								<div class="textname pull-left mr20">备份到</div>\
-									<div class="dropdown  pull-left mr20">\
-										<button class="btn btn-default dropdown-toggle backup_btn" type="button"  data-toggle="dropdown" style="width:auto;">\
-											<b val="'+ obj.from.backup_to +'">'+ backupsName +'</b>\
-											<span class="caret"></span>\
-										</button>\
-										<ul class="dropdown-menu" role="menu" aria-labelledby="backupTo">'+ backupsDom +'</ul>\
-									</div>\
-									<div class="textname pull-left mr20">保留最新</div>\
-									<div class="plan_hms pull-left mr20 bt-input-text">\
-										<span><input type="number" name="save" class="save_create" value="'+ obj.from.save +'" maxlength="4" max="100" min="1"></span><span class="name">份</span>\
-									</div>\
-								</div>\
-							</div>\
-							<div class="clearfix plan ptb10"  style="display:'+ (obj.from.stype == "toShell"?'block;':'none') +'">\
-								<span class="typename controls c4 pull-left f14 text-right mr20">脚本内容</span>\
-								<div style="line-height:34px"><textarea class="txtsjs bt-input-text sBody_create" name="sbody">'+ obj.from.sbody +'</textarea></div>\
-							</div>\
-							<div class="clearfix plan ptb10" style="display:'+ (obj.from.stype == "rememory"?'block;':'none') +'">\
-								<span class="typename controls c4 pull-left f14 text-right mr20">提示</span>\
-								<div style="line-height:34px">释放PHP、MYSQL、PURE-FTPD、OpenResty的内存占用,建议在每天半夜执行!</div>\
-							</div>\
-							<div class="clearfix plan ptb10" style="display:'+ (obj.from.stype == "toUrl"?'block;':'none') +'">\
-								<span class="typename controls c4 pull-left f14 text-right mr20">URL地址</span>\
-								<div style="line-height:34px"><input type="text" style="width:400px; height:34px" class="bt-input-text url_create" name="urladdress"  placeholder="URL地址" value="'+ obj.from.urladdress +'"></div>\
-							</div>\
-							<div class="clearfix plan ptb10">\
-								<div class="bt-submit plan-submits " style="margin-left: 141px;">保存编辑</div>\
-							</div>\
-						</div>',
-
-				success:function(){
-
-					$('.changePathDir').click(function(){
-						changePathCallback($('#sName').val(),function(select_dir){
-							$('input[name="name"]').val('备份目录['+select_dir+']');
-							$('.sName_btn .sname b').attr('val',select_dir).text(select_dir);
-							obj.from.sname = select_dir;
-						});
-					});
-					
-					if(obj.from.stype == 'toShell'){
-						$('.site_list').hide();
-					} else if (obj.from.stype == 'rememory') {
-						$('.site_list').hide();
-					} else if ( obj.from.stype == 'toUrl'){
-						$('.site_list').hide();
-					} else {
-						$('.site_list').show();
-					}
-
-					
-
-					obj.from.minute = $('.minute_create').val();
-					obj.from.hour = $('.hour_create').val();
-					obj.from.where1 = $('.where1_create').val();
-
-					$('.sName_create').blur(function () {
-						obj.from.name = $(this).val();
-					});
-					$('.where1_create').blur(function () {
-						obj.from.where1 = $(this).val();
-					});
-		
-					$('.hour_create').blur(function () {
-						obj.from.hour = $(this).val();
-					});
-		
-					$('.minute_create').blur(function () {
-						obj.from.minute = $(this).val();
-					});
-		
-					$('.save_create').blur(function () {
-						obj.from.save = $(this).val();
-					});
-		
-					$('.sBody_create').blur(function () {
-						obj.from.sbody = $(this).val();
-					});
-					$('.url_create').blur(function () {
-						obj.from.urladdress = $(this).val();
-					});
-		
-					$('[aria-labelledby="cycle"] a').unbind().click(function () {
-						$('.cycle_btn').find('b').attr('val',$(this).attr('value')).html($(this).html());
-						var type = $(this).attr('value');
-						switch(type){
-							case 'day':
-								$('.week_btn').hide();
-								$('.where1_input').hide();
-								$('.hour_input').show().find('input').val('1');
-								$('.minute_input').show().find('input').val('30');
-								obj.from.week = '';
-								obj.from.type = '';
-								obj.from.hour = 1;
-								obj.from.minute = 30;
-							break;
-							case 'day-n':
-								$('.week_btn').hide();
-								$('.where1_input').show().find('input').val('1');
-								$('.hour_input').show().find('input').val('1');
-								$('.minute_input').show().find('input').val('30');
-								obj.from.week = '';
-								obj.from.where1 = 1;
-								obj.from.hour = 1;
-								obj.from.minute = 30;
-							break;
-							case 'hour':
-								$('.week_btn').hide();
-								$('.where1_input').hide();
-								$('.hour_input').hide();
-								$('.minute_input').show().find('input').val('30');
-								obj.from.week = '';
-								obj.from.where1 = '';
-								obj.from.hour = '';
-								obj.from.minute = 30;
-							break;
-							case 'hour-n':
-								$('.week_btn').hide();
-								$('.where1_input').hide();
-								$('.hour_input').show().find('input').val('1');
-								$('.minute_input').show().find('input').val('30');
-								obj.from.week = '';
-								obj.from.where1 = '';
-								obj.from.hour = 1;
-								obj.from.minute = 30;
-							break;
-							case 'minute-n':
-								$('.week_btn').hide();
-								$('.where1_input').hide();
-								$('.hour_input').hide();
-								$('.minute_input').show();
-								obj.from.week = '';
-								obj.from.where1 = '';
-								obj.from.hour = '';
-								obj.from.minute = 30;
-								console.log(obj.from);
-							break;
-							case 'week':
-								$('.week_btn').show();
-								$('.where1_input').hide();
-								$('.hour_input').show();
-								$('.minute_input').show();
-								obj.from.week = 1;
-								obj.from.where1 = '';
-								obj.from.hour = 1;
-								obj.from.minute = 30;
-							break;
-							case 'month':
-								$('.week_btn').hide();
-								$('.where1_input').show();
-								$('.hour_input').show();
-								$('.minute_input').show();
-								obj.from.week = '';
-								obj.from.where1 = 1;
-								obj.from.hour = 1;
-								obj.from.minute = 30;
-							break;
-						}
-						obj.from.type = $(this).attr('value');
-					});
-		
-					$('[aria-labelledby="week"] a').unbind().click(function () {
-						$('.week_btn').find('b').attr('val',$(this).attr('value')).html($(this).html());
-						obj.from.week = $(this).attr('value');
-					});
-		
-					$('[aria-labelledby="backupTo"] a').unbind().click(function () {
-						$('.backup_btn').find('b').attr('val',$(this).attr('value')).html($(this).html());
-						obj.from.backup_to = $(this).attr('value');
-					});
-					$('.plan-submits').unbind().click(function(){
-						if(obj.from.type == 'hour-n'){
-							obj.from.where1 = obj.from.hour;
-							obj.from.hour = '';
-						} else if(obj.from.type == 'minute-n') {
-							obj.from.where1 = obj.from.minute;
-							obj.from.minute = '';
-						}
-						var loadT = layer.msg('正在保存编辑内容，请稍后...',{icon:16,time:0,shade: [0.3, '#000']});
-						$.post('/crontab/modify_crond',obj.from,function(rdata){
-
-							if (!rdata.status){
-								layer.msg(rdata.msg,{icon:rdata.status?1:2});
-								return;
-							}
-
-							showMsg(rdata.msg, function(){
-								layer.closeAll();
-								getCronData(1);
-								initDropdownMenu();
-							},{icon:rdata.status?1:2}, 2000);
-
-						},'json');
-					});
-				}
-				,cancel: function(){ 
-				    initDropdownMenu();
-				}
-			});
-		});
-	},'json');
-}
-
-
-//下拉菜单名称
-function getselectname(){
-	$(".dropdown ul li a").click(function(){
-		var txt = $(this).text();
-		var type = $(this).attr("value");
-		$(this).parents(".dropdown").find("button b").text(txt).attr("val",type);
-	});
-}
-//清理
-function closeOpt(){
-	$("#ptime").html('');
-}
-//星期
-function toWeek(){
-	var mBody = '<div class="dropdown planweek pull-left mr20">\
-	 	<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_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>\
-			<li><a role="menuitem" tabindex="-1" href="javascript:;" value="4">周四</a></li>\
-			<li><a role="menuitem" tabindex="-1" href="javascript:;" value="5">周五</a></li>\
-			<li><a role="menuitem" tabindex="-1" href="javascript:;" value="6">周六</a></li>\
-			<li><a role="menuitem" tabindex="-1" href="javascript:;" value="0">周日</a></li>\
-	 	</ul>\
-	</div>';
-	$("#ptime").html(mBody);
-	getselectname();
-}
-//指定1
-function toWhere1(ix){
-	var mBody ='<div class="plan_hms pull-left mr20 bt-input-text">\
-					<span><input type="number" name="where1" value="3" maxlength="2" max="31" min="0"></span>\
-					<span class="name">'+ix+'</span>\
-				</div>';
-	$("#ptime").append(mBody);
-}
-//小时
-function toHour(){
-	var mBody = '<div class="plan_hms pull-left mr20 bt-input-text">\
-					<span><input type="number" name="hour" value="1" maxlength="2" max="23" min="0"></span>\
-					<span class="name">小时</span>\
-					</div>';
-	$("#ptime").append(mBody);
-}
-
-//分钟
-function toMinute(){
-	var mBody = '<div class="plan_hms pull-left mr20 bt-input-text">\
-					<span><input type="number" name="minute" value="30" maxlength="2" max="59" min="0"></span>\
-					<span class="name">分钟</span>\
-					</div>';
-	$("#ptime").append(mBody);
-	
-}
-
-//从文件
-function toFile(){
-	var tBody = '<input type="text" value="" name="file" id="viewfile" onclick="fileupload()" readonly="true">\
-				<button class="btn btn-default" onclick="fileupload()">上次</button>';
-	$("#implement").html(tBody);
-	$(".planname input[name='name']").removeAttr('readonly style').val("");
-}
-
-//从脚本
-function toShell(){
-	var tBody = "<textarea class='txtsjs bt-input-text' name='sBody'></textarea>";
-	$("#implement").html(tBody);
-	$(".planname input[name='name']").removeAttr('readonly style').val("");
-}
-
-//从脚本
-function toUrl(){
-	var tBody = "<input type='text' style='width:400px; height:34px' class='bt-input-text' name='urladdress' id='urladdress' placeholder='"+lan.crontab.url_address+"' value='http://' />";
-	$("#implement").html(tBody);
-	$(".planname input[name='name']").removeAttr('readonly style').val("");
-}
-
-//释放内存
-function rememory(){
-	$(".planname input[name='name']").removeAttr('readonly style').val("");
-	$(".planname input[name='name']").val(lan.crontab.mem);
-	$("#implement").html(lan.crontab.mem_ps);
-	return;
-}
-//上传
-function fileupload(){
-	$("#sFile").change(function(){
-		$("#viewfile").val($("#sFile").val());
-	});
-	$("#sFile").click();
-}
\ No newline at end of file
diff --git a/route/static/app/files.js b/route/static/app/files.js
deleted file mode 100755
index 5fad6c602..000000000
--- a/route/static/app/files.js
+++ /dev/null
@@ -1,1864 +0,0 @@
-// console.log(lan);
-
-//判断磁盘数量超出宽度
-function isDiskWidth(){
-	var comlistWidth = $("#comlist").width();
-	var bodyWidth = $(".file-box").width();
-	if(comlistWidth + 530 > bodyWidth){
-		$("#comlist").css({"width":bodyWidth-530+"px","height":"34px","overflow":"auto"});
-	}
-	else{
-		$("#comlist").removeAttr("style");
-	}
-}
-
-//打开回收站
-function recycleBin(type){
-	$.post('/files/get_recycle_bin','',function(data){
-		// console.log(rdata);
-		var rdata = data['data'];
-		var body = ''
-		switch(type){
-			case 1:
-				for(var i=0;i<rdata.dirs.length;i++){
-					var shortwebname = rdata.dirs[i].name.replace(/'/,"\\'");
-					var shortpath = rdata.dirs[i].dname;
-					if(shortwebname.length > 20) shortwebname = shortwebname.substring(0, 20) + "...";
-					if(shortpath.length > 20) shortpath = shortpath.substring(0, 20) + "...";
-					body += '<tr>\
-						<td><span class=\'ico ico-folder\'></span><span class="tname" title="'+rdata.dirs[i].name+'">'+shortwebname+'</span></td>\
-						<td><span title="'+rdata.dirs[i].dname+'">'+shortpath+'</span></td>\
-						<td>'+toSize(rdata.dirs[i].size)+'</td>\
-						<td>'+getLocalTime(rdata.dirs[i].time)+'</td>\
-						<td style="text-align: right;">\
-							<a class="btlink" href="javascript:;" onclick="reRecycleBin(\'' + rdata.dirs[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_re+'</a>\
-							 | <a class="btlink" href="javascript:;" onclick="delRecycleBin(\'' + rdata.dirs[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_del+'</a>\
-						</td>\
-					</tr>';
-				}
-				for(var i=0;i<rdata.files.length;i++){
-					if(rdata.files[i].name.indexOf('BTDB_') != -1){
-						var shortwebname = rdata.files[i].name.replace(/'/,"\\'");
-						var shortpath = rdata.files[i].dname;
-						if(shortwebname.length > 20) shortwebname = shortwebname.substring(0, 20) + "...";
-						if(shortpath.length > 20) shortpath = shortpath.substring(0, 20) + "...";
-						body += '<tr>\
-							<td><span class="ico ico-'+(getExtName(rdata.files[i].name))+'"></span><span class="tname" title="'+rdata.files[i].name+'">'+shortwebname.replace('BTDB_','')+'</span></td>\
-							<td><span title="'+rdata.files[i].dname+'">mysql://'+shortpath.replace('BTDB_','')+'</span></td>\
-							<td>-</td>\
-							<td>'+getLocalTime(rdata.files[i].time)+'</td>\
-							<td style="text-align: right;">\
-								<a class="btlink" href="javascript:;" onclick="reRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_re+'</a>\
-								 | <a class="btlink" href="javascript:;" onclick="delRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_del+'</a>\
-							</td>\
-						</tr>';
-							
-						continue;
-					}
-					var shortwebname = rdata.files[i].name.replace(/'/,"\\'");
-					var shortpath = rdata.files[i].dname;
-					if(shortwebname.length > 20) shortwebname = shortwebname.substring(0, 20) + "...";
-					if(shortpath.length > 20) shortpath = shortpath.substring(0, 20) + "...";
-					body += '<tr>\
-								<td><span class="ico ico-'+(getExtName(rdata.files[i].name))+'"></span><span class="tname" title="'+rdata.files[i].name+'">'+shortwebname+'</span></td>\
-								<td><span title="'+rdata.files[i].dname+'">'+shortpath+'</span></td>\
-								<td>'+toSize(rdata.files[i].size)+'</td>\
-								<td>'+getLocalTime(rdata.files[i].time)+'</td>\
-								<td style="text-align: right;">\
-									<a class="btlink" href="javascript:;" onclick="reRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_re+'</a>\
-									 | <a class="btlink" href="javascript:;" onclick="delRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_del+'</a>\
-								</td>\
-							</tr>'
-				}
-				$("#RecycleBody").html(body);
-				return;
-				break;
-			case 2:
-				for(var i=0;i<rdata.dirs.length;i++){
-					var shortwebname = rdata.dirs[i].name.replace(/'/,"\\'");
-					var shortpath = rdata.dirs[i].dname;
-					if(shortwebname.length > 20) shortwebname = shortwebname.substring(0, 20) + "...";
-					if(shortpath.length > 20) shortpath = shortpath.substring(0, 20) + "...";
-					body += '<tr>\
-						<td><span class=\'ico ico-folder\'></span><span class="tname" title="'+rdata.dirs[i].name+'">'+shortwebname+'</span></td>\
-						<td><span title="'+rdata.dirs[i].dname+'">'+shortpath+'</span></td>\
-						<td>'+toSize(rdata.dirs[i].size)+'</td>\
-						<td>'+getLocalTime(rdata.dirs[i].time)+'</td>\
-						<td style="text-align: right;">\
-							<a class="btlink" href="javascript:;" onclick="reRecycleBin(\'' + rdata.dirs[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_re+'</a>\
-							 | <a class="btlink" href="javascript:;" onclick="delRecycleBin(\'' + rdata.dirs[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_del+'</a>\
-						</td>\
-					</tr>'
-				}
-				$("#RecycleBody").html(body);
-				return;
-				break;
-			case 3:
-				for(var i=0;i<rdata.files.length;i++){
-					if(rdata.files[i].name.indexOf('BTDB_') != -1) continue;
-					var shortwebname = rdata.files[i].name.replace(/'/,"\\'");
-					var shortpath = rdata.files[i].dname;
-					if(shortwebname.length > 20) shortwebname = shortwebname.substring(0, 20) + "...";
-					if(shortpath.length > 20) shortpath = shortpath.substring(0, 20) + "...";
-					body += '<tr>\
-						<td><span class="ico ico-'+(getExtName(rdata.files[i].name))+'"></span><span class="tname" title="'+rdata.files[i].name+'">'+shortwebname+'</span></td>\
-						<td><span title="'+rdata.files[i].dname+'">'+shortpath+'</span></td>\
-						<td>'+toSize(rdata.files[i].size)+'</td>\
-						<td>'+getLocalTime(rdata.files[i].time)+'</td>\
-						<td style="text-align: right;">\
-							<a class="btlink" href="javascript:;" onclick="reRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_re+'</a>\
-							 | <a class="btlink" href="javascript:;" onclick="delRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_del+'</a>\
-						</td>\
-					</tr>';
-				}
-				$("#RecycleBody").html(body);
-				return;
-				break;
-			case 4:
-				for(var i=0;i<rdata.files.length;i++){
-					if(reisImage(getFileName(rdata.files[i].name))){
-						var shortwebname = rdata.files[i].name.replace(/'/,"\\'");
-						var shortpath = rdata.files[i].dname;
-						if(shortwebname.length > 20) shortwebname = shortwebname.substring(0, 20) + "...";
-						if(shortpath.length > 20) shortpath = shortpath.substring(0, 20) + "...";
-						body += '<tr>\
-							<td><span class="ico ico-'+(getExtName(rdata.files[i].name))+'"></span><span class="tname" title="'+rdata.files[i].name+'">'+shortwebname+'</span></td>\
-							<td><span title="'+rdata.files[i].dname+'">'+shortpath+'</span></td>\
-							<td>'+toSize(rdata.files[i].size)+'</td>\
-							<td>'+getLocalTime(rdata.files[i].time)+'</td>\
-							<td style="text-align: right;">\
-								<a class="btlink" href="javascript:;" onclick="reRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_re+'</a>\
-								 | <a class="btlink" href="javascript:;" onclick="delRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_del+'</a>\
-							</td>\
-						</tr>';
-					}
-				}
-				$("#RecycleBody").html(body);
-				return;
-				break;
-			case 5:
-				for(var i=0;i<rdata.files.length;i++){
-					if(rdata.files[i].name.indexOf('BTDB_') != -1) continue;
-					if(!(reisImage(getFileName(rdata.files[i].name)))){
-						var shortwebname = rdata.files[i].name.replace(/'/,"\\'");
-						var shortpath = rdata.files[i].dname;
-						if(shortwebname.length > 20) shortwebname = shortwebname.substring(0, 20) + "...";
-						if(shortpath.length > 20) shortpath = shortpath.substring(0, 20) + "...";
-						body += '<tr>\
-								<td><span class="ico ico-'+(getExtName(rdata.files[i].name))+'"></span><span class="tname" title="'+rdata.files[i].name+'">'+shortwebname+'</span></td>\
-								<td><span title="'+rdata.files[i].dname+'">'+shortpath+'</span></td>\
-								<td>'+toSize(rdata.files[i].size)+'</td>\
-								<td>'+getLocalTime(rdata.files[i].time)+'</td>\
-								<td style="text-align: right;">\
-									<a class="btlink" href="javascript:;" onclick="reRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_re+'</a>\
-									 | <a class="btlink" href="javascript:;" onclick="delRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_del+'</a>\
-								</td>\
-							</tr>'
-					}
-				}
-				$("#RecycleBody").html(body);
-				return;
-		}
-				
-		
-		var tablehtml = '<div class="re-head">\
-				<div style="margin-left: 3px;" class="ss-text">\
-                        <em>文件回收站</em>\
-                        <div class="ssh-item">\
-                                <input class="btswitch btswitch-ios" id="setRecycleBin" type="checkbox" '+(rdata.status?'checked':'')+'>\
-                                <label class="btswitch-btn" for="setRecycleBin" onclick="setRecycleBin()"></label>\
-                        </div>\
-                </div>\
-				<span style="line-height: 32px; margin-left: 30px;">注意：关闭回收站，删除的文件无法恢复！</span>\
-                <button style="float: right" class="btn btn-default btn-sm" onclick="closeRecycleBin();">清空回收站</button>\
-				</div>\
-				<div class="re-con">\
-					<div class="re-con-menu">\
-						<p class="on" onclick="recycleBin(1)">全部</p>\
-						<p onclick="recycleBin(2)">文件夹</p>\
-						<p onclick="recycleBin(3)">文件</p>\
-						<p onclick="recycleBin(4)">图片</p>\
-						<p onclick="recycleBin(5)">文档</p>\
-					</div>\
-					<div class="re-con-con">\
-					<div style="margin: 15px;" class="divtable">\
-					<table width="100%" class="table table-hover">\
-						<thead>\
-							<tr>\
-								<th>文件名</th><th>原位置</th>\
-								<th>大小</th><th width="150">删除时间</th>\
-								<th style="text-align: right;" width="110">操作</th>\
-							</tr>\
-						</thead>\
-					<tbody id="RecycleBody" class="list-list">'+body+'</tbody>\
-			</table></div></div></div>';
-		if(type == 'open'){
-			layer.open({
-				type: 1,
-				shift: 5,
-				closeBtn: 1,
-				area: ['80%','606px'],
-				title: lan.files.recycle_bin_title,
-				content: tablehtml
-			});
-			
-			if(window.location.href.indexOf("database") != -1){
-				recycleBin(6);
-				$(".re-con-menu p:last-child").addClass("on").siblings().removeClass("on");
-			}else{
-				recycleBin(1);
-			}
-		}
-		$(".re-con-menu p").click(function(){
-			$(this).addClass("on").siblings().removeClass("on");
-		})
-	},'json');
-}
-
-//去扩展名不处理
-function getFileName(name){
-	var text = name.split("/");
-	var n = text.length-1;
-	text = text[n];
-	return text;
-}
-
-//判断图片文件
-function reisImage(fileName){
-	var exts = ['jpg','jpeg','png','bmp','gif','tiff','ico'];
-	for(var i=0; i<exts.length; i++){
-		if(fileName == exts[i]) return true
-	}
-	return false;
-}
-
-//从回收站恢复文件
-function reRecycleBin(path,obj){
-	layer.confirm(lan.files.recycle_bin_re_msg,{title:lan.files.recycle_bin_re_title,closeBtn:2,icon:3},function(){
-		var loadT = layer.msg(lan.files.recycle_bin_re_the,{icon:16,time:0,shade: [0.3, '#000']});
-		$.post('/files/re_recycle_bin','path='+encodeURIComponent(path),function(rdata){
-			layer.close(loadT);
-			layer.msg(rdata.msg,{icon:rdata.status?1:5});
-			$(obj).parents('tr').remove();
-		},'json');
-	});
-}
-
-//从回收站删除
-function delRecycleBin(path,obj){
-	layer.confirm(lan.files.recycle_bin_del_msg,{title:lan.files.recycle_bin_del_title,closeBtn:2,icon:3},function(){
-		var loadT = layer.msg(lan.files.recycle_bin_del_the,{icon:16,time:0,shade: [0.3, '#000']});
-		$.post('/files/del_recycle_bin','path='+encodeURIComponent(path),function(rdata){
-			layer.close(loadT);
-			layer.msg(rdata.msg,{icon:rdata.status?1:5});
-			$(obj).parents('tr').remove();
-		},'json');
-	});
-}
-
-//清空回收站
-function closeRecycleBin(){
-	layer.confirm('清空回收站操作会永久删除回收站中的文件，继续吗？',{title:'清空回收站',closeBtn:2,icon:3},function(){
-		var loadT = layer.msg("<div class='myspeed'>正在删除,请稍候...</div>",{icon:16,time:0,shade: [0.3, '#000']});
-		setTimeout(function(){
-			getSpeed('.myspeed');
-		},1000);
-		$.post('/files/close_recycle_bin', '', function(rdata){
-			layer.close(loadT);
-			layer.msg(rdata.msg,{icon:rdata.status?1:5});
-			$("#RecycleBody").html('');
-		},'json');
-	});
-}
-
-
-//回收站开关
-function setRecycleBin(db){
-	var loadT = layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']});
-	var data = {}
-	if(db == 1){
-		data = {db:db};
-	}
-	$.post('/files/recycle_bin',data,function(rdata){
-		layer.close(loadT);
-		layer.msg(rdata.msg,{icon:rdata.status?1:5});
-	},'json');
-}
-
-function openFilename(obj){
-	var path = $(obj).attr('data-path');
-	var ext = getSuffixName(path);
-
-	// console.log(path,ext);
-	if (inArray(ext,['html','htm','php','txt','md','js','css','scss','json','c','h','pl','py','java','log','conf','sh','json','ini'])){
-		onlineEditFile(0, path);
-	}
-
-	if (inArray(ext,['png','jpeg','jpg','gif','webp','bmp','ico'])){
-        getImage(path);
-	}
-
-	if (inArray(ext,['svg'])){
-		var url = '/files/download?filename='+path;
-		layer.open({
-			type:1,
-			closeBtn: 1,
-			title:"SVG预览",
-			area: ['600px','500px'],
-			maxmin:true,
-			shadeClose: true,
-			content: '<iframe width="100%" height="100%"\
-                src="'+url+'"\
-                frameborder="0"\
-                border="0"\
-                marginwidth="0"\
-                marginheight="0"\
-                scrolling="yes"\
-                noresize=""\
-                allowfullscreen="allowfullscreen"\
-                mozallowfullscreen="mozallowfullscreen"\
-                msallowfullscreen="msallowfullscreen"\
-                oallowfullscreen="oallowfullscreen"\
-                webkitallowfullscreen="webkitallowfullscreen"\
-                allowfullscreen="true"></iframe>'
-		});
-	}
-}
-
-function searchFile(p){
-	getFiles(p);
-}
-
-//处理排序
-function listFileOrder(skey, obj){
-	var or = getCookie('file_order');
-	var orderType = 'desc';
-	if(or){
-		var or_arr = or.split('|');
-		if(or.split('|')[1] == 'desc'){
-			orderType = 'asc';
-		} else if (or_arr[1] == 'asc'){
-			orderType = 'none';
-		} else {
-			orderType = 'desc';
-		}
-	}
-	setCookie('file_order',skey + '|' + orderType);
-	getFiles(1);
-	// console.log(obj,orderType);
-	// if(orderType == 'desc'){
-	// 	$(obj).find(".glyphicon-triangle-top").remove();
-	// 	$(obj).append("<span class='glyphicon glyphicon-triangle-bottom' style='margin-left:5px;color:#bbb'></span>");
-	// } else {
-	// 	$(obj).find(".glyphicon-triangle-bottom").remove();
-	// 	$(obj).append("<span class='glyphicon glyphicon-triangle-top' style='margin-left:5px;color:#bbb'></span>");
-	// }
-}
-
-function makeFilePage(showRow, page = ''){
-	var rows = ['10','50','100','200','500','1000','2000'];
-	var rowOption = '';
-	for(var i=0;i<rows.length;i++){
-		var rowSelected = '';
-		if(showRow == rows[i]) rowSelected = 'selected';
-		rowOption += '<option value="'+rows[i]+'" '+rowSelected+'>'+rows[i]+'</option>';
-	}
-	
-	//分页
-	$("#filePage").html(page);
-	$("#filePage div").append("<span class='Pcount-item'>每页<select name='file_page' style='margin-left: 3px;margin-right: 3px;border:#ddd 1px solid;' class='showRow'>"+rowOption+"</select>条</span>");
-	$("#filePage .Pcount").css("left","16px"); 
-}
-
-//取数据
-function getFiles(Path) {
-	if(isNaN(Path)){
-		var p = 1;
-	} else {
-		var p = Path;
-		Path = getCookie('open_dir_path');
-	}
-
-	var args = {};
-	args['p'] = p;
-	var post = {};
-	post['path'] = Path;
-
-	var file_row = $.cookie('file_row');
-	if(!file_row) {
-		file_row = '100';
-	}
-	args['row'] = file_row;
-
-	var body = '';
-	var totalSize = 0;
-
-	var search = '';
-	var search_file = $("#search_file").val();
-
-	if(search_file.length > 0){
-		args['search'] = search_file;
-	}
-
-	var search_all = '';
-	var all = $('#search_all').hasClass('active');
-	if(all){
-		args['all'] = 'yes';
-	}
-
-	var file_order = $.cookie('file_order');
-	if (file_order){
-		post['order'] = file_order.replace('|',' ');
-	}
-
-	var query_str = toUrlParam(args);
-
-	var loadT = layer.load();
-	$.post('/files/get_dir?' + query_str, post, function(rdata) {
-		layer.close(loadT);
-		
-		//构建分页
-		makeFilePage(file_row,rdata.PAGE);
-
-		if(rdata.DIR == null) {
-			rdata.DIR = [];
-		}
-
-		for (var i = 0; i < rdata.DIR.length; i++) {
-
-			var fmp = rdata.DIR[i].split(";");
-			var cnametext =fmp[0] + fmp[5];
-
-			fmp[0] = fmp[0].replace(/'/, "\\'");
-			if(cnametext.length>20){
-				cnametext = cnametext.substring(0,20) + '...';
-			}
-
-			if(isChineseChar(cnametext)){
-				if(cnametext.length>10){
-					cnametext = cnametext.substring(0,10) + '...';
-				}
-			}
-
-			var timetext ='--';
-			if(getCookie('rank') == 'a'){
-				//列表展示
-				$("#set_list").addClass("active");
-				$("#set_icon").removeClass("active");
-				body += "<tr class='folderBoxTr' data-path='" + rdata.PATH + "/" + fmp[0] + "' filetype='dir'>\
-					<td><input type='checkbox' name='id' value='"+fmp[0]+"'></td>\
-					<td class='column-name'><span class='cursor' onclick=\"getFiles('" + rdata.PATH + "/" + fmp[0] + "')\">\
-					<span class='ico ico-folder'></span><a class='text' title='" + fmp[0] + fmp[5] + "'>" + cnametext + "</a></span></td>\
-					<td>"+toSize(fmp[1])+"</td>\
-					<td>"+getLocalTime(fmp[2])+"</td>\
-					<td>"+fmp[3]+"</td>\
-					<td>"+fmp[4]+"</td>\
-					<td class='editmenu'><span>\
-						<a class='btlink' href='javascript:;' onclick=\"copyFile('" + rdata.PATH +"/"+ fmp[0] + "')\">复制</a> | \
-						<a class='btlink' href='javascript:;' onclick=\"cutFile('" + rdata.PATH +"/"+ fmp[0]+ "')\">剪切</a> | \
-						<a class='btlink' href='javascript:;' onclick=\"reName(0,'" + fmp[0] + "');\">重命名</a> | \
-						<a class='btlink' href='javascript:;' onclick=\"setChmod(0,'" + rdata.PATH + "/"+fmp[0] + "');\">权限</a> | \
-						<a class='btlink' href='javascript:;' onclick=\"zip('" + rdata.PATH +"/" +fmp[0] + "');\">压缩</a> | \
-						<a class='btlink' href='javascript:;' onclick=\"deleteDir('" + rdata.PATH +"/"+ fmp[0] + "')\">删除</a></span>\
-					</td>\
-				</tr>";
-			} else {
-				//图标展示
-				$("#set_icon").addClass("active");
-				$("#set_list").removeClass("active");
-				body += "<div class='file folderBox menufolder' data-path='" + rdata.PATH + "/" + fmp[0] + "' filetype='dir' title='"+lan.files.file_name+"：" + fmp[0]+"&#13;"+lan.files.file_size+"：" 
-						+ toSize(fmp[1])+"&#13;"+lan.files.file_etime+"："+getLocalTime(fmp[2])+"&#13;"+lan.files.file_auth+"："+fmp[3]+"&#13;"+lan.files.file_own+"："+fmp[4]+"'>\
-						<input type='checkbox' name='id' value='"+fmp[0]+"'>\
-						<div class='ico ico-folder' ondblclick=\"getFiles('" + rdata.PATH + "/" + fmp[0] + "')\"></div>\
-						<div class='titleBox' onclick=\"getFiles('" + rdata.PATH + "/" + fmp[0] + "')\">\
-							<span class='tname'>" + fmp[0] + "</span>\
-						</div>\
-					</div>";
-			}
-		}
-
-		for (var i = 0; i < rdata.FILES.length; i++) {
-			if(rdata.FILES[i] == null) continue;
-			var fmp = rdata.FILES[i].split(";");
-			var bodyZip = '';
-			var download = '';
-			var cnametext =fmp[0] + fmp[5];
-			fmp[0] = fmp[0].replace(/'/,"\\'");
-
-			if(isChineseChar(cnametext)){
-				if(cnametext.length>16){
-					cnametext = cnametext.substring(0,16) + '...';
-				}
-			} else{
-				if( cnametext.length > 48 ){
-					cnametext = cnametext.substring(0,48) + '...';
-				}
-			}
-
-			var displayCompress = 1;
-			if(isCompressFile(fmp[0])){
-				bodyZip = "<a class='btlink' href='javascript:;' onclick=\"unCompressFile('" + rdata.PATH +"/" +fmp[0] + "')\">解压</a> | ";
-			}
-			
-			if(isText(fmp[0])){
-				bodyZip = "<a class='btlink' href='javascript:;' onclick=\"onlineEditFile(0,'" + rdata.PATH +"/"+ fmp[0] + "')\">编辑</a> | ";
-			}
-
-			if(isImage(fmp[0])){
-				download = "<a class='btlink' href='javascript:;' onclick=\"getImage('" + rdata.PATH +"/"+ fmp[0] + "')\">预览</a> | ";
-			} else {
-				download = "<a class='btlink' href='javascript:;' onclick=\"getFileBytes('" + rdata.PATH +"/"+ fmp[0] + "',"+fmp[1]+")\">下载</a> | ";
-			}
-			
-			totalSize +=  parseInt(fmp[1]);
-			if(getCookie("rank")=="a"){
-				body += "<tr style='cursor:pointer;' class='folderBoxTr' data-path='" + rdata.PATH +"/"+ fmp[0] + "' filetype='" + fmp[0] + "' ondblclick='openFilename(this)'>\
-					<td><input type='checkbox' name='id' value='"+fmp[0]+"'></td>\
-					<td class='column-name'><span class='ico ico-"+(getExtName(fmp[0]))+"'></span><a class='text' title='" + fmp[0] + fmp[5] + "'>" + cnametext + "</a></td>\
-					<td>" + (toSize(fmp[1])) + "</td>\
-					<td>" + ((fmp[2].length > 11)?fmp[2]:getLocalTime(fmp[2])) + "</td>\
-					<td>"+fmp[3]+"</td>\
-					<td>"+fmp[4]+"</td>\
-					<td class='editmenu'>\
-					<span><a class='btlink' href='javascript:;' onclick=\"copyFile('" + rdata.PATH +"/"+ fmp[0] + "')\">复制</a> | \
-					<a class='btlink' href='javascript:;' onclick=\"cutFile('" + rdata.PATH +"/"+ fmp[0] + "')\">剪切</a> | \
-					<a class='btlink' href='javascript:;' onclick=\"reName(0,'" + fmp[0] + "')\">重命名</a> | \
-					<a class='btlink' href=\"javascript:setChmod(0,'" + rdata.PATH +"/"+ fmp[0] + "');\">权限</a> | \
-					<a class='btlink' href=\"javascript:zip('" + rdata.PATH +"/" +fmp[0] + "');\">压缩</a> | "
-					+ bodyZip
-					+ download
-					+ "<a class='btlink' href='javascript:;' onclick=\"deleteFile('" + rdata.PATH +"/"+ fmp[0] + "')\">删除</a>\
-					</span></td>\
-				</tr>";
-			}
-			else{
-				body += "<div class='file folderBox menufile' data-path='" + rdata.PATH +"/"+ fmp[0] + "' filetype='"+fmp[0]+"' title='文件名：" + fmp[0]+"&#13;大小："
-					+ toSize(fmp[1])+"&#13;修改时间："+getLocalTime(fmp[2])+"&#13;权限："+fmp[3]+"&#13;所有者："+fmp[4]+"' >\
-					<input type='checkbox' name='id' value='"+fmp[0]+"' />\
-					<div data-path='" + rdata.PATH +"/"+ fmp[0] + "' filetype='"+fmp[0]+"' class='ico ico-"+(getExtName(fmp[0]))+"' ondblclick='javascript;openFilename(this);'></div>\
-					<div class='titleBox'>\
-						<span class='tname'>" + fmp[0] + "</span>\
-					</div>\
-				</div>";
-			}
-		}
-		var dirInfo = '(共{1}个目录与{2}个文件,大小:'.replace('{1}',rdata.DIR.length+'').replace('{2}',rdata.FILES.length+'')+'<font id="pathSize">'
-			+ (toSize(totalSize))+'<a class="btlink ml5" onClick="getPathSize()">获取</a></font>)';
-		$("#dir_info").html(dirInfo);
-		if( getCookie('rank') == 'a' ){
-
-			// console.log(post['order']);
-			var size_icon = '<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb">';
-			if (post['order'] == 'size desc'){
-				size_icon = '<span class="glyphicon glyphicon-triangle-bottom" style="margin-left:5px;color:#bbb">';
-			} else if (post['order'] == 'size asc'){
-				size_icon = '<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb">';
-			} else {
-				size_icon = '<span class="glyphicon glyphicon-option-horizontal" style="top:3px;margin-left:5px;color:#bbb">';
-			}
-
-			var mtime_icon = '<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb">';
-			if (post['order'] == 'mtime desc'){
-				mtime_icon = '<span class="glyphicon glyphicon-triangle-bottom" style="margin-left:5px;color:#bbb">';
-			} else if (post['order'] == 'mtime asc'){
-				mtime_icon = '<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb">';
-			} else {
-				mtime_icon = '<span class="glyphicon glyphicon-option-horizontal" style="top:3px;margin-left:5px;color:#bbb">';
-			}
-
-			var fname_icon = '<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb">';
-			if (post['order'] == 'fname desc'){
-				fname_icon = '<span class="glyphicon glyphicon-triangle-bottom" style="margin-left:5px;color:#bbb">';
-			} else if (post['order'] == 'fname asc'){
-				fname_icon = '<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb">';
-			} else {
-				fname_icon = '<span class="glyphicon glyphicon-option-horizontal" style="top:3px;margin-left:5px;color:#bbb">';
-			}
-
-			var tablehtml = '<table width="100%" border="0" cellpadding="0" cellspacing="0" class="table table-hover">\
-				<thead>\
-					<tr>\
-						<th width="30"><input type="checkbox" id="setBox" placeholder=""></th>\
-						<th onclick="listFileOrder(\'fname\',this)" style="cursor: pointer;">文件名'+fname_icon+'</th>\
-						<th onclick="listFileOrder(\'size\',this)" style="cursor: pointer;">大小'+size_icon+'</th>\
-						<th onclick="listFileOrder(\'mtime\',this)" style="cursor: pointer;">修改时间'+mtime_icon+'</th>\
-						<th>权限</th>\
-						<th>所有者</th>\
-						<th style="text-align: right;" width="330">操作</th>\
-					</tr>\
-				</thead>\
-				<tbody id="filesBody" class="list-list">'+body+'</tbody>\
-			</table>';
-			$("#fileCon").removeClass("fileList").html(tablehtml);
-			$("#tipTools").width($("#fileCon").width());
-		} else {
-			$("#fileCon").addClass("fileList").html(body);
-			$("#tipTools").width($("#fileCon").width());
-		}
-		$("#DirPathPlace input").val(rdata.PATH);
-		var BarTools = '<div class="btn-group">\
-			<button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">\
-				新建<span class="caret"></span>\
-			</button>\
-			<ul class="dropdown-menu">\
-				<li><a href="javascript:createFile(0,\'' + Path + '\');">新建空白文件</a></li>\
-				<li><a href="javascript:createDir(0,\'' + Path + '\');">新建目录</a></li>\
-			</ul>\
-		</div>';
-		if (rdata.PATH != '/') {
-			BarTools += ' <button onclick="javascript:backDir();" class="btn btn-default btn-sm glyphicon glyphicon-arrow-left" title="返回上一级"></button>';
-		}
-		setCookie('open_dir_path',rdata.PATH);
-		BarTools += ' <button onclick="javascript:getFiles(\'' + rdata.PATH + '\');" class="btn btn-default btn-sm glyphicon glyphicon-refresh" title="刷新"></button>\
-			<button onclick="webShell()" title="终端" type="button" class="btn btn-default btn-sm"><em class="ico-cmd"></em></button>';
-		var copyName = getCookie('copyFileName');
-		var cutName = getCookie('cutFileName');
-		var isPaste = (copyName == 'null') ? cutName : copyName;
-		// console.log('isPaste:',isPaste);
-		//---
-		if (isPaste != 'null' && isPaste != undefined) {
-			BarTools += ' <button onclick="javascript:pasteFile(\'' + (getFileName(isPaste)) + '\');" class="btn btn-Warning btn-sm">粘贴</button>';
-		}
-		
-		$("#Batch").html('');
-		var batchTools = '';
-		var isBatch = getCookie('BatchSelected');
-		if (isBatch == 1 || isBatch == '1') {
-			batchTools += ' <button onclick="javascript:batchPaste();" class="btn btn-default btn-sm">粘贴所有</button>';
-		}
-		$("#Batch").html(batchTools);
-
-		$("#setBox").prop("checked", false);
-		
-		$("#BarTools").html(BarTools);
-		
-		$("input[name=id]").click(function(){
-			if($(this).prop("checked")) {
-				$(this).prop("checked", true);
-				$(this).parents("tr").addClass("ui-selected");
-			}
-			else{
-				$(this).prop("checked", false);
-				$(this).parents("tr").removeClass("ui-selected");
-			}
-			showSeclect();
-		});
-
-		$("#setBox").click(function() {
-			if ($(this).prop("checked")) {
-				$("input[name=id]").prop("checked", true);
-				$("#filesBody > tr").addClass("ui-selected");
-				
-			} else {
-				$("input[name=id]").prop("checked", false);
-				$("#filesBody > tr").removeClass("ui-selected");
-			}
-			showSeclect();
-		});
-		//阻止冒泡
-		$("#filesBody .btlink").click(function(e){
-			e.stopPropagation();
-		});
-		$("input[name=id]").dblclick(function(e){
-			e.stopPropagation();
-		});
-
-
-		//禁用右键
-		$("#fileCon").bind("contextmenu",function(e){
-			return false;
-		});
-		bindselect();
-
-		// //绑定右键
-		$("#fileCon").mousedown(function(e){
-			var count = totalFile();
-			if(e.which == 3) {
-				if(count>1){
-					rightMenuClickAll(e);
-				} else {
-					return;
-				}
-			}
-		});
-
-		$(".folderBox,.folderBoxTr").mousedown(function(e){
-			// console.log(e);
-			var count = totalFile();
-			if(e.which == 3) {
-				if(count <= 1){
-					var a = $(this);
-					var option = rightMenuClick(a.attr("filetype"),a.attr("data-path"),a.find("input").val());
-					a.contextify(option);
-				} else{
-					rightMenuClickAll(e);
-				}
-			}
-		});
-		
-		//每页行数
-		$(".showRow").change(function(){
-			setCookie('file_row',$(this).val());
-			getFiles(p);
-		});
-		pathPlaceBtn(rdata.PATH);
-	},'json');
-	// setTimeout(function(){getCookie('open_dir_path');},200);
-}
-
-
-//统计选择数量
-function totalFile(){
-	var el = $("input[name='id']");
-	var len = el.length;
-	var count = 0;
-	for(var i=0;i<len;i++){
-		if(el[i].checked == true){
-			count++;
-		}
-	}
-	return count;
-}
-//绑定操作
-function bindselect(){
-	$("#filesBody,#fileCon").selectable({
-		autoRefresh: false,
-		filter:"tr,.folderBox",
-		cancel: "a,span,input,.ico-folder",
-		selecting:function(e){
-			$(".ui-selecting").find("input").prop("checked", true);
-			showSeclect();
-		},
-		selected:function(e){
-			$(".ui-selectee").find("input").prop("checked", false);
-			$(".ui-selected", this).each(function() {
-				$(this).find("input").prop("checked", true);
-				showSeclect();
-			});
-		},
-		unselecting:function(e){
-			$(".ui-selectee").find("input").prop("checked", false);
-			$(".ui-selecting").find("input").prop("checked", true);
-			showSeclect();
-			$("#rmenu").hide()
-		}
-	});
-	$("#filesBody,#fileCon").selectable("refresh");
-	//重绑图标点击事件
-	$(".ico-folder").click(function(){
-		$(this).parent().addClass("ui-selected").siblings().removeClass("ui-selected");
-		$(".ui-selectee").find("input").prop("checked", false);
-		$(this).prev("input").prop("checked", true);
-		showSeclect();
-	})
-}
-//选择操作
-function showSeclect(){
-	var count = totalFile();
-	var batchTools = '';
-	if(count > 1){
-		batchTools = '<button onclick="javascript:batch(1);" class="btn btn-default btn-sm">复制</button>\
-		  <button onclick="javascript:batch(2);" class="btn btn-default btn-sm">剪切</button>\
-		  <button onclick="javascript:batch(3);" class="btn btn-default btn-sm">权限</button>\
-		  <button onclick="javascript:batch(5);" class="btn btn-default btn-sm">压缩</button>\
-		  <button onclick="javascript:batch(4);" class="btn btn-default btn-sm">删除</button>';
-	}else{
-		//setCookie('BatchSelected', null);
-	}
-	$("#Batch").html(batchTools);
-}
-
-//滚动条事件
-$(window).scroll(function () {
-	if($(window).scrollTop() > 16){
-		$("#tipTools").css({"position":"fixed","top":"0","left":"195px","box-shadow":"0 1px 10px 3px #ccc"});
-	}else{
-		$("#tipTools").css({"position":"absolute","top":"0","left":"0","box-shadow":"none"});
-	}
-});
-$("#tipTools").width($(".file-box").width());
-$("#PathPlaceBtn").width($(".file-box").width()-700);
-$("#DirPathPlace input").width($(".file-box").width()-700);
-if($(window).width()<1160){
-	$("#PathPlaceBtn").width(290);
-}
-window.onresize = function(){
-	$("#tipTools").width($(".file-box").width()-30);
-	$("#PathPlaceBtn").width($(".file-box").width()-700);
-	$("#DirPathPlace input").width($(".file-box").width()-700);
-	if($(window).width()<1160){
-		$("#PathPlaceBtn,#DirPathPlace input").width(290);
-	}
-	pathLeft();
-	isDiskWidth();
-}
-
-//批量操作
-function batch(type,access){
-	var path = $("#DirPathPlace input").val();
-	var el = document.getElementsByTagName('input');
-	var len = el.length;
-	var data='path='+path+'&type='+type;
-	var name = 'data';
-	var datas = [];
-	
-	var oldType = getCookie('BatchPaste');
-
-	for(var i=0;i<len;i++){
-		if(el[i].checked == true && el[i].value != 'on'){
-			datas.push(el[i].value)
-		}
-	}
-	data += "&data=" + encodeURIComponent(JSON.stringify(datas))
-	
-	if(type == 3 && access == undefined){
-		setChmod(0,lan.files.all);
-		return;
-	}
-	
-	if(type < 3) setCookie('BatchSelected', '1');
-	setCookie('BatchPaste',type);
-	
-	if(access == 1){
-		var access = $("#access").val();
-		var chown = $("#chown").val();
-		data += '&access='+access+'&user='+chown;
-		layer.closeAll();
-	}
-	if(type == 4){
-		allDeleteFileSub(data,path);
-		setCookie('BatchPaste',oldType);
-		return;
-	}
-	
-	if(type == 5){
-		var names = '';
-		for(var i=0;i<len;i++){
-			if(el[i].checked == true && el[i].value != 'on'){
-				names += el[i].value + ',';
-			}
-		}
-		zip(names);
-		return;
-	}
-		
-	myloadT = layer.msg("<div class='myspeed'>正在处理,请稍候...</div>",{icon:16,time:0,shade: [0.3, '#000']});
-	setTimeout(function(){getSpeed('.myspeed');},1000);
-	// console.log(data);
-	$.post('/files/set_batch_data',data,function(rdata){
-		layer.close(myloadT);
-		getFiles(path);
-		layer.msg(rdata.msg,{icon:1});
-	},'json');
-}
-
-//批量粘贴
-function batchPaste(){
-	var path = $("#DirPathPlace input").val();
-	var type = getCookie('BatchPaste');
-	var data = 'type='+type+'&path='+path;
-
-	$.post('/files/check_exists_files',{dfile:path},function(rdata){
-		var result = rdata['data'];
-		if(result.length > 0){
-			var tbody = '';
-			for(var i=0;i<result.length;i++){
-				tbody += '<tr><td>'+result[i].filename+'</td><td>'+toSize(result[i].size)+'</td><td>'+getLocalTime(result[i].mtime)+'</td></tr>';
-			}
-			var mbody = '<div class="divtable"><table class="table table-hover" width="100%" border="0" cellpadding="0" cellspacing="0"><thead><th>文件名</th><th>大小</th><th>最后修改时间</th></thead>\
-						<tbody>'+tbody+'</tbody>\
-						</table></div>';
-			safeMessage('即将覆盖以下文件',mbody,function(){
-				batchPasteTo(data,path);
-			});
-			$(".layui-layer-page").css("width","500px");
-		}else{
-			batchPasteTo(data,path);
-		}
-	},'json');
-}
-	
-function batchPasteTo(data,path){
-	myloadT = layer.msg("<div class='myspeed'>正在处理,请稍候...</div>",{icon:16,time:0,shade: [0.3, '#000']});
-	setTimeout(function(){getSpeed('.myspeed');},1000);
-	$.post('/files/batch_paste',data,function(rdata){
-		layer.close(myloadT);
-		setCookie('BatchSelected', null);
-		getFiles(path);
-		layer.msg(rdata.msg,{icon:1});
-	},'json');
-}
-
-
-function getSuffixName(fileName){
-	var extArr = fileName.split(".");	
-	var exts = ['folder-unempty','sql','c','cpp','cs','flv','css','js',
-	'htm','html','java','log','mht','url','xml','ai','bmp','cdr','gif','ico',
-	'jpeg','jpg','JPG','png','psd','webp','ape','avi','mkv','mov','mp3','mp4',
-	'mpeg','mpg','rm','rmvb','swf','wav','webm','wma','wmv','rtf','docx','fdf','potm',
-	'pptx','txt','xlsb','xlsx','7z','cab','iso','rar','zip','gz','bt','file','apk','bookfolder',
-	'folder','folder-empty','fromchromefolder','documentfolder','fromphonefolder',
-	'mix','musicfolder','picturefolder','videofolder','sefolder','access','mdb','accdb',
-	'fla','doc','docm','dotx','dotm','dot','pdf',
-	'ppt','pptm','pot','xls','csv','xlsm','scss','svg','pl','py','php','md','json','sh','conf'];
-	var extLastName = extArr[extArr.length - 1];
-	for(var i=0; i<exts.length; i++){
-		if(exts[i]==extLastName){
-			return exts[i];
-		}
-	}
-	return 'file';
-}
-
-//取扩展名
-function getExtName(fileName){
-	var extArr = fileName.split(".");	
-	var exts = ['folder','folder-unempty','sql','c','cpp','cs','flv','css','js',
-	'htm','html','java','log','mht','php','url','xml','ai','bmp','cdr','gif','ico',
-	'jpeg','jpg','JPG','png','psd','webp','ape','avi','flv','mkv','mov','mp3','mp4',
-	'mpeg','mpg','rm','rmvb','swf','wav','webm','wma','wmv','rtf','docx','fdf','potm',
-	'pptx','txt','xlsb','xlsx','7z','cab','iso','rar','zip','gz','bt','file','apk','bookfolder',
-	'folder-empty','fromchromefolder','documentfolder','fromphonefolder',
-	'mix','musicfolder','picturefolder','videofolder','sefolder','access','mdb','accdb',
-	'fla','flv','doc','docm','dotx','dotm','dot','pdf','ppt','pptm','pot','xls','csv','xlsm'];
-	var extLastName = extArr[extArr.length - 1];
-	for(var i=0; i<exts.length; i++){
-		if(exts[i]==extLastName){
-			return exts[i];
-		}
-	}
-	return 'file';
-}
-
-//操作显示
-function ShowEditMenu(){
-	$("#filesBody > tr").hover(function(){
-		$(this).addClass("hover");
-	},function(){
-		$(this).removeClass("hover");
-	}).click(function(){
-		$(this).addClass("on").siblings().removeClass("on");
-	});
-}
-
-//取磁盘
-function getDisk() {
-	var LBody = '';
-	$.get('/system/disk_info', function(rdata) {
-		for (var i = 0; i < rdata.length; i++) {
-			LBody += "<span onclick=\"getFiles('" + rdata[i].path + "')\">\
-				<span class='glyphicon glyphicon-hdd'></span>&nbsp;" + (rdata[i].path=='/'?lan.files.path_root:rdata[i].path) + "(" + rdata[i].size[2] + ")</span>";
-		}
-		var trash = '<span id="recycle_bin" onclick="recycleBin(\'open\')" title="回收站" style="position: absolute; border-color: #ccc; right: 77px;">\
-			<span class="glyphicon glyphicon-trash"></span>&nbsp;回收站</span>';
-		$("#comlist").html(LBody+trash);
-		isDiskWidth();
-	},'json');
-}
-
-//返回上一级
-function backDir() {
-	var str = $("#DirPathPlace input").val().replace('//','/');
-	if(str.substr(str.length-1,1) == '/'){
-			str = str.substr(0,str.length-1);
-	}
-	var Path = str.split("/");
-	var back = '/';
-	if (Path.length > 2) {
-		var count = Path.length - 1;
-		for (var i = 0; i < count; i++) {
-			back += Path[i] + '/';
-		}
-		if(back.substr(back.length-1,1) == '/'){
-			back = back.substr(0,back.length-1);
-		}
-		getFiles(back);
-	} else {
-		back += Path[0];
-		getFiles(back);
-	}
-	setTimeout('pathPlaceBtn(getCookie("open_dir_path"));',200);
-}
-//新建文件
-function createFile(type, path) {
-	if (type == 1) {
-		var fileName = $("#newFileName").val();
-		layer.msg(lan.public.the, {
-			icon: 16,
-			time: 10000
-		});
-		$.post('/files/create_file', 'path=' + encodeURIComponent(path + '/' + fileName), function(rdata) {
-			layer.closeAll();
-			layer.msg(rdata.msg, {
-				icon: rdata.status ? 1 : 2
-			});
-			if(rdata.status){
-				getFiles($("#DirPathPlace input").val());
-				onlineEditFile(0,path + '/' + fileName);
-			}
-		},'json');
-		return;
-	}
-	layer.open({
-		type: 1,
-		shift: 5,
-		closeBtn: 1,
-		area: '320px', 
-		title: '新建空白文件',
-		content: '<div class="bt-form pd20 pb70">\
-					<div class="line">\
-					<input type="text" class="bt-input-text" name="Name" id="newFileName" value="" placeholder="文件名" style="width:100%" />\
-					</div>\
-					<div class="bt-form-submit-btn">\
-					<button type="button" class="btn btn-danger btn-sm" onclick="layer.closeAll()">关闭</button>\
-					<button id="createFileBtn" type="button" class="btn btn-success btn-sm" onclick="createFile(1,\'' + path + '\')">新建</button>\
-					</div>\
-				</div>',
-		success:function(){
-			$("#newFileName").focus().keyup(function(e){
-				if(e.keyCode == 13) $("#createFileBtn").click();
-			});
-		}
-	});
-	
-}
-//新建目录
-function createDir(type, path) {
-	if (type == 1) {
-		var dirName = $("#newDirName").val();
-		layer.msg('正在处理,请稍候...', {
-			icon: 16,
-			time: 10000
-		});
-		$.post('/files/create_dir', 'path=' + encodeURIComponent(path + '/' + dirName), function(rdata) {
-			layer.closeAll();
-			layer.msg(rdata.msg, {
-				icon: rdata.status ? 1 : 2
-			});
-			getFiles($("#DirPathPlace input").val());
-		},'json');
-		return;
-	}
-	layer.open({
-		type: 1,
-		shift: 5,
-		closeBtn: 1,
-		area: '320px',
-		title: '新建目录',
-		content: '<div class="bt-form pd20 pb70">\
-					<div class="line">\
-					<input type="text" class="bt-input-text" name="Name" id="newDirName" value="" placeholder="目录名称" style="width:100%" />\
-					</div>\
-					<div class="bt-form-submit-btn">\
-					<button type="button" class="btn btn-danger btn-sm btn-title" onclick="layer.closeAll()">关闭</button>\
-					<button type="button" id="createDirBtn" class="btn btn-success btn-sm btn-title" onclick="createDir(1,\'' + path + '\')">新建</button>\
-					</div>\
-				</div>',
-		success:function(){
-			$("#newDirName").focus().keyup(function(e){
-				if(e.keyCode == 13) $("#createDirBtn").click();
-			});
-		}
-	});
-	
-}
-
-//删除文件
-function deleteFile(fileName){
-	layer.confirm(lan.get('recycle_bin_confirm',[fileName]),{title:'删除文件',closeBtn:2,icon:3},function(){
-		layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']});
-		$.post('/files/delete', 'path=' + encodeURIComponent(fileName), function(rdata) {
-			layer.closeAll();
-			layer.msg(rdata.msg, {
-				icon: rdata.status ? 1 : 2,
-			});
-			getFiles($("#DirPathPlace input").val());
-		},'json');
-	});
-}
-
-//删除目录
-function deleteDir(dirName){
-	layer.confirm(lan.get('recycle_bin_confirm_dir',[dirName]),{title:'删除目录',closeBtn:2,icon:3},function(){
-		layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']});
-		$.post('/files/delete_dir', 'path=' + encodeURIComponent(dirName), function(rdata) {
-			layer.closeAll();
-			layer.msg(rdata.msg, {
-				icon: rdata.status ? 1 : 2
-			});
-			getFiles($("#DirPathPlace input").val());
-		},'json');
-	});
-}
-//批量删除文件
-function allDeleteFileSub(data,path){
-	layer.confirm('您确实要把这些文件放入回收站吗?',{title:'批量删除文件',closeBtn:2,icon:3},function(){
-		layer.msg("<div class='myspeed'>正在处理,请稍候...</div>",{icon:16,time:0,shade: [0.3, '#000']});
-		setTimeout(function(){getSpeed('.myspeed');},1000);
-		$.post('/files/set_batch_data',data,function(rdata){
-			layer.closeAll();
-			getFiles(path);
-			layer.msg(rdata.msg,{icon:1});
-		},'json');
-	});
-}
-
-//重载文件列表
-function reloadFiles(){
-	setInterval(function(){
-		var path = $("#DirPathPlace input").val();
-		getFiles(path);
-	},3000);
-}
-			
-//下载文件
-function downloadFile(action){
-	
-	if(action == 1){
-		var fUrl = $("#mUrl").val();
-		fUrl = encodeURIComponent(fUrl);
-
-		var fpath = $("#dpath").val();
-		fname = encodeURIComponent($("#dfilename").val());
-
-		if (fUrl == "" ){
-			layer.msg("URL地址不能为空!",{icon:2});
-			return;
-		}
-
-		layer.closeAll();
-		layer.msg(lan.files.down_task,{time:0,icon:16,shade: [0.3, '#000']});
-
-		$.post('/files/download_file','path='+fpath+'&url='+fUrl+'&filename='+fname,function(rdata){
-			layer.closeAll();
-			getFiles(fpath);
-			getTaskCount();
-			layer.msg(rdata.msg,{icon:rdata.status?1:2});
-		},'json');
-		return;
-	}
-
-	var path = $("#DirPathPlace input").val();
-	layer.open({
-		type: 1,
-		shift: 5,
-		closeBtn: 1,
-		area: '500px',
-		btn:["确定","关闭"],
-		title: lan.files.down_title,
-		content: '<form class="bt-form pd20">\
-					<div class="line">\
-						<span class="tname">URL地址:</span>\
-						<input type="text" class="bt-input-text" name="url" id="mUrl" placeholder="URL地址" style="width:330px" />\
-					</div>\
-					<div class="line">\
-						<span class="tname ">下载到:</span>\
-						<input type="text" class="bt-input-text" name="path" id="dpath" value="'+path+'" placeholder="下载到" style="width:330px" />\
-					</div>\
-					<div class="line">\
-						<span class="tname">文件名:</span>\
-						<input type="text" class="bt-input-text" name="filename" id="dfilename" value="" placeholder="文件名" style="width:330px" />\
-					</div>\
-				</form>',
-		success:function(){
-			$("#mUrl").keyup(function(){
-				durl = $(this).val();
-				tmp = durl.split('/');
-				$("#dfilename").val(tmp[tmp.length-1]);
-			});
-		},
-		yes:function(){
-			downloadFile(1);
-		}
-	});
-}
-
-//重命名
-function reName(type, fileName) {
-	if (type == 1) {
-		var path = $("#DirPathPlace input").val();
-		var newFileName = encodeURIComponent(path + '/' + $("#newFileName").val());
-		var oldFileName = encodeURIComponent(path + '/' + fileName);
-		layer.msg(lan.public.the, {
-			icon: 16,
-			time: 10000
-		});
-		$.post('/files/mv_file', 'sfile=' + oldFileName + '&dfile=' + newFileName, function(rdata) {
-			layer.closeAll();
-			layer.msg(rdata.msg, {
-				icon: rdata.status ? 1 : 2
-			});
-			getFiles(path);
-		},'json');
-		return;
-	}
-	layer.open({
-		type: 1,
-		shift: 5,
-		closeBtn: 1,
-		area: '320px', 
-		title: '重命名',
-		btn:["确定","取消"],
-		content: '<div class="bt-form pd20">\
-					<div class="line">\
-					<input type="text" class="bt-input-text" name="Name" id="newFileName" value="' + fileName + '" placeholder="文件名" style="width:100%" />\
-					</div>\
-				</div>',
-		success:function(){
-			$("#newFileName").focus().keyup(function(e){
-				if(e.keyCode == 13) $(".layui-layer-btn0").click();
-			});
-		},
-		yes:function(){
-			reName(1,fileName.replace(/'/,"\\'"));
-		}
-	});
-	
-}
-//剪切
-function cutFile(fileName) {
-	var path = $("#DirPathPlace input").val();
-	setCookie('cutFileName', fileName);
-	setCookie('copyFileName', null);
-	layer.msg('已剪切', {
-		icon: 1,
-		time: 1000,
-	});
-	setTimeout(function(){
-		getFiles(path);
-	},1000);
-}
-//复制
-function copyFile(fileName) {
-	var path = $("#DirPathPlace input").val();
-	setCookie('copyFileName', fileName);
-	setCookie('cutFileName', null);
-	layer.msg('已复制', {
-		icon: 1,
-		time: 1000,
-	});
-
-	setTimeout(function(){
-		getFiles(path);
-	},1000);
-}
-//粘贴
-function pasteFile(fileName) {
-	var path = $("#DirPathPlace input").val();
-	var copyName = getCookie('copyFileName');
-	var cutName = getCookie('cutFileName');
-	var filename = copyName;
-	if(cutName != 'null' && cutName != undefined) filename=cutName;
-	filename = filename.split('/').pop();
-	$.post('/files/check_exists_files',{dfile:path,filename:filename},function(result){
-		if(result.length > 0){
-			var tbody = '';
-			for(var i=0;i<result.length;i++){
-				tbody += '<tr><td>'+result[i].filename+'</td><td>'+toSize(result[i].size)+'</td><td>'+getLocalTime(result[i].mtime)+'</td></tr>';
-			}
-			var mbody = '<div class="divtable"><table class="table table-hover" width="100%" border="0" cellpadding="0" cellspacing="0"><thead><th>文件名</th><th>大小</th><th>最后修改时间</th></thead>\
-						<tbody>'+tbody+'</tbody>\
-						</table></div>';
-			safeMessage('即将覆盖以下文件',mbody,function(){
-				pasteTo(path,copyName,cutName,fileName);
-			});
-		} else {
-			pasteTo(path,copyName,cutName,fileName);
-		}
-	},'json');
-}
-
-
-function pasteTo(path,copyName,cutName,fileName){
-	if (copyName != 'null' && copyName != undefined) {
-		layer.msg(lan.files.copy_the, {
-			icon: 16,
-			time: 0,shade: [0.3, '#000']
-		});
-
-		//同目录下
-		if (copyName == path +'/'+ fileName){
-			fileName = '__copy__'+ fileName;
-		}
-
-		$.post('/files/copy_file', 'sfile=' + encodeURIComponent(copyName) + '&dfile=' + encodeURIComponent(path +'/'+ fileName), function(rdata) {
-			layer.closeAll();
-			layer.msg(rdata.msg, {
-				icon: rdata.status ? 1 : 2
-			});
-			getFiles(path);
-		},'json');
-		setCookie('copyFileName', null);
-		setCookie('cutFileName', null);
-		return;
-	}
-	
-	if (cutName != 'null' && cutName != undefined) {
-		layer.msg(lan.files.mv_the, {
-			icon: 16,
-			time: 0,shade: [0.3, '#000']
-		});
-		$.post('/files/mv_file', 'sfile=' + encodeURIComponent(cutName) + '&dfile=' + encodeURIComponent(path + '/'+fileName), function(rdata) {
-			layer.closeAll();
-			layer.msg(rdata.msg, {icon: rdata.status ? 1 : 2});
-			getFiles(path);
-		},'json');
-		setCookie('copyFileName', null);
-		setCookie('cutFileName', null);
-	}
-}
-
-
-//压缩目录
-function zip(dirName,submits) {
-	var path = $("#DirPathPlace input").val();
-	if(submits != undefined){
-		if(dirName.indexOf(',') == -1){
-			tmp = $("#sfile").val().split('/');
-			sfile = encodeURIComponent(tmp[tmp.length-1]);
-		}else{
-			sfile = encodeURIComponent(dirName);
-		}
-		
-		dfile = encodeURIComponent($("#dfile").val());
-		layer.closeAll();
-		layer.msg(lan.files.zip_the, {icon: 16,time: 0,shade: [0.3, '#000']});
-		$.post('/files/zip', 'sfile=' + sfile + '&dfile=' + dfile + '&type=tar&path='+encodeURIComponent(path), function(rdata) {
-			layer.closeAll();
-			if(rdata == null || rdata == undefined){
-				layer.msg(lan.files.zip_ok,{icon:1});
-				getFiles(path)
-				reloadFiles();
-				return;
-			}
-			layer.msg(rdata.msg, {icon: rdata.status ? 1 : 2});
-			if(rdata.status) getFiles(path);
-		},'json');
-		return
-	}
-	
-	param = dirName;
-	if(dirName.indexOf(',') != -1){
-		tmp = path.split('/');
-		dirName = path + '/' + tmp[tmp.length-1];
-	}
-	
-	layer.open({
-		type: 1,
-		shift: 5,
-		closeBtn: 1,
-		area: '650px',
-		title: lan.files.zip_title,
-		content: '<div class="bt-form pd20 pb70">'
-					+'<div class="line noborder">'
-					+'<input type="text" class="form-control" id="sfile" value="' +param + '" placeholder="" style="display:none" />'
-					+'<span>'+lan.files.zip_to+'</span>\
-						<input type="text" class="bt-input-text" id="dfile" value="'+dirName + '.tar.gz" placeholder="'+lan.files.zip_to+'" style="width: 75%; display: inline-block; margin: 0px 10px 0px 20px;" />\
-						<span class="glyphicon glyphicon-folder-open cursor" onclick="changePath(\'dfile\')"></span>'
-					+'</div>'
-					+'<div class="bt-form-submit-btn">'
-					+'<button type="button" class="btn btn-danger btn-sm btn-title" onclick="layer.closeAll()">'+lan.public.close+'</button>'
-					+'<button type="button" id="ReNameBtn" class="btn btn-success btn-sm btn-title" onclick="zip(\'' + param + '\',1)">'+lan.files.file_menu_zip+'</button>'
-					+'</div>'
-				+'</div>',
-		success:function(){
-			$("#dfile").change(function(){
-				var dfile = $(this).val()
-				tmp = dfile.split('.');
-				if(tmp[tmp.length-1] != 'gz'){
-					var path = $("#DirPathPlace input").val();
-					tmp = path.split('/');
-					dfile += '/' + tmp[tmp.length-1] + '.tar.gz'
-					$(this).val(dfile.replace(/\/\//g,'/'))
-				}
-			});
-		}
-	});
-	
-}
-		
-//解压目录
-function unZip(fileName, type) {
-	var path = $("#DirPathPlace input").val();
-	if(type.length ==3){
-		var sfile = encodeURIComponent($("#sfile").val());
-		var dfile = encodeURIComponent($("#dfile").val());
-		var coding = $("select[name='coding']").val();
-		var tip = layer.msg(lan.files.unzip_the, {icon: 16,time: 0,shade: [0.3, '#000']});
-		$.post('/files/unzip', 'sfile=' + sfile + '&dfile=' + dfile +'&type=' + type + '&path='+encodeURIComponent(path), function(rdata) {
-			layer.close(tip);
-			showMsg(rdata.msg, function(){
-				getFiles(path);
-			},{icon: rdata.status ? 1 : 2},2000);
-		},'json');
-		return;
-	}
-	
-	type = (type == 1) ? 'tar':'zip';
-	var umpass = '';
-	if(type == 'zip'){
-		umpass = '<div class="line">\
-			<span class="tname">'+lan.files.zip_pass_title+'</span>\
-			<input type="text" class="bt-input-text" id="unpass" value="" placeholder="'+lan.files.zip_pass_msg+'" style="width:330px" />\
-		</div>';
-	}
-	layer.open({
-		type: 1,
-		shift: 5,
-		closeBtn: 1,
-		area: '490px',
-		title: '解压文件',
-		content: '<div class="bt-form pd20 pb70">'
-			+'<div class="line unzipdiv">'
-			+'<span class="tname">'+lan.files.unzip_name+'</span><input type="text" class="bt-input-text" id="sfile" value="' +fileName + '" placeholder="'+lan.files.unzip_name_title+'" style="width:330px" /></div>'
-			+'<div class="line"><span class="tname">'+lan.files.unzip_to+'</span><input type="text" class="bt-input-text" id="dfile" value="'+path + '" placeholder="'+lan.files.unzip_to+'" style="width:330px" /></div>' 
-			+ umpass +'<div class="line"><span class="tname">'+lan.files.unzip_coding+'</span><select class="bt-input-text" name="coding">'
-				+'<option value="UTF-8">UTF-8</option>'
-				+'<option value="gb18030">GBK</option>'
-			+'</select>'
-			+'</div>'
-			+'<div class="bt-form-submit-btn">'
-			+'<button type="button" class="btn btn-danger btn-sm btn-title" onclick="layer.closeAll()">'+lan.public.close+'</button>'
-			+'<button type="button" id="ReNameBtn" class="btn btn-success btn-sm btn-title" onclick="unZip(\'' + fileName + '\',\''+type+'\')">'+lan.files.file_menu_unzip+'</button>'
-			+'</div>'
-		+'</div>'
-	});
-}
-
-function isCompressFile(fileName){
-	var ext = fileName.split('.');
-	var extName = ext[ext.length-1].toLowerCase();
-	var support = ['zip','gz','tgz','rar'];
-	for (x in support) {
-	    if (support[x]==extName){
-	    	return true;
-	    }
-	}
-	return false;
-}
-
-function unCompressFile(fileName, type = 0){
-	// 解压文件
-	var path = $("#DirPathPlace input").val();
-	if(type == 3){
-		var sfile = encodeURIComponent($("#sfile").val());
-		var dfile = encodeURIComponent($("#dfile").val());
-		var coding = $("select[name='coding']").val();
-		var tip = layer.msg('正在解压,请稍候...', {icon: 16,time: 0,shade: [0.3, '#000']});
-		$.post('/files/uncompress', 'sfile=' + sfile + '&dfile=' + dfile +'&type=' + type + '&path='+encodeURIComponent(path), function(rdata) {
-			layer.close(tip);
-			showMsg(rdata.msg, function(){
-				layer.closeAll();
-				getFiles(path);
-			},{icon: rdata.status ? 1 : 2},2000);
-		},'json');
-		return;
-	}
-	
-	// var umpass = '<div class="line">\
-	// 		<span class="tname">解压密码</span>\
-	// 		<input type="text" class="bt-input-text" id="unpass" value="" placeholder="不需要请留空" style="width:330px" />\
-	// 	</div>';
-	layer.open({
-		type: 1,
-		shift: 5,
-		closeBtn: 1,
-		area: '490px',
-		title: '解压文件',
-		content: '<div class="bt-form pd20 pb70">\
-			<div class="line unzipdiv">\
-				<span class="tname">文件名</span>\
-				<input type="text" class="bt-input-text" id="sfile" value="' +fileName + '" placeholder="压缩文件名" style="width:330px" />\
-			</div>\
-			<div class="line">\
-				<span class="tname">解压到</span>\
-				<input type="text" class="bt-input-text" id="dfile" value="'+path + '" placeholder="解压到" style="width:330px" />\
-			</div>\
-			<div class="line">\
-				<span class="tname">编码</span>\
-				<select class="bt-input-text" name="coding">\
-					<option value="UTF-8">UTF-8</option>\
-					<option value="gb18030">GBK</option>\
-				</select>\
-			</div>\
-			<div class="bt-form-submit-btn">\
-				<button type="button" class="btn btn-danger btn-sm btn-title" onclick="layer.closeAll()">关闭</button>\
-				<button type="button" id="ReNameBtn" class="btn btn-success btn-sm btn-title" onclick="unCompressFile(\'' + fileName + '\',\'3\')">解压</button>\
-			</div>\
-		</div>'
-	});
-}
-
-//是否压缩文件
-function isZip(fileName){
-	var ext = fileName.split('.');
-	var extName = ext[ext.length-1].toLowerCase();
-	if( extName == 'zip') return 0;
-	if( extName == 'gz' || extName == 'tgz') return 1;
-	return -1;
-}
-
-//是否文本文件
-function isText(fileName){
-	var exts = ['rar','zip','tar.gz','gz','iso','xsl','doc','xdoc','jpeg',
-		'jpg','png','gif','bmp','tiff','exe','so','7z','bz'];
-	return isExts(fileName,exts)?false:true;
-}
-
-//是否图片文件
-function isImage(fileName){
-	var exts = ['jpg','jpeg','png','bmp','gif','tiff','ico'];
-	return isExts(fileName,exts);
-}
-
-//是否为指定扩展名
-function isExts(fileName,exts){
-	var ext = fileName.split('.');
-	if(ext.length < 2) return false;
-	var extName = ext[ext.length-1].toLowerCase();
-	for(var i=0;i<exts.length;i++){
-		if(extName == exts[i]) return true;
-	}
-	return false;
-}
-
-//图片预览
-function getImage(fileName){
-	var imgUrl = '/files/download?filename='+fileName;
-	layer.open({
-		type:1,
-		offset: '150px',
-		closeBtn: 1,
-		title:"图片预览",
-		area: '400px',
-		shadeClose: true,
-		content: '<div class="showpicdiv"><img style="max-width:400px;" src="'+imgUrl+'"></div>'
-	});
-}
-
-//获取文件数据
-function getFileBytes(fileName, fileSize){
-	window.open('/files/download?filename='+encodeURIComponent(fileName));
-}
-
-
-//上传文件
-function uploadFiles(){
-	var path = $("#DirPathPlace input").val()+"/";
-	layer.open({
-		type:1,
-		closeBtn: 1,
-		title:lan.files.up_title,
-		area: ['500px','300px'], 
-		shadeClose:false,
-		content:'<div class="fileUploadDiv">\
-				<input type="hidden" id="input-val" value="'+path+'" />\
-				<input type="file" id="file_input"  multiple="true" autocomplete="off" />\
-				<button type="button"  id="opt" autocomplete="off">添加文件</button>\
-				<button type="button" id="up" autocomplete="off" >开始上传</button>\
-				<span id="totalProgress" style="position: absolute;top: 7px;right: 147px;"></span>\
-				<span style="float:right;margin-top: 9px;">\
-				<font>文件编码:</font>\
-				<select id="fileCodeing" >\
-					<option value="byte">二进制</option>\
-					<option value="utf-8">UTF-8</option>\
-					<option value="gb18030">GB2312</option>\
-				</select>\
-				</span>\
-				<button type="button" id="filesClose" autocomplete="off" onClick="layer.closeAll()" >关闭</button>\
-				<ul id="up_box"></ul>\
-			</div>'
-	});
-	uploadStart();
-}
-
-//设置权限
-function setChmod(action,fileName){
-	if(action == 1){
-		var chmod = $("#access").val();
-		var chown = $("#chown").val();
-		var data = 'filename='+ encodeURIComponent(fileName)+'&user='+chown+'&access='+chmod;
-		var loadT = layer.msg('正在设置...',{icon:16,time:0,shade: [0.3, '#000']});
-		$.post('/files/set_file_access',data,function(rdata){
-			layer.close(loadT);
-			if(rdata.status) layer.closeAll();
-			layer.msg(rdata.msg,{icon:rdata.status?1:2});
-			var path = $("#DirPathPlace input").val();
-			getFiles(path)
-		},'json');
-		return;
-	}
-	
-	var toExec = fileName == lan.files.all?'batch(3,1)':'setChmod(1,\''+fileName+'\')';
-	$.post('/files/file_access','filename='+encodeURIComponent(fileName),function(rdata){
-		// console.log(rdata);
-		var sys_users = rdata.sys_users;
-		var own_html = '';
-		var is_find_own_option = false;
-		for (var i = 0; i < sys_users.length; i++) {
-			var own = sys_users[i];
-			if (rdata.chown==own){
-				is_find_own_option = true;
-				own_html += '<option value="'+own+'" selected="selected">'+own+'</option>';
-			} else {
-				own_html += '<option value="'+own+'">'+own+'</option>';
-			}
-		}
-		if (!is_find_own_option){
-			own_html += '<option value="'+rdata.chown+'" selected="selected">'+rdata.chown+'</option>';
-		}
-
-		layer.open({
-			type:1,
-			closeBtn: 1,
-			title: '设置权限['+fileName+']',
-			area: '400px', 
-			shadeClose:false,
-			content:'<div class="setchmod bt-form ptb15 pb70">\
-						<fieldset>\
-							<legend>所有者</legend>\
-							<p><input type="checkbox" id="owner_r" />读取</p>\
-							<p><input type="checkbox" id="owner_w" />写入</p>\
-							<p><input type="checkbox" id="owner_x" />执行</p>\
-						</fieldset>\
-						<fieldset>\
-							<legend>用户组</legend>\
-							<p><input type="checkbox" id="group_r" />读取</p>\
-							<p><input type="checkbox" id="group_w" />写入</p>\
-							<p><input type="checkbox" id="group_x" />执行</p>\
-						</fieldset>\
-						<fieldset>\
-							<legend>公共</legend>\
-							<p><input type="checkbox" id="public_r" />读取</p>\
-							<p><input type="checkbox" id="public_w" />写入</p>\
-							<p><input type="checkbox" id="public_x" />执行</p>\
-						</fieldset>\
-						<div class="setchmodnum"><input class="bt-input-text" type="text" id="access" maxlength="3" value="'+rdata.chmod+'">权限，\
-						<span>所有者\
-						<select id="chown" class="bt-input-text" style="width:100px;">\
-							'+own_html+'\
-						</select></span></div>\
-						<div class="bt-form-submit-btn">\
-							<button type="button" class="btn btn-danger btn-sm btn-title" onclick="layer.closeAll()">关闭</button>\
-					        <button type="button" class="btn btn-success btn-sm btn-title" onclick="'+toExec+'" >确定</button>\
-				        </div>\
-					</div>'
-		});
-		
-		onAccess();
-		$("#access").keyup(function(){
-			onAccess();
-		});
-		
-		$("input[type=checkbox]").change(function(){
-			var idName = ['owner','group','public'];
-			var onacc = '';
-			for(var n=0;n<idName.length;n++){
-				var access = 0;
-				access += $("#"+idName[n]+"_x").prop('checked')?1:0;
-				access += $("#"+idName[n]+"_w").prop('checked')?2:0;
-				access += $("#"+idName[n]+"_r").prop('checked')?4:0;
-				onacc += access;
-			}
-			$("#access").val(onacc);
-		});
-
-	},'json');
-}
-
-function onAccess(){
-	var access = $("#access").val();
-	var idName = ['owner','group','public'];				
-	for(var n=0;n<idName.length;n++){
-		$("#"+idName[n]+"_x").prop('checked',false);
-		$("#"+idName[n]+"_w").prop('checked',false);
-		$("#"+idName[n]+"_r").prop('checked',false);
-	}
-	for(var i=0;i<access.length;i++){
-		var onacc = access.substr(i,1);
-		if(i > idName.length) continue;
-		if(onacc > 7) $("#access").val(access.substr(0,access.length-1));
-		switch(onacc){
-			case '1':
-				$("#"+idName[i]+"_x").prop('checked',true);
-				break;
-			case '2':
-				$("#"+idName[i]+"_w").prop('checked',true);
-				break;
-			case '3':
-				$("#"+idName[i]+"_x").prop('checked',true);
-				$("#"+idName[i]+"_w").prop('checked',true);
-				break;
-			case '4':
-				$("#"+idName[i]+"_r").prop('checked',true);
-				break;
-			case '5':
-				$("#"+idName[i]+"_r").prop('checked',true);
-				$("#"+idName[i]+"_x").prop('checked',true);
-				break;
-			case '6':
-				$("#"+idName[i]+"_r").prop('checked',true);
-				$("#"+idName[i]+"_w").prop('checked',true);
-				break;
-			case '7':
-				$("#"+idName[i]+"_r").prop('checked',true);
-				$("#"+idName[i]+"_w").prop('checked',true);
-				$("#"+idName[i]+"_x").prop('checked',true);
-				break;
-		}
-	}
-}
-
-
-//右键菜单
-function rightMenuClick(type,path,name){
-	// console.log(type,path,name);
-	var displayZip = isZip(type);
-	var options = {items:[
-		{text: "复制", onclick: function() {copyFile(path)}},
-		{text: "剪切", 	onclick: function() {cutFile(path)}},
-		{text: "重命名", onclick: function() {reName(0,name)}},
-		{text: lan.files.file_menu_auth, onclick: function() {setChmod(0,path)}},
-	 	{text: lan.files.file_menu_zip, onclick: function() {zip(path)}},
-	]};
-	if(type == "dir"){
-		options.items.push({text: lan.files.file_menu_del, onclick: function() {
-			deleteDir(path)}
-		});
-	}
-	else if(isText(type)){
-		options.items.push({text: lan.files.file_menu_edit, onclick: function() {
-			onlineEditFile(0,path);
-		}},{text: lan.files.file_menu_down, onclick: function() {
-			getFileBytes(path);
-		}},{ text: lan.files.file_menu_del, onclick: function() {
-			deleteFile(path);
-		}});
-	}
-	else if(displayZip != -1){
-		options.items.push({text: lan.files.file_menu_unzip, onclick: function() {
-			unZip(path,displayZip);
-		}},{text: lan.files.file_menu_down, onclick: function() {
-			getFileBytes(path);
-		}},{text: lan.files.file_menu_del, onclick: function() {
-			deleteFile(path);
-		}});
-	}
-	else if(isImage(type)){
-		options.items.push({text: lan.files.file_menu_img, onclick: function() {
-			getImage(path);
-		}},{text: lan.files.file_menu_down, onclick: function() {
-			getFileBytes(path);
-		}},{text: lan.files.file_menu_del, onclick: function() {
-			deleteFile(path);
-		}});
-	}
-	else{
-		options.items.push({text: lan.files.file_menu_down, onclick: function() {
-			getFileBytes(path);
-		}},{text: lan.files.file_menu_del, onclick: function() {
-			deleteFile(path);
-		}});
-	}
-	return options;
-}
-
-//右键批量操作
-function rightMenuClickAll(e){
-	var menu = $("#rmenu");
-	var windowWidth = $(window).width(),
-		windowHeight = $(window).height(),
-		menuWidth = menu.outerWidth(),
-		menuHeight = menu.outerHeight(),
-		x = (menuWidth + e.clientX < windowWidth) ? e.clientX : windowWidth - menuWidth,
-		y = (menuHeight + e.clientY < windowHeight) ? e.clientY : windowHeight - menuHeight;
-
-	menu.css('top', y)
-		.css('left', x)
-		.css('position', 'fixed')
-		.css("z-index","1")
-		.show();
-}
-//取目录大小
-function getPathSize(){
-	var path = encodeURIComponent($("#DirPathPlace input").val());
-	layer.msg("正在计算，请稍候...",{icon:16,time:0,shade: [0.3, '#000']})
-	$.post("/files/get_dir_size","path="+path,function(rdata){
-		layer.closeAll();
-		$("#pathSize").text(rdata.msg);
-	},'json');
-}
-
-$("body").not(".def-log").click(function(){
-	$("#rmenu").hide()
-});
-
-//指定路径
-$("#DirPathPlace input").keyup(function(e){
-	if(e.keyCode == 13) {
-		var fpath = $(this).val();
-		fpath = filterPath(fpath);
-		getFiles(fpath);
-	}
-});
-
-function pathPlaceBtn(path){
-	var html = '';
-	var title = '';
-	if(path == '/'){
-		html = '<li><a title="/">'+lan.files.path_root+'</a></li>';
-	} else {
-		var dst_path = path.split("/");
-		for(var i = 0; i<dst_path.length; i++ ){
-			title += dst_path[i]+'/';
-			dst_path[0] = lan.files.path_root;
-			html += '<li><a title="'+title+'">'+dst_path[i]+'</a></li>';
-		}
-	}
-	
-	html = '<div style="width:1200px;height:26px"><ul>'+html+'</ul></div>';
-	$("#PathPlaceBtn").html(html);
-	$("#PathPlaceBtn ul li a").click(function(e){
-		var go_path = $(this).attr("title");
-		if(go_path.length>1){
-			if(go_path.substr(go_path.length-1,go_path.length) =='/'){
-				go_path = go_path.substr(0,go_path.length-1);
-			}
-		}
-		getFiles(go_path);
-		e.stopPropagation();
-	});
-	pathLeft();
-}
-//计算当前目录偏移
-function pathLeft(){
-	var UlWidth = $("#PathPlaceBtn ul").width();
-	var SpanPathWidth = $("#PathPlaceBtn").width() - 50;
-	var Ml = UlWidth - SpanPathWidth;
-	if(UlWidth > SpanPathWidth ){
-		$("#PathPlaceBtn ul").css("left",-Ml);
-	}
-	else{
-		$("#PathPlaceBtn ul").css("left",0);
-	}
-}
-
-//路径快捷点击
-$("#PathPlaceBtn").on("click", function(e){
-	if($("#DirPathPlace").is(":hidden")){
-		$("#DirPathPlace").css("display","inline");
-		$("#DirPathPlace input").focus();
-		$(this).hide();
-	}else{
-		$("#DirPathPlace").hide();
-		$(this).css("display","inline");
-	}
-	$(document).one("click", function(){
-		$("#DirPathPlace").hide();
-		$("#PathPlaceBtn").css("display","inline");
-	});
-	e.stopPropagation(); 
-}); 
-$("#DirPathPlace").on("click", function(e){
-	e.stopPropagation();
-});
diff --git a/route/static/app/firewall.js b/route/static/app/firewall.js
deleted file mode 100755
index 19f7d6875..000000000
--- a/route/static/app/firewall.js
+++ /dev/null
@@ -1,370 +0,0 @@
-setTimeout(function(){
-	getSshInfo();
-},500);
-	
-setTimeout(function(){
-	showAccept(1);
-},1000);
-
-	
-$(function(){
-	// start 
-	$.post('/firewall/get_www_path',function(data){
-		var html ='<a class="btlink" href="javascript:openPath(\''+data['path']+'\');">日志目录</a>\
-				<em id="logSize">0KB</em>\
-				<button class="btn btn-default btn-sm" onclick="closeLogs();">清空</button>';
-		$('#firewall_weblog').html(html);
-
-		$.post('/files/get_dir_size','path='+data['path'], function(rdata){
-			$("#logSize").html(rdata.msg);
-		},'json');
-	},'json');
-	// end
-});
-
-function closeLogs(){
-	$.post('/files/close_logs','',function(rdata){
-		$("#logSize").html(rdata.msg);
-		layer.msg('已清理!',{icon:1});
-	},'json');
-}
-
-$("#firewalldType").change(function(){
-	var type = $(this).val();
-	var w = '120px';
-	var p = '端口';
-	var t = '放行';
-	var m = '说明: 支持放行端口范围，如: 3000:3500';
-	if(type == 'address'){
-		w = '150px';
-		p = '欲屏蔽的IP地址';
-		t = '屏蔽';
-		m = '说明: 支持屏蔽IP段，如: 192.168.0.0/24';
-	}
-	$("#AcceptPort").css("width",w);
-	$("#AcceptPort").attr('placeholder',p);
-	$("#toAccept").html(t);
-	$("#f-ps").html(m);
-});
-
-
-function sshMgr(){
-
-	$.post('/firewall/get_ssh_info', '', function(rdata){
-		var ssh_status = rdata.status ? 'checked':'';
-		var pass_prohibit_status = rdata.pass_prohibit_status ? 'checked':'';
-		var con = '<div class="pd15">\
-                <div class="divtable">\
-                    <table class="table table-hover waftable">\
-                        <thead><tr><th>名称</th><th width="80">状态</th></tr></thead>\
-                        <tbody>\
-                            <tr>\
-                                <td>启动SSH</td>\
-                                <td>\
-                                    <div class="ssh-item" style="margin-left:0">\
-                                        <input class="btswitch btswitch-ios" id="sshswitch" type="checkbox" '+ssh_status+'>\
-                                        <label class="btswitch-btn" for="sshswitch" onclick=\'setMstscStatus()\'></label>\
-                                    </div>\
-                                </td>\
-                            </tr>\
-                            <tr>\
-                                <td>禁止密码登陆</td>\
-                                <td>\
-                                    <div class="ssh-item" style="margin-left:0">\
-                                        <input class="btswitch btswitch-ios" id="pass_status" type="checkbox" '+pass_prohibit_status+'>\
-                                        <label class="btswitch-btn" for="pass_status" onclick=\'setSshPassStatus()\'></label>\
-                                    </div>\
-                                </td>\
-                            </tr>\
-                        </tbody>\
-                    </table>\
-                </div>\
-            </div>';
-        layer.open({
-	        type: 1,
-	        title: "SSH管理",
-	        area: ['300px', '230px'],
-	        closeBtn: 1,
-	        shadeClose: false,
-	        content: '<div id="ssh_list">'+con+'</div>',
-	        success:function(){
-	        },
-	    });
-
-	},'json');
-}
-
-
-function getSshInfo(){
-	$.post('/firewall/get_ssh_info', '', function(rdata){
-		if(!rdata.status){
-			$("#mstscPort").attr('disabled','disabled');
-		}
-		
-		$("#mstscPort").val(rdata.port);
-		var isPint = '';
-		if(rdata.ping){
-			isPing = "<input class='btswitch btswitch-ios' id='noping' type='checkbox'><label class='btswitch-btn' for='noping' onclick='ping(1)'></label>";
-		}else{
-			isPing = "<input class='btswitch btswitch-ios' id='noping' type='checkbox' checked><label class='btswitch-btn' for='noping' onclick='ping(0)'></label>";
-		}
-		$("#is_ping").html(isPing);
-
-		// console.log(rdata.firewall_status);
-		var fStatus = '';
-		if (rdata.firewall_status){
-			fStatus = "<input class='btswitch btswitch-ios' id='firewall_status' type='checkbox' checked><label class='btswitch-btn' for='firewall_status' onclick='firewall(1)'></label>";
-		}else{
-			fStatus = "<input class='btswitch btswitch-ios' id='firewall_status' type='checkbox'><label class='btswitch-btn' for='firewall_status' onclick='firewall(0)'></label>";
-		}
-		$("#firewall_status").html(fStatus);
-		
-		showAccept(1);
-
-	},'json');
-}
-
-
-/**
- * 修改远程端口
- */
-
-function mstsc(port) {
-	layer.confirm('更改远程端口时，将会注消所有已登录帐户，您真的要更改远程端口吗？', {title: '远程端口'}, function(index) {
-		var data = "port=" + port;
-		var loadT = layer.load({
-			shade: true,
-			shadeClose: false
-		});
-		$.post('/firewall/set_ssh_port', data, function(ret) {
-			layer.msg(ret.msg,{icon:ret.status?1:2})
-			layer.close(loadT);
-			getSshInfo();
-		},'json');
-	});
-}
-
-/**
- * 更改禁ping状态
- * @param {Int} state 0.禁ping 1.可ping
- */
-function ping(status){
-	var msg = status == 1 ? '禁PING后不影响服务器正常使用，但无法ping通服务器，您真的要禁PING吗？' : '解除禁PING状态可能会被黑客发现您的服务器，您真的要解禁吗？';
-	layer.confirm(msg,{title:'是否禁ping',closeBtn:2,cancel:function(){
-		if(status == 1){
-			$("#noping").prop("checked",true);
-		} else {
-			$("#noping").prop("checked",false);
-		}
-	}},function(){
-		layer.msg('正在处理,请稍候...',{icon:16,time:20000});
-		$.post('/firewall/set_ping','status='+status, function(data) {
-			layer.closeAll();
-			if (data['status'] == true) {
-				if(status == 1){
-					layer.msg(data['msg'], {icon: 1});
-				} else {
-					layer.msg('已解除禁PING', {icon: 1});
-				}
-				setTimeout(function(){window.location.reload();},3000);
-			} else {
-				layer.msg('连接服务器失败', {icon: 2});
-			}
-		},'json');
-	},function(){
-		if(status == 1){
-			$("#noping").prop("checked",true);
-		} else {
-			$("#noping").prop("checked",false);
-		}
-	});
-}
-
-
-
-/**
- * 更改防火墙状态
- * @param {Int} state 0,开启 1.禁用
- */
-function firewall(status){
-	var msg = status == 1 ? '禁用防火墙会增加服务器不安全性，您真的要禁用防火墙吗？' : '开启防火墙,增加服务器安全!';
-	layer.confirm(msg,{title:'是否开启防火墙!',closeBtn:2,cancel:function(){
-		if(status == 1){
-			$("#firewall_status").prop("checked",true);
-		} else {
-			$("#firewall_status").prop("checked",false);
-		}
-	}},function(){
-		layer.msg('正在处理,请稍候...',{icon:16,time:20000});
-		$.post('/firewall/set_fw','status='+status, function(data) {
-			layer.closeAll();
-			if (data['status'] == true) {
-				layer.msg(data['msg'], {icon: 1});
-				setTimeout(function(){window.location.reload();},3000);
-			} else {
-				layer.msg('连接服务器失败', {icon: 2});
-			}
-		},'json');
-	},function(){
-		if(status == 1){
-			$("#firewall_status").prop("checked",true);
-		} else {
-			$("#firewall_status").prop("checked",false);
-		}
-	});
-}
-
-
-/**
- * 设置远程服务状态
- * @param {Int} state 0.启用 1.关闭
- */
-function setMstscStatus(){
-	status = $("#sshswitch").prop("checked")==true?1:0;
-	var msg = status==1?'停用SSH服务的同时也将注销所有已登录用户,继续吗？':'确定启用SSH服务吗？';
-	layer.confirm(msg,{title:'警告',closeBtn:2,cancel:function(){
-		if(status == 0){
-			$("#sshswitch").prop("checked",false);
-		} else {
-			$("#sshswitch").prop("checked",true);
-		}
-	}},function(index){
-		if(index > 0){
-			layer.msg('正在处理,请稍候...',{icon:16,time:20000});
-			$.post('/firewall/set_ssh_status','status='+status,function(rdata){
-				layer.msg(rdata.msg,{icon:rdata.status?1:2});
-			},'json');
-		}
-	},function(){
-		if(status == 0){
-			$("#sshswitch").prop("checked",false);
-		} else {
-			$("#sshswitch").prop("checked",true);
-		}
-	});
-}
-
-/**
- * 设置远程服务状态
- * @param {Int} state 0.启用 1.关闭
- */
-function setSshPassStatus(){
-	status = $("#pass_status").prop("checked")==true?1:0;
-	var msg = status==1?'开启密码登陆,继续吗？':'确定禁止密码登陆吗？';
-	layer.confirm(msg,{title:'警告',closeBtn:2,cancel:function(){
-		if(status == 0){
-			$("#pass_status").prop("checked",false);
-		} else {
-			$("#pass_status").prop("checked",true);
-		}
-	}},function(index){
-		if(index > 0){
-			layer.msg('正在处理,请稍候...',{icon:16,time:20000});
-			$.post('/firewall/set_ssh_pass_status','status='+status,function(rdata){
-				layer.msg(rdata.msg,{icon:rdata.status?1:2});
-			},'json');
-		}
-	},function(){
-		if(status == 0){
-			$("#pass_status").prop("checked",false);
-		} else {
-			$("#pass_status").prop("checked",true);
-		}
-	});
-}
-
-/**
- * 取回数据
- * @param {Int} page  分页号
- */
-function showAccept(page,search) {
-	search = search == undefined ? '':search;
-	var loadT = layer.load();
-	$.post('/firewall/get_list','limit=10&p=' + page+"&search="+search, function(data) {
-		layer.close(loadT);
-		var body = '';
-		for (var i = 0; i < data.data.length; i++) {
-			var status = '';
-			switch(data.data[i].status){
-				case 0:
-					status = '未使用';
-					break;
-				case 1:
-					status = '外网不通';
-					break;
-				default:
-					status = '正常';
-					break;
-			}
-			body += "<tr>\
-						<td><em class='dlt-num'>" + data.data[i].id + "</em></td>\
-						<td>" + data.data[i].protocol + "</td>\
-						<td>" + (data.data[i].port.indexOf('.') == -1?'放行端口'+':['+data.data[i].port+']':'屏蔽IP'+':['+data.data[i].port+']') + "</td>\
-						<td>" + status + "</td>\
-						<td>" + data.data[i].addtime + "</td>\
-						<td>" + data.data[i].ps + "</td>\
-						<td class='text-right'><a href='javascript:;' class='btlink' onclick=\"delAcceptPort(" + data.data[i].id + ",'" + data.data[i].port + "','"+data.data[i].protocol+"')\">删除</a></td>\
-					</tr>";
-		}
-		$("#firewallBody").html(body);
-		$("#firewallPage").html(data.page);
-	},'json');
-}
-
-//添加放行
-function addAcceptPort(){
-	var type = $("#firewalldType").val();
-	var port = $("#AcceptPort").val();
-	var ps = $("#Ps").val();
-	var protocol = $('select[name="protocol"]').val();
-	var action = "add_drop_address";
-	if(type == 'port'){
-		ports = port.split(':');
-		for(var i=0;i<ports.length;i++){
-			if(isNaN(ports[i]) || ports[i] < 1 || ports[i] > 65535 ){
-				layer.msg('端口范围不合法!',{icon:5});
-				return;
-			}
-		}
-		action = "add_accept_port";
-	}
-	
-	
-	if(ps.length < 1){
-		layer.msg('备注/说明 不能为空!',{icon:2});
-		$("#Ps").focus();
-		return;
-	}
-	var loadT = layer.msg('正在添加,请稍候...',{icon:16,time:0,shade: [0.3, '#000']})
-	$.post('/firewall/'+action,'port='+port+"&ps="+ps+'&type='+type+'&protocol='+protocol,function(rdata){
-		layer.close(loadT);
-		if(rdata.status == true || rdata.status == 'true'){
-			layer.msg(rdata.msg,{icon:1});
-			showAccept(1);
-			$("#AcceptPort").val('');
-			$("#Ps").val('');
-		}else{
-			layer.msg(rdata.msg,{icon:2});
-		}
-		
-		$("#AcceptPort").attr('value','');
-		$("#Ps").attr('value','');
-	},'json');
-}
-
-//删除放行
-function delAcceptPort(id, port,protocol) {
-	var action = "del_drop_address";
-	if(port.indexOf('.') == -1){
-		action = "del_accept_port";
-	}
-	
-	layer.confirm(lan.get('confirm_del',[port]), {title: '删除防火墙规则',closeBtn:2}, function(index) {
-		var loadT = layer.msg('正在删除,请稍候...',{icon:16,time:0,shade: [0.3, '#000']})
-		$.post("/firewall/"+action, "id=" + id + "&port=" + port+'&protocol='+protocol, function(ret) {
-			layer.close(loadT);
-			layer.msg(ret.msg,{icon:ret.status?1:2})
-			showAccept(1);
-		},'json');
-	});
-}
diff --git a/route/static/app/index.js b/route/static/app/index.js
deleted file mode 100755
index c623ad35e..000000000
--- a/route/static/app/index.js
+++ /dev/null
@@ -1,1463 +0,0 @@
-//获取负载
-function getLoad(data) {
-    $("#LoadList .mask").html("<span id='Load' style='font-size:14px'>获取中..</span>");
-    setCookie('one', data.one);
-    setCookie('five', data.five);
-    setCookie('fifteen', data.fifteen);
-    var transformLeft, transformRight, LoadColor, Average, Occupy, AverageText, conterError = '';
-    var index = $("#LoadList");
-    if (Average == undefined) Average = data.one;
-    setCookie('conterError', conterError);
-    Occupy = Math.round((Average / data.max) * 100);
-    if (Occupy > 100) Occupy = 100;
-    if (Occupy <= 30) {
-        LoadColor = '#20a53a';
-        AverageText = '运行流畅';
-    } else if (Occupy <= 70) {
-        LoadColor = '#6ea520';
-        AverageText = '运行正常';
-    } else if (Occupy <= 90) {
-        LoadColor = '#ff9900';
-        AverageText = '运行缓慢';
-    } else {
-        LoadColor = '#dd2f00';
-        AverageText = '运行堵塞';
-    }
-    index.find('.circle').css("background", LoadColor);
-    index.find('.mask').css({ "color": LoadColor });
-    $("#LoadList .mask").html("<span id='Load'></span>%");
-    $('#Load').html(Occupy);
-    $('#LoadState').html('<span>' + AverageText + '</span>');
-    setImg();
-}
-
-$('#LoadList .circle').click(function() {
-    // getNet();
-});
-
-$('#LoadList .mask').hover(function() {
-    var one, five, fifteen;
-    var that = this;
-    one = getCookie('one');
-    five = getCookie('five');
-    fifteen = getCookie('fifteen');
-    var text = '最近1分钟平均负载：' + one + '</br>最近5分钟平均负载：' + five + '</br>最近15分钟平均负载：' + fifteen + '';
-    layer.tips(text, that, { time: 0, tips: [1, '#999'] });
-}, function() {
-    layer.closeAll('tips');
-});
-
-
-function showCpuTips(rdata){
-    $('#cpuChart .mask').unbind().hover(function() {
-        var cpuText = '';
-        if (rdata.cpu[2].length == 1){
-            var cpuUse = parseFloat(rdata.cpu[2][0] == 0 ? 0 : rdata.cpu[2][0]).toFixed(1);
-            cpuText += 'CPU-1：' + cpuUse + '%';
-        } else {
-            for (var i = 1; i < rdata.cpu[2].length + 1; i++) {
-                var cpuUse = parseFloat(rdata.cpu[2][i - 1] == 0 ? 0 : rdata.cpu[2][i - 1]).toFixed(1);
-                if (i % 2 != 0) {
-                    cpuText += 'CPU-' + i + '：' + cpuUse + '%&nbsp;|&nbsp;';
-                } else {
-                    cpuText += 'CPU-' + i + '：' + cpuUse + '%';
-                    cpuText += '\n';
-                }
-            } 
-        }
-        layer.tips(rdata.cpu[3] + "</br>" + rdata.cpu[5] + "个物理CPU，" + (rdata.cpu[4]) + "个物理核心，" + rdata.cpu[1] + "个逻辑核心</br>" + cpuText, this, { time: 0, tips: [1, '#999'] });
-    }, function() {
-        layer.closeAll('tips');
-    });
-}
-
-
-function rocket(sum, m) {
-    var n = sum - m;
-    $(".mem-release").find(".mask span").text(n);
-}
-
-//释放内存
-function reMemory() {
-    setTimeout(function() {
-        $(".mem-release").find('.mask').css({ 'color': '#20a53a', 'font-size': '14px' }).html('<span style="display:none">1</span>' + lan.index.memre_ok_0 + ' <img src="/static/img/ings.gif">');
-        $.post('/system/rememory', '', function(rdata) {
-            var percent = getPercent(rdata.memRealUsed, rdata.memTotal);
-            var memText = Math.round(rdata.memRealUsed) + "/" + Math.round(rdata.memTotal) + " (MB)";
-            percent = Math.round(percent);
-            $(".mem-release").find('.mask').css({ 'color': '#20a53a', 'font-size': '14px' }).html("<span style='display:none'>" + percent + "</span>" + lan.index.memre_ok);
-            setCookie("mem-before", memText);
-            var memNull = Math.round(getCookie("memRealUsed") - rdata.memRealUsed);
-            setTimeout(function() {
-                if (memNull > 0) {
-                    $(".mem-release").find('.mask').css({ 'color': '#20a53a', 'font-size': '14px', 'line-height': '22px', 'padding-top': '22px' }).html("<span style='display:none'>" + percent + "</span>" + lan.index.memre_ok_1 + "<br>" + memNull + "MB");
-                } else {
-                    $(".mem-release").find('.mask').css({ 'color': '#20a53a', 'font-size': '14px' }).html("<span style='display:none'>" + percent + "</span>" + lan.index.memre_ok_2);
-                }
-                $(".mem-release").removeClass("mem-action");
-                $("#memory").text(memText);
-                setCookie("memRealUsed", rdata.memRealUsed);
-            }, 1000);
-            setTimeout(function() {
-                $(".mem-release").find('.mask').removeAttr("style").html("<span>" + percent + "</span>%");
-                $(".mem-release").find(".mem-re-min").show();
-            }, 2000)
-        },'json');
-    }, 2000);
-}
-
-function getPercent(num, total) {
-    num = parseFloat(num);
-    total = parseFloat(total);
-    if (isNaN(num) || isNaN(total)) {
-        return "-";
-    }
-    return total <= 0 ? "0%" : (Math.round(num / total * 10000) / 100.00);
-}
-
-function getDiskInfo() {
-    $.get('/system/disk_info', function(rdata) {
-        var dBody;
-        for (var i = 0; i < rdata.length; i++) {
-            var LoadColor = setcolor(parseInt(rdata[i].size[3].replace('%', '')), false, 75, 90, 95);
-
-            //判断inode信息是否存在
-            var inodes = '';
-            if ( typeof(rdata[i]['inodes']) !=='undefined' ){
-                inodes = '<div class="mask" style="color:' + LoadColor + '" data="Inode信息<br>总数：' + rdata[i].inodes[0] + '<br>已使用：' + rdata[i].inodes[1] + '<br>可用：' + rdata[i].inodes[2] + '<br>Inode使用率：' + rdata[i].inodes[3] + '"><span>' + rdata[i].size[3].replace('%', '') + '</span>%</div>';
-
-                var ipre = parseInt(rdata[i].inodes[3].replace('%', ''));
-                if (ipre > 95) {
-                    $("#messageError").show();
-                    $("#messageError").append('<p><span class="glyphicon glyphicon-alert" style="color: #ff4040; margin-right: 10px;"></span>分区[' + rdata[i].path + ']当前Inode使用率超过' + ipre + '%，当使用率满100%时将无法在此分区创建文件，请及时清理!<a class="btlink" href="javascript:ClearSystem();">[清理垃圾]</a></p>');
-                }
-            }
-
-            if (rdata[i].path == '/' || rdata[i].path == '/www') {
-                if (rdata[i].size[2].indexOf('M') != -1) {
-                    $("#messageError").show();
-                    $("#messageError").append('<p><span class="glyphicon glyphicon-alert" style="color: #ff4040; margin-right: 10px;"></span> ' + lan.get('diskinfo_span_1', [rdata[i].path]) + '<a class="btlink" href="javascript:ClearSystem();">[清理垃圾]</a></p>');
-                } 
-            }
-           
-            dBody = '<li class="col-xs-6 col-sm-3 col-md-3 col-lg-2 mtb20 circle-box text-center diskbox">' +
-                '<h3 class="c5 f15">' + rdata[i].path + '</h3>' +
-                '<div class="circle" style="background:' + LoadColor + '">' +
-                '<div class="pie_left">' +
-                '<div class="left"></div>' +
-                '</div>' +
-                '<div class="pie_right">' +
-                '<div class="right"></div>' +
-                '</div>'+ inodes +'</div>' +
-                '<h4 class="c5 f15">' + rdata[i].size[1] + '/' + rdata[i].size[0] + '</h4>' +
-                '</li>'
-            $("#systemInfoList").append(dBody);
-            setImg();
-        }
-    },'json');
-}
-
-//清理垃圾
-function clearSystem() {
-    var loadT = layer.msg('正在清理系统垃圾 <img src="/static/img/ing.gif">', { icon: 16, time: 0, shade: [0.3, "#000"] });
-    $.get('/system?action=ClearSystem', function(rdata) {
-        layer.close(loadT);
-        layer.msg('清理完成,共清理[' + rdata[0] + ']个文件,释放[' + toSize(rdata[1]) + ']磁盘空间!', { icon: 1 });
-    });
-}
-
-function setMemImg(info){
-
-    var memRealUsed = toSize(info.memRealUsed);
-    var memTotal = toSize(info.memTotal);
-
-    var memRealUsedVal = memRealUsed.split(' ')[0];
-    var memTotalVal = memTotal.split(' ')[0];
-    var unit = memTotal.split(' ')[1];
-
-    var mem_txt = memRealUsedVal + '/' + memTotalVal + ' ('+ unit +')';
-    setCookie("mem-before", mem_txt);
-    $("#memory").html(mem_txt);
-
-    var memPre = Math.floor(info.memRealUsed / (info.memTotal / 100));
-    $("#left").html(memPre);
-    setcolor(memPre, "#left", 75, 90, 95);
-
-    var memFree = info.memTotal - info.memRealUsed;
-    if (memFree/(1024*1024) < 64) {
-        $("#messageError").show();
-        $("#messageError").append('<p><span class="glyphicon glyphicon-alert" style="color: #ff4040; margin-right: 10px;">当前可用物理内存小于64M，这可能导致MySQL自动停止，站点502等错误，请尝试释放内存！</span></p>')
-    }
-}
-
-function getInfo() {
-    $.get("/system/system_total", function(info) {
-
-        setMemImg(info);
-
-        $("#info").html(info.system);
-        $("#running").html(info.time);
-        var _system = info.system;
-        if(_system.indexOf("Windows") != -1){
-            $(".ico-system").addClass("ico-windows");
-        } else if(_system.indexOf("CentOS") != -1) {
-            $(".ico-system").addClass("ico-centos");
-        } else if(_system.indexOf("Ubuntu") != -1) {
-            $(".ico-system").addClass("ico-ubuntu");
-        } else if(_system.indexOf("Debian") != -1) {
-            $(".ico-system").addClass("ico-debian");
-        } else if(_system.indexOf("Fedora") != -1) {
-            $(".ico-system").addClass("ico-fedora");
-        } else if(_system.indexOf("Mac") != -1){
-            $(".ico-system").addClass("ico-mac");
-        } else {
-            $(".ico-system").addClass("ico-linux");
-        }
-        $("#core").html(info.cpuNum + ' 核心');
-        $("#state").html(info.cpuRealUsed);
-        setcolor(info.cpuRealUsed, "#state", 30, 70, 90);
-       
-
-        // if (info.isuser > 0) {
-        //     $("#messageError").show();
-        //     $("#messageError").append('<p><span class="glyphicon glyphicon-alert" style="color: #ff4040; margin-right: 10px;"></span>' + lan.index.user_warning + '<span class="c7 mr5" title="此安全问题不可忽略，请尽快处理" style="cursor:no-drop"> [不可忽略]</span><a class="btlink" href="javascript:setUserName();"> [立即修改]</a></p>')
-        // }
-        setImg();
-    },'json');
-}
-
-
-function setcolor(pre, s, s1, s2, s3) {
-    var LoadColor;
-    if (pre <= s1) {
-        LoadColor = '#20a53a';
-    } else if (pre <= s2) {
-        LoadColor = '#6ea520';
-    } else if (pre <= s3) {
-        LoadColor = '#ff9900';
-    } else {
-        LoadColor = '#dd2f00';
-    }
-    if (s == false) {
-        return LoadColor;
-    }
-    var co = $(s).parent('.mask');
-    co.css("color", LoadColor);
-    co.parent('.circle').css("background", LoadColor);
-}
-
-
-function getNet() {
-    var up, down;
-    $.get("/system/network", function(net) {
-
-        console.log(net);
-
-        $("#InterfaceSpeed").html(lan.index.interfacespeed + "： 1.0Gbps");
-        $("#upSpeed").html(toSize(net.up));
-        $("#downSpeed").html(toSize(net.down));
-        $("#downAll").html(toSize(net.downTotal));
-        $("#downAll").attr('title', lan.index.package + ':' + net.downPackets)
-        $("#upAll").html(toSize(net.upTotal));
-        $("#upAll").attr('title', lan.index.package + ':' + net.upPackets)
-        $("#core").html(net.cpu[1] + " " + lan.index.cpu_core);
-        $("#state").html(net.cpu[0]);
-        setcolor(net.cpu[0], "#state", 30, 70, 90);
-        setCookie("upNet", net.up);
-        setCookie("downNet", net.down);
-
-        //负载
-        getLoad(net.load);
-
-        //内存
-        setMemImg(net.mem);
-
-        //绑定hover事件
-        setImg();
-        showCpuTips(net);
-
-    },'json');
-}
-
-//网络IO
-function netImg() {
-    
-    var xData = [];
-    var yData = [];
-    var zData = [];
-
-    function getTime() {
-        var now = new Date();
-        var hour = now.getHours();
-        var minute = now.getMinutes();
-        var second = now.getSeconds();
-        if (minute < 10) {
-            minute = "0" + minute;
-        }
-        if (second < 10) {
-            second = "0" + second;
-        }
-        var nowdate = hour + ":" + minute + ":" + second;
-        return nowdate;
-    }
-
-    function ts(m) { return m < 10 ? '0' + m : m }
-
-    function format(sjc) {
-        var time = new Date(sjc);
-        var h = time.getHours();
-        var mm = time.getMinutes();
-        var s = time.getSeconds();
-        return ts(h) + ':' + ts(mm) + ':' + ts(s);
-    }
-
-    var default_unit = 'KB/s';
-    function addData(shift) {
-        xData.push(getTime());
-
-        if (getCookie("upNet") > getCookie("downNet") ){
-            tmp = getCookie("upNet");
-        } else {
-            tmp = getCookie("downNet");
-        }
-        var tmpSize = toSize(tmp);
-        default_unit = tmpSize.split(' ')[1] + '/s';
-
-
-        var upNetTmp = toSize(getCookie("upNet"));
-        var downNetTmp = toSize(getCookie("downNet"));
-        
-        var upNetTmpSize = upNetTmp.split(' ')[0];
-        var downNetTmp = downNetTmp.split(' ')[0];
-        
-        yData.push(upNetTmpSize);
-        zData.push(downNetTmp);
-        if (shift) {
-            xData.shift();
-            yData.shift();
-            zData.shift();
-        }
-    }
-    for (var i = 8; i >= 0; i--) {
-        var time = (new Date()).getTime();
-        xData.push(format(time - (i * 3 * 1000)));
-        yData.push(0);
-        zData.push(0);
-    }
-    // 指定图表的配置项和数据
-    var option = {
-        title: {
-            text: "接口流量实时",
-            left: 'center',
-            textStyle: {
-                color: '#888888',
-                fontStyle: 'normal',
-                fontFamily: "宋体",
-                fontSize: 16,
-            }
-        },
-        tooltip: {
-            trigger: 'axis'
-        },
-        legend: {
-            data: [lan.index.net_up, lan.index.net_down],
-            bottom: '2%'
-        },
-        xAxis: {
-            type: 'category',
-            boundaryGap: false,
-            data: xData,
-            axisLine: {
-                lineStyle: {
-                    color: "#666"
-                }
-            }
-        },
-        yAxis: {
-            name:  '单位 '+ default_unit,
-            splitLine: {
-                lineStyle: { color: "#eee" }
-            },
-            axisLine: {
-                lineStyle: { color: "#666" }
-            }
-        },
-        series: [{
-            name: '上行',
-            type: 'line',
-            data: yData,
-            smooth: true,
-            showSymbol: false,
-            symbol: 'circle',
-            symbolSize: 6,
-            areaStyle: {
-                normal: {
-                    color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                        offset: 0,
-                        color: 'rgba(255, 140, 0,0.5)'
-                    }, {
-                        offset: 1,
-                        color: 'rgba(255, 140, 0,0.8)'
-                    }], false)
-                }
-            },
-            itemStyle: {
-                normal: {
-                    color: '#f7b851'
-                }
-            },
-            lineStyle: {
-                normal: {
-                    width: 1
-                }
-            }
-        },
-        {
-            name: '下行',
-            type: 'line',
-            data: zData,
-            smooth: true,
-            showSymbol: false,
-            symbol: 'circle',
-            symbolSize: 6,
-            areaStyle: {
-                normal: {
-                    color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                        offset: 0,
-                        color: 'rgba(30, 144, 255,0.5)',
-                    }, {
-                        offset: 1,
-                        color: 'rgba(30, 144, 255,0.8)',
-                    }], false)
-                }
-            },
-            itemStyle: {
-                normal: {
-                    color: '#52a9ff',
-                }
-            },
-            lineStyle: {
-                normal: {
-                    width: 1,
-                }
-            }
-        }]
-    };
-
-    var echartsNetImg = echarts.init(document.getElementById('netImg'));
-    setInterval(function() {
-        getNet();
-        addData(true);
-        echartsNetImg.setOption({
-            yAxis: {
-                name:  '单位 '+ default_unit,
-                splitLine: { lineStyle: { color: "#eee" } },
-                axisLine: { lineStyle: { color: "#666" } }
-            },
-            xAxis: {
-                data: xData
-            },
-            series: [{
-                name: lan.index.net_up,
-                data: yData
-            }, {
-                name: lan.index.net_down,
-                data: zData
-            }]
-        });
-    }, 3000);
-
-    // 使用刚指定的配置项和数据显示图表。
-    echartsNetImg.setOption(option);
-    window.addEventListener("resize", function() {
-        echartsNetImg.resize();
-    });
-}
-
-
-function setImg() {
-    $('.circle').each(function(index, el) {
-        var num = $(this).find('span').text() * 3.6;
-        if (num <= 180) {
-            $(this).find('.left').css('transform', "rotate(0deg)");
-            $(this).find('.right').css('transform', "rotate(" + num + "deg)");
-        } else {
-            $(this).find('.right').css('transform', "rotate(180deg)");
-            $(this).find('.left').css('transform', "rotate(" + (num - 180) + "deg)");
-        };
-    });
-
-    $('.diskbox .mask').unbind().hover(function() {
-        layer.closeAll('tips');
-        var that = this;
-        var conterError = $(this).attr("data");
-        layer.tips(conterError, that, { time: 0, tips: [1, '#999'] });
-    }, function() {
-        layer.closeAll('tips');
-    });
-}
-
-// 检查更新
-setTimeout(function() {
-    $.get('/system/update_server?type=check', function(rdata) {
-        if (rdata.status == false) return;
-        if (rdata.data != undefined) {
-            $("#toUpdate").html('<a class="btlink" href="javascript:updateMsg();">更新</a>');
-            $('#toUpdate a').html('更新<i style="display: inline-block; color: red; font-size: 40px;position: absolute;top: -35px; font-style: normal; right: -8px;">.</i>');
-            $('#toUpdate a').css("position","relative");
-            return;
-        }
-    },'json').error(function() {
-    });
-}, 3000);
-
-
-//检查更新
-function checkUpdate() {
-    var loadT = layer.msg(lan.index.update_get, { icon: 16, time: 0, shade: [0.3, '#000'] });
-    $.get('/system/update_server?type=check', function(rdata) {
-        layer.close(loadT);
-
-        if (rdata.data == 'download'){
-            updateStatus();return;
-        }
-
-        if (rdata.status === false) {
-            layer.confirm(rdata.msg, { title: lan.index.update_check, icon: 1, closeBtn: 1, btn: [lan.public.know, lan.public.close] });
-            return;
-        }
-        layer.msg(rdata.msg, { icon: 1 });
-        if (rdata.data != undefined) updateMsg();
-    },'json');
-}
-
-function updateMsg(){
-    $.get('/system/update_server?type=info',function(rdata){
-
-        if (rdata.data == 'download'){
-            updateStatus();return;
-        }
-
-        var v = rdata.data.version;
-        var v_info = '';
-        if (v.split('.').length>3){
-            v_info = "<span class='label label-warning'>测试版本</span>";
-        } else {
-            v_info = "<span class='label label-success arrowed'>正式版本</span>";
-        }
-
-        layer.open({
-            type:1,
-            title:v_info + '<span class="badge badge-inverse">升级到['+rdata.data.version+']</span>',
-            area: '400px', 
-            shadeClose:false,
-            closeBtn:2,
-            content:'<div class="setchmod bt-form pd20 pb70">'
-                    +'<p style="padding: 0 0 10px;line-height: 24px;">'+rdata.data.content+'</p>'
-                    +'<div class="bt-form-submit-btn">'
-                    +'<button type="button" class="btn btn-danger btn-sm btn-title" onclick="layer.closeAll()">取消</button>'
-                    +'<button type="button" class="btn btn-success btn-sm btn-title" onclick="updateVersion(\''+rdata.data.version+'\')" >立即更新</button>'
-                    +'</div>'
-                    +'</div>'
-        });
-    },'json');
-}
-
-
-//开始升级
-function updateVersion(version) {
-    var loadT = layer.msg('正在升级面板..', { icon: 16, time: 0, shade: [0.3, '#000'] });
-    $.get('/system/update_server?type=update&version='+version, function(rdata) {
-
-        layer.closeAll();
-        if (rdata.status === false) {
-            layer.msg(rdata.msg, { icon: 5, time: 5000 });
-            return;
-        }
-        layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
-        if (rdata.status) {
-            $("#btversion").html(version);
-            $("#toUpdate").html('');
-        }
-    },'json').error(function() {
-        layer.msg('更新失败,请重试!', { icon: 2 });
-        setTimeout(function() {
-            window.location.reload();
-        }, 3000);
-    });
-}
-
-function pluginIndexService(pname,pfunc, callback){
-    $.post('/plugins/run', {name:'openresty', func:pfunc}, 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 reBoot() {
-    layer.open({
-        type: 1,
-        title: '重启服务器或者面板',
-        area: '330px',
-        closeBtn: 1,
-        shadeClose: false,
-        content: '<div class="rebt-con">\
-                <div class="rebt-li"><a data-id="server" href="javascript:;">重启服务器</a></div>\
-                <div class="rebt-li"><a data-id="panel" href="javascript:;">重启面板</a></div>\
-            </div>'
-    });
-
-    $('.rebt-con a').click(function () {
-        var type = $(this).attr('data-id');
-        switch (type) {
-            case 'panel':
-                layer.confirm('即将重启面板服务，继续吗？', { title: '重启面板服务', closeBtn: 1, icon: 3 }, function () {
-                    var loadT = layer.load();
-                    $.post('/system/restart','',function (rdata) {
-                        layer.close(loadT);
-                        layer.msg(rdata.msg);
-                        setTimeout(function () { window.location.reload(); }, 3000);
-                    },'json');
-                });
-                break;
-            case 'server':
-                var rebootbox = layer.open({
-                    type: 1,
-                    title: '安全重启服务器',
-                    area: ['500px', '280px'],
-                    closeBtn: 1,
-                    shadeClose: false,
-                    content: "<div class='bt-form bt-window-restart'>\
-                            <div class='pd15'>\
-                            <p style='color:red; margin-bottom:10px; font-size:15px;'>注意，若您的服务器是一个容器，请取消。</p>\
-                            <div class='SafeRestart' style='line-height:26px'>\
-                                <p>安全重启有利于保障文件安全，将执行以下操作：</p>\
-                                <p>1.停止Web服务</p>\
-                                <p>2.停止MySQL服务</p>\
-                                <p>3.开始重启服务器</p>\
-                                <p>4.等待服务器启动</p>\
-                            </div>\
-                            </div>\
-                            <div class='bt-form-submit-btn'>\
-                                <button type='button' class='btn btn-danger btn-sm btn-reboot'>取消</button>\
-                                <button type='button' class='btn btn-success btn-sm WSafeRestart' >确定</button>\
-                            </div>\
-                        </div>"
-                });
-                setTimeout(function () {
-                    $(".btn-reboot").click(function () {
-                        rebootbox.close();
-                    })
-                    $(".WSafeRestart").click(function () {
-                        var body = '<div class="SafeRestartCode pd15" style="line-height:26px"></div>';
-                        $(".bt-window-restart").html(body);
-                        $(".SafeRestartCode").append("<p>正在停止Web服务</p>");
-                        pluginIndexService('openresty', 'stop', function (r1) {
-                            $(".SafeRestartCode p").addClass('c9');
-                            $(".SafeRestartCode").append("<p>正在停止MySQL服务...</p>");
-                            pluginIndexService('mysql','stop', function (r2) {
-                                $(".SafeRestartCode p").addClass('c9');
-                                $(".SafeRestartCode").append("<p>开始重启服务器...</p>");
-                                $.post('/system/restart_server', '',function (rdata) {
-                                    $(".SafeRestartCode p").addClass('c9');
-                                    $(".SafeRestartCode").append("<p>等待服务器启动...</p>");
-                                    var sEver = setInterval(function () {
-                                       $.get("/system/system_total", function(info) {
-                                            clearInterval(sEver);
-                                            $(".SafeRestartCode p").addClass('c9');
-                                            $(".SafeRestartCode").append("<p>服务器重启成功!...</p>");
-                                            setTimeout(function () {
-                                                layer.closeAll();
-                                            }, 3000);
-                                        })
-                                    }, 3000);
-                                })
-                            })
-                        })
-                    })
-                }, 100);
-                break;
-        }
-    });
-}
-
-//修复面板
-function repPanel() {
-    layer.confirm(lan.index.rep_panel_msg, { title: lan.index.rep_panel_title, closeBtn: 1, icon: 3 }, function() {
-        var loadT = layer.msg(lan.index.rep_panel_the, { icon: 16, time: 0, shade: [0.3, '#000'] });
-        $.get('/system?action=RepPanel', function(rdata) {
-            layer.close(loadT);
-            layer.msg(lan.index.rep_panel_ok, { icon: 1 });
-        }).error(function() {
-            layer.close(loadT);
-            layer.msg(lan.index.rep_panel_ok, { icon: 1 });
-        });
-    });
-}
-
-//获取警告信息
-function getWarning() {
-    $.get('/ajax?action=GetWarning', function(wlist) {
-        var num = 0;
-        for (var i = 0; i < wlist.data.length; i++) {
-            if (wlist.data[i].ignore_count >= wlist.data[i].ignore_limit) continue;
-            if (wlist.data[i].ignore_time != 0 && (wlist.time - wlist.data[i].ignore_time) < wlist.data[i].ignore_timeout) continue;
-            var btns = '';
-            for (var n = 0; n < wlist.data[i].btns.length; n++) {
-                if (wlist.data[i].btns[n].type == 'javascript') {
-                    btns += '<a href="javascript:WarningTo(\'' + wlist.data[i].btns[n].url + '\',' + wlist.data[i].btns[n].reload + ');" class="' + wlist.data[i].btns[n].class + '"> ' + wlist.data[i].btns[n].title + '</a>'
-                } else {
-                    btns += '<a href="' + wlist.data[i].btns[n].url + '" class="' + wlist.data[i].btns[n].class + '" target="' + wlist.data[i].btns[n].target + '"> ' + wlist.data[i].btns[n].title + '</a>'
-                }
-            }
-            $("#messageError").append('<p><img src="' + wlist.icon[wlist.data[i].icon] + '" style="margin-right:14px;vertical-align:-3px">' + wlist.data[i].body + btns + '</p>');
-            num++;
-        }
-        if (num > 0) $("#messageError").show();
-    });
-}
-
-//按钮调用
-function warningTo(to_url, def) {
-    var loadT = layer.msg(lan.public.the_get, { icon: 16, time: 0, shade: [0.3, '#000'] });
-    $.post(to_url, {}, function(rdata) {
-        layer.close(loadT);
-        layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
-        if (rdata.status && def) setTimeout(function() { location.reload(); }, 1000);
-    },'json');
-}
-
-function setSafeHide() {
-    setCookie('safeMsg', '1');
-    $("#safeMsg").remove();
-}
-
-//查看报告
-function showDanger(num, port) {
-    var atxt = "因未使用安全隔离登录，所有IP都可以尝试连接，存在较高风险，请立即处理。";
-    if (port == "22") {
-        atxt = "因未修改SSH默认22端口，且未使用安全隔离登录，所有IP都可以尝试连接，存在较高风险，请立即处理。";
-    }
-    layer.open({
-        type: 1,
-        area: ['720px', '410px'],
-        title: '安全提醒(如你想放弃任何安全提醒通知，请删除宝塔安全登录插件)',
-        closeBtn: 1,
-        shift: 5,
-        content: '<div class="pd20">\
-                <table class="f14 showDanger">\
-                    <tbody>\
-                    <tr><td class="text-right" width="150">风险类型：</td><td class="f16" style="color:red">暴力破解 <a href="https://www.bt.cn/bbs/thread-9562-1-1.html" class="btlink f14" style="margin-left:10px" target="_blank">说明</a></td></tr>\
-                    <tr><td class="text-right">累计遭遇攻击总数：</td><td class="f16" style="color:red">' + num + ' <a href="javascript:showDangerIP();" class="btlink f14" style="margin-left:10px">详细</a><span class="c9 f12" style="margin-left:10px">（数据直接来源本服务器日志）</span></td></tr>\
-                    <tr><td class="text-right">风险等级：</td><td class="f16" style="color:red">较高风险</td></tr>\
-                    <tr><td class="text-right" style="vertical-align:top">风险描述：</td><td style="line-height:20px">' + atxt + '</td></tr>\
-                    <tr><td class="text-right" style="vertical-align:top">可参考解决方案：</td><td><p style="margin-bottom:8px">方案一：修改SSH默认端口，修改SSH验证方式为数字证书，清除近期登陆日志。</p><p>方案二：购买宝塔企业运维版，一键部署安全隔离服务，高效且方便。</p></td></tr>\
-                    </tbody>\
-                </table>\
-            </div>'
-    });
-    $(".showDanger td").css("padding", "8px");
-}
-
-function pluginInit(){
-    $.post('/plugins/init', function(data){
-        if (!data.status){
-            return false;
-        }
-
-        var rdata = data.data;
-        var plugin_list = '';
-
-        for (var i = 0; i < rdata.length; i++) {
-            var ver = rdata[i]['versions'];
-            var select_list = '';
-            if (typeof(ver)=='string'){
-                select_list = '<option value="' + ver +'">' + rdata[i]['title'] + ' - ' + ver + '</option>';
-            } else {
-                for (var vi = 0; vi < ver.length; vi++) {
-
-                    if (ver[vi] == rdata[i]['default_ver']){
-                        select_list += '<option value="'+ver[vi]+'" selected="selected">'+ rdata[i]['title'] + ' - '+ ver[vi] + '</option>';
-                    } else {
-                        select_list += '<option value="'+ver[vi]+'">'+ rdata[i]['title'] + ' - '+ ver[vi] + '</option>';
-                    }
-                }
-            }
-
-            var pn_checked = '<input id="data_'+rdata[i]['name']+'" type="checkbox" checked>';
-            if (rdata[i]['name'] == 'swap'){
-                var pn_checked = '<input id="data_'+rdata[i]['name']+'" type="checkbox" disabled="disabled" checked>';
-            }
-            
-            plugin_list += '<li><span class="ico"><img src="/plugins/file?name='+rdata[i]['name']+'&f=ico.png"></span>\
-            <span class="name">\
-                <select id="select_'+rdata[i]['name']+'" class="sl-s-info">'+select_list+'</select>\
-            </span>\
-            <span class="pull-right">'+pn_checked+'</span></li>';
-        }
-
-        layer.open({
-            type: 1,
-            title: '推荐安装',
-            area: ["320px", "400px"],
-            closeBtn: 2,
-            shadeClose: false,
-            content:"\
-        <div class='rec-install'>\
-            <div class='important-title'>\
-                <p><span class='glyphicon glyphicon-alert' style='color: #f39c12; margin-right: 10px;'></span>推荐以下一键套件，或在<a href='javascript:jump()' style='color:#20a53a'>软件管理</a>按需选择。</p>\
-                <!-- <button style='margin-top: 8px;height: 30px;' type='button' class='btn btn-sm btn-default no-show-rec-btn'>不再显示推荐</button> -->\
-            </div>\
-            <div class='rec-box'>\
-                <h3 style='text-align: center'>经典LNMP</h3>\
-                <div class='rec-box-con'>\
-                    <ul class='rec-list'>" + plugin_list + "</ul>\
-                    <div class='onekey'>一键安装</div>\
-                </div>\
-            </div>\
-        </div>",
-            success:function(l,index){
-                $('.rec-box-con .onekey').click(function(){
-                    var post_data = [];
-                    for (var i = 0; i < rdata.length; i++) {
-                        var key_ver = '#select_'+rdata[i]['name'];
-                        var key_checked = '#data_'+rdata[i]['name'];
-
-                        var val_checked = $(key_checked).prop("checked");
-                        if (val_checked){
-
-                            var tmp = {};
-                            var val_key = $(key_ver).val();
-
-                            tmp['version'] = val_key;
-                            tmp['name'] = rdata[i]['name'];
-                            post_data.push(tmp);
-                        }
-                    }
-
-                    $.post('/plugins/init_install', 'list='+JSON.stringify(post_data), function(data){
-                        showMsg(data.msg, function(){
-                            if (data.status){
-                                layer.closeAll();
-                                messageBox();
-                            }
-                        },{ icon: data.status ? 1 : 2 },2000);
-                    },'json');
-                });   
-            },
-            cancel:function(){
-                layer.confirm('是否不再显示推荐安装套件?', {btn : ['确定', '取消'],title: "不再显示推荐?"}, function() {
-                    $.post('/files/create_dir', 'path=/www/server/php', function(rdata) {
-                        layer.closeAll();
-                    },'json');
-                });
-            }
-        });
-    },'json');
-}
-
-function loadKeyDataCount(){
-    var plist = ['mysql', 'gogs', 'gitea'];
-    for (var i = 0; i < plist.length; i++) {
-        pname = plist[i];
-        function call(pname){
-            $.post('/plugins/run', {name:pname, func:'get_total_statistics'}, function(data) {
-                try {
-                    var rdata = $.parseJSON(data['data']);
-                } catch(e){
-                    return;
-                }
-                if (!rdata['status']){
-                    return;
-                }
-                var html = '<li class="sys-li-box col-xs-3 col-sm-3 col-md-3 col-lg-3">\
-                        <p class="name f15 c9">'+pname+'</p>\
-                        <div class="val"><a class="btlink" onclick="softMain(\''+pname+'\',\''+pname+'\',\''+rdata['data']['ver']+'\')">'+rdata['data']['count']+'</a></div>\
-                    </li>';
-                $('#index_overview').append(html);
-            },'json');
-        }
-        call(pname);
-    }
-}
-
-$(function() {
-    $(".mem-release").hover(function() {
-        $(this).addClass("shine_green");
-        if (!($(this).hasClass("mem-action"))) {
-            $(this).find(".mem-re-min").hide();
-            $(this).find(".mask").css({ "color": "#d2edd8" });
-            $(this).find(".mem-re-con").css({ "display": "block" });
-            $(this).find(".mem-re-con").animate({ "top": "0", opacity: 1 });
-            $("#memory").text('内存释放');
-        }
-    }, function() {
-        $(this).removeClass("shine_green");
-        $(this).find(".mask").css({ "color": "#20a53a" });
-        $(this).find(".mem-re-con").css({ "top": "15px", opacity: 1, "display": "none" });
-        $("#memory").text(getCookie("mem-before"));
-        $(this).find(".mem-re-min").hide();
-    }).click(function() {
-        $(this).find(".mem-re-min").hide();
-        if (!($(this).hasClass("mem-action"))) {
-            reMemory();
-            var btlen = $(".mem-release").find(".mask span").text();
-            $(this).addClass("mem-action");
-            $(this).find(".mask").css({ "color": "#20a53a" });
-            $(this).find(".mem-re-con").animate({ "top": "-400px", opacity: 0 });
-            $(this).find(".pie_right .right").css({ "transform": "rotate(3deg)" });
-            for (var i = 0; i < btlen; i++) {
-                setTimeout("rocket(" + btlen + "," + i + ")", i * 30);
-            }
-        }
-    });
-
-    $("select[name='network-io'],select[name='disk-io']").change(function () {
-        var key = $(this).val(), type = $(this).attr('name');
-        if (type == 'network-io') {
-            if (key == 'ALL') {
-                key = '';
-            }
-            setCookie('network_io_key', key);
-        } else {
-            if (key == 'ALL') {
-                key = '';
-            }
-            setCookie('disk_io_key', key);
-        }
-    });
-
-    $('.tabs-nav span').click(function () {
-        var indexs = $(this).index();
-        $(this).addClass('active').siblings().removeClass('active');
-        $('.tabs-content .tabs-item:eq(' + indexs + ')').addClass('tabs-active').siblings().removeClass('tabs-active');
-        $('.tabs-down select:eq(' + indexs + ')').removeClass('hide').siblings().addClass('hide');
-        switch (indexs) {
-        case 0:
-          index.net.table.resize();
-          break;
-        case 1:
-          index.iostat.table.resize();
-          break;
-        }
-    })
-});
-
-var index = {
-    common:{
-        ts:function (m) { return m < 10 ? '0' + m : m },
-        format:function (sjc) {
-            var time = new Date(sjc);
-            var h = time.getHours();
-            var mm = time.getMinutes();
-            var s = time.getSeconds();
-            return h+ ':' + mm + ':' +s;
-        },
-        getTime:function () {
-            var now = new Date();
-            var hour = now.getHours();
-            var minute = now.getMinutes();
-            var second = now.getSeconds();
-            if (minute < 10) {
-                minute = "0" + minute;
-            }
-            if (second < 10) {
-                second = "0" + second;
-            }
-            var nowdate = hour + ":" + minute + ":" + second;
-            return nowdate;
-        },
-    },
-    net: {
-        table: null,
-        data: {
-          xData: [],
-          yData: [],
-          zData: []
-        },
-        default_unit : 'KB/s',
-        init_select : false,
-        init: function(){
-            for (var i = 8; i >= 0; i--) {
-                var time = (new Date()).getTime();
-                index.net.data.xData.push(index.common.format(time - (i * 3 * 1000)));
-                index.net.data.yData.push(0);
-                index.net.data.zData.push(0);
-            }
-
-            index.net.table = echarts.init(document.getElementById('netImg'));
-            var option = index.net.defaultOption();
-            index.net.table.setOption(option);
-
-            window.addEventListener("resize", function () {
-                index.net.table.resize();
-            });
-        },
-        render:function(){
-            index.net.table.setOption({
-                yAxis: {
-                    name:  '单位 '+ index.net.default_unit,
-                    splitLine: { lineStyle: { color: "#eee" } },
-                    axisLine: { lineStyle: { color: "#666" } }
-                },
-                xAxis: {
-                    data: index.net.data.xData
-                },
-                series: [{
-                    name: lan.index.net_up,
-                    data: index.net.data.yData
-                }, {
-                    name: lan.index.net_down,
-                    data: index.net.data.zData
-                }]
-            });
-        },
-        defaultOption:function(){
-            var option = {
-                title: {
-                    text: "",
-                    left: 'center',
-                    textStyle: {
-                        color: '#888888',
-                        fontStyle: 'normal',
-                        fontFamily: "宋体",
-                        fontSize: 16,
-                    }
-                },
-                tooltip: {
-                    trigger: 'axis',
-                    formatter :function (config) {
-                        var _config = config, _tips = "时间：" + _config[0].axisValue + "<br />";
-                        for (var i = 0; i < config.length; i++) {
-                            if (typeof config[i].data == "undefined") {
-                                return false;
-                            }
-                            _tips += '<span style="display: inline-block;width: 10px;height: 10px;border-radius: 50%;background: ' + config[i].color + ';"></span>&nbsp;&nbsp;<span>' + config[i].seriesName + '：' + config[i].data + ' '+ index.net.default_unit + '</span><br />'
-                        }
-                        return _tips;
-                    }
-
-                },
-                legend: {
-                    data: [lan.index.net_up, lan.index.net_down],
-                    bottom: '2%'
-                },
-                xAxis: {
-                    type: 'category',
-                    boundaryGap: false,
-                    data: index.net.data.xData,
-                    axisLine: {
-                        lineStyle: {
-                            color: "#666"
-                        }
-                    }
-                },
-                yAxis: {
-                    name:  '单位 '+ index.net.default_unit,
-                    splitLine: {
-                        lineStyle: { color: "#eee" }
-                    },
-                    axisLine: {
-                        lineStyle: { color: "#666" }
-                    }
-                },
-                series: [{
-                    name: '上行',
-                    type: 'line',
-                    data: index.net.data.yData,
-                    smooth: true,
-                    showSymbol: false,
-                    symbol: 'circle',
-                    symbolSize: 6,
-                    areaStyle: {
-                        normal: {
-                            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                                offset: 0,
-                                color: 'rgba(255, 140, 0,0.5)'
-                            }, {
-                                offset: 1,
-                                color: 'rgba(255, 140, 0,0.8)'
-                            }], false)
-                        }
-                    },
-                    itemStyle: {
-                        normal: {
-                            color: '#f7b851'
-                        }
-                    },
-                    lineStyle: {
-                        normal: {
-                            width: 1
-                        }
-                    }
-                },
-                {
-                    name: '下行',
-                    type: 'line',
-                    data: index.net.data.zData,
-                    smooth: true,
-                    showSymbol: false,
-                    symbol: 'circle',
-                    symbolSize: 6,
-                    areaStyle: {
-                        normal: {
-                            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                                offset: 0,
-                                color: 'rgba(30, 144, 255,0.5)',
-                            }, {
-                                offset: 1,
-                                color: 'rgba(30, 144, 255,0.8)',
-                            }], false)
-                        }
-                    },
-                    itemStyle: {
-                        normal: {
-                            color: '#52a9ff',
-                        }
-                    },
-                    lineStyle: {
-                        normal: {
-                            width: 1,
-                        }
-                    }
-                }]
-            };
-            return option;
-        },
-
-        
-        add: function (up, down) {
-            var _net = this;
-            var limit = 8;
-            var d = new Date()
-            if (_net.data.xData.length >= limit) _net.data.xData.splice(0, 1);
-            if (_net.data.yData.length >= limit) _net.data.yData.splice(0, 1);
-            if (_net.data.zData.length >= limit) _net.data.zData.splice(0, 1);
-
-            _net.data.xData.push(d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds());
-
-            if (up>down){
-                var upTmp = toSizePos(up);
-                var upTmpSize = upTmp['name'].split(' ')[0];
-                index.net.default_unit = upTmp['name'].split(' ')[1] + '/s';
-
-                var downTmpSize = toSizePos(down,upTmp['pos'])['name'].split(' ')[0];
-                // console.log('up',upTmp['pos'],toSizePos(down, upTmp['pos']),downTmpSize);
-
-                _net.data.zData.push(downTmpSize);
-                _net.data.yData.push(upTmpSize);
-            } else {
-
-                var downTmp = toSizePos(down);
-                var downTmpSize = downTmp['name'].split(' ')[0];
-                index.net.default_unit = downTmp['name'].split(' ')[1] + '/s';
-
-                var upTmpSize = toSizePos(up, downTmp['pos'])['name'].split(' ')[0];
-                // console.log('down',downTmp['pos'],toSizePos(up, downTmp['pos']),upTmpSize);
-
-                _net.data.zData.push(downTmpSize);
-                _net.data.yData.push(upTmpSize);
-            }
-            
-        },
-        renderSelect:function(net){
-            // console.log(net);
-            if (!index.net.init_select){
-                var option = '';
-                var network = net.network;
-                var network_io_key = getCookie('network_io_key');
-
-                for (var name in network) {
-                    if (name == 'ALL'){
-                        option += '<option value="'+name+'">全部</option>';
-                    } else if (network_io_key == name){
-                        option += '<option value="'+name+'" selected>'+name+'</option>';
-                    } else {
-                        option += '<option value="'+name+'">'+name+'</option>';
-                    }
-                }
-                $('select[name="network-io"]').html(option);
-                index.net.init_select = true;
-            }
-        }
-    },
-
-    iostat:{
-        table: null,
-        data: {
-          xData: [],
-          yData: [],
-          zData: [],
-          tipsData: []
-        },
-        init_select:false,
-        default_unit : 'MB/s',
-        init:function(){
-            for (var i = 8; i >= 0; i--) {
-                var time = (new Date()).getTime();
-                index.iostat.data.xData.push(index.common.format(time - (i * 3 * 1000)));
-                index.iostat.data.yData.push(0);
-                index.iostat.data.zData.push(0);
-                index.iostat.data.tipsData.push({});
-            }
-
-            index.iostat.table = echarts.init(document.getElementById('ioStat'));
-            var option = index.iostat.defaultOption();
-            index.iostat.table.setOption(option);
-
-            window.addEventListener("resize", function () {
-                index.iostat.table.resize();
-            });
-        },
-
-        render:function(){
-            index.iostat.table.setOption({
-                tooltip: {
-                    trigger: 'axis',
-                    formatter :function (config) {
-                        var _config = config, _tips = "时间：" + _config[0].axisValue + "<br />", options = {
-                            read_bytes: '读取字节数',
-                            read_count: '读取次数 ',
-                            read_merged_count: '合并读取次数',
-                            read_time: '读取延迟',
-                            write_bytes: '写入字节数',
-                            write_count: '写入次数',
-                            write_merged_count: '合并写入次数',
-                            write_time: '写入延迟',
-                        }, data = index.iostat.data.tipsData[config[0].dataIndex], list = ['read_count', 'write_count', 'read_merged_count', 'write_merged_count', 'read_time', 'write_time',];
-                        for (var i = 0; i < config.length; i++) {
-                            if (typeof config[i].data == "undefined") {
-                                return false;
-                            }
-                            _tips += '<span style="display: inline-block;width: 10px;height: 10px;border-radius: 50%;background: ' + config[i].color + ';"></span>&nbsp;&nbsp;<span>' + config[i].seriesName + '：' + config[i].data + ' MB/s' + '</span><br />'
-                        }
-                        $.each(list, function (index, item) {
-
-                            if (typeof data[item] != 'undefined'){
-                                _tips += '<span style="display: inline-block;width: 10px;height: 10px;"></span>&nbsp;&nbsp;<span style="' + (item.indexOf('time') > -1 ? ('color:' + ((data[item] > 100 && data[item] < 1000) ? '#ff9900' : (data[item] >= 1000 ? 'red' : '#20a53a'))) : '') + '">' + options[item] + '：' + data[item] + (item.indexOf('time') > -1 ? ' ms' : ' 次/秒') + '</span><br />';
-                            }
-                        })
-                        return _tips;
-                    }
-                },
-                yAxis: {
-                    name:  '单位 '+ index.iostat.default_unit,
-                    splitLine: { lineStyle: { color: "#eee" } },
-                    axisLine: { lineStyle: { color: "#666" } }
-                },
-                xAxis: {
-                    data: index.iostat.data.xData
-                },
-                series: [{
-                    name: "读取",
-                    data: index.iostat.data.yData
-                }, {
-                    name: "写入",
-                    data: index.iostat.data.zData
-                }]
-            });
-        },
-        defaultOption:function(){
-            var option = {
-                title: {
-                    text: "",
-                    left: 'center',
-                    textStyle: {
-                        color: '#888888',
-                        fontStyle: 'normal',
-                        fontFamily: "宋体",
-                        fontSize: 16,
-                    }
-                },
-                tooltip: {
-                    trigger: 'axis'
-                },
-                legend: {
-                    data: ["读取", "写入"],
-                    bottom: '2%'
-                },
-                xAxis: {
-                    type: 'category',
-                    boundaryGap: false,
-                    data: index.iostat.data.xData,
-                    axisLine: {
-                        lineStyle: {
-                            color: "#666"
-                        }
-                    }
-                },
-                yAxis: {
-                    name:  '单位 '+ index.iostat.default_unit,
-                    splitLine: {
-                        lineStyle: { color: "#eee" }
-                    },
-                    axisLine: {
-                        lineStyle: { color: "#666" }
-                    }
-                },
-                series: [{
-                    name: '读取',
-                    type: 'line',
-                    data: index.iostat.data.yData,
-                    smooth: true,
-                    showSymbol: false,
-                    symbol: 'circle',
-                    areaStyle: {
-                        normal: {
-                            color: 'rgb(255, 70, 131)'
-                        }
-                    },
-                    itemStyle: {
-                        normal: {
-                            color: 'rgb(255, 70, 131)'
-                        }
-                    },
-                    lineStyle: {
-                        normal: {
-                            width: 1,
-                        }
-                    }
-                },
-                {
-                    name: '写入',
-                    type: 'line',
-                    data: index.iostat.data.zData,
-                    smooth: true,
-                    showSymbol: false,
-                    symbol: 'circle',
-                    symbolSize: 6,
-                    areaStyle: {
-                        normal: {
-                            color: 'rgba(46, 165, 186, .7)'
-                        }
-                    },
-                    itemStyle: {
-                        normal: {
-                            color: 'rgba(46, 165, 186, .7)'
-                        }
-                    },
-                    lineStyle: {
-                        normal: {
-                            width: 1,
-                        }
-                    }
-                }]
-            };
-            return option;
-        },
-
-        renderSelect:function(data){
-            if (!index.iostat.init_select){
-                var option = '';
-                var iostat = data.iostat;
-                var disk_io_key = getCookie('disk_io_key');
-
-                for (var name in iostat) {
-                    if (name == 'ALL'){
-                        option += '<option value="'+name+'">全部</option>';
-                    } else if (disk_io_key == name){
-                        option += '<option value="'+name+'" selected>'+name+'</option>';
-                    } else {
-                        option += '<option value="'+name+'">'+name+'</option>';
-                    }
-                }
-                $('select[name="disk-io"]').html(option);
-                index.iostat.init_select = true;
-            }
-        },
-        add: function (read, write, data) {
-            var _iostat = this;
-            var limit = 8;
-            var d = new Date()
-            if (_iostat.data.xData.length >= limit) _iostat.data.xData.splice(0, 1);
-            if (_iostat.data.yData.length >= limit) _iostat.data.yData.splice(0, 1);
-            if (_iostat.data.zData.length >= limit) _iostat.data.zData.splice(0, 1);
-            if (_iostat.data.tipsData.length >= limit) _iostat.data.tipsData.splice(0, 1);
-
-
-            var readTmpSize = toSizeMB(read).split(' ')[0];
-            var writeTmpSize = toSizeMB(write).split(' ')[0];
-
-            _iostat.data.zData.push(writeTmpSize);
-            _iostat.data.yData.push(readTmpSize);
-            _iostat.data.tipsData.push(data);
-            _iostat.data.xData.push(d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds());
-        },
-
-    },
-    getData:function(){
-
-        $.get("/system/network", function(net) {
-
-            //网络IO
-            var network_io_key = getCookie('network_io_key');
-            var network_data = net.network;
-            var network_select = network_data['ALL'];
-            if (network_io_key && network_io_key != ''){
-                network_select = network_data[network_io_key];
-            }
-
-            index.net.add(network_select.up,network_select.down);
-            index.net.render();
-            index.net.renderSelect(net);
-
-            $("#upSpeed").html(toSize(network_select.up));
-            $("#downSpeed").html(toSize(network_select.down));
-
-            $("#downAll").html(toSize(network_select.downTotal));
-            $("#downAll").attr('title','数据包:' + network_select.downPackets)
-            $("#upAll").html(toSize(network_select.upTotal));
-            $("#upAll").attr('title','数据包:' + network_select.upPackets)
-
-
-            //磁盘IO
-            var disk_io_key = getCookie('disk_io_key');
-            var iostat_data = net.iostat;
-            var iostat_select = iostat_data['ALL'];
-            if (disk_io_key && disk_io_key != ''){
-                iostat_select = iostat_data[disk_io_key];
-            }
-
-            index.iostat.add(iostat_select.read_bytes,iostat_select.write_bytes, iostat_select);
-            index.iostat.render();
-            index.iostat.renderSelect(net);
-
-            $("#readBytes").html(toSize(iostat_select.read_bytes));
-            $("#writeBytes").html(toSize(iostat_select.write_bytes));
-            $("#diskIops").html(iostat_select.read_count+":"+iostat_select.write_count+ " 次");
-            $("#diskTime").html(iostat_select.read_time+":"+iostat_select.write_time +" ms");
-
-
-            $("#core").html(net.cpu[1] + " " + lan.index.cpu_core);
-            $("#state").html(net.cpu[0]);
-            
-            setcolor(net.cpu[0], "#state", 30, 70, 90);
-            //负载
-            getLoad(net.load);
-            //内存
-            setMemImg(net.mem);
-            //绑定hover事件
-            setImg();
-            showCpuTips(net);
-
-        },'json');
-    },
-    task:function(){
-        // index.getData();
-        setInterval(function() {
-            index.getData();
-        }, 3000);
-    },
-    init: function(){
-        index.net.init();
-        index.iostat.init();
-        index.task();
-    }
-}
diff --git a/route/static/app/logs.js b/route/static/app/logs.js
deleted file mode 100644
index c61f3d7b1..000000000
--- a/route/static/app/logs.js
+++ /dev/null
@@ -1,205 +0,0 @@
-
-$(document).ready(function(){
-   logsLoad();
-});
-
-function changeLogsViewH(){
-    var l = $(window).height();
-    $('.container-fluid .tab-view-box').css('height',l-80-40);
-
-    $('#panelLogs').css('height',l-80-40-50);
-
-    $('#logAudit .logAuditTab').css('height',l-80-40-50);
-    $('#logAudit .logAuditContent').css('height',l-80-40-50);
-
-}
-
-function logsLoad(){
-    changeLogsViewH();
-    $(window).resize(function(){
-        changeLogsViewH();
-    });
-
-    getLogs(1);
-}
-
-
-
-$('#cutTab .tabs-item').click(function(){
-	var type = $(this).data('name');
-
-	$('#cutTab .tabs-item').removeClass('active');
-	$(this).addClass('active');
-
-
-	$('.tab-view-box .tab-con').addClass('hide').removeClass('show').removeClass('w-full');
-	$('#'+type).addClass('show').addClass('w-full');
-
-	switch(type){
-	case 'panelLogs':
-		getLogs(1);
-		break;
-	case 'logAudit':
-		getAuditLogsFiles();
-		break;
-	}
-
-});
-
-
-$('#panelLogs .refresh').click(function(){
-	getLogs(1);
-});
-
-$('#panelLogs .clear').click(function(){
-	delLogs(1);
-});
-
-
-function getAuditLogsFiles(){
-	var loadT = layer.msg('正在获取日志审计列表...', { icon: 16, time: 0, shade: 0.3 });
-	$.post('/logs/get_audit_logs_files',{}, function(data) {
-		layer.close(loadT);
-        var option = '';
-        for (var i = 0; i < data.length; i++) {
-        	var tip = data[i]['name'] +' - '+data[i]['title'] + '(' + toSize(data[i]['size']) + ')';
-        	if (i==0){
-        		option += '<div class="logAuditItem active" title="'+tip+'" data-file="'+data[i]['name']+'">'+tip+'</div>';
-        	} else {
-        		option += '<div class="logAuditItem" title="'+tip+'" data-file="'+data[i]['name']+'">'+tip+'</div>';
-        	}
-        }
-        $("#logAudit .logAuditTab").html(option);
-
-        getAuditFile(data[0]['name']);
-        $('#logAudit .logAuditItem').click(function(){
-        	$('#logAudit .logAuditItem').removeClass('active');
-        	$(this).addClass('active');
-        	getAuditFile($(this).data('file'));
-        });
-
-	},'json');
-}
-
-
-function getAuditFile(log_name){
-	var loadT = layer.msg('正在获取日志审计内容...', { icon: 16, time: 0, shade: 0.3 });
-	$.post('/logs/get_audit_file',{log_name:log_name}, function(data) {
-		layer.close(loadT);
-		// console.log(data);
-		try{
-            if (typeof(data) == 'object'){
-            	var plist = data.data;
-
-            	var pre_html  ='<div id="logAuditTable" style="position: relative;display: block;">\
-							<div class="tootls_group tootls_top">\
-								<div class="pull-left">\
-									<button type="button" title="刷新列表" class="refresh btn btn-success btn-sm mr5"><span>刷新列表</span></button>\
-								</div>\
-								<!-- <div class="pull-right">\
-									<div class="logs_search" style="position: relative;">\
-										<input type="text" class="search_input" style="" placeholder="请输入来源/端口/角色/事件">\
-										<span class="glyphicon glyphicon-search" aria-hidden="true"></span>\
-									</div>\
-								</div> --> \
-							</div>\
-							<div class="divtable mtb10" style="max-height: 83px;">\
-								<table class="table table-hover">\
-									<thead style="position: relative;z-index: 1;">\
-										<tr>\
-											<th><span data-index="0"><span>用户</span></span></th>\
-											<th><span data-index="1"><span>来源</span></span></th>\
-											<th><span data-index="2"><span>端口</span></span></th>\
-											<th><span data-index="3"><span>时间</span></span></th>\
-										</tr>\
-									</thead>\
-									<tbody>\
-										<tr><td><span>root</span></td>\
-											<td><span>117.139.193.29</span></td>\
-											<td><span>pts/0</span></td>\
-											<td><span>2023-08-25 13:27 still logged in</span></td>\
-										</tr>\
-									</tbody>\
-								</table>\
-							</div>\
-							<div class="tootls_group tootls_bottom">\
-								<div class="pull-left"></div>\
-								<div class="pull-right">\
-								</div>\
-							</div>\
-						</div>'
-
-            	// var pre_html = '<table class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0">\
-			    //         <thead><tr><th>时间</th><th>角色</th><th>事件</th></tr></thead>\
-			    //         <tbody></tbody>\
-			    //     </table>';
-			    $('#logAudit .logAuditContent').html(pre_html);
-
-			    if (plist.length>0){
-			        var tmp = plist[0];
-			        var thead = '';
-			        tbody += '<tr>'
-			        for (var i in tmp) {
-			            tbody+='<th>'+ i + '</th>';
-			        }
-			        tbody += '</tr>';
-			        $('#logAudit .logAuditContent thead').html(tbody);
-			    }
-			    
-
-			    var tbody = '';
-			    for (var i = 0; i < plist.length; i++) {
-			        tbody += '<tr>';
-			        for (var vv in plist[i]) {
-			            tbody+= '<td>'+ plist[i][vv] + '</td>'
-			        }
-			        tbody += '</tr>';
-			    }
-			    $('#logAudit .logAuditContent tbody').html(tbody);
-
-			    $('#logAudit .refresh').click(function(){
-			    	getAuditFile(log_name);
-			    });
-            }
-
-            if (typeof(data) == 'string'){
-            	var cc = '<div id="logAuditPre">\
-            		<pre style="height: 100%; background-color: rgb(51, 51, 51); color: rgb(255, 255, 255); overflow-x: hidden; overflow-wrap: break-word; white-space: pre-wrap;"><code>'+data+'</code></pre>\
-            	</div>';
-                $('#logAudit .logAuditContent').html(cc);
-            }
-        } catch (e) {
-            layer.msg(str(e),{icon:2,time:10000,shade: [0.3, '#000']});
-        }
-	});
-}
-
-function getLogs(page,search) {
-	search = search == undefined ? '':search;
-	var loadT = layer.load();
-	$.post('/logs/get_log_list','limit=10&p=' + page+"&search="+search, function(data) {
-		layer.close(loadT);
-		var body = '';
-		for (var i = 0; i < data.data.length; i++) {
-			body += "<tr>\
-						<td><em class='dlt-num'>" + data.data[i].id + "</em></td>\
-						<td>" + data.data[i].type + "</td>\
-						<td>" + data.data[i].log + "</td>\
-						<td>" + data.data[i].addtime + "</td>\
-					</tr>";
-		}
-		$("#operationLog tbody").html(body);
-		$("#panelLogs .page").html(data.page);
-	},'json');
-}
-
-function delLogs(){
-	layer.confirm('即将清空面板日志，继续吗？',{title:'清空日志',closeBtn:2},function(){
-		var loadT = layer.msg('正在清理,请稍候...',{icon:16});
-		$.post('/logs/del_panel_logs','',function(rdata){
-			layer.close(loadT);
-			layer.msg(rdata.msg,{icon:rdata.status?1:2});
-			getLogs(1);
-		},'json');
-	});
-}
\ No newline at end of file
diff --git a/route/static/app/public.js b/route/static/app/public.js
deleted file mode 100755
index 56fb17891..000000000
--- a/route/static/app/public.js
+++ /dev/null
@@ -1,2784 +0,0 @@
-
-$(document).ready(function() {
-	$(".sub-menu a.sub-menu-a").click(function() {
-		$(this).next(".sub").slideToggle("slow").siblings(".sub:visible").slideUp("slow");
-	});
-});
-
-function toSize(a) {
-	var d = [" B", " KB", " MB", " GB", " TB", " PB"];
-	var e = 1024;
-	for(var b = 0; b < d.length; b++) {
-		if(a < e) {
-			return(b == 0 ? a : a.toFixed(2)) + d[b]
-		}
-		a /= e;
-	}
-}
-
-function toSizePos(a, pos = 0) {
-	var d = [" B", " KB", " MB", " GB", " TB", " PB"];
-	var e = 1024;
-	var r = {};
-	for(var b = 0; b < d.length; b++) {
-		if (pos > 0){
-			if (b == pos){
-				r['name'] = (b == 0 ? a : a.toFixed(2)) + d[b];
-				r['pos'] = b;
-				return r
-			}
-		} else {
-			if( a < e) {
-				r['name'] = (b == 0 ? a : a.toFixed(2)) + d[b];
-				r['pos'] = b;
-				return r
-			}
-		}
-		a /= e;
-	}
-}
-
-function toSizeMB(a) {
-	var d = [" KB", " MB"];
-	var e = 1024;
-	var i = 0;
-	for(var b = 0; b < d.length; b++) {
-		a /= e;
-		i = b;
-	}
-	return a.toFixed(2) + d[i]
-}
-
-function toTrim(x) {
-    return x.replace(/^\s+|\s+$/gm,'');
-}
-
-function inArray(f, arr){
-	for (var i = 0; i < arr.length; i++) {
-		if (f == arr[i]) {
-			return true;
-		}
-	}
-	return false;
-}
-
-//表格头固定
-function tableFixed(name) {
-    var tableName = document.querySelector('#' + name);
-    tableName.addEventListener('scroll', scrollHandle);
-}
-
-function escapeHTML(a){
-    a = "" + a;
-    return a.replace(/&/g, "&amp;").replace(/</g, "&lt;").
-    replace(/>/g, "&gt;").replace(/"/g, '&quot;').
-    replace(/'/g,"‘").replace(/\(/g,"&#40;").replace(/\&#60;/g,"&lt;").
-    replace(/\&#62;/g,"&gt;").replace(/`/g,"&#96;").replace(/=/g,"＝");
-}
-
-function scrollHandle(e) {
-    var scrollTop = this.scrollTop;
-    //this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)';
-    $(this).find("thead").css({ "transform": "translateY(" + scrollTop + "px)", "position": "relative", "z-index": "1" });
-}
-
-
-//转换单们到MB
-function toSizeM(byteLen) {
-    var a = parseInt(byteLen) / 1024 / 1024;
-    return a || 0;
-}
-
-//字节单位转换MB
-function toSizeG(bytes){
-	var c = 1024 * 1024;
-	var b = 0;
-	if(bytes > 0){
-		var b = (bytes/c).toFixed(2);
-	}
-	return b;
-}
-
-//to unixtime
-function toUnixTime(txt){
-        var unix = new Date(Date.parse(txt.replace(/-/g,'/'))).getTime();
-        return unix/1000;
-    }
-
-function randomStrPwd(b) {
-	b = b || 32;
-	// &!@%
-	var c = "AaBbCcDdEeFfGHhiJjKkLMmNnPpRSrTsWtXwYxZyz2345678";
-	var a = c.length;
-	var d = "";
-	for(i = 0; i < b; i++) {
-		d += c.charAt(Math.floor(Math.random() * a))
-	}
-	return d
-}
-
-function getRandomString(len) {
-	len = len || 32;
-	var chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678'; // 默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1  
-	var maxPos = chars.length;
-	var pwd = '';
-	for (i = 0; i < len; i++) {
-		pwd += chars.charAt(Math.floor(Math.random() * maxPos));
-	}
-	return pwd;
-}
-
-//验证IP地址
-function isValidIP(ip) {
-    var reg = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
-    return reg.test(ip);
-}
-
-function isContains(str, substr) {
-    return str.indexOf(substr) >= 0;
-}
-
-
-function filterPath(path){
-	var path_arr = path.split('/');
-	var path_new = [];
-	for (var i = 0; i < path_arr.length; i++) {
-		if (path_arr[i]!=''){
-			path_new.push(path_arr[i]);
-		}
-	}
-	var rdata = "/"+path_new.join('/');
-	return rdata;
-}
-
-function msgTpl(msg, args){
-	if (typeof args == 'string'){
-		return msg.replace('{1}', args);
-	} else if (typeof args == 'object'){
-		for (var i = 0; i < args.length; i++) {
-			rep = '{' + (i + 1) + '}';
-			msg = msg.replace(rep, args[i]);
-		}	
-	}
-	return msg;
-}
-
-function refresh() {
-	window.location.reload()
-}
-
-function mwsPost(path, args, callback){
-	$.post(path, args, function(rdata){
-		if(typeof(callback) == 'function'){
-			callback(rdata);
-		}
-	},'json');
-}
-
-function syncPost(path, args){
-	var retData;
-	 $.ajax({
-		type : 'post',
-		url : path,  
-		data : args,  
-		async : false,  
-		dataType:'json',
-		success : function(data){  
-        	retData = data;
-		} 
-    });
-	return retData;
-}
-
-function repeatPwd(a) {
-	$("#MyPassword").val(randomStrPwd(a))
-}
-
-$(".menu-icon").click(function() {
-	$(".sidebar-scroll").toggleClass("sidebar-close");
-	$(".main-content").toggleClass("main-content-open");
-	if($(".sidebar-close")) {
-		$(".sub-menu").find(".sub").css("display", "none");
-	}
-});
-
-var Upload, percentage;
-Date.prototype.format = function(b) {
-	var c = {
-		"M+": this.getMonth() + 1,
-		"d+": this.getDate(),
-		"h+": this.getHours(),
-		"m+": this.getMinutes(),
-		"s+": this.getSeconds(),
-		"q+": Math.floor((this.getMonth() + 3) / 3),
-		S: this.getMilliseconds()
-	};
-	if(/(y+)/.test(b)) {
-		b = b.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length))
-	}
-	for(var a in c) {
-		if(new RegExp("(" + a + ")").test(b)) {
-			b = b.replace(RegExp.$1, RegExp.$1.length == 1 ? c[a] : ("00" + c[a]).substr(("" + c[a]).length))
-		}
-	}
-	return b
-};
-
-function getLocalTime(a) {
-	a = a.toString();
-	if(a.length > 10) {
-		a = a.substring(0, 10)
-	}
-	return new Date(parseInt(a) * 1000).format("yyyy/MM/dd hh:mm:ss")
-}
-
-function getFormatTime(tm, format) {
-	if (format == undefined) format = "yyyy/MM/dd hh:mm:ss";
-	tm = tm.toString();
-	if (tm.length > 10) {
-	  tm = tm.substring(0, 10);
-	}
-	var data = new Date(parseInt(tm) * 1000);
-	var o = {
-	  "M+": data.getMonth() + 1, //month
-	  "d+": data.getDate(), //day
-	  "h+": data.getHours(), //hour
-	  "m+": data.getMinutes(), //minute
-	  "s+": data.getSeconds(), //second
-	  "q+": Math.floor((data.getMonth() + 3) / 3), //quarter
-	  "S": data.getMilliseconds() //millisecond
-	}
-	if (/(y+)/.test(format)) format = format.replace(RegExp.$1,
-	    (data.getFullYear() + "").substr(4 - RegExp.$1.length));
-	for (var k in o)
-	  if (new RegExp("(" + k + ")").test(format))
-	    format = format.replace(RegExp.$1,RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
-	return format;
-}
-
-
-
-function changePathCallback(default_dir, callback) {
-
-	var c = layer.open({
-		type: 1,
-		area: "650px",
-		title: '选择目录',
-		closeBtn: 1,
-		shift: 5,
-		shadeClose: false,
-		content: "<div class='changepath'>\
-					<div class='path-top'>\
-						<button type='button' class='btn btn-default btn-sm' onclick='backFile()'>\
-							<span class='glyphicon glyphicon-share-alt'></span>返回\
-						</button>\
-						<div class='place' id='PathPlace'>当前路径：<span></span></div>\
-					</div>\
-					<div class='path-con'>\
-						<div class='path-con-left'>\
-						<dl><dt id='changecomlist' onclick='backMyComputer()'>计算机</dt></dl>\
-						</div>\
-						<div class='path-con-right'>\
-							<ul class='default' id='computerDefautl'></ul>\
-							<div class='file-list divtable'>\
-								<table class='table table-hover' style='border:0 none'>\
-									<thead>\
-										<tr class='file-list-head'>\
-											<th width='40%'>文件名</th>\
-											<th width='20%'>修改时间</th>\
-											<th width='10%'>权限</th>\
-											<th width='10%'>所有者</th>\
-											<th width='10%'></th>\
-										</tr>\
-									</thead>\
-									<tbody id='tbody' class='list-list'></tbody>\
-								</table>\
-							</div>\
-						</div>\
-					</div>\
-				</div>\
-				<div class='getfile-btn' style='margin-top:0'>\
-					<button type='button' class='btn btn-default btn-sm pull-left' onclick='createFolder()'>新建文件夹</button>\
-					<button type='button' class='btn btn-danger btn-sm mr5 btn-close'>关闭</button>\
-					<button type='button' class='btn btn-success btn-sm btn-choose'>选择</button>\
-				</div>",
-		success:function(layero,layer_index){
-			$('.btn-close').click(function(){
-				layer.close(layer_index);
-			});
-
-			$('.btn-choose').click(function(){
-				var a = $("#PathPlace").find("span").text();
-				a = a.replace(new RegExp(/(\\)/g), "/");
-				a_len = a.length;
-				if (a[a_len-1] == '/'){
-					a = a.substr(0,a_len-1);
-				}
-				callback(a);
-				layer.close(layer_index);
-			});
-		}
-	});
-	getDiskList(default_dir);
-	activeDisk();
-}
-
-function changePath(d) {
-	setCookie('SetId', d);
-	setCookie('SetName', '');
-	var c = layer.open({
-		type: 1,
-		area: "650px",
-		title: '选择目录',
-		closeBtn: 1,
-		shift: 5,
-		shadeClose: false,
-		content: "\
-			<div class='changepath'>\
-				<div class='path-top'>\
-					<button type='button' class='btn btn-default btn-sm' onclick='backFile()'><span class='glyphicon glyphicon-share-alt'></span>返回</button>\
-					<div class='place' id='PathPlace'>当前路径：<span></span></div>\
-				</div>\
-				<div class='path-con'>\
-					<div class='path-con-left'><dl><dt id='changecomlist' onclick='backMyComputer()'>计算机</dt></dl></div>\
-					<div class='path-con-right'>\
-						<ul class='default' id='computerDefautl'></ul>\
-						<div class='file-list divtable'>\
-							<table class='table table-hover' style='border:0 none'>\
-								<thead>\
-									<tr class='file-list-head'>\
-										<th width='40%'>文件名</th>\
-										<th width='20%'>修改时间</th>\
-										<th width='10%'>权限</th>\
-										<th width='10%'>所有者</th>\
-										<th width='10%'></th>\
-									</tr>\
-								</thead>\
-								<tbody id='tbody' class='list-list'></tbody>\
-							</table>\
-						</div>\
-					</div>\
-				</div>\
-			</div>\
-			<div class='getfile-btn' style='margin-top:0'>\
-				<button type='button' class='btn btn-default btn-sm pull-left' onclick='createFolder()'>新建文件夹</button>\
-				<button type='button' class='btn btn-danger btn-sm mr5' onclick=\"layer.close(getCookie('changePath'))\">关闭</button>\
-				<button type='button' class='btn btn-success btn-sm' onclick='getfilePath()'>选择</button>\
-			</div>"
-	});
-	setCookie("changePath", c);
-	var b = $("#" + d).val();
-	tmp = b.split(".");
-	if(tmp[tmp.length - 1] == "gz") {
-		tmp = b.split("/");
-		b = "";
-		for(var a = 0; a < tmp.length - 1; a++) {
-			b += "/" + tmp[a]
-		}
-		setCookie("SetName", tmp[tmp.length - 1])
-	}
-	b = b.replace(/\/\//g, "/");
-	getDiskList(b);
-	activeDisk();
-}
-
-function getDiskList(b) {
-	var d = "";
-	var a = "";
-	var c = "path=" + b + "&disk=True";
-	$.post("/files/get_dir", c, function(h) {
-		if(h.DISK != undefined) {
-			for(var f = 0; f < h.DISK.length; f++) {
-				a += "<dd onclick=\"getDiskList('" + h.DISK[f].path + "')\"><span class='glyphicon glyphicon-hdd'></span>&nbsp;" + h.DISK[f].path + "</dd>"
-			}
-			$("#changecomlist").html(a)
-		}
-		for(var f = 0; f < h.DIR.length; f++) {
-			var g = h.DIR[f].split(";");
-			var e = g[0];
-		
-			if(isChineseChar(e)) {
-				if(e.length > 10) {
-					e = e.substring(0, 10) + "...";
-				}
-			} else{
-				if(e.length > 20) {
-					e = e.substring(0, 20) + "...";
-				}
-			}
-
-			d += "<tr>\
-				<td onclick=\"getDiskList('" + h.PATH + "/" + g[0] + "')\" title='" + g[0] + "'>\
-					<span class='glyphicon glyphicon-folder-open'></span>" + e + "</td><td>" + getLocalTime(g[2]) + "</td>\
-				<td>" + g[3] + "</td>\
-				<td>" + g[4] + "</td>\
-				<td><span class='delfile-btn' onclick=\"NewDelFile('" + h.PATH + "/" + g[0] + "')\">X</span></td>\
-			</tr>";
-		}
-		if(h.FILES != null && h.FILES != "") {
-			for(var f = 0; f < h.FILES.length; f++) {
-				var g = h.FILES[f].split(";");
-				var e = g[0];
-				if(isChineseChar(e)) {
-					if(e.length > 10) {
-						e = e.substring(0, 10) + "..."
-					}
-				} else{
-					if(e.length > 20) {
-						e = e.substring(0, 20) + "..."
-					}
-				}
-
-				d += "<tr>\
-					<td title='" + g[0] + "'><span class='glyphicon glyphicon-file'></span>" + e + "</td>\
-					<td>" + getLocalTime(g[2]) + "</td>\
-					<td>" + g[3] + "</td>\
-					<td>" + g[4] + "</td>\
-					<td></td>\
-				</tr>";
-			}
-		}
-		$(".default").hide();
-		$(".file-list").show();
-		$("#tbody").html(d);
-		if(h.PATH.substr(h.PATH.length - 1, 1) != "/") {
-			h.PATH += "/";
-		}
-		$("#PathPlace").find("span").html(h.PATH);
-		activeDisk();
-		return;
-	},'json');
-}
-
-function createFolder() {
-	var a = "<tr>\
-		<td colspan='2'><span class='glyphicon glyphicon-folder-open'></span><input id='newFolderName' class='newFolderName' type='text' value=''></td>\
-		<td colspan='3'><button id='nameOk' type='button' class='btn btn-success btn-sm'>确定</button>\
-			&nbsp;&nbsp;<button id='nameNOk' type='button' class='btn btn-default btn-sm'>取消</button></td>\
-		</tr>";
-	if($("#tbody tr").length == 0) {
-		$("#tbody").append(a)
-	} else {
-		$("#tbody tr:first-child").before(a)
-	}
-	$(".newFolderName").focus();
-	$("#nameOk").click(function() {
-		var c = $("#newFolderName").val();
-		var b = $("#PathPlace").find("span").text();
-		newTxt = b.replace(new RegExp(/(\/\/)/g), "/") + c;
-		var d = "path=" + newTxt;
-		$.post("/files/create_dir", d, function(e) {
-			if(e.status == true) {
-				layer.msg(e.msg, {
-					icon: 1
-				})
-			} else {
-				layer.msg(e.msg, {
-					icon: 2
-				})
-			}
-			getDiskList(b);
-		},'json');
-	});
-	$("#nameNOk").click(function() {
-		$(this).parents("tr").remove()
-	})
-}
-
-function NewDelFile(c) {
-	var a = $("#PathPlace").find("span").text();
-	newTxt = c.replace(new RegExp(/(\/\/)/g), "/");
-	var b = "path=" + newTxt + "&empty=True";
-	$.post("/files/delete_dir", b, function(d) {
-		if(d.status == true) {
-			layer.msg(d.msg, {
-				icon: 1
-			})
-		} else {
-			layer.msg(d.msg, {
-				icon: 2
-			})
-		}
-		getDiskList(a);
-	},'json');
-}
-
-function activeDisk() {
-	var a = $("#PathPlace").find("span").text().substring(0, 1);
-	switch(a) {
-		case "C":
-			$(".path-con-left dd:nth-of-type(1)").css("background", "#eee").siblings().removeAttr("style");
-			break;
-		case "D":
-			$(".path-con-left dd:nth-of-type(2)").css("background", "#eee").siblings().removeAttr("style");
-			break;
-		case "E":
-			$(".path-con-left dd:nth-of-type(3)").css("background", "#eee").siblings().removeAttr("style");
-			break;
-		case "F":
-			$(".path-con-left dd:nth-of-type(4)").css("background", "#eee").siblings().removeAttr("style");
-			break;
-		case "G":
-			$(".path-con-left dd:nth-of-type(5)").css("background", "#eee").siblings().removeAttr("style");
-			break;
-		case "H":
-			$(".path-con-left dd:nth-of-type(6)").css("background", "#eee").siblings().removeAttr("style");
-			break;
-		default:
-			$(".path-con-left dd").removeAttr("style")
-	}
-}
-
-function backMyComputer() {
-	$(".default").show();
-	$(".file-list").hide();
-	$("#PathPlace").find("span").html("");
-	activeDisk();
-}
-
-function backFile() {
-	var c = $("#PathPlace").find("span").text();
-	if(c.substr(c.length - 1, 1) == "/") {
-		c = c.substr(0, c.length - 1)
-	}
-	var d = c.split("/");
-	var a = "";
-	if(d.length > 1) {
-		var e = d.length - 1;
-		for(var b = 0; b < e; b++) {
-			a += d[b] + "/"
-		}
-		getDiskList(a.replace("//", "/"))
-	} else {
-		a = d[0]
-	}
-	if(d.length == 1) {}
-}
-
-function getfilePath() {
-	var a = $("#PathPlace").find("span").text();
-	a = a.replace(new RegExp(/(\\)/g), "/");
-	a_len = a.length;
-	if (a[a_len-1] == '/'){
-		a = a.substr(0,a_len-1);
-	}
-
-	$("#" + getCookie("SetId")).val(a + getCookie("SetName"));
-	layer.close(getCookie("changePath"));
-	return a;
-}
-
-function setCookie(a, c) {
-	var b = 30;
-	var d = new Date();
-	d.setTime(d.getTime() + b * 24 * 60 * 60 * 1000);
-	document.cookie = a + "=" + escape(c) + ";path=/;expires=" + d.toGMTString();
-}
-
-function getCookie(b) {
-	var a, c = new RegExp("(^| )" + b + "=([^;]*)(;|$)");
-	if(a = document.cookie.match(c)) {
-		return unescape(a[2])
-	} else {
-		return null
-	}
-}
-
-function autoHeight() {
-	var a = $("body").height() - 40;
-	$(".main-content").css("min-height", a);
-}
-
-function showMsg(msg, callback ,icon, time){
-
-	if (typeof time == 'undefined'){
-		time = 2000;
-	}
-
-	if (typeof icon == 'undefined'){
-		icon = {};
-	}
-
-	var loadT = layer.msg(msg, icon);
-	setTimeout(function() {
-		layer.close(loadT);
-		if (typeof callback == 'function'){
-			callback();
-		}
-	}, time);
-}
-
-function openPath(a) {
-	setCookie("open_dir_path", a);
-	window.location.href = "/files/";
-}
-
-function onlineEditFile(k, f, callback) {
-	if(k != 0) {
-		var l = $("#PathPlace input").val();
-		var h = encodeURIComponent($("#textBody").val());
-		var a = $("select[name=encoding]").val();
-		var loadT = layer.msg('正在保存,请稍候...', {icon: 16,time: 0});
-		$.post("/files/save_body", "data=" + h + "&path=" + encodeURIComponent(f) + "&encoding=" + a, function(data) {
-			if(k == 1) {
-				layer.close(loadT);
-			}
-			layer.msg(data.msg, {icon: data.status ? 1 : 2});
-			if (data.status && typeof(callback) == 'function'){
-				callback(k, f);
-			}
-		},'json');
-		return
-	}
-	var e = layer.msg('正在读取文件,请稍候...', {icon: 16,time: 0});
-	var g = f.split(".");
-	var b = g[g.length - 1];
-	var d;
-	switch(b) {
-		case "html":
-			var j = {
-				name: "htmlmixed",
-				scriptTypes: [{
-					matches: /\/x-handlebars-template|\/x-mustache/i,
-					mode: null
-				}, {
-					matches: /(text|application)\/(x-)?vb(a|script)/i,
-					mode: "vbscript"
-				}]
-			};
-			d = j;
-			break;
-		case "htm":
-			var j = {
-				name: "htmlmixed",
-				scriptTypes: [{
-					matches: /\/x-handlebars-template|\/x-mustache/i,
-					mode: null
-				}, {
-					matches: /(text|application)\/(x-)?vb(a|script)/i,
-					mode: "vbscript"
-				}]
-			};
-			d = j;
-			break;
-		case "js":
-			d = "text/javascript";
-			break;
-		case "json":
-			d = "application/ld+json";
-			break;
-		case "css":
-			d = "text/css";
-			break;
-		case "php":
-			d = "application/x-httpd-php";
-			break;
-		case "tpl":
-			d = "application/x-httpd-php";
-			break;
-		case "xml":
-			d = "application/xml";
-			break;
-		case "sql":
-			d = "text/x-sql";
-			break;
-		case "conf":
-			d = "text/x-nginx-conf";
-			break;
-		default:
-			var j = {
-				name: "htmlmixed",
-				scriptTypes: [
-					{matches: /\/x-handlebars-template|\/x-mustache/i,mode: null}, 
-					{matches: /(text|application)\/(x-)?vb(a|script)/i,mode: "vbscript"}
-				]
-			};
-			d = j;
-	}
-	$.post("/files/get_body", "path=" + encodeURIComponent(f), function(s) {
-		if(s.status === false){
-			layer.msg(s.msg,{icon:5});
-			return;
-		}
-		layer.close(e);
-		var u = ["utf-8", "GBK", "GB2312", "BIG5"];
-		var n = "";
-		var m = "";
-		var o = "";
-		for(var p = 0; p < u.length; p++) {
-			m = s.data.encoding == u[p] ? "selected" : "";
-			n += '<option value="' + u[p] + '" ' + m + ">" + u[p] + "</option>";
-		}
-		var code_mirror = null;
-		var r = layer.open({
-			type: 1,
-			shift: 5,
-			closeBtn: 1,
-			area: ["90%", "90%"],
-			btn:['保存','关闭'],
-			title: "在线编辑[" + f + "]",
-			content: '<form class="bt-form pd20">\
-				<div class="line">\
-					<p style="color:red;margin-bottom:10px">提示：Ctrl+F 搜索关键字，Ctrl+G 查找下一个，Ctrl+S 保存，Ctrl+Shift+R 查找替换!\
-						<select class="bt-input-text" name="encoding" style="width: 74px;position: absolute;top: 31px;right: 19px;height: 22px;z-index: 9999;border-radius: 0;">' + n + '</select>\
-					</p>\
-					<textarea class="mCustomScrollbar bt-input-text" id="textBody" style="width:100%;margin:0 auto;line-height: 1.8;position: relative;top: 10px;" value="" />\
-				</div>\
-			</form>',
-			success:function(){
-				$("#textBody").text(s.data.data);
-				var q = $(window).height() * 0.9;
-				$("#textBody").height(q - 160);
-				code_mirror = CodeMirror.fromTextArea(document.getElementById("textBody"), {
-					extraKeys: {
-						"Ctrl-F": "findPersistent",
-						"Ctrl-H": "replaceAll",
-						"Ctrl-S": function() {
-							$("#textBody").text(code_mirror.getValue());
-							onlineEditFile(2, f,callback);
-						},
-						"Cmd-S":function() {
-							$("#textBody").text(code_mirror.getValue());
-							onlineEditFile(2, f,callback);
-						},
-					},
-					mode: d,
-					lineNumbers: true,
-					matchBrackets: true,
-					matchtags: true,
-					autoMatchParens: true
-				});
-				code_mirror.focus();
-				code_mirror.setSize("auto", q - 150);
-
-				$(window).resize(function(){
-                    var q = $(window).height() * 0.9;
-                    code_mirror.setSize("auto", q - 150);
-                }); 
-			},
-			yes:function(){
-				$("#textBody").text(code_mirror.getValue());
-				onlineEditFile(1, f,callback);
-			}
-		});
-	},'json');
-}
-
-function divcenter() {
-	$(".layui-layer").css("position", "absolute");
-	var c = $(window).width();
-	var b = $(".layui-layer").outerWidth();
-	var g = $(window).height();
-	var f = $(".layui-layer").outerHeight();
-	var a = (c - b) / 2;
-	var e = (g - f) / 2 > 0 ? (g - f) / 2 : 10;
-	var d = $(".layui-layer").offset().left - $(".layui-layer").position().left;
-	var h = $(".layui-layer").offset().top - $(".layui-layer").position().top;
-	a = a + $(window).scrollLeft() - d;
-	e = e + $(window).scrollTop() - h;
-	$(".layui-layer").css("left", a + "px");
-	$(".layui-layer").css("top", e + "px")
-}
-
-function copyText(value) {
-	var clipboard = new ClipboardJS('#mw_copys');
-    clipboard.on('success', function (e) {
-        layer.msg('复制成功',{icon:1,time:2000});
-    });
-
-    clipboard.on('error', function (e) {
-        layer.msg('复制失败，浏览器不兼容!',{icon:2,time:2000});
-    });
-    $("#mw_copys").attr('data-clipboard-text',value);
-    $("#mw_copys").click();
-}
-
-function copyPass(value){
-	if (value == ''){
-		layer.msg('空,不能复制',{icon:2,time:2000});
-		return;
-	}
-	copyText(value);
-}
-
-function isChineseChar(b) {
-	var a = /[\u4E00-\u9FA5\uF900-\uFA2D]/;
-	return a.test(b)
-}
-
-function safeMessage(j, h, g, f) {
-	if(f == undefined) {
-		f = ""
-	}
-	var d = Math.round(Math.random() * 9 + 1);
-	var c = Math.round(Math.random() * 9 + 1);
-	var e = "";
-	e = d + c;
-	sumtext = d + " + " + c;
-	setCookie("vcodesum", e);
-	var mess = layer.open({
-		type: 1,
-		title: j,
-		area: "350px",
-		closeBtn: 1,
-		shadeClose: true,
-		content: "<div class='bt-form webDelete pd20 pb70'>\
-			<p>" + h + "</p>" + f + "<div class='vcode'>"+lan.bt.cal_msg+"<span class='text'>" + sumtext + "</span>=<input type='number' id='vcodeResult' value=''></div>\
-			<div class='bt-form-submit-btn'>\
-				<button type='button' class='btn btn-danger btn-sm bt-cancel'>"+lan.public.cancel+"</button>\
-				<button type='button' id='toSubmit' class='btn btn-success btn-sm' >"+lan.public.ok+"</button></div>\
-			</div>"
-	});
-	$("#vcodeResult").focus().keyup(function(a) {
-		if(a.keyCode == 13) {
-			$("#toSubmit").click()
-		}
-	});
-	$(".bt-cancel").click(function(){
-		layer.close(mess);
-	});
-	$("#toSubmit").click(function() {
-		var a = $("#vcodeResult").val().replace(/ /g, "");
-		if(a == undefined || a == "") {
-			layer.msg('请正确输入计算结果!');
-			return
-		}
-		if(a != getCookie("vcodesum")) {
-			layer.msg('请正确输入计算结果!');
-			return
-		}
-		layer.close(mess);
-		g();
-	})
-}
-//isAction();
-
-function isAction() {
-	hrefs = window.location.href.split("/");
-	name = hrefs[hrefs.length - 1];
-	if(!name) {
-		$("#memuA").addClass("current");
-		return
-	}
-	$("#memuA" + name).addClass("current")
-}
-
-var W_window = $(window).width();
-if(W_window <= 980) {
-	$(window).scroll(function() {
-		var a = $(window).scrollTop();
-		$(".sidebar-scroll").css({
-			position: "absolute",
-			top: a
-		})
-	})
-} else {
-	$(".sidebar-scroll").css({
-		position: "fixed",
-		top: "0"
-	})
-}
-$(function() {
-	$(".fb-ico").hover(function() {
-		$(".fb-text").css({
-			left: "36px",
-			top: 0,
-			width: "80px"
-		})
-	}, function() {
-		$(".fb-text").css({
-			left: 0,
-			width: "36px"
-		})
-	}).click(function() {
-		$(".fb-text").css({
-			left: 0,
-			width: "36px"
-		});
-		$(".zun-feedback-suggestion").show()
-	});
-	$(".fb-close").click(function() {
-		$(".zun-feedback-suggestion").hide()
-	});
-	$(".fb-attitudes li").click(function() {
-		$(this).addClass("fb-selected").siblings().removeClass("fb-selected")
-	})
-});
-
-$("#signout").click(function() {
-	layer.confirm('您真的要退出面板吗?', {icon:3,closeBtn: 1}, function() {
-		window.location.href = "/login?signout=True"
-	});
-	return false
-});
-
-
-var openWindow = null;
-var downLoad = null;
-var speed = null;
-
-function task() {
-	messageBox();
-}
-
-function ActionTask() {
-	var a = layer.msg(lan.public.the_del, {
-		icon: 16,
-		time: 0,
-		shade: [0.3, "#000"]
-	});
-	$.post("/files?action=ActionTask", "", function(b) {
-		layer.close(a);
-		layer.msg(b.msg, {
-			icon: b.status ? 1 : 5
-		})
-	})
-}
-
-function removeTask(b) {
-	var a = layer.msg('正在删除,请稍候...', {
-		icon: 16,
-		time: 0,
-		shade: [0.3, "#000"]
-	});
-	$.post("/files/remove_task", "id=" + b, function(c) {
-		layer.close(a);
-		layer.msg(c.msg, {
-			icon: c.status ? 1 : 5
-		});
-	},'json').error(function(){
-		layer.msg(lan.bt.task_close,{icon:1});
-	});
-}
-
-function GetTaskList(a) {
-	a = a == undefined ? 1 : a;
-	$.post("/task/list", "tojs=GetTaskList&table=tasks&limit=10&p=" + a, function(g) {
-		console.log(g);
-		var e = "";
-		var b = "";
-		var c = "";
-		var f = false;
-		for(var d = 0; d < g.data.length; d++) {
-			switch(g.data[d].status) {
-				case "-1":
-					f = true;
-					if(g.data[d].type != "download") {
-						b = "<li>\
-								<span class='titlename'>" + g.data[d].name + "</span>\
-								<span class='state'>正在安装 <img src='/static/img/ing.gif'> | <a href=\"javascript:removeTask(" + g.data[d].id + ")\">关闭</a></span>\
-								<span class='opencmd'></span><pre class='cmd'></pre>\
-							</li>";
-					} else {
-						b = "<li>\
-							<div class='line-progress' style='width:0%'></div>\
-							<span class='titlename'>" + g.data[d].name + "<a id='speed' style='margin-left:130px;'>0.0M/12.5M</a></span>\
-							<span class='com-progress'>0%</span><span class='state'>\
-								下载中 <img src='/static/img/ing.gif'> | <a href=\"javascript:removeTask(" + g.data[d].id + ")\">"+lan.public.close+"</a>\
-							</span>\
-						</li>";
-					}
-					break;
-				case "0":
-					c += "<li>\
-							<span class='titlename'>" + g.data[d].name + "</span>\
-							<span class='state'>等待</span> | <a href=\"javascript:removeTask(" + g.data[d].id + ")\">删除</a>\
-						</li>";
-					break;
-				case "1":
-					e += "<li>\
-						<span class='titlename'>" + g.data[d].name + "</span>\
-						<span class='state'>" + g.data[d].addtime + "  "+'已完成'+"  "+ '耗时' + (g.data[d].end - g.data[d].start)+"秒</span>\
-						</li>";
-			}
-		}
-		$("#srunning").html(b + c);
-		$("#sbody").html(e);
-		return f
-	})
-}
-
-
-//获取任务总数
-function getTaskCount() {
-	$.get("/task/count", "", function(a) {
-		$(".task").text(a);
-	});
-}
-getTaskCount();
-setInterval(function(){
-	getTaskCount();
-},6000);
-
-function setSelectChecked(c, d) {
-	var a = document.getElementById(c);
-	for(var b = 0; b < a.options.length; b++) {
-		if(a.options[b].innerHTML == d) {
-			a.options[b].selected = true;
-			break
-		}
-	}
-}
-
-function jump() {
-	layer.closeAll();
-	window.location.href = "/soft";
-}
-
-function installTips() {
-	$(".fangshi label").mouseover(function() {
-		var a = $(this).attr("data-title");
-		layer.tips(a, this, {tips: [1, "#787878"],time: 0});
-	}).mouseout(function() {
-		$(".layui-layer-tips").remove()
-	})
-}
-
-
-// function fly(a) {
-// 	var b = $("#task").offset();
-// 	$("." + a).click(function(d) {
-// 		var e = $(this);
-// 		var c = $('<span class="yuandian"></span>');
-// 		c.fly({
-// 			start: {
-// 				left: d.pageX,
-// 				top: d.pageY
-// 			},
-// 			end: {
-// 				left: b.left + 10,
-// 				top: b.top + 10,
-// 				width: 0,
-// 				height: 0
-// 			},
-// 			onEnd: function() {
-// 				layer.closeAll();
-// 				layer.msg(lan.bt.task_add, {icon: 1});
-// 				getTaskCount();
-// 			}
-// 		});
-// 	});
-// };
-
-function flySlow(a) {
-	var b = $("#task").offset();
-	var c = $('<span class="yuandian"></span>');
-	var d = $("." + a);
-	c.fly({
-		start: {
-			left: d.offset().left,
-			top: d.offset().top,
-		},
-		end: {
-			left: b.left + 10,
-			top: b.top + 10,
-			width: 0,
-			height: 0
-		},
-		speed: 0.65,
-		onEnd: function() {
-			layer.closeAll();
-			layer.msg(lan.bt.task_add, {icon: 1});
-			getTaskCount();
-			$('.yuandian').remove();
-		}
-	});
-	
-};
-
-function readerTableChecked(){
-    $('thead').find('input').unbind('click').bind('click',function(){
-        $('tbody').find('tr').each(function(i,obj){
-        	var fin = $(this).find('td')[0];
-        	checked = $(fin).find('input').prop('checked');
-        	$(fin).find('input').prop('checked',!checked);
-        });
-    });    
-}
-
-//检查选中项
-function checkSelect(){
-	setTimeout(function(){
-		var num = $('tbody').find('input[type="checkbox"]:checked').length;
-        if (num == 1) {
-            $('button[batch="true"]').hide();
-            $('button[batch="false"]').show();
-        }else if (num>1){
-            $('button[batch="true"]').show();
-            $('button[batch="false"]').show();
-		}else{
-            $('button[batch="true"]').hide();
-            $('button[batch="false"]').hide();
-		}
-	},5);
-}
-
-//处理排序
-function listOrder(skey,type,obj){
-	or = getCookie('order');
-	orderType = 'desc';
-	if(or){
-		if(or.split(' ')[1] == 'desc'){
-			orderType = 'asc';
-		}
-	}
-	setCookie('order',skey + ' ' + orderType);
-	getWeb(1);
-	$(obj).find(".glyphicon-triangle-bottom").remove();
-	$(obj).find(".glyphicon-triangle-top").remove();
-	if(orderType == 'asc'){
-		$(obj).append("<span class='glyphicon glyphicon-triangle-bottom' style='margin-left:5px;color:#bbb'></span>");
-	}else{
-		$(obj).append("<span class='glyphicon glyphicon-triangle-top' style='margin-left:5px;color:#bbb'></span>");
-	}
-}
-
-
-//获取关联列表
-function getPanelList(){
-	var con ='';
-	$.post("/config/get_panel_list",function(rdata){
-		for(var i=0; i<rdata.length; i++){
-			con +='<h3 class="mypcip mypcipnew" style="opacity:.6" data-url="'+rdata[i].url+'" data-user="'+rdata[i].username+'" data-pw="'+rdata[i].password+'">\
-				<span class="f14 cw">'+rdata[i].title+'</span>\
-				<em class="btedit" onclick="bindPanel(0,\'c\',\''+rdata[i].title+'\',\''+rdata[i].id+'\',\''+rdata[i].url+'\',\''+rdata[i].username+'\',\''+rdata[i].password+'\')"></em>\
-				</h3>';
-		}
-
-		$("#newbtpc").html(con);
-		$(".mypcipnew").hover(function(){
-			$(this).css("opacity","1");
-		},function(){
-			$(this).css("opacity",".6");
-		}).click(function(){
-			$("#btpanelform").remove();
-			var murl = $(this).attr("data-url");
-			var user = $(this).attr("data-user");
-			var pw = $(this).attr("data-pw");
-			layer.open({
-				type: 2,
-				title: false,
-			 	closeBtn: 0, //不显示关闭按钮
-				shade: [0],
-				area: ['340px', '215px'],
-				offset: 'rb', //右下角弹出
-				time: 5, //2秒后自动关闭
-				anim: 2,
-				content: [murl+'/login', 'no']
-			});
-			var loginForm ='<div id="btpanelform" style="display:none"><form id="toBtpanel" action="'+murl+'/do_login" method="post" target="btpfrom">\
-				<input name="username" id="btp_username" value="'+user+'" type="text">\
-				<input name="password" id="btp_password" value="'+pw+'" type="password">\
-				<input name="code" id="bt_code" value="12345" type="text">\
-			</form><iframe name="btpfrom" src=""></iframe></div>';
-			$("body").append(loginForm);
-			layer.msg('正在打开面板...',{icon:16,shade: [0.3, '#000'],time:1000});
-			setTimeout(function(){
-				$("#toBtpanel").submit();
-			},500);
-			setTimeout(function(){
-				window.open(murl);
-			},1000);
-		});
-		$(".btedit").click(function(e){
-			e.stopPropagation();
-		});
-	},'json');
-}
-getPanelList();
-
-//添加面板快捷登录
-function bindPanel(a,type,ip,btid,url,user,pw){
-	var titleName = '关联面板';
-	if(type == "b"){
-		btn = "<button type='button' class='btn btn-success btn-sm' onclick=\"bindPanel(1,'b')\">添加</button>";
-	} else {
-		titleName = '修改关联' + ip;
-		btn = "<button type='button' class='btn btn-default btn-sm' onclick=\"bindPaneldel('"+btid+"')\">删除</button>\
-		<button type='button' class='btn btn-success btn-sm' onclick=\"bindPanel(1,'c','"+ip+"','"+btid+"')\" style='margin-left:7px'>修改</button>";
-	}
-	if(url == undefined) url="http://";
-	if(user == undefined) user="";
-	if(pw == undefined) pw="";
-	if(ip == undefined) ip="";
-	if(a == 1) {
-		var gurl = "/config/add_panel_info";
-		var btaddress = $("#btaddress").val();
-		if(!btaddress.match(/^(http|https)+:\/\/([\w-]+\.)+[\w-]+:\d+/)){
-			layer.msg('面板地址格式不正确，示例：<p>http://192.168.0.1:8888</p>',{icon:5,time:5000});
-			return;
-		}
-		var btuser = encodeURIComponent($("#btuser").val());
-		var btpassword = encodeURIComponent($("#btpassword").val());
-		var bttitle = $("#bttitle").val();
-		var data = "title="+bttitle+"&url="+encodeURIComponent(btaddress)+"&username="+btuser+"&password="+btpassword;
-		if(btaddress =="" || btuser=="" || btpassword=="" || bttitle==""){
-			layer.msg(lan.bt.panel_err_empty,{icon:8});
-			return;
-		}
-		if(type=="c"){
-			gurl = "/config/set_panel_info";
-			data = data+"&id="+btid;
-		}
-		$.post(gurl, data, function(b) {
-			if(b.status) {
-				layer.closeAll();
-				layer.msg(b.msg, {icon: 1});
-				getPanelList();
-			} else {
-				layer.msg(b.msg, {icon: 2})
-			}
-		},'json');
-		return
-	}
-	layer.open({
-		type: 1,
-		area: "400px",
-		title: titleName,
-		closeBtn: 1,
-		shift: 5,
-		shadeClose: false,
-		content: "<div class='bt-form pd20 pb70'>\
-				<div class='line'><span class='tname'>面板地址</span>\
-				<div class='info-r'><input class='bt-input-text' type='text' name='btaddress' id='btaddress' value='"+url+"' placeholder='面板地址' style='width:100%'/></div>\
-				</div>\
-				<div class='line'><span class='tname'>用户名</span>\
-				<div class='info-r'><input class='bt-input-text' type='text' name='btuser' id='btuser' value='"+user+"' placeholder='用户名' style='width:100%'/></div>\
-				</div>\
-				<div class='line'><span class='tname'>密码</span>\
-				<div class='info-r'><input class='bt-input-text' type='password' name='btpassword' id='btpassword' value='"+pw+"' placeholder='密码' style='width:100%'/></div>\
-				</div>\
-				<div class='line'><span class='tname'>备注</span>\
-				<div class='info-r'><input class='bt-input-text' type='text' name='bttitle' id='bttitle' value='"+ip+"' placeholder='备注' style='width:100%'/></div>\
-				</div>\
-				<div class='line'><ul class='help-info-text c7'>\
-					<li>收藏其它服务器面板资料，实现一键登录面板功能</li><li>面板备注不可重复</li>\
-					<li><font style='color:red'>注意，开启广告拦截会导致无法快捷登录。</font></li></ul>\
-				</div>\
-				<div class='bt-form-submit-btn'><button type='button' class='btn btn-danger btn-sm' onclick=\"layer.closeAll()\">关闭</button> "+btn+"</div>\
-			</div>",
-
-		success:function(){
-			$("#btaddress").on("input",function(){
-				var str =$(this).val();
-				var isip = /([\w-]+\.){2,6}\w+/;
-				var iptext = str.match(isip);
-				if(iptext) $("#bttitle").val(iptext[0]);
-			}).blur(function(){
-				var str =$(this).val();
-				var isip = /([\w-]+\.){2,6}\w+/;
-				var iptext = str.match(isip);
-				if(iptext) $("#bttitle").val(iptext[0]);
-			});
-		}
-	});
-}
-//删除快捷登录
-function bindPaneldel(id){
-	$.post("/config/del_panel_info","id="+id,function(rdata){
-		layer.closeAll();
-		layer.msg(rdata.msg,{icon:rdata.status?1:2});
-		getPanelList();
-	},'json');
-}
-
-function getSpeed(sele){
-	if(!$(sele)) {
-		return;
-	}
-	$.get('/files/get_speed',function(data){
-		var speed = data['data'];
-		if(speed.title === null){
-			return;
-		}
-		var mspeed = '';
-		if(speed.speed > 0){
-			mspeed = '<span class="pull-right">'+toSize(speed.speed)+'/s</span>';
-		}
-		var body = '<p>'+speed.title+' <img src="/static/img/ing.gif"></p>\
-		<div class="bt-progress"><div class="bt-progress-bar" style="width:'+speed.progress+'%"><span class="bt-progress-text">'+speed.progress+'%</span></div></div>\
-		<p class="f12 c9"><span class="pull-left">'+speed.used+'/'+speed.total+'</span>'+mspeed+'</p>';
-		$(sele).prev().hide();
-		$(sele).css({"margin-left":"-37px","width":"380px"});
-		$(sele).parents(".layui-layer").css({"margin-left":"-100px"});
-		
-		$(sele).html(body);
-		setTimeout(function(){
-			getSpeed(sele);
-		},1000);
-	},'json');
-}
-//消息盒子
-function messageBox() {
-	layer.open({
-		type: 1,
-		title: '消息盒子',
-		area: "670px",
-		closeBtn: 1,
-		shadeClose: false,
-		content: '<div class="bt-form">\
-					<div class="bt-w-main">\
-						<div class="bt-w-menu">\
-							<p class="bgw" id="taskList" onclick="tasklist()">任务列表(<span class="task_count">0</span>)</p>\
-							<p onclick="remind()">消息列表(<span class="msg_count">0</span>)</p>\
-							<p onclick="execLog()">执行日志</p>\
-						</div>\
-						<div class="bt-w-con pd15">\
-							<div class="taskcon"></div>\
-						</div>\
-					</div>\
-				</div>'
-	});
-	$(".bt-w-menu p").click(function(){
-		$(this).addClass("bgw").siblings().removeClass("bgw");
-	});
-	tasklist();
-}
-
-//取执行日志
-function execLog(){
-	$.post('/task/get_exec_log',{},function(logs){
-		var lbody = '<textarea readonly="" style="margin: 0px;width: 530px;height: 520px;background-color: #333;color:#fff; padding:0 5px" id="exec_log">'+logs+'</textarea>';
-		$(".taskcon").html(lbody);
-		var ob = document.getElementById('exec_log');
-		ob.scrollTop = ob.scrollHeight;
-	});
-}
-
-/**
- * 获取时分秒
- * @param {Number} seconds 总秒数
- * @param {String} dateFormat 返回的日期格式，默认为'H:i:s'
- */
-function getSFM(seconds, dateFormat = 'H:i:s') {
-
-	var obj = {};
- 	obj.H = Number.parseInt(seconds / 3600);
- 	obj.i = Number.parseInt((seconds - obj.H * 3600) / 60);
- 	obj.s = Number.parseInt(seconds - obj.H * 3600 - obj.i * 60);
- 	if (obj.H < 10) {
-    	obj.H = '0' + obj.H;
-  	}
-  	if (obj.i < 10) {
-    	obj.i = '0' + obj.i;
-  	}
-  	if (obj.s < 10) {
-    	obj.s = '0' + obj.s;
-  	}
- 
-  	// 3.解析
-  	var rs = dateFormat.replace('H', obj.H).replace('i', obj.i).replace('s', obj.s);
-  	return rs;
-}
-
-function remind(a){
-	a = a == undefined ? 1 : a;
-	$.post("/task/list", "table=tasks&result=2,4,6,8&limit=10&p=" + a, function(g) {
-		var e = '';
-		var f = false;
-		var task_count = 0;
-		for(var d = 0; d < g.data.length; d++) {
-			var status = g.data[d].status;
-			var status_text = '已经完成';
-			var cos_text = '';
-			if (status == '1'){
-				status_text = '完成';
-				cos_text = '耗时['+getSFM(g.data[d].end - g.data[d].start)+']'
-			} else if (status == '0'){
-				status_text = '正在处理';
-				cos_text = '等待中..';
-			} else if (status == '-1'){
-				status_text = '安装中';
-				cos_text = '..';
-			}
-
-			e += '<tr>\
-				<td><input type="checkbox"></td>\
-				<td>\
-					<div class="titlename c3">'+g.data[d].name+'</span>\
-						<span class="rs-status">【'+status_text+'】<span>\
-						<span class="rs-time">'+cos_text+'</span>\
-					</div>\
-				</td>\
-				<td class="text-right c3">'+g.data[d].addtime+'</td>\
-			</tr>';
-		}
-		var con = '<div class="divtable"><table class="table table-hover">\
-					<thead>\
-						<tr>\
-							<th width="20"><input id="Rs-checkAll" type="checkbox" onclick="RscheckSelect()"></th>\
-							<th>'+lan.bt.task_name+'</th><th class="text-right">'+lan.bt.task_time+'</th>\
-						</tr>\
-					</thead>\
-					<tbody id="remind">'+e+'</tbody>\
-					</table>\
-				</div>\
-				<div class="mtb15" style="height:32px">\
-					<div class="pull-left buttongroup" style="display:none;">\
-						<button class="btn btn-default btn-sm mr5 rs-del" disabled="disabled">'+lan.public.del+'</button>\
-						<button class="btn btn-default btn-sm mr5 rs-read" disabled="disabled">'+lan.bt.task_tip_read+'</button>\
-						<button class="btn btn-default btn-sm">'+lan.bt.task_tip_all+'</button>\
-					</div>\
-					<div id="taskPage" class="page"></div>\
-				</div>';
-		
-		$(".task_count").text(task_count);
-		$(".msg_count").text(g.count);
-		$(".taskcon").html(con);
-		$("#taskPage").html(g.page);
-
-		$("#Rs-checkAll").click(function(){
-			if($(this).prop("checked")){
-				$("#remind").find("input").prop("checked",true);
-			} else {
-				$("#remind").find("input").prop("checked",false);
-			}
-		});
-	},'json');
-}
-
-function getReloads() {
-	var a = 0;
-	var mm = $(".bt-w-menu .bgw").html()
-	if(mm == undefined || mm.indexOf(lan.bt.task_list) == -1) {
-		clearInterval(speed);
-		a = 0;
-		speed = null;
-		return
-	}
-	if(speed) {return;}
-	speed = setInterval(function() {
-		var mm = $(".bt-w-menu .bgw").html()
-		if(mm == undefined || mm.indexOf(lan.bt.task_list) == -1) {
-			clearInterval(speed);
-			speed = null;
-			a = 0;
-			return
-		}
-		a++;
-		$.post('/task/get_task_speed', '', function(h) {
-			if(h.task == undefined) {
-				$(".cmdlist").html(lan.bt.task_not_list);
-				return;
-			}
-			var b = "";
-			var d = "";
-			$("#task").text(h.task.length);
-			$(".task_count").text(h.task.length);
-			for(var g = 0; g < h.task.length; g++) {
-				if(h.task[g].status == "-1") {
-					if(h.task[g].type != "download") {
-						var c = "";
-						var f = h.msg.split("\n");
-						for(var e = 0; e < f.length; e++) {
-							c += f[e] + "<br>"
-						}
-						if(h.task[g].name.indexOf("扫描") != -1) {
-							b = "<li>\
-								<span class='titlename'>" + h.task[g].name + "</span>\
-								<span class='state'>正在扫描<img src='/static/img/ing.gif'> | <a href=\"javascript:removeTask(" + h.task[g].id + ")\">关闭</a></span>\
-								<span class='opencmd'></span>\
-								<div class='cmd'>" + c + "</div>\
-							</li>";
-						} else {
-							b = "<li>\
-								<span class='titlename'>" + h.task[g].name + "</span>\
-								<span class='state'>正在安装<img src='/static/img/ing.gif'> | <a href=\"javascript:removeTask(" + h.task[g].id + ")\">关闭</a></span>\
-								<div class='cmd'>" + c + "</div>\
-							</li>";
-						}
-					} else {
-						b = "<li>\
-								<div class='line-progress' style='width:" + h.msg.pre + "%'></div>\
-								<span class='titlename'>" + h.task[g].name + "<a style='margin-left:130px;'>" + (toSize(h.msg.used) + "/" + toSize(h.msg.total)) + "</a></span>\
-									<span class='com-progress'>" + h.msg.pre + "%</span>\
-									<span class='state'>"+lan.bt.task_downloading+" <img src='/static/img/ing.gif'> | <a href=\"javascript:removeTask(" + h.task[g].id + ")\">"+lan.public.close+"</a></span>\
-							</li>"
-					}
-				} else {
-					d += "<li><span class='titlename'>" + h.task[g].name + "</span><span class='state'>等待 | <a style='color:green' href=\"javascript:removeTask(" + h.task[g].id + ')">删除</a></span></li>'
-				}
-			}
-			$(".cmdlist").html(b + d);
-			$(".cmd").html(c);
-			try{
-				if($(".cmd")[0].scrollHeight) $(".cmd").scrollTop($(".cmd")[0].scrollHeight);
-			}catch(e){
-				return;
-			}
-		},'json').error(function(){});
-	}, 1000);
-}
-
-//检查选中项
-function RscheckSelect(){
-	setTimeout(function(){
-		var checkList = $("#remind").find("input");
-		var count = 0;
-		for(var i=0;i<checkList.length;i++){
-			if(checkList[i].checked) count++;
-		}
-		if(count > 0){
-			$(".buttongroup .btn").removeAttr("disabled");
-		}else{
-			$(".rs-del,.rs-read").attr("disabled","disabled");
-		}
-	},5);
-}
-
-
-function tasklist(a){
-	var con='<ul class="cmdlist"></ul>\
-		<span style="position:  fixed;bottom: 13px;">若任务长时间未执行，请尝试在首页点【重启面板】来重置任务队列</span>';
-	$(".taskcon").html(con);
-	a = a == undefined ? 1 : a;
-	$.post("/task/list", "tojs=getTaskList&table=tasks&limit=10&p=" + a, function(g) {
-		var e = "";
-		var b = "";
-		var c = "";
-		var f = false;
-		var task_count =0;
-		for(var d = 0; d < g.data.length; d++) {
-			switch(g.data[d].status) {
-				case "-1":
-					f = true;
-					if(g.data[d].type != "download") {
-						b = "<li>\
-							<span class='titlename'>" + g.data[d].name + "</span>\
-							<span class='state pull-right c6'>正在安装<img src='/static/img/ing.gif'> | <a class='btlink' href=\"javascript:removeTask(" + g.data[d].id + ")\">关闭</a></span>\
-							<span class='opencmd'></span><pre class='cmd'></pre>\
-						</li>";
-					} else {
-						b = "<li>\
-							<div class='line-progress' style='width:0%'></div><span class='titlename'>" + g.data[d].name + "<a id='speed' style='margin-left:130px;'>0.0M/12.5M</a></span>\
-							<span class='com-progress'>0%</span><span class='state'>下载中 <img src='/static/img/ing.gif'> | <a href=\"javascript:removeTask(" + g.data[d].id + ")\">关闭</a></span>\
-						</li>";
-					}
-					task_count++;
-					break;
-				case "0":
-					c += "<li>\
-						<span class='titlename'>" + g.data[d].name + "</span>\
-						<span class='state pull-right c6'>等待</span> | <a href=\"javascript:removeTask(" + g.data[d].id + ")\" class='btlink'>"+lan.public.del+"</a>\
-					</li>";
-					task_count++;
-					break;
-			}
-		}
-		
-		
-		$(".task_count").text(task_count);
-		$(".cmdlist").html(b + c);
-		getReloads();
-		return f
-	},'json');
-}
-
-function activeDisk() {
-	var a = $("#PathPlace").find("span").text().substring(0, 1);
-	switch(a) {
-		case "C":
-			$(".path-con-left dd:nth-of-type(1)").css("background", "#eee").siblings().removeAttr("style");
-			break;
-		case "D":
-			$(".path-con-left dd:nth-of-type(2)").css("background", "#eee").siblings().removeAttr("style");
-			break;
-		case "E":
-			$(".path-con-left dd:nth-of-type(3)").css("background", "#eee").siblings().removeAttr("style");
-			break;
-		case "F":
-			$(".path-con-left dd:nth-of-type(4)").css("background", "#eee").siblings().removeAttr("style");
-			break;
-		case "G":
-			$(".path-con-left dd:nth-of-type(5)").css("background", "#eee").siblings().removeAttr("style");
-			break;
-		case "H":
-			$(".path-con-left dd:nth-of-type(6)").css("background", "#eee").siblings().removeAttr("style");
-			break;
-		default:
-			$(".path-con-left dd").removeAttr("style");
-	}
-}
-
-
-function backMyComputer() {
-	$(".default").show();
-	$(".file-list").hide();
-	$("#PathPlace").find("span").html("");
-	activeDisk();
-}
-
-//检查登陆状态
-function check_login(){
-	$.post('/check_login',{},function(rdata){
-		if(rdata === true) return;
-	});
-}
-
-//登陆跳转
-function to_login(){
-	layer.confirm('您的登陆状态已过期，请重新登陆!',{title:'会话已过期',icon:2,closeBtn: 1,shift: 5},function(){
-		location.reload();
-	});
-}
-//表格头固定
-function table_fixed(name){
-	var tableName = document.querySelector('#'+name);
-	tableName.addEventListener('scroll',scroll_handle);
-}
-function scroll_handle(e){
-	var scrollTop = this.scrollTop;
-	$(this).find("thead").css({"transform":"translateY("+scrollTop+"px)","position":"relative","z-index":"1"});
-}
-
-
-$(function(){
-///
-setInterval(function(){check_login();},6000);
-///
-});
-
-function asyncLoadImage(obj, url){
-	
-	if (typeof(url) == 'undefined'){
-		return;
-	}
-
-	function loadImage(obj,url,callback){
-	    var img = new Image();
-	    img.src = url;
-	    
-	    if(img.complete){
-	        callback.call(img,obj);
-	        return;
-	    }
-	    img.onload = function(){
-	        callback.call(img,obj);
-	    }
-	}
-
-	function showImage(obj){
-	    obj.src = this.src;
-	}
-	loadImage(obj, url, showImage);
-}
-
-function loadImage(){
-	$('img').each(function(i){
-		// console.log($(this).attr('data-src'));
-		if ($(this).attr('data-src') != ''){
-			asyncLoadImage(this, $(this).attr('data-src'));
-		} 
-    });
-}
-
-var socket, gterm;
-function webShell() {
-    var termCols = 83;
-    var termRows = 21;
-    var sendTotal = 0;
-    if(!socket)socket = io.connect();
-    var term = new Terminal({ cols: termCols, rows: termRows, screenKeys: true, useStyle: true});
-
-    term.open();
-    term.setOption('cursorBlink', true);
-    term.setOption('fontSize', 14);
-    gterm = term;
-
-    socket.on('server_response', function (data) {
-        term.write(data.data);
-        if (data.data == '\r\n登出\r\n' || 
-            data.data == '登出\r\n' || 
-            data.data == '\r\nlogout\r\n' || 
-            data.data == 'logout\r\n') {
-            setTimeout(function () {
-                layer.closeAll();
-                term.destroy();
-                clearInterval(interval);
-            }, 500);
-        }
-    });
-
-    $(window).unload(function(){
-  　     term.destroy();
-        clearInterval(interval);
-    });
-
-    if (socket) {
-        socket.emit('webssh', '');
-        interval = setInterval(function () {
-            socket.emit('webssh', '');
-        }, 500);
-    }
-    
-    term.on('data', function (data) {
-        socket.emit('webssh', data);
-    });
-
-
-    var term_box = layer.open({
-        type: 1,
-        title: "本地终端",
-        area: ['685px','463px'],
-        closeBtn: 1,
-        shadeClose: false,
-        content: '<div class="term-box"><div id="term"></div></div>\
-					<div class="shell-text-input">\
-                    <textarea type="text" class="bt-input-text-shell" placeholder="请将命令粘贴到此处.." value="" name="ssh_copy" />\
-					<div class="shell-btn-group">\
-                    <button class="shellbutton btn btn-success btn-sm pull-right shell_btn_1">发送(Ctrl+Enter)</button>\
-					<button class="shellbutton btn btn-default btn-sm pull-right shell_btn_close">关闭</button>\
-					</div>\
-                </div>',
-        success:function(){
-        	$(".shell_btn_close").click(function(){
-				layer.close(term_box);
-				term.destroy();
-		        clearInterval(interval);
-			});
-        },
-        cancel: function () {
-            term.destroy();
-            clearInterval(interval);
-        }
-    });
-	
-	
-    setTimeout(function () {
-
-        $('.terminal').detach().appendTo('#term');
-        $("#term").show();
-        socket.emit('webssh', "\n");
-        term.focus();
-
-        // 鼠标右键事件
-        var can = $("#term");
-        can.contextmenu(function (e) {
-            var winWidth = can.width();
-            var winHeight = can.height();
-            var mouseX = e.pageX;
-            var mouseY = e.pageY;
-            var menuWidth = $(".contextmenu").width();
-            var menuHeight = $(".contextmenu").height();
-            var minEdgeMargin = 10;
-            if (mouseX + menuWidth + minEdgeMargin >= winWidth &&
-                mouseY + menuHeight + minEdgeMargin >= winHeight) {
-                menuLeft = mouseX - menuWidth - minEdgeMargin + "px";
-                menuTop = mouseY - menuHeight - minEdgeMargin + "px";
-            }
-            else if (mouseX + menuWidth + minEdgeMargin >= winWidth) {
-                menuLeft = mouseX - menuWidth - minEdgeMargin + "px";
-                menuTop = mouseY + minEdgeMargin + "px";
-            }
-            else if (mouseY + menuHeight + minEdgeMargin >= winHeight) {
-                menuLeft = mouseX + minEdgeMargin + "px";
-                menuTop = mouseY - menuHeight - minEdgeMargin + "px";
-            }
-            else {
-                menuLeft = mouseX + minEdgeMargin + "px";
-                menuTop = mouseY + minEdgeMargin + "px";
-            };
-
-            var selectText = term.getSelection()
-            var style_str = '';
-            var paste_str = '';
-            if (!selectText) {
-                if (!getCookie('shell_copy_body')) {
-                    paste_str = 'style="color: #bbb;" disable';
-                }
-                style_str = 'style="color: #bbb;" disable';
-            } else {
-                setCookie('ssh_selection', selectText);
-            }
-
-
-            var menudiv = '<ul class="contextmenu">\
-                        <li><a class="shell_copy_btn menu_ssh" data-clipboard-text="'+ selectText + '" ' + style_str + '>复制到剪切板</a></li>\
-                        <li><a  onclick="shell_paste_text()" '+ paste_str+'>粘贴选中项</a></li>\
-                        <li><a onclick="shell_to_baidu()" ' + style_str + '>百度搜索</a></li>\
-                    </ul>';
-            $("body").append(menudiv);
-            $(".contextmenu").css({
-                "left": menuLeft,
-                "top": menuTop
-            });
-            return false;
-        });
-        can.click(function () {
-            remove_ssh_menu();
-        });
-
-        clipboard = new ClipboardJS('.shell_copy_btn');
-        clipboard.on('success', function (e) {
-            layer.msg('复制成功!');
-            setCookie('shell_copy_body', e.text)
-            remove_ssh_menu();
-            term.focus();
-        });
-
-        clipboard.on('error', function (e) {
-            layer.msg('复制失败，浏览器不兼容!');
-            setCookie('shell_copy_body', e.text)
-            remove_ssh_menu();
-            term.focus();
-        });
-
-        $(".shellbutton").click(function () {
-            var tobj = $("textarea[name='ssh_copy']");
-            var ptext = tobj.val();
-            tobj.val('');
-            if ($(this).text().indexOf('Alt') != -1) {
-                ptext +="\n";
-            }
-            socket.emit('webssh', ptext);
-            term.focus();
-        });
-        $("textarea[name='ssh_copy']").keydown(function (e) {
-            if (e.ctrlKey && e.keyCode == 13) {
-                $(".shell_btn_1").click();
-            } else if (e.altKey && e.keyCode == 13) {
-                $(".shell_btn_1").click();
-            }
-        });
-    }, 100);
-}
-
-function shell_to_baidu() {
-    var selectText = getCookie('ssh_selection');
-    remove_ssh_menu();
-    window.open('https://www.baidu.com/s?wd=' + selectText)
-    gterm.focus();
-}
-
-function shell_paste_text(){
-    socket.emit('webssh', getCookie('ssh_selection'));
-    remove_ssh_menu();
-    gterm.focus();
-}
-
-function remove_ssh_menu() {
-    $(".contextmenu").remove();
-}
-
-//显示进度
-function showSpeed(filename) {
-    $.post('/files/get_last_body', { num: 10,path: filename}, function (rdata) {
-    	if ($("#speed_log_lst").length < 1){
-    		return;
-    	}
-		if (rdata.status) {
-			$("#speed_log_lst").html(rdata.data);
-			$("#speed_log_lst").scrollTop($("#speed_log_lst")[0].scrollHeight);
-		}
-		setTimeout(function () { showSpeed(filename); }, 1000);
-    },'json');
-}
-/**
- * 显示进度窗口
- */
-function showSpeedWindow(msg, speed_log_func_name, callback){
-	var speed_msg = "<pre style='margin-bottom: 0px;height:250px;text-align: left;background-color: #000;\
-		color: #fff;white-space: pre-wrap;' id='speed_log_lst'>[MSG]</pre>";
-	var showSpeedKey = layer.open({
-		title: false,
-		type: 1,
-		closeBtn: 2,
-		shade: 0.3,
-		area: "700px",
-		offset: "30%",
-		content: speed_msg.replace('[MSG]', msg),
-		success: function (layers, index) {
-			var url = speed_log_func_name.replace('.','/');
-			$.post('/'+url, {}, function(rdata){
-				if (rdata.status){
-					setTimeout(function () {
-						showSpeed(rdata.data);
-					}, 1000);
-				} else {
-					layer.msg("缺少指定文件!");
-				}
-			},'json');
-			if (callback) {callback(layers,index,showSpeedKey);}
-		}
-    });
-}
-
-
-/*** 其中功能,针对插件通过库使用 start ***/
-
-function toUrlParam(json) {
-    return Object.keys(json).map(key => key + '=' + json[key]).join('&');
-}
-
-//字符串转数组对象
-function toArrayObject(str){
-	var data = {};
-    kv = str.split('&');
-    for(i in kv){
-        v = kv[i].split('=');
-        data[v[0]] = v[1];
-    }
-    return data;
-}
-
-/**
-* 实体字符编码
-* @param {*} text 待编码的文本
-* @returns
-*/
-function entitiesEncode(text) {
-    text = text.replace(/&/g, "&amp;");
-    text = text.replace(/</g, "&lt;");
-    text = text.replace(/>/g, "&gt;");
-    text = text.replace(/ /g, "&nbsp;");
-    text = text.replace(/"/g, "&quot;");
-    return text;
-}
-/**
-* 实体字符解码
-* @param {*} text 待解码的文本
-* @returns
-*/
-function entitiesDecode(text) {
-    text = text.replace(/&amp;/g, "&");
-    text = text.replace(/&lt;/g, "<");
-    text = text.replace(/&gt;/g, ">");
-    text = text.replace(/&nbsp;/g, " ");
-    text = text.replace(/&quot;/g, "'");
-    return text;
-}
-
-// base64.js
-// base64加密
-function base64_encode(str) {
-    var base64EncodeChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-    var out, i, len;
-    var c1, c2, c3;
-
-    len = str.length;
-    i = 0;
-    out = "";
-    while(i < len) {
-        c1 = str.charCodeAt(i++) & 0xff;
-        if(i == len)
-        {
-            out += base64EncodeChars.charAt(c1 >> 2);
-            out += base64EncodeChars.charAt((c1 & 0x3) << 4);
-            out += "==";
-            break;
-        }
-        c2 = str.charCodeAt(i++);
-        if(i == len)
-        {
-            out += base64EncodeChars.charAt(c1 >> 2);
-            out += base64EncodeChars.charAt(((c1 & 0x3)<< 4) | ((c2 & 0xF0) >> 4));
-            out += base64EncodeChars.charAt((c2 & 0xF) << 2);
-            out += "=";
-            break;
-        }
-        c3 = str.charCodeAt(i++);
-        out += base64EncodeChars.charAt(c1 >> 2);
-        out += base64EncodeChars.charAt(((c1 & 0x3)<< 4) | ((c2 & 0xF0) >> 4));
-        out += base64EncodeChars.charAt(((c2 & 0xF) << 2) | ((c3 & 0xC0) >>6));
-        out += base64EncodeChars.charAt(c3 & 0x3F);
-    }
-    return out;
-}
-
-
-// base64解密
-function base64_decode(str) {
-    var base64DecodeChars = new Array(
-        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
-        52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
-        -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
-        15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
-        -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-        41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1);
-    var c1, c2, c3, c4;
-    var i, len, out;
-
-    len = str.length;
-    i = 0;
-    out = "";
-    while(i < len) {
-        /* c1 */
-        do {
-            c1 = base64DecodeChars[str.charCodeAt(i++) & 0xff];
-        } while(i < len && c1 == -1);
-        if(c1 == -1)
-            break;
-
-        /* c2 */
-        do {
-            c2 = base64DecodeChars[str.charCodeAt(i++) & 0xff];
-        } while(i < len && c2 == -1);
-        if(c2 == -1)
-            break;
-
-        out += String.fromCharCode((c1 << 2) | ((c2 & 0x30) >> 4));
-
-        /* c3 */
-        do {
-            c3 = str.charCodeAt(i++) & 0xff;
-            if(c3 == 61)
-                return out;
-            c3 = base64DecodeChars[c3];
-        } while(i < len && c3 == -1);
-        if(c3 == -1)
-            break;
-
-        out += String.fromCharCode(((c2 & 0XF) << 4) | ((c3 & 0x3C) >> 2));
-
-        /* c4 */
-        do {
-            c4 = str.charCodeAt(i++) & 0xff;
-            if(c4 == 61)
-                return out;
-            c4 = base64DecodeChars[c4];
-        } while(i < len && c4 == -1);
-        if(c4 == -1)
-            break;
-        out += String.fromCharCode(((c3 & 0x03) << 6) | c4);
-    }
-    return out;
-}
-
-function utf16to8(str) {
-    var out, i, len, c;
-
-    out = "";
-    len = str.length;
-    for(i = 0; i < len; i++) {
-        c = str.charCodeAt(i);
-        if ((c >= 0x0001) && (c <= 0x007F)) {
-            out += str.charAt(i);
-        } else if (c > 0x07FF) {
-            out += String.fromCharCode(0xE0 | ((c >> 12) & 0x0F));
-            out += String.fromCharCode(0x80 | ((c >> 6) & 0x3F));
-            out += String.fromCharCode(0x80 | ((c >> 0) & 0x3F));
-        } else {
-            out += String.fromCharCode(0xC0 | ((c >> 6) & 0x1F));
-            out += String.fromCharCode(0x80 | ((c >> 0) & 0x3F));
-        }
-    }
-    return out;
-}
-
-function utf8to16(str) {
-    var out, i, len, c;
-    var char2, char3;
-
-    out = "";
-    len = str.length;
-    i = 0;
-    while(i < len) {
-        c = str.charCodeAt(i++);
-        switch(c >> 4)
-        {
-            case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
-            // 0xxxxxxx
-            out += str.charAt(i-1);
-            break;
-            case 12: case 13:
-            // 110x xxxx 10xx xxxx
-            char2 = str.charCodeAt(i++);
-            out += String.fromCharCode(((c & 0x1F) << 6) | (char2 & 0x3F));
-            break;
-            case 14:
-                // 1110 xxxx 10xx xxxx 10xx xxxx
-                char2 = str.charCodeAt(i++);
-                char3 = str.charCodeAt(i++);
-                out += String.fromCharCode(((c & 0x0F) << 12) |
-                    ((char2 & 0x3F) << 6) |
-                    ((char3 & 0x3F) << 0));
-                break;
-        }
-    }
-
-    return out;
-}
-
-
-function pluginService(_name, version, _suffix_name=''){
-
-	var default_name = 'status';
-	if ( _suffix_name != '' ){
-		default_name = 'status_'+_suffix_name;
-	}
-
-	var data = {name:_name, func:default_name};
-	if ( typeof(version) != 'undefined' ){
-		data['version'] = version;
-	} else {
-		version = '';
-	}
-
-	var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
-	$.post('/plugins/run', data, function(data) {
-		layer.close(loadT);
-        if(!data.status){
-            layer.msg(data.msg,{icon:0,time:3000,shade: [0.3, '#000']});
-            return;
-        }
-        if (data.data == 'start'){
-            pluginSetService(_name, true, version, _suffix_name);
-        } else {
-            pluginSetService(_name, false, version, _suffix_name);
-        }
-    },'json');
-}
-
-function pluginSetService(_name ,status, version, _suffix_name=''){
-
-	var default_name = 'status';
-	var restart_name = 'restart';
-	var reload_name = 'reload';
-	var status_ss = (status?'stop':'start');
-	if ( _suffix_name != '' ){
-		default_name = 'status_'+_suffix_name;
-		restart_name = 'restart_'+_suffix_name;
-		reload_name = 'reload_'+_suffix_name;
-		status_ss = status_ss+'_'+_suffix_name;
-	}
-
-	var serviceCon ='<p class="status">当前状态：<span>'+(status ? '开启' : '关闭' )+
-        '</span><span style="color: '+
-        (status?'#20a53a;':'red;')+
-        ' margin-left: 3px;" class="glyphicon ' + (status?'glyphicon glyphicon-play':'glyphicon-pause')+'"></span></p><div class="sfm-opt">\
-            <button class="btn btn-default btn-sm" onclick="pluginOpService(\''+_name+'\',\''+status_ss+'\',\''+version+'\',\''+_suffix_name+'\')">'+(status?'停止':'启动')+'</button>\
-            <button class="btn btn-default btn-sm" onclick="pluginOpService(\''+_name+'\',\''+restart_name+'\',\''+version+'\',\''+_suffix_name+'\')">重启</button>\
-            <button class="btn btn-default btn-sm" onclick="pluginOpService(\''+_name+'\',\''+reload_name+'\',\''+version+'\',\''+_suffix_name+'\')">重载配置</button>\
-        </div>'; 
-    $(".soft-man-con").html(serviceCon);
-}
-
-
-function pluginOpService(a, b, v, _suffix_name='') {
-
-    var c = "name=" + a + "&func=" + b;
-    if(v != ''){
-    	c = c + '&version='+v;
-    }
-
-    var d = "";
-
-    b = b.split('_')[0];
-    switch(b) {
-        case "stop":d = '停止';break;
-        case "start":d = '启动';break;
-        case "restart":d = '重启';break;
-        case "reload":d = '重载';break;
-    }
-
-    _ver = v;
-    if(v != ''){
-    	_ver = '【' + v + '】';
-    }
-
-    layer.confirm( msgTpl('您真的要{1}{2}{3}服务吗？', [d,a,_ver]), {icon:3,closeBtn: 1}, function() {
-        var e = layer.msg(msgTpl('正在{1}{2}{3}服务,请稍候...',[d,a,_ver]), {icon: 16,time: 0});
-        $.post("/plugins/run", c, function(g) {
-            layer.close(e);
-            
-            var f = g.data == 'ok' ? msgTpl('{1}{2}服务已{3}',[a,_ver,d]) : msgTpl('{1}{2}服务{3}失败!',[a,_ver,d]);
-            layer.msg(f, {icon: g.data == 'ok' ? 1 : 2});
-            
-            if( b != "reload" && g.data == 'ok' ) {
-                if ( b == 'start' ) {
-                    pluginSetService(a, true, v, _suffix_name);
-                } else if ( b == 'stop' ){
-                    pluginSetService(a, false, v, _suffix_name);
-                }
-            }
-
-            if( g.status && g.data != 'ok' ) {
-                layer.msg(g.data, {icon: 2,time: 6000,shade: 0.3,shadeClose: true});
-            }
-
-            setTimeout(function(){
-            	// location.reload();
-            	getSList();
-            },2000);
-        },'json').error(function() {
-            layer.close(e);
-            layer.msg('操作异常!', {icon: 1});
-        });
-    })
-}
-
-//配置修改 --- start
-function pluginConfig(_name, version, func){
-	if ( typeof(version) == 'undefined' ){
-		version = '';
-	}
-
-	var func_name = 'conf';
-    if ( typeof(func) != 'undefined' ){
-        func_name = func;
-    }
-
-    var con = '<p style="color: #666; margin-bottom: 7px">提示：Ctrl+F 搜索关键字，Ctrl+G 查找下一个，Ctrl+S 保存，Ctrl+Shift+R 查找替换!</p>\
-    			<textarea class="bt-input-text" style="height: 320px; line-height:18px;" id="textBody"></textarea>\
-                <button id="onlineEditFileBtn" class="btn btn-success btn-sm" style="margin-top:10px;">保存</button>\
-                <ul class="help-info-text c7 ptb15">\
-                    <li>此处为'+ _name + version +'主配置文件,若您不了解配置规则,请勿随意修改。</li>\
-                </ul>';
-    
-
-    var loadT = layer.msg('配置文件路径获取中...',{icon:16,time:0,shade: [0.3, '#000']});
-    $.post('/plugins/run', {name:_name, func:func_name,version:version},function (data) {
-        layer.close(loadT);
-
-        try{
-        	var jdata = $.parseJSON(data.data);
-        	if (!jdata['status']){
-        		layer.msg(jdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
-                return;
-        	}
-		}catch(err){/*console.log(err);*/}
-
-		$(".soft-man-con").html(con);
-		
-        var loadT2 = layer.msg('文件内容获取中...',{icon:16,time:0,shade: [0.3, '#000']});
-        var fileName = data.data;
-        $.post('/files/get_body', 'path=' + fileName, function(rdata) {
-            layer.close(loadT2);
-            if (!rdata.status){
-                layer.msg(rdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
-                return;
-            }
-            $("#textBody").empty().text(rdata.data.data);
-            $(".CodeMirror").remove();
-            var editor = CodeMirror.fromTextArea(document.getElementById("textBody"), {
-                extraKeys: {
-                    "Ctrl-Space": "autocomplete",
-                    "Ctrl-F": "findPersistent",
-                    "Ctrl-H": "replaceAll",
-                    "Ctrl-S": function() {
-                    	$("#textBody").text(editor.getValue());
-                        pluginConfigSave(fileName);
-                    }
-                },
-                lineNumbers: true,
-                matchBrackets:true,
-            });
-            editor.focus();
-            $(".CodeMirror-scroll").css({"height":"300px","margin":0,"padding":0});
-            $("#onlineEditFileBtn").click(function(){
-                $("#textBody").text(editor.getValue());
-                pluginConfigSave(fileName);
-            });
-        },'json');
-    },'json');
-}
-
-
-//配置修改模版 --- start
-function pluginConfigTpl(_name, version, func, config_tpl_func, read_config_tpl_func, save_callback_func){
-	if ( typeof(version) == 'undefined' ){
-		version = '';
-	}
-
-	var func_name = 'conf';
-    if ( typeof(func) != 'undefined' ){
-        func_name = func;
-    }
-
-    var _config_tpl_func = 'config_tpl';
-    if ( typeof(config_tpl_func) != 'undefined' ){
-        _config_tpl_func = config_tpl_func;
-    }
-
-    var _read_config_tpl_func = 'read_config_tpl';
-    if ( typeof(read_config_tpl_func) != 'undefined' ){
-        _read_config_tpl_func = read_config_tpl_func;
-    }
-
-
-    var con = '<p style="color: #666; margin-bottom: 7px">提示：Ctrl+F 搜索关键字，Ctrl+G 查找下一个，Ctrl+S 保存，Ctrl+Shift+R 查找替换!</p>\
-    			<select id="config_tpl" class="bt-input-text mr20" style="width:30%;margin-bottom: 3px;"><option value="0">请选择</option></select>\
-    			<textarea class="bt-input-text" style="height: 320px; line-height:18px;" id="textBody"></textarea>\
-                <button id="onlineEditFileBtn" class="btn btn-success btn-sm" style="margin-top:10px;">保存</button>\
-                <ul class="help-info-text c7 ptb15">\
-                    <li>此处为【'+ _name + version +'】主配置文件,若您不了解配置规则,请勿随意修改。</li>\
-                </ul>';
-    $(".soft-man-con").html(con);
-
-    function getFileName(file){
-    	var list = file.split('/');
-    	var f = list[list.length-1];
-    	return f 
-    }
-
-    var fileName = '';
-    $.post('/plugins/run',{name:_name, func:_config_tpl_func,version:version}, function(data){
-    	var rdata = $.parseJSON(data.data);
-    	for (var i = 0; i < rdata.length; i++) {
-    		$('#config_tpl').append('<option value="'+rdata[i]+'"">'+getFileName(rdata[i])+'</option>');
-    	}
-
-    	$('#config_tpl').change(function(){
-    		var selected = $(this).val();
-    		if (selected != '0'){
-    			var loadT = layer.msg('配置模版获取中...',{icon:16,time:0,shade: [0.3, '#000']});
-
-    			var _args = JSON.stringify({file:selected});
-    			$.post('/plugins/run', {name:_name, func:_read_config_tpl_func,version:version,args:_args}, function(data){
-    				layer.close(loadT);
-    				var rdata = $.parseJSON(data.data);
-    				if (!rdata.status){
-		                layer.msg(rdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
-		                return;
-		            }
-
-    				$("#textBody").empty().text(rdata.data);
-    				$(".CodeMirror").remove();
-		            var editor = CodeMirror.fromTextArea(document.getElementById("textBody"), {
-		                extraKeys: {
-		                    "Ctrl-Space": "autocomplete",
-		                    "Ctrl-F": "findPersistent",
-		                    "Ctrl-H": "replaceAll",
-		                    "Ctrl-S": function() {
-		                    	$("#textBody").text(editor.getValue());
-		                        pluginConfigSave(fileName,save_callback_func);
-		                    }
-		                },
-		                lineNumbers: true,
-		                matchBrackets:true,
-		            });
-		            editor.focus();
-		            $(".CodeMirror-scroll").css({"height":"300px","margin":0,"padding":0});
-		            $("#onlineEditFileBtn").unbind('click');
-		            $("#onlineEditFileBtn").click(function(){
-		                $("#textBody").text(editor.getValue());
-		                pluginConfigSave(fileName, save_callback_func);
-		            });
-    			},'json');
-    		}
-    	});
-
-    },'json');
-
-    var loadT = layer.msg('配置文件路径获取中...',{icon:16,time:0,shade: [0.3, '#000']});
-    $.post('/plugins/run', {name:_name, func:func_name,version:version}, function (data) {
-        layer.close(loadT);
-
-        var loadT2 = layer.msg('文件内容获取中...',{icon:16,time:0,shade: [0.3, '#000']});
-        fileName = data.data;
-        $.post('/files/get_body', 'path=' + fileName, function(rdata) {
-            layer.close(loadT2);
-            if (!rdata.status){
-                layer.msg(rdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
-                return;
-            }
-            $("#textBody").empty().text(rdata.data.data);
-            $(".CodeMirror").remove();
-            var editor = CodeMirror.fromTextArea(document.getElementById("textBody"), {
-                extraKeys: {
-                    "Ctrl-Space": "autocomplete",
-                    "Ctrl-F": "findPersistent",
-                    "Ctrl-H": "replaceAll",
-                    "Ctrl-S": function() {
-                    	$("#textBody").text(editor.getValue());
-                        pluginConfigSave(fileName,save_callback_func);
-                    }
-                },
-                lineNumbers: true,
-                matchBrackets:true,
-            });
-            editor.focus();
-            $(".CodeMirror-scroll").css({"height":"300px","margin":0,"padding":0});
-            $("#onlineEditFileBtn").click(function(){
-                $("#textBody").text(editor.getValue());
-                pluginConfigSave(fileName,save_callback_func);
-            });
-        },'json');
-    },'json');
-}
-
-//配置模版列表 --- start
-function pluginConfigListTpl(_name, version, config_tpl_func, read_config_tpl_func){
-	if ( typeof(version) == 'undefined' ){
-		version = '';
-	}
-
-    var _config_tpl_func = 'config_tpl';
-    if ( typeof(config_tpl_func) != 'undefined' ){
-        _config_tpl_func = config_tpl_func;
-    }
-
-    var _read_config_tpl_func = 'read_config_tpl';
-    if ( typeof(read_config_tpl_func) != 'undefined' ){
-        _read_config_tpl_func = read_config_tpl_func;
-    }
-
-
-    var con = '<p style="color: #666; margin-bottom: 7px">提示：Ctrl+F 搜索关键字，Ctrl+G 查找下一个，Ctrl+S 保存，Ctrl+Shift+R 查找替换!</p>\
-    			<select id="config_tpl" class="bt-input-text mr20" style="width:30%;margin-bottom: 3px;"></select>\
-    			<textarea class="bt-input-text" style="height: 320px; line-height:18px;" id="textBody"></textarea>\
-                <button id="onlineEditFileBtn" class="btn btn-success btn-sm" style="margin-top:10px;">保存</button>\
-                <ul class="help-info-text c7 ptb15">\
-                    <li>此处为'+ _name + version +'主配置文件,若您不了解配置规则,请勿随意修改。</li>\
-                </ul>';
-    $(".soft-man-con").html(con);
-
-    function getFileName(file){
-    	var list = file.split('/');
-    	var f = list[list.length-1];
-    	return f 
-    }
-
-    function loadTextBody(fileName){
-        $.post('/files/get_body', 'path=' + fileName, function(rdata) {
-            if (!rdata.status){
-                layer.msg(rdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
-                return;
-            }
-            $("#textBody").empty().text(rdata.data.data);
-            $(".CodeMirror").remove();
-            var editor = CodeMirror.fromTextArea(document.getElementById("textBody"), {
-                extraKeys: {
-                    "Ctrl-Space": "autocomplete",
-                    "Ctrl-F": "findPersistent",
-                    "Ctrl-H": "replaceAll",
-                    "Ctrl-S": function() {
-                    	$("#textBody").text(editor.getValue());
-                        pluginConfigSave(fileName);
-                    }
-                },
-                lineNumbers: true,
-                matchBrackets:true,
-            });
-            editor.focus();
-            $(".CodeMirror-scroll").css({"height":"300px","margin":0,"padding":0});
-            $("#onlineEditFileBtn").click(function(){
-                $("#textBody").text(editor.getValue());
-                pluginConfigSave(fileName);
-            });
-        },'json');
-    }
-
-
-
-    var fileName = '';
-    $.post('/plugins/run',{name:_name, func:_config_tpl_func,version:version}, function(data){
-    	var rdata = $.parseJSON(data.data);
-    	for (var i = 0; i < rdata.length; i++) {
-    		$('#config_tpl').append('<option value="'+rdata[i]+'">'+getFileName(rdata[i])+'</option>');
-    	}
-
-    	if (rdata.length>0){
-    		loadTextBody(rdata[0]);
-    	}
-
-    	$('#config_tpl').change(function(){
-    		var selected = $(this).val();
-    		fileName = selected;
-    
-			var loadT = layer.msg('配置模版获取中...',{icon:16,time:0,shade: [0.3, '#000']});
-
-			var _args = JSON.stringify({file:selected});
-			$.post('/plugins/run', {name:_name, func:_read_config_tpl_func,version:version,args:_args}, function(data){
-				layer.close(loadT);
-				var rdata = $.parseJSON(data.data);
-				if (!rdata.status){
-	                layer.msg(rdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
-	                return;
-	            }
-
-				$("#textBody").empty().text(rdata.data);
-				$(".CodeMirror").remove();
-	            var editor = CodeMirror.fromTextArea(document.getElementById("textBody"), {
-	                extraKeys: {
-	                    "Ctrl-Space": "autocomplete",
-	                    "Ctrl-F": "findPersistent",
-	                    "Ctrl-H": "replaceAll",
-	                    "Ctrl-S": function() {
-	                    	$("#textBody").text(editor.getValue());
-	                        pluginConfigSave(fileName);
-	                    }
-	                },
-	                lineNumbers: true,
-	                matchBrackets:true,
-	            });
-	            editor.focus();
-	            $(".CodeMirror-scroll").css({"height":"300px","margin":0,"padding":0});
-	            $("#onlineEditFileBtn").unbind('click');
-	            $("#onlineEditFileBtn").click(function(){
-	                $("#textBody").text(editor.getValue());
-	                pluginConfigSave(fileName);
-	            });
-			},'json');
-    		
-    	});
-
-    },'json');
-}
-
-
-//配置保存
-function pluginConfigSave(fileName, callback) {
-    var data = encodeURIComponent($("#textBody").val());
-    var encoding = 'utf-8';
-    var loadT = layer.msg('保存中...', {icon: 16,time: 0});
-    $.post('/files/save_body', 'data=' + data + '&path=' + fileName + '&encoding=' + encoding, function(rdata) {
-        layer.close(loadT);
-
-        showMsg(rdata.msg, function(){
-        	if ( rdata.status && typeof(callback) == 'function'){
-	        	callback();
-	        }
-        },{icon: rdata.status ? 1 : 2});
-     
-    },'json');
-}
-
-function pluginInitD(_name, _version, _suffix_name=''){
-	if (typeof _version == 'undefined'){
-    	_version = '';
-    }
-
-    var default_name = 'initd_status';
-	if ( _suffix_name != '' ){
-		default_name = 'initd_status_'+_suffix_name;
-	}
-
-	var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
-	$.post('/plugins/run', {name:_name, func:default_name, version : _version}, function(data) {
-		layer.close(loadT);
-        if( !data.status ){
-            layer.msg(data.msg,{icon:0,time:3000,shade: [0.3, '#000']});
-            return;
-        }
-        if( data.data!='ok' && data.data!='fail' ){
-            layer.msg(data.data,{icon:0,time:3000,shade: [0.3, '#000']});
-            return;
-        }
-        if (data.data == 'ok'){
-            pluginSetInitD(_name, _version, true, _suffix_name);
-        } else {
-            pluginSetInitD(_name, _version, false, _suffix_name);
-        }
-    },'json');
-}
-
-function pluginSetInitD(_name, _version, status,_suffix_name=''){
-
-	var default_name = (status?'initd_uninstall':'initd_install');
-	if ( _suffix_name != '' ){
-		default_name = default_name + '_' + _suffix_name;
-	}
-
-	var serviceCon ='<p class="status">当前状态：<span>'+(status ? '已加载' : '未加载' )+
-        '</span><span style="color: '+
-        (status?'#20a53a;':'red;')+
-        ' margin-left: 3px;" class="glyphicon ' + (status?'glyphicon glyphicon-play':'glyphicon-pause')+'"></span></p><div class="sfm-opt">\
-            <button class="btn btn-default btn-sm" onclick="pluginOpInitD(\''+_name+'\',\''+_version+'\',\''+default_name+'\',\''+_suffix_name+'\')">'+(status?'卸载':'加载')+'</button>\
-        </div>'; 
-    $(".soft-man-con").html(serviceCon);
-}
-
-function pluginOpInitD(a, _version, b, _suffix_name='') {
-    var c = "name=" + a + "&func=" + b + "&version="+_version;
-    var d = "";
-    b = b.split('_'+_suffix_name)[0];
-    switch(b) {
-        case "initd_install":d = '加载';break;
-        case "initd_uninstall":d = '卸载';break;
-    }
-
-    _ver = _version;
-    if(_version != ''){
-    	_ver = '【' + _version + '】';
-    }
-
-    layer.confirm( msgTpl('您真的要{1}{2}{3}服务吗？', [d,a,_ver]), {icon:3,closeBtn: 1}, function() {
-        var e = layer.msg(msgTpl('正在{1}{2}{3}服务,请稍候...',[d,a,_ver]), {icon: 16,time: 0});
-        $.post("/plugins/run", c, function(g) {
-            layer.close(e);
-            var f = g.data == 'ok' ? msgTpl('{1}{3}服务已{2}',[a,d,_ver]) : msgTpl('{1}{3}服务{2}失败!',[a,d,_ver]);
-            layer.msg(f, {icon: g.data == 'ok' ? 1 : 2});
-            
-            if ( b == 'initd_install' && g.data == 'ok' ) {
-                pluginSetInitD(a, _version, true);
-            }else{
-                pluginSetInitD(a, _version, false);
-            }
-            if(g.data != 'ok') {
-                layer.msg(g.data, {icon: 2,time: 0,shade: 0.3,shadeClose: true});
-            }
-        },'json').error(function() {
-            layer.close(e);
-            layer.msg('系统异常!', {icon: 0});
-        });
-    })
-}
-
-function pluginLogs(_name, version, func, line){
-
-	var _this = this;
-    if ( typeof(version) == 'undefined' ){
-        version = '';
-    }
-
-    var func_name = 'error_log';
-    if ( typeof(func) != 'undefined' ){
-        func_name = func;
-    }
-
-    var file_line = 100;
-    if ( typeof(line) != 'undefined' ){
-        file_line = line;
-    }
-
-
-    var loadT = layer.msg('日志路径获取中...',{icon:16,time:0,shade: [0.3, '#000']});
-    $.post('/plugins/run', {name:_name, func:func_name, version:version},function (data) {
-        layer.close(loadT);
-
-        try{
-        	var jdata = $.parseJSON(data.data);
-        	if (!jdata['status']){
-        		layer.msg(jdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
-                return;
-        	}
-		}catch(err){/*console.log(err);*/}
-
-
-        var loadT2 = layer.msg('文件内容获取中...',{icon:16,time:0,shade: [0.3, '#000']});
-        var fileName = data.data;
-        $.post('/files/get_last_body', 'path=' + fileName+'&line='+file_line, function(rdata) {
-            layer.close(loadT2);
-            if (!rdata.status){
-                layer.msg(rdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
-                return;
-            }
-            
-            if(rdata.data == '') {
-            	rdata.data = '当前没有日志!';
-            }
-
-     
-            var h =  parseInt($('.bt-w-menu').css('height')) - 40;
-            var ebody = '<textarea readonly="" style="margin: 0px;height: '+h+'px;width: 100%;background-color: #333;color:#fff; padding:0 5px" id="info_log">'+rdata.data+'</textarea>';
-            $(".soft-man-con").html(ebody);
-            var ob = document.getElementById('info_log');
-            ob.scrollTop = ob.scrollHeight; 
-        },'json');
-    },'json');
-}
-
-
-function pluginRollingLogs(_name, version, func, _args, line){
-	if ( typeof(version) == 'undefined' ){
-        version = '';
-    }
-
-    var func_name = 'error_log';
-    if ( typeof(func) != 'undefined' ){
-        func_name = func;
-    }
-
-    var file_line = 100;
-    if ( typeof(line) != 'undefined' ){
-        file_line = line;
-    }
-
-    var reqTimer = null;
-
-    function requestLogs(fileName){
-    	$.post('/files/get_last_body', 'path=' + fileName+'&line='+file_line, function(rdata) {
-            if (!rdata.status){   
-                return;
-            }
-            
-            if(rdata.data == '') {
-            	rdata.data = '当前没有日志!';
-            }
-            var ebody = '<textarea readonly="readonly" style="margin: 0px;width: 100%;height: 360px;background-color: #333;color:#fff; padding:0 5px" id="roll_info_log">'+rdata.data+'</textarea>';
-            $("#plugins_rolling_logs").html(ebody);
-            var ob = document.getElementById('roll_info_log');
-            ob.scrollTop = ob.scrollHeight; 
-        },'json');
-    }
-
-
-    layer.open({
-        type: 1,
-        title: _name + '日志',
-        area: '640px',
-        end: function(){
-        	if (reqTimer){
-        		clearInterval(reqTimer);
-        	}
-        },
-        content:'<div class="change-default pd20" id="plugins_rolling_logs">\
-        	<textarea readonly="readonly" style="margin: 0px;width: 100%;height: 360px;background-color: #333;color:#fff; padding:0 5px" id="roll_info_log"></textarea>\
-        </div>',
-        success:function(){
-        	$.post('/plugins/run', {name:_name, func:func_name, version:version, args:_args},function (data) {
-		    	var fileName = data.data;
-		    	requestLogs(fileName);
-		    	reqTimer = setInterval(function(){
-		    		requestLogs(fileName);
-		    	},1000);
-		    },'json');
-        }
-    });
-}
-
-
-function pluginStandAloneLogs(_name, version, func, _args, line){
-	if ( typeof(version) == 'undefined' ){
-        version = '';
-    }
-
-    var func_name = 'error_log';
-    if ( typeof(func) != 'undefined' ){
-        func_name = func;
-    }
-
-    var file_line = 100;
-    if ( typeof(line) != 'undefined' ){
-        file_line = line;
-    }
-
-
-    layer.open({
-        type: 1,
-        title: _name + '日志',
-        area: '640px',
-        content:'<div class="change-default pd20" id="plugins_stand_alone_logs">\
-        	<textarea readonly="readonly" style="margin: 0px;width: 100%;height: 360px;background-color: #333;color:#fff; padding:0 5px"></textarea>\
-        	</div>'
-    });
-
-    $.post('/plugins/run', {name:_name, func:func_name, version:version,args:_args},function (data) {
-    	var fileName = data.data;
-		$.post('/files/get_last_body', 'path=' + fileName+'&line='+file_line, function(rdata) {
-            if (!rdata.status){   
-                return;
-            }
-            
-            if(rdata.data == '') {
-            	rdata.data = '当前没有日志!';
-            }
-            var ebody = '<textarea readonly="" style="margin: 0px;width: 100%;height: 360px;background-color: #333;color:#fff; padding:0 5px">'+rdata.data+'</textarea>';
-            $("#plugins_stand_alone_logs").html(ebody);
-            var ob = document.getElementById('plugins_stand_alone_logs');
-            ob.scrollTop = ob.scrollHeight; 
-        },'json');
-    },'json');
-}
-/*** 其中功能,针对插件通过库使用 end ***/
-
-
-$(function() {
-	autoHeight();
-});
-$(window).resize(function() {
-	autoHeight();
-});
\ No newline at end of file
diff --git a/route/static/app/site.js b/route/static/app/site.js
deleted file mode 100755
index 7a03629a0..000000000
--- a/route/static/app/site.js
+++ /dev/null
@@ -1,2923 +0,0 @@
-
-
-$("#site_search_input").keyup(function(event){
-	if(event.keyCode == 13) {
-		getWeb(1, -1, $(this).val());
-	}
-});
-
-$('#site_search').click(function(){
-	getWeb(1, -1, $('#site_search_input').val());
-});
-
-/**
- * 取回网站数据列表
- * @param {Number} page   当前页
- * @param {String} search 搜索条件
- */
- function getWeb(page, type_id, search) {
- 	if ( typeof(search) == 'undefined' ){
-		search = $('#site_search_input').val();
-	}
-	
-	var page = page == undefined ? '1':page;
-	var order = getCookie('order');
-	if(order){
-		order = '&order=' + order;
-	} else {
-		order = '';
-	}
-
-	var type = '';
-	if ( typeof(type_id) == 'undefined' ){
-		type = '&type_id=-1';
-	} else {
-		type = '&type_id='+type_id;
-	}
-
-	var sUrl = '/site/list';
-	var pdata = 'limit=10&p=' + page + '&search=' + search + order + type;
-	var loadT = layer.load();
-	//取回数据
-	$.post(sUrl, pdata, function(data) {
-		layer.close(loadT);
-		//构造数据列表
-		var body = '';
-		$("#webBody").html(body);
-		for (var i = 0; i < data.data.length; i++) {
-			//当前站点状态
-			if (data.data[i].status == '正在运行' || data.data[i].status == '1') {
-				var status = "<a href='javascript:;' title='停用这个站点' onclick=\"webStop(" + data.data[i].id + ",'" + data.data[i].name + "')\" class='btn-defsult'><span style='color:rgb(92, 184, 92)'>运行中</span><span style='color:rgb(92, 184, 92)' class='glyphicon glyphicon-play'></span></a>";
-			} else {
-				var status = "<a href='javascript:;' title='启用这个站点' onclick=\"webStart(" + data.data[i].id + ",'" + data.data[i].name + "')\" class='btn-defsult'><span style='color:red'>已停止</span><span style='color:rgb(255, 0, 0);' class='glyphicon glyphicon-pause'></span></a>";
-			}
-
-			//是否有备份
-			if (data.data[i].backup_count > 0) {
-				var backup = "<a href='javascript:;' class='btlink' onclick=\"getBackup(" + data.data[i].id + ")\">有备份</a>";
-			} else {
-				var backup = "<a href='javascript:;' class='btlink' onclick=\"getBackup(" + data.data[i].id + ")\">无备份</a>";
-			}
-			//是否设置有效期
-			var web_end_time = (data.data[i].edate == "0000-00-00") ? '永久': data.data[i].edate;
-			//表格主体
-			var shortwebname = data.data[i].name;
-			var shortpath = data.data[i].path;
-			if(data.data[i].name.length > 30) {
-				shortwebname = data.data[i].name.substring(0, 30) + "...";
-			}
-			if(data.data[i].path.length > 30){
-				shortpath = data.data[i].path.substring(0, 30) + "...";
-			}
-			var idname = data.data[i].name.replace(/\./g,'_');
-			
-			body = "<tr><td><input type='checkbox' name='id' title='"+data.data[i].name+"' onclick='checkSelect();' value='" + data.data[i].id + "'></td>\
-					<td><a class='btlink webtips' href='javascript:;' onclick=\"webEdit(" + data.data[i].id + ",'" + data.data[i].name + "','" + data.data[i].edate + "','" + data.data[i].addtime + "')\" title='"+data.data[i].name+"'>" + shortwebname + "</td>\
-					<td>" + status + "</td>\
-					<td>" + backup + "</td>\
-					<td><a class='btlink' title='打开目录"+data.data[i].path+"' href=\"javascript:openPath('"+data.data[i].path+"');\">" + shortpath + "</a></td>\
-					<td><a class='btlink setTimes' id='site_"+data.data[i].id+"' data-ids='"+data.data[i].id+"'>" + web_end_time + "</a></td>\
-					<td><a class='btlinkbed' href='javascript:;' data-id='"+data.data[i].id+"'>" + data.data[i].ps + "</a></td>\
-					<td style='text-align:right; color:#bbb'>\
-					<a href='javascript:;' class='btlink' onclick=\"webEdit(" + data.data[i].id + ",'" + data.data[i].name + "','" + data.data[i].edate + "','" + data.data[i].addtime + "')\">设置</a>\
-                        | <a href='javascript:;' class='btlink' onclick=\"webDelete('" + data.data[i].id + "','" + data.data[i].name + "')\" title='删除站点'>删除</a>\
-					</td></tr>"
-			
-			$("#webBody").append(body);
-			//setEdate(data.data[i].id,data.data[i].edate);
-         	//设置到期日期
-			function getDate(a) {
-				var dd = new Date();
-				dd.setTime(dd.getTime() + (a == undefined || isNaN(parseInt(a)) ? 0 : parseInt(a)) * 86400000);
-				var y = dd.getFullYear();
-				var m = dd.getMonth() + 1;
-				var d = dd.getDate();
-				return y + "-" + (m < 10 ? ('0' + m) : m) + "-" + (d < 10 ? ('0' + d) : d);
-			}
-            $('#webBody').on('click','#site_'+ data.data[i].id,function(){
-				var _this = $(this);
-				var id = $(this).attr('data-ids');
-				laydate.render({
-					elem: '#site_'+ id //指定元素
-					,min:getDate(1)
-					,max:'2099-12-31'
-					,vlue:getDate(365)
-					,type:'date'
-					,format :'yyyy-MM-dd'
-					,trigger:'click'
-					,btns:['perpetual', 'confirm']
-					,theme:'#20a53a'
-					,done:function(dates){
-						if(_this.html() == '永久'){
-						 	dates = '0000-00-00';
-						}
-						var loadT = layer.msg(lan.site.saving_txt, { icon: 16, time: 0, shade: [0.3, "#000"]}); 
-						$.post('/site/set_end_date','id='+id+'&edate='+dates,function(rdata){
-							layer.close(loadT);
-							layer.msg(rdata.msg,{icon:rdata.status?1:5});
-						},'json');
-					}
-				});
-            	this.click();
-            });
-		}
-		if(body.length < 10){
-			body = "<tr><td colspan='9'>当前没有站点数据</td></tr>";
-			// $(".dataTables_paginate").hide();
-			$("#webBody").html(body);
-		}
-		//输出数据列表
-		$(".btn-more").hover(function(){
-			$(this).addClass("open");
-		},function(){
-			$(this).removeClass("open");
-		});
-		
-		//输出分页
-		$("#webPage").html(data.page);
-		// $("#webPage").html('<div class="site_type"><span>站点分类:</span><select class="bt-input-text mr5" style="width:100px"><option value="-1">全部分类</option><option value="0">默认分类</option></select></div>');
-		
-		$(".btlinkbed").click(function(){
-			var dataid = $(this).attr("data-id");
-			var databak = $(this).text();
-			if(databak == null){
-				databak = '';
-			}
-			$(this).hide().after("<input class='baktext' type='text' data-id='"+dataid+"' data-page='"+page+"' name='bak' value='" + databak + "' placeholder='备注信息' onblur='getBakPost(\"sites\")' />");
-			$(".baktext").focus();
-		});
-
-		readerTableChecked();
-	},'json');
-}
-
-
-function getBakPost(b) {
-	$(".baktext").hide().prev().show();
-	var id = $(".baktext").attr("data-id");
-	var page = $(".baktext").attr("data-page");
-	var a = $(".baktext").val();
-	if(a == "") {
-		a = '空';
-	}
-	setWebPs(b, id, a,page);
-	$("a[data-id='" + id + "']").html(a);
-	$(".baktext").remove();
-}
-
-function setWebPs(b, id, ps,page) {
-	var d = layer.load({shade: true,shadeClose: false});
-	var ps = 'ps=' + ps;
-	$.post('/site/set_ps', 'id=' + id + "&" + ps, function(data) {
-		if(data['status']) {
-			getWeb(page);
-			layer.closeAll();
-			layer.msg('修改成功!', {icon: 1});
-		} else {
-			layer.closeAll();
-			layer.msg('修改失败!', {icon: 2});
-		}
-	},'json');
-}
-
-//创建站点前,检查服务是否开启
-function webAdd(type){
-	loading = layer.msg('正在检查是否开启OpenResty服务!',{icon:16,time:0,shade: [0.3, "#000"]})
-	$.post('/site/check_web_status', function(data){
-		layer.close(loading);
-		if (data.status){
-			webAddPage(type)
-		} else {
-			layer.msg(data.msg,{icon:0,time:3000,shade: [0.3, "#000"]})
-		}
-	},'json');
-}
-
-//添加站点
-function webAddPage(type) {
-
-	if (type == 1) {
-		var array;
-		var str="";
-		var domainlist='';
-		var domain = array = $("#mainDomain").val().replace('http://','').replace('https://','').split("\n");
-		var webport=[];
-		var checkDomain = domain[0].split('.');
-		if(checkDomain.length < 1){
-			layer.msg(lan.site.domain_err_txt,{icon:2});
-			return;
-		}
-		for(var i=1; i<domain.length; i++){
-			domainlist += '"'+domain[i]+'",';
-		}
-
-		webport = domain[0].split(":")[1];//主域名端口
-		if(webport == undefined){
-			webport="80";
-		}
-
-		domainlist = domainlist.substring(0,domainlist.length-1);//子域名json
-		domain ='{"domain":"'+domain[0]+'","domainlist":['+domainlist+'],"count":'+domain.length+'}';//拼接json
-		var loadT = layer.msg(lan.public.the_get,{icon:16,time:0,shade: [0.3, "#000"]})
-		var data = $("#addweb").serialize()+"&port="+webport+"&webinfo="+domain;
-
-		$.post('/site/add', data, function(ret) {
-			if (ret.status == true) {
-				getWeb(1);
-				layer.closeAll();
-				layer.msg('成功创建站点',{icon:1})
-			} else {
-				layer.msg(ret.msg, {icon: 2});
-			}
-			layer.close(loadT);
-		},'json');
-		return;
-	}
-	
-	$.post('/site/get_php_version',function(rdata){
-	
-		var defaultPath = $("#defaultPath").html();
-		var php_version = "<div class='line'><span class='tname'>"+lan.site.php_ver+"</span><select class='bt-input-text' name='version' id='c_k3' style='width:100px'>";
-		for (var i=rdata.length-1;i>=0;i--) {
-            php_version += "<option value='"+rdata[i].version+"'>"+rdata[i].name+"</option>";
-        }
-
-        var www = syncPost('/site/get_root_dir');
-
-		php_version += "</select><span id='php_w' style='color:red;margin-left: 10px;'></span></div>";
-		layer.open({
-			type: 1,
-			skin: 'demo-class',
-			area: '640px',
-			title: '添加网站',
-			closeBtn: 1,
-			shift: 0,
-			shadeClose: false,
-			content: "<form class='bt-form pd20 pb70' id='addweb'>\
-				<div class='line'>\
-                    <span class='tname'>"+lan.site.domain+"</span>\
-                    <div class='info-r c4'>\
-						<textarea id='mainDomain' class='bt-input-text' name='webname' style='width:458px;height:100px;line-height:22px' /></textarea>\
-					</div>\
-				</div>\
-                <div class='line'>\
-                <span class='tname'>备注</span>\
-                <div class='info-r c4'>\
-                	<input id='Wbeizhu' class='bt-input-text' type='text' name='ps' placeholder='网站备注' style='width:458px' />\
-                </div>\
-                </div>\
-                <div class='line'>\
-                <span class='tname'>根目录</span>\
-                <div class='info-r c4'>\
-                	<input id='inputPath' class='bt-input-text mr5' type='text' name='path' value='"+www['dir']+"/' placeholder='"+www['dir']+"' style='width:458px' />\
-                	<span class='glyphicon glyphicon-folder-open cursor' onclick='changePath(\"inputPath\")'></span>\
-                </div>\
-                </div>\
-				"+php_version+"\
-                <div class='bt-form-submit-btn'>\
-					<button type='button' class='btn btn-danger btn-sm btn-title' onclick='layer.closeAll()'>取消</button>\
-					<button type='button' class='btn btn-success btn-sm btn-title' onclick=\"webAdd(1)\">提交</button>\
-				</div>\
-            </form>",
-		});
-
-		$(function() {
-			var placeholder = "<div class='placeholder c9' style='top:10px;left:10px'>"+lan.site.domain_help+"</div>";
-			$('#mainDomain').after(placeholder);
-			$(".placeholder").click(function(){
-				$(this).hide();
-				$('#mainDomain').focus();
-			})
-			$('#mainDomain').focus(function() {
-			    $(".placeholder").hide();
-			});
-			
-			$('#mainDomain').blur(function() {
-				if($(this).val().length==0){
-					$(".placeholder").show();
-				}  
-			});
-			
-			//验证PHP版本
-			$("select[name='version']").change(function(){
-				if($(this).val() == '52'){
-					var msgerr = 'PHP5.2在您的站点有漏洞时有跨站风险，请尽量使用PHP5.3以上版本!';
-					$('#php_w').text(msgerr);
-				}else{
-					$('#php_w').text('');
-				}
-			})
-
-			$('#mainDomain').on('input', function() {
-				var array;
-				var res,ress;
-				var str = $(this).val().replace('http://','').replace('https://','');
-				var len = str.replace(/[^\x00-\xff]/g, "**").length;
-				array = str.split("\n");
-				ress =array[0].split(":")[0];
-				res = ress.replace(new RegExp(/([-.])/g), '_');
-				if(res.length > 15){ 
-					res = res.substr(0,15);
-				}
-
-				var placeholder = $("#inputPath").attr('placeholder');
-				$("#inputPath").val(placeholder+'/'+ress);
-				
-				if(res.length > 15){
-					res = res.substr(0,15);
-				}
-
-				$("#Wbeizhu").val(ress);
-			})
-
-			//备注
-			$('#Wbeizhu').on('input', function() {
-				var str = $(this).val();
-				var len = str.replace(/[^\x00-\xff]/g, "**").length;
-				if (len > 20) {
-					str = str.substring(0, 20);
-					$(this).val(str);
-					layer.msg('不能超出20个字符!', {
-						icon: 0
-					});
-				}
-			})
-			//获取当前时间时间戳，截取后6位
-			var timestamp = new Date().getTime().toString();
-			var dtpw = timestamp.substring(7);
-		});
-	}, 'json');
-}
-
-//修改网站目录
-function webPathEdit(id){
-	$.post('/site/get_dir_user_ini','&id='+id, function(data){
-		var userini = data['data'];
-		var webpath = userini['path'];
-		var siteName = userini['name'];
-		var runPath = userini['runPath']['runPath'];
-		var userinicheckeds = userini.userini?'checked':'';
-		var logscheckeds = userini.logs?'checked':'';
-		var opt = ''
-		var selected = '';
-		for(var i=0;i<userini.runPath.dirs.length;i++){
-			selected = '';
-			if(userini.runPath.dirs[i] == userini.runPath.runPath){ 
-				selected = 'selected';
-			}
-			opt += '<option value="'+ userini.runPath.dirs[i] +'" '+selected+'>'+ userini.runPath.dirs[i] +'</option>'
-		}
-		var webPathHtml = "<div class='webedit-box soft-man-con'>\
-					<div class='label-input-group ptb10'>\
-						<input type='checkbox' name='userini' id='userini'"+userinicheckeds+" /><label class='mr20' for='userini' style='font-weight:normal'>防跨站攻击(open_basedir)</label>\
-						<input type='checkbox' name='logs' id='logs'"+logscheckeds+" /><label for='logs' style='font-weight:normal'>写访问日志</label>\
-					</div>\
-					<div class='line mt10'>\
-						<span class='mr5'>网站目录</span>\
-						<input class='bt-input-text mr5' type='text' style='width:50%' placeholder='网站根目录' value='"+webpath+"' name='webdir' id='inputPath'>\
-						<span onclick='changePath(&quot;inputPath&quot;)' class='glyphicon glyphicon-folder-open cursor mr20'></span>\
-						<button class='btn btn-success btn-sm' onclick='setSitePath("+id+")'>保存</button>\
-					</div>\
-					<div class='line mtb15'>\
-						<span class='mr5'>运行目录</span>\
-						<select class='bt-input-text' type='text' style='width:50%; margin-right:41px' name='runPath' id='runPath'>"+opt+"</select>\
-						<button class='btn btn-success btn-sm' onclick='setSiteRunPath("+id+")' style='margin-top: -1px;'>保存</button>\
-					</div>\
-					<ul class='help-info-text c7 ptb10'>\
-						<li>部分程序需要指定二级目录作为运行目录，如ThinkPHP5，Laravel</li>\
-						<li>选择您的运行目录，点保存即可</li>\
-					</ul>"
-					+'<div class="user_pw_tit" style="margin-top: -8px;padding-top: 11px;">'
-						+'<span class="tit">密码访问</span>'
-						+'<span class="btswitch-p"><input '+(userini.pass?'checked':'')+' class="btswitch btswitch-ios" id="pathSafe" type="checkbox">'
-							+'<label class="btswitch-btn phpmyadmin-btn" for="pathSafe" onclick="pathSafe('+id+')"></label>'
-						+'</span>'
-					+'</div>'
-					+'<div class="user_pw" style="margin-top: 10px;display:'+(userini.pass?'block;':'none;')+'">'
-						+'<p><span>授权账号</span><input id="username_get" class="bt-input-text" name="username_get" value="" type="text" placeholder="不修改请留空"></p>'
-						+'<p><span>访问密码</span><input id="password_get_1" class="bt-input-text" name="password_get_1" value="" type="password" placeholder="不修改请留空"></p>'
-						+'<p><span>重复密码</span><input id="password_get_2" class="bt-input-text" name="password_get_1" value="" type="password" placeholder="不修改请留空"></p>'
-						+'<p><button class="btn btn-success btn-sm" onclick="setPathSafe('+id+')">保存</button></p>'
-					+'</div>'
-				+'</div>';
-
-		$("#webedit-con").html(webPathHtml);		
-		$("#userini").change(function(){
-			$.post('/site/set_dir_user_ini',{
-				'path':webpath,
-				'runPath':runPath,
-			},function(userini){
-				layer.msg(userini.msg+'<p style="color:red;">注意：设置防跨站需要重启PHP才能生效!</p>',{icon:userini.status?1:2});
-				tryRestartPHP(siteName);
-			},'json');
-		});
-		
-		$("#logs").change(function(){
-			var loadT = layer.msg("正在设置中...",{icon:16,time:10000,shade: [0.3, '#000']});
-			$.post('/site/logs_open','id='+id, function(rdata){
-				layer.close(loadT);
-				layer.msg(rdata.msg,{icon:rdata.status?1:2});
-			},'json');
-		});
-		
-	},'json');
-}
-
-//是否设置访问密码
-function pathSafe(id){
-	var isPass = $('#pathSafe').prop('checked');
-	if(!isPass){
-		$(".user_pw").show();
-	} else {
-		var loadT = layer.msg(lan.public.the,{icon:16,time:10000,shade: [0.3, '#000']});
-		$.post('/site/close_has_pwd',{id:id},function(rdata){
-			layer.close(loadT);
-			layer.msg(rdata.msg,{icon:rdata.status?1:2});
-			$(".user_pw").hide();
-		},'json');
-	}
-}
-
-//设置访问密码
-function setPathSafe(id){
-	var username = $("#username_get").val();
-	var pass1 = $("#password_get_1").val();
-	var pass2 = $("#password_get_2").val();
-	if(pass1 != pass2){
-		layer.msg('两次输入的密码不一致!',{icon:2});
-		return;
-	}
-	var loadT = layer.msg('正在处理,请稍候...',{icon:16,time:10000,shade: [0.3, '#000']});
-	$.post('/site/set_has_pwd',{id:id,username:username,password:pass1},function(rdata){
-		layer.close(loadT);
-		layer.msg(rdata.msg,{icon:rdata.status?1:2});
-	},'json');
-}
-
-//提交运行目录
-function setSiteRunPath(id){
-	var NewPath = $("#runPath").val();
-	var loadT = layer.msg(lan.public.the,{icon:16,time:10000,shade: [0.3, '#000']});
-	$.post('/site/set_site_run_path','id='+id+'&runPath='+NewPath,function(rdata){
-		layer.close(loadT);
-		var ico = rdata.status?1:2;
-		layer.msg(rdata.msg,{icon:ico});
-	},'json');
-}
-
-//提交网站目录
-function setSitePath(id){
-	var NewPath = $("#inputPath").val();
-	var loadT = layer.msg('正在处理,请稍候...',{icon:16,time:10000,shade: [0.3, '#000']});
-	$.post('/site/set_path','id='+id+'&path='+NewPath,function(rdata){
-		layer.close(loadT);
-		layer.msg(rdata.msg,{icon:rdata.status?1:2});
-	},'json');
-}
-
-//修改网站备注
-function webBakEdit(id){
-	$.post("/data?action=getKey','table=sites&key=ps&id="+id,function(rdata){
-		var webBakHtml = "<div class='webEdit-box padding-10'>\
-					<div class='line'>\
-					<label><span>"+lan.site.note_ph+"</span></label>\
-					<div class='info-r'>\
-					<textarea name='beizhu' id='webbeizhu' col='5' style='width:96%'>"+rdata+"</textarea>\
-					<br><br><button class='btn btn-success btn-sm' onclick='SetSitePs("+id+")'>保存</button>\
-					</div>\
-					</div>";
-		$("#webedit-con").html(webBakHtml);
-	});
-}
-
-
-//设置默认文档
-function setIndexEdit(id){
-	$.post('/site/get_index','id='+id,function(data){
-		var rdata = data['index'];
-		rdata = rdata.replace(new RegExp(/(,)/g), "\n");
-		var setIndexHtml = "<div id='SetIndex'><div class='SetIndex'>\
-				<div class='line'>\
-						<textarea class='bt-input-text' id='Dindex' name='files' style='height: 180px; width:50%; line-height:20px'>"+rdata+"</textarea>\
-						<button type='button' class='btn btn-success btn-sm pull-right' onclick='setIndexList("+id+")' style='margin: 70px 130px 0px 0px;'>"+lan.public.save+"</button>\
-				</div>\
-				<ul class='help-info-text c7 ptb10'>\
-					<li>默认文档，每行一个，优先级由上至下。</li>\
-				</ul>\
-				</div></div>";
-		$("#webedit-con").html(setIndexHtml);
-	},'json');
-}
-
-/**
- * 停止一个站点
- * @param {Int} wid  网站ID
- * @param {String} wname 网站名称
- */
-function webStop(wid, wname) {
-	layer.confirm('站点停用后将无法访问，您真的要停用这个站点吗？', {icon:3,closeBtn:2},function(index) {
-		if (index > 0) {
-			var loadT = layer.load();
-			$.post("/site/stop","id=" + wid + "&name=" + wname, function(ret) {
-				layer.msg(ret.msg,{icon:ret.status?1:2})
-				layer.close(loadT);
-				getWeb(1);
-			},'json');
-		}
-	});
-}
-
-/**
- * 启动一个网站
- * @param {Number} wid 网站ID
- * @param {String} wname 网站名称
- */
-function webStart(wid, wname) {
-	layer.confirm('即将启动站点，您真的要启用这个站点吗？',{icon:3,closeBtn:2}, function(index) {
-		if (index > 0) {
-			var loadT = layer.load()
-			$.post("/site/start","id=" + wid + "&name=" + wname, function(ret) {
-				layer.msg(ret.msg,{icon:ret.status?1:2})
-				layer.close(loadT);
-				getWeb(1);
-			},'json');
-		}
-	});
-}
-
-/**
- * 删除一个网站
- * @param {Number} wid 网站ID
- * @param {String} wname 网站名称
- */
-function webDelete(wid, wname){
-	var thtml = "<div class='options'>\
-	    	<label><input type='checkbox' id='delpath' name='path'><span>根目录</span></label>\
-	    	</div>";
-	var info = '是否要删除同名根目录';
-	safeMessage('删除站点'+"["+wname+"]",info, function(){
-		var path='';
-		if($("#delpath").is(":checked")){
-			path='&path=1';
-		}
-		var loadT = layer.msg('正在处理,请稍候...',{icon:16,time:10000,shade: [0.3, '#000']});
-		$.post("/site/delete","id=" + wid + "&webname=" + wname + path, function(ret){
-			layer.closeAll();
-			layer.msg(ret.msg,{icon:ret.status?1:2})
-			getWeb(1);
-		},'json');
-	},thtml);
-}
-
-
-//批量删除
-function allDeleteSite(){
-	var checkList = $("input[name=id]");
-	var dataList = new Array();
-	for(var i=0;i<checkList.length;i++){
-		if(!checkList[i].checked) continue;
-		var tmp = new Object();
-		tmp.name = checkList[i].title;
-		tmp.id = checkList[i].value;
-		dataList.push(tmp);
-	}
-	
-	var thtml = "<div class='options'>\
-	    	<label style=\"width:100%;\"><input type='checkbox' id='delpath' name='path'><span>"+lan.site.all_del_info+"</span></label>\
-	    	</div>";
-	safeMessage(lan.site.all_del_site,"<a style='color:red;'>"+lan.get('del_all_site',[dataList.length])+"</a>",function(){
-		layer.closeAll();
-		var path = '';
-		if($("#delpath").is(":checked")){
-			path='&path=1';
-		}
-		syncDeleteSite(dataList, 0,'',path);
-	},thtml);
-}
-
-//模拟同步开始批量删除
-function syncDeleteSite(dataList,successCount,errorMsg,path){
-	if(dataList.length < 1) {
-		showMsg(lan.get('del_all_site_ok',[successCount]), function(){
-			// location.reload();
-		},{icon:1});
-		return;
-	}
-	var loadT = layer.msg(lan.get('del_all_task_the',[dataList[0].name]),{icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/site/delete', 'id='+dataList[0].id+'&webname='+dataList[0].name+path , function(rdata){
-		layer.close(loadT);
-		if(rdata.status){
-			successCount++;
-			$("input[title='"+dataList[0].name+"']").parents("tr").remove();
-		} else {
-			if(!errorMsg){
-				errorMsg = '<br><p>'+lan.site.del_err+':</p>';
-			}
-			errorMsg += '<li>'+dataList[0].name+' -> '+rdata.msg+'</li>'
-		}
-		dataList.splice(0,1);
-		syncDeleteSite(dataList,successCount,errorMsg,path);
-	},'json');
-}
-
-
-/**
- * 域名管理
- * @param {Int} id 网站ID
- */
-function domainEdit(id, name, msg, status) {
-	$.post('/site/get_domain' ,{pid:id}, function(domain) {
-
-		var echoHtml = "";
-		for (var i = 0; i < domain.length; i++) {
-			echoHtml += "<tr>\
-				<td><a title='"+lan.site.click_access+"' target='_blank' href='http://" + domain[i].name + ":" + domain[i].port + "' class='btlinkbed'>" + domain[i].name + "</a></td>\
-				<td><a class='btlinkbed'>" + domain[i].port + "</a></td>\
-				<td class='text-center'><a class='table-btn-del' href='javascript:;' onclick=\"delDomain(" + id + ",'" + name + "','" + domain[i].name + "','" + domain[i].port + "',1)\"><span class='glyphicon glyphicon-trash'></span></a></td>\
-				</tr>";
-		}
-		var bodyHtml = "<textarea id='newdomain' class='bt-input-text' style='height: 100px; width: 340px;padding:5px 10px;line-height:20px'></textarea>\
-								<input type='hidden' id='newport' value='80' />\
-								<button type='button' class='btn btn-success btn-sm pull-right' style='margin:30px 35px 0 0' onclick=\"domainAdd(" + id + ",'" + name + "',1)\">添加</button>\
-							<div class='divtable mtb15' style='height:350px;overflow:auto'>\
-								<table class='table table-hover' width='100%'>\
-								<thead><tr><th>"+lan.site.domain+"</th><th width='70px'>端口</th><th width='50px' class='text-center'>操作</th></tr></thead>\
-								<tbody id='checkDomain'>" + echoHtml + "</tbody>\
-								</table>\
-							</div>";
-		$("#webedit-con").html(bodyHtml);
-		if(msg != undefined){
-			layer.msg(msg,{icon:status?1:5});
-		}
-		var placeholder = "<div class='placeholder c9' style='left:28px;width:330px;top:16px;'>每行填写一个域名，默认为80端口<br>泛解析添加方法 *.domain.com<br>如另加端口格式为 www.domain.com:88</div>";
-		$('#newdomain').after(placeholder);
-		$(".placeholder").click(function(){
-			$(this).hide();
-			$('#newdomain').focus();
-		})
-		$('#newdomain').focus(function() {
-		    $(".placeholder").hide();
-		});
-		
-		$('#newdomain').blur(function() {
-			if($(this).val().length==0){
-				$(".placeholder").show();
-			}  
-		});
-		$("#newdomain").on("input",function(){
-			var str = $(this).val();
-			if(isChineseChar(str)) {
-				$('.btn-zhm').show();
-			} else{
-				$('.btn-zhm').hide();
-			}
-		})
-		//checkDomain();
-	},'json');
-}
-
-//编辑域名/端口
-function cancelSend(){
-	$(".changeDomain,.changePort").hide().prev().show();
-	$(".changeDomain,.changePort").remove();
-}
-//遍历域名
-function checkDomain() {
-	$("#checkDomain tr").each(function() {
-		var $this = $(this);
-		var domain = $(this).find("td:first-child").text();
-		$(this).find("td:first-child").append("<i class='lading'></i>");
-	});
-}
-
-/**
- * 添加域名
- * @param {Int} id  网站ID
- * @param {String} webname 主域名
- */
-function domainAdd(id, webname,type) {
-	var Domain = $("#newdomain").val().split("\n");
-
-	var domainlist = '';
-	for(var i=0; i<Domain.length; i++){
-		domainlist += Domain[i]+ ',';
-	}
-	
-	if(domainlist.length < 3){
-		layer.msg(lan.site.domain_empty,{icon:5});
-		return;
-	}
-
-	domainlist = domainlist.substring(0,domainlist.length-1);
-	var loadT = layer.load();
-	var data = "domain=" + domainlist + "&webname=" + webname + "&id=" + id;
-	$.post('/site/add_domain', data, function(retuls) {
-		layer.close(loadT);
-		domainEdit(id, webname, retuls.msg, retuls.status);
-	},'json');
-}
-
-/**
- * 删除域名
- * @param {Number} wid 网站ID
- * @param {String} wname 主域名
- * @param {String} domain 欲删除的域名
- * @param {Number} port 对应的端口
- */
-function delDomain(wid, wname, domain, port,type) {
-	var num = $("#checkDomain").find("tr").length;
-	if(num==1){
-		layer.msg(lan.site.domain_last_cannot);
-	}
-	layer.confirm(lan.site.domain_del_confirm,{icon:3,closeBtn:2}, function(index) {
-		var url = "/site/del_domain"
-		var data = "id=" + wid + "&webname=" + wname + "&domain=" + domain + "&port=" + port;
-		var loadT = layer.msg(lan.public.the_del,{time:0,icon:16});
-		$.post(url,data, function(ret) {
-			layer.close(loadT);
-			layer.msg(ret.msg,{icon:ret.status?1:2})
-			if(type == 1){
-				layer.close(loadT);
-				domainEdit(wid,wname)
-			}else{
-				layer.closeAll();
-				DomainRoot(wid, wname);
-			}
-		},'json');
-	});
-}
-
-/**
- * 判断IP/域名格式
- * @param {String} domain  源文本
- * @return bool
- */
-function isDomain(domain) {
-	//domain = 'http://'+domain;
-	var re = new RegExp();
-	re.compile("^[A-Za-z0-9-_]+\\.[A-Za-z0-9-_%&\?\/.=]+$");
-	if (re.test(domain)) {
-		return (true);
-	} else {
-		return (false);
-	}
-}
-
-
-/**
- *设置数据库备份
- * @param {Number} sign	操作标识
- * @param {Number} id	编号
- * @param {String} name	主域名
- */
-function webBackup(id, name) {
-	var loadT =layer.msg('正在备份,请稍候...', {icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/site/to_backup', "id="+id, function(rdata) {
-		layer.closeAll();
-		layer.msg(rdata.msg,{icon:rdata.status?1:2});
-
-		getBackup(id);
-	},'json');
-}
-
-/**
- *删除网站备份
- * @param {Number} webid	网站编号
- * @param {Number} id	文件编号
- * @param {String} name	主域名
- */
-function webBackupDelete(id,pid){
-	layer.confirm('真的要删除备份包吗?',{title:'删除备份文件!',icon:3,closeBtn:2},function(index){
-		var loadT =layer.msg('正在删除,请稍候...', {icon:16,time:0,shade: [0.3, '#000']});
-		$.post('/site/del_backup','id='+id, function(rdata){
-			layer.closeAll();
-			layer.msg(rdata.msg,{icon:rdata.status?1:2});
-			getBackup(pid);
-		},'json');
-	})
-}
-
-function getBackup(id,name,page) {
-
-	if(typeof(page) == 'undefined'){
-		page = '1';
-	}
-	$.post('/site/get_backup','search=' + id + '&limit=5&p='+page, function(frdata){		
-		var body = '';
-		for (var i = 0; i < frdata.data.length; i++) {
-			if(frdata.data[i].type == '1') {
-				continue;
-			}
-			
-			var ftpdown = "<a class='btlink' href='/files/download?filename="+frdata.data[i].filename+"&name="+frdata.data[i].name+"' target='_blank'>下载</a> | ";
-			body += "<tr><td><span class='glyphicon glyphicon-file'></span>"+frdata.data[i].name+"</td>\
-					<td>" + (toSize(frdata.data[i].size)) + "</td>\
-					<td>" + frdata.data[i].addtime + "</td>\
-					<td class='text-right' style='color:#ccc'>"+ ftpdown + "<a class='btlink' href='javascript:;' onclick=\"webBackupDelete('" + frdata.data[i].id + "',"+id+")\">删除</a></td>\
-				</tr>"
-		}
-
-		var ftpdown = '';
-		frdata.page = frdata.page.replace(/'/g,'"').replace(/getBackup\(/g,"getBackup(" + id + ",0,");
-
-		if(name == 0){
-			var sBody = "<table width='100%' id='webBackupList' class='table table-hover'>\
-						<thead><tr><th>文件名称</th><th>文件大小</th><th>打包时间</th><th width='140px' class='text-right'>操作</th></tr></thead>\
-						<tbody id='webBackupBody' class='list-list'>"+body+"</tbody>\
-						</table>"
-			$("#webBackupList").html(sBody);
-			$(".page").html(frdata.page);
-			return;
-		}
-		layer.closeAll();
-		layer.open({
-			type: 1,
-			skin: 'demo-class',
-			area: '700px',
-			title: '打包备份',
-			closeBtn: 1,
-			shift: 0,
-			shadeClose: false,
-			content: "<div class='bt-form ptb15 mlr15' id='webBackup'>\
-						<button class='btn btn-default btn-sm' style='margin-right:10px' type='button' onclick=\"webBackup('" + frdata['site']['id'] + "','" +  frdata['site']['name'] + "')\">打包备份</button>\
-						<div class='divtable mtb15' style='margin-bottom:0'>\
-							<table width='100%' id='webBackupList' class='table table-hover'>\
-							<thead>\
-								<tr><th>文件名称</th><th>文件大小</th><th>打包时间</th><th width='140px' class='text-right'>操作</th></tr>\
-							</thead>\
-							<tbody id='webBackupBody' class='list-list'>" + body + "</tbody>\
-							</table>\
-							<div class='page'>" + frdata.page + "</div>\
-						</div>\
-					</div>"
-		});
-	},'json');
-}
-
-function goSet(num) {
-	//取选中对象
-	var el = document.getElementsByTagName('input');
-	var len = el.length;
-	var data = '';
-	var a = '';
-	var count = 0;
-	//构造POST数据
-	for (var i = 0; i < len; i++) {
-		if (el[i].checked == true && el[i].value != 'on') {
-			data += a + count + '=' + el[i].value;
-			a = '&';
-			count++;
-		}
-	}
-	//判断操作类别
-	if(num==1){
-		reAdd(data);
-	}
-	else if(num==2){
-		shift(data);
-	}
-}
-
-
-//设置默认文档
-function setIndex(id){
-	var quanju = (id==undefined)?lan.site.public_set:lan.site.local_site;
-	var data=id==undefined?"":"id="+id;
-	$.post('/site?action=GetIndex',data,function(rdata){
-		rdata= rdata.replace(new RegExp(/(,)/g), "\n");
-		layer.open({
-				type: 1,
-				area: '500px',
-				title: lan.site.setindex,
-				closeBtn: 1,
-				shift: 5,
-				shadeClose: true,
-				content:"<form class='bt-form' id='SetIndex'><div class='SetIndex'>"
-				+"<div class='line'>"
-				+"	<span class='tname' style='padding-right:2px'>"+lan.site.default_doc+"</span>"
-				+"	<div class='info-r'>"
-				+"		<textarea id='Dindex' name='files' style='line-height:20px'>"+rdata+"</textarea>"
-				+"		<p>"+quanju+lan.site.default_doc_help+"</p>"
-				+"	</div>"
-				+"</div>"
-				+"<div class='bt-form-submit-btn'>"
-				+"	<button type='button' id='web_end_time' class='btn btn-danger btn-sm btn-title' onclick='layer.closeAll()'>"+lan.public.cancel+"</button>"
-			    +"    <button type='button' class='btn btn-success btn-sm btn-title' onclick='setIndexList("+id+")'>"+lan.public.ok+"</button>"
-		        +"</div>"
-				+"</div></form>"
-		});
-	});
-}
-
-//设置默认站点
-function setDefaultSite(){
-	var name = $("#default_site").val();
-	var loadT = layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/site/set_default_site','name='+name,function(rdata){
-		layer.closeAll();
-		layer.msg(rdata.msg,{icon:rdata.status?1:5});
-	},'json');
-}
-
-
-//默认站点
-function getDefaultSite(){
-	$.post('/site/get_default_site','',function(rdata){
-		var opt = '<option value="off">未设置默认站点</option>';
-		var selected = '';
-		for(var i=0;i<rdata.sites.length;i++){
-			selected = '';
-			if(rdata.default_site == rdata.sites[i].name) selected = 'selected';
-			opt += '<option value="' + rdata.sites[i].name + '" ' + selected + '>' + rdata.sites[i].name + '</option>';
-		}
-		
-		layer.open({
-			type: 1,
-			area: '530px',
-			title: '设置默认站点',
-			closeBtn: 1,
-			shift: 5,
-			shadeClose: true,
-			content:'<div class="bt-form ptb15 pb70">\
-						<p class="line">\
-							<span class="tname text-right">默认站点</span>\
-							<select id="default_site" class="bt-input-text" style="width: 300px;">'+opt+'</select>\
-						</p>\
-						<ul class="help-info-text c6 plr20">\
-						    <li>设置默认站点后,所有未绑定的域名和IP都被定向到默认站点</li>\
-						    <li>可有效防止恶意解析</li>\
-					    </ul>\
-						<div class="bt-form-submit-btn">\
-							<button type="button" class="btn btn-danger btn-sm btn-title" onclick="layer.closeAll()">取消</button>\
-							<button class="btn btn-success btn-sm btn-title" onclick="setDefaultSite()">确定</button>\
-						</div>\
-					</div>'
-		});
-	},'json');
-}
-
-function setPHPVer(){
-	$.post('/site/get_cli_php_version','',function(rdata){
-		if(typeof(rdata['status'])!='undefined'){
-			layer.msg(rdata.msg,{icon:rdata.status?1:2});
-			return;
-		}
-
-		var opt = '';
-		var selected = '';
-		for(var i=0;i<rdata.versions.length;i++){
-			selected = '';
-			if(rdata.select.version == rdata.versions[i].version) selected = 'selected';
-
-			if (rdata.versions[i].version.indexOf("yum")>-1){
-				continue;
-			}
-
-			if (rdata.versions[i].version.indexOf("apt")>-1){
-				continue;
-			}
-
-			opt += '<option value="' + rdata.versions[i].version + '" ' + selected + '>' + rdata.versions[i].name + '</option>';
-		}
-		
-		var phpver_layer = layer.open({
-			type: 1,
-			area: '530px',
-			title: '设置PHP-CLI(命令行)版本',
-			closeBtn: 1,
-			shift: 5,
-			shadeClose: true,
-			btn:["确定","取消"],
-			content:'<div class="bt-form ptb15">\
-						<p class="line">\
-							<span class="tname text-right">PHP-CLI版本</span>\
-							<select id="default_ver" class="bt-input-text" style="width: 300px;">'+opt+'</select>\
-						</p>\
-						<ul class="help-info-text c6 plr20">\
-						    <li>此处可设置命令行运行php时使用的PHP版本</li>\
-						    <li>安装新的PHP版本后此处需要重新设置</li>\
-					    </ul>\
-					</div>',
-			yes:function(layero,index){
-				var version = $("#default_ver").val();
-				var loadT = layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']});
-				$.post('/site/set_cli_php_version','version='+version,function(rdata){
-					layer.close(loadT);
-					showMsg(rdata.msg,function(){
-						if (rdata.status){
-							layer.close(phpver_layer);
-						}
-					},{icon:rdata.status?1:5},2000);
-				},'json');
-			},
-		});
-	},'json');
-}
-
-function setIndexList(id){
-	var Dindex = $("#Dindex").val().replace(new RegExp(/(\n)/g), ",");
-	if(id == undefined ){
-		var data="id=&index="+Dindex;
-	} else{
-		var data="id="+id+"&index="+Dindex;
-	}
-	var loadT= layer.load(2);
-	$.post('/site/set_index',data,function(rdata){
-		layer.close(loadT);
-		var ico = rdata.status? 1:5;
-		layer.msg(rdata.msg,{icon:ico});
-	},'json');
-}
-
-
-/*站点修改*/
-function webEdit(id,website,endTime,addtime){
-	layer.open({
-		type: 1,
-		area: '700px',
-		title: '站点修改['+website+']  --  添加时间['+addtime+']',
-		closeBtn: 1,
-		shift: 0,
-		content: "<div class='bt-form'>\
-			<div class='bt-w-menu pull-left' style='height: 565px;'>\
-				<p class='bgw' onclick=\"domainEdit(" + id + ",'" + website + "')\">域名管理</p>\
-				<p onclick='dirBinding("+id+")'>子目录绑定</p>\
-				<p onclick='webPathEdit("+id+")'>网站目录</p>\
-				<p onclick='limitNet("+id+")'>流量限制</p>\
-				<p onclick=\"rewrite('"+website+"')\">伪静态</p>\
-				<p onclick='setIndexEdit("+id+")'>默认文档</p>\
-				<p onclick=\"configFile('"+website+"')\">配置文件</p>\
-				<p onclick=\"setSSL("+id+",'"+website+"')\">SSL</p>\
-				<p onclick=\"phpVersion('"+website+"')\">PHP版本</p>\
-				<p onclick=\"to301('"+website+"')\">重定向</p>\
-				<p onclick=\"toProxy('"+website+"')\">反向代理</p>\
-				<p id='site_"+id+"' onclick=\"security('"+id+"','"+website+"')\">防盗链</p>\
-				<p id='site_"+id+"' onclick=\"getSiteLogs('"+website+"')\">响应日志</p>\
-				<p id='site_"+id+"' onclick=\"getSiteErrorLogs('"+website+"')\">错误日志</p>\
-			</div>\
-			<div id='webedit-con' class='bt-w-con webedit-con pd15' style='height: 565px;overflow: scroll;'></div>\
-		</div>",
-		success:function(){
-			//域名输入提示
-			var placeholder = "<div class='placeholder'>每行填写一个域名，默认为80端口<br>泛解析添加方法 *.domain.com<br>如另加端口格式为 www.domain.com:88</div>";
-			$('#newdomain').after(placeholder);
-			$(".placeholder").click(function(){
-				$(this).hide();
-				$('#newdomain').focus();
-			});
-
-			$('#newdomain').focus(function() {
-			    $(".placeholder").hide();
-			});
-			
-			$('#newdomain').blur(function() {
-				if($(this).val().length == 0){
-					$(".placeholder").show();
-				}  
-			});
-
-			//切换
-			$(".bt-w-menu p").click(function(){
-				$(this).addClass("bgw").siblings().removeClass("bgw");
-			});
-
-			domainEdit(id,website);
-		}
-	});	
-}
-
-//取网站日志
-function getSiteLogs(siteName){
-	var loadT = layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/site/get_logs',{siteName:siteName},function(logs){
-		layer.close(loadT);
-		if(logs.status !== true){
-			logs.msg = '';
-		}
-		if (logs.msg == '') logs.msg = '当前没有日志.';
-		var phpCon = '<textarea wrap="off" readonly="" style="white-space: pre;margin: 0px;width: 560px;height: 530px;background-color: #333;color:#fff; padding:0 5px" id="error_log">'+logs.msg+'</textarea>';
-		$("#webedit-con").html(phpCon);
-		var ob = document.getElementById('error_log');
-		ob.scrollTop = ob.scrollHeight;		
-	},'json');
-}
-
-//取网站错误日志
-function getSiteErrorLogs(siteName){
-	var loadT = layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/site/get_error_logs',{siteName:siteName},function(logs){
-		// console.log(logs);
-		layer.close(loadT);
-		if(logs.status !== true){
-			logs.msg = '';
-		}
-		if (logs.msg == '') logs.msg = '当前没有日志.';
-		var phpCon = '<textarea wrap="off" readonly="" style="white-space: pre;margin: 0px;width: 560px;height: 530px;background-color: #333;color:#fff; padding:0 5px" id="error_log">'+logs.msg+'</textarea>';
-		$("#webedit-con").html(phpCon);
-		var ob = document.getElementById('error_log');
-		ob.scrollTop = ob.scrollHeight;		
-	},'json');
-}
-
-
-//防盗链
-function security(id,name){
-	var loadT = layer.msg(lan.site.the_msg,{icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/site/get_security',{id:id,name:name},function(rdata){
-		console.log(rdata);
-		layer.close(loadT);
-		var mbody = '<div>'
-					+'<p style="margin-bottom:8px"><span style="display: inline-block; width: 60px;">URL后缀</span><input class="bt-input-text" type="text" name="sec_fix" value="'+rdata.fix+'" style="margin-left: 5px;width: 425px;height: 30px;margin-right:10px;'+(rdata.status?'background-color: #eee;':'')+'" placeholder="多个请用逗号隔开,例：png,jpeg,jpg,gif,zip" '+(rdata.status?'readonly':'')+'></p>'
-					+'<p style="margin-bottom:8px"><span style="display: inline-block; width: 60px;">许可域名</span><input class="bt-input-text" type="text" name="sec_domains" value="'+rdata.domains+'" style="margin-left: 5px;width: 425px;height: 30px;margin-right:10px;'+(rdata.status?'background-color: #eee;':'')+'" placeholder="支持通配符,多个域名请用逗号隔开,例：*.test.com,test.com" '+(rdata.status?'readonly':'')+'></p>'
-					+'<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="sec_status" onclick="setSecurity(\''+name+'\','+id+')" '+(rdata.status?'checked':'')+'>启用防盗链</label></div>'
-					+'<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="sec_none_status" onclick="setSecurity(\''+name+'\','+id+')" '+(rdata.none?'checked':'')+'>允许空HTTP_REFERER请求</label></div>'
-					+'<ul class="help-info-text c7 ptb10">'
-						+'<li>默认允许资源被直接访问,即不限制HTTP_REFERER为空的请求</li>'
-						+'<li>多个URL后缀与域名请使用逗号(,)隔开,如: png,jpeg,zip,js</li>'
-						+'<li>当触发防盗链时,将直接返回404状态</li>'
-					+'</ul>'
-				+'</div>'
-		$("#webedit-con").html(mbody);
-	},'json');
-}
-
-//设置防盗链
-function setSecurity(name,id, none){
-	setTimeout(function(){
-		var data = {
-			fix:$("input[name='sec_fix']").val(),
-			domains:$("input[name='sec_domains']").val(),
-			status:$("input[name='sec_status']").prop("checked"),
-			none:$("input[name='sec_none_status']").prop("checked"),
-			name:name,
-			id:id
-		}
-		var loadT = layer.msg(lan.site.the_msg,{icon:16,time:0,shade: [0.3, '#000']});
-		$.post('/site/set_security',data,function(rdata){
-			layer.close(loadT);
-			layer.msg(rdata.msg,{icon:rdata.status?1:2});
-			if(rdata.status) setTimeout(function(){security(id,name);},1000);
-		},'json');
-	},100);
-}
-
-
-//流量限制
-function limitNet(id){
-	$.post('/site/get_limit_net','id='+id, function(rdata){
-		var status_selected = rdata.perserver != 0?'checked':'';
-		if(rdata.perserver == 0){
-			rdata.perserver = 300;
-			rdata.perip = 25;
-			rdata.limit_rate = 512;
-		}
-		var limitList = "<option value='1' "+((rdata.perserver == 0 || rdata.perserver == 300)?'selected':'')+">"+lan.site.limit_net_1+"</option>"
-						+"<option value='2' "+((rdata.perserver == 200)?'selected':'')+">"+lan.site.limit_net_2+"</option>"
-						+"<option value='3' "+((rdata.perserver == 50)?'selected':'')+">"+lan.site.limit_net_3+"</option>"
-						+"<option value='4' "+((rdata.perserver == 500)?'selected':'')+">"+lan.site.limit_net_4+"</option>"
-						+"<option value='5'  "+((rdata.perserver == 400)?'selected':'')+">"+lan.site.limit_net_5+"</option>"
-						+"<option value='6' "+((rdata.perserver == 60)?'selected':'')+">"+lan.site.limit_net_6+"</option>"
-						+"<option value='7' "+((rdata.perserver == 150)?'selected':'')+">"+lan.site.limit_net_7+"</option>"
-		var body = "<div class='dirBinding flow c4'>"
-				+'<p class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" '+status_selected+' onclick="saveLimitNet('+id+')" style="width:15px;height:15px;margin-right:5px" />'+lan.site.limit_net_8+'</label></p>'
-				+"<p class='line' style='padding:10px 0'><span class='span_tit mr5'>"+lan.site.limit_net_9+"：</span><select class='bt-input-text mr20' name='limit' style='width:90px'>"+limitList+"</select></p>"
-			    +"<p class='line' style='padding:10px 0'><span class='span_tit mr5'>"+lan.site.limit_net_10+"：</span><input class='bt-input-text mr20' style='width: 90px;' type='number' name='perserver' value='"+rdata.perserver+"' /></p>"
-			    +"<p class='line' style='padding:10px 0'><span class='span_tit mr5'>"+lan.site.limit_net_12+"：</span><input class='bt-input-text mr20' style='width: 90px;' type='number' name='perip' value='"+rdata.perip+"' /></p>"
-			    +"<p class='line' style='padding:10px 0'><span class='span_tit mr5'>"+lan.site.limit_net_14+"：</span><input class='bt-input-text mr20' style='width: 90px;' type='number' name='limit_rate' value='"+rdata.limit_rate+"' /></p>"
-			    +"<button class='btn btn-success btn-sm mt10' onclick='saveLimitNet("+id+",1)'>"+lan.public.save+"</button>"
-			    +"</div>"
-				+"<ul class='help-info-text c7 mtb15'><li>"+lan.site.limit_net_11+"</li><li>"+lan.site.limit_net_13+"</li><li>"+lan.site.limit_net_15+"</li></ul>"
-		$("#webedit-con").html(body);
-			
-		$("select[name='limit']").change(function(){
-			var type = $(this).val();
-			perserver = 300;
-			perip = 25;
-			limit_rate = 512;
-			switch(type){
-				case '1':
-					perserver = 300;
-					perip = 25;
-					limit_rate = 512;
-					break;
-				case '2':
-					perserver = 200;
-					perip = 10;
-					limit_rate = 1024;
-					break;
-				case '3':
-					perserver = 50;
-					perip = 3;
-					limit_rate = 2048;
-					break;
-				case '4':
-					perserver = 500;
-					perip = 10;
-					limit_rate = 2048;
-					break;
-				case '5':
-					perserver = 400;
-					perip = 15;
-					limit_rate = 1024;
-					break;
-				case '6':
-					perserver = 60;
-					perip = 10;
-					limit_rate = 512;
-					break;
-				case '7':
-					perserver = 150;
-					perip = 4;
-					limit_rate = 1024;
-					break;
-			}
-			
-			$("input[name='perserver']").val(perserver);
-			$("input[name='perip']").val(perip);
-			$("input[name='limit_rate']").val(limit_rate);
-		});
-	},'json');
-}
-
-
-//保存流量限制配置
-function saveLimitNet(id, type){
-	var isChecked = $("input[name='status']").attr('checked');
-	if(isChecked == undefined || type == 1 ){
-		var data = 'id='+id+'&perserver='+$("input[name='perserver']").val()+'&perip='+$("input[name='perip']").val()+'&limit_rate='+$("input[name='limit_rate']").val();
-		var loadT = layer.msg(lan.public.config,{icon:16,time:10000})
-		$.post('/site/save_limit_net',data,function(rdata){
-			layer.close(loadT);
-			limitNet(id);
-			layer.msg(rdata.msg,{icon:rdata.status?1:2});
-		},'json');
-	}else{
-		var loadT = layer.msg(lan.public.config,{icon:16,time:10000})
-		$.post('/site/close_limit_net',{id:id},function(rdata){
-			layer.close(loadT);
-			limitNet(id);
-			layer.msg(rdata.msg,{icon:rdata.status?1:2});
-		},'json');
-	}
-}
-
-
-//子目录绑定
-function dirBinding(id){
-	$.post('/site/get_dir_binding',{'id':id},function(data){
-		var rdata = data['data'];
-		var echoHtml = '';
-		for(var i=0;i<rdata.binding.length;i++){
-			echoHtml += "<tr><td>"+rdata.binding[i].domain+"</td><td>"+rdata.binding[i].port+"</td><td>"+rdata.binding[i].path+"</td><td class='text-right'><a class='btlink' href='javascript:setDirRewrite("+rdata.binding[i].id+");'>伪静态</a> | <a class='btlink' href='javascript:delDirBind("+rdata.binding[i].id+","+id+");'>删除</a></td></tr>";
-		}
-		
-		var dirList = '';
-		for(var n=0;n<rdata.dirs.length;n++){
-			dirList += "<option value='"+rdata.dirs[n]+"'>"+rdata.dirs[n]+"</option>";
-		}
-		
-		var body = "<div class='dirBinding c5'>"
-			   + "域名：<input class='bt-input-text mr20' type='text' name='domain' />"
-			   + "子目录：<select class='bt-input-text mr20' name='dirName'>"+dirList+"</select>"
-			   + "<button class='btn btn-success btn-sm' onclick='addDirBinding("+id+")'>添加</button>"
-			   + "</div>"
-			   + "<div class='divtable mtb15' style='height:470px;overflow:auto'><table class='table table-hover' width='100%' style='margin-bottom:0'>"
-			   + "<thead><tr><th>域名</th><th width='70'>端口</th><th width='100'>子目录</th><th width='100' class='text-right'>操作</th></tr></thead>"
-			   + "<tbody id='checkDomain'>" + echoHtml + "</tbody>"
-			   + "</table></div>";
-		
-		$("#webedit-con").html(body);
-	},'json');
-}
-
-//子目录伪静态
-function setDirRewrite(id){
-	$.post('/site/get_dir_bind_rewrite','id='+id,function(rdata){
-		if(!rdata.status){
-			var confirmObj = layer.confirm('你真的要为这个子目录创建独立的伪静态规则吗？',{icon:3,closeBtn:2},function(){
-				$.post('/site/get_dir_bind_rewrite','id='+id+'&add=1',function(rdata){
-					layer.close(confirmObj);
-					showRewrite(rdata);
-				},'json');
-			});
-			return;
-		}
-		showRewrite(rdata);
-	},'json');
-}
-
-//显示伪静态
-function showRewrite(rdata){
-	var rList = ''; 
-	for(var i=0;i<rdata.rlist.length;i++){
-		rList += "<option value='"+rdata.rlist[i]+"'>"+rdata.rlist[i]+"</option>";
-	}
-	var webBakHtml = "<div class='c5 plr15'>\
-				<div class='line'>\
-					<select class='bt-input-text mr20' id='myRewrite' name='rewrite' style='width:30%;'>"+rList+"</select>\
-					<textarea class='bt-input-text mtb15' style='height: 260px; width: 470px; line-height:18px;padding:5px;' id='rewriteBody'>"+rdata.data+"</textarea>\
-				</div>\
-				<button id='setRewriteBtn' class='btn btn-success btn-sm'>保存</button>\
-				<ul class='help-info-text c7 ptb10'>\
-					<li>请选择您的应用，若设置伪静态后，网站无法正常访问，请尝试设置回default</li>\
-					<li>您可以对伪静态规则进行修改，修改完后保存即可。</li>\
-				</ul>\
-			</div>";
-	layer.open({
-		type: 1,
-		area: '500px',
-		title: '配置伪静态规则',
-		closeBtn: 1,
-		shift: 5,
-		shadeClose: true,
-		content:webBakHtml,
-		success:function(){
-
-			$("#myRewrite").change(function(){
-				var rewriteName = $(this).val();
-				$.post('/files/get_body','path='+rdata['rewrite_dir']+'/'+rewriteName+'.conf',function(fileBody){
-					 $("#rewriteBody").val(fileBody.data.data);
-				},'json');
-			});
-
-			$('#setRewriteBtn').click(function(){
-				var data = $("#rewriteBody").val();
-				setRewrite(rdata.filename, encodeURIComponent(data));
-			});
-		}
-	});
-}
-
-//添加子目录绑定
-function addDirBinding(id){
-	var domain = $("input[name='domain']").val();
-	var dirName = $("select[name='dirName']").val();
-	if(domain == '' || dirName == '' || dirName == null){
-		layer.msg(lan.site.d_s_empty,{icon:2});
-		return;
-	}
-	
-	var data = 'id='+id+'&domain='+domain+'&dirName='+dirName;
-	$.post('/site/add_dir_bind',data,function(rdata){
-		dirBinding(id);
-		layer.msg(rdata.msg,{icon:rdata.status?1:2});
-	},'json');
-}
-
-//删除子目录绑定
-function delDirBind(id,siteId){
-	layer.confirm(lan.site.s_bin_del,{icon:3,closeBtn:2},function(){
-		$.post('/site/del_dir_bind','id='+id,function(rdata){
-			dirBinding(siteId);
-			layer.msg(rdata.msg,{icon:rdata.status?1:2});
-		},'json');
-	});
-}
-		
-//301重定向
-function to301(siteName, type, obj){
-	
-	// 设置 页面展示
-	if(type == 1) {
-		obj = {
-			to: 'http://',
-			from: '',
-			r_type: '',
-			type: 1,
-			type: 'path',
-			keep_path: 1
-		}
-		var redirect_form = layer.open({
-			type: 1,
-			skin: 'demo-class',
-			area: '650px',
-			title: type == 1 ? '创建重定向' : '修改重定向[' + obj.redirectname + ']',
-			closeBtn: 1,
-			shift: 5,
-			shadeClose: false,
-			content: "<form id='form_redirect' class='divtable pd20' style='padding-bottom: 60px'>" +
-				"<div class='line' style='overflow:hidden;height: 40px;'>" +
-				"<div style='display: inline-block;'>" +
-				"<span class='tname' style='margin-left:10px;position: relative;top: -5px;'>保留URI参数</span>" +
-				"<input class='btswitch btswitch-ios' id='keep_path' type='checkbox' name='keep_path' " + (obj.keep_path == 1 ? 'checked="checked"' : '') + " /><label class='btswitch-btn phpmyadmin-btn' for='keep_path' style='float:left'></label>" +
-				"</div>" +
-				"</div>" +
-				"<div class='line' style='clear:both;'>" +
-				"<span class='tname'>重定向类型</span>" +
-				"<div class='info-r  ml0'>" +
-				"<select class='bt-input-text mr5' name='type' style='width:100px'><option value='domain' " + (obj.type == 'domain' ? 'selected ="selected"' : "") + ">域名</option><option value='path'  " + (obj.type == 'path' ? 'selected ="selected"' : "") + ">路径</option></select>" +
-				"<span class='mlr15'>重定向方式</span>" +
-				"<select class='bt-input-text ml10' name='r_type' style='width:100px'><option value='301' " + (obj.r_type == '301' ? 'selected ="selected"' : "") + " >301</option><option value='302' " + (obj.r_type == '302' ? 'selected ="selected"' : "") + ">302</option></select></div>" +
-				"</div>" +
-				"<div class='line redirectdomain'>" +
-				"<span class='tname'>重定向源</span>" +
-				"<div class='info-r  ml0'>" +
-				"<input  name='from' placeholder='域名或路径' class='bt-input-text mr5' type='text' style='width:200px;float: left;margin-right:0px' value='" + obj.from + "'>" +
-				"<span class='tname' style='width:90px'>目标URL</span>" +
-				"<input  name='to' class='bt-input-text mr5' type='text' style='width:200px' value='" + obj.to + "'>" +
-				"</div>" +
-				"</div>" +
-				"</div>" +
-				"<div class='bt-form-submit-btn'><button type='button' class='btn btn-sm btn-danger btn-colse-prosy'>关闭</button><button type='button' class='btn btn-sm btn-success btn-submit-redirect'>" + (type == 1 ? " 提交" : "保存") + "</button></div>" +
-				"</form>"
-		});
-		setTimeout(function() {
-			$('.btn-colse-prosy').click(function() {
-				layer.close(redirect_form);
-			});
-			$('.btn-submit-redirect').click(function() {
-				var keep_path = $('[name="keep_path"]').prop('checked') ? 1 : 0;
-				var r_type = $('[name="r_type"]').val();
-				var type = $('[name="type"]').val();
-				var from = $('[name="from"]').val();
-				var to = $('[name="to"]').val();
-				
-				$.post('/site/set_redirect', {
-					siteName: siteName,
-					type: type,
-					r_type: r_type,
-					from: from,
-					to: to,
-					keep_path: keep_path
-				}, function(res) {
-					res = JSON.parse(res);
-					if (res.status) {
-						layer.close(redirect_form);
-						to301(siteName)
-					} else {
-						layer.msg(res.msg, {
-							icon: 2
-						});
-					}
-				});
-			});
-		}, 100);
-	}
-
-	if (type == 2) {
-		$.post('/site/del_redirect', {
-			siteName: siteName,
-			id: obj,
-		}, function(res) {
-			res = JSON.parse(res);
-			if (res.status == true) {
-				layer.msg('删除成功', {time: 1000,icon: 1});
-				to301(siteName);
-			} else {
-				layer.msg(res.msg, {time: 1000,icon: 2});
-			}
-		});
-		return
-	}
-
-	if (type == 3) {
-		var laoding = layer.load();
-		var data = {siteName: siteName,id: obj};
-		$.post('/site/get_redirect_conf', data, function(res) {
-			layer.close(laoding);
-			res = JSON.parse(res);
-			if (res.status == true) {
-				var mBody = "<div class='webEdit-box' style='padding: 20px'>\
-				<textarea style='height: 320px; width: 445px; margin-left: 20px; line-height:18px' id='configRedirectBody'>"+res.data.result+"</textarea>\
-					<div class='info-r'>\
-						<ul class='help-info-text c7 ptb10'>\
-							<li>此处为重定向配置文件,若您不了解配置规则,请勿随意修改.</li>\
-						</ul>\
-					</div>\
-				</div>";
-				var editor;
-				var index = layer.open({
-					type: 1,
-					title: '编辑配置文件',
-					closeBtn: 1,
-					shadeClose: true,
-					area: ['500px', '500px'],
-					btn: ['提交','关闭'],
-					content: mBody,
-					success: function () {
-						editor = CodeMirror.fromTextArea(document.getElementById("configRedirectBody"), {
-							extraKeys: {"Ctrl-Space": "autocomplete"},
-							lineNumbers: true,
-							matchBrackets:true,
-						});
-						editor.focus();
-						$(".CodeMirror-scroll").css({"height":"300px","margin":0,"padding":0});
-						$("#onlineEditFileBtn").unbind('click');
-					},
-					yes:function(index,layero){
-						$("#configRedirectBody").empty().text(editor.getValue());
-						var load = layer.load();
-						var data = {
-							siteName: siteName,
-							id: obj,
-							config: editor.getValue(),
-						};
-						$.post('/site/save_redirect_conf', data, function(res) {
-							layer.close(load)
-							if (res.status == true) {
-								layer.msg('保存成功', {icon: 1});
-								layer.close(index);
-							} else {
-								layer.msg(res.msg, {time: 3000,icon: 2});
-							}
-						},'json');
-						return true;
-			        },
-				});
-				
-			} else {
-				layer.msg('请求错误!!', {time: 3000,icon: 2});
-			}
-		});
-		return
-	}
-
-	var body = '<div id="redirect_list" class="bt_table">\
-					<div style="padding-bottom: 10px">\
-						<button type="button" title="添加重定向" class="btn btn-success btn-sm mr5" onclick="to301(\''+siteName+'\',1)" ><span>添加重定向</span></button>\
-					</div>\
-					<div class="divtable" style="max-height:200px;">\
-						<table class="table table-hover" >\
-							<thead style="position: relative;z-index: 1;">\
-								<tr>\
-									<th><span data-index="1"><span>重定向类型</span></span></th>\
-									<th><span data-index="2"><span>重定向方式</span></span></th>\
-									<th><span data-index="3"><span>保留URL参数</span></span></th>\
-									<th><span data-index="4"><span>操作</span></span></th>\
-								</tr>\
-							</thead>\
-							<tbody id="md-301-body">\
-							</tbody>\
-						</table>\
-					</div>\
-				</div>';
-	$("#webedit-con").html(body);
-	
-	var loadT = layer.msg(lan.site.the_msg,{icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/site/get_redirect','siteName='+siteName, function(res) {
-		layer.close(loadT);
-		$("#md-301-loading").remove();
-		if (res.status === true) {
-			let data = res.data.result;
-			data.forEach(function(item){
-				lan_r_type = item.r_type == 0 ? "永久重定向" : "临时重定向"
-				keep_path = item.keep_path == 0 ? "不保留" : "保留"
-				let tmp = '<tr>\
-					<td><span data-index="1"><span>'+item.r_from+'</span></span></td>\
-					<td><span data-index="2"><span>'+lan_r_type+'</span></span></td>\
-					<td><span data-index="2"><span>'+keep_path+'</span></span></td>\
-					<td><span data-index="4"  onclick="to301(\''+siteName+'\', 3, \''+ item.id +'\')"  class="btlink">详细</span> | <span data-index="5" onclick="to301(\''+siteName+'\', 2, \''+ item.id +'\')" class="btlink">删除</span></td>\
-				</tr>';
-				$("#md-301-body").append(tmp);
-			})
-		} else {
-			layer.msg(res.msg, {icon:2});
-		}
-	},'json');
-}
-
-
-//反向代理
-function toProxy(siteName, type, obj) {
-	// 设置 页面展示
-	if(type == 1) {
-		var proxy_title = "创建反向代理";
-		if (typeof(obj) != 'undefined'){
-			proxy_title = "编辑反向代理";
-		}
-
-		layer.open({
-			type: 1,
-			area: '650px',
-			title: proxy_title,
-			closeBtn: 1,
-			shift: 5,
-			shadeClose: false,
-			btn: ['提交','关闭'],
-			content: "<form id='form_proxy' class='divtable pd15' style='padding-bottom: 10px'>\
-				<div class='line'>\
-					<span class='tname'>开启代理</span>\
-					<div class='info-r ml0 mt5'>\
-						<input name='open_proxy' class='btswitch btswitch-ios' type='checkbox' checked>\
-						<label id='open_proxy' class='btswitch-btn' for='openProxy' style='float:left'></label>\
-						<div style='display: inline-block'>\
-							<span class='tname' style='margin-left:15px;position: relative;top: -5px;'>是否缓存</span>\
-							<input class='btswitch btswitch-ios' type='checkbox' name='open_cache'>\
-							<label class='btswitch-btn' id='open_cache' for='openCache' style='float:left'></label>\
-						</div>\
-					</div>\
-				</div>\
-				<div class='line'>\
-					<span class='tname'>名称</span>\
-					<div class='info-r ml0'>\
-					<input name='name' value='index' placeholder='请输入名称' class='bt-input-text mr5' type='text' style='width:200px''>\
-					</div>\
-				</div>\
-				<div class='line' style='display:none' id='cache_time'>\
-					<span class='tname'>缓存时间</span>\
-					<div class='info-r ml0'>\
-					<input name='cache_time' value='1' class='bt-input-text mr5' type='text' style='width:200px''>分钟\
-					</div>\
-				</div>\
-				<div class='line'>\
-					<span class='tname'>代理目录</span>\
-					<div class='info-r ml0'>\
-					<input name='from' value='/' placeholder='/' class='bt-input-text mr5' type='text' style='width:200px''>\
-					</div>\
-				</div>\
-				<div class='line'>\
-					<span class='tname'>目标URL</span>\
-					<div class='info-r ml0'>\
-					<input name='to' class='bt-input-text mr5' type='text' style='width:200px;float: left;margin-right:0px''>\
-					<span class='tname' style='width:90px'>发送域名</span>\
-					<input name='host' value='$host' class='bt-input-text mr5' type='text' style='width:200px'>\
-					</div>\
-				</div>\
-				<input name='id' value='' type='hidden'>\
-				<div class='help-info-text c7'>\
-					<ul class='help-info-text c7'>\
-					<li>代理目录：访问这个目录时将会把目标URL的内容返回并显示</li>\
-					<li>目标URL：可以填写你需要代理的站点，目标URL必须为可正常访问的URL，否则将返回错误</li>\
-					<li>发送域名：将域名添加到请求头传递到代理服务器，默认为目标URL域名，若设置不当可能导致代理无法正常运行</li>\
-					</ul>\
-				</div>\
-				</form>",
-			success:function(){
-
-				if (typeof(obj) != 'undefined'){
-					// console.log(obj);
-					$('input[name="name"]').val(obj['name']).attr('readonly','readonly').addClass('disabled');
-					if (obj['open_cache'] == 'on'){
-						$("input[name='open_cache']").prop("checked",true);
-						$('#cache_time').show();
-					}
-
-					$('input[name="from"]').val(obj['from']);
-					$('input[name="to"]').val(obj['to']);
-
-					var url = obj['to'];
-					var ip_reg = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
-	                url = url.replace(/^http[s]?:\/\//, '');
-	                url = url.replace(/(:|\?|\/|\\)(.*)$/, '');
-	                if (ip_reg.test(url)) {
-	                    $("[name='host']").val('$host');
-	                } else {
-	                    $("[name='host']").val(url);
-	                }
-
-	                $('input[name="id"]').val(obj['id']);
-	                $('input[name="cache_time"]').val(obj['cache_time']);
-				}
-
-
-				$('input[name="to"]').on('keyup', function(){
-					var url = $(this).val();
-					var ip_reg = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
-	                url = url.replace(/^http[s]?:\/\//, '');
-	                url = url.replace(/(:|\?|\/|\\)(.*)$/, '');
-	                if (ip_reg.test(url)) {
-	                    $("[name='host']").val('$host');
-	                } else {
-	                    $("[name='host']").val(url);
-	                }
-				});
-
-				$("#open_proxy").click(function(){
-					var status = $("input[name='open_proxy']").prop("checked")==true?1:0;
-					if(status==1){
-						$("input[name='open_proxy']").prop("checked",false);
-					}else{
-						$("input[name='open_proxy']").prop("checked",true);
-					}
-				});
-
-				$('#open_cache').click(function(){
-					var status = $("input[name='open_cache']").prop("checked")==true?1:0;
-					if(status==1){
-						$('#cache_time').hide();
-						$("input[name='open_cache']").prop("checked",false);
-					}else{
-						$('#cache_time').show();
-						$("input[name='open_cache']").prop("checked",true);
-					}
-				});
-			},
-			yes:function(index,layer_ro){
-				var data = $('#form_proxy').serializeArray();
-				var t = {};
-				t['name'] = 'siteName';
-				t['value'] = siteName;
-				data.push(t);
-
-				// console.log(data);
-				var loading = layer.msg('正在'+proxy_title+'...',{icon:16,time:0,shade: [0.3, '#000']});
-				$.post('/site/set_proxy',data, function(res) {
-					layer.close(loading);
-					if (!res.status){
-						layer.msg(res.msg, {icon: 2,time:10000});
-						return;
-					}
-
-					showMsg(proxy_title+"成功!",function(){
-						layer.close(index);
-						toProxy(siteName);
-					},{icon: 1, time:2000});
-				},'json');
-			}
-		});
-	}
-
-	if (type == 2) {
-		var loading = layer.msg('正在删除中...',{icon:16,time:0,shade: [0.3, '#000']});
-		$.post('/site/del_proxy', {siteName: siteName,id: obj,}, function(res) {
-			layer.close(loading);
-			if (res.status == true) {
-				showMsg('删除成功', function(){
-					toProxy(siteName);
-				},{time: 1000,icon: 1});
-			} else {
-				layer.msg(res.msg, {time: 1000,icon: 2});
-			}
-		},'json');
-		return
-	}
-
-
-	if (type == 3) {
-		var laoding = layer.load();
-		var data = {siteName: siteName,id: obj};
-		$.post('/site/get_proxy_conf', data, function(res) {
-			layer.close(laoding);
-			if (!res.status){
-				layer.msg('请求错误!!', {time: 3000,icon: 2});
-				return;
-			}
-
-			var mBody = "<div class='webEdit-box' style='padding: 20px'>\
-			<textarea style='height: 320px; width: 445px; margin-left: 20px; line-height:18px' id='configProxyBody'>"+res.data.result+"</textarea>\
-				<div class='info-r'>\
-					<ul class='help-info-text c7 ptb10'>\
-						<li>此处为反向代理配置文件,若您不了解配置规则,请勿随意修改.</li>\
-					</ul>\
-				</div>\
-			</div>";
-			var editor;
-			var index = layer.open({
-				type: 1,
-				title: '编辑配置文件',
-				closeBtn: 1,
-				shadeClose: true,
-				area: ['500px', '500px'],
-				btn: ['提交','关闭'],
-				content: mBody,
-				success: function () {
-					editor = CodeMirror.fromTextArea(document.getElementById("configProxyBody"), {
-						extraKeys: {"Ctrl-Space": "autocomplete"},
-						lineNumbers: true,
-						matchBrackets:true,
-					});
-					editor.focus();
-					$(".CodeMirror-scroll").css({"height":"300px","margin":0,"padding":0});
-					$("#onlineEditFileBtn").unbind('click');
-				},
-				yes:function(index,layero){
-					$("#configProxyBody").empty().text(editor.getValue());
-					var load = layer.load();
-					var data = {
-						siteName: siteName,
-						id: obj,
-						config: editor.getValue(),
-					};
-
-					$.post('/site/save_proxy_conf', data, function(res) {
-						layer.close(load)
-						if (res.status == true) {
-							layer.msg('保存成功', {icon: 1});
-							layer.close(index);
-						} else {
-							layer.msg(res.msg, {time: 3000,icon: 2});
-						}
-					},'json');
-					return true;
-		        },
-			});
-		},'json');
-		return;
-	}
-
-	if (type == 10 || type == 11) {
-		//[11]启动 或 停止[10]
-		status = type==10 ? '0' : '1';
-		var loading = layer.msg(lan.site.the_msg,{icon:16,time:0,shade: [0.3, '#000']});
-		$.post('/site/set_proxy_status', {siteName: siteName,'status':status,'id':obj}, function(rdata) {
-			layer.close(loading);
-			if (!rdata.status){
-				layer.msg(res.msg, {time: 3000,icon: 2});
-				return;
-			}
-
-			showMsg("设置成功",function(){
-				toProxy(siteName);
-			},{icon: 1,time:2000});
-		},'json');
-		return;
-	}
-
-	if (type == 20 || type == 21) {
-		//[20] 开始缓存 或 [21] 停止缓存
-		var status = type == 20 ? 'on' : '';
-		obj['open_cache'] = status;
-		obj['siteName'] = siteName;
-
-		var loading = layer.msg('正在提交请求...',{icon:16,time:0,shade: [0.3, '#000']});
-		$.post('/site/set_proxy',obj, function(rdata) {
-			layer.close(loading);
-			if (!rdata.status){
-				layer.msg(rdata.msg, {icon: 2,time:2000});
-				return;
-			}
-
-			showMsg("设置成功!",function(){
-				toProxy(siteName);
-			},{icon: 1, time:2000});
-		},'json');
-		return;
-	}
-
-	var body = '<div id="proxy_list" class="bt_table">\
-					<div style="padding-bottom: 10px">\
-						<button type="button" title="添加反向代理" class="btn btn-success btn-sm mr5" onclick="toProxy(\''+siteName+'\',1)" >\
-							<span>添加反向代理</span>\
-						</button>\
-					</div>\
-					<div class="divtable" style="max-height:200px;">\
-						<table class="table table-hover" >\
-							<thead style="position: relative;z-index: 1;">\
-								<tr>\
-									<th>名称</th>\
-									<th>代理目录</th>\
-									<th>目标地址</th>\
-									<th>缓存</th>\
-									<th>状态</th>\
-									<th>操作</th>\
-								</tr>\
-							</thead>\
-							<tbody id="md-301-body"></tbody>\
-						</table>\
-					</div>\
-				</div>';
-	$("#webedit-con").html(body);
-	
-	var loading = layer.msg(lan.site.the_msg,{icon:16,time:0,shade: [0.3, '#000']});
-	$.post("/site/get_proxy_list", {siteName: siteName},function (res) {
-		layer.close(loading);
-		if (!res.status){
-			layer.msg(res.msg, {icon:2});
-			return;
-		}
-	
-		var data = res.data.result;
-		for (var i = 0; i < data.length; i++) {
-			var item = data[i];
-		
-			var switchProxy  = '<span onclick="toProxy(\''+siteName+'\', 10, \''+ item.id +'\')" style="color:rgb(92, 184, 92);" class="btlink glyphicon glyphicon-play"></span>';
-			if (!item['status']){
-				switchProxy = '<span onclick="toProxy(\''+siteName+'\', 11, \''+ item.id +'\')" style="color:rgb(255, 0, 0);" class="btlink glyphicon glyphicon-pause"></span>';
-			}
-
-			var openCache = '<span  data-index="'+i+'" class="btlink cache off">未开启</span>';
-			if (item['open_cache'] == 'on'){
-				openCache = '<span  data-index="'+i+'" class="btlink cache on">已开启</span>';
-			}
-
-			let tmp = '<tr>\
-				<td>'+item.name+'</td>\
-				<td>'+item.from+'</td>\
-				<td>'+item.to+'</td>\
-				<td>'+openCache+'</td>\
-				<td>'+switchProxy+'</td>\
-				<td>\
-				   <span data-index="'+i+'" class="btlink detail">详细</span> |\
-				   <span data-index="'+i+'" class="btlink edit">编辑</span> |\
-				   <span data-index="'+i+'" class="btlink delete">删除</span>\
-				</td>\
-			</tr>';
-			$("#md-301-body").append(tmp);
-		}
-
-		$('#md-301-body .detail').click(function(){
-			var index = $(this).data('index');
-			toProxy(siteName, 3 ,data[index]['id']);
-		});
-
-		$('#md-301-body .edit').click(function(){
-			var index = $(this).data('index');
-			toProxy(siteName, 1 ,data[index]);
-		});
-
-		$('#md-301-body .delete').click(function(){
-			var index = $(this).data('index');
-			toProxy(siteName, 2 ,data[index]['id']);
-		});
-
-		$('#md-301-body .cache').click(function(){
-			var index = $(this).data('index');
-			if ($(this).hasClass('on')){
-				toProxy(siteName, 21 ,data[index]);
-			} else{
-				toProxy(siteName, 20 ,data[index]);
-			}
-		});
-		
-	},'json');
-/////////
-}
-
-//证书夹
-function sslAdmin(siteName){
-	var loadT = layer.msg('正在提交任务...',{icon:16,time:0,shade: [0.3, '#000']});
-	$.get('/site/get_cert_list',function(data){
-		layer.close(loadT);
-		var rdata = data['data'];
-		var tbody = '';
-		for(var i=0;i<rdata.length;i++){
-			tbody += '<tr>\
-				<td>'+rdata[i].subject+'</td>\
-				<td>'+rdata[i].dns.join('<br>')+'</td>\
-				<td>'+rdata[i].notAfter+'</td>\
-				<td>'+rdata[i].issuer.split(' ')[0]+'</td>\
-				<td style="text-align: right;"><a onclick="setCertSsl(\''+rdata[i].subject+'\',\''+siteName+'\')" class="btlink">部署</a> | <a onclick="removeSsl(\''+rdata[i].subject+'\')" class="btlink">删除</a></td>\
-			</tr>'
-		}
-		var txt = '<div class="mtb15" style="line-height:30px">\
-		<button style="margin-bottom: 7px;display:none;" class="btn btn-success btn-sm">添加</button>\
-		<div class="divtable"><table class="table table-hover"><thead><tr><th>域名</th><th>信任名称</th><th>到期时间</th><th>品牌</th><th class="text-right" width="75">操作</th></tr></thead>\
-		<tbody>'+tbody+'</tbody>\
-		</table></div></div>';
-		$(".tab-con").html(txt);
-	},'json');
-}
-
-//删除证书
-function removeSsl(certName){
-	safeMessage('删除证书','您真的要从证书夹删除证书吗?',function(){
-		var loadT = layer.msg(lan.site.the_msg,{icon:16,time:0,shade: [0.3, '#000']});
-		$.post('/site/remove_cert',{certName:certName},function(rdata){
-			layer.close(loadT);
-			layer.msg(rdata.msg,{icon:rdata.status?1:2});
-			$("#ssl_admin").click();
-		},'json');
-	});
-}
-
-//从证书夹部署
-function setCertSsl(certName,siteName){
-	var loadT = layer.msg('正在部署证书...',{icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/site/set_cert_to_site',{certName:certName,siteName:siteName},function(rdata){
-		layer.close(loadT);
-		showMsg(rdata.msg, function(){
-			$(".tab-nav span:first-child").click();
-		},{icon:rdata.status?1:2},2000);
-	},'json');
-}
-
-//ssl
-function setSSL(id,siteName){
-	var sslHtml = '<div class="warning_info mb10" style="display:none;">\
-					<p>温馨提示：当前站点未开启SSL证书访问，站点访问可能存在风险。<button class="btn btn-success btn-xs ml10 cutTabView">申请证书</button></p>\
-				</div>\
-				<div class="tab-nav" style="margin-top: 10px;">\
-					<span class="on" id="now_ssl" onclick="opSSL(\'now\','+id+',\''+siteName+'\')">当前证书 - <i class="error">[未部署SSL]</i></span>\
-					<span onclick="opSSL(\'lets\','+id+',\''+siteName+'\')">Let\'s Encrypt</span>\
-					<span onclick="opSSL(\'acme\','+id+',\''+siteName+'\')">ACME</span>\
-					<span id="ssl_admin" onclick="sslAdmin(\''+siteName+'\')">证书夹</span>'
-					+ '<div class="ss-text pull-right mr30" style="position: relative;top:-4px">\
-	                </div></div>'
-			  + '<div class="tab-con" style="padding: 0px;"></div>';
-	$("#webedit-con").html(sslHtml);
-	$(".tab-nav span").click(function(){
-		$(this).addClass("on").siblings().removeClass("on");
-	});
-	opSSL('now',id,siteName);
-}
-
-//设置httpToHttps
-function httpToHttps(siteName){
-	var isHttps = $("#toHttps").prop('checked');
-	if(isHttps){
-		layer.confirm('关闭强制HTTPS后需要清空浏览器缓存才能看到效果,继续吗?',{icon:3,title:"关闭强制HTTPS"},function(){
-			$.post('/site/close_to_https','siteName='+siteName,function(rdata){
-				layer.msg(rdata.msg,{icon:rdata.status?1:2});
-			},'json');
-		});
-	}else{
-		$.post('/site/http_to_https','siteName='+siteName,function(rdata){
-			layer.msg(rdata.msg,{icon:rdata.status?1:2});
-		},'json');
-	}
-}
-
-
-function deleteSSL(type,id,siteName){
-	$.post('/site/delete_ssl','site_name='+siteName+'&ssl_type='+type,function(rdata){
-		showMsg(rdata.msg, function(){
-			opSSL(type,id,siteName);
-		},{icon:rdata.status?1:2}, 2000);
-	},'json');
-}
-
-function deploySSL(type,id,siteName){
-	$.post('/site/deploy_ssl','site_name='+siteName+'&ssl_type='+type,function(rdata){
-		showMsg(rdata.msg, function(){
-			if (rdata.status){
-				$('#now_ssl').click();
-			} else{
-				opSSL(type,id,siteName);
-			}
-		},{icon:rdata.status?1:2}, 2000);
-	},'json');
-}
-
-function renewSSL(type,id,siteName){
-	showSpeedWindow('正在续签...', 'site.get_let_logs', function(layers,index){
-		$.post('/site/renew_ssl','site_name='+siteName+'&ssl_type='+type,function(rdata){
-			showMsg(rdata.msg, function(){
-				if (rdata.status){
-					layer.close(index);
-					opSSL(type,id,siteName);
-				}
-			},{icon:rdata.status?1:2}, 2000);
-		},'json');
-	});	
-}
-
-function fileCheck(){
-
-}
-
-function dnsCheck(){
-
-}
-
-//SSL
-function opSSL(type, id, siteName, callback){
-
-	var now = '<div class="myKeyCon ptb15">\
-			<div class="ssl_state_info" style="display:none;"></div>\
-		<div class="custom_certificate_info">\
-			<div class="ssl-con-key pull-left mr20">密钥(KEY)<br><textarea id="key" class="bt-input-text"></textarea></div>\
-			<div class="ssl-con-key pull-left">证书(PEM格式)<br><textarea id="csr" class="bt-input-text"></textarea></div>\
-		</div>\
-		<div class="ssl-btn pull-left mtb15" style="width:100%">\
-			<button class="btn btn-success btn-sm" onclick="saveSSL(\''+siteName+'\')">保存</button>\
-		</div>\
-	</div>\
-	<ul class="help-info-text c7 pull-left">\
-		<li>粘贴您的*.key以及*.pem内容，然后保存即可。</li>\
-		<li>如果浏览器提示证书链不完整,请检查是否正确拼接PEM证书</li><li>PEM格式证书 = 域名证书.crt + 根证书(root_bundle).crt</li>\
-		<li>在未指定SSL默认站点时,未开启SSL的站点使用HTTPS会直接访问到已开启SSL的站点</li>\
-	</ul>';	
-
-	// 	<input type="radio" name="c_type" onclick="dnsCheck()" id="check_dns"/>\
-	// <label class="mr20" for="check_dns" style="font-weight:normal">DNS验证</label></label>\
-	var lets =  '<div class="apply_ssl">\
-		<div class="label-input-group">\
-			<div class="line mtb10">\
-				<form>\
-					<span class="tname text-center">验证方式</span>\
-					<div style="margin-top:7px;display:inline-block">\
-						<input type="radio" name="c_type" onclick="fileCheck()" id="check_file" checked="checked" />\
-	  					<label class="mr20" for="check_file" style="font-weight:normal">文件验证</label></label>\
-	  				</div>\
-	  			</form>\
-	  		</div>\
-  			<div class="check_message line">\
-  				<div style="margin-left:100px">\
-  					<input type="checkbox" name="checkDomain" id="checkDomain" checked="">\
-  					<label class="mr20" for="checkDomain" style="font-weight:normal">提前校验域名(提前发现问题,减少失败率)</label>\
-  				</div>\
-  			</div>\
-  		</div>\
-  		<div class="line mtb10">\
-  			<span class="tname text-center">管理员邮箱</span>\
-  			<input class="bt-input-text" style="width:240px;" type="text" name="admin_email" />\
-  		</div>\
-  		<div class="line mtb10">\
-  			<span class="tname text-center">域名</span>\
-  			<ul id="ymlist" style="padding: 5px 10px;max-height:180px;overflow:auto; width:240px;border:#ccc 1px solid;border-radius:3px"></ul>\
-  		</div>\
-  		<div class="line mtb10" style="margin-left:100px">\
-  			<button class="btn btn-success btn-sm letsApply">申请</button>\
-  		</div>\
-	  	<ul class="help-info-text c7" id="lets_help">\
-	  		<li>申请之前，请确保域名已解析，如未解析会导致审核失败</li>\
-	  		<li>Let\'s Encrypt免费证书，有效期3个月，支持多域名。默认会自动续签</li>\
-	  		<li>若您的站点使用了CDN或301重定向会导致续签失败</li>\
-	  		<li>在未指定SSL默认站点时,未开启SSL的站点使用HTTPS会直接访问到已开启SSL的站点</li>\
-	  	</ul>\
-  	</div>';
-
-  	// <input type="radio" name="c_type" onclick="dnsCheck()" id="check_dns"/>\
-	// <label class="mr20" for="check_dns" style="font-weight:normal">DNS验证</label></label>\
-	var acme =  '<div class="apply_ssl">\
-		<div class="label-input-group">\
-			<div class="line mtb10">\
-				<form>\
-					<span class="tname text-center">验证方式</span>\
-					<div style="margin-top:7px;display:inline-block">\
-						<input type="radio" name="c_type" onclick="fileCheck()" id="check_file" checked="checked" />\
-	  					<label class="mr20" for="check_file" style="font-weight:normal">文件验证</label></label>\
-	  				</div>\
-	  			</form>\
-	  		</div>\
-  			<div class="check_message line">\
-  				<div style="margin-left:100px">\
-  					<input type="checkbox" name="checkDomain" id="checkDomain" checked="">\
-  					<label class="mr20" for="checkDomain" style="font-weight:normal">提前校验域名(提前发现问题,减少失败率)</label>\
-  				</div>\
-  			</div>\
-  		</div>\
-  		<div class="line mtb10">\
-  			<span class="tname text-center">管理员邮箱</span>\
-  			<input class="bt-input-text" style="width:240px;" type="text" name="admin_email" />\
-  		</div>\
-  		<div class="line mtb10">\
-  			<span class="tname text-center">域名</span>\
-  			<ul id="ymlist" style="padding: 5px 10px;max-height:180px;overflow:auto; width:240px;border:#ccc 1px solid;border-radius:3px"></ul>\
-  		</div>\
-  		<div class="line mtb10" style="margin-left:100px">\
-  			<button class="btn btn-success btn-sm letsApply">申请</button>\
-  		</div>\
-		<ul class="help-info-text c7" id="lets_help">\
-			<li>申请之前，请确保域名已解析，如未解析会导致审核失败</li>\
-			<li>由ACME免费申请证书，有效期3个月，支持多域名。默认会自动续签</li>\
-			<li>若您的站点使用了CDN或301重定向会导致续签失败</li>\
-			<li>在未指定SSL默认站点时,未开启SSL的站点使用HTTPS会直接访问到已开启SSL的站点</li></ul>\
-	 	</ul>\
-	</div>';
-
-			
-	switch(type){
-		case 'lets':
-			$(".tab-con").html(lets);
-			$.post('/site/get_ssl',  'site_name='+siteName+'&ssl_type=lets', function(data){
-				var rdata = data['data'];
-				if(rdata.csr == false){
-					$.post('/site/get_site_domains','id='+id, function(rdata) {
-						var data = rdata['data'];
-						var opt='';
-						for(var i=0;i<data.domains.length;i++){
-							var isIP = isValidIP(data.domains[i].name);
-							var x = isContains(data.domains[i].name, '*');
-							if(!isIP && !x){
-								opt+='<li style="line-height:26px"><input type="checkbox" style="margin-right:5px; vertical-align:-2px" value="'+data.domains[i].name+'">'+data.domains[i].name+'</li>'
-							}
-						}
-						$("input[name='admin_email']").val(data.email);
-						$("#ymlist").html(opt);
-						$("#ymlist li input").click(function(e){
-							e.stopPropagation();
-						})
-						$("#ymlist li").click(function(){
-							var o = $(this).find("input");
-							if(o.prop("checked")){
-								o.prop("checked",false)
-							}
-							else{
-								o.prop("checked",true);
-							}
-						})
-						$(".letsApply").click(function(){
-							var c = $("#ymlist input[type='checkbox']");
-							var str = [];
-							var domains = '';
-							for(var i=0; i<c.length; i++){
-								if(c[i].checked){
-									str.push(c[i].value);
-								}
-							}
-							domains = JSON.stringify(str);
-							newSSL(siteName, id, domains);
-						});
-
-						if (typeof (callback) != 'undefined'){
-							callback(rdata);
-						}
-					},'json');
-					return;
-				}
-				var lets = '<div class="myKeyCon ptb15">\
-						<div class="ssl_state_info" style="display:none;"></div>\
-						<div class="custom_certificate_info">\
-							<div class="ssl-con-key pull-left mr20" readonly>密钥(KEY)<br><textarea id="key" class="bt-input-text">'+rdata.key+'</textarea></div>\
-							<div class="ssl-con-key pull-left" readonly>证书(PEM格式)<br><textarea id="csr" class="bt-input-text">'+rdata.csr+'</textarea></div>\
-						</div>\
-						<div class="ssl-btn pull-left mtb15" style="width:100%">\
-							<button class="btn btn-success btn-sm" onclick="deploySSL(\'lets\','+id+',\''+siteName+'\')">部署</button>\
-							<button class="btn btn-success btn-sm" onclick="renewSSL(\'lets\','+id+',\''+siteName+'\')">续期</button>\
-							<button class="btn btn-success btn-sm" onclick="deleteSSL(\'lets\','+id+',\''+siteName+'\')">删除</button>\
-						</div>\
-					</div>\
-					<ul class="help-info-text c7 pull-left">\
-						<li>已为您自动生成Let\'s Encrypt免费证书</li>\
-						<li>由Let\'s Encrypt免费申请证书，有效期3个月，支持多域名。默认会自动续签</li>\
-						<li>如需使用其他SSL,请切换其他证书后粘贴您的KEY以及PEM内容，然后保存即可。</li>\
-					</ul>';
-				$(".tab-con").html(lets);
-
-				if (rdata['cert_data']){
-					var issuer = rdata['cert_data']['issuer'].split(" ");
-					var domains = rdata['cert_data']['dns'].join("、");
-
-					var cert_data = "<div class='state_info_flex'>\
-						<div class='state_item'><span>证书品牌：</span><span class='ellipsis_text'>"+issuer[0]+"</span></div>\
-						<div class='state_item'><span>到期时间：</span><span class='btlink'>剩余"+rdata['cert_data']['endtime']+"天到期</span></div>\
-					</div>\
-					<div class='state_info_flex'>\
-						<div class='state_item'><span>认证域名：</span><span class='ellipsis_text'>"+domains+"</span></div>\
-					</div>";
-					$(".ssl_state_info").html(cert_data);
-					$(".ssl_state_info").css('display','block');
-				}
-			},'json');			
-			break;
-		case 'acme':
-			$(".tab-con").html(acme);
-			$.post('/site/get_ssl',  'site_name='+siteName+'&ssl_type=acme', function(data){
-				var rdata = data['data'];
-				if(rdata.csr == false){
-					$.post('/site/get_site_domains','id='+id, function(rdata) {
-						var data = rdata['data'];
-						var opt='';
-						for(var i=0;i<data.domains.length;i++){
-							var isIP = isValidIP(data.domains[i].name);
-							var x = isContains(data.domains[i].name, '*');
-							if(!isIP && !x){
-								opt += '<li style="line-height:26px">\
-									<input type="checkbox" style="margin-right:5px; vertical-align:-2px" value="'+data.domains[i].name+'">'+data.domains[i].name
-								+'</li>';
-							}
-						}
-						$("input[name='admin_email']").val(data.email);
-						$("#ymlist").html(opt);
-						$("#ymlist li input").click(function(e){
-							e.stopPropagation();
-						})
-						$("#ymlist li").click(function(){
-							var o = $(this).find("input");
-							if(o.prop("checked")){
-								o.prop("checked",false)
-							}
-							else{
-								o.prop("checked",true);
-							}
-						})
-						$(".letsApply").click(function(){
-							var c = $("#ymlist input[type='checkbox']");
-							var str = [];
-							var domains = '';
-							for(var i=0; i<c.length; i++){
-								if(c[i].checked){
-									str.push(c[i].value);
-								}
-							}
-							domains = JSON.stringify(str);
-							newAcmeSSL(siteName, id, domains);
-						});
-
-						if (typeof (callback) != 'undefined'){
-							callback(rdata);
-						}
-					},'json');
-					return;
-				}
-				var acme = '<div class="myKeyCon ptb15">\
-						<div class="ssl_state_info" style="display:none;"></div>\
-						<div class="custom_certificate_info">\
-							<div class="ssl-con-key pull-left mr20" readonly>密钥(KEY)<br><textarea id="key" class="bt-input-text">'+rdata.key+'</textarea></div>\
-							<div class="ssl-con-key pull-left" readonly>证书(PEM格式)<br><textarea id="csr" class="bt-input-text">'+rdata.csr+'</textarea></div>\
-						</div>\
-						<div class="ssl-btn pull-left mtb15" style="width:100%">\
-							<button class="btn btn-success btn-sm" onclick="deploySSL(\'acme\','+id+',\''+siteName+'\')">部署</button>\
-							<button class="btn btn-success btn-sm" onclick="deleteSSL(\'acme\','+id+',\''+siteName+'\')">删除</button>\
-						</div>\
-					</div>\
-					<ul class="help-info-text c7 pull-left">\
-						<li>已为您自动生成ACME免费证书</li>\
-						<li>由ACME免费申请证书，有效期3个月，支持多域名。默认会自动续签</li>\
-						<li>如需使用其他SSL,请切换其他证书后粘贴您的KEY以及PEM内容，然后保存即可。</li>\
-					</ul>';
-				$(".tab-con").html(acme);
-
-				if (rdata['cert_data']){
-					var issuer = rdata['cert_data']['issuer'].split(" ");
-					var domains = rdata['cert_data']['dns'].join("、");
-
-					var cert_data = "<div class='state_info_flex'>\
-						<div class='state_item'><span>证书品牌：</span><span class='ellipsis_text'>"+issuer[0]+"</span></div>\
-						<div class='state_item'><span>到期时间：</span><span class='btlink'>剩余"+rdata['cert_data']['endtime']+"天到期</span></div>\
-					</div>\
-					<div class='state_info_flex'>\
-						<div class='state_item'><span>认证域名：</span><span class='ellipsis_text'>"+domains+"</span></div>\
-					</div>";
-					$(".ssl_state_info").html(cert_data);
-					$(".ssl_state_info").css('display','block');
-				}
-			},'json');			
-			break;
-		case 'now':
-			$(".tab-con").html(now);
-			var key = '';
-			var csr = '';
-			var loadT = layer.msg('正在提交任务...',{icon:16,time:0,shade: [0.3, '#000']});
-			$.post('site/get_ssl','site_name='+siteName,function(data){
-				layer.close(loadT);
-				var rdata = data['data'];
-
-				if (rdata['cert_data']){
-					var issuer = rdata['cert_data']['issuer'].split(" ");
-					var domains = rdata['cert_data']['dns'].join("、");
-
-					var cert_data = "<div class='state_info_flex'>\
-						<div class='state_item'><span>证书品牌：</span><span class='ellipsis_text'>"+issuer[0]+"</span></div>\
-						<div class='state_item'><span>到期时间：</span><span class='btlink'>剩余"+rdata['cert_data']['endtime']+"天到期</span></div>\
-					</div>\
-					<div class='state_info_flex'>\
-						<div class='state_item'><span>认证域名：</span><span class='ellipsis_text'>"+domains+"</span></div>\
-						<div class='state_item'><span>强制HTTPS：</span><span class='switch'>\
-							<input class='btswitch btswitch-ios' id='toHttps' type='checkbox'>\
-		                    <label class='btswitch-btn' for='toHttps' onclick=\"httpToHttps('" + siteName + "')\">\
-						</span></div>\
-					</div>";
-					$(".ssl_state_info").html(cert_data);
-					$(".ssl_state_info").css('display','block');
-				}
-
-				if(rdata.key == false){
-					rdata.key = '';
-				} else {
-					$(".ssl-btn").append('<button style=\'margin-left:3px;\' class="btn btn-success btn-sm" onclick="deleteSSL(\'now\','+id+',\''+siteName+'\')">删除</button>');
-				}
-
-				if(rdata.csr == false){
-					rdata.csr = '';
-				}
-				$("#key").val(rdata.key);
-				$("#csr").val(rdata.csr);
-
-				$("#toHttps").attr('checked',rdata.httpTohttps);
-				if(rdata.status){
-					$('.warning_info').css('display','none');
-					
-					$(".ssl-btn").append("<button class='btn btn-success btn-sm' onclick=\"ocSSL('close_ssl_conf','"+siteName+"')\" style='margin-left:3px;'>关闭SSL</button>");
-					$('#now_ssl').html('当前证书 - <i style="color:#20a53a;">[已部署SSL]</i>');
-				} else{
-					$('.warning_info').css('display','block');
-					$('#now_ssl').html('当前证书 - <i style="color:red;">[未部署SSL]</i>');
-				}
-
-
-				if (typeof (callback) != 'undefined'){
-					callback(rdata);
-				}
-			},'json');
-			break;
-		default:
-			layer.msg("错误类型", {icon:5});
-			break;
-	}
-}
-
-
-//开启与关闭SSL
-function ocSSL(action,siteName){
-	var loadT = layer.msg('正在获取证书列表，请稍后..',{icon:16,time:0,shade: [0.3, '#000']});
-	$.post("/site/"+action,'siteName='+siteName+'&updateOf=1',function(rdata){
-		layer.close(loadT)
-		
-		if(!rdata.status){
-			if(!rdata.out){
-				layer.msg(rdata.msg,{icon:rdata.status?1:2});
-				setSSL(siteName);
-				return;
-			}
-			data = "<p>证书获取失败：</p><hr />"
-			for(var i=0;i<rdata.out.length;i++){
-				data += "<p>域名: "+rdata.out[i].Domain+"</p>"
-					  + "<p>错误类型: "+rdata.out[i].Type+"</p>"
-					  + "<p>详情: "+rdata.out[i].Detail+"</p>"
-					  + "<hr />";
-			}
-			layer.msg(data,{icon:2,time:0,shade:0.3,shadeClose:true});
-			return;
-		}
-		layer.msg(rdata.msg,{icon:rdata.status?1:2});
-		if(action == 'close_ssl_conf'){
-			layer.msg('已关闭SSL,请务必清除浏览器缓存后再访问站点!',{icon:1,time:5000});
-		}
-		$(".tab-nav .on").click();
-	},'json');
-}
-
-//生成SSL
-function newSSL(siteName, id, domains){
-	showSpeedWindow('正在申请...', 'site.get_let_logs', function(layers,index){
-		var force = '';
-		if ($("#checkDomain").prop("checked")){
-			force = '&force=true';
-		}
-		var email = $("input[name='admin_email']").val();
-		$.post('/site/create_let','siteName='+siteName+'&domains='+domains+'&email='+email + force,function(rdata){
-			layer.close(index);
-			if(rdata.status){
-				showMsg(rdata.msg, function(){
-					$(".tab-nav span:first-child").click();
-				},{icon:1}, 2000);
-				return;
-			}
-			layer.msg(rdata.msg,{icon:2,area:'500px',time:0,shade:0.3,shadeClose:true});
-		},'json');
-	});
-}
-
-function newAcmeSSL(siteName, id, domains){
-	showSpeedWindow('正在由ACME申请...', 'site.get_acme_logs', function(layers,index){
-		var force = '';
-		if($("#checkDomain").prop("checked")){
-			force = '&force=true';
-		}
-		var email = $("input[name='admin_email']").val();
-		$.post('/site/create_acme','siteName='+siteName+'&domains='+domains+'&email='+email + force,function(rdata){
-			layer.close(index);
-			if(rdata.status){
-				showMsg(rdata.msg, function(){
-					$(".tab-nav span:first-child").click();
-				},{icon:1}, 2000);
-				return;
-			}
-			layer.msg(rdata.msg,{icon:2,area:'500px',time:0,shade:0.3,shadeClose:true});
-		},'json');
-	});
-}
-
-//保存SSL
-function saveSSL(siteName){
-	var data = 'type=1&siteName='+siteName+'&key='+encodeURIComponent($("#key").val())+'&csr='+encodeURIComponent($("#csr").val());
-	var loadT = layer.msg(lan.site.saving_txt,{icon:16,time:20000,shade: [0.3, '#000']})
-	$.post('/site/set_ssl',data,function(rdata){
-		layer.close(loadT);
-		if(rdata.status){
-			layer.msg(rdata.msg,{icon:1});
-			$(".ssl-btn").find(".btn-default").remove();
-			$(".ssl-btn").append("<button class='btn btn-default btn-sm' onclick=\"ocSSL('close_ssl_conf','"+siteName+"')\" style='margin-left:10px'>"+lan.site.ssl_close+"</button>");
-		} else {
-			layer.msg(rdata.msg,{icon:2,time:0,shade:0.3,shadeClose:true});
-		}
-	},'json');
-}
-
-//PHP版本
-function phpVersion(siteName){
-	$.post('/site/get_site_php_version','siteName='+siteName,function(version){
-		// console.log(version);
-		if(version.status === false){
-			layer.msg(version.msg,{icon:5});
-			return;
-		}
-		$.post('/site/get_php_version',function(rdata){
-			var versionSelect = "<div class='webEdit-box'>\
-									<div class='line'>\
-										<span class='tname' style='width:100px'>PHP版本</span>\
-										<div class='info-r'>\
-											<select id='phpVersion' class='bt-input-text mr5' name='phpVersion' style='width:110px'>";
-			var optionSelect = '';
-			for(var i=0;i<rdata.length;i++){
-				optionSelect = version.phpversion == rdata[i].version?'selected':'';
-				versionSelect += "<option value='"+ rdata[i].version +"' "+ optionSelect +">"+ rdata[i].name +"</option>"
-			}
-			versionSelect += "</select>\
-							<button class='btn btn-success btn-sm' onclick=\"setPHPVersion('"+siteName+"')\">"+lan.site.switch+"</button>\
-							</div>\
-							<span id='php_w' style='color:red;margin-left: 32px;'></span>\
-						</div>\
-							<ul class='help-info-text c7 ptb10'>\
-								<li>请根据您的程序需求选择版本</li>\
-								<li>若非必要,请尽量不要使用PHP5.2,这会降低您的服务器安全性；</li>\
-								<li>PHP7不支持mysql扩展，默认安装mysqli以及mysql-pdo。</li>\
-							</ul>\
-						</div>\
-					</div>";
-			$("#webedit-con").html(versionSelect);
-			//验证PHP版本
-			$("select[name='phpVersion']").change(function(){
-				if($(this).val() == '52'){
-					var msgerr = 'PHP5.2在您的站点有漏洞时有跨站风险，请尽量使用PHP5.3以上版本!';
-					$('#php_w').text(msgerr);
-				}else{
-					$('#php_w').text('');
-				}
-			})
-		},'json');
-	},'json');
-}
-
-
-//设置PHP版本
-function setPHPVersion(siteName){
-	var data = 'version='+$("#phpVersion").val()+'&siteName='+siteName;
-	var loadT = layer.msg('正在保存...',{icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/site/set_php_version',data,function(rdata){
-		layer.close(loadT);
-		layer.msg(rdata.msg,{icon:rdata.status?1:2});
-	},'json');
-}
-
-//配置文件
-function configFile(webSite){
-	var info = syncPost('/site/get_host_conf', {siteName:webSite});
-	$.post('/files/get_body','path='+info['host'],function(rdata){
-		var mBody = "<div class='webEdit-box padding-10'>\
-		<textarea style='height: 320px; width: 445px; margin-left: 20px;line-height:18px' id='configBody'>"+rdata.data.data+"</textarea>\
-			<div class='info-r'>\
-				<button id='SaveConfigFileBtn' class='btn btn-success btn-sm' style='margin-top:15px;'>保存</button>\
-				<ul class='help-info-text c7 ptb10'>\
-					<li>此处为站点主配置文件,若您不了解配置规则,请勿随意修改.</li>\
-				</ul>\
-			</div>\
-		</div>";
-		$("#webedit-con").html(mBody);
-		var editor = CodeMirror.fromTextArea(document.getElementById("configBody"), {
-			extraKeys: {"Ctrl-Space": "autocomplete"},
-			lineNumbers: true,
-			matchBrackets:true,
-		});
-		$(".CodeMirror-scroll").css({"height":"300px","margin":0,"padding":0});
-		$("#SaveConfigFileBtn").click(function(){
-			$("#configBody").empty();
-			$("#configBody").text(editor.getValue());
-			saveConfigFile(webSite,rdata.data.encoding, info['host']);
-		})
-	},'json');
-}
-
-//保存配置文件
-function saveConfigFile(webSite,encoding,path){
-	var data = 'encoding='+encoding+'&data='+encodeURIComponent($("#configBody").val())+'&path='+path;
-	var loadT = layer.msg('保存中...',{icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/site/save_host_conf',data,function(rdata){
-		layer.close(loadT);
-		if(rdata.status){
-			layer.msg(rdata.msg,{icon:1});
-		}else{
-			layer.msg(rdata.msg,{icon:2,time:0,shade:0.3,shadeClose:true});
-		}
-	},'json');
-}
-
-//伪静态
-function rewrite(siteName){
-	$.post("/site/get_rewrite_list", 'siteName='+siteName,function(rdata){
-		var info = syncPost('/site/get_rewrite_conf', {siteName:siteName});
-		var filename = info['rewrite'];
-		$.post('/files/get_body','path='+filename,function(fileBody){
-			var centent = fileBody['data']['data'];
-			var rList = ''; 
-			for(var i=0;i<rdata.rewrite.length;i++){
-				if (i==0){
-					rList += "<option value='0'>"+rdata.rewrite[i]+"</option>";	
-				} else {
-					rList += "<option value='"+rdata.rewrite[i]+"'>"+rdata.rewrite[i]+"</option>";		
-				}
-			}
-			var webBakHtml = "<div class='bt-form'>\
-						<div class='line'>\
-						<select id='myRewrite' class='bt-input-text mr20' name='rewrite' style='width:30%;'>"+rList+"</select>\
-						<textarea class='bt-input-text' style='height: 260px; width: 480px; line-height:18px;margin-top:10px;padding:5px;' id='rewriteBody'>"+centent+"</textarea></div>\
-						<button id='SetRewriteBtn' class='btn btn-success btn-sm'>保存</button>\
-						<button id='SetRewriteBtnTel' class='btn btn-success btn-sm'>另存为模板</button>\
-						<ul class='help-info-text c7 ptb15'>\
-							<li>请选择您的应用，若设置伪静态后，网站无法正常访问，请尝试设置回default</li>\
-							<li>您可以对伪静态规则进行修改，修改完后保存即可。</li>\
-						</ul>\
-						</div>";
-			$("#webedit-con").html(webBakHtml);
-			
-			var editor = CodeMirror.fromTextArea(document.getElementById("rewriteBody"), {
-	            extraKeys: {"Ctrl-Space": "autocomplete"},
-				lineNumbers: true,
-				matchBrackets:true,
-			});
-			
-			$(".CodeMirror-scroll").css({"height":"300px","margin":0,"padding":0});
-			$("#SetRewriteBtn").click(function(){
-				$("#rewriteBody").empty();
-				$("#rewriteBody").text(editor.getValue());
-				setRewrite(filename, encodeURIComponent(editor.getValue()));
-			});
-			$("#SetRewriteBtnTel").click(function(){
-				$("#rewriteBody").empty();
-				$("#rewriteBody").text(editor.getValue());
-				setRewriteTel();
-			});
-			
-			$("#myRewrite").change(function(){
-				var rewriteName = $(this).val();
-				if(rewriteName == '0'){
-					rpath = filename;
-				}else{
-					var info = syncPost('/site/get_rewrite_tpl', {tplname:rewriteName});
-					if (!info['status']){
-						layer.msg(info['msg']);
-						return;
-					}
-					rpath = info['data'];
-				}
-				
-				$.post('/files/get_body','path='+rpath,function(fileBody){
-					$("#rewriteBody").val(fileBody['data']['data']);
-					editor.setValue(fileBody['data']['data']);
-				},'json');
-			});
-		},'json');
-	},'json');
-}
-
-
-//设置伪静态
-function setRewrite(filename,data){
-	var data = 'data='+data+'&path='+filename+'&encoding=utf-8';
-	var loadT = layer.msg(lan.site.saving_txt,{icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/site/set_rewrite',data,function(rdata){
-		layer.close(loadT);
-		if(rdata.status){
-			layer.msg(rdata.msg,{icon:1});
-		}else{
-			layer.msg(rdata.msg,{icon:2,time:0,shade:0.3,shadeClose:true});
-		}
-	},'json');
-}
-var aindex = null;
-
-//保存为模板
-function setRewriteTel(act){	
-	aindex = layer.open({
-		type: 1,
-		shift: 5,
-		closeBtn: 1,
-		area: '320px', //宽高
-		title: '保存为Rewrite模板',
-		btn:[lan.public.ok,lan.public.cancel],
-		content: '<div class="bt-form pd20">\
-					<div class="line">\
-						<input type="text" class="bt-input-text" name="rewriteName" id="rewriteName" value="" placeholder="'+lan.site.template_name+'" style="width:100%" />\
-					</div>\
-				</div>',
-		success:function(index){
-			$("#rewriteName").focus().keyup(function(e){
-				if(e.keyCode == 13) $("#rewriteNameBtn").click();
-			});
-		},
-		yes:function(index){
-			name = $("#rewriteName").val();
-			if(name == ''){
-				layer.msg(lan.site.template_empty,{icon:5});
-				return;
-			}
-			var data = 'data='+encodeURIComponent($("#rewriteBody").val())+'&name='+name;
-			var loadT = layer.msg(lan.site.saving_txt,{icon:16,time:0,shade: [0.3, '#000']});
-			$.post('/site/set_rewrite_tpl',data,function(rdata){
-				layer.close(loadT);
-				layer.close(index);
-				layer.msg(rdata.msg, {icon:rdata.status?1:5});
-			},'json');
-			return;
-		}
-	});
-}
-//修改默认页
-function siteDefaultPage(){
-	stype = getCookie('serverType');
-	layer.open({
-		type: 1,
-		area: '460px',
-		title: '修改默认页',
-		closeBtn: 1,
-		shift: 0,
-		content: '<div class="changeDefault pd20">\
-						<button class="btn btn-default btn-sm mg10" style="width:188px" onclick="changeDefault(1)">默认文档</button>\
-						<button class="btn btn-default btn-sm mg10" style="width:188px" onclick="changeDefault(2)">404错误页</button>\
-						<button class="btn btn-default btn-sm mg10" style="width:188px" onclick="changeDefault(3)">空白页</button>\
-						<button class="btn btn-default btn-sm mg10" style="width:188px" onclick="changeDefault(4)">默认站点停止页</button>\
-				</div>'
-	});
-}
-
-function changeDefault(type){
-	$.post('/site/get_site_doc','type='+type, function(rdata){
-		showMsg('操作成功!',function(){
-			if (rdata.status){
-				vhref = rdata.data.path;
-				onlineEditFile(0,vhref);
-			}
-		},{icon:rdata.status?1:2});
-	},'json');
-}
-
-function getClassType(){
-	var select = $('.site_type > select');
-	$.post('/site/get_site_types',function(rdata){
-		$(select).html('');
-		$(select).append('<option value="-1">全部分类</option>');
-		for (var i = 0; i<rdata.length; i++) {
-			$(select).append('<option value="'+rdata[i]['id']+'">'+rdata[i]['name']+'</option>');
-		}
-
-		$(select).bind('change',function(){
-			var select_id = $(this).val();
-			getWeb(1,select_id, '');
-		})
-	},'json');
-}
-getClassType();
-
-function setClassType(){
-	$.post('/site/get_site_types',function(rdata){
-		var list = '';
-		for (var i = 0; i<rdata.length; i++) {
-			list +='<tr><td>' + rdata[i]['name'] + '</td>\
-				<td><a class="btlink edit_type" onclick="editClassType(\''+rdata[i]['id']+'\',\''+rdata[i]['name']+'\')">编辑</a> | <a class="btlink del_type" onclick="removeClassType(\''+rdata[i]['id']+'\',\''+rdata[i]['name']+'\')">删除</a>\
-				</td></tr>';
-		}
-
-		layer.open({
-			type: 1,
-			area: '350px',
-			title: '网站分类管理',
-			closeBtn: 1,
-			shift: 0,
-			content: '<div class="bt-form edit_site_type">\
-					<div class="divtable mtb15" style="overflow:auto">\
-						<div class="line "><div class="info-r  ml0">\
-							<input name="type_name" class="bt-input-text mr5 type_name" placeholder="请填写分类名称" type="text" style="width:50%" value=""><button name="btn_submit" class="btn btn-success btn-sm mr5 ml5 btn_submit" onclick="addClassType();">添加</button></div>\
-						</div>\
-						<table id="type_table" class="table table-hover" width="100%">\
-							<thead><tr><th>名称</th><th width="80px">操作</th></tr></thead>\
-							<tbody>'+list+'</tbody>\
-						</table>\
-					</div>\
-				</div>'
-		});
-	},'json');
-}
-
-function addClassType(){
-	var name = $("input[name=type_name]").val();
-	$.post('/site/add_site_type','name='+name, function(rdata){
-		showMsg(rdata.msg,function(){
-			if (rdata.status){
-				layer.closeAll();
-				setClassType();
-				getClassType();
-			}
-		},{icon:rdata.status?1:2});
-	},'json');
-}
-
-function removeClassType(id,name){
-	if (id == 0){
-		layer.msg('默认分类不可删除/不可编辑!',{icon:2});
-		return;
-	}
-	layer.confirm('是否确定删除分类？',{title: '删除分类【'+ name +'】' }, function(){
-		$.post('/site/remove_site_type','id='+id, function(rdata){
-			showMsg(rdata.msg,function(){
-				if (rdata.status){
-					layer.closeAll();
-					setClassType();
-					getClassType();
-				}
-			},{icon:rdata.status?1:2});
-		},'json');
-	});
-}
-
-function editClassType(id,name){
-	if (id == 0){
-		layer.msg('默认分类不可删除/不可编辑!',{icon:2});
-		return;
-	}
-
-	layer.open({
-		type: 1,
-		area: '350px',
-		title: '修改分类管理【' + name + '】',
-		closeBtn: 1,
-		shift: 0,
-		content: "<form class='bt-form bt-form pd20 pb70' id='mod_pwd'>\
-                    <div class='line'>\
-                        <span class='tname'>分类名称</span>\
-                        <div class='info-r'><input name=\"site_type_mod\" class='bt-input-text mr5' type='text' value='"+name+"' /></div>\
-                    </div>\
-                    <div class='bt-form-submit-btn'>\
-                        <button id='site_type_mod' type='button' class='btn btn-success btn-sm btn-title'>提交</button>\
-                    </div>\
-                  </form>"
-	});
-
-	$('#site_type_mod').unbind().click(function(){
-		var _name = $('input[name=site_type_mod]').val();
-		$.post('/site/modify_site_type_name','id='+id+'&name='+_name, function(rdata){
-			showMsg(rdata.msg,function(){
-				if (rdata.status){
-					layer.closeAll();
-					setClassType();
-					getClassType();
-				}
-			},{icon:rdata.status?1:2});
-		},'json');
-
-	});
-}
-
-
-function moveClassTYpe(){
-	$.post('/site/get_site_types',function(rdata){
-		var option = '';
-		for (var i = 0; i<rdata.length; i++) {
-			option +='<option value="'+rdata[i]['id']+'">'+rdata[i]['name']+'</option>';
-		}
-
-		layer.open({
-			type: 1,
-			area: '350px',
-			title: '设置站点分类',
-			closeBtn: 1,
-			shift: 0,
-			content: '<div class="bt-form edit_site_type">\
-					<div class="divtable mtb15" style="overflow:auto;height:80px;">\
-						<div class="line"><span class="tname">默认站点</span>\
-							<div class="info-r">\
-							<select class="bt-input-text mr5" name="type_id" style="width:200px">'+option+'\
-							</select>\
-							</div>\
-						</div>\
-					</div>\
-					<div class="bt-form-submit-btn"><button onclick="setSizeClassType();" type="button" class="btn btn-sm btn-success">提交</button></div>\
-				</div>'
-		});
-	},'json');
-}
-
-
-function setSizeClassType(){
-	var data = {};
-	data['id'] = $('select[name=type_id]').val();
-	var ids = [];
-    $('table').find('td').find('input').each(function(i,obj){
-        checked = $(this).prop('checked');
-        if (checked) {
-        	ids.push($(this).val());
-        }
-    });
-	data['site_ids'] = JSON.stringify(ids);
-	$.post('/site/set_site_type',data, function(rdata){
-		showMsg(rdata.msg,function(){
-			if (rdata.status){
-				layer.closeAll();
-			}
-		},{icon:rdata.status?1:2});
-	},'json');
-}
-
-
-// 尝试重启PHP
-function tryRestartPHP(siteName){
-	$.post('/site/get_site_php_version','siteName='+siteName,function(data){
-		var phpversion = data.phpversion;
-
-		if (phpversion == "00"){
-			return
-		}
-		
-		var php_sign = 'php';
-		if (phpversion.indexOf('yum') > -1){
-			php_sign = 'php-yum';
-			phpversion = phpversion.replace('yum','');
-		}
-
-		if (phpversion.indexOf('apt') > -1){
-			php_sign = 'php-apt';
-			phpversion = phpversion.replace('apt','');
-		}
-
-		var reqData = {name: php_sign, func:'restart'}
-		reqData['version'] = phpversion;
-
-		// console.log(reqData);
-		var loadT = layer.msg('尝试自动重启PHP['+phpversion+']...', { icon: 16, time: 0, shade: 0.3 });
-		$.post('/plugins/run', reqData, function(data) {
-			layer.close(loadT);
-	        layer.msg(data.msg,{icon:data.status?1:2,time:3000,shade: [0.3, '#000']});
-	    },'json');
-	},'json');
-}
\ No newline at end of file
diff --git a/route/static/app/soft.js b/route/static/app/soft.js
deleted file mode 100755
index eacbfcf5f..000000000
--- a/route/static/app/soft.js
+++ /dev/null
@@ -1,517 +0,0 @@
-
-
-//重置插件弹出框宽度
-function resetPluginWinWidth(width){
-    $("div[id^='layui-layer'][class*='layui-layer-page']").width(width);
-}
-
-//重置插件弹出框宽度
-function resetPluginWinHeight(height){
-    $("div[id^='layui-layer'][class*='layui-layer-page']").height(height);
-    $(".bt-form .bt-w-main").height(height-42);
-}
-
-//软件管理窗口
-function softMain(name, title, version) {
-
-    var _title = title.replace('-'+version,'')
-
-    var loadT = layer.msg("正在处理,请稍后...", { icon: 16, time: 0, shade: [0.3, '#000'] });
-    $.get('/plugins/setting?name='+name, function(rdata) {
-        layer.close(loadT);
-        layer.open({
-            type: 1,
-            area: '640px',
-            title: _title + '【' + version + "】管理",
-            closeBtn: 1,
-            shift: 0,
-            content: rdata
-        });
-        $(".bt-w-menu p").click(function() {
-            $(this).addClass("bgw").siblings().removeClass("bgw");
-        });
-
-        //version to
-        $(".plugin_version").attr('version',version).hide();
-    });
-}
-
-//取软件列表
-function getSList(isdisplay) {
-    if (isdisplay !== true) {
-        var loadT = layer.msg('正在获取列表...', { icon: 16, time: 0, shade: [0.3, '#000'] })
-    }
-    if (!isdisplay || isdisplay === true)
-        isdisplay = getCookie('p' + getCookie('soft_type'));
-    if (isdisplay == true || isdisplay == 'true') isdisplay = 1;
-
-    var search = $("#SearchValue").val();
-    if (search != '') {
-        search = '&search=' + search;
-    }
-    var type = '';
-    var istype = getCookie('soft_type');
-    if (istype == 'undefined' || istype == 'null' || !istype) {
-        istype = '0';
-    }
-
-    type = '&type=' + istype;
-    var page = '';
-    if (isdisplay) {
-        page = '&p=' + isdisplay;
-        setCookie('p' + getCookie('soft_type'), isdisplay);
-    }
-
-    var condition = (search + type + page).slice(1);
-    $.get('/plugins/list?' + condition, '', function(rdata) {
-        layer.close(loadT);
-        var tBody = '';
-        var sBody = '';
-        var pBody = '';
-
-        for (var i = 0; i < rdata.type.length; i++) {
-            var c = '';
-            if (istype == rdata.type[i].type) {
-                c = 'class="on"';
-            }
-            tBody += '<span typeid="' + rdata.type[i].type + '" ' + c + '>' + rdata.type[i].title + '</span>';
-        }
-
-        $(".softtype").html(tBody);
-        $("#softPage").html(rdata.list);
-        $("#softPage .Pcount").css({ "position": "absolute", "left": "0" })
-
-        $(".task").text(rdata.data[rdata.length - 1]);
-        for (var i = 0; i < rdata.data.length; i++) {
-            var plugin = rdata.data[i];
-            var len = plugin.versions.length;
-            var version_info = '';
-            var version = '';
-            var softPath = '';
-            var titleClick = '';
-            var state = '';
-            var indexshow = '';
-            var checked = '';
-
-            checked = plugin.display ? 'checked' : '';
-    
-            if (typeof(plugin.versions) == "string" ){
-                version_info += plugin.versions + '|';
-            } else {
-                for (var j = 0; j < len; j++) {
-                    version_info += plugin.versions[j] + '|';
-                }
-            }
-            if (version_info != '') {
-                version_info = version_info.substring(0, version_info.length - 1);
-            }
-
-            var handle = '<a class="btlink" onclick="addVersion(\'' + plugin.name + '\',\'' + version_info + '\',\'' + plugin.tip + '\',this,\'' + plugin.title + '\',' + plugin.install_pre_inspection + ')">安装</a>';
-            
-            if (plugin.setup == true) {
-
-                var mupdate = '';//(plugin.versions[n] == plugin.updates[n]) '' : '<a class="btlink" onclick="softUpdate(\'' + plugin.name + '\',\'' + plugin.versions[n].version + '\',\'' + plugin.updates[n] + '\')">更新</a> | ';
-                // if (plugin.versions[n] == '') mupdate = '';
-                handle = mupdate + '<a class="btlink" onclick="softMain(\'' + plugin.name + '\',\'' + plugin.title + '\',\'' + plugin.setup_version + '\')">设置</a> | <a class="btlink" onclick="uninstallVersion(\'' + plugin.name + '\',\'' + plugin.title +'\',\'' + plugin.setup_version + '\',' + plugin.uninstall_pre_inspection +')">卸载</a>';
-                titleClick = 'onclick="softMain(\'' + plugin.name + '\',\'' + plugin.title + '\',\'' + plugin.setup_version + '\')" style="cursor:pointer"';
-             
-                softPath = '<span class="glyphicon glyphicon-folder-open" title="' + plugin.path + '" onclick="openPath(\'' + plugin.path + '\')"></span>';
-                if (plugin.coexist){
-                    indexshow = '<div class="index-item">\
-                        <input class="btswitch btswitch-ios" id="index_' + plugin.name  + plugin.versions + '" type="checkbox" ' + checked + '>\
-                        <label class="btswitch-btn" for="index_' + plugin.name + plugin.versions + '" onclick="toIndexDisplay(\'' + plugin.name + '\',\'' + plugin.versions + '\',\'' + plugin.coexist +'\')"></label>\
-                    </div>';
-                } else {
-                    indexshow = '<div class="index-item">\
-                        <input class="btswitch btswitch-ios" id="index_' + plugin.name + '" type="checkbox" ' + checked + '>\
-                        <label class="btswitch-btn" for="index_' + plugin.name + '" onclick="toIndexDisplay(\'' + plugin.name + '\',\'' + plugin.setup_version + '\')"></label>\
-                    </div>';
-                }
-                
-                if (plugin.status == true) {
-                    state = '<span style="color:#20a53a" class="glyphicon glyphicon-play"></span>'
-                } else {
-                    state = '<span style="color:red" class="glyphicon glyphicon-pause"></span>'
-                }
-            }
-
-            if (plugin.task == '-2') {
-                handle = '<a style="color:green;" href="javascript:task();">正在卸载...</a>';
-            } else if (plugin.task == '-1') {
-                handle = '<a style="color:green;" href="javascript:task();">正在安装...</a>';
-            } else if (plugin.task == '0') {
-                handle = '<a style="color:#C0C0C0;" href="javascript:task();">等待中...</a>';
-            }
-
-            var plugin_title = plugin.title;
-            if (plugin.setup && !plugin.coexist){
-                plugin_title = plugin.title + ' ' + plugin.setup_version;
-            }
-
-            icon_link = "/plugins/file?name="+plugin.name+"&f=ico.png";
-            if (plugin.icon != ''){
-                icon_link = "/plugins/file?name="+plugin.name+"&f="+plugin.icon;
-            }
-
-            sBody += '<tr>' +
-                '<td><span ' + titleClick + '>'+
-                '<img data-src="'+icon_link+'" src="/static/img/loading.gif">' + plugin_title + '</span></td>' +
-                '<td>' + plugin.ps + '</td>' +
-                '<td>' + softPath + '</td>' +
-                '<td>' + state + '</td>' +
-                '<td>' + indexshow + '</td>' +
-                '<td style="text-align: right;">' + handle + '</td>' +
-                '</tr>';
-        }
-
-        sBody += pBody;
-
-
-        $("#softList").html(sBody);
-        $(".menu-sub span").click(function() {
-            setCookie('soft_type', $(this).attr('typeid'));
-            $(this).addClass("on").siblings().removeClass("on");
-            getSList();
-        });
-
-        loadImage();
-    },'json');
-}
-
-function installPreInspection(name, ver, callback){
-    var loading = layer.msg('正在检查安装环境...', { icon: 16, time: 0, shade: [0.3, '#000'] });
-     $.post("/plugins/run", {'name':name,'version':ver,'func':'install_pre_inspection'}, function(rdata) {
-        layer.close(loading);
-        if (rdata.status){
-            if (rdata.data == 'ok'){
-                callback();
-            } else {
-                layer.msg(rdata.data, { icon: 2 });
-            }
-        } else {
-            layer.msg(rdata.data, { icon: rdata.status ? 1 : 2 });
-        }
-    },'json');
-}
-
-function runInstall(data){
-    var loadT = layer.msg('正在添加到安装器...', { icon: 16, time: 0, shade: [0.3, '#000'] });
-    $.post("/plugins/install", data, function(rdata) {
-        layer.closeAll();
-        layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
-        getSList();
-    },'json');
-}
-
-function addVersion(name, ver, type, obj, title, install_pre_inspection) {
-    var option = '';
-    var titlename = title.replace("-"+ver,"");
-    if (ver.indexOf('|') >= 0){
-        var veropt = ver.split("|");
-        var selectVersion = '';
-        for (var i = 0; i < veropt.length; i++) {
-            selectVersion += '<option>' + name + ' ' + veropt[i] + '</option>';
-        }
-        option = "<select id='selectVersion' class='bt-input-text' style='margin-left:30px'>" + selectVersion + "</select>";
-    } else {
-        option = '<span id="selectVersion" val="' + name + ' ' + ver + '">【' + titlename + '】 ' + ver + '</span>';
-    }
-
-    layer.open({
-        type: 1,
-        title: "【"+titlename + "】软件安装",
-        area: '350px',
-        closeBtn: 1,
-        shadeClose: true,
-        btn: ['提交','关闭'],
-        content: "<div class='bt-form pd20 c6'>\
-			<div class='version line'>安装版本：" + option + "</div>\
-	    </div>",
-        success:function(){
-            $('.fangshi input').click(function() {
-                $(this).attr('checked', 'checked').parent().siblings().find("input").removeAttr('checked');
-            });
-            installTips();
-        },
-        yes:function(index,layero){
-            var info = $("#selectVersion").val().toLowerCase();
-            if (info == ''){
-                info = $("#selectVersion").attr('val').toLowerCase();
-            }
-            var info_split = info.split(' ');
-            var name = info_split[0];
-            var version = info_split[1];
-
-            var type = $('.fangshi').prop("checked") ? '1' : '0';
-            var request_args = "name=" + name + "&version=" + version + "&type=" + type;
-
-            if (install_pre_inspection){
-                //安装检查
-                installPreInspection(name, version, function(){
-                    runInstall(request_args);
-                    flySlow('layui-layer-btn0');
-                });      
-                return;
-            }
-
-            runInstall(request_args);
-            flySlow('layui-layer-btn0');
-        }
-    });
-}
-
-//卸载软件
-function uninstallPreInspection(name, title, ver, callback){
-    var loading = layer.msg('正在检查卸载环境...', { icon: 16, time: 0, shade: [0.3, '#000'] });
-     $.post("/plugins/run", {'name':name,'version':ver,'func':'uninstall_pre_inspection'}, function(rdata) {
-        layer.close(loading);
-        if (rdata.status){
-            if (rdata.data == 'ok'){
-                if (typeof(callback) == 'function'){
-                    callback();
-                }
-            } else {
-                layer.msg(rdata.data, { icon: 2 , time: 6666});
-            }
-        } else {
-            layer.msg(rdata.data, { icon: rdata.status ? 1 : 2, time: 6666 });
-        }
-    },'json');
-}
-
-
-function runUninstallVersion(name, title, version){
-    var title = title.replace("-"+version,"");
-    layer.confirm(msgTpl('您真的要卸载【{1}-{2}】吗?', [title, version]), { icon: 3, closeBtn: 1 }, function() {
-        var data = 'name=' + name + '&version=' + version;
-        var loadT = layer.msg('正在处理,请稍候...', { icon: 16, time: 0, shade: [0.3, '#000'] });
-        $.post('/plugins/uninstall', data, function(rdata) {
-            layer.close(loadT)
-            getSList();
-            layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
-        },'json');
-    });
-}
-
-
-function uninstallVersion(name, title, version, uninstall_pre_inspection) {
-    if (uninstall_pre_inspection) {
-        uninstallPreInspection(name,title,version,function(){
-            runUninstallVersion(name,title,version);
-        });
-    } else {
-        runUninstallVersion(name,title,version);
-    }
-}
-
-
-//首页显示
-function toIndexDisplay(name, version, coexist) {
-
-    var status = $("#index_" + name).prop("checked") ? "0" : "1";
-    if (coexist == "true") {
-        var verinfo = version.replace(/\./, "");
-        status = $("#index_" + name + verinfo).prop("checked") ? "0" : "1";
-    }
-
-    var data = "name=" + name + "&status=" + status + "&version=" + version;
-    $.post("/plugins/set_index", data, function(rdata) {
-        if (rdata.status) {
-            layer.msg(rdata.msg, { icon: 1 })
-        } else {
-            layer.msg(rdata.msg, { icon: 2 })
-        }
-    },'json');
-}
-
-function indexListHtml(callback){
-    
-
-    // init
-    $("#indexsoft").html('');
-    var index_soft = '';
-    for (var i = 0; i < 12; i++) {
-        index_soft += '<div class="col-sm-3 col-md-3 col-lg-3 no-bg"></div>';
-    }
-    $("#indexsoft").html(index_soft);
-
-    // var loadT = layer.msg('正在获取列表...', { icon: 16, time: 0, shade: [0.3, '#000'] });
-    $.get('/plugins/index_list', function(rdata) {
-        // layer.close(loadT);
-        $("#indexsoft").html('');
-        var con = '';
-        for (var i = 0; i < rdata.length; i++) {
-            var plugin = rdata[i];
-            var len = plugin.versions.length;
-            var version_info = '';
-
-            if (typeof plugin.versions == "string"){
-                version_info += plugin.versions + '|';
-            } else {
-                for (var j = 0; j < len; j++) {
-                    version_info += plugin.versions[j] + '|';
-                }
-            }
-            if (version_info != '') {
-                version_info = version_info.substring(0, version_info.length - 1);
-            }
-
-            if (plugin.status == true) {
-                    state = '<span style="color:#20a53a" class="glyphicon glyphicon-play"></span>'
-                } else {
-                    state = '<span style="color:red" class="glyphicon glyphicon-pause"></span>'
-            }
-
-            var name = plugin.title + ' ' + plugin.setup_version + '  ';
-            var data_id = plugin.name + '-' + plugin.setup_version;
-            if (plugin.coexist){
-                name = plugin.title + '  ';
-                data_id = plugin.name + '-' + plugin.versions;
-            }
-
-            con += '<div class="col-sm-3 col-md-3 col-lg-3" data-id="' + data_id + '">\
-                <span class="spanmove"></span>\
-                <div onclick="softMain(\'' + plugin.name + '\',\'' + plugin.title + '\',\'' + plugin.setup_version + '\')">\
-                <div class="image"><img bk-src="/static/img/loading.gif" src="/plugins/file?name=' + plugin.name + '&f=ico.png" style="max-width:48px;"></div>\
-                <div class="sname">' +  name + state + '</div>\
-                </div>\
-            </div>';
-
-            // loadImage();
-        }
-
-        $("#indexsoft").html(con);
-        //软件位置移动
-        var softboxlen = $("#indexsoft > div").length;
-        var softboxsum = 12;
-        var softboxcon = '';
-        var softboxn = softboxlen;
-        if (softboxlen <= softboxsum) {
-            for (var i = 0; i < softboxsum - softboxlen; i++) {
-                softboxcon += '<div class="col-sm-3 col-md-3 col-lg-3 no-bg" data-id=""></div>';
-            }
-            $("#indexsoft").append(softboxcon);
-        }
-
-        if (typeof callback=='function'){
-            callback();
-        }
-    },'json');
-}
-
-
-//首页软件列表
-function indexSoft() {
-    indexListHtml(function(){
-        $("#indexsoft").dragsort({ 
-            dragSelector: ".spanmove", 
-            dragBetween: true, 
-            dragEnd: saveOrder, 
-            placeHolderTemplate: "<div class='col-sm-3 col-md-3 col-lg-3 dashed-border'></div>"
-        });
-    });
-    
-    function saveOrder() {
-        var data = $("#indexsoft > div").map(function() { return $(this).attr("data-id"); }).get();
-        tmp = [];
-        for(i in data){
-            // console.log(data[i]);
-            if (data[i] != ''){
-                tmp.push($.trim(data[i]));
-            }
-        }
-        var ssort = tmp.join("|");
-        $("input[name=list1SortOrder]").val(ssort);
-        $.post("/plugins/index_sort", 'ssort=' + ssort, function(rdata) {
-            if (!rdata.status){
-                showMsg('设置失败:'+ rdata.msg, function(){
-                    indexListHtml();
-                }, { icon: 16, time: 0, shade: [0.3, '#000'] });
-            }
-        },'json');
-    };
-}
-
-
-function importPluginOpen(){
-    $("#update_zip").on("change", function () {
-        var files = $("#update_zip")[0].files;
-        if (files.length == 0) {
-            return;
-        }
-        importPlugin(files[0]);
-        $("#update_zip").val('')
-    });
-    $("#update_zip").click();
-}
-
-
-function importPlugin(file){
-    var formData = new FormData();
-    formData.append("plugin_zip", file);
-    $.ajax({
-        url: "/plugins/update_zip",
-        type: "POST",
-        data: formData,
-        processData: false,
-        dataType:'json',
-        contentType: false,
-        success: function (data) {
-            if (data.status === false) {
-                layer.msg(data.msg, { icon: 2 });
-                return;
-            }
-            var loadT = layer.open({
-                type: 1,
-                area: "500px",
-                title: "安装第三方插件包",
-                closeBtn: 1,
-                shift: 5,
-                shadeClose: false,
-                content: '<style>\
-                    .install_three_plugin{padding:25px;padding-bottom:70px}\
-                    .plugin_user_info p { font-size: 14px;}\
-                    .plugin_user_info {padding: 15px 30px;line-height: 26px;background: #f5f6fa;border-radius: 5px;border: 1px solid #efefef;}\
-                    .btn-content{text-align: center;margin-top: 25px;}\
-                </style>\
-                <div class="bt-form c7  install_three_plugin pb70">\
-                    <div class="plugin_user_info">\
-                        <p><b>名称：</b>'+ data.title + '</p>\
-                        <p><b>版本：</b>' + data.versions +'</p>\
-                        <p><b>描述：</b>' + data.ps + '</p>\
-                        <p><b>大小：</b>' + toSize(data.size) + '</p>\
-                        <p><b>作者：</b>' + data.author + '</p>\
-                        <p><b>来源：</b><a class="btlink" href="'+data.home+'" target="_blank">' + data.home + '</a></p>\
-                    </div>\
-                    <ul class="help-info-text c7">\
-                        <li style="color:red;">此为第三方开发的插件，无法验证其可靠性!</li>\
-                        <li>安装过程可能需要几分钟时间，请耐心等候!</li>\
-                        <li>如果已存在此插件，将被替换!</li>\
-                    </ul>\
-                    <div class="bt-form-submit-btn"><button type="button" class="btn btn-sm btn-danger mr5" onclick="layer.closeAll()">取消</button><button type="button" class="btn btn-sm btn-success" onclick="importPluginInstall(\''+ data.name + '\',\'' + data.tmp_path +'\')">确定安装</button></div>\
-                </div>'
-            });
-
-        },error: function (responseStr) {
-            layer.msg('上传失败2!:' + responseStr, { icon: 2 });
-        }
-    });
-}
-
-
-function importPluginInstall(plugin_name, tmp_path) {
-    layer.msg('正在安装,这可能需要几分钟时间...', { icon: 16, time: 0, shade: [0.3, '#000'] });
-    $.post('/plugins/input_zip', { plugin_name: plugin_name, tmp_path: tmp_path }, function (rdata) {
-        layer.closeAll()
-        if (rdata.status) {
-            getSList(true);
-        }
-        setTimeout(function () { layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 }) }, 1000);
-    },'json');
-}
-
-$(function() {
-    if (window.document.location.pathname == '/soft/') {
-        setInterval(function() { getSList(); }, 8000);
-    }
-});
\ No newline at end of file
diff --git a/route/static/app/upload.js b/route/static/app/upload.js
deleted file mode 100755
index cdeaddd4b..000000000
--- a/route/static/app/upload.js
+++ /dev/null
@@ -1,238 +0,0 @@
-function MyAjax() {
-	this.serverdata = this.erromsg = this.timeout = this.stop = this.xmlhttp = !1, this.transit = !0
-}
-MyAjax.prototype.handle = function(d, f) {
-	if(4 == d.readyState) {
-		if(this.stop === !0) {
-			return
-		}
-		if(this.transit = !0, f.timeout && f.async && (clearTimeout(this.timeout), this.timeout = !1), 200 == d.status) {
-			var e = this.serverdata = d.responseText.replace(/(^\s*)|(\s*$)/g, "");
-			"function" == typeof f.success && f.success(e)
-		} else {
-			this.erromsg = d.status, "function" == typeof f.error && f.error(d.status)
-		}
-	} else {
-		if(0 == d.readyState) {
-			if(this.stop === !0) {
-				return
-			}
-			f.timeout && f.async && (clearTimeout(this.timeout), this.timeout = !1), this.erromsg = d.readyState, this.transit = !0, "function" == typeof f.error && f.error(d.readyState)
-		}
-	}
-}, MyAjax.prototype.out = function(b) {
-	this.transit = !0, this.erromsg = 504, this.stop = !0, "function" == typeof b.error && b.error(504)
-}, MyAjax.prototype.carry = function(j) {
-	var i, h, g, l;
-	if(j.lock && !this.transit) {
-		return !1
-	}
-	this.transit = !1, this.stop = this.erromsg = !1, i = window.XMLHttpRequest ? new XMLHttpRequest : new ActiveXObject("Microsoft.XMLHTTP"), j.type = j.type.toUpperCase(), h = function() {}, "string" == typeof j.data ? (j.data = j.data.replace(/(^\s*)|(\s*$)/g, ""), h = function() {
-		i.setRequestHeader("Content-Type", "application/x-www-form-urlencoded")
-	}) : "[object FormData]" !== Object.prototype.toString.call(j.data) ? (j.data = "", h = function() {
-		i.setRequestHeader("Content-Type", "application/x-www-form-urlencoded")
-	}) : ("function" == typeof j.progress && i.upload.addEventListener("progress", j.progress, !1), j.type = "POST"), g = "" == j.data ? [null, ""] : [j.data, "?" + j.data], l = this, "function" == typeof j.complete && j.complete(), j.timeout && j.async && (this.timeout = setTimeout(function() {
-		l.out(j)
-	}, j.timeout)), j.async === !0 && (i.onreadystatechange = function() {
-		l.handle(i, j)
-	});
-	try {
-		switch(j.type) {
-			case "POST":
-				i.open("POST", j.url, j.async), h();
-				break;
-			default:
-				i.open("GET", j.url + g[1], j.async), j.cache === !0 || i.setRequestHeader("If-Modified-Since", "0")
-		}
-	} catch(k) {
-		return this.erromsg = 505, j.timeout && j.async && (clearTimeout(this.timeout), this.timeout = !1), this.transit = !0, "function" == typeof j.error && j.error(505), void 0
-	}
-	i.send(g[0]), j.async === !1 && l.handle(i, j)
-};
-
-function uploadStart(d) {
-	var a = function(e) {
-		this.uptype = e.UpType;
-		this.url = e.url;
-		this.oldurl = e.url;
-		this.filessize = e.FilesSize, this.MaxUpNum = e.MaxUpNum, this.str = new MyAjax();
-		this.file_input = document.getElementById("file_input");
-		this.opt = document.getElementById("opt");
-		this.up = document.getElementById("up");
-		this.up_box = document.getElementById("up_box");
-		this.filesalllength = this.FilesArrayLength = this.up_box_li = FileProgress = 0;
-		this.FilesArray = new Array();
-		this.num = 0
-	};
-	a.prototype = {
-		SelectFile: function() {
-			if(this.FilesArrayLength === 0) {
-				this.up_box.innerHTML = "";
-				this.un()
-			}
-			var h = this.file_input.files,
-				e, g, f = h.length;
-			if(this.filesalllength + f > this.MaxUpNum) {
-				f = this.MaxUpNum - this.filesalllength;
-				layer.msg(lan.get('update_num',[this.MaxUpNum]), {
-					icon: 5
-				})
-			}
-			for(var j = 0; j < f; j++) {
-				e = h[j];
-				g = e.name.split(".");
-				g = Object.prototype.toString.call(g) === "[object Array]" ? g[g.length - 1] : "";
-				if(d) {
-					if(g != "sql" && g != "zip" && g != "gz" && g != "tgz") {
-						layer.msg(lan.upload.file_type_err, {
-							icon: 5
-						});
-						return
-					}
-				}
-				if(!e) {
-					this.up_box.insertAdjacentHTML("beforeEnd", "<li>" + e.name + "<em style='color: red;'>"+lan.upload.file_err+"</em></li>")
-				} else {
-					if(this.uptype.length > 0 && this.uptype.indexOf(g.toLowerCase()) === -1) {
-						this.up_box.insertAdjacentHTML("beforeEnd", "<li>" + e.name + "<em style='color: red;'>"+lan.upload.file_type_err+"</em></li>")
-					} else {
-						if(e.size <= 0) {
-							this.up_box.insertAdjacentHTML("beforeEnd", "<li>" + e.name + "<em style='color: red;'>"+lan.upload.file_err_empty+"</em></li>")
-						} else {
-							this.up_box.insertAdjacentHTML("beforeEnd", "<li><span class='filename'>" + e.name + "</span><span class='filesize'>" + (toSize(e.size)) + "</span><em>"+lan.upload.up_sleep+"</em></li>");
-							this.FilesArray.push([e, (this.filesalllength - 1 < 0 ? 0 : this.filesalllength) + j])
-						}
-					}
-				}
-			}
-			this.filesalllength += f;
-			this.FilesArrayLength = this.FilesArray.length
-		},
-		read: function() {
-			if(this.filesalllength == 0) {
-				layer.msg(lan.upload.select_file, {
-					icon: 5
-				});
-				return
-			}
-			this.url = this.oldurl + "&codeing=" + document.getElementById("fileCodeing").value;
-			if(this.FilesArrayLength > 0) {
-				this.opt.disabled = true;
-				this.up.disabled = true;
-				this.file_input.disabled = true;
-				this.up_box_li = this.up_box.getElementsByTagName("li");
-				this.ready(this.FilesArray, 0, this.FilesArrayLength - 1)
-			} else {
-				layer.msg(an.upload.select_empty, {
-					icon: 5
-				})
-			}
-		},
-		un: function() {
-			this.opt.disabled = this.up.disabled = this.file_input.disabled;
-			this.filesalllength = this.FilesArrayLength = this.up_box_li = 0;
-			this.FilesArray = new Array()
-		},
-		ready: function(i, f, h) {
-			if(f > h) {
-				this.un();
-				return
-			}
-			try {
-				var g = new FormData();
-				g.append("zunfile", i[f][0])
-			} catch(e) {
-				this.opt.disabled = true;
-				this.up.disabled = true;
-				this.file_input.disabled = true;
-				layer.msg(lan.upload.ie_err, {
-					icon: 5
-				})
-			}
-			if(i.length > 1) {
-				$("#totalProgress").html("<p>"+lan.upload.up_the+ this.num + "/" + i.length + "</p><progress value='" + this.num + "' max='" + i.length + "' ></progress>");
-				$(".cancel").css("visibility", "hidden")
-			}
-			this.send(g, i, f, h)
-		},
-		SetTxt: function(f, g, h) {
-			var e = this.up_box_li[f].getElementsByTagName("em")[0];
-			e.style.color = h;
-			e.innerHTML = g
-		},
-		send: function(f, i, e, g) {
-			if(!this.up_box_li[e].getElementsByTagName("em")[0]) {
-				this.ready(i, e + 1, g);
-				this.num++;
-				return
-			}
-			var h = this;
-			this.FileProgress = 0;
-			this.str.carry({
-				url: this.url,
-				data: f,
-				type: "get",
-				timeout: 86400000,
-				async: true,
-				lock: true,
-				complete: false,
-				progress: function(j) {
-					h.FileProgress = Math.floor(j.loaded / j.total * 100) + "%";
-					if(h.FileProgress == "100%") {
-						h.FileProgress = '正在保存..';
-					}
-					h.SetTxt(i[e][1], '上传进度:' + h.FileProgress, "#005100")
-				},
-				success: function(j) {
-					h.str.serverdata = false;
-					h.SetTxt(i[e][1], '已上传成功', "#005100");
-					h.ready(i, e + 1, g);
-					h.num++;
-					if(i.length > 1) {
-						var k = (h.num == i.length) ? '上传完成': '已上传';
-						$("#totalProgress").html("<p>" + k + h.num + "/" + i.length + "</p><progress value='" + h.num + "' max='" + i.length + "' ></progress>")
-					}
-					if(h.num == i.length) {
-						c.opt.disabled = false;
-						c.up.disabled = false;
-						c.file_input.disabled = false;
-						h.num = 0
-					}
-					if(!d) {
-						getFiles(getCookie("open_dir_path"));
-					} else{
-						d();
-					}
-				},
-				error: function(j) {
-					h.SetTxt(i[e][1], lan.upload.up_err, "red");
-					h.str.serverdata = false;
-					h.ready(i, e + 1, g)
-				},
-				cache: false
-			})
-		}
-	};
-	try {
-		var c = new a({
-			UpType: new Array(),
-			FilesSize: 5242880000,
-			MaxUpNum: 100,
-			url: "/files/upload_file?path=" + encodeURIComponent(document.getElementById("input-val").value)
-		});
-		c.opt.addEventListener("click", function() {
-			c.file_input.click()
-		}, false);
-		c.up.addEventListener("click", function() {
-			c.read();
-		}, false);
-		c.file_input.addEventListener("change", function() {
-			c.SelectFile();
-		}, false)
-	} catch(b) {
-		c.opt.disabled = true;
-		c.up.disabled = true;
-		c.file_input.disabled = true;
-		layer.msg('抱歉,IE 6/7/8 不支持请更换浏览器再上传', {icon: 5});
-	}
-};
\ No newline at end of file
diff --git a/route/static/bootstrap-3.3.5/css/bootstrap-theme.min.css b/route/static/bootstrap-3.3.5/css/bootstrap-theme.min.css
deleted file mode 100755
index 61358b13d..000000000
--- a/route/static/bootstrap-3.3.5/css/bootstrap-theme.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
- * Bootstrap v3.3.5 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */.btn-danger,.btn-default,.btn-info,.btn-primary,.btn-success,.btn-warning{text-shadow:0 -1px 0 rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075)}.btn-danger.active,.btn-danger:active,.btn-default.active,.btn-default:active,.btn-info.active,.btn-info:active,.btn-primary.active,.btn-primary:active,.btn-success.active,.btn-success:active,.btn-warning.active,.btn-warning:active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-danger.disabled,.btn-danger[disabled],.btn-default.disabled,.btn-default[disabled],.btn-info.disabled,.btn-info[disabled],.btn-primary.disabled,.btn-primary[disabled],.btn-success.disabled,.btn-success[disabled],.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-danger,fieldset[disabled] .btn-default,fieldset[disabled] .btn-info,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-success,fieldset[disabled] .btn-warning{-webkit-box-shadow:none;box-shadow:none}.btn-danger .badge,.btn-default .badge,.btn-info .badge,.btn-primary .badge,.btn-success .badge,.btn-warning .badge{text-shadow:none}.btn.active,.btn:active{background-image:none}.btn-default{text-shadow:0 1px 0 #fff;background-image:-webkit-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-o-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e0e0e0));background-image:linear-gradient(to bottom,#fff 0,#e0e0e0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#dbdbdb;border-color:#ccc}.btn-default:focus,.btn-default:hover{background-color:#e0e0e0;background-position:0 -15px}.btn-default.active,.btn-default:active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#e0e0e0;background-image:none}.btn-primary{background-image:-webkit-linear-gradient(top,#337ab7 0,#265a88 100%);background-image:-o-linear-gradient(top,#337ab7 0,#265a88 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#265a88));background-image:linear-gradient(to bottom,#337ab7 0,#265a88 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#245580}.btn-primary:focus,.btn-primary:hover{background-color:#265a88;background-position:0 -15px}.btn-primary.active,.btn-primary:active{background-color:#265a88;border-color:#245580}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#265a88;background-image:none}.btn-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5cb85c),to(#419641));background-image:linear-gradient(to bottom,#5cb85c 0,#419641 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#3e8f3e}.btn-success:focus,.btn-success:hover{background-color:#419641;background-position:0 -15px}.btn-success.active,.btn-success:active{background-color:#419641;border-color:#3e8f3e}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#419641;background-image:none}.btn-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5bc0de),to(#2aabd2));background-image:linear-gradient(to bottom,#5bc0de 0,#2aabd2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#28a4c9}.btn-info:focus,.btn-info:hover{background-color:#2aabd2;background-position:0 -15px}.btn-info.active,.btn-info:active{background-color:#2aabd2;border-color:#28a4c9}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#2aabd2;background-image:none}.btn-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-o-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f0ad4e),to(#eb9316));background-image:linear-gradient(to bottom,#f0ad4e 0,#eb9316 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#e38d13}.btn-warning:focus,.btn-warning:hover{background-color:#eb9316;background-position:0 -15px}.btn-warning.active,.btn-warning:active{background-color:#eb9316;border-color:#e38d13}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#eb9316;background-image:none}.btn-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-o-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9534f),to(#c12e2a));background-image:linear-gradient(to bottom,#d9534f 0,#c12e2a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#b92c28}.btn-danger:focus,.btn-danger:hover{background-color:#c12e2a;background-position:0 -15px}.btn-danger.active,.btn-danger:active{background-color:#c12e2a;border-color:#b92c28}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#c12e2a;background-image:none}.img-thumbnail,.thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#e8e8e8;background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-repeat:repeat-x}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#2e6da4;background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}.navbar-default{background-image:-webkit-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-o-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f8f8f8));background-image:linear-gradient(to bottom,#fff 0,#f8f8f8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075)}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.open>a{background-image:-webkit-linear-gradient(top,#dbdbdb 0,#e2e2e2 100%);background-image:-o-linear-gradient(top,#dbdbdb 0,#e2e2e2 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dbdbdb),to(#e2e2e2));background-image:linear-gradient(to bottom,#dbdbdb 0,#e2e2e2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffe2e2e2', GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.075);box-shadow:inset 0 3px 9px rgba(0,0,0,.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-o-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#3c3c3c),to(#222));background-image:linear-gradient(to bottom,#3c3c3c 0,#222 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-radius:4px}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.open>a{background-image:-webkit-linear-gradient(top,#080808 0,#0f0f0f 100%);background-image:-o-linear-gradient(top,#080808 0,#0f0f0f 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#080808),to(#0f0f0f));background-image:linear-gradient(to bottom,#080808 0,#0f0f0f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.25);box-shadow:inset 0 3px 9px rgba(0,0,0,.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,.25)}.navbar-fixed-bottom,.navbar-fixed-top,.navbar-static-top{border-radius:0}@media (max-width:767px){.navbar .navbar-nav .open .dropdown-menu>.active>a,.navbar .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}}.alert{text-shadow:0 1px 0 rgba(255,255,255,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05)}.alert-success{background-image:-webkit-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-o-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#c8e5bc));background-image:linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);background-repeat:repeat-x;border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-o-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9edf7),to(#b9def0));background-image:linear-gradient(to bottom,#d9edf7 0,#b9def0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);background-repeat:repeat-x;border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-o-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf8e3),to(#f8efc0));background-image:linear-gradient(to bottom,#fcf8e3 0,#f8efc0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);background-repeat:repeat-x;border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-o-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f2dede),to(#e7c3c3));background-image:linear-gradient(to bottom,#f2dede 0,#e7c3c3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);background-repeat:repeat-x;border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#f5f5f5));background-image:linear-gradient(to bottom,#ebebeb 0,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);background-repeat:repeat-x}.progress-bar{background-image:-webkit-linear-gradient(top,#337ab7 0,#286090 100%);background-image:-o-linear-gradient(top,#337ab7 0,#286090 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#286090));background-image:linear-gradient(to bottom,#337ab7 0,#286090 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff286090', GradientType=0);background-repeat:repeat-x}.progress-bar-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5cb85c),to(#449d44));background-image:linear-gradient(to bottom,#5cb85c 0,#449d44 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);background-repeat:repeat-x}.progress-bar-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5bc0de),to(#31b0d5));background-image:linear-gradient(to bottom,#5bc0de 0,#31b0d5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);background-repeat:repeat-x}.progress-bar-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-o-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f0ad4e),to(#ec971f));background-image:linear-gradient(to bottom,#f0ad4e 0,#ec971f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);background-repeat:repeat-x}.progress-bar-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-o-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9534f),to(#c9302c));background-image:linear-gradient(to bottom,#d9534f 0,#c9302c 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);background-repeat:repeat-x}.progress-bar-striped{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{text-shadow:0 -1px 0 #286090;background-image:-webkit-linear-gradient(top,#337ab7 0,#2b669a 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2b669a 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2b669a));background-image:linear-gradient(to bottom,#337ab7 0,#2b669a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2b669a', GradientType=0);background-repeat:repeat-x;border-color:#2b669a}.list-group-item.active .badge,.list-group-item.active:focus .badge,.list-group-item.active:hover .badge{text-shadow:none}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 1px 2px rgba(0,0,0,.05)}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-repeat:repeat-x}.panel-primary>.panel-heading{background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}.panel-success>.panel-heading{background-image:-webkit-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-o-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#d0e9c6));background-image:linear-gradient(to bottom,#dff0d8 0,#d0e9c6 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);background-repeat:repeat-x}.panel-info>.panel-heading{background-image:-webkit-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-o-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9edf7),to(#c4e3f3));background-image:linear-gradient(to bottom,#d9edf7 0,#c4e3f3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);background-repeat:repeat-x}.panel-warning>.panel-heading{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-o-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf8e3),to(#faf2cc));background-image:linear-gradient(to bottom,#fcf8e3 0,#faf2cc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);background-repeat:repeat-x}.panel-danger>.panel-heading{background-image:-webkit-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-o-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f2dede),to(#ebcccc));background-image:linear-gradient(to bottom,#f2dede 0,#ebcccc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);background-repeat:repeat-x}.well{background-image:-webkit-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#e8e8e8),to(#f5f5f5));background-image:linear-gradient(to bottom,#e8e8e8 0,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);background-repeat:repeat-x;border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1)}
\ No newline at end of file
diff --git a/route/static/bootstrap-3.3.5/css/bootstrap.min.css b/route/static/bootstrap-3.3.5/css/bootstrap.min.css
deleted file mode 100755
index 0336abcd4..000000000
--- a/route/static/bootstrap-3.3.5/css/bootstrap.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
- * Bootstrap v3.3.5 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before,.glyphicon-True:before{content:"\e072"}.glyphicon-pause:before,.glyphicon-False:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:none}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:none}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.33px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:none}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#555;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#fff;background-color:#10952a;border-color:#398439}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#fff;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#20a53a;border-color:#20a53a}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#10952a;border-color:#255625}.btn-success:hover{color:#fff;background-color:#10952a;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#10952a;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#20a53a;border-color:#20a53a}.btn-success .badge{color:#20a53a;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:3;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:2;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#20a53a}.label-success[href]:focus,.label-success[href]:hover{background-color:#10952a}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#20a53a}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.43px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-15px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}
\ No newline at end of file
diff --git a/route/static/bootstrap-3.3.5/css/index.html b/route/static/bootstrap-3.3.5/css/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/bootstrap-3.3.5/css/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.eot b/route/static/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.eot
deleted file mode 100755
index b93a4953fff68df523aa7656497ee339d6026d64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20127
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

diff --git a/route/static/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.svg b/route/static/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.svg
deleted file mode 100755
index f9635d9c1..000000000
--- a/route/static/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"><defs><font horiz-adv-x="1200"><font-face ascent="960" descent="-240" units-per-em="1200"/><missing-glyph horiz-adv-x="500"/><glyph horiz-adv-x="0"/><glyph horiz-adv-x="400"/><glyph unicode="&#x20;"/><glyph d="M600 1100q15 0 34-1.5t30-3.5l11-1q10-2 17.5-10.5t7.5-18.5v-224l158 158q7 7 18 8t19-6l106-106q7-8 6-19t-8-18l-158-158h224q10 0 18.5-7.5t10.5-17.5q6-41 6-75 0-15-1.5-34t-3.5-30l-1-11q-2-10-10.5-17.5t-18.5-7.5h-224l158-158q7-7 8-18t-6-19l-106-106q-8-7-19-6t-18 8l-158 158v-224q0-10-7.5-18.5t-17.5-10.5q-41-6-75-6-15 0-34 1.5t-30 3.5l-11 1q-10 2-17.5 10.5t-7.5 18.5v224l-158-158q-7-7-18-8t-19 6l-106 106q-7 8-6 19t8 18l158 158h-224q-10 0-18.5 7.5t-10.5 17.5q-6 41-6 75 0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7-8 18t6 19l106 106q8 7 19 6t18-8l158-158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z" unicode="&#x2a;"/><glyph d="M450 1100h200q21 0 35.5-14.5t14.5-35.5v-350h350q21 0 35.5-14.5t14.5-35.5v-200q0-21-14.5-35.5t-35.5-14.5h-350v-350q0-21-14.5-35.5t-35.5-14.5h-200q-21 0-35.5 14.5t-14.5 35.5v350h-350q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h350v350q0 21 14.5 35.5t35.5 14.5z" unicode="&#x2b;"/><glyph unicode="&#xa0;"/><glyph d="M825 1100h250q10 0 12.5-5t-5.5-13l-364-364q-6-6-11-18h268q10 0 13-6t-3-14l-120-160q-6-8-18-14t-22-6h-125v-100h275q10 0 13-6t-3-14l-120-160q-6-8-18-14t-22-6h-125v-174q0-11-7.5-18.5t-18.5-7.5h-148q-11 0-18.5 7.5t-7.5 18.5v174h-275q-10 0-13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0-13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12-11 18l-364 364q-8 8-5.5 13t12.5 5h250q25 0 43-18l164-164q8-8 18-8t18 8l164 164q18 18 43 18z" unicode="&#xa5;"/><glyph horiz-adv-x="650" unicode="&#x2000;"/><glyph horiz-adv-x="1300" unicode="&#x2001;"/><glyph horiz-adv-x="650" unicode="&#x2002;"/><glyph horiz-adv-x="1300" unicode="&#x2003;"/><glyph horiz-adv-x="433" unicode="&#x2004;"/><glyph horiz-adv-x="325" unicode="&#x2005;"/><glyph horiz-adv-x="216" unicode="&#x2006;"/><glyph horiz-adv-x="216" unicode="&#x2007;"/><glyph horiz-adv-x="162" unicode="&#x2008;"/><glyph horiz-adv-x="260" unicode="&#x2009;"/><glyph horiz-adv-x="72" unicode="&#x200a;"/><glyph horiz-adv-x="260" unicode="&#x202f;"/><glyph horiz-adv-x="325" unicode="&#x205f;"/><glyph d="M744 1198q242 0 354-189 60-104 66-209h-181q0 45-17.5 82.5t-43.5 61.5-58 40.5-60.5 24-51.5 7.5q-19 0-40.5-5.5t-49.5-20.5-53-38-49-62.5-39-89.5h379l-100-100h-300q-6-50-6-100h406l-100-100h-300q9-74 33-132t52.5-91 61.5-54.5 59-29 47-7.5q22 0 50.5 7.5t60.5 24.5 58 41 43.5 61 17.5 80h174q-30-171-128-278-107-117-274-117-206 0-324 158-36 48-69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z" unicode="&#x20ac;"/><glyph d="M428 1200h350q67 0 120-13t86-31 57-49.5 35-56.5 17-64.5 6.5-60.5.5-57v-16.5-16.5q0-36-.5-57t-6.5-61-17-65-35-57-57-50.5-86-31.5-120-13h-178l-2-100h288q10 0 13-6t-3-14l-120-160q-6-8-18-14t-22-6h-138v-175q0-11-5.5-18t-15.5-7h-149q-10 0-17.5 7.5t-7.5 17.5v175h-267q-10 0-13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0-13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84-22.5 116t-86.5 32h-203z" unicode="&#x20bd;"/><glyph d="M250 700h800q21 0 35.5-14.5t14.5-35.5v-200q0-21-14.5-35.5t-35.5-14.5h-800q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" unicode="&#x2212;"/><glyph d="M1000 1200v-150q0-21-14.5-35.5t-35.5-14.5h-50v-100q0-91-49.5-165.5t-130.5-109.5q81-35 130.5-109.5t49.5-165.5v-150h50q21 0 35.5-14.5t14.5-35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35-130.5 109.5t-49.5 165.5v100h-50q-21 0-35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0-60 32.5-109.5t87.5-73.5q28-12 44-37t16-55-16-55-44-37q-55-24-87.5-73.5t-32.5-109.5v-150h400v150q0 60-32.5 109.5t-87.5 73.5q-28 12-44 37t-16 55 16 55 44 37q55 24 87.5 73.5t32.5 109.5v100h-400z" unicode="&#x231b;"/><glyph d="M0 0z" horiz-adv-x="500" unicode="&#x25fc;"/><glyph d="M503 1089q110 0 200.5-59.5t134.5-156.5q44 14 90 14 120 0 205-86.5t85-206.5q0-121-85-207.5t-205-86.5h-750q-79 0-135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12-2 37 0 153 108 260.5t260 107.5z" unicode="&#x2601;"/><glyph d="M774 1193.5q16-9.5 20.5-27t-5.5-33.5l-136-187 467-746h30q20 0 35-18.5t15-39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746-135 183q-10 16-5.5 34t20.5 28 34 5.5 28-20.5l111-148 112 150q9 16 27 20.5t34-5zM600 200h377l-182 112-195 534v-646z" unicode="&#x26fa;"/><glyph d="M25 1100h1150q10 0 12.5-5t-5.5-13l-564-567q-8-8-18-8t-18 8l-564 567q-8 8-5.5 13t12.5 5zM18 882l264-264q8-8 8-18t-8-18l-264-264q-8-8-13-5.5t-5 12.5v550q0 10 5 12.5t13-5.5zM918 618l264 264q8 8 13 5.5t5-12.5v-550q0-10-5-12.5t-13 5.5l-264 264q-8 8-8 18t8 18zM818 482l364-364q8-8 5.5-13t-12.5-5h-1150q-10 0-12.5 5t5.5 13l364 364q8 8 18 8t18-8l164-164q8-8 18-8t18 8l164 164q8 8 18 8t18-8z" unicode="&#x2709;"/><glyph d="M1011 1210q19 0 33-13l153-153q13-14 13-33t-13-33l-99-92-214 214 95 96q13 14 32 14zM1013 800l-615-614-214 214 614 614zM317 96l-333-112 110 335z" unicode="&#x270f;"/><glyph d="M700 650v-550h250q21 0 35.5-14.5t14.5-35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" unicode="&#xe001;"/><glyph d="M368 1017l645 163q39 15 63 0t24-49v-831q0-55-41.5-95.5t-111.5-63.5q-79-25-147-4.5t-86 75 25.5 111.5 122.5 82q72 24 138 8v521l-600-155v-606q0-42-44-90t-109-69q-79-26-147-5.5t-86 75.5 25.5 111.5 122.5 82.5q72 24 138 7v639q0 38 14.5 59t53.5 34z" unicode="&#xe002;"/><glyph d="M500 1191q100 0 191-39t156.5-104.5 104.5-156.5 39-191l-1-2 1-5q0-141-78-262l275-274q23-26 22.5-44.5t-22.5-42.5l-59-58q-26-20-46.5-20t-39.5 20l-275 274q-119-77-261-77l-5 1-2-1q-100 0-191 39t-156.5 104.5-104.5 156.5-39 191 39 191 104.5 156.5 156.5 104.5 191 39zM500 1022q-88 0-162-43t-117-117-43-162 43-162 117-117 162-43 162 43 117 117 43 162-43 162-117 117-162 43z" unicode="&#xe003;"/><glyph d="M649 949q48 68 109.5 104t121.5 38.5 118.5-20 102.5-64 71-100.5 27-123q0-57-33.5-117.5t-94-124.5-126.5-127.5-150-152.5-146-174q-62 85-145.5 174t-150 152.5-126.5 127.5-93.5 124.5-33.5 117.5q0 64 28 123t73 100.5 104 64 119 20 120.5-38.5 104.5-104z" unicode="&#xe005;"/><glyph d="M407 800l131 353q7 19 17.5 19t17.5-19l129-353h421q21 0 24-8.5t-14-20.5l-342-249 130-401q7-20-.5-25.5t-24.5 6.5l-343 246-342-247q-17-12-24.5-6.5t-.5 25.5l130 400-347 251q-17 12-14 20.5t23 8.5h429z" unicode="&#xe006;"/><glyph d="M407 800l131 353q7 19 17.5 19t17.5-19l129-353h421q21 0 24-8.5t-14-20.5l-342-249 130-401q7-20-.5-25.5t-24.5 6.5l-343 246-342-247q-17-12-24.5-6.5t-.5 25.5l130 400-347 251q-17 12-14 20.5t23 8.5h429zM477 700h-240l197-142-74-226 193 139 195-140-74 229 192 140h-234l-78 211z" unicode="&#xe007;"/><glyph d="M600 1200q124 0 212-88t88-212v-250q0-46-31-98t-69-52v-75q0-10 6-21.5t15-17.5l358-230q9-5 15-16.5t6-21.5v-93q0-10-7.5-17.5t-17.5-7.5h-1150q-10 0-17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0-69 52t-31 98v250q0 124 88 212t212 88z" unicode="&#xe008;"/><glyph d="M25 1100h1150q10 0 17.5-7.5t7.5-17.5v-1050q0-10-7.5-17.5t-17.5-7.5h-1150q-10 0-17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0-17.5-7.5t-7.5-17.5v-350q0-10 7.5-17.5t17.5-7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10-7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0-17.5-7.5t-7.5-17.5v-350q0-10 7.5-17.5t17.5-7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10-7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z" unicode="&#xe009;"/><glyph d="M50 1100h400q21 0 35.5-14.5t14.5-35.5v-400q0-21-14.5-35.5t-35.5-14.5h-400q-21 0-35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5-14.5t14.5-35.5v-400q0-21-14.5-35.5t-35.5-14.5h-400q-21 0-35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5-14.5t14.5-35.5v-400q0-21-14.5-35.5t-35.5-14.5h-400q-21 0-35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5-14.5t14.5-35.5v-400q0-21-14.5-35.5t-35.5-14.5h-400q-21 0-35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe010;"/><glyph d="M50 1100h200q21 0 35.5-14.5t14.5-35.5v-200q0-21-14.5-35.5t-35.5-14.5h-200q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5-14.5t14.5-35.5v-200q0-21-14.5-35.5t-35.5-14.5h-200q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5-14.5t14.5-35.5v-200q0-21-14.5-35.5t-35.5-14.5h-200q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5-14.5t14.5-35.5v-200q0-21-14.5-35.5t-35.5-14.5h-200q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5-14.5t14.5-35.5v-200q0-21-14.5-35.5t-35.5-14.5h-200q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5-14.5t14.5-35.5v-200q0-21-14.5-35.5t-35.5-14.5h-200q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5-14.5t14.5-35.5v-200q0-21-14.5-35.5t-35.5-14.5h-200q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h200q21 0 35.5-14.5t14.5-35.5v-200q0-21-14.5-35.5t-35.5-14.5h-200q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5-14.5t14.5-35.5v-200q0-21-14.5-35.5t-35.5-14.5h-200q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe011;"/><glyph d="M50 1100h200q21 0 35.5-14.5t14.5-35.5v-200q0-21-14.5-35.5t-35.5-14.5h-200q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5-14.5t14.5-35.5v-200q0-21-14.5-35.5t-35.5-14.5h-700q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5-14.5t14.5-35.5v-200q0-21-14.5-35.5t-35.5-14.5h-200q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5-14.5t14.5-35.5v-200q0-21-14.5-35.5t-35.5-14.5h-700q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5-14.5t14.5-35.5v-200q0-21-14.5-35.5t-35.5-14.5h-200q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5-14.5t14.5-35.5v-200q0-21-14.5-35.5t-35.5-14.5h-700q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe012;"/><glyph d="M465 477l571 571q8 8 18 8t17-8l177-177q8-7 8-17t-8-18l-783-784q-7-8-17.5-8t-17.5 8l-384 384q-8 8-8 18t8 17l177 177q7 8 17 8t18-8l171-171q7-7 18-7t18 7z" unicode="&#xe013;"/><glyph d="M904 1083l178-179q8-8 8-18.5t-8-17.5l-267-268 267-268q8-7 8-17.5t-8-18.5l-178-178q-8-8-18.5-8t-17.5 8l-268 267-268-267q-7-8-17.5-8t-18.5 8l-178 178q-8 8-8 18.5t8 17.5l267 268-267 268q-8 7-8 17.5t8 18.5l178 178q8 8 18.5 8t17.5-8l268-267 268 268q7 7 17.5 7t18.5-7z" unicode="&#xe014;"/><glyph d="M507 1177q98 0 187.5-38.5t154.5-103.5 103.5-154.5 38.5-187.5q0-141-78-262l300-299q8-8 8-18.5t-8-18.5l-109-108q-7-8-17.5-8t-18.5 8l-300 299q-119-77-261-77-98 0-188 38.5t-154.5 103-103 154.5-38.5 188 38.5 187.5 103 154.5 154.5 103.5 188 38.5zM506.5 1023q-89.5 0-165.5-44t-120-120.5-44-166 44-165.5 120-120 165.5-44 166 44 120.5 120 44 165.5-44 166-120.5 120.5-166 44zM425 900h150q10 0 17.5-7.5t7.5-17.5v-75h75q10 0 17.5-7.5t7.5-17.5v-150q0-10-7.5-17.5t-17.5-7.5h-75v-75q0-10-7.5-17.5t-17.5-7.5h-150q-10 0-17.5 7.5t-7.5 17.5v75h-75q-10 0-17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z" unicode="&#xe015;"/><glyph d="M507 1177q98 0 187.5-38.5t154.5-103.5 103.5-154.5 38.5-187.5q0-141-78-262l300-299q8-8 8-18.5t-8-18.5l-109-108q-7-8-17.5-8t-18.5 8l-300 299q-119-77-261-77-98 0-188 38.5t-154.5 103-103 154.5-38.5 188 38.5 187.5 103 154.5 154.5 103.5 188 38.5zM506.5 1023q-89.5 0-165.5-44t-120-120.5-44-166 44-165.5 120-120 165.5-44 166 44 120.5 120 44 165.5-44 166-120.5 120.5-166 44zM325 800h350q10 0 17.5-7.5t7.5-17.5v-150q0-10-7.5-17.5t-17.5-7.5h-350q-10 0-17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" unicode="&#xe016;"/><glyph d="M550 1200h100q21 0 35.5-14.5t14.5-35.5v-400q0-21-14.5-35.5t-35.5-14.5h-100q-21 0-35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167-62 272-209.5t105-331.5q0-117-45.5-224t-123-184.5-184.5-123-224-45.5-224 45.5-184.5 123-123 184.5-45.5 224q0 184 105 331.5t272 209.5v-166q-103-55-165-155t-62-220q0-116 57-214.5t155.5-155.5 214.5-57 214.5 57 155.5 155.5 57 214.5q0 120-62 220t-165 155z" unicode="&#xe017;"/><glyph d="M1025 1200h150q10 0 17.5-7.5t7.5-17.5v-1150q0-10-7.5-17.5t-17.5-7.5h-150q-10 0-17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5-7.5t7.5-17.5v-750q0-10-7.5-17.5t-17.5-7.5h-150q-10 0-17.5 7.5t-7.5 17.5v750q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5-7.5t7.5-17.5v-450q0-10-7.5-17.5t-17.5-7.5h-150q-10 0-17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5-7.5t7.5-17.5v-250q0-10-7.5-17.5t-17.5-7.5h-150q-10 0-17.5 7.5t-7.5 17.5v250q0 10 7.5 17.5t17.5 7.5z" unicode="&#xe018;"/><glyph d="M600 1174q33 0 74-5l38-152 5-1q49-14 94-39l5-2 134 80q61-48 104-105l-80-134 3-5q25-44 39-93l1-6 152-38q5-43 5-73 0-34-5-74l-152-38-1-6q-15-49-39-93l-3-5 80-134q-48-61-104-105l-134 81-5-3q-44-25-94-39l-5-2-38-151q-43-5-74-5-33 0-74 5l-38 151-5 2q-49 14-94 39l-5 3-134-81q-60 48-104 105l80 134-3 5q-25 45-38 93l-2 6-151 38q-6 42-6 74 0 33 6 73l151 38 2 6q13 48 38 93l3 5-80 134q47 61 105 105l133-80 5 2q45 25 94 39l5 1 38 152q43 5 74 5zM600 815q-89 0-152-63t-63-151.5 63-151.5 152-63 152 63 63 151.5-63 151.5-152 63z" unicode="&#xe019;"/><glyph d="M500 1300h300q41 0 70.5-29.5t29.5-70.5v-100h275q10 0 17.5-7.5t7.5-17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0-41-29.5-70.5t-70.5-29.5h-700q-41 0-70.5 29.5t-29.5 70.5v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z" unicode="&#xe020;"/><glyph d="M18 618l620 608q8 7 18.5 7t17.5-7l608-608q8-8 5.5-13t-12.5-5h-175v-575q0-10-7.5-17.5t-17.5-7.5h-250q-10 0-17.5 7.5t-7.5 17.5v375h-300v-375q0-10-7.5-17.5t-17.5-7.5h-250q-10 0-17.5 7.5t-7.5 17.5v575h-175q-10 0-12.5 5t5.5 13z" unicode="&#xe021;"/><glyph d="M600 1200v-400q0-41 29.5-70.5t70.5-29.5h300v-650q0-21-14.5-35.5t-35.5-14.5h-800q-21 0-35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0-35.5 14.5t-14.5 35.5v250z" unicode="&#xe022;"/><glyph d="M600 1177q117 0 224-45.5t184.5-123 123-184.5 45.5-224-45.5-224-123-184.5-184.5-123-224-45.5-224 45.5-184.5 123-123 184.5-45.5 224 45.5 224 123 184.5 184.5 123 224 45.5zM600 1027q-116 0-214.5-57t-155.5-155.5-57-214.5 57-214.5 155.5-155.5 214.5-57 214.5 57 155.5 155.5 57 214.5-57 214.5-155.5 155.5-214.5 57zM525 900h50q10 0 17.5-7.5t7.5-17.5v-275h175q10 0 17.5-7.5t7.5-17.5v-50q0-10-7.5-17.5t-17.5-7.5h-250q-10 0-17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z" unicode="&#xe023;"/><glyph d="M1300 0h-538l-41 400h-242l-41-400h-538l431 1200h209l-21-300h162l-20 300h208zM515 800l-27-300h224l-27 300h-170z" unicode="&#xe024;"/><glyph d="M550 1200h200q21 0 35.5-14.5t14.5-35.5v-450h191q20 0 25.5-11.5t-7.5-27.5l-327-400q-13-16-32-16t-32 16l-327 400q-13 16-7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5-7.5t7.5-17.5v-350q0-10-7.5-17.5t-17.5-7.5h-1050q-10 0-17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5-7.5t7.5-17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" unicode="&#xe025;"/><glyph d="M600 1177q117 0 224-45.5t184.5-123 123-184.5 45.5-224-45.5-224-123-184.5-184.5-123-224-45.5-224 45.5-184.5 123-123 184.5-45.5 224 45.5 224 123 184.5 184.5 123 224 45.5zM600 1027q-116 0-214.5-57t-155.5-155.5-57-214.5 57-214.5 155.5-155.5 214.5-57 214.5 57 155.5 155.5 57 214.5-57 214.5-155.5 155.5-214.5 57zM525 900h150q10 0 17.5-7.5t7.5-17.5v-275h137q21 0 26-11.5t-8-27.5l-223-275q-13-16-32-16t-32 16l-223 275q-13 16-8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" unicode="&#xe026;"/><glyph d="M600 1177q117 0 224-45.5t184.5-123 123-184.5 45.5-224-45.5-224-123-184.5-184.5-123-224-45.5-224 45.5-184.5 123-123 184.5-45.5 224 45.5 224 123 184.5 184.5 123 224 45.5zM600 1027q-116 0-214.5-57t-155.5-155.5-57-214.5 57-214.5 155.5-155.5 214.5-57 214.5 57 155.5 155.5 57 214.5-57 214.5-155.5 155.5-214.5 57zM632 914l223-275q13-16 8-27.5t-26-11.5h-137v-275q0-10-7.5-17.5t-17.5-7.5h-150q-10 0-17.5 7.5t-7.5 17.5v275h-137q-21 0-26 11.5t8 27.5l223 275q13 16 32 16t32-16z" unicode="&#xe027;"/><glyph d="M225 1200h750q10 0 19.5-7t12.5-17l186-652q7-24 7-49v-425q0-12-4-27t-9-17q-12-6-37-6h-1100q-12 0-27 4t-17 8q-6 13-6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0-19-7t-11-18l-87-450q-2-11 4-18t16-7h150q10 0 19.5-7t11.5-17l38-152q2-10 11.5-17t19.5-7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11-11 18t-19 7z" unicode="&#xe028;"/><glyph d="M600 1177q117 0 224-45.5t184.5-123 123-184.5 45.5-224-45.5-224-123-184.5-184.5-123-224-45.5-224 45.5-184.5 123-123 184.5-45.5 224 45.5 224 123 184.5 184.5 123 224 45.5zM600 1027q-116 0-214.5-57t-155.5-155.5-57-214.5 57-214.5 155.5-155.5 214.5-57 214.5 57 155.5 155.5 57 214.5-57 214.5-155.5 155.5-214.5 57zM540 820l253-190q17-12 17-30t-17-30l-253-190q-16-12-28-6.5t-12 26.5v400q0 21 12 26.5t28-6.5z" unicode="&#xe029;"/><glyph d="M947 1060l135 135q7 7 12.5 5t5.5-13v-362q0-10-7.5-17.5t-17.5-7.5h-362q-11 0-13 5.5t5 12.5l133 133q-109 76-238 76-116 0-214.5-57t-155.5-155.5-57-214.5 57-214.5 155.5-155.5 214.5-57 214.5 57 155.5 155.5 57 214.5h150q0-117-45.5-224t-123-184.5-184.5-123-224-45.5-224 45.5-184.5 123-123 184.5-45.5 224 45.5 224 123 184.5 184.5 123 224 45.5q192 0 347-117z" unicode="&#xe030;"/><glyph d="M947 1060l135 135q7 7 12.5 5t5.5-13v-361q0-11-7.5-18.5t-18.5-7.5h-361q-11 0-13 5.5t5 12.5l134 134q-110 75-239 75-116 0-214.5-57t-155.5-155.5-57-214.5h-150q0 117 45.5 224t123 184.5 184.5 123 224 45.5q192 0 347-117zM1027 600h150q0-117-45.5-224t-123-184.5-184.5-123-224-45.5q-192 0-348 118l-134-134q-7-8-12.5-5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5-5.5t-5.5-12.5l-133-133q110-76 240-76 116 0 214.5 57t155.5 155.5 57 214.5z" unicode="&#xe031;"/><glyph d="M125 1200h1050q10 0 17.5-7.5t7.5-17.5v-1150q0-10-7.5-17.5t-17.5-7.5h-1050q-10 0-17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0-17.5-7.5t-7.5-17.5v-850q0-10 7.5-17.5t17.5-7.5h850q10 0 17.5 7.5t7.5 17.5v850q0 10-7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5-7.5t7.5-17.5v-50q0-10-7.5-17.5t-17.5-7.5h-50q-10 0-17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5-7.5t7.5-17.5v-50q0-10-7.5-17.5t-17.5-7.5h-450q-10 0-17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5-7.5t7.5-17.5v-50q0-10-7.5-17.5t-17.5-7.5h-50q-10 0-17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5-7.5t7.5-17.5v-50q0-10-7.5-17.5t-17.5-7.5h-450q-10 0-17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5-7.5t7.5-17.5v-50q0-10-7.5-17.5t-17.5-7.5h-50q-10 0-17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5-7.5t7.5-17.5v-50q0-10-7.5-17.5t-17.5-7.5h-450q-10 0-17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5-7.5t7.5-17.5v-50q0-10-7.5-17.5t-17.5-7.5h-50q-10 0-17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5-7.5t7.5-17.5v-50q0-10-7.5-17.5t-17.5-7.5h-450q-10 0-17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5z" unicode="&#xe032;"/><glyph d="M900 800v200q0 83-58.5 141.5t-141.5 58.5h-300q-82 0-141-59t-59-141v-200h-100q-41 0-70.5-29.5t-29.5-70.5v-600q0-41 29.5-70.5t70.5-29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41-29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200q20 0 35-14.5t15-35.5v-150h-300z" unicode="&#xe033;"/><glyph d="M125 1100h50q10 0 17.5-7.5t7.5-17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9-2 16-6 16-23v-421q0-6-3-12-33-59-66.5-99t-65.5-58-56.5-24.5-52.5-6.5q-26 0-57.5 6.5t-52.5 13.5-60 21q-41 15-63 22.5t-57.5 15-65.5 7.5q-85 0-160-57-7-5-15-5-6 0-11 3-14 7-14 22v438q22 55 82 98.5t119 46.5q23 2 43 .5t43-7 32.5-8.5 38-13 32.5-11q41-14 63.5-21t57-14 63.5-7q103 0 183 87 7 8 18 8z" unicode="&#xe034;"/><glyph d="M600 1175q116 0 227-49.5t192.5-131 131-192.5 49.5-227v-300q0-10-7.5-17.5t-17.5-7.5h-50q-10 0-17.5 7.5t-7.5 17.5v300q0 127-70.5 231.5t-184.5 161.5-245 57-245-57-184.5-161.5-70.5-231.5v-300q0-10-7.5-17.5t-17.5-7.5h-50q-10 0-17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5 192.5 131 227 49.5zM220 500h160q8 0 14-6t6-14v-460q0-8-6-14t-14-6h-160q-8 0-14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14-6t6-14v-460q0-8-6-14t-14-6h-160q-8 0-14 6t-6 14v460q0 8 6 14t14 6z" unicode="&#xe035;"/><glyph d="M321 814l258 172q9 6 15 2.5t6-13.5v-750q0-10-6-13.5t-15 2.5l-258 172q-21 14-46 14h-250q-10 0-17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17-7l34-34q7-7 7-17t-7-17l-120-120 120-120q7-7 7-17t-7-17l-34-34q-7-7-17-7t-17 7l-120 119-120-119q-7-7-17-7t-17 7l-34 34q-7 7-7 17t7 17l119 120-119 120q-7 7-7 17t7 17l34 34q7 8 17 8t17-8z" unicode="&#xe036;"/><glyph d="M321 814l258 172q9 6 15 2.5t6-13.5v-750q0-10-6-13.5t-15 2.5l-258 172q-21 14-46 14h-250q-10 0-17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10-1 16-10 96-129 96-290 0-154-90-281-6-9-17-10l-3-1q-9 0-16 6l-29 23q-7 7-8.5 16.5t4.5 17.5q72 103 72 229 0 132-78 238-6 8-4.5 18t9.5 17l29 22q7 5 15 5z" unicode="&#xe037;"/><glyph d="M967 1004h3q11-1 17-10 135-179 135-396 0-105-34-206.5t-98-185.5q-7-9-17-10h-3q-9 0-16 6l-42 34q-8 6-9 16t5 18q111 150 111 328 0 90-29.5 176t-84.5 157q-6 9-5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6-13.5v-750q0-10-6-13.5t-15 2.5l-258 172q-21 14-46 14h-250q-10 0-17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10-1 16-10 96-129 96-290 0-154-90-281-6-9-17-10l-3-1q-9 0-16 6l-29 23q-7 7-8.5 16.5t4.5 17.5q72 103 72 229 0 132-78 238-6 8-4.5 18.5t9.5 16.5l29 22q7 5 15 5z" unicode="&#xe038;"/><glyph d="M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z" unicode="&#xe039;"/><glyph d="M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z" unicode="&#xe040;"/><glyph d="M500 1200l682-682q8-8 8-18t-8-18l-464-464q-8-8-18-8t-18 8l-682 682 1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5-71 29.5t-71-29.5-29.5-71.5 29.5-71.5 71-29.5 71 29.5 29.5 71.5-29.5 71.5z" unicode="&#xe041;"/><glyph d="M500 1200l682-682q8-8 8-18t-8-18l-464-464q-8-8-18-8t-18 8l-682 682 1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682-682q8-8 8-18t-8-18l-464-464q-8-8-18-8t-18 8l-56 56 424 426-700 700h150zM319.5 1024.5q-29.5 29.5-71 29.5t-71-29.5-29.5-71.5 29.5-71.5 71-29.5 71 29.5 29.5 71.5-29.5 71.5z" unicode="&#xe042;"/><glyph d="M300 1200h825q75 0 75-75v-900q0-25-18-43l-64-64q-8-8-13-5.5t-5 12.5v950q0 10-7.5 17.5t-17.5 7.5h-700q-25 0-43-18l-64-64q-8-8-5.5-13t12.5-5h700q10 0 17.5-7.5t7.5-17.5v-950q0-10-7.5-17.5t-17.5-7.5h-850q-10 0-17.5 7.5t-7.5 17.5v975q0 25 18 43l139 139q18 18 43 18z" unicode="&#xe043;"/><glyph d="M250 1200h800q21 0 35.5-14.5t14.5-35.5v-1150l-450 444-450-445v1151q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe044;"/><glyph d="M822 1200h-444q-11 0-19-7.5t-9-17.5l-78-301q-7-24 7-45l57-108q6-9 17.5-15t21.5-6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10-9 17.5t-19 7.5zM1175 800h-150q-10 0-21-6.5t-15-15.5l-78-156q-4-9-15-15.5t-21-6.5h-550q-10 0-21 6.5t-15 15.5l-78 156q-4 9-15 15.5t-21 6.5h-150q-10 0-17.5-7.5t-7.5-17.5v-650q0-10 7.5-17.5t17.5-7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5-7.5t7.5-17.5v-150q0-10 7.5-17.5t17.5-7.5h150q10 0 17.5 7.5t7.5 17.5v650q0 10-7.5 17.5t-17.5 7.5zM850 200h-500q-10 0-19.5-7t-11.5-17l-38-152q-2-10 3.5-17t15.5-7h600q10 0 15.5 7t3.5 17l-38 152q-2 10-11.5 17t-19.5 7z" unicode="&#xe045;"/><glyph d="M500 1100h200q56 0 102.5-20.5t72.5-50 44-59 25-50.5l6-20h150q41 0 70.5-29.5t29.5-70.5v-600q0-41-29.5-70.5t-70.5-29.5h-1000q-41 0-70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48 45 61 72 48 102.5 21.5zM900 800v-100h100v100h-100zM600 730q-95 0-162.5-67.5t-67.5-162.5 67.5-162.5 162.5-67.5 162.5 67.5 67.5 162.5-67.5 162.5-162.5 67.5zM600 603q43 0 73-30t30-73-30-73-73-30-73 30-30 73 30 73 73 30z" unicode="&#xe046;"/><glyph d="M681 1199l385-998q20-50 60-92 18-19 36.5-29.5t27.5-11.5l10-2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58-145-92-234-11-34-6.5-57t25.5-37 46-20 55-6v-66h-365v66q56 24 84 52 12 12 25 30.5t20 31.5l7 13 399 1006h93zM416 521h340l-162 457z" unicode="&#xe047;"/><glyph d="M753 641q5-1 14.5-4.5t36-15.5 50.5-26.5 53.5-40 50.5-54.5 35.5-70 14.5-87q0-67-27.5-125.5t-71.5-97.5-98.5-66.5-108.5-40.5-102-13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24-.5 34t-3.5 24-8.5 19.5-17 13.5-28 12.5-42.5 11.5v71l471-1q57 0 115.5-20.5t108-57 80.5-94 31-124.5q0-51-15.5-96.5t-38-74.5-45-50.5-38.5-30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41-8.5 70.5t-29.5 55.5-62.5 39.5-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90-62.5 154.5t-156.5 64.5h-159v-400z" unicode="&#xe048;"/><glyph d="M877 1200l2-57q-83-19-116-45.5t-40-66.5l-132-839q-9-49 13-69t96-26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5-9 17.5-13.5 12.5-21.5 10-26 8.5-33.5 10q-13 3-19 5v57h425z" unicode="&#xe049;"/><glyph d="M1300 900h-50q0 21-4 37t-9.5 26.5-18 17.5-22 11-28.5 5.5-31 2-37 .5h-200v-850q0-22 25-34.5t50-13.5l25-2v-100h-400v100q4 0 11 .5t24 3 30 7 24 15 11 24.5v850h-200q-25 0-37-.5t-31-2-28.5-5.5-22-11-18-17.5-9.5-26.5-4-37h-50v300h1000v-300zM175 1000h-75v-800h75l-125-167-125 167h75v800h-75l125 167z" unicode="&#xe050;"/><glyph d="M1100 900h-50q0 21-4 37t-9.5 26.5-18 17.5-22 11-28.5 5.5-31 2-37 .5h-200v-650q0-22 25-34.5t50-13.5l25-2v-100h-400v100q4 0 11 .5t24 3 30 7 24 15 11 24.5v650h-200q-25 0-37-.5t-31-2-28.5-5.5-22-11-18-17.5-9.5-26.5-4-37h-50v300h1000v-300zM1167 50l-167-125v75h-800v-75l-167 125 167 125v-75h800v75z" unicode="&#xe051;"/><glyph d="M50 1100h600q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-600q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-1000q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-800q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-1100q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe052;"/><glyph d="M250 1100h700q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-700q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-1100q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-700q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-1100q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe053;"/><glyph d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-600q-21 0-35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-1000q-21 0-35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-800q-21 0-35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-1100q-21 0-35.5 14.5t-14.5 35.5z" unicode="&#xe054;"/><glyph d="M50 1100h1100q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-1100q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-1100q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-1100q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-1100q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe055;"/><glyph d="M50 1100h100q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-100q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-800q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-100q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-800q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-100q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-800q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-100q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200h800q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-800q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe056;"/><glyph d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-100q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-500q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167-125v75h-200v100h200v75zM550 500h300q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-300q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-600q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe057;"/><glyph d="M50 1100h100q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-100q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-500q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125 167 125v-75zM50 500h300q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-300q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-600q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe058;"/><glyph d="M75 1000h750q31 0 53-22t22-53v-650q0-31-22-53t-53-22h-750q-31 0-53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300 300 300v-600z" unicode="&#xe059;"/><glyph d="M44 1100h1112q18 0 31-13t13-31v-1012q0-18-13-31t-31-13h-1112q-18 0-31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182 298-131-74 156 293 318 236-288v500h-1000zM342 884q56 0 95-39t39-94.5-39-95-95-39.5-95 39.5-39 95 39 94.5 95 39z" unicode="&#xe060;"/><glyph d="M648 1169q117 0 216-60t156.5-161 57.5-218q0-115-70-258-69-109-158-225.5t-143-179.5l-54-62q-9 8-25.5 24.5t-63.5 67.5-91 103-98.5 128-95.5 148q-60 132-60 249 0 88 34 169.5t91.5 142 137 96.5 166.5 36zM652.5 974q-91.5 0-156.5-65t-65-157 65-156.5 156.5-64.5 156.5 64.5 65 156.5-65 157-156.5 65z" unicode="&#xe062;"/><glyph d="M600 1177q117 0 224-45.5t184.5-123 123-184.5 45.5-224-45.5-224-123-184.5-184.5-123-224-45.5-224 45.5-184.5 123-123 184.5-45.5 224 45.5 224 123 184.5 184.5 123 224 45.5zM600 173v854q-116 0-214.5-57t-155.5-155.5-57-214.5 57-214.5 155.5-155.5 214.5-57z" unicode="&#xe063;"/><glyph d="M554 1295q21-72 57.5-143.5t76-130 83-118 82.5-117 70-116 49.5-126 18.5-136.5q0-71-25.5-135t-68.5-111-99-82-118.5-54-125.5-23q-84 5-161.5 34t-139.5 78.5-99 125-37 164.5q0 69 18 136.5t49.5 126.5 69.5 116.5 81.5 117.5 83.5 119 76.5 131 58.5 143zM344 710q-23-33-43.5-70.5t-40.5-102.5-17-123q1-37 14.5-69.5t30-52 41-37 38.5-24.5 33-15q21-7 32-1t13 22l6 34q2 10-2.5 22t-13.5 19q-5 4-14 12t-29.5 40.5-32.5 73.5q-26 89 6 271 2 11-6 11-8 1-15-10z" unicode="&#xe064;"/><glyph d="M1000 1013l108 115q2 1 5 2t13 2 20.5-1 25-9.5 28.5-21.5q22-22 27-43t0-32l-6-10-108-115zM350 1100h400q50 0 105-13l-187-187h-368q-41 0-70.5-29.5t-29.5-70.5v-500q0-41 29.5-70.5t70.5-29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332q0-165-93.5-257.5t-256.5-92.5h-400q-165 0-257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362-362-161-50 55 170 355 355z" unicode="&#xe065;"/><glyph d="M350 1100h361q-164-146-216-200h-195q-41 0-70.5-29.5t-29.5-70.5v-500q0-41 29.5-70.5t70.5-29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0-165-92.5-257.5t-257.5-92.5h-400q-165 0-257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM824 1073l339-301q8-7 8-17.5t-8-17.5l-340-306q-7-6-12.5-4t-6.5 11v203q-26 1-54.5 0t-78.5-7.5-92-17.5-86-35-70-57q10 59 33 108t51.5 81.5 65 58.5 68.5 40.5 67 24.5 56 13.5 40 4.5v210q1 10 6.5 12.5t13.5-4.5z" unicode="&#xe066;"/><glyph d="M350 1100h350q60 0 127-23l-178-177h-349q-41 0-70.5-29.5t-29.5-70.5v-500q0-41 29.5-70.5t70.5-29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0-165-92.5-257.5t-257.5-92.5h-400q-165 0-257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM643 639l395 395q7 7 17.5 7t17.5-7l101-101q7-7 7-17.5t-7-17.5l-531-532q-7-7-17.5-7t-17.5 7l-248 248q-7 7-7 17.5t7 17.5l101 101q7 7 17.5 7t17.5-7l111-111q8-7 18-7t18 7z" unicode="&#xe067;"/><glyph d="M318 918l264 264q8 8 18 8t18-8l260-264q7-8 4.5-13t-12.5-5h-170v-200h200v173q0 10 5 12t13-5l264-260q8-7 8-17.5t-8-17.5l-264-265q-8-7-13-5t-5 12v173h-200v-200h170q10 0 12.5-5t-4.5-13l-260-264q-8-8-18-8t-18 8l-264 264q-8 8-5.5 13t12.5 5h175v200h-200v-173q0-10-5-12t-13 5l-264 265q-8 7-8 17.5t8 17.5l264 260q8 7 13 5t5-12v-173h200v200h-175q-10 0-12.5 5t5.5 13z" unicode="&#xe068;"/><glyph d="M250 1100h100q21 0 35.5-14.5t14.5-35.5v-438l464 453q15 14 25.5 10t10.5-25v-1000q0-21-10.5-25t-25.5 10l-464 453v-438q0-21-14.5-35.5t-35.5-14.5h-100q-21 0-35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe069;"/><glyph d="M50 1100h100q21 0 35.5-14.5t14.5-35.5v-438l464 453q15 14 25.5 10t10.5-25v-438l464 453q15 14 25.5 10t10.5-25v-1000q0-21-10.5-25t-25.5 10l-464 453v-438q0-21-10.5-25t-25.5 10l-464 453v-438q0-21-14.5-35.5t-35.5-14.5h-100q-21 0-35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe070;"/><glyph d="M1200 1050v-1000q0-21-10.5-25t-25.5 10l-464 453v-438q0-21-10.5-25t-25.5 10l-492 480q-15 14-15 35t15 35l492 480q15 14 25.5 10t10.5-25v-438l464 453q15 14 25.5 10t10.5-25z" unicode="&#xe071;"/><glyph d="M243 1074l814-498q18-11 18-26t-18-26l-814-498q-18-11-30.5-4t-12.5 28v1000q0 21 12.5 28t30.5-4z" unicode="&#xe072;"/><glyph d="M250 1000h200q21 0 35.5-14.5t14.5-35.5v-800q0-21-14.5-35.5t-35.5-14.5h-200q-21 0-35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5-14.5t14.5-35.5v-800q0-21-14.5-35.5t-35.5-14.5h-200q-21 0-35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe073;"/><glyph d="M1100 950v-800q0-21-14.5-35.5t-35.5-14.5h-800q-21 0-35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5-14.5t14.5-35.5z" unicode="&#xe074;"/><glyph d="M500 612v438q0 21 10.5 25t25.5-10l492-480q15-14 15-35t-15-35l-492-480q-15-14-25.5-10t-10.5 25v438l-464-453q-15-14-25.5-10t-10.5 25v1000q0 21 10.5 25t25.5-10z" unicode="&#xe075;"/><glyph d="M1048 1102l100 1q20 0 35-14.5t15-35.5l5-1000q0-21-14.5-35.5t-35.5-14.5l-100-1q-21 0-35.5 14.5t-14.5 35.5l-2 437-463-454q-14-15-24.5-10.5t-10.5 25.5l-2 437-462-455q-15-14-25.5-9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5-10.5l466-450-2 438q0 20 10.5 24.5t25.5-9.5l466-451-2 438q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe076;"/><glyph d="M850 1100h100q21 0 35.5-14.5t14.5-35.5v-1000q0-21-14.5-35.5t-35.5-14.5h-100q-21 0-35.5 14.5t-14.5 35.5v438l-464-453q-15-14-25.5-10t-10.5 25v1000q0 21 10.5 25t25.5-10l464-453v438q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe077;"/><glyph d="M686 1081l501-540q15-15 10.5-26t-26.5-11h-1042q-22 0-26.5 11t10.5 26l501 540q15 15 36 15t36-15zM150 400h1000q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-1000q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe078;"/><glyph d="M885 900l-352-353 352-353-197-198-552 552 552 550z" unicode="&#xe079;"/><glyph d="M1064 547l-551-551-198 198 353 353-353 353 198 198z" unicode="&#xe080;"/><glyph d="M600 1177q117 0 224-45.5t184.5-123 123-184.5 45.5-224-45.5-224-123-184.5-184.5-123-224-45.5-224 45.5-184.5 123-123 184.5-45.5 224 45.5 224 123 184.5 184.5 123 224 45.5zM650 900h-100q-21 0-35.5-14.5t-14.5-35.5v-150h-150q-21 0-35.5-14.5t-14.5-35.5v-100q0-21 14.5-35.5t35.5-14.5h150v-150q0-21 14.5-35.5t35.5-14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21-14.5 35.5t-35.5 14.5h-150v150q0 21-14.5 35.5t-35.5 14.5z" unicode="&#xe081;"/><glyph d="M600 1177q117 0 224-45.5t184.5-123 123-184.5 45.5-224-45.5-224-123-184.5-184.5-123-224-45.5-224 45.5-184.5 123-123 184.5-45.5 224 45.5 224 123 184.5 184.5 123 224 45.5zM850 700h-500q-21 0-35.5-14.5t-14.5-35.5v-100q0-21 14.5-35.5t35.5-14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21-14.5 35.5t-35.5 14.5z" unicode="&#xe082;"/><glyph d="M600 1177q117 0 224-45.5t184.5-123 123-184.5 45.5-224-45.5-224-123-184.5-184.5-123-224-45.5-224 45.5-184.5 123-123 184.5-45.5 224 45.5 224 123 184.5 184.5 123 224 45.5zM741.5 913q-12.5 0-21.5-9l-120-120-120 120q-9 9-21.5 9t-21.5-9l-141-141q-9-9-9-21.5t9-21.5l120-120-120-120q-9-9-9-21.5t9-21.5l141-141q9-9 21.5-9t21.5 9l120 120 120-120q9-9 21.5-9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120 120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9-21.5 9z" unicode="&#xe083;"/><glyph d="M600 1177q117 0 224-45.5t184.5-123 123-184.5 45.5-224-45.5-224-123-184.5-184.5-123-224-45.5-224 45.5-184.5 123-123 184.5-45.5 224 45.5 224 123 184.5 184.5 123 224 45.5zM546 623l-84 85q-7 7-17.5 7t-18.5-7l-139-139q-7-8-7-18t7-18l242-241q7-8 17.5-8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7-17.5 7t-17.5-7z" unicode="&#xe084;"/><glyph d="M600 1177q117 0 224-45.5t184.5-123 123-184.5 45.5-224-45.5-224-123-184.5-184.5-123-224-45.5-224 45.5-184.5 123-123 184.5-45.5 224 45.5 224 123 184.5 184.5 123 224 45.5zM588 941q-29 0-59-5.5t-63-20.5-58-38.5-41.5-63-16.5-89.5q0-25 20-25h131q30-5 35 11 6 20 20.5 28t45.5 8q20 0 31.5-10.5t11.5-28.5q0-23-7-34t-26-18q-1 0-13.5-4t-19.5-7.5-20-10.5-22-17-18.5-24-15.5-35-8-46q-1-8 5.5-16.5t20.5-8.5h173q7 0 22 8t35 28 37.5 48 29.5 74 12 100q0 47-17 83t-42.5 57-59.5 34.5-64 18-59 4.5zM675 400h-150q-10 0-17.5-7.5t-7.5-17.5v-150q0-10 7.5-17.5t17.5-7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10-7.5 17.5t-17.5 7.5z" unicode="&#xe085;"/><glyph d="M600 1177q117 0 224-45.5t184.5-123 123-184.5 45.5-224-45.5-224-123-184.5-184.5-123-224-45.5-224 45.5-184.5 123-123 184.5-45.5 224 45.5 224 123 184.5 184.5 123 224 45.5zM675 1000h-150q-10 0-17.5-7.5t-7.5-17.5v-150q0-10 7.5-17.5t17.5-7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10-7.5 17.5t-17.5 7.5zM675 700h-250q-10 0-17.5-7.5t-7.5-17.5v-50q0-10 7.5-17.5t17.5-7.5h75v-200h-75q-10 0-17.5-7.5t-7.5-17.5v-50q0-10 7.5-17.5t17.5-7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10-7.5 17.5t-17.5 7.5h-75v275q0 10-7.5 17.5t-17.5 7.5z" unicode="&#xe086;"/><glyph d="M525 1200h150q10 0 17.5-7.5t7.5-17.5v-194q103-27 178.5-102.5t102.5-178.5h194q10 0 17.5-7.5t7.5-17.5v-150q0-10-7.5-17.5t-17.5-7.5h-194q-27-103-102.5-178.5t-178.5-102.5v-194q0-10-7.5-17.5t-17.5-7.5h-150q-10 0-17.5 7.5t-7.5 17.5v194q-103 27-178.5 102.5t-102.5 178.5h-194q-10 0-17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0-10-7.5-17.5t-17.5-7.5h-150q-10 0-17.5 7.5t-7.5 17.5v168q-68-23-119-74t-74-119h168q10 0 17.5-7.5t7.5-17.5v-150q0-10-7.5-17.5t-17.5-7.5h-168q23-68 74-119t119-74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5-7.5t7.5-17.5v-168q68 23 119 74t74 119h-168q-10 0-17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168q-23 68-74 119t-119 74z" unicode="&#xe087;"/><glyph d="M600 1177q117 0 224-45.5t184.5-123 123-184.5 45.5-224-45.5-224-123-184.5-184.5-123-224-45.5-224 45.5-184.5 123-123 184.5-45.5 224 45.5 224 123 184.5 184.5 123 224 45.5zM600 1027q-116 0-214.5-57t-155.5-155.5-57-214.5 57-214.5 155.5-155.5 214.5-57 214.5 57 155.5 155.5 57 214.5-57 214.5-155.5 155.5-214.5 57zM759 823l64-64q7-7 7-17.5t-7-17.5l-124-124 124-124q7-7 7-17.5t-7-17.5l-64-64q-7-7-17.5-7t-17.5 7l-124 124-124-124q-7-7-17.5-7t-17.5 7l-64 64q-7 7-7 17.5t7 17.5l124 124-124 124q-7 7-7 17.5t7 17.5l64 64q7 7 17.5 7t17.5-7l124-124 124 124q7 7 17.5 7t17.5-7z" unicode="&#xe088;"/><glyph d="M600 1177q117 0 224-45.5t184.5-123 123-184.5 45.5-224-45.5-224-123-184.5-184.5-123-224-45.5-224 45.5-184.5 123-123 184.5-45.5 224 45.5 224 123 184.5 184.5 123 224 45.5zM600 1027q-116 0-214.5-57t-155.5-155.5-57-214.5 57-214.5 155.5-155.5 214.5-57 214.5 57 155.5 155.5 57 214.5-57 214.5-155.5 155.5-214.5 57zM782 788l106-106q7-7 7-17.5t-7-17.5l-320-321q-8-7-18-7t-18 7l-202 203q-8 7-8 17.5t8 17.5l106 106q7 8 17.5 8t17.5-8l79-79 197 197q7 7 17.5 7t17.5-7z" unicode="&#xe089;"/><glyph d="M600 1177q117 0 224-45.5t184.5-123 123-184.5 45.5-224-45.5-224-123-184.5-184.5-123-224-45.5-224 45.5-184.5 123-123 184.5-45.5 224 45.5 224 123 184.5 184.5 123 224 45.5zM600 1027q-116 0-214.5-57t-155.5-155.5-57-214.5q0-120 65-225l587 587q-105 65-225 65zM965 819l-584-584q104-62 219-62 116 0 214.5 57t155.5 155.5 57 214.5q0 115-62 219z" unicode="&#xe090;"/><glyph d="M39 582l522 427q16 13 27.5 8t11.5-26v-291h550q21 0 35.5-14.5t14.5-35.5v-200q0-21-14.5-35.5t-35.5-14.5h-550v-291q0-21-11.5-26t-27.5 8l-522 427q-16 13-16 32t16 32z" unicode="&#xe091;"/><glyph d="M639 1009l522-427q16-13 16-32t-16-32l-522-427q-16-13-27.5-8t-11.5 26v291h-550q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5-8z" unicode="&#xe092;"/><glyph d="M682 1161l427-522q13-16 8-27.5t-26-11.5h-291v-550q0-21-14.5-35.5t-35.5-14.5h-200q-21 0-35.5 14.5t-14.5 35.5v550h-291q-21 0-26 11.5t8 27.5l427 522q13 16 32 16t32-16z" unicode="&#xe093;"/><glyph d="M550 1200h200q21 0 35.5-14.5t14.5-35.5v-550h291q21 0 26-11.5t-8-27.5l-427-522q-13-16-32-16t-32 16l-427 522q-13 16-8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe094;"/><glyph d="M639 1109l522-427q16-13 16-32t-16-32l-522-427q-16-13-27.5-8t-11.5 26v291q-94-2-182-20t-170.5-52-147-92.5-100.5-135.5q5 105 27 193.5t67.5 167 113 135 167 91.5 225.5 42v262q0 21 11.5 26t27.5-8z" unicode="&#xe095;"/><glyph d="M850 1200h300q21 0 35.5-14.5t14.5-35.5v-300q0-21-10.5-25t-24.5 10l-94 94-249-249q-8-7-18-7t-18 7l-106 106q-7 8-7 18t7 18l249 249-94 94q-14 14-10 24.5t25 10.5zM350 0h-300q-21 0-35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5-10l94-94 249 249q8 7 18 7t18-7l106-106q7-8 7-18t-7-18l-249-249 94-94q14-14 10-24.5t-25-10.5z" unicode="&#xe096;"/><glyph d="M1014 1120l106-106q7-8 7-18t-7-18l-249-249 94-94q14-14 10-24.5t-25-10.5h-300q-21 0-35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5-10l94-94 249 249q8 7 18 7t18-7zM250 600h300q21 0 35.5-14.5t14.5-35.5v-300q0-21-10.5-25t-24.5 10l-94 94-249-249q-8-7-18-7t-18 7l-106 106q-7 8-7 18t7 18l249 249-94 94q-14 14-10 24.5t25 10.5z" unicode="&#xe097;"/><glyph d="M600 1177q117 0 224-45.5t184.5-123 123-184.5 45.5-224-45.5-224-123-184.5-184.5-123-224-45.5-224 45.5-184.5 123-123 184.5-45.5 224 45.5 224 123 184.5 184.5 123 224 45.5zM704 900h-208q-20 0-32-14.5t-8-34.5l58-302q4-20 21.5-34.5t37.5-14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20-8 34.5t-32 14.5zM675 400h-150q-10 0-17.5-7.5t-7.5-17.5v-150q0-10 7.5-17.5t17.5-7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10-7.5 17.5t-17.5 7.5z" unicode="&#xe101;"/><glyph d="M260 1200q9 0 19-2t15-4l5-2q22-10 44-23l196-118q21-13 36-24 29-21 37-12 11 13 49 35l196 118q22 13 45 23 17 7 38 7 23 0 47-16.5t37-33.5l13-16q14-21 18-45l25-123 8-44q1-9 8.5-14.5t17.5-5.5h61q10 0 17.5-7.5t7.5-17.5v-50q0-10-7.5-17.5t-17.5-7.5h-50q-10 0-17.5-7.5t-7.5-17.5v-175h-400v300h-200v-300h-400v175q0 10-7.5 17.5t-17.5 7.5h-50q-10 0-17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45 2 3 5 7t13.5 15 21.5 19.5 26.5 15.5 29.5 7zM915 1079l-166-162q-7-7-5-12t12-5h219q10 0 15 7t2 17l-51 149q-3 10-11 12t-15-6zM463 917l-177 157q-8 7-16 5t-11-12l-51-143q-3-10 2-17t15-7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0-17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375q0-10-7.5-17.5t-17.5-7.5h-375v400h400z" unicode="&#xe102;"/><glyph d="M1165 1190q8 3 21-6.5t13-17.5q-2-178-24.5-323.5t-55.5-245.5-87-174.5-102.5-118.5-118-68.5-118.5-33-120-4.5-105 9.5-90 16.5q-61 12-78 11-4 1-12.5 0t-34-14.5-52.5-40.5l-153-153q-26-24-37-14.5t-11 43.5q0 64 42 102 8 8 50.5 45t66.5 58q19 17 35 47t13 61q-9 55-10 102.5t7 111 37 130 78 129.5q39 51 80 88t89.5 63.5 94.5 45 113.5 36 129 31 157.5 37 182 47.5zM1116 1098q-8 9-22.5-3t-45.5-50q-38-47-119-103.5t-142-89.5l-62-33q-56-30-102-57t-104-68-102.5-80.5-85.5-91-64-104.5q-24-56-31-86t2-32 31.5 17.5 55.5 59.5q25 30 94 75.5t125.5 77.5 147.5 81q70 37 118.5 69t102 79.5 99 111 86.5 148.5q22 50 24 60t-6 19z" unicode="&#xe103;"/><glyph d="M653 1231q-39-67-54.5-131t-10.5-114.5 24.5-96.5 47.5-80 63.5-62.5 68.5-46.5 65-30q-4 7-17.5 35t-18.5 39.5-17 39.5-17 43-13 42-9.5 44.5-2 42 4 43 13.5 39 23 38.5q96-42 165-107.5t105-138 52-156 13-159-19-149.5q-13-55-44-106.5t-68-87-78.5-64.5-72.5-45-53-22q-72-22-127-11-31 6-13 19 6 3 17 7 13 5 32.5 21t41 44 38.5 63.5 21.5 81.5-6.5 94.5-50 107-104 115.5q10-104-.5-189t-37-140.5-65-93-84-52-93.5-11-95 24.5q-80 36-131.5 114t-53.5 171q-2 23 0 49.5t4.5 52.5 13.5 56 27.5 60 46 64.5 69.5 68.5q-8-53-5-102.5t17.5-90 34-68.5 44.5-39 49-2q31 13 38.5 36t-4.5 55-29 64.5-36 75-26 75.5q-15 85 2 161.5t53.5 128.5 85.5 92.5 93.5 61 81.5 25.5z" unicode="&#xe104;"/><glyph d="M600 1094q82 0 160.5-22.5t140-59 116.5-82.5 94.5-95 68-95 42.5-82.5 14-57.5-14-57.5-43-82.5-68.5-95-94.5-95-116.5-82.5-140-59-159.5-22.5-159.5 22.5-140 59-116.5 82.5-94.5 95-68.5 95-43 82.5-14 57.5 14 57.5 42.5 82.5 68 95 94.5 95 116.5 82.5 140 59 160.5 22.5zM888 829q-15 15-18 12t5-22q25-57 25-119 0-124-88-212t-212-88-212 88-88 212q0 59 23 114 8 19 4.5 22t-17.5-12q-70-69-160-184-13-16-15-40.5t9-42.5q22-36 47-71t70-82 92.5-81 113-58.5 133.5-24.5 133.5 24 113 58.5 92.5 81.5 70 81.5 47 70.5q11 18 9 42.5t-14 41.5q-90 117-163 189zM448 727l-35-36q-15-15-19.5-38.5t4.5-41.5q37-68 93-116 16-13 38.5-11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44-89 117-11 18-28 20t-32-12z" unicode="&#xe105;"/><glyph d="M592 0h-148l31 120q-91 20-175.5 68.5t-143.5 106.5-103.5 119-66.5 110-22 76q0 21 14 57.5t42.5 82.5 68 95 94.5 95 116.5 82.5 140 59 160.5 22.5q61 0 126-15l32 121h148zM944 770l47 181q108-85 176.5-192t68.5-159q0-26-19.5-71t-59.5-102-93-112-129-104.5-158-75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70-107 130zM310 824q-70-69-160-184-13-16-15-40.5t9-42.5q18-30 39-60t57-70.5 74-73 90-61 105-41.5l41 154q-107 18-178.5 101.5t-71.5 193.5q0 59 23 114 8 19 4.5 22t-17.5-12zM448 727l-35-36q-15-15-19.5-38.5t4.5-41.5q37-68 93-116 16-13 38.5-11t36.5 17l12 11 22 86-3 4q-44 44-89 117-11 18-28 20t-32-12z" unicode="&#xe106;"/><glyph d="M-90 100l642 1066q20 31 48 28.5t48-35.5l642-1056q21-32 7.5-67.5t-50.5-35.5h-1294q-37 0-50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5-7.5t7.5-17.5v-75h345l-445 723zM496 700h208q20 0 32-14.5t8-34.5l-58-252q-4-20-21.5-34.5t-37.5-14.5h-54q-20 0-37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" unicode="&#xe107;"/><glyph d="M650 1200q62 0 106-44t44-106v-339l363-325q15-14 26-38.5t11-44.5v-41q0-20-12-26.5t-29 5.5l-359 249v-263q100-93 100-113v-64q0-21-13-29t-32 1l-205 128-205-128q-19-9-32-1t-13 29v64q0 20 100 113v263l-359-249q-17-12-29-5.5t-12 26.5v41q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z" unicode="&#xe108;"/><glyph d="M850 1200h100q21 0 35.5-14.5t14.5-35.5v-50h50q21 0 35.5-14.5t14.5-35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5-14.5t14.5-35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0-21-14.5-35.5t-35.5-14.5h-1000q-21 0-35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z" unicode="&#xe109;"/><glyph d="M1135 1165l249-230q15-14 15-35t-15-35l-249-230q-14-14-24.5-10t-10.5 25v150h-159l-600-600h-291q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5-10zM522 819l-141-141-122 122h-209q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249-230q15-14 15-35t-15-35l-249-230q-14-14-24.5-10t-10.5 25v150h-241l-181 181 141 141 122-122h159v150q0 21 10.5 25t24.5-10z" unicode="&#xe110;"/><glyph d="M100 1100h1000q41 0 70.5-29.5t29.5-70.5v-600q0-41-29.5-70.5t-70.5-29.5h-596l-304-300v300h-100q-41 0-70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z" unicode="&#xe111;"/><glyph d="M150 1200h200q21 0 35.5-14.5t14.5-35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5-14.5t14.5-35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0-41-3-77.5t-15-89.5-32-96-58-89-89-77-129-51-174-20-174 20-129 51-89 77-58 89-32 96-15 89.5-3 77.5v300h300v-250-27-42.5t1.5-41 5-38 10-35 16.5-30 25.5-24.5 35-19 46.5-12 60-4 60 4.5 46.5 12.5 35 19.5 25 25.5 17 30.5 10 35 5 38 2 40.5-.5 42v25 250h300z" unicode="&#xe112;"/><glyph d="M1100 411l-198-199-353 353-353-353-197 199 551 551z" unicode="&#xe113;"/><glyph d="M1101 789l-550-551-551 551 198 199 353-353 353 353z" unicode="&#xe114;"/><glyph d="M404 1000h746q21 0 35.5-14.5t14.5-35.5v-551h150q21 0 25-10.5t-10-24.5l-230-249q-14-15-35-15t-35 15l-230 249q-14 14-10 24.5t25 10.5h150v401h-381zM135 984l230-249q14-14 10-24.5t-25-10.5h-150v-400h385l215-200h-750q-21 0-35.5 14.5t-14.5 35.5v550h-150q-21 0-25 10.5t10 24.5l230 249q14 15 35 15t35-15z" unicode="&#xe115;"/><glyph d="M56 1200h94q17 0 31-11t18-27l38-162h896q24 0 39-18.5t10-42.5l-100-475q-5-21-27-42.5t-55-21.5h-633l48-200h535q21 0 35.5-14.5t14.5-35.5-14.5-35.5-35.5-14.5h-50v-50q0-21-14.5-35.5t-35.5-14.5-35.5 14.5-14.5 35.5v50h-300v-50q0-21-14.5-35.5t-35.5-14.5-35.5 14.5-14.5 35.5v50h-31q-18 0-32.5 10t-20.5 19l-5 10-201 961h-54q-20 0-35 14.5t-15 35.5 15 35.5 35 14.5z" unicode="&#xe116;"/><glyph d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5-29.5t29.5-70.5h500zM0 800h1200v-800h-1200v800z" unicode="&#xe117;"/><glyph d="M200 800l-200-400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71-29.5t29-70.5h500v-200h-1000zM1500 700l-300-700h-1200l300 700h1200z" unicode="&#xe118;"/><glyph d="M635 1184l230-249q14-14 10-24.5t-25-10.5h-150v-601h150q21 0 25-10.5t-10-24.5l-230-249q-14-15-35-15t-35 15l-230 249q-14 14-10 24.5t25 10.5h150v601h-150q-21 0-25 10.5t10 24.5l230 249q14 15 35 15t35-15z" unicode="&#xe119;"/><glyph d="M936 864l249-229q14-15 14-35.5t-14-35.5l-249-229q-15-15-25.5-10.5t-10.5 24.5v151h-600v-151q0-20-10.5-24.5t-25.5 10.5l-249 229q-14 15-14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5-25.5v-149h600v149q0 21 10.5 25.5t25.5-10.5z" unicode="&#xe120;"/><glyph d="M1169 400l-172 732q-5 23-23 45.5t-38 22.5h-672q-20 0-38-20t-23-41l-172-739h1138zM1100 300h-1000q-41 0-70.5-29.5t-29.5-70.5v-100q0-41 29.5-70.5t70.5-29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41-29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100zM1000 100v100h100v-100h-100z" unicode="&#xe121;"/><glyph d="M1150 1100q21 0 35.5-14.5t14.5-35.5v-850q0-21-14.5-35.5t-35.5-14.5-35.5 14.5-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47-276q3-16-5.5-20t-29.5-4h-7-84q-20 0-34.5 14t-18.5 35q-55 337-55 351v250 6q0 16 1 23.5t6.5 14 17.5 6.5h200l675 250v-850zM0 750v-250q-4 0-11 .5t-24 6-30 15-24 30-11 48.5v50q0 26 10.5 46t25 30 29 16 25.5 7z" unicode="&#xe122;"/><glyph d="M553 1200h94q20 0 29-10.5t3-29.5l-18-37q83-19 144-82.5t76-140.5l63-327 118-173h17q19 0 33-14.5t14-35-13-40.5-31-27q-8-4-23-9.5t-65-19.5-103-25-132.5-20-158.5-9q-57 0-115 5t-104 12-88.5 15.5-73.5 17.5-54.5 16-35.5 12l-11 4q-18 8-31 28t-13 40.5 14 35 33 14.5h17l118 173 63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50-6 102-6 53 0 102 6-12-49-39.5-79.5t-62.5-30.5-63 30.5-39 79.5z" unicode="&#xe123;"/><glyph d="M800 946l224 78-78-224 234-45-180-155 180-155-234-45 78-224-224 78-45-234-155 180-155-180-45 234-224-78 78 224-234 45 180 155-180 155 234 45-78 224 224-78 45 234 155-180 155 180z" unicode="&#xe124;"/><glyph d="M650 1200h50q40 0 70-40.5t30-84.5v-150l-28-125h328q40 0 70-40.5t30-84.5v-100q0-45-29-74l-238-344q-16-24-38-40.5t-45-16.5h-250q-7 0-42 25t-66 50l-31 25h-61q-45 0-72.5 18t-27.5 57v400q0 36 20 63l145 196 96 198q13 28 37.5 48t51.5 20zM650 1100l-100-212-150-213v-375h100l136-100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5-14.5t14.5-35.5v-500q0-21-14.5-35.5t-35.5-14.5h-100q-21 0-35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe125;"/><glyph d="M600 1100h250q23 0 45-16.5t38-40.5l238-344q29-29 29-74v-100q0-44-30-84.5t-70-40.5h-328q28-118 28-125v-150q0-44-30-84.5t-70-40.5h-50q-27 0-51.5 20t-37.5 48l-96 198-145 196q-20 27-20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100zM50 1000h100q21 0 35.5-14.5t14.5-35.5v-500q0-21-14.5-35.5t-35.5-14.5h-100q-21 0-35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136-100h-100v-375l150-213 100-212h50v175l-50 225h450v125l-250 375h-214z" unicode="&#xe126;"/><glyph d="M356 873l363 230q31 16 53-6l110-112q13-13 13.5-32t-11.5-34l-84-121h302q84 0 138-38t54-110-55-111-139-39h-106l-131-339q-6-21-19.5-41t-28.5-20h-342q-7 0-90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100-89h293l131 339q6 21 19.5 41t28.5 20h203q21 0 30.5 25t.5 50-31 25h-456-7-6-5.5t-6 .5-5 1.5-5 2-4 2.5-4 4-2.5 4.5q-12 25 5 47l146 183-86 83zM50 800h100q21 0 35.5-14.5t14.5-35.5v-500q0-21-14.5-35.5t-35.5-14.5h-100q-21 0-35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe127;"/><glyph d="M475 1103l366-230q2-1 6-3.5t14-10.5 18-16.5 14.5-20 6.5-22.5v-525q0-13-86-94t-93-81h-342q-15 0-28.5 20t-19.5 41l-131 339h-106q-85 0-139.5 39t-54.5 111 54 110 138 38h302l-85 121q-11 15-10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146-183q17-22 5-47-2-2-3.5-4.5t-4-4-4-2.5-5-2-5-1.5-6-.5h-6-6.5-6-475v-100h221q15 0 29-20t20-41l130-339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5-14.5t14.5-35.5v-500q0-21-14.5-35.5t-35.5-14.5h-100q-21 0-35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe128;"/><glyph d="M550 1294q72 0 111-55t39-139v-106l339-131q21-6 41-19.5t20-28.5v-342q0-7-81-90t-94-83h-525q-17 0-35.5 14t-28.5 28l-9 14-230 363q-16 31 6 53l112 110q13 13 32 13.5t34-11.5l121-84v302q0 84 38 138t110 54zM600 972v203q0 21-25 30.5t-50 .5-25-31v-456-7-6-5.5t-.5-6-1.5-5-2-5-2.5-4-4-4-4.5-2.5q-25-12-47 5l-183 146-83-86 236-339h503l89 100v293l-339 131q-21 6-41 19.5t-20 28.5zM450 200h500q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-500q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe129;"/><glyph d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21-14.5 35.5t-35.5 14.5h-500q-21 0-35.5-14.5t-14.5-35.5v-100q0-21 14.5-35.5t35.5-14.5zM600 306v-106q0-84-39-139t-111-55-110 54-38 138v302l-121-84q-15-12-34-11.5t-32 13.5l-112 110q-22 22-6 53l230 363q1 2 3.5 6t10.5 13.5 16.5 17 20 13.5 22.5 6h525q13 0 94-83t81-90v-342q0-15-20-28.5t-41-19.5zM308 900l-236-339 83-86 183 146q22 17 47 5 2-1 4.5-2.5t4-4 2.5-4 2-5 1.5-5 .5-6v-5.5-6-7-456q0-22 25-31t50 .5 25 30.5v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z" unicode="&#xe130;"/><glyph d="M600 1178q118 0 225-45.5t184.5-123 123-184.5 45.5-225-45.5-225-123-184.5-184.5-123-225-45.5-225 45.5-184.5 123-123 184.5-45.5 225 45.5 225 123 184.5 184.5 123 225 45.5zM914 632l-275 223q-16 13-27.5 8t-11.5-26v-137h-275q-10 0-17.5-7.5t-7.5-17.5v-150q0-10 7.5-17.5t17.5-7.5h275v-137q0-21 11.5-26t27.5 8l275 223q16 13 16 32t-16 32z" unicode="&#xe131;"/><glyph d="M600 1178q118 0 225-45.5t184.5-123 123-184.5 45.5-225-45.5-225-123-184.5-184.5-123-225-45.5-225 45.5-184.5 123-123 184.5-45.5 225 45.5 225 123 184.5 184.5 123 225 45.5zM561 855l-275-223q-16-13-16-32t16-32l275-223q16-13 27.5-8t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10-7.5 17.5t-17.5 7.5h-275v137q0 21-11.5 26t-27.5-8z" unicode="&#xe132;"/><glyph d="M600 1178q118 0 225-45.5t184.5-123 123-184.5 45.5-225-45.5-225-123-184.5-184.5-123-225-45.5-225 45.5-184.5 123-123 184.5-45.5 225 45.5 225 123 184.5 184.5 123 225 45.5zM855 639l-223 275q-13 16-32 16t-32-16l-223-275q-13-16-8-27.5t26-11.5h137v-275q0-10 7.5-17.5t17.5-7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" unicode="&#xe133;"/><glyph d="M600 1178q118 0 225-45.5t184.5-123 123-184.5 45.5-225-45.5-225-123-184.5-184.5-123-225-45.5-225 45.5-184.5 123-123 184.5-45.5 225 45.5 225 123 184.5 184.5 123 225 45.5zM675 900h-150q-10 0-17.5-7.5t-7.5-17.5v-275h-137q-21 0-26-11.5t8-27.5l223-275q13-16 32-16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10-7.5 17.5t-17.5 7.5z" unicode="&#xe134;"/><glyph d="M600 1176q116 0 222.5-46t184-123.5 123.5-184 46-222.5-46-222.5-123.5-184-184-123.5-222.5-46-222.5 46-184 123.5-123.5 184-46 222.5 46 222.5 123.5 184 184 123.5 222.5 46zM627 1101q-15-12-36.5-20.5t-35.5-12-43-8-39-6.5q-15-3-45.5 0t-45.5-2q-20-7-51.5-26.5t-34.5-34.5q-3-11 6.5-22.5t8.5-18.5q-3-34-27.5-91t-29.5-79q-9-34 5-93t8-87q0-9 17-44.5t16-59.5q12 0 23-5t23.5-15 19.5-14q16-8 33-15t40.5-15 34.5-12q21-9 52.5-32t60-38 57.5-11q7-15-3-34t-22.5-40-9.5-38q13-21 23-34.5t27.5-27.5 36.5-18q0-7-3.5-16t-3.5-14 5-17q104-2 221 112 30 29 46.5 47t34.5 49 21 63q-13 8-37 8.5t-36 7.5q-15 7-49.5 15t-51.5 19q-18 0-41-.5t-43-1.5-42-6.5-38-16.5q-51-35-66-12-4 1-3.5 25.5t.5 25.5q-6 13-26.5 17.5t-24.5 6.5q1 15-.5 30.5t-7 28-18.5 11.5-31-21q-23-25-42 4-19 28-8 58 6 16 22 22 6-1 26-1.5t33.5-4 19.5-13.5q7-12 18-24t21.5-20.5 20-15 15.5-10.5l5-3q2 12 7.5 30.5t8 34.5-.5 32q-3 18 3.5 29t18 22.5 15.5 24.5q6 14 10.5 35t8 31 15.5 22.5 34 22.5q-6 18 10 36 8 0 24-1.5t24.5-1.5 20 4.5 20.5 15.5q-10 23-31 42.5t-37.5 29.5-49 27-43.5 23q0 1 2 8t3 11.5 1.5 10.5-1 9.5-4.5 4.5q31-13 58.5-14.5t38.5 2.5l12 5q5 28-9.5 46t-36.5 24-50 15-41 20q-18-4-37 0zM613 994q0-17 8-42t17-45 9-23q-8 1-39.5 5.5t-52.5 10-37 16.5q3 11 16 29.5t16 25.5q10-10 19-10t14 6 13.5 14.5 16.5 12.5z" unicode="&#xe135;"/><glyph d="M756 1157q164 92 306-9l-259-138 145-232 251 126q6-89-34-156.5t-117-110.5q-60-34-127-39.5t-126 16.5l-596-596q-15-16-36.5-16t-36.5 16l-111 110q-15 15-15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z" unicode="&#xe136;"/><glyph d="M100 1196h1000q41 0 70.5-29.5t29.5-70.5v-100q0-41-29.5-70.5t-70.5-29.5h-1000q-41 0-70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5-29.5t29.5-70.5v-100q0-41-29.5-70.5t-70.5-29.5h-1000q-41 0-70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5-29.5t29.5-70.5v-100q0-41-29.5-70.5t-70.5-29.5h-1000q-41 0-70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z" horiz-adv-x="1220" unicode="&#xe137;"/><glyph d="M150 1200h900q21 0 35.5-14.5t14.5-35.5-14.5-35.5-35.5-14.5h-900q-21 0-35.5 14.5t-14.5 35.5 14.5 35.5 35.5 14.5zM700 500v-300l-200-200v500l-350 500h900z" unicode="&#xe138;"/><glyph d="M500 1200h200q41 0 70.5-29.5t29.5-70.5v-100h300q41 0 70.5-29.5t29.5-70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0-41-29.5-70.5t-70.5-29.5h-1000q-41 0-70.5 29.5t-29.5 70.5v200h1200z" unicode="&#xe139;"/><glyph d="M50 1200h300q21 0 25-10.5t-10-24.5l-94-94 199-199q7-8 7-18t-7-18l-106-106q-8-7-18-7t-18 7l-199 199-94-94q-14-14-24.5-10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5-14.5t14.5-35.5v-300q0-21-10.5-25t-24.5 10l-94 94-199-199q-8-7-18-7t-18 7l-106 106q-7 8-7 18t7 18l199 199-94 94q-14 14-10 24.5t25 10.5zM364 470l106-106q7-8 7-18t-7-18l-199-199 94-94q14-14 10-24.5t-25-10.5h-300q-21 0-35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5-10l94-94 199 199q8 7 18 7t18-7zM1071 271l94 94q14 14 24.5 10t10.5-25v-300q0-21-14.5-35.5t-35.5-14.5h-300q-21 0-25 10.5t10 24.5l94 94-199 199q-7 8-7 18t7 18l106 106q8 7 18 7t18-7z" unicode="&#xe140;"/><glyph d="M596 1192q121 0 231.5-47.5t190-127 127-190 47.5-231.5-47.5-231.5-127-190.5-190-127-231.5-47-231.5 47-190.5 127-127 190.5-47 231.5 47 231.5 127 190 190.5 127 231.5 47.5zM596 1010q-112 0-207.5-55.5t-151-151-55.5-207.5 55.5-207.5 151-151 207.5-55.5 207.5 55.5 151 151 55.5 207.5-55.5 207.5-151 151-207.5 55.5zM454.5 905q22.5 0 38.5-16t16-38.5-16-39-38.5-16.5-38.5 16.5-16 39 16 38.5 38.5 16zM754.5 905q22.5 0 38.5-16t16-38.5-16-39-38-16.5q-14 0-29 10l-55-145q17-23 17-51 0-36-25.5-61.5t-61.5-25.5-61.5 25.5-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126 1 1q-9 14-9 28 0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5-16t16-38.5-16-38.5-38.5-16-38.5 16-16 38.5 16 38.5 38.5 16zM854.5 709q22.5 0 38.5-16t16-38.5-16-38.5-38.5-16-38.5 16-16 38.5 16 38.5 38.5 16z" unicode="&#xe141;"/><glyph d="M546 173l469 470q91 91 99 192 7 98-52 175.5t-154 94.5q-22 4-47 4-34 0-66.5-10t-56.5-23-55.5-38-48-41.5-48.5-47.5q-376-375-391-390-30-27-45-41.5t-37.5-41-32-46.5-16-47.5-1.5-56.5q9-62 53.5-95t99.5-33q74 0 125 51l548 548q36 36 20 75-7 16-21.5 26t-32.5 10q-26 0-50-23-13-12-39-38l-341-338q-15-15-35.5-15.5t-34.5 13.5-14 34.5 14 34.5q327 333 361 367 35 35 67.5 51.5t78.5 16.5q14 0 29-1 44-8 74.5-35.5t43.5-68.5q14-47 2-96.5t-47-84.5q-12-11-32-32t-79.5-81-114.5-115-124.5-123.5-123-119.5-96.5-89-57-45q-56-27-120-27-70 0-129 32t-93 89q-48 78-35 173t81 163l511 511q71 72 111 96 91 55 198 55 80 0 152-33 78-36 129.5-103t66.5-154q17-93-11-183.5t-94-156.5l-482-476q-15-15-36-16t-37 14-17.5 34 14.5 35z" unicode="&#xe142;"/><glyph d="M649 949q48 68 109.5 104t121.5 38.5 118.5-20 102.5-64 71-100.5 27-123q0-57-33.5-117.5t-94-124.5-126.5-127.5-150-152.5-146-174q-62 85-145.5 174t-150 152.5-126.5 127.5-93.5 124.5-33.5 117.5q0 64 28 123t73 100.5 104 64 119 20 120.5-38.5 104.5-104zM896 972q-33 0-64.5-19t-56.5-46-47.5-53.5-43.5-45.5-37.5-19-36 19-40 45.5-43 53.5-54 46-65.5 19q-67 0-122.5-55.5t-55.5-132.5q0-23 13.5-51t46-65 57.5-63 76-75l22-22q15-14 44-44t50.5-51 46-44 41-35 23-12 23.5 12 42.5 36 46 44 52.5 52 44 43q4 4 12 13 43 41 63.5 62t52 55 46 55 26 46 11.5 44q0 79-53 133.5t-120 54.5z" unicode="&#xe143;"/><glyph d="M776.5 1214q93.5 0 159.5-66l141-141q66-66 66-160 0-42-28-95.5t-62-87.5l-29-29q-31 53-77 99l-18 18 95 95-247 248-389-389 212-212-105-106-19 18-141 141q-66 66-66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10-8 19-17l141-141q66-66 66-159t-66-159l-283-283q-66-66-159-66t-159 66l-141 141q-66 66-66 159.5t66 159.5l55 55q29-55 75-102l18-17-95-95 247-248 389 389z" unicode="&#xe144;"/><glyph d="M603 1200q85 0 162-15t127-38 79-48 29-46v-953q0-41-29.5-70.5t-70.5-29.5h-600q-41 0-70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48 129 37.5 163 15zM300 1000v-700h600v700h-600zM600 254q-43 0-73.5-30.5t-30.5-73.5 30.5-73.5 73.5-30.5 73.5 30.5 30.5 73.5-30.5 73.5-73.5 30.5z" unicode="&#xe145;"/><glyph d="M902 1185l283-282q15-15 15-36t-14.5-35.5-35.5-14.5-35 15l-36 35-279-267v-300l-212 210-308-307-280-203 203 280 307 308-210 212h300l267 279-35 36q-15 14-15 35t14.5 35.5 35.5 14.5 35-15z" unicode="&#xe146;"/><glyph d="M700 1248v-78q38-5 72.5-14.5t75.5-31.5 71-53.5 52-84 24-118.5h-159q-4 36-10.5 59t-21 45-40 35.5-64.5 20.5v-307l64-13q34-7 64-16.5t70-32 67.5-52.5 47.5-80 20-112q0-139-89-224t-244-97v-77h-100v79q-150 16-237 103-40 40-52.5 93.5t-15.5 139.5h139q5-77 48.5-126t117.5-65v335l-27 8q-46 14-79 26.5t-72 36-63 52-40 72.5-16 98q0 70 25 126t67.5 92 94.5 57 110 27v77h100zM600 754v274q-29-4-50-11t-42-21.5-31.5-41.5-10.5-65q0-29 7-50.5t16.5-34 28.5-22.5 31.5-14 37.5-10q9-3 13-4zM700 547v-310q22 2 42.5 6.5t45 15.5 41.5 27 29 42 12 59.5-12.5 59.5-38 44.5-53 31-66.5 24.5z" unicode="&#xe148;"/><glyph d="M561 1197q84 0 160.5-40t123.5-109.5 47-147.5h-153q0 40-19.5 71.5t-49.5 48.5-59.5 26-55.5 9q-37 0-79-14.5t-62-35.5q-41-44-41-101 0-26 13.5-63t26.5-61 37-66q6-9 9-14h241v-100h-197q8-50-2.5-115t-31.5-95q-45-62-99-112 34 10 83 17.5t71 7.5q32 1 102-16t104-17q83 0 136 30l50-147q-31-19-58-30.5t-55-15.5-42-4.5-46-.5q-23 0-76 17t-111 32.5-96 11.5q-39-3-82-16t-67-25l-23-11-55 145q4 3 16 11t15.5 10.5 13 9 15.5 12 14.5 14 17.5 18.5q48 55 54 126.5t-30 142.5h-221v100h166q-23 47-44 104-7 20-12 41.5t-6 55.5 6 66.5 29.5 70.5 58.5 71q97 88 263 88z" unicode="&#xe149;"/><glyph d="M400 300h150q21 0 25-11t-10-25l-230-250q-14-15-35-15t-35 15l-230 250q-14 14-10 25t25 11h150v900h200v-900zM935 1184l230-249q14-14 10-24.5t-25-10.5h-150v-900h-200v900h-150q-21 0-25 10.5t10 24.5l230 249q14 15 35 15t35-15z" unicode="&#xe150;"/><glyph d="M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25-11t-10-25l-230-250q-14-15-35-15t-35 15l-230 250q-14 14-10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200-250h200v-100h-300v150l200 250h-200v100h300v-150z" unicode="&#xe151;"/><glyph d="M400 300h150q21 0 25-11t-10-25l-230-250q-14-15-35-15t-35 15l-230 250q-14 14-10 25t25 11h150v900h200v-900zM1000 1050l-200-250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z" unicode="&#xe152;"/><glyph d="M400 300h150q21 0 25-11t-10-25l-230-250q-14-15-35-15t-35 15l-230 250q-14 14-10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z" unicode="&#xe153;"/><glyph d="M400 300h150q21 0 25-11t-10-25l-230-250q-14-15-35-15t-35 15l-230 250q-14 14-10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z" unicode="&#xe154;"/><glyph d="M400 300h150q21 0 25-11t-10-25l-230-250q-14-15-35-15t-35 15l-230 250q-14 14-10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" unicode="&#xe155;"/><glyph d="M400 300h150q21 0 25-11t-10-25l-230-250q-14-15-35-15t-35 15l-230 250q-14 14-10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" unicode="&#xe156;"/><glyph d="M350 1100h400q162 0 256-93.5t94-256.5v-400q0-165-93.5-257.5t-256.5-92.5h-400q-165 0-257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0-70.5-29.5t-29.5-70.5v-500q0-41 29.5-70.5t70.5-29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41-29.5 70.5t-70.5 29.5z" unicode="&#xe157;"/><glyph d="M350 1100h400q165 0 257.5-92.5t92.5-257.5v-400q0-165-92.5-257.5t-257.5-92.5h-400q-163 0-256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0-70.5-29.5t-29.5-70.5v-500q0-41 29.5-70.5t70.5-29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41-29.5 70.5t-70.5 29.5zM440 770l253-190q17-12 17-30t-17-30l-253-190q-16-12-28-6.5t-12 26.5v400q0 21 12 26.5t28-6.5z" unicode="&#xe158;"/><glyph d="M350 1100h400q163 0 256.5-94t93.5-256v-400q0-165-92.5-257.5t-257.5-92.5h-400q-165 0-257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0-70.5-29.5t-29.5-70.5v-500q0-41 29.5-70.5t70.5-29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41-29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5-12t-6.5-28l-190-253q-12-17-30-17t-30 17l-190 253q-12 16-6.5 28t26.5 12z" unicode="&#xe159;"/><glyph d="M350 1100h400q165 0 257.5-92.5t92.5-257.5v-400q0-163-92.5-256.5t-257.5-93.5h-400q-163 0-256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0-70.5-29.5t-29.5-70.5v-500q0-41 29.5-70.5t70.5-29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41-29.5 70.5t-70.5 29.5zM580 693l190-253q12-16 6.5-28t-26.5-12h-400q-21 0-26.5 12t6.5 28l190 253q12 17 30 17t30-17z" unicode="&#xe160;"/><glyph d="M550 1100h400q165 0 257.5-92.5t92.5-257.5v-400q0-165-92.5-257.5t-257.5-92.5h-400q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41-29.5 70.5t-70.5 29.5h-450q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM338 867l324-284q16-14 16-33t-16-33l-324-284q-16-14-27-9t-11 26v150h-250q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27-9z" unicode="&#xe161;"/><glyph d="M793 1182l9-9q8-10 5-27-3-11-79-225.5t-78-221.5l300 1q24 0 32.5-17.5t-5.5-35.5q-1 0-133.5-155t-267-312.5-138.5-162.5q-12-15-26-15h-9l-9 8q-9 11-4 32 2 9 42 123.5t79 224.5l39 110h-302q-23 0-31 19-10 21 6 41 75 86 209.5 237.5t228 257 98.5 111.5q9 16 25 16h9z" unicode="&#xe162;"/><glyph d="M350 1100h400q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-450q-41 0-70.5-29.5t-29.5-70.5v-500q0-41 29.5-70.5t70.5-29.5h450q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-400q-165 0-257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM938 867l324-284q16-14 16-33t-16-33l-324-284q-16-14-27-9t-11 26v150h-250q-21 0-35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27-9z" unicode="&#xe163;"/><glyph d="M750 1200h400q21 0 35.5-14.5t14.5-35.5v-400q0-21-10.5-25t-24.5 10l-109 109-312-312q-15-15-35.5-15t-35.5 15l-141 141q-15 15-15 35.5t15 35.5l312 312-109 109q-14 14-10 24.5t25 10.5zM456 900h-156q-41 0-70.5-29.5t-29.5-70.5v-500q0-41 29.5-70.5t70.5-29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0-165-93.5-257.5t-256.5-92.5h-400q-165 0-257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z" unicode="&#xe164;"/><glyph d="M600 1186q119 0 227.5-46.5t187-125 125-187 46.5-227.5-46.5-227.5-125-187-187-125-227.5-46.5-227.5 46.5-187 125-125 187-46.5 227.5 46.5 227.5 125 187 187 125 227.5 46.5zM600 1022q-115 0-212-56.5t-153.5-153.5-56.5-212 56.5-212 153.5-153.5 212-56.5 212 56.5 153.5 153.5 56.5 212-56.5 212-153.5 153.5-212 56.5zM600 794q80 0 137-57t57-137-57-137-137-57-137 57-57 137 57 137 137 57z" unicode="&#xe165;"/><glyph d="M450 1200h200q21 0 35.5-14.5t14.5-35.5v-350h245q20 0 25-11t-9-26l-383-426q-14-15-33.5-15t-32.5 15l-379 426q-13 15-8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5-14.5t14.5-35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" unicode="&#xe166;"/><glyph d="M583 1182l378-435q14-15 9-31t-26-16h-244v-250q0-20-17-35t-39-15h-200q-20 0-32 14.5t-12 35.5v250h-250q-20 0-25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5-14zM50 300h1000q21 0 35.5-14.5t14.5-35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" unicode="&#xe167;"/><glyph d="M396 723l369 369q7 7 17.5 7t17.5-7l139-139q7-8 7-18.5t-7-17.5l-525-525q-7-8-17.5-8t-17.5 8l-292 291q-7 8-7 18t7 18l139 139q8 7 18.5 7t17.5-7zM50 300h1000q21 0 35.5-14.5t14.5-35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" unicode="&#xe168;"/><glyph d="M135 1023l142 142q14 14 35 14t35-14l77-77-212-212-77 76q-14 15-14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5-25l-2-599q-1-20-15.5-35t-35.5-15l-597-1q-21 0-25 10.5t10 24.5l208 208-154 155 212 212zM50 300h1000q21 0 35.5-14.5t14.5-35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" unicode="&#xe169;"/><glyph d="M350 1200l599-2q20-1 35-15.5t15-35.5l1-597q0-21-10.5-25t-24.5 10l-208 208-155-154-212 212 155 154-210 210q-14 14-10 24.5t25 10.5zM524 512l-76-77q-15-14-36-14t-35 14l-142 142q-14 14-14 35t14 35l77 77zM50 300h1000q21 0 35.5-14.5t14.5-35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" unicode="&#xe170;"/><glyph d="M1200 103l-483 276-314-399v423h-399l1196 796v-1096zM483 424v-230l683 953z" unicode="&#xe171;"/><glyph d="M1100 1000v-850q0-21-14.5-35.5t-35.5-14.5h-150v400h-700v-400h-150q-21 0-35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" unicode="&#xe172;"/><glyph d="M1100 1000l-2-149-299-299-95 95q-9 9-21.5 9t-21.5-9l-149-147h-312v-400h-150q-21 0-35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106-106q7-7 7-17.5t-7-17.5l-420-421q-8-7-18-7t-18 7l-202 203q-8 7-8 17.5t8 17.5l106 106q7 8 17.5 8t17.5-8l79-79 297 297q7 7 17.5 7t17.5-7z" unicode="&#xe173;"/><glyph d="M1100 1000v-269l-103-103-134 134q-15 15-33.5 16.5t-34.5-12.5l-266-266h-329v-400h-150q-21 0-35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70-70q15-15 15-35.5t-15-35.5l-131-131 131-131q15-15 15-35.5t-15-35.5l-70-70q-15-15-35.5-15t-35.5 15l-131 131-131-131q-15-15-35.5-15t-35.5 15l-70 70q-15 15-15 35.5t15 35.5l131 131-131 131q-15 15-15 35.5t15 35.5l70 70q15 15 35.5 15t35.5-15l131-131 131 131q15 15 35.5 15t35.5-15z" unicode="&#xe174;"/><glyph d="M1100 1000v-300h-350q-21 0-35.5-14.5t-14.5-35.5v-150h-500v-400h-150q-21 0-35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5-14.5t14.5-35.5v-250h150q21 0 25-10.5t-10-24.5l-230-230q-14-14-35-14t-35 14l-230 230q-14 14-10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe175;"/><glyph d="M1100 1000v-400l-165 165q-14 15-35 15t-35-15l-263-265h-402v-400h-150q-21 0-35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230-229q14-15 10-25.5t-25-10.5h-150v-250q0-20-14.5-35t-35.5-15h-100q-21 0-35.5 15t-14.5 35v250h-150q-21 0-25 10.5t10 25.5l230 229q14 15 35 15t35-15z" unicode="&#xe176;"/><glyph d="M50 1100h1100q21 0 35.5-14.5t14.5-35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0-21-14.5-35.5t-35.5-14.5h-1100q-21 0-35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z" unicode="&#xe177;"/><glyph d="M935 1165l248-230q14-14 14-35t-14-35l-248-230q-14-14-24.5-10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5-10zM200 800h-50q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230q14 14 24.5 10t10.5-25v-150h400v-200h-400v-150q0-21-10.5-25t-24.5 10l-247 230q-15 14-15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-34.5-14.5h-51v200z" unicode="&#xe178;"/><glyph d="M862 1073l276 116q25 18 43.5 8t18.5-41v-1106q0-21-14.5-35.5t-35.5-14.5h-200q-21 0-35.5 14.5t-14.5 35.5v397q-4 1-11 5t-24 17.5-30 29-24 42-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5-12.5t14.5-24.5l1-13v-450q0-28-10.5-59.5t-25-56-29-45-25.5-31.5l-10-11v-447q0-21-14.5-35.5t-35.5-14.5h-200q-21 0-35.5 14.5t-14.5 35.5v447q-4 4-11 11.5t-24 30.5-30 46-24 55-11 60v450q0 2 .5 5.5t4 12 8.5 15 14.5 12 22.5 5.5q20 0 32.5-12.5t14.5-24.5l3-13v-350h100v350 5.5t2.5 12 7 15 15 12 25.5 5.5q23 0 35.5-12.5t13.5-24.5l1-13v-350h100v350q0 2 .5 5.5t3 12 7 15 15 12 24.5 5.5z" unicode="&#xe179;"/><glyph d="M1200 1100v-56q-4 0-11-.5t-24-3-30-7.5-24-15-11-24v-888q0-22 25-34.5t50-13.5l25-2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0-37 12.5-43.5t87.5-6.5v-56h-400v56q4 0 11 .5t24 3 30 7.5 24 15 11 24v888q0 22-25 34.5t-50 13.5l-25 2v56h400v-56q-75 0-87.5-6.5t-12.5-43.5v-394h500v394q0 37-12.5 43.5t-87.5 6.5v56h400z" unicode="&#xe180;"/><glyph d="M675 1000h375q21 0 35.5-14.5t14.5-35.5v-150h-105l-295-98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5-29.5t29.5-70.5v-500q0-41-29.5-70.5t-70.5-29.5h-300q-41 0-70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200h-300zM1100 535l-400-133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0-21-14.5-35.5t-35.5-14.5h-375l-100-100h-375l-100 100h400l200 200h105z" unicode="&#xe181;"/><glyph d="M17 1007l162 162q17 17 40 14t37-22l139-194q14-20 11-44.5t-20-41.5l-119-118q102-142 228-268t267-227l119 118q17 17 42.5 19t44.5-12l192-136q19-14 22.5-37.5t-13.5-40.5l-163-162q-3-1-9.5-1t-29.5 2-47.5 6-62.5 14.5-77.5 26.5-90 42.5-101.5 60-111 83-119 108.5q-74 74-133.5 150.5t-94.5 138.5-60 119.5-34.5 100-15 74.5-4.5 48z" unicode="&#xe182;"/><glyph d="M600 1100q92 0 175-10.5t141.5-27 108.5-36.5 81.5-40 53.5-37 31-27l9-10v-200q0-21-14.5-33t-34.5-9l-202 34q-20 3-34.5 20t-14.5 38v146q-141 24-300 24t-300-24v-146q0-21-14.5-38t-34.5-20l-202-34q-20-3-34.5 9t-14.5 33v200q3 4 9.5 10.5t31 26 54 37.5 80.5 39.5 109 37.5 141 26.5 175 10.5zM600 795q56 0 97-9.5t60-23.5 30-28 12-24l1-10v-50l365-303q14-15 24.5-40t10.5-45v-212q0-21-14.5-35.5t-35.5-14.5h-1100q-21 0-35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50q0 4 1 10.5t12 23 30 29 60 22.5 97 10z" unicode="&#xe183;"/><glyph d="M1100 700l-200-200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5-14.5t14.5-35.5-14.5-35.5-35.5-14.5h-12l137-100h-950l137 100h-12q-21 0-35.5 14.5t-14.5 35.5 14.5 35.5 35.5 14.5zM50 100h1100q21 0 35.5-14.5t14.5-35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe184;"/><glyph d="M700 1100h-100q-41 0-70.5-29.5t-29.5-70.5v-1000h300v1000q0 41-29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0-70.5-29.5t-29.5-70.5v-700h300v700q0 41-29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5-29.5t29.5-70.5v-400z" unicode="&#xe185;"/><glyph d="M200 1100h700q124 0 212-88t88-212v-500q0-124-88-212t-212-88h-700q-124 0-212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100-100h-200v500h200zM700 700v-300h100v300h-100z" unicode="&#xe186;"/><glyph d="M200 1100h700q124 0 212-88t88-212v-500q0-124-88-212t-212-88h-700q-124 0-212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100-100h-200v500h200zM700 700v-300h100v300h-100z" unicode="&#xe187;"/><glyph d="M200 1100h700q124 0 212-88t88-212v-500q0-124-88-212t-212-88h-700q-124 0-212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z" unicode="&#xe188;"/><glyph d="M200 1100h700q124 0 212-88t88-212v-500q0-124-88-212t-212-88h-700q-124 0-212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150 300 150v-300zM900 550l-300-150v300z" unicode="&#xe189;"/><glyph d="M200 1100h700q124 0 212-88t88-212v-500q0-124-88-212t-212-88h-700q-124 0-212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0-66.5-43t-28.5-108 27-107 68-42h130v300zM300 700v-300h130q41 0 68 42t27 107-28.5 108-66.5 43h-130z" unicode="&#xe190;"/><glyph d="M200 1100h700q124 0 212-88t88-212v-500q0-124-88-212t-212-88h-700q-124 0-212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500zM700 300h-100v100h100v-100z" unicode="&#xe191;"/><glyph d="M200 1100h700q124 0 212-88t88-212v-500q0-124-88-212t-212-88h-700q-124 0-212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100zM700 300h-100v100h100v-100z" unicode="&#xe192;"/><glyph d="M200 1100h700q124 0 212-88t88-212v-500q0-124-88-212t-212-88h-700q-124 0-212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199-200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100v100h100v-100z" unicode="&#xe193;"/><glyph d="M600 1191q120 0 229.5-47t188.5-126 126-188.5 47-229.5-47-229.5-126-188.5-188.5-126-229.5-47-229.5 47-188.5 126-126 188.5-47 229.5 47 229.5 126 188.5 188.5 126 229.5 47zM600 1021q-114 0-211-56.5t-153.5-153.5-56.5-211 56.5-211 153.5-153.5 211-56.5 211 56.5 153.5 153.5 56.5 211-56.5 211-153.5 153.5-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" unicode="&#xe194;"/><glyph d="M600 1191q120 0 229.5-47t188.5-126 126-188.5 47-229.5-47-229.5-126-188.5-188.5-126-229.5-47-229.5 47-188.5 126-126 188.5-47 229.5 47 229.5 126 188.5 188.5 126 229.5 47zM600 1021q-114 0-211-56.5t-153.5-153.5-56.5-211 56.5-211 153.5-153.5 211-56.5 211 56.5 153.5 153.5 56.5 211-56.5 211-153.5 153.5-211 56.5zM800 700v-100l-50-50 100-100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z" unicode="&#xe195;"/><glyph d="M503 1089q110 0 200.5-59.5t134.5-156.5q44 14 90 14 120 0 205-86.5t85-207-85-207-205-86.5h-128v250q0 21-14.5 35.5t-35.5 14.5h-300q-21 0-35.5-14.5t-14.5-35.5v-250h-222q-80 0-136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19-2 37 0 100 49 185t134 134 185 49zM525 500h150q10 0 17.5-7.5t7.5-17.5v-275h137q21 0 26-11.5t-8-27.5l-223-244q-13-16-32-16t-32 16l-223 244q-13 16-8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" unicode="&#xe197;"/><glyph d="M502 1089q110 0 201-59.5t135-156.5q43 15 89 15 121 0 206-86.5t86-206.5q0-99-60-181t-150-110l-378 360q-13 16-31.5 16t-31.5-16l-381-365h-9q-79 0-135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19-2 38 0 100 49 184.5t133.5 134 184.5 49.5zM632 467l223-228q13-16 8-27.5t-26-11.5h-137v-275q0-10-7.5-17.5t-17.5-7.5h-150q-10 0-17.5 7.5t-7.5 17.5v275h-137q-21 0-26 11.5t8 27.5q199 204 223 228 19 19 31.5 19t32.5-19z" unicode="&#xe198;"/><glyph d="M700 100v100h400l-270 300h170l-270 300h170l-300 333-300-333h170l-270-300h170l-270-300h400v-100h-50q-21 0-35.5-14.5t-14.5-35.5v-50h400v50q0 21-14.5 35.5t-35.5 14.5h-50z" unicode="&#xe199;"/><glyph d="M600 1179q94 0 167.5-56.5t99.5-145.5q89-6 150.5-71.5t61.5-155.5q0-61-29.5-112.5t-79.5-82.5q9-29 9-55 0-74-52.5-126.5t-126.5-52.5q-55 0-100 30v-251q21 0 35.5-14.5t14.5-35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45-30-100-30-74 0-126.5 52.5t-52.5 126.5q0 18 4 38-47 21-75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23-2 0 2-1 10t-1 13q0 116 81.5 197.5t197.5 81.5z" unicode="&#xe200;"/><glyph d="M1010 1010q111-111 150.5-260.5t0-299-150.5-260.5q-83-83-191.5-126.5t-218.5-43.5-218.5 43.5-191.5 126.5q-111 111-150.5 260.5t0 299 150.5 260.5q83 83 191.5 126.5t218.5 43.5 218.5-43.5 191.5-126.5zM476 1065q-4 0-8-1-121-34-209.5-122.5t-122.5-209.5q-4-12 2.5-23t18.5-14l36-9q3-1 7-1 23 0 29 22 27 96 98 166 70 71 166 98 11 3 17.5 13.5t3.5 22.5l-9 35q-3 13-14 19-7 4-15 4zM512 920q-4 0-9-2-80-24-138.5-82.5t-82.5-138.5q-4-13 2-24t19-14l34-9q4-1 8-1 22 0 28 21 18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12-14 19-7 4-15 4zM719.5 719.5q-49.5 49.5-119.5 49.5t-119.5-49.5-49.5-119.5 49.5-119.5 119.5-49.5 119.5 49.5 49.5 119.5-49.5 119.5zM855 551q-22 0-28-21-18-58-58.5-98.5t-98.5-57.5q-11-4-17-14.5t-3-21.5l9-35q3-12 14-19 7-4 15-4 4 0 9 2 80 24 138.5 82.5t82.5 138.5q4 13-2.5 24t-18.5 14l-34 9q-4 1-8 1zM1000 515q-23 0-29-22-27-96-98-166-70-71-166-98-11-3-17.5-13.5t-3.5-22.5l9-35q3-13 14-19 7-4 15-4 4 0 8 1 121 34 209.5 122.5t122.5 209.5q4 12-2.5 23t-18.5 14l-36 9q-3 1-7 1z" unicode="&#xe201;"/><glyph d="M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212-212-212 212h162v200h100v-200zM520 0h-395q-10 0-17.5 7.5t-7.5 17.5v395zM1000 220v-195q0-10-7.5-17.5t-17.5-7.5h-195z" unicode="&#xe202;"/><glyph d="M700 800h300v-520l-350 350-550-550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0-17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0-10-7.5-17.5t-17.5-7.5h-155v80h180z" unicode="&#xe203;"/><glyph d="M1162 800h-162v-200h100l100-100h-300v300h-162l212 212zM200 800h200q27 0 40-2t29.5-10.5 23.5-30 7-57.5h300v-100h-600l-200-350v450h100q0 36 7 57.5t23.5 30 29.5 10.5 40 2zM800 400h240l-240-400h-800l300 500h500v-100z" unicode="&#xe204;"/><glyph d="M650 1100h100q21 0 35.5-14.5t14.5-35.5v-50h50q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-300q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5-29.5t29.5-70.5v-800q0-41-29.5-70.5t-70.5-29.5h-600q-1 0-20 4l246 246-326 326v324q0 41 29.5 70.5t70.5 29.5v-150q0-62 44-106t106-44h300q62 0 106 44t44 106zM412 250l-212-212v162h-200v100h200v162z" unicode="&#xe205;"/><glyph d="M450 1100h100q21 0 35.5-14.5t14.5-35.5v-50h50q21 0 35.5-14.5t14.5-35.5v-100q0-21-14.5-35.5t-35.5-14.5h-300q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5-29.5t29.5-70.5v-500h-200v-300h200q0-36-7-57.5t-23.5-30-29.5-10.5-40-2h-600q-41 0-70.5 29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0-62 44-106t106-44h300q62 0 106 44t44 106zM1212 250l-212-212v162h-200v100h200v162z" unicode="&#xe206;"/><glyph d="M658 1197l637-1104q23-38 7-65.5t-60-27.5h-1276q-44 0-60 27.5t7 65.5l637 1104q22 39 54 39t54-39zM704 800h-208q-20 0-32-14.5t-8-34.5l58-302q4-20 21.5-34.5t37.5-14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20-8 34.5t-32 14.5zM500 300v-100h200v100h-200z" unicode="&#xe209;"/><glyph d="M425 1100h250q10 0 17.5-7.5t7.5-17.5v-150q0-10-7.5-17.5t-17.5-7.5h-250q-10 0-17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 800h250q10 0 17.5-7.5t7.5-17.5v-150q0-10-7.5-17.5t-17.5-7.5h-250q-10 0-17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 800h250q10 0 17.5-7.5t7.5-17.5v-150q0-10-7.5-17.5t-17.5-7.5h-250q-10 0-17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5-7.5t7.5-17.5v-150q0-10-7.5-17.5t-17.5-7.5h-250q-10 0-17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 500h250q10 0 17.5-7.5t7.5-17.5v-150q0-10-7.5-17.5t-17.5-7.5h-250q-10 0-17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 500h250q10 0 17.5-7.5t7.5-17.5v-150q0-10-7.5-17.5t-17.5-7.5h-250q-10 0-17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 200h250q10 0 17.5-7.5t7.5-17.5v-150q0-10-7.5-17.5t-17.5-7.5h-250q-10 0-17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 200h250q10 0 17.5-7.5t7.5-17.5v-150q0-10-7.5-17.5t-17.5-7.5h-250q-10 0-17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 200h250q10 0 17.5-7.5t7.5-17.5v-150q0-10-7.5-17.5t-17.5-7.5h-250q-10 0-17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" unicode="&#xe210;"/><glyph d="M700 1200h100v-200h-100v-100h350q62 0 86.5-39.5t-3.5-94.5l-66-132q-41-83-81-134h-772q-40 51-81 134l-66 132q-28 55-3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5-14.5t14.5-35.5-14.5-35.5-35.5-14.5h-12l137-100h-950l138 100h-13q-21 0-35.5 14.5t-14.5 35.5 14.5 35.5 35.5 14.5zM50 100h1100q21 0 35.5-14.5t14.5-35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe211;"/><glyph d="M600 1300q40 0 68.5-29.5t28.5-70.5h-194q0 41 28.5 70.5t68.5 29.5zM443 1100h314q18-37 18-75 0-8-3-25h328q41 0 44.5-16.5t-30.5-38.5l-175-145h-678l-178 145q-34 22-29 38.5t46 16.5h328q-3 17-3 25 0 38 18 75zM250 700h700q21 0 35.5-14.5t14.5-35.5-14.5-35.5-35.5-14.5h-150v-200l275-200h-950l275 200v200h-150q-21 0-35.5 14.5t-14.5 35.5 14.5 35.5 35.5 14.5zM50 100h1100q21 0 35.5-14.5t14.5-35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe212;"/><glyph d="M600 1181q75 0 128-53t53-128-53-128-128-53-128 53-53 128 53 128 128 53zM602 798h46q34 0 55.5-28.5t21.5-86.5q0-76 39-183h-324q39 107 39 183 0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5-14.5t14.5-35.5-14.5-35.5-35.5-14.5h-13l138-100h-950l137 100h-12q-21 0-35.5 14.5t-14.5 35.5 14.5 35.5 35.5 14.5zM50 100h1100q21 0 35.5-14.5t14.5-35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe213;"/><glyph d="M600 1300q47 0 92.5-53.5t71-123 25.5-123.5q0-78-55.5-133.5t-133.5-55.5-133.5 55.5-55.5 133.5q0 62 34 143l144-143 111 111-163 163q34 26 63 26zM602 798h46q34 0 55.5-28.5t21.5-86.5q0-76 39-183h-324q39 107 39 183 0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5-14.5t14.5-35.5-14.5-35.5-35.5-14.5h-13l138-100h-950l137 100h-12q-21 0-35.5 14.5t-14.5 35.5 14.5 35.5 35.5 14.5zM50 100h1100q21 0 35.5-14.5t14.5-35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe214;"/><glyph d="M600 1200l300-161v-139h-300q0-57 18.5-108t50-91.5 63-72 70-67.5 57.5-61h-530q-60 83-90.5 177.5t-30.5 178.5 33 164.5 87.5 139.5 126 96.5 145.5 41.5v-98zM250 400h700q21 0 35.5-14.5t14.5-35.5-14.5-35.5-35.5-14.5h-13l138-100h-950l137 100h-12q-21 0-35.5 14.5t-14.5 35.5 14.5 35.5 35.5 14.5zM50 100h1100q21 0 35.5-14.5t14.5-35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe215;"/><glyph d="M600 1300q41 0 70.5-29.5t29.5-70.5v-78q46-26 73-72t27-100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400 800h400q54 0 100-27t72-73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0-83-58.5-141.5t-141.5-58.5h-400q-83 0-141.5 58.5t-58.5 141.5v400q0 83 58.5 141.5t141.5 58.5z" unicode="&#xe216;"/><glyph d="M150 1100h900q21 0 35.5-14.5t14.5-35.5v-500q0-21-14.5-35.5t-35.5-14.5h-900q-21 0-35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM125 400h950q10 0 17.5-7.5t7.5-17.5v-50q0-10-7.5-17.5t-17.5-7.5h-283l224-224q13-13 13-31.5t-13-32-31.5-13.5-31.5 13l-88 88h-524l-87-88q-13-13-32-13t-32 13.5-13 32 13 31.5l224 224h-289q-10 0-17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100-100h324l-100 100h-124z" unicode="&#xe218;"/><glyph d="M200 1100h800q83 0 141.5-58.5t58.5-141.5v-200h-100q0 41-29.5 70.5t-70.5 29.5h-250q-41 0-70.5-29.5t-29.5-70.5h-100q0 41-29.5 70.5t-70.5 29.5h-250q-41 0-70.5-29.5t-29.5-70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5-29.5t29.5-70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0-21-14.5-35.5t-35.5-14.5h-100q-21 0-35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0-21-14.5-35.5t-35.5-14.5h-100q-21 0-35.5 14.5t-14.5 35.5v50h200z" unicode="&#xe219;"/><glyph d="M480 1165l682-683q31-31 31-75.5t-31-75.5l-131-131h-481l-517 518q-32 31-32 75.5t32 75.5l295 296q31 31 75.5 31t76.5-31zM108 794l342-342 303 304-341 341zM250 100h800q21 0 35.5-14.5t14.5-35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe221;"/><glyph d="M1057 647l-189 506q-8 19-27.5 33t-40.5 14h-400q-21 0-40.5-14t-27.5-33l-189-506q-8-19 1.5-33t30.5-14h625v-150q0-21 14.5-35.5t35.5-14.5 35.5 14.5 14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897 0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h48v300h200v-300h47q21 0 35.5-14.5t14.5-35.5v-50h50q21 0 35.5-14.5t14.5-35.5v-50z" unicode="&#xe223;"/><glyph d="M900 800h300v-575q0-10-7.5-17.5t-17.5-7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200 900h-200v200zM400 600h300v-575q0-10-7.5-17.5t-17.5-7.5h-650q-10 0-17.5 7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z" unicode="&#xe224;"/><glyph d="M484 1095h195q75 0 146-32.5t124-86 89.5-122.5 48.5-142q18-14 35-20 31-10 64.5 6.5t43.5 48.5q10 34-15 71-19 27-9 43 5 8 12.5 11t19-1 23.5-16q41-44 39-105-3-63-46-106.5t-104-43.5h-62q-7-55-35-117t-56-100l-39-234q-3-20-20-34.5t-38-14.5h-100q-21 0-33 14.5t-9 34.5l12 70q-49-14-91-14h-195q-24 0-65 8l-11-64q-3-20-20-34.5t-38-14.5h-100q-21 0-33 14.5t-9 34.5l26 157q-84 74-128 175l-159 53q-19 7-33 26t-14 40v50q0 21 14.5 35.5t35.5 14.5h124q11 87 56 166l-111 95q-16 14-12.5 23.5t24.5 9.5h203q116 101 250 101zM675 1000h-250q-10 0-17.5-7.5t-7.5-17.5v-50q0-10 7.5-17.5t17.5-7.5h250q10 0 17.5 7.5t7.5 17.5v50q0 10-7.5 17.5t-17.5 7.5z" unicode="&#xe225;"/><glyph d="M641 900l423 247q19 8 42 2.5t37-21.5l32-38q14-15 12.5-36t-17.5-34l-139-120h-390zM50 1100h106q67 0 103-17t66-71l102-212h823q21 0 35.5-14.5t14.5-35.5v-50q0-21-14-40t-33-26l-737-132q-23-4-40 6t-26 25q-42 67-100 67h-300q-62 0-106 44t-44 106v200q0 62 44 106t106 44zM173 928h-80q-19 0-28-14t-9-35v-56q0-51 42-51h134q16 0 21.5 8t5.5 24q0 11-16 45t-27 51q-18 28-43 28zM550 727q-32 0-54.5-22.5t-22.5-54.5 22.5-54.5 54.5-22.5 54.5 22.5 22.5 54.5-22.5 54.5-54.5 22.5zM130 389l152 130q18 19 34 24t31-3.5 24.5-17.5 25.5-28q28-35 50.5-51t48.5-13l63 5 48-179q13-61-3.5-97.5t-67.5-79.5l-80-69q-47-40-109-35.5t-103 51.5l-130 151q-40 47-35.5 109.5t51.5 102.5zM380 377l-102-88q-31-27 2-65l37-43q13-15 27.5-19.5t31.5 6.5l61 53q19 16 14 49-2 20-12 56t-17 45q-11 12-19 14t-23-8z" unicode="&#xe226;"/><glyph d="M625 1200h150q10 0 17.5-7.5t7.5-17.5v-109q79-33 131-87.5t53-128.5q1-46-15-84.5t-39-61-46-38-39-21.5l-17-6q6 0 15-1.5t35-9 50-17.5 53-30 50-45 35.5-64 14.5-84q0-59-11.5-105.5t-28.5-76.5-44-51-49.5-31.5-54.5-16-49.5-6.5-43.5-1v-75q0-10-7.5-17.5t-17.5-7.5h-150q-10 0-17.5 7.5t-7.5 17.5v75h-100v-75q0-10-7.5-17.5t-17.5-7.5h-150q-10 0-17.5 7.5t-7.5 17.5v75h-175q-10 0-17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h-75q-10 0-17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h175v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5-7.5t7.5-17.5v-75h100v75q0 10 7.5 17.5t17.5 7.5zM400 900v-200h263q28 0 48.5 10.5t30 25 15 29 5.5 25.5l1 10q0 4-.5 11t-6 24-15 30-30 24-48.5 11h-263zM400 500v-200h363q28 0 48.5 10.5t30 25 15 29 5.5 25.5l1 10q0 4-.5 11t-6 24-15 30-30 24-48.5 11h-363z" unicode="&#xe227;"/><glyph d="M212 1198h780q86 0 147-61t61-147v-416q0-51-18-142.5t-36-157.5l-18-66q-29-87-93.5-146.5t-146.5-59.5h-572q-82 0-147 59t-93 147q-8 28-20 73t-32 143.5-20 149.5v416q0 86 61 147t147 61zM600 1045q-70 0-132.5-11.5t-105.5-30.5-78.5-41.5-57-45-36-41-20.5-30.5l-6-12 156-243h560l156 243q-2 5-6 12.5t-20 29.5-36.5 42-57 44.5-79 42-105 29.5-132.5 12zM762 703h-157l195 261z" unicode="&#xe230;"/><glyph d="M475 1300h150q103 0 189-86t86-189v-500q0-41-42-83t-83-42h-450q-41 0-83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0-21-27-48t-48-27h-150q-21 0-48 27t-27 48v225h300z" unicode="&#xe231;"/><glyph d="M475 1300h96q0-150 89.5-239.5t239.5-89.5v-446q0-41-42-83t-83-42h-450q-41 0-83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0-21-27-48t-48-27h-150q-21 0-48 27t-27 48v225h300z" unicode="&#xe232;"/><glyph d="M1294 767l-638-283-378 170-78-60v-224l100-150v-199l-150 148-150-149v200l100 150v250q0 4-.5 10.5t0 9.5 1 8 3 8 6.5 6l47 40-147 65 642 283zM1000 380l-350-166-350 166v147l350-165 350 165v-147z" unicode="&#xe233;"/><glyph d="M250 800q62 0 106-44t44-106-44-106-106-44-106 44-44 106 44 106 106 44zM650 800q62 0 106-44t44-106-44-106-106-44-106 44-44 106 44 106 106 44zM1050 800q62 0 106-44t44-106-44-106-106-44-106 44-44 106 44 106 106 44z" unicode="&#xe234;"/><glyph d="M550 1100q62 0 106-44t44-106-44-106-106-44-106 44-44 106 44 106 106 44zM550 700q62 0 106-44t44-106-44-106-106-44-106 44-44 106 44 106 106 44zM550 300q62 0 106-44t44-106-44-106-106-44-106 44-44 106 44 106 106 44z" unicode="&#xe235;"/><glyph d="M125 1100h950q10 0 17.5-7.5t7.5-17.5v-150q0-10-7.5-17.5t-17.5-7.5h-950q-10 0-17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 700h950q10 0 17.5-7.5t7.5-17.5v-150q0-10-7.5-17.5t-17.5-7.5h-950q-10 0-17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 300h950q10 0 17.5-7.5t7.5-17.5v-150q0-10-7.5-17.5t-17.5-7.5h-950q-10 0-17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" unicode="&#xe236;"/><glyph d="M350 1200h500q162 0 256-93.5t94-256.5v-500q0-165-93.5-257.5t-256.5-92.5h-500q-165 0-257.5 92.5t-92.5 257.5v500q0 165 92.5 257.5t257.5 92.5zM900 1000h-600q-41 0-70.5-29.5t-29.5-70.5v-600q0-41 29.5-70.5t70.5-29.5h600q41 0 70.5 29.5t29.5 70.5v600q0 41-29.5 70.5t-70.5 29.5zM350 900h500q21 0 35.5-14.5t14.5-35.5v-300q0-21-14.5-35.5t-35.5-14.5h-500q-21 0-35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400 800v-200h400v200h-400z" unicode="&#xe237;"/><glyph d="M150 1100h1000q21 0 35.5-14.5t14.5-35.5-14.5-35.5-35.5-14.5h-50v-200h50q21 0 35.5-14.5t14.5-35.5-14.5-35.5-35.5-14.5h-50v-200h50q21 0 35.5-14.5t14.5-35.5-14.5-35.5-35.5-14.5h-50v-200h50q21 0 35.5-14.5t14.5-35.5-14.5-35.5-35.5-14.5h-1000q-21 0-35.5 14.5t-14.5 35.5 14.5 35.5 35.5 14.5h50v200h-50q-21 0-35.5 14.5t-14.5 35.5 14.5 35.5 35.5 14.5h50v200h-50q-21 0-35.5 14.5t-14.5 35.5 14.5 35.5 35.5 14.5h50v200h-50q-21 0-35.5 14.5t-14.5 35.5 14.5 35.5 35.5 14.5z" unicode="&#xe238;"/><glyph d="M650 1187q87-67 118.5-156t0-178-118.5-155q-87 66-118.5 155t0 178 118.5 156zM300 800q124 0 212-88t88-212q-124 0-212 88t-88 212zM1000 800q0-124-88-212t-212-88q0 124 88 212t212 88zM300 500q124 0 212-88t88-212q-124 0-212 88t-88 212zM1000 500q0-124-88-212t-212-88q0 124 88 212t212 88zM700 199v-144q0-21-14.5-35.5t-35.5-14.5-35.5 14.5-14.5 35.5v142q40-4 43-4 17 0 57 6z" unicode="&#xe239;"/><glyph d="M745 878l69 19q25 6 45-12l298-295q11-11 15-26.5t-2-30.5q-5-14-18-23.5t-28-9.5h-8q1 0 1-13 0-29-2-56t-8.5-62-20-63-33-53-51-39-72.5-14h-146q-184 0-184 288 0 24 10 47-20 4-62 4t-63-4q11-24 11-47 0-288-184-288h-142q-48 0-84.5 21t-56 51-32 71.5-16 75-3.5 68.5q0 13 2 13h-7q-15 0-27.5 9.5t-18.5 23.5q-6 15-2 30.5t15 25.5l298 296q20 18 46 11l76-19q20-5 30.5-22.5t5.5-37.5-22.5-31-37.5-5l-51 12-182-193h891l-182 193-44-12q-20-5-37.5 6t-22.5 31 6 37.5 31 22.5z" unicode="&#xe240;"/><glyph d="M1200 900h-50q0 21-4 37t-9.5 26.5-18 17.5-22 11-28.5 5.5-31 2-37 .5h-200v-850q0-22 25-34.5t50-13.5l25-2v-100h-400v100q4 0 11 .5t24 3 30 7 24 15 11 24.5v850h-200q-25 0-37-.5t-31-2-28.5-5.5-22-11-18-17.5-9.5-26.5-4-37h-50v300h1000v-300zM500 450h-25q0 15-4 24.5t-9 14.5-17 7.5-20 3-25 .5h-100v-425q0-11 12.5-17.5t25.5-7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0-25-.5t-20-3-17-7.5-9-14.5-4-24.5h-25v150h500v-150z" unicode="&#xe241;"/><glyph d="M1000 300v50q-25 0-55 32-14 14-25 31t-16 27l-4 11-289 747h-69l-300-754q-18-35-39-56-9-9-24.5-18.5t-26.5-14.5l-11-5v-50h273v50q-49 0-78.5 21.5t-11.5 67.5l69 176h293l61-166q13-34-3.5-66.5t-55.5-32.5v-50h312zM412 691l134 342 121-342h-255zM1100 150v-100q0-21-14.5-35.5t-35.5-14.5h-1000q-21 0-35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5-14.5t14.5-35.5z" unicode="&#xe242;"/><glyph d="M50 1200h1100q21 0 35.5-14.5t14.5-35.5v-1100q0-21-14.5-35.5t-35.5-14.5h-1100q-21 0-35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5zM611 1118h-70q-13 0-18-12l-299-753q-17-32-35-51-18-18-56-34-12-5-12-18v-50q0-8 5.5-14t14.5-6h273q8 0 14 6t6 14v50q0 8-6 14t-14 6q-55 0-71 23-10 14 0 39l63 163h266l57-153q11-31-6-55-12-17-36-17-8 0-14-6t-6-14v-50q0-8 6-14t14-6h313q8 0 14 6t6 14v50q0 7-5.5 13t-13.5 7q-17 0-42 25-25 27-40 63h-1l-288 748q-5 12-19 12zM639 611h-197l103 264z" unicode="&#xe243;"/><glyph d="M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0 35.5-14.5t14.5-35.5v-900q0-21-14.5-35.5t-35.5-14.5h-400q-21 0-35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5-14.5t14.5-35.5v-400q0-21-14.5-35.5t-35.5-14.5h-400q-21 0-35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z" unicode="&#xe244;"/><glyph d="M50 1200h400q21 0 35.5-14.5t14.5-35.5v-900q0-21-14.5-35.5t-35.5-14.5h-400q-21 0-35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 700h400q21 0 35.5-14.5t14.5-35.5v-400q0-21-14.5-35.5t-35.5-14.5h-400q-21 0-35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z" unicode="&#xe245;"/><glyph d="M50 1000h400q21 0 35.5-14.5t14.5-35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5-14.5t14.5-35.5v-150h100v-100h-100v-150q0-21-14.5-35.5t-35.5-14.5h-400q-21 0-35.5 14.5t-14.5 35.5v150h-100v-350q0-21-14.5-35.5t-35.5-14.5h-400q-21 0-35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z" unicode="&#xe246;"/><glyph d="M100 0h-100v1200h100v-1200zM250 1100h400q21 0 35.5-14.5t14.5-35.5v-400q0-21-14.5-35.5t-35.5-14.5h-400q-21 0-35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250 500h900q21 0 35.5-14.5t14.5-35.5v-400q0-21-14.5-35.5t-35.5-14.5h-900q-21 0-35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe247;"/><glyph d="M600 1100h150q21 0 35.5-14.5t14.5-35.5v-400q0-21-14.5-35.5t-35.5-14.5h-150v-100h450q21 0 35.5-14.5t14.5-35.5v-400q0-21-14.5-35.5t-35.5-14.5h-900q-21 0-35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h350v100h-150q-21 0-35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z" unicode="&#xe248;"/><glyph d="M1200 0h-100v1200h100v-1200zM550 1100h400q21 0 35.5-14.5t14.5-35.5v-400q0-21-14.5-35.5t-35.5-14.5h-400q-21 0-35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50 500h900q21 0 35.5-14.5t14.5-35.5v-400q0-21-14.5-35.5t-35.5-14.5h-900q-21 0-35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" unicode="&#xe249;"/><glyph d="M865 565l-494-494q-23-23-41-23-14 0-22 13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41-23l494-494q14-14 14-35t-14-35z" unicode="&#xe250;"/><glyph d="M335 635l494 494q29 29 50 20.5t21-49.5v-1000q0-41-21-49.5t-50 20.5l-494 494q-14 14-14 35t14 35z" unicode="&#xe251;"/><glyph d="M100 900h1000q41 0 49.5-21t-20.5-50l-494-494q-14-14-35-14t-35 14l-494 494q-29 29-20.5 50t49.5 21z" unicode="&#xe252;"/><glyph d="M635 865l494-494q29-29 20.5-50t-49.5-21h-1000q-41 0-49.5 21t20.5 50l494 494q14 14 35 14t35-14z" unicode="&#xe253;"/><glyph d="M700 741v-182l-692-323v221l413 193-413 193v221zM1200 0h-800v200h800v-200z" unicode="&#xe254;"/><glyph d="M1200 900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4 37t9.5 26.5 18 17.5 22 11 28.5 5.5 31 2 37 .5h100v-550q0-22-25-34.5t-50-13.5l-25-2v-100h400v100q-4 0-11 .5t-24 3-30 7-24 15-11 24.5v550h100q25 0 37-.5t31-2 28.5-5.5 22-11 18-17.5 9.5-26.5 4-37h50v300h-800v-300z" unicode="&#xe255;"/><glyph d="M800 700h-50q0 21-4 37t-9.5 26.5-18 17.5-22 11-28.5 5.5-31 2-37 .5h-100v-550q0-22 25-34.5t50-14.5l25-1v-100h-400v100q4 0 11 .5t24 3 30 7 24 15 11 24.5v550h-100q-25 0-37-.5t-31-2-28.5-5.5-22-11-18-17.5-9.5-26.5-4-37h-50v300h800v-300zM1100 200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z" unicode="&#xe256;"/><glyph d="M701 1098h160q16 0 21-11t-7-23l-464-464 464-464q12-12 7-23t-21-11h-160q-13 0-23 9l-471 471q-7 8-7 18t7 18l471 471q10 9 23 9z" unicode="&#xe257;"/><glyph d="M339 1098h160q13 0 23-9l471-471q7-8 7-18t-7-18l-471-471q-10-9-23-9h-160q-16 0-21 11t7 23l464 464-464 464q-12 12-7 23t21 11z" unicode="&#xe258;"/><glyph d="M1087 882q11-5 11-21v-160q0-13-9-23l-471-471q-8-7-18-7t-18 7l-471 471q-9 10-9 23v160q0 16 11 21t23-7l464-464 464 464q12 12 23 7z" unicode="&#xe259;"/><glyph d="M618 993l471-471q9-10 9-23v-160q0-16-11-21t-23 7l-464 464-464-464q-12-12-23-7t-11 21v160q0 13 9 23l471 471q8 7 18 7t18-7z" unicode="&#xe260;"/><glyph d="M1000 1200q0-124-88-212t-212-88q0 124 88 212t212 88zM450 1000h100q21 0 40-14t26-33l79-194q5 1 16 3 34 6 54 9.5t60 7 65.5 1 61-10 56.5-23 42.5-42 29-64 5-92-19.5-121.5q-1-7-3-19.5t-11-50-20.5-73-32.5-81.5-46.5-83-64-70-82.5-50q-13-5-42-5t-65.5 2.5-47.5 2.5q-14 0-49.5-3.5t-63-3.5-43.5 7q-57 25-104.5 78.5t-75 111.5-46.5 112-26 90l-7 35q-15 63-18 115t4.5 88.5 26 64 39.5 43.5 52 25.5 58.5 13 62.5 2 59.5-4.5 55.5-8l-147 192q-12 18-5.5 30t27.5 12z" unicode="&#xf8ff;"/><glyph d="M250 1200h600q21 0 35.5-14.5t14.5-35.5v-400q0-21-14.5-35.5t-35.5-14.5h-150v-500l-255-178q-19-9-32-1t-13 29v650h-150q-21 0-35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400 1100v-100h300v100h-300z" unicode="&#x1f511;"/><glyph d="M250 1200h750q39 0 69.5-40.5t30.5-84.5v-933l-700-117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500 525v-100l100 20v100z" unicode="&#x1f6aa;"/></font></defs></svg>
\ No newline at end of file
diff --git a/route/static/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.ttf b/route/static/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.ttf
deleted file mode 100755
index 1413fc609ab6f21774de0cb7e01360095584f65b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 45404
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

diff --git a/route/static/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff b/route/static/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff
deleted file mode 100755
index 9e612858f802245ddcbf59788a0db942224bab35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23424
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
G`u_lkUM?>H

diff --git a/route/static/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff2 b/route/static/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff2
deleted file mode 100755
index 64539b54c3751a6d9adb44c8e3a45ba5a73b77f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18028
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

diff --git a/route/static/bootstrap-3.3.5/fonts/index.html b/route/static/bootstrap-3.3.5/fonts/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/bootstrap-3.3.5/fonts/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/bootstrap-3.3.5/index.html b/route/static/bootstrap-3.3.5/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/bootstrap-3.3.5/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/build/addons/attach/attach.js b/route/static/build/addons/attach/attach.js
deleted file mode 100755
index 847cb62e8..000000000
--- a/route/static/build/addons/attach/attach.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * Copyright (c) 2014 The xterm.js authors. All rights reserved.
- * @license MIT
- *
- * Implements the attach method, that attaches the terminal to a WebSocket stream.
- */
-
-(function (attach) {
-  if (typeof exports === 'object' && typeof module === 'object') {
-    /*
-     * CommonJS environment
-     */
-    module.exports = attach(require('../../Terminal').Terminal);
-  } else if (typeof define == 'function') {
-    /*
-     * Require.js is available
-     */
-    define(['../../xterm'], attach);
-  } else {
-    /*
-     * Plain browser environment
-     */
-    attach(window.Terminal);
-  }
-})(function (Terminal) {
-  'use strict';
-
-  var exports = {};
-
-  /**
-   * Attaches the given terminal to the given socket.
-   *
-   * @param {Terminal} term - The terminal to be attached to the given socket.
-   * @param {WebSocket} socket - The socket to attach the current terminal.
-   * @param {boolean} bidirectional - Whether the terminal should send data
-   *                                  to the socket as well.
-   * @param {boolean} buffered - Whether the rendering of incoming data
-   *                             should happen instantly or at a maximum
-   *                             frequency of 1 rendering per 10ms.
-   */
-  exports.attach = function (term, socket, bidirectional, buffered) {
-    bidirectional = (typeof bidirectional == 'undefined') ? true : bidirectional;
-    term.socket = socket;
-
-    term._flushBuffer = function () {
-      term.write(term._attachSocketBuffer);
-      term._attachSocketBuffer = null;
-    };
-
-    term._pushToBuffer = function (data) {
-      if (term._attachSocketBuffer) {
-        term._attachSocketBuffer += data;
-      } else {
-        term._attachSocketBuffer = data;
-        setTimeout(term._flushBuffer, 10);
-      }
-    };
-
-    var myTextDecoder;
-
-    term._getMessage = function (ev) {
-      var str;
-      if (typeof ev.data === "object") {
-        if (ev.data instanceof ArrayBuffer) {
-            if (!myTextDecoder) {
-              myTextDecoder = new TextDecoder();
-            }
-
-            str = myTextDecoder.decode( ev.data );
-        }
-        else {
-          throw "TODO: handle Blob?";
-        }
-      }
-
-      if (buffered) {
-        term._pushToBuffer(str || ev.data);
-      } else {
-        term.write(str || ev.data);
-      }
-    };
-
-    term._sendData = function (data) {
-      socket.send(data);
-    };
-
-    socket.addEventListener('message', term._getMessage);
-
-    if (bidirectional) {
-      term.on('data', term._sendData);
-    }
-
-    socket.addEventListener('close', term.detach.bind(term, socket));
-    socket.addEventListener('error', term.detach.bind(term, socket));
-  };
-
-  /**
-   * Detaches the given terminal from the given socket
-   *
-   * @param {Terminal} term - The terminal to be detached from the given socket.
-   * @param {WebSocket} socket - The socket from which to detach the current
-   *                             terminal.
-   */
-  exports.detach = function (term, socket) {
-    term.off('data', term._sendData);
-
-    socket = (typeof socket == 'undefined') ? term.socket : socket;
-
-    if (socket) {
-      socket.removeEventListener('message', term._getMessage);
-    }
-
-    delete term.socket;
-  };
-
-  /**
-   * Attaches the current terminal to the given socket
-   *
-   * @param {WebSocket} socket - The socket to attach the current terminal.
-   * @param {boolean} bidirectional - Whether the terminal should send data
-   *                                  to the socket as well.
-   * @param {boolean} buffered - Whether the rendering of incoming data
-   *                             should happen instantly or at a maximum
-   *                             frequency of 1 rendering per 10ms.
-   */
-  Terminal.prototype.attach = function (socket, bidirectional, buffered) {
-    return exports.attach(this, socket, bidirectional, buffered);
-  };
-
-  /**
-   * Detaches the current terminal from the given socket.
-   *
-   * @param {WebSocket} socket - The socket from which to detach the current
-   *                             terminal.
-   */
-  Terminal.prototype.detach = function (socket) {
-    return exports.detach(this, socket);
-  };
-
-  return exports;
-});
diff --git a/route/static/build/addons/attach/index.html b/route/static/build/addons/attach/index.html
deleted file mode 100755
index 4a41fbde2..000000000
--- a/route/static/build/addons/attach/index.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <link rel="stylesheet" href="../../src/xterm.css" />
-    <link rel="stylesheet" href="../../demo/style.css" />
-    <script src="../../src/xterm.js"></script>
-    <script src="attach.js"></script>
-    <style>
-        body {
-            color: #111;
-        }
-        
-        h1, h2 {
-            color: #444;
-            border-bottom: 1px solid #ddd;
-            text-align: left;
-        }
-        
-        form {
-            margin-bottom: 32px;
-        }
-        
-        input, button {
-            line-height: 22px;
-            font-size: 16px;
-            display: inline-block;
-            border-radius: 2px;
-            border: 1px solid #ccc;
-        }
-        
-        input {
-            height: 22px;
-            padding-left: 4px;
-            padding-right: 4px;
-        }
-        
-        button {
-            height: 28px;
-            background-color: #ccc;
-            cursor: pointer;
-            color: #333;
-        }
-        
-        .container {
-            max-width: 900px;
-            margin: 0 auto;
-        }
-    </style>
-  </head>
-  <body>
-      <div class="container">
-          
-    <h1>
-        xterm.js: socket attach
-    </h1>
-          <p>
-              Attach the terminal to a WebSocket terminal stream with ease. Perfect for attaching to your
-              Docker containers.
-          </p>
-          <h2>
-              Socket information
-          </h2>
-    <form id="socket-form">
-      <input id="socket-url"
-             type="text"
-             placeholder="Enter socket url (e.g. ws://mysock)"
-             autofocus />
-      <button>
-        Attach
-      </button>
-    </form>
-    <div id="terminal-container"></div>
-          
-      </div>
-    <script>
-      var term = new Terminal(),
-          container = document.getElementById('terminal-container'),
-          socketUrl = document.getElementById('socket-url'),
-          socketForm = document.getElementById('socket-form');
-      
-      socketForm.addEventListener('submit', function (ev) {
-        ev.preventDefault();
-        var url = socketUrl.value,
-            sock = new WebSocket(url);
-        sock.addEventListener('open', function () {
-          term.attach(sock);
-        });
-      });
-      
-      term.open(container);
-    </script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/route/static/build/addons/attach/package.json b/route/static/build/addons/attach/package.json
deleted file mode 100755
index e8f6b2ca2..000000000
--- a/route/static/build/addons/attach/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "xterm.attach",
-  "main": "attach.js",
-  "private": true
-}
diff --git a/route/static/build/addons/fit/fit.js b/route/static/build/addons/fit/fit.js
deleted file mode 100755
index 01e0c2f21..000000000
--- a/route/static/build/addons/fit/fit.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Copyright (c) 2014 The xterm.js authors. All rights reserved.
- * @license MIT
- *
- * Fit terminal columns and rows to the dimensions of its DOM element.
- *
- * ## Approach
- *
- *    Rows: Truncate the division of the terminal parent element height by the
- *          terminal row height.
- * Columns: Truncate the division of the terminal parent element width by the
- *          terminal character width (apply display: inline at the terminal
- *          row and truncate its width with the current number of columns).
- */
-
-(function (fit) {
-  if (typeof exports === 'object' && typeof module === 'object') {
-    /*
-     * CommonJS environment
-     */
-    module.exports = fit(require('../../Terminal').Terminal);
-  } else if (typeof define == 'function') {
-    /*
-     * Require.js is available
-     */
-    define(['../../xterm'], fit);
-  } else {
-    /*
-     * Plain browser environment
-     */
-    fit(window.Terminal);
-  }
-})(function (Terminal) {
-  var exports = {};
-
-  exports.proposeGeometry = function (term) {
-    if (!term.element.parentElement) {
-      return null;
-    }
-    var parentElementStyle = window.getComputedStyle(term.element.parentElement);
-    var parentElementHeight = parseInt(parentElementStyle.getPropertyValue('height'));
-    var parentElementWidth = Math.max(0, parseInt(parentElementStyle.getPropertyValue('width')) - 17);
-    var elementStyle = window.getComputedStyle(term.element);
-    var elementPaddingVer = parseInt(elementStyle.getPropertyValue('padding-top')) + parseInt(elementStyle.getPropertyValue('padding-bottom'));
-    var elementPaddingHor = parseInt(elementStyle.getPropertyValue('padding-right')) + parseInt(elementStyle.getPropertyValue('padding-left'));
-    var availableHeight = parentElementHeight - elementPaddingVer;
-    var availableWidth = parentElementWidth - elementPaddingHor;
-    var geometry = {
-      cols: Math.floor(availableWidth / term.charMeasure.width),
-      rows: Math.floor(availableHeight / Math.floor(term.charMeasure.height * term.getOption('lineHeight')))
-    };
-
-    return geometry;
-  };
-
-  exports.fit = function (term) {
-    // Wrap fit in a setTimeout as charMeasure needs time to get initialized
-    // after calling Terminal.open
-    setTimeout(function () {
-      var geometry = exports.proposeGeometry(term);
-
-      if (geometry) {
-        // Force a full render
-        if (term.rows !== geometry.rows || term.cols !== geometry.cols) {
-          term.renderer.clear();
-          term.resize(geometry.cols, geometry.rows);
-        }
-      }
-    }, 0);
-  };
-
-  Terminal.prototype.proposeGeometry = function () {
-    return exports.proposeGeometry(this);
-  };
-
-  Terminal.prototype.fit = function () {
-    return exports.fit(this);
-  };
-
-  return exports;
-});
diff --git a/route/static/build/addons/fit/package.json b/route/static/build/addons/fit/package.json
deleted file mode 100755
index aec1bbd6d..000000000
--- a/route/static/build/addons/fit/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "xterm.fit",
-  "main": "fit.js",
-  "private": true
-}
diff --git a/route/static/build/addons/fullscreen/fullscreen.css b/route/static/build/addons/fullscreen/fullscreen.css
deleted file mode 100755
index 37229932f..000000000
--- a/route/static/build/addons/fullscreen/fullscreen.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.xterm.fullscreen {
-    position: fixed;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    width: auto;
-    height: auto;
-    z-index: 255;
-}
diff --git a/route/static/build/addons/fullscreen/fullscreen.js b/route/static/build/addons/fullscreen/fullscreen.js
deleted file mode 100755
index f1dc56a26..000000000
--- a/route/static/build/addons/fullscreen/fullscreen.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2014 The xterm.js authors. All rights reserved.
- * @license MIT
- */
-
-(function (fullscreen) {
-  if (typeof exports === 'object' && typeof module === 'object') {
-    /*
-     * CommonJS environment
-     */
-    module.exports = fullscreen(require('../../Terminal').Terminal);
-  } else if (typeof define == 'function') {
-    /*
-     * Require.js is available
-     */
-    define(['../../xterm'], fullscreen);
-  } else {
-    /*
-     * Plain browser environment
-     */
-    fullscreen(window.Terminal);
-  }
-})(function (Terminal) {
-  var exports = {};
-
-  /**
-   * Toggle the given terminal's fullscreen mode.
-   * @param {Terminal} term - The terminal to toggle full screen mode
-   * @param {boolean} fullscreen - Toggle fullscreen on (true) or off (false)
-   */
-  exports.toggleFullScreen = function (term, fullscreen) {
-    var fn;
-
-    if (typeof fullscreen == 'undefined') {
-      fn = (term.element.classList.contains('fullscreen')) ? 'remove' : 'add';
-    } else if (!fullscreen) {
-      fn = 'remove';
-    } else {
-      fn = 'add';
-    }
-
-    term.element.classList[fn]('fullscreen');
-  };
-
-  Terminal.prototype.toggleFullscreen = function (fullscreen) {
-    exports.toggleFullScreen(this, fullscreen);
-  };
-
-  return exports;
-});
diff --git a/route/static/build/addons/fullscreen/package.json b/route/static/build/addons/fullscreen/package.json
deleted file mode 100755
index 9c359a052..000000000
--- a/route/static/build/addons/fullscreen/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "xterm.fullscreen",
-  "main": "fullscreen.js",
-  "private": true
-}
diff --git a/route/static/build/addons/search/search.js b/route/static/build/addons/search/search.js
deleted file mode 100755
index 088e28347..000000000
--- a/route/static/build/addons/search/search.js
+++ /dev/null
@@ -1,116 +0,0 @@
-(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var SearchHelper = (function () {
-    function SearchHelper(_terminal) {
-        this._terminal = _terminal;
-    }
-    SearchHelper.prototype.findNext = function (term) {
-        if (!term || term.length === 0) {
-            return false;
-        }
-        var result;
-        var startRow = this._terminal.buffer.ydisp;
-        if (this._terminal.selectionManager.selectionEnd) {
-            startRow = this._terminal.selectionManager.selectionEnd[1];
-        }
-        for (var y = startRow + 1; y < this._terminal.buffer.ybase + this._terminal.rows; y++) {
-            result = this._findInLine(term, y);
-            if (result) {
-                break;
-            }
-        }
-        if (!result) {
-            for (var y = 0; y < startRow; y++) {
-                result = this._findInLine(term, y);
-                if (result) {
-                    break;
-                }
-            }
-        }
-        return this._selectResult(result);
-    };
-    SearchHelper.prototype.findPrevious = function (term) {
-        if (!term || term.length === 0) {
-            return false;
-        }
-        var result;
-        var startRow = this._terminal.buffer.ydisp;
-        if (this._terminal.selectionManager.selectionStart) {
-            startRow = this._terminal.selectionManager.selectionStart[1];
-        }
-        for (var y = startRow - 1; y >= 0; y--) {
-            result = this._findInLine(term, y);
-            if (result) {
-                break;
-            }
-        }
-        if (!result) {
-            for (var y = this._terminal.buffer.ybase + this._terminal.rows - 1; y > startRow; y--) {
-                result = this._findInLine(term, y);
-                if (result) {
-                    break;
-                }
-            }
-        }
-        return this._selectResult(result);
-    };
-    SearchHelper.prototype._findInLine = function (term, y) {
-        var lowerStringLine = this._terminal.buffer.translateBufferLineToString(y, true).toLowerCase();
-        var lowerTerm = term.toLowerCase();
-        var searchIndex = lowerStringLine.indexOf(lowerTerm);
-        if (searchIndex >= 0) {
-            return {
-                term: term,
-                col: searchIndex,
-                row: y
-            };
-        }
-    };
-    SearchHelper.prototype._selectResult = function (result) {
-        if (!result) {
-            return false;
-        }
-        this._terminal.selectionManager.setSelection(result.col, result.row, result.term.length);
-        this._terminal.scrollLines(result.row - this._terminal.buffer.ydisp, false);
-        return true;
-    };
-    return SearchHelper;
-}());
-exports.SearchHelper = SearchHelper;
-
-
-
-},{}],2:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var SearchHelper_1 = require("./SearchHelper");
-(function (addon) {
-    if (typeof window !== 'undefined' && 'Terminal' in window) {
-        addon(window.Terminal);
-    }
-    else if (typeof exports === 'object' && typeof module === 'object') {
-        module.exports = addon(require('../../Terminal').Terminal);
-    }
-    else if (typeof define === 'function') {
-        define(['../../xterm'], addon);
-    }
-})(function (Terminal) {
-    Terminal.prototype.findNext = function (term) {
-        if (!this._searchHelper) {
-            this.searchHelper = new SearchHelper_1.SearchHelper(this);
-        }
-        return this.searchHelper.findNext(term);
-    };
-    Terminal.prototype.findPrevious = function (term) {
-        if (!this._searchHelper) {
-            this.searchHelper = new SearchHelper_1.SearchHelper(this);
-        }
-        return this.searchHelper.findPrevious(term);
-    };
-});
-
-
-
-},{"../../Terminal":undefined,"./SearchHelper":1}]},{},[2])
-//# sourceMappingURL=search.js.map
diff --git a/route/static/build/addons/search/search.js.map b/route/static/build/addons/search/search.js.map
deleted file mode 100755
index baa06e886..000000000
--- a/route/static/build/addons/search/search.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"search.js","sources":["../../../src/addons/search/search.ts","../../../src/addons/search/SearchHelper.ts","../../../node_modules/browser-pack/_prelude.js"],"sourcesContent":["/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { SearchHelper } from './SearchHelper';\n\ndeclare var exports: any;\ndeclare var module: any;\ndeclare var define: any;\ndeclare var require: any;\ndeclare var window: any;\n\n(function (addon) {\n  if (typeof window !== 'undefined' && 'Terminal' in window) {\n    /**\n     * Plain browser environment\n     */\n    addon(window.Terminal);\n  } else if (typeof exports === 'object' && typeof module === 'object') {\n    /**\n     * CommonJS environment\n     */\n    module.exports = addon(require('../../Terminal').Terminal);\n  } else if (typeof define === 'function') {\n    /**\n     * Require.js is available\n     */\n    define(['../../xterm'], addon);\n  }\n})((Terminal: any) => {\n  /**\n   * Find the next instance of the term, then scroll to and select it. If it\n   * doesn't exist, do nothing.\n   * @param term Tne search term.\n   * @return Whether a result was found.\n   */\n  Terminal.prototype.findNext = function(term: string): boolean {\n    if (!this._searchHelper) {\n      this.searchHelper = new SearchHelper(this);\n    }\n    return (<SearchHelper>this.searchHelper).findNext(term);\n  };\n\n  /**\n   * Find the previous instance of the term, then scroll to and select it. If it\n   * doesn't exist, do nothing.\n   * @param term Tne search term.\n   * @return Whether a result was found.\n   */\n  Terminal.prototype.findPrevious = function(term: string): boolean {\n    if (!this._searchHelper) {\n      this.searchHelper = new SearchHelper(this);\n    }\n    return (<SearchHelper>this.searchHelper).findPrevious(term);\n  };\n});\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\n// import { ITerminal } from '../../Interfaces';\n// import { translateBufferLineToString } from '../../utils/BufferLine';\n\ninterface ISearchResult {\n  term: string;\n  col: number;\n  row: number;\n}\n\n/**\n * A class that knows how to search the terminal and how to display the results.\n */\nexport class SearchHelper {\n  constructor(private _terminal: any) {\n    // TODO: Search for multiple instances on 1 line\n    // TODO: Don't use the actual selection, instead use a \"find selection\" so multiple instances can be highlighted\n    // TODO: Highlight other instances in the viewport\n    // TODO: Support regex, case sensitivity, etc.\n  }\n\n  /**\n   * Find the next instance of the term, then scroll to and select it. If it\n   * doesn't exist, do nothing.\n   * @param term Tne search term.\n   * @return Whether a result was found.\n   */\n  public findNext(term: string): boolean {\n    if (!term || term.length === 0) {\n      return false;\n    }\n\n    let result: ISearchResult;\n\n    let startRow = this._terminal.buffer.ydisp;\n    if (this._terminal.selectionManager.selectionEnd) {\n      // Start from the selection end if there is a selection\n      startRow = this._terminal.selectionManager.selectionEnd[1];\n    }\n\n    // Search from ydisp + 1 to end\n    for (let y = startRow + 1; y < this._terminal.buffer.ybase + this._terminal.rows; y++) {\n      result = this._findInLine(term, y);\n      if (result) {\n        break;\n      }\n    }\n\n    // Search from the top to the current ydisp\n    if (!result) {\n      for (let y = 0; y < startRow; y++) {\n        result = this._findInLine(term, y);\n        if (result) {\n          break;\n        }\n      }\n    }\n\n    // Set selection and scroll if a result was found\n    return this._selectResult(result);\n  }\n\n  /**\n   * Find the previous instance of the term, then scroll to and select it. If it\n   * doesn't exist, do nothing.\n   * @param term Tne search term.\n   * @return Whether a result was found.\n   */\n  public findPrevious(term: string): boolean {\n    if (!term || term.length === 0) {\n      return false;\n    }\n\n    let result: ISearchResult;\n\n    let startRow = this._terminal.buffer.ydisp;\n    if (this._terminal.selectionManager.selectionStart) {\n      // Start from the selection end if there is a selection\n      startRow = this._terminal.selectionManager.selectionStart[1];\n    }\n\n    // Search from ydisp + 1 to end\n    for (let y = startRow - 1; y >= 0; y--) {\n      result = this._findInLine(term, y);\n      if (result) {\n        break;\n      }\n    }\n\n    // Search from the top to the current ydisp\n    if (!result) {\n      for (let y = this._terminal.buffer.ybase + this._terminal.rows - 1; y > startRow; y--) {\n        result = this._findInLine(term, y);\n        if (result) {\n          break;\n        }\n      }\n    }\n\n    // Set selection and scroll if a result was found\n    return this._selectResult(result);\n  }\n\n  /**\n   * Searches a line for a search term.\n   * @param term Tne search term.\n   * @param y The line to search.\n   * @return The search result if it was found.\n   */\n  private _findInLine(term: string, y: number): ISearchResult {\n    const lowerStringLine = this._terminal.buffer.translateBufferLineToString(y, true).toLowerCase();\n    const lowerTerm = term.toLowerCase();\n    const searchIndex = lowerStringLine.indexOf(lowerTerm);\n    if (searchIndex >= 0) {\n      return {\n        term,\n        col: searchIndex,\n        row: y\n      };\n    }\n  }\n\n  /**\n   * Selects and scrolls to a result.\n   * @param result The result to select.\n   * @return Whethera result was selected.\n   */\n  private _selectResult(result: ISearchResult): boolean {\n    if (!result) {\n      return false;\n    }\n    this._terminal.selectionManager.setSelection(result.col, result.row, result.term.length);\n    this._terminal.scrollLines(result.row - this._terminal.buffer.ydisp, false);\n    return true;\n  }\n}\n",null],"names":[],"mappings":"AEAA;;;ADiBA;AACA;AAAA;AAKA;AAQA;AACA;AACA;AACA;AAEA;AAEA;AACA;AAEA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AAQA;AACA;AACA;AACA;AAEA;AAEA;AACA;AAEA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AA1Ha;;;;;;;ADZb;AAQA;AACA;AAIA;AACA;AAAA;AAIA;AACA;AAAA;AAIA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;;;"}
\ No newline at end of file
diff --git a/route/static/build/addons/terminado/package.json b/route/static/build/addons/terminado/package.json
deleted file mode 100755
index 9af1851bc..000000000
--- a/route/static/build/addons/terminado/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "xterm.terminado",
-  "main": "terminado.js",
-  "private": true
-}
diff --git a/route/static/build/addons/terminado/terminado.js b/route/static/build/addons/terminado/terminado.js
deleted file mode 100755
index 702351b9c..000000000
--- a/route/static/build/addons/terminado/terminado.js
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * Copyright (c) 2016 The xterm.js authors. All rights reserved.
- * @license MIT
- *
- * This module provides methods for attaching a terminal to a terminado
- * WebSocket stream.
- */
-
-(function (attach) {
-  if (typeof exports === 'object' && typeof module === 'object') {
-    /*
-     * CommonJS environment
-     */
-    module.exports = attach(require('../../Terminal').Terminal);
-  } else if (typeof define == 'function') {
-    /*
-     * Require.js is available
-     */
-    define(['../../xterm'], attach);
-  } else {
-    /*
-     * Plain browser environment
-     */
-    attach(window.Terminal);
-  }
-})(function (Terminal) {
-  'use strict';
-
-  var exports = {};
-
-  /**
-   * Attaches the given terminal to the given socket.
-   *
-   * @param {Terminal} term - The terminal to be attached to the given socket.
-   * @param {WebSocket} socket - The socket to attach the current terminal.
-   * @param {boolean} bidirectional - Whether the terminal should send data
-   *                                  to the socket as well.
-   * @param {boolean} buffered - Whether the rendering of incoming data
-   *                             should happen instantly or at a maximum
-   *                             frequency of 1 rendering per 10ms.
-   */
-  exports.terminadoAttach = function (term, socket, bidirectional, buffered) {
-    bidirectional = (typeof bidirectional == 'undefined') ? true : bidirectional;
-    term.socket = socket;
-
-    term._flushBuffer = function () {
-      term.write(term._attachSocketBuffer);
-      term._attachSocketBuffer = null;
-    };
-
-    term._pushToBuffer = function (data) {
-      if (term._attachSocketBuffer) {
-        term._attachSocketBuffer += data;
-      } else {
-        term._attachSocketBuffer = data;
-        setTimeout(term._flushBuffer, 10);
-      }
-    };
-
-    term._getMessage = function (ev) {
-      var data = JSON.parse(ev.data)
-      if( data[0] == "stdout" ) {
-        if (buffered) {
-          term._pushToBuffer(data[1]);
-        } else {
-          term.write(data[1]);
-        }
-      }
-    };
-
-    term._sendData = function (data) {
-      socket.send(JSON.stringify(['stdin', data]));
-    };
-
-    term._setSize = function (size) {
-      socket.send(JSON.stringify(['set_size', size.rows, size.cols]));
-    };
-
-    socket.addEventListener('message', term._getMessage);
-
-    if (bidirectional) {
-      term.on('data', term._sendData);
-    }
-    term.on('resize', term._setSize);
-
-    socket.addEventListener('close', term.terminadoDetach.bind(term, socket));
-    socket.addEventListener('error', term.terminadoDetach.bind(term, socket));
-  };
-
-  /**
-   * Detaches the given terminal from the given socket
-   *
-   * @param {Xterm} term - The terminal to be detached from the given socket.
-   * @param {WebSocket} socket - The socket from which to detach the current
-   *                             terminal.
-   */
-  exports.terminadoDetach = function (term, socket) {
-    term.off('data', term._sendData);
-
-    socket = (typeof socket == 'undefined') ? term.socket : socket;
-
-    if (socket) {
-      socket.removeEventListener('message', term._getMessage);
-    }
-
-    delete term.socket;
-  };
-
-  /**
-   * Attaches the current terminal to the given socket
-   *
-   * @param {WebSocket} socket - The socket to attach the current terminal.
-   * @param {boolean} bidirectional - Whether the terminal should send data
-   *                                  to the socket as well.
-   * @param {boolean} buffered - Whether the rendering of incoming data
-   *                             should happen instantly or at a maximum
-   *                             frequency of 1 rendering per 10ms.
-   */
-  Terminal.prototype.terminadoAttach = function (socket, bidirectional, buffered) {
-    return exports.terminadoAttach(this, socket, bidirectional, buffered);
-  };
-
-  /**
-   * Detaches the current terminal from the given socket.
-   *
-   * @param {WebSocket} socket - The socket from which to detach the current
-   *                             terminal.
-   */
-  Terminal.prototype.terminadoDetach = function (socket) {
-    return exports.terminadoDetach(this, socket);
-  };
-
-  return exports;
-});
diff --git a/route/static/build/addons/winptyCompat/winptyCompat.js b/route/static/build/addons/winptyCompat/winptyCompat.js
deleted file mode 100755
index 89c0d8795..000000000
--- a/route/static/build/addons/winptyCompat/winptyCompat.js
+++ /dev/null
@@ -1,29 +0,0 @@
-(function (addon) {
-    if (typeof window !== 'undefined' && 'Terminal' in window) {
-        addon(window.Terminal);
-    }
-    else if (typeof exports === 'object' && typeof module === 'object') {
-        module.exports = addon(require('../../Terminal').Terminal);
-    }
-    else if (typeof define === 'function') {
-        define(['../../xterm'], addon);
-    }
-})(function (Terminal) {
-    Terminal.prototype.winptyCompatInit = function () {
-        var _this = this;
-        var isWindows = ['Windows', 'Win16', 'Win32', 'WinCE'].indexOf(navigator.platform) >= 0;
-        if (!isWindows) {
-            return;
-        }
-        this.on('lineFeed', function () {
-            var line = _this.buffer.lines.get(_this.buffer.ybase + _this.buffer.y - 1);
-            var lastChar = line[_this.cols - 1];
-            if (lastChar[3] !== 32) {
-                var nextLine = _this.buffer.lines.get(_this.buffer.ybase + _this.buffer.y);
-                nextLine.isWrapped = true;
-            }
-        });
-    };
-});
-
-//# sourceMappingURL=winptyCompat.js.map
diff --git a/route/static/build/addons/winptyCompat/winptyCompat.js.map b/route/static/build/addons/winptyCompat/winptyCompat.js.map
deleted file mode 100755
index 826e69714..000000000
--- a/route/static/build/addons/winptyCompat/winptyCompat.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/addons/winptyCompat/winptyCompat.ts"],"names":[],"mappings":"AAQA,CAAC,UAAU,KAAK;IACd,EAAE,CAAC,CAAC,OAAO,MAAM,KAAK,WAAW,IAAI,UAAU,IAAI,MAAM,CAAC,CAAC,CAAC;QAI1D,KAAK,CAAO,MAAO,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC;QAIrE,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC7D,CAAC;IAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC;QAIxC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,KAAK,CAAC,CAAC;IACjC,CAAC;AACH,CAAC,CAAC,CAAC,UAAC,QAAa;IACf,QAAQ,CAAC,SAAS,CAAC,gBAAgB,GAAG;QAAA,iBAyBrC;QAvBC,IAAM,SAAS,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC1F,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YACf,MAAM,CAAC;QACT,CAAC;QAYD,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE;YAClB,IAAM,IAAI,GAAG,KAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAI,CAAC,MAAM,CAAC,KAAK,GAAG,KAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1E,IAAM,QAAQ,GAAG,IAAI,CAAC,KAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;YACrC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,EAAY,CAAC,CAAC,CAAC;gBACjC,IAAM,QAAQ,GAAG,KAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAI,CAAC,MAAM,CAAC,KAAK,GAAG,KAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACpE,QAAS,CAAC,SAAS,GAAG,IAAI,CAAC;YACnC,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC","file":"winptyCompat.js","sourceRoot":"."}
\ No newline at end of file
diff --git a/route/static/build/addons/zmodem/demo/app.js b/route/static/build/addons/zmodem/demo/app.js
deleted file mode 100755
index 13a40a6d2..000000000
--- a/route/static/build/addons/zmodem/demo/app.js
+++ /dev/null
@@ -1,87 +0,0 @@
-var express = require('express');
-var app = express();
-var expressWs = require('express-ws')(app);
-var os = require('os');
-var pty = require('node-pty');
-
-var terminals = {},
-    logs = {};
-
-app.use('/build', express.static(__dirname + '/../../../../build'));
-app.use('/demo', express.static(__dirname + '/../../../../demo'));
-app.use('/zmodemjs', express.static(__dirname + '/../../../../node_modules/zmodem.js/dist'));
-
-app.get('/', function(req, res){
-  res.sendFile(__dirname + '/index.html');
-});
-
-app.get('/style.css', function(req, res){
-  res.sendFile(__dirname + '/style.css');
-});
-
-app.get('/main.js', function(req, res){
-  res.sendFile(__dirname + '/main.js');
-});
-
-app.post('/terminals', function (req, res) {
-  var cols = parseInt(req.query.cols),
-      rows = parseInt(req.query.rows),
-      term = pty.spawn(process.platform === 'win32' ? 'cmd.exe' : 'bash', [], {
-        encoding: null,
-        name: 'xterm-color',
-        cols: cols || 80,
-        rows: rows || 24,
-        cwd: process.env.PWD,
-        env: process.env
-      });
-
-  console.log('Created terminal with PID: ' + term.pid);
-  terminals[term.pid] = term;
-  logs[term.pid] = '';
-  term.on('data', function(data) {
-    logs[term.pid] += data;
-  });
-  res.send(term.pid.toString());
-  res.end();
-});
-
-app.post('/terminals/:pid/size', function (req, res) {
-  var pid = parseInt(req.params.pid),
-      cols = parseInt(req.query.cols),
-      rows = parseInt(req.query.rows),
-      term = terminals[pid];
-
-  term.resize(cols, rows);
-  console.log('Resized terminal ' + pid + ' to ' + cols + ' cols and ' + rows + ' rows.');
-  res.end();
-});
-
-app.ws('/terminals/:pid', function (ws, req) {
-  var term = terminals[parseInt(req.params.pid)];
-  console.log('Connected to terminal ' + term.pid);
-  ws.send(logs[term.pid]);
-
-  term.on('data', function(data) {
-    try {
-      ws.send(data);
-    } catch (ex) {
-      // The WebSocket is not open, ignore
-    }
-  });
-  ws.on('message', function(msg) {
-    term.write(msg);
-  });
-  ws.on('close', function () {
-    term.kill();
-    console.log('Closed terminal ' + term.pid);
-    // Clean things up
-    delete terminals[term.pid];
-    delete logs[term.pid];
-  });
-});
-
-var port = process.env.PORT || 3000,
-    host = os.platform() === 'win32' ? '127.0.0.1' : '0.0.0.0';
-
-console.log('App listening to http://' + host + ':' + port);
-app.listen(port, host);
diff --git a/route/static/build/addons/zmodem/demo/index.html b/route/static/build/addons/zmodem/demo/index.html
deleted file mode 100755
index 0b38cf4f1..000000000
--- a/route/static/build/addons/zmodem/demo/index.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>xterm.js demo</title>
-        <link rel="stylesheet" href="/build/xterm.css" />
-        <link rel="stylesheet" href="/build/addons/fullscreen/fullscreen.css" />
-        <link rel="stylesheet" href="/demo/style.css" />
-      	<script src="https://cdnjs.cloudflare.com/ajax/libs/es6-promise/4.1.1/es6-promise.auto.min.js"></script>
-      	<script src="https://cdnjs.cloudflare.com/ajax/libs/fetch/1.0.0/fetch.min.js"></script>
-        <script src="/build/xterm.js" ></script>
-
-        <script src="/build/addons/attach/attach.js" ></script>
-        <script src="/zmodemjs/zmodem.js"></script>
-        <script src="/build/addons/zmodem/zmodem.js" ></script>
-
-        <script src="/build/addons/fit/fit.js" ></script>
-        <script src="/build/addons/fullscreen/fullscreen.js" ></script>
-        <script src="/build/addons/search/search.js" ></script>
-    </head>
-    <body>
-        <h1>xterm.js: xterm, in the browser</h1>
-
-        <div id="terminal-container"></div>
-
-        <div id="zmodem_controls">
-            <form id="zm_start" style="display: none" action="javascript:void(0)">
-                ZMODEM detected: Start ZMODEM session?
-                <label><input id="zmstart_yes" name="zmstart" type=radio checked value="1"> Yes</label>
-                &nbsp;
-                <label><input name="zmstart" type=radio value=""> No</label>
-                <button type="submit">Submit</button>
-            </form>
-
-            <form id="zm_offer" style="display: none" action="javascript:void(0)">
-                <p>ZMODEM File offered!</p>
-
-                <label><input id="zmaccept_yes" name="zmaccept" type=radio checked value="1"> Accept</label>
-                &nbsp;
-                <label><input name="zmaccept" type=radio value=""> Skip</label>
-                <button type="submit">Submit</button>
-            </form>
-
-            <div id="zm_file" style="display: none">
-                <div>Name: <span id="name"></span></div>
-                <div>Size: <span id="size"></span></div>
-                <div>Last modified: <span id="mtime"></span></div>
-                <div>Mode: <span id="mode"></span></div>
-                <br>
-                <div>Conversion: <span id="zfile_conversion"></span></div>
-                <div>Management: <span id="zfile_management"></span></div>
-                <div>Transport: <span id="zfile_transport"></span></div>
-                <div>Sparse? <span id="zfile_sparse"></span></div>
-                <br>
-                <div>Files remaining in batch: <span id="files_remaining"></span></div>
-                <div>Bytes remaining in batch: <span id="bytes_remaining"></span></div>
-            </div>
-
-            <form id="zm_progress" style="display: none" action="javascript:void(0)">
-                <div><span id="percent_received"></span>% (<span id="bytes_received"></span> bytes) received</div>
-                <button id="zm_progress_skipper" type="button" onclick="skip_current_file();">Skip File</button>
-            </form>
-
-            <form id="zm_choose" style="display: none" action="javascript:void(0)">
-                <label>Choose file(s): <input id="zm_files" type="file" multiple></label>
-            </form>
-        </div>
-
-        <div>
-          <h2>Actions</h2>
-          <p>
-            <label>Find next <input id="find-next"/></label>
-            <label>Find previous <input id="find-previous"/></label>
-          </p>
-        </div>
-        <div>
-          <h2>Options</h2>
-          <p>
-            <label><input type="checkbox" id="option-cursor-blink"> cursorBlink</label>
-          </p>
-          <p>
-            <label><input type="checkbox" checked id="zmodem-auto"> Accept all ZMODEM prompts<sup>*</sup></label>
-          </p>
-          <p>
-            <label>
-              cursorStyle
-              <select id="option-cursor-style">
-                <option value="block">block</option>
-                <option value="underline">underline</option>
-                <option value="bar">bar</option>
-              </select>
-            </label>
-          </p>
-          <p>
-            <label>
-              bellStyle
-              <select id="option-bell-style">
-                <option value="">none</option>
-                <option value="sound">sound</option>
-                <option value="visual">visual</option>
-                <option value="both">both</option>
-              </select>
-            </label>
-          </p>
-          <p>
-            <label>scrollback <input type="number" id="option-scrollback" value="1000" /></label>
-          </p>
-          <p>
-            <label>tabStopWidth <input type="number" id="option-tabstopwidth" value="8" /></label>
-          </p>
-          <div>
-          	<h3>Size</h3>
-            <div>
-              <div style="display: inline-block; margin-right: 16px;">
-                <label for="cols">Columns</label>
-                <input type="number" id="cols" />
-              </div>
-              <div style="display: inline-block; margin-right: 16px;">
-                <label for="rows">Rows</label>
-                <input type="number" id="rows" />
-              </div>
-            </div>
-          </div>
-        </div>
-        <p><strong>Attention:</strong> The demo is a barebones implementation and is designed for xterm.js evaluation purposes only. Exposing the demo to the public as is would introduce security risks for the host.</p>
-        <p><sup>*</sup> ZMODEM file transfers are supported via an addon. To try it out, install <a href="https://ohse.de/uwe/software/lrzsz.html"><code>lrzsz</code></a> onto the remote peer, then run <code>rz</code> to send from your browser or <code>sz &lt;file&gt;</code> to send from the remote peer.</p>
-        <script src="main.js" defer ></script>
-    </body>
-</html>
diff --git a/route/static/build/addons/zmodem/demo/main.js b/route/static/build/addons/zmodem/demo/main.js
deleted file mode 100755
index aca441355..000000000
--- a/route/static/build/addons/zmodem/demo/main.js
+++ /dev/null
@@ -1,383 +0,0 @@
-"use strict";
-
-var term,
-    protocol,
-    socketURL,
-    socket,
-    pid;
-
-var terminalContainer = document.getElementById('terminal-container'),
-    actionElements = {
-      findNext: document.querySelector('#find-next'),
-      findPrevious: document.querySelector('#find-previous')
-    },
-    optionElements = {
-      cursorBlink: document.querySelector('#option-cursor-blink'),
-      cursorStyle: document.querySelector('#option-cursor-style'),
-      scrollback: document.querySelector('#option-scrollback'),
-      tabstopwidth: document.querySelector('#option-tabstopwidth'),
-      bellStyle: document.querySelector('#option-bell-style')
-    },
-    colsElement = document.getElementById('cols'),
-    rowsElement = document.getElementById('rows');
-
-function setTerminalSize() {
-  var cols = parseInt(colsElement.value, 10);
-  var rows = parseInt(rowsElement.value, 10);
-  var viewportElement = document.querySelector('.xterm-viewport');
-  var scrollBarWidth = viewportElement.offsetWidth - viewportElement.clientWidth;
-  var width = (cols * term.charMeasure.width + 20 /*room for scrollbar*/).toString() + 'px';
-  var height = (rows * term.charMeasure.height).toString() + 'px';
-
-  terminalContainer.style.width = width;
-  terminalContainer.style.height = height;
-  term.resize(cols, rows);
-}
-
-colsElement.addEventListener('change', setTerminalSize);
-rowsElement.addEventListener('change', setTerminalSize);
-
-actionElements.findNext.addEventListener('keypress', function (e) {
-  if (e.key === "Enter") {
-    e.preventDefault();
-    term.findNext(actionElements.findNext.value);
-  }
-});
-actionElements.findPrevious.addEventListener('keypress', function (e) {
-  if (e.key === "Enter") {
-    e.preventDefault();
-    term.findPrevious(actionElements.findPrevious.value);
-  }
-});
-
-optionElements.cursorBlink.addEventListener('change', function () {
-  term.setOption('cursorBlink', optionElements.cursorBlink.checked);
-});
-optionElements.cursorStyle.addEventListener('change', function () {
-  term.setOption('cursorStyle', optionElements.cursorStyle.value);
-});
-optionElements.bellStyle.addEventListener('change', function () {
-  term.setOption('bellStyle', optionElements.bellStyle.value);
-});
-optionElements.scrollback.addEventListener('change', function () {
-  term.setOption('scrollback', parseInt(optionElements.scrollback.value, 10));
-});
-optionElements.tabstopwidth.addEventListener('change', function () {
-  term.setOption('tabStopWidth', parseInt(optionElements.tabstopwidth.value, 10));
-});
-
-createTerminal();
-
-function createTerminal() {
-  // Clean terminal
-  while (terminalContainer.children.length) {
-    terminalContainer.removeChild(terminalContainer.children[0]);
-  }
-  term = new Terminal({
-    cursorBlink: optionElements.cursorBlink.checked,
-    scrollback: parseInt(optionElements.scrollback.value, 10),
-    tabStopWidth: parseInt(optionElements.tabstopwidth.value, 10)
-  });
-  term.on('resize', function (size) {
-    if (!pid) {
-      return;
-    }
-    var cols = size.cols,
-        rows = size.rows,
-        url = '/terminals/' + pid + '/size?cols=' + cols + '&rows=' + rows;
-
-    fetch(url, {method: 'POST'});
-  });
-  protocol = (location.protocol === 'https:') ? 'wss://' : 'ws://';
-  socketURL = protocol + location.hostname + ((location.port) ? (':' + location.port) : '') + '/terminals/';
-
-  term.open(terminalContainer);
-  term.fit();
-
-  // fit is called within a setTimeout, cols and rows need this.
-  setTimeout(function () {
-    colsElement.value = term.cols;
-    rowsElement.value = term.rows;
-
-    // Set terminal size again to set the specific dimensions on the demo
-    setTerminalSize();
-
-    fetch('/terminals?cols=' + term.cols + '&rows=' + term.rows, {method: 'POST'}).then(function (res) {
-
-      res.text().then(function (pid) {
-        window.pid = pid;
-        socketURL += pid;
-        socket = new WebSocket(socketURL);
-        socket.onopen = runRealTerminal;
-        socket.onclose = runFakeTerminal;
-        socket.onerror = runFakeTerminal;
-
-        term.zmodemAttach(socket, {
-            noTerminalWriteOutsideSession: true,
-        } );
-
-        term.on("zmodemRetract", () => {
-            start_form.style.display = "none";
-            start_form.onsubmit = null;
-        });
-
-        term.on("zmodemDetect", (detection) => {
-            function do_zmodem() {
-                term.detach();
-                let zsession = detection.confirm();
-
-                var promise;
-
-                if (zsession.type === "receive") {
-                    promise = _handle_receive_session(zsession);
-                }
-                else {
-                    promise = _handle_send_session(zsession);
-                }
-
-                promise.catch( console.error.bind(console) ).then( () => {
-                    term.attach(socket);
-                } );
-            }
-
-            if (_auto_zmodem()) {
-                do_zmodem();
-            }
-            else {
-                start_form.style.display = "";
-                start_form.onsubmit = function(e) {
-                    start_form.style.display = "none";
-
-                    if (document.getElementById("zmstart_yes").checked) {
-                        do_zmodem();
-                    }
-                    else {
-                        detection.deny();
-                    }
-                };
-            }
-        });
-      });
-    });
-  }, 0);
-}
-
-//----------------------------------------------------------------------
-// UI STUFF
-
-function _show_file_info(xfer) {
-    var file_info = xfer.get_details();
-
-    document.getElementById("name").textContent = file_info.name;
-    document.getElementById("size").textContent = file_info.size;
-    document.getElementById("mtime").textContent = file_info.mtime;
-    document.getElementById("files_remaining").textContent = file_info.files_remaining;
-    document.getElementById("bytes_remaining").textContent = file_info.bytes_remaining;
-
-    document.getElementById("mode").textContent = "0" + file_info.mode.toString(8);
-
-    var xfer_opts = xfer.get_options();
-    ["conversion", "management", "transport", "sparse"].forEach( (lbl) => {
-        document.getElementById(`zfile_${lbl}`).textContent = xfer_opts[lbl];
-    } );
-
-    document.getElementById("zm_file").style.display = "";
-}
-function _hide_file_info() {
-    document.getElementById("zm_file").style.display = "none";
-}
-
-function _save_to_disk(xfer, buffer) {
-    return Zmodem.Browser.save_to_disk(buffer, xfer.get_details().name);
-}
-
-var skipper_button = document.getElementById("zm_progress_skipper");
-var skipper_button_orig_text = skipper_button.textContent;
-
-function _show_progress() {
-    skipper_button.disabled = false;
-    skipper_button.textContent = skipper_button_orig_text;
-
-    document.getElementById("bytes_received").textContent = 0;
-    document.getElementById("percent_received").textContent = 0;
-
-    document.getElementById("zm_progress").style.display = "";
-}
-
-function _update_progress(xfer) {
-    var total_in = xfer.get_offset();
-
-    document.getElementById("bytes_received").textContent = total_in;
-
-    var percent_received = 100 * total_in / xfer.get_details().size;
-    document.getElementById("percent_received").textContent = percent_received.toFixed(2);
-}
-
-function _hide_progress() {
-    document.getElementById("zm_progress").style.display = "none";
-}
-
-var start_form = document.getElementById("zm_start");
-
-function _auto_zmodem() {
-    return document.getElementById("zmodem-auto").checked;
-}
-
-// END UI STUFF
-//----------------------------------------------------------------------
-
-function _handle_receive_session(zsession) {
-    zsession.on("offer", function(xfer) {
-        current_receive_xfer = xfer;
-
-        _show_file_info(xfer);
-
-        var offer_form = document.getElementById("zm_offer");
-
-        function on_form_submit() {
-            offer_form.style.display = "none";
-
-            //START
-            //if (offer_form.zmaccept.value) {
-            if (_auto_zmodem() || document.getElementById("zmaccept_yes").checked) {
-                _show_progress();
-
-                var FILE_BUFFER = [];
-                xfer.on("input", (payload) => {
-                    _update_progress(xfer);
-                    FILE_BUFFER.push( new Uint8Array(payload) );
-                });
-                xfer.accept().then(
-                    () => {
-                        _save_to_disk(xfer, FILE_BUFFER);
-                    },
-                    console.error.bind(console)
-                );
-            }
-            else {
-                xfer.skip();
-            }
-            //END
-        }
-
-        if (_auto_zmodem()) {
-            on_form_submit();
-        }
-        else {
-            offer_form.onsubmit = on_form_submit;
-            offer_form.style.display = "";
-        }
-    } );
-
-    var promise = new Promise( (res) => {
-        zsession.on("session_end", () => {
-            _hide_file_info();
-            _hide_progress();
-            res();
-        } );
-    } );
-
-    zsession.start();
-
-    return promise;
-}
-
-function _handle_send_session(zsession) {
-    var choose_form = document.getElementById("zm_choose");
-    choose_form.style.display = "";
-
-    var file_el = document.getElementById("zm_files");
-
-    var promise = new Promise( (res) => {
-        file_el.onchange = function(e) {
-            choose_form.style.display = "none";
-
-            var files_obj = file_el.files;
-
-            Zmodem.Browser.send_files(
-                zsession,
-                files_obj,
-                {
-                    on_offer_response(obj, xfer) {
-                        if (xfer) _show_progress();
-                        //console.log("offer", xfer ? "accepted" : "skipped");
-                    },
-                    on_progress(obj, xfer) {
-                        _update_progress(xfer);
-                    },
-                    on_file_complete(obj) {
-                        //console.log("COMPLETE", obj);
-                        _hide_progress();
-                    },
-                }
-            ).then(_hide_progress).then(
-                zsession.close.bind(zsession),
-                console.error.bind(console)
-            ).then( () => {
-                _hide_file_info();
-                _hide_progress();
-                res();
-            } );
-        };
-    } );
-
-    return promise;
-}
-
-//This is here to allow canceling of an in-progress ZMODEM transfer.
-var current_receive_xfer;
-
-//Called from HTML directly.
-function skip_current_file() {
-    current_receive_xfer.skip();
-
-    skipper_button.disabled = true;
-    skipper_button.textContent = "Waiting for server to acknowledge skip …";
-}
-
-function runRealTerminal() {
-    term.attach(socket);
-
-    term._initialized = true;
-}
-
-function runFakeTerminal() {
-  if (term._initialized) {
-    return;
-  }
-
-  term._initialized = true;
-
-  var shellprompt = '$ ';
-
-  term.prompt = function () {
-    term.write('\r\n' + shellprompt);
-  };
-
-  term.writeln('Welcome to xterm.js');
-  term.writeln('This is a local terminal emulation, without a real terminal in the back-end.');
-  term.writeln('Type some keys and commands to play around.');
-  term.writeln('');
-  term.prompt();
-
-  term.on('key', function (key, ev) {
-    var printable = (
-      !ev.altKey && !ev.altGraphKey && !ev.ctrlKey && !ev.metaKey
-    );
-
-    if (ev.keyCode == 13) {
-      term.prompt();
-    } else if (ev.keyCode == 8) {
-     // Do not delete the prompt
-      if (term.x > 2) {
-        term.write('\b \b');
-      }
-    } else if (printable) {
-      term.write(key);
-    }
-  });
-
-  term.on('paste', function (data, ev) {
-    term.write(data);
-  });
-}
diff --git a/route/static/build/addons/zmodem/zmodem.js b/route/static/build/addons/zmodem/zmodem.js
deleted file mode 100755
index aeb2fd5f0..000000000
--- a/route/static/build/addons/zmodem/zmodem.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- *
- * Allow xterm.js to handle ZMODEM uploads and downloads.
- *
- * This addon is a wrapper around zmodem.js. It adds the following to the
- *  Terminal class:
- *
- * - function `zmodemAttach(<WebSocket>, <Object>)` - creates a Zmodem.Sentry
- *      on the passed WebSocket object. The Object passed is optional and
- *      can contain:
- *          - noTerminalWriteOutsideSession: Suppress writes from the Sentry
- *            object to the Terminal while there is no active Session. This
- *            is necessary for compatibility with, for example, the
- *            `attach.js` addon.
- *
- * - event `zmodemDetect` - fired on Zmodem.Sentry’s `on_detect` callback.
- *      Passes the zmodem.js Detection object.
- *
- * - event `zmodemRetract` - fired on Zmodem.Sentry’s `on_retract` callback.
- *
- * You’ll need to provide logic to handle uploads and downloads.
- * See zmodem.js’s documentation for more details.
- *
- * **IMPORTANT:** After you confirm() a zmodem.js Detection, if you have
- *  used the `attach` or `terminado` addons, you’ll need to suspend their
- *  operation for the duration of the ZMODEM session. (The demo does this
- *  via `detach()` and a re-`attach()`.)
- */
-(function (addon) {
-  if (typeof exports === 'object' && typeof module === 'object') {
-    /*
-     * CommonJS environment
-     */
-    module.exports = addon(require('../../Terminal').Terminal);
-  } else if (typeof define == 'function') {
-    /*
-     * Require.js is available
-     */
-    define(['../../xterm'], addon);
-  } else {
-    /*
-     * Plain browser environment
-     */
-    addon(window.Terminal);
-  }
-})(function _zmodemAddon(Terminal) {
-    Object.assign(
-        Terminal.prototype,
-        {
-            zmodemAttach: function zmodemAttach(ws, opts) {
-                var term = this;
-
-                if (!opts) opts = {};
-
-                var senderFunc = function _ws_sender_func(octets) {
-                    ws.send( new Uint8Array(octets) );
-                };
-
-                var zsentry;
-
-                function _shouldWrite() {
-                    return !!zsentry.get_confirmed_session() || !opts.noTerminalWriteOutsideSession;
-                }
-
-                zsentry = new Zmodem.Sentry( {
-                    to_terminal: function _to_terminal(octets) {
-                        if (_shouldWrite()) {
-                            term.write(
-                                String.fromCharCode.apply(String, octets)
-                            );
-                        }
-                    },
-
-                    sender: senderFunc,
-
-                    on_retract: function _on_retract() {
-                        term.emit("zmodemRetract");
-                    },
-
-                    on_detect: function _on_detect(detection) {
-                        term.emit("zmodemDetect", detection);
-                    },
-                } );
-
-                function handleWSMessage(evt) {
-
-                    //In testing with xterm.js’s demo the first message was
-                    //always text even if the rest were binary. While that
-                    //may be specific to xterm.js’s demo, ultimately we
-                    //should reject anything that isn’t binary.
-                    if (typeof evt.data === "string") {
-                        if (_shouldWrite()) {
-                            term.write(evt.data);
-                        }
-                    }
-                    else {
-                        zsentry.consume(evt.data);
-                    }
-                }
-
-                ws.binaryType = "arraybuffer";
-                ws.addEventListener("message", handleWSMessage);
-            },
-
-            zmodemBrowser: Zmodem.Browser,
-        }
-    );
-});
diff --git a/route/static/build/xterm.css b/route/static/build/xterm.css
deleted file mode 100755
index c668af403..000000000
--- a/route/static/build/xterm.css
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * Copyright (c) 2014 The xterm.js authors. All rights reserved.
- * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
- * https://github.com/chjj/term.js
- * @license MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Originally forked from (with the author's permission):
- *   Fabrice Bellard's javascript vt100 for jslinux:
- *   http://bellard.org/jslinux/
- *   Copyright (c) 2011 Fabrice Bellard
- *   The original design remains. The terminal itself
- *   has been extended to include xterm CSI codes, among
- *   other features.
- */
-
-/**
- *  Default styles for xterm.js
- */
-
-.xterm {
-    font-family: courier-new, courier, monospace;
-    font-feature-settings: "liga" 0;
-    position: relative;
-    user-select: none;
-    -ms-user-select: none;
-    -webkit-user-select: none;
-}
-
-.xterm.focus,
-.xterm:focus {
-    outline: none;
-}
-
-.xterm .xterm-helpers {
-    position: absolute;
-    top: 0;
-    /**
-     * The z-index of the helpers must be higher than the canvases in order for
-     * IMEs to appear on top.
-     */
-    z-index: 10;
-}
-
-.xterm .xterm-helper-textarea {
-    /*
-     * HACK: to fix IE's blinking cursor
-     * Move textarea out of the screen to the far left, so that the cursor is not visible.
-     */
-    position: absolute;
-    opacity: 0;
-    left: -9999em;
-    top: 0;
-    width: 0;
-    height: 0;
-    z-index: -10;
-    /** Prevent wrapping so the IME appears against the textarea at the correct position */
-    white-space: nowrap;
-    overflow: hidden;
-    resize: none;
-}
-
-.xterm .composition-view {
-    /* TODO: Composition position got messed up somewhere */
-    background: #333;
-    color: #FFF;
-    display: none;
-    position: absolute;
-    white-space: nowrap;
-    z-index: 1;
-}
-
-.xterm .composition-view.active {
-    display: block;
-}
-
-.xterm .xterm-viewport {
-    /* On OS X this is required in order for the scroll bar to appear fully opaque */
-    background-color: #333;
-    overflow-y: scroll;
-}
-
-.xterm canvas {
-    position: absolute;
-    left: 0;
-    top: 0;
-}
-
-.xterm .xterm-scroll-area {
-    visibility: hidden;
-}
-
-.xterm .xterm-char-measure-element {
-    display: inline-block;
-    visibility: hidden;
-    position: absolute;
-    left: -9999em;
-}
-
-.xterm.enable-mouse-events {
-    /* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */
-    cursor: default;
-}
-
-.xterm:not(.enable-mouse-events) {
-    cursor: text;
-}
diff --git a/route/static/build/xterm.js b/route/static/build/xterm.js
deleted file mode 100755
index 80b0ba5d3..000000000
--- a/route/static/build/xterm.js
+++ /dev/null
@@ -1,6241 +0,0 @@
-(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.Terminal = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var CircularList_1 = require("./utils/CircularList");
-exports.CHAR_DATA_ATTR_INDEX = 0;
-exports.CHAR_DATA_CHAR_INDEX = 1;
-exports.CHAR_DATA_WIDTH_INDEX = 2;
-exports.CHAR_DATA_CODE_INDEX = 3;
-exports.MAX_BUFFER_SIZE = 4294967295;
-var Buffer = (function () {
-    function Buffer(_terminal, _hasScrollback) {
-        this._terminal = _terminal;
-        this._hasScrollback = _hasScrollback;
-        this.clear();
-    }
-    Object.defineProperty(Buffer.prototype, "lines", {
-        get: function () {
-            return this._lines;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(Buffer.prototype, "hasScrollback", {
-        get: function () {
-            return this._hasScrollback && this.lines.maxLength > this._terminal.rows;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(Buffer.prototype, "isCursorInViewport", {
-        get: function () {
-            var absoluteY = this.ybase + this.y;
-            var relativeY = absoluteY - this.ydisp;
-            return (relativeY >= 0 && relativeY < this._terminal.rows);
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Buffer.prototype._getCorrectBufferLength = function (rows) {
-        if (!this._hasScrollback) {
-            return rows;
-        }
-        var correctBufferLength = rows + this._terminal.options.scrollback;
-        return correctBufferLength > exports.MAX_BUFFER_SIZE ? exports.MAX_BUFFER_SIZE : correctBufferLength;
-    };
-    Buffer.prototype.fillViewportRows = function () {
-        if (this._lines.length === 0) {
-            var i = this._terminal.rows;
-            while (i--) {
-                this.lines.push(this._terminal.blankLine());
-            }
-        }
-    };
-    Buffer.prototype.clear = function () {
-        this.ydisp = 0;
-        this.ybase = 0;
-        this.y = 0;
-        this.x = 0;
-        this._lines = new CircularList_1.CircularList(this._getCorrectBufferLength(this._terminal.rows));
-        this.scrollTop = 0;
-        this.scrollBottom = this._terminal.rows - 1;
-        this.setupTabStops();
-    };
-    Buffer.prototype.resize = function (newCols, newRows) {
-        var newMaxLength = this._getCorrectBufferLength(newRows);
-        if (newMaxLength > this._lines.maxLength) {
-            this._lines.maxLength = newMaxLength;
-        }
-        if (this._lines.length > 0) {
-            if (this._terminal.cols < newCols) {
-                var ch = [this._terminal.defAttr, ' ', 1, 32];
-                for (var i = 0; i < this._lines.length; i++) {
-                    if (this._lines.get(i) === undefined) {
-                        this._lines.set(i, this._terminal.blankLine(undefined, undefined, newCols));
-                    }
-                    while (this._lines.get(i).length < newCols) {
-                        this._lines.get(i).push(ch);
-                    }
-                }
-            }
-            var addToY = 0;
-            if (this._terminal.rows < newRows) {
-                for (var y = this._terminal.rows; y < newRows; y++) {
-                    if (this._lines.length < newRows + this.ybase) {
-                        if (this.ybase > 0 && this._lines.length <= this.ybase + this.y + addToY + 1) {
-                            this.ybase--;
-                            addToY++;
-                            if (this.ydisp > 0) {
-                                this.ydisp--;
-                            }
-                        }
-                        else {
-                            this._lines.push(this._terminal.blankLine(undefined, undefined, newCols));
-                        }
-                    }
-                }
-            }
-            else {
-                for (var y = this._terminal.rows; y > newRows; y--) {
-                    if (this._lines.length > newRows + this.ybase) {
-                        if (this._lines.length > this.ybase + this.y + 1) {
-                            this._lines.pop();
-                        }
-                        else {
-                            this.ybase++;
-                            this.ydisp++;
-                        }
-                    }
-                }
-            }
-            if (newMaxLength < this._lines.maxLength) {
-                var amountToTrim = this._lines.length - newMaxLength;
-                if (amountToTrim > 0) {
-                    this._lines.trimStart(amountToTrim);
-                    this.ybase = Math.max(this.ybase - amountToTrim, 0);
-                    this.ydisp = Math.max(this.ydisp - amountToTrim, 0);
-                }
-                this._lines.maxLength = newMaxLength;
-            }
-            if (this.y >= newRows) {
-                this.y = newRows - 1;
-            }
-            if (addToY) {
-                this.y += addToY;
-            }
-            if (this.x >= newCols) {
-                this.x = newCols - 1;
-            }
-            this.scrollTop = 0;
-        }
-        this.scrollBottom = newRows - 1;
-    };
-    Buffer.prototype.translateBufferLineToString = function (lineIndex, trimRight, startCol, endCol) {
-        if (startCol === void 0) { startCol = 0; }
-        if (endCol === void 0) { endCol = null; }
-        var lineString = '';
-        var line = this.lines.get(lineIndex);
-        if (!line) {
-            return '';
-        }
-        var startIndex = startCol;
-        endCol = endCol || line.length;
-        var endIndex = endCol;
-        for (var i = 0; i < line.length; i++) {
-            var char = line[i];
-            lineString += char[exports.CHAR_DATA_CHAR_INDEX];
-            if (char[exports.CHAR_DATA_WIDTH_INDEX] === 0) {
-                if (startCol >= i) {
-                    startIndex--;
-                }
-                if (endCol >= i) {
-                    endIndex--;
-                }
-            }
-            else {
-                if (char[exports.CHAR_DATA_CHAR_INDEX].length > 1) {
-                    if (startCol > i) {
-                        startIndex += char[exports.CHAR_DATA_CHAR_INDEX].length - 1;
-                    }
-                    if (endCol > i) {
-                        endIndex += char[exports.CHAR_DATA_CHAR_INDEX].length - 1;
-                    }
-                }
-            }
-        }
-        if (trimRight) {
-            var rightWhitespaceIndex = lineString.search(/\s+$/);
-            if (rightWhitespaceIndex !== -1) {
-                endIndex = Math.min(endIndex, rightWhitespaceIndex);
-            }
-            if (endIndex <= startIndex) {
-                return '';
-            }
-        }
-        return lineString.substring(startIndex, endIndex);
-    };
-    Buffer.prototype.setupTabStops = function (i) {
-        if (i != null) {
-            if (!this.tabs[i]) {
-                i = this.prevStop(i);
-            }
-        }
-        else {
-            this.tabs = {};
-            i = 0;
-        }
-        for (; i < this._terminal.cols; i += this._terminal.options.tabStopWidth) {
-            this.tabs[i] = true;
-        }
-    };
-    Buffer.prototype.prevStop = function (x) {
-        if (x == null) {
-            x = this.x;
-        }
-        while (!this.tabs[--x] && x > 0)
-            ;
-        return x >= this._terminal.cols ? this._terminal.cols - 1 : x < 0 ? 0 : x;
-    };
-    Buffer.prototype.nextStop = function (x) {
-        if (x == null) {
-            x = this.x;
-        }
-        while (!this.tabs[++x] && x < this._terminal.cols)
-            ;
-        return x >= this._terminal.cols ? this._terminal.cols - 1 : x < 0 ? 0 : x;
-    };
-    return Buffer;
-}());
-exports.Buffer = Buffer;
-
-
-
-},{"./utils/CircularList":30}],2:[function(require,module,exports){
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var Buffer_1 = require("./Buffer");
-var EventEmitter_1 = require("./EventEmitter");
-var BufferSet = (function (_super) {
-    __extends(BufferSet, _super);
-    function BufferSet(_terminal) {
-        var _this = _super.call(this) || this;
-        _this._terminal = _terminal;
-        _this._normal = new Buffer_1.Buffer(_this._terminal, true);
-        _this._normal.fillViewportRows();
-        _this._alt = new Buffer_1.Buffer(_this._terminal, false);
-        _this._activeBuffer = _this._normal;
-        _this.setupTabStops();
-        return _this;
-    }
-    Object.defineProperty(BufferSet.prototype, "alt", {
-        get: function () {
-            return this._alt;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(BufferSet.prototype, "active", {
-        get: function () {
-            return this._activeBuffer;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(BufferSet.prototype, "normal", {
-        get: function () {
-            return this._normal;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    BufferSet.prototype.activateNormalBuffer = function () {
-        this._alt.clear();
-        this._activeBuffer = this._normal;
-        this.emit('activate', this._normal);
-    };
-    BufferSet.prototype.activateAltBuffer = function () {
-        this._alt.fillViewportRows();
-        this._activeBuffer = this._alt;
-        this.emit('activate', this._alt);
-    };
-    BufferSet.prototype.resize = function (newCols, newRows) {
-        this._normal.resize(newCols, newRows);
-        this._alt.resize(newCols, newRows);
-    };
-    BufferSet.prototype.setupTabStops = function (i) {
-        this._normal.setupTabStops(i);
-        this._alt.setupTabStops(i);
-    };
-    return BufferSet;
-}(EventEmitter_1.EventEmitter));
-exports.BufferSet = BufferSet;
-
-
-
-},{"./Buffer":1,"./EventEmitter":7}],3:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.wcwidth = (function (opts) {
-    var COMBINING_BMP = [
-        [0x0300, 0x036F], [0x0483, 0x0486], [0x0488, 0x0489],
-        [0x0591, 0x05BD], [0x05BF, 0x05BF], [0x05C1, 0x05C2],
-        [0x05C4, 0x05C5], [0x05C7, 0x05C7], [0x0600, 0x0603],
-        [0x0610, 0x0615], [0x064B, 0x065E], [0x0670, 0x0670],
-        [0x06D6, 0x06E4], [0x06E7, 0x06E8], [0x06EA, 0x06ED],
-        [0x070F, 0x070F], [0x0711, 0x0711], [0x0730, 0x074A],
-        [0x07A6, 0x07B0], [0x07EB, 0x07F3], [0x0901, 0x0902],
-        [0x093C, 0x093C], [0x0941, 0x0948], [0x094D, 0x094D],
-        [0x0951, 0x0954], [0x0962, 0x0963], [0x0981, 0x0981],
-        [0x09BC, 0x09BC], [0x09C1, 0x09C4], [0x09CD, 0x09CD],
-        [0x09E2, 0x09E3], [0x0A01, 0x0A02], [0x0A3C, 0x0A3C],
-        [0x0A41, 0x0A42], [0x0A47, 0x0A48], [0x0A4B, 0x0A4D],
-        [0x0A70, 0x0A71], [0x0A81, 0x0A82], [0x0ABC, 0x0ABC],
-        [0x0AC1, 0x0AC5], [0x0AC7, 0x0AC8], [0x0ACD, 0x0ACD],
-        [0x0AE2, 0x0AE3], [0x0B01, 0x0B01], [0x0B3C, 0x0B3C],
-        [0x0B3F, 0x0B3F], [0x0B41, 0x0B43], [0x0B4D, 0x0B4D],
-        [0x0B56, 0x0B56], [0x0B82, 0x0B82], [0x0BC0, 0x0BC0],
-        [0x0BCD, 0x0BCD], [0x0C3E, 0x0C40], [0x0C46, 0x0C48],
-        [0x0C4A, 0x0C4D], [0x0C55, 0x0C56], [0x0CBC, 0x0CBC],
-        [0x0CBF, 0x0CBF], [0x0CC6, 0x0CC6], [0x0CCC, 0x0CCD],
-        [0x0CE2, 0x0CE3], [0x0D41, 0x0D43], [0x0D4D, 0x0D4D],
-        [0x0DCA, 0x0DCA], [0x0DD2, 0x0DD4], [0x0DD6, 0x0DD6],
-        [0x0E31, 0x0E31], [0x0E34, 0x0E3A], [0x0E47, 0x0E4E],
-        [0x0EB1, 0x0EB1], [0x0EB4, 0x0EB9], [0x0EBB, 0x0EBC],
-        [0x0EC8, 0x0ECD], [0x0F18, 0x0F19], [0x0F35, 0x0F35],
-        [0x0F37, 0x0F37], [0x0F39, 0x0F39], [0x0F71, 0x0F7E],
-        [0x0F80, 0x0F84], [0x0F86, 0x0F87], [0x0F90, 0x0F97],
-        [0x0F99, 0x0FBC], [0x0FC6, 0x0FC6], [0x102D, 0x1030],
-        [0x1032, 0x1032], [0x1036, 0x1037], [0x1039, 0x1039],
-        [0x1058, 0x1059], [0x1160, 0x11FF], [0x135F, 0x135F],
-        [0x1712, 0x1714], [0x1732, 0x1734], [0x1752, 0x1753],
-        [0x1772, 0x1773], [0x17B4, 0x17B5], [0x17B7, 0x17BD],
-        [0x17C6, 0x17C6], [0x17C9, 0x17D3], [0x17DD, 0x17DD],
-        [0x180B, 0x180D], [0x18A9, 0x18A9], [0x1920, 0x1922],
-        [0x1927, 0x1928], [0x1932, 0x1932], [0x1939, 0x193B],
-        [0x1A17, 0x1A18], [0x1B00, 0x1B03], [0x1B34, 0x1B34],
-        [0x1B36, 0x1B3A], [0x1B3C, 0x1B3C], [0x1B42, 0x1B42],
-        [0x1B6B, 0x1B73], [0x1DC0, 0x1DCA], [0x1DFE, 0x1DFF],
-        [0x200B, 0x200F], [0x202A, 0x202E], [0x2060, 0x2063],
-        [0x206A, 0x206F], [0x20D0, 0x20EF], [0x302A, 0x302F],
-        [0x3099, 0x309A], [0xA806, 0xA806], [0xA80B, 0xA80B],
-        [0xA825, 0xA826], [0xFB1E, 0xFB1E], [0xFE00, 0xFE0F],
-        [0xFE20, 0xFE23], [0xFEFF, 0xFEFF], [0xFFF9, 0xFFFB],
-    ];
-    var COMBINING_HIGH = [
-        [0x10A01, 0x10A03], [0x10A05, 0x10A06], [0x10A0C, 0x10A0F],
-        [0x10A38, 0x10A3A], [0x10A3F, 0x10A3F], [0x1D167, 0x1D169],
-        [0x1D173, 0x1D182], [0x1D185, 0x1D18B], [0x1D1AA, 0x1D1AD],
-        [0x1D242, 0x1D244], [0xE0001, 0xE0001], [0xE0020, 0xE007F],
-        [0xE0100, 0xE01EF]
-    ];
-    function bisearch(ucs, data) {
-        var min = 0;
-        var max = data.length - 1;
-        var mid;
-        if (ucs < data[0][0] || ucs > data[max][1])
-            return false;
-        while (max >= min) {
-            mid = (min + max) >> 1;
-            if (ucs > data[mid][1])
-                min = mid + 1;
-            else if (ucs < data[mid][0])
-                max = mid - 1;
-            else
-                return true;
-        }
-        return false;
-    }
-    function wcwidthBMP(ucs) {
-        if (ucs === 0)
-            return opts.nul;
-        if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
-            return opts.control;
-        if (bisearch(ucs, COMBINING_BMP))
-            return 0;
-        if (isWideBMP(ucs)) {
-            return 2;
-        }
-        return 1;
-    }
-    function isWideBMP(ucs) {
-        return (ucs >= 0x1100 && (ucs <= 0x115f ||
-            ucs === 0x2329 ||
-            ucs === 0x232a ||
-            (ucs >= 0x2e80 && ucs <= 0xa4cf && ucs !== 0x303f) ||
-            (ucs >= 0xac00 && ucs <= 0xd7a3) ||
-            (ucs >= 0xf900 && ucs <= 0xfaff) ||
-            (ucs >= 0xfe10 && ucs <= 0xfe19) ||
-            (ucs >= 0xfe30 && ucs <= 0xfe6f) ||
-            (ucs >= 0xff00 && ucs <= 0xff60) ||
-            (ucs >= 0xffe0 && ucs <= 0xffe6)));
-    }
-    function wcwidthHigh(ucs) {
-        if (bisearch(ucs, COMBINING_HIGH))
-            return 0;
-        if ((ucs >= 0x20000 && ucs <= 0x2fffd) || (ucs >= 0x30000 && ucs <= 0x3fffd)) {
-            return 2;
-        }
-        return 1;
-    }
-    var control = opts.control | 0;
-    var table = null;
-    function init_table() {
-        var CODEPOINTS = 65536;
-        var BITWIDTH = 2;
-        var ITEMSIZE = 32;
-        var CONTAINERSIZE = CODEPOINTS * BITWIDTH / ITEMSIZE;
-        var CODEPOINTS_PER_ITEM = ITEMSIZE / BITWIDTH;
-        table = (typeof Uint32Array === 'undefined')
-            ? new Array(CONTAINERSIZE)
-            : new Uint32Array(CONTAINERSIZE);
-        for (var i = 0; i < CONTAINERSIZE; ++i) {
-            var num = 0;
-            var pos = CODEPOINTS_PER_ITEM;
-            while (pos--)
-                num = (num << 2) | wcwidthBMP(CODEPOINTS_PER_ITEM * i + pos);
-            table[i] = num;
-        }
-        return table;
-    }
-    return function (num) {
-        num = num | 0;
-        if (num < 32)
-            return control | 0;
-        if (num < 127)
-            return 1;
-        var t = table || init_table();
-        if (num < 65536)
-            return t[num >> 4] >> ((num & 15) << 1) & 3;
-        return wcwidthHigh(num);
-    };
-})({ nul: 0, control: 0 });
-
-
-
-},{}],4:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CHARSETS = {};
-exports.DEFAULT_CHARSET = exports.CHARSETS['B'];
-exports.CHARSETS['0'] = {
-    '`': '\u25c6',
-    'a': '\u2592',
-    'b': '\u0009',
-    'c': '\u000c',
-    'd': '\u000d',
-    'e': '\u000a',
-    'f': '\u00b0',
-    'g': '\u00b1',
-    'h': '\u2424',
-    'i': '\u000b',
-    'j': '\u2518',
-    'k': '\u2510',
-    'l': '\u250c',
-    'm': '\u2514',
-    'n': '\u253c',
-    'o': '\u23ba',
-    'p': '\u23bb',
-    'q': '\u2500',
-    'r': '\u23bc',
-    's': '\u23bd',
-    't': '\u251c',
-    'u': '\u2524',
-    'v': '\u2534',
-    'w': '\u252c',
-    'x': '\u2502',
-    'y': '\u2264',
-    'z': '\u2265',
-    '{': '\u03c0',
-    '|': '\u2260',
-    '}': '\u00a3',
-    '~': '\u00b7'
-};
-exports.CHARSETS['A'] = {
-    '#': '£'
-};
-exports.CHARSETS['B'] = null;
-exports.CHARSETS['4'] = {
-    '#': '£',
-    '@': '¾',
-    '[': 'ij',
-    '\\': '½',
-    ']': '|',
-    '{': '¨',
-    '|': 'f',
-    '}': '¼',
-    '~': '´'
-};
-exports.CHARSETS['C'] =
-    exports.CHARSETS['5'] = {
-        '[': 'Ä',
-        '\\': 'Ö',
-        ']': 'Å',
-        '^': 'Ü',
-        '`': 'é',
-        '{': 'ä',
-        '|': 'ö',
-        '}': 'å',
-        '~': 'ü'
-    };
-exports.CHARSETS['R'] = {
-    '#': '£',
-    '@': 'à',
-    '[': '°',
-    '\\': 'ç',
-    ']': '§',
-    '{': 'é',
-    '|': 'ù',
-    '}': 'è',
-    '~': '¨'
-};
-exports.CHARSETS['Q'] = {
-    '@': 'à',
-    '[': 'â',
-    '\\': 'ç',
-    ']': 'ê',
-    '^': 'î',
-    '`': 'ô',
-    '{': 'é',
-    '|': 'ù',
-    '}': 'è',
-    '~': 'û'
-};
-exports.CHARSETS['K'] = {
-    '@': '§',
-    '[': 'Ä',
-    '\\': 'Ö',
-    ']': 'Ü',
-    '{': 'ä',
-    '|': 'ö',
-    '}': 'ü',
-    '~': 'ß'
-};
-exports.CHARSETS['Y'] = {
-    '#': '£',
-    '@': '§',
-    '[': '°',
-    '\\': 'ç',
-    ']': 'é',
-    '`': 'ù',
-    '{': 'à',
-    '|': 'ò',
-    '}': 'è',
-    '~': 'ì'
-};
-exports.CHARSETS['E'] =
-    exports.CHARSETS['6'] = {
-        '@': 'Ä',
-        '[': 'Æ',
-        '\\': 'Ø',
-        ']': 'Å',
-        '^': 'Ü',
-        '`': 'ä',
-        '{': 'æ',
-        '|': 'ø',
-        '}': 'å',
-        '~': 'ü'
-    };
-exports.CHARSETS['Z'] = {
-    '#': '£',
-    '@': '§',
-    '[': '¡',
-    '\\': 'Ñ',
-    ']': '¿',
-    '{': '°',
-    '|': 'ñ',
-    '}': 'ç'
-};
-exports.CHARSETS['H'] =
-    exports.CHARSETS['7'] = {
-        '@': 'É',
-        '[': 'Ä',
-        '\\': 'Ö',
-        ']': 'Å',
-        '^': 'Ü',
-        '`': 'é',
-        '{': 'ä',
-        '|': 'ö',
-        '}': 'å',
-        '~': 'ü'
-    };
-exports.CHARSETS['='] = {
-    '#': 'ù',
-    '@': 'à',
-    '[': 'é',
-    '\\': 'ç',
-    ']': 'ê',
-    '^': 'î',
-    '_': 'è',
-    '`': 'ô',
-    '{': 'ä',
-    '|': 'ö',
-    '}': 'ü',
-    '~': 'û'
-};
-
-
-
-},{}],5:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var CompositionHelper = (function () {
-    function CompositionHelper(textarea, compositionView, terminal) {
-        this.textarea = textarea;
-        this.compositionView = compositionView;
-        this.terminal = terminal;
-        this.isComposing = false;
-        this.isSendingComposition = false;
-        this.compositionPosition = { start: null, end: null };
-    }
-    CompositionHelper.prototype.compositionstart = function () {
-        this.isComposing = true;
-        this.compositionPosition.start = this.textarea.value.length;
-        this.compositionView.textContent = '';
-        this.compositionView.classList.add('active');
-    };
-    CompositionHelper.prototype.compositionupdate = function (ev) {
-        var _this = this;
-        this.compositionView.textContent = ev.data;
-        this.updateCompositionElements();
-        setTimeout(function () {
-            _this.compositionPosition.end = _this.textarea.value.length;
-        }, 0);
-    };
-    CompositionHelper.prototype.compositionend = function () {
-        this.finalizeComposition(true);
-    };
-    CompositionHelper.prototype.keydown = function (ev) {
-        if (this.isComposing || this.isSendingComposition) {
-            if (ev.keyCode === 229) {
-                return false;
-            }
-            else if (ev.keyCode === 16 || ev.keyCode === 17 || ev.keyCode === 18) {
-                return false;
-            }
-            else {
-                this.finalizeComposition(false);
-            }
-        }
-        if (ev.keyCode === 229) {
-            this.handleAnyTextareaChanges();
-            return false;
-        }
-        return true;
-    };
-    CompositionHelper.prototype.finalizeComposition = function (waitForPropogation) {
-        var _this = this;
-        this.compositionView.classList.remove('active');
-        this.isComposing = false;
-        this.clearTextareaPosition();
-        if (!waitForPropogation) {
-            this.isSendingComposition = false;
-            var input = this.textarea.value.substring(this.compositionPosition.start, this.compositionPosition.end);
-            this.terminal.handler(input);
-        }
-        else {
-            var currentCompositionPosition_1 = {
-                start: this.compositionPosition.start,
-                end: this.compositionPosition.end,
-            };
-            this.isSendingComposition = true;
-            setTimeout(function () {
-                if (_this.isSendingComposition) {
-                    _this.isSendingComposition = false;
-                    var input = void 0;
-                    if (_this.isComposing) {
-                        input = _this.textarea.value.substring(currentCompositionPosition_1.start, currentCompositionPosition_1.end);
-                    }
-                    else {
-                        input = _this.textarea.value.substring(currentCompositionPosition_1.start);
-                    }
-                    _this.terminal.handler(input);
-                }
-            }, 0);
-        }
-    };
-    CompositionHelper.prototype.handleAnyTextareaChanges = function () {
-        var _this = this;
-        var oldValue = this.textarea.value;
-        setTimeout(function () {
-            if (!_this.isComposing) {
-                var newValue = _this.textarea.value;
-                var diff = newValue.replace(oldValue, '');
-                if (diff.length > 0) {
-                    _this.terminal.handler(diff);
-                }
-            }
-        }, 0);
-    };
-    CompositionHelper.prototype.updateCompositionElements = function (dontRecurse) {
-        var _this = this;
-        if (!this.isComposing) {
-            return;
-        }
-        if (this.terminal.buffer.isCursorInViewport) {
-            var cellHeight = Math.ceil(this.terminal.charMeasure.height * this.terminal.options.lineHeight);
-            var cursorTop = this.terminal.buffer.y * cellHeight;
-            var cursorLeft = this.terminal.buffer.x * this.terminal.charMeasure.width;
-            this.compositionView.style.left = cursorLeft + 'px';
-            this.compositionView.style.top = cursorTop + 'px';
-            this.compositionView.style.height = cellHeight + 'px';
-            this.compositionView.style.lineHeight = cellHeight + 'px';
-            var compositionViewBounds = this.compositionView.getBoundingClientRect();
-            this.textarea.style.left = cursorLeft + 'px';
-            this.textarea.style.top = cursorTop + 'px';
-            this.textarea.style.width = compositionViewBounds.width + 'px';
-            this.textarea.style.height = compositionViewBounds.height + 'px';
-            this.textarea.style.lineHeight = compositionViewBounds.height + 'px';
-        }
-        if (!dontRecurse) {
-            setTimeout(function () { return _this.updateCompositionElements(true); }, 0);
-        }
-    };
-    ;
-    CompositionHelper.prototype.clearTextareaPosition = function () {
-        this.textarea.style.left = '';
-        this.textarea.style.top = '';
-    };
-    ;
-    return CompositionHelper;
-}());
-exports.CompositionHelper = CompositionHelper;
-
-
-
-},{}],6:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var C0;
-(function (C0) {
-    C0.NUL = '\x00';
-    C0.SOH = '\x01';
-    C0.STX = '\x02';
-    C0.ETX = '\x03';
-    C0.EOT = '\x04';
-    C0.ENQ = '\x05';
-    C0.ACK = '\x06';
-    C0.BEL = '\x07';
-    C0.BS = '\x08';
-    C0.HT = '\x09';
-    C0.LF = '\x0a';
-    C0.VT = '\x0b';
-    C0.FF = '\x0c';
-    C0.CR = '\x0d';
-    C0.SO = '\x0e';
-    C0.SI = '\x0f';
-    C0.DLE = '\x10';
-    C0.DC1 = '\x11';
-    C0.DC2 = '\x12';
-    C0.DC3 = '\x13';
-    C0.DC4 = '\x14';
-    C0.NAK = '\x15';
-    C0.SYN = '\x16';
-    C0.ETB = '\x17';
-    C0.CAN = '\x18';
-    C0.EM = '\x19';
-    C0.SUB = '\x1a';
-    C0.ESC = '\x1b';
-    C0.FS = '\x1c';
-    C0.GS = '\x1d';
-    C0.RS = '\x1e';
-    C0.US = '\x1f';
-    C0.SP = '\x20';
-    C0.DEL = '\x7f';
-})(C0 = exports.C0 || (exports.C0 = {}));
-;
-
-
-
-},{}],7:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var EventEmitter = (function () {
-    function EventEmitter() {
-        this._events = this._events || {};
-    }
-    EventEmitter.prototype.on = function (type, listener) {
-        this._events[type] = this._events[type] || [];
-        this._events[type].push(listener);
-    };
-    EventEmitter.prototype.off = function (type, listener) {
-        if (!this._events[type]) {
-            return;
-        }
-        var obj = this._events[type];
-        var i = obj.length;
-        while (i--) {
-            if (obj[i] === listener || obj[i].listener === listener) {
-                obj.splice(i, 1);
-                return;
-            }
-        }
-    };
-    EventEmitter.prototype.removeAllListeners = function (type) {
-        if (this._events[type]) {
-            delete this._events[type];
-        }
-    };
-    EventEmitter.prototype.once = function (type, listener) {
-        function on() {
-            var args = Array.prototype.slice.call(arguments);
-            this.off(type, on);
-            listener.apply(this, args);
-        }
-        on.listener = listener;
-        this.on(type, on);
-    };
-    EventEmitter.prototype.emit = function (type) {
-        var args = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            args[_i - 1] = arguments[_i];
-        }
-        if (!this._events[type]) {
-            return;
-        }
-        var obj = this._events[type];
-        for (var i = 0; i < obj.length; i++) {
-            obj[i].apply(this, args);
-        }
-    };
-    EventEmitter.prototype.listeners = function (type) {
-        return this._events[type] || [];
-    };
-    EventEmitter.prototype.destroy = function () {
-        this._events = {};
-    };
-    return EventEmitter;
-}());
-exports.EventEmitter = EventEmitter;
-
-
-
-},{}],8:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var EscapeSequences_1 = require("./EscapeSequences");
-var Charsets_1 = require("./Charsets");
-var Buffer_1 = require("./Buffer");
-var Types_1 = require("./renderer/Types");
-var CharWidth_1 = require("./CharWidth");
-var InputHandler = (function () {
-    function InputHandler(_terminal) {
-        this._terminal = _terminal;
-    }
-    InputHandler.prototype.addChar = function (char, code) {
-        if (char >= ' ') {
-            var ch_width = CharWidth_1.wcwidth(code);
-            if (this._terminal.charset && this._terminal.charset[char]) {
-                char = this._terminal.charset[char];
-            }
-            var row = this._terminal.buffer.y + this._terminal.buffer.ybase;
-            if (!ch_width && this._terminal.buffer.x) {
-                if (this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 1]) {
-                    if (!this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 1][Buffer_1.CHAR_DATA_WIDTH_INDEX]) {
-                        if (this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 2]) {
-                            this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 2][Buffer_1.CHAR_DATA_CHAR_INDEX] += char;
-                            this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 2][3] = char.charCodeAt(0);
-                        }
-                    }
-                    else {
-                        this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 1][Buffer_1.CHAR_DATA_CHAR_INDEX] += char;
-                        this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 1][3] = char.charCodeAt(0);
-                    }
-                    this._terminal.updateRange(this._terminal.buffer.y);
-                }
-                return;
-            }
-            if (this._terminal.buffer.x + ch_width - 1 >= this._terminal.cols) {
-                if (this._terminal.wraparoundMode) {
-                    this._terminal.buffer.x = 0;
-                    this._terminal.buffer.y++;
-                    if (this._terminal.buffer.y > this._terminal.buffer.scrollBottom) {
-                        this._terminal.buffer.y--;
-                        this._terminal.scroll(true);
-                    }
-                    else {
-                        this._terminal.buffer.lines.get(this._terminal.buffer.y).isWrapped = true;
-                    }
-                }
-                else {
-                    if (ch_width === 2)
-                        return;
-                }
-            }
-            row = this._terminal.buffer.y + this._terminal.buffer.ybase;
-            if (this._terminal.insertMode) {
-                for (var moves = 0; moves < ch_width; ++moves) {
-                    var removed = this._terminal.buffer.lines.get(this._terminal.buffer.y + this._terminal.buffer.ybase).pop();
-                    if (removed[Buffer_1.CHAR_DATA_WIDTH_INDEX] === 0
-                        && this._terminal.buffer.lines.get(row)[this._terminal.cols - 2]
-                        && this._terminal.buffer.lines.get(row)[this._terminal.cols - 2][Buffer_1.CHAR_DATA_WIDTH_INDEX] === 2) {
-                        this._terminal.buffer.lines.get(row)[this._terminal.cols - 2] = [this._terminal.curAttr, ' ', 1, ' '.charCodeAt(0)];
-                    }
-                    this._terminal.buffer.lines.get(row).splice(this._terminal.buffer.x, 0, [this._terminal.curAttr, ' ', 1, ' '.charCodeAt(0)]);
-                }
-            }
-            this._terminal.buffer.lines.get(row)[this._terminal.buffer.x] = [this._terminal.curAttr, char, ch_width, char.charCodeAt(0)];
-            this._terminal.buffer.x++;
-            this._terminal.updateRange(this._terminal.buffer.y);
-            if (ch_width === 2) {
-                this._terminal.buffer.lines.get(row)[this._terminal.buffer.x] = [this._terminal.curAttr, '', 0, undefined];
-                this._terminal.buffer.x++;
-            }
-        }
-    };
-    InputHandler.prototype.bell = function () {
-        this._terminal.bell();
-    };
-    InputHandler.prototype.lineFeed = function () {
-        if (this._terminal.convertEol) {
-            this._terminal.buffer.x = 0;
-        }
-        this._terminal.buffer.y++;
-        if (this._terminal.buffer.y > this._terminal.buffer.scrollBottom) {
-            this._terminal.buffer.y--;
-            this._terminal.scroll();
-        }
-        if (this._terminal.buffer.x >= this._terminal.cols) {
-            this._terminal.buffer.x--;
-        }
-        this._terminal.emit('lineFeed');
-    };
-    InputHandler.prototype.carriageReturn = function () {
-        this._terminal.buffer.x = 0;
-    };
-    InputHandler.prototype.backspace = function () {
-        if (this._terminal.buffer.x > 0) {
-            this._terminal.buffer.x--;
-        }
-    };
-    InputHandler.prototype.tab = function () {
-        this._terminal.buffer.x = this._terminal.buffer.nextStop();
-    };
-    InputHandler.prototype.shiftOut = function () {
-        this._terminal.setgLevel(1);
-    };
-    InputHandler.prototype.shiftIn = function () {
-        this._terminal.setgLevel(0);
-    };
-    InputHandler.prototype.insertChars = function (params) {
-        var param = params[0];
-        if (param < 1)
-            param = 1;
-        var row = this._terminal.buffer.y + this._terminal.buffer.ybase;
-        var j = this._terminal.buffer.x;
-        var ch = [this._terminal.eraseAttr(), ' ', 1, 32];
-        while (param-- && j < this._terminal.cols) {
-            this._terminal.buffer.lines.get(row).splice(j++, 0, ch);
-            this._terminal.buffer.lines.get(row).pop();
-        }
-    };
-    InputHandler.prototype.cursorUp = function (params) {
-        var param = params[0];
-        if (param < 1) {
-            param = 1;
-        }
-        this._terminal.buffer.y -= param;
-        if (this._terminal.buffer.y < 0) {
-            this._terminal.buffer.y = 0;
-        }
-    };
-    InputHandler.prototype.cursorDown = function (params) {
-        var param = params[0];
-        if (param < 1) {
-            param = 1;
-        }
-        this._terminal.buffer.y += param;
-        if (this._terminal.buffer.y >= this._terminal.rows) {
-            this._terminal.buffer.y = this._terminal.rows - 1;
-        }
-        if (this._terminal.buffer.x >= this._terminal.cols) {
-            this._terminal.buffer.x--;
-        }
-    };
-    InputHandler.prototype.cursorForward = function (params) {
-        var param = params[0];
-        if (param < 1) {
-            param = 1;
-        }
-        this._terminal.buffer.x += param;
-        if (this._terminal.buffer.x >= this._terminal.cols) {
-            this._terminal.buffer.x = this._terminal.cols - 1;
-        }
-    };
-    InputHandler.prototype.cursorBackward = function (params) {
-        var param = params[0];
-        if (param < 1) {
-            param = 1;
-        }
-        if (this._terminal.buffer.x >= this._terminal.cols) {
-            this._terminal.buffer.x--;
-        }
-        this._terminal.buffer.x -= param;
-        if (this._terminal.buffer.x < 0) {
-            this._terminal.buffer.x = 0;
-        }
-    };
-    InputHandler.prototype.cursorNextLine = function (params) {
-        var param = params[0];
-        if (param < 1) {
-            param = 1;
-        }
-        this._terminal.buffer.y += param;
-        if (this._terminal.buffer.y >= this._terminal.rows) {
-            this._terminal.buffer.y = this._terminal.rows - 1;
-        }
-        this._terminal.buffer.x = 0;
-    };
-    InputHandler.prototype.cursorPrecedingLine = function (params) {
-        var param = params[0];
-        if (param < 1) {
-            param = 1;
-        }
-        this._terminal.buffer.y -= param;
-        if (this._terminal.buffer.y < 0) {
-            this._terminal.buffer.y = 0;
-        }
-        this._terminal.buffer.x = 0;
-    };
-    InputHandler.prototype.cursorCharAbsolute = function (params) {
-        var param = params[0];
-        if (param < 1) {
-            param = 1;
-        }
-        this._terminal.buffer.x = param - 1;
-    };
-    InputHandler.prototype.cursorPosition = function (params) {
-        var col;
-        var row = params[0] - 1;
-        if (params.length >= 2) {
-            col = params[1] - 1;
-        }
-        else {
-            col = 0;
-        }
-        if (row < 0) {
-            row = 0;
-        }
-        else if (row >= this._terminal.rows) {
-            row = this._terminal.rows - 1;
-        }
-        if (col < 0) {
-            col = 0;
-        }
-        else if (col >= this._terminal.cols) {
-            col = this._terminal.cols - 1;
-        }
-        this._terminal.buffer.x = col;
-        this._terminal.buffer.y = row;
-    };
-    InputHandler.prototype.cursorForwardTab = function (params) {
-        var param = params[0] || 1;
-        while (param--) {
-            this._terminal.buffer.x = this._terminal.buffer.nextStop();
-        }
-    };
-    InputHandler.prototype.eraseInDisplay = function (params) {
-        var j;
-        switch (params[0]) {
-            case 0:
-                this._terminal.eraseRight(this._terminal.buffer.x, this._terminal.buffer.y);
-                j = this._terminal.buffer.y + 1;
-                for (; j < this._terminal.rows; j++) {
-                    this._terminal.eraseLine(j);
-                }
-                break;
-            case 1:
-                this._terminal.eraseLeft(this._terminal.buffer.x, this._terminal.buffer.y);
-                j = this._terminal.buffer.y;
-                while (j--) {
-                    this._terminal.eraseLine(j);
-                }
-                break;
-            case 2:
-                j = this._terminal.rows;
-                while (j--)
-                    this._terminal.eraseLine(j);
-                break;
-            case 3:
-                var scrollBackSize = this._terminal.buffer.lines.length - this._terminal.rows;
-                if (scrollBackSize > 0) {
-                    this._terminal.buffer.lines.trimStart(scrollBackSize);
-                    this._terminal.buffer.ybase = Math.max(this._terminal.buffer.ybase - scrollBackSize, 0);
-                    this._terminal.buffer.ydisp = Math.max(this._terminal.buffer.ydisp - scrollBackSize, 0);
-                    this._terminal.emit('scroll', 0);
-                }
-                break;
-        }
-    };
-    InputHandler.prototype.eraseInLine = function (params) {
-        switch (params[0]) {
-            case 0:
-                this._terminal.eraseRight(this._terminal.buffer.x, this._terminal.buffer.y);
-                break;
-            case 1:
-                this._terminal.eraseLeft(this._terminal.buffer.x, this._terminal.buffer.y);
-                break;
-            case 2:
-                this._terminal.eraseLine(this._terminal.buffer.y);
-                break;
-        }
-    };
-    InputHandler.prototype.insertLines = function (params) {
-        var param = params[0];
-        if (param < 1) {
-            param = 1;
-        }
-        var row = this._terminal.buffer.y + this._terminal.buffer.ybase;
-        var scrollBottomRowsOffset = this._terminal.rows - 1 - this._terminal.buffer.scrollBottom;
-        var scrollBottomAbsolute = this._terminal.rows - 1 + this._terminal.buffer.ybase - scrollBottomRowsOffset + 1;
-        while (param--) {
-            this._terminal.buffer.lines.splice(scrollBottomAbsolute - 1, 1);
-            this._terminal.buffer.lines.splice(row, 0, this._terminal.blankLine(true));
-        }
-        this._terminal.updateRange(this._terminal.buffer.y);
-        this._terminal.updateRange(this._terminal.buffer.scrollBottom);
-    };
-    InputHandler.prototype.deleteLines = function (params) {
-        var param = params[0];
-        if (param < 1) {
-            param = 1;
-        }
-        var row = this._terminal.buffer.y + this._terminal.buffer.ybase;
-        var j;
-        j = this._terminal.rows - 1 - this._terminal.buffer.scrollBottom;
-        j = this._terminal.rows - 1 + this._terminal.buffer.ybase - j;
-        while (param--) {
-            this._terminal.buffer.lines.splice(row, 1);
-            this._terminal.buffer.lines.splice(j, 0, this._terminal.blankLine(true));
-        }
-        this._terminal.updateRange(this._terminal.buffer.y);
-        this._terminal.updateRange(this._terminal.buffer.scrollBottom);
-    };
-    InputHandler.prototype.deleteChars = function (params) {
-        var param = params[0];
-        if (param < 1) {
-            param = 1;
-        }
-        var row = this._terminal.buffer.y + this._terminal.buffer.ybase;
-        var ch = [this._terminal.eraseAttr(), ' ', 1, 32];
-        while (param--) {
-            this._terminal.buffer.lines.get(row).splice(this._terminal.buffer.x, 1);
-            this._terminal.buffer.lines.get(row).push(ch);
-        }
-        this._terminal.updateRange(this._terminal.buffer.y);
-    };
-    InputHandler.prototype.scrollUp = function (params) {
-        var param = params[0] || 1;
-        while (param--) {
-            this._terminal.buffer.lines.splice(this._terminal.buffer.ybase + this._terminal.buffer.scrollTop, 1);
-            this._terminal.buffer.lines.splice(this._terminal.buffer.ybase + this._terminal.buffer.scrollBottom, 0, this._terminal.blankLine());
-        }
-        this._terminal.updateRange(this._terminal.buffer.scrollTop);
-        this._terminal.updateRange(this._terminal.buffer.scrollBottom);
-    };
-    InputHandler.prototype.scrollDown = function (params) {
-        var param = params[0] || 1;
-        while (param--) {
-            this._terminal.buffer.lines.splice(this._terminal.buffer.ybase + this._terminal.buffer.scrollBottom, 1);
-            this._terminal.buffer.lines.splice(this._terminal.buffer.ybase + this._terminal.buffer.scrollTop, 0, this._terminal.blankLine());
-        }
-        this._terminal.updateRange(this._terminal.buffer.scrollTop);
-        this._terminal.updateRange(this._terminal.buffer.scrollBottom);
-    };
-    InputHandler.prototype.eraseChars = function (params) {
-        var param = params[0];
-        if (param < 1) {
-            param = 1;
-        }
-        var row = this._terminal.buffer.y + this._terminal.buffer.ybase;
-        var j = this._terminal.buffer.x;
-        var ch = [this._terminal.eraseAttr(), ' ', 1, 32];
-        while (param-- && j < this._terminal.cols) {
-            this._terminal.buffer.lines.get(row)[j++] = ch;
-        }
-    };
-    InputHandler.prototype.cursorBackwardTab = function (params) {
-        var param = params[0] || 1;
-        while (param--) {
-            this._terminal.buffer.x = this._terminal.buffer.prevStop();
-        }
-    };
-    InputHandler.prototype.charPosAbsolute = function (params) {
-        var param = params[0];
-        if (param < 1) {
-            param = 1;
-        }
-        this._terminal.buffer.x = param - 1;
-        if (this._terminal.buffer.x >= this._terminal.cols) {
-            this._terminal.buffer.x = this._terminal.cols - 1;
-        }
-    };
-    InputHandler.prototype.HPositionRelative = function (params) {
-        var param = params[0];
-        if (param < 1) {
-            param = 1;
-        }
-        this._terminal.buffer.x += param;
-        if (this._terminal.buffer.x >= this._terminal.cols) {
-            this._terminal.buffer.x = this._terminal.cols - 1;
-        }
-    };
-    InputHandler.prototype.repeatPrecedingCharacter = function (params) {
-        var param = params[0] || 1;
-        var line = this._terminal.buffer.lines.get(this._terminal.buffer.ybase + this._terminal.buffer.y);
-        var ch = line[this._terminal.buffer.x - 1] || [this._terminal.defAttr, ' ', 1, 32];
-        while (param--) {
-            line[this._terminal.buffer.x++] = ch;
-        }
-    };
-    InputHandler.prototype.sendDeviceAttributes = function (params) {
-        if (params[0] > 0) {
-            return;
-        }
-        if (!this._terminal.prefix) {
-            if (this._terminal.is('xterm') || this._terminal.is('rxvt-unicode') || this._terminal.is('screen')) {
-                this._terminal.send(EscapeSequences_1.C0.ESC + '[?1;2c');
-            }
-            else if (this._terminal.is('linux')) {
-                this._terminal.send(EscapeSequences_1.C0.ESC + '[?6c');
-            }
-        }
-        else if (this._terminal.prefix === '>') {
-            if (this._terminal.is('xterm')) {
-                this._terminal.send(EscapeSequences_1.C0.ESC + '[>0;276;0c');
-            }
-            else if (this._terminal.is('rxvt-unicode')) {
-                this._terminal.send(EscapeSequences_1.C0.ESC + '[>85;95;0c');
-            }
-            else if (this._terminal.is('linux')) {
-                this._terminal.send(params[0] + 'c');
-            }
-            else if (this._terminal.is('screen')) {
-                this._terminal.send(EscapeSequences_1.C0.ESC + '[>83;40003;0c');
-            }
-        }
-    };
-    InputHandler.prototype.linePosAbsolute = function (params) {
-        var param = params[0];
-        if (param < 1) {
-            param = 1;
-        }
-        this._terminal.buffer.y = param - 1;
-        if (this._terminal.buffer.y >= this._terminal.rows) {
-            this._terminal.buffer.y = this._terminal.rows - 1;
-        }
-    };
-    InputHandler.prototype.VPositionRelative = function (params) {
-        var param = params[0];
-        if (param < 1) {
-            param = 1;
-        }
-        this._terminal.buffer.y += param;
-        if (this._terminal.buffer.y >= this._terminal.rows) {
-            this._terminal.buffer.y = this._terminal.rows - 1;
-        }
-        if (this._terminal.buffer.x >= this._terminal.cols) {
-            this._terminal.buffer.x--;
-        }
-    };
-    InputHandler.prototype.HVPosition = function (params) {
-        if (params[0] < 1)
-            params[0] = 1;
-        if (params[1] < 1)
-            params[1] = 1;
-        this._terminal.buffer.y = params[0] - 1;
-        if (this._terminal.buffer.y >= this._terminal.rows) {
-            this._terminal.buffer.y = this._terminal.rows - 1;
-        }
-        this._terminal.buffer.x = params[1] - 1;
-        if (this._terminal.buffer.x >= this._terminal.cols) {
-            this._terminal.buffer.x = this._terminal.cols - 1;
-        }
-    };
-    InputHandler.prototype.tabClear = function (params) {
-        var param = params[0];
-        if (param <= 0) {
-            delete this._terminal.buffer.tabs[this._terminal.buffer.x];
-        }
-        else if (param === 3) {
-            this._terminal.buffer.tabs = {};
-        }
-    };
-    InputHandler.prototype.setMode = function (params) {
-        if (params.length > 1) {
-            for (var i = 0; i < params.length; i++) {
-                this.setMode([params[i]]);
-            }
-            return;
-        }
-        if (!this._terminal.prefix) {
-            switch (params[0]) {
-                case 4:
-                    this._terminal.insertMode = true;
-                    break;
-                case 20:
-                    break;
-            }
-        }
-        else if (this._terminal.prefix === '?') {
-            switch (params[0]) {
-                case 1:
-                    this._terminal.applicationCursor = true;
-                    break;
-                case 2:
-                    this._terminal.setgCharset(0, Charsets_1.DEFAULT_CHARSET);
-                    this._terminal.setgCharset(1, Charsets_1.DEFAULT_CHARSET);
-                    this._terminal.setgCharset(2, Charsets_1.DEFAULT_CHARSET);
-                    this._terminal.setgCharset(3, Charsets_1.DEFAULT_CHARSET);
-                    break;
-                case 3:
-                    this._terminal.savedCols = this._terminal.cols;
-                    this._terminal.resize(132, this._terminal.rows);
-                    break;
-                case 6:
-                    this._terminal.originMode = true;
-                    break;
-                case 7:
-                    this._terminal.wraparoundMode = true;
-                    break;
-                case 12:
-                    break;
-                case 66:
-                    this._terminal.log('Serial port requested application keypad.');
-                    this._terminal.applicationKeypad = true;
-                    this._terminal.viewport.syncScrollArea();
-                    break;
-                case 9:
-                case 1000:
-                case 1002:
-                case 1003:
-                    this._terminal.x10Mouse = params[0] === 9;
-                    this._terminal.vt200Mouse = params[0] === 1000;
-                    this._terminal.normalMouse = params[0] > 1000;
-                    this._terminal.mouseEvents = true;
-                    this._terminal.element.classList.add('enable-mouse-events');
-                    this._terminal.selectionManager.disable();
-                    this._terminal.log('Binding to mouse events.');
-                    break;
-                case 1004:
-                    this._terminal.sendFocus = true;
-                    break;
-                case 1005:
-                    this._terminal.utfMouse = true;
-                    break;
-                case 1006:
-                    this._terminal.sgrMouse = true;
-                    break;
-                case 1015:
-                    this._terminal.urxvtMouse = true;
-                    break;
-                case 25:
-                    this._terminal.cursorHidden = false;
-                    break;
-                case 1049:
-                case 47:
-                case 1047:
-                    this._terminal.buffers.activateAltBuffer();
-                    this._terminal.selectionManager.setBuffer(this._terminal.buffer);
-                    this._terminal.viewport.syncScrollArea();
-                    this._terminal.showCursor();
-                    break;
-                case 2004:
-                    this._terminal.bracketedPasteMode = true;
-                    break;
-            }
-        }
-    };
-    InputHandler.prototype.resetMode = function (params) {
-        if (params.length > 1) {
-            for (var i = 0; i < params.length; i++) {
-                this.resetMode([params[i]]);
-            }
-            return;
-        }
-        if (!this._terminal.prefix) {
-            switch (params[0]) {
-                case 4:
-                    this._terminal.insertMode = false;
-                    break;
-                case 20:
-                    break;
-            }
-        }
-        else if (this._terminal.prefix === '?') {
-            switch (params[0]) {
-                case 1:
-                    this._terminal.applicationCursor = false;
-                    break;
-                case 3:
-                    if (this._terminal.cols === 132 && this._terminal.savedCols) {
-                        this._terminal.resize(this._terminal.savedCols, this._terminal.rows);
-                    }
-                    delete this._terminal.savedCols;
-                    break;
-                case 6:
-                    this._terminal.originMode = false;
-                    break;
-                case 7:
-                    this._terminal.wraparoundMode = false;
-                    break;
-                case 12:
-                    break;
-                case 66:
-                    this._terminal.log('Switching back to normal keypad.');
-                    this._terminal.applicationKeypad = false;
-                    this._terminal.viewport.syncScrollArea();
-                    break;
-                case 9:
-                case 1000:
-                case 1002:
-                case 1003:
-                    this._terminal.x10Mouse = false;
-                    this._terminal.vt200Mouse = false;
-                    this._terminal.normalMouse = false;
-                    this._terminal.mouseEvents = false;
-                    this._terminal.element.classList.remove('enable-mouse-events');
-                    this._terminal.selectionManager.enable();
-                    break;
-                case 1004:
-                    this._terminal.sendFocus = false;
-                    break;
-                case 1005:
-                    this._terminal.utfMouse = false;
-                    break;
-                case 1006:
-                    this._terminal.sgrMouse = false;
-                    break;
-                case 1015:
-                    this._terminal.urxvtMouse = false;
-                    break;
-                case 25:
-                    this._terminal.cursorHidden = true;
-                    break;
-                case 1049:
-                case 47:
-                case 1047:
-                    this._terminal.buffers.activateNormalBuffer();
-                    this._terminal.selectionManager.setBuffer(this._terminal.buffer);
-                    this._terminal.refresh(0, this._terminal.rows - 1);
-                    this._terminal.viewport.syncScrollArea();
-                    this._terminal.showCursor();
-                    break;
-                case 2004:
-                    this._terminal.bracketedPasteMode = false;
-                    break;
-            }
-        }
-    };
-    InputHandler.prototype.charAttributes = function (params) {
-        if (params.length === 1 && params[0] === 0) {
-            this._terminal.curAttr = this._terminal.defAttr;
-            return;
-        }
-        var l = params.length;
-        var flags = this._terminal.curAttr >> 18;
-        var fg = (this._terminal.curAttr >> 9) & 0x1ff;
-        var bg = this._terminal.curAttr & 0x1ff;
-        var p;
-        for (var i = 0; i < l; i++) {
-            p = params[i];
-            if (p >= 30 && p <= 37) {
-                fg = p - 30;
-            }
-            else if (p >= 40 && p <= 47) {
-                bg = p - 40;
-            }
-            else if (p >= 90 && p <= 97) {
-                p += 8;
-                fg = p - 90;
-            }
-            else if (p >= 100 && p <= 107) {
-                p += 8;
-                bg = p - 100;
-            }
-            else if (p === 0) {
-                flags = this._terminal.defAttr >> 18;
-                fg = (this._terminal.defAttr >> 9) & 0x1ff;
-                bg = this._terminal.defAttr & 0x1ff;
-            }
-            else if (p === 1) {
-                flags |= Types_1.FLAGS.BOLD;
-            }
-            else if (p === 4) {
-                flags |= Types_1.FLAGS.UNDERLINE;
-            }
-            else if (p === 5) {
-                flags |= Types_1.FLAGS.BLINK;
-            }
-            else if (p === 7) {
-                flags |= Types_1.FLAGS.INVERSE;
-            }
-            else if (p === 8) {
-                flags |= Types_1.FLAGS.INVISIBLE;
-            }
-            else if (p === 2) {
-                flags |= Types_1.FLAGS.DIM;
-            }
-            else if (p === 22) {
-                flags &= ~Types_1.FLAGS.BOLD;
-                flags &= ~Types_1.FLAGS.DIM;
-            }
-            else if (p === 24) {
-                flags &= ~Types_1.FLAGS.UNDERLINE;
-            }
-            else if (p === 25) {
-                flags &= ~Types_1.FLAGS.BLINK;
-            }
-            else if (p === 27) {
-                flags &= ~Types_1.FLAGS.INVERSE;
-            }
-            else if (p === 28) {
-                flags &= ~Types_1.FLAGS.INVISIBLE;
-            }
-            else if (p === 39) {
-                fg = (this._terminal.defAttr >> 9) & 0x1ff;
-            }
-            else if (p === 49) {
-                bg = this._terminal.defAttr & 0x1ff;
-            }
-            else if (p === 38) {
-                if (params[i + 1] === 2) {
-                    i += 2;
-                    fg = this._terminal.matchColor(params[i] & 0xff, params[i + 1] & 0xff, params[i + 2] & 0xff);
-                    if (fg === -1)
-                        fg = 0x1ff;
-                    i += 2;
-                }
-                else if (params[i + 1] === 5) {
-                    i += 2;
-                    p = params[i] & 0xff;
-                    fg = p;
-                }
-            }
-            else if (p === 48) {
-                if (params[i + 1] === 2) {
-                    i += 2;
-                    bg = this._terminal.matchColor(params[i] & 0xff, params[i + 1] & 0xff, params[i + 2] & 0xff);
-                    if (bg === -1)
-                        bg = 0x1ff;
-                    i += 2;
-                }
-                else if (params[i + 1] === 5) {
-                    i += 2;
-                    p = params[i] & 0xff;
-                    bg = p;
-                }
-            }
-            else if (p === 100) {
-                fg = (this._terminal.defAttr >> 9) & 0x1ff;
-                bg = this._terminal.defAttr & 0x1ff;
-            }
-            else {
-                this._terminal.error('Unknown SGR attribute: %d.', p);
-            }
-        }
-        this._terminal.curAttr = (flags << 18) | (fg << 9) | bg;
-    };
-    InputHandler.prototype.deviceStatus = function (params) {
-        if (!this._terminal.prefix) {
-            switch (params[0]) {
-                case 5:
-                    this._terminal.send(EscapeSequences_1.C0.ESC + '[0n');
-                    break;
-                case 6:
-                    this._terminal.send(EscapeSequences_1.C0.ESC + '['
-                        + (this._terminal.buffer.y + 1)
-                        + ';'
-                        + (this._terminal.buffer.x + 1)
-                        + 'R');
-                    break;
-            }
-        }
-        else if (this._terminal.prefix === '?') {
-            switch (params[0]) {
-                case 6:
-                    this._terminal.send(EscapeSequences_1.C0.ESC + '[?'
-                        + (this._terminal.buffer.y + 1)
-                        + ';'
-                        + (this._terminal.buffer.x + 1)
-                        + 'R');
-                    break;
-                case 15:
-                    break;
-                case 25:
-                    break;
-                case 26:
-                    break;
-                case 53:
-                    break;
-            }
-        }
-    };
-    InputHandler.prototype.softReset = function (params) {
-        this._terminal.cursorHidden = false;
-        this._terminal.insertMode = false;
-        this._terminal.originMode = false;
-        this._terminal.wraparoundMode = true;
-        this._terminal.applicationKeypad = false;
-        this._terminal.viewport.syncScrollArea();
-        this._terminal.applicationCursor = false;
-        this._terminal.buffer.scrollTop = 0;
-        this._terminal.buffer.scrollBottom = this._terminal.rows - 1;
-        this._terminal.curAttr = this._terminal.defAttr;
-        this._terminal.buffer.x = this._terminal.buffer.y = 0;
-        this._terminal.charset = null;
-        this._terminal.glevel = 0;
-        this._terminal.charsets = [null];
-    };
-    InputHandler.prototype.setCursorStyle = function (params) {
-        var param = params[0] < 1 ? 1 : params[0];
-        switch (param) {
-            case 1:
-            case 2:
-                this._terminal.setOption('cursorStyle', 'block');
-                break;
-            case 3:
-            case 4:
-                this._terminal.setOption('cursorStyle', 'underline');
-                break;
-            case 5:
-            case 6:
-                this._terminal.setOption('cursorStyle', 'bar');
-                break;
-        }
-        var isBlinking = param % 2 === 1;
-        this._terminal.setOption('cursorBlink', isBlinking);
-    };
-    InputHandler.prototype.setScrollRegion = function (params) {
-        if (this._terminal.prefix)
-            return;
-        this._terminal.buffer.scrollTop = (params[0] || 1) - 1;
-        this._terminal.buffer.scrollBottom = (params[1] && params[1] <= this._terminal.rows ? params[1] : this._terminal.rows) - 1;
-        this._terminal.buffer.x = 0;
-        this._terminal.buffer.y = 0;
-    };
-    InputHandler.prototype.saveCursor = function (params) {
-        this._terminal.buffer.savedX = this._terminal.buffer.x;
-        this._terminal.buffer.savedY = this._terminal.buffer.y;
-    };
-    InputHandler.prototype.restoreCursor = function (params) {
-        this._terminal.buffer.x = this._terminal.buffer.savedX || 0;
-        this._terminal.buffer.y = this._terminal.buffer.savedY || 0;
-    };
-    return InputHandler;
-}());
-exports.InputHandler = InputHandler;
-
-
-
-},{"./Buffer":1,"./CharWidth":3,"./Charsets":4,"./EscapeSequences":6,"./renderer/Types":27}],9:[function(require,module,exports){
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var Types_1 = require("./Types");
-var MouseZoneManager_1 = require("./input/MouseZoneManager");
-var EventEmitter_1 = require("./EventEmitter");
-var protocolClause = '(https?:\\/\\/)';
-var domainCharacterSet = '[\\da-z\\.-]+';
-var negatedDomainCharacterSet = '[^\\da-z\\.-]+';
-var domainBodyClause = '(' + domainCharacterSet + ')';
-var tldClause = '([a-z\\.]{2,6})';
-var ipClause = '((\\d{1,3}\\.){3}\\d{1,3})';
-var localHostClause = '(localhost)';
-var portClause = '(:\\d{1,5})';
-var hostClause = '((' + domainBodyClause + '\\.' + tldClause + ')|' + ipClause + '|' + localHostClause + ')' + portClause + '?';
-var pathClause = '(\\/[\\/\\w\\.\\-%~]*)*';
-var queryStringHashFragmentCharacterSet = '[0-9\\w\\[\\]\\(\\)\\/\\?\\!#@$%&\'*+,:;~\\=\\.\\-]*';
-var queryStringClause = '(\\?' + queryStringHashFragmentCharacterSet + ')?';
-var hashFragmentClause = '(#' + queryStringHashFragmentCharacterSet + ')?';
-var negatedPathCharacterSet = '[^\\/\\w\\.\\-%]+';
-var bodyClause = hostClause + pathClause + queryStringClause + hashFragmentClause;
-var start = '(?:^|' + negatedDomainCharacterSet + ')(';
-var end = ')($|' + negatedPathCharacterSet + ')';
-var strictUrlRegex = new RegExp(start + protocolClause + bodyClause + end);
-var HYPERTEXT_LINK_MATCHER_ID = 0;
-var Linkifier = (function (_super) {
-    __extends(Linkifier, _super);
-    function Linkifier(_terminal) {
-        var _this = _super.call(this) || this;
-        _this._terminal = _terminal;
-        _this._linkMatchers = [];
-        _this._nextLinkMatcherId = HYPERTEXT_LINK_MATCHER_ID;
-        _this._rowsToLinkify = {
-            start: null,
-            end: null
-        };
-        _this.registerLinkMatcher(strictUrlRegex, null, { matchIndex: 1 });
-        return _this;
-    }
-    Linkifier.prototype.attachToDom = function (mouseZoneManager) {
-        this._mouseZoneManager = mouseZoneManager;
-    };
-    Linkifier.prototype.linkifyRows = function (start, end) {
-        var _this = this;
-        if (!this._mouseZoneManager) {
-            return;
-        }
-        if (!this._rowsToLinkify.start) {
-            this._rowsToLinkify.start = start;
-            this._rowsToLinkify.end = end;
-        }
-        else {
-            this._rowsToLinkify.start = this._rowsToLinkify.start < start ? this._rowsToLinkify.start : start;
-            this._rowsToLinkify.end = this._rowsToLinkify.end > end ? this._rowsToLinkify.end : end;
-        }
-        this._mouseZoneManager.clearAll(start, end);
-        if (this._rowsTimeoutId) {
-            clearTimeout(this._rowsTimeoutId);
-        }
-        this._rowsTimeoutId = setTimeout(function () { return _this._linkifyRows(); }, Linkifier.TIME_BEFORE_LINKIFY);
-    };
-    Linkifier.prototype._linkifyRows = function () {
-        this._rowsTimeoutId = null;
-        for (var i = this._rowsToLinkify.start; i <= this._rowsToLinkify.end; i++) {
-            this._linkifyRow(i);
-        }
-        this._rowsToLinkify.start = null;
-        this._rowsToLinkify.end = null;
-    };
-    Linkifier.prototype.setHypertextLinkHandler = function (handler) {
-        this._linkMatchers[HYPERTEXT_LINK_MATCHER_ID].handler = handler;
-    };
-    Linkifier.prototype.setHypertextValidationCallback = function (callback) {
-        this._linkMatchers[HYPERTEXT_LINK_MATCHER_ID].validationCallback = callback;
-    };
-    Linkifier.prototype.registerLinkMatcher = function (regex, handler, options) {
-        if (options === void 0) { options = {}; }
-        if (this._nextLinkMatcherId !== HYPERTEXT_LINK_MATCHER_ID && !handler) {
-            throw new Error('handler must be defined');
-        }
-        var matcher = {
-            id: this._nextLinkMatcherId++,
-            regex: regex,
-            handler: handler,
-            matchIndex: options.matchIndex,
-            validationCallback: options.validationCallback,
-            hoverTooltipCallback: options.tooltipCallback,
-            hoverLeaveCallback: options.leaveCallback,
-            priority: options.priority || 0
-        };
-        this._addLinkMatcherToList(matcher);
-        return matcher.id;
-    };
-    Linkifier.prototype._addLinkMatcherToList = function (matcher) {
-        if (this._linkMatchers.length === 0) {
-            this._linkMatchers.push(matcher);
-            return;
-        }
-        for (var i = this._linkMatchers.length - 1; i >= 0; i--) {
-            if (matcher.priority <= this._linkMatchers[i].priority) {
-                this._linkMatchers.splice(i + 1, 0, matcher);
-                return;
-            }
-        }
-        this._linkMatchers.splice(0, 0, matcher);
-    };
-    Linkifier.prototype.deregisterLinkMatcher = function (matcherId) {
-        for (var i = 1; i < this._linkMatchers.length; i++) {
-            if (this._linkMatchers[i].id === matcherId) {
-                this._linkMatchers.splice(i, 1);
-                return true;
-            }
-        }
-        return false;
-    };
-    Linkifier.prototype._linkifyRow = function (rowIndex) {
-        var absoluteRowIndex = this._terminal.buffer.ydisp + rowIndex;
-        if (absoluteRowIndex >= this._terminal.buffer.lines.length) {
-            return;
-        }
-        var text = this._terminal.buffer.translateBufferLineToString(absoluteRowIndex, false);
-        for (var i = 0; i < this._linkMatchers.length; i++) {
-            this._doLinkifyRow(rowIndex, text, this._linkMatchers[i]);
-        }
-    };
-    Linkifier.prototype._doLinkifyRow = function (rowIndex, text, matcher, offset) {
-        var _this = this;
-        if (offset === void 0) { offset = 0; }
-        var result = [];
-        var isHttpLinkMatcher = matcher.id === HYPERTEXT_LINK_MATCHER_ID;
-        var match = text.match(matcher.regex);
-        if (!match || match.length === 0) {
-            return;
-        }
-        var uri = match[typeof matcher.matchIndex !== 'number' ? 0 : matcher.matchIndex];
-        var index = text.indexOf(uri);
-        if (matcher.validationCallback) {
-            matcher.validationCallback(uri, function (isValid) {
-                if (_this._rowsTimeoutId) {
-                    return;
-                }
-                if (isValid) {
-                    _this._addLink(offset + index, rowIndex, uri, matcher);
-                }
-            });
-        }
-        else {
-            this._addLink(offset + index, rowIndex, uri, matcher);
-        }
-        var remainingStartIndex = index + uri.length;
-        var remainingText = text.substr(remainingStartIndex);
-        if (remainingText.length > 0) {
-            this._doLinkifyRow(rowIndex, remainingText, matcher, offset + remainingStartIndex);
-        }
-    };
-    Linkifier.prototype._addLink = function (x, y, uri, matcher) {
-        var _this = this;
-        this._mouseZoneManager.add(new MouseZoneManager_1.MouseZone(x + 1, x + 1 + uri.length, y + 1, function (e) {
-            if (matcher.handler) {
-                return matcher.handler(e, uri);
-            }
-            window.open(uri, '_blank');
-        }, function (e) {
-            _this.emit(Types_1.LinkHoverEventTypes.HOVER, { x: x, y: y, length: uri.length });
-            _this._terminal.element.style.cursor = 'pointer';
-        }, function (e) {
-            _this.emit(Types_1.LinkHoverEventTypes.TOOLTIP, { x: x, y: y, length: uri.length });
-            if (matcher.hoverTooltipCallback) {
-                matcher.hoverTooltipCallback(e, uri);
-            }
-        }, function () {
-            _this.emit(Types_1.LinkHoverEventTypes.LEAVE, { x: x, y: y, length: uri.length });
-            _this._terminal.element.style.cursor = '';
-            if (matcher.hoverLeaveCallback) {
-                matcher.hoverLeaveCallback();
-            }
-        }));
-    };
-    Linkifier.TIME_BEFORE_LINKIFY = 200;
-    return Linkifier;
-}(EventEmitter_1.EventEmitter));
-exports.Linkifier = Linkifier;
-
-
-
-},{"./EventEmitter":7,"./Types":14,"./input/MouseZoneManager":17}],10:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var EscapeSequences_1 = require("./EscapeSequences");
-var Charsets_1 = require("./Charsets");
-var normalStateHandler = {};
-normalStateHandler[EscapeSequences_1.C0.BEL] = function (parser, handler) { return handler.bell(); };
-normalStateHandler[EscapeSequences_1.C0.LF] = function (parser, handler) { return handler.lineFeed(); };
-normalStateHandler[EscapeSequences_1.C0.VT] = normalStateHandler[EscapeSequences_1.C0.LF];
-normalStateHandler[EscapeSequences_1.C0.FF] = normalStateHandler[EscapeSequences_1.C0.LF];
-normalStateHandler[EscapeSequences_1.C0.CR] = function (parser, handler) { return handler.carriageReturn(); };
-normalStateHandler[EscapeSequences_1.C0.BS] = function (parser, handler) { return handler.backspace(); };
-normalStateHandler[EscapeSequences_1.C0.HT] = function (parser, handler) { return handler.tab(); };
-normalStateHandler[EscapeSequences_1.C0.SO] = function (parser, handler) { return handler.shiftOut(); };
-normalStateHandler[EscapeSequences_1.C0.SI] = function (parser, handler) { return handler.shiftIn(); };
-normalStateHandler[EscapeSequences_1.C0.ESC] = function (parser, handler) { return parser.setState(ParserState.ESCAPED); };
-var escapedStateHandler = {};
-escapedStateHandler['['] = function (parser, terminal) {
-    terminal.params = [];
-    terminal.currentParam = 0;
-    parser.setState(ParserState.CSI_PARAM);
-};
-escapedStateHandler[']'] = function (parser, terminal) {
-    terminal.params = [];
-    terminal.currentParam = 0;
-    parser.setState(ParserState.OSC);
-};
-escapedStateHandler['P'] = function (parser, terminal) {
-    terminal.params = [];
-    terminal.currentParam = 0;
-    parser.setState(ParserState.DCS);
-};
-escapedStateHandler['_'] = function (parser, terminal) {
-    parser.setState(ParserState.IGNORE);
-};
-escapedStateHandler['^'] = function (parser, terminal) {
-    parser.setState(ParserState.IGNORE);
-};
-escapedStateHandler['c'] = function (parser, terminal) {
-    terminal.reset();
-};
-escapedStateHandler['E'] = function (parser, terminal) {
-    terminal.buffer.x = 0;
-    terminal.index();
-    parser.setState(ParserState.NORMAL);
-};
-escapedStateHandler['D'] = function (parser, terminal) {
-    terminal.index();
-    parser.setState(ParserState.NORMAL);
-};
-escapedStateHandler['M'] = function (parser, terminal) {
-    terminal.reverseIndex();
-    parser.setState(ParserState.NORMAL);
-};
-escapedStateHandler['%'] = function (parser, terminal) {
-    terminal.setgLevel(0);
-    terminal.setgCharset(0, Charsets_1.DEFAULT_CHARSET);
-    parser.setState(ParserState.NORMAL);
-    parser.skipNextChar();
-};
-escapedStateHandler[EscapeSequences_1.C0.CAN] = function (parser) { return parser.setState(ParserState.NORMAL); };
-var csiParamStateHandler = {};
-csiParamStateHandler['?'] = function (parser) { return parser.setPrefix('?'); };
-csiParamStateHandler['>'] = function (parser) { return parser.setPrefix('>'); };
-csiParamStateHandler['!'] = function (parser) { return parser.setPrefix('!'); };
-csiParamStateHandler['0'] = function (parser) { return parser.setParam(parser.getParam() * 10); };
-csiParamStateHandler['1'] = function (parser) { return parser.setParam(parser.getParam() * 10 + 1); };
-csiParamStateHandler['2'] = function (parser) { return parser.setParam(parser.getParam() * 10 + 2); };
-csiParamStateHandler['3'] = function (parser) { return parser.setParam(parser.getParam() * 10 + 3); };
-csiParamStateHandler['4'] = function (parser) { return parser.setParam(parser.getParam() * 10 + 4); };
-csiParamStateHandler['5'] = function (parser) { return parser.setParam(parser.getParam() * 10 + 5); };
-csiParamStateHandler['6'] = function (parser) { return parser.setParam(parser.getParam() * 10 + 6); };
-csiParamStateHandler['7'] = function (parser) { return parser.setParam(parser.getParam() * 10 + 7); };
-csiParamStateHandler['8'] = function (parser) { return parser.setParam(parser.getParam() * 10 + 8); };
-csiParamStateHandler['9'] = function (parser) { return parser.setParam(parser.getParam() * 10 + 9); };
-csiParamStateHandler['$'] = function (parser) { return parser.setPostfix('$'); };
-csiParamStateHandler['"'] = function (parser) { return parser.setPostfix('"'); };
-csiParamStateHandler[' '] = function (parser) { return parser.setPostfix(' '); };
-csiParamStateHandler['\''] = function (parser) { return parser.setPostfix('\''); };
-csiParamStateHandler[';'] = function (parser) { return parser.finalizeParam(); };
-csiParamStateHandler[EscapeSequences_1.C0.CAN] = function (parser) { return parser.setState(ParserState.NORMAL); };
-var csiStateHandler = {};
-csiStateHandler['@'] = function (handler, params, prefix) { return handler.insertChars(params); };
-csiStateHandler['A'] = function (handler, params, prefix) { return handler.cursorUp(params); };
-csiStateHandler['B'] = function (handler, params, prefix) { return handler.cursorDown(params); };
-csiStateHandler['C'] = function (handler, params, prefix) { return handler.cursorForward(params); };
-csiStateHandler['D'] = function (handler, params, prefix) { return handler.cursorBackward(params); };
-csiStateHandler['E'] = function (handler, params, prefix) { return handler.cursorNextLine(params); };
-csiStateHandler['F'] = function (handler, params, prefix) { return handler.cursorPrecedingLine(params); };
-csiStateHandler['G'] = function (handler, params, prefix) { return handler.cursorCharAbsolute(params); };
-csiStateHandler['H'] = function (handler, params, prefix) { return handler.cursorPosition(params); };
-csiStateHandler['I'] = function (handler, params, prefix) { return handler.cursorForwardTab(params); };
-csiStateHandler['J'] = function (handler, params, prefix) { return handler.eraseInDisplay(params); };
-csiStateHandler['K'] = function (handler, params, prefix) { return handler.eraseInLine(params); };
-csiStateHandler['L'] = function (handler, params, prefix) { return handler.insertLines(params); };
-csiStateHandler['M'] = function (handler, params, prefix) { return handler.deleteLines(params); };
-csiStateHandler['P'] = function (handler, params, prefix) { return handler.deleteChars(params); };
-csiStateHandler['S'] = function (handler, params, prefix) { return handler.scrollUp(params); };
-csiStateHandler['T'] = function (handler, params, prefix) {
-    if (params.length < 2 && !prefix) {
-        handler.scrollDown(params);
-    }
-};
-csiStateHandler['X'] = function (handler, params, prefix) { return handler.eraseChars(params); };
-csiStateHandler['Z'] = function (handler, params, prefix) { return handler.cursorBackwardTab(params); };
-csiStateHandler['`'] = function (handler, params, prefix) { return handler.charPosAbsolute(params); };
-csiStateHandler['a'] = function (handler, params, prefix) { return handler.HPositionRelative(params); };
-csiStateHandler['b'] = function (handler, params, prefix) { return handler.repeatPrecedingCharacter(params); };
-csiStateHandler['c'] = function (handler, params, prefix) { return handler.sendDeviceAttributes(params); };
-csiStateHandler['d'] = function (handler, params, prefix) { return handler.linePosAbsolute(params); };
-csiStateHandler['e'] = function (handler, params, prefix) { return handler.VPositionRelative(params); };
-csiStateHandler['f'] = function (handler, params, prefix) { return handler.HVPosition(params); };
-csiStateHandler['g'] = function (handler, params, prefix) { return handler.tabClear(params); };
-csiStateHandler['h'] = function (handler, params, prefix) { return handler.setMode(params); };
-csiStateHandler['l'] = function (handler, params, prefix) { return handler.resetMode(params); };
-csiStateHandler['m'] = function (handler, params, prefix) { return handler.charAttributes(params); };
-csiStateHandler['n'] = function (handler, params, prefix) { return handler.deviceStatus(params); };
-csiStateHandler['p'] = function (handler, params, prefix) {
-    switch (prefix) {
-        case '!':
-            handler.softReset(params);
-            break;
-    }
-};
-csiStateHandler['q'] = function (handler, params, prefix, postfix) {
-    if (postfix === ' ') {
-        handler.setCursorStyle(params);
-    }
-};
-csiStateHandler['r'] = function (handler, params) { return handler.setScrollRegion(params); };
-csiStateHandler['s'] = function (handler, params) { return handler.saveCursor(params); };
-csiStateHandler['u'] = function (handler, params) { return handler.restoreCursor(params); };
-csiStateHandler[EscapeSequences_1.C0.CAN] = function (handler, params, prefix, postfix, parser) { return parser.setState(ParserState.NORMAL); };
-var ParserState;
-(function (ParserState) {
-    ParserState[ParserState["NORMAL"] = 0] = "NORMAL";
-    ParserState[ParserState["ESCAPED"] = 1] = "ESCAPED";
-    ParserState[ParserState["CSI_PARAM"] = 2] = "CSI_PARAM";
-    ParserState[ParserState["CSI"] = 3] = "CSI";
-    ParserState[ParserState["OSC"] = 4] = "OSC";
-    ParserState[ParserState["CHARSET"] = 5] = "CHARSET";
-    ParserState[ParserState["DCS"] = 6] = "DCS";
-    ParserState[ParserState["IGNORE"] = 7] = "IGNORE";
-})(ParserState = exports.ParserState || (exports.ParserState = {}));
-var Parser = (function () {
-    function Parser(_inputHandler, _terminal) {
-        this._inputHandler = _inputHandler;
-        this._terminal = _terminal;
-        this._state = ParserState.NORMAL;
-    }
-    Parser.prototype.parse = function (data) {
-        var l = data.length;
-        var j;
-        var cs;
-        var ch;
-        var code;
-        var low;
-        var cursorStartX = this._terminal.buffer.x;
-        var cursorStartY = this._terminal.buffer.y;
-        if (this._terminal.debug) {
-            this._terminal.log('data: ' + data);
-        }
-        this._position = 0;
-        if (this._terminal.surrogate_high) {
-            data = this._terminal.surrogate_high + data;
-            this._terminal.surrogate_high = '';
-        }
-        for (; this._position < l; this._position++) {
-            ch = data[this._position];
-            code = data.charCodeAt(this._position);
-            if (0xD800 <= code && code <= 0xDBFF) {
-                low = data.charCodeAt(this._position + 1);
-                if (isNaN(low)) {
-                    this._terminal.surrogate_high = ch;
-                    continue;
-                }
-                code = ((code - 0xD800) * 0x400) + (low - 0xDC00) + 0x10000;
-                ch += data.charAt(this._position + 1);
-            }
-            if (0xDC00 <= code && code <= 0xDFFF)
-                continue;
-            switch (this._state) {
-                case ParserState.NORMAL:
-                    if (ch in normalStateHandler) {
-                        normalStateHandler[ch](this, this._inputHandler);
-                    }
-                    else {
-                        this._inputHandler.addChar(ch, code);
-                    }
-                    break;
-                case ParserState.ESCAPED:
-                    if (ch in escapedStateHandler) {
-                        escapedStateHandler[ch](this, this._terminal);
-                        break;
-                    }
-                    switch (ch) {
-                        case '(':
-                        case ')':
-                        case '*':
-                        case '+':
-                        case '-':
-                        case '.':
-                            switch (ch) {
-                                case '(':
-                                    this._terminal.gcharset = 0;
-                                    break;
-                                case ')':
-                                    this._terminal.gcharset = 1;
-                                    break;
-                                case '*':
-                                    this._terminal.gcharset = 2;
-                                    break;
-                                case '+':
-                                    this._terminal.gcharset = 3;
-                                    break;
-                                case '-':
-                                    this._terminal.gcharset = 1;
-                                    break;
-                                case '.':
-                                    this._terminal.gcharset = 2;
-                                    break;
-                            }
-                            this._state = ParserState.CHARSET;
-                            break;
-                        case '/':
-                            this._terminal.gcharset = 3;
-                            this._state = ParserState.CHARSET;
-                            this._position--;
-                            break;
-                        case 'N':
-                            break;
-                        case 'O':
-                            break;
-                        case 'n':
-                            this._terminal.setgLevel(2);
-                            break;
-                        case 'o':
-                            this._terminal.setgLevel(3);
-                            break;
-                        case '|':
-                            this._terminal.setgLevel(3);
-                            break;
-                        case '}':
-                            this._terminal.setgLevel(2);
-                            break;
-                        case '~':
-                            this._terminal.setgLevel(1);
-                            break;
-                        case '7':
-                            this._inputHandler.saveCursor();
-                            this._state = ParserState.NORMAL;
-                            break;
-                        case '8':
-                            this._inputHandler.restoreCursor();
-                            this._state = ParserState.NORMAL;
-                            break;
-                        case '#':
-                            this._state = ParserState.NORMAL;
-                            this._position++;
-                            break;
-                        case 'H':
-                            this._terminal.tabSet();
-                            this._state = ParserState.NORMAL;
-                            break;
-                        case '=':
-                            this._terminal.log('Serial port requested application keypad.');
-                            this._terminal.applicationKeypad = true;
-                            if (this._terminal.viewport) {
-                                this._terminal.viewport.syncScrollArea();
-                            }
-                            this._state = ParserState.NORMAL;
-                            break;
-                        case '>':
-                            this._terminal.log('Switching back to normal keypad.');
-                            this._terminal.applicationKeypad = false;
-                            if (this._terminal.viewport) {
-                                this._terminal.viewport.syncScrollArea();
-                            }
-                            this._state = ParserState.NORMAL;
-                            break;
-                        default:
-                            this._state = ParserState.NORMAL;
-                            this._terminal.error('Unknown ESC control: %s.', ch);
-                            break;
-                    }
-                    break;
-                case ParserState.CHARSET:
-                    if (ch in Charsets_1.CHARSETS) {
-                        cs = Charsets_1.CHARSETS[ch];
-                        if (ch === '/') {
-                            this.skipNextChar();
-                        }
-                    }
-                    else {
-                        cs = Charsets_1.DEFAULT_CHARSET;
-                    }
-                    this._terminal.setgCharset(this._terminal.gcharset, cs);
-                    this._terminal.gcharset = null;
-                    this._state = ParserState.NORMAL;
-                    break;
-                case ParserState.OSC:
-                    if (ch === EscapeSequences_1.C0.ESC || ch === EscapeSequences_1.C0.BEL) {
-                        if (ch === EscapeSequences_1.C0.ESC)
-                            this._position++;
-                        this._terminal.params.push(this._terminal.currentParam);
-                        switch (this._terminal.params[0]) {
-                            case 0:
-                            case 1:
-                            case 2:
-                                if (this._terminal.params[1]) {
-                                    this._terminal.title = this._terminal.params[1];
-                                    this._terminal.handleTitle(this._terminal.title);
-                                }
-                                break;
-                            case 3:
-                                break;
-                            case 4:
-                            case 5:
-                                break;
-                            case 10:
-                            case 11:
-                            case 12:
-                            case 13:
-                            case 14:
-                            case 15:
-                            case 16:
-                            case 17:
-                            case 18:
-                            case 19:
-                                break;
-                            case 46:
-                                break;
-                            case 50:
-                                break;
-                            case 51:
-                                break;
-                            case 52:
-                                break;
-                            case 104:
-                            case 105:
-                            case 110:
-                            case 111:
-                            case 112:
-                            case 113:
-                            case 114:
-                            case 115:
-                            case 116:
-                            case 117:
-                            case 118:
-                                break;
-                        }
-                        this._terminal.params = [];
-                        this._terminal.currentParam = 0;
-                        this._state = ParserState.NORMAL;
-                    }
-                    else {
-                        if (!this._terminal.params.length) {
-                            if (ch >= '0' && ch <= '9') {
-                                this._terminal.currentParam =
-                                    this._terminal.currentParam * 10 + ch.charCodeAt(0) - 48;
-                            }
-                            else if (ch === ';') {
-                                this._terminal.params.push(this._terminal.currentParam);
-                                this._terminal.currentParam = '';
-                            }
-                        }
-                        else {
-                            this._terminal.currentParam += ch;
-                        }
-                    }
-                    break;
-                case ParserState.CSI_PARAM:
-                    if (ch in csiParamStateHandler) {
-                        csiParamStateHandler[ch](this);
-                        break;
-                    }
-                    this.finalizeParam();
-                    this._state = ParserState.CSI;
-                case ParserState.CSI:
-                    if (ch in csiStateHandler) {
-                        if (this._terminal.debug) {
-                            this._terminal.log("CSI " + (this._terminal.prefix ? this._terminal.prefix : '') + " " + (this._terminal.params ? this._terminal.params.join(';') : '') + " " + (this._terminal.postfix ? this._terminal.postfix : '') + " " + ch);
-                        }
-                        csiStateHandler[ch](this._inputHandler, this._terminal.params, this._terminal.prefix, this._terminal.postfix, this);
-                    }
-                    else {
-                        this._terminal.error('Unknown CSI code: %s.', ch);
-                    }
-                    this._state = ParserState.NORMAL;
-                    this._terminal.prefix = '';
-                    this._terminal.postfix = '';
-                    break;
-                case ParserState.DCS:
-                    if (ch === EscapeSequences_1.C0.ESC || ch === EscapeSequences_1.C0.BEL) {
-                        if (ch === EscapeSequences_1.C0.ESC)
-                            this._position++;
-                        var pt = void 0;
-                        var valid = void 0;
-                        switch (this._terminal.prefix) {
-                            case '':
-                                break;
-                            case '$q':
-                                pt = this._terminal.currentParam;
-                                valid = false;
-                                switch (pt) {
-                                    case '"q':
-                                        pt = '0"q';
-                                        break;
-                                    case '"p':
-                                        pt = '61"p';
-                                        break;
-                                    case 'r':
-                                        pt = ''
-                                            + (this._terminal.buffer.scrollTop + 1)
-                                            + ';'
-                                            + (this._terminal.buffer.scrollBottom + 1)
-                                            + 'r';
-                                        break;
-                                    case 'm':
-                                        pt = '0m';
-                                        break;
-                                    default:
-                                        this._terminal.error('Unknown DCS Pt: %s.', pt);
-                                        pt = '';
-                                        break;
-                                }
-                                this._terminal.send(EscapeSequences_1.C0.ESC + 'P' + +valid + '$r' + pt + EscapeSequences_1.C0.ESC + '\\');
-                                break;
-                            case '+p':
-                                break;
-                            case '+q':
-                                pt = this._terminal.currentParam;
-                                valid = false;
-                                this._terminal.send(EscapeSequences_1.C0.ESC + 'P' + +valid + '+r' + pt + EscapeSequences_1.C0.ESC + '\\');
-                                break;
-                            default:
-                                this._terminal.error('Unknown DCS prefix: %s.', this._terminal.prefix);
-                                break;
-                        }
-                        this._terminal.currentParam = 0;
-                        this._terminal.prefix = '';
-                        this._state = ParserState.NORMAL;
-                    }
-                    else if (!this._terminal.currentParam) {
-                        if (!this._terminal.prefix && ch !== '$' && ch !== '+') {
-                            this._terminal.currentParam = ch;
-                        }
-                        else if (this._terminal.prefix.length === 2) {
-                            this._terminal.currentParam = ch;
-                        }
-                        else {
-                            this._terminal.prefix += ch;
-                        }
-                    }
-                    else {
-                        this._terminal.currentParam += ch;
-                    }
-                    break;
-                case ParserState.IGNORE:
-                    if (ch === EscapeSequences_1.C0.ESC || ch === EscapeSequences_1.C0.BEL) {
-                        if (ch === EscapeSequences_1.C0.ESC)
-                            this._position++;
-                        this._state = ParserState.NORMAL;
-                    }
-                    break;
-            }
-        }
-        if (this._terminal.buffer.x !== cursorStartX || this._terminal.buffer.y !== cursorStartY) {
-            this._terminal.emit('cursormove');
-        }
-        return this._state;
-    };
-    Parser.prototype.setState = function (state) {
-        this._state = state;
-    };
-    Parser.prototype.setPrefix = function (prefix) {
-        this._terminal.prefix = prefix;
-    };
-    Parser.prototype.setPostfix = function (postfix) {
-        this._terminal.postfix = postfix;
-    };
-    Parser.prototype.setParam = function (param) {
-        this._terminal.currentParam = param;
-    };
-    Parser.prototype.getParam = function () {
-        return this._terminal.currentParam;
-    };
-    Parser.prototype.finalizeParam = function () {
-        this._terminal.params.push(this._terminal.currentParam);
-        this._terminal.currentParam = 0;
-    };
-    Parser.prototype.skipNextChar = function () {
-        this._position++;
-    };
-    return Parser;
-}());
-exports.Parser = Parser;
-
-
-
-},{"./Charsets":4,"./EscapeSequences":6}],11:[function(require,module,exports){
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var MouseHelper_1 = require("./utils/MouseHelper");
-var Browser = require("./utils/Browser");
-var EventEmitter_1 = require("./EventEmitter");
-var SelectionModel_1 = require("./SelectionModel");
-var Buffer_1 = require("./Buffer");
-var DRAG_SCROLL_MAX_THRESHOLD = 50;
-var DRAG_SCROLL_MAX_SPEED = 15;
-var DRAG_SCROLL_INTERVAL = 50;
-var WORD_SEPARATORS = ' ()[]{}\'"';
-var NON_BREAKING_SPACE_CHAR = String.fromCharCode(160);
-var ALL_NON_BREAKING_SPACE_REGEX = new RegExp(NON_BREAKING_SPACE_CHAR, 'g');
-var SelectionMode;
-(function (SelectionMode) {
-    SelectionMode[SelectionMode["NORMAL"] = 0] = "NORMAL";
-    SelectionMode[SelectionMode["WORD"] = 1] = "WORD";
-    SelectionMode[SelectionMode["LINE"] = 2] = "LINE";
-})(SelectionMode || (SelectionMode = {}));
-var SelectionManager = (function (_super) {
-    __extends(SelectionManager, _super);
-    function SelectionManager(_terminal, _buffer, _charMeasure) {
-        var _this = _super.call(this) || this;
-        _this._terminal = _terminal;
-        _this._buffer = _buffer;
-        _this._charMeasure = _charMeasure;
-        _this._enabled = true;
-        _this._initListeners();
-        _this.enable();
-        _this._model = new SelectionModel_1.SelectionModel(_terminal);
-        _this._activeSelectionMode = SelectionMode.NORMAL;
-        return _this;
-    }
-    SelectionManager.prototype._initListeners = function () {
-        var _this = this;
-        this._mouseMoveListener = function (event) { return _this._onMouseMove(event); };
-        this._mouseUpListener = function (event) { return _this._onMouseUp(event); };
-        this._buffer.lines.on('trim', function (amount) { return _this._onTrim(amount); });
-    };
-    SelectionManager.prototype.disable = function () {
-        this.clearSelection();
-        this._enabled = false;
-    };
-    SelectionManager.prototype.enable = function () {
-        this._enabled = true;
-    };
-    SelectionManager.prototype.setBuffer = function (buffer) {
-        this._buffer = buffer;
-        this.clearSelection();
-    };
-    Object.defineProperty(SelectionManager.prototype, "selectionStart", {
-        get: function () { return this._model.finalSelectionStart; },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(SelectionManager.prototype, "selectionEnd", {
-        get: function () { return this._model.finalSelectionEnd; },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(SelectionManager.prototype, "hasSelection", {
-        get: function () {
-            var start = this._model.finalSelectionStart;
-            var end = this._model.finalSelectionEnd;
-            if (!start || !end) {
-                return false;
-            }
-            return start[0] !== end[0] || start[1] !== end[1];
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(SelectionManager.prototype, "selectionText", {
-        get: function () {
-            var start = this._model.finalSelectionStart;
-            var end = this._model.finalSelectionEnd;
-            if (!start || !end) {
-                return '';
-            }
-            var startRowEndCol = start[1] === end[1] ? end[0] : null;
-            var result = [];
-            result.push(this._buffer.translateBufferLineToString(start[1], true, start[0], startRowEndCol));
-            for (var i = start[1] + 1; i <= end[1] - 1; i++) {
-                var bufferLine = this._buffer.lines.get(i);
-                var lineText = this._buffer.translateBufferLineToString(i, true);
-                if (bufferLine.isWrapped) {
-                    result[result.length - 1] += lineText;
-                }
-                else {
-                    result.push(lineText);
-                }
-            }
-            if (start[1] !== end[1]) {
-                var bufferLine = this._buffer.lines.get(end[1]);
-                var lineText = this._buffer.translateBufferLineToString(end[1], true, 0, end[0]);
-                if (bufferLine.isWrapped) {
-                    result[result.length - 1] += lineText;
-                }
-                else {
-                    result.push(lineText);
-                }
-            }
-            var formattedResult = result.map(function (line) {
-                return line.replace(ALL_NON_BREAKING_SPACE_REGEX, ' ');
-            }).join(Browser.isMSWindows ? '\r\n' : '\n');
-            return formattedResult;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    SelectionManager.prototype.clearSelection = function () {
-        this._model.clearSelection();
-        this._removeMouseDownListeners();
-        this.refresh();
-    };
-    SelectionManager.prototype.refresh = function (isNewSelection) {
-        var _this = this;
-        if (!this._refreshAnimationFrame) {
-            this._refreshAnimationFrame = window.requestAnimationFrame(function () { return _this._refresh(); });
-        }
-        if (Browser.isLinux && isNewSelection) {
-            var selectionText = this.selectionText;
-            if (selectionText.length) {
-                this.emit('newselection', this.selectionText);
-            }
-        }
-    };
-    SelectionManager.prototype._refresh = function () {
-        this._refreshAnimationFrame = null;
-        this.emit('refresh', { start: this._model.finalSelectionStart, end: this._model.finalSelectionEnd });
-    };
-    SelectionManager.prototype.selectAll = function () {
-        this._model.isSelectAllActive = true;
-        this.refresh();
-        this.emit('selection');
-    };
-    SelectionManager.prototype._onTrim = function (amount) {
-        var needsRefresh = this._model.onTrim(amount);
-        if (needsRefresh) {
-            this.refresh();
-        }
-    };
-    SelectionManager.prototype._getMouseBufferCoords = function (event) {
-        var coords = this._terminal.mouseHelper.getCoords(event, this._terminal.element, this._charMeasure, this._terminal.options.lineHeight, this._terminal.cols, this._terminal.rows, true);
-        if (!coords) {
-            return null;
-        }
-        coords[0]--;
-        coords[1]--;
-        coords[1] += this._terminal.buffer.ydisp;
-        return coords;
-    };
-    SelectionManager.prototype._getMouseEventScrollAmount = function (event) {
-        var offset = MouseHelper_1.MouseHelper.getCoordsRelativeToElement(event, this._terminal.element)[1];
-        var terminalHeight = this._terminal.rows * Math.ceil(this._charMeasure.height * this._terminal.options.lineHeight);
-        if (offset >= 0 && offset <= terminalHeight) {
-            return 0;
-        }
-        if (offset > terminalHeight) {
-            offset -= terminalHeight;
-        }
-        offset = Math.min(Math.max(offset, -DRAG_SCROLL_MAX_THRESHOLD), DRAG_SCROLL_MAX_THRESHOLD);
-        offset /= DRAG_SCROLL_MAX_THRESHOLD;
-        return (offset / Math.abs(offset)) + Math.round(offset * (DRAG_SCROLL_MAX_SPEED - 1));
-    };
-    SelectionManager.prototype.shouldForceSelection = function (event) {
-        return Browser.isMac ? event.altKey : event.shiftKey;
-    };
-    SelectionManager.prototype.onMouseDown = function (event) {
-        if (event.button === 2 && this.hasSelection) {
-            return;
-        }
-        if (event.button !== 0) {
-            return;
-        }
-        if (!this._enabled) {
-            if (!this.shouldForceSelection(event)) {
-                return;
-            }
-            event.stopPropagation();
-        }
-        event.preventDefault();
-        this._dragScrollAmount = 0;
-        if (this._enabled && event.shiftKey) {
-            this._onIncrementalClick(event);
-        }
-        else {
-            if (event.detail === 1) {
-                this._onSingleClick(event);
-            }
-            else if (event.detail === 2) {
-                this._onDoubleClick(event);
-            }
-            else if (event.detail === 3) {
-                this._onTripleClick(event);
-            }
-        }
-        this._addMouseDownListeners();
-        this.refresh(true);
-    };
-    SelectionManager.prototype._addMouseDownListeners = function () {
-        var _this = this;
-        this._terminal.element.ownerDocument.addEventListener('mousemove', this._mouseMoveListener);
-        this._terminal.element.ownerDocument.addEventListener('mouseup', this._mouseUpListener);
-        this._dragScrollIntervalTimer = setInterval(function () { return _this._dragScroll(); }, DRAG_SCROLL_INTERVAL);
-    };
-    SelectionManager.prototype._removeMouseDownListeners = function () {
-        this._terminal.element.ownerDocument.removeEventListener('mousemove', this._mouseMoveListener);
-        this._terminal.element.ownerDocument.removeEventListener('mouseup', this._mouseUpListener);
-        clearInterval(this._dragScrollIntervalTimer);
-        this._dragScrollIntervalTimer = null;
-    };
-    SelectionManager.prototype._onIncrementalClick = function (event) {
-        if (this._model.selectionStart) {
-            this._model.selectionEnd = this._getMouseBufferCoords(event);
-        }
-    };
-    SelectionManager.prototype._onSingleClick = function (event) {
-        this._model.selectionStartLength = 0;
-        this._model.isSelectAllActive = false;
-        this._activeSelectionMode = SelectionMode.NORMAL;
-        this._model.selectionStart = this._getMouseBufferCoords(event);
-        if (!this._model.selectionStart) {
-            return;
-        }
-        this._model.selectionEnd = null;
-        var line = this._buffer.lines.get(this._model.selectionStart[1]);
-        if (!line) {
-            return;
-        }
-        if (line.length >= this._model.selectionStart[0]) {
-            return;
-        }
-        var char = line[this._model.selectionStart[0]];
-        if (char[Buffer_1.CHAR_DATA_WIDTH_INDEX] === 0) {
-            this._model.selectionStart[0]++;
-        }
-    };
-    SelectionManager.prototype._onDoubleClick = function (event) {
-        var coords = this._getMouseBufferCoords(event);
-        if (coords) {
-            this._activeSelectionMode = SelectionMode.WORD;
-            this._selectWordAt(coords);
-        }
-    };
-    SelectionManager.prototype._onTripleClick = function (event) {
-        var coords = this._getMouseBufferCoords(event);
-        if (coords) {
-            this._activeSelectionMode = SelectionMode.LINE;
-            this._selectLineAt(coords[1]);
-        }
-    };
-    SelectionManager.prototype._onMouseMove = function (event) {
-        event.stopImmediatePropagation();
-        var previousSelectionEnd = this._model.selectionEnd ? [this._model.selectionEnd[0], this._model.selectionEnd[1]] : null;
-        this._model.selectionEnd = this._getMouseBufferCoords(event);
-        if (!this._model.selectionEnd) {
-            this.refresh(true);
-            return;
-        }
-        if (this._activeSelectionMode === SelectionMode.LINE) {
-            if (this._model.selectionEnd[1] < this._model.selectionStart[1]) {
-                this._model.selectionEnd[0] = 0;
-            }
-            else {
-                this._model.selectionEnd[0] = this._terminal.cols;
-            }
-        }
-        else if (this._activeSelectionMode === SelectionMode.WORD) {
-            this._selectToWordAt(this._model.selectionEnd);
-        }
-        this._dragScrollAmount = this._getMouseEventScrollAmount(event);
-        if (this._dragScrollAmount > 0) {
-            this._model.selectionEnd[0] = this._terminal.cols;
-        }
-        else if (this._dragScrollAmount < 0) {
-            this._model.selectionEnd[0] = 0;
-        }
-        if (this._model.selectionEnd[1] < this._buffer.lines.length) {
-            var char = this._buffer.lines.get(this._model.selectionEnd[1])[this._model.selectionEnd[0]];
-            if (char && char[Buffer_1.CHAR_DATA_WIDTH_INDEX] === 0) {
-                this._model.selectionEnd[0]++;
-            }
-        }
-        if (!previousSelectionEnd ||
-            previousSelectionEnd[0] !== this._model.selectionEnd[0] ||
-            previousSelectionEnd[1] !== this._model.selectionEnd[1]) {
-            this.refresh(true);
-        }
-    };
-    SelectionManager.prototype._dragScroll = function () {
-        if (this._dragScrollAmount) {
-            this._terminal.scrollLines(this._dragScrollAmount, false);
-            if (this._dragScrollAmount > 0) {
-                this._model.selectionEnd = [this._terminal.cols - 1, this._terminal.buffer.ydisp + this._terminal.rows];
-            }
-            else {
-                this._model.selectionEnd = [0, this._terminal.buffer.ydisp];
-            }
-            this.refresh();
-        }
-    };
-    SelectionManager.prototype._onMouseUp = function (event) {
-        this._removeMouseDownListeners();
-        if (this.hasSelection)
-            this.emit('selection');
-    };
-    SelectionManager.prototype._convertViewportColToCharacterIndex = function (bufferLine, coords) {
-        var charIndex = coords[0];
-        for (var i = 0; coords[0] >= i; i++) {
-            var char = bufferLine[i];
-            if (char[Buffer_1.CHAR_DATA_WIDTH_INDEX] === 0) {
-                charIndex--;
-            }
-            else if (char[Buffer_1.CHAR_DATA_CHAR_INDEX].length > 1 && coords[0] !== i) {
-                charIndex += char[Buffer_1.CHAR_DATA_CHAR_INDEX].length - 1;
-            }
-        }
-        return charIndex;
-    };
-    SelectionManager.prototype.setSelection = function (col, row, length) {
-        this._model.clearSelection();
-        this._removeMouseDownListeners();
-        this._model.selectionStart = [col, row];
-        this._model.selectionStartLength = length;
-        this.refresh();
-    };
-    SelectionManager.prototype._getWordAt = function (coords) {
-        var bufferLine = this._buffer.lines.get(coords[1]);
-        if (!bufferLine) {
-            return null;
-        }
-        var line = this._buffer.translateBufferLineToString(coords[1], false);
-        var startIndex = this._convertViewportColToCharacterIndex(bufferLine, coords);
-        var endIndex = startIndex;
-        var charOffset = coords[0] - startIndex;
-        var leftWideCharCount = 0;
-        var rightWideCharCount = 0;
-        var leftLongCharOffset = 0;
-        var rightLongCharOffset = 0;
-        if (line.charAt(startIndex) === ' ') {
-            while (startIndex > 0 && line.charAt(startIndex - 1) === ' ') {
-                startIndex--;
-            }
-            while (endIndex < line.length && line.charAt(endIndex + 1) === ' ') {
-                endIndex++;
-            }
-        }
-        else {
-            var startCol = coords[0];
-            var endCol = coords[0];
-            if (bufferLine[startCol][Buffer_1.CHAR_DATA_WIDTH_INDEX] === 0) {
-                leftWideCharCount++;
-                startCol--;
-            }
-            if (bufferLine[endCol][Buffer_1.CHAR_DATA_WIDTH_INDEX] === 2) {
-                rightWideCharCount++;
-                endCol++;
-            }
-            if (bufferLine[endCol][Buffer_1.CHAR_DATA_CHAR_INDEX].length > 1) {
-                rightLongCharOffset += bufferLine[endCol][Buffer_1.CHAR_DATA_CHAR_INDEX].length - 1;
-                endIndex += bufferLine[endCol][Buffer_1.CHAR_DATA_CHAR_INDEX].length - 1;
-            }
-            while (startCol > 0 && startIndex > 0 && !this._isCharWordSeparator(bufferLine[startCol - 1])) {
-                var char = bufferLine[startCol - 1];
-                if (char[Buffer_1.CHAR_DATA_WIDTH_INDEX] === 0) {
-                    leftWideCharCount++;
-                    startCol--;
-                }
-                else if (char[Buffer_1.CHAR_DATA_CHAR_INDEX].length > 1) {
-                    leftLongCharOffset += char[Buffer_1.CHAR_DATA_CHAR_INDEX].length - 1;
-                    startIndex -= char[Buffer_1.CHAR_DATA_CHAR_INDEX].length - 1;
-                }
-                startIndex--;
-                startCol--;
-            }
-            while (endCol < bufferLine.length && endIndex + 1 < line.length && !this._isCharWordSeparator(bufferLine[endCol + 1])) {
-                var char = bufferLine[endCol + 1];
-                if (char[Buffer_1.CHAR_DATA_WIDTH_INDEX] === 2) {
-                    rightWideCharCount++;
-                    endCol++;
-                }
-                else if (char[Buffer_1.CHAR_DATA_CHAR_INDEX].length > 1) {
-                    rightLongCharOffset += char[Buffer_1.CHAR_DATA_CHAR_INDEX].length - 1;
-                    endIndex += char[Buffer_1.CHAR_DATA_CHAR_INDEX].length - 1;
-                }
-                endIndex++;
-                endCol++;
-            }
-        }
-        endIndex++;
-        var start = startIndex
-            + charOffset
-            - leftWideCharCount
-            + leftLongCharOffset;
-        var length = Math.min(this._terminal.cols, endIndex
-            - startIndex
-            + leftWideCharCount
-            + rightWideCharCount
-            - leftLongCharOffset
-            - rightLongCharOffset);
-        return { start: start, length: length };
-    };
-    SelectionManager.prototype._selectWordAt = function (coords) {
-        var wordPosition = this._getWordAt(coords);
-        if (wordPosition) {
-            this._model.selectionStart = [wordPosition.start, coords[1]];
-            this._model.selectionStartLength = wordPosition.length;
-        }
-    };
-    SelectionManager.prototype._selectToWordAt = function (coords) {
-        var wordPosition = this._getWordAt(coords);
-        if (wordPosition) {
-            this._model.selectionEnd = [this._model.areSelectionValuesReversed() ? wordPosition.start : (wordPosition.start + wordPosition.length), coords[1]];
-        }
-    };
-    SelectionManager.prototype._isCharWordSeparator = function (charData) {
-        if (charData[Buffer_1.CHAR_DATA_WIDTH_INDEX] === 0) {
-            return false;
-        }
-        return WORD_SEPARATORS.indexOf(charData[Buffer_1.CHAR_DATA_CHAR_INDEX]) >= 0;
-    };
-    SelectionManager.prototype._selectLineAt = function (line) {
-        this._model.selectionStart = [0, line];
-        this._model.selectionStartLength = this._terminal.cols;
-    };
-    return SelectionManager;
-}(EventEmitter_1.EventEmitter));
-exports.SelectionManager = SelectionManager;
-
-
-
-},{"./Buffer":1,"./EventEmitter":7,"./SelectionModel":12,"./utils/Browser":28,"./utils/MouseHelper":32}],12:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var SelectionModel = (function () {
-    function SelectionModel(_terminal) {
-        this._terminal = _terminal;
-        this.clearSelection();
-    }
-    SelectionModel.prototype.clearSelection = function () {
-        this.selectionStart = null;
-        this.selectionEnd = null;
-        this.isSelectAllActive = false;
-        this.selectionStartLength = 0;
-    };
-    Object.defineProperty(SelectionModel.prototype, "finalSelectionStart", {
-        get: function () {
-            if (this.isSelectAllActive) {
-                return [0, 0];
-            }
-            if (!this.selectionEnd || !this.selectionStart) {
-                return this.selectionStart;
-            }
-            return this.areSelectionValuesReversed() ? this.selectionEnd : this.selectionStart;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(SelectionModel.prototype, "finalSelectionEnd", {
-        get: function () {
-            if (this.isSelectAllActive) {
-                return [this._terminal.cols, this._terminal.buffer.ybase + this._terminal.rows - 1];
-            }
-            if (!this.selectionStart) {
-                return null;
-            }
-            if (!this.selectionEnd || this.areSelectionValuesReversed()) {
-                return [this.selectionStart[0] + this.selectionStartLength, this.selectionStart[1]];
-            }
-            if (this.selectionStartLength) {
-                if (this.selectionEnd[1] === this.selectionStart[1]) {
-                    return [Math.max(this.selectionStart[0] + this.selectionStartLength, this.selectionEnd[0]), this.selectionEnd[1]];
-                }
-            }
-            return this.selectionEnd;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    SelectionModel.prototype.areSelectionValuesReversed = function () {
-        var start = this.selectionStart;
-        var end = this.selectionEnd;
-        if (!start || !end) {
-            return false;
-        }
-        return start[1] > end[1] || (start[1] === end[1] && start[0] > end[0]);
-    };
-    SelectionModel.prototype.onTrim = function (amount) {
-        if (this.selectionStart) {
-            this.selectionStart[1] -= amount;
-        }
-        if (this.selectionEnd) {
-            this.selectionEnd[1] -= amount;
-        }
-        if (this.selectionEnd && this.selectionEnd[1] < 0) {
-            this.clearSelection();
-            return true;
-        }
-        if (this.selectionStart && this.selectionStart[1] < 0) {
-            this.selectionStart[1] = 0;
-        }
-        return false;
-    };
-    return SelectionModel;
-}());
-exports.SelectionModel = SelectionModel;
-
-
-
-},{}],13:[function(require,module,exports){
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var BufferSet_1 = require("./BufferSet");
-var Buffer_1 = require("./Buffer");
-var CompositionHelper_1 = require("./CompositionHelper");
-var EventEmitter_1 = require("./EventEmitter");
-var Viewport_1 = require("./Viewport");
-var Clipboard_1 = require("./handlers/Clipboard");
-var EscapeSequences_1 = require("./EscapeSequences");
-var InputHandler_1 = require("./InputHandler");
-var Parser_1 = require("./Parser");
-var Renderer_1 = require("./renderer/Renderer");
-var Linkifier_1 = require("./Linkifier");
-var SelectionManager_1 = require("./SelectionManager");
-var CharMeasure_1 = require("./utils/CharMeasure");
-var Browser = require("./utils/Browser");
-var MouseHelper_1 = require("./utils/MouseHelper");
-var Sounds_1 = require("./utils/Sounds");
-var ColorManager_1 = require("./renderer/ColorManager");
-var MouseZoneManager_1 = require("./input/MouseZoneManager");
-var CharAtlas_1 = require("./renderer/CharAtlas");
-var document = (typeof window !== 'undefined') ? window.document : null;
-var WRITE_BUFFER_PAUSE_THRESHOLD = 5;
-var WRITE_BATCH_SIZE = 300;
-var DEFAULT_OPTIONS = {
-    convertEol: false,
-    termName: 'xterm',
-    geometry: [80, 24],
-    cursorBlink: false,
-    cursorStyle: 'block',
-    bellSound: Sounds_1.BellSound,
-    bellStyle: 'none',
-    enableBold: true,
-    fontFamily: 'courier-new, courier, monospace',
-    fontSize: 15,
-    lineHeight: 1.0,
-    letterSpacing: 0,
-    scrollback: 1000,
-    screenKeys: false,
-    debug: false,
-    cancelEvents: false,
-    disableStdin: false,
-    useFlowControl: false,
-    tabStopWidth: 8,
-    theme: null
-};
-var Terminal = (function (_super) {
-    __extends(Terminal, _super);
-    function Terminal(options) {
-        if (options === void 0) { options = {}; }
-        var _this = _super.call(this) || this;
-        _this.browser = Browser;
-        _this.options = options;
-        _this.setup();
-        return _this;
-    }
-    Terminal.prototype.setup = function () {
-        var _this = this;
-        Object.keys(DEFAULT_OPTIONS).forEach(function (key) {
-            if (_this.options[key] == null) {
-                _this.options[key] = DEFAULT_OPTIONS[key];
-            }
-            _this[key] = _this.options[key];
-        });
-        this.parent = document ? document.body : null;
-        this.cols = this.options.cols || this.options.geometry[0];
-        this.rows = this.options.rows || this.options.geometry[1];
-        this.geometry = [this.cols, this.rows];
-        if (this.options.handler) {
-            this.on('data', this.options.handler);
-        }
-        this.cursorState = 0;
-        this.cursorHidden = false;
-        this.sendDataQueue = '';
-        this.customKeyEventHandler = null;
-        this.applicationKeypad = false;
-        this.applicationCursor = false;
-        this.originMode = false;
-        this.insertMode = false;
-        this.wraparoundMode = true;
-        this.bracketedPasteMode = false;
-        this.charset = null;
-        this.gcharset = null;
-        this.glevel = 0;
-        this.charsets = [null];
-        this.readable = true;
-        this.writable = true;
-        this.defAttr = (0 << 18) | (257 << 9) | (256 << 0);
-        this.curAttr = (0 << 18) | (257 << 9) | (256 << 0);
-        this.params = [];
-        this.currentParam = 0;
-        this.prefix = '';
-        this.postfix = '';
-        this.writeBuffer = [];
-        this.writeInProgress = false;
-        this.xoffSentToCatchUp = false;
-        this.writeStopped = false;
-        this.surrogate_high = '';
-        this.userScrolling = false;
-        this.inputHandler = new InputHandler_1.InputHandler(this);
-        this.parser = new Parser_1.Parser(this.inputHandler, this);
-        this.renderer = this.renderer || null;
-        this.selectionManager = this.selectionManager || null;
-        this.linkifier = this.linkifier || new Linkifier_1.Linkifier(this);
-        this._mouseZoneManager = this._mouseZoneManager || null;
-        this.buffers = new BufferSet_1.BufferSet(this);
-        this.buffer = this.buffers.active;
-        this.buffers.on('activate', function (buffer) {
-            _this.buffer = buffer;
-        });
-        if (this.selectionManager) {
-            this.selectionManager.setBuffer(this.buffer);
-        }
-    };
-    Terminal.prototype.eraseAttr = function () {
-        return (this.defAttr & ~0x1ff) | (this.curAttr & 0x1ff);
-    };
-    Terminal.prototype.focus = function () {
-        this.textarea.focus();
-    };
-    Object.defineProperty(Terminal.prototype, "isFocused", {
-        get: function () {
-            return document.activeElement === this.textarea;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Terminal.prototype.getOption = function (key) {
-        if (!(key in DEFAULT_OPTIONS)) {
-            throw new Error('No option with key "' + key + '"');
-        }
-        if (typeof this.options[key] !== 'undefined') {
-            return this.options[key];
-        }
-        return this[key];
-    };
-    Terminal.prototype.setOption = function (key, value) {
-        if (!(key in DEFAULT_OPTIONS)) {
-            throw new Error('No option with key "' + key + '"');
-        }
-        switch (key) {
-            case 'bellStyle':
-                if (!value) {
-                    value = 'none';
-                }
-                break;
-            case 'cursorStyle':
-                if (!value) {
-                    value = 'block';
-                }
-                break;
-            case 'lineHeight':
-                if (value < 1) {
-                    console.warn(key + " cannot be less than 1, value: " + value);
-                    return;
-                }
-            case 'tabStopWidth':
-                if (value < 1) {
-                    console.warn(key + " cannot be less than 1, value: " + value);
-                    return;
-                }
-                break;
-            case 'theme':
-                if (this.renderer) {
-                    this._setTheme(value);
-                    return;
-                }
-                break;
-            case 'scrollback':
-                value = Math.min(value, Buffer_1.MAX_BUFFER_SIZE);
-                if (value < 0) {
-                    console.warn(key + " cannot be less than 0, value: " + value);
-                    return;
-                }
-                if (this.options[key] !== value) {
-                    var newBufferLength = this.rows + value;
-                    if (this.buffer.lines.length > newBufferLength) {
-                        var amountToTrim = this.buffer.lines.length - newBufferLength;
-                        var needsRefresh = (this.buffer.ydisp - amountToTrim < 0);
-                        this.buffer.lines.trimStart(amountToTrim);
-                        this.buffer.ybase = Math.max(this.buffer.ybase - amountToTrim, 0);
-                        this.buffer.ydisp = Math.max(this.buffer.ydisp - amountToTrim, 0);
-                        if (needsRefresh) {
-                            this.refresh(0, this.rows - 1);
-                        }
-                    }
-                }
-                break;
-        }
-        this[key] = value;
-        this.options[key] = value;
-        switch (key) {
-            case 'fontFamily':
-            case 'fontSize':
-                this.renderer.clear();
-                this.charMeasure.measure(this.options);
-                break;
-            case 'enableBold':
-            case 'letterSpacing':
-            case 'lineHeight':
-                this.renderer.clear();
-                this.renderer.onResize(this.cols, this.rows, false);
-                this.refresh(0, this.rows - 1);
-            case 'scrollback':
-                this.buffers.resize(this.cols, this.rows);
-                this.viewport.syncScrollArea();
-                break;
-            case 'tabStopWidth':
-                this.buffers.setupTabStops();
-                break;
-            case 'bellSound':
-            case 'bellStyle':
-                this.syncBellSound();
-                break;
-        }
-        if (this.renderer) {
-            this.renderer.onOptionsChanged();
-        }
-    };
-    Terminal.prototype._onTextAreaFocus = function () {
-        if (this.sendFocus) {
-            this.send(EscapeSequences_1.C0.ESC + '[I');
-        }
-        this.element.classList.add('focus');
-        this.showCursor();
-        this.emit('focus');
-    };
-    ;
-    Terminal.prototype.blur = function () {
-        return this.textarea.blur();
-    };
-    Terminal.prototype._onTextAreaBlur = function () {
-        this.refresh(this.buffer.y, this.buffer.y);
-        if (this.sendFocus) {
-            this.send(EscapeSequences_1.C0.ESC + '[O');
-        }
-        this.element.classList.remove('focus');
-        this.emit('blur');
-    };
-    Terminal.prototype.initGlobal = function () {
-        var _this = this;
-        this.bindKeys();
-        on(this.element, 'copy', function (event) {
-            if (!_this.hasSelection()) {
-                return;
-            }
-            Clipboard_1.copyHandler(event, _this, _this.selectionManager);
-        });
-        var pasteHandlerWrapper = function (event) { return Clipboard_1.pasteHandler(event, _this); };
-        on(this.textarea, 'paste', pasteHandlerWrapper);
-        on(this.element, 'paste', pasteHandlerWrapper);
-        if (Browser.isFirefox) {
-            on(this.element, 'mousedown', function (event) {
-                if (event.button === 2) {
-                    Clipboard_1.rightClickHandler(event, _this.textarea, _this.selectionManager);
-                }
-            });
-        }
-        else {
-            on(this.element, 'contextmenu', function (event) {
-                Clipboard_1.rightClickHandler(event, _this.textarea, _this.selectionManager);
-            });
-        }
-        if (Browser.isLinux) {
-            on(this.element, 'auxclick', function (event) {
-                if (event.button === 1) {
-                    Clipboard_1.moveTextAreaUnderMouseCursor(event, _this.textarea);
-                }
-            });
-        }
-    };
-    Terminal.prototype.bindKeys = function () {
-        var _this = this;
-        var self = this;
-        on(this.element, 'keydown', function (ev) {
-            if (document.activeElement !== this) {
-                return;
-            }
-            self._keyDown(ev);
-        }, true);
-        on(this.element, 'keypress', function (ev) {
-            if (document.activeElement !== this) {
-                return;
-            }
-            self._keyPress(ev);
-        }, true);
-        on(this.element, 'keyup', function (ev) {
-            if (!wasMondifierKeyOnlyEvent(ev)) {
-                _this.focus();
-            }
-        }, true);
-        on(this.textarea, 'keydown', function (ev) {
-            _this._keyDown(ev);
-        }, true);
-        on(this.textarea, 'keypress', function (ev) {
-            _this._keyPress(ev);
-            _this.textarea.value = '';
-        }, true);
-        on(this.textarea, 'compositionstart', function () { return _this.compositionHelper.compositionstart(); });
-        on(this.textarea, 'compositionupdate', function (e) { return _this.compositionHelper.compositionupdate(e); });
-        on(this.textarea, 'compositionend', function () { return _this.compositionHelper.compositionend(); });
-        this.on('refresh', function () { return _this.compositionHelper.updateCompositionElements(); });
-        this.on('refresh', function (data) { return _this.queueLinkification(data.start, data.end); });
-    };
-    Terminal.prototype.open = function (parent) {
-        var _this = this;
-        var i = 0;
-        var div;
-        this.parent = parent || this.parent;
-        if (!this.parent) {
-            throw new Error('Terminal requires a parent element.');
-        }
-        this.context = this.parent.ownerDocument.defaultView;
-        this.document = this.parent.ownerDocument;
-        this.body = this.document.body;
-        CharAtlas_1.initialize(this.document);
-        this.element = this.document.createElement('div');
-        this.element.classList.add('terminal');
-        this.element.classList.add('xterm');
-        this.element.setAttribute('tabindex', '0');
-        this.viewportElement = document.createElement('div');
-        this.viewportElement.classList.add('xterm-viewport');
-        this.element.appendChild(this.viewportElement);
-        this.viewportScrollArea = document.createElement('div');
-        this.viewportScrollArea.classList.add('xterm-scroll-area');
-        this.viewportElement.appendChild(this.viewportScrollArea);
-        this.syncBellSound();
-        this._mouseZoneManager = new MouseZoneManager_1.MouseZoneManager(this);
-        this.on('scroll', function () { return _this._mouseZoneManager.clearAll(); });
-        this.linkifier.attachToDom(this._mouseZoneManager);
-        this.helperContainer = document.createElement('div');
-        this.helperContainer.classList.add('xterm-helpers');
-        this.element.appendChild(this.helperContainer);
-        this.textarea = document.createElement('textarea');
-        this.textarea.classList.add('xterm-helper-textarea');
-        this.textarea.setAttribute('autocorrect', 'off');
-        this.textarea.setAttribute('autocapitalize', 'off');
-        this.textarea.setAttribute('spellcheck', 'false');
-        this.textarea.tabIndex = 0;
-        this.textarea.addEventListener('focus', function () { return _this._onTextAreaFocus(); });
-        this.textarea.addEventListener('blur', function () { return _this._onTextAreaBlur(); });
-        this.helperContainer.appendChild(this.textarea);
-        this.compositionView = document.createElement('div');
-        this.compositionView.classList.add('composition-view');
-        this.compositionHelper = new CompositionHelper_1.CompositionHelper(this.textarea, this.compositionView, this);
-        this.helperContainer.appendChild(this.compositionView);
-        this.charSizeStyleElement = document.createElement('style');
-        this.helperContainer.appendChild(this.charSizeStyleElement);
-        this.parent.appendChild(this.element);
-        this.charMeasure = new CharMeasure_1.CharMeasure(document, this.helperContainer);
-        this.renderer = new Renderer_1.Renderer(this, this.options.theme);
-        this.options.theme = null;
-        this.viewport = new Viewport_1.Viewport(this, this.viewportElement, this.viewportScrollArea, this.charMeasure);
-        this.viewport.onThemeChanged(this.renderer.colorManager.colors);
-        this.on('cursormove', function () { return _this.renderer.onCursorMove(); });
-        this.on('resize', function () { return _this.renderer.onResize(_this.cols, _this.rows, false); });
-        this.on('blur', function () { return _this.renderer.onBlur(); });
-        this.on('focus', function () { return _this.renderer.onFocus(); });
-        window.addEventListener('resize', function () { return _this.renderer.onWindowResize(window.devicePixelRatio); });
-        this.charMeasure.on('charsizechanged', function () { return _this.renderer.onResize(_this.cols, _this.rows, true); });
-        this.renderer.on('resize', function (dimensions) { return _this.viewport.syncScrollArea(); });
-        this.selectionManager = new SelectionManager_1.SelectionManager(this, this.buffer, this.charMeasure);
-        this.element.addEventListener('mousedown', function (e) { return _this.selectionManager.onMouseDown(e); });
-        this.selectionManager.on('refresh', function (data) { return _this.renderer.onSelectionChanged(data.start, data.end); });
-        this.selectionManager.on('newselection', function (text) {
-            _this.textarea.value = text;
-            _this.textarea.focus();
-            _this.textarea.select();
-        });
-        this.on('scroll', function () {
-            _this.viewport.syncScrollArea();
-            _this.selectionManager.refresh();
-        });
-        this.viewportElement.addEventListener('scroll', function () { return _this.selectionManager.refresh(); });
-        this.mouseHelper = new MouseHelper_1.MouseHelper(this.renderer);
-        this.charMeasure.measure(this.options);
-        this.refresh(0, this.rows - 1);
-        this.initGlobal();
-        this.bindMouse();
-    };
-    Terminal.prototype._setTheme = function (theme) {
-        var colors = this.renderer.setTheme(theme);
-        if (this.viewport) {
-            this.viewport.onThemeChanged(colors);
-        }
-    };
-    Terminal.loadAddon = function (addon, callback) {
-        if (typeof exports === 'object' && typeof module === 'object') {
-            return require('./addons/' + addon + '/' + addon);
-        }
-        else if (typeof define === 'function') {
-            return require(['./addons/' + addon + '/' + addon], callback);
-        }
-        else {
-            console.error('Cannot load a module without a CommonJS or RequireJS environment.');
-            return false;
-        }
-    };
-    Terminal.prototype.bindMouse = function () {
-        var _this = this;
-        var el = this.element;
-        var self = this;
-        var pressed = 32;
-        function sendButton(ev) {
-            var button;
-            var pos;
-            button = getButton(ev);
-            pos = self.mouseHelper.getRawByteCoords(ev, self.element, self.charMeasure, self.options.lineHeight, self.cols, self.rows);
-            if (!pos)
-                return;
-            sendEvent(button, pos);
-            switch (ev.overrideType || ev.type) {
-                case 'mousedown':
-                    pressed = button;
-                    break;
-                case 'mouseup':
-                    pressed = 32;
-                    break;
-                case 'wheel':
-                    break;
-            }
-        }
-        function sendMove(ev) {
-            var button = pressed;
-            var pos = self.mouseHelper.getRawByteCoords(ev, self.element, self.charMeasure, self.options.lineHeight, self.cols, self.rows);
-            if (!pos)
-                return;
-            button += 32;
-            sendEvent(button, pos);
-        }
-        function encode(data, ch) {
-            if (!self.utfMouse) {
-                if (ch === 255) {
-                    data.push(0);
-                    return;
-                }
-                if (ch > 127)
-                    ch = 127;
-                data.push(ch);
-            }
-            else {
-                if (ch === 2047) {
-                    data.push(0);
-                    return;
-                }
-                if (ch < 127) {
-                    data.push(ch);
-                }
-                else {
-                    if (ch > 2047)
-                        ch = 2047;
-                    data.push(0xC0 | (ch >> 6));
-                    data.push(0x80 | (ch & 0x3F));
-                }
-            }
-        }
-        function sendEvent(button, pos) {
-            if (self.vt300Mouse) {
-                button &= 3;
-                pos.x -= 32;
-                pos.y -= 32;
-                var data_1 = EscapeSequences_1.C0.ESC + '[24';
-                if (button === 0)
-                    data_1 += '1';
-                else if (button === 1)
-                    data_1 += '3';
-                else if (button === 2)
-                    data_1 += '5';
-                else if (button === 3)
-                    return;
-                else
-                    data_1 += '0';
-                data_1 += '~[' + pos.x + ',' + pos.y + ']\r';
-                self.send(data_1);
-                return;
-            }
-            if (self.decLocator) {
-                button &= 3;
-                pos.x -= 32;
-                pos.y -= 32;
-                if (button === 0)
-                    button = 2;
-                else if (button === 1)
-                    button = 4;
-                else if (button === 2)
-                    button = 6;
-                else if (button === 3)
-                    button = 3;
-                self.send(EscapeSequences_1.C0.ESC + '['
-                    + button
-                    + ';'
-                    + (button === 3 ? 4 : 0)
-                    + ';'
-                    + pos.y
-                    + ';'
-                    + pos.x
-                    + ';'
-                    + pos.page || 0
-                    + '&w');
-                return;
-            }
-            if (self.urxvtMouse) {
-                pos.x -= 32;
-                pos.y -= 32;
-                pos.x++;
-                pos.y++;
-                self.send(EscapeSequences_1.C0.ESC + '[' + button + ';' + pos.x + ';' + pos.y + 'M');
-                return;
-            }
-            if (self.sgrMouse) {
-                pos.x -= 32;
-                pos.y -= 32;
-                self.send(EscapeSequences_1.C0.ESC + '[<'
-                    + (((button & 3) === 3 ? button & ~3 : button) - 32)
-                    + ';'
-                    + pos.x
-                    + ';'
-                    + pos.y
-                    + ((button & 3) === 3 ? 'm' : 'M'));
-                return;
-            }
-            var data = [];
-            encode(data, button);
-            encode(data, pos.x);
-            encode(data, pos.y);
-            self.send(EscapeSequences_1.C0.ESC + '[M' + String.fromCharCode.apply(String, data));
-        }
-        function getButton(ev) {
-            var button;
-            var shift;
-            var meta;
-            var ctrl;
-            var mod;
-            switch (ev.overrideType || ev.type) {
-                case 'mousedown':
-                    button = ev.button != null
-                        ? +ev.button
-                        : ev.which != null
-                            ? ev.which - 1
-                            : null;
-                    if (Browser.isMSIE) {
-                        button = button === 1 ? 0 : button === 4 ? 1 : button;
-                    }
-                    break;
-                case 'mouseup':
-                    button = 3;
-                    break;
-                case 'DOMMouseScroll':
-                    button = ev.detail < 0
-                        ? 64
-                        : 65;
-                    break;
-                case 'wheel':
-                    button = ev.wheelDeltaY > 0
-                        ? 64
-                        : 65;
-                    break;
-            }
-            shift = ev.shiftKey ? 4 : 0;
-            meta = ev.metaKey ? 8 : 0;
-            ctrl = ev.ctrlKey ? 16 : 0;
-            mod = shift | meta | ctrl;
-            if (self.vt200Mouse) {
-                mod &= ctrl;
-            }
-            else if (!self.normalMouse) {
-                mod = 0;
-            }
-            button = (32 + (mod << 2)) + button;
-            return button;
-        }
-        on(el, 'mousedown', function (ev) {
-            ev.preventDefault();
-            _this.focus();
-            if (!_this.mouseEvents || _this.selectionManager.shouldForceSelection(ev)) {
-                return;
-            }
-            sendButton(ev);
-            if (_this.vt200Mouse) {
-                ev.overrideType = 'mouseup';
-                sendButton(ev);
-                return _this.cancel(ev);
-            }
-            if (_this.normalMouse)
-                on(_this.document, 'mousemove', sendMove);
-            if (!_this.x10Mouse) {
-                var handler_1 = function (ev) {
-                    sendButton(ev);
-                    if (_this.normalMouse)
-                        off(_this.document, 'mousemove', sendMove);
-                    off(_this.document, 'mouseup', handler_1);
-                    return _this.cancel(ev);
-                };
-                on(_this.document, 'mouseup', handler_1);
-            }
-            return _this.cancel(ev);
-        });
-        on(el, 'wheel', function (ev) {
-            if (!_this.mouseEvents)
-                return;
-            if (_this.x10Mouse || _this.vt300Mouse || _this.decLocator)
-                return;
-            sendButton(ev);
-            ev.preventDefault();
-        });
-        on(el, 'wheel', function (ev) {
-            if (_this.mouseEvents)
-                return;
-            _this.viewport.onWheel(ev);
-            return _this.cancel(ev);
-        });
-        on(el, 'touchstart', function (ev) {
-            if (_this.mouseEvents)
-                return;
-            _this.viewport.onTouchStart(ev);
-            return _this.cancel(ev);
-        });
-        on(el, 'touchmove', function (ev) {
-            if (_this.mouseEvents)
-                return;
-            _this.viewport.onTouchMove(ev);
-            return _this.cancel(ev);
-        });
-    };
-    Terminal.prototype.destroy = function () {
-        _super.prototype.destroy.call(this);
-        this.readable = false;
-        this.writable = false;
-        this.handler = function () { };
-        this.write = function () { };
-        if (this.element && this.element.parentNode) {
-            this.element.parentNode.removeChild(this.element);
-        }
-    };
-    Terminal.prototype.refresh = function (start, end) {
-        if (this.renderer) {
-            this.renderer.queueRefresh(start, end);
-        }
-    };
-    Terminal.prototype.queueLinkification = function (start, end) {
-        if (this.linkifier) {
-            this.linkifier.linkifyRows(start, end);
-        }
-    };
-    Terminal.prototype.showCursor = function () {
-        if (!this.cursorState) {
-            this.cursorState = 1;
-            this.refresh(this.buffer.y, this.buffer.y);
-        }
-    };
-    Terminal.prototype.scroll = function (isWrapped) {
-        var newLine = this.blankLine(undefined, isWrapped);
-        var topRow = this.buffer.ybase + this.buffer.scrollTop;
-        var bottomRow = this.buffer.ybase + this.buffer.scrollBottom;
-        if (this.buffer.scrollTop === 0) {
-            var willBufferBeTrimmed = this.buffer.lines.length === this.buffer.lines.maxLength;
-            if (bottomRow === this.buffer.lines.length - 1) {
-                this.buffer.lines.push(newLine);
-            }
-            else {
-                this.buffer.lines.splice(bottomRow + 1, 0, newLine);
-            }
-            if (!willBufferBeTrimmed) {
-                this.buffer.ybase++;
-                if (!this.userScrolling) {
-                    this.buffer.ydisp++;
-                }
-            }
-            else {
-                if (this.userScrolling) {
-                    this.buffer.ydisp = Math.max(this.buffer.ydisp - 1, 0);
-                }
-            }
-        }
-        else {
-            var scrollRegionHeight = bottomRow - topRow + 1;
-            this.buffer.lines.shiftElements(topRow + 1, scrollRegionHeight - 1, -1);
-            this.buffer.lines.set(bottomRow, newLine);
-        }
-        if (!this.userScrolling) {
-            this.buffer.ydisp = this.buffer.ybase;
-        }
-        this.updateRange(this.buffer.scrollTop);
-        this.updateRange(this.buffer.scrollBottom);
-        this.emit('scroll', this.buffer.ydisp);
-    };
-    Terminal.prototype.scrollLines = function (disp, suppressScrollEvent) {
-        if (disp < 0) {
-            if (this.buffer.ydisp === 0) {
-                return;
-            }
-            this.userScrolling = true;
-        }
-        else if (disp + this.buffer.ydisp >= this.buffer.ybase) {
-            this.userScrolling = false;
-        }
-        var oldYdisp = this.buffer.ydisp;
-        this.buffer.ydisp = Math.max(Math.min(this.buffer.ydisp + disp, this.buffer.ybase), 0);
-        if (oldYdisp === this.buffer.ydisp) {
-            return;
-        }
-        if (!suppressScrollEvent) {
-            this.emit('scroll', this.buffer.ydisp);
-        }
-        this.refresh(0, this.rows - 1);
-    };
-    Terminal.prototype.scrollPages = function (pageCount) {
-        this.scrollLines(pageCount * (this.rows - 1));
-    };
-    Terminal.prototype.scrollToTop = function () {
-        this.scrollLines(-this.buffer.ydisp);
-    };
-    Terminal.prototype.scrollToBottom = function () {
-        this.scrollLines(this.buffer.ybase - this.buffer.ydisp);
-    };
-    Terminal.prototype.write = function (data) {
-        var _this = this;
-        this.writeBuffer.push(data);
-        if (this.options.useFlowControl && !this.xoffSentToCatchUp && this.writeBuffer.length >= WRITE_BUFFER_PAUSE_THRESHOLD) {
-            this.send(EscapeSequences_1.C0.DC3);
-            this.xoffSentToCatchUp = true;
-        }
-        if (!this.writeInProgress && this.writeBuffer.length > 0) {
-            this.writeInProgress = true;
-            setTimeout(function () {
-                _this.innerWrite();
-            });
-        }
-    };
-    Terminal.prototype.innerWrite = function () {
-        var _this = this;
-        var writeBatch = this.writeBuffer.splice(0, WRITE_BATCH_SIZE);
-        while (writeBatch.length > 0) {
-            var data = writeBatch.shift();
-            if (this.xoffSentToCatchUp && writeBatch.length === 0 && this.writeBuffer.length === 0) {
-                this.send(EscapeSequences_1.C0.DC1);
-                this.xoffSentToCatchUp = false;
-            }
-            this.refreshStart = this.buffer.y;
-            this.refreshEnd = this.buffer.y;
-            var state = this.parser.parse(data);
-            this.parser.setState(state);
-            this.updateRange(this.buffer.y);
-            this.refresh(this.refreshStart, this.refreshEnd);
-        }
-        if (this.writeBuffer.length > 0) {
-            setTimeout(function () { return _this.innerWrite(); }, 0);
-        }
-        else {
-            this.writeInProgress = false;
-        }
-    };
-    Terminal.prototype.writeln = function (data) {
-        this.write(data + '\r\n');
-    };
-    Terminal.prototype.attachCustomKeyEventHandler = function (customKeyEventHandler) {
-        this.customKeyEventHandler = customKeyEventHandler;
-    };
-    Terminal.prototype.setHypertextLinkHandler = function (handler) {
-        if (!this.linkifier) {
-            throw new Error('Cannot attach a hypertext link handler before Terminal.open is called');
-        }
-        this.linkifier.setHypertextLinkHandler(handler);
-        this.refresh(0, this.rows - 1);
-    };
-    Terminal.prototype.setHypertextValidationCallback = function (callback) {
-        if (!this.linkifier) {
-            throw new Error('Cannot attach a hypertext validation callback before Terminal.open is called');
-        }
-        this.linkifier.setHypertextValidationCallback(callback);
-        this.refresh(0, this.rows - 1);
-    };
-    Terminal.prototype.registerLinkMatcher = function (regex, handler, options) {
-        if (this.linkifier) {
-            var matcherId = this.linkifier.registerLinkMatcher(regex, handler, options);
-            this.refresh(0, this.rows - 1);
-            return matcherId;
-        }
-        return 0;
-    };
-    Terminal.prototype.deregisterLinkMatcher = function (matcherId) {
-        if (this.linkifier) {
-            if (this.linkifier.deregisterLinkMatcher(matcherId)) {
-                this.refresh(0, this.rows - 1);
-            }
-        }
-    };
-    Terminal.prototype.hasSelection = function () {
-        return this.selectionManager ? this.selectionManager.hasSelection : false;
-    };
-    Terminal.prototype.getSelection = function () {
-        return this.selectionManager ? this.selectionManager.selectionText : '';
-    };
-    Terminal.prototype.clearSelection = function () {
-        if (this.selectionManager) {
-            this.selectionManager.clearSelection();
-        }
-    };
-    Terminal.prototype.selectAll = function () {
-        if (this.selectionManager) {
-            this.selectionManager.selectAll();
-        }
-    };
-    Terminal.prototype._keyDown = function (ev) {
-        if (this.customKeyEventHandler && this.customKeyEventHandler(ev) === false) {
-            return false;
-        }
-        if (!this.compositionHelper.keydown(ev)) {
-            if (this.buffer.ybase !== this.buffer.ydisp) {
-                this.scrollToBottom();
-            }
-            return false;
-        }
-        var result = this._evaluateKeyEscapeSequence(ev);
-        if (result.key === EscapeSequences_1.C0.DC3) {
-            this.writeStopped = true;
-        }
-        else if (result.key === EscapeSequences_1.C0.DC1) {
-            this.writeStopped = false;
-        }
-        if (result.scrollLines) {
-            this.scrollLines(result.scrollLines);
-            return this.cancel(ev, true);
-        }
-        if (isThirdLevelShift(this.browser, ev)) {
-            return true;
-        }
-        if (result.cancel) {
-            this.cancel(ev, true);
-        }
-        if (!result.key) {
-            return true;
-        }
-        this.emit('keydown', ev);
-        this.emit('key', result.key, ev);
-        this.showCursor();
-        this.handler(result.key);
-        return this.cancel(ev, true);
-    };
-    Terminal.prototype._evaluateKeyEscapeSequence = function (ev) {
-        var result = {
-            cancel: false,
-            key: undefined,
-            scrollLines: undefined
-        };
-        var modifiers = (ev.shiftKey ? 1 : 0) | (ev.altKey ? 2 : 0) | (ev.ctrlKey ? 4 : 0) | (ev.metaKey ? 8 : 0);
-        switch (ev.keyCode) {
-            case 0:
-                if (ev.key === 'UIKeyInputUpArrow') {
-                    if (this.applicationCursor) {
-                        result.key = EscapeSequences_1.C0.ESC + 'OA';
-                    }
-                    else {
-                        result.key = EscapeSequences_1.C0.ESC + '[A';
-                    }
-                }
-                else if (ev.key === 'UIKeyInputLeftArrow') {
-                    if (this.applicationCursor) {
-                        result.key = EscapeSequences_1.C0.ESC + 'OD';
-                    }
-                    else {
-                        result.key = EscapeSequences_1.C0.ESC + '[D';
-                    }
-                }
-                else if (ev.key === 'UIKeyInputRightArrow') {
-                    if (this.applicationCursor) {
-                        result.key = EscapeSequences_1.C0.ESC + 'OC';
-                    }
-                    else {
-                        result.key = EscapeSequences_1.C0.ESC + '[C';
-                    }
-                }
-                else if (ev.key === 'UIKeyInputDownArrow') {
-                    if (this.applicationCursor) {
-                        result.key = EscapeSequences_1.C0.ESC + 'OB';
-                    }
-                    else {
-                        result.key = EscapeSequences_1.C0.ESC + '[B';
-                    }
-                }
-                break;
-            case 8:
-                if (ev.shiftKey) {
-                    result.key = EscapeSequences_1.C0.BS;
-                    break;
-                }
-                result.key = EscapeSequences_1.C0.DEL;
-                break;
-            case 9:
-                if (ev.shiftKey) {
-                    result.key = EscapeSequences_1.C0.ESC + '[Z';
-                    break;
-                }
-                result.key = EscapeSequences_1.C0.HT;
-                result.cancel = true;
-                break;
-            case 13:
-                result.key = EscapeSequences_1.C0.CR;
-                result.cancel = true;
-                break;
-            case 27:
-                result.key = EscapeSequences_1.C0.ESC;
-                result.cancel = true;
-                break;
-            case 37:
-                if (modifiers) {
-                    result.key = EscapeSequences_1.C0.ESC + '[1;' + (modifiers + 1) + 'D';
-                    if (result.key === EscapeSequences_1.C0.ESC + '[1;3D') {
-                        result.key = (this.browser.isMac) ? EscapeSequences_1.C0.ESC + 'b' : EscapeSequences_1.C0.ESC + '[1;5D';
-                    }
-                }
-                else if (this.applicationCursor) {
-                    result.key = EscapeSequences_1.C0.ESC + 'OD';
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + '[D';
-                }
-                break;
-            case 39:
-                if (modifiers) {
-                    result.key = EscapeSequences_1.C0.ESC + '[1;' + (modifiers + 1) + 'C';
-                    if (result.key === EscapeSequences_1.C0.ESC + '[1;3C') {
-                        result.key = (this.browser.isMac) ? EscapeSequences_1.C0.ESC + 'f' : EscapeSequences_1.C0.ESC + '[1;5C';
-                    }
-                }
-                else if (this.applicationCursor) {
-                    result.key = EscapeSequences_1.C0.ESC + 'OC';
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + '[C';
-                }
-                break;
-            case 38:
-                if (modifiers) {
-                    result.key = EscapeSequences_1.C0.ESC + '[1;' + (modifiers + 1) + 'A';
-                    if (result.key === EscapeSequences_1.C0.ESC + '[1;3A') {
-                        result.key = EscapeSequences_1.C0.ESC + '[1;5A';
-                    }
-                }
-                else if (this.applicationCursor) {
-                    result.key = EscapeSequences_1.C0.ESC + 'OA';
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + '[A';
-                }
-                break;
-            case 40:
-                if (modifiers) {
-                    result.key = EscapeSequences_1.C0.ESC + '[1;' + (modifiers + 1) + 'B';
-                    if (result.key === EscapeSequences_1.C0.ESC + '[1;3B') {
-                        result.key = EscapeSequences_1.C0.ESC + '[1;5B';
-                    }
-                }
-                else if (this.applicationCursor) {
-                    result.key = EscapeSequences_1.C0.ESC + 'OB';
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + '[B';
-                }
-                break;
-            case 45:
-                if (!ev.shiftKey && !ev.ctrlKey) {
-                    result.key = EscapeSequences_1.C0.ESC + '[2~';
-                }
-                break;
-            case 46:
-                if (modifiers) {
-                    result.key = EscapeSequences_1.C0.ESC + '[3;' + (modifiers + 1) + '~';
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + '[3~';
-                }
-                break;
-            case 36:
-                if (modifiers)
-                    result.key = EscapeSequences_1.C0.ESC + '[1;' + (modifiers + 1) + 'H';
-                else if (this.applicationCursor)
-                    result.key = EscapeSequences_1.C0.ESC + 'OH';
-                else
-                    result.key = EscapeSequences_1.C0.ESC + '[H';
-                break;
-            case 35:
-                if (modifiers)
-                    result.key = EscapeSequences_1.C0.ESC + '[1;' + (modifiers + 1) + 'F';
-                else if (this.applicationCursor)
-                    result.key = EscapeSequences_1.C0.ESC + 'OF';
-                else
-                    result.key = EscapeSequences_1.C0.ESC + '[F';
-                break;
-            case 33:
-                if (ev.shiftKey) {
-                    result.scrollLines = -(this.rows - 1);
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + '[5~';
-                }
-                break;
-            case 34:
-                if (ev.shiftKey) {
-                    result.scrollLines = this.rows - 1;
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + '[6~';
-                }
-                break;
-            case 112:
-                if (modifiers) {
-                    result.key = EscapeSequences_1.C0.ESC + '[1;' + (modifiers + 1) + 'P';
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + 'OP';
-                }
-                break;
-            case 113:
-                if (modifiers) {
-                    result.key = EscapeSequences_1.C0.ESC + '[1;' + (modifiers + 1) + 'Q';
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + 'OQ';
-                }
-                break;
-            case 114:
-                if (modifiers) {
-                    result.key = EscapeSequences_1.C0.ESC + '[1;' + (modifiers + 1) + 'R';
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + 'OR';
-                }
-                break;
-            case 115:
-                if (modifiers) {
-                    result.key = EscapeSequences_1.C0.ESC + '[1;' + (modifiers + 1) + 'S';
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + 'OS';
-                }
-                break;
-            case 116:
-                if (modifiers) {
-                    result.key = EscapeSequences_1.C0.ESC + '[15;' + (modifiers + 1) + '~';
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + '[15~';
-                }
-                break;
-            case 117:
-                if (modifiers) {
-                    result.key = EscapeSequences_1.C0.ESC + '[17;' + (modifiers + 1) + '~';
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + '[17~';
-                }
-                break;
-            case 118:
-                if (modifiers) {
-                    result.key = EscapeSequences_1.C0.ESC + '[18;' + (modifiers + 1) + '~';
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + '[18~';
-                }
-                break;
-            case 119:
-                if (modifiers) {
-                    result.key = EscapeSequences_1.C0.ESC + '[19;' + (modifiers + 1) + '~';
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + '[19~';
-                }
-                break;
-            case 120:
-                if (modifiers) {
-                    result.key = EscapeSequences_1.C0.ESC + '[20;' + (modifiers + 1) + '~';
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + '[20~';
-                }
-                break;
-            case 121:
-                if (modifiers) {
-                    result.key = EscapeSequences_1.C0.ESC + '[21;' + (modifiers + 1) + '~';
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + '[21~';
-                }
-                break;
-            case 122:
-                if (modifiers) {
-                    result.key = EscapeSequences_1.C0.ESC + '[23;' + (modifiers + 1) + '~';
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + '[23~';
-                }
-                break;
-            case 123:
-                if (modifiers) {
-                    result.key = EscapeSequences_1.C0.ESC + '[24;' + (modifiers + 1) + '~';
-                }
-                else {
-                    result.key = EscapeSequences_1.C0.ESC + '[24~';
-                }
-                break;
-            default:
-                if (ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) {
-                    if (ev.keyCode >= 65 && ev.keyCode <= 90) {
-                        result.key = String.fromCharCode(ev.keyCode - 64);
-                    }
-                    else if (ev.keyCode === 32) {
-                        result.key = String.fromCharCode(0);
-                    }
-                    else if (ev.keyCode >= 51 && ev.keyCode <= 55) {
-                        result.key = String.fromCharCode(ev.keyCode - 51 + 27);
-                    }
-                    else if (ev.keyCode === 56) {
-                        result.key = String.fromCharCode(127);
-                    }
-                    else if (ev.keyCode === 219) {
-                        result.key = String.fromCharCode(27);
-                    }
-                    else if (ev.keyCode === 220) {
-                        result.key = String.fromCharCode(28);
-                    }
-                    else if (ev.keyCode === 221) {
-                        result.key = String.fromCharCode(29);
-                    }
-                }
-                else if (!this.browser.isMac && ev.altKey && !ev.ctrlKey && !ev.metaKey) {
-                    if (ev.keyCode >= 65 && ev.keyCode <= 90) {
-                        result.key = EscapeSequences_1.C0.ESC + String.fromCharCode(ev.keyCode + 32);
-                    }
-                    else if (ev.keyCode === 192) {
-                        result.key = EscapeSequences_1.C0.ESC + '`';
-                    }
-                    else if (ev.keyCode >= 48 && ev.keyCode <= 57) {
-                        result.key = EscapeSequences_1.C0.ESC + (ev.keyCode - 48);
-                    }
-                }
-                else if (this.browser.isMac && !ev.altKey && !ev.ctrlKey && ev.metaKey) {
-                    if (ev.keyCode === 65) {
-                        this.selectAll();
-                    }
-                }
-                break;
-        }
-        return result;
-    };
-    Terminal.prototype.setgLevel = function (g) {
-        this.glevel = g;
-        this.charset = this.charsets[g];
-    };
-    Terminal.prototype.setgCharset = function (g, charset) {
-        this.charsets[g] = charset;
-        if (this.glevel === g) {
-            this.charset = charset;
-        }
-    };
-    Terminal.prototype._keyPress = function (ev) {
-        var key;
-        if (this.customKeyEventHandler && this.customKeyEventHandler(ev) === false) {
-            return false;
-        }
-        this.cancel(ev);
-        if (ev.charCode) {
-            key = ev.charCode;
-        }
-        else if (ev.which == null) {
-            key = ev.keyCode;
-        }
-        else if (ev.which !== 0 && ev.charCode !== 0) {
-            key = ev.which;
-        }
-        else {
-            return false;
-        }
-        if (!key || ((ev.altKey || ev.ctrlKey || ev.metaKey) && !isThirdLevelShift(this.browser, ev))) {
-            return false;
-        }
-        key = String.fromCharCode(key);
-        this.emit('keypress', key, ev);
-        this.emit('key', key, ev);
-        this.showCursor();
-        this.handler(key);
-        return true;
-    };
-    Terminal.prototype.send = function (data) {
-        var _this = this;
-        if (!this.sendDataQueue) {
-            setTimeout(function () {
-                _this.handler(_this.sendDataQueue);
-                _this.sendDataQueue = '';
-            }, 1);
-        }
-        this.sendDataQueue += data;
-    };
-    Terminal.prototype.bell = function () {
-        var _this = this;
-        this.emit('bell');
-        if (this.soundBell())
-            this.bellAudioElement.play();
-        if (this.visualBell()) {
-            this.element.classList.add('visual-bell-active');
-            clearTimeout(this.visualBellTimer);
-            this.visualBellTimer = window.setTimeout(function () {
-                _this.element.classList.remove('visual-bell-active');
-            }, 200);
-        }
-    };
-    Terminal.prototype.log = function (text, data) {
-        if (!this.options.debug)
-            return;
-        if (!this.context.console || !this.context.console.log)
-            return;
-        this.context.console.log(text, data);
-    };
-    Terminal.prototype.error = function (text, data) {
-        if (!this.options.debug)
-            return;
-        if (!this.context.console || !this.context.console.error)
-            return;
-        this.context.console.error(text, data);
-    };
-    Terminal.prototype.resize = function (x, y) {
-        if (isNaN(x) || isNaN(y)) {
-            return;
-        }
-        if (x === this.cols && y === this.rows) {
-            if (!this.charMeasure.width || !this.charMeasure.height) {
-                this.charMeasure.measure(this.options);
-            }
-            return;
-        }
-        if (x < 1)
-            x = 1;
-        if (y < 1)
-            y = 1;
-        this.buffers.resize(x, y);
-        this.cols = x;
-        this.rows = y;
-        this.buffers.setupTabStops(this.cols);
-        this.charMeasure.measure(this.options);
-        this.refresh(0, this.rows - 1);
-        this.geometry = [this.cols, this.rows];
-        this.emit('resize', { cols: x, rows: y });
-    };
-    Terminal.prototype.updateRange = function (y) {
-        if (y < this.refreshStart)
-            this.refreshStart = y;
-        if (y > this.refreshEnd)
-            this.refreshEnd = y;
-    };
-    Terminal.prototype.maxRange = function () {
-        this.refreshStart = 0;
-        this.refreshEnd = this.rows - 1;
-    };
-    Terminal.prototype.eraseRight = function (x, y) {
-        var line = this.buffer.lines.get(this.buffer.ybase + y);
-        if (!line) {
-            return;
-        }
-        var ch = [this.eraseAttr(), ' ', 1, 32];
-        for (; x < this.cols; x++) {
-            line[x] = ch;
-        }
-        this.updateRange(y);
-    };
-    Terminal.prototype.eraseLeft = function (x, y) {
-        var line = this.buffer.lines.get(this.buffer.ybase + y);
-        if (!line) {
-            return;
-        }
-        var ch = [this.eraseAttr(), ' ', 1, 32];
-        x++;
-        while (x--) {
-            line[x] = ch;
-        }
-        this.updateRange(y);
-    };
-    Terminal.prototype.clear = function () {
-        if (this.buffer.ybase === 0 && this.buffer.y === 0) {
-            return;
-        }
-        this.buffer.lines.set(0, this.buffer.lines.get(this.buffer.ybase + this.buffer.y));
-        this.buffer.lines.length = 1;
-        this.buffer.ydisp = 0;
-        this.buffer.ybase = 0;
-        this.buffer.y = 0;
-        for (var i = 1; i < this.rows; i++) {
-            this.buffer.lines.push(this.blankLine());
-        }
-        this.refresh(0, this.rows - 1);
-        this.emit('scroll', this.buffer.ydisp);
-    };
-    Terminal.prototype.eraseLine = function (y) {
-        this.eraseRight(0, y);
-    };
-    Terminal.prototype.blankLine = function (cur, isWrapped, cols) {
-        var attr = cur ? this.eraseAttr() : this.defAttr;
-        var ch = [attr, ' ', 1, 32];
-        var line = [];
-        if (isWrapped) {
-            line.isWrapped = isWrapped;
-        }
-        cols = cols || this.cols;
-        for (var i = 0; i < cols; i++) {
-            line[i] = ch;
-        }
-        return line;
-    };
-    Terminal.prototype.ch = function (cur) {
-        if (cur) {
-            return [this.eraseAttr(), ' ', 1, 32];
-        }
-        return [this.defAttr, ' ', 1, 32];
-    };
-    Terminal.prototype.is = function (term) {
-        return (this.options.termName + '').indexOf(term) === 0;
-    };
-    Terminal.prototype.handler = function (data) {
-        if (this.options.disableStdin) {
-            return;
-        }
-        if (this.selectionManager && this.selectionManager.hasSelection) {
-            this.selectionManager.clearSelection();
-        }
-        if (this.buffer.ybase !== this.buffer.ydisp) {
-            this.scrollToBottom();
-        }
-        this.emit('data', data);
-    };
-    Terminal.prototype.handleTitle = function (title) {
-        this.emit('title', title);
-    };
-    Terminal.prototype.index = function () {
-        this.buffer.y++;
-        if (this.buffer.y > this.buffer.scrollBottom) {
-            this.buffer.y--;
-            this.scroll();
-        }
-        if (this.buffer.x >= this.cols) {
-            this.buffer.x--;
-        }
-    };
-    Terminal.prototype.reverseIndex = function () {
-        if (this.buffer.y === this.buffer.scrollTop) {
-            var scrollRegionHeight = this.buffer.scrollBottom - this.buffer.scrollTop;
-            this.buffer.lines.shiftElements(this.buffer.y + this.buffer.ybase, scrollRegionHeight, 1);
-            this.buffer.lines.set(this.buffer.y + this.buffer.ybase, this.blankLine(true));
-            this.updateRange(this.buffer.scrollTop);
-            this.updateRange(this.buffer.scrollBottom);
-        }
-        else {
-            this.buffer.y--;
-        }
-    };
-    Terminal.prototype.reset = function () {
-        this.options.rows = this.rows;
-        this.options.cols = this.cols;
-        var customKeyEventHandler = this.customKeyEventHandler;
-        var inputHandler = this.inputHandler;
-        var buffers = this.buffers;
-        this.setup();
-        this.customKeyEventHandler = customKeyEventHandler;
-        this.inputHandler = inputHandler;
-        this.buffers = buffers;
-        this.refresh(0, this.rows - 1);
-        this.viewport.syncScrollArea();
-    };
-    Terminal.prototype.tabSet = function () {
-        this.buffer.tabs[this.buffer.x] = true;
-    };
-    Terminal.prototype.cancel = function (ev, force) {
-        if (!this.options.cancelEvents && !force) {
-            return;
-        }
-        ev.preventDefault();
-        ev.stopPropagation();
-        return false;
-    };
-    Terminal.prototype.matchColor = function (r1, g1, b1) {
-        return matchColor_(r1, g1, b1);
-    };
-    Terminal.prototype.visualBell = function () {
-        return this.options.bellStyle === 'visual' ||
-            this.options.bellStyle === 'both';
-    };
-    Terminal.prototype.soundBell = function () {
-        return this.options.bellStyle === 'sound' ||
-            this.options.bellStyle === 'both';
-    };
-    Terminal.prototype.syncBellSound = function () {
-        if (this.soundBell() && this.bellAudioElement) {
-            this.bellAudioElement.setAttribute('src', this.options.bellSound);
-        }
-        else if (this.soundBell()) {
-            this.bellAudioElement = document.createElement('audio');
-            this.bellAudioElement.setAttribute('preload', 'auto');
-            this.bellAudioElement.setAttribute('src', this.options.bellSound);
-            this.helperContainer.appendChild(this.bellAudioElement);
-        }
-        else if (this.bellAudioElement) {
-            this.helperContainer.removeChild(this.bellAudioElement);
-        }
-    };
-    return Terminal;
-}(EventEmitter_1.EventEmitter));
-exports.Terminal = Terminal;
-function globalOn(el, type, handler, capture) {
-    if (!Array.isArray(el)) {
-        el = [el];
-    }
-    el.forEach(function (element) {
-        element.addEventListener(type, handler, capture || false);
-    });
-}
-var on = globalOn;
-function off(el, type, handler, capture) {
-    if (capture === void 0) { capture = false; }
-    el.removeEventListener(type, handler, capture);
-}
-function isThirdLevelShift(browser, ev) {
-    var thirdLevelKey = (browser.isMac && ev.altKey && !ev.ctrlKey && !ev.metaKey) ||
-        (browser.isMSWindows && ev.altKey && ev.ctrlKey && !ev.metaKey);
-    if (ev.type === 'keypress') {
-        return thirdLevelKey;
-    }
-    return thirdLevelKey && (!ev.keyCode || ev.keyCode > 47);
-}
-function wasMondifierKeyOnlyEvent(ev) {
-    return ev.keyCode === 16 ||
-        ev.keyCode === 17 ||
-        ev.keyCode === 18;
-}
-var vcolors = (function () {
-    var result = ColorManager_1.DEFAULT_ANSI_COLORS.map(function (c) {
-        c = c.substring(1);
-        return [
-            parseInt(c.substring(0, 2), 16),
-            parseInt(c.substring(2, 4), 16),
-            parseInt(c.substring(4, 6), 16)
-        ];
-    });
-    var r = [0x00, 0x5f, 0x87, 0xaf, 0xd7, 0xff];
-    for (var i = 0; i < 216; i++) {
-        result.push([
-            r[(i / 36) % 6 | 0],
-            r[(i / 6) % 6 | 0],
-            r[i % 6]
-        ]);
-    }
-    var c;
-    for (var i = 0; i < 24; i++) {
-        c = 8 + i * 10;
-        result.push([c, c, c]);
-    }
-    return result;
-})();
-var matchColorCache = {};
-function matchColorDistance(r1, g1, b1, r2, g2, b2) {
-    return Math.pow(30 * (r1 - r2), 2)
-        + Math.pow(59 * (g1 - g2), 2)
-        + Math.pow(11 * (b1 - b2), 2);
-}
-;
-function matchColor_(r1, g1, b1) {
-    var hash = (r1 << 16) | (g1 << 8) | b1;
-    if (matchColorCache[hash] != null) {
-        return matchColorCache[hash];
-    }
-    var ldiff = Infinity;
-    var li = -1;
-    var i = 0;
-    var c;
-    var r2;
-    var g2;
-    var b2;
-    var diff;
-    for (; i < vcolors.length; i++) {
-        c = vcolors[i];
-        r2 = c[0];
-        g2 = c[1];
-        b2 = c[2];
-        diff = matchColorDistance(r1, g1, b1, r2, g2, b2);
-        if (diff === 0) {
-            li = i;
-            break;
-        }
-        if (diff < ldiff) {
-            ldiff = diff;
-            li = i;
-        }
-    }
-    return matchColorCache[hash] = li;
-}
-
-
-
-},{"./Buffer":1,"./BufferSet":2,"./CompositionHelper":5,"./EscapeSequences":6,"./EventEmitter":7,"./InputHandler":8,"./Linkifier":9,"./Parser":10,"./SelectionManager":11,"./Viewport":15,"./handlers/Clipboard":16,"./input/MouseZoneManager":17,"./renderer/CharAtlas":19,"./renderer/ColorManager":20,"./renderer/Renderer":24,"./utils/Browser":28,"./utils/CharMeasure":29,"./utils/MouseHelper":32,"./utils/Sounds":33}],14:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var LinkHoverEventTypes;
-(function (LinkHoverEventTypes) {
-    LinkHoverEventTypes["HOVER"] = "linkhover";
-    LinkHoverEventTypes["TOOLTIP"] = "linktooltip";
-    LinkHoverEventTypes["LEAVE"] = "linkleave";
-})(LinkHoverEventTypes = exports.LinkHoverEventTypes || (exports.LinkHoverEventTypes = {}));
-;
-
-
-
-},{}],15:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var Viewport = (function () {
-    function Viewport(terminal, viewportElement, scrollArea, charMeasure) {
-        var _this = this;
-        this.terminal = terminal;
-        this.viewportElement = viewportElement;
-        this.scrollArea = scrollArea;
-        this.charMeasure = charMeasure;
-        this.currentRowHeight = 0;
-        this.lastRecordedBufferLength = 0;
-        this.lastRecordedViewportHeight = 0;
-        this.lastRecordedBufferHeight = 0;
-        this.viewportElement.addEventListener('scroll', this.onScroll.bind(this));
-        setTimeout(function () { return _this.syncScrollArea(); }, 0);
-    }
-    Viewport.prototype.onThemeChanged = function (colors) {
-        this.viewportElement.style.backgroundColor = colors.background;
-    };
-    Viewport.prototype.refresh = function () {
-        if (this.charMeasure.height > 0) {
-            this.currentRowHeight = this.terminal.renderer.dimensions.scaledCellHeight / window.devicePixelRatio;
-            if (this.lastRecordedViewportHeight !== this.terminal.renderer.dimensions.canvasHeight) {
-                this.lastRecordedViewportHeight = this.terminal.renderer.dimensions.canvasHeight;
-                this.viewportElement.style.height = this.lastRecordedViewportHeight + 'px';
-            }
-            var newBufferHeight = Math.round(this.currentRowHeight * this.lastRecordedBufferLength);
-            if (this.lastRecordedBufferHeight !== newBufferHeight) {
-                this.lastRecordedBufferHeight = newBufferHeight;
-                this.scrollArea.style.height = this.lastRecordedBufferHeight + 'px';
-            }
-        }
-    };
-    Viewport.prototype.syncScrollArea = function () {
-        if (this.lastRecordedBufferLength !== this.terminal.buffer.lines.length) {
-            this.lastRecordedBufferLength = this.terminal.buffer.lines.length;
-            this.refresh();
-        }
-        else if (this.lastRecordedViewportHeight !== this.terminal.renderer.dimensions.canvasHeight) {
-            this.refresh();
-        }
-        else {
-            if (this.terminal.renderer.dimensions.scaledCellHeight / window.devicePixelRatio !== this.currentRowHeight) {
-                this.refresh();
-            }
-        }
-        var scrollTop = this.terminal.buffer.ydisp * this.currentRowHeight;
-        if (this.viewportElement.scrollTop !== scrollTop) {
-            this.viewportElement.scrollTop = scrollTop;
-        }
-    };
-    Viewport.prototype.onScroll = function (ev) {
-        var newRow = Math.round(this.viewportElement.scrollTop / this.currentRowHeight);
-        var diff = newRow - this.terminal.buffer.ydisp;
-        this.terminal.scrollLines(diff, true);
-    };
-    Viewport.prototype.onWheel = function (ev) {
-        if (ev.deltaY === 0) {
-            return;
-        }
-        var multiplier = 1;
-        if (ev.deltaMode === WheelEvent.DOM_DELTA_LINE) {
-            multiplier = this.currentRowHeight;
-        }
-        else if (ev.deltaMode === WheelEvent.DOM_DELTA_PAGE) {
-            multiplier = this.currentRowHeight * this.terminal.rows;
-        }
-        this.viewportElement.scrollTop += ev.deltaY * multiplier;
-        ev.preventDefault();
-    };
-    ;
-    Viewport.prototype.onTouchStart = function (ev) {
-        this.lastTouchY = ev.touches[0].pageY;
-    };
-    ;
-    Viewport.prototype.onTouchMove = function (ev) {
-        var deltaY = this.lastTouchY - ev.touches[0].pageY;
-        this.lastTouchY = ev.touches[0].pageY;
-        if (deltaY === 0) {
-            return;
-        }
-        this.viewportElement.scrollTop += deltaY;
-        ev.preventDefault();
-    };
-    ;
-    return Viewport;
-}());
-exports.Viewport = Viewport;
-
-
-
-},{}],16:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function prepareTextForTerminal(text, isMSWindows) {
-    if (isMSWindows) {
-        return text.replace(/\r?\n/g, '\r');
-    }
-    return text;
-}
-exports.prepareTextForTerminal = prepareTextForTerminal;
-function bracketTextForPaste(text, bracketedPasteMode) {
-    if (bracketedPasteMode) {
-        return '\x1b[200~' + text + '\x1b[201~';
-    }
-    return text;
-}
-exports.bracketTextForPaste = bracketTextForPaste;
-function copyHandler(ev, term, selectionManager) {
-    if (term.browser.isMSIE) {
-        window.clipboardData.setData('Text', selectionManager.selectionText);
-    }
-    else {
-        ev.clipboardData.setData('text/plain', selectionManager.selectionText);
-    }
-    ev.preventDefault();
-}
-exports.copyHandler = copyHandler;
-function pasteHandler(ev, term) {
-    ev.stopPropagation();
-    var text;
-    var dispatchPaste = function (text) {
-        text = prepareTextForTerminal(text, term.browser.isMSWindows);
-        text = bracketTextForPaste(text, term.bracketedPasteMode);
-        term.handler(text);
-        term.textarea.value = '';
-        term.emit('paste', text);
-        term.cancel(ev);
-    };
-    if (term.browser.isMSIE) {
-        if (window.clipboardData) {
-            text = window.clipboardData.getData('Text');
-            dispatchPaste(text);
-        }
-    }
-    else {
-        if (ev.clipboardData) {
-            text = ev.clipboardData.getData('text/plain');
-            dispatchPaste(text);
-        }
-    }
-}
-exports.pasteHandler = pasteHandler;
-function moveTextAreaUnderMouseCursor(ev, textarea) {
-    textarea.style.position = 'fixed';
-    textarea.style.width = '20px';
-    textarea.style.height = '20px';
-    textarea.style.left = (ev.clientX - 10) + 'px';
-    textarea.style.top = (ev.clientY - 10) + 'px';
-    textarea.style.zIndex = '1000';
-    textarea.focus();
-    setTimeout(function () {
-        textarea.style.position = null;
-        textarea.style.width = null;
-        textarea.style.height = null;
-        textarea.style.left = null;
-        textarea.style.top = null;
-        textarea.style.zIndex = null;
-    }, 4);
-}
-exports.moveTextAreaUnderMouseCursor = moveTextAreaUnderMouseCursor;
-function rightClickHandler(ev, textarea, selectionManager) {
-    moveTextAreaUnderMouseCursor(ev, textarea);
-    textarea.value = selectionManager.selectionText;
-    textarea.select();
-}
-exports.rightClickHandler = rightClickHandler;
-
-
-
-},{}],17:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var HOVER_DURATION = 500;
-var MouseZoneManager = (function () {
-    function MouseZoneManager(_terminal) {
-        var _this = this;
-        this._terminal = _terminal;
-        this._zones = [];
-        this._areZonesActive = false;
-        this._tooltipTimeout = null;
-        this._currentZone = null;
-        this._lastHoverCoords = [null, null];
-        this._terminal.element.addEventListener('mousedown', function (e) { return _this._onMouseDown(e); });
-        this._mouseMoveListener = function (e) { return _this._onMouseMove(e); };
-        this._clickListener = function (e) { return _this._onClick(e); };
-    }
-    MouseZoneManager.prototype.add = function (zone) {
-        this._zones.push(zone);
-        if (this._zones.length === 1) {
-            this._activate();
-        }
-    };
-    MouseZoneManager.prototype.clearAll = function (start, end) {
-        if (this._zones.length === 0) {
-            return;
-        }
-        if (!end) {
-            start = 0;
-            end = this._terminal.rows - 1;
-        }
-        for (var i = 0; i < this._zones.length; i++) {
-            var zone = this._zones[i];
-            if (zone.y > start && zone.y <= end + 1) {
-                if (this._currentZone && this._currentZone === zone) {
-                    this._currentZone.leaveCallback();
-                    this._currentZone = null;
-                }
-                this._zones.splice(i--, 1);
-            }
-        }
-        if (this._zones.length === 0) {
-            this._deactivate();
-        }
-    };
-    MouseZoneManager.prototype._activate = function () {
-        if (!this._areZonesActive) {
-            this._areZonesActive = true;
-            this._terminal.element.addEventListener('mousemove', this._mouseMoveListener);
-            this._terminal.element.addEventListener('click', this._clickListener);
-        }
-    };
-    MouseZoneManager.prototype._deactivate = function () {
-        if (this._areZonesActive) {
-            this._areZonesActive = false;
-            this._terminal.element.removeEventListener('mousemove', this._mouseMoveListener);
-            this._terminal.element.removeEventListener('click', this._clickListener);
-        }
-    };
-    MouseZoneManager.prototype._onMouseMove = function (e) {
-        if (this._lastHoverCoords[0] !== e.pageX || this._lastHoverCoords[1] !== e.pageY) {
-            this._onHover(e);
-            this._lastHoverCoords = [e.pageX, e.pageY];
-        }
-    };
-    MouseZoneManager.prototype._onHover = function (e) {
-        var _this = this;
-        var zone = this._findZoneEventAt(e);
-        if (zone === this._currentZone) {
-            return;
-        }
-        if (this._currentZone) {
-            this._currentZone.leaveCallback();
-            this._currentZone = null;
-            if (this._tooltipTimeout) {
-                clearTimeout(this._tooltipTimeout);
-            }
-        }
-        if (!zone) {
-            return;
-        }
-        this._currentZone = zone;
-        if (zone.hoverCallback) {
-            zone.hoverCallback(e);
-        }
-        this._tooltipTimeout = setTimeout(function () { return _this._onTooltip(e); }, HOVER_DURATION);
-    };
-    MouseZoneManager.prototype._onTooltip = function (e) {
-        this._tooltipTimeout = null;
-        var zone = this._findZoneEventAt(e);
-        if (zone && zone.tooltipCallback) {
-            zone.tooltipCallback(e);
-        }
-    };
-    MouseZoneManager.prototype._onMouseDown = function (e) {
-        if (!this._areZonesActive) {
-            return;
-        }
-        var zone = this._findZoneEventAt(e);
-        if (zone) {
-            e.preventDefault();
-            e.stopImmediatePropagation();
-        }
-    };
-    MouseZoneManager.prototype._onClick = function (e) {
-        var zone = this._findZoneEventAt(e);
-        if (zone) {
-            zone.clickCallback(e);
-            e.preventDefault();
-            e.stopImmediatePropagation();
-        }
-    };
-    MouseZoneManager.prototype._findZoneEventAt = function (e) {
-        var coords = this._terminal.mouseHelper.getCoords(e, this._terminal.element, this._terminal.charMeasure, this._terminal.options.lineHeight, this._terminal.cols, this._terminal.rows);
-        if (!coords) {
-            return null;
-        }
-        for (var i = 0; i < this._zones.length; i++) {
-            var zone = this._zones[i];
-            if (zone.y === coords[1] && zone.x1 <= coords[0] && zone.x2 > coords[0]) {
-                return zone;
-            }
-        }
-        ;
-        return null;
-    };
-    return MouseZoneManager;
-}());
-exports.MouseZoneManager = MouseZoneManager;
-var MouseZone = (function () {
-    function MouseZone(x1, x2, y, clickCallback, hoverCallback, tooltipCallback, leaveCallback) {
-        this.x1 = x1;
-        this.x2 = x2;
-        this.y = y;
-        this.clickCallback = clickCallback;
-        this.hoverCallback = hoverCallback;
-        this.tooltipCallback = tooltipCallback;
-        this.leaveCallback = leaveCallback;
-    }
-    return MouseZone;
-}());
-exports.MouseZone = MouseZone;
-
-
-
-},{}],18:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var CharAtlas_1 = require("./CharAtlas");
-var Buffer_1 = require("../Buffer");
-exports.INVERTED_DEFAULT_COLOR = -1;
-var DIM_OPACITY = 0.5;
-var BaseRenderLayer = (function () {
-    function BaseRenderLayer(container, id, zIndex, _alpha, _colors) {
-        this._alpha = _alpha;
-        this._colors = _colors;
-        this._scaledCharWidth = 0;
-        this._scaledCharHeight = 0;
-        this._scaledCellWidth = 0;
-        this._scaledCellHeight = 0;
-        this._scaledCharLeft = 0;
-        this._scaledCharTop = 0;
-        this._canvas = document.createElement('canvas');
-        this._canvas.id = "xterm-" + id + "-layer";
-        this._canvas.style.zIndex = zIndex.toString();
-        this._ctx = this._canvas.getContext('2d', { alpha: _alpha });
-        this._ctx.scale(window.devicePixelRatio, window.devicePixelRatio);
-        if (!_alpha) {
-            this.clearAll();
-        }
-        container.appendChild(this._canvas);
-    }
-    BaseRenderLayer.prototype.onOptionsChanged = function (terminal) { };
-    BaseRenderLayer.prototype.onBlur = function (terminal) { };
-    BaseRenderLayer.prototype.onFocus = function (terminal) { };
-    BaseRenderLayer.prototype.onCursorMove = function (terminal) { };
-    BaseRenderLayer.prototype.onGridChanged = function (terminal, startRow, endRow) { };
-    BaseRenderLayer.prototype.onSelectionChanged = function (terminal, start, end) { };
-    BaseRenderLayer.prototype.onThemeChanged = function (terminal, colorSet) {
-        this._refreshCharAtlas(terminal, colorSet);
-    };
-    BaseRenderLayer.prototype._refreshCharAtlas = function (terminal, colorSet) {
-        var _this = this;
-        if (this._scaledCharWidth <= 0 && this._scaledCharHeight <= 0) {
-            return;
-        }
-        this._charAtlas = null;
-        var result = CharAtlas_1.acquireCharAtlas(terminal, this._colors, this._scaledCharWidth, this._scaledCharHeight);
-        if (result instanceof HTMLCanvasElement) {
-            this._charAtlas = result;
-        }
-        else {
-            result.then(function (bitmap) { return _this._charAtlas = bitmap; });
-        }
-    };
-    BaseRenderLayer.prototype.resize = function (terminal, dim, charSizeChanged) {
-        this._scaledCellWidth = dim.scaledCellWidth;
-        this._scaledCellHeight = dim.scaledCellHeight;
-        this._scaledCharWidth = dim.scaledCharWidth;
-        this._scaledCharHeight = dim.scaledCharHeight;
-        this._scaledCharLeft = dim.scaledCharLeft;
-        this._scaledCharTop = dim.scaledCharTop;
-        this._canvas.width = dim.scaledCanvasWidth;
-        this._canvas.height = dim.scaledCanvasHeight;
-        this._canvas.style.width = dim.canvasWidth + "px";
-        this._canvas.style.height = dim.canvasHeight + "px";
-        if (!this._alpha) {
-            this.clearAll();
-        }
-        if (charSizeChanged) {
-            this._refreshCharAtlas(terminal, this._colors);
-        }
-    };
-    BaseRenderLayer.prototype.fillCells = function (x, y, width, height) {
-        this._ctx.fillRect(x * this._scaledCellWidth, y * this._scaledCellHeight, width * this._scaledCellWidth, height * this._scaledCellHeight);
-    };
-    BaseRenderLayer.prototype.fillBottomLineAtCells = function (x, y, width) {
-        if (width === void 0) { width = 1; }
-        this._ctx.fillRect(x * this._scaledCellWidth, (y + 1) * this._scaledCellHeight - window.devicePixelRatio - 1, width * this._scaledCellWidth, window.devicePixelRatio);
-    };
-    BaseRenderLayer.prototype.fillLeftLineAtCell = function (x, y) {
-        this._ctx.fillRect(x * this._scaledCellWidth, y * this._scaledCellHeight, window.devicePixelRatio, this._scaledCellHeight);
-    };
-    BaseRenderLayer.prototype.strokeRectAtCell = function (x, y, width, height) {
-        this._ctx.lineWidth = window.devicePixelRatio;
-        this._ctx.strokeRect(x * this._scaledCellWidth + window.devicePixelRatio / 2, y * this._scaledCellHeight + (window.devicePixelRatio / 2), width * this._scaledCellWidth - window.devicePixelRatio, (height * this._scaledCellHeight) - window.devicePixelRatio);
-    };
-    BaseRenderLayer.prototype.clearAll = function () {
-        if (this._alpha) {
-            this._ctx.clearRect(0, 0, this._canvas.width, this._canvas.height);
-        }
-        else {
-            this._ctx.fillStyle = this._colors.background;
-            this._ctx.fillRect(0, 0, this._canvas.width, this._canvas.height);
-        }
-    };
-    BaseRenderLayer.prototype.clearCells = function (x, y, width, height) {
-        if (this._alpha) {
-            this._ctx.clearRect(x * this._scaledCellWidth, y * this._scaledCellHeight, width * this._scaledCellWidth, height * this._scaledCellHeight);
-        }
-        else {
-            this._ctx.fillStyle = this._colors.background;
-            this._ctx.fillRect(x * this._scaledCellWidth, y * this._scaledCellHeight, width * this._scaledCellWidth, height * this._scaledCellHeight);
-        }
-    };
-    BaseRenderLayer.prototype.fillCharTrueColor = function (terminal, charData, x, y) {
-        this._ctx.font = terminal.options.fontSize * window.devicePixelRatio + "px " + terminal.options.fontFamily;
-        this._ctx.textBaseline = 'top';
-        this._clipRow(terminal, y);
-        this._ctx.fillText(charData[Buffer_1.CHAR_DATA_CHAR_INDEX], x * this._scaledCellWidth + this._scaledCharLeft, y * this._scaledCellHeight + this._scaledCharTop);
-    };
-    BaseRenderLayer.prototype.drawChar = function (terminal, char, code, width, x, y, fg, bg, bold, dim) {
-        var colorIndex = 0;
-        if (fg < 256) {
-            colorIndex = fg + 2;
-        }
-        else {
-            if (bold && terminal.options.enableBold) {
-                colorIndex = 1;
-            }
-        }
-        var isAscii = code < 256;
-        var isBasicColor = (colorIndex > 1 && fg < 16) && (fg < 8 || bold);
-        var isDefaultColor = fg >= 256;
-        var isDefaultBackground = bg >= 256;
-        if (this._charAtlas && isAscii && (isBasicColor || isDefaultColor) && isDefaultBackground) {
-            var charAtlasCellWidth = this._scaledCharWidth + CharAtlas_1.CHAR_ATLAS_CELL_SPACING;
-            var charAtlasCellHeight = this._scaledCharHeight + CharAtlas_1.CHAR_ATLAS_CELL_SPACING;
-            if (dim) {
-                this._ctx.globalAlpha = DIM_OPACITY;
-            }
-            if (bold && !terminal.options.enableBold) {
-                if (colorIndex > 1) {
-                    colorIndex -= 8;
-                }
-            }
-            this._ctx.drawImage(this._charAtlas, code * charAtlasCellWidth, colorIndex * charAtlasCellHeight, charAtlasCellWidth, this._scaledCharHeight, x * this._scaledCellWidth + this._scaledCharLeft, y * this._scaledCellHeight + this._scaledCharTop, charAtlasCellWidth, this._scaledCharHeight);
-        }
-        else {
-            this._drawUncachedChar(terminal, char, width, fg, x, y, bold, dim);
-        }
-    };
-    BaseRenderLayer.prototype._drawUncachedChar = function (terminal, char, width, fg, x, y, bold, dim) {
-        this._ctx.save();
-        this._ctx.font = terminal.options.fontSize * window.devicePixelRatio + "px " + terminal.options.fontFamily;
-        if (bold && terminal.options.enableBold) {
-            this._ctx.font = "bold " + this._ctx.font;
-        }
-        this._ctx.textBaseline = 'top';
-        if (fg === exports.INVERTED_DEFAULT_COLOR) {
-            this._ctx.fillStyle = this._colors.background;
-        }
-        else if (fg < 256) {
-            this._ctx.fillStyle = this._colors.ansi[fg];
-        }
-        else {
-            this._ctx.fillStyle = this._colors.foreground;
-        }
-        this._clipRow(terminal, y);
-        if (dim) {
-            this._ctx.globalAlpha = DIM_OPACITY;
-        }
-        this._ctx.fillText(char, x * this._scaledCellWidth + this._scaledCharLeft, y * this._scaledCellHeight + this._scaledCharTop);
-        this._ctx.restore();
-    };
-    BaseRenderLayer.prototype._clipRow = function (terminal, y) {
-        this._ctx.beginPath();
-        this._ctx.rect(0, y * this._scaledCellHeight, terminal.cols * this._scaledCellWidth, this._scaledCellHeight);
-        this._ctx.clip();
-    };
-    return BaseRenderLayer;
-}());
-exports.BaseRenderLayer = BaseRenderLayer;
-
-
-
-},{"../Buffer":1,"./CharAtlas":19}],19:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var Browser_1 = require("../utils/Browser");
-exports.CHAR_ATLAS_CELL_SPACING = 1;
-var charAtlasCache = [];
-function acquireCharAtlas(terminal, colors, scaledCharWidth, scaledCharHeight) {
-    var newConfig = generateConfig(scaledCharWidth, scaledCharHeight, terminal, colors);
-    for (var i = 0; i < charAtlasCache.length; i++) {
-        var entry = charAtlasCache[i];
-        var ownedByIndex = entry.ownedBy.indexOf(terminal);
-        if (ownedByIndex >= 0) {
-            if (configEquals(entry.config, newConfig)) {
-                return entry.bitmap;
-            }
-            else {
-                if (entry.ownedBy.length === 1) {
-                    charAtlasCache.splice(i, 1);
-                }
-                else {
-                    entry.ownedBy.splice(ownedByIndex, 1);
-                }
-                break;
-            }
-        }
-    }
-    for (var i = 0; i < charAtlasCache.length; i++) {
-        var entry = charAtlasCache[i];
-        if (configEquals(entry.config, newConfig)) {
-            entry.ownedBy.push(terminal);
-            return entry.bitmap;
-        }
-    }
-    var newEntry = {
-        bitmap: generator.generate(scaledCharWidth, scaledCharHeight, terminal.options.fontSize, terminal.options.fontFamily, colors.background, colors.foreground, colors.ansi),
-        config: newConfig,
-        ownedBy: [terminal]
-    };
-    charAtlasCache.push(newEntry);
-    return newEntry.bitmap;
-}
-exports.acquireCharAtlas = acquireCharAtlas;
-function generateConfig(scaledCharWidth, scaledCharHeight, terminal, colors) {
-    var clonedColors = {
-        foreground: colors.foreground,
-        background: colors.background,
-        cursor: null,
-        cursorAccent: null,
-        selection: null,
-        ansi: colors.ansi.slice(0, 16)
-    };
-    return {
-        scaledCharWidth: scaledCharWidth,
-        scaledCharHeight: scaledCharHeight,
-        fontFamily: terminal.options.fontFamily,
-        fontSize: terminal.options.fontSize,
-        colors: clonedColors
-    };
-}
-function configEquals(a, b) {
-    for (var i = 0; i < a.colors.ansi.length; i++) {
-        if (a.colors.ansi[i] !== b.colors.ansi[i]) {
-            return false;
-        }
-    }
-    return a.fontFamily === b.fontFamily &&
-        a.fontSize === b.fontSize &&
-        a.scaledCharWidth === b.scaledCharWidth &&
-        a.scaledCharHeight === b.scaledCharHeight &&
-        a.colors.foreground === b.colors.foreground &&
-        a.colors.background === b.colors.background;
-}
-var generator;
-function initialize(document) {
-    if (!generator) {
-        generator = new CharAtlasGenerator(document);
-    }
-}
-exports.initialize = initialize;
-var CharAtlasGenerator = (function () {
-    function CharAtlasGenerator(_document) {
-        this._document = _document;
-        this._canvas = this._document.createElement('canvas');
-        this._ctx = this._canvas.getContext('2d', { alpha: false });
-        this._ctx.scale(window.devicePixelRatio, window.devicePixelRatio);
-    }
-    CharAtlasGenerator.prototype.generate = function (scaledCharWidth, scaledCharHeight, fontSize, fontFamily, background, foreground, ansiColors) {
-        var cellWidth = scaledCharWidth + exports.CHAR_ATLAS_CELL_SPACING;
-        var cellHeight = scaledCharHeight + exports.CHAR_ATLAS_CELL_SPACING;
-        this._canvas.width = 255 * cellWidth;
-        this._canvas.height = (2 + 16) * cellHeight;
-        this._ctx.fillStyle = background;
-        this._ctx.fillRect(0, 0, this._canvas.width, this._canvas.height);
-        this._ctx.save();
-        this._ctx.fillStyle = foreground;
-        this._ctx.font = fontSize * window.devicePixelRatio + "px " + fontFamily;
-        this._ctx.textBaseline = 'top';
-        for (var i = 0; i < 256; i++) {
-            this._ctx.save();
-            this._ctx.beginPath();
-            this._ctx.rect(i * cellWidth, 0, cellWidth, cellHeight);
-            this._ctx.clip();
-            this._ctx.fillText(String.fromCharCode(i), i * cellWidth, 0);
-            this._ctx.restore();
-        }
-        this._ctx.save();
-        this._ctx.font = "bold " + this._ctx.font;
-        for (var i = 0; i < 256; i++) {
-            this._ctx.save();
-            this._ctx.beginPath();
-            this._ctx.rect(i * cellWidth, cellHeight, cellWidth, cellHeight);
-            this._ctx.clip();
-            this._ctx.fillText(String.fromCharCode(i), i * cellWidth, cellHeight);
-            this._ctx.restore();
-        }
-        this._ctx.restore();
-        this._ctx.font = fontSize * window.devicePixelRatio + "px " + fontFamily;
-        for (var colorIndex = 0; colorIndex < 16; colorIndex++) {
-            if (colorIndex === 8) {
-                this._ctx.font = "bold " + this._ctx.font;
-            }
-            var y = (colorIndex + 2) * cellHeight;
-            for (var i = 0; i < 256; i++) {
-                this._ctx.save();
-                this._ctx.beginPath();
-                this._ctx.rect(i * cellWidth, y, cellWidth, cellHeight);
-                this._ctx.clip();
-                this._ctx.fillStyle = ansiColors[colorIndex];
-                this._ctx.fillText(String.fromCharCode(i), i * cellWidth, y);
-                this._ctx.restore();
-            }
-        }
-        this._ctx.restore();
-        if (!('createImageBitmap' in window) || Browser_1.isFirefox) {
-            var result = this._canvas;
-            this._canvas = this._document.createElement('canvas');
-            this._ctx = this._canvas.getContext('2d');
-            this._ctx.scale(window.devicePixelRatio, window.devicePixelRatio);
-            return result;
-        }
-        var charAtlasImageData = this._ctx.getImageData(0, 0, this._canvas.width, this._canvas.height);
-        var r = parseInt(background.substr(1, 2), 16);
-        var g = parseInt(background.substr(3, 2), 16);
-        var b = parseInt(background.substr(5, 2), 16);
-        this._clearColor(charAtlasImageData, r, g, b);
-        var promise = window.createImageBitmap(charAtlasImageData);
-        this._ctx.clearRect(0, 0, this._canvas.width, this._canvas.height);
-        return promise;
-    };
-    CharAtlasGenerator.prototype._clearColor = function (imageData, r, g, b) {
-        for (var offset = 0; offset < imageData.data.length; offset += 4) {
-            if (imageData.data[offset] === r &&
-                imageData.data[offset + 1] === g &&
-                imageData.data[offset + 2] === b) {
-                imageData.data[offset + 3] = 0;
-            }
-        }
-    };
-    return CharAtlasGenerator;
-}());
-
-
-
-},{"../utils/Browser":28}],20:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var DEFAULT_FOREGROUND = '#ffffff';
-var DEFAULT_BACKGROUND = '#333333';
-var DEFAULT_CURSOR = '#ffffff';
-var DEFAULT_CURSOR_ACCENT = '#333333';
-var DEFAULT_SELECTION = 'rgba(255, 255, 255, 0.3)';
-exports.DEFAULT_ANSI_COLORS = [
-    '#2e3436',
-    '#cc0000',
-    '#4e9a06',
-    '#c4a000',
-    '#3465a4',
-    '#75507b',
-    '#06989a',
-    '#d3d7cf',
-    '#555753',
-    '#ef2929',
-    '#8ae234',
-    '#fce94f',
-    '#729fcf',
-    '#ad7fa8',
-    '#34e2e2',
-    '#eeeeec'
-];
-function generate256Colors(first16Colors) {
-    var colors = first16Colors.slice();
-    var v = [0x00, 0x5f, 0x87, 0xaf, 0xd7, 0xff];
-    for (var i = 0; i < 216; i++) {
-        var r = toPaddedHex(v[(i / 36) % 6 | 0]);
-        var g = toPaddedHex(v[(i / 6) % 6 | 0]);
-        var b = toPaddedHex(v[i % 6]);
-        colors.push("#" + r + g + b);
-    }
-    for (var i = 0; i < 24; i++) {
-        var c = toPaddedHex(8 + i * 10);
-        colors.push("#" + c + c + c);
-    }
-    return colors;
-}
-function toPaddedHex(c) {
-    var s = c.toString(16);
-    return s.length < 2 ? '0' + s : s;
-}
-var ColorManager = (function () {
-    function ColorManager() {
-        this.colors = {
-            foreground: DEFAULT_FOREGROUND,
-            background: DEFAULT_BACKGROUND,
-            cursor: DEFAULT_CURSOR,
-            cursorAccent: DEFAULT_CURSOR_ACCENT,
-            selection: DEFAULT_SELECTION,
-            ansi: generate256Colors(exports.DEFAULT_ANSI_COLORS)
-        };
-    }
-    ColorManager.prototype.setTheme = function (theme) {
-        this.colors.foreground = theme.foreground || DEFAULT_FOREGROUND;
-        this.colors.background = this._validateColor(theme.background, DEFAULT_BACKGROUND);
-        this.colors.cursor = theme.cursor || DEFAULT_CURSOR;
-        this.colors.cursorAccent = theme.cursorAccent || DEFAULT_CURSOR_ACCENT;
-        this.colors.selection = theme.selection || DEFAULT_SELECTION;
-        this.colors.ansi[0] = theme.black || exports.DEFAULT_ANSI_COLORS[0];
-        this.colors.ansi[1] = theme.red || exports.DEFAULT_ANSI_COLORS[1];
-        this.colors.ansi[2] = theme.green || exports.DEFAULT_ANSI_COLORS[2];
-        this.colors.ansi[3] = theme.yellow || exports.DEFAULT_ANSI_COLORS[3];
-        this.colors.ansi[4] = theme.blue || exports.DEFAULT_ANSI_COLORS[4];
-        this.colors.ansi[5] = theme.magenta || exports.DEFAULT_ANSI_COLORS[5];
-        this.colors.ansi[6] = theme.cyan || exports.DEFAULT_ANSI_COLORS[6];
-        this.colors.ansi[7] = theme.white || exports.DEFAULT_ANSI_COLORS[7];
-        this.colors.ansi[8] = theme.brightBlack || exports.DEFAULT_ANSI_COLORS[8];
-        this.colors.ansi[9] = theme.brightRed || exports.DEFAULT_ANSI_COLORS[9];
-        this.colors.ansi[10] = theme.brightGreen || exports.DEFAULT_ANSI_COLORS[10];
-        this.colors.ansi[11] = theme.brightYellow || exports.DEFAULT_ANSI_COLORS[11];
-        this.colors.ansi[12] = theme.brightBlue || exports.DEFAULT_ANSI_COLORS[12];
-        this.colors.ansi[13] = theme.brightMagenta || exports.DEFAULT_ANSI_COLORS[13];
-        this.colors.ansi[14] = theme.brightCyan || exports.DEFAULT_ANSI_COLORS[14];
-        this.colors.ansi[15] = theme.brightWhite || exports.DEFAULT_ANSI_COLORS[15];
-    };
-    ColorManager.prototype._validateColor = function (color, fallback) {
-        if (!color) {
-            return fallback;
-        }
-        if (color.length === 7 && color.charAt(0) === '#') {
-            return color;
-        }
-        if (color.length === 4 && color.charAt(0) === '#') {
-            var r = color.charAt(1);
-            var g = color.charAt(2);
-            var b = color.charAt(3);
-            return "#" + r + r + g + g + b + b;
-        }
-        return fallback;
-    };
-    return ColorManager;
-}());
-exports.ColorManager = ColorManager;
-
-
-
-},{}],21:[function(require,module,exports){
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var Buffer_1 = require("../Buffer");
-var BaseRenderLayer_1 = require("./BaseRenderLayer");
-var BLINK_INTERVAL = 600;
-var CursorRenderLayer = (function (_super) {
-    __extends(CursorRenderLayer, _super);
-    function CursorRenderLayer(container, zIndex, colors) {
-        var _this = _super.call(this, container, 'cursor', zIndex, true, colors) || this;
-        _this._state = {
-            x: null,
-            y: null,
-            isFocused: null,
-            style: null,
-            width: null,
-        };
-        _this._cursorRenderers = {
-            'bar': _this._renderBarCursor.bind(_this),
-            'block': _this._renderBlockCursor.bind(_this),
-            'underline': _this._renderUnderlineCursor.bind(_this)
-        };
-        return _this;
-    }
-    CursorRenderLayer.prototype.resize = function (terminal, dim, charSizeChanged) {
-        _super.prototype.resize.call(this, terminal, dim, charSizeChanged);
-        this._state = {
-            x: null,
-            y: null,
-            isFocused: null,
-            style: null,
-            width: null,
-        };
-    };
-    CursorRenderLayer.prototype.reset = function (terminal) {
-        this._clearCursor();
-        if (this._cursorBlinkStateManager) {
-            this._cursorBlinkStateManager.dispose();
-            this._cursorBlinkStateManager = null;
-            this.onOptionsChanged(terminal);
-        }
-    };
-    CursorRenderLayer.prototype.onBlur = function (terminal) {
-        if (this._cursorBlinkStateManager) {
-            this._cursorBlinkStateManager.pause();
-        }
-        terminal.refresh(terminal.buffer.y, terminal.buffer.y);
-    };
-    CursorRenderLayer.prototype.onFocus = function (terminal) {
-        if (this._cursorBlinkStateManager) {
-            this._cursorBlinkStateManager.resume(terminal);
-        }
-        else {
-            terminal.refresh(terminal.buffer.y, terminal.buffer.y);
-        }
-    };
-    CursorRenderLayer.prototype.onOptionsChanged = function (terminal) {
-        var _this = this;
-        if (terminal.options.cursorBlink) {
-            if (!this._cursorBlinkStateManager) {
-                this._cursorBlinkStateManager = new CursorBlinkStateManager(terminal, function () {
-                    _this._render(terminal, true);
-                });
-            }
-        }
-        else {
-            if (this._cursorBlinkStateManager) {
-                this._cursorBlinkStateManager.dispose();
-                this._cursorBlinkStateManager = null;
-            }
-            terminal.refresh(terminal.buffer.y, terminal.buffer.y);
-        }
-    };
-    CursorRenderLayer.prototype.onCursorMove = function (terminal) {
-        if (this._cursorBlinkStateManager) {
-            this._cursorBlinkStateManager.restartBlinkAnimation(terminal);
-        }
-    };
-    CursorRenderLayer.prototype.onGridChanged = function (terminal, startRow, endRow) {
-        if (!this._cursorBlinkStateManager || this._cursorBlinkStateManager.isPaused) {
-            this._render(terminal, false);
-        }
-    };
-    CursorRenderLayer.prototype._render = function (terminal, triggeredByAnimationFrame) {
-        if (!terminal.cursorState || terminal.cursorHidden) {
-            this._clearCursor();
-            return;
-        }
-        var cursorY = terminal.buffer.ybase + terminal.buffer.y;
-        var viewportRelativeCursorY = cursorY - terminal.buffer.ydisp;
-        if (viewportRelativeCursorY < 0 || viewportRelativeCursorY >= terminal.rows) {
-            this._clearCursor();
-            return;
-        }
-        var charData = terminal.buffer.lines.get(cursorY)[terminal.buffer.x];
-        if (!charData) {
-            return;
-        }
-        if (!terminal.isFocused) {
-            this._clearCursor();
-            this._ctx.save();
-            this._ctx.fillStyle = this._colors.cursor;
-            this._renderBlurCursor(terminal, terminal.buffer.x, viewportRelativeCursorY, charData);
-            this._ctx.restore();
-            this._state.x = terminal.buffer.x;
-            this._state.y = viewportRelativeCursorY;
-            this._state.isFocused = false;
-            this._state.style = terminal.options.cursorStyle;
-            this._state.width = charData[Buffer_1.CHAR_DATA_WIDTH_INDEX];
-            return;
-        }
-        if (this._cursorBlinkStateManager && !this._cursorBlinkStateManager.isCursorVisible) {
-            this._clearCursor();
-            return;
-        }
-        if (this._state) {
-            if (this._state.x === terminal.buffer.x &&
-                this._state.y === viewportRelativeCursorY &&
-                this._state.isFocused === terminal.isFocused &&
-                this._state.style === terminal.options.cursorStyle &&
-                this._state.width === charData[Buffer_1.CHAR_DATA_WIDTH_INDEX]) {
-                return;
-            }
-            this._clearCursor();
-        }
-        this._ctx.save();
-        this._cursorRenderers[terminal.options.cursorStyle || 'block'](terminal, terminal.buffer.x, viewportRelativeCursorY, charData);
-        this._ctx.restore();
-        this._state.x = terminal.buffer.x;
-        this._state.y = viewportRelativeCursorY;
-        this._state.isFocused = false;
-        this._state.style = terminal.options.cursorStyle;
-        this._state.width = charData[Buffer_1.CHAR_DATA_WIDTH_INDEX];
-    };
-    CursorRenderLayer.prototype._clearCursor = function () {
-        if (this._state) {
-            this.clearCells(this._state.x, this._state.y, this._state.width, 1);
-            this._state = {
-                x: null,
-                y: null,
-                isFocused: null,
-                style: null,
-                width: null,
-            };
-        }
-    };
-    CursorRenderLayer.prototype._renderBarCursor = function (terminal, x, y, charData) {
-        this._ctx.save();
-        this._ctx.fillStyle = this._colors.cursor;
-        this.fillLeftLineAtCell(x, y);
-        this._ctx.restore();
-    };
-    CursorRenderLayer.prototype._renderBlockCursor = function (terminal, x, y, charData) {
-        this._ctx.save();
-        this._ctx.fillStyle = this._colors.cursor;
-        this.fillCells(x, y, charData[Buffer_1.CHAR_DATA_WIDTH_INDEX], 1);
-        this._ctx.fillStyle = this._colors.cursorAccent;
-        this.fillCharTrueColor(terminal, charData, x, y);
-        this._ctx.restore();
-    };
-    CursorRenderLayer.prototype._renderUnderlineCursor = function (terminal, x, y, charData) {
-        this._ctx.save();
-        this._ctx.fillStyle = this._colors.cursor;
-        this.fillBottomLineAtCells(x, y);
-        this._ctx.restore();
-    };
-    CursorRenderLayer.prototype._renderBlurCursor = function (terminal, x, y, charData) {
-        this._ctx.save();
-        this._ctx.strokeStyle = this._colors.cursor;
-        this.strokeRectAtCell(x, y, charData[Buffer_1.CHAR_DATA_WIDTH_INDEX], 1);
-        this._ctx.restore();
-    };
-    return CursorRenderLayer;
-}(BaseRenderLayer_1.BaseRenderLayer));
-exports.CursorRenderLayer = CursorRenderLayer;
-var CursorBlinkStateManager = (function () {
-    function CursorBlinkStateManager(terminal, renderCallback) {
-        this.renderCallback = renderCallback;
-        this.isCursorVisible = true;
-        if (terminal.isFocused) {
-            this._restartInterval();
-        }
-    }
-    Object.defineProperty(CursorBlinkStateManager.prototype, "isPaused", {
-        get: function () { return !(this._blinkStartTimeout || this._blinkInterval); },
-        enumerable: true,
-        configurable: true
-    });
-    CursorBlinkStateManager.prototype.dispose = function () {
-        if (this._blinkInterval) {
-            window.clearInterval(this._blinkInterval);
-            this._blinkInterval = null;
-        }
-        if (this._blinkStartTimeout) {
-            window.clearTimeout(this._blinkStartTimeout);
-            this._blinkStartTimeout = null;
-        }
-        if (this._animationFrame) {
-            window.cancelAnimationFrame(this._animationFrame);
-            this._animationFrame = null;
-        }
-    };
-    CursorBlinkStateManager.prototype.restartBlinkAnimation = function (terminal) {
-        var _this = this;
-        if (this.isPaused) {
-            return;
-        }
-        this._animationTimeRestarted = Date.now();
-        this.isCursorVisible = true;
-        if (!this._animationFrame) {
-            this._animationFrame = window.requestAnimationFrame(function () {
-                _this.renderCallback();
-                _this._animationFrame = null;
-            });
-        }
-    };
-    CursorBlinkStateManager.prototype._restartInterval = function (timeToStart) {
-        var _this = this;
-        if (timeToStart === void 0) { timeToStart = BLINK_INTERVAL; }
-        if (this._blinkInterval) {
-            window.clearInterval(this._blinkInterval);
-        }
-        this._blinkStartTimeout = setTimeout(function () {
-            if (_this._animationTimeRestarted) {
-                var time = BLINK_INTERVAL - (Date.now() - _this._animationTimeRestarted);
-                _this._animationTimeRestarted = null;
-                if (time > 0) {
-                    _this._restartInterval(time);
-                    return;
-                }
-            }
-            _this.isCursorVisible = false;
-            _this._animationFrame = window.requestAnimationFrame(function () {
-                _this.renderCallback();
-                _this._animationFrame = null;
-            });
-            _this._blinkInterval = setInterval(function () {
-                if (_this._animationTimeRestarted) {
-                    var time = BLINK_INTERVAL - (Date.now() - _this._animationTimeRestarted);
-                    _this._animationTimeRestarted = null;
-                    _this._restartInterval(time);
-                    return;
-                }
-                _this.isCursorVisible = !_this.isCursorVisible;
-                _this._animationFrame = window.requestAnimationFrame(function () {
-                    _this.renderCallback();
-                    _this._animationFrame = null;
-                });
-            }, BLINK_INTERVAL);
-        }, timeToStart);
-    };
-    CursorBlinkStateManager.prototype.pause = function () {
-        this.isCursorVisible = true;
-        if (this._blinkInterval) {
-            window.clearInterval(this._blinkInterval);
-            this._blinkInterval = null;
-        }
-        if (this._blinkStartTimeout) {
-            window.clearTimeout(this._blinkStartTimeout);
-            this._blinkStartTimeout = null;
-        }
-        if (this._animationFrame) {
-            window.cancelAnimationFrame(this._animationFrame);
-            this._animationFrame = null;
-        }
-    };
-    CursorBlinkStateManager.prototype.resume = function (terminal) {
-        this._animationTimeRestarted = null;
-        this._restartInterval();
-        this.restartBlinkAnimation(terminal);
-    };
-    return CursorBlinkStateManager;
-}());
-
-
-
-},{"../Buffer":1,"./BaseRenderLayer":18}],22:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var GridCache = (function () {
-    function GridCache() {
-        this.cache = [];
-    }
-    GridCache.prototype.resize = function (width, height) {
-        for (var x = 0; x < width; x++) {
-            if (this.cache.length <= x) {
-                this.cache.push([]);
-            }
-            for (var y = this.cache[x].length; y < height; y++) {
-                this.cache[x].push(null);
-            }
-            this.cache[x].length = height;
-        }
-        this.cache.length = width;
-    };
-    GridCache.prototype.clear = function () {
-        for (var x = 0; x < this.cache.length; x++) {
-            for (var y = 0; y < this.cache[x].length; y++) {
-                this.cache[x][y] = null;
-            }
-        }
-    };
-    return GridCache;
-}());
-exports.GridCache = GridCache;
-
-
-
-},{}],23:[function(require,module,exports){
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var BaseRenderLayer_1 = require("./BaseRenderLayer");
-var Types_1 = require("../Types");
-var LinkRenderLayer = (function (_super) {
-    __extends(LinkRenderLayer, _super);
-    function LinkRenderLayer(container, zIndex, colors, terminal) {
-        var _this = _super.call(this, container, 'link', zIndex, true, colors) || this;
-        _this._state = null;
-        terminal.linkifier.on(Types_1.LinkHoverEventTypes.HOVER, function (e) { return _this._onLinkHover(e); });
-        terminal.linkifier.on(Types_1.LinkHoverEventTypes.LEAVE, function (e) { return _this._onLinkLeave(e); });
-        return _this;
-    }
-    LinkRenderLayer.prototype.resize = function (terminal, dim, charSizeChanged) {
-        _super.prototype.resize.call(this, terminal, dim, charSizeChanged);
-        this._state = null;
-    };
-    LinkRenderLayer.prototype.reset = function (terminal) {
-        this._clearCurrentLink();
-    };
-    LinkRenderLayer.prototype._clearCurrentLink = function () {
-        if (this._state) {
-            this.clearCells(this._state.x, this._state.y, this._state.length, 1);
-            this._state = null;
-        }
-    };
-    LinkRenderLayer.prototype._onLinkHover = function (e) {
-        this._ctx.fillStyle = this._colors.foreground;
-        this.fillBottomLineAtCells(e.x, e.y, e.length);
-        this._state = e;
-    };
-    LinkRenderLayer.prototype._onLinkLeave = function (e) {
-        this._clearCurrentLink();
-    };
-    return LinkRenderLayer;
-}(BaseRenderLayer_1.BaseRenderLayer));
-exports.LinkRenderLayer = LinkRenderLayer;
-
-
-
-},{"../Types":14,"./BaseRenderLayer":18}],24:[function(require,module,exports){
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var TextRenderLayer_1 = require("./TextRenderLayer");
-var SelectionRenderLayer_1 = require("./SelectionRenderLayer");
-var CursorRenderLayer_1 = require("./CursorRenderLayer");
-var ColorManager_1 = require("./ColorManager");
-var LinkRenderLayer_1 = require("./LinkRenderLayer");
-var EventEmitter_1 = require("../EventEmitter");
-var Renderer = (function (_super) {
-    __extends(Renderer, _super);
-    function Renderer(_terminal, theme) {
-        var _this = _super.call(this) || this;
-        _this._terminal = _terminal;
-        _this._refreshRowsQueue = [];
-        _this._refreshAnimationFrame = null;
-        _this.colorManager = new ColorManager_1.ColorManager();
-        if (theme) {
-            _this.colorManager.setTheme(theme);
-        }
-        _this._renderLayers = [
-            new TextRenderLayer_1.TextRenderLayer(_this._terminal.element, 0, _this.colorManager.colors),
-            new SelectionRenderLayer_1.SelectionRenderLayer(_this._terminal.element, 1, _this.colorManager.colors),
-            new LinkRenderLayer_1.LinkRenderLayer(_this._terminal.element, 2, _this.colorManager.colors, _this._terminal),
-            new CursorRenderLayer_1.CursorRenderLayer(_this._terminal.element, 3, _this.colorManager.colors)
-        ];
-        _this.dimensions = {
-            scaledCharWidth: null,
-            scaledCharHeight: null,
-            scaledCellWidth: null,
-            scaledCellHeight: null,
-            scaledCharLeft: null,
-            scaledCharTop: null,
-            scaledCanvasWidth: null,
-            scaledCanvasHeight: null,
-            canvasWidth: null,
-            canvasHeight: null,
-            actualCellWidth: null,
-            actualCellHeight: null
-        };
-        _this._devicePixelRatio = window.devicePixelRatio;
-        return _this;
-    }
-    Renderer.prototype.onWindowResize = function (devicePixelRatio) {
-        if (this._devicePixelRatio !== devicePixelRatio) {
-            this._devicePixelRatio = devicePixelRatio;
-            this.onResize(this._terminal.cols, this._terminal.rows, true);
-        }
-    };
-    Renderer.prototype.setTheme = function (theme) {
-        var _this = this;
-        this.colorManager.setTheme(theme);
-        this._renderLayers.forEach(function (l) {
-            l.onThemeChanged(_this._terminal, _this.colorManager.colors);
-            l.reset(_this._terminal);
-        });
-        this._terminal.refresh(0, this._terminal.rows - 1);
-        return this.colorManager.colors;
-    };
-    Renderer.prototype.onResize = function (cols, rows, didCharSizeChange) {
-        var _this = this;
-        if (!this._terminal.charMeasure.width || !this._terminal.charMeasure.height) {
-            return;
-        }
-        this.dimensions.scaledCharWidth = Math.floor(this._terminal.charMeasure.width * window.devicePixelRatio);
-        this.dimensions.scaledCharHeight = Math.ceil(this._terminal.charMeasure.height * window.devicePixelRatio);
-        this.dimensions.scaledCellHeight = Math.floor(this.dimensions.scaledCharHeight * this._terminal.options.lineHeight);
-        this.dimensions.scaledCharTop = this._terminal.options.lineHeight === 1 ? 0 : Math.round((this.dimensions.scaledCellHeight - this.dimensions.scaledCharHeight) / 2);
-        this.dimensions.scaledCellWidth = this.dimensions.scaledCharWidth + Math.round(this._terminal.options.letterSpacing);
-        this.dimensions.scaledCharLeft = Math.floor(this._terminal.options.letterSpacing / 2);
-        this.dimensions.scaledCanvasHeight = this._terminal.rows * this.dimensions.scaledCellHeight;
-        this.dimensions.scaledCanvasWidth = this._terminal.cols * this.dimensions.scaledCellWidth;
-        this.dimensions.canvasHeight = Math.round(this.dimensions.scaledCanvasHeight / window.devicePixelRatio);
-        this.dimensions.canvasWidth = Math.round(this.dimensions.scaledCanvasWidth / window.devicePixelRatio);
-        this.dimensions.actualCellHeight = this.dimensions.canvasHeight / this._terminal.rows;
-        this.dimensions.actualCellWidth = this.dimensions.canvasWidth / this._terminal.cols;
-        this._renderLayers.forEach(function (l) { return l.resize(_this._terminal, _this.dimensions, didCharSizeChange); });
-        this._terminal.refresh(0, this._terminal.rows - 1);
-        this.emit('resize', {
-            width: this.dimensions.canvasWidth,
-            height: this.dimensions.canvasHeight
-        });
-    };
-    Renderer.prototype.onCharSizeChanged = function () {
-        this.onResize(this._terminal.cols, this._terminal.rows, true);
-    };
-    Renderer.prototype.onBlur = function () {
-        var _this = this;
-        this._renderLayers.forEach(function (l) { return l.onBlur(_this._terminal); });
-    };
-    Renderer.prototype.onFocus = function () {
-        var _this = this;
-        this._renderLayers.forEach(function (l) { return l.onFocus(_this._terminal); });
-    };
-    Renderer.prototype.onSelectionChanged = function (start, end) {
-        var _this = this;
-        this._renderLayers.forEach(function (l) { return l.onSelectionChanged(_this._terminal, start, end); });
-    };
-    Renderer.prototype.onCursorMove = function () {
-        var _this = this;
-        this._renderLayers.forEach(function (l) { return l.onCursorMove(_this._terminal); });
-    };
-    Renderer.prototype.onOptionsChanged = function () {
-        var _this = this;
-        this._renderLayers.forEach(function (l) { return l.onOptionsChanged(_this._terminal); });
-    };
-    Renderer.prototype.clear = function () {
-        var _this = this;
-        this._renderLayers.forEach(function (l) { return l.reset(_this._terminal); });
-    };
-    Renderer.prototype.queueRefresh = function (start, end) {
-        this._refreshRowsQueue.push({ start: start, end: end });
-        if (!this._refreshAnimationFrame) {
-            this._refreshAnimationFrame = window.requestAnimationFrame(this._refreshLoop.bind(this));
-        }
-    };
-    Renderer.prototype._refreshLoop = function () {
-        var _this = this;
-        var start;
-        var end;
-        if (this._refreshRowsQueue.length > 4) {
-            start = 0;
-            end = this._terminal.rows - 1;
-        }
-        else {
-            start = this._refreshRowsQueue[0].start;
-            end = this._refreshRowsQueue[0].end;
-            for (var i = 1; i < this._refreshRowsQueue.length; i++) {
-                if (this._refreshRowsQueue[i].start < start) {
-                    start = this._refreshRowsQueue[i].start;
-                }
-                if (this._refreshRowsQueue[i].end > end) {
-                    end = this._refreshRowsQueue[i].end;
-                }
-            }
-        }
-        this._refreshRowsQueue = [];
-        this._refreshAnimationFrame = null;
-        start = Math.max(start, 0);
-        end = Math.min(end, this._terminal.rows - 1);
-        this._renderLayers.forEach(function (l) { return l.onGridChanged(_this._terminal, start, end); });
-        this._terminal.emit('refresh', { start: start, end: end });
-    };
-    return Renderer;
-}(EventEmitter_1.EventEmitter));
-exports.Renderer = Renderer;
-
-
-
-},{"../EventEmitter":7,"./ColorManager":20,"./CursorRenderLayer":21,"./LinkRenderLayer":23,"./SelectionRenderLayer":25,"./TextRenderLayer":26}],25:[function(require,module,exports){
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var BaseRenderLayer_1 = require("./BaseRenderLayer");
-var SelectionRenderLayer = (function (_super) {
-    __extends(SelectionRenderLayer, _super);
-    function SelectionRenderLayer(container, zIndex, colors) {
-        var _this = _super.call(this, container, 'selection', zIndex, true, colors) || this;
-        _this._state = {
-            start: null,
-            end: null
-        };
-        return _this;
-    }
-    SelectionRenderLayer.prototype.resize = function (terminal, dim, charSizeChanged) {
-        _super.prototype.resize.call(this, terminal, dim, charSizeChanged);
-        this._state = {
-            start: null,
-            end: null
-        };
-    };
-    SelectionRenderLayer.prototype.reset = function (terminal) {
-        if (this._state.start && this._state.end) {
-            this._state = {
-                start: null,
-                end: null
-            };
-            this.clearAll();
-        }
-    };
-    SelectionRenderLayer.prototype.onSelectionChanged = function (terminal, start, end) {
-        if (this._state.start === start || this._state.end === end) {
-            return;
-        }
-        this.clearAll();
-        if (!start || !end) {
-            return;
-        }
-        var viewportStartRow = start[1] - terminal.buffer.ydisp;
-        var viewportEndRow = end[1] - terminal.buffer.ydisp;
-        var viewportCappedStartRow = Math.max(viewportStartRow, 0);
-        var viewportCappedEndRow = Math.min(viewportEndRow, terminal.rows - 1);
-        if (viewportCappedStartRow >= terminal.rows || viewportCappedEndRow < 0) {
-            return;
-        }
-        var startCol = viewportStartRow === viewportCappedStartRow ? start[0] : 0;
-        var startRowEndCol = viewportCappedStartRow === viewportCappedEndRow ? end[0] : terminal.cols;
-        this._ctx.fillStyle = this._colors.selection;
-        this.fillCells(startCol, viewportCappedStartRow, startRowEndCol - startCol, 1);
-        var middleRowsCount = Math.max(viewportCappedEndRow - viewportCappedStartRow - 1, 0);
-        this.fillCells(0, viewportCappedStartRow + 1, terminal.cols, middleRowsCount);
-        if (viewportCappedStartRow !== viewportCappedEndRow) {
-            var endCol = viewportEndRow === viewportCappedEndRow ? end[0] : terminal.cols;
-            this.fillCells(0, viewportCappedEndRow, endCol, 1);
-        }
-        this._state.start = [start[0], start[1]];
-        this._state.end = [end[0], end[1]];
-    };
-    return SelectionRenderLayer;
-}(BaseRenderLayer_1.BaseRenderLayer));
-exports.SelectionRenderLayer = SelectionRenderLayer;
-
-
-
-},{"./BaseRenderLayer":18}],26:[function(require,module,exports){
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var Buffer_1 = require("../Buffer");
-var Types_1 = require("./Types");
-var GridCache_1 = require("./GridCache");
-var BaseRenderLayer_1 = require("./BaseRenderLayer");
-var OVERLAP_OWNED_CHAR_DATA = [null, '', 0, -1];
-var TextRenderLayer = (function (_super) {
-    __extends(TextRenderLayer, _super);
-    function TextRenderLayer(container, zIndex, colors) {
-        var _this = _super.call(this, container, 'text', zIndex, false, colors) || this;
-        _this._characterOverlapCache = {};
-        _this._state = new GridCache_1.GridCache();
-        return _this;
-    }
-    TextRenderLayer.prototype.resize = function (terminal, dim, charSizeChanged) {
-        _super.prototype.resize.call(this, terminal, dim, charSizeChanged);
-        var terminalFont = terminal.options.fontSize * window.devicePixelRatio + "px " + terminal.options.fontFamily;
-        if (this._characterWidth !== dim.scaledCharWidth || this._characterFont !== terminalFont) {
-            this._characterWidth = dim.scaledCharWidth;
-            this._characterFont = terminalFont;
-            this._characterOverlapCache = {};
-        }
-        this._state.clear();
-        this._state.resize(terminal.cols, terminal.rows);
-    };
-    TextRenderLayer.prototype.reset = function (terminal) {
-        this._state.clear();
-        this.clearAll();
-    };
-    TextRenderLayer.prototype.onGridChanged = function (terminal, startRow, endRow) {
-        if (this._state.cache.length === 0) {
-            return;
-        }
-        for (var y = startRow; y <= endRow; y++) {
-            var row = y + terminal.buffer.ydisp;
-            var line = terminal.buffer.lines.get(row);
-            this.clearCells(0, y, terminal.cols, 1);
-            for (var x = 0; x < terminal.cols; x++) {
-                var charData = line[x];
-                var code = charData[Buffer_1.CHAR_DATA_CODE_INDEX];
-                var char = charData[Buffer_1.CHAR_DATA_CHAR_INDEX];
-                var attr = charData[Buffer_1.CHAR_DATA_ATTR_INDEX];
-                var width = charData[Buffer_1.CHAR_DATA_WIDTH_INDEX];
-                if (width === 0) {
-                    continue;
-                }
-                if (code === 32) {
-                    if (x > 0) {
-                        var previousChar = line[x - 1];
-                        if (this._isOverlapping(previousChar)) {
-                            continue;
-                        }
-                    }
-                }
-                var flags = attr >> 18;
-                var bg = attr & 0x1ff;
-                var isDefaultBackground = bg >= 256;
-                var isInvisible = flags & Types_1.FLAGS.INVISIBLE;
-                var isInverted = flags & Types_1.FLAGS.INVERSE;
-                if (!code || (code === 32 && isDefaultBackground && !isInverted) || isInvisible) {
-                    continue;
-                }
-                if (width !== 0 && this._isOverlapping(charData)) {
-                    if (x < line.length - 1 && line[x + 1][Buffer_1.CHAR_DATA_CODE_INDEX] === 32) {
-                        width = 2;
-                    }
-                }
-                var fg = (attr >> 9) & 0x1ff;
-                if (isInverted) {
-                    var temp = bg;
-                    bg = fg;
-                    fg = temp;
-                    if (fg === 256) {
-                        fg = BaseRenderLayer_1.INVERTED_DEFAULT_COLOR;
-                    }
-                    if (bg === 257) {
-                        bg = BaseRenderLayer_1.INVERTED_DEFAULT_COLOR;
-                    }
-                }
-                if (width === 2) {
-                }
-                if (bg < 256) {
-                    this._ctx.save();
-                    this._ctx.fillStyle = (bg === BaseRenderLayer_1.INVERTED_DEFAULT_COLOR ? this._colors.foreground : this._colors.ansi[bg]);
-                    this.fillCells(x, y, width, 1);
-                    this._ctx.restore();
-                }
-                this._ctx.save();
-                if (flags & Types_1.FLAGS.BOLD) {
-                    this._ctx.font = "bold " + this._ctx.font;
-                    if (fg < 8) {
-                        fg += 8;
-                    }
-                }
-                if (flags & Types_1.FLAGS.UNDERLINE) {
-                    if (fg === BaseRenderLayer_1.INVERTED_DEFAULT_COLOR) {
-                        this._ctx.fillStyle = this._colors.background;
-                    }
-                    else if (fg < 256) {
-                        this._ctx.fillStyle = this._colors.ansi[fg];
-                    }
-                    else {
-                        this._ctx.fillStyle = this._colors.foreground;
-                    }
-                    this.fillBottomLineAtCells(x, y);
-                }
-                this.drawChar(terminal, char, code, width, x, y, fg, bg, !!(flags & Types_1.FLAGS.BOLD), !!(flags & Types_1.FLAGS.DIM));
-                this._ctx.restore();
-            }
-        }
-    };
-    TextRenderLayer.prototype._isOverlapping = function (charData) {
-        if (charData[Buffer_1.CHAR_DATA_WIDTH_INDEX] !== 1) {
-            return false;
-        }
-        var code = charData[Buffer_1.CHAR_DATA_CODE_INDEX];
-        if (code < 256) {
-            return false;
-        }
-        var char = charData[Buffer_1.CHAR_DATA_CHAR_INDEX];
-        if (this._characterOverlapCache.hasOwnProperty(char)) {
-            return this._characterOverlapCache[char];
-        }
-        this._ctx.save();
-        this._ctx.font = this._characterFont;
-        var overlaps = Math.floor(this._ctx.measureText(char).width) > this._characterWidth;
-        this._ctx.restore();
-        this._characterOverlapCache[char] = overlaps;
-        return overlaps;
-    };
-    TextRenderLayer.prototype._clearChar = function (x, y) {
-        var colsToClear = 1;
-        var state = this._state.cache[x][y];
-        if (state && state[Buffer_1.CHAR_DATA_WIDTH_INDEX] === 2) {
-            colsToClear = 2;
-        }
-        this.clearCells(x, y, colsToClear, 1);
-    };
-    return TextRenderLayer;
-}(BaseRenderLayer_1.BaseRenderLayer));
-exports.TextRenderLayer = TextRenderLayer;
-
-
-
-},{"../Buffer":1,"./BaseRenderLayer":18,"./GridCache":22,"./Types":27}],27:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var FLAGS;
-(function (FLAGS) {
-    FLAGS[FLAGS["BOLD"] = 1] = "BOLD";
-    FLAGS[FLAGS["UNDERLINE"] = 2] = "UNDERLINE";
-    FLAGS[FLAGS["BLINK"] = 4] = "BLINK";
-    FLAGS[FLAGS["INVERSE"] = 8] = "INVERSE";
-    FLAGS[FLAGS["INVISIBLE"] = 16] = "INVISIBLE";
-    FLAGS[FLAGS["DIM"] = 32] = "DIM";
-})(FLAGS = exports.FLAGS || (exports.FLAGS = {}));
-;
-
-
-
-},{}],28:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var Generic_1 = require("./Generic");
-var isNode = (typeof navigator === 'undefined') ? true : false;
-var userAgent = (isNode) ? 'node' : navigator.userAgent;
-var platform = (isNode) ? 'node' : navigator.platform;
-exports.isFirefox = !!~userAgent.indexOf('Firefox');
-exports.isMSIE = !!~userAgent.indexOf('MSIE') || !!~userAgent.indexOf('Trident');
-exports.isMac = Generic_1.contains(['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K'], platform);
-exports.isIpad = platform === 'iPad';
-exports.isIphone = platform === 'iPhone';
-exports.isMSWindows = Generic_1.contains(['Windows', 'Win16', 'Win32', 'WinCE'], platform);
-exports.isLinux = platform.indexOf('Linux') >= 0;
-
-
-
-},{"./Generic":31}],29:[function(require,module,exports){
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var EventEmitter_1 = require("../EventEmitter");
-var CharMeasure = (function (_super) {
-    __extends(CharMeasure, _super);
-    function CharMeasure(document, parentElement) {
-        var _this = _super.call(this) || this;
-        _this._document = document;
-        _this._parentElement = parentElement;
-        return _this;
-    }
-    Object.defineProperty(CharMeasure.prototype, "width", {
-        get: function () {
-            return this._width;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(CharMeasure.prototype, "height", {
-        get: function () {
-            return this._height;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    CharMeasure.prototype.measure = function (options) {
-        var _this = this;
-        if (!this._measureElement) {
-            this._measureElement = this._document.createElement('span');
-            this._measureElement.style.position = 'absolute';
-            this._measureElement.style.top = '0';
-            this._measureElement.style.left = '-9999em';
-            this._measureElement.style.lineHeight = 'normal';
-            this._measureElement.textContent = 'W';
-            this._measureElement.setAttribute('aria-hidden', 'true');
-            this._parentElement.appendChild(this._measureElement);
-            setTimeout(function () { return _this._doMeasure(options); }, 0);
-        }
-        else {
-            this._doMeasure(options);
-        }
-    };
-    CharMeasure.prototype._doMeasure = function (options) {
-        this._measureElement.style.fontFamily = options.fontFamily;
-        this._measureElement.style.fontSize = options.fontSize + "px";
-        var geometry = this._measureElement.getBoundingClientRect();
-        if (geometry.width === 0 || geometry.height === 0) {
-            return;
-        }
-        if (this._width !== geometry.width || this._height !== geometry.height) {
-            this._width = geometry.width;
-            this._height = Math.ceil(geometry.height);
-            this.emit('charsizechanged');
-        }
-    };
-    return CharMeasure;
-}(EventEmitter_1.EventEmitter));
-exports.CharMeasure = CharMeasure;
-
-
-
-},{"../EventEmitter":7}],30:[function(require,module,exports){
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var EventEmitter_1 = require("../EventEmitter");
-var CircularList = (function (_super) {
-    __extends(CircularList, _super);
-    function CircularList(_maxLength) {
-        var _this = _super.call(this) || this;
-        _this._maxLength = _maxLength;
-        _this._array = new Array(_this._maxLength);
-        _this._startIndex = 0;
-        _this._length = 0;
-        return _this;
-    }
-    Object.defineProperty(CircularList.prototype, "maxLength", {
-        get: function () {
-            return this._maxLength;
-        },
-        set: function (newMaxLength) {
-            if (this._maxLength === newMaxLength) {
-                return;
-            }
-            var newArray = new Array(newMaxLength);
-            for (var i = 0; i < Math.min(newMaxLength, this.length); i++) {
-                newArray[i] = this._array[this._getCyclicIndex(i)];
-            }
-            this._array = newArray;
-            this._maxLength = newMaxLength;
-            this._startIndex = 0;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(CircularList.prototype, "length", {
-        get: function () {
-            return this._length;
-        },
-        set: function (newLength) {
-            if (newLength > this._length) {
-                for (var i = this._length; i < newLength; i++) {
-                    this._array[i] = undefined;
-                }
-            }
-            this._length = newLength;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(CircularList.prototype, "forEach", {
-        get: function () {
-            var _this = this;
-            return function (callbackfn) {
-                var i = 0;
-                var length = _this.length;
-                for (var i_1 = 0; i_1 < length; i_1++) {
-                    callbackfn(_this.get(i_1), i_1);
-                }
-            };
-        },
-        enumerable: true,
-        configurable: true
-    });
-    CircularList.prototype.get = function (index) {
-        return this._array[this._getCyclicIndex(index)];
-    };
-    CircularList.prototype.set = function (index, value) {
-        this._array[this._getCyclicIndex(index)] = value;
-    };
-    CircularList.prototype.push = function (value) {
-        this._array[this._getCyclicIndex(this._length)] = value;
-        if (this._length === this._maxLength) {
-            this._startIndex++;
-            if (this._startIndex === this._maxLength) {
-                this._startIndex = 0;
-            }
-            this.emit('trim', 1);
-        }
-        else {
-            this._length++;
-        }
-    };
-    CircularList.prototype.pop = function () {
-        return this._array[this._getCyclicIndex(this._length-- - 1)];
-    };
-    CircularList.prototype.splice = function (start, deleteCount) {
-        var items = [];
-        for (var _i = 2; _i < arguments.length; _i++) {
-            items[_i - 2] = arguments[_i];
-        }
-        if (deleteCount) {
-            for (var i = start; i < this._length - deleteCount; i++) {
-                this._array[this._getCyclicIndex(i)] = this._array[this._getCyclicIndex(i + deleteCount)];
-            }
-            this._length -= deleteCount;
-        }
-        if (items && items.length) {
-            for (var i = this._length - 1; i >= start; i--) {
-                this._array[this._getCyclicIndex(i + items.length)] = this._array[this._getCyclicIndex(i)];
-            }
-            for (var i = 0; i < items.length; i++) {
-                this._array[this._getCyclicIndex(start + i)] = items[i];
-            }
-            if (this._length + items.length > this.maxLength) {
-                var countToTrim = (this._length + items.length) - this.maxLength;
-                this._startIndex += countToTrim;
-                this._length = this.maxLength;
-                this.emit('trim', countToTrim);
-            }
-            else {
-                this._length += items.length;
-            }
-        }
-    };
-    CircularList.prototype.trimStart = function (count) {
-        if (count > this._length) {
-            count = this._length;
-        }
-        this._startIndex += count;
-        this._length -= count;
-        this.emit('trim', count);
-    };
-    CircularList.prototype.shiftElements = function (start, count, offset) {
-        if (count <= 0) {
-            return;
-        }
-        if (start < 0 || start >= this._length) {
-            throw new Error('start argument out of range');
-        }
-        if (start + offset < 0) {
-            throw new Error('Cannot shift elements in list beyond index 0');
-        }
-        if (offset > 0) {
-            for (var i = count - 1; i >= 0; i--) {
-                this.set(start + i + offset, this.get(start + i));
-            }
-            var expandListBy = (start + count + offset) - this._length;
-            if (expandListBy > 0) {
-                this._length += expandListBy;
-                while (this._length > this.maxLength) {
-                    this._length--;
-                    this._startIndex++;
-                    this.emit('trim', 1);
-                }
-            }
-        }
-        else {
-            for (var i = 0; i < count; i++) {
-                this.set(start + i + offset, this.get(start + i));
-            }
-        }
-    };
-    CircularList.prototype._getCyclicIndex = function (index) {
-        return (this._startIndex + index) % this.maxLength;
-    };
-    return CircularList;
-}(EventEmitter_1.EventEmitter));
-exports.CircularList = CircularList;
-
-
-
-},{"../EventEmitter":7}],31:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function contains(arr, el) {
-    return arr.indexOf(el) >= 0;
-}
-exports.contains = contains;
-;
-
-
-
-},{}],32:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var MouseHelper = (function () {
-    function MouseHelper(_renderer) {
-        this._renderer = _renderer;
-    }
-    MouseHelper.getCoordsRelativeToElement = function (event, element) {
-        if (event.pageX == null) {
-            return null;
-        }
-        var originalElement = element;
-        var x = event.pageX;
-        var y = event.pageY;
-        while (element) {
-            x -= element.offsetLeft;
-            y -= element.offsetTop;
-            element = 'offsetParent' in element ? element.offsetParent : element.parentElement;
-        }
-        element = originalElement;
-        while (element && element !== element.ownerDocument.body) {
-            x += element.scrollLeft;
-            y += element.scrollTop;
-            element = element.parentElement;
-        }
-        return [x, y];
-    };
-    MouseHelper.prototype.getCoords = function (event, element, charMeasure, lineHeight, colCount, rowCount, isSelection) {
-        if (!charMeasure.width || !charMeasure.height) {
-            return null;
-        }
-        var coords = MouseHelper.getCoordsRelativeToElement(event, element);
-        if (!coords) {
-            return null;
-        }
-        coords[0] = Math.ceil((coords[0] + (isSelection ? this._renderer.dimensions.actualCellWidth / 2 : 0)) / this._renderer.dimensions.actualCellWidth);
-        coords[1] = Math.ceil(coords[1] / this._renderer.dimensions.actualCellHeight);
-        coords[0] = Math.min(Math.max(coords[0], 1), colCount + (isSelection ? 1 : 0));
-        coords[1] = Math.min(Math.max(coords[1], 1), rowCount);
-        return coords;
-    };
-    MouseHelper.prototype.getRawByteCoords = function (event, element, charMeasure, lineHeight, colCount, rowCount) {
-        var coords = this.getCoords(event, element, charMeasure, lineHeight, colCount, rowCount);
-        var x = coords[0];
-        var y = coords[1];
-        x += 32;
-        y += 32;
-        return { x: x, y: y };
-    };
-    return MouseHelper;
-}());
-exports.MouseHelper = MouseHelper;
-
-
-
-},{}],33:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BellSound = 'data:audio/wav;base64,UklGRigBAABXQVZFZm10IBAAAAABAAEARKwAAIhYAQACABAAZGF0YQQBAADpAFgCwAMlBZoG/wdmCcoKRAypDQ8PbRDBEQQTOxRtFYcWlBePGIUZXhoiG88bcBz7HHIdzh0WHlMeZx51HmkeUx4WHs8dah0AHXwc3hs9G4saxRnyGBIYGBcQFv8U4RPAEoYRQBACD70NWwwHC6gJOwjWBloF7gOBAhABkf8b/qv8R/ve+Xf4Ife79W/0JfPZ8Z/wde9N7ijtE+wU6xvqM+lb6H7nw+YX5mrlxuQz5Mzje+Ma49fioeKD4nXiYeJy4pHitOL04j/jn+MN5IPkFOWs5U3mDefM55/ogOl36m7rdOyE7abuyu8D8Unyj/Pg9D/2qfcb+Yn6/vuK/Qj/lAAlAg==';
-
-
-
-},{}],34:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var Terminal_1 = require("./Terminal");
-module.exports = Terminal_1.Terminal;
-
-
-
-},{"./Terminal":13}]},{},[34])(34)
-});
-//# sourceMappingURL=xterm.js.map
diff --git a/route/static/build/xterm.js.map b/route/static/build/xterm.js.map
deleted file mode 100755
index 9716c5e22..000000000
--- a/route/static/build/xterm.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"xterm.js","sources":["../src/xterm.ts","../src/utils/Sounds.ts","../src/utils/MouseHelper.ts","../src/utils/Generic.ts","../src/utils/CircularList.ts","../src/utils/CharMeasure.ts","../src/utils/Browser.ts","../src/renderer/Types.ts","../src/renderer/TextRenderLayer.ts","../src/renderer/SelectionRenderLayer.ts","../src/renderer/Renderer.ts","../src/renderer/LinkRenderLayer.ts","../src/renderer/GridCache.ts","../src/renderer/CursorRenderLayer.ts","../src/renderer/ColorManager.ts","../src/renderer/CharAtlas.ts","../src/renderer/BaseRenderLayer.ts","../src/input/MouseZoneManager.ts","../src/handlers/Clipboard.ts","../src/Viewport.ts","../src/Types.ts","../src/Terminal.ts","../src/SelectionModel.ts","../src/SelectionManager.ts","../src/Parser.ts","../src/Linkifier.ts","../src/InputHandler.ts","../src/EventEmitter.ts","../src/EscapeSequences.ts","../src/CompositionHelper.ts","../src/Charsets.ts","../src/CharWidth.ts","../src/BufferSet.ts","../src/Buffer.ts","../node_modules/browser-pack/_prelude.js"],"sourcesContent":["/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * This file is the entry point for browserify.\n */\n\nimport { Terminal } from './Terminal';\n\nmodule.exports = Terminal;\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\n// Source: https://freesound.org/people/altemark/sounds/45759/\n// This sound is released under the Creative Commons Attribution 3.0 Unported\n// (CC BY 3.0) license. It was created by 'altemark'. No modifications have been\n// made, apart from the conversion to base64.\nexport const BellSound = 'data:audio/wav;base64,UklGRigBAABXQVZFZm10IBAAAAABAAEARKwAAIhYAQACABAAZGF0YQQBAADpAFgCwAMlBZoG/wdmCcoKRAypDQ8PbRDBEQQTOxRtFYcWlBePGIUZXhoiG88bcBz7HHIdzh0WHlMeZx51HmkeUx4WHs8dah0AHXwc3hs9G4saxRnyGBIYGBcQFv8U4RPAEoYRQBACD70NWwwHC6gJOwjWBloF7gOBAhABkf8b/qv8R/ve+Xf4Ife79W/0JfPZ8Z/wde9N7ijtE+wU6xvqM+lb6H7nw+YX5mrlxuQz5Mzje+Ma49fioeKD4nXiYeJy4pHitOL04j/jn+MN5IPkFOWs5U3mDefM55/ogOl36m7rdOyE7abuyu8D8Unyj/Pg9D/2qfcb+Yn6/vuK/Qj/lAAlAg==';\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { ICharMeasure } from '../Interfaces';\nimport { IRenderer } from '../renderer/Interfaces';\n\nexport class MouseHelper {\n  constructor(private _renderer: IRenderer) {}\n\n  public static getCoordsRelativeToElement(event: {pageX: number, pageY: number}, element: HTMLElement): [number, number] {\n    // Ignore browsers that don't support MouseEvent.pageX\n    if (event.pageX == null) {\n      return null;\n    }\n\n    const originalElement = element;\n    let x = event.pageX;\n    let y = event.pageY;\n\n    // Converts the coordinates from being relative to the document to being\n    // relative to the terminal.\n    while (element) {\n      x -= element.offsetLeft;\n      y -= element.offsetTop;\n      element = 'offsetParent' in element ? <HTMLElement>element.offsetParent : <HTMLElement>element.parentElement;\n    }\n    element = originalElement;\n    while (element && element !== element.ownerDocument.body) {\n      x += element.scrollLeft;\n      y += element.scrollTop;\n      element = <HTMLElement>element.parentElement;\n    }\n    return [x, y];\n  }\n\n  /**\n   * Gets coordinates within the terminal for a particular mouse event. The result\n   * is returned as an array in the form [x, y] instead of an object as it's a\n   * little faster and this function is used in some low level code.\n   * @param event The mouse event.\n   * @param element The terminal's container element.\n   * @param charMeasure The char measure object used to determine character sizes.\n   * @param colCount The number of columns in the terminal.\n   * @param rowCount The number of rows n the terminal.\n   * @param isSelection Whether the request is for the selection or not. This will\n   * apply an offset to the x value such that the left half of the cell will\n   * select that cell and the right half will select the next cell.\n   */\n  public getCoords(event: {pageX: number, pageY: number}, element: HTMLElement, charMeasure: ICharMeasure, lineHeight: number, colCount: number, rowCount: number, isSelection?: boolean): [number, number] {\n    // Coordinates cannot be measured if charMeasure has not been initialized\n    if (!charMeasure.width || !charMeasure.height) {\n      return null;\n    }\n\n    const coords = MouseHelper.getCoordsRelativeToElement(event, element);\n    if (!coords) {\n      return null;\n    }\n\n    coords[0] = Math.ceil((coords[0] + (isSelection ? this._renderer.dimensions.actualCellWidth / 2 : 0)) / this._renderer.dimensions.actualCellWidth);\n    coords[1] = Math.ceil(coords[1] / this._renderer.dimensions.actualCellHeight);\n\n    // Ensure coordinates are within the terminal viewport. Note that selections\n    // need an addition point of precision to cover the end point (as characters\n    // cover half of one char and half of the next).\n    coords[0] = Math.min(Math.max(coords[0], 1), colCount + (isSelection ? 1 : 0));\n    coords[1] = Math.min(Math.max(coords[1], 1), rowCount);\n\n    return coords;\n  }\n\n  /**\n   * Gets coordinates within the terminal for a particular mouse event, wrapping\n   * them to the bounds of the terminal and adding 32 to both the x and y values\n   * as expected by xterm.\n   * @param event The mouse event.\n   * @param element The terminal's container element.\n   * @param charMeasure The char measure object used to determine character sizes.\n   * @param colCount The number of columns in the terminal.\n   * @param rowCount The number of rows in the terminal.\n   */\n  public getRawByteCoords(event: MouseEvent, element: HTMLElement, charMeasure: ICharMeasure, lineHeight: number, colCount: number, rowCount: number): { x: number, y: number } {\n    const coords = this.getCoords(event, element, charMeasure, lineHeight, colCount, rowCount);\n    let x = coords[0];\n    let y = coords[1];\n\n    // xterm sends raw bytes and starts at 32 (SP) for each.\n    x += 32;\n    y += 32;\n\n    return { x, y };\n  }\n}\n","/**\n * Copyright (c) 2016 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\n/**\n * Return if the given array contains the given element\n * @param {Array} array The array to search for the given element.\n * @param {Object} el The element to look for into the array\n */\nexport function contains(arr: any[], el: any): boolean {\n  return arr.indexOf(el) >= 0;\n};\n","/**\n * Copyright (c) 2016 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { EventEmitter } from '../EventEmitter';\nimport { ICircularList } from '../Interfaces';\n\n/**\n * Represents a circular list; a list with a maximum size that wraps around when push is called,\n * overriding values at the start of the list.\n */\nexport class CircularList<T> extends EventEmitter implements ICircularList<T> {\n  protected _array: T[];\n  private _startIndex: number;\n  private _length: number;\n\n  constructor(\n    private _maxLength: number\n  ) {\n    super();\n    this._array = new Array<T>(this._maxLength);\n    this._startIndex = 0;\n    this._length = 0;\n  }\n\n  public get maxLength(): number {\n    return this._maxLength;\n  }\n\n  public set maxLength(newMaxLength: number) {\n    // There was no change in maxLength, return early.\n    if (this._maxLength === newMaxLength) {\n      return;\n    }\n\n    // Reconstruct array, starting at index 0. Only transfer values from the\n    // indexes 0 to length.\n    let newArray = new Array<T>(newMaxLength);\n    for (let i = 0; i < Math.min(newMaxLength, this.length); i++) {\n      newArray[i] = this._array[this._getCyclicIndex(i)];\n    }\n    this._array = newArray;\n    this._maxLength = newMaxLength;\n    this._startIndex = 0;\n  }\n\n  public get length(): number {\n    return this._length;\n  }\n\n  public set length(newLength: number) {\n    if (newLength > this._length) {\n      for (let i = this._length; i < newLength; i++) {\n        this._array[i] = undefined;\n      }\n    }\n    this._length = newLength;\n  }\n\n  public get forEach(): (callbackfn: (value: T, index: number) => void) => void {\n    return (callbackfn: (value: T, index: number) => void) => {\n      let i = 0;\n      let length = this.length;\n      for (let i = 0; i < length; i++) {\n        callbackfn(this.get(i), i);\n      }\n    };\n  }\n\n  /**\n   * Gets the value at an index.\n   *\n   * Note that for performance reasons there is no bounds checking here, the index reference is\n   * circular so this should always return a value and never throw.\n   * @param index The index of the value to get.\n   * @return The value corresponding to the index.\n   */\n  public get(index: number): T {\n    return this._array[this._getCyclicIndex(index)];\n  }\n\n  /**\n   * Sets the value at an index.\n   *\n   * Note that for performance reasons there is no bounds checking here, the index reference is\n   * circular so this should always return a value and never throw.\n   * @param index The index to set.\n   * @param value The value to set.\n   */\n  public set(index: number, value: T): void {\n    this._array[this._getCyclicIndex(index)] = value;\n  }\n\n  /**\n   * Pushes a new value onto the list, wrapping around to the start of the array, overriding index 0\n   * if the maximum length is reached.\n   * @param value The value to push onto the list.\n   */\n  public push(value: T): void {\n    this._array[this._getCyclicIndex(this._length)] = value;\n    if (this._length === this._maxLength) {\n      this._startIndex++;\n      if (this._startIndex === this._maxLength) {\n        this._startIndex = 0;\n      }\n      this.emit('trim', 1);\n    } else {\n      this._length++;\n    }\n  }\n\n  /**\n   * Removes and returns the last value on the list.\n   * @return The popped value.\n   */\n  public pop(): T {\n    return this._array[this._getCyclicIndex(this._length-- - 1)];\n  }\n\n  /**\n   * Deletes and/or inserts items at a particular index (in that order). Unlike\n   * Array.prototype.splice, this operation does not return the deleted items as a new array in\n   * order to save creating a new array. Note that this operation may shift all values in the list\n   * in the worst case.\n   * @param start The index to delete and/or insert.\n   * @param deleteCount The number of elements to delete.\n   * @param items The items to insert.\n   */\n  public splice(start: number, deleteCount: number, ...items: T[]): void {\n    // Delete items\n    if (deleteCount) {\n      for (let i = start; i < this._length - deleteCount; i++) {\n        this._array[this._getCyclicIndex(i)] = this._array[this._getCyclicIndex(i + deleteCount)];\n      }\n      this._length -= deleteCount;\n    }\n\n    if (items && items.length) {\n      // Add items\n      for (let i = this._length - 1; i >= start; i--) {\n        this._array[this._getCyclicIndex(i + items.length)] = this._array[this._getCyclicIndex(i)];\n      }\n      for (let i = 0; i < items.length; i++) {\n        this._array[this._getCyclicIndex(start + i)] = items[i];\n      }\n\n      // Adjust length as needed\n      if (this._length + items.length > this.maxLength) {\n        const countToTrim = (this._length + items.length) - this.maxLength;\n        this._startIndex += countToTrim;\n        this._length = this.maxLength;\n        this.emit('trim', countToTrim);\n      } else {\n        this._length += items.length;\n      }\n    }\n  }\n\n  /**\n   * Trims a number of items from the start of the list.\n   * @param count The number of items to remove.\n   */\n  public trimStart(count: number): void {\n    if (count > this._length) {\n      count = this._length;\n    }\n    this._startIndex += count;\n    this._length -= count;\n    this.emit('trim', count);\n  }\n\n  public shiftElements(start: number, count: number, offset: number): void {\n    if (count <= 0) {\n      return;\n    }\n    if (start < 0 || start >= this._length) {\n      throw new Error('start argument out of range');\n    }\n    if (start + offset < 0) {\n      throw new Error('Cannot shift elements in list beyond index 0');\n    }\n\n    if (offset > 0) {\n      for (let i = count - 1; i >= 0; i--) {\n        this.set(start + i + offset, this.get(start + i));\n      }\n      const expandListBy = (start + count + offset) - this._length;\n      if (expandListBy > 0) {\n        this._length += expandListBy;\n        while (this._length > this.maxLength) {\n          this._length--;\n          this._startIndex++;\n          this.emit('trim', 1);\n        }\n      }\n    } else {\n      for (let i = 0; i < count; i++) {\n        this.set(start + i + offset, this.get(start + i));\n      }\n    }\n  }\n\n  /**\n   * Gets the cyclic index for the specified regular index. The cyclic index can then be used on the\n   * backing array to get the element associated with the regular index.\n   * @param index The regular index.\n   * @returns The cyclic index.\n   */\n  private _getCyclicIndex(index: number): number {\n    return (this._startIndex + index) % this.maxLength;\n  }\n}\n","/**\n * Copyright (c) 2016 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { EventEmitter } from '../EventEmitter';\nimport { ICharMeasure, ITerminal, ITerminalOptions } from '../Interfaces';\n\n/**\n * Utility class that measures the size of a character. Measurements are done in\n * the DOM rather than with a canvas context because support for extracting the\n * height of characters is patchy across browsers.\n */\nexport class CharMeasure extends EventEmitter implements ICharMeasure {\n  private _document: Document;\n  private _parentElement: HTMLElement;\n  private _measureElement: HTMLElement;\n  private _width: number;\n  private _height: number;\n\n  constructor(document: Document, parentElement: HTMLElement) {\n    super();\n    this._document = document;\n    this._parentElement = parentElement;\n  }\n\n  public get width(): number {\n    return this._width;\n  }\n\n  public get height(): number {\n    return this._height;\n  }\n\n  public measure(options: ITerminalOptions): void {\n    if (!this._measureElement) {\n      this._measureElement = this._document.createElement('span');\n      this._measureElement.style.position = 'absolute';\n      this._measureElement.style.top = '0';\n      this._measureElement.style.left = '-9999em';\n      this._measureElement.style.lineHeight = 'normal';\n      this._measureElement.textContent = 'W';\n      this._measureElement.setAttribute('aria-hidden', 'true');\n      this._parentElement.appendChild(this._measureElement);\n      // Perform _doMeasure async if the element was just attached as sometimes\n      // getBoundingClientRect does not return accurate values without this.\n      setTimeout(() => this._doMeasure(options), 0);\n    } else {\n      this._doMeasure(options);\n    }\n  }\n\n  private _doMeasure(options: ITerminalOptions): void {\n    this._measureElement.style.fontFamily = options.fontFamily;\n    this._measureElement.style.fontSize = `${options.fontSize}px`;\n    const geometry = this._measureElement.getBoundingClientRect();\n    // The element is likely currently display:none, we should retain the\n    // previous value.\n    if (geometry.width === 0 || geometry.height === 0) {\n      return;\n    }\n    if (this._width !== geometry.width || this._height !== geometry.height) {\n      this._width = geometry.width;\n      this._height = Math.ceil(geometry.height);\n      this.emit('charsizechanged');\n    }\n  }\n}\n","/**\n * Copyright (c) 2016 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { contains } from './Generic';\n\nconst isNode = (typeof navigator === 'undefined') ? true : false;\nconst userAgent = (isNode) ? 'node' : navigator.userAgent;\nconst platform = (isNode) ? 'node' : navigator.platform;\n\nexport const isFirefox = !!~userAgent.indexOf('Firefox');\nexport const isMSIE = !!~userAgent.indexOf('MSIE') || !!~userAgent.indexOf('Trident');\n\n// Find the users platform. We use this to interpret the meta key\n// and ISO third level shifts.\n// http://stackoverflow.com/q/19877924/577598\nexport const isMac = contains(['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K'], platform);\nexport const isIpad = platform === 'iPad';\nexport const isIphone = platform === 'iPhone';\nexport const isMSWindows = contains(['Windows', 'Win16', 'Win32', 'WinCE'], platform);\nexport const isLinux = platform.indexOf('Linux') >= 0;\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\n /**\n * Flags used to render terminal text properly.\n */\nexport enum FLAGS {\n  BOLD = 1,\n  UNDERLINE = 2,\n  BLINK = 4,\n  INVERSE = 8,\n  INVISIBLE = 16,\n  DIM = 32\n};\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IColorSet, IRenderDimensions } from './Interfaces';\nimport { IBuffer, ICharMeasure, ITerminal } from '../Interfaces';\nimport { CHAR_DATA_ATTR_INDEX, CHAR_DATA_CODE_INDEX, CHAR_DATA_CHAR_INDEX, CHAR_DATA_WIDTH_INDEX } from '../Buffer';\nimport { FLAGS } from './Types';\nimport { GridCache } from './GridCache';\nimport { CharData } from '../Types';\nimport { BaseRenderLayer, INVERTED_DEFAULT_COLOR } from './BaseRenderLayer';\n\n/**\n * This CharData looks like a null character, which will forc a clear and render\n * when the character changes (a regular space ' ' character may not as it's\n * drawn state is a cleared cell).\n */\nconst OVERLAP_OWNED_CHAR_DATA: CharData = [null, '', 0, -1];\n\nexport class TextRenderLayer extends BaseRenderLayer {\n  private _state: GridCache<CharData>;\n  private _characterWidth: number;\n  private _characterFont: string;\n  private _characterOverlapCache: { [key: string]: boolean } = {};\n\n  constructor(container: HTMLElement, zIndex: number, colors: IColorSet) {\n    super(container, 'text', zIndex, false, colors);\n    this._state = new GridCache<CharData>();\n  }\n\n  public resize(terminal: ITerminal, dim: IRenderDimensions, charSizeChanged: boolean): void {\n    super.resize(terminal, dim, charSizeChanged);\n\n    // Clear the character width cache if the font or width has changed\n    const terminalFont = `${terminal.options.fontSize * window.devicePixelRatio}px ${terminal.options.fontFamily}`;\n    if (this._characterWidth !== dim.scaledCharWidth || this._characterFont !== terminalFont) {\n      this._characterWidth = dim.scaledCharWidth;\n      this._characterFont = terminalFont;\n      this._characterOverlapCache = {};\n    }\n    // Resizing the canvas discards the contents of the canvas so clear state\n    this._state.clear();\n    this._state.resize(terminal.cols, terminal.rows);\n  }\n\n  public reset(terminal: ITerminal): void {\n    this._state.clear();\n    this.clearAll();\n  }\n\n  public onGridChanged(terminal: ITerminal, startRow: number, endRow: number): void {\n    // Resize has not been called yet\n    if (this._state.cache.length === 0) {\n      return;\n    }\n\n    for (let y = startRow; y <= endRow; y++) {\n      const row = y + terminal.buffer.ydisp;\n      const line = terminal.buffer.lines.get(row);\n\n      this.clearCells(0, y, terminal.cols, 1);\n      // for (let x = 0; x < terminal.cols; x++) {\n      //   this._state.cache[x][y] = null;\n      // }\n\n      for (let x = 0; x < terminal.cols; x++) {\n        const charData = line[x];\n        const code: number = <number>charData[CHAR_DATA_CODE_INDEX];\n        const char: string = charData[CHAR_DATA_CHAR_INDEX];\n        const attr: number = charData[CHAR_DATA_ATTR_INDEX];\n        let width: number = charData[CHAR_DATA_WIDTH_INDEX];\n\n        // The character to the left is a wide character, drawing is owned by\n        // the char at x-1\n        if (width === 0) {\n          // this._state.cache[x][y] = null;\n          continue;\n        }\n\n        // If the character is a space and the character to the left is an\n        // overlapping character, skip the character and allow the overlapping\n        // char to take full control over this character's cell.\n        if (code === 32 /*' '*/) {\n          if (x > 0) {\n            const previousChar: CharData = line[x - 1];\n            if (this._isOverlapping(previousChar)) {\n              continue;\n            }\n          }\n        }\n\n        // Skip rendering if the character is identical\n        // const state = this._state.cache[x][y];\n        // if (state && state[CHAR_DATA_CHAR_INDEX] === char && state[CHAR_DATA_ATTR_INDEX] === attr) {\n        //   // Skip render, contents are identical\n        //   this._state.cache[x][y] = charData;\n        //   continue;\n        // }\n\n        // Clear the old character was not a space with the default background\n        // const wasInverted = !!(state && state[CHAR_DATA_ATTR_INDEX] && state[CHAR_DATA_ATTR_INDEX] >> 18 & FLAGS.INVERSE);\n        // if (state && !(state[CHAR_DATA_CODE_INDEX] === 32 /*' '*/ && (state[CHAR_DATA_ATTR_INDEX] & 0x1ff) >= 256 && !wasInverted)) {\n        //   this._clearChar(x, y);\n        // }\n        // this._state.cache[x][y] = charData;\n\n        const flags = attr >> 18;\n        let bg = attr & 0x1ff;\n\n        // Skip rendering if the character is invisible\n        const isDefaultBackground = bg >= 256;\n        const isInvisible = flags & FLAGS.INVISIBLE;\n        const isInverted = flags & FLAGS.INVERSE;\n        if (!code || (code === 32 /*' '*/ && isDefaultBackground && !isInverted) || isInvisible) {\n          continue;\n        }\n\n        // If the character is an overlapping char and the character to the right is a\n        // space, take ownership of the cell to the right.\n        if (width !== 0 && this._isOverlapping(charData)) {\n          // If the character is overlapping, we want to force a re-render on every\n          // frame. This is specifically to work around the case where two\n          // overlaping chars `a` and `b` are adjacent, the cursor is moved to b and a\n          // space is added. Without this, the first half of `b` would never\n          // get removed, and `a` would not re-render because it thinks it's\n          // already in the correct state.\n          // this._state.cache[x][y] = OVERLAP_OWNED_CHAR_DATA;\n          if (x < line.length - 1 && line[x + 1][CHAR_DATA_CODE_INDEX] === 32 /*' '*/) {\n            width = 2;\n            // this._clearChar(x + 1, y);\n            // The overlapping char's char data will force a clear and render when the\n            // overlapping char is no longer to the left of the character and also when\n            // the space changes to another character.\n            // this._state.cache[x + 1][y] = OVERLAP_OWNED_CHAR_DATA;\n          }\n        }\n\n        let fg = (attr >> 9) & 0x1ff;\n\n        // If inverse flag is on, the foreground should become the background.\n        if (isInverted) {\n          const temp = bg;\n          bg = fg;\n          fg = temp;\n          if (fg === 256) {\n            fg = INVERTED_DEFAULT_COLOR;\n          }\n          if (bg === 257) {\n            bg = INVERTED_DEFAULT_COLOR;\n          }\n        }\n\n        // Clear the cell next to this character if it's wide\n        if (width === 2) {\n          // this.clearCells(x + 1, y, 1, 1);\n        }\n\n        // Draw background\n        if (bg < 256) {\n          this._ctx.save();\n          this._ctx.fillStyle = (bg === INVERTED_DEFAULT_COLOR ? this._colors.foreground : this._colors.ansi[bg]);\n          this.fillCells(x, y, width, 1);\n          this._ctx.restore();\n        }\n\n        this._ctx.save();\n        if (flags & FLAGS.BOLD) {\n          this._ctx.font = `bold ${this._ctx.font}`;\n          // Convert the FG color to the bold variant\n          if (fg < 8) {\n            fg += 8;\n          }\n        }\n\n        if (flags & FLAGS.UNDERLINE) {\n          if (fg === INVERTED_DEFAULT_COLOR) {\n            this._ctx.fillStyle = this._colors.background;\n          } else if (fg < 256) {\n            // 256 color support\n            this._ctx.fillStyle = this._colors.ansi[fg];\n          } else {\n            this._ctx.fillStyle = this._colors.foreground;\n          }\n          this.fillBottomLineAtCells(x, y);\n        }\n\n        this.drawChar(terminal, char, code, width, x, y, fg, bg, !!(flags & FLAGS.BOLD), !!(flags & FLAGS.DIM));\n\n        this._ctx.restore();\n      }\n    }\n  }\n\n\t/**\n\t * Whether a character is overlapping to the next cell.\n\t */\n  private _isOverlapping(charData: CharData): boolean {\n    // Only single cell characters can be overlapping, rendering issues can\n    // occur without this check\n    if (charData[CHAR_DATA_WIDTH_INDEX] !== 1) {\n      return false;\n    }\n\n    // We assume that any ascii character will not overlap\n    const code = charData[CHAR_DATA_CODE_INDEX];\n    if (code < 256) {\n      return false;\n    }\n\n    // Deliver from cache if available\n    const char = charData[CHAR_DATA_CHAR_INDEX];\n    if (this._characterOverlapCache.hasOwnProperty(char)) {\n      return this._characterOverlapCache[char];\n    }\n\n    // Setup the font\n    this._ctx.save();\n    this._ctx.font = this._characterFont;\n\n    // Measure the width of the character, but Math.floor it\n    // because that is what the renderer does when it calculates\n    // the character dimensions we are comparing against\n    const overlaps = Math.floor(this._ctx.measureText(char).width) > this._characterWidth;\n\n    // Restore the original context\n    this._ctx.restore();\n\n    // Cache and return\n    this._characterOverlapCache[char] = overlaps;\n    return overlaps;\n  }\n\n  /**\n   * Clear the charcater at the cell specified.\n   * @param x The column of the char.\n   * @param y The row of the char.\n   */\n  private _clearChar(x: number, y: number): void {\n    let colsToClear = 1;\n    // Clear the adjacent character if it was wide\n    const state = this._state.cache[x][y];\n    if (state && state[CHAR_DATA_WIDTH_INDEX] === 2) {\n      colsToClear = 2;\n    }\n    this.clearCells(x, y, colsToClear, 1);\n  }\n}\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IColorSet, IRenderDimensions } from './Interfaces';\nimport { IBuffer, ICharMeasure, ITerminal } from '../Interfaces';\nimport { CHAR_DATA_ATTR_INDEX } from '../Buffer';\nimport { GridCache } from './GridCache';\nimport { FLAGS } from './Types';\nimport { BaseRenderLayer } from './BaseRenderLayer';\n\nexport class SelectionRenderLayer extends BaseRenderLayer {\n  private _state: {start: [number, number], end: [number, number]};\n\n  constructor(container: HTMLElement, zIndex: number, colors: IColorSet) {\n    super(container, 'selection', zIndex, true, colors);\n    this._state = {\n      start: null,\n      end: null\n    };\n  }\n\n  public resize(terminal: ITerminal, dim: IRenderDimensions, charSizeChanged: boolean): void {\n    super.resize(terminal, dim, charSizeChanged);\n    // Resizing the canvas discards the contents of the canvas so clear state\n    this._state = {\n      start: null,\n      end: null\n    };\n  }\n\n  public reset(terminal: ITerminal): void {\n    if (this._state.start && this._state.end) {\n      this._state = {\n        start: null,\n        end: null\n      };\n      this.clearAll();\n    }\n  }\n\n  public onSelectionChanged(terminal: ITerminal, start: [number, number], end: [number, number]): void {\n    // Selection has not changed\n    if (this._state.start === start || this._state.end === end) {\n      return;\n    }\n\n    // Remove all selections\n    this.clearAll();\n\n    // Selection does not exist\n    if (!start || !end) {\n      return;\n    }\n\n    // Translate from buffer position to viewport position\n    const viewportStartRow = start[1] - terminal.buffer.ydisp;\n    const viewportEndRow = end[1] - terminal.buffer.ydisp;\n    const viewportCappedStartRow = Math.max(viewportStartRow, 0);\n    const viewportCappedEndRow = Math.min(viewportEndRow, terminal.rows - 1);\n\n    // No need to draw the selection\n    if (viewportCappedStartRow >= terminal.rows || viewportCappedEndRow < 0) {\n      return;\n    }\n\n    // Draw first row\n    const startCol = viewportStartRow === viewportCappedStartRow ? start[0] : 0;\n    const startRowEndCol = viewportCappedStartRow === viewportCappedEndRow ? end[0] : terminal.cols;\n    this._ctx.fillStyle = this._colors.selection;\n    this.fillCells(startCol, viewportCappedStartRow, startRowEndCol - startCol, 1);\n\n    // Draw middle rows\n    const middleRowsCount = Math.max(viewportCappedEndRow - viewportCappedStartRow - 1, 0);\n    this.fillCells(0, viewportCappedStartRow + 1, terminal.cols, middleRowsCount);\n\n    // Draw final row\n    if (viewportCappedStartRow !== viewportCappedEndRow) {\n      // Only draw viewportEndRow if it's not the same as viewportStartRow\n      const endCol = viewportEndRow === viewportCappedEndRow ? end[0] : terminal.cols;\n      this.fillCells(0, viewportCappedEndRow, endCol, 1);\n    }\n\n    // Save state for next render\n    this._state.start = [start[0], start[1]];\n    this._state.end = [end[0], end[1]];\n  }\n}\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { ITerminal, ITheme } from '../Interfaces';\nimport { CHAR_DATA_WIDTH_INDEX, CHAR_DATA_CHAR_INDEX } from '../Buffer';\nimport { TextRenderLayer } from './TextRenderLayer';\nimport { SelectionRenderLayer } from './SelectionRenderLayer';\nimport { CursorRenderLayer } from './CursorRenderLayer';\nimport { ColorManager } from './ColorManager';\nimport { BaseRenderLayer } from './BaseRenderLayer';\nimport { IRenderLayer, IColorSet, IRenderer, IRenderDimensions } from './Interfaces';\nimport { LinkRenderLayer } from './LinkRenderLayer';\nimport { EventEmitter } from '../EventEmitter';\n\nexport class Renderer extends EventEmitter implements IRenderer {\n  /** A queue of the rows to be refreshed */\n  private _refreshRowsQueue: {start: number, end: number}[] = [];\n  private _refreshAnimationFrame = null;\n\n  private _renderLayers: IRenderLayer[];\n  private _devicePixelRatio: number;\n\n  public colorManager: ColorManager;\n  public dimensions: IRenderDimensions;\n\n  constructor(private _terminal: ITerminal, theme: ITheme) {\n    super();\n    this.colorManager = new ColorManager();\n    if (theme) {\n      this.colorManager.setTheme(theme);\n    }\n    this._renderLayers = [\n      new TextRenderLayer(this._terminal.element, 0, this.colorManager.colors),\n      new SelectionRenderLayer(this._terminal.element, 1, this.colorManager.colors),\n      new LinkRenderLayer(this._terminal.element, 2, this.colorManager.colors, this._terminal),\n      new CursorRenderLayer(this._terminal.element, 3, this.colorManager.colors)\n    ];\n    this.dimensions = {\n      scaledCharWidth: null,\n      scaledCharHeight: null,\n      scaledCellWidth: null,\n      scaledCellHeight: null,\n      scaledCharLeft: null,\n      scaledCharTop: null,\n      scaledCanvasWidth: null,\n      scaledCanvasHeight: null,\n      canvasWidth: null,\n      canvasHeight: null,\n      actualCellWidth: null,\n      actualCellHeight: null\n    };\n    this._devicePixelRatio = window.devicePixelRatio;\n  }\n\n  public onWindowResize(devicePixelRatio: number): void {\n    // If the device pixel ratio changed, the char atlas needs to be regenerated\n    // and the terminal needs to refreshed\n    if (this._devicePixelRatio !== devicePixelRatio) {\n      this._devicePixelRatio = devicePixelRatio;\n      this.onResize(this._terminal.cols, this._terminal.rows, true);\n    }\n  }\n\n  public setTheme(theme: ITheme): IColorSet {\n    this.colorManager.setTheme(theme);\n\n    // Clear layers and force a full render\n    this._renderLayers.forEach(l => {\n      l.onThemeChanged(this._terminal, this.colorManager.colors);\n      l.reset(this._terminal);\n    });\n\n    this._terminal.refresh(0, this._terminal.rows - 1);\n\n    return this.colorManager.colors;\n  }\n\n  public onResize(cols: number, rows: number, didCharSizeChange: boolean): void {\n    if (!this._terminal.charMeasure.width || !this._terminal.charMeasure.height) {\n      return;\n    }\n\n    // Calculate the scaled character width. Width is floored as it must be\n    // drawn to an integer grid in order for the CharAtlas \"stamps\" to not be\n    // blurry. When text is drawn to the grid not using the CharAtlas, it is\n    // clipped to ensure there is no overlap with the next cell.\n    this.dimensions.scaledCharWidth = Math.floor(this._terminal.charMeasure.width * window.devicePixelRatio);\n\n    // Calculate the scaled character height. Height is ceiled in case\n    // devicePixelRatio is a floating point number in order to ensure there is\n    // enough space to draw the character to the cell.\n    this.dimensions.scaledCharHeight = Math.ceil(this._terminal.charMeasure.height * window.devicePixelRatio);\n\n    // Calculate the scaled cell height, if lineHeight is not 1 then the value\n    // will be floored because since lineHeight can never be lower then 1, there\n    // is a guarentee that the scaled line height will always be larger than\n    // scaled char height.\n    this.dimensions.scaledCellHeight = Math.floor(this.dimensions.scaledCharHeight * this._terminal.options.lineHeight);\n\n    // Calculate the y coordinate within a cell that text should draw from in\n    // order to draw in the center of a cell.\n    this.dimensions.scaledCharTop = this._terminal.options.lineHeight === 1 ? 0 : Math.round((this.dimensions.scaledCellHeight - this.dimensions.scaledCharHeight) / 2);\n\n    // Calculate the scaled cell width, taking the letterSpacing into account.\n    this.dimensions.scaledCellWidth = this.dimensions.scaledCharWidth + Math.round(this._terminal.options.letterSpacing);\n\n    // Calculate the x coordinate with a cell that text should draw from in\n    // order to draw in the center of a cell.\n    this.dimensions.scaledCharLeft = Math.floor(this._terminal.options.letterSpacing / 2);\n\n    // Recalculate the canvas dimensions; scaled* define the actual number of\n    // pixel in the canvas\n    this.dimensions.scaledCanvasHeight = this._terminal.rows * this.dimensions.scaledCellHeight;\n    this.dimensions.scaledCanvasWidth = this._terminal.cols * this.dimensions.scaledCellWidth;\n\n    // The the size of the canvas on the page. It's very important that this\n    // rounds to nearest integer and not ceils as browsers often set\n    // window.devicePixelRatio as something like 1.100000023841858, when it's\n    // actually 1.1. Ceiling causes blurriness as the backing canvas image is 1\n    // pixel too large for the canvas element size.\n    this.dimensions.canvasHeight = Math.round(this.dimensions.scaledCanvasHeight / window.devicePixelRatio);\n    this.dimensions.canvasWidth = Math.round(this.dimensions.scaledCanvasWidth / window.devicePixelRatio);\n\n    // Get the _actual_ dimensions of an individual cell. This needs to be\n    // derived from the canvasWidth/Height calculated above which takes into\n    // account window.devicePixelRatio. CharMeasure.width/height by itself is\n    // insufficient when the page is not at 100% zoom level as CharMeasure is\n    // measured in CSS pixels, but the actual char size on the canvas can\n    // differ.\n    this.dimensions.actualCellHeight = this.dimensions.canvasHeight / this._terminal.rows;\n    this.dimensions.actualCellWidth = this.dimensions.canvasWidth / this._terminal.cols;\n\n    // Resize all render layers\n    this._renderLayers.forEach(l => l.resize(this._terminal, this.dimensions, didCharSizeChange));\n\n    // Force a refresh\n    this._terminal.refresh(0, this._terminal.rows - 1);\n\n    this.emit('resize', {\n      width: this.dimensions.canvasWidth,\n      height: this.dimensions.canvasHeight\n    });\n  }\n\n  public onCharSizeChanged(): void {\n    this.onResize(this._terminal.cols, this._terminal.rows, true);\n  }\n\n  public onBlur(): void {\n    this._renderLayers.forEach(l => l.onBlur(this._terminal));\n  }\n\n  public onFocus(): void {\n    this._renderLayers.forEach(l => l.onFocus(this._terminal));\n  }\n\n  public onSelectionChanged(start: [number, number], end: [number, number]): void {\n    this._renderLayers.forEach(l => l.onSelectionChanged(this._terminal, start, end));\n  }\n\n  public onCursorMove(): void {\n    this._renderLayers.forEach(l => l.onCursorMove(this._terminal));\n  }\n\n  public onOptionsChanged(): void {\n    this._renderLayers.forEach(l => l.onOptionsChanged(this._terminal));\n  }\n\n  public clear(): void {\n    this._renderLayers.forEach(l => l.reset(this._terminal));\n  }\n\n  /**\n   * Queues a refresh between two rows (inclusive), to be done on next animation\n   * frame.\n   * @param {number} start The start row.\n   * @param {number} end The end row.\n   */\n  public queueRefresh(start: number, end: number): void {\n    this._refreshRowsQueue.push({ start: start, end: end });\n    if (!this._refreshAnimationFrame) {\n      this._refreshAnimationFrame = window.requestAnimationFrame(this._refreshLoop.bind(this));\n    }\n  }\n\n  /**\n   * Performs the refresh loop callback, calling refresh only if a refresh is\n   * necessary before queueing up the next one.\n   */\n  private _refreshLoop(): void {\n    let start;\n    let end;\n    if (this._refreshRowsQueue.length > 4) {\n      // Just do a full refresh when 5+ refreshes are queued\n      start = 0;\n      end = this._terminal.rows - 1;\n    } else {\n      // Get start and end rows that need refreshing\n      start = this._refreshRowsQueue[0].start;\n      end = this._refreshRowsQueue[0].end;\n      for (let i = 1; i < this._refreshRowsQueue.length; i++) {\n        if (this._refreshRowsQueue[i].start < start) {\n          start = this._refreshRowsQueue[i].start;\n        }\n        if (this._refreshRowsQueue[i].end > end) {\n          end = this._refreshRowsQueue[i].end;\n        }\n      }\n    }\n    this._refreshRowsQueue = [];\n    this._refreshAnimationFrame = null;\n\n    // Render\n    start = Math.max(start, 0);\n    end = Math.min(end, this._terminal.rows - 1);\n    this._renderLayers.forEach(l => l.onGridChanged(this._terminal, start, end));\n    this._terminal.emit('refresh', {start, end});\n  }\n}\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IColorSet, IRenderDimensions } from './Interfaces';\nimport { IBuffer, ICharMeasure, ITerminal, ILinkifierAccessor } from '../Interfaces';\nimport { CHAR_DATA_ATTR_INDEX } from '../Buffer';\nimport { GridCache } from './GridCache';\nimport { FLAGS } from './Types';\nimport { BaseRenderLayer, INVERTED_DEFAULT_COLOR } from './BaseRenderLayer';\nimport { LinkHoverEvent, LinkHoverEventTypes } from '../Types';\n\nexport class LinkRenderLayer extends BaseRenderLayer {\n  private _state: LinkHoverEvent = null;\n\n  constructor(container: HTMLElement, zIndex: number, colors: IColorSet, terminal: ILinkifierAccessor) {\n    super(container, 'link', zIndex, true, colors);\n    terminal.linkifier.on(LinkHoverEventTypes.HOVER, (e: LinkHoverEvent) => this._onLinkHover(e));\n    terminal.linkifier.on(LinkHoverEventTypes.LEAVE, (e: LinkHoverEvent) => this._onLinkLeave(e));\n  }\n\n  public resize(terminal: ITerminal, dim: IRenderDimensions, charSizeChanged: boolean): void {\n    super.resize(terminal, dim, charSizeChanged);\n    // Resizing the canvas discards the contents of the canvas so clear state\n    this._state = null;\n  }\n\n  public reset(terminal: ITerminal): void {\n    this._clearCurrentLink();\n  }\n\n  private _clearCurrentLink(): void {\n    if (this._state) {\n      this.clearCells(this._state.x, this._state.y, this._state.length, 1);\n      this._state = null;\n    }\n  }\n\n  private _onLinkHover(e: LinkHoverEvent): void {\n    this._ctx.fillStyle = this._colors.foreground;\n    this.fillBottomLineAtCells(e.x, e.y, e.length);\n    this._state = e;\n  }\n\n  private _onLinkLeave(e: LinkHoverEvent): void {\n    this._clearCurrentLink();\n  }\n}\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nexport class GridCache<T> {\n  public cache: T[][];\n\n  public constructor() {\n    this.cache = [];\n  }\n\n  public resize(width: number, height: number): void {\n    for (let x = 0; x < width; x++) {\n      if (this.cache.length <= x) {\n        this.cache.push([]);\n      }\n      for (let y = this.cache[x].length; y < height; y++) {\n        this.cache[x].push(null);\n      }\n      this.cache[x].length = height;\n    }\n    this.cache.length = width;\n  }\n\n  public clear(): void {\n    for (let x = 0; x < this.cache.length; x++) {\n      for (let y = 0; y < this.cache[x].length; y++) {\n        this.cache[x][y] = null;\n      }\n    }\n  }\n}\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IColorSet, IRenderDimensions } from './Interfaces';\nimport { IBuffer, ICharMeasure, ITerminal, ITerminalOptions } from '../Interfaces';\nimport { CHAR_DATA_WIDTH_INDEX, CHAR_DATA_CODE_INDEX, CHAR_DATA_CHAR_INDEX } from '../Buffer';\nimport { GridCache } from './GridCache';\nimport { FLAGS } from './Types';\nimport { BaseRenderLayer } from './BaseRenderLayer';\nimport { CharData } from '../Types';\n\ninterface CursorState {\n  x: number;\n  y: number;\n  isFocused: boolean;\n  style: string;\n  width: number;\n}\n\n/**\n * The time between cursor blinks.\n */\nconst BLINK_INTERVAL = 600;\n\nexport class CursorRenderLayer extends BaseRenderLayer {\n  private _state: CursorState;\n  private _cursorRenderers: {[key: string]: (terminal: ITerminal, x: number, y: number, charData: CharData) => void};\n  private _cursorBlinkStateManager: CursorBlinkStateManager;\n  private _isFocused: boolean;\n\n  constructor(container: HTMLElement, zIndex: number, colors: IColorSet) {\n    super(container, 'cursor', zIndex, true, colors);\n    this._state = {\n      x: null,\n      y: null,\n      isFocused: null,\n      style: null,\n      width: null,\n    };\n    this._cursorRenderers = {\n      'bar': this._renderBarCursor.bind(this),\n      'block': this._renderBlockCursor.bind(this),\n      'underline': this._renderUnderlineCursor.bind(this)\n    };\n    // TODO: Consider initial options? Maybe onOptionsChanged should be called at the end of open?\n  }\n\n  public resize(terminal: ITerminal, dim: IRenderDimensions, charSizeChanged: boolean): void {\n    super.resize(terminal, dim, charSizeChanged);\n    // Resizing the canvas discards the contents of the canvas so clear state\n    this._state = {\n      x: null,\n      y: null,\n      isFocused: null,\n      style: null,\n      width: null,\n    };\n  }\n\n  public reset(terminal: ITerminal): void {\n    this._clearCursor();\n    if (this._cursorBlinkStateManager) {\n      this._cursorBlinkStateManager.dispose();\n      this._cursorBlinkStateManager = null;\n      this.onOptionsChanged(terminal);\n    }\n  }\n\n  public onBlur(terminal: ITerminal): void {\n    if (this._cursorBlinkStateManager) {\n      this._cursorBlinkStateManager.pause();\n    }\n    terminal.refresh(terminal.buffer.y, terminal.buffer.y);\n  }\n\n  public onFocus(terminal: ITerminal): void {\n    if (this._cursorBlinkStateManager) {\n      this._cursorBlinkStateManager.resume(terminal);\n    } else {\n      terminal.refresh(terminal.buffer.y, terminal.buffer.y);\n    }\n  }\n\n  public onOptionsChanged(terminal: ITerminal): void {\n    if (terminal.options.cursorBlink) {\n      if (!this._cursorBlinkStateManager) {\n        this._cursorBlinkStateManager = new CursorBlinkStateManager(terminal, () => {\n          this._render(terminal, true);\n        });\n      }\n    } else {\n      if (this._cursorBlinkStateManager) {\n        this._cursorBlinkStateManager.dispose();\n        this._cursorBlinkStateManager = null;\n      }\n      // Request a refresh from the terminal as management of rendering is being\n      // moved back to the terminal\n      terminal.refresh(terminal.buffer.y, terminal.buffer.y);\n    }\n  }\n\n  public onCursorMove(terminal: ITerminal): void {\n    if (this._cursorBlinkStateManager) {\n      this._cursorBlinkStateManager.restartBlinkAnimation(terminal);\n    }\n  }\n\n  public onGridChanged(terminal: ITerminal, startRow: number, endRow: number): void {\n    // Only render if the animation frame is not active\n    if (!this._cursorBlinkStateManager || this._cursorBlinkStateManager.isPaused) {\n      this._render(terminal, false);\n    }\n  }\n\n  private _render(terminal: ITerminal, triggeredByAnimationFrame: boolean): void {\n    // Don't draw the cursor if it's hidden\n    if (!terminal.cursorState || terminal.cursorHidden) {\n      this._clearCursor();\n      return;\n    }\n\n    const cursorY = terminal.buffer.ybase + terminal.buffer.y;\n    const viewportRelativeCursorY = cursorY - terminal.buffer.ydisp;\n\n    // Don't draw the cursor if it's off-screen\n    if (viewportRelativeCursorY < 0 || viewportRelativeCursorY >= terminal.rows) {\n      this._clearCursor();\n      return;\n    }\n\n    const charData = terminal.buffer.lines.get(cursorY)[terminal.buffer.x];\n    if (!charData) {\n      return;\n    }\n\n    if (!terminal.isFocused) {\n      this._clearCursor();\n      this._ctx.save();\n      this._ctx.fillStyle = this._colors.cursor;\n      this._renderBlurCursor(terminal, terminal.buffer.x, viewportRelativeCursorY, charData);\n      this._ctx.restore();\n      this._state.x = terminal.buffer.x;\n      this._state.y = viewportRelativeCursorY;\n      this._state.isFocused = false;\n      this._state.style = terminal.options.cursorStyle;\n      this._state.width = charData[CHAR_DATA_WIDTH_INDEX];\n      return;\n    }\n\n    // Don't draw the cursor if it's blinking\n    if (this._cursorBlinkStateManager && !this._cursorBlinkStateManager.isCursorVisible) {\n      this._clearCursor();\n      return;\n    }\n\n    if (this._state) {\n      // The cursor is already in the correct spot, don't redraw\n      if (this._state.x === terminal.buffer.x &&\n          this._state.y === viewportRelativeCursorY &&\n          this._state.isFocused === terminal.isFocused &&\n          this._state.style === terminal.options.cursorStyle &&\n          this._state.width === charData[CHAR_DATA_WIDTH_INDEX]) {\n        return;\n      }\n      this._clearCursor();\n    }\n\n    this._ctx.save();\n    this._cursorRenderers[terminal.options.cursorStyle || 'block'](terminal, terminal.buffer.x, viewportRelativeCursorY, charData);\n    this._ctx.restore();\n\n    this._state.x = terminal.buffer.x;\n    this._state.y = viewportRelativeCursorY;\n    this._state.isFocused = false;\n    this._state.style = terminal.options.cursorStyle;\n    this._state.width = charData[CHAR_DATA_WIDTH_INDEX];\n  }\n\n  private _clearCursor(): void {\n    if (this._state) {\n      this.clearCells(this._state.x, this._state.y, this._state.width, 1);\n      this._state = {\n        x: null,\n        y: null,\n        isFocused: null,\n        style: null,\n        width: null,\n      };\n    }\n  }\n\n  private _renderBarCursor(terminal: ITerminal, x: number, y: number, charData: CharData): void {\n    this._ctx.save();\n    this._ctx.fillStyle = this._colors.cursor;\n    this.fillLeftLineAtCell(x, y);\n    this._ctx.restore();\n  }\n\n  private _renderBlockCursor(terminal: ITerminal, x: number, y: number, charData: CharData): void {\n    this._ctx.save();\n    this._ctx.fillStyle = this._colors.cursor;\n    this.fillCells(x, y, charData[CHAR_DATA_WIDTH_INDEX], 1);\n    this._ctx.fillStyle = this._colors.cursorAccent;\n    this.fillCharTrueColor(terminal, charData, x, y);\n    this._ctx.restore();\n  }\n\n  private _renderUnderlineCursor(terminal: ITerminal, x: number, y: number, charData: CharData): void {\n    this._ctx.save();\n    this._ctx.fillStyle = this._colors.cursor;\n    this.fillBottomLineAtCells(x, y);\n    this._ctx.restore();\n  }\n\n  private _renderBlurCursor(terminal: ITerminal, x: number, y: number, charData: CharData): void {\n    this._ctx.save();\n    this._ctx.strokeStyle = this._colors.cursor;\n    this.strokeRectAtCell(x, y, charData[CHAR_DATA_WIDTH_INDEX], 1);\n    this._ctx.restore();\n  }\n}\n\nclass CursorBlinkStateManager {\n  public isCursorVisible: boolean;\n\n  private _animationFrame: number;\n  private _blinkStartTimeout: number;\n  private _blinkInterval: number;\n\n  /**\n   * The time at which the animation frame was restarted, this is used on the\n   * next render to restart the timers so they don't need to restart the timers\n   * multiple times over a short period.\n   */\n  private _animationTimeRestarted: number;\n\n  constructor(\n    terminal: ITerminal,\n    private renderCallback: () => void\n  ) {\n    this.isCursorVisible = true;\n    if (terminal.isFocused) {\n      this._restartInterval();\n    }\n  }\n\n  public get isPaused(): boolean { return !(this._blinkStartTimeout || this._blinkInterval); }\n\n  public dispose(): void {\n    if (this._blinkInterval) {\n      window.clearInterval(this._blinkInterval);\n      this._blinkInterval = null;\n    }\n    if (this._blinkStartTimeout) {\n      window.clearTimeout(this._blinkStartTimeout);\n      this._blinkStartTimeout = null;\n    }\n    if (this._animationFrame) {\n      window.cancelAnimationFrame(this._animationFrame);\n      this._animationFrame = null;\n    }\n  }\n\n  public restartBlinkAnimation(terminal: ITerminal): void {\n    if (this.isPaused) {\n      return;\n    }\n    // Save a timestamp so that the restart can be done on the next interval\n    this._animationTimeRestarted = Date.now();\n    // Force a cursor render to ensure it's visible and in the correct position\n    this.isCursorVisible = true;\n    if (!this._animationFrame) {\n      this._animationFrame = window.requestAnimationFrame(() => {\n        this.renderCallback();\n        this._animationFrame = null;\n      });\n    }\n  }\n\n  private _restartInterval(timeToStart: number = BLINK_INTERVAL): void {\n    // Clear any existing interval\n    if (this._blinkInterval) {\n      window.clearInterval(this._blinkInterval);\n    }\n\n    // Setup the initial timeout which will hide the cursor, this is done before\n    // the regular interval is setup in order to support restarting the blink\n    // animation in a lightweight way (without thrashing clearInterval and\n    // setInterval).\n    this._blinkStartTimeout = <number><any>setTimeout(() => {\n      // Check if another animation restart was requested while this was being\n      // started\n      if (this._animationTimeRestarted) {\n        const time = BLINK_INTERVAL - (Date.now() - this._animationTimeRestarted);\n        this._animationTimeRestarted = null;\n        if (time > 0) {\n          this._restartInterval(time);\n          return;\n        }\n      }\n\n      // Hide the cursor\n      this.isCursorVisible = false;\n      this._animationFrame = window.requestAnimationFrame(() => {\n        this.renderCallback();\n        this._animationFrame = null;\n      });\n\n      // Setup the blink interval\n      this._blinkInterval = <number><any>setInterval(() => {\n        // Adjust the animation time if it was restarted\n        if (this._animationTimeRestarted) {\n          // calc time diff\n          // Make restart interval do a setTimeout initially?\n          const time = BLINK_INTERVAL - (Date.now() - this._animationTimeRestarted);\n          this._animationTimeRestarted = null;\n          this._restartInterval(time);\n          return;\n        }\n\n        // Invert visibility and render\n        this.isCursorVisible = !this.isCursorVisible;\n        this._animationFrame = window.requestAnimationFrame(() => {\n          this.renderCallback();\n          this._animationFrame = null;\n        });\n      }, BLINK_INTERVAL);\n    }, timeToStart);\n  }\n\n  public pause(): void {\n    this.isCursorVisible = true;\n    if (this._blinkInterval) {\n      window.clearInterval(this._blinkInterval);\n      this._blinkInterval = null;\n    }\n    if (this._blinkStartTimeout) {\n      window.clearTimeout(this._blinkStartTimeout);\n      this._blinkStartTimeout = null;\n    }\n    if (this._animationFrame) {\n      window.cancelAnimationFrame(this._animationFrame);\n      this._animationFrame = null;\n    }\n  }\n\n  public resume(terminal: ITerminal): void {\n    this._animationTimeRestarted = null;\n    this._restartInterval();\n    this.restartBlinkAnimation(terminal);\n  }\n}\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IColorSet, IColorManager } from './Interfaces';\nimport { ITheme } from '../Interfaces';\n\nconst DEFAULT_FOREGROUND = '#ffffff';\nconst DEFAULT_BACKGROUND = '#000000';\nconst DEFAULT_CURSOR = '#ffffff';\nconst DEFAULT_CURSOR_ACCENT = '#000000';\nconst DEFAULT_SELECTION = 'rgba(255, 255, 255, 0.3)';\nexport const DEFAULT_ANSI_COLORS = [\n  // dark:\n  '#2e3436',\n  '#cc0000',\n  '#4e9a06',\n  '#c4a000',\n  '#3465a4',\n  '#75507b',\n  '#06989a',\n  '#d3d7cf',\n  // bright:\n  '#555753',\n  '#ef2929',\n  '#8ae234',\n  '#fce94f',\n  '#729fcf',\n  '#ad7fa8',\n  '#34e2e2',\n  '#eeeeec'\n];\n\n/**\n * Fills an existing 16 length string with the remaining 240 ANSI colors.\n * @param first16Colors The first 16 ANSI colors.\n */\nfunction generate256Colors(first16Colors: string[]): string[] {\n  let colors = first16Colors.slice();\n\n  // Generate colors (16-231)\n  let v = [0x00, 0x5f, 0x87, 0xaf, 0xd7, 0xff];\n  for (let i = 0; i < 216; i++) {\n    const r = toPaddedHex(v[(i / 36) % 6 | 0]);\n    const g = toPaddedHex(v[(i / 6) % 6 | 0]);\n    const b = toPaddedHex(v[i % 6]);\n    colors.push(`#${r}${g}${b}`);\n  }\n\n  // Generate greys (232-255)\n  for (let i = 0; i < 24; i++) {\n    const c = toPaddedHex(8 + i * 10);\n    colors.push(`#${c}${c}${c}`);\n  }\n\n  return colors;\n}\n\nfunction toPaddedHex(c: number): string {\n  let s = c.toString(16);\n  return s.length < 2 ? '0' + s : s;\n}\n\n/**\n * Manages the source of truth for a terminal's colors.\n */\nexport class ColorManager implements IColorManager {\n  public colors: IColorSet;\n\n  constructor() {\n    this.colors = {\n      foreground: DEFAULT_FOREGROUND,\n      background: DEFAULT_BACKGROUND,\n      cursor: DEFAULT_CURSOR,\n      cursorAccent: DEFAULT_CURSOR_ACCENT,\n      selection: DEFAULT_SELECTION,\n      ansi: generate256Colors(DEFAULT_ANSI_COLORS)\n    };\n  }\n\n  /**\n   * Sets the terminal's theme.\n   * @param theme The  theme to use. If a partial theme is provided then default\n   * colors will be used where colors are not defined.\n   */\n  public setTheme(theme: ITheme): void {\n    this.colors.foreground = theme.foreground || DEFAULT_FOREGROUND;\n    this.colors.background = this._validateColor(theme.background, DEFAULT_BACKGROUND);\n    this.colors.cursor = theme.cursor || DEFAULT_CURSOR;\n    this.colors.cursorAccent = theme.cursorAccent || DEFAULT_CURSOR_ACCENT;\n    this.colors.selection = theme.selection || DEFAULT_SELECTION;\n    this.colors.ansi[0] = theme.black || DEFAULT_ANSI_COLORS[0];\n    this.colors.ansi[1] = theme.red || DEFAULT_ANSI_COLORS[1];\n    this.colors.ansi[2] = theme.green || DEFAULT_ANSI_COLORS[2];\n    this.colors.ansi[3] = theme.yellow || DEFAULT_ANSI_COLORS[3];\n    this.colors.ansi[4] = theme.blue || DEFAULT_ANSI_COLORS[4];\n    this.colors.ansi[5] = theme.magenta || DEFAULT_ANSI_COLORS[5];\n    this.colors.ansi[6] = theme.cyan || DEFAULT_ANSI_COLORS[6];\n    this.colors.ansi[7] = theme.white || DEFAULT_ANSI_COLORS[7];\n    this.colors.ansi[8] = theme.brightBlack || DEFAULT_ANSI_COLORS[8];\n    this.colors.ansi[9] = theme.brightRed || DEFAULT_ANSI_COLORS[9];\n    this.colors.ansi[10] = theme.brightGreen || DEFAULT_ANSI_COLORS[10];\n    this.colors.ansi[11] = theme.brightYellow || DEFAULT_ANSI_COLORS[11];\n    this.colors.ansi[12] = theme.brightBlue || DEFAULT_ANSI_COLORS[12];\n    this.colors.ansi[13] = theme.brightMagenta || DEFAULT_ANSI_COLORS[13];\n    this.colors.ansi[14] = theme.brightCyan || DEFAULT_ANSI_COLORS[14];\n    this.colors.ansi[15] = theme.brightWhite || DEFAULT_ANSI_COLORS[15];\n  }\n\n  private _validateColor(color: string, fallback: string): string {\n    if (!color) {\n      return fallback;\n    }\n    if (color.length === 7 && color.charAt(0) === '#') {\n      return color;\n    }\n    if (color.length === 4 && color.charAt(0) === '#') {\n      const r = color.charAt(1);\n      const g = color.charAt(2);\n      const b = color.charAt(3);\n      return `#${r}${r}${g}${g}${b}${b}`;\n    }\n    return fallback;\n  }\n}\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { ITerminal, ITheme } from '../Interfaces';\nimport { IColorSet } from '../renderer/Interfaces';\nimport { isFirefox } from '../utils/Browser';\n\nexport const CHAR_ATLAS_CELL_SPACING = 1;\n\ninterface ICharAtlasConfig {\n  fontSize: number;\n  fontFamily: string;\n  scaledCharWidth: number;\n  scaledCharHeight: number;\n  colors: IColorSet;\n}\n\ninterface ICharAtlasCacheEntry {\n  bitmap: HTMLCanvasElement | Promise<ImageBitmap>;\n  config: ICharAtlasConfig;\n  ownedBy: ITerminal[];\n}\n\nlet charAtlasCache: ICharAtlasCacheEntry[] = [];\n\n/**\n * Acquires a char atlas, either generating a new one or returning an existing\n * one that is in use by another terminal.\n * @param terminal The terminal.\n * @param colors The colors to use.\n */\nexport function acquireCharAtlas(terminal: ITerminal, colors: IColorSet, scaledCharWidth: number, scaledCharHeight: number): HTMLCanvasElement | Promise<ImageBitmap> {\n  const newConfig = generateConfig(scaledCharWidth, scaledCharHeight, terminal, colors);\n\n  // Check to see if the terminal already owns this config\n  for (let i = 0; i < charAtlasCache.length; i++) {\n    const entry = charAtlasCache[i];\n    const ownedByIndex = entry.ownedBy.indexOf(terminal);\n    if (ownedByIndex >= 0) {\n      if (configEquals(entry.config, newConfig)) {\n        return entry.bitmap;\n      } else {\n        // The configs differ, release the terminal from the entry\n        if (entry.ownedBy.length === 1) {\n          charAtlasCache.splice(i, 1);\n        } else {\n          entry.ownedBy.splice(ownedByIndex, 1);\n        }\n        break;\n      }\n    }\n  }\n\n  // Try match a char atlas from the cache\n  for (let i = 0; i < charAtlasCache.length; i++) {\n    const entry = charAtlasCache[i];\n    if (configEquals(entry.config, newConfig)) {\n      // Add the terminal to the cache entry and return\n      entry.ownedBy.push(terminal);\n      return entry.bitmap;\n    }\n  }\n\n  const newEntry: ICharAtlasCacheEntry = {\n    bitmap: generator.generate(scaledCharWidth, scaledCharHeight, terminal.options.fontSize, terminal.options.fontFamily, colors.background, colors.foreground, colors.ansi),\n    config: newConfig,\n    ownedBy: [terminal]\n  };\n  charAtlasCache.push(newEntry);\n  return newEntry.bitmap;\n}\n\nfunction generateConfig(scaledCharWidth: number, scaledCharHeight: number, terminal: ITerminal, colors: IColorSet): ICharAtlasConfig {\n  const clonedColors = {\n    foreground: colors.foreground,\n    background: colors.background,\n    cursor: null,\n    cursorAccent: null,\n    selection: null,\n    ansi: colors.ansi.slice(0, 16)\n  };\n  return {\n    scaledCharWidth,\n    scaledCharHeight,\n    fontFamily: terminal.options.fontFamily,\n    fontSize: terminal.options.fontSize,\n    colors: clonedColors\n  };\n}\n\nfunction configEquals(a: ICharAtlasConfig, b: ICharAtlasConfig): boolean {\n  for (let i = 0; i < a.colors.ansi.length; i++) {\n    if (a.colors.ansi[i] !== b.colors.ansi[i]) {\n      return false;\n    }\n  }\n  return a.fontFamily === b.fontFamily &&\n      a.fontSize === b.fontSize &&\n      a.scaledCharWidth === b.scaledCharWidth &&\n      a.scaledCharHeight === b.scaledCharHeight &&\n      a.colors.foreground === b.colors.foreground &&\n      a.colors.background === b.colors.background;\n}\n\nlet generator: CharAtlasGenerator;\n\n/**\n * Initializes the char atlas generator.\n * @param document The document.\n */\nexport function initialize(document: Document): void {\n  if (!generator) {\n    generator = new CharAtlasGenerator(document);\n  }\n}\n\nclass CharAtlasGenerator {\n  private _canvas: HTMLCanvasElement;\n  private _ctx: CanvasRenderingContext2D;\n\n  constructor(private _document: Document) {\n    this._canvas = this._document.createElement('canvas');\n    this._ctx = this._canvas.getContext('2d', {alpha: false});\n    this._ctx.scale(window.devicePixelRatio, window.devicePixelRatio);\n  }\n\n  public generate(scaledCharWidth: number, scaledCharHeight: number, fontSize: number, fontFamily: string, background: string, foreground: string, ansiColors: string[]): HTMLCanvasElement | Promise<ImageBitmap> {\n    const cellWidth = scaledCharWidth + CHAR_ATLAS_CELL_SPACING;\n    const cellHeight = scaledCharHeight + CHAR_ATLAS_CELL_SPACING;\n    this._canvas.width = 255 * cellWidth;\n    this._canvas.height = (/*default+default bold*/2 + /*0-15*/16) * cellHeight;\n\n    this._ctx.fillStyle = background;\n    this._ctx.fillRect(0, 0, this._canvas.width, this._canvas.height);\n\n    this._ctx.save();\n    this._ctx.fillStyle = foreground;\n    this._ctx.font = `${fontSize * window.devicePixelRatio}px ${fontFamily}`;\n    this._ctx.textBaseline = 'top';\n\n    // Default color\n    for (let i = 0; i < 256; i++) {\n      this._ctx.save();\n      this._ctx.beginPath();\n      this._ctx.rect(i * cellWidth, 0, cellWidth, cellHeight);\n      this._ctx.clip();\n      this._ctx.fillText(String.fromCharCode(i), i * cellWidth, 0);\n      this._ctx.restore();\n    }\n    // Default color bold\n    this._ctx.save();\n    this._ctx.font = `bold ${this._ctx.font}`;\n    for (let i = 0; i < 256; i++) {\n      this._ctx.save();\n      this._ctx.beginPath();\n      this._ctx.rect(i * cellWidth, cellHeight, cellWidth, cellHeight);\n      this._ctx.clip();\n      this._ctx.fillText(String.fromCharCode(i), i * cellWidth, cellHeight);\n      this._ctx.restore();\n    }\n    this._ctx.restore();\n\n    // Colors 0-15\n    this._ctx.font = `${fontSize * window.devicePixelRatio}px ${fontFamily}`;\n    for (let colorIndex = 0; colorIndex < 16; colorIndex++) {\n      // colors 8-15 are bold\n      if (colorIndex === 8) {\n        this._ctx.font = `bold ${this._ctx.font}`;\n      }\n      const y = (colorIndex + 2) * cellHeight;\n      // Draw ascii characters\n      for (let i = 0; i < 256; i++) {\n        this._ctx.save();\n        this._ctx.beginPath();\n        this._ctx.rect(i * cellWidth, y, cellWidth, cellHeight);\n        this._ctx.clip();\n        this._ctx.fillStyle = ansiColors[colorIndex];\n        this._ctx.fillText(String.fromCharCode(i), i * cellWidth, y);\n        this._ctx.restore();\n      }\n    }\n    this._ctx.restore();\n\n    // Support is patchy for createImageBitmap at the moment, pass a canvas back\n    // if support is lacking as drawImage works there too. Firefox is also\n    // included here as ImageBitmap appears both buggy and has horrible\n    // performance (tested on v55).\n    if (!('createImageBitmap' in window) || isFirefox) {\n      // Regenerate canvas and context as they are now owned by the char atlas\n      const result = this._canvas;\n      this._canvas = this._document.createElement('canvas');\n      this._ctx = this._canvas.getContext('2d');\n      this._ctx.scale(window.devicePixelRatio, window.devicePixelRatio);\n      return result;\n    }\n\n    const charAtlasImageData = this._ctx.getImageData(0, 0, this._canvas.width, this._canvas.height);\n\n    // Remove the background color from the image so characters may overlap\n    const r = parseInt(background.substr(1, 2), 16);\n    const g = parseInt(background.substr(3, 2), 16);\n    const b = parseInt(background.substr(5, 2), 16);\n    this._clearColor(charAtlasImageData, r, g, b);\n\n    const promise = window.createImageBitmap(charAtlasImageData);\n    // Clear the rect while the promise is in progress\n    this._ctx.clearRect(0, 0, this._canvas.width, this._canvas.height);\n    return promise;\n  }\n\n  private _clearColor(imageData: ImageData, r: number, g: number, b: number): void {\n    for (let offset = 0; offset < imageData.data.length; offset += 4) {\n      if (imageData.data[offset] === r &&\n          imageData.data[offset + 1] === g &&\n          imageData.data[offset + 2] === b) {\n        imageData.data[offset + 3] = 0;\n      }\n    }\n  }\n}\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IRenderLayer, IColorSet, IRenderDimensions } from './Interfaces';\nimport { ITerminal, ITerminalOptions } from '../Interfaces';\nimport { acquireCharAtlas, CHAR_ATLAS_CELL_SPACING } from './CharAtlas';\nimport { CharData } from '../Types';\nimport { CHAR_DATA_WIDTH_INDEX, CHAR_DATA_CHAR_INDEX } from '../Buffer';\n\nexport const INVERTED_DEFAULT_COLOR = -1;\nconst DIM_OPACITY = 0.5;\n\nexport abstract class BaseRenderLayer implements IRenderLayer {\n  private _canvas: HTMLCanvasElement;\n  protected _ctx: CanvasRenderingContext2D;\n  private _scaledCharWidth: number = 0;\n  private _scaledCharHeight: number = 0;\n  private _scaledCellWidth: number = 0;\n  private _scaledCellHeight: number = 0;\n  private _scaledCharLeft: number = 0;\n  private _scaledCharTop: number = 0;\n\n  private _charAtlas: HTMLCanvasElement | ImageBitmap;\n\n  constructor(\n    container: HTMLElement,\n    id: string,\n    zIndex: number,\n    private _alpha: boolean,\n    protected _colors: IColorSet\n  ) {\n    this._canvas = document.createElement('canvas');\n    this._canvas.id = `xterm-${id}-layer`;\n    this._canvas.style.zIndex = zIndex.toString();\n    this._ctx = this._canvas.getContext('2d', {alpha: _alpha});\n    this._ctx.scale(window.devicePixelRatio, window.devicePixelRatio);\n    // Draw the background if this is an opaque layer\n    if (!_alpha) {\n      this.clearAll();\n    }\n    container.appendChild(this._canvas);\n  }\n\n  public onOptionsChanged(terminal: ITerminal): void {}\n  public onBlur(terminal: ITerminal): void {}\n  public onFocus(terminal: ITerminal): void {}\n  public onCursorMove(terminal: ITerminal): void {}\n  public onGridChanged(terminal: ITerminal, startRow: number, endRow: number): void {}\n  public onSelectionChanged(terminal: ITerminal, start: [number, number], end: [number, number]): void {}\n\n  public onThemeChanged(terminal: ITerminal, colorSet: IColorSet): void {\n    this._refreshCharAtlas(terminal, colorSet);\n  }\n\n  /**\n   * Refreshes the char atlas, aquiring a new one if necessary.\n   * @param terminal The terminal.\n   * @param colorSet The color set to use for the char atlas.\n   */\n  private _refreshCharAtlas(terminal: ITerminal, colorSet: IColorSet): void {\n    if (this._scaledCharWidth <= 0 && this._scaledCharHeight <= 0) {\n      return;\n    }\n    this._charAtlas = null;\n    const result = acquireCharAtlas(terminal, this._colors, this._scaledCharWidth, this._scaledCharHeight);\n    if (result instanceof HTMLCanvasElement) {\n      this._charAtlas = result;\n    } else {\n      result.then(bitmap => this._charAtlas = bitmap);\n    }\n  }\n\n  public resize(terminal: ITerminal, dim: IRenderDimensions, charSizeChanged: boolean): void {\n    this._scaledCellWidth = dim.scaledCellWidth;\n    this._scaledCellHeight = dim.scaledCellHeight;\n    this._scaledCharWidth = dim.scaledCharWidth;\n    this._scaledCharHeight = dim.scaledCharHeight;\n    this._scaledCharLeft = dim.scaledCharLeft;\n    this._scaledCharTop = dim.scaledCharTop;\n    this._canvas.width = dim.scaledCanvasWidth;\n    this._canvas.height = dim.scaledCanvasHeight;\n    this._canvas.style.width = `${dim.canvasWidth}px`;\n    this._canvas.style.height = `${dim.canvasHeight}px`;\n\n    // Draw the background if this is an opaque layer\n    if (!this._alpha) {\n      this.clearAll();\n    }\n\n    if (charSizeChanged) {\n      this._refreshCharAtlas(terminal, this._colors);\n    }\n  }\n\n  public abstract reset(terminal: ITerminal): void;\n\n  /**\n   * Fills 1+ cells completely. This uses the existing fillStyle on the context.\n   * @param x The column to start at.\n   * @param y The row to start at\n   * @param width The number of columns to fill.\n   * @param height The number of rows to fill.\n   */\n  protected fillCells(x: number, y: number, width: number, height: number): void {\n    this._ctx.fillRect(\n        x * this._scaledCellWidth,\n        y * this._scaledCellHeight,\n        width * this._scaledCellWidth,\n        height * this._scaledCellHeight);\n  }\n\n  /**\n   * Fills a 1px line (2px on HDPI) at the bottom of the cell. This uses the\n   * existing fillStyle on the context.\n   * @param x The column to fill.\n   * @param y The row to fill.\n   */\n  protected fillBottomLineAtCells(x: number, y: number, width: number = 1): void {\n    this._ctx.fillRect(\n        x * this._scaledCellWidth,\n        (y + 1) * this._scaledCellHeight - window.devicePixelRatio - 1 /* Ensure it's drawn within the cell */,\n        width * this._scaledCellWidth,\n        window.devicePixelRatio);\n  }\n\n  /**\n   * Fills a 1px line (2px on HDPI) at the left of the cell. This uses the\n   * existing fillStyle on the context.\n   * @param x The column to fill.\n   * @param y The row to fill.\n   */\n  protected fillLeftLineAtCell(x: number, y: number): void {\n    this._ctx.fillRect(\n        x * this._scaledCellWidth,\n        y * this._scaledCellHeight,\n        window.devicePixelRatio,\n        this._scaledCellHeight);\n  }\n\n  /**\n   * Strokes a 1px rectangle (2px on HDPI) around a cell. This uses the existing\n   * strokeStyle on the context.\n   * @param x The column to fill.\n   * @param y The row to fill.\n   */\n  protected strokeRectAtCell(x: number, y: number, width: number, height: number): void {\n    this._ctx.lineWidth = window.devicePixelRatio;\n    this._ctx.strokeRect(\n        x * this._scaledCellWidth + window.devicePixelRatio / 2,\n        y * this._scaledCellHeight + (window.devicePixelRatio / 2),\n        width * this._scaledCellWidth - window.devicePixelRatio,\n        (height * this._scaledCellHeight) - window.devicePixelRatio);\n  }\n\n  /**\n   * Clears the entire canvas.\n   */\n  protected clearAll(): void {\n    if (this._alpha) {\n      this._ctx.clearRect(0, 0, this._canvas.width, this._canvas.height);\n    } else {\n      this._ctx.fillStyle = this._colors.background;\n      this._ctx.fillRect(0, 0, this._canvas.width, this._canvas.height);\n    }\n  }\n\n  /**\n   * Clears 1+ cells completely.\n   * @param x The column to start at.\n   * @param y The row to start at.\n   * @param width The number of columns to clear.\n   * @param height The number of rows to clear.\n   */\n  protected clearCells(x: number, y: number, width: number, height: number): void {\n    if (this._alpha) {\n      this._ctx.clearRect(\n          x * this._scaledCellWidth,\n          y * this._scaledCellHeight,\n          width * this._scaledCellWidth,\n          height * this._scaledCellHeight);\n    } else {\n      this._ctx.fillStyle = this._colors.background;\n      this._ctx.fillRect(\n          x * this._scaledCellWidth,\n          y * this._scaledCellHeight,\n          width * this._scaledCellWidth,\n          height * this._scaledCellHeight);\n    }\n  }\n\n  /**\n   * Draws a truecolor character at the cell. The character will be clipped to\n   * ensure that it fits with the cell, including the cell to the right if it's\n   * a wide character. This uses the existing fillStyle on the context.\n   * @param terminal The terminal.\n   * @param charData The char data for the character to draw.\n   * @param x The column to draw at.\n   * @param y The row to draw at.\n   * @param color The color of the character.\n   */\n  protected fillCharTrueColor(terminal: ITerminal, charData: CharData, x: number, y: number): void {\n    this._ctx.font = `${terminal.options.fontSize * window.devicePixelRatio}px ${terminal.options.fontFamily}`;\n    this._ctx.textBaseline = 'top';\n    this._clipRow(terminal, y);\n    this._ctx.fillText(\n        charData[CHAR_DATA_CHAR_INDEX],\n        x * this._scaledCellWidth + this._scaledCharLeft,\n        y * this._scaledCellHeight + this._scaledCharTop);\n  }\n\n  /**\n   * Draws a character at a cell. If possible this will draw using the character\n   * atlas to reduce draw time.\n   * @param terminal The terminal.\n   * @param char The character.\n   * @param code The character code.\n   * @param width The width of the character.\n   * @param x The column to draw at.\n   * @param y The row to draw at.\n   * @param fg The foreground color, in the format stored within the attributes.\n   * @param bg The background color, in the format stored within the attributes.\n   * This is used to validate whether a cached image can be used.\n   * @param bold Whether the text is bold.\n   */\n  protected drawChar(terminal: ITerminal, char: string, code: number, width: number, x: number, y: number, fg: number, bg: number, bold: boolean, dim: boolean): void {\n    let colorIndex = 0;\n    if (fg < 256) {\n      colorIndex = fg + 2;\n    } else {\n      // If default color and bold\n      if (bold && terminal.options.enableBold) {\n        colorIndex = 1;\n      }\n    }\n    const isAscii = code < 256;\n    // A color is basic if it is one of the standard normal or bold weight\n    // colors of the characters held in the char atlas. Note that this excludes\n    // the normal weight _light_ color characters.\n    const isBasicColor = (colorIndex > 1 && fg < 16) && (fg < 8 || bold);\n    const isDefaultColor = fg >= 256;\n    const isDefaultBackground = bg >= 256;\n    if (this._charAtlas && isAscii && (isBasicColor || isDefaultColor) && isDefaultBackground) {\n      // ImageBitmap's draw about twice as fast as from a canvas\n      const charAtlasCellWidth = this._scaledCharWidth + CHAR_ATLAS_CELL_SPACING;\n      const charAtlasCellHeight = this._scaledCharHeight + CHAR_ATLAS_CELL_SPACING;\n\n      // Apply alpha to dim the character\n      if (dim) {\n        this._ctx.globalAlpha = DIM_OPACITY;\n      }\n\n      // Draw the non-bold version of the same color if bold is not enabled\n      if (bold && !terminal.options.enableBold) {\n        // Ignore default color as it's not touched above\n        if (colorIndex > 1) {\n          colorIndex -= 8;\n        }\n      }\n\n      this._ctx.drawImage(this._charAtlas,\n          code * charAtlasCellWidth,\n          colorIndex * charAtlasCellHeight,\n          charAtlasCellWidth,\n          this._scaledCharHeight,\n          x * this._scaledCellWidth + this._scaledCharLeft,\n          y * this._scaledCellHeight + this._scaledCharTop,\n          charAtlasCellWidth,\n          this._scaledCharHeight);\n    } else {\n      this._drawUncachedChar(terminal, char, width, fg, x, y, bold, dim);\n    }\n    // This draws the atlas (for debugging purposes)\n    // this._ctx.clearRect(0, 0, this._canvas.width, this._canvas.height);\n    // this._ctx.drawImage(this._charAtlas, 0, 0);\n  }\n\n  /**\n   * Draws a character at a cell. The character will be clipped to\n   * ensure that it fits with the cell, including the cell to the right if it's\n   * a wide character.\n   * @param terminal The terminal.\n   * @param char The character.\n   * @param width The width of the character.\n   * @param fg The foreground color, in the format stored within the attributes.\n   * @param x The column to draw at.\n   * @param y The row to draw at.\n   */\n  private _drawUncachedChar(terminal: ITerminal, char: string, width: number, fg: number, x: number, y: number, bold: boolean, dim: boolean): void {\n    this._ctx.save();\n    this._ctx.font = `${terminal.options.fontSize * window.devicePixelRatio}px ${terminal.options.fontFamily}`;\n    if (bold && terminal.options.enableBold) {\n      this._ctx.font = `bold ${this._ctx.font}`;\n    }\n    this._ctx.textBaseline = 'top';\n\n    if (fg === INVERTED_DEFAULT_COLOR) {\n      this._ctx.fillStyle = this._colors.background;\n    } else if (fg < 256) {\n      // 256 color support\n      this._ctx.fillStyle = this._colors.ansi[fg];\n    } else {\n      this._ctx.fillStyle = this._colors.foreground;\n    }\n\n    this._clipRow(terminal, y);\n\n    // Apply alpha to dim the character\n    if (dim) {\n      this._ctx.globalAlpha = DIM_OPACITY;\n    }\n    // Draw the character\n    this._ctx.fillText(\n        char,\n        x * this._scaledCellWidth + this._scaledCharLeft,\n        y * this._scaledCellHeight + this._scaledCharTop);\n    this._ctx.restore();\n  }\n\n  /**\n   * Clips a row to ensure no pixels will be drawn outside the cells in the row.\n   * @param terminal The terminal.\n   * @param y The row to clip.\n   */\n  private _clipRow(terminal: ITerminal, y: number): void {\n    this._ctx.beginPath();\n    this._ctx.rect(\n        0,\n        y * this._scaledCellHeight,\n        terminal.cols * this._scaledCellWidth,\n        this._scaledCellHeight);\n    this._ctx.clip();\n  }\n}\n\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IMouseZoneManager, IMouseZone } from './Interfaces';\nimport { ITerminal } from '../Interfaces';\n\nconst HOVER_DURATION = 500;\n\n/**\n * The MouseZoneManager allows components to register zones within the terminal\n * that trigger hover and click callbacks.\n *\n * This class was intentionally made not so robust initially as the only case it\n * needed to support was single-line links which never overlap. Improvements can\n * be made in the future.\n */\nexport class MouseZoneManager implements IMouseZoneManager {\n  private _zones: IMouseZone[] = [];\n\n  private _areZonesActive: boolean = false;\n  private _mouseMoveListener: (e: MouseEvent) => any;\n  private _clickListener: (e: MouseEvent) => any;\n\n  private _tooltipTimeout: number = null;\n  private _currentZone: IMouseZone = null;\n  private _lastHoverCoords: [number, number] = [null, null];\n\n  constructor(\n    private _terminal: ITerminal\n  ) {\n    this._terminal.element.addEventListener('mousedown', e => this._onMouseDown(e));\n\n    // These events are expensive, only listen to it when mouse zones are active\n    this._mouseMoveListener = e => this._onMouseMove(e);\n    this._clickListener = e => this._onClick(e);\n  }\n\n  public add(zone: IMouseZone): void {\n    this._zones.push(zone);\n    if (this._zones.length === 1) {\n      this._activate();\n    }\n  }\n\n  public clearAll(start?: number, end?: number): void {\n    // Exit if there's nothing to clear\n    if (this._zones.length === 0) {\n      return;\n    }\n\n    // Clear all if start/end weren't set\n    if (!end) {\n      start = 0;\n      end = this._terminal.rows - 1;\n    }\n\n    // Iterate through zones and clear them out if they're within the range\n    for (let i = 0; i < this._zones.length; i++) {\n      const zone = this._zones[i];\n      if (zone.y > start && zone.y <= end + 1) {\n        if (this._currentZone && this._currentZone === zone) {\n          this._currentZone.leaveCallback();\n          this._currentZone = null;\n        }\n        this._zones.splice(i--, 1);\n      }\n    }\n\n    // Deactivate the mouse zone manager if all the zones have been removed\n    if (this._zones.length === 0) {\n      this._deactivate();\n    }\n  }\n\n  private _activate(): void {\n    if (!this._areZonesActive) {\n      this._areZonesActive = true;\n      this._terminal.element.addEventListener('mousemove', this._mouseMoveListener);\n      this._terminal.element.addEventListener('click', this._clickListener);\n    }\n  }\n\n  private _deactivate(): void {\n    if (this._areZonesActive) {\n      this._areZonesActive = false;\n      this._terminal.element.removeEventListener('mousemove', this._mouseMoveListener);\n      this._terminal.element.removeEventListener('click', this._clickListener);\n    }\n  }\n\n  private _onMouseMove(e: MouseEvent): void {\n    // TODO: Ideally this would only clear the hover state when the mouse moves\n    // outside of the mouse zone\n    if (this._lastHoverCoords[0] !== e.pageX || this._lastHoverCoords[1] !== e.pageY) {\n      this._onHover(e);\n      // Record the current coordinates\n      this._lastHoverCoords = [e.pageX, e.pageY];\n    }\n  }\n\n  private _onHover(e: MouseEvent): void {\n    const zone = this._findZoneEventAt(e);\n\n    // Do nothing if the zone is the same\n    if (zone === this._currentZone) {\n      return;\n    }\n\n    // Fire the hover end callback and cancel any existing timer if a new zone\n    // is being hovered\n    if (this._currentZone) {\n      this._currentZone.leaveCallback();\n      this._currentZone = null;\n      if (this._tooltipTimeout) {\n        clearTimeout(this._tooltipTimeout);\n      }\n    }\n\n    // Exit if there is not zone\n    if (!zone) {\n      return;\n    }\n    this._currentZone = zone;\n\n    // Trigger the hover callback\n    if (zone.hoverCallback) {\n      zone.hoverCallback(e);\n    }\n\n    // Restart the tooltip timeout\n    this._tooltipTimeout = <number><any>setTimeout(() => this._onTooltip(e), HOVER_DURATION);\n  }\n\n  private _onTooltip(e: MouseEvent): void {\n    this._tooltipTimeout = null;\n    const zone = this._findZoneEventAt(e);\n    if (zone && zone.tooltipCallback) {\n      zone.tooltipCallback(e);\n    }\n  }\n\n  private _onMouseDown(e: MouseEvent): void {\n    // Ignore the event if there are no zones active\n    if (!this._areZonesActive) {\n      return;\n    }\n\n    // Find the active zone, prevent event propagation if found to prevent other\n    // components from handling the mouse event.\n    const zone = this._findZoneEventAt(e);\n    if (zone) {\n      // TODO: When link modifier support is added, the event should only be\n      // cancelled when the modifier is held (see #1021)\n      e.preventDefault();\n      e.stopImmediatePropagation();\n    }\n  }\n\n  private _onClick(e: MouseEvent): void {\n    // Find the active zone and click it if found\n    const zone = this._findZoneEventAt(e);\n    if (zone) {\n      zone.clickCallback(e);\n      e.preventDefault();\n      e.stopImmediatePropagation();\n    }\n  }\n\n  private _findZoneEventAt(e: MouseEvent): IMouseZone {\n    const coords = this._terminal.mouseHelper.getCoords(e, this._terminal.element, this._terminal.charMeasure, this._terminal.options.lineHeight, this._terminal.cols, this._terminal.rows);\n    if (!coords) {\n      return null;\n    }\n    for (let i = 0; i < this._zones.length; i++) {\n      const zone = this._zones[i];\n      if (zone.y === coords[1] && zone.x1 <= coords[0] && zone.x2 > coords[0]) {\n        return zone;\n      }\n    };\n    return null;\n  }\n}\n\nexport class MouseZone implements IMouseZone {\n  constructor(\n    public x1: number,\n    public x2: number,\n    public y: number,\n    public clickCallback: (e: MouseEvent) => any,\n    public hoverCallback?: (e: MouseEvent) => any,\n    public tooltipCallback?: (e: MouseEvent) => any,\n    public leaveCallback?: () => void\n  ) {\n  }\n}\n","/**\n * Copyright (c) 2016 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { ITerminal, ISelectionManager } from '../Interfaces';\n\ninterface IWindow extends Window {\n  clipboardData?: {\n    getData(format: string): string;\n    setData(format: string, data: string): void;\n  };\n}\n\ndeclare var window: IWindow;\n\n/**\n * Prepares text to be pasted into the terminal by normalizing the line endings\n * @param text The pasted text that needs processing before inserting into the terminal\n */\nexport function prepareTextForTerminal(text: string, isMSWindows: boolean): string {\n  if (isMSWindows) {\n    return text.replace(/\\r?\\n/g, '\\r');\n  }\n  return text;\n}\n\n/**\n * Bracket text for paste, if necessary, as per https://cirw.in/blog/bracketed-paste\n * @param text The pasted text to bracket\n */\nexport function bracketTextForPaste(text: string, bracketedPasteMode: boolean): string {\n  if (bracketedPasteMode) {\n    return '\\x1b[200~' + text + '\\x1b[201~';\n  }\n  return text;\n}\n\n/**\n * Binds copy functionality to the given terminal.\n * @param {ClipboardEvent} ev The original copy event to be handled\n */\nexport function copyHandler(ev: ClipboardEvent, term: ITerminal, selectionManager: ISelectionManager): void {\n  if (term.browser.isMSIE) {\n    window.clipboardData.setData('Text', selectionManager.selectionText);\n  } else {\n    ev.clipboardData.setData('text/plain', selectionManager.selectionText);\n  }\n\n  // Prevent or the original text will be copied.\n  ev.preventDefault();\n}\n\n/**\n * Redirect the clipboard's data to the terminal's input handler.\n * @param {ClipboardEvent} ev The original paste event to be handled\n * @param {Terminal} term The terminal on which to apply the handled paste event\n */\nexport function pasteHandler(ev: ClipboardEvent, term: ITerminal): void {\n  ev.stopPropagation();\n\n  let text: string;\n\n  let dispatchPaste = function(text: string): void {\n    text = prepareTextForTerminal(text, term.browser.isMSWindows);\n    text = bracketTextForPaste(text, term.bracketedPasteMode);\n    term.handler(text);\n    term.textarea.value = '';\n    term.emit('paste', text);\n    term.cancel(ev);\n  };\n\n  if (term.browser.isMSIE) {\n    if (window.clipboardData) {\n      text = window.clipboardData.getData('Text');\n      dispatchPaste(text);\n    }\n  } else {\n    if (ev.clipboardData) {\n      text = ev.clipboardData.getData('text/plain');\n      dispatchPaste(text);\n    }\n  }\n}\n\n/**\n * Moves the textarea under the mouse cursor and focuses it.\n * @param ev The original right click event to be handled.\n * @param textarea The terminal's textarea.\n */\nexport function moveTextAreaUnderMouseCursor(ev: MouseEvent, textarea: HTMLTextAreaElement): void {\n  // Bring textarea at the cursor position\n  textarea.style.position = 'fixed';\n  textarea.style.width = '20px';\n  textarea.style.height = '20px';\n  textarea.style.left = (ev.clientX - 10) + 'px';\n  textarea.style.top = (ev.clientY - 10) + 'px';\n  textarea.style.zIndex = '1000';\n\n  textarea.focus();\n\n  // Reset the terminal textarea's styling\n  setTimeout(() => {\n    textarea.style.position = null;\n    textarea.style.width = null;\n    textarea.style.height = null;\n    textarea.style.left = null;\n    textarea.style.top = null;\n    textarea.style.zIndex = null;\n  }, 4);\n}\n\n/**\n * Bind to right-click event and allow right-click copy and paste.\n * @param ev The original right click event to be handled.\n * @param textarea The terminal's textarea.\n * @param selectionManager The terminal's selection manager.\n */\nexport function rightClickHandler(ev: MouseEvent, textarea: HTMLTextAreaElement, selectionManager: ISelectionManager): void {\n  moveTextAreaUnderMouseCursor(ev, textarea);\n\n  // Get textarea ready to copy from the context menu\n  textarea.value = selectionManager.selectionText;\n  textarea.select();\n}\n","/**\n * Copyright (c) 2016 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { ITerminal, IViewport } from './Interfaces';\nimport { CharMeasure } from './utils/CharMeasure';\nimport { IColorSet } from './renderer/Interfaces';\n\n/**\n * Represents the viewport of a terminal, the visible area within the larger buffer of output.\n * Logic for the virtual scroll bar is included in this object.\n */\nexport class Viewport implements IViewport {\n  private currentRowHeight: number = 0;\n  private lastRecordedBufferLength: number = 0;\n  private lastRecordedViewportHeight: number = 0;\n  private lastRecordedBufferHeight: number = 0;\n  private lastTouchY: number;\n\n  /**\n   * Creates a new Viewport.\n   * @param terminal The terminal this viewport belongs to.\n   * @param viewportElement The DOM element acting as the viewport.\n   * @param scrollArea The DOM element acting as the scroll area.\n   * @param charMeasure A DOM element used to measure the character size of. the terminal.\n   */\n  constructor(\n    private terminal: ITerminal,\n    private viewportElement: HTMLElement,\n    private scrollArea: HTMLElement,\n    private charMeasure: CharMeasure\n  ) {\n    this.viewportElement.addEventListener('scroll', this.onScroll.bind(this));\n\n    // Perform this async to ensure the CharMeasure is ready.\n    setTimeout(() => this.syncScrollArea(), 0);\n  }\n\n  public onThemeChanged(colors: IColorSet): void {\n    this.viewportElement.style.backgroundColor = colors.background;\n  }\n\n  /**\n   * Refreshes row height, setting line-height, viewport height and scroll area height if\n   * necessary.\n   */\n  private refresh(): void {\n    if (this.charMeasure.height > 0) {\n      this.currentRowHeight = this.terminal.renderer.dimensions.scaledCellHeight / window.devicePixelRatio;\n\n      if (this.lastRecordedViewportHeight !== this.terminal.renderer.dimensions.canvasHeight) {\n        this.lastRecordedViewportHeight = this.terminal.renderer.dimensions.canvasHeight;\n        this.viewportElement.style.height = this.lastRecordedViewportHeight + 'px';\n      }\n\n      const newBufferHeight = Math.round(this.currentRowHeight * this.lastRecordedBufferLength);\n      if (this.lastRecordedBufferHeight !== newBufferHeight) {\n        this.lastRecordedBufferHeight = newBufferHeight;\n        this.scrollArea.style.height = this.lastRecordedBufferHeight + 'px';\n      }\n    }\n  }\n\n  /**\n   * Updates dimensions and synchronizes the scroll area if necessary.\n   */\n  public syncScrollArea(): void {\n    if (this.lastRecordedBufferLength !== this.terminal.buffer.lines.length) {\n      // If buffer height changed\n      this.lastRecordedBufferLength = this.terminal.buffer.lines.length;\n      this.refresh();\n    } else if (this.lastRecordedViewportHeight !== (<any>this.terminal).renderer.dimensions.canvasHeight) {\n      // If viewport height changed\n      this.refresh();\n    } else {\n      // If size has changed, refresh viewport\n      if (this.terminal.renderer.dimensions.scaledCellHeight / window.devicePixelRatio !== this.currentRowHeight) {\n        this.refresh();\n      }\n    }\n\n    // Sync scrollTop\n    const scrollTop = this.terminal.buffer.ydisp * this.currentRowHeight;\n    if (this.viewportElement.scrollTop !== scrollTop) {\n      this.viewportElement.scrollTop = scrollTop;\n    }\n  }\n\n  /**\n   * Handles scroll events on the viewport, calculating the new viewport and requesting the\n   * terminal to scroll to it.\n   * @param ev The scroll event.\n   */\n  private onScroll(ev: Event): void {\n    const newRow = Math.round(this.viewportElement.scrollTop / this.currentRowHeight);\n    const diff = newRow - this.terminal.buffer.ydisp;\n    this.terminal.scrollLines(diff, true);\n  }\n\n  /**\n   * Handles mouse wheel events by adjusting the viewport's scrollTop and delegating the actual\n   * scrolling to `onScroll`, this event needs to be attached manually by the consumer of\n   * `Viewport`.\n   * @param ev The mouse wheel event.\n   */\n  public onWheel(ev: WheelEvent): void {\n    if (ev.deltaY === 0) {\n      // Do nothing if it's not a vertical scroll event\n      return;\n    }\n    // Fallback to WheelEvent.DOM_DELTA_PIXEL\n    let multiplier = 1;\n    if (ev.deltaMode === WheelEvent.DOM_DELTA_LINE) {\n      multiplier = this.currentRowHeight;\n    } else if (ev.deltaMode === WheelEvent.DOM_DELTA_PAGE) {\n      multiplier = this.currentRowHeight * this.terminal.rows;\n    }\n    this.viewportElement.scrollTop += ev.deltaY * multiplier;\n    // Prevent the page from scrolling when the terminal scrolls\n    ev.preventDefault();\n  };\n\n  /**\n   * Handles the touchstart event, recording the touch occurred.\n   * @param ev The touch event.\n   */\n  public onTouchStart(ev: TouchEvent): void {\n    this.lastTouchY = ev.touches[0].pageY;\n  };\n\n  /**\n   * Handles the touchmove event, scrolling the viewport if the position shifted.\n   * @param ev The touch event.\n   */\n  public onTouchMove(ev: TouchEvent): void {\n    let deltaY = this.lastTouchY - ev.touches[0].pageY;\n    this.lastTouchY = ev.touches[0].pageY;\n    if (deltaY === 0) {\n      return;\n    }\n    this.viewportElement.scrollTop += deltaY;\n    ev.preventDefault();\n  };\n}\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nexport type LinkMatcher = {\n  id: number,\n  regex: RegExp,\n  handler: LinkMatcherHandler,\n  hoverTooltipCallback?: LinkMatcherHandler,\n  hoverLeaveCallback?: () => void,\n  matchIndex?: number,\n  validationCallback?: LinkMatcherValidationCallback,\n  priority?: number\n};\nexport type LinkMatcherHandler = (event: MouseEvent, uri: string) => boolean | void;\nexport type LinkMatcherValidationCallback = (uri: string, callback: (isValid: boolean) => void) => void;\n\nexport type CustomKeyEventHandler = (event: KeyboardEvent) => boolean;\nexport type Charset = {[key: string]: string};\n\nexport type CharData = [number, string, number, number];\nexport type LineData = CharData[];\n\nexport type LinkHoverEvent = {\n  x: number,\n  y: number,\n  length: number\n};\n\nexport enum LinkHoverEventTypes {\n  HOVER = 'linkhover',\n  TOOLTIP = 'linktooltip',\n  LEAVE = 'linkleave'\n};\n","/**\n * Copyright (c) 2014 The xterm.js authors. All rights reserved.\n * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)\n * @license MIT\n *\n * Originally forked from (with the author's permission):\n *   Fabrice Bellard's javascript vt100 for jslinux:\n *   http://bellard.org/jslinux/\n *   Copyright (c) 2011 Fabrice Bellard\n *   The original design remains. The terminal itself\n *   has been extended to include xterm CSI codes, among\n *   other features.\n *\n * Terminal Emulation References:\n *   http://vt100.net/\n *   http://invisible-island.net/xterm/ctlseqs/ctlseqs.txt\n *   http://invisible-island.net/xterm/ctlseqs/ctlseqs.html\n *   http://invisible-island.net/vttest/\n *   http://www.inwap.com/pdp10/ansicode.txt\n *   http://linux.die.net/man/4/console_codes\n *   http://linux.die.net/man/7/urxvt\n */\n\nimport { BufferSet } from './BufferSet';\nimport { Buffer, MAX_BUFFER_SIZE } from './Buffer';\nimport { CompositionHelper } from './CompositionHelper';\nimport { EventEmitter } from './EventEmitter';\nimport { Viewport } from './Viewport';\nimport { rightClickHandler, moveTextAreaUnderMouseCursor, pasteHandler, copyHandler } from './handlers/Clipboard';\nimport { CircularList } from './utils/CircularList';\nimport { C0 } from './EscapeSequences';\nimport { InputHandler } from './InputHandler';\nimport { Parser } from './Parser';\nimport { Renderer } from './renderer/Renderer';\nimport { Linkifier } from './Linkifier';\nimport { SelectionManager } from './SelectionManager';\nimport { CharMeasure } from './utils/CharMeasure';\nimport * as Browser from './utils/Browser';\nimport { MouseHelper } from './utils/MouseHelper';\nimport { CHARSETS } from './Charsets';\nimport { CustomKeyEventHandler, Charset, LinkMatcherHandler, LinkMatcherValidationCallback, CharData, LineData } from './Types';\nimport { ITerminal, IBrowser, ITerminalOptions, IInputHandlingTerminal, ILinkMatcherOptions, IViewport, ICompositionHelper, ITheme, ILinkifier } from './Interfaces';\nimport { BellSound } from './utils/Sounds';\nimport { DEFAULT_ANSI_COLORS } from './renderer/ColorManager';\nimport { IMouseZoneManager } from './input/Interfaces';\nimport { MouseZoneManager } from './input/MouseZoneManager';\nimport { initialize as initializeCharAtlas } from './renderer/CharAtlas';\nimport { IRenderer } from './renderer/Interfaces';\n\n// Declares required for loadAddon\ndeclare var exports: any;\ndeclare var module: any;\ndeclare var define: any;\ndeclare var require: any;\n\n// Let it work inside Node.js for automated testing purposes.\nconst document = (typeof window !== 'undefined') ? window.document : null;\n\n/**\n * The amount of write requests to queue before sending an XOFF signal to the\n * pty process. This number must be small in order for ^C and similar sequences\n * to be responsive.\n */\nconst WRITE_BUFFER_PAUSE_THRESHOLD = 5;\n\n/**\n * The number of writes to perform in a single batch before allowing the\n * renderer to catch up with a 0ms setTimeout.\n */\nconst WRITE_BATCH_SIZE = 300;\n\nconst DEFAULT_OPTIONS: ITerminalOptions = {\n  convertEol: false,\n  termName: 'xterm',\n  geometry: [80, 24],\n  cursorBlink: false,\n  cursorStyle: 'block',\n  bellSound: BellSound,\n  bellStyle: 'none',\n  enableBold: true,\n  fontFamily: 'courier-new, courier, monospace',\n  fontSize: 15,\n  lineHeight: 1.0,\n  letterSpacing: 0,\n  scrollback: 1000,\n  screenKeys: false,\n  debug: false,\n  cancelEvents: false,\n  disableStdin: false,\n  useFlowControl: false,\n  tabStopWidth: 8,\n  theme: null\n  // programFeatures: false,\n  // focusKeys: false,\n};\n\nexport class Terminal extends EventEmitter implements ITerminal, IInputHandlingTerminal {\n  public textarea: HTMLTextAreaElement;\n  public element: HTMLElement;\n\n  /**\n   * The HTMLElement that the terminal is created in, set by Terminal.open.\n   */\n  private parent: HTMLElement;\n  private context: Window;\n  private document: Document;\n  private body: HTMLBodyElement;\n  private viewportScrollArea: HTMLElement;\n  private viewportElement: HTMLElement;\n  private helperContainer: HTMLElement;\n  private compositionView: HTMLElement;\n  private charSizeStyleElement: HTMLStyleElement;\n  private bellAudioElement: HTMLAudioElement;\n  private visualBellTimer: number;\n\n  public browser: IBrowser = <any>Browser;\n\n  public options: ITerminalOptions;\n  private colors: any;\n\n  // TODO: This can be changed to an enum or boolean, 0 and 1 seem to be the only options\n  public cursorState: number;\n  public cursorHidden: boolean;\n  public convertEol: boolean;\n\n  private sendDataQueue: string;\n  private customKeyEventHandler: CustomKeyEventHandler;\n\n  // modes\n  public applicationKeypad: boolean;\n  public applicationCursor: boolean;\n  public originMode: boolean;\n  public insertMode: boolean;\n  public wraparoundMode: boolean; // defaults: xterm - true, vt100 - false\n  public bracketedPasteMode: boolean;\n\n  // charset\n  // The current charset\n  public charset: Charset;\n  public gcharset: number;\n  public glevel: number;\n  public charsets: Charset[];\n\n  // mouse properties\n  private decLocator: boolean; // This is unstable and never set\n  public x10Mouse: boolean;\n  public vt200Mouse: boolean;\n  private vt300Mouse: boolean; // This is unstable and never set\n  public normalMouse: boolean;\n  public mouseEvents: boolean;\n  public sendFocus: boolean;\n  public utfMouse: boolean;\n  public sgrMouse: boolean;\n  public urxvtMouse: boolean;\n\n  // misc\n  private refreshStart: number;\n  private refreshEnd: number;\n  public savedCols: number;\n\n  // stream\n  private readable: boolean;\n  private writable: boolean;\n\n  public defAttr: number;\n  public curAttr: number;\n\n  public params: (string | number)[];\n  public currentParam: string | number;\n  public prefix: string;\n  public postfix: string;\n\n  // user input states\n  public writeBuffer: string[];\n  private writeInProgress: boolean;\n\n  /**\n   * Whether _xterm.js_ sent XOFF in order to catch up with the pty process.\n   * This is a distinct state from writeStopped so that if the user requested\n   * XOFF via ^S that it will not automatically resume when the writeBuffer goes\n   * below threshold.\n   */\n  private xoffSentToCatchUp: boolean;\n\n  /** Whether writing has been stopped as a result of XOFF */\n  private writeStopped: boolean;\n\n  // leftover surrogate high from previous write invocation\n  private surrogate_high: string;\n\n  // Store if user went browsing history in scrollback\n  private userScrolling: boolean;\n\n  private inputHandler: InputHandler;\n  private parser: Parser;\n  public renderer: IRenderer;\n  public selectionManager: SelectionManager;\n  public linkifier: ILinkifier;\n  public buffers: BufferSet;\n  public buffer: Buffer;\n  public viewport: IViewport;\n  private compositionHelper: ICompositionHelper;\n  public charMeasure: CharMeasure;\n  private _mouseZoneManager: IMouseZoneManager;\n  public mouseHelper: MouseHelper;\n\n  public cols: number;\n  public rows: number;\n  public geometry: [/*cols*/number, /*rows*/number];\n\n  /**\n   * Creates a new `Terminal` object.\n   *\n   * @param {object} options An object containing a set of options, the available options are:\n   *   - `cursorBlink` (boolean): Whether the terminal cursor blinks\n   *   - `cols` (number): The number of columns of the terminal (horizontal size)\n   *   - `rows` (number): The number of rows of the terminal (vertical size)\n   *\n   * @public\n   * @class Xterm Xterm\n   * @alias module:xterm/src/xterm\n   */\n  constructor(\n    options: ITerminalOptions = {}\n  ) {\n    super();\n    this.options = options;\n    this.setup();\n  }\n\n  private setup(): void {\n    Object.keys(DEFAULT_OPTIONS).forEach((key) => {\n      if (this.options[key] == null) {\n        this.options[key] = DEFAULT_OPTIONS[key];\n      }\n      // TODO: We should move away from duplicate options on the Terminal object\n      this[key] = this.options[key];\n    });\n\n    // this.context = options.context || window;\n    // this.document = options.document || document;\n    // TODO: WHy not document.body?\n    this.parent = document ? document.body : null;\n\n    this.cols = this.options.cols || this.options.geometry[0];\n    this.rows = this.options.rows || this.options.geometry[1];\n    this.geometry = [this.cols, this.rows];\n\n    if (this.options.handler) {\n      this.on('data', this.options.handler);\n    }\n\n    this.cursorState = 0;\n    this.cursorHidden = false;\n    this.sendDataQueue = '';\n    this.customKeyEventHandler = null;\n\n    // modes\n    this.applicationKeypad = false;\n    this.applicationCursor = false;\n    this.originMode = false;\n    this.insertMode = false;\n    this.wraparoundMode = true; // defaults: xterm - true, vt100 - false\n    this.bracketedPasteMode = false;\n\n    // charset\n    this.charset = null;\n    this.gcharset = null;\n    this.glevel = 0;\n    // TODO: Can this be just []?\n    this.charsets = [null];\n\n    this.readable = true;\n    this.writable = true;\n\n    this.defAttr = (0 << 18) | (257 << 9) | (256 << 0);\n    this.curAttr = (0 << 18) | (257 << 9) | (256 << 0);\n\n    this.params = [];\n    this.currentParam = 0;\n    this.prefix = '';\n    this.postfix = '';\n\n    // user input states\n    this.writeBuffer = [];\n    this.writeInProgress = false;\n\n    this.xoffSentToCatchUp = false;\n    this.writeStopped = false;\n    this.surrogate_high = '';\n    this.userScrolling = false;\n\n    this.inputHandler = new InputHandler(this);\n    this.parser = new Parser(this.inputHandler, this);\n    // Reuse renderer if the Terminal is being recreated via a reset call.\n    this.renderer = this.renderer || null;\n    this.selectionManager = this.selectionManager || null;\n    this.linkifier = this.linkifier || new Linkifier(this);\n    this._mouseZoneManager = this._mouseZoneManager || null;\n\n    // Create the terminal's buffers and set the current buffer\n    this.buffers = new BufferSet(this);\n    this.buffer = this.buffers.active;  // Convenience shortcut;\n    this.buffers.on('activate', (buffer: Buffer) => {\n      this.buffer = buffer;\n    });\n\n    // Ensure the selection manager has the correct buffer\n    if (this.selectionManager) {\n      this.selectionManager.setBuffer(this.buffer);\n    }\n  }\n\n  /**\n   * back_color_erase feature for xterm.\n   */\n  public eraseAttr(): number {\n    // if (this.is('screen')) return this.defAttr;\n    return (this.defAttr & ~0x1ff) | (this.curAttr & 0x1ff);\n  }\n\n  /**\n   * Focus the terminal. Delegates focus handling to the terminal's DOM element.\n   */\n  public focus(): void {\n    this.textarea.focus();\n  }\n\n  public get isFocused(): boolean {\n    return document.activeElement === this.textarea;\n  }\n\n  /**\n   * Retrieves an option's value from the terminal.\n   * @param {string} key The option key.\n   */\n  public getOption(key: string): any {\n    if (!(key in DEFAULT_OPTIONS)) {\n      throw new Error('No option with key \"' + key + '\"');\n    }\n\n    if (typeof this.options[key] !== 'undefined') {\n      return this.options[key];\n    }\n\n    return this[key];\n  }\n\n  /**\n   * Sets an option on the terminal.\n   * @param {string} key The option key.\n   * @param {any} value The option value.\n   */\n  public setOption(key: string, value: any): void {\n    if (!(key in DEFAULT_OPTIONS)) {\n      throw new Error('No option with key \"' + key + '\"');\n    }\n    switch (key) {\n      case 'bellStyle':\n        if (!value) {\n          value = 'none';\n        }\n        break;\n      case 'cursorStyle':\n        if (!value) {\n          value = 'block';\n        }\n        break;\n      case 'lineHeight':\n        if (value < 1) {\n          console.warn(`${key} cannot be less than 1, value: ${value}`);\n          return;\n        }\n      case 'tabStopWidth':\n        if (value < 1) {\n          console.warn(`${key} cannot be less than 1, value: ${value}`);\n          return;\n        }\n        break;\n      case 'theme':\n        // If open has been called we do not want to set options.theme as the\n        // source of truth is owned by the renderer.\n        if (this.renderer) {\n          this._setTheme(<ITheme>value);\n          return;\n        }\n        break;\n      case 'scrollback':\n        value = Math.min(value, MAX_BUFFER_SIZE);\n\n        if (value < 0) {\n          console.warn(`${key} cannot be less than 0, value: ${value}`);\n          return;\n        }\n        if (this.options[key] !== value) {\n          const newBufferLength = this.rows + value;\n          if (this.buffer.lines.length > newBufferLength) {\n            const amountToTrim = this.buffer.lines.length - newBufferLength;\n            const needsRefresh = (this.buffer.ydisp - amountToTrim < 0);\n            this.buffer.lines.trimStart(amountToTrim);\n            this.buffer.ybase = Math.max(this.buffer.ybase - amountToTrim, 0);\n            this.buffer.ydisp = Math.max(this.buffer.ydisp - amountToTrim, 0);\n            if (needsRefresh) {\n              this.refresh(0, this.rows - 1);\n            }\n          }\n        }\n        break;\n    }\n    this[key] = value;\n    this.options[key] = value;\n    switch (key) {\n      case 'fontFamily':\n      case 'fontSize':\n        // When the font changes the size of the cells may change which requires a renderer clear\n        this.renderer.clear();\n        this.charMeasure.measure(this.options);\n        break;\n      case 'enableBold':\n      case 'letterSpacing':\n      case 'lineHeight':\n        // When the font changes the size of the cells may change which requires a renderer clear\n        this.renderer.clear();\n        this.renderer.onResize(this.cols, this.rows, false);\n        this.refresh(0, this.rows - 1);\n        // this.charMeasure.measure(this.options);\n      case 'scrollback':\n        this.buffers.resize(this.cols, this.rows);\n        this.viewport.syncScrollArea();\n        break;\n      case 'tabStopWidth': this.buffers.setupTabStops(); break;\n      case 'bellSound':\n      case 'bellStyle': this.syncBellSound(); break;\n    }\n    // Inform renderer of changes\n    if (this.renderer) {\n      this.renderer.onOptionsChanged();\n    }\n  }\n\n  /**\n   * Binds the desired focus behavior on a given terminal object.\n   */\n  private _onTextAreaFocus(): void {\n    if (this.sendFocus) {\n      this.send(C0.ESC + '[I');\n    }\n    this.element.classList.add('focus');\n    this.showCursor();\n    this.emit('focus');\n  };\n\n  /**\n   * Blur the terminal, calling the blur function on the terminal's underlying\n   * textarea.\n   */\n  public blur(): void {\n    return this.textarea.blur();\n  }\n\n  /**\n   * Binds the desired blur behavior on a given terminal object.\n   */\n  private _onTextAreaBlur(): void {\n    this.refresh(this.buffer.y, this.buffer.y);\n    if (this.sendFocus) {\n      this.send(C0.ESC + '[O');\n    }\n    this.element.classList.remove('focus');\n    this.emit('blur');\n  }\n\n  /**\n   * Initialize default behavior\n   */\n  private initGlobal(): void {\n    this.bindKeys();\n\n    // Bind clipboard functionality\n    on(this.element, 'copy', (event: ClipboardEvent) => {\n      // If mouse events are active it means the selection manager is disabled and\n      // copy should be handled by the host program.\n      if (!this.hasSelection()) {\n        return;\n      }\n      copyHandler(event, this, this.selectionManager);\n    });\n    const pasteHandlerWrapper = event => pasteHandler(event, this);\n    on(this.textarea, 'paste', pasteHandlerWrapper);\n    on(this.element, 'paste', pasteHandlerWrapper);\n\n    // Handle right click context menus\n    if (Browser.isFirefox) {\n      // Firefox doesn't appear to fire the contextmenu event on right click\n      on(this.element, 'mousedown', (event: MouseEvent) => {\n        if (event.button === 2) {\n          rightClickHandler(event, this.textarea, this.selectionManager);\n        }\n      });\n    } else {\n      on(this.element, 'contextmenu', (event: MouseEvent) => {\n        rightClickHandler(event, this.textarea, this.selectionManager);\n      });\n    }\n\n    // Move the textarea under the cursor when middle clicking on Linux to ensure\n    // middle click to paste selection works. This only appears to work in Chrome\n    // at the time is writing.\n    if (Browser.isLinux) {\n      // Use auxclick event over mousedown the latter doesn't seem to work. Note\n      // that the regular click event doesn't fire for the middle mouse button.\n      on(this.element, 'auxclick', (event: MouseEvent) => {\n        if (event.button === 1) {\n          moveTextAreaUnderMouseCursor(event, this.textarea);\n        }\n      });\n    }\n  }\n\n  /**\n   * Apply key handling to the terminal\n   */\n  private bindKeys(): void {\n    const self = this;\n    on(this.element, 'keydown', function (ev: KeyboardEvent): void {\n      if (document.activeElement !== this) {\n        return;\n      }\n      self._keyDown(ev);\n    }, true);\n\n    on(this.element, 'keypress', function (ev: KeyboardEvent): void {\n      if (document.activeElement !== this) {\n        return;\n      }\n      self._keyPress(ev);\n    }, true);\n\n    on(this.element, 'keyup', (ev: KeyboardEvent) => {\n      if (!wasMondifierKeyOnlyEvent(ev)) {\n        this.focus();\n      }\n    }, true);\n\n    on(this.textarea, 'keydown', (ev: KeyboardEvent) => {\n      this._keyDown(ev);\n    }, true);\n\n    on(this.textarea, 'keypress', (ev: KeyboardEvent) => {\n      this._keyPress(ev);\n      // Truncate the textarea's value, since it is not needed\n      this.textarea.value = '';\n    }, true);\n\n    on(this.textarea, 'compositionstart', () => this.compositionHelper.compositionstart());\n    on(this.textarea, 'compositionupdate', (e: CompositionEvent) => this.compositionHelper.compositionupdate(e));\n    on(this.textarea, 'compositionend', () => this.compositionHelper.compositionend());\n    this.on('refresh', () => this.compositionHelper.updateCompositionElements());\n    this.on('refresh', (data) => this.queueLinkification(data.start, data.end));\n  }\n\n  /**\n   * Opens the terminal within an element.\n   *\n   * @param {HTMLElement} parent The element to create the terminal within.\n   */\n  public open(parent: HTMLElement): void {\n    let i = 0;\n    let div;\n\n    this.parent = parent || this.parent;\n\n    if (!this.parent) {\n      throw new Error('Terminal requires a parent element.');\n    }\n\n    // Grab global elements\n    this.context = this.parent.ownerDocument.defaultView;\n    this.document = this.parent.ownerDocument;\n    this.body = <HTMLBodyElement>this.document.body;\n\n    initializeCharAtlas(this.document);\n\n    // Create main element container\n    this.element = this.document.createElement('div');\n    this.element.classList.add('terminal');\n    this.element.classList.add('xterm');\n\n    this.element.setAttribute('tabindex', '0');\n\n    this.viewportElement = document.createElement('div');\n    this.viewportElement.classList.add('xterm-viewport');\n    this.element.appendChild(this.viewportElement);\n    this.viewportScrollArea = document.createElement('div');\n    this.viewportScrollArea.classList.add('xterm-scroll-area');\n    this.viewportElement.appendChild(this.viewportScrollArea);\n\n    // preload audio\n    this.syncBellSound();\n\n    this._mouseZoneManager = new MouseZoneManager(this);\n    this.on('scroll', () => this._mouseZoneManager.clearAll());\n    this.linkifier.attachToDom(this._mouseZoneManager);\n\n    // Create the container that will hold helpers like the textarea for\n    // capturing DOM Events. Then produce the helpers.\n    this.helperContainer = document.createElement('div');\n    this.helperContainer.classList.add('xterm-helpers');\n    // TODO: This should probably be inserted once it's filled to prevent an additional layout\n    this.element.appendChild(this.helperContainer);\n    this.textarea = document.createElement('textarea');\n    this.textarea.classList.add('xterm-helper-textarea');\n    this.textarea.setAttribute('autocorrect', 'off');\n    this.textarea.setAttribute('autocapitalize', 'off');\n    this.textarea.setAttribute('spellcheck', 'false');\n    this.textarea.tabIndex = 0;\n    this.textarea.addEventListener('focus', () => this._onTextAreaFocus());\n    this.textarea.addEventListener('blur', () => this._onTextAreaBlur());\n    this.helperContainer.appendChild(this.textarea);\n\n    this.compositionView = document.createElement('div');\n    this.compositionView.classList.add('composition-view');\n    this.compositionHelper = new CompositionHelper(this.textarea, this.compositionView, this);\n    this.helperContainer.appendChild(this.compositionView);\n\n    this.charSizeStyleElement = document.createElement('style');\n    this.helperContainer.appendChild(this.charSizeStyleElement);\n\n    this.parent.appendChild(this.element);\n\n    this.charMeasure = new CharMeasure(document, this.helperContainer);\n\n    this.renderer = new Renderer(this, this.options.theme);\n    this.options.theme = null;\n    this.viewport = new Viewport(this, this.viewportElement, this.viewportScrollArea, this.charMeasure);\n    this.viewport.onThemeChanged(this.renderer.colorManager.colors);\n\n    this.on('cursormove', () => this.renderer.onCursorMove());\n    this.on('resize', () => this.renderer.onResize(this.cols, this.rows, false));\n    this.on('blur', () => this.renderer.onBlur());\n    this.on('focus', () => this.renderer.onFocus());\n    window.addEventListener('resize', () => this.renderer.onWindowResize(window.devicePixelRatio));\n    this.charMeasure.on('charsizechanged', () => this.renderer.onResize(this.cols, this.rows, true));\n    this.renderer.on('resize', (dimensions) => this.viewport.syncScrollArea());\n\n    this.selectionManager = new SelectionManager(this, this.buffer, this.charMeasure);\n    this.element.addEventListener('mousedown', (e: MouseEvent) => this.selectionManager.onMouseDown(e));\n    this.selectionManager.on('refresh', data => this.renderer.onSelectionChanged(data.start, data.end));\n    this.selectionManager.on('newselection', text => {\n      // If there's a new selection, put it into the textarea, focus and select it\n      // in order to register it as a selection on the OS. This event is fired\n      // only on Linux to enable middle click to paste selection.\n      this.textarea.value = text;\n      this.textarea.focus();\n      this.textarea.select();\n    });\n    this.on('scroll', () => {\n      this.viewport.syncScrollArea();\n      this.selectionManager.refresh();\n    });\n    this.viewportElement.addEventListener('scroll', () => this.selectionManager.refresh());\n\n    this.mouseHelper = new MouseHelper(this.renderer);\n\n    // Measure the character size\n    this.charMeasure.measure(this.options);\n\n    // Setup loop that draws to screen\n    this.refresh(0, this.rows - 1);\n\n    // Initialize global actions that need to be taken on the document.\n    this.initGlobal();\n\n    // Listen for mouse events and translate\n    // them into terminal mouse protocols.\n    this.bindMouse();\n  }\n\n  /**\n   * Sets the theme on the renderer. The renderer must have been initialized.\n   * @param theme The theme to ste.\n   */\n  private _setTheme(theme: ITheme): void {\n    const colors = this.renderer.setTheme(theme);\n    if (this.viewport) {\n      this.viewport.onThemeChanged(colors);\n    }\n  }\n\n  /**\n   * Attempts to load an add-on using CommonJS or RequireJS (whichever is available).\n   * @param {string} addon The name of the addon to load\n   * @static\n   */\n  public static loadAddon(addon: string, callback?: Function): boolean | any {\n    // TODO: Improve return type and documentation\n    if (typeof exports === 'object' && typeof module === 'object') {\n      // CommonJS\n      return require('./addons/' + addon + '/' + addon);\n    } else if (typeof define === 'function') {\n      // RequireJS\n      return (<any>require)(['./addons/' + addon + '/' + addon], callback);\n    } else {\n      console.error('Cannot load a module without a CommonJS or RequireJS environment.');\n      return false;\n    }\n  }\n\n  /**\n   * XTerm mouse events\n   * http://invisible-island.net/xterm/ctlseqs/ctlseqs.html#Mouse%20Tracking\n   * To better understand these\n   * the xterm code is very helpful:\n   * Relevant files:\n   *   button.c, charproc.c, misc.c\n   * Relevant functions in xterm/button.c:\n   *   BtnCode, EmitButtonCode, EditorButton, SendMousePosition\n   */\n  public bindMouse(): void {\n    const el = this.element;\n    const self = this;\n    let pressed = 32;\n\n    // mouseup, mousedown, wheel\n    // left click: ^[[M 3<^[[M#3<\n    // wheel up: ^[[M`3>\n    function sendButton(ev: MouseEvent | WheelEvent): void {\n      let button;\n      let pos;\n\n      // get the xterm-style button\n      button = getButton(ev);\n\n      // get mouse coordinates\n      pos = self.mouseHelper.getRawByteCoords(ev, self.element, self.charMeasure, self.options.lineHeight, self.cols, self.rows);\n      if (!pos) return;\n\n      sendEvent(button, pos);\n\n      switch ((<any>ev).overrideType || ev.type) {\n        case 'mousedown':\n          pressed = button;\n          break;\n        case 'mouseup':\n          // keep it at the left\n          // button, just in case.\n          pressed = 32;\n          break;\n        case 'wheel':\n          // nothing. don't\n          // interfere with\n          // `pressed`.\n          break;\n      }\n    }\n\n    // motion example of a left click:\n    // ^[[M 3<^[[M@4<^[[M@5<^[[M@6<^[[M@7<^[[M#7<\n    function sendMove(ev: MouseEvent): void {\n      let button = pressed;\n      let pos = self.mouseHelper.getRawByteCoords(ev, self.element, self.charMeasure, self.options.lineHeight, self.cols, self.rows);\n      if (!pos) return;\n\n      // buttons marked as motions\n      // are incremented by 32\n      button += 32;\n\n      sendEvent(button, pos);\n    }\n\n    // encode button and\n    // position to characters\n    function encode(data: number[], ch: number): void {\n      if (!self.utfMouse) {\n        if (ch === 255) {\n          data.push(0);\n          return;\n        }\n        if (ch > 127) ch = 127;\n        data.push(ch);\n      } else {\n        if (ch === 2047) {\n          data.push(0);\n          return;\n        }\n        if (ch < 127) {\n          data.push(ch);\n        } else {\n          if (ch > 2047) ch = 2047;\n          data.push(0xC0 | (ch >> 6));\n          data.push(0x80 | (ch & 0x3F));\n        }\n      }\n    }\n\n    // send a mouse event:\n    // regular/utf8: ^[[M Cb Cx Cy\n    // urxvt: ^[[ Cb ; Cx ; Cy M\n    // sgr: ^[[ Cb ; Cx ; Cy M/m\n    // vt300: ^[[ 24(1/3/5)~ [ Cx , Cy ] \\r\n    // locator: CSI P e ; P b ; P r ; P c ; P p & w\n    function sendEvent(button: number, pos: {x: number, y: number}): void {\n      // self.emit('mouse', {\n      //   x: pos.x - 32,\n      //   y: pos.x - 32,\n      //   button: button\n      // });\n\n      if (self.vt300Mouse) {\n        // NOTE: Unstable.\n        // http://www.vt100.net/docs/vt3xx-gp/chapter15.html\n        button &= 3;\n        pos.x -= 32;\n        pos.y -= 32;\n        let data = C0.ESC + '[24';\n        if (button === 0) data += '1';\n        else if (button === 1) data += '3';\n        else if (button === 2) data += '5';\n        else if (button === 3) return;\n        else data += '0';\n        data += '~[' + pos.x + ',' + pos.y + ']\\r';\n        self.send(data);\n        return;\n      }\n\n      if (self.decLocator) {\n        // NOTE: Unstable.\n        button &= 3;\n        pos.x -= 32;\n        pos.y -= 32;\n        if (button === 0) button = 2;\n        else if (button === 1) button = 4;\n        else if (button === 2) button = 6;\n        else if (button === 3) button = 3;\n        self.send(C0.ESC + '['\n                  + button\n                  + ';'\n                  + (button === 3 ? 4 : 0)\n                  + ';'\n                  + pos.y\n                  + ';'\n                  + pos.x\n                  + ';'\n                  // Not sure what page is meant to be\n                  + (<any>pos).page || 0\n                  + '&w');\n        return;\n      }\n\n      if (self.urxvtMouse) {\n        pos.x -= 32;\n        pos.y -= 32;\n        pos.x++;\n        pos.y++;\n        self.send(C0.ESC + '[' + button + ';' + pos.x + ';' + pos.y + 'M');\n        return;\n      }\n\n      if (self.sgrMouse) {\n        pos.x -= 32;\n        pos.y -= 32;\n        self.send(C0.ESC + '[<'\n                  + (((button & 3) === 3 ? button & ~3 : button) - 32)\n                  + ';'\n                  + pos.x\n                  + ';'\n                  + pos.y\n                  + ((button & 3) === 3 ? 'm' : 'M'));\n        return;\n      }\n\n      let data: number[] = [];\n\n      encode(data, button);\n      encode(data, pos.x);\n      encode(data, pos.y);\n\n      self.send(C0.ESC + '[M' + String.fromCharCode.apply(String, data));\n    }\n\n    function getButton(ev: MouseEvent): number {\n      let button;\n      let shift;\n      let meta;\n      let ctrl;\n      let mod;\n\n      // two low bits:\n      // 0 = left\n      // 1 = middle\n      // 2 = right\n      // 3 = release\n      // wheel up/down:\n      // 1, and 2 - with 64 added\n      switch ((<any>ev).overrideType || ev.type) {\n        case 'mousedown':\n          button = ev.button != null\n            ? +ev.button\n          : ev.which != null\n            ? ev.which - 1\n          : null;\n\n          if (Browser.isMSIE) {\n            button = button === 1 ? 0 : button === 4 ? 1 : button;\n          }\n          break;\n        case 'mouseup':\n          button = 3;\n          break;\n        case 'DOMMouseScroll':\n          button = ev.detail < 0\n            ? 64\n          : 65;\n          break;\n        case 'wheel':\n          button = (<WheelEvent>ev).wheelDeltaY > 0\n            ? 64\n          : 65;\n          break;\n      }\n\n      // next three bits are the modifiers:\n      // 4 = shift, 8 = meta, 16 = control\n      shift = ev.shiftKey ? 4 : 0;\n      meta = ev.metaKey ? 8 : 0;\n      ctrl = ev.ctrlKey ? 16 : 0;\n      mod = shift | meta | ctrl;\n\n      // no mods\n      if (self.vt200Mouse) {\n        // ctrl only\n        mod &= ctrl;\n      } else if (!self.normalMouse) {\n        mod = 0;\n      }\n\n      // increment to SP\n      button = (32 + (mod << 2)) + button;\n\n      return button;\n    }\n\n    on(el, 'mousedown', (ev: MouseEvent) => {\n\n      // Prevent the focus on the textarea from getting lost\n      // and make sure we get focused on mousedown\n      ev.preventDefault();\n      this.focus();\n\n      // Don't send the mouse button to the pty if mouse events are disabled or\n      // if the selection manager is having selection forced (ie. a modifier is\n      // held).\n      if (!this.mouseEvents || this.selectionManager.shouldForceSelection(ev)) {\n        return;\n      }\n\n      // send the button\n      sendButton(ev);\n\n      // fix for odd bug\n      // if (this.vt200Mouse && !this.normalMouse) {\n      if (this.vt200Mouse) {\n        (<any>ev).overrideType = 'mouseup';\n        sendButton(ev);\n        return this.cancel(ev);\n      }\n\n      // bind events\n      if (this.normalMouse) on(this.document, 'mousemove', sendMove);\n\n      // x10 compatibility mode can't send button releases\n      if (!this.x10Mouse) {\n        const handler = (ev: MouseEvent) => {\n          sendButton(ev);\n          // TODO: Seems dangerous calling this on document?\n          if (this.normalMouse) off(this.document, 'mousemove', sendMove);\n          off(this.document, 'mouseup', handler);\n          return this.cancel(ev);\n        };\n        // TODO: Seems dangerous calling this on document?\n        on(this.document, 'mouseup', handler);\n      }\n\n      return this.cancel(ev);\n    });\n\n    // if (this.normalMouse) {\n    //  on(this.document, 'mousemove', sendMove);\n    // }\n\n    on(el, 'wheel', (ev: WheelEvent) => {\n      if (!this.mouseEvents) return;\n      if (this.x10Mouse || this.vt300Mouse || this.decLocator) return;\n      sendButton(ev);\n      ev.preventDefault();\n    });\n\n    // allow wheel scrolling in\n    // the shell for example\n    on(el, 'wheel', (ev: WheelEvent) => {\n      if (this.mouseEvents) return;\n      this.viewport.onWheel(ev);\n      return this.cancel(ev);\n    });\n\n    on(el, 'touchstart', (ev: TouchEvent) => {\n      if (this.mouseEvents) return;\n      this.viewport.onTouchStart(ev);\n      return this.cancel(ev);\n    });\n\n    on(el, 'touchmove', (ev: TouchEvent) => {\n      if (this.mouseEvents) return;\n      this.viewport.onTouchMove(ev);\n      return this.cancel(ev);\n    });\n  }\n\n  /**\n   * Destroys the terminal.\n   */\n  public destroy(): void {\n    super.destroy();\n    this.readable = false;\n    this.writable = false;\n    this.handler = () => {};\n    this.write = () => {};\n    if (this.element && this.element.parentNode) {\n      this.element.parentNode.removeChild(this.element);\n    }\n    // this.emit('close');\n  }\n\n  /**\n   * Tells the renderer to refresh terminal content between two rows (inclusive) at the next\n   * opportunity.\n   * @param {number} start The row to start from (between 0 and this.rows - 1).\n   * @param {number} end The row to end at (between start and this.rows - 1).\n   */\n  public refresh(start: number, end: number): void {\n    if (this.renderer) {\n      this.renderer.queueRefresh(start, end);\n    }\n  }\n\n  /**\n   * Queues linkification for the specified rows.\n   * @param {number} start The row to start from (between 0 and this.rows - 1).\n   * @param {number} end The row to end at (between start and this.rows - 1).\n   */\n  private queueLinkification(start: number, end: number): void {\n    if (this.linkifier) {\n      this.linkifier.linkifyRows(start, end);\n    }\n  }\n\n  /**\n   * Display the cursor element\n   */\n  public showCursor(): void {\n    if (!this.cursorState) {\n      this.cursorState = 1;\n      this.refresh(this.buffer.y, this.buffer.y);\n    }\n  }\n\n  /**\n   * Scroll the terminal down 1 row, creating a blank line.\n   * @param isWrapped Whether the new line is wrapped from the previous line.\n   */\n  public scroll(isWrapped?: boolean): void {\n    const newLine = this.blankLine(undefined, isWrapped);\n    const topRow = this.buffer.ybase + this.buffer.scrollTop;\n    let bottomRow = this.buffer.ybase + this.buffer.scrollBottom;\n\n    if (this.buffer.scrollTop === 0) {\n      // Determine whether the buffer is going to be trimmed after insertion.\n      const willBufferBeTrimmed = this.buffer.lines.length === this.buffer.lines.maxLength;\n\n      // Insert the line using the fastest method\n      if (bottomRow === this.buffer.lines.length - 1) {\n        this.buffer.lines.push(newLine);\n      } else {\n        this.buffer.lines.splice(bottomRow + 1, 0, newLine);\n      }\n\n      // Only adjust ybase and ydisp when the buffer is not trimmed\n      if (!willBufferBeTrimmed) {\n        this.buffer.ybase++;\n        // Only scroll the ydisp with ybase if the user has not scrolled up\n        if (!this.userScrolling) {\n          this.buffer.ydisp++;\n        }\n      } else {\n        // When the buffer is full and the user has scrolled up, keep the text\n        // stable unless ydisp is right at the top\n        if (this.userScrolling) {\n          this.buffer.ydisp = Math.max(this.buffer.ydisp - 1, 0);\n        }\n      }\n    } else {\n      // scrollTop is non-zero which means no line will be going to the\n      // scrollback, instead we can just shift them in-place.\n      const scrollRegionHeight = bottomRow - topRow + 1/*as it's zero-based*/;\n      this.buffer.lines.shiftElements(topRow + 1, scrollRegionHeight - 1, -1);\n      this.buffer.lines.set(bottomRow, newLine);\n    }\n\n    // Move the viewport to the bottom of the buffer unless the user is\n    // scrolling.\n    if (!this.userScrolling) {\n      this.buffer.ydisp = this.buffer.ybase;\n    }\n\n    // Flag rows that need updating\n    this.updateRange(this.buffer.scrollTop);\n    this.updateRange(this.buffer.scrollBottom);\n\n    /**\n     * This event is emitted whenever the terminal is scrolled.\n     * The one parameter passed is the new y display position.\n     *\n     * @event scroll\n     */\n    this.emit('scroll', this.buffer.ydisp);\n  }\n\n  /**\n   * Scroll the display of the terminal\n   * @param {number} disp The number of lines to scroll down (negative scroll up).\n   * @param {boolean} suppressScrollEvent Don't emit the scroll event as scrollLines. This is used\n   * to avoid unwanted events being handled by the viewport when the event was triggered from the\n   * viewport originally.\n   */\n  public scrollLines(disp: number, suppressScrollEvent?: boolean): void {\n    if (disp < 0) {\n      if (this.buffer.ydisp === 0) {\n        return;\n      }\n      this.userScrolling = true;\n    } else if (disp + this.buffer.ydisp >= this.buffer.ybase) {\n      this.userScrolling = false;\n    }\n\n    const oldYdisp = this.buffer.ydisp;\n    this.buffer.ydisp = Math.max(Math.min(this.buffer.ydisp + disp, this.buffer.ybase), 0);\n\n    // No change occurred, don't trigger scroll/refresh\n    if (oldYdisp === this.buffer.ydisp) {\n      return;\n    }\n\n    if (!suppressScrollEvent) {\n      this.emit('scroll', this.buffer.ydisp);\n    }\n\n    this.refresh(0, this.rows - 1);\n  }\n\n  /**\n   * Scroll the display of the terminal by a number of pages.\n   * @param {number} pageCount The number of pages to scroll (negative scrolls up).\n   */\n  public scrollPages(pageCount: number): void {\n    this.scrollLines(pageCount * (this.rows - 1));\n  }\n\n  /**\n   * Scrolls the display of the terminal to the top.\n   */\n  public scrollToTop(): void {\n    this.scrollLines(-this.buffer.ydisp);\n  }\n\n  /**\n   * Scrolls the display of the terminal to the bottom.\n   */\n  public scrollToBottom(): void {\n    this.scrollLines(this.buffer.ybase - this.buffer.ydisp);\n  }\n\n  /**\n   * Writes text to the terminal.\n   * @param {string} data The text to write to the terminal.\n   */\n  public write(data: string): void {\n    this.writeBuffer.push(data);\n\n    // Send XOFF to pause the pty process if the write buffer becomes too large so\n    // xterm.js can catch up before more data is sent. This is necessary in order\n    // to keep signals such as ^C responsive.\n    if (this.options.useFlowControl && !this.xoffSentToCatchUp && this.writeBuffer.length >= WRITE_BUFFER_PAUSE_THRESHOLD) {\n      // XOFF - stop pty pipe\n      // XON will be triggered by emulator before processing data chunk\n      this.send(C0.DC3);\n      this.xoffSentToCatchUp = true;\n    }\n\n    if (!this.writeInProgress && this.writeBuffer.length > 0) {\n      // Kick off a write which will write all data in sequence recursively\n      this.writeInProgress = true;\n      // Kick off an async innerWrite so more writes can come in while processing data\n      setTimeout(() => {\n        this.innerWrite();\n      });\n    }\n  }\n\n  private innerWrite(): void {\n    const writeBatch = this.writeBuffer.splice(0, WRITE_BATCH_SIZE);\n    while (writeBatch.length > 0) {\n      const data = writeBatch.shift();\n\n      // If XOFF was sent in order to catch up with the pty process, resume it if\n      // the writeBuffer is empty to allow more data to come in.\n      if (this.xoffSentToCatchUp && writeBatch.length === 0 && this.writeBuffer.length === 0) {\n        this.send(C0.DC1);\n        this.xoffSentToCatchUp = false;\n      }\n\n      this.refreshStart = this.buffer.y;\n      this.refreshEnd = this.buffer.y;\n\n      // HACK: Set the parser state based on it's state at the time of return.\n      // This works around the bug #662 which saw the parser state reset in the\n      // middle of parsing escape sequence in two chunks. For some reason the\n      // state of the parser resets to 0 after exiting parser.parse. This change\n      // just sets the state back based on the correct return statement.\n      const state = this.parser.parse(data);\n      this.parser.setState(state);\n\n      this.updateRange(this.buffer.y);\n      this.refresh(this.refreshStart, this.refreshEnd);\n    }\n    if (this.writeBuffer.length > 0) {\n      // Allow renderer to catch up before processing the next batch\n      setTimeout(() => this.innerWrite(), 0);\n    } else {\n      this.writeInProgress = false;\n    }\n  }\n\n  /**\n   * Writes text to the terminal, followed by a break line character (\\n).\n   * @param {string} data The text to write to the terminal.\n   */\n  public writeln(data: string): void {\n    this.write(data + '\\r\\n');\n  }\n\n  /**\n   * Attaches a custom key event handler which is run before keys are processed,\n   * giving consumers of xterm.js ultimate control as to what keys should be\n   * processed by the terminal and what keys should not.\n   * @param customKeyEventHandler The custom KeyboardEvent handler to attach.\n   * This is a function that takes a KeyboardEvent, allowing consumers to stop\n   * propogation and/or prevent the default action. The function returns whether\n   * the event should be processed by xterm.js.\n   */\n  public attachCustomKeyEventHandler(customKeyEventHandler: CustomKeyEventHandler): void {\n    this.customKeyEventHandler = customKeyEventHandler;\n  }\n\n  /**\n   * Attaches a http(s) link handler, forcing web links to behave differently to\n   * regular <a> tags. This will trigger a refresh as links potentially need to be\n   * reconstructed. Calling this with null will remove the handler.\n   * @param handler The handler callback function.\n   */\n  public setHypertextLinkHandler(handler: LinkMatcherHandler): void {\n    if (!this.linkifier) {\n      throw new Error('Cannot attach a hypertext link handler before Terminal.open is called');\n    }\n    this.linkifier.setHypertextLinkHandler(handler);\n    // Refresh to force links to refresh\n    this.refresh(0, this.rows - 1);\n  }\n\n  /**\n   * Attaches a validation callback for hypertext links. This is useful to use\n   * validation logic or to do something with the link's element and url.\n   * @param callback The callback to use, this can\n   * be cleared with null.\n   */\n  public setHypertextValidationCallback(callback: LinkMatcherValidationCallback): void {\n    if (!this.linkifier) {\n      throw new Error('Cannot attach a hypertext validation callback before Terminal.open is called');\n    }\n    this.linkifier.setHypertextValidationCallback(callback);\n    // // Refresh to force links to refresh\n    this.refresh(0, this.rows - 1);\n  }\n\n  /**\n   * Registers a link matcher, allowing custom link patterns to be matched and\n   * handled.\n   * @param regex The regular expression to search for, specifically\n   * this searches the textContent of the rows. You will want to use \\s to match\n   * a space ' ' character for example.\n   * @param handler The callback when the link is called.\n   * @param options Options for the link matcher.\n   * @return The ID of the new matcher, this can be used to deregister.\n   */\n  public registerLinkMatcher(regex: RegExp, handler: LinkMatcherHandler, options?: ILinkMatcherOptions): number {\n    if (this.linkifier) {\n      const matcherId = this.linkifier.registerLinkMatcher(regex, handler, options);\n      this.refresh(0, this.rows - 1);\n      return matcherId;\n    }\n    return 0;\n  }\n\n  /**\n   * Deregisters a link matcher if it has been registered.\n   * @param matcherId The link matcher's ID (returned after register)\n   */\n  public deregisterLinkMatcher(matcherId: number): void {\n    if (this.linkifier) {\n      if (this.linkifier.deregisterLinkMatcher(matcherId)) {\n        this.refresh(0, this.rows - 1);\n      }\n    }\n  }\n\n  /**\n   * Gets whether the terminal has an active selection.\n   */\n  public hasSelection(): boolean {\n    return this.selectionManager ? this.selectionManager.hasSelection : false;\n  }\n\n  /**\n   * Gets the terminal's current selection, this is useful for implementing copy\n   * behavior outside of xterm.js.\n   */\n  public getSelection(): string {\n    return this.selectionManager ? this.selectionManager.selectionText : '';\n  }\n\n  /**\n   * Clears the current terminal selection.\n   */\n  public clearSelection(): void {\n    if (this.selectionManager) {\n      this.selectionManager.clearSelection();\n    }\n  }\n\n  /**\n   * Selects all text within the terminal.\n   */\n  public selectAll(): void {\n    if (this.selectionManager) {\n      this.selectionManager.selectAll();\n    }\n  }\n\n  /**\n   * Handle a keydown event\n   * Key Resources:\n   *   - https://developer.mozilla.org/en-US/docs/DOM/KeyboardEvent\n   * @param {KeyboardEvent} ev The keydown event to be handled.\n   */\n  protected _keyDown(ev: KeyboardEvent): boolean {\n    if (this.customKeyEventHandler && this.customKeyEventHandler(ev) === false) {\n      return false;\n    }\n\n    if (!this.compositionHelper.keydown(ev)) {\n      if (this.buffer.ybase !== this.buffer.ydisp) {\n        this.scrollToBottom();\n      }\n      return false;\n    }\n\n    const result = this._evaluateKeyEscapeSequence(ev);\n\n    if (result.key === C0.DC3) { // XOFF\n      this.writeStopped = true;\n    } else if (result.key === C0.DC1) { // XON\n      this.writeStopped = false;\n    }\n\n    if (result.scrollLines) {\n      this.scrollLines(result.scrollLines);\n      return this.cancel(ev, true);\n    }\n\n    if (isThirdLevelShift(this.browser, ev)) {\n      return true;\n    }\n\n    if (result.cancel) {\n      // The event is canceled at the end already, is this necessary?\n      this.cancel(ev, true);\n    }\n\n    if (!result.key) {\n      return true;\n    }\n\n    this.emit('keydown', ev);\n    this.emit('key', result.key, ev);\n    this.showCursor();\n    this.handler(result.key);\n\n    return this.cancel(ev, true);\n  }\n\n  /**\n   * Returns an object that determines how a KeyboardEvent should be handled. The key of the\n   * returned value is the new key code to pass to the PTY.\n   *\n   * Reference: http://invisible-island.net/xterm/ctlseqs/ctlseqs.html\n   * @param ev The keyboard event to be translated to key escape sequence.\n   */\n  protected _evaluateKeyEscapeSequence(ev: KeyboardEvent): {cancel: boolean, key: string, scrollLines: number} {\n    const result: {cancel: boolean, key: string, scrollLines: number} = {\n      // Whether to cancel event propogation (NOTE: this may not be needed since the event is\n      // canceled at the end of keyDown\n      cancel: false,\n      // The new key even to emit\n      key: undefined,\n      // The number of characters to scroll, if this is defined it will cancel the event\n      scrollLines: undefined\n    };\n    const modifiers = (ev.shiftKey ? 1 : 0) | (ev.altKey ? 2 : 0) | (ev.ctrlKey ? 4 : 0) | (ev.metaKey ? 8 : 0);\n    switch (ev.keyCode) {\n      case 0:\n        if (ev.key === 'UIKeyInputUpArrow') {\n          if (this.applicationCursor) {\n            result.key = C0.ESC + 'OA';\n          } else {\n            result.key = C0.ESC + '[A';\n          }\n        }\n        else if (ev.key === 'UIKeyInputLeftArrow') {\n          if (this.applicationCursor) {\n            result.key = C0.ESC + 'OD';\n          } else {\n            result.key = C0.ESC + '[D';\n          }\n        }\n        else if (ev.key === 'UIKeyInputRightArrow') {\n          if (this.applicationCursor) {\n            result.key = C0.ESC + 'OC';\n          } else {\n            result.key = C0.ESC + '[C';\n          }\n        }\n        else if (ev.key === 'UIKeyInputDownArrow') {\n          if (this.applicationCursor) {\n            result.key = C0.ESC + 'OB';\n          } else {\n            result.key = C0.ESC + '[B';\n          }\n        }\n        break;\n      case 8:\n        // backspace\n        if (ev.shiftKey) {\n          result.key = C0.BS; // ^H\n          break;\n        }\n        result.key = C0.DEL; // ^?\n        break;\n      case 9:\n        // tab\n        if (ev.shiftKey) {\n          result.key = C0.ESC + '[Z';\n          break;\n        }\n        result.key = C0.HT;\n        result.cancel = true;\n        break;\n      case 13:\n        // return/enter\n        result.key = C0.CR;\n        result.cancel = true;\n        break;\n      case 27:\n        // escape\n        result.key = C0.ESC;\n        result.cancel = true;\n        break;\n      case 37:\n        // left-arrow\n        if (modifiers) {\n          result.key = C0.ESC + '[1;' + (modifiers + 1) + 'D';\n          // HACK: Make Alt + left-arrow behave like Ctrl + left-arrow: move one word backwards\n          // http://unix.stackexchange.com/a/108106\n          // macOS uses different escape sequences than linux\n          if (result.key === C0.ESC + '[1;3D') {\n            result.key = (this.browser.isMac) ? C0.ESC + 'b' : C0.ESC + '[1;5D';\n          }\n        } else if (this.applicationCursor) {\n          result.key = C0.ESC + 'OD';\n        } else {\n          result.key = C0.ESC + '[D';\n        }\n        break;\n      case 39:\n        // right-arrow\n        if (modifiers) {\n          result.key = C0.ESC + '[1;' + (modifiers + 1) + 'C';\n          // HACK: Make Alt + right-arrow behave like Ctrl + right-arrow: move one word forward\n          // http://unix.stackexchange.com/a/108106\n          // macOS uses different escape sequences than linux\n          if (result.key === C0.ESC + '[1;3C') {\n            result.key = (this.browser.isMac) ? C0.ESC + 'f' : C0.ESC + '[1;5C';\n          }\n        } else if (this.applicationCursor) {\n          result.key = C0.ESC + 'OC';\n        } else {\n          result.key = C0.ESC + '[C';\n        }\n        break;\n      case 38:\n        // up-arrow\n        if (modifiers) {\n          result.key = C0.ESC + '[1;' + (modifiers + 1) + 'A';\n          // HACK: Make Alt + up-arrow behave like Ctrl + up-arrow\n          // http://unix.stackexchange.com/a/108106\n          if (result.key === C0.ESC + '[1;3A') {\n            result.key = C0.ESC + '[1;5A';\n          }\n        } else if (this.applicationCursor) {\n          result.key = C0.ESC + 'OA';\n        } else {\n          result.key = C0.ESC + '[A';\n        }\n        break;\n      case 40:\n        // down-arrow\n        if (modifiers) {\n          result.key = C0.ESC + '[1;' + (modifiers + 1) + 'B';\n          // HACK: Make Alt + down-arrow behave like Ctrl + down-arrow\n          // http://unix.stackexchange.com/a/108106\n          if (result.key === C0.ESC + '[1;3B') {\n            result.key = C0.ESC + '[1;5B';\n          }\n        } else if (this.applicationCursor) {\n          result.key = C0.ESC + 'OB';\n        } else {\n          result.key = C0.ESC + '[B';\n        }\n        break;\n      case 45:\n        // insert\n        if (!ev.shiftKey && !ev.ctrlKey) {\n          // <Ctrl> or <Shift> + <Insert> are used to\n          // copy-paste on some systems.\n          result.key = C0.ESC + '[2~';\n        }\n        break;\n      case 46:\n        // delete\n        if (modifiers) {\n          result.key = C0.ESC + '[3;' + (modifiers + 1) + '~';\n        } else {\n          result.key = C0.ESC + '[3~';\n        }\n        break;\n      case 36:\n        // home\n        if (modifiers)\n          result.key = C0.ESC + '[1;' + (modifiers + 1) + 'H';\n        else if (this.applicationCursor)\n          result.key = C0.ESC + 'OH';\n        else\n          result.key = C0.ESC + '[H';\n        break;\n      case 35:\n        // end\n        if (modifiers)\n          result.key = C0.ESC + '[1;' + (modifiers + 1) + 'F';\n        else if (this.applicationCursor)\n          result.key = C0.ESC + 'OF';\n        else\n          result.key = C0.ESC + '[F';\n        break;\n      case 33:\n        // page up\n        if (ev.shiftKey) {\n          result.scrollLines = -(this.rows - 1);\n        } else {\n          result.key = C0.ESC + '[5~';\n        }\n        break;\n      case 34:\n        // page down\n        if (ev.shiftKey) {\n          result.scrollLines = this.rows - 1;\n        } else {\n          result.key = C0.ESC + '[6~';\n        }\n        break;\n      case 112:\n        // F1-F12\n        if (modifiers) {\n          result.key = C0.ESC + '[1;' + (modifiers + 1) + 'P';\n        } else {\n          result.key = C0.ESC + 'OP';\n        }\n        break;\n      case 113:\n        if (modifiers) {\n          result.key = C0.ESC + '[1;' + (modifiers + 1) + 'Q';\n        } else {\n          result.key = C0.ESC + 'OQ';\n        }\n        break;\n      case 114:\n        if (modifiers) {\n          result.key = C0.ESC + '[1;' + (modifiers + 1) + 'R';\n        } else {\n          result.key = C0.ESC + 'OR';\n        }\n        break;\n      case 115:\n        if (modifiers) {\n          result.key = C0.ESC + '[1;' + (modifiers + 1) + 'S';\n        } else {\n          result.key = C0.ESC + 'OS';\n        }\n        break;\n      case 116:\n        if (modifiers) {\n          result.key = C0.ESC + '[15;' + (modifiers + 1) + '~';\n        } else {\n          result.key = C0.ESC + '[15~';\n        }\n        break;\n      case 117:\n        if (modifiers) {\n          result.key = C0.ESC + '[17;' + (modifiers + 1) + '~';\n        } else {\n          result.key = C0.ESC + '[17~';\n        }\n        break;\n      case 118:\n        if (modifiers) {\n          result.key = C0.ESC + '[18;' + (modifiers + 1) + '~';\n        } else {\n          result.key = C0.ESC + '[18~';\n        }\n        break;\n      case 119:\n        if (modifiers) {\n          result.key = C0.ESC + '[19;' + (modifiers + 1) + '~';\n        } else {\n          result.key = C0.ESC + '[19~';\n        }\n        break;\n      case 120:\n        if (modifiers) {\n          result.key = C0.ESC + '[20;' + (modifiers + 1) + '~';\n        } else {\n          result.key = C0.ESC + '[20~';\n        }\n        break;\n      case 121:\n        if (modifiers) {\n          result.key = C0.ESC + '[21;' + (modifiers + 1) + '~';\n        } else {\n          result.key = C0.ESC + '[21~';\n        }\n        break;\n      case 122:\n        if (modifiers) {\n          result.key = C0.ESC + '[23;' + (modifiers + 1) + '~';\n        } else {\n          result.key = C0.ESC + '[23~';\n        }\n        break;\n      case 123:\n        if (modifiers) {\n          result.key = C0.ESC + '[24;' + (modifiers + 1) + '~';\n        } else {\n          result.key = C0.ESC + '[24~';\n        }\n        break;\n      default:\n        // a-z and space\n        if (ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) {\n          if (ev.keyCode >= 65 && ev.keyCode <= 90) {\n            result.key = String.fromCharCode(ev.keyCode - 64);\n          } else if (ev.keyCode === 32) {\n            // NUL\n            result.key = String.fromCharCode(0);\n          } else if (ev.keyCode >= 51 && ev.keyCode <= 55) {\n            // escape, file sep, group sep, record sep, unit sep\n            result.key = String.fromCharCode(ev.keyCode - 51 + 27);\n          } else if (ev.keyCode === 56) {\n            // delete\n            result.key = String.fromCharCode(127);\n          } else if (ev.keyCode === 219) {\n            // ^[ - Control Sequence Introducer (CSI)\n            result.key = String.fromCharCode(27);\n          } else if (ev.keyCode === 220) {\n            // ^\\ - String Terminator (ST)\n            result.key = String.fromCharCode(28);\n          } else if (ev.keyCode === 221) {\n            // ^] - Operating System Command (OSC)\n            result.key = String.fromCharCode(29);\n          }\n        } else if (!this.browser.isMac && ev.altKey && !ev.ctrlKey && !ev.metaKey) {\n          // On Mac this is a third level shift. Use <Esc> instead.\n          if (ev.keyCode >= 65 && ev.keyCode <= 90) {\n            result.key = C0.ESC + String.fromCharCode(ev.keyCode + 32);\n          } else if (ev.keyCode === 192) {\n            result.key = C0.ESC + '`';\n          } else if (ev.keyCode >= 48 && ev.keyCode <= 57) {\n            result.key = C0.ESC + (ev.keyCode - 48);\n          }\n        } else if (this.browser.isMac && !ev.altKey && !ev.ctrlKey && ev.metaKey) {\n          if (ev.keyCode === 65) { // cmd + a\n            this.selectAll();\n          }\n        }\n        break;\n    }\n\n    return result;\n  }\n\n  /**\n   * Set the G level of the terminal\n   * @param g\n   */\n  public setgLevel(g: number): void {\n    this.glevel = g;\n    this.charset = this.charsets[g];\n  }\n\n  /**\n   * Set the charset for the given G level of the terminal\n   * @param g\n   * @param charset\n   */\n  public setgCharset(g: number, charset: Charset): void {\n    this.charsets[g] = charset;\n    if (this.glevel === g) {\n      this.charset = charset;\n    }\n  }\n\n  /**\n   * Handle a keypress event.\n   * Key Resources:\n   *   - https://developer.mozilla.org/en-US/docs/DOM/KeyboardEvent\n   * @param {KeyboardEvent} ev The keypress event to be handled.\n   */\n  protected _keyPress(ev: KeyboardEvent): boolean {\n    let key;\n\n    if (this.customKeyEventHandler && this.customKeyEventHandler(ev) === false) {\n      return false;\n    }\n\n    this.cancel(ev);\n\n    if (ev.charCode) {\n      key = ev.charCode;\n    } else if (ev.which == null) {\n      key = ev.keyCode;\n    } else if (ev.which !== 0 && ev.charCode !== 0) {\n      key = ev.which;\n    } else {\n      return false;\n    }\n\n    if (!key || (\n      (ev.altKey || ev.ctrlKey || ev.metaKey) && !isThirdLevelShift(this.browser, ev)\n    )) {\n      return false;\n    }\n\n    key = String.fromCharCode(key);\n\n    this.emit('keypress', key, ev);\n    this.emit('key', key, ev);\n    this.showCursor();\n    this.handler(key);\n\n    return true;\n  }\n\n  /**\n   * Send data for handling to the terminal\n   * @param {string} data\n   */\n  public send(data: string): void {\n    if (!this.sendDataQueue) {\n      setTimeout(() => {\n        this.handler(this.sendDataQueue);\n        this.sendDataQueue = '';\n      }, 1);\n    }\n\n    this.sendDataQueue += data;\n  }\n\n  /**\n   * Ring the bell.\n   * Note: We could do sweet things with webaudio here\n   */\n  public bell(): void {\n    this.emit('bell');\n    if (this.soundBell()) this.bellAudioElement.play();\n\n    if (this.visualBell()) {\n      this.element.classList.add('visual-bell-active');\n      clearTimeout(this.visualBellTimer);\n      this.visualBellTimer = window.setTimeout(() => {\n        this.element.classList.remove('visual-bell-active');\n      }, 200);\n    }\n  }\n\n  /**\n   * Log the current state to the console.\n   */\n  public log(text: string, data?: any): void {\n    if (!this.options.debug) return;\n    if (!this.context.console || !this.context.console.log) return;\n    this.context.console.log(text, data);\n  }\n\n  /**\n   * Log the current state as error to the console.\n   */\n  public error(text: string, data?: any): void {\n    if (!this.options.debug) return;\n    if (!this.context.console || !this.context.console.error) return;\n    this.context.console.error(text, data);\n  }\n\n  /**\n   * Resizes the terminal.\n   *\n   * @param {number} x The number of columns to resize to.\n   * @param {number} y The number of rows to resize to.\n   */\n  public resize(x: number, y: number): void {\n    if (isNaN(x) || isNaN(y)) {\n      return;\n    }\n\n    if (x === this.cols && y === this.rows) {\n      // Check if we still need to measure the char size (fixes #785).\n      if (!this.charMeasure.width || !this.charMeasure.height) {\n        this.charMeasure.measure(this.options);\n      }\n      return;\n    }\n\n    if (x < 1) x = 1;\n    if (y < 1) y = 1;\n\n    this.buffers.resize(x, y);\n\n    this.cols = x;\n    this.rows = y;\n    this.buffers.setupTabStops(this.cols);\n\n    this.charMeasure.measure(this.options);\n\n    this.refresh(0, this.rows - 1);\n\n    this.geometry = [this.cols, this.rows];\n    this.emit('resize', {cols: x, rows: y});\n  }\n\n  /**\n   * Updates the range of rows to refresh\n   * @param {number} y The number of rows to refresh next.\n   */\n  public updateRange(y: number): void {\n    if (y < this.refreshStart) this.refreshStart = y;\n    if (y > this.refreshEnd) this.refreshEnd = y;\n    // if (y > this.refreshEnd) {\n    //   this.refreshEnd = y;\n    //   if (y > this.rows - 1) {\n    //     this.refreshEnd = this.rows - 1;\n    //   }\n    // }\n  }\n\n  /**\n   * Set the range of refreshing to the maximum value\n   */\n  public maxRange(): void {\n    this.refreshStart = 0;\n    this.refreshEnd = this.rows - 1;\n  }\n\n  /**\n   * Erase in the identified line everything from \"x\" to the end of the line (right).\n   * @param {number} x The column from which to start erasing to the end of the line.\n   * @param {number} y The line in which to operate.\n   */\n  public eraseRight(x: number, y: number): void {\n    const line = this.buffer.lines.get(this.buffer.ybase + y);\n    if (!line) {\n      return;\n    }\n    const ch: CharData = [this.eraseAttr(), ' ', 1, 32 /* ' '.charCodeAt(0) */]; // xterm\n    for (; x < this.cols; x++) {\n      line[x] = ch;\n    }\n    this.updateRange(y);\n  }\n\n  /**\n   * Erase in the identified line everything from \"x\" to the start of the line (left).\n   * @param {number} x The column from which to start erasing to the start of the line.\n   * @param {number} y The line in which to operate.\n   */\n  public eraseLeft(x: number, y: number): void {\n    const line = this.buffer.lines.get(this.buffer.ybase + y);\n    if (!line) {\n      return;\n    }\n    const ch: CharData = [this.eraseAttr(), ' ', 1, 32 /* ' '.charCodeAt(0) */]; // xterm\n    x++;\n    while (x--) {\n      line[x] = ch;\n    }\n    this.updateRange(y);\n  }\n\n  /**\n   * Clear the entire buffer, making the prompt line the new first line.\n   */\n  public clear(): void {\n    if (this.buffer.ybase === 0 && this.buffer.y === 0) {\n      // Don't clear if it's already clear\n      return;\n    }\n    this.buffer.lines.set(0, this.buffer.lines.get(this.buffer.ybase + this.buffer.y));\n    this.buffer.lines.length = 1;\n    this.buffer.ydisp = 0;\n    this.buffer.ybase = 0;\n    this.buffer.y = 0;\n    for (let i = 1; i < this.rows; i++) {\n      this.buffer.lines.push(this.blankLine());\n    }\n    this.refresh(0, this.rows - 1);\n    this.emit('scroll', this.buffer.ydisp);\n  }\n\n  /**\n   * Erase all content in the given line\n   * @param {number} y The line to erase all of its contents.\n   */\n  public eraseLine(y: number): void {\n    this.eraseRight(0, y);\n  }\n\n  /**\n   * Return the data array of a blank line\n   * @param {boolean} cur First bunch of data for each \"blank\" character.\n   * @param {boolean} isWrapped Whether the new line is wrapped from the previous line.\n   * @param {boolean} cols The number of columns in the terminal, if this is not\n   * set, the terminal's current column count would be used.\n   */\n  public blankLine(cur?: boolean, isWrapped?: boolean, cols?: number): LineData {\n    const attr = cur ? this.eraseAttr() : this.defAttr;\n\n    const ch: CharData = [attr, ' ', 1, 32 /* ' '.charCodeAt(0) */]; // width defaults to 1 halfwidth character\n    const line: LineData = [];\n\n    // TODO: It is not ideal that this is a property on an array, a buffer line\n    // class should be added that will hold this data and other useful functions.\n    if (isWrapped) {\n      (<any>line).isWrapped = isWrapped;\n    }\n\n    cols = cols || this.cols;\n    for (let i = 0; i < cols; i++) {\n      line[i] = ch;\n    }\n\n    return line;\n  }\n\n  /**\n   * If cur return the back color xterm feature attribute. Else return defAttr.\n   * @param cur\n   */\n  public ch(cur?: boolean): CharData {\n    if (cur) {\n      return [this.eraseAttr(), ' ', 1, 32 /* ' '.charCodeAt(0) */];\n    }\n    return [this.defAttr, ' ', 1, 32 /* ' '.charCodeAt(0) */];\n  }\n\n  /**\n   * Evaluate if the current terminal is the given argument.\n   * @param term The terminal name to evaluate\n   */\n  public is(term: string): boolean {\n    return (this.options.termName + '').indexOf(term) === 0;\n  }\n\n  /**\n   * Emit the 'data' event and populate the given data.\n   * @param {string} data The data to populate in the event.\n   */\n  public handler(data: string): void {\n    // Prevents all events to pty process if stdin is disabled\n    if (this.options.disableStdin) {\n      return;\n    }\n\n    // Clear the selection if the selection manager is available and has an active selection\n    if (this.selectionManager && this.selectionManager.hasSelection) {\n      this.selectionManager.clearSelection();\n    }\n\n    // Input is being sent to the terminal, the terminal should focus the prompt.\n    if (this.buffer.ybase !== this.buffer.ydisp) {\n      this.scrollToBottom();\n    }\n    this.emit('data', data);\n  }\n\n  /**\n   * Emit the 'title' event and populate the given title.\n   * @param {string} title The title to populate in the event.\n   */\n  private handleTitle(title: string): void {\n    /**\n     * This event is emitted when the title of the terminal is changed\n     * from inside the terminal. The parameter is the new title.\n     *\n     * @event title\n     */\n    this.emit('title', title);\n  }\n\n  /**\n   * ESC\n   */\n\n  /**\n   * ESC D Index (IND is 0x84).\n   */\n  public index(): void {\n    this.buffer.y++;\n    if (this.buffer.y > this.buffer.scrollBottom) {\n      this.buffer.y--;\n      this.scroll();\n    }\n    // If the end of the line is hit, prevent this action from wrapping around to the next line.\n    if (this.buffer.x >= this.cols) {\n      this.buffer.x--;\n    }\n  }\n\n  /**\n   * ESC M Reverse Index (RI is 0x8d).\n   *\n   * Move the cursor up one row, inserting a new blank line if necessary.\n   */\n  public reverseIndex(): void {\n    if (this.buffer.y === this.buffer.scrollTop) {\n      // possibly move the code below to term.reverseScroll();\n      // test: echo -ne '\\e[1;1H\\e[44m\\eM\\e[0m'\n      // blankLine(true) is xterm/linux behavior\n      const scrollRegionHeight = this.buffer.scrollBottom - this.buffer.scrollTop;\n      this.buffer.lines.shiftElements(this.buffer.y + this.buffer.ybase, scrollRegionHeight, 1);\n      this.buffer.lines.set(this.buffer.y + this.buffer.ybase, this.blankLine(true));\n      this.updateRange(this.buffer.scrollTop);\n      this.updateRange(this.buffer.scrollBottom);\n    } else {\n      this.buffer.y--;\n    }\n  }\n\n  /**\n   * ESC c Full Reset (RIS).\n   */\n  public reset(): void {\n    this.options.rows = this.rows;\n    this.options.cols = this.cols;\n    const customKeyEventHandler = this.customKeyEventHandler;\n    const inputHandler = this.inputHandler;\n    const buffers = this.buffers;\n    this.setup();\n    this.customKeyEventHandler = customKeyEventHandler;\n    this.inputHandler = inputHandler;\n    this.buffers = buffers;\n    this.refresh(0, this.rows - 1);\n    this.viewport.syncScrollArea();\n  }\n\n\n  /**\n   * ESC H Tab Set (HTS is 0x88).\n   */\n  private tabSet(): void {\n    this.buffer.tabs[this.buffer.x] = true;\n  }\n\n  // TODO: Remove cancel function and cancelEvents option\n  public cancel(ev: Event, force?: boolean): boolean {\n    if (!this.options.cancelEvents && !force) {\n      return;\n    }\n    ev.preventDefault();\n    ev.stopPropagation();\n    return false;\n  }\n\n  // TODO: Remove when true color is implemented\n  public matchColor(r1: number, g1: number, b1: number): number {\n    return matchColor_(r1, g1, b1);\n  }\n\n  private visualBell(): boolean {\n    return this.options.bellStyle === 'visual' ||\n        this.options.bellStyle === 'both';\n  }\n\n  private soundBell(): boolean {\n    return this.options.bellStyle === 'sound' ||\n        this.options.bellStyle === 'both';\n  }\n\n  private syncBellSound(): void {\n    if (this.soundBell() && this.bellAudioElement) {\n      this.bellAudioElement.setAttribute('src', this.options.bellSound);\n    } else if (this.soundBell()) {\n      this.bellAudioElement = document.createElement('audio');\n      this.bellAudioElement.setAttribute('preload', 'auto');\n      this.bellAudioElement.setAttribute('src', this.options.bellSound);\n      this.helperContainer.appendChild(this.bellAudioElement);\n    } else if (this.bellAudioElement) {\n      this.helperContainer.removeChild(this.bellAudioElement);\n    }\n  }\n}\n\n/**\n * Helpers\n */\n\nfunction globalOn(el: any, type: string, handler: (event: Event) => any, capture?: boolean): void {\n  if (!Array.isArray(el)) {\n    el = [el];\n  }\n  el.forEach((element: HTMLElement) => {\n    element.addEventListener(type, handler, capture || false);\n  });\n}\n// TODO: Remove once everything is typed\nconst on = globalOn;\n\nfunction off(el: any, type: string, handler: (event: Event) => any, capture: boolean = false): void {\n  el.removeEventListener(type, handler, capture);\n}\n\nfunction isThirdLevelShift(browser: IBrowser, ev: KeyboardEvent): boolean {\n  const thirdLevelKey =\n      (browser.isMac && ev.altKey && !ev.ctrlKey && !ev.metaKey) ||\n      (browser.isMSWindows && ev.altKey && ev.ctrlKey && !ev.metaKey);\n\n  if (ev.type === 'keypress') {\n    return thirdLevelKey;\n  }\n\n  // Don't invoke for arrows, pageDown, home, backspace, etc. (on non-keypress events)\n  return thirdLevelKey && (!ev.keyCode || ev.keyCode > 47);\n}\n\nfunction wasMondifierKeyOnlyEvent(ev: KeyboardEvent): boolean {\n  return ev.keyCode === 16 || // Shift\n    ev.keyCode === 17 || // Ctrl\n    ev.keyCode === 18; // Alt\n}\n\n/**\n * TODO:\n * The below color-related code can be removed when true color is implemented.\n * It's only purpose is to match true color requests with the closest matching\n * ANSI color code.\n */\n\n// Colors 0-15 + 16-255\n// Much thanks to TooTallNate for writing this.\nconst vcolors: number[][] = (function(): number[][] {\n  const result = DEFAULT_ANSI_COLORS.map(c => {\n    c = c.substring(1);\n    return [\n      parseInt(c.substring(0, 2), 16),\n      parseInt(c.substring(2, 4), 16),\n      parseInt(c.substring(4, 6), 16)\n    ];\n  });\n  const r = [0x00, 0x5f, 0x87, 0xaf, 0xd7, 0xff];\n\n  // 16-231\n  for (let i = 0; i < 216; i++) {\n    result.push([\n      r[(i / 36) % 6 | 0],\n      r[(i / 6) % 6 | 0],\n      r[i % 6]\n    ]);\n  }\n\n  // 232-255 (grey)\n  let c: number;\n  for (let i = 0; i < 24; i++) {\n    c = 8 + i * 10;\n    result.push([c, c, c]);\n  }\n\n  return result;\n})();\n\nconst matchColorCache: {[colorRGBHash: number]: number} = {};\n\n// http://stackoverflow.com/questions/1633828\nfunction matchColorDistance(r1: number, g1: number, b1: number, r2: number, g2: number, b2: number): number {\n  return Math.pow(30 * (r1 - r2), 2)\n    + Math.pow(59 * (g1 - g2), 2)\n    + Math.pow(11 * (b1 - b2), 2);\n};\n\n\nfunction matchColor_(r1: number, g1: number, b1: number): number {\n  const hash = (r1 << 16) | (g1 << 8) | b1;\n\n  if (matchColorCache[hash] != null) {\n    return matchColorCache[hash];\n  }\n\n  let ldiff = Infinity;\n  let li = -1;\n  let i = 0;\n  let c: number[];\n  let r2: number;\n  let g2: number;\n  let b2: number;\n  let diff: number;\n\n  for (; i < vcolors.length; i++) {\n    c = vcolors[i];\n    r2 = c[0];\n    g2 = c[1];\n    b2 = c[2];\n\n    diff = matchColorDistance(r1, g1, b1, r2, g2, b2);\n\n    if (diff === 0) {\n      li = i;\n      break;\n    }\n\n    if (diff < ldiff) {\n      ldiff = diff;\n      li = i;\n    }\n  }\n\n  return matchColorCache[hash] = li;\n}\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { ITerminal } from './Interfaces';\n\n/**\n * Represents a selection within the buffer. This model only cares about column\n * and row coordinates, not wide characters.\n */\nexport class SelectionModel {\n  /**\n   * Whether select all is currently active.\n   */\n  public isSelectAllActive: boolean;\n\n  /**\n   * The [x, y] position the selection starts at.\n   */\n  public selectionStart: [number, number];\n\n  /**\n   * The minimal length of the selection from the start position. When double\n   * clicking on a word, the word will be selected which makes the selection\n   * start at the start of the word and makes this variable the length.\n   */\n  public selectionStartLength: number;\n\n  /**\n   * The [x, y] position the selection ends at.\n   */\n  public selectionEnd: [number, number];\n\n  constructor(\n    private _terminal: ITerminal\n  ) {\n    this.clearSelection();\n  }\n\n  /**\n   * Clears the current selection.\n   */\n  public clearSelection(): void {\n    this.selectionStart = null;\n    this.selectionEnd = null;\n    this.isSelectAllActive = false;\n    this.selectionStartLength = 0;\n  }\n\n  /**\n   * The final selection start, taking into consideration select all.\n   */\n  public get finalSelectionStart(): [number, number] {\n    if (this.isSelectAllActive) {\n      return [0, 0];\n    }\n\n    if (!this.selectionEnd || !this.selectionStart) {\n      return this.selectionStart;\n    }\n\n    return this.areSelectionValuesReversed() ? this.selectionEnd : this.selectionStart;\n  }\n\n  /**\n   * The final selection end, taking into consideration select all, double click\n   * word selection and triple click line selection.\n   */\n  public get finalSelectionEnd(): [number, number] {\n    if (this.isSelectAllActive) {\n      return [this._terminal.cols, this._terminal.buffer.ybase + this._terminal.rows - 1];\n    }\n\n    if (!this.selectionStart) {\n      return null;\n    }\n\n    // Use the selection start if the end doesn't exist or they're reversed\n    if (!this.selectionEnd || this.areSelectionValuesReversed()) {\n      return [this.selectionStart[0] + this.selectionStartLength, this.selectionStart[1]];\n    }\n\n    // Ensure the the word/line is selected after a double/triple click\n    if (this.selectionStartLength) {\n      // Select the larger of the two when start and end are on the same line\n      if (this.selectionEnd[1] === this.selectionStart[1]) {\n        return [Math.max(this.selectionStart[0] + this.selectionStartLength, this.selectionEnd[0]), this.selectionEnd[1]];\n      }\n    }\n    return this.selectionEnd;\n  }\n\n  /**\n   * Returns whether the selection start and end are reversed.\n   */\n  public areSelectionValuesReversed(): boolean {\n    const start = this.selectionStart;\n    const end = this.selectionEnd;\n    if (!start || !end) {\n      return false;\n    }\n    return start[1] > end[1] || (start[1] === end[1] && start[0] > end[0]);\n  }\n\n  /**\n   * Handle the buffer being trimmed, adjust the selection position.\n   * @param amount The amount the buffer is being trimmed.\n   * @return Whether a refresh is necessary.\n   */\n  public onTrim(amount: number): boolean {\n    // Adjust the selection position based on the trimmed amount.\n    if (this.selectionStart) {\n      this.selectionStart[1] -= amount;\n    }\n    if (this.selectionEnd) {\n      this.selectionEnd[1] -= amount;\n    }\n\n    // The selection has moved off the buffer, clear it.\n    if (this.selectionEnd && this.selectionEnd[1] < 0) {\n      this.clearSelection();\n      return true;\n    }\n\n    // If the selection start is trimmed, ensure the start column is 0.\n    if (this.selectionStart && this.selectionStart[1] < 0) {\n      this.selectionStart[1] = 0;\n    }\n    return false;\n  }\n}\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { MouseHelper } from './utils/MouseHelper';\nimport * as Browser from './utils/Browser';\nimport { CharMeasure } from './utils/CharMeasure';\nimport { CircularList } from './utils/CircularList';\nimport { EventEmitter } from './EventEmitter';\nimport { ITerminal, ICircularList, ISelectionManager, IBuffer } from './Interfaces';\nimport { SelectionModel } from './SelectionModel';\nimport { LineData, CharData } from './Types';\nimport { CHAR_DATA_WIDTH_INDEX, CHAR_DATA_CHAR_INDEX } from './Buffer';\n\n/**\n * The number of pixels the mouse needs to be above or below the viewport in\n * order to scroll at the maximum speed.\n */\nconst DRAG_SCROLL_MAX_THRESHOLD = 50;\n\n/**\n * The maximum scrolling speed\n */\nconst DRAG_SCROLL_MAX_SPEED = 15;\n\n/**\n * The number of milliseconds between drag scroll updates.\n */\nconst DRAG_SCROLL_INTERVAL = 50;\n\n/**\n * A string containing all characters that are considered word separated by the\n * double click to select work logic.\n */\nconst WORD_SEPARATORS = ' ()[]{}\\'\"';\n\nconst NON_BREAKING_SPACE_CHAR = String.fromCharCode(160);\nconst ALL_NON_BREAKING_SPACE_REGEX = new RegExp(NON_BREAKING_SPACE_CHAR, 'g');\n\n/**\n * Represents a position of a word on a line.\n */\ninterface IWordPosition {\n  start: number;\n  length: number;\n}\n\n/**\n * A selection mode, this drives how the selection behaves on mouse move.\n */\nenum SelectionMode {\n  NORMAL,\n  WORD,\n  LINE\n}\n\n/**\n * A class that manages the selection of the terminal. With help from\n * SelectionModel, SelectionManager handles with all logic associated with\n * dealing with the selection, including handling mouse interaction, wide\n * characters and fetching the actual text within the selection. Rendering is\n * not handled by the SelectionManager but a 'refresh' event is fired when the\n * selection is ready to be redrawn.\n */\nexport class SelectionManager extends EventEmitter implements ISelectionManager {\n  protected _model: SelectionModel;\n\n  /**\n   * The amount to scroll every drag scroll update (depends on how far the mouse\n   * drag is above or below the terminal).\n   */\n  private _dragScrollAmount: number;\n\n  /**\n   * The current selection mode.\n   */\n  private _activeSelectionMode: SelectionMode;\n\n  /**\n   * A setInterval timer that is active while the mouse is down whose callback\n   * scrolls the viewport when necessary.\n   */\n  private _dragScrollIntervalTimer: NodeJS.Timer;\n\n  /**\n   * The animation frame ID used for refreshing the selection.\n   */\n  private _refreshAnimationFrame: number;\n\n  /**\n   * Whether selection is enabled.\n   */\n  private _enabled = true;\n\n  private _mouseMoveListener: EventListener;\n  private _mouseUpListener: EventListener;\n\n  constructor(\n    private _terminal: ITerminal,\n    private _buffer: IBuffer,\n    private _charMeasure: CharMeasure\n  ) {\n    super();\n    this._initListeners();\n    this.enable();\n\n    this._model = new SelectionModel(_terminal);\n    this._activeSelectionMode = SelectionMode.NORMAL;\n  }\n\n  /**\n   * Initializes listener variables.\n   */\n  private _initListeners(): void {\n    this._mouseMoveListener = event => this._onMouseMove(<MouseEvent>event);\n    this._mouseUpListener = event => this._onMouseUp(<MouseEvent>event);\n\n    // Only adjust the selection on trim, shiftElements is rarely used (only in\n    // reverseIndex) and delete in a splice is only ever used when the same\n    // number of elements was just added. Given this is could actually be\n    // beneficial to leave the selection as is for these cases.\n    this._buffer.lines.on('trim', (amount: number) => this._onTrim(amount));\n  }\n\n  /**\n   * Disables the selection manager. This is useful for when terminal mouse\n   * are enabled.\n   */\n  public disable(): void {\n    this.clearSelection();\n    this._enabled = false;\n  }\n\n  /**\n   * Enable the selection manager.\n   */\n  public enable(): void {\n    this._enabled = true;\n  }\n\n  /**\n   * Sets the active buffer, this should be called when the alt buffer is\n   * switched in or out.\n   * @param buffer The active buffer.\n   */\n  public setBuffer(buffer: IBuffer): void {\n    this._buffer = buffer;\n    this.clearSelection();\n  }\n\n  public get selectionStart(): [number, number] { return this._model.finalSelectionStart; }\n  public get selectionEnd(): [number, number] { return this._model.finalSelectionEnd; }\n\n  /**\n   * Gets whether there is an active text selection.\n   */\n  public get hasSelection(): boolean {\n    const start = this._model.finalSelectionStart;\n    const end = this._model.finalSelectionEnd;\n    if (!start || !end) {\n      return false;\n    }\n    return start[0] !== end[0] || start[1] !== end[1];\n  }\n\n  /**\n   * Gets the text currently selected.\n   */\n  public get selectionText(): string {\n    const start = this._model.finalSelectionStart;\n    const end = this._model.finalSelectionEnd;\n    if (!start || !end) {\n      return '';\n    }\n\n    // Get first row\n    const startRowEndCol = start[1] === end[1] ? end[0] : null;\n    let result: string[] = [];\n    result.push(this._buffer.translateBufferLineToString(start[1], true, start[0], startRowEndCol));\n\n    // Get middle rows\n    for (let i = start[1] + 1; i <= end[1] - 1; i++) {\n      const bufferLine = this._buffer.lines.get(i);\n      const lineText = this._buffer.translateBufferLineToString(i, true);\n      if ((<any>bufferLine).isWrapped) {\n        result[result.length - 1] += lineText;\n      } else {\n        result.push(lineText);\n      }\n    }\n\n    // Get final row\n    if (start[1] !== end[1]) {\n      const bufferLine = this._buffer.lines.get(end[1]);\n      const lineText = this._buffer.translateBufferLineToString(end[1], true, 0, end[0]);\n      if ((<any>bufferLine).isWrapped) {\n        result[result.length - 1] += lineText;\n      } else {\n        result.push(lineText);\n      }\n    }\n\n    // Format string by replacing non-breaking space chars with regular spaces\n    // and joining the array into a multi-line string.\n    const formattedResult = result.map(line => {\n      return line.replace(ALL_NON_BREAKING_SPACE_REGEX, ' ');\n    }).join(Browser.isMSWindows ? '\\r\\n' : '\\n');\n\n    return formattedResult;\n  }\n\n  /**\n   * Clears the current terminal selection.\n   */\n  public clearSelection(): void {\n    this._model.clearSelection();\n    this._removeMouseDownListeners();\n    this.refresh();\n  }\n\n  /**\n   * Queues a refresh, redrawing the selection on the next opportunity.\n   * @param isNewSelection Whether the selection should be registered as a new\n   * selection on Linux.\n   */\n  public refresh(isNewSelection?: boolean): void {\n    // Queue the refresh for the renderer\n    if (!this._refreshAnimationFrame) {\n      this._refreshAnimationFrame = window.requestAnimationFrame(() => this._refresh());\n    }\n\n    // If the platform is Linux and the refresh call comes from a mouse event,\n    // we need to update the selection for middle click to paste selection.\n    if (Browser.isLinux && isNewSelection) {\n      const selectionText = this.selectionText;\n      if (selectionText.length) {\n        this.emit('newselection', this.selectionText);\n      }\n    }\n  }\n\n  /**\n   * Fires the refresh event, causing consumers to pick it up and redraw the\n   * selection state.\n   */\n  private _refresh(): void {\n    this._refreshAnimationFrame = null;\n    this.emit('refresh', { start: this._model.finalSelectionStart, end: this._model.finalSelectionEnd });\n  }\n\n  /**\n   * Selects all text within the terminal.\n   */\n  public selectAll(): void {\n    this._model.isSelectAllActive = true;\n    this.refresh();\n    this.emit('selection');\n  }\n\n  /**\n   * Handle the buffer being trimmed, adjust the selection position.\n   * @param amount The amount the buffer is being trimmed.\n   */\n  private _onTrim(amount: number): void {\n    const needsRefresh = this._model.onTrim(amount);\n    if (needsRefresh) {\n      this.refresh();\n    }\n  }\n\n  /**\n   * Gets the 0-based [x, y] buffer coordinates of the current mouse event.\n   * @param event The mouse event.\n   */\n  private _getMouseBufferCoords(event: MouseEvent): [number, number] {\n    const coords = this._terminal.mouseHelper.getCoords(event, this._terminal.element, this._charMeasure, this._terminal.options.lineHeight, this._terminal.cols, this._terminal.rows, true);\n    if (!coords) {\n      return null;\n    }\n\n    // Convert to 0-based\n    coords[0]--;\n    coords[1]--;\n\n    // Convert viewport coords to buffer coords\n    coords[1] += this._terminal.buffer.ydisp;\n    return coords;\n  }\n\n  /**\n   * Gets the amount the viewport should be scrolled based on how far out of the\n   * terminal the mouse is.\n   * @param event The mouse event.\n   */\n  private _getMouseEventScrollAmount(event: MouseEvent): number {\n    let offset = MouseHelper.getCoordsRelativeToElement(event, this._terminal.element)[1];\n    const terminalHeight = this._terminal.rows * Math.ceil(this._charMeasure.height * this._terminal.options.lineHeight);\n    if (offset >= 0 && offset <= terminalHeight) {\n      return 0;\n    }\n    if (offset > terminalHeight) {\n      offset -= terminalHeight;\n    }\n\n    offset = Math.min(Math.max(offset, -DRAG_SCROLL_MAX_THRESHOLD), DRAG_SCROLL_MAX_THRESHOLD);\n    offset /= DRAG_SCROLL_MAX_THRESHOLD;\n    return (offset / Math.abs(offset)) + Math.round(offset * (DRAG_SCROLL_MAX_SPEED - 1));\n  }\n\n  /**\n   * Returns whether the selection manager should force selection, regardless of\n   * whether the terminal is in mouse events mode.\n   * @param event The mouse event.\n   */\n  public shouldForceSelection(event: MouseEvent): boolean {\n    return Browser.isMac ? event.altKey : event.shiftKey;\n  }\n\n  /**\n   * Handles te mousedown event, setting up for a new selection.\n   * @param event The mousedown event.\n   */\n  public onMouseDown(event: MouseEvent): void {\n    // If we have selection, we want the context menu on right click even if the\n    // terminal is in mouse mode.\n    if (event.button === 2 && this.hasSelection) {\n      return;\n    }\n\n    // Only action the primary button\n    if (event.button !== 0) {\n      return;\n    }\n\n    // Allow selection when using a specific modifier key, even when disabled\n    if (!this._enabled) {\n      if (!this.shouldForceSelection(event)) {\n        return;\n      }\n\n      // Don't send the mouse down event to the current process, we want to select\n      event.stopPropagation();\n    }\n\n    // Tell the browser not to start a regular selection\n    event.preventDefault();\n\n    // Reset drag scroll state\n    this._dragScrollAmount = 0;\n\n    if (this._enabled && event.shiftKey) {\n      this._onIncrementalClick(event);\n    } else {\n      if (event.detail === 1) {\n        this._onSingleClick(event);\n      } else if (event.detail === 2) {\n        this._onDoubleClick(event);\n      } else if (event.detail === 3) {\n        this._onTripleClick(event);\n      }\n    }\n\n    this._addMouseDownListeners();\n    this.refresh(true);\n  }\n\n  /**\n   * Adds listeners when mousedown is triggered.\n   */\n  private _addMouseDownListeners(): void {\n    // Listen on the document so that dragging outside of viewport works\n    this._terminal.element.ownerDocument.addEventListener('mousemove', this._mouseMoveListener);\n    this._terminal.element.ownerDocument.addEventListener('mouseup', this._mouseUpListener);\n    this._dragScrollIntervalTimer = setInterval(() => this._dragScroll(), DRAG_SCROLL_INTERVAL);\n  }\n\n  /**\n   * Removes the listeners that are registered when mousedown is triggered.\n   */\n  private _removeMouseDownListeners(): void {\n    this._terminal.element.ownerDocument.removeEventListener('mousemove', this._mouseMoveListener);\n    this._terminal.element.ownerDocument.removeEventListener('mouseup', this._mouseUpListener);\n    clearInterval(this._dragScrollIntervalTimer);\n    this._dragScrollIntervalTimer = null;\n  }\n\n  /**\n   * Performs an incremental click, setting the selection end position to the mouse\n   * position.\n   * @param event The mouse event.\n   */\n  private _onIncrementalClick(event: MouseEvent): void {\n    if (this._model.selectionStart) {\n      this._model.selectionEnd = this._getMouseBufferCoords(event);\n    }\n  }\n\n  /**\n   * Performs a single click, resetting relevant state and setting the selection\n   * start position.\n   * @param event The mouse event.\n   */\n  private _onSingleClick(event: MouseEvent): void {\n    this._model.selectionStartLength = 0;\n    this._model.isSelectAllActive = false;\n    this._activeSelectionMode = SelectionMode.NORMAL;\n\n    // Initialize the new selection\n    this._model.selectionStart = this._getMouseBufferCoords(event);\n    if (!this._model.selectionStart) {\n      return;\n    }\n    this._model.selectionEnd = null;\n\n    // Ensure the line exists\n    const line = this._buffer.lines.get(this._model.selectionStart[1]);\n    if (!line) {\n      return;\n    }\n\n    // Return early if the click event is not in the buffer (eg. in scroll bar)\n    if (line.length >= this._model.selectionStart[0]) {\n      return;\n    }\n\n    // If the mouse is over the second half of a wide character, adjust the\n    // selection to cover the whole character\n    const char = line[this._model.selectionStart[0]];\n    if (char[CHAR_DATA_WIDTH_INDEX] === 0) {\n      this._model.selectionStart[0]++;\n    }\n  }\n\n  /**\n   * Performs a double click, selecting the current work.\n   * @param event The mouse event.\n   */\n  private _onDoubleClick(event: MouseEvent): void {\n    const coords = this._getMouseBufferCoords(event);\n    if (coords) {\n      this._activeSelectionMode = SelectionMode.WORD;\n      this._selectWordAt(coords);\n    }\n  }\n\n  /**\n   * Performs a triple click, selecting the current line and activating line\n   * select mode.\n   * @param event The mouse event.\n   */\n  private _onTripleClick(event: MouseEvent): void {\n    const coords = this._getMouseBufferCoords(event);\n    if (coords) {\n      this._activeSelectionMode = SelectionMode.LINE;\n      this._selectLineAt(coords[1]);\n    }\n  }\n\n  /**\n   * Handles the mousemove event when the mouse button is down, recording the\n   * end of the selection and refreshing the selection.\n   * @param event The mousemove event.\n   */\n  private _onMouseMove(event: MouseEvent): void {\n    // If the mousemove listener is active it means that a selection is\n    // currently being made, we should stop propogation to prevent mouse events\n    // to be sent to the pty.\n    event.stopImmediatePropagation();\n\n    // Record the previous position so we know whether to redraw the selection\n    // at the end.\n    const previousSelectionEnd = this._model.selectionEnd ? [this._model.selectionEnd[0], this._model.selectionEnd[1]] : null;\n\n    // Set the initial selection end based on the mouse coordinates\n    this._model.selectionEnd = this._getMouseBufferCoords(event);\n    if (!this._model.selectionEnd) {\n      this.refresh(true);\n      return;\n    }\n\n    // Select the entire line if line select mode is active.\n    if (this._activeSelectionMode === SelectionMode.LINE) {\n      if (this._model.selectionEnd[1] < this._model.selectionStart[1]) {\n        this._model.selectionEnd[0] = 0;\n      } else {\n        this._model.selectionEnd[0] = this._terminal.cols;\n      }\n    } else if (this._activeSelectionMode === SelectionMode.WORD) {\n      this._selectToWordAt(this._model.selectionEnd);\n    }\n\n    // Determine the amount of scrolling that will happen.\n    this._dragScrollAmount = this._getMouseEventScrollAmount(event);\n\n    // If the cursor was above or below the viewport, make sure it's at the\n    // start or end of the viewport respectively.\n    if (this._dragScrollAmount > 0) {\n      this._model.selectionEnd[0] = this._terminal.cols;\n    } else if (this._dragScrollAmount < 0) {\n      this._model.selectionEnd[0] = 0;\n    }\n\n    // If the character is a wide character include the cell to the right in the\n    // selection. Note that selections at the very end of the line will never\n    // have a character.\n    if (this._model.selectionEnd[1] < this._buffer.lines.length) {\n      const char = this._buffer.lines.get(this._model.selectionEnd[1])[this._model.selectionEnd[0]];\n      if (char && char[CHAR_DATA_WIDTH_INDEX] === 0) {\n        this._model.selectionEnd[0]++;\n      }\n    }\n\n    // Only draw here if the selection changes.\n    if (!previousSelectionEnd ||\n      previousSelectionEnd[0] !== this._model.selectionEnd[0] ||\n      previousSelectionEnd[1] !== this._model.selectionEnd[1]) {\n      this.refresh(true);\n    }\n  }\n\n  /**\n   * The callback that occurs every DRAG_SCROLL_INTERVAL ms that does the\n   * scrolling of the viewport.\n   */\n  private _dragScroll(): void {\n    if (this._dragScrollAmount) {\n      this._terminal.scrollLines(this._dragScrollAmount, false);\n      // Re-evaluate selection\n      if (this._dragScrollAmount > 0) {\n        this._model.selectionEnd = [this._terminal.cols - 1, this._terminal.buffer.ydisp + this._terminal.rows];\n      } else {\n        this._model.selectionEnd = [0, this._terminal.buffer.ydisp];\n      }\n      this.refresh();\n    }\n  }\n\n  /**\n   * Handles the mouseup event, removing the mousedown listeners.\n   * @param event The mouseup event.\n   */\n  private _onMouseUp(event: MouseEvent): void {\n    this._removeMouseDownListeners();\n\n    if (this.hasSelection)\n      this.emit('selection');\n  }\n\n  /**\n   * Converts a viewport column to the character index on the buffer line, the\n   * latter takes into account wide characters.\n   * @param coords The coordinates to find the 2 index for.\n   */\n  private _convertViewportColToCharacterIndex(bufferLine: any, coords: [number, number]): number {\n    let charIndex = coords[0];\n    for (let i = 0; coords[0] >= i; i++) {\n      const char = bufferLine[i];\n      if (char[CHAR_DATA_WIDTH_INDEX] === 0) {\n        // Wide characters aren't included in the line string so decrement the\n        // index so the index is back on the wide character.\n        charIndex--;\n      } else if (char[CHAR_DATA_CHAR_INDEX].length > 1 && coords[0] !== i) {\n        // Emojis take up multiple characters, so adjust accordingly. For these\n        // we don't want ot include the character at the column as we're\n        // returning the start index in the string, not the end index.\n        charIndex += char[CHAR_DATA_CHAR_INDEX].length - 1;\n      }\n    }\n    return charIndex;\n  }\n\n  public setSelection(col: number, row: number, length: number): void {\n    this._model.clearSelection();\n    this._removeMouseDownListeners();\n    this._model.selectionStart = [col, row];\n    this._model.selectionStartLength = length;\n    this.refresh();\n  }\n\n  /**\n   * Gets positional information for the word at the coordinated specified.\n   * @param coords The coordinates to get the word at.\n   */\n  private _getWordAt(coords: [number, number]): IWordPosition {\n    const bufferLine = this._buffer.lines.get(coords[1]);\n    if (!bufferLine) {\n      return null;\n    }\n\n    const line = this._buffer.translateBufferLineToString(coords[1], false);\n\n    // Get actual index, taking into consideration wide characters\n    let startIndex = this._convertViewportColToCharacterIndex(bufferLine, coords);\n    let endIndex = startIndex;\n\n    // Record offset to be used later\n    const charOffset = coords[0] - startIndex;\n    let leftWideCharCount = 0;\n    let rightWideCharCount = 0;\n    let leftLongCharOffset = 0;\n    let rightLongCharOffset = 0;\n\n    if (line.charAt(startIndex) === ' ') {\n      // Expand until non-whitespace is hit\n      while (startIndex > 0 && line.charAt(startIndex - 1) === ' ') {\n        startIndex--;\n      }\n      while (endIndex < line.length && line.charAt(endIndex + 1) === ' ') {\n        endIndex++;\n      }\n    } else {\n      // Expand until whitespace is hit. This algorithm works by scanning left\n      // and right from the starting position, keeping both the index format\n      // (line) and the column format (bufferLine) in sync. When a wide\n      // character is hit, it is recorded and the column index is adjusted.\n      let startCol = coords[0];\n      let endCol = coords[0];\n\n      // Consider the initial position, skip it and increment the wide char\n      // variable\n      if (bufferLine[startCol][CHAR_DATA_WIDTH_INDEX] === 0) {\n        leftWideCharCount++;\n        startCol--;\n      }\n      if (bufferLine[endCol][CHAR_DATA_WIDTH_INDEX] === 2) {\n        rightWideCharCount++;\n        endCol++;\n      }\n\n      // Adjust the end index for characters whose length are > 1 (emojis)\n      if (bufferLine[endCol][CHAR_DATA_CHAR_INDEX].length > 1) {\n        rightLongCharOffset += bufferLine[endCol][CHAR_DATA_CHAR_INDEX].length - 1;\n        endIndex += bufferLine[endCol][CHAR_DATA_CHAR_INDEX].length - 1;\n      }\n\n      // Expand the string in both directions until a space is hit\n      while (startCol > 0 && startIndex > 0 && !this._isCharWordSeparator(bufferLine[startCol - 1])) {\n        const char = bufferLine[startCol - 1];\n        if (char[CHAR_DATA_WIDTH_INDEX] === 0) {\n          // If the next character is a wide char, record it and skip the column\n          leftWideCharCount++;\n          startCol--;\n        } else if (char[CHAR_DATA_CHAR_INDEX].length > 1) {\n          // If the next character's string is longer than 1 char (eg. emoji),\n          // adjust the index\n          leftLongCharOffset += char[CHAR_DATA_CHAR_INDEX].length - 1;\n          startIndex -= char[CHAR_DATA_CHAR_INDEX].length - 1;\n        }\n        startIndex--;\n        startCol--;\n      }\n      while (endCol < bufferLine.length && endIndex + 1 < line.length && !this._isCharWordSeparator(bufferLine[endCol + 1])) {\n        const char = bufferLine[endCol + 1];\n        if (char[CHAR_DATA_WIDTH_INDEX] === 2) {\n          // If the next character is a wide char, record it and skip the column\n          rightWideCharCount++;\n          endCol++;\n        } else if (char[CHAR_DATA_CHAR_INDEX].length > 1) {\n          // If the next character's string is longer than 1 char (eg. emoji),\n          // adjust the index\n          rightLongCharOffset += char[CHAR_DATA_CHAR_INDEX].length - 1;\n          endIndex += char[CHAR_DATA_CHAR_INDEX].length - 1;\n        }\n        endIndex++;\n        endCol++;\n      }\n    }\n\n    // Incremenet the end index so it is at the start of the next character\n    endIndex++;\n\n    // Calculate the start _column_, converting the the string indexes back to\n    // column coordinates.\n    const start =\n        startIndex // The index of the selection's start char in the line string\n        + charOffset // The difference between the initial char's column and index\n        - leftWideCharCount // The number of wide chars left of the initial char\n        + leftLongCharOffset; // The number of additional chars left of the initial char added by columns with strings longer than 1 (emojis)\n\n    // Calculate the length in _columns_, converting the the string indexes back\n    // to column coordinates.\n    const length = Math.min(this._terminal.cols, // Disallow lengths larger than the terminal cols\n        endIndex // The index of the selection's end char in the line string\n        - startIndex // The index of the selection's start char in the line string\n        + leftWideCharCount // The number of wide chars left of the initial char\n        + rightWideCharCount // The number of wide chars right of the initial char (inclusive)\n        - leftLongCharOffset // The number of additional chars left of the initial char added by columns with strings longer than 1 (emojis)\n        - rightLongCharOffset); // The number of additional chars right of the initial char (inclusive) added by columns with strings longer than 1 (emojis)\n\n    return { start, length };\n  }\n\n  /**\n   * Selects the word at the coordinates specified.\n   * @param coords The coordinates to get the word at.\n   */\n  protected _selectWordAt(coords: [number, number]): void {\n    const wordPosition = this._getWordAt(coords);\n    if (wordPosition) {\n      this._model.selectionStart = [wordPosition.start, coords[1]];\n      this._model.selectionStartLength = wordPosition.length;\n    }\n  }\n\n  /**\n   * Sets the selection end to the word at the coordinated specified.\n   * @param coords The coordinates to get the word at.\n   */\n  private _selectToWordAt(coords: [number, number]): void {\n    const wordPosition = this._getWordAt(coords);\n    if (wordPosition) {\n      this._model.selectionEnd = [this._model.areSelectionValuesReversed() ? wordPosition.start : (wordPosition.start + wordPosition.length), coords[1]];\n    }\n  }\n\n  /**\n   * Gets whether the character is considered a word separator by the select\n   * word logic.\n   * @param char The character to check.\n   */\n  private _isCharWordSeparator(charData: CharData): boolean {\n    // Zero width characters are never separators as they are always to the\n    // right of wide characters\n    if (charData[CHAR_DATA_WIDTH_INDEX] === 0) {\n      return false;\n    }\n    return WORD_SEPARATORS.indexOf(charData[CHAR_DATA_CHAR_INDEX]) >= 0;\n  }\n\n  /**\n   * Selects the line specified.\n   * @param line The line index.\n   */\n  protected _selectLineAt(line: number): void {\n    this._model.selectionStart = [0, line];\n    this._model.selectionStartLength = this._terminal.cols;\n  }\n}\n","/**\n * Copyright (c) 2014 The xterm.js authors. All rights reserved.\n * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)\n * @license MIT\n */\n\nimport { C0 } from './EscapeSequences';\nimport { IInputHandler } from './Interfaces';\nimport { CHARSETS, DEFAULT_CHARSET } from './Charsets';\n\nconst normalStateHandler: {[key: string]: (parser: Parser, handler: IInputHandler) => void} = {};\nnormalStateHandler[C0.BEL] = (parser, handler) => handler.bell();\nnormalStateHandler[C0.LF] = (parser, handler) => handler.lineFeed();\nnormalStateHandler[C0.VT] = normalStateHandler[C0.LF];\nnormalStateHandler[C0.FF] = normalStateHandler[C0.LF];\nnormalStateHandler[C0.CR] = (parser, handler) => handler.carriageReturn();\nnormalStateHandler[C0.BS] = (parser, handler) => handler.backspace();\nnormalStateHandler[C0.HT] = (parser, handler) => handler.tab();\nnormalStateHandler[C0.SO] = (parser, handler) => handler.shiftOut();\nnormalStateHandler[C0.SI] = (parser, handler) => handler.shiftIn();\nnormalStateHandler[C0.ESC] = (parser, handler) => parser.setState(ParserState.ESCAPED);\n\n// TODO: Remove terminal when parser owns params and currentParam\nconst escapedStateHandler: {[key: string]: (parser: Parser, terminal: any) => void} = {};\nescapedStateHandler['['] = (parser, terminal) => {\n  // ESC [ Control Sequence Introducer (CSI  is 0x9b)\n  terminal.params = [];\n  terminal.currentParam = 0;\n  parser.setState(ParserState.CSI_PARAM);\n};\nescapedStateHandler[']'] = (parser, terminal) => {\n  // ESC ] Operating System Command (OSC is 0x9d)\n  terminal.params = [];\n  terminal.currentParam = 0;\n  parser.setState(ParserState.OSC);\n};\nescapedStateHandler['P'] = (parser, terminal) => {\n  // ESC P Device Control String (DCS is 0x90)\n  terminal.params = [];\n  terminal.currentParam = 0;\n  parser.setState(ParserState.DCS);\n};\nescapedStateHandler['_'] = (parser, terminal) => {\n  // ESC _ Application Program Command ( APC is 0x9f).\n  parser.setState(ParserState.IGNORE);\n};\nescapedStateHandler['^'] = (parser, terminal) => {\n  // ESC ^ Privacy Message ( PM is 0x9e).\n  parser.setState(ParserState.IGNORE);\n};\nescapedStateHandler['c'] = (parser, terminal) => {\n  // ESC c Full Reset (RIS).\n  terminal.reset();\n};\nescapedStateHandler['E'] = (parser, terminal) => {\n  // ESC E Next Line ( NEL is 0x85).\n  terminal.buffer.x = 0;\n  terminal.index();\n  parser.setState(ParserState.NORMAL);\n};\nescapedStateHandler['D'] = (parser, terminal) => {\n  // ESC D Index ( IND is 0x84).\n  terminal.index();\n  parser.setState(ParserState.NORMAL);\n};\nescapedStateHandler['M'] = (parser, terminal) => {\n  // ESC M Reverse Index ( RI is 0x8d).\n  terminal.reverseIndex();\n  parser.setState(ParserState.NORMAL);\n};\nescapedStateHandler['%'] = (parser, terminal) => {\n  // ESC % Select default/utf-8 character set.\n  // @ = default, G = utf-8\n  terminal.setgLevel(0);\n  terminal.setgCharset(0, DEFAULT_CHARSET); // US (default)\n  parser.setState(ParserState.NORMAL);\n  parser.skipNextChar();\n};\nescapedStateHandler[C0.CAN] = (parser) => parser.setState(ParserState.NORMAL);\n\nconst csiParamStateHandler: {[key: string]: (parser: Parser) => void} = {};\ncsiParamStateHandler['?'] = (parser) => parser.setPrefix('?');\ncsiParamStateHandler['>'] = (parser) => parser.setPrefix('>');\ncsiParamStateHandler['!'] = (parser) => parser.setPrefix('!');\ncsiParamStateHandler['0'] = (parser) => parser.setParam(parser.getParam() * 10);\ncsiParamStateHandler['1'] = (parser) => parser.setParam(parser.getParam() * 10 + 1);\ncsiParamStateHandler['2'] = (parser) => parser.setParam(parser.getParam() * 10 + 2);\ncsiParamStateHandler['3'] = (parser) => parser.setParam(parser.getParam() * 10 + 3);\ncsiParamStateHandler['4'] = (parser) => parser.setParam(parser.getParam() * 10 + 4);\ncsiParamStateHandler['5'] = (parser) => parser.setParam(parser.getParam() * 10 + 5);\ncsiParamStateHandler['6'] = (parser) => parser.setParam(parser.getParam() * 10 + 6);\ncsiParamStateHandler['7'] = (parser) => parser.setParam(parser.getParam() * 10 + 7);\ncsiParamStateHandler['8'] = (parser) => parser.setParam(parser.getParam() * 10 + 8);\ncsiParamStateHandler['9'] = (parser) => parser.setParam(parser.getParam() * 10 + 9);\ncsiParamStateHandler['$'] = (parser) => parser.setPostfix('$');\ncsiParamStateHandler['\"'] = (parser) => parser.setPostfix('\"');\ncsiParamStateHandler[' '] = (parser) => parser.setPostfix(' ');\ncsiParamStateHandler['\\''] = (parser) => parser.setPostfix('\\'');\ncsiParamStateHandler[';'] = (parser) => parser.finalizeParam();\ncsiParamStateHandler[C0.CAN] = (parser) => parser.setState(ParserState.NORMAL);\n\nconst csiStateHandler: {[key: string]: (handler: IInputHandler, params: number[], prefix: string, postfix: string, parser: Parser) => void} = {};\ncsiStateHandler['@'] = (handler, params, prefix) => handler.insertChars(params);\ncsiStateHandler['A'] = (handler, params, prefix) => handler.cursorUp(params);\ncsiStateHandler['B'] = (handler, params, prefix) => handler.cursorDown(params);\ncsiStateHandler['C'] = (handler, params, prefix) => handler.cursorForward(params);\ncsiStateHandler['D'] = (handler, params, prefix) => handler.cursorBackward(params);\ncsiStateHandler['E'] = (handler, params, prefix) => handler.cursorNextLine(params);\ncsiStateHandler['F'] = (handler, params, prefix) => handler.cursorPrecedingLine(params);\ncsiStateHandler['G'] = (handler, params, prefix) => handler.cursorCharAbsolute(params);\ncsiStateHandler['H'] = (handler, params, prefix) => handler.cursorPosition(params);\ncsiStateHandler['I'] = (handler, params, prefix) => handler.cursorForwardTab(params);\ncsiStateHandler['J'] = (handler, params, prefix) => handler.eraseInDisplay(params);\ncsiStateHandler['K'] = (handler, params, prefix) => handler.eraseInLine(params);\ncsiStateHandler['L'] = (handler, params, prefix) => handler.insertLines(params);\ncsiStateHandler['M'] = (handler, params, prefix) => handler.deleteLines(params);\ncsiStateHandler['P'] = (handler, params, prefix) => handler.deleteChars(params);\ncsiStateHandler['S'] = (handler, params, prefix) => handler.scrollUp(params);\ncsiStateHandler['T'] = (handler, params, prefix) => {\n  if (params.length < 2 && !prefix) {\n    handler.scrollDown(params);\n  }\n};\ncsiStateHandler['X'] = (handler, params, prefix) => handler.eraseChars(params);\ncsiStateHandler['Z'] = (handler, params, prefix) => handler.cursorBackwardTab(params);\ncsiStateHandler['`'] = (handler, params, prefix) => handler.charPosAbsolute(params);\ncsiStateHandler['a'] = (handler, params, prefix) => handler.HPositionRelative(params);\ncsiStateHandler['b'] = (handler, params, prefix) => handler.repeatPrecedingCharacter(params);\ncsiStateHandler['c'] = (handler, params, prefix) => handler.sendDeviceAttributes(params);\ncsiStateHandler['d'] = (handler, params, prefix) => handler.linePosAbsolute(params);\ncsiStateHandler['e'] = (handler, params, prefix) => handler.VPositionRelative(params);\ncsiStateHandler['f'] = (handler, params, prefix) => handler.HVPosition(params);\ncsiStateHandler['g'] = (handler, params, prefix) => handler.tabClear(params);\ncsiStateHandler['h'] = (handler, params, prefix) => handler.setMode(params);\ncsiStateHandler['l'] = (handler, params, prefix) => handler.resetMode(params);\ncsiStateHandler['m'] = (handler, params, prefix) => handler.charAttributes(params);\ncsiStateHandler['n'] = (handler, params, prefix) => handler.deviceStatus(params);\ncsiStateHandler['p'] = (handler, params, prefix) => {\n  switch (prefix) {\n    case '!': handler.softReset(params); break;\n  }\n};\ncsiStateHandler['q'] = (handler, params, prefix, postfix) => {\n  if (postfix === ' ') {\n    handler.setCursorStyle(params);\n  }\n};\ncsiStateHandler['r'] = (handler, params) => handler.setScrollRegion(params);\ncsiStateHandler['s'] = (handler, params) => handler.saveCursor(params);\ncsiStateHandler['u'] = (handler, params) => handler.restoreCursor(params);\ncsiStateHandler[C0.CAN] = (handler, params, prefix, postfix, parser) => parser.setState(ParserState.NORMAL);\n\nexport enum ParserState {\n  NORMAL = 0,\n  ESCAPED = 1,\n  CSI_PARAM = 2,\n  CSI = 3,\n  OSC = 4,\n  CHARSET = 5,\n  DCS = 6,\n  IGNORE = 7\n}\n\n/**\n * The terminal's parser, all input into the terminal goes through the parser\n * which parses and defers the actual input handling the the IInputHandler\n * specified in the constructor.\n */\nexport class Parser {\n  private _state: ParserState;\n  private _position: number;\n\n  // TODO: Remove terminal when handler can do everything\n  constructor(\n    private _inputHandler: IInputHandler,\n    private _terminal: any\n  ) {\n    this._state = ParserState.NORMAL;\n  }\n\n  /**\n   * Parse and handle data.\n   *\n   * @param data The data to parse.\n   */\n  public parse(data: string): ParserState {\n    const l = data.length;\n    let j;\n    let cs;\n    let ch;\n    let code;\n    let low;\n\n    const cursorStartX = this._terminal.buffer.x;\n    const cursorStartY = this._terminal.buffer.y;\n\n    if (this._terminal.debug) {\n      this._terminal.log('data: ' + data);\n    }\n\n    this._position = 0;\n    // apply leftover surrogate high from last write\n    if (this._terminal.surrogate_high) {\n      data = this._terminal.surrogate_high + data;\n      this._terminal.surrogate_high = '';\n    }\n\n    for (; this._position < l; this._position++) {\n      ch = data[this._position];\n\n      // FIXME: higher chars than 0xa0 are not allowed in escape sequences\n      //        --> maybe move to default\n      code = data.charCodeAt(this._position);\n      if (0xD800 <= code && code <= 0xDBFF) {\n        // we got a surrogate high\n        // get surrogate low (next 2 bytes)\n        low = data.charCodeAt(this._position + 1);\n        if (isNaN(low)) {\n          // end of data stream, save surrogate high\n          this._terminal.surrogate_high = ch;\n          continue;\n        }\n        code = ((code - 0xD800) * 0x400) + (low - 0xDC00) + 0x10000;\n        ch += data.charAt(this._position + 1);\n      }\n      // surrogate low - already handled above\n      if (0xDC00 <= code && code <= 0xDFFF)\n        continue;\n\n      switch (this._state) {\n        case ParserState.NORMAL:\n          if (ch in normalStateHandler) {\n            normalStateHandler[ch](this, this._inputHandler);\n          } else {\n            this._inputHandler.addChar(ch, code);\n          }\n          break;\n        case ParserState.ESCAPED:\n          if (ch in escapedStateHandler) {\n            escapedStateHandler[ch](this, this._terminal);\n            // Skip switch as it was just handled\n            break;\n          }\n          switch (ch) {\n\n            // ESC (,),*,+,-,. Designate G0-G2 Character Set.\n            case '(': // <-- this seems to get all the attention\n            case ')':\n            case '*':\n            case '+':\n            case '-':\n            case '.':\n              switch (ch) {\n                case '(':\n                  this._terminal.gcharset = 0;\n                  break;\n                case ')':\n                  this._terminal.gcharset = 1;\n                  break;\n                case '*':\n                  this._terminal.gcharset = 2;\n                  break;\n                case '+':\n                  this._terminal.gcharset = 3;\n                  break;\n                case '-':\n                  this._terminal.gcharset = 1;\n                  break;\n                case '.':\n                  this._terminal.gcharset = 2;\n                  break;\n              }\n              this._state = ParserState.CHARSET;\n              break;\n\n            // Designate G3 Character Set (VT300).\n            // A = ISO Latin-1 Supplemental.\n            // Not implemented.\n            case '/':\n              this._terminal.gcharset = 3;\n              this._state = ParserState.CHARSET;\n              this._position--;\n              break;\n\n            // ESC N\n            // Single Shift Select of G2 Character Set\n            // ( SS2 is 0x8e). This affects next character only.\n            case 'N':\n              break;\n            // ESC O\n            // Single Shift Select of G3 Character Set\n            // ( SS3 is 0x8f). This affects next character only.\n            case 'O':\n              break;\n            // ESC n\n            // Invoke the G2 Character Set as GL (LS2).\n            case 'n':\n              this._terminal.setgLevel(2);\n              break;\n            // ESC o\n            // Invoke the G3 Character Set as GL (LS3).\n            case 'o':\n              this._terminal.setgLevel(3);\n              break;\n            // ESC |\n            // Invoke the G3 Character Set as GR (LS3R).\n            case '|':\n              this._terminal.setgLevel(3);\n              break;\n            // ESC }\n            // Invoke the G2 Character Set as GR (LS2R).\n            case '}':\n              this._terminal.setgLevel(2);\n              break;\n            // ESC ~\n            // Invoke the G1 Character Set as GR (LS1R).\n            case '~':\n              this._terminal.setgLevel(1);\n              break;\n\n            // ESC 7 Save Cursor (DECSC).\n            case '7':\n              this._inputHandler.saveCursor();\n              this._state = ParserState.NORMAL;\n              break;\n\n            // ESC 8 Restore Cursor (DECRC).\n            case '8':\n              this._inputHandler.restoreCursor();\n              this._state = ParserState.NORMAL;\n              break;\n\n            // ESC # 3 DEC line height/width\n            case '#':\n              this._state = ParserState.NORMAL;\n              this._position++;\n              break;\n\n            // ESC H Tab Set (HTS is 0x88).\n            case 'H':\n              this._terminal.tabSet();\n              this._state = ParserState.NORMAL;\n              break;\n\n            // ESC = Application Keypad (DECKPAM).\n            case '=':\n              this._terminal.log('Serial port requested application keypad.');\n              this._terminal.applicationKeypad = true;\n              if (this._terminal.viewport) {\n                this._terminal.viewport.syncScrollArea();\n              }\n              this._state = ParserState.NORMAL;\n              break;\n\n            // ESC > Normal Keypad (DECKPNM).\n            case '>':\n              this._terminal.log('Switching back to normal keypad.');\n              this._terminal.applicationKeypad = false;\n              if (this._terminal.viewport) {\n                this._terminal.viewport.syncScrollArea();\n              }\n              this._state = ParserState.NORMAL;\n              break;\n\n            default:\n              this._state = ParserState.NORMAL;\n              this._terminal.error('Unknown ESC control: %s.', ch);\n              break;\n          }\n          break;\n\n        case ParserState.CHARSET:\n          if (ch in CHARSETS) {\n            cs = CHARSETS[ch];\n            if (ch === '/') { // ISOLatin is actually /A\n              this.skipNextChar();\n            }\n          } else {\n            cs = DEFAULT_CHARSET;\n          }\n          this._terminal.setgCharset(this._terminal.gcharset, cs);\n          this._terminal.gcharset = null;\n          this._state = ParserState.NORMAL;\n          break;\n\n        case ParserState.OSC:\n          // OSC Ps ; Pt ST\n          // OSC Ps ; Pt BEL\n          //   Set Text Parameters.\n          if (ch === C0.ESC || ch === C0.BEL) {\n            if (ch === C0.ESC) this._position++;\n\n            this._terminal.params.push(this._terminal.currentParam);\n\n            switch (this._terminal.params[0]) {\n              case 0:\n              case 1:\n              case 2:\n                if (this._terminal.params[1]) {\n                  this._terminal.title = this._terminal.params[1];\n                  this._terminal.handleTitle(this._terminal.title);\n                }\n                break;\n              case 3:\n                // set X property\n                break;\n              case 4:\n              case 5:\n                // change dynamic colors\n                break;\n              case 10:\n              case 11:\n              case 12:\n              case 13:\n              case 14:\n              case 15:\n              case 16:\n              case 17:\n              case 18:\n              case 19:\n                // change dynamic ui colors\n                break;\n              case 46:\n                // change log file\n                break;\n              case 50:\n                // dynamic font\n                break;\n              case 51:\n                // emacs shell\n                break;\n              case 52:\n                // manipulate selection data\n                break;\n              case 104:\n              case 105:\n              case 110:\n              case 111:\n              case 112:\n              case 113:\n              case 114:\n              case 115:\n              case 116:\n              case 117:\n              case 118:\n                // reset colors\n                break;\n            }\n\n            this._terminal.params = [];\n            this._terminal.currentParam = 0;\n            this._state = ParserState.NORMAL;\n          } else {\n            if (!this._terminal.params.length) {\n              if (ch >= '0' && ch <= '9') {\n                this._terminal.currentParam =\n                  this._terminal.currentParam * 10 + ch.charCodeAt(0) - 48;\n              } else if (ch === ';') {\n                this._terminal.params.push(this._terminal.currentParam);\n                this._terminal.currentParam = '';\n              }\n            } else {\n              this._terminal.currentParam += ch;\n            }\n          }\n          break;\n\n        case ParserState.CSI_PARAM:\n          if (ch in csiParamStateHandler) {\n            csiParamStateHandler[ch](this);\n            break;\n          }\n          this.finalizeParam();\n          // Fall through the CSI as this character should be the CSI code.\n          this._state = ParserState.CSI;\n\n        case ParserState.CSI:\n          if (ch in csiStateHandler) {\n            if (this._terminal.debug) {\n              this._terminal.log(`CSI ${this._terminal.prefix ? this._terminal.prefix : ''} ${this._terminal.params ? this._terminal.params.join(';') : ''} ${this._terminal.postfix ? this._terminal.postfix : ''} ${ch}`);\n            }\n            csiStateHandler[ch](this._inputHandler, this._terminal.params, this._terminal.prefix, this._terminal.postfix, this);\n          } else {\n            this._terminal.error('Unknown CSI code: %s.', ch);\n          }\n\n          this._state = ParserState.NORMAL;\n          this._terminal.prefix = '';\n          this._terminal.postfix = '';\n          break;\n\n        case ParserState.DCS:\n          if (ch === C0.ESC || ch === C0.BEL) {\n            if (ch === C0.ESC) this._position++;\n            let pt;\n            let valid: boolean;\n\n            switch (this._terminal.prefix) {\n              // User-Defined Keys (DECUDK).\n              case '':\n                break;\n\n              // Request Status String (DECRQSS).\n              // test: echo -e '\\eP$q\"p\\e\\\\'\n              case '$q':\n                pt = this._terminal.currentParam;\n                valid = false;\n\n                switch (pt) {\n                  // DECSCA\n                  case '\"q':\n                    pt = '0\"q';\n                    break;\n\n                  // DECSCL\n                  case '\"p':\n                    pt = '61\"p';\n                    break;\n\n                  // DECSTBM\n                  case 'r':\n                    pt = ''\n                      + (this._terminal.buffer.scrollTop + 1)\n                      + ';'\n                      + (this._terminal.buffer.scrollBottom + 1)\n                      + 'r';\n                    break;\n\n                  // SGR\n                  case 'm':\n                    pt = '0m';\n                    break;\n\n                  default:\n                    this._terminal.error('Unknown DCS Pt: %s.', pt);\n                    pt = '';\n                    break;\n                }\n\n                this._terminal.send(C0.ESC + 'P' + +valid + '$r' + pt + C0.ESC + '\\\\');\n                break;\n\n              // Set Termcap/Terminfo Data (xterm, experimental).\n              case '+p':\n                break;\n\n              // Request Termcap/Terminfo String (xterm, experimental)\n              // Regular xterm does not even respond to this sequence.\n              // This can cause a small glitch in vim.\n              // test: echo -ne '\\eP+q6b64\\e\\\\'\n              case '+q':\n                pt = this._terminal.currentParam;\n                valid = false;\n\n                this._terminal.send(C0.ESC + 'P' + +valid + '+r' + pt + C0.ESC + '\\\\');\n                break;\n\n              default:\n                this._terminal.error('Unknown DCS prefix: %s.', this._terminal.prefix);\n                break;\n            }\n\n            this._terminal.currentParam = 0;\n            this._terminal.prefix = '';\n            this._state = ParserState.NORMAL;\n          } else if (!this._terminal.currentParam) {\n            if (!this._terminal.prefix && ch !== '$' && ch !== '+') {\n              this._terminal.currentParam = ch;\n            } else if (this._terminal.prefix.length === 2) {\n              this._terminal.currentParam = ch;\n            } else {\n              this._terminal.prefix += ch;\n            }\n          } else {\n            this._terminal.currentParam += ch;\n          }\n          break;\n\n        case ParserState.IGNORE:\n          // For PM and APC.\n          if (ch === C0.ESC || ch === C0.BEL) {\n            if (ch === C0.ESC) this._position++;\n            this._state = ParserState.NORMAL;\n          }\n          break;\n      }\n    }\n\n    // Fire the cursormove event if it's moved. This is done inside the parser\n    // as a render cannot happen in the middle of a parsing round.\n    if (this._terminal.buffer.x !== cursorStartX || this._terminal.buffer.y !== cursorStartY) {\n      this._terminal.emit('cursormove');\n    }\n\n    return this._state;\n  }\n\n  /**\n   * Set the parser's current parsing state.\n   *\n   * @param state The new state.\n   */\n  public setState(state: ParserState): void {\n    this._state = state;\n  }\n\n  /**\n   * Sets the parsier's current prefix. CSI codes can have prefixes of '?', '>'\n   * or '!'.\n   *\n   * @param prefix The prefix.\n   */\n  public setPrefix(prefix: string): void {\n    this._terminal.prefix = prefix;\n  }\n\n  /**\n   * Sets the parsier's current prefix. CSI codes can have postfixes of '$',\n   * '\"', ' ', '\\''.\n   *\n   * @param postfix The postfix.\n   */\n  public setPostfix(postfix: string): void {\n    this._terminal.postfix = postfix;\n  }\n\n  /**\n   * Sets the parser's current parameter.\n   *\n   * @param param the parameter.\n   */\n  public setParam(param: number): void {\n    this._terminal.currentParam = param;\n  }\n\n  /**\n   * Gets the parser's current parameter.\n   */\n  public getParam(): number {\n    return this._terminal.currentParam;\n  }\n\n  /**\n   * Finalizes the parser's current parameter, adding it to the list of\n   * parameters and setting the new current parameter to 0.\n   */\n  public finalizeParam(): void {\n    this._terminal.params.push(this._terminal.currentParam);\n    this._terminal.currentParam = 0;\n  }\n\n  /**\n   * Tell the parser to skip the next character.\n   */\n  public skipNextChar(): void {\n    this._position++;\n  }\n\n  /**\n   * Tell the parser to repeat parsing the current character (for example if it\n   * needs parsing using a different state.\n   */\n  // public repeatChar(): void {\n  //   this._position--;\n  // }\n}\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { ILinkMatcherOptions, ITerminal, IBufferAccessor, ILinkifier, IElementAccessor } from './Interfaces';\nimport { LinkMatcher, LinkMatcherHandler, LinkMatcherValidationCallback, LineData, LinkHoverEvent, LinkHoverEventTypes } from './Types';\nimport { IMouseZoneManager } from './input/Interfaces';\nimport { MouseZone } from './input/MouseZoneManager';\nimport { EventEmitter } from './EventEmitter';\n\nconst protocolClause = '(https?:\\\\/\\\\/)';\nconst domainCharacterSet = '[\\\\da-z\\\\.-]+';\nconst negatedDomainCharacterSet = '[^\\\\da-z\\\\.-]+';\nconst domainBodyClause = '(' + domainCharacterSet + ')';\nconst tldClause = '([a-z\\\\.]{2,6})';\nconst ipClause = '((\\\\d{1,3}\\\\.){3}\\\\d{1,3})';\nconst localHostClause = '(localhost)';\nconst portClause = '(:\\\\d{1,5})';\nconst hostClause = '((' + domainBodyClause + '\\\\.' + tldClause + ')|' + ipClause + '|' + localHostClause + ')' + portClause + '?';\nconst pathClause = '(\\\\/[\\\\/\\\\w\\\\.\\\\-%~]*)*';\nconst queryStringHashFragmentCharacterSet = '[0-9\\\\w\\\\[\\\\]\\\\(\\\\)\\\\/\\\\?\\\\!#@$%&\\'*+,:;~\\\\=\\\\.\\\\-]*';\nconst queryStringClause = '(\\\\?' + queryStringHashFragmentCharacterSet + ')?';\nconst hashFragmentClause = '(#' + queryStringHashFragmentCharacterSet + ')?';\nconst negatedPathCharacterSet = '[^\\\\/\\\\w\\\\.\\\\-%]+';\nconst bodyClause = hostClause + pathClause + queryStringClause + hashFragmentClause;\nconst start = '(?:^|' + negatedDomainCharacterSet + ')(';\nconst end = ')($|' + negatedPathCharacterSet + ')';\nconst strictUrlRegex = new RegExp(start + protocolClause + bodyClause + end);\n\n/**\n * The ID of the built in http(s) link matcher.\n */\nconst HYPERTEXT_LINK_MATCHER_ID = 0;\n\n/**\n * The Linkifier applies links to rows shortly after they have been refreshed.\n */\nexport class Linkifier extends EventEmitter implements ILinkifier {\n  /**\n   * The time to wait after a row is changed before it is linkified. This prevents\n   * the costly operation of searching every row multiple times, potentially a\n   * huge amount of times.\n   */\n  protected static TIME_BEFORE_LINKIFY = 200;\n\n  protected _linkMatchers: LinkMatcher[] = [];\n\n  private _mouseZoneManager: IMouseZoneManager;\n  private _rowsTimeoutId: number;\n  private _nextLinkMatcherId = HYPERTEXT_LINK_MATCHER_ID;\n  private _rowsToLinkify: {start: number, end: number};\n\n  constructor(\n    protected _terminal: IBufferAccessor & IElementAccessor\n  ) {\n    super();\n    this._rowsToLinkify = {\n      start: null,\n      end: null\n    };\n    this.registerLinkMatcher(strictUrlRegex, null, { matchIndex: 1 });\n  }\n\n  /**\n   * Attaches the linkifier to the DOM, enabling linkification.\n   * @param mouseZoneManager The mouse zone manager to register link zones with.\n   */\n  public attachToDom(mouseZoneManager: IMouseZoneManager): void {\n    this._mouseZoneManager = mouseZoneManager;\n  }\n\n  /**\n   * Queue linkification on a set of rows.\n   * @param start The row to linkify from (inclusive).\n   * @param end The row to linkify to (inclusive).\n   */\n  public linkifyRows(start: number, end: number): void {\n    // Don't attempt linkify if not yet attached to DOM\n    if (!this._mouseZoneManager) {\n      return;\n    }\n\n    // Increase range to linkify\n    if (!this._rowsToLinkify.start) {\n      this._rowsToLinkify.start = start;\n      this._rowsToLinkify.end = end;\n    } else {\n      this._rowsToLinkify.start = this._rowsToLinkify.start < start ? this._rowsToLinkify.start : start;\n      this._rowsToLinkify.end = this._rowsToLinkify.end > end ? this._rowsToLinkify.end : end;\n    }\n\n    // Clear out any existing links on this row range\n    this._mouseZoneManager.clearAll(start, end);\n\n    // Restart timer\n    if (this._rowsTimeoutId) {\n      clearTimeout(this._rowsTimeoutId);\n    }\n    this._rowsTimeoutId = <number><any>setTimeout(() => this._linkifyRows(), Linkifier.TIME_BEFORE_LINKIFY);\n  }\n\n  /**\n   * Linkifies the rows requested.\n   */\n  private _linkifyRows(): void {\n    this._rowsTimeoutId = null;\n    for (let i = this._rowsToLinkify.start; i <= this._rowsToLinkify.end; i++) {\n      this._linkifyRow(i);\n    }\n    this._rowsToLinkify.start = null;\n    this._rowsToLinkify.end = null;\n  }\n\n  /**\n   * Attaches a handler for hypertext links, overriding default <a> behavior for\n   * tandard http(s) links.\n   * @param handler The handler to use, this can be cleared with null.\n   */\n  public setHypertextLinkHandler(handler: LinkMatcherHandler): void {\n    this._linkMatchers[HYPERTEXT_LINK_MATCHER_ID].handler = handler;\n  }\n\n  /**\n   * Attaches a validation callback for hypertext links.\n   * @param callback The callback to use, this can be cleared with null.\n   */\n  public setHypertextValidationCallback(callback: LinkMatcherValidationCallback): void {\n    this._linkMatchers[HYPERTEXT_LINK_MATCHER_ID].validationCallback = callback;\n  }\n\n  /**\n   * Registers a link matcher, allowing custom link patterns to be matched and\n   * handled.\n   * @param regex The regular expression to search for. Specifically, this\n   * searches the textContent of the rows. You will want to use \\s to match a\n   * space ' ' character for example.\n   * @param handler The callback when the link is called.\n   * @param options Options for the link matcher.\n   * @return The ID of the new matcher, this can be used to deregister.\n   */\n  public registerLinkMatcher(regex: RegExp, handler: LinkMatcherHandler, options: ILinkMatcherOptions = {}): number {\n    if (this._nextLinkMatcherId !== HYPERTEXT_LINK_MATCHER_ID && !handler) {\n      throw new Error('handler must be defined');\n    }\n    const matcher: LinkMatcher = {\n      id: this._nextLinkMatcherId++,\n      regex,\n      handler,\n      matchIndex: options.matchIndex,\n      validationCallback: options.validationCallback,\n      hoverTooltipCallback: options.tooltipCallback,\n      hoverLeaveCallback: options.leaveCallback,\n      priority: options.priority || 0\n    };\n    this._addLinkMatcherToList(matcher);\n    return matcher.id;\n  }\n\n  /**\n   * Inserts a link matcher to the list in the correct position based on the\n   * priority of each link matcher. New link matchers of equal priority are\n   * considered after older link matchers.\n   * @param matcher The link matcher to be added.\n   */\n  private _addLinkMatcherToList(matcher: LinkMatcher): void {\n    if (this._linkMatchers.length === 0) {\n      this._linkMatchers.push(matcher);\n      return;\n    }\n\n    for (let i = this._linkMatchers.length - 1; i >= 0; i--) {\n      if (matcher.priority <= this._linkMatchers[i].priority) {\n        this._linkMatchers.splice(i + 1, 0, matcher);\n        return;\n      }\n    }\n\n    this._linkMatchers.splice(0, 0, matcher);\n  }\n\n  /**\n   * Deregisters a link matcher if it has been registered.\n   * @param matcherId The link matcher's ID (returned after register)\n   * @return Whether a link matcher was found and deregistered.\n   */\n  public deregisterLinkMatcher(matcherId: number): boolean {\n    // ID 0 is the hypertext link matcher which cannot be deregistered\n    for (let i = 1; i < this._linkMatchers.length; i++) {\n      if (this._linkMatchers[i].id === matcherId) {\n        this._linkMatchers.splice(i, 1);\n        return true;\n      }\n    }\n    return false;\n  }\n\n  /**\n   * Linkifies a row.\n   * @param rowIndex The index of the row to linkify.\n   */\n  private _linkifyRow(rowIndex: number): void {\n    const absoluteRowIndex = this._terminal.buffer.ydisp + rowIndex;\n    if (absoluteRowIndex >= this._terminal.buffer.lines.length) {\n      return;\n    }\n    const text = this._terminal.buffer.translateBufferLineToString(absoluteRowIndex, false);\n    for (let i = 0; i < this._linkMatchers.length; i++) {\n      this._doLinkifyRow(rowIndex, text, this._linkMatchers[i]);\n    }\n  }\n\n  /**\n   * Linkifies a row given a specific handler.\n   * @param rowIndex The row index to linkify.\n   * @param text The text of the row (excludes text in the row that's already\n   * linkified).\n   * @param matcher The link matcher for this line.\n   * @param offset The how much of the row has already been linkified.\n   * @return The link element(s) that were added.\n   */\n  private _doLinkifyRow(rowIndex: number, text: string, matcher: LinkMatcher, offset: number = 0): void {\n    // Iterate over nodes as we want to consider text nodes\n    let result = [];\n    const isHttpLinkMatcher = matcher.id === HYPERTEXT_LINK_MATCHER_ID;\n\n    // Find the first match\n    let match = text.match(matcher.regex);\n    if (!match || match.length === 0) {\n      return;\n    }\n    let uri = match[typeof matcher.matchIndex !== 'number' ? 0 : matcher.matchIndex];\n\n    // Get index, match.index is for the outer match which includes negated chars\n    const index = text.indexOf(uri);\n\n    // Ensure the link is valid before registering\n    if (matcher.validationCallback) {\n      matcher.validationCallback(uri, isValid => {\n        // Discard link if the line has already changed\n        if (this._rowsTimeoutId) {\n          return;\n        }\n        if (isValid) {\n          this._addLink(offset + index, rowIndex, uri, matcher);\n        }\n      });\n    } else {\n      this._addLink(offset + index, rowIndex, uri, matcher);\n    }\n\n    // Recursively check for links in the rest of the text\n    const remainingStartIndex = index + uri.length;\n    const remainingText = text.substr(remainingStartIndex);\n    if (remainingText.length > 0) {\n      this._doLinkifyRow(rowIndex, remainingText, matcher, offset + remainingStartIndex);\n    }\n  }\n\n  /**\n   * Registers a link to the mouse zone manager.\n   * @param x The column the link starts.\n   * @param y The row the link is on.\n   * @param uri The URI of the link.\n   * @param matcher The link matcher for the link.\n   */\n  private _addLink(x: number, y: number, uri: string, matcher: LinkMatcher): void {\n    this._mouseZoneManager.add(new MouseZone(\n      x + 1,\n      x + 1 + uri.length,\n      y + 1,\n      e => {\n        if (matcher.handler) {\n          return matcher.handler(e, uri);\n        }\n        window.open(uri, '_blank');\n      },\n      e => {\n        this.emit(LinkHoverEventTypes.HOVER, <LinkHoverEvent>{ x, y, length: uri.length});\n        this._terminal.element.style.cursor = 'pointer';\n      },\n      e => {\n        this.emit(LinkHoverEventTypes.TOOLTIP, <LinkHoverEvent>{ x, y, length: uri.length});\n        if (matcher.hoverTooltipCallback) {\n          matcher.hoverTooltipCallback(e, uri);\n        }\n      },\n      () => {\n        this.emit(LinkHoverEventTypes.LEAVE, <LinkHoverEvent>{ x, y, length: uri.length});\n        this._terminal.element.style.cursor = '';\n        if (matcher.hoverLeaveCallback) {\n          matcher.hoverLeaveCallback();\n        }\n      }\n    ));\n  }\n}\n","/**\n * Copyright (c) 2014 The xterm.js authors. All rights reserved.\n * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)\n * @license MIT\n */\n\nimport { IInputHandler, ITerminal, IInputHandlingTerminal } from './Interfaces';\nimport { C0 } from './EscapeSequences';\nimport { DEFAULT_CHARSET } from './Charsets';\nimport { CharData } from './Types';\nimport { CHAR_DATA_CHAR_INDEX, CHAR_DATA_WIDTH_INDEX } from './Buffer';\nimport { FLAGS } from './renderer/Types';\nimport { wcwidth } from './CharWidth';\n\n/**\n * The terminal's standard implementation of IInputHandler, this handles all\n * input from the Parser.\n *\n * Refer to http://invisible-island.net/xterm/ctlseqs/ctlseqs.html to understand\n * each function's header comment.\n */\nexport class InputHandler implements IInputHandler {\n  constructor(private _terminal: IInputHandlingTerminal) { }\n\n  public addChar(char: string, code: number): void {\n    if (char >= ' ') {\n      // calculate print space\n      // expensive call, therefore we save width in line buffer\n      const ch_width = wcwidth(code);\n\n      if (this._terminal.charset && this._terminal.charset[char]) {\n        char = this._terminal.charset[char];\n      }\n\n      let row = this._terminal.buffer.y + this._terminal.buffer.ybase;\n\n      // insert combining char in last cell\n      // FIXME: needs handling after cursor jumps\n      if (!ch_width && this._terminal.buffer.x) {\n        // dont overflow left\n        if (this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 1]) {\n          if (!this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 1][CHAR_DATA_WIDTH_INDEX]) {\n            // found empty cell after fullwidth, need to go 2 cells back\n            if (this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 2]) {\n              this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 2][CHAR_DATA_CHAR_INDEX] += char;\n              this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 2][3] = char.charCodeAt(0);\n            }\n          } else {\n            this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 1][CHAR_DATA_CHAR_INDEX] += char;\n            this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 1][3] = char.charCodeAt(0);\n          }\n          this._terminal.updateRange(this._terminal.buffer.y);\n        }\n        return;\n      }\n\n      // goto next line if ch would overflow\n      // TODO: needs a global min terminal width of 2\n      if (this._terminal.buffer.x + ch_width - 1 >= this._terminal.cols) {\n        // autowrap - DECAWM\n        if (this._terminal.wraparoundMode) {\n          this._terminal.buffer.x = 0;\n          this._terminal.buffer.y++;\n          if (this._terminal.buffer.y > this._terminal.buffer.scrollBottom) {\n            this._terminal.buffer.y--;\n            this._terminal.scroll(true);\n          } else {\n            // The line already exists (eg. the initial viewport), mark it as a\n            // wrapped line\n            (<any>this._terminal.buffer.lines.get(this._terminal.buffer.y)).isWrapped = true;\n          }\n        } else {\n          if (ch_width === 2)  // FIXME: check for xterm behavior\n            return;\n        }\n      }\n      row = this._terminal.buffer.y + this._terminal.buffer.ybase;\n\n      // insert mode: move characters to right\n      if (this._terminal.insertMode) {\n        // do this twice for a fullwidth char\n        for (let moves = 0; moves < ch_width; ++moves) {\n          // remove last cell, if it's width is 0\n          // we have to adjust the second last cell as well\n          const removed = this._terminal.buffer.lines.get(this._terminal.buffer.y + this._terminal.buffer.ybase).pop();\n          if (removed[CHAR_DATA_WIDTH_INDEX] === 0\n              && this._terminal.buffer.lines.get(row)[this._terminal.cols - 2]\n              && this._terminal.buffer.lines.get(row)[this._terminal.cols - 2][CHAR_DATA_WIDTH_INDEX] === 2) {\n            this._terminal.buffer.lines.get(row)[this._terminal.cols - 2] = [this._terminal.curAttr, ' ', 1, ' '.charCodeAt(0)];\n          }\n\n          // insert empty cell at cursor\n          this._terminal.buffer.lines.get(row).splice(this._terminal.buffer.x, 0, [this._terminal.curAttr, ' ', 1, ' '.charCodeAt(0)]);\n        }\n      }\n\n      this._terminal.buffer.lines.get(row)[this._terminal.buffer.x] = [this._terminal.curAttr, char, ch_width, char.charCodeAt(0)];\n      this._terminal.buffer.x++;\n      this._terminal.updateRange(this._terminal.buffer.y);\n\n      // fullwidth char - set next cell width to zero and advance cursor\n      if (ch_width === 2) {\n        this._terminal.buffer.lines.get(row)[this._terminal.buffer.x] = [this._terminal.curAttr, '', 0, undefined];\n        this._terminal.buffer.x++;\n      }\n    }\n  }\n\n  /**\n   * BEL\n   * Bell (Ctrl-G).\n   */\n  public bell(): void {\n    this._terminal.bell();\n  }\n\n  /**\n   * LF\n   * Line Feed or New Line (NL).  (LF  is Ctrl-J).\n   */\n  public lineFeed(): void {\n    if (this._terminal.convertEol) {\n      this._terminal.buffer.x = 0;\n    }\n    this._terminal.buffer.y++;\n    if (this._terminal.buffer.y > this._terminal.buffer.scrollBottom) {\n      this._terminal.buffer.y--;\n      this._terminal.scroll();\n    }\n    // If the end of the line is hit, prevent this action from wrapping around to the next line.\n    if (this._terminal.buffer.x >= this._terminal.cols) {\n      this._terminal.buffer.x--;\n    }\n    /**\n     * This event is emitted whenever the terminal outputs a LF or NL.\n     *\n     * @event lineFeed\n     */\n    this._terminal.emit('lineFeed');\n  }\n\n  /**\n   * CR\n   * Carriage Return (Ctrl-M).\n   */\n  public carriageReturn(): void {\n    this._terminal.buffer.x = 0;\n  }\n\n  /**\n   * BS\n   * Backspace (Ctrl-H).\n   */\n  public backspace(): void {\n    if (this._terminal.buffer.x > 0) {\n      this._terminal.buffer.x--;\n    }\n  }\n\n  /**\n   * TAB\n   * Horizontal Tab (HT) (Ctrl-I).\n   */\n  public tab(): void {\n    this._terminal.buffer.x = this._terminal.buffer.nextStop();\n  }\n\n  /**\n   * SO\n   * Shift Out (Ctrl-N) -> Switch to Alternate Character Set.  This invokes the\n   * G1 character set.\n   */\n  public shiftOut(): void {\n    this._terminal.setgLevel(1);\n  }\n\n  /**\n   * SI\n   * Shift In (Ctrl-O) -> Switch to Standard Character Set.  This invokes the G0\n   * character set (the default).\n   */\n  public shiftIn(): void {\n    this._terminal.setgLevel(0);\n  }\n\n  /**\n   * CSI Ps @\n   * Insert Ps (Blank) Character(s) (default = 1) (ICH).\n   */\n  public insertChars(params: number[]): void {\n    let param = params[0];\n    if (param < 1) param = 1;\n\n    const row = this._terminal.buffer.y + this._terminal.buffer.ybase;\n    let j = this._terminal.buffer.x;\n    const ch: CharData = [this._terminal.eraseAttr(), ' ', 1, 32]; // xterm\n\n    while (param-- && j < this._terminal.cols) {\n      this._terminal.buffer.lines.get(row).splice(j++, 0, ch);\n      this._terminal.buffer.lines.get(row).pop();\n    }\n  }\n\n  /**\n   * CSI Ps A\n   * Cursor Up Ps Times (default = 1) (CUU).\n   */\n  public cursorUp(params: number[]): void {\n    let param = params[0];\n    if (param < 1) {\n      param = 1;\n    }\n    this._terminal.buffer.y -= param;\n    if (this._terminal.buffer.y < 0) {\n      this._terminal.buffer.y = 0;\n    }\n  }\n\n  /**\n   * CSI Ps B\n   * Cursor Down Ps Times (default = 1) (CUD).\n   */\n  public cursorDown(params: number[]): void {\n    let param = params[0];\n    if (param < 1) {\n      param = 1;\n    }\n    this._terminal.buffer.y += param;\n    if (this._terminal.buffer.y >= this._terminal.rows) {\n      this._terminal.buffer.y = this._terminal.rows - 1;\n    }\n    // If the end of the line is hit, prevent this action from wrapping around to the next line.\n    if (this._terminal.buffer.x >= this._terminal.cols) {\n      this._terminal.buffer.x--;\n    }\n  }\n\n  /**\n   * CSI Ps C\n   * Cursor Forward Ps Times (default = 1) (CUF).\n   */\n  public cursorForward(params: number[]): void {\n    let param = params[0];\n    if (param < 1) {\n      param = 1;\n    }\n    this._terminal.buffer.x += param;\n    if (this._terminal.buffer.x >= this._terminal.cols) {\n      this._terminal.buffer.x = this._terminal.cols - 1;\n    }\n  }\n\n  /**\n   * CSI Ps D\n   * Cursor Backward Ps Times (default = 1) (CUB).\n   */\n  public cursorBackward(params: number[]): void {\n    let param = params[0];\n    if (param < 1) {\n      param = 1;\n    }\n    // If the end of the line is hit, prevent this action from wrapping around to the next line.\n    if (this._terminal.buffer.x >= this._terminal.cols) {\n      this._terminal.buffer.x--;\n    }\n    this._terminal.buffer.x -= param;\n    if (this._terminal.buffer.x < 0) {\n      this._terminal.buffer.x = 0;\n    }\n  }\n\n  /**\n   * CSI Ps E\n   * Cursor Next Line Ps Times (default = 1) (CNL).\n   * same as CSI Ps B ?\n   */\n  public cursorNextLine(params: number[]): void {\n    let param = params[0];\n    if (param < 1) {\n      param = 1;\n    }\n    this._terminal.buffer.y += param;\n    if (this._terminal.buffer.y >= this._terminal.rows) {\n      this._terminal.buffer.y = this._terminal.rows - 1;\n    }\n    this._terminal.buffer.x = 0;\n  }\n\n\n  /**\n   * CSI Ps F\n   * Cursor Preceding Line Ps Times (default = 1) (CNL).\n   * reuse CSI Ps A ?\n   */\n  public cursorPrecedingLine(params: number[]): void {\n    let param = params[0];\n    if (param < 1) {\n      param = 1;\n    }\n    this._terminal.buffer.y -= param;\n    if (this._terminal.buffer.y < 0) {\n      this._terminal.buffer.y = 0;\n    }\n    this._terminal.buffer.x = 0;\n  }\n\n\n  /**\n   * CSI Ps G\n   * Cursor Character Absolute  [column] (default = [row,1]) (CHA).\n   */\n  public cursorCharAbsolute(params: number[]): void {\n    let param = params[0];\n    if (param < 1) {\n      param = 1;\n    }\n    this._terminal.buffer.x = param - 1;\n  }\n\n  /**\n   * CSI Ps ; Ps H\n   * Cursor Position [row;column] (default = [1,1]) (CUP).\n   */\n  public cursorPosition(params: number[]): void {\n    let col: number;\n    let row: number = params[0] - 1;\n\n    if (params.length >= 2) {\n      col = params[1] - 1;\n    } else {\n      col = 0;\n    }\n\n    if (row < 0) {\n      row = 0;\n    } else if (row >= this._terminal.rows) {\n      row = this._terminal.rows - 1;\n    }\n\n    if (col < 0) {\n      col = 0;\n    } else if (col >= this._terminal.cols) {\n      col = this._terminal.cols - 1;\n    }\n\n    this._terminal.buffer.x = col;\n    this._terminal.buffer.y = row;\n  }\n\n  /**\n   * CSI Ps I\n   *   Cursor Forward Tabulation Ps tab stops (default = 1) (CHT).\n   */\n  public cursorForwardTab(params: number[]): void {\n    let param = params[0] || 1;\n    while (param--) {\n      this._terminal.buffer.x = this._terminal.buffer.nextStop();\n    }\n  }\n\n  /**\n   * CSI Ps J  Erase in Display (ED).\n   *     Ps = 0  -> Erase Below (default).\n   *     Ps = 1  -> Erase Above.\n   *     Ps = 2  -> Erase All.\n   *     Ps = 3  -> Erase Saved Lines (xterm).\n   * CSI ? Ps J\n   *   Erase in Display (DECSED).\n   *     Ps = 0  -> Selective Erase Below (default).\n   *     Ps = 1  -> Selective Erase Above.\n   *     Ps = 2  -> Selective Erase All.\n   */\n  public eraseInDisplay(params: number[]): void {\n    let j;\n    switch (params[0]) {\n      case 0:\n        this._terminal.eraseRight(this._terminal.buffer.x, this._terminal.buffer.y);\n        j = this._terminal.buffer.y + 1;\n        for (; j < this._terminal.rows; j++) {\n          this._terminal.eraseLine(j);\n        }\n        break;\n      case 1:\n        this._terminal.eraseLeft(this._terminal.buffer.x, this._terminal.buffer.y);\n        j = this._terminal.buffer.y;\n        while (j--) {\n          this._terminal.eraseLine(j);\n        }\n        break;\n      case 2:\n        j = this._terminal.rows;\n        while (j--) this._terminal.eraseLine(j);\n        break;\n      case 3:\n        // Clear scrollback (everything not in viewport)\n        const scrollBackSize = this._terminal.buffer.lines.length - this._terminal.rows;\n        if (scrollBackSize > 0) {\n          this._terminal.buffer.lines.trimStart(scrollBackSize);\n          this._terminal.buffer.ybase = Math.max(this._terminal.buffer.ybase - scrollBackSize, 0);\n          this._terminal.buffer.ydisp = Math.max(this._terminal.buffer.ydisp - scrollBackSize, 0);\n          // Force a scroll event to refresh viewport\n          this._terminal.emit('scroll', 0);\n        }\n        break;\n    }\n  }\n\n  /**\n   * CSI Ps K  Erase in Line (EL).\n   *     Ps = 0  -> Erase to Right (default).\n   *     Ps = 1  -> Erase to Left.\n   *     Ps = 2  -> Erase All.\n   * CSI ? Ps K\n   *   Erase in Line (DECSEL).\n   *     Ps = 0  -> Selective Erase to Right (default).\n   *     Ps = 1  -> Selective Erase to Left.\n   *     Ps = 2  -> Selective Erase All.\n   */\n  public eraseInLine(params: number[]): void {\n    switch (params[0]) {\n      case 0:\n        this._terminal.eraseRight(this._terminal.buffer.x, this._terminal.buffer.y);\n        break;\n      case 1:\n        this._terminal.eraseLeft(this._terminal.buffer.x, this._terminal.buffer.y);\n        break;\n      case 2:\n        this._terminal.eraseLine(this._terminal.buffer.y);\n        break;\n    }\n  }\n\n  /**\n   * CSI Ps L\n   * Insert Ps Line(s) (default = 1) (IL).\n   */\n  public insertLines(params: number[]): void {\n    let param: number = params[0];\n    if (param < 1) {\n      param = 1;\n    }\n    let row: number = this._terminal.buffer.y + this._terminal.buffer.ybase;\n\n    let scrollBottomRowsOffset = this._terminal.rows - 1 - this._terminal.buffer.scrollBottom;\n    let scrollBottomAbsolute = this._terminal.rows - 1 + this._terminal.buffer.ybase - scrollBottomRowsOffset + 1;\n    while (param--) {\n      // test: echo -e '\\e[44m\\e[1L\\e[0m'\n      // blankLine(true) - xterm/linux behavior\n      this._terminal.buffer.lines.splice(scrollBottomAbsolute - 1, 1);\n      this._terminal.buffer.lines.splice(row, 0, this._terminal.blankLine(true));\n    }\n\n    // this.maxRange();\n    this._terminal.updateRange(this._terminal.buffer.y);\n    this._terminal.updateRange(this._terminal.buffer.scrollBottom);\n  }\n\n  /**\n   * CSI Ps M\n   * Delete Ps Line(s) (default = 1) (DL).\n   */\n  public deleteLines(params: number[]): void {\n    let param = params[0];\n    if (param < 1) {\n      param = 1;\n    }\n    const row: number = this._terminal.buffer.y + this._terminal.buffer.ybase;\n\n    let j: number;\n    j = this._terminal.rows - 1 - this._terminal.buffer.scrollBottom;\n    j = this._terminal.rows - 1 + this._terminal.buffer.ybase - j;\n    while (param--) {\n      // test: echo -e '\\e[44m\\e[1M\\e[0m'\n      // blankLine(true) - xterm/linux behavior\n      this._terminal.buffer.lines.splice(row, 1);\n      this._terminal.buffer.lines.splice(j, 0, this._terminal.blankLine(true));\n    }\n\n    // this.maxRange();\n    this._terminal.updateRange(this._terminal.buffer.y);\n    this._terminal.updateRange(this._terminal.buffer.scrollBottom);\n  }\n\n  /**\n   * CSI Ps P\n   * Delete Ps Character(s) (default = 1) (DCH).\n   */\n  public deleteChars(params: number[]): void {\n    let param: number = params[0];\n    if (param < 1) {\n      param = 1;\n    }\n\n    const row = this._terminal.buffer.y + this._terminal.buffer.ybase;\n    const ch: CharData = [this._terminal.eraseAttr(), ' ', 1, 32]; // xterm\n\n    while (param--) {\n      this._terminal.buffer.lines.get(row).splice(this._terminal.buffer.x, 1);\n      this._terminal.buffer.lines.get(row).push(ch);\n    }\n    this._terminal.updateRange(this._terminal.buffer.y);\n  }\n\n  /**\n   * CSI Ps S  Scroll up Ps lines (default = 1) (SU).\n   */\n  public scrollUp(params: number[]): void {\n    let param = params[0] || 1;\n    while (param--) {\n      this._terminal.buffer.lines.splice(this._terminal.buffer.ybase + this._terminal.buffer.scrollTop, 1);\n      this._terminal.buffer.lines.splice(this._terminal.buffer.ybase + this._terminal.buffer.scrollBottom, 0, this._terminal.blankLine());\n    }\n    // this.maxRange();\n    this._terminal.updateRange(this._terminal.buffer.scrollTop);\n    this._terminal.updateRange(this._terminal.buffer.scrollBottom);\n  }\n\n  /**\n   * CSI Ps T  Scroll down Ps lines (default = 1) (SD).\n   */\n  public scrollDown(params: number[]): void {\n    let param = params[0] || 1;\n    while (param--) {\n      this._terminal.buffer.lines.splice(this._terminal.buffer.ybase + this._terminal.buffer.scrollBottom, 1);\n      this._terminal.buffer.lines.splice(this._terminal.buffer.ybase + this._terminal.buffer.scrollTop, 0, this._terminal.blankLine());\n    }\n    // this.maxRange();\n    this._terminal.updateRange(this._terminal.buffer.scrollTop);\n    this._terminal.updateRange(this._terminal.buffer.scrollBottom);\n  }\n\n  /**\n   * CSI Ps X\n   * Erase Ps Character(s) (default = 1) (ECH).\n   */\n  public eraseChars(params: number[]): void {\n    let param = params[0];\n    if (param < 1) {\n      param = 1;\n    }\n\n    const row = this._terminal.buffer.y + this._terminal.buffer.ybase;\n    let j = this._terminal.buffer.x;\n    const ch: CharData = [this._terminal.eraseAttr(), ' ', 1, 32]; // xterm\n\n    while (param-- && j < this._terminal.cols) {\n      this._terminal.buffer.lines.get(row)[j++] = ch;\n    }\n  }\n\n  /**\n   * CSI Ps Z  Cursor Backward Tabulation Ps tab stops (default = 1) (CBT).\n   */\n  public cursorBackwardTab(params: number[]): void {\n    let param = params[0] || 1;\n    while (param--) {\n      this._terminal.buffer.x = this._terminal.buffer.prevStop();\n    }\n  }\n\n  /**\n   * CSI Pm `  Character Position Absolute\n   *   [column] (default = [row,1]) (HPA).\n   */\n  public charPosAbsolute(params: number[]): void {\n    let param = params[0];\n    if (param < 1) {\n      param = 1;\n    }\n    this._terminal.buffer.x = param - 1;\n    if (this._terminal.buffer.x >= this._terminal.cols) {\n      this._terminal.buffer.x = this._terminal.cols - 1;\n    }\n  }\n\n  /**\n   * CSI Pm a  Character Position Relative\n   *   [columns] (default = [row,col+1]) (HPR)\n   * reuse CSI Ps C ?\n   */\n  public HPositionRelative(params: number[]): void {\n    let param = params[0];\n    if (param < 1) {\n      param = 1;\n    }\n    this._terminal.buffer.x += param;\n    if (this._terminal.buffer.x >= this._terminal.cols) {\n      this._terminal.buffer.x = this._terminal.cols - 1;\n    }\n  }\n\n  /**\n   * CSI Ps b  Repeat the preceding graphic character Ps times (REP).\n   */\n  public repeatPrecedingCharacter(params: number[]): void {\n    let param = params[0] || 1;\n    const line = this._terminal.buffer.lines.get(this._terminal.buffer.ybase + this._terminal.buffer.y);\n    const ch = line[this._terminal.buffer.x - 1] || [this._terminal.defAttr, ' ', 1, 32];\n\n    while (param--) {\n      line[this._terminal.buffer.x++] = ch;\n    }\n  }\n\n  /**\n   * CSI Ps c  Send Device Attributes (Primary DA).\n   *     Ps = 0  or omitted -> request attributes from terminal.  The\n   *     response depends on the decTerminalID resource setting.\n   *     -> CSI ? 1 ; 2 c  (``VT100 with Advanced Video Option'')\n   *     -> CSI ? 1 ; 0 c  (``VT101 with No Options'')\n   *     -> CSI ? 6 c  (``VT102'')\n   *     -> CSI ? 6 0 ; 1 ; 2 ; 6 ; 8 ; 9 ; 1 5 ; c  (``VT220'')\n   *   The VT100-style response parameters do not mean anything by\n   *   themselves.  VT220 parameters do, telling the host what fea-\n   *   tures the terminal supports:\n   *     Ps = 1  -> 132-columns.\n   *     Ps = 2  -> Printer.\n   *     Ps = 6  -> Selective erase.\n   *     Ps = 8  -> User-defined keys.\n   *     Ps = 9  -> National replacement character sets.\n   *     Ps = 1 5  -> Technical characters.\n   *     Ps = 2 2  -> ANSI color, e.g., VT525.\n   *     Ps = 2 9  -> ANSI text locator (i.e., DEC Locator mode).\n   * CSI > Ps c\n   *   Send Device Attributes (Secondary DA).\n   *     Ps = 0  or omitted -> request the terminal's identification\n   *     code.  The response depends on the decTerminalID resource set-\n   *     ting.  It should apply only to VT220 and up, but xterm extends\n   *     this to VT100.\n   *     -> CSI  > Pp ; Pv ; Pc c\n   *   where Pp denotes the terminal type\n   *     Pp = 0  -> ``VT100''.\n   *     Pp = 1  -> ``VT220''.\n   *   and Pv is the firmware version (for xterm, this was originally\n   *   the XFree86 patch number, starting with 95).  In a DEC termi-\n   *   nal, Pc indicates the ROM cartridge registration number and is\n   *   always zero.\n   * More information:\n   *   xterm/charproc.c - line 2012, for more information.\n   *   vim responds with ^[[?0c or ^[[?1c after the terminal's response (?)\n   */\n  public sendDeviceAttributes(params: number[]): void {\n    if (params[0] > 0) {\n      return;\n    }\n\n    if (!this._terminal.prefix) {\n      if (this._terminal.is('xterm') || this._terminal.is('rxvt-unicode') || this._terminal.is('screen')) {\n        this._terminal.send(C0.ESC + '[?1;2c');\n      } else if (this._terminal.is('linux')) {\n        this._terminal.send(C0.ESC + '[?6c');\n      }\n    } else if (this._terminal.prefix === '>') {\n      // xterm and urxvt\n      // seem to spit this\n      // out around ~370 times (?).\n      if (this._terminal.is('xterm')) {\n        this._terminal.send(C0.ESC + '[>0;276;0c');\n      } else if (this._terminal.is('rxvt-unicode')) {\n        this._terminal.send(C0.ESC + '[>85;95;0c');\n      } else if (this._terminal.is('linux')) {\n        // not supported by linux console.\n        // linux console echoes parameters.\n        this._terminal.send(params[0] + 'c');\n      } else if (this._terminal.is('screen')) {\n        this._terminal.send(C0.ESC + '[>83;40003;0c');\n      }\n    }\n  }\n\n  /**\n   * CSI Pm d  Vertical Position Absolute (VPA)\n   *   [row] (default = [1,column])\n   */\n  public linePosAbsolute(params: number[]): void {\n    let param = params[0];\n    if (param < 1) {\n      param = 1;\n    }\n    this._terminal.buffer.y = param - 1;\n    if (this._terminal.buffer.y >= this._terminal.rows) {\n      this._terminal.buffer.y = this._terminal.rows - 1;\n    }\n  }\n\n  /**\n   * CSI Pm e  Vertical Position Relative (VPR)\n   *   [rows] (default = [row+1,column])\n   * reuse CSI Ps B ?\n   */\n  public VPositionRelative(params: number[]): void {\n    let param = params[0];\n    if (param < 1) {\n      param = 1;\n    }\n    this._terminal.buffer.y += param;\n    if (this._terminal.buffer.y >= this._terminal.rows) {\n      this._terminal.buffer.y = this._terminal.rows - 1;\n    }\n    // If the end of the line is hit, prevent this action from wrapping around to the next line.\n    if (this._terminal.buffer.x >= this._terminal.cols) {\n      this._terminal.buffer.x--;\n    }\n  }\n\n  /**\n   * CSI Ps ; Ps f\n   *   Horizontal and Vertical Position [row;column] (default =\n   *   [1,1]) (HVP).\n   */\n  public HVPosition(params: number[]): void {\n    if (params[0] < 1) params[0] = 1;\n    if (params[1] < 1) params[1] = 1;\n\n    this._terminal.buffer.y = params[0] - 1;\n    if (this._terminal.buffer.y >= this._terminal.rows) {\n      this._terminal.buffer.y = this._terminal.rows - 1;\n    }\n\n    this._terminal.buffer.x = params[1] - 1;\n    if (this._terminal.buffer.x >= this._terminal.cols) {\n      this._terminal.buffer.x = this._terminal.cols - 1;\n    }\n  }\n\n  /**\n   * CSI Ps g  Tab Clear (TBC).\n   *     Ps = 0  -> Clear Current Column (default).\n   *     Ps = 3  -> Clear All.\n   * Potentially:\n   *   Ps = 2  -> Clear Stops on Line.\n   *   http://vt100.net/annarbor/aaa-ug/section6.html\n   */\n  public tabClear(params: number[]): void {\n    let param = params[0];\n    if (param <= 0) {\n      delete this._terminal.buffer.tabs[this._terminal.buffer.x];\n    } else if (param === 3) {\n      this._terminal.buffer.tabs = {};\n    }\n  }\n\n  /**\n   * CSI Pm h  Set Mode (SM).\n   *     Ps = 2  -> Keyboard Action Mode (AM).\n   *     Ps = 4  -> Insert Mode (IRM).\n   *     Ps = 1 2  -> Send/receive (SRM).\n   *     Ps = 2 0  -> Automatic Newline (LNM).\n   * CSI ? Pm h\n   *   DEC Private Mode Set (DECSET).\n   *     Ps = 1  -> Application Cursor Keys (DECCKM).\n   *     Ps = 2  -> Designate USASCII for character sets G0-G3\n   *     (DECANM), and set VT100 mode.\n   *     Ps = 3  -> 132 Column Mode (DECCOLM).\n   *     Ps = 4  -> Smooth (Slow) Scroll (DECSCLM).\n   *     Ps = 5  -> Reverse Video (DECSCNM).\n   *     Ps = 6  -> Origin Mode (DECOM).\n   *     Ps = 7  -> Wraparound Mode (DECAWM).\n   *     Ps = 8  -> Auto-repeat Keys (DECARM).\n   *     Ps = 9  -> Send Mouse X & Y on button press.  See the sec-\n   *     tion Mouse Tracking.\n   *     Ps = 1 0  -> Show toolbar (rxvt).\n   *     Ps = 1 2  -> Start Blinking Cursor (att610).\n   *     Ps = 1 8  -> Print form feed (DECPFF).\n   *     Ps = 1 9  -> Set print extent to full screen (DECPEX).\n   *     Ps = 2 5  -> Show Cursor (DECTCEM).\n   *     Ps = 3 0  -> Show scrollbar (rxvt).\n   *     Ps = 3 5  -> Enable font-shifting functions (rxvt).\n   *     Ps = 3 8  -> Enter Tektronix Mode (DECTEK).\n   *     Ps = 4 0  -> Allow 80 -> 132 Mode.\n   *     Ps = 4 1  -> more(1) fix (see curses resource).\n   *     Ps = 4 2  -> Enable Nation Replacement Character sets (DECN-\n   *     RCM).\n   *     Ps = 4 4  -> Turn On Margin Bell.\n   *     Ps = 4 5  -> Reverse-wraparound Mode.\n   *     Ps = 4 6  -> Start Logging.  This is normally disabled by a\n   *     compile-time option.\n   *     Ps = 4 7  -> Use Alternate Screen Buffer.  (This may be dis-\n   *     abled by the titeInhibit resource).\n   *     Ps = 6 6  -> Application keypad (DECNKM).\n   *     Ps = 6 7  -> Backarrow key sends backspace (DECBKM).\n   *     Ps = 1 0 0 0  -> Send Mouse X & Y on button press and\n   *     release.  See the section Mouse Tracking.\n   *     Ps = 1 0 0 1  -> Use Hilite Mouse Tracking.\n   *     Ps = 1 0 0 2  -> Use Cell Motion Mouse Tracking.\n   *     Ps = 1 0 0 3  -> Use All Motion Mouse Tracking.\n   *     Ps = 1 0 0 4  -> Send FocusIn/FocusOut events.\n   *     Ps = 1 0 0 5  -> Enable Extended Mouse Mode.\n   *     Ps = 1 0 1 0  -> Scroll to bottom on tty output (rxvt).\n   *     Ps = 1 0 1 1  -> Scroll to bottom on key press (rxvt).\n   *     Ps = 1 0 3 4  -> Interpret \"meta\" key, sets eighth bit.\n   *     (enables the eightBitInput resource).\n   *     Ps = 1 0 3 5  -> Enable special modifiers for Alt and Num-\n   *     Lock keys.  (This enables the numLock resource).\n   *     Ps = 1 0 3 6  -> Send ESC   when Meta modifies a key.  (This\n   *     enables the metaSendsEscape resource).\n   *     Ps = 1 0 3 7  -> Send DEL from the editing-keypad Delete\n   *     key.\n   *     Ps = 1 0 3 9  -> Send ESC  when Alt modifies a key.  (This\n   *     enables the altSendsEscape resource).\n   *     Ps = 1 0 4 0  -> Keep selection even if not highlighted.\n   *     (This enables the keepSelection resource).\n   *     Ps = 1 0 4 1  -> Use the CLIPBOARD selection.  (This enables\n   *     the selectToClipboard resource).\n   *     Ps = 1 0 4 2  -> Enable Urgency window manager hint when\n   *     Control-G is received.  (This enables the bellIsUrgent\n   *     resource).\n   *     Ps = 1 0 4 3  -> Enable raising of the window when Control-G\n   *     is received.  (enables the popOnBell resource).\n   *     Ps = 1 0 4 7  -> Use Alternate Screen Buffer.  (This may be\n   *     disabled by the titeInhibit resource).\n   *     Ps = 1 0 4 8  -> Save cursor as in DECSC.  (This may be dis-\n   *     abled by the titeInhibit resource).\n   *     Ps = 1 0 4 9  -> Save cursor as in DECSC and use Alternate\n   *     Screen Buffer, clearing it first.  (This may be disabled by\n   *     the titeInhibit resource).  This combines the effects of the 1\n   *     0 4 7  and 1 0 4 8  modes.  Use this with terminfo-based\n   *     applications rather than the 4 7  mode.\n   *     Ps = 1 0 5 0  -> Set terminfo/termcap function-key mode.\n   *     Ps = 1 0 5 1  -> Set Sun function-key mode.\n   *     Ps = 1 0 5 2  -> Set HP function-key mode.\n   *     Ps = 1 0 5 3  -> Set SCO function-key mode.\n   *     Ps = 1 0 6 0  -> Set legacy keyboard emulation (X11R6).\n   *     Ps = 1 0 6 1  -> Set VT220 keyboard emulation.\n   *     Ps = 2 0 0 4  -> Set bracketed paste mode.\n   * Modes:\n   *   http: *vt100.net/docs/vt220-rm/chapter4.html\n   */\n  public setMode(params: number[]): void {\n    if (params.length > 1) {\n      for (let i = 0; i < params.length; i++) {\n        this.setMode([params[i]]);\n      }\n\n      return;\n    }\n\n    if (!this._terminal.prefix) {\n      switch (params[0]) {\n        case 4:\n          this._terminal.insertMode = true;\n          break;\n        case 20:\n          // this._t.convertEol = true;\n          break;\n      }\n    } else if (this._terminal.prefix === '?') {\n      switch (params[0]) {\n        case 1:\n          this._terminal.applicationCursor = true;\n          break;\n        case 2:\n          this._terminal.setgCharset(0, DEFAULT_CHARSET);\n          this._terminal.setgCharset(1, DEFAULT_CHARSET);\n          this._terminal.setgCharset(2, DEFAULT_CHARSET);\n          this._terminal.setgCharset(3, DEFAULT_CHARSET);\n          // set VT100 mode here\n          break;\n        case 3: // 132 col mode\n          this._terminal.savedCols = this._terminal.cols;\n          this._terminal.resize(132, this._terminal.rows);\n          break;\n        case 6:\n          this._terminal.originMode = true;\n          break;\n        case 7:\n          this._terminal.wraparoundMode = true;\n          break;\n        case 12:\n          // this.cursorBlink = true;\n          break;\n        case 66:\n          this._terminal.log('Serial port requested application keypad.');\n          this._terminal.applicationKeypad = true;\n          this._terminal.viewport.syncScrollArea();\n          break;\n        case 9: // X10 Mouse\n          // no release, no motion, no wheel, no modifiers.\n        case 1000: // vt200 mouse\n          // no motion.\n          // no modifiers, except control on the wheel.\n        case 1002: // button event mouse\n        case 1003: // any event mouse\n          // any event - sends motion events,\n          // even if there is no button held down.\n\n          // TODO: Why are params[0] compares nested within a switch for params[0]?\n\n          this._terminal.x10Mouse = params[0] === 9;\n          this._terminal.vt200Mouse = params[0] === 1000;\n          this._terminal.normalMouse = params[0] > 1000;\n          this._terminal.mouseEvents = true;\n          this._terminal.element.classList.add('enable-mouse-events');\n          this._terminal.selectionManager.disable();\n          this._terminal.log('Binding to mouse events.');\n          break;\n        case 1004: // send focusin/focusout events\n          // focusin: ^[[I\n          // focusout: ^[[O\n          this._terminal.sendFocus = true;\n          break;\n        case 1005: // utf8 ext mode mouse\n          this._terminal.utfMouse = true;\n          // for wide terminals\n          // simply encodes large values as utf8 characters\n          break;\n        case 1006: // sgr ext mode mouse\n          this._terminal.sgrMouse = true;\n          // for wide terminals\n          // does not add 32 to fields\n          // press: ^[[<b;x;yM\n          // release: ^[[<b;x;ym\n          break;\n        case 1015: // urxvt ext mode mouse\n          this._terminal.urxvtMouse = true;\n          // for wide terminals\n          // numbers for fields\n          // press: ^[[b;x;yM\n          // motion: ^[[b;x;yT\n          break;\n        case 25: // show cursor\n          this._terminal.cursorHidden = false;\n          break;\n        case 1049: // alt screen buffer cursor\n          // TODO: Not sure if we need to save/restore after switching the buffer\n          // this.saveCursor(params);\n          // FALL-THROUGH\n        case 47: // alt screen buffer\n        case 1047: // alt screen buffer\n          this._terminal.buffers.activateAltBuffer();\n          this._terminal.selectionManager.setBuffer(this._terminal.buffer);\n          this._terminal.viewport.syncScrollArea();\n          this._terminal.showCursor();\n          break;\n        case 2004: // bracketed paste mode (https://cirw.in/blog/bracketed-paste)\n          this._terminal.bracketedPasteMode = true;\n          break;\n      }\n    }\n  }\n\n  /**\n   * CSI Pm l  Reset Mode (RM).\n   *     Ps = 2  -> Keyboard Action Mode (AM).\n   *     Ps = 4  -> Replace Mode (IRM).\n   *     Ps = 1 2  -> Send/receive (SRM).\n   *     Ps = 2 0  -> Normal Linefeed (LNM).\n   * CSI ? Pm l\n   *   DEC Private Mode Reset (DECRST).\n   *     Ps = 1  -> Normal Cursor Keys (DECCKM).\n   *     Ps = 2  -> Designate VT52 mode (DECANM).\n   *     Ps = 3  -> 80 Column Mode (DECCOLM).\n   *     Ps = 4  -> Jump (Fast) Scroll (DECSCLM).\n   *     Ps = 5  -> Normal Video (DECSCNM).\n   *     Ps = 6  -> Normal Cursor Mode (DECOM).\n   *     Ps = 7  -> No Wraparound Mode (DECAWM).\n   *     Ps = 8  -> No Auto-repeat Keys (DECARM).\n   *     Ps = 9  -> Don't send Mouse X & Y on button press.\n   *     Ps = 1 0  -> Hide toolbar (rxvt).\n   *     Ps = 1 2  -> Stop Blinking Cursor (att610).\n   *     Ps = 1 8  -> Don't print form feed (DECPFF).\n   *     Ps = 1 9  -> Limit print to scrolling region (DECPEX).\n   *     Ps = 2 5  -> Hide Cursor (DECTCEM).\n   *     Ps = 3 0  -> Don't show scrollbar (rxvt).\n   *     Ps = 3 5  -> Disable font-shifting functions (rxvt).\n   *     Ps = 4 0  -> Disallow 80 -> 132 Mode.\n   *     Ps = 4 1  -> No more(1) fix (see curses resource).\n   *     Ps = 4 2  -> Disable Nation Replacement Character sets (DEC-\n   *     NRCM).\n   *     Ps = 4 4  -> Turn Off Margin Bell.\n   *     Ps = 4 5  -> No Reverse-wraparound Mode.\n   *     Ps = 4 6  -> Stop Logging.  (This is normally disabled by a\n   *     compile-time option).\n   *     Ps = 4 7  -> Use Normal Screen Buffer.\n   *     Ps = 6 6  -> Numeric keypad (DECNKM).\n   *     Ps = 6 7  -> Backarrow key sends delete (DECBKM).\n   *     Ps = 1 0 0 0  -> Don't send Mouse X & Y on button press and\n   *     release.  See the section Mouse Tracking.\n   *     Ps = 1 0 0 1  -> Don't use Hilite Mouse Tracking.\n   *     Ps = 1 0 0 2  -> Don't use Cell Motion Mouse Tracking.\n   *     Ps = 1 0 0 3  -> Don't use All Motion Mouse Tracking.\n   *     Ps = 1 0 0 4  -> Don't send FocusIn/FocusOut events.\n   *     Ps = 1 0 0 5  -> Disable Extended Mouse Mode.\n   *     Ps = 1 0 1 0  -> Don't scroll to bottom on tty output\n   *     (rxvt).\n   *     Ps = 1 0 1 1  -> Don't scroll to bottom on key press (rxvt).\n   *     Ps = 1 0 3 4  -> Don't interpret \"meta\" key.  (This disables\n   *     the eightBitInput resource).\n   *     Ps = 1 0 3 5  -> Disable special modifiers for Alt and Num-\n   *     Lock keys.  (This disables the numLock resource).\n   *     Ps = 1 0 3 6  -> Don't send ESC  when Meta modifies a key.\n   *     (This disables the metaSendsEscape resource).\n   *     Ps = 1 0 3 7  -> Send VT220 Remove from the editing-keypad\n   *     Delete key.\n   *     Ps = 1 0 3 9  -> Don't send ESC  when Alt modifies a key.\n   *     (This disables the altSendsEscape resource).\n   *     Ps = 1 0 4 0  -> Do not keep selection when not highlighted.\n   *     (This disables the keepSelection resource).\n   *     Ps = 1 0 4 1  -> Use the PRIMARY selection.  (This disables\n   *     the selectToClipboard resource).\n   *     Ps = 1 0 4 2  -> Disable Urgency window manager hint when\n   *     Control-G is received.  (This disables the bellIsUrgent\n   *     resource).\n   *     Ps = 1 0 4 3  -> Disable raising of the window when Control-\n   *     G is received.  (This disables the popOnBell resource).\n   *     Ps = 1 0 4 7  -> Use Normal Screen Buffer, clearing screen\n   *     first if in the Alternate Screen.  (This may be disabled by\n   *     the titeInhibit resource).\n   *     Ps = 1 0 4 8  -> Restore cursor as in DECRC.  (This may be\n   *     disabled by the titeInhibit resource).\n   *     Ps = 1 0 4 9  -> Use Normal Screen Buffer and restore cursor\n   *     as in DECRC.  (This may be disabled by the titeInhibit\n   *     resource).  This combines the effects of the 1 0 4 7  and 1 0\n   *     4 8  modes.  Use this with terminfo-based applications rather\n   *     than the 4 7  mode.\n   *     Ps = 1 0 5 0  -> Reset terminfo/termcap function-key mode.\n   *     Ps = 1 0 5 1  -> Reset Sun function-key mode.\n   *     Ps = 1 0 5 2  -> Reset HP function-key mode.\n   *     Ps = 1 0 5 3  -> Reset SCO function-key mode.\n   *     Ps = 1 0 6 0  -> Reset legacy keyboard emulation (X11R6).\n   *     Ps = 1 0 6 1  -> Reset keyboard emulation to Sun/PC style.\n   *     Ps = 2 0 0 4  -> Reset bracketed paste mode.\n   */\n  public resetMode(params: number[]): void {\n    if (params.length > 1) {\n      for (let i = 0; i < params.length; i++) {\n        this.resetMode([params[i]]);\n      }\n\n      return;\n    }\n\n    if (!this._terminal.prefix) {\n      switch (params[0]) {\n        case 4:\n          this._terminal.insertMode = false;\n          break;\n        case 20:\n          // this._t.convertEol = false;\n          break;\n      }\n    } else if (this._terminal.prefix === '?') {\n      switch (params[0]) {\n        case 1:\n          this._terminal.applicationCursor = false;\n          break;\n        case 3:\n          if (this._terminal.cols === 132 && this._terminal.savedCols) {\n            this._terminal.resize(this._terminal.savedCols, this._terminal.rows);\n          }\n          delete this._terminal.savedCols;\n          break;\n        case 6:\n          this._terminal.originMode = false;\n          break;\n        case 7:\n          this._terminal.wraparoundMode = false;\n          break;\n        case 12:\n          // this.cursorBlink = false;\n          break;\n        case 66:\n          this._terminal.log('Switching back to normal keypad.');\n          this._terminal.applicationKeypad = false;\n          this._terminal.viewport.syncScrollArea();\n          break;\n        case 9: // X10 Mouse\n        case 1000: // vt200 mouse\n        case 1002: // button event mouse\n        case 1003: // any event mouse\n          this._terminal.x10Mouse = false;\n          this._terminal.vt200Mouse = false;\n          this._terminal.normalMouse = false;\n          this._terminal.mouseEvents = false;\n          this._terminal.element.classList.remove('enable-mouse-events');\n          this._terminal.selectionManager.enable();\n          break;\n        case 1004: // send focusin/focusout events\n          this._terminal.sendFocus = false;\n          break;\n        case 1005: // utf8 ext mode mouse\n          this._terminal.utfMouse = false;\n          break;\n        case 1006: // sgr ext mode mouse\n          this._terminal.sgrMouse = false;\n          break;\n        case 1015: // urxvt ext mode mouse\n          this._terminal.urxvtMouse = false;\n          break;\n        case 25: // hide cursor\n          this._terminal.cursorHidden = true;\n          break;\n        case 1049: // alt screen buffer cursor\n           // FALL-THROUGH\n        case 47: // normal screen buffer\n        case 1047: // normal screen buffer - clearing it first\n          // Ensure the selection manager has the correct buffer\n          this._terminal.buffers.activateNormalBuffer();\n          // TODO: Not sure if we need to save/restore after switching the buffer\n          // if (params[0] === 1049) {\n          //   this.restoreCursor(params);\n          // }\n          this._terminal.selectionManager.setBuffer(this._terminal.buffer);\n          this._terminal.refresh(0, this._terminal.rows - 1);\n          this._terminal.viewport.syncScrollArea();\n          this._terminal.showCursor();\n          break;\n        case 2004: // bracketed paste mode (https://cirw.in/blog/bracketed-paste)\n          this._terminal.bracketedPasteMode = false;\n          break;\n      }\n    }\n  }\n\n  /**\n   * CSI Pm m  Character Attributes (SGR).\n   *     Ps = 0  -> Normal (default).\n   *     Ps = 1  -> Bold.\n   *     Ps = 2  -> Faint, decreased intensity (ISO 6429).\n   *     Ps = 4  -> Underlined.\n   *     Ps = 5  -> Blink (appears as Bold).\n   *     Ps = 7  -> Inverse.\n   *     Ps = 8  -> Invisible, i.e., hidden (VT300).\n   *     Ps = 2 2  -> Normal (neither bold nor faint).\n   *     Ps = 2 4  -> Not underlined.\n   *     Ps = 2 5  -> Steady (not blinking).\n   *     Ps = 2 7  -> Positive (not inverse).\n   *     Ps = 2 8  -> Visible, i.e., not hidden (VT300).\n   *     Ps = 3 0  -> Set foreground color to Black.\n   *     Ps = 3 1  -> Set foreground color to Red.\n   *     Ps = 3 2  -> Set foreground color to Green.\n   *     Ps = 3 3  -> Set foreground color to Yellow.\n   *     Ps = 3 4  -> Set foreground color to Blue.\n   *     Ps = 3 5  -> Set foreground color to Magenta.\n   *     Ps = 3 6  -> Set foreground color to Cyan.\n   *     Ps = 3 7  -> Set foreground color to White.\n   *     Ps = 3 9  -> Set foreground color to default (original).\n   *     Ps = 4 0  -> Set background color to Black.\n   *     Ps = 4 1  -> Set background color to Red.\n   *     Ps = 4 2  -> Set background color to Green.\n   *     Ps = 4 3  -> Set background color to Yellow.\n   *     Ps = 4 4  -> Set background color to Blue.\n   *     Ps = 4 5  -> Set background color to Magenta.\n   *     Ps = 4 6  -> Set background color to Cyan.\n   *     Ps = 4 7  -> Set background color to White.\n   *     Ps = 4 9  -> Set background color to default (original).\n   *\n   *   If 16-color support is compiled, the following apply.  Assume\n   *   that xterm's resources are set so that the ISO color codes are\n   *   the first 8 of a set of 16.  Then the aixterm colors are the\n   *   bright versions of the ISO colors:\n   *     Ps = 9 0  -> Set foreground color to Black.\n   *     Ps = 9 1  -> Set foreground color to Red.\n   *     Ps = 9 2  -> Set foreground color to Green.\n   *     Ps = 9 3  -> Set foreground color to Yellow.\n   *     Ps = 9 4  -> Set foreground color to Blue.\n   *     Ps = 9 5  -> Set foreground color to Magenta.\n   *     Ps = 9 6  -> Set foreground color to Cyan.\n   *     Ps = 9 7  -> Set foreground color to White.\n   *     Ps = 1 0 0  -> Set background color to Black.\n   *     Ps = 1 0 1  -> Set background color to Red.\n   *     Ps = 1 0 2  -> Set background color to Green.\n   *     Ps = 1 0 3  -> Set background color to Yellow.\n   *     Ps = 1 0 4  -> Set background color to Blue.\n   *     Ps = 1 0 5  -> Set background color to Magenta.\n   *     Ps = 1 0 6  -> Set background color to Cyan.\n   *     Ps = 1 0 7  -> Set background color to White.\n   *\n   *   If xterm is compiled with the 16-color support disabled, it\n   *   supports the following, from rxvt:\n   *     Ps = 1 0 0  -> Set foreground and background color to\n   *     default.\n   *\n   *   If 88- or 256-color support is compiled, the following apply.\n   *     Ps = 3 8  ; 5  ; Ps -> Set foreground color to the second\n   *     Ps.\n   *     Ps = 4 8  ; 5  ; Ps -> Set background color to the second\n   *     Ps.\n   */\n  public charAttributes(params: number[]): void {\n    // Optimize a single SGR0.\n    if (params.length === 1 && params[0] === 0) {\n      this._terminal.curAttr = this._terminal.defAttr;\n      return;\n    }\n\n    const l = params.length;\n    let flags = this._terminal.curAttr >> 18;\n    let fg = (this._terminal.curAttr >> 9) & 0x1ff;\n    let bg = this._terminal.curAttr & 0x1ff;\n    let p;\n\n    for (let i = 0; i < l; i++) {\n      p = params[i];\n      if (p >= 30 && p <= 37) {\n        // fg color 8\n        fg = p - 30;\n      } else if (p >= 40 && p <= 47) {\n        // bg color 8\n        bg = p - 40;\n      } else if (p >= 90 && p <= 97) {\n        // fg color 16\n        p += 8;\n        fg = p - 90;\n      } else if (p >= 100 && p <= 107) {\n        // bg color 16\n        p += 8;\n        bg = p - 100;\n      } else if (p === 0) {\n        // default\n        flags = this._terminal.defAttr >> 18;\n        fg = (this._terminal.defAttr >> 9) & 0x1ff;\n        bg = this._terminal.defAttr & 0x1ff;\n        // flags = 0;\n        // fg = 0x1ff;\n        // bg = 0x1ff;\n      } else if (p === 1) {\n        // bold text\n        flags |= FLAGS.BOLD;\n      } else if (p === 4) {\n        // underlined text\n        flags |= FLAGS.UNDERLINE;\n      } else if (p === 5) {\n        // blink\n        flags |= FLAGS.BLINK;\n      } else if (p === 7) {\n        // inverse and positive\n        // test with: echo -e '\\e[31m\\e[42mhello\\e[7mworld\\e[27mhi\\e[m'\n        flags |= FLAGS.INVERSE;\n      } else if (p === 8) {\n        // invisible\n        flags |= FLAGS.INVISIBLE;\n      } else if (p === 2) {\n        // dimmed text\n        flags |= FLAGS.DIM;\n      } else if (p === 22) {\n        // not bold nor faint\n        flags &= ~FLAGS.BOLD;\n        flags &= ~FLAGS.DIM;\n      } else if (p === 24) {\n        // not underlined\n        flags &= ~FLAGS.UNDERLINE;\n      } else if (p === 25) {\n        // not blink\n        flags &= ~FLAGS.BLINK;\n      } else if (p === 27) {\n        // not inverse\n        flags &= ~FLAGS.INVERSE;\n      } else if (p === 28) {\n        // not invisible\n        flags &= ~FLAGS.INVISIBLE;\n      } else if (p === 39) {\n        // reset fg\n        fg = (this._terminal.defAttr >> 9) & 0x1ff;\n      } else if (p === 49) {\n        // reset bg\n        bg = this._terminal.defAttr & 0x1ff;\n      } else if (p === 38) {\n        // fg color 256\n        if (params[i + 1] === 2) {\n          i += 2;\n          fg = this._terminal.matchColor(\n            params[i] & 0xff,\n            params[i + 1] & 0xff,\n            params[i + 2] & 0xff);\n          if (fg === -1) fg = 0x1ff;\n          i += 2;\n        } else if (params[i + 1] === 5) {\n          i += 2;\n          p = params[i] & 0xff;\n          fg = p;\n        }\n      } else if (p === 48) {\n        // bg color 256\n        if (params[i + 1] === 2) {\n          i += 2;\n          bg = this._terminal.matchColor(\n            params[i] & 0xff,\n            params[i + 1] & 0xff,\n            params[i + 2] & 0xff);\n          if (bg === -1) bg = 0x1ff;\n          i += 2;\n        } else if (params[i + 1] === 5) {\n          i += 2;\n          p = params[i] & 0xff;\n          bg = p;\n        }\n      } else if (p === 100) {\n        // reset fg/bg\n        fg = (this._terminal.defAttr >> 9) & 0x1ff;\n        bg = this._terminal.defAttr & 0x1ff;\n      } else {\n        this._terminal.error('Unknown SGR attribute: %d.', p);\n      }\n    }\n\n    this._terminal.curAttr = (flags << 18) | (fg << 9) | bg;\n  }\n\n  /**\n   * CSI Ps n  Device Status Report (DSR).\n   *     Ps = 5  -> Status Report.  Result (``OK'') is\n   *   CSI 0 n\n   *     Ps = 6  -> Report Cursor Position (CPR) [row;column].\n   *   Result is\n   *   CSI r ; c R\n   * CSI ? Ps n\n   *   Device Status Report (DSR, DEC-specific).\n   *     Ps = 6  -> Report Cursor Position (CPR) [row;column] as CSI\n   *     ? r ; c R (assumes page is zero).\n   *     Ps = 1 5  -> Report Printer status as CSI ? 1 0  n  (ready).\n   *     or CSI ? 1 1  n  (not ready).\n   *     Ps = 2 5  -> Report UDK status as CSI ? 2 0  n  (unlocked)\n   *     or CSI ? 2 1  n  (locked).\n   *     Ps = 2 6  -> Report Keyboard status as\n   *   CSI ? 2 7  ;  1  ;  0  ;  0  n  (North American).\n   *   The last two parameters apply to VT400 & up, and denote key-\n   *   board ready and LK01 respectively.\n   *     Ps = 5 3  -> Report Locator status as\n   *   CSI ? 5 3  n  Locator available, if compiled-in, or\n   *   CSI ? 5 0  n  No Locator, if not.\n   */\n  public deviceStatus(params: number[]): void {\n    if (!this._terminal.prefix) {\n      switch (params[0]) {\n        case 5:\n          // status report\n          this._terminal.send(C0.ESC + '[0n');\n          break;\n        case 6:\n          // cursor position\n          this._terminal.send(C0.ESC + '['\n                    + (this._terminal.buffer.y + 1)\n                    + ';'\n                    + (this._terminal.buffer.x + 1)\n                    + 'R');\n          break;\n      }\n    } else if (this._terminal.prefix === '?') {\n      // modern xterm doesnt seem to\n      // respond to any of these except ?6, 6, and 5\n      switch (params[0]) {\n        case 6:\n          // cursor position\n          this._terminal.send(C0.ESC + '[?'\n                    + (this._terminal.buffer.y + 1)\n                    + ';'\n                    + (this._terminal.buffer.x + 1)\n                    + 'R');\n          break;\n        case 15:\n          // no printer\n          // this.send(C0.ESC + '[?11n');\n          break;\n        case 25:\n          // dont support user defined keys\n          // this.send(C0.ESC + '[?21n');\n          break;\n        case 26:\n          // north american keyboard\n          // this.send(C0.ESC + '[?27;1;0;0n');\n          break;\n        case 53:\n          // no dec locator/mouse\n          // this.send(C0.ESC + '[?50n');\n          break;\n      }\n    }\n  }\n\n  /**\n   * CSI ! p   Soft terminal reset (DECSTR).\n   * http://vt100.net/docs/vt220-rm/table4-10.html\n   */\n  public softReset(params: number[]): void {\n    this._terminal.cursorHidden = false;\n    this._terminal.insertMode = false;\n    this._terminal.originMode = false;\n    this._terminal.wraparoundMode = true;  // defaults: xterm - true, vt100 - false\n    this._terminal.applicationKeypad = false; // ?\n    this._terminal.viewport.syncScrollArea();\n    this._terminal.applicationCursor = false;\n    this._terminal.buffer.scrollTop = 0;\n    this._terminal.buffer.scrollBottom = this._terminal.rows - 1;\n    this._terminal.curAttr = this._terminal.defAttr;\n    this._terminal.buffer.x = this._terminal.buffer.y = 0; // ?\n    this._terminal.charset = null;\n    this._terminal.glevel = 0; // ??\n    this._terminal.charsets = [null]; // ??\n  }\n\n  /**\n   * CSI Ps SP q  Set cursor style (DECSCUSR, VT520).\n   *   Ps = 0  -> blinking block.\n   *   Ps = 1  -> blinking block (default).\n   *   Ps = 2  -> steady block.\n   *   Ps = 3  -> blinking underline.\n   *   Ps = 4  -> steady underline.\n   *   Ps = 5  -> blinking bar (xterm).\n   *   Ps = 6  -> steady bar (xterm).\n   */\n  public setCursorStyle(params?: number[]): void {\n    const param = params[0] < 1 ? 1 : params[0];\n    switch (param) {\n      case 1:\n      case 2:\n        this._terminal.setOption('cursorStyle', 'block');\n        break;\n      case 3:\n      case 4:\n        this._terminal.setOption('cursorStyle', 'underline');\n        break;\n      case 5:\n      case 6:\n        this._terminal.setOption('cursorStyle', 'bar');\n        break;\n    }\n    const isBlinking = param % 2 === 1;\n    this._terminal.setOption('cursorBlink', isBlinking);\n  }\n\n  /**\n   * CSI Ps ; Ps r\n   *   Set Scrolling Region [top;bottom] (default = full size of win-\n   *   dow) (DECSTBM).\n   * CSI ? Pm r\n   */\n  public setScrollRegion(params: number[]): void {\n    if (this._terminal.prefix) return;\n    this._terminal.buffer.scrollTop = (params[0] || 1) - 1;\n    this._terminal.buffer.scrollBottom = (params[1] && params[1] <= this._terminal.rows ? params[1] : this._terminal.rows) - 1;\n    this._terminal.buffer.x = 0;\n    this._terminal.buffer.y = 0;\n  }\n\n\n  /**\n   * CSI s\n   *   Save cursor (ANSI.SYS).\n   */\n  public saveCursor(params: number[]): void {\n    this._terminal.buffer.savedX = this._terminal.buffer.x;\n    this._terminal.buffer.savedY = this._terminal.buffer.y;\n  }\n\n\n  /**\n   * CSI u\n   *   Restore cursor (ANSI.SYS).\n   */\n  public restoreCursor(params: number[]): void {\n    this._terminal.buffer.x = this._terminal.buffer.savedX || 0;\n    this._terminal.buffer.y = this._terminal.buffer.savedY || 0;\n  }\n}\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IEventEmitter, IListenerType } from './Interfaces';\n\nexport class EventEmitter implements IEventEmitter {\n  private _events: {[type: string]: IListenerType[]};\n\n  constructor() {\n    // Restore the previous events if available, this will happen if the\n    // constructor is called multiple times on the same object (terminal reset).\n    this._events = this._events || {};\n  }\n\n  public on(type: string, listener: IListenerType): void {\n    this._events[type] = this._events[type] || [];\n    this._events[type].push(listener);\n  }\n\n  public off(type: string, listener: IListenerType): void {\n    if (!this._events[type]) {\n      return;\n    }\n\n    let obj = this._events[type];\n    let i = obj.length;\n\n    while (i--) {\n      if (obj[i] === listener || obj[i].listener === listener) {\n        obj.splice(i, 1);\n        return;\n      }\n    }\n  }\n\n  public removeAllListeners(type: string): void {\n    if (this._events[type]) {\n       delete this._events[type];\n    }\n  }\n\n  public once(type: string, listener: IListenerType): void {\n    function on(): void {\n      let args = Array.prototype.slice.call(arguments);\n      this.off(type, on);\n      listener.apply(this, args);\n    }\n    (<any>on).listener = listener;\n    this.on(type, on);\n  }\n\n  public emit(type: string, ...args: any[]): void {\n    if (!this._events[type]) {\n      return;\n    }\n    let obj = this._events[type];\n    for (let i = 0; i < obj.length; i++) {\n      obj[i].apply(this, args);\n    }\n  }\n\n  public listeners(type: string): IListenerType[] {\n    return this._events[type] || [];\n  }\n\n  protected destroy(): void {\n    this._events = {};\n  }\n}\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\n/**\n * C0 control codes\n * See = https://en.wikipedia.org/wiki/C0_and_C1_control_codes\n */\nexport namespace C0 {\n  /** Null (Caret = ^@, C = \\0) */\n  export const NUL = '\\x00';\n  /** Start of Heading (Caret = ^A) */\n  export const SOH = '\\x01';\n  /** Start of Text (Caret = ^B) */\n  export const STX = '\\x02';\n  /** End of Text (Caret = ^C) */\n  export const ETX = '\\x03';\n  /** End of Transmission (Caret = ^D) */\n  export const EOT = '\\x04';\n  /** Enquiry (Caret = ^E) */\n  export const ENQ = '\\x05';\n  /** Acknowledge (Caret = ^F) */\n  export const ACK = '\\x06';\n  /** Bell (Caret = ^G, C = \\a) */\n  export const BEL = '\\x07';\n  /** Backspace (Caret = ^H, C = \\b) */\n  export const BS  = '\\x08';\n  /** Character Tabulation, Horizontal Tabulation (Caret = ^I, C = \\t) */\n  export const HT  = '\\x09';\n  /** Line Feed (Caret = ^J, C = \\n) */\n  export const LF  = '\\x0a';\n  /** Line Tabulation, Vertical Tabulation (Caret = ^K, C = \\v) */\n  export const VT  = '\\x0b';\n  /** Form Feed (Caret = ^L, C = \\f) */\n  export const FF  = '\\x0c';\n  /** Carriage Return (Caret = ^M, C = \\r) */\n  export const CR  = '\\x0d';\n  /** Shift Out (Caret = ^N) */\n  export const SO  = '\\x0e';\n  /** Shift In (Caret = ^O) */\n  export const SI  = '\\x0f';\n  /** Data Link Escape (Caret = ^P) */\n  export const DLE = '\\x10';\n  /** Device Control One (XON) (Caret = ^Q) */\n  export const DC1 = '\\x11';\n  /** Device Control Two (Caret = ^R) */\n  export const DC2 = '\\x12';\n  /** Device Control Three (XOFF) (Caret = ^S) */\n  export const DC3 = '\\x13';\n  /** Device Control Four (Caret = ^T) */\n  export const DC4 = '\\x14';\n  /** Negative Acknowledge (Caret = ^U) */\n  export const NAK = '\\x15';\n  /** Synchronous Idle (Caret = ^V) */\n  export const SYN = '\\x16';\n  /** End of Transmission Block (Caret = ^W) */\n  export const ETB = '\\x17';\n  /** Cancel (Caret = ^X) */\n  export const CAN = '\\x18';\n  /** End of Medium (Caret = ^Y) */\n  export const EM  = '\\x19';\n  /** Substitute (Caret = ^Z) */\n  export const SUB = '\\x1a';\n  /** Escape (Caret = ^[, C = \\e) */\n  export const ESC = '\\x1b';\n  /** File Separator (Caret = ^\\) */\n  export const FS  = '\\x1c';\n  /** Group Separator (Caret = ^]) */\n  export const GS  = '\\x1d';\n  /** Record Separator (Caret = ^^) */\n  export const RS  = '\\x1e';\n  /** Unit Separator (Caret = ^_) */\n  export const US  = '\\x1f';\n  /** Space */\n  export const SP  = '\\x20';\n  /** Delete (Caret = ^?) */\n  export const DEL = '\\x7f';\n};\n","/**\n * Copyright (c) 2016 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { ITerminal } from './Interfaces';\n\ninterface IPosition {\n  start: number;\n  end: number;\n}\n\n/**\n * Encapsulates the logic for handling compositionstart, compositionupdate and compositionend\n * events, displaying the in-progress composition to the UI and forwarding the final composition\n * to the handler.\n */\nexport class CompositionHelper {\n  /**\n   * Whether input composition is currently happening, eg. via a mobile keyboard, speech input or\n   * IME. This variable determines whether the compositionText should be displayed on the UI.\n   */\n  private isComposing: boolean;\n\n  /**\n   * The position within the input textarea's value of the current composition.\n   */\n  private compositionPosition: IPosition;\n\n  /**\n   * Whether a composition is in the process of being sent, setting this to false will cancel any\n   * in-progress composition.\n   */\n  private isSendingComposition: boolean;\n\n  /**\n   * Creates a new CompositionHelper.\n   * @param textarea The textarea that xterm uses for input.\n   * @param compositionView The element to display the in-progress composition in.\n   * @param terminal The Terminal to forward the finished composition to.\n   */\n  constructor(\n    private textarea: HTMLTextAreaElement,\n    private compositionView: HTMLElement,\n    private terminal: ITerminal\n  ) {\n    this.isComposing = false;\n    this.isSendingComposition = false;\n    this.compositionPosition = { start: null, end: null };\n  }\n\n  /**\n   * Handles the compositionstart event, activating the composition view.\n   */\n  public compositionstart(): void {\n    this.isComposing = true;\n    this.compositionPosition.start = this.textarea.value.length;\n    this.compositionView.textContent = '';\n    this.compositionView.classList.add('active');\n  }\n\n  /**\n   * Handles the compositionupdate event, updating the composition view.\n   * @param {CompositionEvent} ev The event.\n   */\n  public compositionupdate(ev: CompositionEvent): void {\n    this.compositionView.textContent = ev.data;\n    this.updateCompositionElements();\n    setTimeout(() => {\n      this.compositionPosition.end = this.textarea.value.length;\n    }, 0);\n  }\n\n  /**\n   * Handles the compositionend event, hiding the composition view and sending the composition to\n   * the handler.\n   */\n  public compositionend(): void {\n    this.finalizeComposition(true);\n  }\n\n  /**\n   * Handles the keydown event, routing any necessary events to the CompositionHelper functions.\n   * @param ev The keydown event.\n   * @return Whether the Terminal should continue processing the keydown event.\n   */\n  public keydown(ev: KeyboardEvent): boolean {\n    if (this.isComposing || this.isSendingComposition) {\n      if (ev.keyCode === 229) {\n        // Continue composing if the keyCode is the \"composition character\"\n        return false;\n      } else if (ev.keyCode === 16 || ev.keyCode === 17 || ev.keyCode === 18) {\n        // Continue composing if the keyCode is a modifier key\n        return false;\n      } else {\n        // Finish composition immediately. This is mainly here for the case where enter is\n        // pressed and the handler needs to be triggered before the command is executed.\n        this.finalizeComposition(false);\n      }\n    }\n\n    if (ev.keyCode === 229) {\n      // If the \"composition character\" is used but gets to this point it means a non-composition\n      // character (eg. numbers and punctuation) was pressed when the IME was active.\n      this.handleAnyTextareaChanges();\n      return false;\n    }\n\n    return true;\n  }\n\n  /**\n   * Finalizes the composition, resuming regular input actions. This is called when a composition\n   * is ending.\n   * @param waitForPropogation Whether to wait for events to propogate before sending\n   *   the input. This should be false if a non-composition keystroke is entered before the\n   *   compositionend event is triggered, such as enter, so that the composition is send before\n   *   the command is executed.\n   */\n  private finalizeComposition(waitForPropogation: boolean): void {\n    this.compositionView.classList.remove('active');\n    this.isComposing = false;\n    this.clearTextareaPosition();\n\n    if (!waitForPropogation) {\n      // Cancel any delayed composition send requests and send the input immediately.\n      this.isSendingComposition = false;\n      const input = this.textarea.value.substring(this.compositionPosition.start, this.compositionPosition.end);\n      this.terminal.handler(input);\n    } else {\n      // Make a deep copy of the composition position here as a new compositionstart event may\n      // fire before the setTimeout executes.\n      const currentCompositionPosition = {\n        start: this.compositionPosition.start,\n        end: this.compositionPosition.end,\n      };\n\n      // Since composition* events happen before the changes take place in the textarea on most\n      // browsers, use a setTimeout with 0ms time to allow the native compositionend event to\n      // complete. This ensures the correct character is retrieved, this solution was used\n      // because:\n      // - The compositionend event's data property is unreliable, at least on Chromium\n      // - The last compositionupdate event's data property does not always accurately describe\n      //   the character, a counter example being Korean where an ending consonsant can move to\n      //   the following character if the following input is a vowel.\n      this.isSendingComposition = true;\n      setTimeout(() => {\n        // Ensure that the input has not already been sent\n        if (this.isSendingComposition) {\n          this.isSendingComposition = false;\n          let input;\n          if (this.isComposing) {\n            // Use the end position to get the string if a new composition has started.\n            input = this.textarea.value.substring(currentCompositionPosition.start, currentCompositionPosition.end);\n          } else {\n            // Don't use the end position here in order to pick up any characters after the\n            // composition has finished, for example when typing a non-composition character\n            // (eg. 2) after a composition character.\n            input = this.textarea.value.substring(currentCompositionPosition.start);\n          }\n          this.terminal.handler(input);\n        }\n      }, 0);\n    }\n  }\n\n  /**\n   * Apply any changes made to the textarea after the current event chain is allowed to complete.\n   * This should be called when not currently composing but a keydown event with the \"composition\n   * character\" (229) is triggered, in order to allow non-composition text to be entered when an\n   * IME is active.\n   */\n  private handleAnyTextareaChanges(): void {\n    const oldValue = this.textarea.value;\n    setTimeout(() => {\n      // Ignore if a composition has started since the timeout\n      if (!this.isComposing) {\n        const newValue = this.textarea.value;\n        const diff = newValue.replace(oldValue, '');\n        if (diff.length > 0) {\n          this.terminal.handler(diff);\n        }\n      }\n    }, 0);\n  }\n\n  /**\n   * Positions the composition view on top of the cursor and the textarea just below it (so the\n   * IME helper dialog is positioned correctly).\n   * @param dontRecurse Whether to use setTimeout to recursively trigger another update, this is\n   *   necessary as the IME events across browsers are not consistently triggered.\n   */\n  public updateCompositionElements(dontRecurse?: boolean): void {\n    if (!this.isComposing) {\n      return;\n    }\n\n    if (this.terminal.buffer.isCursorInViewport) {\n      const cellHeight = Math.ceil(this.terminal.charMeasure.height * this.terminal.options.lineHeight);\n      const cursorTop = this.terminal.buffer.y * cellHeight;\n      const cursorLeft = this.terminal.buffer.x * this.terminal.charMeasure.width;\n\n      this.compositionView.style.left = cursorLeft + 'px';\n      this.compositionView.style.top = cursorTop + 'px';\n      this.compositionView.style.height = cellHeight + 'px';\n      this.compositionView.style.lineHeight = cellHeight + 'px';\n      // Sync the textarea to the exact position of the composition view so the IME knows where the\n      // text is.\n      const compositionViewBounds = this.compositionView.getBoundingClientRect();\n      this.textarea.style.left = cursorLeft + 'px';\n      this.textarea.style.top = cursorTop + 'px';\n      this.textarea.style.width = compositionViewBounds.width + 'px';\n      this.textarea.style.height = compositionViewBounds.height + 'px';\n      this.textarea.style.lineHeight = compositionViewBounds.height + 'px';\n    }\n\n    if (!dontRecurse) {\n      setTimeout(() => this.updateCompositionElements(true), 0);\n    }\n  };\n\n  /**\n   * Clears the textarea's position so that the cursor does not blink on IE.\n   * @private\n   */\n  private clearTextareaPosition(): void {\n    this.textarea.style.left = '';\n    this.textarea.style.top = '';\n  };\n}\n","/**\n * Copyright (c) 2016 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { Charset } from './Types';\n\n/**\n * The character sets supported by the terminal. These enable several languages\n * to be represented within the terminal with only 8-bit encoding. See ISO 2022\n * for a discussion on character sets. Only VT100 character sets are supported.\n */\nexport const CHARSETS: { [key: string]: Charset } = {};\n\n/**\n * The default character set, US.\n */\nexport const DEFAULT_CHARSET: Charset = CHARSETS['B'];\n\n/**\n * DEC Special Character and Line Drawing Set.\n * Reference: http://vt100.net/docs/vt102-ug/table5-13.html\n * A lot of curses apps use this if they see TERM=xterm.\n * testing: echo -e '\\e(0a\\e(B'\n * The xterm output sometimes seems to conflict with the\n * reference above. xterm seems in line with the reference\n * when running vttest however.\n * The table below now uses xterm's output from vttest.\n */\nCHARSETS['0'] = {\n  '`': '\\u25c6', // '◆'\n  'a': '\\u2592', // '▒'\n  'b': '\\u0009', // '\\t'\n  'c': '\\u000c', // '\\f'\n  'd': '\\u000d', // '\\r'\n  'e': '\\u000a', // '\\n'\n  'f': '\\u00b0', // '°'\n  'g': '\\u00b1', // '±'\n  'h': '\\u2424', // '\\u2424' (NL)\n  'i': '\\u000b', // '\\v'\n  'j': '\\u2518', // '┘'\n  'k': '\\u2510', // '┐'\n  'l': '\\u250c', // '┌'\n  'm': '\\u2514', // '└'\n  'n': '\\u253c', // '┼'\n  'o': '\\u23ba', // '⎺'\n  'p': '\\u23bb', // '⎻'\n  'q': '\\u2500', // '─'\n  'r': '\\u23bc', // '⎼'\n  's': '\\u23bd', // '⎽'\n  't': '\\u251c', // '├'\n  'u': '\\u2524', // '┤'\n  'v': '\\u2534', // '┴'\n  'w': '\\u252c', // '┬'\n  'x': '\\u2502', // '│'\n  'y': '\\u2264', // '≤'\n  'z': '\\u2265', // '≥'\n  '{': '\\u03c0', // 'π'\n  '|': '\\u2260', // '≠'\n  '}': '\\u00a3', // '£'\n  '~': '\\u00b7'  // '·'\n};\n\n/**\n * British character set\n * ESC (A\n * Reference: http://vt100.net/docs/vt220-rm/table2-5.html\n */\nCHARSETS['A'] = {\n  '#': '£'\n};\n\n/**\n * United States character set\n * ESC (B\n */\nCHARSETS['B'] = null;\n\n/**\n * Dutch character set\n * ESC (4\n * Reference: http://vt100.net/docs/vt220-rm/table2-6.html\n */\nCHARSETS['4'] = {\n  '#': '£',\n  '@': '¾',\n  '[': 'ij',\n  '\\\\': '½',\n  ']': '|',\n  '{': '¨',\n  '|': 'f',\n  '}': '¼',\n  '~': '´'\n};\n\n/**\n * Finnish character set\n * ESC (C or ESC (5\n * Reference: http://vt100.net/docs/vt220-rm/table2-7.html\n */\nCHARSETS['C'] =\nCHARSETS['5'] = {\n  '[': 'Ä',\n  '\\\\': 'Ö',\n  ']': 'Å',\n  '^': 'Ü',\n  '`': 'é',\n  '{': 'ä',\n  '|': 'ö',\n  '}': 'å',\n  '~': 'ü'\n};\n\n/**\n * French character set\n * ESC (R\n * Reference: http://vt100.net/docs/vt220-rm/table2-8.html\n */\nCHARSETS['R'] = {\n  '#': '£',\n  '@': 'à',\n  '[': '°',\n  '\\\\': 'ç',\n  ']': '§',\n  '{': 'é',\n  '|': 'ù',\n  '}': 'è',\n  '~': '¨'\n};\n\n/**\n * French Canadian character set\n * ESC (Q\n * Reference: http://vt100.net/docs/vt220-rm/table2-9.html\n */\nCHARSETS['Q'] = {\n  '@': 'à',\n  '[': 'â',\n  '\\\\': 'ç',\n  ']': 'ê',\n  '^': 'î',\n  '`': 'ô',\n  '{': 'é',\n  '|': 'ù',\n  '}': 'è',\n  '~': 'û'\n};\n\n/**\n * German character set\n * ESC (K\n * Reference: http://vt100.net/docs/vt220-rm/table2-10.html\n */\nCHARSETS['K'] = {\n  '@': '§',\n  '[': 'Ä',\n  '\\\\': 'Ö',\n  ']': 'Ü',\n  '{': 'ä',\n  '|': 'ö',\n  '}': 'ü',\n  '~': 'ß'\n};\n\n/**\n * Italian character set\n * ESC (Y\n * Reference: http://vt100.net/docs/vt220-rm/table2-11.html\n */\nCHARSETS['Y'] = {\n  '#': '£',\n  '@': '§',\n  '[': '°',\n  '\\\\': 'ç',\n  ']': 'é',\n  '`': 'ù',\n  '{': 'à',\n  '|': 'ò',\n  '}': 'è',\n  '~': 'ì'\n};\n\n/**\n * Norwegian/Danish character set\n * ESC (E or ESC (6\n * Reference: http://vt100.net/docs/vt220-rm/table2-12.html\n */\nCHARSETS['E'] =\nCHARSETS['6'] = {\n  '@': 'Ä',\n  '[': 'Æ',\n  '\\\\': 'Ø',\n  ']': 'Å',\n  '^': 'Ü',\n  '`': 'ä',\n  '{': 'æ',\n  '|': 'ø',\n  '}': 'å',\n  '~': 'ü'\n};\n\n/**\n * Spanish character set\n * ESC (Z\n * Reference: http://vt100.net/docs/vt220-rm/table2-13.html\n */\nCHARSETS['Z'] = {\n  '#': '£',\n  '@': '§',\n  '[': '¡',\n  '\\\\': 'Ñ',\n  ']': '¿',\n  '{': '°',\n  '|': 'ñ',\n  '}': 'ç'\n};\n\n/**\n * Swedish character set\n * ESC (H or ESC (7\n * Reference: http://vt100.net/docs/vt220-rm/table2-14.html\n */\nCHARSETS['H'] =\nCHARSETS['7'] = {\n  '@': 'É',\n  '[': 'Ä',\n  '\\\\': 'Ö',\n  ']': 'Å',\n  '^': 'Ü',\n  '`': 'é',\n  '{': 'ä',\n  '|': 'ö',\n  '}': 'å',\n  '~': 'ü'\n};\n\n/**\n * Swiss character set\n * ESC (=\n * Reference: http://vt100.net/docs/vt220-rm/table2-15.html\n */\nCHARSETS['='] = {\n  '#': 'ù',\n  '@': 'à',\n  '[': 'é',\n  '\\\\': 'ç',\n  ']': 'ê',\n  '^': 'î',\n  '_': 'è',\n  '`': 'ô',\n  '{': 'ä',\n  '|': 'ö',\n  '}': 'ü',\n  '~': 'û'\n};\n","/**\n * Copyright (c) 2016 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nexport const wcwidth = (function(opts: {nul: number, control: number}): (ucs: number) => number {\n    // extracted from https://www.cl.cam.ac.uk/%7Emgk25/ucs/wcwidth.c\n    // combining characters\n    const COMBINING_BMP = [\n      [0x0300, 0x036F], [0x0483, 0x0486], [0x0488, 0x0489],\n      [0x0591, 0x05BD], [0x05BF, 0x05BF], [0x05C1, 0x05C2],\n      [0x05C4, 0x05C5], [0x05C7, 0x05C7], [0x0600, 0x0603],\n      [0x0610, 0x0615], [0x064B, 0x065E], [0x0670, 0x0670],\n      [0x06D6, 0x06E4], [0x06E7, 0x06E8], [0x06EA, 0x06ED],\n      [0x070F, 0x070F], [0x0711, 0x0711], [0x0730, 0x074A],\n      [0x07A6, 0x07B0], [0x07EB, 0x07F3], [0x0901, 0x0902],\n      [0x093C, 0x093C], [0x0941, 0x0948], [0x094D, 0x094D],\n      [0x0951, 0x0954], [0x0962, 0x0963], [0x0981, 0x0981],\n      [0x09BC, 0x09BC], [0x09C1, 0x09C4], [0x09CD, 0x09CD],\n      [0x09E2, 0x09E3], [0x0A01, 0x0A02], [0x0A3C, 0x0A3C],\n      [0x0A41, 0x0A42], [0x0A47, 0x0A48], [0x0A4B, 0x0A4D],\n      [0x0A70, 0x0A71], [0x0A81, 0x0A82], [0x0ABC, 0x0ABC],\n      [0x0AC1, 0x0AC5], [0x0AC7, 0x0AC8], [0x0ACD, 0x0ACD],\n      [0x0AE2, 0x0AE3], [0x0B01, 0x0B01], [0x0B3C, 0x0B3C],\n      [0x0B3F, 0x0B3F], [0x0B41, 0x0B43], [0x0B4D, 0x0B4D],\n      [0x0B56, 0x0B56], [0x0B82, 0x0B82], [0x0BC0, 0x0BC0],\n      [0x0BCD, 0x0BCD], [0x0C3E, 0x0C40], [0x0C46, 0x0C48],\n      [0x0C4A, 0x0C4D], [0x0C55, 0x0C56], [0x0CBC, 0x0CBC],\n      [0x0CBF, 0x0CBF], [0x0CC6, 0x0CC6], [0x0CCC, 0x0CCD],\n      [0x0CE2, 0x0CE3], [0x0D41, 0x0D43], [0x0D4D, 0x0D4D],\n      [0x0DCA, 0x0DCA], [0x0DD2, 0x0DD4], [0x0DD6, 0x0DD6],\n      [0x0E31, 0x0E31], [0x0E34, 0x0E3A], [0x0E47, 0x0E4E],\n      [0x0EB1, 0x0EB1], [0x0EB4, 0x0EB9], [0x0EBB, 0x0EBC],\n      [0x0EC8, 0x0ECD], [0x0F18, 0x0F19], [0x0F35, 0x0F35],\n      [0x0F37, 0x0F37], [0x0F39, 0x0F39], [0x0F71, 0x0F7E],\n      [0x0F80, 0x0F84], [0x0F86, 0x0F87], [0x0F90, 0x0F97],\n      [0x0F99, 0x0FBC], [0x0FC6, 0x0FC6], [0x102D, 0x1030],\n      [0x1032, 0x1032], [0x1036, 0x1037], [0x1039, 0x1039],\n      [0x1058, 0x1059], [0x1160, 0x11FF], [0x135F, 0x135F],\n      [0x1712, 0x1714], [0x1732, 0x1734], [0x1752, 0x1753],\n      [0x1772, 0x1773], [0x17B4, 0x17B5], [0x17B7, 0x17BD],\n      [0x17C6, 0x17C6], [0x17C9, 0x17D3], [0x17DD, 0x17DD],\n      [0x180B, 0x180D], [0x18A9, 0x18A9], [0x1920, 0x1922],\n      [0x1927, 0x1928], [0x1932, 0x1932], [0x1939, 0x193B],\n      [0x1A17, 0x1A18], [0x1B00, 0x1B03], [0x1B34, 0x1B34],\n      [0x1B36, 0x1B3A], [0x1B3C, 0x1B3C], [0x1B42, 0x1B42],\n      [0x1B6B, 0x1B73], [0x1DC0, 0x1DCA], [0x1DFE, 0x1DFF],\n      [0x200B, 0x200F], [0x202A, 0x202E], [0x2060, 0x2063],\n      [0x206A, 0x206F], [0x20D0, 0x20EF], [0x302A, 0x302F],\n      [0x3099, 0x309A], [0xA806, 0xA806], [0xA80B, 0xA80B],\n      [0xA825, 0xA826], [0xFB1E, 0xFB1E], [0xFE00, 0xFE0F],\n      [0xFE20, 0xFE23], [0xFEFF, 0xFEFF], [0xFFF9, 0xFFFB],\n    ];\n    const COMBINING_HIGH = [\n      [0x10A01, 0x10A03], [0x10A05, 0x10A06], [0x10A0C, 0x10A0F],\n      [0x10A38, 0x10A3A], [0x10A3F, 0x10A3F], [0x1D167, 0x1D169],\n      [0x1D173, 0x1D182], [0x1D185, 0x1D18B], [0x1D1AA, 0x1D1AD],\n      [0x1D242, 0x1D244], [0xE0001, 0xE0001], [0xE0020, 0xE007F],\n      [0xE0100, 0xE01EF]\n    ];\n    // binary search\n    function bisearch(ucs: number, data: number[][]): boolean {\n      let min = 0;\n      let max = data.length - 1;\n      let mid;\n      if (ucs < data[0][0] || ucs > data[max][1])\n        return false;\n      while (max >= min) {\n        mid = (min + max) >> 1;\n        if (ucs > data[mid][1])\n          min = mid + 1;\n        else if (ucs < data[mid][0])\n          max = mid - 1;\n        else\n          return true;\n      }\n      return false;\n    }\n    function wcwidthBMP(ucs: number): number {\n      // test for 8-bit control characters\n      if (ucs === 0)\n        return opts.nul;\n      if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))\n        return opts.control;\n      // binary search in table of non-spacing characters\n      if (bisearch(ucs, COMBINING_BMP))\n        return 0;\n      // if we arrive here, ucs is not a combining or C0/C1 control character\n      if (isWideBMP(ucs)) {\n        return 2;\n      }\n      return 1;\n    }\n    function isWideBMP(ucs: number): boolean {\n      return (\n        ucs >= 0x1100 && (\n        ucs <= 0x115f ||                // Hangul Jamo init. consonants\n        ucs === 0x2329 ||\n        ucs === 0x232a ||\n        (ucs >= 0x2e80 && ucs <= 0xa4cf && ucs !== 0x303f) ||  // CJK..Yi\n        (ucs >= 0xac00 && ucs <= 0xd7a3) ||    // Hangul Syllables\n        (ucs >= 0xf900 && ucs <= 0xfaff) ||    // CJK Compat Ideographs\n        (ucs >= 0xfe10 && ucs <= 0xfe19) ||    // Vertical forms\n        (ucs >= 0xfe30 && ucs <= 0xfe6f) ||    // CJK Compat Forms\n        (ucs >= 0xff00 && ucs <= 0xff60) ||    // Fullwidth Forms\n        (ucs >= 0xffe0 && ucs <= 0xffe6)));\n    }\n    function wcwidthHigh(ucs: number): 0 | 1 | 2 {\n      if (bisearch(ucs, COMBINING_HIGH))\n        return 0;\n      if ((ucs >= 0x20000 && ucs <= 0x2fffd) || (ucs >= 0x30000 && ucs <= 0x3fffd)) {\n        return 2;\n      }\n      return 1;\n    }\n    const control = opts.control | 0;\n    let table: number[] | Uint32Array = null;\n    function init_table(): number[] | Uint32Array {\n      // lookup table for BMP\n      const CODEPOINTS = 65536;  // BMP holds 65536 codepoints\n      const BITWIDTH = 2;        // a codepoint can have a width of 0, 1 or 2\n      const ITEMSIZE = 32;       // using uint32_t\n      const CONTAINERSIZE = CODEPOINTS * BITWIDTH / ITEMSIZE;\n      const CODEPOINTS_PER_ITEM = ITEMSIZE / BITWIDTH;\n      table = (typeof Uint32Array === 'undefined')\n        ? new Array(CONTAINERSIZE)\n        : new Uint32Array(CONTAINERSIZE);\n      for (let i = 0; i < CONTAINERSIZE; ++i) {\n        let num = 0;\n        let pos = CODEPOINTS_PER_ITEM;\n        while (pos--)\n          num = (num << 2) | wcwidthBMP(CODEPOINTS_PER_ITEM * i + pos);\n        table[i] = num;\n      }\n      return table;\n    }\n    // get width from lookup table\n    //   position in container   : num / CODEPOINTS_PER_ITEM\n    //     ==> n = table[Math.floor(num / 16)]\n    //     ==> n = table[num >> 4]\n    //   16 codepoints per number:       FFEEDDCCBBAA99887766554433221100\n    //   position in number      : (num % CODEPOINTS_PER_ITEM) * BITWIDTH\n    //     ==> m = (n % 16) * 2\n    //     ==> m = (num & 15) << 1\n    //   right shift to position m\n    //     ==> n = n >> m     e.g. m=12  000000000000FFEEDDCCBBAA99887766\n    //   we are only interested in 2 LSBs, cut off higher bits\n    //     ==> n = n & 3      e.g.       000000000000000000000000000000XX\n    return function (num: number): number {\n      num = num | 0;  // get asm.js like optimization under V8\n      if (num < 32)\n        return control | 0;\n      if (num < 127)\n        return 1;\n      let t = table || init_table();\n      if (num < 65536)\n        return t[num >> 4] >> ((num & 15) << 1) & 3;\n      // do a full search for high codepoints\n      return wcwidthHigh(num);\n    };\n})({nul: 0, control: 0});  // configurable options\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { ITerminal, IBufferSet } from './Interfaces';\nimport { Buffer } from './Buffer';\nimport { EventEmitter } from './EventEmitter';\n\n/**\n * The BufferSet represents the set of two buffers used by xterm terminals (normal and alt) and\n * provides also utilities for working with them.\n */\nexport class BufferSet extends EventEmitter implements IBufferSet {\n  private _normal: Buffer;\n  private _alt: Buffer;\n  private _activeBuffer: Buffer;\n\n  /**\n   * Create a new BufferSet for the given terminal.\n   * @param {Terminal} terminal - The terminal the BufferSet will belong to\n   */\n  constructor(private _terminal: ITerminal) {\n    super();\n    this._normal = new Buffer(this._terminal, true);\n    this._normal.fillViewportRows();\n\n    // The alt buffer should never have scrollback.\n    // See http://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h2-The-Alternate-Screen-Buffer\n    this._alt = new Buffer(this._terminal, false);\n    this._activeBuffer = this._normal;\n\n    this.setupTabStops();\n  }\n\n  /**\n   * Returns the alt Buffer of the BufferSet\n   * @returns {Buffer}\n   */\n  public get alt(): Buffer {\n    return this._alt;\n  }\n\n  /**\n   * Returns the normal Buffer of the BufferSet\n   * @returns {Buffer}\n   */\n  public get active(): Buffer {\n    return this._activeBuffer;\n  }\n\n  /**\n   * Returns the currently active Buffer of the BufferSet\n   * @returns {Buffer}\n   */\n  public get normal(): Buffer {\n    return this._normal;\n  }\n\n  /**\n   * Sets the normal Buffer of the BufferSet as its currently active Buffer\n   */\n  public activateNormalBuffer(): void {\n    // The alt buffer should always be cleared when we switch to the normal\n    // buffer. This frees up memory since the alt buffer should always be new\n    // when activated.\n    this._alt.clear();\n\n    this._activeBuffer = this._normal;\n    this.emit('activate', this._normal);\n  }\n\n  /**\n   * Sets the alt Buffer of the BufferSet as its currently active Buffer\n   */\n  public activateAltBuffer(): void {\n    // Since the alt buffer is always cleared when the normal buffer is\n    // activated, we want to fill it when switching to it.\n    this._alt.fillViewportRows();\n    this._activeBuffer = this._alt;\n    this.emit('activate', this._alt);\n  }\n\n  /**\n   * Resizes both normal and alt buffers, adjusting their data accordingly.\n   * @param newCols The new number of columns.\n   * @param newRows The new number of rows.\n   */\n  public resize(newCols: number, newRows: number): void {\n    this._normal.resize(newCols, newRows);\n    this._alt.resize(newCols, newRows);\n  }\n\n  /**\n   * Setup the tab stops.\n   * @param i The index to start setting up tab stops from.\n   */\n  public setupTabStops(i?: number): void {\n    this._normal.setupTabStops(i);\n    this._alt.setupTabStops(i);\n  }\n}\n","/**\n * Copyright (c) 2017 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { ITerminal, IBuffer } from './Interfaces';\nimport { CircularList } from './utils/CircularList';\nimport { LineData, CharData } from './Types';\n\nexport const CHAR_DATA_ATTR_INDEX = 0;\nexport const CHAR_DATA_CHAR_INDEX = 1;\nexport const CHAR_DATA_WIDTH_INDEX = 2;\nexport const CHAR_DATA_CODE_INDEX = 3;\nexport const MAX_BUFFER_SIZE = 4294967295; // 2^32 - 1\n\n/**\n * This class represents a terminal buffer (an internal state of the terminal), where the\n * following information is stored (in high-level):\n *   - text content of this particular buffer\n *   - cursor position\n *   - scroll position\n */\nexport class Buffer implements IBuffer {\n  private _lines: CircularList<LineData>;\n\n  public ydisp: number;\n  public ybase: number;\n  public y: number;\n  public x: number;\n  public scrollBottom: number;\n  public scrollTop: number;\n  public tabs: any;\n  public savedY: number;\n  public savedX: number;\n\n  /**\n   * Create a new Buffer.\n   * @param _terminal The terminal the Buffer will belong to.\n   * @param _hasScrollback Whether the buffer should respect the scrollback of\n   * the terminal.\n   */\n  constructor(\n    private _terminal: ITerminal,\n    private _hasScrollback: boolean\n  ) {\n    this.clear();\n  }\n\n  public get lines(): CircularList<LineData> {\n    return this._lines;\n  }\n\n  public get hasScrollback(): boolean {\n    return this._hasScrollback && this.lines.maxLength > this._terminal.rows;\n  }\n\n  public get isCursorInViewport(): boolean {\n    const absoluteY = this.ybase + this.y;\n    const relativeY = absoluteY - this.ydisp;\n    return (relativeY >= 0 && relativeY < this._terminal.rows);\n  }\n\n  /**\n   * Gets the correct buffer length based on the rows provided, the terminal's\n   * scrollback and whether this buffer is flagged to have scrollback or not.\n   * @param rows The terminal rows to use in the calculation.\n   */\n  private _getCorrectBufferLength(rows: number): number {\n    if (!this._hasScrollback) {\n      return rows;\n    }\n\n    const correctBufferLength = rows + this._terminal.options.scrollback;\n\n    return correctBufferLength > MAX_BUFFER_SIZE ? MAX_BUFFER_SIZE : correctBufferLength;\n  }\n\n  /**\n   * Fills the buffer's viewport with blank lines.\n   */\n  public fillViewportRows(): void {\n    if (this._lines.length === 0) {\n      let i = this._terminal.rows;\n      while (i--) {\n        this.lines.push(this._terminal.blankLine());\n      }\n    }\n  }\n\n  /**\n   * Clears the buffer to it's initial state, discarding all previous data.\n   */\n  public clear(): void {\n    this.ydisp = 0;\n    this.ybase = 0;\n    this.y = 0;\n    this.x = 0;\n    this._lines = new CircularList<LineData>(this._getCorrectBufferLength(this._terminal.rows));\n    this.scrollTop = 0;\n    this.scrollBottom = this._terminal.rows - 1;\n    this.setupTabStops();\n  }\n\n  /**\n   * Resizes the buffer, adjusting its data accordingly.\n   * @param newCols The new number of columns.\n   * @param newRows The new number of rows.\n   */\n  public resize(newCols: number, newRows: number): void {\n    // Increase max length if needed before adjustments to allow space to fill\n    // as required.\n    const newMaxLength = this._getCorrectBufferLength(newRows);\n    if (newMaxLength > this._lines.maxLength) {\n      this._lines.maxLength = newMaxLength;\n    }\n\n    // The following adjustments should only happen if the buffer has been\n    // initialized/filled.\n    if (this._lines.length > 0) {\n      // Deal with columns increasing (we don't do anything when columns reduce)\n      if (this._terminal.cols < newCols) {\n        const ch: CharData = [this._terminal.defAttr, ' ', 1, 32]; // does xterm use the default attr?\n        for (let i = 0; i < this._lines.length; i++) {\n          // TODO: This should be removed, with tests setup for the case that was\n          // causing the underlying bug, see https://github.com/sourcelair/xterm.js/issues/824\n          if (this._lines.get(i) === undefined) {\n            this._lines.set(i, this._terminal.blankLine(undefined, undefined, newCols));\n          }\n          while (this._lines.get(i).length < newCols) {\n            this._lines.get(i).push(ch);\n          }\n        }\n      }\n\n      // Resize rows in both directions as needed\n      let addToY = 0;\n      if (this._terminal.rows < newRows) {\n        for (let y = this._terminal.rows; y < newRows; y++) {\n          if (this._lines.length < newRows + this.ybase) {\n            if (this.ybase > 0 && this._lines.length <= this.ybase + this.y + addToY + 1) {\n              // There is room above the buffer and there are no empty elements below the line,\n              // scroll up\n              this.ybase--;\n              addToY++;\n              if (this.ydisp > 0) {\n                // Viewport is at the top of the buffer, must increase downwards\n                this.ydisp--;\n              }\n            } else {\n              // Add a blank line if there is no buffer left at the top to scroll to, or if there\n              // are blank lines after the cursor\n              this._lines.push(this._terminal.blankLine(undefined, undefined, newCols));\n            }\n          }\n        }\n      } else { // (this._terminal.rows >= newRows)\n        for (let y = this._terminal.rows; y > newRows; y--) {\n          if (this._lines.length > newRows + this.ybase) {\n            if (this._lines.length > this.ybase + this.y + 1) {\n              // The line is a blank line below the cursor, remove it\n              this._lines.pop();\n            } else {\n              // The line is the cursor, scroll down\n              this.ybase++;\n              this.ydisp++;\n            }\n          }\n        }\n      }\n\n      // Reduce max length if needed after adjustments, this is done after as it\n      // would otherwise cut data from the bottom of the buffer.\n      if (newMaxLength < this._lines.maxLength) {\n        // Trim from the top of the buffer and adjust ybase and ydisp.\n        const amountToTrim = this._lines.length - newMaxLength;\n        if (amountToTrim > 0) {\n          this._lines.trimStart(amountToTrim);\n          this.ybase = Math.max(this.ybase - amountToTrim, 0);\n          this.ydisp = Math.max(this.ydisp - amountToTrim, 0);\n        }\n        this._lines.maxLength = newMaxLength;\n      }\n\n      // Make sure that the cursor stays on screen\n      if (this.y >= newRows) {\n        this.y = newRows - 1;\n      }\n      if (addToY) {\n        this.y += addToY;\n      }\n\n      if (this.x >= newCols) {\n        this.x = newCols - 1;\n      }\n\n      this.scrollTop = 0;\n    }\n\n    this.scrollBottom = newRows - 1;\n  }\n\n  /**\n   * Translates a buffer line to a string, with optional start and end columns.\n   * Wide characters will count as two columns in the resulting string. This\n   * function is useful for getting the actual text underneath the raw selection\n   * position.\n   * @param line The line being translated.\n   * @param trimRight Whether to trim whitespace to the right.\n   * @param startCol The column to start at.\n   * @param endCol The column to end at.\n   */\n  public translateBufferLineToString(lineIndex: number, trimRight: boolean, startCol: number = 0, endCol: number = null): string {\n    // Get full line\n    let lineString = '';\n    const line = this.lines.get(lineIndex);\n    if (!line) {\n      return '';\n    }\n\n    // Initialize column and index values. Column values represent the actual\n    // cell column, indexes represent the index in the string. Indexes are\n    // needed here because some chars are 0 characters long (eg. after wide\n    // chars) and some chars are longer than 1 characters long (eg. emojis).\n    let startIndex = startCol;\n    endCol = endCol || line.length;\n    let endIndex = endCol;\n\n    for (let i = 0; i < line.length; i++) {\n      const char = line[i];\n      lineString += char[CHAR_DATA_CHAR_INDEX];\n      // Adjust start and end cols for wide characters if they affect their\n      // column indexes\n      if (char[CHAR_DATA_WIDTH_INDEX] === 0) {\n        if (startCol >= i) {\n          startIndex--;\n        }\n        if (endCol >= i) {\n          endIndex--;\n        }\n      } else {\n        // Adjust the columns to take glyphs that are represented by multiple\n        // code points into account.\n        if (char[CHAR_DATA_CHAR_INDEX].length > 1) {\n          if (startCol > i) {\n            startIndex += char[CHAR_DATA_CHAR_INDEX].length - 1;\n          }\n          if (endCol > i) {\n            endIndex += char[CHAR_DATA_CHAR_INDEX].length - 1;\n          }\n        }\n      }\n    }\n\n    // Calculate the final end col by trimming whitespace on the right of the\n    // line if needed.\n    if (trimRight) {\n      const rightWhitespaceIndex = lineString.search(/\\s+$/);\n      if (rightWhitespaceIndex !== -1) {\n        endIndex = Math.min(endIndex, rightWhitespaceIndex);\n      }\n      // Return the empty string if only trimmed whitespace is selected\n      if (endIndex <= startIndex) {\n        return '';\n      }\n    }\n\n    return lineString.substring(startIndex, endIndex);\n  }\n\n  /**\n   * Setup the tab stops.\n   * @param i The index to start setting up tab stops from.\n   */\n  public setupTabStops(i?: number): void {\n    if (i != null) {\n      if (!this.tabs[i]) {\n        i = this.prevStop(i);\n      }\n    } else {\n      this.tabs = {};\n      i = 0;\n    }\n\n    for (; i < this._terminal.cols; i += this._terminal.options.tabStopWidth) {\n      this.tabs[i] = true;\n    }\n  }\n\n  /**\n   * Move the cursor to the previous tab stop from the given position (default is current).\n   * @param x The position to move the cursor to the previous tab stop.\n   */\n  public prevStop(x?: number): number {\n    if (x == null) {\n      x = this.x;\n    }\n    while (!this.tabs[--x] && x > 0);\n    return x >= this._terminal.cols ? this._terminal.cols - 1 : x < 0 ? 0 : x;\n  }\n\n  /**\n   * Move the cursor one tab stop forward from the given position (default is current).\n   * @param x The position to move the cursor one tab stop forward.\n   */\n  public nextStop(x?: number): number {\n    if (x == null) {\n      x = this.x;\n    }\n    while (!this.tabs[++x] && x < this._terminal.cols);\n    return x >= this._terminal.cols ? this._terminal.cols - 1 : x < 0 ? 0 : x;\n  }\n}\n",null],"names":[],"mappings":"AkCAA;;;ADMA;AAGa;AACA;AACA;AACA;AACA;AASb;AAmBA;AACA;AACA;AAEA;AACA;AAEA;AAAA;AACA;AACA;;;AAAA;AAEA;AAAA;AACA;AACA;;;AAAA;AAEA;AAAA;AACA;AACA;AACA;AACA;;;AAAA;AAOA;AACA;AACA;AACA;AAEA;AAEA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AAGA;AACA;AACA;AACA;AAIA;AAEA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AAEA;AACA;AACA;AAAA;AAGA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AAEA;AACA;AAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AAIA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AAEA;AACA;AAYA;AAAA;AAAA;AAEA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AAEA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAIA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AAAA;AAjSa;;;;;;;;;;;;;;;;;ADhBb;AACA;AAMA;AAAA;AASA;AAAA;AAAA;AAEA;AACA;AAIA;AACA;AAEA;;AACA;AAMA;AAAA;AACA;AACA;;;AAAA;AAMA;AAAA;AACA;AACA;;;AAAA;AAMA;AAAA;AACA;AACA;;;AAAA;AAKA;AAIA;AAEA;AACA;AACA;AAKA;AAGA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AAAA;AAxFa;;;;;;;ADRA;AAGb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;;;;;;;ADpJa;AAKA;AAYb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AAMA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;AD7OA;AAwBA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AAMA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AAOA;AACA;AACA;AAEA;AACA;AAAA;AAEA;AACA;AAAA;AAGA;AACA;AACA;AAEA;AAGA;AACA;AACA;AAEA;AACA;AAUA;AAAA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AAAA;AAGA;AACA;AACA;AACA;AAUA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AAAA;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AAQA;AAAA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAQA;AAAA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAAA;AAMA;AACA;AACA;AACA;AAAA;AACA;AAAA;AApNa;;;;;;;ADRb;AAAA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AACA;AAAC;;;;;;;ADvED;AAGA;AAGA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAAA;AAAA;AAAA;;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AAAA;AA/Da;;;;;;;ADAb;AACA;AAEA;AACA;AACA;AASA;AACA;AAAA;AAAA;AAEA;AACA;AAGA;AAEA;AACA;AACA;AAEA;AAIA;AAEA;AACA;AAEA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAIA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AAGA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AAGA;AAEA;AAGA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AAEA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAMA;AACA;AAMA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AAOA;AACA;AACA;AAOA;AACA;AACA;AAMA;AACA;AACA;AAAA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AAEA;AACA;AACA;AAAA;AACA;AACA;AAEA;AACA;AACA;AAAA;AACA;AACA;AAEA;AACA;AACA;AAAA;AACA;AACA;AAEA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AAcA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAGA;AACA;AACA;AAGA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAGA;AACA;AACA;AAGA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AAEA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAuCA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AAAA;AAIA;AACA;AACA;AAAA;AACA;AACA;AAAA;AAGA;AACA;AAAA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAOA;AACA;AAAA;AACA;AAAA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAUA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AAwFA;AACA;AACA;AACA;AACA;AAEA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAGA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AAGA;AACA;AACA;AAKA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAoFA;AACA;AACA;AACA;AACA;AAEA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AAEA;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAmEA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AAAA;AAEA;AACA;AAAA;AAEA;AACA;AACA;AAAA;AAEA;AACA;AACA;AAAA;AAEA;AACA;AACA;AAIA;AAAA;AAEA;AACA;AAAA;AAEA;AACA;AAAA;AAEA;AACA;AAAA;AAGA;AACA;AAAA;AAEA;AACA;AAAA;AAEA;AACA;AAAA;AAEA;AACA;AACA;AAAA;AAEA;AACA;AAAA;AAEA;AACA;AAAA;AAEA;AACA;AAAA;AAEA;AACA;AAAA;AAEA;AACA;AAAA;AAEA;AACA;AAAA;AAEA;AACA;AACA;AAIA;AAAA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AAAA;AAEA;AACA;AACA;AAIA;AAAA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AAAA;AAEA;AACA;AACA;AAAA;AACA;AACA;AACA;AAEA;AACA;AAyBA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AAGA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AAGA;AACA;AAGA;AACA;AAGA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAYA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAQA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AAAA;AAz5Ca;;;;;;;;;;;;;;;;;ADfb;AAEA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAKA;AAKA;AAAA;AAeA;AAAA;AACA;AARA;AAIA;AAOA;AACA;AACA;AACA;AACA;;AACA;AAMA;AACA;AACA;AAOA;AAAA;AAEA;AACA;AACA;AAGA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AAGA;AAGA;AACA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AAMA;AACA;AACA;AAYA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAQA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AAOA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAWA;AAAA;AAAA;AAEA;AACA;AAGA;AACA;AACA;AACA;AACA;AAGA;AAGA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AASA;AAAA;AACA;AAKA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AA3PA;AA4PA;AAlQA;AAAa;;;;;;;ADhCb;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AAKA;AACA;AACA;AAEA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AAEA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AAEA;AACA;AAIA;AACA;AAGA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AAEA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AAKA;AACA;AAIA;AACA;AAGA;AACA;AACA;AAGA;AACA;AACA;AAGA;AACA;AACA;AAGA;AACA;AACA;AAGA;AACA;AACA;AAGA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAIA;AACA;AAAA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AAEA;AACA;AAEA;AACA;AAEA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AAEA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AAAA;AACA;AACA;AAEA;AAEA;AACA;AAIA;AACA;AACA;AAEA;AAEA;AACA;AACA;AAGA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AAGA;AACA;AAMA;AACA;AACA;AAEA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AAAA;AACA;AACA;AAAA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AAEA;AAEA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AAIA;AACA;AACA;AAEA;AACA;AAOA;AACA;AACA;AAQA;AACA;AACA;AAQA;AACA;AACA;AAOA;AACA;AACA;AAKA;AACA;AACA;AAMA;AACA;AACA;AACA;AAKA;AACA;AACA;AASA;AAAA;AAjfa;;;;;;;;;;;;;;;;;ADnKb;AACA;AAGA;AAEA;AAEA;AAMA;AAKA;AAKA;AAMA;AAEA;AACA;AAaA;AAAA;AACA;AACA;AACA;AACA;AAUA;AAAA;AAiCA;AAAA;AACA;AACA;AACA;AARA;AAWA;AACA;AAEA;AACA;;AACA;AAKA;AAAA;AACA;AACA;AAMA;AACA;AAMA;AACA;AACA;AACA;AAKA;AACA;AACA;AAOA;AACA;AACA;AACA;AAEA;AAAA;;;AAAA;AACA;AAAA;;;AAAA;AAKA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAAA;AAKA;AAAA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AAIA;AACA;AACA;AAEA;AACA;;;AAAA;AAKA;AACA;AACA;AACA;AACA;AAOA;AAAA;AAEA;AACA;AACA;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AAGA;AACA;AAGA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAOA;AACA;AACA;AAMA;AAGA;AACA;AACA;AAGA;AACA;AACA;AAGA;AACA;AACA;AACA;AAGA;AACA;AAGA;AAGA;AAEA;AACA;AACA;AAAA;AACA;AACA;AACA;AAAA;AACA;AACA;AAAA;AACA;AACA;AACA;AAEA;AACA;AACA;AAKA;AAAA;AAEA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AAGA;AACA;AACA;AAIA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AAIA;AAIA;AAGA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AAAA;AACA;AACA;AAGA;AAIA;AACA;AACA;AAAA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AAEA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AAEA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AAGA;AACA;AAAA;AAIA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AAEA;AAGA;AACA;AAGA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AAKA;AACA;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AAGA;AACA;AACA;AAEA;AACA;AACA;AAAA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAAA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AAIA;AAEA;AACA;AACA;AAIA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AAOA;AAGA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AAAA;AAjqBa;;;;;;;ADtDb;AAuBA;AACA;AAEA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AAKA;AAAA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;;;AAAA;AAMA;AAAA;AACA;AACA;AACA;AAEA;AACA;AACA;AAGA;AACA;AACA;AAGA;AAEA;AACA;AACA;AACA;AACA;AACA;;;AAAA;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AAEA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AAAA;AAxHa;;;;;;;;;;;;;;;;;ADYb;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAIA;AACA;AAEA;AACA;AAUA;AAOA;AAMA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AAEA;AAAA;AA8HA;AACA;AADA;AA3GA;AA+GA;AACA;;AACA;AAEA;AAAA;AACA;AACA;AACA;AACA;AAEA;AACA;AAKA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AAEA;AAEA;AACA;AAEA;AACA;AAEA;AACA;AACA;AACA;AAGA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AAEA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AAKA;AAEA;AACA;AAKA;AACA;AACA;AAEA;AAAA;AACA;AACA;;;AAAA;AAMA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAAA;AAAA;AACA;AACA;AAAA;AAAA;AACA;AAEA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AAMA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAKA;AAAA;AACA;AAGA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AAEA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AAKA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AAKA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AAEA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAOA;AAAA;AACA;AACA;AAEA;AAEA;AACA;AACA;AAGA;AACA;AACA;AAEA;AAGA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AAGA;AAEA;AACA;AACA;AAIA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AAEA;AAEA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAGA;AAGA;AAGA;AAIA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AAOA;AAEA;AAEA;AACA;AAAA;AAEA;AACA;AAAA;AACA;AACA;AACA;AACA;AAYA;AAAA;AACA;AACA;AACA;AAKA;AACA;AACA;AAGA;AAGA;AACA;AAAA;AAEA;AAEA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AAIA;AACA;AACA;AAIA;AACA;AACA;AACA;AAAA;AAIA;AAEA;AACA;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AAQA;AAOA;AAGA;AACA;AACA;AACA;AACA;AAAA;AACA;AAAA;AACA;AAAA;AACA;AAAA;AACA;AAAA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AAAA;AACA;AAAA;AACA;AAAA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AAEA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AASA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAIA;AACA;AACA;AACA;AAGA;AAEA;AACA;AAAA;AACA;AACA;AAGA;AAEA;AACA;AAEA;AAIA;AACA;AAKA;AACA;AACA;AAGA;AAIA;AACA;AACA;AACA;AACA;AAGA;AAAA;AAGA;AACA;AACA;AAEA;AAAA;AACA;AACA;AACA;AAEA;AACA;AAEA;AACA;AAMA;AACA;AAAA;AACA;AAAA;AACA;AACA;AACA;AAIA;AACA;AAAA;AACA;AACA;AACA;AAEA;AACA;AAAA;AACA;AACA;AACA;AAEA;AACA;AAAA;AACA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAQA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AAEA;AAEA;AAGA;AACA;AACA;AAAA;AACA;AACA;AAGA;AACA;AAEA;AACA;AACA;AACA;AAAA;AAGA;AACA;AACA;AACA;AACA;AAAA;AAGA;AACA;AACA;AACA;AAIA;AACA;AACA;AAGA;AACA;AAQA;AACA;AASA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AAEA;AACA;AAGA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AAMA;AACA;AACA;AAKA;AACA;AACA;AAKA;AACA;AACA;AAMA;AAAA;AACA;AAKA;AAGA;AACA;AACA;AAEA;AAEA;AAEA;AACA;AACA;AACA;AACA;AAEA;AAAA;AACA;AACA;AACA;AAIA;AACA;AACA;AACA;AAEA;AACA;AAOA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AAAA;AACA;AACA;AACA;AAMA;AACA;AACA;AAWA;AACA;AACA;AAQA;AACA;AACA;AACA;AACA;AAEA;AACA;AAQA;AACA;AACA;AACA;AACA;AAEA;AACA;AAYA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AAKA;AACA;AACA;AAMA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AAQA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AAAA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AAEA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AASA;AACA;AAGA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AAIA;AACA;AACA;AACA;AAAA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AAEA;AACA;AAIA;AACA;AACA;AACA;AAAA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AAEA;AACA;AAGA;AACA;AACA;AACA;AAAA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AAEA;AACA;AAGA;AACA;AACA;AACA;AAAA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AAEA;AAGA;AACA;AACA;AACA;AAEA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAAA;AAEA;AACA;AAAA;AAEA;AACA;AAAA;AAEA;AACA;AAAA;AAEA;AACA;AAAA;AAEA;AACA;AAAA;AAEA;AACA;AACA;AAAA;AAEA;AACA;AACA;AAAA;AACA;AACA;AAAA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AAMA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AAQA;AACA;AAEA;AACA;AACA;AAEA;AAEA;AACA;AACA;AAAA;AACA;AACA;AAAA;AACA;AACA;AAAA;AACA;AACA;AAEA;AAGA;AACA;AAEA;AAEA;AACA;AACA;AACA;AAEA;AACA;AAMA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AAMA;AAAA;AACA;AACA;AAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAKA;AACA;AAAA;AACA;AAAA;AACA;AACA;AAKA;AACA;AAAA;AACA;AAAA;AACA;AACA;AAQA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AACA;AAEA;AAAA;AACA;AAAA;AAEA;AAEA;AACA;AACA;AAEA;AAEA;AAEA;AACA;AACA;AAMA;AACA;AAAA;AACA;AAAA;AAOA;AAKA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAKA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AASA;AACA;AAEA;AACA;AAIA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AAMA;AAEA;AACA;AACA;AAGA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AAMA;AAOA;AACA;AASA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAOA;AACA;AAIA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AAAA;AA//Da;AAqgEb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAEA;AAAA;AACA;AACA;AAEA;AACA;AAEA;AAEA;AACA;AACA;AAGA;AACA;AAEA;AACA;AACA;AACA;AACA;AAWA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AAEA;AACA;AAEA;AAGA;AACA;AACA;AACA;AACA;AAAC;AAGD;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;;;;;;;AD9rEA;AAAA;AACA;AACA;AACA;AACA;AAAC;;;;;;;ADrBD;AAcA;AAAA;AACA;AACA;AACA;AACA;AAjBA;AACA;AACA;AACA;AAgBA;AAGA;AACA;AAEA;AACA;AACA;AAMA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAKA;AACA;AAEA;AACA;AACA;AAAA;AAEA;AACA;AAAA;AAEA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AAQA;AACA;AAEA;AACA;AAEA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AAEA;AACA;AAAA;AAMA;AACA;AACA;AAAA;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AAAA;AAnIa;;;;;;;ADOb;AACA;AACA;AACA;AACA;AACA;AALA;AAWA;AACA;AACA;AACA;AACA;AACA;AALA;AAWA;AACA;AACA;AACA;AAAA;AACA;AACA;AAGA;AACA;AATA;AAgBA;AACA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AAzBA;AAgCA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AApBA;AA4BA;AACA;AAGA;AACA;AACA;AANA;;;;;;;AD9GA;AAUA;AAWA;AAAA;AACA;AAXA;AAEA;AAIA;AACA;AACA;AAKA;AAGA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AAGA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAGA;AACA;AAEA;AACA;AACA;AAEA;AAAA;AACA;AAGA;AACA;AACA;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AAGA;AACA;AACA;AAGA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AAIA;AACA;AAGA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AAAA;AArKa;AAuKb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AAAA;AAXa;;;;;;;ADlLb;AAEA;AAEa;AACb;AAEA;AAYA;AAIA;AACA;AAdA;AACA;AACA;AACA;AACA;AACA;AAWA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAOA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AAEA;AACA;AACA;AACA;AAWA;AACA;AAKA;AAQA;AAAA;AACA;AAKA;AAQA;AACA;AAKA;AAQA;AACA;AACA;AAKA;AAKA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AASA;AACA;AACA;AAKA;AAAA;AACA;AACA;AAKA;AACA;AAYA;AACA;AACA;AACA;AACA;AAIA;AAgBA;AACA;AACA;AACA;AACA;AAAA;AAEA;AACA;AACA;AACA;AACA;AAIA;AACA;AACA;AACA;AAEA;AACA;AAGA;AACA;AACA;AAGA;AAEA;AACA;AACA;AACA;AAEA;AASA;AAAA;AACA;AACA;AAIA;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAAA;AAEA;AACA;AAAA;AACA;AACA;AAEA;AAGA;AACA;AACA;AAEA;AAIA;AACA;AAOA;AACA;AACA;AAKA;AACA;AACA;AAAA;AAhUsB;;;;;;;ADPtB;AAEa;AAgBb;AAQA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AAEA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAvCA;AAyCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAMA;AACA;AACA;AACA;AACA;AAJA;AAMA;AAIA;AAAA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AAEA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAMA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AAGA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;;;;;;;ADrNA;AACA;AACA;AACA;AACA;AACa;AAEb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAMA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AAEA;AACA;AAEA;AACA;AACA;AACA;AAKA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AA1Da;;;;;;;;;;;;;;;;;AD5Db;AAGA;AAcA;AAEA;AAAA;AAMA;AAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AAEA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AAEA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AAEA;AACA;AAGA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AApMa;AAsMb;AAcA;AAEA;AAEA;AACA;AACA;AACA;AACA;AAEA;AAAA;;;AAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAAA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAAA;AAAA;AAEA;AACA;AACA;AAMA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AAGA;AAEA;AAGA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAAA;;;;;;;AD5VA;AAGA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AA3Ba;;;;;;;;;;;;;;;;;ADKb;AACA;AAEA;AAAA;AAGA;AAAA;AAFA;AAIA;AACA;;AACA;AAEA;AACA;AAEA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAAA;AAnCa;;;;;;;;;;;;;;;;;ADNb;AACA;AACA;AACA;AAGA;AACA;AAEA;AAAA;AAWA;AAAA;AAAA;AATA;AACA;AAUA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AACA;AAEA;AAGA;AACA;AACA;AACA;AACA;AAEA;AAAA;AACA;AAGA;AACA;AACA;AACA;AAEA;AAEA;AACA;AAEA;AAAA;AACA;AACA;AACA;AAMA;AAKA;AAMA;AAIA;AAGA;AAIA;AAIA;AACA;AAOA;AACA;AAQA;AACA;AAGA;AAGA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AAAA;AACA;AACA;AAEA;AAAA;AACA;AACA;AAEA;AAAA;AACA;AACA;AAEA;AAAA;AACA;AACA;AAEA;AAAA;AACA;AACA;AAEA;AAAA;AACA;AACA;AAQA;AACA;AACA;AACA;AACA;AACA;AAMA;AAAA;AACA;AACA;AACA;AAEA;AACA;AACA;AAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AAAA;AA5Ma;;;;;;;;;;;;;;;;;ADNb;AAEA;AAAA;AAGA;AAAA;AAEA;AACA;AACA;AACA;;AACA;AAEA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AAGA;AAGA;AACA;AACA;AAGA;AACA;AACA;AACA;AAGA;AACA;AACA;AAGA;AACA;AACA;AACA;AAGA;AACA;AAGA;AAEA;AACA;AACA;AAGA;AACA;AACA;AACA;AAAA;AA5Ea;;;;;;;;;;;;;;;;;ADLb;AACA;AACA;AAEA;AAOA;AAEA;AAAA;AAMA;AAAA;AAFA;AAIA;;AACA;AAEA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAEA;AAKA;AACA;AACA;AACA;AACA;AACA;AAIA;AAEA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAiBA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AAIA;AAQA;AACA;AAMA;AACA;AAEA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AAEA;AAGA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAAA;AAEA;AACA;AAAA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AAKA;AAGA;AACA;AACA;AAGA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AAGA;AACA;AAKA;AAGA;AAGA;AACA;AACA;AAOA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AAnOa;;;;;;;ADZb;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAC;;;;;;;ADVD;AAEA;AACA;AACA;AAEa;AACA;AAKA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;;;;ADhBb;AAQA;AAAA;AAOA;AAAA;AAEA;AACA;;AACA;AAEA;AAAA;AACA;AACA;;;AAAA;AAEA;AAAA;AACA;AACA;;;AAAA;AAEA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AAAA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AAtDa;;;;;;;;;;;;;;;;;ADRb;AAOA;AAAA;AAKA;AAAA;AACA;AAGA;AACA;AACA;;AACA;AAEA;AAAA;AACA;AACA;AAEA;AAEA;AACA;AACA;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAjBA;AAmBA;AAAA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AATA;AAWA;AAAA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAAA;AAUA;AACA;AACA;AAUA;AACA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AAMA;AACA;AACA;AAWA;AAAA;AAAA;AAAA;;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AACA;AACA;AACA;AACA;AACA;AAQA;AACA;AACA;AACA;AAAA;AAxMa;;;;;;;ADFb;AACA;AACA;AAFA;AAEC;;;;;;;ADJD;AACA;AAAA;AAAA;AAEA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAeA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AAKA;AACA;AAEA;AACA;AAYA;AACA;AACA;AACA;AAGA;AACA;AAEA;AACA;AACA;AAAA;AAtFa;;;;;;;ADCA;;;;;;;ADFb;AAEA;;;"}
\ No newline at end of file
diff --git a/route/static/codemirror/addon/dialog/dialog.css b/route/static/codemirror/addon/dialog/dialog.css
deleted file mode 100755
index 494690b40..000000000
--- a/route/static/codemirror/addon/dialog/dialog.css
+++ /dev/null
@@ -1 +0,0 @@
-.CodeMirror-dialog{position:absolute;left:0;right:0;background:inherit;z-index:15;padding:.4em .8em;overflow:hidden;color:inherit}.CodeMirror-dialog-top{border-bottom:1px solid #eee;top:0}.CodeMirror-dialog-bottom{border-top:1px solid #eee;bottom:0}.CodeMirror-dialog input{border:0;outline:0;background:transparent;width:20em;color:inherit;font-family:monospace}.CodeMirror-dialog button{font-size:70%}.Dialog-close{color:#111;float:right;font-family:Arial;font-size:16px;height:30px;line-height:30px;text-align:center;width:30px;cursor:pointer}
\ No newline at end of file
diff --git a/route/static/codemirror/addon/dialog/dialog.js b/route/static/codemirror/addon/dialog/dialog.js
deleted file mode 100755
index ef64aa000..000000000
--- a/route/static/codemirror/addon/dialog/dialog.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(b){function c(d,h,e){var g=d.getWrapperElement();var f;f=g.appendChild(document.createElement("div"));if(e){f.className="CodeMirror-dialog CodeMirror-dialog-bottom"}else{f.className="CodeMirror-dialog CodeMirror-dialog-top"}if(typeof h=="string"){f.innerHTML=h}else{f.appendChild(h)}return f}function a(d,e){if(d.state.currentNotificationClose){d.state.currentNotificationClose()}d.state.currentNotificationClose=e}b.defineExtension("openDialog",function(i,j,l){if(!l){l={}}a(this,null);var f=c(this,i,l.bottom);var e=false,g=this;function k(m){if(typeof m=="string"){h.value=m}else{if(e){return}e=true;f.parentNode.removeChild(f);g.focus();if(l.onClose){l.onClose(f)}}}var h=f.getElementsByTagName("input")[0],d;if(h){h.focus();if(l.value){h.value=l.value;if(l.selectValueOnOpen!==false){h.select()}}if(l.onInput){b.on(h,"input",function(m){l.onInput(m,h.value,k)})}if(l.onKeyUp){b.on(h,"keyup",function(m){l.onKeyUp(m,h.value,k)})}b.on(h,"keydown",function(m){if(l&&l.onKeyDown&&l.onKeyDown(m,h.value,k)){return}if(m.keyCode==27||(l.closeOnEnter!==false&&m.keyCode==13)){h.blur();b.e_stop(m);k()}if(m.keyCode==13){j(h.value,m)}});if(l.closeOnBlur!==false){b.on(h,"blur",k)}}else{if(d=f.getElementsByTagName("button")[0]){b.on(d,"click",function(){k();g.focus()});if(l.closeOnBlur!==false){b.on(d,"blur",k)}d.focus()}}return k});b.defineExtension("openConfirm",function(m,g,o){a(this,null);var h=c(this,m,o&&o.bottom);var j=h.getElementsByTagName("button");var f=false,k=this,d=1;function n(){if(f){return}f=true;h.parentNode.removeChild(h);k.focus()}j[0].focus();for(var e=0;e<j.length;++e){var l=j[e];(function(i){b.on(l,"click",function(p){b.e_preventDefault(p);n();if(i){i(k)}})})(g[e]);b.on(l,"blur",function(){--d;setTimeout(function(){if(d<=0){n()}},200)});b.on(l,"focus",function(){++d})}});b.defineExtension("openNotification",function(g,e){a(this,j);var f=c(this,g,e&&e.bottom);var d=false,h;var i=e&&typeof e.duration!=="undefined"?e.duration:5000;function j(){if(d){return}d=true;clearTimeout(h);f.parentNode.removeChild(f)}b.on(f,"click",function(k){b.e_preventDefault(k);j()});if(i){h=setTimeout(j,i)}return j})});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/dialog/index.html b/route/static/codemirror/addon/dialog/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/codemirror/addon/dialog/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/codemirror/addon/display/autorefresh.js b/route/static/codemirror/addon/display/autorefresh.js
deleted file mode 100755
index 5a7a32968..000000000
--- a/route/static/codemirror/addon/display/autorefresh.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(b){b.defineOption("autoRefresh",false,function(d,e){if(d.state.autoRefresh){a(d,d.state.autoRefresh);d.state.autoRefresh=null}if(e&&d.display.wrapper.offsetHeight==0){c(d,d.state.autoRefresh={delay:e.delay||250})}});function c(d,f){function e(){if(d.display.wrapper.offsetHeight){a(d,f);if(d.display.lastWrapHeight!=d.display.wrapper.clientHeight){d.refresh()}}else{f.timeout=setTimeout(e,f.delay)}}f.timeout=setTimeout(e,f.delay);f.hurry=function(){clearTimeout(f.timeout);f.timeout=setTimeout(e,50)};b.on(window,"mouseup",f.hurry);b.on(window,"keyup",f.hurry)}function a(d,e){clearTimeout(e.timeout);b.off(window,"mouseup",e.hurry);b.off(window,"keyup",e.hurry)}});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/display/fullscreen.css b/route/static/codemirror/addon/display/fullscreen.css
deleted file mode 100755
index a414b0220..000000000
--- a/route/static/codemirror/addon/display/fullscreen.css
+++ /dev/null
@@ -1 +0,0 @@
-.CodeMirror-fullscreen{position:fixed;top:0;left:0;right:0;bottom:0;height:auto;z-index:9}
\ No newline at end of file
diff --git a/route/static/codemirror/addon/display/fullscreen.js b/route/static/codemirror/addon/display/fullscreen.js
deleted file mode 100755
index a2329a4dd..000000000
--- a/route/static/codemirror/addon/display/fullscreen.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(a){a.defineOption("fullScreen",false,function(d,f,e){if(e==a.Init){e=false}if(!e==!f){return}if(f){b(d)}else{c(d)}});function b(d){var e=d.getWrapperElement();d.state.fullScreenRestore={scrollTop:window.pageYOffset,scrollLeft:window.pageXOffset,width:e.style.width,height:e.style.height};e.style.width="";e.style.height="auto";e.className+=" CodeMirror-fullscreen";document.documentElement.style.overflow="hidden";d.refresh()}function c(d){var e=d.getWrapperElement();e.className=e.className.replace(/\s*CodeMirror-fullscreen\b/,"");document.documentElement.style.overflow="";var f=d.state.fullScreenRestore;e.style.width=f.width;e.style.height=f.height;window.scrollTo(f.scrollLeft,f.scrollTop);d.refresh()}});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/display/index.html b/route/static/codemirror/addon/display/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/codemirror/addon/display/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/codemirror/addon/display/panel.js b/route/static/codemirror/addon/display/panel.js
deleted file mode 100755
index d3b0e63f1..000000000
--- a/route/static/codemirror/addon/display/panel.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(a){a.defineExtension("addPanel",function(g,f){f=f||{};if(!this.state.panels){b(this)}var h=this.state.panels;var j=h.wrapper;var i=this.getWrapperElement();if(f.after instanceof d&&!f.after.cleared){j.insertBefore(g,f.before.node.nextSibling)}else{if(f.before instanceof d&&!f.before.cleared){j.insertBefore(g,f.before.node)}else{if(f.replace instanceof d&&!f.replace.cleared){j.insertBefore(g,f.replace.node);f.replace.clear()}else{if(f.position=="bottom"){j.appendChild(g)}else{if(f.position=="before-bottom"){j.insertBefore(g,i.nextSibling)}else{if(f.position=="after-top"){j.insertBefore(g,i)}else{j.insertBefore(g,j.firstChild)}}}}}}var e=(f&&f.height)||g.offsetHeight;this._setSize(null,h.heightLeft-=e);h.panels++;return new d(this,g,f,e)});function d(f,h,g,e){this.cm=f;this.node=h;this.options=g;this.height=e;this.cleared=false}d.prototype.clear=function(){if(this.cleared){return}this.cleared=true;var e=this.cm.state.panels;this.cm._setSize(null,e.heightLeft+=this.height);e.wrapper.removeChild(this.node);if(--e.panels==0){c(this.cm)}};d.prototype.changed=function(e){var f=e==null?this.node.offsetHeight:e;var g=this.cm.state.panels;this.cm._setSize(null,g.height+=(f-this.height));this.height=f};function b(f){var h=f.getWrapperElement();var g=window.getComputedStyle?window.getComputedStyle(h):h.currentStyle;var e=parseInt(g.height);var i=f.state.panels={setHeight:h.style.height,heightLeft:e,panels:0,wrapper:document.createElement("div")};h.parentNode.insertBefore(i.wrapper,h);var j=f.hasFocus();i.wrapper.appendChild(h);if(j){f.focus()}f._setSize=f.setSize;if(e!=null){f.setSize=function(m,k){if(k==null){return this._setSize(m,k)}i.setHeight=k;if(typeof k!="number"){var l=/^(\d+\.?\d*)px$/.exec(k);if(l){k=Number(l[1])}else{i.wrapper.style.height=k;k=i.wrapper.offsetHeight;i.wrapper.style.height=""}}f._setSize(m,i.heightLeft+=(k-e));e=k}}}function c(e){var g=e.state.panels;e.state.panels=null;var f=e.getWrapperElement();g.wrapper.parentNode.replaceChild(f,g.wrapper);f.style.height=g.setHeight;e.setSize=e._setSize;e.setSize()}});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/display/placeholder.js b/route/static/codemirror/addon/display/placeholder.js
deleted file mode 100755
index acb9db7ec..000000000
--- a/route/static/codemirror/addon/display/placeholder.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(b){b.defineOption("placeholder","",function(g,j,h){var i=h&&h!=b.Init;if(j&&!i){g.on("blur",e);g.on("change",a);g.on("swapDoc",a);a(g)}else{if(!j&&i){g.off("blur",e);g.off("change",a);g.off("swapDoc",a);c(g);var k=g.getWrapperElement();k.className=k.className.replace(" CodeMirror-empty","")}}if(j&&!g.hasFocus()){e(g)}});function c(g){if(g.state.placeholder){g.state.placeholder.parentNode.removeChild(g.state.placeholder);g.state.placeholder=null}}function d(g){c(g);var h=g.state.placeholder=document.createElement("pre");h.style.cssText="height: 0; overflow: visible";h.className="CodeMirror-placeholder";var i=g.getOption("placeholder");if(typeof i=="string"){i=document.createTextNode(i)}h.appendChild(i);g.display.lineSpace.insertBefore(h,g.display.lineSpace.firstChild)}function e(g){if(f(g)){d(g)}}function a(g){var i=g.getWrapperElement(),h=f(g);i.className=i.className.replace(" CodeMirror-empty","")+(h?" CodeMirror-empty":"");if(h){d(g)}else{c(g)}}function f(g){return(g.lineCount()===1)&&(g.getLine(0)==="")}});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/display/rulers.js b/route/static/codemirror/addon/display/rulers.js
deleted file mode 100755
index cfbd155da..000000000
--- a/route/static/codemirror/addon/display/rulers.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(b){b.defineOption("rulers",false,function(c,d){if(c.state.rulerDiv){c.state.rulerDiv.parentElement.removeChild(c.state.rulerDiv);c.state.rulerDiv=null;c.off("refresh",a)}if(d&&d.length){c.state.rulerDiv=c.display.lineSpace.parentElement.insertBefore(document.createElement("div"),c.display.lineSpace);c.state.rulerDiv.className="CodeMirror-rulers";a(c);c.on("refresh",a)}});function a(c){c.state.rulerDiv.textContent="";var k=c.getOption("rulers");var d=c.defaultCharWidth();var j=c.charCoords(b.Pos(c.firstLine(),0),"div").left;c.state.rulerDiv.style.minHeight=(c.display.scroller.offsetHeight+30)+"px";for(var h=0;h<k.length;h++){var g=document.createElement("div");g.className="CodeMirror-ruler";var f,e=k[h];if(typeof e=="number"){f=e}else{f=e.column;if(e.className){g.className+=" "+e.className}if(e.color){g.style.borderColor=e.color}if(e.lineStyle){g.style.borderLeftStyle=e.lineStyle}if(e.width){g.style.borderLeftWidth=e.width}}g.style.left=(j+f*d)+"px";c.state.rulerDiv.appendChild(g)}}});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/edit/closebrackets.js b/route/static/codemirror/addon/edit/closebrackets.js
deleted file mode 100755
index 07f4d8569..000000000
--- a/route/static/codemirror/addon/edit/closebrackets.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(f){var e={pairs:"()[]{}''\"\"",triples:"",explode:"[]{}"};var p=f.Pos;f.defineOption("autoCloseBrackets",false,function(i,t,s){if(s&&s!=f.Init){i.removeKeyMap(l);i.state.closeBrackets=null}if(t){i.state.closeBrackets=t;i.addKeyMap(l)}});function a(s,i){if(i=="pairs"&&typeof s=="string"){return s}if(typeof s=="object"&&s[i]!=null){return s[i]}return e[i]}var m=e.pairs+"`";var l={Backspace:d,Enter:b};for(var j=0;j<m.length;j++){l["'"+m.charAt(j)+"'"]=r(m.charAt(j))}function r(i){return function(s){return q(s,i)}}function o(i){var t=i.state.closeBrackets;if(!t){return null}var s=i.getModeAt(i.getCursor());return s.closeBrackets||t}function d(s){var u=o(s);if(!u||s.getOption("disableInput")){return f.Pass}var x=a(u,"pairs");var t=s.listSelections();for(var v=0;v<t.length;v++){if(!t[v].empty()){return f.Pass}var w=h(s,t[v].head);if(!w||x.indexOf(w)%2!=0){return f.Pass}}for(var v=t.length-1;v>=0;v--){var y=t[v].head;s.replaceRange("",p(y.line,y.ch-1),p(y.line,y.ch+1),"+delete")}}function b(s){var u=o(s);var w=u&&a(u,"explode");if(!w||s.getOption("disableInput")){return f.Pass}var t=s.listSelections();for(var v=0;v<t.length;v++){if(!t[v].empty()){return f.Pass}var x=h(s,t[v].head);if(!x||w.indexOf(x)%2!=0){return f.Pass}}s.operation(function(){s.replaceSelection("\n\n",null);s.execCommand("goCharLeft");t=s.listSelections();for(var z=0;z<t.length;z++){var y=t[z].head.line;s.indentLine(y,null,true);s.indentLine(y+1,null,true)}})}function g(s){var i=f.cmpPos(s.anchor,s.head)>0;return{anchor:new p(s.anchor.line,s.anchor.ch+(i?-1:1)),head:new p(s.head.line,s.head.ch+(i?1:-1))}}function q(F,s){var A=o(F);if(!A||F.getOption("disableInput")){return f.Pass}var u=a(A,"pairs");var D=u.indexOf(s);if(D==-1){return f.Pass}var I=a(A,"triples");var E=u.charAt(D+1)==s;var t=F.listSelections();var v=D%2==0;var B;for(var x=0;x<t.length;x++){var z=t[x],H=z.head,C;var y=F.getRange(H,p(H.line,H.ch+1));if(v&&!z.empty()){C="surround"}else{if((E||!v)&&y==s){if(E&&k(F,H)){C="both"}else{if(I.indexOf(s)>=0&&F.getRange(H,p(H.line,H.ch+3))==s+s+s){C="skipThree"}else{C="skip"}}}else{if(E&&H.ch>1&&I.indexOf(s)>=0&&F.getRange(p(H.line,H.ch-2),H)==s+s&&(H.ch<=2||F.getRange(p(H.line,H.ch-3),p(H.line,H.ch-2))!=s)){C="addFour"}else{if(E){if(!f.isWordChar(y)&&n(F,H,s)){C="both"}else{return f.Pass}}else{if(v&&(F.getLine(H.line).length==H.ch||c(y,u)||/\s/.test(y))){C="both"}else{return f.Pass}}}}}if(!B){B=C}else{if(B!=C){return f.Pass}}}var w=D%2?u.charAt(D-1):s;var G=D%2?s:u.charAt(D+1);F.operation(function(){if(B=="skip"){F.execCommand("goCharRight")}else{if(B=="skipThree"){for(var K=0;K<3;K++){F.execCommand("goCharRight")}}else{if(B=="surround"){var J=F.getSelections();for(var K=0;K<J.length;K++){J[K]=w+J[K]+G}F.replaceSelections(J,"around");J=F.listSelections().slice();for(var K=0;K<J.length;K++){J[K]=g(J[K])}F.setSelections(J)}else{if(B=="both"){F.replaceSelection(w+G,null);F.triggerElectric(w+G);F.execCommand("goCharLeft")}else{if(B=="addFour"){F.replaceSelection(w+w+w+w,"before");F.execCommand("goCharRight")}}}}}})}function c(i,s){var t=s.lastIndexOf(i);return t>-1&&t%2==1}function h(i,t){var s=i.getRange(p(t.line,t.ch-1),p(t.line,t.ch+1));return s.length==2?s:null}function n(i,x,v){var s=i.getLine(x.line);var u=i.getTokenAt(x);if(/\bstring2?\b/.test(u.type)){return false}var w=new f.StringStream(s.slice(0,x.ch)+v+s.slice(x.ch),4);w.pos=w.start=u.start;for(;;){var t=i.getMode().token(w,u.state);if(w.pos>=x.ch+1){return/\bstring2?\b/.test(t)}w.start=w.pos}}function k(i,t){var s=i.getTokenAt(p(t.line,t.ch+1));return/\bstring/.test(s.type)&&s.start==t.ch}});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/edit/closetag.js b/route/static/codemirror/addon/edit/closetag.js
deleted file mode 100755
index 3fda5544b..000000000
--- a/route/static/codemirror/addon/edit/closetag.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"),require("../fold/xml-fold"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror","../fold/xml-fold"],a)}else{a(CodeMirror)}}})(function(b){b.defineOption("autoCloseTags",false,function(i,l,j){if(j!=b.Init&&j){i.removeKeyMap("autoCloseTags")}if(!l){return}var k={name:"autoCloseTags"};if(typeof l!="object"||l.whenClosing){k["'/'"]=function(m){return e(m)}}if(typeof l!="object"||l.whenOpening){k["'>'"]=function(m){return a(m)}}i.addKeyMap(k)});var d=["area","base","br","col","command","embed","hr","img","input","keygen","link","meta","param","source","track","wbr"];var c=["applet","blockquote","body","button","div","dl","fieldset","form","frameset","h1","h2","h3","h4","h5","h6","head","html","iframe","layer","legend","object","ol","p","select","table","ul"];function a(x){if(x.getOption("disableInput")){return b.Pass}var k=x.listSelections(),r=[];for(var s=0;s<k.length;s++){if(!k[s].empty()){return b.Pass}var w=k[s].head,y=x.getTokenAt(w);var z=b.innerMode(x.getMode(),y.state),j=z.state;if(z.mode.name!="xml"||!j.tagName){return b.Pass}var l=x.getOption("autoCloseTags"),t=z.mode.configuration=="html";var n=(typeof l=="object"&&l.dontCloseTags)||(t&&d);var v=(typeof l=="object"&&l.indentTags)||(t&&c);var q=j.tagName;if(y.end>w.ch){q=q.slice(0,q.length-y.end+w.ch)}var u=q.toLowerCase();if(!q||y.type=="string"&&(y.end!=w.ch||!/[\"\']/.test(y.string.charAt(y.string.length-1))||y.string.length==1)||y.type=="tag"&&j.type=="closeTag"||y.string.indexOf("/")==(y.string.length-1)||n&&g(n,u)>-1||f(x,q,w,j,true)){return b.Pass}var p=v&&g(v,u)>-1;r[s]={indent:p,text:">"+(p?"\n\n":"")+"</"+q+">",newPos:p?b.Pos(w.line+1,0):b.Pos(w.line,w.ch+1)}}for(var s=k.length-1;s>=0;s--){var o=r[s];x.replaceRange(o.text,k[s].head,k[s].anchor,"+insert");var m=x.listSelections().slice(0);m[s]={head:o.newPos,anchor:o.newPos};x.setSelections(m);if(o.indent){x.indentLine(o.newPos.line,null,true);x.indentLine(o.newPos.line+1,null,true)}}}function h(r,n){var k=r.listSelections(),m=[];var q=n?"/":"</";for(var o=0;o<k.length;o++){if(!k[o].empty()){return b.Pass}var p=k[o].head,s=r.getTokenAt(p);var t=b.innerMode(r.getMode(),s.state),j=t.state;if(n&&(s.type=="string"||s.string.charAt(0)!="<"||s.start!=p.ch-1)){return b.Pass}var l;if(t.mode.name!="xml"){if(r.getMode().name=="htmlmixed"&&t.mode.name=="javascript"){l=q+"script"}else{if(r.getMode().name=="htmlmixed"&&t.mode.name=="css"){l=q+"style"}else{return b.Pass}}}else{if(!j.context||!j.context.tagName||f(r,j.context.tagName,p,j)){return b.Pass}l=q+j.context.tagName}if(r.getLine(p.line).charAt(s.end)!=">"){l+=">"}m[o]=l}r.replaceSelections(m);k=r.listSelections();for(var o=0;o<k.length;o++){if(o==k.length-1||k[o].head.line<k[o+1].head.line){r.indentLine(k[o].head.line)}}}function e(i){if(i.getOption("disableInput")){return b.Pass}return h(i,true)}b.commands.closeTag=function(i){return h(i)};function g(m,j){if(m.indexOf){return m.indexOf(j)}for(var k=0,l=m.length;k<l;++k){if(m[k]==j){return k}}return -1}function f(r,k,q,j,t){if(!b.scanForClosingTag){return false}var l=Math.min(r.lastLine()+1,q.line+500);var s=b.scanForClosingTag(r,q,null,l);if(!s||s.tag!=k){return false}var m=j.context;for(var o=t?1:0;m&&m.tagName==k;m=m.prev){++o}q=s.to;for(var n=1;n<o;n++){var p=b.scanForClosingTag(r,q,null,l);if(!p||p.tag!=k){return false}q=p.to}return true}});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/edit/continuelist.js b/route/static/codemirror/addon/edit/continuelist.js
deleted file mode 100755
index 2d226716d..000000000
--- a/route/static/codemirror/addon/edit/continuelist.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(b){var d=/^(\s*)(>[> ]*|- \[[x ]\]\s|[*+-]\s|(\d+)([.)]))(\s*)/,c=/^(\s*)(>[> ]*|- \[[x ]\]|[*+-]|(\d+)[.)])(\s*)$/,a=/[*+-]\s/;b.commands.newlineAndIndentContinueMarkdownList=function(q){if(q.getOption("disableInput")){return b.Pass}var g=q.listSelections(),k=[];for(var m=0;m<g.length;m++){var p=g[m].head;var h=q.getStateAfter(p.line);var o=h.list!==false;var l=h.quote!==0;var r=q.getLine(p.line),n=d.exec(r);if(!g[m].empty()||(!o&&!l)||!n){q.execCommand("newlineAndIndent");return}if(c.test(r)){q.replaceRange("",{line:p.line,ch:0},{line:p.line,ch:p.ch+1});k[m]="\n"}else{var j=n[1],f=n[5];var e=a.test(n[2])||n[2].indexOf(">")>=0?n[2].replace("x"," "):(parseInt(n[3],10)+1)+n[4];k[m]="\n"+j+e+f}}q.replaceSelections(k)}});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/edit/editAll.js b/route/static/codemirror/addon/edit/editAll.js
deleted file mode 100755
index 0426f0e93..000000000
--- a/route/static/codemirror/addon/edit/editAll.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"),require("../fold/xml-fold"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror","../fold/xml-fold"],a)}else{a(CodeMirror)}}})(function(c){c.defineOption("matchTags",false,function(e,g,f){if(f&&f!=c.Init){e.off("cursorActivity",b);e.off("viewportChange",d);a(e)}if(g){e.state.matchBothTags=typeof g=="object"&&g.bothTags;e.on("cursorActivity",b);e.on("viewportChange",d);b(e)}});function a(e){if(e.state.tagHit){e.state.tagHit.clear()}if(e.state.tagOther){e.state.tagOther.clear()}e.state.tagHit=e.state.tagOther=null}function b(e){e.state.failedTagMatch=false;e.operation(function(){a(e);if(e.somethingSelected()){return}var j=e.getCursor(),g=e.getViewport();g.from=Math.min(g.from,j.line);g.to=Math.max(j.line+1,g.to);var h=c.findMatchingTag(e,j,g);if(!h){return}if(e.state.matchBothTags){var i=h.at=="open"?h.open:h.close;if(i){e.state.tagHit=e.markText(i.from,i.to,{className:"CodeMirror-matchingtag"})}}var f=h.at=="close"?h.open:h.close;if(f){e.state.tagOther=e.markText(f.from,f.to,{className:"CodeMirror-matchingtag"})}else{e.state.failedTagMatch=true}})}function d(e){if(e.state.failedTagMatch){b(e)}}c.commands.toMatchingTag=function(f){var g=c.findMatchingTag(f,f.getCursor());if(g){var e=g.at=="close"?g.open:g.close;if(e){f.extendSelection(e.to,e.from)}}}});(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(e){var d=/MSIE \d/.test(navigator.userAgent)&&(document.documentMode==null||document.documentMode<8);var i=e.Pos;var a={"(":")>",")":"(<","[":"]>","]":"[<","{":"}>","}":"{<"};function f(q,m,p,k){var s=q.getLineHandle(m.line),o=m.ch-1;var n=(o>=0&&a[s.text.charAt(o)])||a[s.text.charAt(++o)];if(!n){return null}var l=n.charAt(1)==">"?1:-1;if(p&&(l>0)!=(o==m.ch)){return null}var j=q.getTokenTypeAt(i(m.line,o+1));var r=g(q,i(m.line,o+(l>0?1:0)),l,j||null,k);if(r==null){return null}return{from:i(m.line,o),to:r&&r.pos,match:r&&r.ch==n.charAt(0),forward:l>0}}function g(w,r,n,k,m){var l=(m&&m.maxScanLineLength)||10000;var t=(m&&m.maxScanLines)||1000;var v=[];var x=m&&m.bracketRegex?m.bracketRegex:/[(){}[\]]/;var q=n>0?Math.min(r.line+t,w.lastLine()+1):Math.max(w.firstLine()-1,r.line-t);for(var o=r.line;o!=q;o+=n){var y=w.getLine(o);if(!y){continue}var u=n>0?0:y.length-1,p=n>0?y.length:-1;if(y.length>l){continue}if(o==r.line){u=r.ch-(n<0?1:0)}for(;u!=p;u+=n){var j=y.charAt(u);if(x.test(j)&&(k===undefined||w.getTokenTypeAt(i(o,u+1))==k)){var s=a[j];if((s.charAt(1)==">")==(n>0)){v.push(j)}else{if(!v.length){return{pos:i(o,u),ch:j}}else{v.pop()}}}}}return o-n==(n>0?w.lastLine():w.firstLine())?false:null}function b(s,n,m){var k=s.state.matchBrackets.maxHighlightLineLength||1000;var r=[],l=s.listSelections();for(var o=0;o<l.length;o++){var q=l[o].empty()&&f(s,l[o].head,false,m);if(q&&s.getLine(q.from.line).length<=k){var j=q.match?"CodeMirror-matchingbracket":"CodeMirror-nonmatchingbracket";r.push(s.markText(q.from,i(q.from.line,q.from.ch+1),{className:j}));if(q.to&&s.getLine(q.to.line).length<=k){r.push(s.markText(q.to,i(q.to.line,q.to.ch+1),{className:j}))}}}if(r.length){if(d&&s.state.focused){s.focus()}var p=function(){s.operation(function(){for(var t=0;t<r.length;t++){r[t].clear()}})};if(n){setTimeout(p,800)}else{return p}}}var c=null;function h(j){j.operation(function(){if(c){c();c=null}c=b(j,false,j.state.matchBrackets)})}e.defineOption("matchBrackets",false,function(j,l,k){if(k&&k!=e.Init){j.off("cursorActivity",h);if(c){c();c=null}}if(l){j.state.matchBrackets=typeof l=="object"?l:{};j.on("cursorActivity",h)}});e.defineExtension("matchBrackets",function(){b(this,true)});e.defineExtension("findMatchingBracket",function(l,j,k){return f(this,l,j,k)});e.defineExtension("scanForBracket",function(m,k,l,j){return g(this,m,k,l,j)})});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/edit/index.html b/route/static/codemirror/addon/edit/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/codemirror/addon/edit/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/codemirror/addon/edit/matchbrackets.js b/route/static/codemirror/addon/edit/matchbrackets.js
deleted file mode 100755
index 7e6a31eb7..000000000
--- a/route/static/codemirror/addon/edit/matchbrackets.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(e){var d=/MSIE \d/.test(navigator.userAgent)&&(document.documentMode==null||document.documentMode<8);var i=e.Pos;var a={"(":")>",")":"(<","[":"]>","]":"[<","{":"}>","}":"{<"};function f(q,m,p,k){var s=q.getLineHandle(m.line),o=m.ch-1;var n=(o>=0&&a[s.text.charAt(o)])||a[s.text.charAt(++o)];if(!n){return null}var l=n.charAt(1)==">"?1:-1;if(p&&(l>0)!=(o==m.ch)){return null}var j=q.getTokenTypeAt(i(m.line,o+1));var r=g(q,i(m.line,o+(l>0?1:0)),l,j||null,k);if(r==null){return null}return{from:i(m.line,o),to:r&&r.pos,match:r&&r.ch==n.charAt(0),forward:l>0}}function g(w,r,n,k,m){var l=(m&&m.maxScanLineLength)||10000;var t=(m&&m.maxScanLines)||1000;var v=[];var x=m&&m.bracketRegex?m.bracketRegex:/[(){}[\]]/;var q=n>0?Math.min(r.line+t,w.lastLine()+1):Math.max(w.firstLine()-1,r.line-t);for(var o=r.line;o!=q;o+=n){var y=w.getLine(o);if(!y){continue}var u=n>0?0:y.length-1,p=n>0?y.length:-1;if(y.length>l){continue}if(o==r.line){u=r.ch-(n<0?1:0)}for(;u!=p;u+=n){var j=y.charAt(u);if(x.test(j)&&(k===undefined||w.getTokenTypeAt(i(o,u+1))==k)){var s=a[j];if((s.charAt(1)==">")==(n>0)){v.push(j)}else{if(!v.length){return{pos:i(o,u),ch:j}}else{v.pop()}}}}}return o-n==(n>0?w.lastLine():w.firstLine())?false:null}function b(s,n,m){var k=s.state.matchBrackets.maxHighlightLineLength||1000;var r=[],l=s.listSelections();for(var o=0;o<l.length;o++){var q=l[o].empty()&&f(s,l[o].head,false,m);if(q&&s.getLine(q.from.line).length<=k){var j=q.match?"CodeMirror-matchingbracket":"CodeMirror-nonmatchingbracket";r.push(s.markText(q.from,i(q.from.line,q.from.ch+1),{className:j}));if(q.to&&s.getLine(q.to.line).length<=k){r.push(s.markText(q.to,i(q.to.line,q.to.ch+1),{className:j}))}}}if(r.length){if(d&&s.state.focused){s.focus()}var p=function(){s.operation(function(){for(var t=0;t<r.length;t++){r[t].clear()}})};if(n){setTimeout(p,800)}else{return p}}}var c=null;function h(j){j.operation(function(){if(c){c();c=null}c=b(j,false,j.state.matchBrackets)})}e.defineOption("matchBrackets",false,function(j,l,k){if(k&&k!=e.Init){j.off("cursorActivity",h);if(c){c();c=null}}if(l){j.state.matchBrackets=typeof l=="object"?l:{};j.on("cursorActivity",h)}});e.defineExtension("matchBrackets",function(){b(this,true)});e.defineExtension("findMatchingBracket",function(l,j,k){return f(this,l,j,k)});e.defineExtension("scanForBracket",function(m,k,l,j){return g(this,m,k,l,j)})});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/edit/matchtags.js b/route/static/codemirror/addon/edit/matchtags.js
deleted file mode 100755
index f9dfee0d6..000000000
--- a/route/static/codemirror/addon/edit/matchtags.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"),require("../fold/xml-fold"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror","../fold/xml-fold"],a)}else{a(CodeMirror)}}})(function(c){c.defineOption("matchTags",false,function(e,g,f){if(f&&f!=c.Init){e.off("cursorActivity",b);e.off("viewportChange",d);a(e)}if(g){e.state.matchBothTags=typeof g=="object"&&g.bothTags;e.on("cursorActivity",b);e.on("viewportChange",d);b(e)}});function a(e){if(e.state.tagHit){e.state.tagHit.clear()}if(e.state.tagOther){e.state.tagOther.clear()}e.state.tagHit=e.state.tagOther=null}function b(e){e.state.failedTagMatch=false;e.operation(function(){a(e);if(e.somethingSelected()){return}var j=e.getCursor(),g=e.getViewport();g.from=Math.min(g.from,j.line);g.to=Math.max(j.line+1,g.to);var h=c.findMatchingTag(e,j,g);if(!h){return}if(e.state.matchBothTags){var i=h.at=="open"?h.open:h.close;if(i){e.state.tagHit=e.markText(i.from,i.to,{className:"CodeMirror-matchingtag"})}}var f=h.at=="close"?h.open:h.close;if(f){e.state.tagOther=e.markText(f.from,f.to,{className:"CodeMirror-matchingtag"})}else{e.state.failedTagMatch=true}})}function d(e){if(e.state.failedTagMatch){b(e)}}c.commands.toMatchingTag=function(f){var g=c.findMatchingTag(f,f.getCursor());if(g){var e=g.at=="close"?g.open:g.close;if(e){f.extendSelection(e.to,e.from)}}}});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/edit/trailingspace.js b/route/static/codemirror/addon/edit/trailingspace.js
deleted file mode 100755
index bc9f4fe0d..000000000
--- a/route/static/codemirror/addon/edit/trailingspace.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(a){a.defineOption("showTrailingSpace",false,function(b,d,c){if(c==a.Init){c=false}if(c&&!d){b.removeOverlay("trailingspace")}else{if(!c&&d){b.addOverlay({token:function(g){for(var e=g.string.length,f=e;f&&/\s/.test(g.string.charAt(f-1));--f){}if(f>g.pos){g.pos=f;return null}g.pos=e;return"trailingspace"},name:"trailingspace"})}}})});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/hint/anyword-hint.js b/route/static/codemirror/addon/hint/anyword-hint.js
deleted file mode 100755
index 2b27ad172..000000000
--- a/route/static/codemirror/addon/hint/anyword-hint.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(c){var b=/[\w$]+/,a=500;c.registerHelper("hint","anyword",function(o,u){var f=u&&u.word||b;var n=u&&u.range||a;var q=o.getCursor(),e=o.getLine(q.line);var l=q.ch,h=l;while(h&&f.test(e.charAt(h-1))){--h}var g=h!=l&&e.slice(h,l);var p=u&&u.list||[],d={};var s=new RegExp(f.source,"g");for(var k=-1;k<=1;k+=2){var t=q.line,j=Math.min(Math.max(t+k*n,o.firstLine()),o.lastLine())+k;for(;t!=j;t+=k){var r=o.getLine(t),i;while(i=s.exec(r)){if(t==q.line&&i[0]===g){continue}if((!g||i[0].lastIndexOf(g,0)==0)&&!Object.prototype.hasOwnProperty.call(d,i[0])){d[i[0]]=true;p.push(i[0])}}}}return{list:p,from:c.Pos(q.line,h),to:c.Pos(q.line,l)}})});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/hint/css-hint.js b/route/static/codemirror/addon/hint/css-hint.js
deleted file mode 100755
index 1086c2a59..000000000
--- a/route/static/codemirror/addon/hint/css-hint.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"),require("../../mode/css/css"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror","../../mode/css/css"],a)}else{a(CodeMirror)}}})(function(a){var b={link:1,visited:1,active:1,hover:1,focus:1,"first-letter":1,"first-line":1,"first-child":1,before:1,after:1,lang:1};a.registerHelper("hint","css",function(g){var h=g.getCursor(),e=g.getTokenAt(h);var m=a.innerMode(g.getMode(),e.state);if(m.mode.name!="css"){return}if(e.type=="keyword"&&"!important".indexOf(e.string)==0){return{list:["!important"],from:a.Pos(h.line,e.start),to:a.Pos(h.line,e.end)}}var d=e.start,f=h.ch,c=e.string.slice(0,f-d);if(/[^\w$_-]/.test(c)){c="";d=f=h.ch}var i=a.resolveMode("text/css");var l=[];function k(o){for(var n in o){if(!c||n.lastIndexOf(c,0)==0){l.push(n)}}}var j=m.state.state;if(j=="pseudo"||e.type=="variable-3"){k(b)}else{if(j=="block"||j=="maybeprop"){k(i.propertyKeywords)}else{if(j=="prop"||j=="parens"||j=="at"||j=="params"){k(i.valueKeywords);k(i.colorKeywords)}else{if(j=="media"||j=="media_parens"){k(i.mediaTypes);k(i.mediaFeatures)}}}}if(l.length){return{list:l,from:a.Pos(h.line,d),to:a.Pos(h.line,f)}}})});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/hint/html-hint.js b/route/static/codemirror/addon/hint/html-hint.js
deleted file mode 100755
index 10e0ef6ea..000000000
--- a/route/static/codemirror/addon/hint/html-hint.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"),require("./xml-hint"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror","./xml-hint"],a)}else{a(CodeMirror)}}})(function(f){var g="ab aa af ak sq am ar an hy as av ae ay az bm ba eu be bn bh bi bs br bg my ca ch ce ny zh cv kw co cr hr cs da dv nl dz en eo et ee fo fj fi fr ff gl ka de el gn gu ht ha he hz hi ho hu ia id ie ga ig ik io is it iu ja jv kl kn kr ks kk km ki rw ky kv kg ko ku kj la lb lg li ln lo lt lu lv gv mk mg ms ml mt mi mr mh mn na nv nb nd ne ng nn no ii nr oc oj cu om or os pa pi fa pl ps pt qu rm rn ro ru sa sc sd se sm sg sr gd sn si sk sl so st es su sw ss sv ta te tg th ti bo tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa cy wo fy xh yi yo za zu".split(" ");var j=["_blank","_self","_top","_parent"];var a=["ascii","utf-8","utf-16","latin1","latin1"];var e=["get","post","put","delete"];var b=["application/x-www-form-urlencoded","multipart/form-data","text/plain"];var c=["all","screen","print","embossed","braille","handheld","print","projection","screen","tty","tv","speech","3d-glasses","resolution [>][<][=] [X]","device-aspect-ratio: X/Y","orientation:portrait","orientation:landscape","device-height: [X]","device-width: [X]"];var m={attrs:{}};var h={a:{attrs:{href:null,ping:null,type:null,media:c,target:j,hreflang:g}},abbr:m,acronym:m,address:m,applet:m,area:{attrs:{alt:null,coords:null,href:null,target:null,ping:null,media:c,hreflang:g,type:null,shape:["default","rect","circle","poly"]}},article:m,aside:m,audio:{attrs:{src:null,mediagroup:null,crossorigin:["anonymous","use-credentials"],preload:["none","metadata","auto"],autoplay:["","autoplay"],loop:["","loop"],controls:["","controls"]}},b:m,base:{attrs:{href:null,target:j}},basefont:m,bdi:m,bdo:m,big:m,blockquote:{attrs:{cite:null}},body:m,br:m,button:{attrs:{form:null,formaction:null,name:null,value:null,autofocus:["","autofocus"],disabled:["","autofocus"],formenctype:b,formmethod:e,formnovalidate:["","novalidate"],formtarget:j,type:["submit","reset","button"]}},canvas:{attrs:{width:null,height:null}},caption:m,center:m,cite:m,code:m,col:{attrs:{span:null}},colgroup:{attrs:{span:null}},command:{attrs:{type:["command","checkbox","radio"],label:null,icon:null,radiogroup:null,command:null,title:null,disabled:["","disabled"],checked:["","checked"]}},data:{attrs:{value:null}},datagrid:{attrs:{disabled:["","disabled"],multiple:["","multiple"]}},datalist:{attrs:{data:null}},dd:m,del:{attrs:{cite:null,datetime:null}},details:{attrs:{open:["","open"]}},dfn:m,dir:m,div:m,dl:m,dt:m,em:m,embed:{attrs:{src:null,type:null,width:null,height:null}},eventsource:{attrs:{src:null}},fieldset:{attrs:{disabled:["","disabled"],form:null,name:null}},figcaption:m,figure:m,font:m,footer:m,form:{attrs:{action:null,name:null,"accept-charset":a,autocomplete:["on","off"],enctype:b,method:e,novalidate:["","novalidate"],target:j}},frame:m,frameset:m,h1:m,h2:m,h3:m,h4:m,h5:m,h6:m,head:{attrs:{},children:["title","base","link","style","meta","script","noscript","command"]},header:m,hgroup:m,hr:m,html:{attrs:{manifest:null},children:["head","body"]},i:m,iframe:{attrs:{src:null,srcdoc:null,name:null,width:null,height:null,sandbox:["allow-top-navigation","allow-same-origin","allow-forms","allow-scripts"],seamless:["","seamless"]}},img:{attrs:{alt:null,src:null,ismap:null,usemap:null,width:null,height:null,crossorigin:["anonymous","use-credentials"]}},input:{attrs:{alt:null,dirname:null,form:null,formaction:null,height:null,list:null,max:null,maxlength:null,min:null,name:null,pattern:null,placeholder:null,size:null,src:null,step:null,value:null,width:null,accept:["audio/*","video/*","image/*"],autocomplete:["on","off"],autofocus:["","autofocus"],checked:["","checked"],disabled:["","disabled"],formenctype:b,formmethod:e,formnovalidate:["","novalidate"],formtarget:j,multiple:["","multiple"],readonly:["","readonly"],required:["","required"],type:["hidden","text","search","tel","url","email","password","datetime","date","month","week","time","datetime-local","number","range","color","checkbox","radio","file","submit","image","reset","button"]}},ins:{attrs:{cite:null,datetime:null}},kbd:m,keygen:{attrs:{challenge:null,form:null,name:null,autofocus:["","autofocus"],disabled:["","disabled"],keytype:["RSA"]}},label:{attrs:{"for":null,form:null}},legend:m,li:{attrs:{value:null}},link:{attrs:{href:null,type:null,hreflang:g,media:c,sizes:["all","16x16","16x16 32x32","16x16 32x32 64x64"]}},map:{attrs:{name:null}},mark:m,menu:{attrs:{label:null,type:["list","context","toolbar"]}},meta:{attrs:{content:null,charset:a,name:["viewport","application-name","author","description","generator","keywords"],"http-equiv":["content-language","content-type","default-style","refresh"]}},meter:{attrs:{value:null,min:null,low:null,high:null,max:null,optimum:null}},nav:m,noframes:m,noscript:m,object:{attrs:{data:null,type:null,name:null,usemap:null,form:null,width:null,height:null,typemustmatch:["","typemustmatch"]}},ol:{attrs:{reversed:["","reversed"],start:null,type:["1","a","A","i","I"]}},optgroup:{attrs:{disabled:["","disabled"],label:null}},option:{attrs:{disabled:["","disabled"],label:null,selected:["","selected"],value:null}},output:{attrs:{"for":null,form:null,name:null}},p:m,param:{attrs:{name:null,value:null}},pre:m,progress:{attrs:{value:null,max:null}},q:{attrs:{cite:null}},rp:m,rt:m,ruby:m,s:m,samp:m,script:{attrs:{type:["text/javascript"],src:null,async:["","async"],defer:["","defer"],charset:a}},section:m,select:{attrs:{form:null,name:null,size:null,autofocus:["","autofocus"],disabled:["","disabled"],multiple:["","multiple"]}},small:m,source:{attrs:{src:null,type:null,media:null}},span:m,strike:m,strong:m,style:{attrs:{type:["text/css"],media:c,scoped:null}},sub:m,summary:m,sup:m,table:m,tbody:m,td:{attrs:{colspan:null,rowspan:null,headers:null}},textarea:{attrs:{dirname:null,form:null,maxlength:null,name:null,placeholder:null,rows:null,cols:null,autofocus:["","autofocus"],disabled:["","disabled"],readonly:["","readonly"],required:["","required"],wrap:["soft","hard"]}},tfoot:m,th:{attrs:{colspan:null,rowspan:null,headers:null,scope:["row","col","rowgroup","colgroup"]}},thead:m,time:{attrs:{datetime:null}},title:m,tr:m,track:{attrs:{src:null,label:null,"default":null,kind:["subtitles","captions","descriptions","chapters","metadata"],srclang:g}},tt:m,u:m,ul:m,"var":m,video:{attrs:{src:null,poster:null,width:null,height:null,crossorigin:["anonymous","use-credentials"],preload:["auto","metadata","none"],autoplay:["","autoplay"],mediagroup:["movie"],muted:["","muted"],controls:["","controls"]}},wbr:m};var d={accesskey:["a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","0","1","2","3","4","5","6","7","8","9"],"class":null,contenteditable:["true","false"],contextmenu:null,dir:["ltr","rtl","auto"],draggable:["true","false","auto"],dropzone:["copy","move","link","string:","file:"],hidden:["hidden"],id:null,inert:["inert"],itemid:null,itemprop:null,itemref:null,itemscope:["itemscope"],itemtype:null,lang:["en","es"],spellcheck:["true","false"],style:null,tabindex:["1","2","3","4","5","6","7","8","9"],title:null,translate:["yes","no"],onclick:null,rel:["stylesheet","alternate","author","bookmark","help","license","next","nofollow","noreferrer","prefetch","prev","search","tag"]};function i(o){for(var n in d){if(d.hasOwnProperty(n)){o.attrs[n]=d[n]}}}i(m);for(var l in h){if(h.hasOwnProperty(l)&&h[l]!=m){i(h[l])}}f.htmlSchema=h;function k(n,o){var q={schemaInfo:h};if(o){for(var p in o){q[p]=o[p]}}return f.hint.xml(n,q)}f.registerHelper("hint","html",k)});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/hint/index.html b/route/static/codemirror/addon/hint/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/codemirror/addon/hint/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/codemirror/addon/hint/javascript-hint.js b/route/static/codemirror/addon/hint/javascript-hint.js
deleted file mode 100755
index f9cfa09eb..000000000
--- a/route/static/codemirror/addon/hint/javascript-hint.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(d){var l=d.Pos;function g(p,r){for(var q=0,s=p.length;q<s;++q){r(p[q])}}function e(p,r){if(!Array.prototype.indexOf){var q=p.length;while(q--){if(p[q]===r){return true}}return false}return p.indexOf(r)!=-1}function h(u,t,w,q){var v=u.getCursor(),s=w(u,v);if(/\b(?:string|comment)\b/.test(s.type)){return}s.state=d.innerMode(u.getMode(),s.state).state;if(!/^[\w$_]*$/.test(s.string)){s={start:v.ch,end:v.ch,string:"",state:s.state,type:s.string=="."?"property":null}}else{if(s.end>v.ch){s.end=v.ch;s.string=s.string.slice(0,v.ch-s.start)}}var p=s;while(p.type=="property"){p=w(u,l(v.line,p.start));if(p.string!="."){return}p=w(u,l(v.line,p.start));if(!r){var r=[]}r.push(p)}return{list:i(s,r,t,q),from:l(v.line,s.start),to:l(v.line,s.end)}}function a(q,p){return h(q,c,function(r,s){return r.getTokenAt(s)},p)}d.registerHelper("hint","javascript",a);function b(q,r){var p=q.getTokenAt(r);if(r.ch==p.start+1&&p.string.charAt(0)=="."){p.end=p.start;p.string=".";p.type="property"}else{if(/^\.[\w$_]*$/.test(p.string)){p.type="property";p.start++;p.string=p.string.replace(/\./,"")}}return p}function j(q,p){return h(q,n,b,p)}d.registerHelper("hint","coffeescript",j);var m=("charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight toUpperCase toLowerCase split concat match replace search").split(" ");var o=("length concat join splice push pop shift unshift slice reverse sort indexOf lastIndexOf every some filter forEach map reduce reduceRight ").split(" ");var f="prototype apply call bind".split(" ");var c=("break case catch continue debugger default delete do else false finally for function if in instanceof new null return switch throw true try typeof var void while with").split(" ");var n=("and break catch class continue delete do else extends false finally for if in instanceof isnt new no not null of off on or return switch then throw true try typeof until void while with yes").split(" ");function k(q,s){if(!Object.getOwnPropertyNames||!Object.getPrototypeOf){for(var p in q){s(p)}}else{for(var r=q;r;r=Object.getPrototypeOf(r)){Object.getOwnPropertyNames(r).forEach(s)}}}function i(u,t,y,B){var A=[],r=u.string,s=B&&B.globalScope||window;function w(v){if(v.lastIndexOf(r,0)==0&&!e(A,v)){A.push(v)}}function q(v){if(typeof v=="string"){g(m,w)}else{if(v instanceof Array){g(o,w)}else{if(v instanceof Function){g(f,w)}}}k(v,w)}if(t&&t.length){var x=t.pop(),p;if(x.type&&x.type.indexOf("variable")===0){if(B&&B.additionalContext){p=B.additionalContext[x.string]}if(!B||B.useGlobalScope!==false){p=p||s[x.string]}}else{if(x.type=="string"){p=""}else{if(x.type=="atom"){p=1}else{if(x.type=="function"){if(s.jQuery!=null&&(x.string=="$"||x.string=="jQuery")&&(typeof s.jQuery=="function")){p=s.jQuery()}else{if(s._!=null&&(x.string=="_")&&(typeof s._=="function")){p=s._()}}}}}}while(p!=null&&t.length){p=p[t.pop().string]}if(p!=null){q(p)}}else{for(var z=u.state.localVars;z;z=z.next){w(z.name)}for(var z=u.state.globalVars;z;z=z.next){w(z.name)}if(!B||B.useGlobalScope!==false){q(s)}g(y,w)}return A}});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/hint/show-hint.css b/route/static/codemirror/addon/hint/show-hint.css
deleted file mode 100755
index 4027ed60e..000000000
--- a/route/static/codemirror/addon/hint/show-hint.css
+++ /dev/null
@@ -1 +0,0 @@
-.CodeMirror-hints{position:absolute;z-index:10;overflow:hidden;list-style:none;margin:0;padding:2px;-webkit-box-shadow:2px 3px 5px rgba(0,0,0,.2);-moz-box-shadow:2px 3px 5px rgba(0,0,0,.2);box-shadow:2px 3px 5px rgba(0,0,0,.2);border-radius:3px;border:1px solid silver;background:white;font-size:90%;font-family:monospace;max-height:20em;overflow-y:auto}.CodeMirror-hint{margin:0;padding:0 4px;border-radius:2px;white-space:pre;color:black;cursor:pointer}li.CodeMirror-hint-active{background:#08f;color:white}
\ No newline at end of file
diff --git a/route/static/codemirror/addon/hint/show-hint.js b/route/static/codemirror/addon/hint/show-hint.js
deleted file mode 100755
index 24ca4b4e7..000000000
--- a/route/static/codemirror/addon/hint/show-hint.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(e){var i="CodeMirror-hint";var h="CodeMirror-hint-active";e.showHint=function(q,r,s){if(!r){return q.showHint(s)}if(s&&s.async){r.async=true}var t={hint:r};if(s){for(var u in s){t[u]=s[u]}}return q.showHint(t)};e.defineExtension("showHint",function(r){r=o(this,this.getCursor("start"),r);var t=this.listSelections();if(t.length>1){return}if(this.somethingSelected()){if(!r.hint.supportsSelection){return}for(var s=0;s<t.length;s++){if(t[s].head.line!=t[s].anchor.line){return}}}if(this.state.completionActive){this.state.completionActive.close()}var q=this.state.completionActive=new b(this,r);if(!q.options.hint){return}e.signal(this,"startCompletion",this);q.update(true)});function b(q,s){this.cm=q;this.options=s;this.widget=null;this.debounce=0;this.tick=0;this.startPos=this.cm.getCursor("start");this.startLen=this.cm.getLine(this.startPos.line).length-this.cm.getSelection().length;var r=this;q.on("cursorActivity",this.activityFunc=function(){r.cursorActivity()})}var l=window.requestAnimationFrame||function(q){return setTimeout(q,1000/60)};var g=window.cancelAnimationFrame||clearTimeout;b.prototype={close:function(){if(!this.active()){return}this.cm.state.completionActive=null;this.tick=null;this.cm.off("cursorActivity",this.activityFunc);if(this.widget&&this.data){e.signal(this.data,"close")}if(this.widget){this.widget.close()}e.signal(this.cm,"endCompletion",this.cm)},active:function(){return this.cm.state.completionActive==this},pick:function(s,r){var q=s.list[r];if(q.hint){q.hint(this.cm,s,q)}else{this.cm.replaceRange(p(q),q.from||s.from,q.to||s.to,"complete")}e.signal(s,"pick",q);this.close()},cursorActivity:function(){if(this.debounce){g(this.debounce);this.debounce=0}var s=this.cm.getCursor(),q=this.cm.getLine(s.line);if(s.line!=this.startPos.line||q.length-s.ch!=this.startLen-this.startPos.ch||s.ch<this.startPos.ch||this.cm.somethingSelected()||(s.ch&&this.options.closeCharacters.test(q.charAt(s.ch-1)))){this.close()}else{var r=this;this.debounce=l(function(){r.update()});if(this.widget){this.widget.disable()}}},update:function(s){if(this.tick==null){return}var q=this,r=++this.tick;f(this.options.hint,this.cm,this.options,function(t){if(q.tick==r){q.finishUpdate(t,s)}})},finishUpdate:function(r,s){if(this.data){e.signal(this.data,"update")}var q=(this.widget&&this.widget.picked)||(s&&this.options.completeSingle);if(this.widget){this.widget.close()}if(r&&this.data&&j(this.data,r)){return}this.data=r;if(r&&r.list.length){if(q&&r.list.length==1){this.pick(r,0)}else{this.widget=new n(this,r);e.signal(r,"shown")}}}};function j(r,q){var s=e.cmpPos(q.from,r.from);return s>0&&r.to.ch-r.from.ch!=q.to.ch-q.from.ch}function o(q,v,s){var t=q.options.hintOptions;var r={};for(var u in c){r[u]=c[u]}if(t){for(var u in t){if(t[u]!==undefined){r[u]=t[u]}}}if(s){for(var u in s){if(s[u]!==undefined){r[u]=s[u]}}}if(r.hint.resolve){r.hint=r.hint.resolve(q,v)}return r}function p(q){if(typeof q=="string"){return q}else{return q.text}}function d(u,x){var r={Up:function(){x.moveFocus(-1)},Down:function(){x.moveFocus(1)},PageUp:function(){x.moveFocus(-x.menuSize()+1,true)},PageDown:function(){x.moveFocus(x.menuSize()-1,true)},Home:function(){x.setFocus(0)},End:function(){x.setFocus(x.length-1)},Enter:x.pick,Tab:x.pick,Esc:x.close};var w=u.options.customKeys;var t=w?{}:r;function s(y,A){var z;if(typeof A!="string"){z=function(B){return A(B,x)}}else{if(r.hasOwnProperty(A)){z=r[A]}else{z=A}}t[y]=z}if(w){for(var v in w){if(w.hasOwnProperty(v)){s(v,w[v])}}}var q=u.options.extraKeys;if(q){for(var v in q){if(q.hasOwnProperty(v)){s(v,q[v])}}}return t}function m(r,q){while(q&&q!=r){if(q.nodeName.toUpperCase()==="LI"&&q.parentNode==r){return q}q=q.parentNode}}function n(E,P){this.completion=E;this.data=P;this.picked=false;var v=this,A=E.cm;var M=this.hints=document.createElement("ul");M.className="CodeMirror-hints";this.selectedHint=P.selectedHint||0;var z=P.list;for(var O=0;O<z.length;++O){var u=M.appendChild(document.createElement("li")),t=z[O];var s=i+(O!=this.selectedHint?"":" "+h);if(t.className!=null){s=t.className+" "+s}u.className=s;if(t.render){t.render(u,P,t)}else{u.appendChild(document.createTextNode(t.displayText||p(t)))}u.hintId=O}var y=A.cursorCoords(E.options.alignWithWord?P.from:null);var w=y.left,I=y.bottom,G=true;M.style.left=w+"px";M.style.top=I+"px";var B=window.innerWidth||Math.max(document.body.offsetWidth,document.documentElement.offsetWidth);var N=window.innerHeight||Math.max(document.body.offsetHeight,document.documentElement.offsetHeight);(E.options.container||document.body).appendChild(M);var C=M.getBoundingClientRect(),D=C.bottom-N;var r=M.scrollHeight>M.clientHeight+1;var H=A.getScrollInfo();if(D>0){var J=C.bottom-C.top,q=y.top-(y.bottom-C.top);if(q-J>0){M.style.top=(I=y.top-J)+"px";G=false}else{if(J>N){M.style.height=(N-5)+"px";M.style.top=(I=y.bottom-C.top)+"px";var x=A.getCursor();if(P.from.ch!=x.ch){y=A.cursorCoords(x);M.style.left=(w=y.left)+"px";C=M.getBoundingClientRect()}}}}var F=C.right-B;if(F>0){if(C.right-C.left>B){M.style.width=(B-5)+"px";F-=(C.right-C.left)-B}M.style.left=(w=y.left-F)+"px"}if(r){for(var L=M.firstChild;L;L=L.nextSibling){L.style.paddingRight=A.display.nativeBarWidth+"px"}}A.addKeyMap(this.keyMap=d(E,{moveFocus:function(R,Q){v.changeActive(v.selectedHint+R,Q)},setFocus:function(Q){v.changeActive(Q)},menuSize:function(){return v.screenAmount()},length:z.length,close:function(){E.close()},pick:function(){v.pick()},data:P}));if(E.options.closeOnUnfocus){var K;A.on("blur",this.onBlur=function(){K=setTimeout(function(){E.close()},100)});A.on("focus",this.onFocus=function(){clearTimeout(K)})}A.on("scroll",this.onScroll=function(){var T=A.getScrollInfo(),S=A.getWrapperElement().getBoundingClientRect();var R=I+H.top-T.top;var Q=R-(window.pageYOffset||(document.documentElement||document.body).scrollTop);if(!G){Q+=M.offsetHeight}if(Q<=S.top||Q>=S.bottom){return E.close()}M.style.top=R+"px";M.style.left=(w+H.left-T.left)+"px"});e.on(M,"dblclick",function(R){var Q=m(M,R.target||R.srcElement);if(Q&&Q.hintId!=null){v.changeActive(Q.hintId);v.pick()}});e.on(M,"click",function(R){var Q=m(M,R.target||R.srcElement);if(Q&&Q.hintId!=null){v.changeActive(Q.hintId);if(E.options.completeOnSingleClick){v.pick()}}});e.on(M,"mousedown",function(){setTimeout(function(){A.focus()},20)});e.signal(P,"select",z[0],M.firstChild);return true}n.prototype={close:function(){if(this.completion.widget!=this){return}this.completion.widget=null;this.hints.parentNode.removeChild(this.hints);this.completion.cm.removeKeyMap(this.keyMap);var q=this.completion.cm;if(this.completion.options.closeOnUnfocus){q.off("blur",this.onBlur);q.off("focus",this.onFocus)}q.off("scroll",this.onScroll)},disable:function(){this.completion.cm.removeKeyMap(this.keyMap);var q=this;this.keyMap={Enter:function(){q.picked=true}};this.completion.cm.addKeyMap(this.keyMap)},pick:function(){this.completion.pick(this.data,this.selectedHint)},changeActive:function(q,s){if(q>=this.data.list.length){q=s?this.data.list.length-1:0}else{if(q<0){q=s?0:this.data.list.length-1}}if(this.selectedHint==q){return}var r=this.hints.childNodes[this.selectedHint];r.className=r.className.replace(" "+h,"");r=this.hints.childNodes[this.selectedHint=q];r.className+=" "+h;if(r.offsetTop<this.hints.scrollTop){this.hints.scrollTop=r.offsetTop-3}else{if(r.offsetTop+r.offsetHeight>this.hints.scrollTop+this.hints.clientHeight){this.hints.scrollTop=r.offsetTop+r.offsetHeight-this.hints.clientHeight+3}}e.signal(this.data,"select",this.data.list[this.selectedHint],r)},screenAmount:function(){return Math.floor(this.hints.clientHeight/this.hints.firstChild.offsetHeight)||1}};function k(r,t){if(!r.somethingSelected()){return t}var q=[];for(var s=0;s<t.length;s++){if(t[s].supportsSelection){q.push(t[s])}}return q}function f(t,r,s,u){if(t.async){t(r,u,s)}else{var q=t(r,s);if(q&&q.then){q.then(u)}else{u(q)}}}function a(q,u){var s=q.getHelpers(u,"hint"),t;if(s.length){var r=function(v,z,w){var y=k(v,s);function x(A){if(A==y.length){return z(null)}f(y[A],v,w,function(B){if(B&&B.list.length>0){z(B)}else{x(A+1)}})}x(0)};r.async=true;r.supportsSelection=true;return r}else{if(t=q.getHelper(q.getCursor(),"hintWords")){return function(v){return e.hint.fromList(v,{words:t})}}else{if(e.hint.anyword){return function(v,w){return e.hint.anyword(v,w)}}else{return function(){}}}}}e.registerHelper("hint","auto",{resolve:a});e.registerHelper("hint","fromList",function(w,z){var x=w.getCursor(),r=w.getTokenAt(x);var u=e.Pos(x.line,r.end);if(r.string&&/\w/.test(r.string[r.string.length-1])){var s=r.string,v=e.Pos(x.line,r.start)}else{var s="",v=u}var y=[];for(var t=0;t<z.words.length;t++){var q=z.words[t];if(q.slice(0,s.length)==s){y.push(q)}}if(y.length){return{list:y,from:v,to:u}}});e.commands.autocomplete=e.showHint;var c={hint:e.hint.auto,completeSingle:true,alignWithWord:true,closeCharacters:/[\s()\[\]{};:>,]/,closeOnUnfocus:true,completeOnSingleClick:true,container:null,customKeys:null,extraKeys:null};e.defineOption("hintOptions",null)});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/hint/sql-hint.js b/route/static/codemirror/addon/hint/sql-hint.js
deleted file mode 100755
index cb9fd7e57..000000000
--- a/route/static/codemirror/addon/hint/sql-hint.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"),require("../../mode/sql/sql"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror","../../mode/sql/sql"],a)}else{a(CodeMirror)}}})(function(p){var h;var s;var i;var j={QUERY_DIV:";",ALIAS_KEYWORD:"AS"};var n=p.Pos,o=p.cmpPos;function l(v){return Object.prototype.toString.call(v)=="[object Array]"}function d(v){var w=v.doc.modeOption;if(w==="sql"){w="text/x-sql"}return p.resolveMode(w).keywords}function a(v){return typeof v=="string"?v:v.text}function b(v,w){if(l(w)){w={columns:w}}if(!w.text){w.text=v}return w}function q(w){var v={};if(l(w)){for(var y=w.length-1;y>=0;y--){var z=w[y];v[a(z).toUpperCase()]=b(a(z),z)}}else{if(w){for(var x in w){v[x.toUpperCase()]=b(x,w[x])}}}return v}function c(v){return h[v.toUpperCase()]}function g(w){var v={};for(var x in w){if(w.hasOwnProperty(x)){v[x]=w[x]}}return v}function e(w,y){var v=w.length;var x=a(y).substr(0,v);return w.toUpperCase()===x.toUpperCase()}function f(v,y,z,x){if(l(z)){for(var w=0;w<z.length;w++){if(e(y,z[w])){v.push(x(z[w]))}}}else{for(var A in z){if(z.hasOwnProperty(A)){var B=z[A];if(!B||B===true){B=A}else{B=B.displayText?{text:B.text,displayText:B.displayText}:B.text}if(e(y,B)){v.push(x(B))}}}}}function k(v){if(v.charAt(0)=="."){v=v.substr(1)}return v.replace(/`/g,"")}function r(w){var v=a(w).split(".");for(var x=0;x<v.length;x++){v[x]="`"+v[x]+"`"}var y=v.join(".");if(typeof w=="string"){return y}w=g(w);w.text=y;return w}function t(F,y,H,D){var E=false;var z=[];var v=y.start;var I=true;while(I){I=(y.string.charAt(0)==".");E=E||(y.string.charAt(0)=="`");v=y.start;z.unshift(k(y.string));y=D.getTokenAt(n(F.line,y.start));if(y.string=="."){I=true;y=D.getTokenAt(n(F.line,y.start))}}var C=z.join(".");f(H,C,h,function(J){return E?r(J):J});f(H,C,s,function(J){return E?r(J):J});C=z.pop();var G=z.join(".");var B=false;var A=G;if(!c(G)){var w=G;G=m(G,D);if(G!==w){B=true}}var x=c(G);if(x&&x.columns){x=x.columns}if(x){f(H,C,x,function(J){var K=G;if(B==true){K=A}if(typeof J=="string"){J=K+"."+J}else{J=g(J);J.text=K+"."+J.text}return E?r(J):J})}return v}function u(w,y){if(!w){return}var v=/[,;]/g;var z=w.split(" ");for(var x=0;x<z.length;x++){y(z[x]?z[x].replace(v,""):"")}}function m(A,B){var I=B.doc;var w=I.getValue();var v=A.toUpperCase();var C="";var J="";var z=[];var H={start:n(0,0),end:n(B.lastLine(),B.getLineHandle(B.lastLine()).length)};var y=w.indexOf(j.QUERY_DIV);while(y!=-1){z.push(I.posFromIndex(y));y=w.indexOf(j.QUERY_DIV,y+1)}z.unshift(n(0,0));z.push(n(B.lastLine(),B.getLineHandle(B.lastLine()).text.length));var G=null;var D=B.getCursor();for(var x=0;x<z.length;x++){if((G==null||o(D,G)>0)&&o(D,z[x])<=0){H={start:G,end:z[x]};break}G=z[x]}var E=I.getRange(H.start,H.end,false);for(var x=0;x<E.length;x++){var F=E[x];u(F,function(L){var K=L.toUpperCase();if(K===v&&c(C)){J=C}if(K!==j.ALIAS_KEYWORD){C=L}});if(J){break}}return J}p.registerHelper("hint","sql",function(z,D){h=q(D&&D.tables);var w=D&&D.defaultTable;var A=D&&D.disableKeywords;s=w&&c(w);i=d(z);if(w&&!s){s=m(w,z)}s=s||[];if(s.columns){s=s.columns}var B=z.getCursor();var E=[];var x=z.getTokenAt(B),v,y,C;if(x.end>B.ch){x.end=B.ch;x.string=x.string.slice(0,B.ch-x.start)}if(x.string.match(/^[.`\w@]\w*$/)){C=x.string;v=x.start;y=x.end}else{v=y=B.ch;C=""}if(C.charAt(0)=="."||C.charAt(0)=="`"){v=t(B,x,E,z)}else{f(E,C,h,function(F){return F});f(E,C,s,function(F){return F});if(!A){f(E,C,i,function(F){return F.toUpperCase()})}}return{list:E,from:n(B.line,v),to:n(B.line,y)}})});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/hint/xml-hint.js b/route/static/codemirror/addon/hint/xml-hint.js
deleted file mode 100755
index f2321c98c..000000000
--- a/route/static/codemirror/addon/hint/xml-hint.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(b){var c=b.Pos;function a(o,h){var t=h&&h.schemaInfo;var E=(h&&h.quoteChar)||'"';if(!t){return}var g=o.getCursor(),m=o.getTokenAt(g);if(m.end>g.ch){m.end=g.ch;m.string=m.string.slice(0,g.ch-m.start)}var F=b.innerMode(o.getMode(),m.state);if(F.mode.name!="xml"){return}var p=[],z=false,A;var H=/\btag\b/.test(m.type)&&!/>$/.test(m.string);var e=H&&/^\w/.test(m.string),C;if(e){var s=o.getLine(g.line).slice(Math.max(0,m.start-2),m.start);var l=/<\/$/.test(s)?"close":/<$/.test(s)?"open":null;if(l){C=m.start-(l=="close"?2:1)}}else{if(H&&m.string=="<"){l="open"}else{if(H&&m.string=="</"){l="close"}}}if(!H&&!F.state.tagName||l){if(e){A=m.string}z=l;var f=F.state.context,u=f&&t[f.tagName];var k=f?u&&u.children:t["!top"];if(k&&l!="close"){for(var B=0;B<k.length;++B){if(!A||k[B].lastIndexOf(A,0)==0){p.push("<"+k[B])}}}else{if(l!="close"){for(var G in t){if(t.hasOwnProperty(G)&&G!="!top"&&G!="!attrs"&&(!A||G.lastIndexOf(A,0)==0)){p.push("<"+G)}}}}if(f&&(!A||l=="close"&&f.tagName.lastIndexOf(A,0)==0)){p.push("</"+f.tagName+">")}}else{var u=t[F.state.tagName],x=u&&u.attrs;var j=t["!attrs"];if(!x&&!j){return}if(!x){x=j}else{if(j){var r={};for(var d in j){if(j.hasOwnProperty(d)){r[d]=j[d]}}for(var d in x){if(x.hasOwnProperty(d)){r[d]=x[d]}}x=r}}if(m.type=="string"||m.string=="="){var s=o.getRange(c(g.line,Math.max(0,g.ch-60)),c(g.line,m.type=="string"?m.start:m.end));var v=s.match(/([^\s\u00a0=<>\"\']+)=$/),q;if(!v||!x.hasOwnProperty(v[1])||!(q=x[v[1]])){return}if(typeof q=="function"){q=q.call(this,o)}if(m.type=="string"){A=m.string;var w=0;if(/['"]/.test(m.string.charAt(0))){E=m.string.charAt(0);A=m.string.slice(1);w++}var D=m.string.length;if(/['"]/.test(m.string.charAt(D-1))){E=m.string.charAt(D-1);A=m.string.substr(w,D-2)}z=true}for(var B=0;B<q.length;++B){if(!A||q[B].lastIndexOf(A,0)==0){p.push(E+q[B]+E)}}}else{if(m.type=="attribute"){A=m.string;z=true}for(var y in x){if(x.hasOwnProperty(y)&&(!A||y.lastIndexOf(A,0)==0)){p.push(y)}}}}return{list:p,from:z?c(g.line,C==null?m.start:C):g,to:z?c(g.line,m.end):g}}b.registerHelper("hint","xml",a)});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/index.html b/route/static/codemirror/addon/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/codemirror/addon/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/codemirror/addon/scroll/annotatescrollbar.js b/route/static/codemirror/addon/scroll/annotatescrollbar.js
deleted file mode 100755
index 88f7f83b4..000000000
--- a/route/static/codemirror/addon/scroll/annotatescrollbar.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(a){a.defineExtension("annotateScrollbar",function(c){if(typeof c=="string"){c={className:c}}return new b(this,c)});a.defineOption("scrollButtonHeight",0);function b(c,e){this.cm=c;this.options=e;this.buttonHeight=e.scrollButtonHeight||c.getOption("scrollButtonHeight");this.annotations=[];this.doRedraw=this.doUpdate=null;this.div=c.getWrapperElement().appendChild(document.createElement("div"));this.div.style.cssText="position: absolute; right: 0; top: 0; z-index: 7; pointer-events: none";this.computeScale();function f(g){clearTimeout(d.doRedraw);d.doRedraw=setTimeout(function(){d.redraw()},g)}var d=this;c.on("refresh",this.resizeHandler=function(){clearTimeout(d.doUpdate);d.doUpdate=setTimeout(function(){if(d.computeScale()){f(20)}},100)});c.on("markerAdded",this.resizeHandler);c.on("markerCleared",this.resizeHandler);if(e.listenForChanges!==false){c.on("change",this.changeHandler=function(){f(250)})}}b.prototype.computeScale=function(){var c=this.cm;var d=(c.getWrapperElement().clientHeight-c.display.barHeight-this.buttonHeight*2)/c.getScrollerElement().scrollHeight;if(d!=this.hScale){this.hScale=d;return true}};b.prototype.update=function(c){this.annotations=c;this.redraw()};b.prototype.redraw=function(o){if(o!==false){this.computeScale()}var p=this.cm,t=this.hScale;var s=document.createDocumentFragment(),g=this.annotations;var k=p.getOption("lineWrapping");var j=k&&p.defaultTextHeight()*1.5;var e=null,n=null;function q(v,u){if(e!=v.line){e=v.line;n=p.getLineHandle(e)}if(k&&n.height>j){return p.charCoords(v,"local")[u?"top":"bottom"]}var i=p.heightAtLine(n,"local");return i+(u?0:n.height)}if(p.display.barWidth){for(var h=0,l;h<g.length;h++){var d=g[h];var m=l||q(d.from,true)*t;var c=q(d.to,false)*t;while(h<g.length-1){l=q(g[h+1].from,true)*t;if(l>c+0.9){break}d=g[++h];c=q(d.to,false)*t}if(c==m){continue}var r=Math.max(c-m,3);var f=s.appendChild(document.createElement("div"));f.style.cssText="position: absolute; right: 0px; width: "+Math.max(p.display.barWidth-1,2)+"px; top: "+(m+this.buttonHeight)+"px; height: "+r+"px";f.className=this.options.className;if(d.id){f.setAttribute("annotation-id",d.id)}}}this.div.textContent="";this.div.appendChild(s)};b.prototype.clear=function(){this.cm.off("refresh",this.resizeHandler);this.cm.off("markerAdded",this.resizeHandler);this.cm.off("markerCleared",this.resizeHandler);if(this.changeHandler){this.cm.off("change",this.changeHandler)}this.div.parentNode.removeChild(this.div)}});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/scroll/index.html b/route/static/codemirror/addon/scroll/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/codemirror/addon/scroll/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/codemirror/addon/scroll/scrollpastend.js b/route/static/codemirror/addon/scroll/scrollpastend.js
deleted file mode 100755
index 9e2877c83..000000000
--- a/route/static/codemirror/addon/scroll/scrollpastend.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(b){b.defineOption("scrollPastEnd",false,function(d,f,e){if(e&&e!=b.Init){d.off("change",a);d.off("refresh",c);d.display.lineSpace.parentNode.style.paddingBottom="";d.state.scrollPastEndPadding=null}if(f){d.on("change",a);d.on("refresh",c);c(d)}});function a(d,e){if(b.changeEnd(e).line==d.lastLine()){c(d)}}function c(d){var g="";if(d.lineCount()>1){var e=d.display.scroller.clientHeight-30,f=d.getLineHandle(d.lastLine()).height;g=(e-f)+"px"}if(d.state.scrollPastEndPadding!=g){d.state.scrollPastEndPadding=g;d.display.lineSpace.parentNode.style.paddingBottom=g;d.off("refresh",c);d.setSize();d.on("refresh",c)}}});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/scroll/simplescrollbars.css b/route/static/codemirror/addon/scroll/simplescrollbars.css
deleted file mode 100755
index b4b5245bc..000000000
--- a/route/static/codemirror/addon/scroll/simplescrollbars.css
+++ /dev/null
@@ -1 +0,0 @@
-.CodeMirror-simplescroll-horizontal div,.CodeMirror-simplescroll-vertical div{position:absolute;background:#ccc;-moz-box-sizing:border-box;box-sizing:border-box;border:1px solid #bbb;border-radius:2px}.CodeMirror-simplescroll-horizontal,.CodeMirror-simplescroll-vertical{position:absolute;z-index:6;background:#eee}.CodeMirror-simplescroll-horizontal{bottom:0;left:0;height:8px}.CodeMirror-simplescroll-horizontal div{bottom:0;height:100%}.CodeMirror-simplescroll-vertical{right:0;top:0;width:8px}.CodeMirror-simplescroll-vertical div{right:0;width:100%}.CodeMirror-overlayscroll .CodeMirror-scrollbar-filler,.CodeMirror-overlayscroll .CodeMirror-gutter-filler{display:none}.CodeMirror-overlayscroll-horizontal div,.CodeMirror-overlayscroll-vertical div{position:absolute;background:#bcd;border-radius:3px}.CodeMirror-overlayscroll-horizontal,.CodeMirror-overlayscroll-vertical{position:absolute;z-index:6}.CodeMirror-overlayscroll-horizontal{bottom:0;left:0;height:6px}.CodeMirror-overlayscroll-horizontal div{bottom:0;height:100%}.CodeMirror-overlayscroll-vertical{right:0;top:0;width:6px}.CodeMirror-overlayscroll-vertical div{right:0;width:100%}
\ No newline at end of file
diff --git a/route/static/codemirror/addon/scroll/simplescrollbars.js b/route/static/codemirror/addon/scroll/simplescrollbars.js
deleted file mode 100755
index 303b69a98..000000000
--- a/route/static/codemirror/addon/scroll/simplescrollbars.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(b){function a(f,h,e){this.orientation=h;this.scroll=e;this.screen=this.total=this.size=1;this.pos=0;this.node=document.createElement("div");this.node.className=f+"-"+h;this.inner=this.node.appendChild(document.createElement("div"));var g=this;b.on(this.inner,"mousedown",function(n){if(n.which!=1){return}b.e_preventDefault(n);var l=g.orientation=="horizontal"?"pageX":"pageY";var o=n[l],m=g.pos;function k(){b.off(document,"mousemove",j);b.off(document,"mouseup",k)}function j(p){if(p.which!=1){return k()}g.moveTo(m+(p[l]-o)*(g.total/g.size))}b.on(document,"mousemove",j);b.on(document,"mouseup",k)});b.on(this.node,"click",function(l){b.e_preventDefault(l);var j=g.inner.getBoundingClientRect(),k;if(g.orientation=="horizontal"){k=l.clientX<j.left?-1:l.clientX>j.right?1:0}else{k=l.clientY<j.top?-1:l.clientY>j.bottom?1:0}g.moveTo(g.pos+k*g.screen)});function i(l){var k=b.wheelEventPixels(l)[g.orientation=="horizontal"?"x":"y"];var j=g.pos;g.moveTo(g.pos+k);if(g.pos!=j){b.e_preventDefault(l)}}b.on(this.node,"mousewheel",i);b.on(this.node,"DOMMouseScroll",i)}a.prototype.setPos=function(f,e){if(f<0){f=0}if(f>this.total-this.screen){f=this.total-this.screen}if(!e&&f==this.pos){return false}this.pos=f;this.inner.style[this.orientation=="horizontal"?"left":"top"]=(f*(this.size/this.total))+"px";return true};a.prototype.moveTo=function(e){if(this.setPos(e)){this.scroll(e,this.orientation)}};var d=10;a.prototype.update=function(g,h,i){var f=this.screen!=h||this.total!=g||this.size!=i;if(f){this.screen=h;this.total=g;this.size=i}var e=this.screen*(this.size/this.total);if(e<d){this.size-=d-e;e=d}this.inner.style[this.orientation=="horizontal"?"width":"height"]=e+"px";this.setPos(this.pos,f)};function c(g,f,e){this.addClass=g;this.horiz=new a(g,"horizontal",e);f(this.horiz.node);this.vert=new a(g,"vertical",e);f(this.vert.node);this.width=null}c.prototype.update=function(h){if(this.width==null){var g=window.getComputedStyle?window.getComputedStyle(this.horiz.node):this.horiz.node.currentStyle;if(g){this.width=parseInt(g.height)}}var f=this.width||0;var i=h.scrollWidth>h.clientWidth+1;var e=h.scrollHeight>h.clientHeight+1;this.vert.node.style.display=e?"block":"none";this.horiz.node.style.display=i?"block":"none";if(e){this.vert.update(h.scrollHeight,h.clientHeight,h.viewHeight-(i?f:0));this.vert.node.style.bottom=i?f+"px":"0"}if(i){this.horiz.update(h.scrollWidth,h.clientWidth,h.viewWidth-(e?f:0)-h.barLeft);this.horiz.node.style.right=e?f+"px":"0";this.horiz.node.style.left=h.barLeft+"px"}return{right:e?f:0,bottom:i?f:0}};c.prototype.setScrollTop=function(e){this.vert.setPos(e)};c.prototype.setScrollLeft=function(e){this.horiz.setPos(e)};c.prototype.clear=function(){var e=this.horiz.node.parentNode;e.removeChild(this.horiz.node);e.removeChild(this.vert.node)};b.scrollbarModel.simple=function(f,e){return new c("CodeMirror-simplescroll",f,e)};b.scrollbarModel.overlay=function(f,e){return new c("CodeMirror-overlayscroll",f,e)}});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/search/index.html b/route/static/codemirror/addon/search/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/codemirror/addon/search/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/codemirror/addon/search/jump-to-line.js b/route/static/codemirror/addon/search/jump-to-line.js
deleted file mode 100755
index 0d0a498dd..000000000
--- a/route/static/codemirror/addon/search/jump-to-line.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"),require("../dialog/dialog"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror","../dialog/dialog"],a)}else{a(CodeMirror)}}})(function(a){function b(e,i,g,j,h){if(e.openDialog){e.openDialog(i,h,{value:j,selectValueOnOpen:true})}else{h(prompt(g,j))}}var d='Jump to line: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use line:column or scroll% syntax)</span>';function c(e,g){var f=Number(g);if(/^[-+]/.test(g)){return e.getCursor().line+f}else{return f-1}}a.commands.jumpToLine=function(e){var f=e.getCursor();b(e,d,"Jump to line:",(f.line+1)+":"+f.ch,function(i){if(!i){return}var h;if(h=/^\s*([\+\-]?\d+)\s*\:\s*(\d+)\s*$/.exec(i)){e.setCursor(c(e,h[1]),Number(h[2]))}else{if(h=/^\s*([\+\-]?\d+(\.\d+)?)\%\s*/.exec(i)){var g=Math.round(e.lineCount()*Number(h[1])/100);if(/^[-+]/.test(h[1])){g=f.line+g+1}e.setCursor(g-1,f.ch)}else{if(h=/^\s*\:?\s*([\+\-]?\d+)\s*/.exec(i)){e.setCursor(c(e,h[1]),f.ch)}}}})};a.keyMap["default"]["Alt-G"]="jumpToLine"});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/search/match-highlighter.js b/route/static/codemirror/addon/search/match-highlighter.js
deleted file mode 100755
index 5bc46f2ed..000000000
--- a/route/static/codemirror/addon/search/match-highlighter.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"),require("./matchesonscrollbar"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror","./matchesonscrollbar"],a)}else{a(CodeMirror)}}})(function(d){var c={style:"matchhighlight",minChars:2,delay:100,wordsOnly:false,annotateScrollbar:false,showToken:false,trim:true};function j(n){this.options={};for(var m in c){this.options[m]=(n&&n.hasOwnProperty(m)?n:c)[m]}this.overlay=this.timeout=null;this.matchesonscroll=null;this.active=false}d.defineOption("highlightSelectionMatches",false,function(m,p,n){if(n&&n!=d.Init){l(m);clearTimeout(m.state.matchHighlighter.timeout);m.state.matchHighlighter=null;m.off("cursorActivity",i);m.off("focus",h)}if(p){var o=m.state.matchHighlighter=new j(p);if(m.hasFocus()){o.active=true;f(m)}else{m.on("focus",h)}m.on("cursorActivity",i)}});function i(m){var n=m.state.matchHighlighter;if(n.active||m.hasFocus()){a(m,n)}}function h(m){var n=m.state.matchHighlighter;if(!n.active){n.active=true;a(m,n)}}function a(m,n){clearTimeout(n.timeout);n.timeout=setTimeout(function(){f(m)},n.options.delay)}function b(n,r,p,o){var q=n.state.matchHighlighter;n.addOverlay(q.overlay=e(r,p,o));if(q.options.annotateScrollbar&&n.showMatchesOnScrollbar){var m=p?new RegExp("\\b"+r+"\\b"):r;q.matchesonscroll=n.showMatchesOnScrollbar(m,false,{className:"CodeMirror-selection-highlight-scrollbar"})}}function l(m){var n=m.state.matchHighlighter;if(n.overlay){m.removeOverlay(n.overlay);n.overlay=null;if(n.matchesonscroll){n.matchesonscroll.clear();n.matchesonscroll=null}}}function f(m){m.operation(function(){var n=m.state.matchHighlighter;l(m);if(!m.somethingSelected()&&n.options.showToken){var u=n.options.showToken===true?/[\w$]/:n.options.showToken;var t=m.getCursor(),v=m.getLine(t.line),o=t.ch,p=o;while(o&&u.test(v.charAt(o-1))){--o}while(p<v.length&&u.test(v.charAt(p))){++p}if(o<p){b(m,v.slice(o,p),u,n.options.style)}return}var r=m.getCursor("from"),s=m.getCursor("to");if(r.line!=s.line){return}if(n.options.wordsOnly&&!g(m,r,s)){return}var q=m.getRange(r,s);if(n.options.trim){q=q.replace(/^\s+|\s+$/g,"")}if(q.length>=n.options.minChars){b(m,q,false,n.options.style)}})}function g(m,r,q){var o=m.getRange(r,q);if(o.match(/^\w+$/)!==null){if(r.ch>0){var p={line:r.line,ch:r.ch-1};var n=m.getRange(p,r);if(n.match(/\W/)===null){return false}}if(q.ch<m.getLine(r.line).length){var p={line:q.line,ch:q.ch+1};var n=m.getRange(q,p);if(n.match(/\W/)===null){return false}}return true}else{return false}}function k(n,m){return(!n.start||!m.test(n.string.charAt(n.start-1)))&&(n.pos==n.string.length||!m.test(n.string.charAt(n.pos)))}function e(o,n,m){return{token:function(p){if(p.match(o)&&(!n||k(p,n))){return m}p.next();p.skipTo(o.charAt(0))||p.skipToEnd()}}}});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/search/matchesonscrollbar.css b/route/static/codemirror/addon/search/matchesonscrollbar.css
deleted file mode 100755
index 16ee9050f..000000000
--- a/route/static/codemirror/addon/search/matchesonscrollbar.css
+++ /dev/null
@@ -1 +0,0 @@
-.CodeMirror-search-match{background:gold;border-top:1px solid orange;border-bottom:1px solid orange;-moz-box-sizing:border-box;box-sizing:border-box;opacity:.5}
\ No newline at end of file
diff --git a/route/static/codemirror/addon/search/matchesonscrollbar.js b/route/static/codemirror/addon/search/matchesonscrollbar.js
deleted file mode 100755
index 5f00897a2..000000000
--- a/route/static/codemirror/addon/search/matchesonscrollbar.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"),require("./searchcursor"),require("../scroll/annotatescrollbar"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror","./searchcursor","../scroll/annotatescrollbar"],a)}else{a(CodeMirror)}}})(function(b){b.defineExtension("showMatchesOnScrollbar",function(g,f,e){if(typeof e=="string"){e={className:e}}if(!e){e={}}return new c(this,g,f,e)});function c(e,j,i,h){this.cm=e;this.options=h;var f={listenForChanges:false};for(var k in h){f[k]=h[k]}if(!f.className){f.className="CodeMirror-search-match"}this.annotation=e.annotateScrollbar(f);this.query=j;this.caseFold=i;this.gap={from:e.firstLine(),to:e.lastLine()+1};this.matches=[];this.update=null;this.findMatches();this.annotation.update(this.matches);var g=this;e.on("change",this.changeHandler=function(l,m){g.onChange(m)})}var d=1000;c.prototype.findMatches=function(){if(!this.gap){return}for(var g=0;g<this.matches.length;g++){var f=this.matches[g];if(f.from.line>=this.gap.to){break}if(f.to.line>=this.gap.from){this.matches.splice(g--,1)}}var h=this.cm.getSearchCursor(this.query,b.Pos(this.gap.from,0),this.caseFold);var e=this.options&&this.options.maxMatches||d;while(h.findNext()){var f={from:h.from(),to:h.to()};if(f.from.line>=this.gap.to){break}this.matches.splice(g++,0,f);if(this.matches.length>e){break}}this.gap=null};function a(e,g,f){if(e<=g){return e}return Math.max(g,e+f)}c.prototype.onChange=function(k){var l=k.from.line;var e=b.changeEnd(k).line;var f=e-k.to.line;if(this.gap){this.gap.from=Math.min(a(this.gap.from,l,f),k.from.line);this.gap.to=Math.max(a(this.gap.to,l,f),k.from.line)}else{this.gap={from:k.from.line,to:e+1}}if(f){for(var h=0;h<this.matches.length;h++){var j=this.matches[h];var g=a(j.from.line,l,f);if(g!=j.from.line){j.from=b.Pos(g,j.from.ch)}var m=a(j.to.line,l,f);if(m!=j.to.line){j.to=b.Pos(m,j.to.ch)}}}clearTimeout(this.update);var n=this;this.update=setTimeout(function(){n.updateAfterChange()},250)};c.prototype.updateAfterChange=function(){this.findMatches();this.annotation.update(this.matches)};c.prototype.clear=function(){this.cm.off("change",this.changeHandler);this.annotation.clear()}});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/search/search.js b/route/static/codemirror/addon/search/search.js
deleted file mode 100755
index c6598761d..000000000
--- a/route/static/codemirror/addon/search/search.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"),require("./searchcursor"),require("../dialog/dialog"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror","./searchcursor","../dialog/dialog"],a)}else{a(CodeMirror)}}})(function(n){function k(w,v){if(typeof w=="string"){w=new RegExp(w.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&"),v?"gi":"g")}else{if(!w.global){w=new RegExp(w.source,w.ignoreCase?"gi":"g")}}return{token:function(y){w.lastIndex=y.pos;var x=w.exec(y.string);if(x&&x.index==y.pos){y.pos+=x[0].length||1;return"searching"}else{if(x){y.pos=x.index}else{y.skipToEnd()}}}}}function j(){this.posFrom=this.posTo=this.lastQuery=this.query=null;this.overlay=null}function s(v){return v.state.search||(v.state.search=new j())}function e(v){return typeof v=="string"&&v==v.toLowerCase()}function b(v,w,x){return v.getSearchCursor(w,x,e(w))}function d(v,y,z,w,x){v.openDialog(y,w,{value:z,selectValueOnOpen:true,closeOnEnter:false,onClose:function(){q(v)},onKeyDown:x})}function p(v,y,w,z,x){if(v.openDialog){v.openDialog(y,x,{value:z,selectValueOnOpen:true})}else{x(prompt(w,z))}}function l(w,y,x,v){if(w.openConfirm){w.openConfirm(y,v)}else{if(confirm(x)){v[0]()}}}function i(v){return v.replace(/\\(.)/g,function(w,x){if(x=="n"){return"\n"}if(x=="r"){return"\r"}return x})}function h(w){var v=w.match(/^\/(.*)\/([a-z]*)$/);if(v){try{w=new RegExp(v[1],v[2].indexOf("i")==-1?"":"i")}catch(x){}}else{w=i(w)}if(typeof w=="string"?w=="":w.test("")){w=/x^/}return w}var u='搜索: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(回车继续检索下一个)</span><div class="Dialog-close">X</div>';function t(v,x,w){x.queryText=w;x.query=h(w);v.removeOverlay(x.overlay,e(x.query));x.overlay=k(x.query,e(x.query));v.addOverlay(x.overlay);if(v.showMatchesOnScrollbar){if(x.annotate){x.annotate.clear();x.annotate=null}x.annotate=v.showMatchesOnScrollbar(x.query,e(x.query))}}function m(v,y,x,z){var C=s(v);if(C.query){return f(v,y)}var B=v.getSelection()||C.lastQuery;if(x&&v.openDialog){var w=null;var A=function(E,D){n.e_stop(D);if(!E){return}if(E!=C.queryText){t(v,C,E);C.posFrom=C.posTo=v.getCursor()}if(w){w.style.opacity=1}f(v,D.shiftKey,function(F,H){var G;if(H.line<3&&document.querySelector&&(G=v.display.wrapper.querySelector(".CodeMirror-dialog"))&&G.getBoundingClientRect().bottom-4>v.cursorCoords(H,"window").top){(w=G).style.opacity=0.4}})};d(v,u,B,A,function(E,G){var D=n.keyName(E);var F=n.keyMap[v.getOption("keyMap")][D];if(!F){F=v.getOption("extraKeys")[D]}if(F=="findNext"||F=="findPrev"||F=="findPersistentNext"||F=="findPersistentPrev"){n.e_stop(E);t(v,s(v),G);v.execCommand(F)}else{if(F=="find"||F=="findPersistent"){n.e_stop(E);A(G,E)}}});if(z&&B){t(v,C,B);f(v,y)}}else{p(v,u,"Search for:",B,function(D){if(D&&!C.query){v.operation(function(){t(v,C,D);C.posFrom=C.posTo=v.getCursor();f(v,y)})}})}}function f(v,w,x){v.operation(function(){var y=s(v);var z=b(v,y.query,w?y.posFrom:y.posTo);if(!z.find(w)){z=b(v,y.query,w?n.Pos(v.lastLine()):n.Pos(v.firstLine(),0));if(!z.find(w)){return}}v.setSelection(z.from(),z.to());v.scrollIntoView({from:z.from(),to:z.to()},20);y.posFrom=z.from();y.posTo=z.to();if(x){x(z.from(),z.to())}})}function q(v){v.operation(function(){var w=s(v);w.lastQuery=w.query;if(!w.query){return}w.query=w.queryText=null;v.removeOverlay(w.overlay);if(w.annotate){w.annotate.clear();w.annotate=null}})}var a=' <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';var g='到: <input type="text" style="width: 10em" class="CodeMirror-search-field"/>';var o="替换? <button>是</button> <button>否</button> <button>全部</button> <button>取消</button>";function c(v,w,x){v.operation(function(){for(var z=b(v,w);z.findNext();){if(typeof w!="string"){var y=v.getRange(z.from(),z.to()).match(w);z.replace(x.replace(/\$(\d)/g,function(A,B){return y[B]}))}else{z.replace(x)}}})}function r(v,x){if(v.getOption("readOnly")){return}var y=v.getSelection()||s(v).lastQuery;var w=x?"全部替换:":"替换:";p(v,w+a,w,y,function(z){if(!z){return}z=h(z);p(v,g,"更换:","",function(D){D=i(D);if(x){c(v,z,D)}else{q(v);var C=b(v,z,v.getCursor("from"));var B=function(){var F=C.from(),E;if(!(E=C.findNext())){C=b(v,z);if(!(E=C.findNext())||(F&&C.from().line==F.line&&C.from().ch==F.ch)){return}}v.setSelection(C.from(),C.to());v.scrollIntoView({from:C.from(),to:C.to()});l(v,o,"替换?",[function(){A(E)},B,function(){c(v,z,D)}])};var A=function(E){C.replace(typeof z=="string"?D:D.replace(/\$(\d)/g,function(F,G){return E[G]}));B()};B()}})})}n.commands.find=function(v){q(v);m(v)};n.commands.findPersistent=function(v){q(v);m(v,false,true)};n.commands.findPersistentNext=function(v){m(v,false,true,true)};n.commands.findPersistentPrev=function(v){m(v,true,true,true)};n.commands.findNext=m;n.commands.findPrev=function(v){m(v,true)};n.commands.clearSearch=q;n.commands.replace=r;n.commands.replaceAll=function(v){r(v,true)}});(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(a){var b=a.Pos;function c(k,i,l,g){this.atOccurrence=false;this.doc=k;if(g==null&&typeof i=="string"){g=false}l=l?k.clipPos(l):b(0,0);this.pos={from:l,to:l};if(typeof i!="string"){if(!i.global){i=new RegExp(i.source,i.ignoreCase?"ig":"g")}this.matches=function(p,t){if(p){i.lastIndex=0;var m=k.getLine(t.line).slice(0,t.ch),r=0,o,s;for(;;){i.lastIndex=r;var q=i.exec(m);if(!q){break}o=q;s=o.index;r=o.index+(o[0].length||1);if(r==m.length){break}}var n=(o&&o[0].length)||0;if(!n){if(s==0&&m.length==0){o=undefined}else{if(s!=k.getLine(t.line).length){n++}}}}else{i.lastIndex=t.ch;var m=k.getLine(t.line),o=i.exec(m);var n=(o&&o[0].length)||0;var s=o&&o.index;if(s+n!=m.length&&!n){n=1}}if(o&&n){return{from:b(t.line,s),to:b(t.line,s+n),match:o}}}}else{var e=i;if(g){i=i.toLowerCase()}var f=g?function(m){return m.toLowerCase()}:function(m){return m};var j=i.split("\n");if(j.length==1){if(!i.length){this.matches=function(){}}else{this.matches=function(o,q){if(o){var p=k.getLine(q.line).slice(0,q.ch),m=f(p);var n=m.lastIndexOf(i);if(n>-1){n=d(p,m,n);return{from:b(q.line,n),to:b(q.line,n+e.length)}}}else{var p=k.getLine(q.line).slice(q.ch),m=f(p);var n=m.indexOf(i);if(n>-1){n=d(p,m,n)+q.ch;return{from:b(q.line,n),to:b(q.line,n+e.length)}}}}}}else{var h=e.split("\n");this.matches=function(n,p){var t=j.length-1;if(n){if(p.line-(j.length-1)<k.firstLine()){return}if(f(k.getLine(p.line).slice(0,h[t].length))!=j[j.length-1]){return}var s=b(p.line,h[t].length);for(var o=p.line-1,m=t-1;m>=1;--m,--o){if(j[m]!=f(k.getLine(o))){return}}var u=k.getLine(o),q=u.length-h[0].length;if(f(u.slice(q))!=j[0]){return}return{from:b(o,q),to:s}}else{if(p.line+(j.length-1)>k.lastLine()){return}var u=k.getLine(p.line),q=u.length-h[0].length;if(f(u.slice(q))!=j[0]){return}var r=b(p.line,q);for(var o=p.line+1,m=1;m<t;++m,++o){if(j[m]!=f(k.getLine(o))){return}}if(f(k.getLine(o).slice(0,h[t].length))!=j[t]){return}return{from:r,to:b(o,h[t].length)}}}}}}c.prototype={findNext:function(){return this.find(false)},findPrevious:function(){return this.find(true)},find:function(f){var e=this,i=this.doc.clipPos(f?this.pos.from:this.pos.to);function g(j){var k=b(j,0);e.pos={from:k,to:k};e.atOccurrence=false;return false}for(;;){if(this.pos=this.matches(f,i)){this.atOccurrence=true;return this.pos.match||true}if(f){if(!i.line){return g(0)}i=b(i.line-1,this.doc.getLine(i.line-1).length)}else{var h=this.doc.lineCount();if(i.line==h-1){return g(h)}i=b(i.line+1,0)}}},from:function(){if(this.atOccurrence){return this.pos.from}},to:function(){if(this.atOccurrence){return this.pos.to}},replace:function(g,f){if(!this.atOccurrence){return}var e=a.splitLines(g);this.doc.replaceRange(e,this.pos.from,this.pos.to,f);this.pos.to=b(this.pos.from.line+e.length-1,e[e.length-1].length+(e.length==1?this.pos.from.ch:0))}};function d(i,g,h){if(i.length==g.length){return h}for(var f=Math.min(h,i.length);;){var e=i.slice(0,f).toLowerCase().length;if(e<h){++f}else{if(e>h){--f}else{return f}}}}a.defineExtension("getSearchCursor",function(f,g,e){return new c(this.doc,f,g,e)});a.defineDocExtension("getSearchCursor",function(f,g,e){return new c(this,f,g,e)});a.defineExtension("selectMatches",function(g,f){var e=[];var h=this.getSearchCursor(g,this.getCursor("from"),f);while(h.findNext()){if(a.cmpPos(h.to(),this.getCursor("to"))>0){break}e.push({anchor:h.from(),head:h.to()})}if(e.length){this.setSelections(e,0)}})});(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"),require("../dialog/dialog"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror","../dialog/dialog"],a)}else{a(CodeMirror)}}})(function(a){function b(e,i,g,j,h){if(e.openDialog){e.openDialog(i,h,{value:j,selectValueOnOpen:true})}else{h(prompt(g,j))}}var d='Jump to line: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use line:column or scroll% syntax)</span>';function c(e,g){var f=Number(g);if(/^[-+]/.test(g)){return e.getCursor().line+f}else{return f-1}}a.commands.jumpToLine=function(e){var f=e.getCursor();b(e,d,"Jump to line:",(f.line+1)+":"+f.ch,function(i){if(!i){return}var h;if(h=/^\s*([\+\-]?\d+)\s*\:\s*(\d+)\s*$/.exec(i)){e.setCursor(c(e,h[1]),Number(h[2]))}else{if(h=/^\s*([\+\-]?\d+(\.\d+)?)\%\s*/.exec(i)){var g=Math.round(e.lineCount()*Number(h[1])/100);if(/^[-+]/.test(h[1])){g=f.line+g+1}e.setCursor(g-1,f.ch)}else{if(h=/^\s*\:?\s*([\+\-]?\d+)\s*/.exec(i)){e.setCursor(c(e,h[1]),f.ch)}}}})};a.keyMap["default"]["Alt-G"]="jumpToLine"});(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"),require("./searchcursor"),require("../scroll/annotatescrollbar"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror","./searchcursor","../scroll/annotatescrollbar"],a)}else{a(CodeMirror)}}})(function(b){b.defineExtension("showMatchesOnScrollbar",function(g,f,e){if(typeof e=="string"){e={className:e}}if(!e){e={}}return new c(this,g,f,e)});function c(e,j,i,h){this.cm=e;this.options=h;var f={listenForChanges:false};for(var k in h){f[k]=h[k]}if(!f.className){f.className="CodeMirror-search-match"}this.annotation=e.annotateScrollbar(f);this.query=j;this.caseFold=i;this.gap={from:e.firstLine(),to:e.lastLine()+1};this.matches=[];this.update=null;this.findMatches();this.annotation.update(this.matches);var g=this;e.on("change",this.changeHandler=function(l,m){g.onChange(m)})}var d=1000;c.prototype.findMatches=function(){if(!this.gap){return}for(var g=0;g<this.matches.length;g++){var f=this.matches[g];if(f.from.line>=this.gap.to){break}if(f.to.line>=this.gap.from){this.matches.splice(g--,1)}}var h=this.cm.getSearchCursor(this.query,b.Pos(this.gap.from,0),this.caseFold);var e=this.options&&this.options.maxMatches||d;while(h.findNext()){var f={from:h.from(),to:h.to()};if(f.from.line>=this.gap.to){break}this.matches.splice(g++,0,f);if(this.matches.length>e){break}}this.gap=null};function a(e,g,f){if(e<=g){return e}return Math.max(g,e+f)}c.prototype.onChange=function(k){var l=k.from.line;var e=b.changeEnd(k).line;var f=e-k.to.line;if(this.gap){this.gap.from=Math.min(a(this.gap.from,l,f),k.from.line);this.gap.to=Math.max(a(this.gap.to,l,f),k.from.line)}else{this.gap={from:k.from.line,to:e+1}}if(f){for(var h=0;h<this.matches.length;h++){var j=this.matches[h];var g=a(j.from.line,l,f);if(g!=j.from.line){j.from=b.Pos(g,j.from.ch)}var m=a(j.to.line,l,f);if(m!=j.to.line){j.to=b.Pos(m,j.to.ch)}}}clearTimeout(this.update);var n=this;this.update=setTimeout(function(){n.updateAfterChange()},250)};c.prototype.updateAfterChange=function(){this.findMatches();this.annotation.update(this.matches)};c.prototype.clear=function(){this.cm.off("change",this.changeHandler);this.annotation.clear()}});(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"),require("./matchesonscrollbar"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror","./matchesonscrollbar"],a)}else{a(CodeMirror)}}})(function(d){var c={style:"matchhighlight",minChars:2,delay:100,wordsOnly:false,annotateScrollbar:false,showToken:false,trim:true};function j(n){this.options={};for(var m in c){this.options[m]=(n&&n.hasOwnProperty(m)?n:c)[m]}this.overlay=this.timeout=null;this.matchesonscroll=null;this.active=false}d.defineOption("highlightSelectionMatches",false,function(m,p,n){if(n&&n!=d.Init){l(m);clearTimeout(m.state.matchHighlighter.timeout);m.state.matchHighlighter=null;m.off("cursorActivity",i);m.off("focus",h)}if(p){var o=m.state.matchHighlighter=new j(p);if(m.hasFocus()){o.active=true;f(m)}else{m.on("focus",h)}m.on("cursorActivity",i)}});function i(m){var n=m.state.matchHighlighter;if(n.active||m.hasFocus()){a(m,n)}}function h(m){var n=m.state.matchHighlighter;if(!n.active){n.active=true;a(m,n)}}function a(m,n){clearTimeout(n.timeout);n.timeout=setTimeout(function(){f(m)},n.options.delay)}function b(n,r,p,o){var q=n.state.matchHighlighter;n.addOverlay(q.overlay=e(r,p,o));if(q.options.annotateScrollbar&&n.showMatchesOnScrollbar){var m=p?new RegExp("\\b"+r+"\\b"):r;q.matchesonscroll=n.showMatchesOnScrollbar(m,false,{className:"CodeMirror-selection-highlight-scrollbar"})}}function l(m){var n=m.state.matchHighlighter;if(n.overlay){m.removeOverlay(n.overlay);n.overlay=null;if(n.matchesonscroll){n.matchesonscroll.clear();n.matchesonscroll=null}}}function f(m){m.operation(function(){var n=m.state.matchHighlighter;l(m);if(!m.somethingSelected()&&n.options.showToken){var u=n.options.showToken===true?/[\w$]/:n.options.showToken;var t=m.getCursor(),v=m.getLine(t.line),o=t.ch,p=o;while(o&&u.test(v.charAt(o-1))){--o}while(p<v.length&&u.test(v.charAt(p))){++p}if(o<p){b(m,v.slice(o,p),u,n.options.style)}return}var r=m.getCursor("from"),s=m.getCursor("to");if(r.line!=s.line){return}if(n.options.wordsOnly&&!g(m,r,s)){return}var q=m.getRange(r,s);if(n.options.trim){q=q.replace(/^\s+|\s+$/g,"")}if(q.length>=n.options.minChars){b(m,q,false,n.options.style)}})}function g(m,r,q){var o=m.getRange(r,q);if(o.match(/^\w+$/)!==null){if(r.ch>0){var p={line:r.line,ch:r.ch-1};var n=m.getRange(p,r);if(n.match(/\W/)===null){return false}}if(q.ch<m.getLine(r.line).length){var p={line:q.line,ch:q.ch+1};var n=m.getRange(q,p);if(n.match(/\W/)===null){return false}}return true}else{return false}}function k(n,m){return(!n.start||!m.test(n.string.charAt(n.start-1)))&&(n.pos==n.string.length||!m.test(n.string.charAt(n.pos)))}function e(o,n,m){return{token:function(p){if(p.match(o)&&(!n||k(p,n))){return m}p.next();p.skipTo(o.charAt(0))||p.skipToEnd()}}}});
\ No newline at end of file
diff --git a/route/static/codemirror/addon/search/searchcursor.js b/route/static/codemirror/addon/search/searchcursor.js
deleted file mode 100755
index 0bfe62b7c..000000000
--- a/route/static/codemirror/addon/search/searchcursor.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){if(typeof exports=="object"&&typeof module=="object"){a(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],a)}else{a(CodeMirror)}}})(function(a){var b=a.Pos;function c(k,i,l,g){this.atOccurrence=false;this.doc=k;if(g==null&&typeof i=="string"){g=false}l=l?k.clipPos(l):b(0,0);this.pos={from:l,to:l};if(typeof i!="string"){if(!i.global){i=new RegExp(i.source,i.ignoreCase?"ig":"g")}this.matches=function(p,t){if(p){i.lastIndex=0;var m=k.getLine(t.line).slice(0,t.ch),r=0,o,s;for(;;){i.lastIndex=r;var q=i.exec(m);if(!q){break}o=q;s=o.index;r=o.index+(o[0].length||1);if(r==m.length){break}}var n=(o&&o[0].length)||0;if(!n){if(s==0&&m.length==0){o=undefined}else{if(s!=k.getLine(t.line).length){n++}}}}else{i.lastIndex=t.ch;var m=k.getLine(t.line),o=i.exec(m);var n=(o&&o[0].length)||0;var s=o&&o.index;if(s+n!=m.length&&!n){n=1}}if(o&&n){return{from:b(t.line,s),to:b(t.line,s+n),match:o}}}}else{var e=i;if(g){i=i.toLowerCase()}var f=g?function(m){return m.toLowerCase()}:function(m){return m};var j=i.split("\n");if(j.length==1){if(!i.length){this.matches=function(){}}else{this.matches=function(o,q){if(o){var p=k.getLine(q.line).slice(0,q.ch),m=f(p);var n=m.lastIndexOf(i);if(n>-1){n=d(p,m,n);return{from:b(q.line,n),to:b(q.line,n+e.length)}}}else{var p=k.getLine(q.line).slice(q.ch),m=f(p);var n=m.indexOf(i);if(n>-1){n=d(p,m,n)+q.ch;return{from:b(q.line,n),to:b(q.line,n+e.length)}}}}}}else{var h=e.split("\n");this.matches=function(n,p){var t=j.length-1;if(n){if(p.line-(j.length-1)<k.firstLine()){return}if(f(k.getLine(p.line).slice(0,h[t].length))!=j[j.length-1]){return}var s=b(p.line,h[t].length);for(var o=p.line-1,m=t-1;m>=1;--m,--o){if(j[m]!=f(k.getLine(o))){return}}var u=k.getLine(o),q=u.length-h[0].length;if(f(u.slice(q))!=j[0]){return}return{from:b(o,q),to:s}}else{if(p.line+(j.length-1)>k.lastLine()){return}var u=k.getLine(p.line),q=u.length-h[0].length;if(f(u.slice(q))!=j[0]){return}var r=b(p.line,q);for(var o=p.line+1,m=1;m<t;++m,++o){if(j[m]!=f(k.getLine(o))){return}}if(f(k.getLine(o).slice(0,h[t].length))!=j[t]){return}return{from:r,to:b(o,h[t].length)}}}}}}c.prototype={findNext:function(){return this.find(false)},findPrevious:function(){return this.find(true)},find:function(f){var e=this,i=this.doc.clipPos(f?this.pos.from:this.pos.to);function g(j){var k=b(j,0);e.pos={from:k,to:k};e.atOccurrence=false;return false}for(;;){if(this.pos=this.matches(f,i)){this.atOccurrence=true;return this.pos.match||true}if(f){if(!i.line){return g(0)}i=b(i.line-1,this.doc.getLine(i.line-1).length)}else{var h=this.doc.lineCount();if(i.line==h-1){return g(h)}i=b(i.line+1,0)}}},from:function(){if(this.atOccurrence){return this.pos.from}},to:function(){if(this.atOccurrence){return this.pos.to}},replace:function(g,f){if(!this.atOccurrence){return}var e=a.splitLines(g);this.doc.replaceRange(e,this.pos.from,this.pos.to,f);this.pos.to=b(this.pos.from.line+e.length-1,e[e.length-1].length+(e.length==1?this.pos.from.ch:0))}};function d(i,g,h){if(i.length==g.length){return h}for(var f=Math.min(h,i.length);;){var e=i.slice(0,f).toLowerCase().length;if(e<h){++f}else{if(e>h){--f}else{return f}}}}a.defineExtension("getSearchCursor",function(f,g,e){return new c(this.doc,f,g,e)});a.defineDocExtension("getSearchCursor",function(f,g,e){return new c(this,f,g,e)});a.defineExtension("selectMatches",function(g,f){var e=[];var h=this.getSearchCursor(g,this.getCursor("from"),f);while(h.findNext()){if(a.cmpPos(h.to(),this.getCursor("to"))>0){break}e.push({anchor:h.from(),head:h.to()})}if(e.length){this.setSelections(e,0)}})});
\ No newline at end of file
diff --git a/route/static/codemirror/index.html b/route/static/codemirror/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/codemirror/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/codemirror/lib/codemirror.css b/route/static/codemirror/lib/codemirror.css
deleted file mode 100755
index 48e2ac5a8..000000000
--- a/route/static/codemirror/lib/codemirror.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.CodeMirror{font-family:monospace;height:auto;color:black;border:#ccc 1px solid}.CodeMirror-lines{padding:4px 0}.CodeMirror pre{padding:0 4px}.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler{background-color:white}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:black}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid black;border-right:0;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0!important;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background-color:#7e7}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-rulers{position:absolute;left:0;right:0;top:-50px;bottom:-20px;overflow:hidden}.CodeMirror-ruler{border-left:1px solid #ccc;top:0;bottom:0;position:absolute}.cm-s-default .cm-header{color:blue}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:bold}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta{color:#555}.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-s-default .cm-error{color:#f00}.cm-invalidchar{color:#f00}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0f0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#f22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:white}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-vscrollbar,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:none!important;border:none!important}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-gutter-wrapper{-webkit-user-select:none;-moz-user-select:none;user-select:none}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:transparent;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:none;font-variant-ligatures:none}.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;overflow:auto}.CodeMirror-code{outline:0}.CodeMirror-scroll,.CodeMirror-sizer,.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute;pointer-events:none}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-focused div.CodeMirror-cursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background:#ffa;background:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:0}
-.CodeMirror-hints{position:absolute;z-index:10;overflow:hidden;list-style:none;margin:0;padding:2px;-webkit-box-shadow:2px 3px 5px rgba(0,0,0,.2);-moz-box-shadow:2px 3px 5px rgba(0,0,0,.2);box-shadow:2px 3px 5px rgba(0,0,0,.2);border-radius:3px;border:1px solid silver;background:white;font-size:90%;font-family:monospace;max-height:20em;overflow-y:auto}.CodeMirror-hint{margin:0;padding:0 4px;border-radius:2px;white-space:pre;color:black;cursor:pointer}li.CodeMirror-hint-active{background:#08f;color:white}
-.CodeMirror-dialog{position:absolute;left:0;right:0;background:inherit;z-index:15;padding:.4em .8em;overflow:hidden;color:inherit}.CodeMirror-dialog-top{border-bottom:1px solid #eee;top:0}.CodeMirror-dialog-bottom{border-top:1px solid #eee;bottom:0}.CodeMirror-dialog input{border:0;outline:0;background:transparent;width:20em;color:inherit;font-family:monospace}.CodeMirror-dialog button{font-size:70%}.Dialog-close{color:#111;float:right;font-family:Arial;font-size:16px;height:30px;line-height:30px;text-align:center;width:30px;cursor:pointer}
-.CodeMirror-search-match{background:gold;border-top:1px solid orange;border-bottom:1px solid orange;-moz-box-sizing:border-box;box-sizing:border-box;opacity:.5}
\ No newline at end of file
diff --git a/route/static/codemirror/lib/codemirror.js b/route/static/codemirror/lib/codemirror.js
deleted file mode 100755
index b9cb291c8..000000000
--- a/route/static/codemirror/lib/codemirror.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(c,d){typeof exports==="object"&&typeof module!=="undefined"?module.exports=d():typeof define==="function"&&define.amd?define(d):(c.CodeMirror=d())}(this,(function(){var iP=navigator.userAgent;var ir=navigator.platform;var kc=/gecko\/\d/i.test(iP);var kv=/MSIE \d/.test(iP);var nf=/Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(iP);var kj=kv||nf;var kH=kj&&(kv?document.documentMode||6:nf[1]);var mU=/WebKit\//.test(iP);var j6=mU&&/Qt\/\d+\.\d+/.test(iP);var ju=/Chrome\//.test(iP);var iL=/Opera\//.test(iP);var ob=/Apple Computer/.test(navigator.vendor);var jI=/Mac OS X 1\d\D([8-9]|\d\d)\D/.test(iP);var iq=/PhantomJS/.test(iP);var hE=/AppleWebKit/.test(iP)&&/Mobile\/\w+/.test(iP);var ie=hE||/Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(iP);var k9=hE||/Mac/.test(ir);var i6=/\bCrOS\b/.test(iP);var nW=/win/i.test(ir);var nE=iL&&iP.match(/Version\/(\d*\.\d*)/);if(nE){nE=Number(nE[1])}if(nE&&nE>=15){iL=false;mU=true}var mW=k9&&(j6||iL&&(nE==null||nE<12.11));var hT=kc||(kj&&kH>=9);function lO(a){return new RegExp("(^|\\s)"+a+"(?:$|\\s)\\s*")}var kS=function(d,c){var b=d.className;var e=lO(c).exec(b);if(e){var a=b.slice(e.index+e[0].length);d.className=b.slice(0,e.index)+(a?e[1]+a:"")}};function iN(b){for(var a=b.childNodes.length;a>0;--a){b.removeChild(b.firstChild)}return b}function mR(a,b){return iN(a).appendChild(b)}function gZ(f,b,c,d){var a=document.createElement(f);if(c){a.className=c}if(d){a.style.cssText=d}if(typeof b=="string"){a.appendChild(document.createTextNode(b))}else{if(b){for(var e=0;e<b.length;++e){a.appendChild(b[e])}}}return a}var ki;if(document.createRange){ki=function(c,a,e,b){var d=document.createRange();d.setEnd(b||c,e);d.setStart(c,a);return d}}else{ki=function(d,a,c){var e=document.body.createTextRange();try{e.moveToElementText(d.parentNode)}catch(b){return e}e.collapse(true);e.moveEnd("character",c);e.moveStart("character",a);return e}}function hR(a,b){if(b.nodeType==3){b=b.parentNode}if(a.contains){return a.contains(b)}do{if(b.nodeType==11){b=b.host}if(b==a){return true}}while(b=b.parentNode)}function j3(){var a;try{a=document.activeElement}catch(b){a=document.body||null}while(a&&a.root&&a.root.activeElement){a=a.root.activeElement}return a}function h6(c,a){var b=c.className;if(!lO(a).test(b)){c.className+=(b?" ":"")+a}}function g9(b,d){var c=b.split(" ");for(var a=0;a<c.length;a++){if(c[a]&&!lO(c[a]).test(d)){d+=" "+c[a]}}return d}var kf=function(a){a.select()};if(hE){kf=function(a){a.selectionStart=0;a.selectionEnd=a.value.length}}else{if(kj){kf=function(b){try{b.select()}catch(a){}}}}function mD(b){var a=Array.prototype.slice.call(arguments,1);return function(){return b.apply(null,a)}}function n0(c,d,b){if(!d){d={}}for(var a in c){if(c.hasOwnProperty(a)&&(b!==false||!d.hasOwnProperty(a))){d[a]=c[a]}}return d}function mV(d,f,b,a,e){if(f==null){f=d.search(/[^\s\u00a0]/);if(f==-1){f=d.length}}for(var c=a||0,h=e||0;;){var g=d.indexOf("\t",c);if(g<0||g>=f){return h+(f-c)}h+=g-c;h+=b-(h%b);c=g+1}}function hA(){this.id=null}hA.prototype.set=function(a,b){clearTimeout(this.id);this.id=setTimeout(b,a)};function jb(a,c){for(var b=0;b<a.length;++b){if(a[b]==c){return b}}return -1}var ko=30;var kU={toString:function(){return"CodeMirror.Pass"}};var ln={scroll:false};var l9={origin:"*mouse"};var m4={origin:"+move"};function jM(c,e,b){for(var a=0,f=0;;){var g=c.indexOf("\t",a);if(g==-1){g=c.length}var d=g-a;if(g==c.length||f+d>=e){return a+Math.min(d,e-f)}f+=g-a;f+=b-(f%b);a=g+1;if(f>=e){return a}}}var gU=[""];function j7(a){while(gU.length<=a){gU.push(ji(gU)+" ")}return gU[a]}function ji(a){return a[a.length-1]}function mO(a,b){var d=[];for(var c=0;c<a.length;c++){d[c]=b(a[c],c)}return d}function kZ(a,e,d){var c=0,b=d(e);while(c<a.length&&d(a[c])<=b){c++}a.splice(c,0,e)}function g8(){}function ks(b,a){var c;if(Object.create){c=Object.create(b)}else{g8.prototype=b;c=new g8()}if(a){n0(a,c)}return c}var mu=/[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;function h0(a){return/\w/.test(a)||a>"\x80"&&(a.toUpperCase()!=a.toLowerCase()||mu.test(a))}function mo(a,b){if(!b){return h0(a)}if(b.source.indexOf("\\w")>-1&&h0(a)){return true}return b.test(a)}function hS(a){for(var b in a){if(a.hasOwnProperty(b)&&a[b]){return false}}return true}var ky=/[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;function iB(a){return a.charCodeAt(0)>=768&&ky.test(a)}function iU(b,c,d){var a=this;this.input=d;a.scrollbarFiller=gZ("div",null,"CodeMirror-scrollbar-filler");a.scrollbarFiller.setAttribute("cm-not-content","true");a.gutterFiller=gZ("div",null,"CodeMirror-gutter-filler");a.gutterFiller.setAttribute("cm-not-content","true");a.lineDiv=gZ("div",null,"CodeMirror-code");a.selectionDiv=gZ("div",null,null,"position: relative; z-index: 1");a.cursorDiv=gZ("div",null,"CodeMirror-cursors");a.measure=gZ("div",null,"CodeMirror-measure");a.lineMeasure=gZ("div",null,"CodeMirror-measure");a.lineSpace=gZ("div",[a.measure,a.lineMeasure,a.selectionDiv,a.cursorDiv,a.lineDiv],null,"position: relative; outline: none");a.mover=gZ("div",[gZ("div",[a.lineSpace],"CodeMirror-lines")],null,"position: relative");a.sizer=gZ("div",[a.mover],"CodeMirror-sizer");a.sizerWidth=null;a.heightForcer=gZ("div",null,null,"position: absolute; height: "+ko+"px; width: 1px;");a.gutters=gZ("div",null,"CodeMirror-gutters");a.lineGutter=null;a.scroller=gZ("div",[a.sizer,a.heightForcer,a.gutters],"CodeMirror-scroll");a.scroller.setAttribute("tabIndex","-1");a.wrapper=gZ("div",[a.scrollbarFiller,a.gutterFiller,a.scroller],"CodeMirror");if(kj&&kH<8){a.gutters.style.zIndex=-1;a.scroller.style.paddingRight=0}if(!mU&&!(kc&&ie)){a.scroller.draggable=true}if(b){if(b.appendChild){b.appendChild(a.wrapper)}else{b(a.wrapper)}}a.viewFrom=a.viewTo=c.first;a.reportedViewFrom=a.reportedViewTo=c.first;a.view=[];a.renderedView=null;a.externalMeasured=null;a.viewOffset=0;a.lastWrapHeight=a.lastWrapWidth=0;a.updateLineNumbers=null;a.nativeBarWidth=a.barHeight=a.barWidth=0;a.scrollbarsClipped=false;a.lineNumWidth=a.lineNumInnerWidth=a.lineNumChars=null;a.alignWidgets=false;a.cachedCharWidth=a.cachedTextHeight=a.cachedPaddingH=null;a.maxLine=null;a.maxLineLength=0;a.maxLineChanged=false;a.wheelDX=a.wheelDY=a.wheelStartX=a.wheelStartY=null;a.shift=false;a.selForContextMenu=null;a.activeTouch=null;d.init(a)}function hm(c,a){a-=c.first;if(a<0||a>=c.size){throw new Error("There is no line "+(a+c.first)+" in the document.")}var f=c;while(!f.lines){for(var e=0;;++e){var b=f.children[e],d=b.chunkSize();if(a<d){f=b;break}a-=d}}return f.lines[a]}function gY(d,a,c){var e=[],b=a.line;d.iter(a.line,c.line+1,function(g){var f=g.text;if(b==c.line){f=f.slice(0,c.ch)}if(b==a.line){f=f.slice(a.ch)}e.push(f);++b});return e}function gS(d,b,c){var a=[];d.iter(b,c,function(e){a.push(e.text)});return a}function gV(d,b){var c=b-d.height;if(c){for(var a=d;a;a=a.parent){a.height+=c}}}function m5(e){if(e.parent==null){return null}var a=e.parent,b=jb(a.lines,e);for(var d=a.parent;d;a=d,d=d.parent){for(var c=0;;++c){if(d.children[c]==a){break}b+=d.children[c].chunkSize()}}return b+a.first}function nj(c,d){var f=c.first;outer:do{for(var g=0;g<c.children.length;++g){var h=c.children[g],j=h.height;if(d<j){c=h;continue outer}d-=j;f+=h.chunkSize()}return f}while(!c.lines);var e=0;for(;e<c.lines.length;++e){var a=c.lines[e],b=a.height;if(d<b){break}d-=b}return f+e}function k3(b,a){return a>=b.first&&a<b.first+b.size}function jF(b,a){return String(b.lineNumberFormatter(a+b.firstLineNumber))}function lA(a,b){if(!(this instanceof lA)){return new lA(a,b)}this.line=a;this.ch=b}function kI(b,a){return b.line-a.line||b.ch-a.ch}function kz(a){return lA(a.line,a.ch)}function nD(b,a){return kI(b,a)<0?a:b}function m3(b,a){return kI(b,a)<0?b:a}function jL(a,b){return Math.max(a.first,Math.min(b,a.first+a.size-1))}function i3(c,b){if(b.line<c.first){return lA(c.first,0)}var a=c.first+c.size-1;if(b.line>a){return lA(a,hm(c,a).text.length)}return iu(b,hm(c,b.line).text.length)}function iu(b,c){var a=b.ch;if(a==null||a>c){return lA(b.line,c)}else{if(a<0){return lA(b.line,0)}else{return b}}}function lo(b,a){var d=[];for(var c=0;c<a.length;c++){d[c]=i3(b,a[c])}return d}var hM=false;var gN=false;function ia(){hM=true}function lf(){gN=true}function h7(a,b,c){this.marker=a;this.from=b;this.to=c}function hr(b,d){if(b){for(var c=0;c<b.length;++c){var a=b[c];if(a.marker==d){return a}}}}function iY(c,b){var a;for(var d=0;d<c.length;++d){if(c[d]!=b){(a||(a=[])).push(c[d])}}return a}function kP(a,b){a.markedSpans=a.markedSpans?a.markedSpans.concat([b]):[b];b.marker.attachLine(a)}function nV(h,g,c){var b;if(h){for(var e=0;e<h.length;++e){var a=h[e],d=a.marker;var j=a.from==null||(d.inclusiveLeft?a.from<=g:a.from<g);if(j||a.from==g&&d.type=="bookmark"&&(!c||!a.marker.insertLeft)){var f=a.to==null||(d.inclusiveRight?a.to>=g:a.to>g);(b||(b=[])).push(new h7(d,a.from,f?null:a.to))}}}return b}function oc(h,f,c){var b;if(h){for(var e=0;e<h.length;++e){var a=h[e],d=a.marker;var g=a.to==null||(d.inclusiveRight?a.to>=f:a.to>f);if(g||a.from==f&&d.type=="bookmark"&&(!c||a.marker.insertLeft)){var j=a.from==null||(d.inclusiveLeft?a.from<=f:a.from<f);(b||(b=[])).push(new h7(d,j?null:a.from-f,a.to==null?null:a.to-f))}}}return b}function h5(q,d){if(d.full){return null}var n=k3(q,d.from.line)&&hm(q,d.from.line).markedSpans;var f=k3(q,d.to.line)&&hm(q,d.to.line).markedSpans;if(!n&&!f){return null}var g=d.from.ch,v=d.to.ch,b=kI(d.from,d.to)==0;var h=nV(n,g,b);var e=oc(f,v,b);var a=d.text.length==1,k=ji(d.text).length+(a?g:0);if(h){for(var s=0;s<h.length;++s){var t=h[s];if(t.to==null){var c=hr(e,t.marker);if(!c){t.to=g}else{if(a){t.to=c.to==null?null:c.to+k}}}}}if(e){for(var j=0;j<e.length;++j){var u=e[j];if(u.to!=null){u.to+=k}if(u.from==null){var o=hr(h,u.marker);if(!o){u.from=k;if(a){(h||(h=[])).push(u)}}}else{u.from+=k;if(a){(h||(h=[])).push(u)}}}}if(h){h=kn(h)}if(e&&e!=h){e=kn(e)}var r=[h];if(!a){var w=d.text.length-2,p;if(w>0&&h){for(var l=0;l<h.length;++l){if(h[l].to==null){(p||(p=[])).push(new h7(h[l].marker,null,null))}}}for(var m=0;m<w;++m){r.push(p)}r.push(e)}return r}function kn(b){for(var c=0;c<b.length;++c){var a=b[c];if(a.from!=null&&a.from==a.to&&a.marker.clearWhenEmpty!==false){b.splice(c--,1)}}if(!b.length){return null}return b}function l1(a,c,b){var j=null;a.iter(c.line,b.line+1,function(q){if(q.markedSpans){for(var p=0;p<q.markedSpans.length;++p){var o=q.markedSpans[p].marker;if(o.readOnly&&(!j||jb(j,o)==-1)){(j||(j=[])).push(o)}}}});if(!j){return null}var h=[{from:c,to:b}];for(var g=0;g<j.length;++g){var f=j[g],l=f.find(0);for(var k=0;k<h.length;++k){var m=h[k];if(kI(m.to,l.from)<0||kI(m.from,l.to)>0){continue}var d=[k,1],n=kI(m.from,l.from),e=kI(m.to,l.to);if(n<0||!f.inclusiveLeft&&!n){d.push({from:m.from,to:l.from})}if(e>0||!f.inclusiveRight&&!e){d.push({from:l.to,to:m.to})}h.splice.apply(h,d);k+=d.length-1}}return h}function hV(c){var a=c.markedSpans;if(!a){return}for(var b=0;b<a.length;++b){a[b].marker.detachLine(c)}c.markedSpans=null}function mM(c,a){if(!a){return}for(var b=0;b<a.length;++b){a[b].marker.attachLine(c)}c.markedSpans=a}function j5(a){return a.inclusiveLeft?-1:0}function mH(a){return a.inclusiveRight?1:0}function lW(e,g){var b=e.lines.length-g.lines.length;if(b!=0){return b}var f=e.find(),a=g.find();var d=kI(f.from,a.from)||j5(e)-j5(g);if(d){return -d}var c=kI(f.to,a.to)||mH(e)-mH(g);if(c){return c}return g.id-e.id}function gO(e,a){var f=gN&&e.markedSpans,b;if(f){for(var c=void 0,d=0;d<f.length;++d){c=f[d];if(c.marker.collapsed&&(a?c.from:c.to)==null&&(!b||lW(b,c.marker)<0)){b=c.marker}}}return b}function kb(a){return gO(a,true)}function jy(a){return gO(a,false)}function jS(d,m,f,e,h){var a=hm(d,m);var l=gN&&a.markedSpans;if(l){for(var j=0;j<l.length;++j){var k=l[j];if(!k.marker.collapsed){continue}var b=k.marker.find(0);var c=kI(b.from,f)||j5(k.marker)-j5(h);var g=kI(b.to,e)||mH(k.marker)-mH(h);if(c>=0&&g<=0||c<=0&&g>=0){continue}if(c<=0&&(k.marker.inclusiveRight&&h.inclusiveLeft?kI(b.to,f)>=0:kI(b.to,f)>0)||c>=0&&(k.marker.inclusiveRight&&h.inclusiveLeft?kI(b.from,e)<=0:kI(b.from,e)<0)){return true}}}}function jV(b){var a;while(a=kb(b)){b=a.find(-1,true).line}return b}function kW(b){var a,c;while(a=jy(b)){b=a.find(1,true).line;(c||(c=[])).push(b)}return c}function nJ(b,d){var a=hm(b,d),c=jV(a);if(a==c){return d}return m5(c)}function iJ(b,c){if(c>b.lastLine()){return c}var d=hm(b,c),a;if(!il(b,d)){return c}while(a=jy(d)){d=a.find(1,true).line}return m5(d)+1}function il(a,d){var e=gN&&d.markedSpans;if(e){for(var b=void 0,c=0;c<e.length;++c){b=e[c];if(!b.marker.collapsed){continue}if(b.from==null){return true}if(b.marker.widgetNode){continue}if(b.from==0&&b.marker.inclusiveLeft&&lJ(a,d,b)){return true}}}}function lJ(a,e,c){if(c.to==null){var f=c.marker.find(1,true);return lJ(a,f.line,hr(f.line.markedSpans,c.marker))}if(c.marker.inclusiveRight&&c.to==e.text.length){return true}for(var b=void 0,d=0;d<e.markedSpans.length;++d){b=e.markedSpans[d];if(b.marker.collapsed&&!b.marker.widgetNode&&b.from==c.to&&(b.to==null||b.to!=c.from)&&(b.marker.inclusiveLeft||c.marker.inclusiveRight)&&lJ(a,e,b)){return true}}}function m7(e){e=jV(e);var c=0,f=e.parent;for(var d=0;d<f.lines.length;++d){var g=f.lines[d];if(g==e){break}else{c+=g.height}}for(var b=f.parent;b;f=b,b=f.parent){for(var h=0;h<b.children.length;++h){var a=b.children[h];if(a==f){break}else{c+=a.height}}}return c}function hZ(e){if(e.height==0){return 0}var f=e.text.length,d,a=e;while(d=kb(a)){var c=d.find(0,true);a=c.from.line;f+=c.from.ch-c.to.ch}a=e;while(d=jy(a)){var b=d.find(0,true);f-=a.text.length-b.from.ch;a=b.to.line;f+=a.text.length-b.to.ch}return f}function kY(a){var b=a.display,c=a.doc;b.maxLine=hm(c,c.first);b.maxLineLength=hZ(b.maxLine);b.maxLineChanged=true;c.iter(function(d){var e=hZ(d);if(e>b.maxLineLength){b.maxLineLength=e;b.maxLine=d}})}function iG(g,a,b,c){if(!g){return c(a,b,"ltr")}var d=false;for(var e=0;e<g.length;++e){var f=g[e];if(f.from<b&&f.to>a||a==b&&f.to==a){c(Math.max(f.from,a),Math.min(f.to,b),f.level==1?"rtl":"ltr");d=true}}if(!d){c(a,b,"ltr")}}function kT(a){return a.level%2?a.to:a.from}function hJ(a){return a.level%2?a.from:a.to}function md(b){var a=ld(b);return a?kT(a[0]):0}function lj(b){var a=ld(b);if(!a){return b.text.length}return hJ(ji(a))}function ne(d,c,b){var a=d[0].level;if(c==a){return true}if(b==a){return false}return c<b}var hz=null;function n6(e,a){var c;hz=null;for(var d=0;d<e.length;++d){var b=e[d];if(b.from<a&&b.to>a){return d}if((b.from==a||b.to==a)){if(c==null){c=d}else{if(ne(e,b.level,e[c].level)){if(b.from!=b.to){hz=c}return d}else{if(b.from!=b.to){hz=d}return c}}}}return c}function hl(b,a,d,c){if(!c){return a+d}do{a+=d}while(a>0&&iB(b.text.charAt(a)));return a}function ka(f,a,g,e){var d=ld(f);if(!d){return nn(f,a,g,e)}var b=n6(d,a),h=d[b];var c=hl(f,a,h.level%2?-g:g,e);for(;;){if(c>h.from&&c<h.to){return c}if(c==h.from||c==h.to){if(n6(d,c)==b){return c}h=d[b+=g];return(g>0)==h.level%2?h.to:h.from}else{h=d[b+=g];if(!h){return null}if((g>0)==h.level%2){c=hl(f,h.to,-1,e)}else{c=hl(f,h.from,1,e)}}}}function nn(c,a,e,d){var b=a+e;if(d){while(b>0&&iB(c.text.charAt(b))){b+=e}}return b<0||b>c.text.length?null:b}var mc=(function(){var e="bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN";var g="rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm";function h(l){if(l<=247){return e.charAt(l)}else{if(1424<=l&&l<=1524){return"R"}else{if(1536<=l&&l<=1773){return g.charAt(l-1536)}else{if(1774<=l&&l<=2220){return"r"}else{if(8192<=l&&l<=8203){return"w"}else{if(l==8204){return"b"}else{return"L"}}}}}}}var b=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/;var a=/[stwN]/,j=/[LRr]/,k=/[Lb1n]/,f=/[1n]/;var c="L";function d(l,m,n){this.level=l;this.from=m;this.to=n}return function(s){if(!b.test(s)){return false}var R=s.length,F=[];for(var l=0;l<R;++l){F.push(h(s.charCodeAt(l)))}for(var H=0,B=c;H<R;++H){var o=F[H];if(o=="m"){F[H]=B}else{B=o}}for(var J=0,v=c;J<R;++J){var r=F[J];if(r=="1"&&v=="r"){F[J]="n"}else{if(j.test(r)){v=r;if(r=="r"){F[J]="R"}}}}for(var K=1,A=F[0];K<R-1;++K){var w=F[K];if(w=="+"&&A=="1"&&F[K+1]=="1"){F[K]="1"}else{if(w==","&&A==F[K+1]&&(A=="1"||A=="n")){F[K]=A}}A=w}for(var N=0;N<R;++N){var y=F[N];if(y==","){F[N]="N"}else{if(y=="%"){var m=void 0;for(m=N+1;m<R&&F[m]=="%";++m){}var L=(N&&F[N-1]=="!")||(m<R&&F[m]=="1")?"1":"N";for(var n=N;n<m;++n){F[n]=L}N=m-1}}}for(var T=0,S=c;T<R;++T){var C=F[T];if(S=="L"&&C=="1"){F[T]="L"}else{if(j.test(C)){S=C}}}for(var u=0;u<R;++u){if(a.test(F[u])){var P=void 0;for(P=u+1;P<R&&a.test(F[P]);++P){}var E=(u?F[u-1]:c)=="L";var x=(P<R?F[P]:c)=="L";var G=E||x?"L":"R";for(var M=u;M<P;++M){F[M]=G}u=P-1}}var p=[],t;for(var z=0;z<R;){if(k.test(F[z])){var Q=z;for(++z;z<R&&k.test(F[z]);++z){}p.push(new d(0,Q,z))}else{var I=z,D=p.length;for(++z;z<R&&F[z]!="L";++z){}for(var O=I;O<z;){if(f.test(F[O])){if(I<O){p.splice(D,0,new d(1,I,O))}var q=O;for(++O;O<z&&f.test(F[O]);++O){}p.splice(D,0,new d(2,q,O));I=O}else{++O}}if(I<z){p.splice(D,0,new d(1,I,z))}}}if(p[0].level==1&&(t=s.match(/^\s+/))){p[0].from=t[0].length;p.unshift(new d(0,0,t[0].length))}if(ji(p).level==1&&(t=s.match(/\s+$/))){ji(p).to-=t[0].length;p.push(new d(0,R-t[0].length,R))}if(p[0].level==2){p.unshift(new d(1,p[0].to,p[0].to))}if(p[0].level!=ji(p).level){p.push(new d(p[0].level,R,R))}return p}})();function ld(b){var a=b.order;if(a==null){a=b.order=mc(b.text)}return a}var hv=[];var nY=function(b,a,c){if(b.addEventListener){b.addEventListener(a,c,false)}else{if(b.attachEvent){b.attachEvent("on"+a,c)}else{var d=b._handlers||(b._handlers={});d[a]=(d[a]||hv).concat(c)}}};function h4(b,a){return b._handlers&&b._handlers[a]||hv}function ih(a,e,b){if(a.removeEventListener){a.removeEventListener(e,b,false)}else{if(a.detachEvent){a.detachEvent("on"+e,b)}else{var d=a._handlers,c=d&&d[e];if(c){var f=jb(c,b);if(f>-1){d[e]=c.slice(0,f).concat(c.slice(f+1))}}}}}function n9(a,b){var e=h4(a,b);if(!e.length){return}var d=Array.prototype.slice.call(arguments,2);for(var c=0;c<e.length;++c){e[c].apply(null,d)}}function nT(a,b,c){if(typeof b=="string"){b={type:b,preventDefault:function(){this.defaultPrevented=true}}}n9(a,c||b.type,a,b);return na(b)||b.codemirrorIgnore}function lD(c){var d=c._handlers&&c._handlers.cursorActivity;if(!d){return}var a=c.curOp.cursorActivityHandlers||(c.curOp.cursorActivityHandlers=[]);for(var b=0;b<d.length;++b){if(jb(a,d[b])==-1){a.push(d[b])}}}function iI(b,a){return h4(b,a).length>0}function nA(a){a.prototype.on=function(c,b){nY(this,c,b)};a.prototype.off=function(c,b){ih(this,c,b)}}function l7(a){if(a.preventDefault){a.preventDefault()}else{a.returnValue=false}}function iT(a){if(a.stopPropagation){a.stopPropagation()}else{a.cancelBubble=true}}function na(a){return a.defaultPrevented!=null?a.defaultPrevented:a.returnValue==false}function jK(a){l7(a);iT(a)}function mb(a){return a.target||a.srcElement}function hi(b){var a=b.which;if(a==null){if(b.button&1){a=1}else{if(b.button&2){a=3}else{if(b.button&4){a=2}}}}if(k9&&b.ctrlKey&&a==1){a=3}return a}var kr=function(){if(kj&&kH<9){return false}var a=gZ("div");return"draggable" in a||"dragDrop" in a}();var hk;function lP(a){if(hk==null){var b=gZ("span","\u200b");mR(a,gZ("span",[b,document.createTextNode("x")]));if(a.firstChild.offsetHeight!=0){hk=b.offsetWidth<=1&&b.offsetHeight>2&&!(kj&&kH<8)}}var c=hk?gZ("span","\u200b"):gZ("span","\u00a0",null,"display: inline-block; width: 1px; margin-right: -1px");c.setAttribute("cm-text","");return c}var hj;function m2(b){if(hj!=null){return hj}var a=mR(b,document.createTextNode("A\u062eA"));var c=ki(a,0,1).getBoundingClientRect();var d=ki(a,1,2).getBoundingClientRect();iN(b);if(!c||c.left==c.right){return false}return hj=(d.right-c.right<3)}var hd="\n\nb".split(/\n/).length!=3?function(b){var a=0,e=[],c=b.length;while(a<=c){var d=b.indexOf("\n",a);if(d==-1){d=b.length}var f=b.slice(a,b.charAt(d-1)=="\r"?d-1:d);var g=f.indexOf("\r");if(g!=-1){e.push(f.slice(0,g));a+=g+1}else{e.push(f);a=d+1}}return e}:function(a){return a.split(/\r\n?|\n/)};var lv=window.getSelection?function(b){try{return b.selectionStart!=b.selectionEnd}catch(a){return false}}:function(b){var c;try{c=b.ownerDocument.selection.createRange()}catch(a){}if(!c||c.parentElement()!=b){return false}return c.compareEndPoints("StartToEnd",c)!=0};var jz=(function(){var a=gZ("div");if("oncopy" in a){return true}a.setAttribute("oncopy","return;");return typeof a.oncopy=="function"})();var hu=null;function n2(d){if(hu!=null){return hu}var c=mR(d,gZ("span","x"));var b=c.getBoundingClientRect();var a=ki(c,0,1).getBoundingClientRect();return hu=Math.abs(b.left-a.left)>1}var le={};var nQ={};function jE(a,b){if(arguments.length>2){b.dependencies=Array.prototype.slice.call(arguments,2)}le[a]=b}function lT(b,a){nQ[b]=a}function hP(a){if(typeof a=="string"&&nQ.hasOwnProperty(a)){a=nQ[a]}else{if(a&&typeof a.name=="string"&&nQ.hasOwnProperty(a.name)){var b=nQ[a.name];if(typeof b=="string"){b={name:b}}a=ks(b,a);a.name=b.name}else{if(typeof a=="string"&&/^[\w\-]+\/[\w\-]+\+xml$/.test(a)){return hP("application/xml")}else{if(typeof a=="string"&&/^[\w\-]+\/[\w\-]+\+json$/.test(a)){return hP("application/json")}}}}if(typeof a=="string"){return{name:a}}else{return a||{name:"null"}}}function h8(f,g){g=hP(g);var c=le[g.name];if(!c){return h8(f,"text/plain")}var b=c(f,g);if(iV.hasOwnProperty(g.name)){var e=iV[g.name];for(var a in e){if(!e.hasOwnProperty(a)){continue}if(b.hasOwnProperty(a)){b["_"+a]=b[a]}b[a]=e[a]}}b.name=g.name;if(g.helperType){b.helperType=g.helperType}if(g.modeProps){for(var d in g.modeProps){b[d]=g.modeProps[d]}}return b}var iV={};function jc(b,c){var a=iV.hasOwnProperty(b)?iV[b]:(iV[b]={});n0(c,a)}function nK(c,b){if(b===true){return b}if(c.copyState){return c.copyState(b)}var d={};for(var a in b){var e=b[a];if(e instanceof Array){e=e.concat([])}d[a]=e}return d}function hX(b,a){var c;while(b.innerMode){c=b.innerMode(a);if(!c||c.mode==b){break}a=c.state;b=c.mode}return c||{mode:b,state:a}}function nR(b,c,a){return b.startState?b.startState(c,a):true}var hU=function(a,b){this.pos=this.start=0;this.string=a;this.tabSize=b||8;this.lastColumnPos=this.lastColumnValue=0;this.lineStart=0};hU.prototype={eol:function(){return this.pos>=this.string.length},sol:function(){return this.pos==this.lineStart},peek:function(){return this.string.charAt(this.pos)||undefined},next:function(){if(this.pos<this.string.length){return this.string.charAt(this.pos++)}},eat:function(a){var b=this.string.charAt(this.pos);var c;if(typeof a=="string"){c=b==a}else{c=b&&(a.test?a.test(b):a(b))}if(c){++this.pos;return b}},eatWhile:function(a){var b=this.pos;while(this.eat(a)){}return this.pos>b},eatSpace:function(){var b=this;var a=this.pos;while(/[\s\u00a0]/.test(this.string.charAt(this.pos))){++b.pos}return this.pos>a},skipToEnd:function(){this.pos=this.string.length},skipTo:function(a){var b=this.string.indexOf(a,this.pos);if(b>-1){this.pos=b;return true}},backUp:function(a){this.pos-=a},column:function(){if(this.lastColumnPos<this.start){this.lastColumnValue=mV(this.string,this.start,this.tabSize,this.lastColumnPos,this.lastColumnValue);this.lastColumnPos=this.start}return this.lastColumnValue-(this.lineStart?mV(this.string,this.lineStart,this.tabSize):0)},indentation:function(){return mV(this.string,null,this.tabSize)-(this.lineStart?mV(this.string,this.lineStart,this.tabSize):0)},match:function(b,f,d){if(typeof b=="string"){var a=function(g){return d?g.toLowerCase():g};var c=this.string.substr(this.pos,b.length);if(a(c)==a(b)){if(f!==false){this.pos+=b.length}return true}}else{var e=this.string.slice(this.pos).match(b);if(e&&e.index>0){return null}if(e&&f!==false){this.pos+=e[0].length}return e}},current:function(){return this.string.slice(this.start,this.pos)},hideFirstChars:function(b,a){this.lineStart+=b;try{return a()}finally{this.lineStart-=b}}};function ib(f,g,b,c){var d=[f.state.modeGen],e={};j2(f,g.text,f.doc.mode,b,function(k,j){return d.push(k,j)},e,c);var h=function(j){var l=f.state.overlays[j],k=1,m=0;j2(f,g.text,l.mode,true,function(r,p){var n=k;while(m<r){var q=d[k];if(q>r){d.splice(k,1,r,d[k+1],q)}k+=2;m=Math.min(r,q)}if(!p){return}if(l.opaque){d.splice(n,k-n,r,"overlay "+p);k=n+2}else{for(;n<k;n+=2){var o=d[n+1];d[n+1]=(o?o+" ":"")+"overlay "+p}}},e)};for(var a=0;a<f.state.overlays.length;++a){h(a)}return{styles:d,classes:e.bgClass||e.textClass?e:null}}function jG(e,d,a){if(!d.styles||d.styles[0]!=e.state.modeGen){var c=kM(e,m5(d));var b=ib(e,d,d.text.length>e.options.maxHighlightLength?nK(e.doc.mode,c):c);d.stateAfter=c;d.styles=b.styles;if(b.classes){d.styleClasses=b.classes}else{if(d.styleClasses){d.styleClasses=null}}if(a===e.doc.frontier){e.doc.frontier++}}return d.styles}function kM(e,a,g){var c=e.doc,d=e.display;if(!c.mode.startState){return true}var b=mv(e,a,g),f=b>c.first&&hm(c,b-1).stateAfter;if(!f){f=nR(c.mode)}else{f=nK(c.mode,f)}c.iter(b,a,function(h){k0(e,h.text,f);var j=b==a-1||b%5==0||b>=d.viewFrom&&b<d.viewTo;h.stateAfter=j?nK(c.mode,f):null;++b});if(g){c.frontier=b}return f}function k0(d,a,e,f){var b=d.doc.mode;var c=new hU(a,d.options.tabSize);c.start=c.pos=f||0;if(a==""){iz(b,e)}while(!c.eol()){jj(b,c,e);c.start=c.pos}}function iz(b,c){if(b.blankLine){return b.blankLine(c)}if(!b.innerMode){return}var a=hX(b,c);if(a.mode.blankLine){return a.mode.blankLine(a.state)}}function jj(a,b,c,f){for(var e=0;e<10;e++){if(f){f[0]=hX(a,c).mode}var d=a.token(b,c);if(b.pos>b.start){return d}}throw new Error("Mode "+a.name+" failed to advance stream.")}function j4(c,f,j,k){var d=function(n){return({start:b.start,end:b.pos,string:b.current(),type:l||null,state:n?nK(e.mode,m):m})};var e=c.doc,h=e.mode,l;f=i3(e,f);var a=hm(e,f.line),m=kM(c,f.line,j);var b=new hU(a.text,c.options.tabSize),g;if(k){g=[]}while((k||b.pos<f.ch)&&!b.eol()){b.start=b.pos;l=jj(h,b,m);if(k){g.push(d(true))}}return k?g:d()}function i8(c,d){if(c){for(;;){var b=c.match(/(?:^|\s+)line-(background-)?(\S+)/);if(!b){break}c=c.slice(0,b.index)+c.slice(b.index+b[0].length);var a=b[1]?"bgClass":"textClass";if(d[a]==null){d[a]=b[2]}else{if(!(new RegExp("(?:^|s)"+b[2]+"(?:$|s)")).test(d[a])){d[a]+=" "+b[2]}}}}return c}function j2(e,c,l,p,k,n,m){var o=l.flattenSpans;if(o==null){o=e.options.flattenSpans}var h=0,j=null;var d=new hU(c,e.options.tabSize),g;var a=e.options.addModeClass&&[null];if(c==""){i8(iz(l,p),n)}while(!d.eol()){if(d.pos>e.options.maxHighlightLength){o=false;if(m){k0(e,c,p,d.pos)}d.pos=c.length;g=null}else{g=i8(jj(l,d,p,a),n)}if(a){var b=a[0].name;if(b){g="m-"+(g?b+" "+g:b)}}if(!o||j!=g){while(h<d.start){h=Math.min(d.start,h+5000);k(h,j)}j=g}d.start=d.pos}while(h<d.pos){var f=Math.min(d.pos,h+5000);k(f,j);h=f}}function mv(e,b,h){var k,g,f=e.doc;var j=h?-1:b-(e.doc.mode.innerMode?1000:100);for(var a=b;a>j;--a){if(a<=f.first){return f.first}var c=hm(f,a-1);if(c.stateAfter&&(!h||a<=f.frontier)){return a}var d=mV(c.text,null,e.options.tabSize);if(g==null||k>d){g=a-1;k=d}}return g}function gW(b,c,a){this.text=b;mM(this,c);this.height=a?a(this):1}nA(gW);gW.prototype.lineNo=function(){return m5(this)};function hY(e,a,d,c){e.text=a;if(e.stateAfter){e.stateAfter=null}if(e.styles){e.styles=null}if(e.order!=null){e.order=null}hV(e);mM(e,d);var b=c?c(e):1;if(b!=e.height){gV(e,b)}}function nv(a){a.parent=null;hV(a)}var lE={};var nM={};function hO(b,c){if(!b||/^\s*$/.test(b)){return null}var a=c.addModeClass?nM:lE;return a[b]||(a[b]=b.replace(/\S+/g,"cm-$&"))}function j0(c,d){var e=gZ("span",null,null,mU?"padding-right: .1px":null);var f={pre:gZ("pre",[e],"CodeMirror-line"),content:e,col:0,pos:0,cm:c,trailingSpace:false,splitSpaces:(kj||mU)&&c.getOption("lineWrapping")};d.measure={};for(var g=0;g<=(d.rest?d.rest.length:0);g++){var a=g?d.rest[g-1]:d.line,h=void 0;f.pos=0;f.addToken=ke;if(m2(c.display.measure)&&(h=ld(a))){f.addToken=lF(f.addToken,h)}f.map=[];var j=d!=c.display.externalMeasured&&m5(a);lK(a,f,jG(c,a,j));if(a.styleClasses){if(a.styleClasses.bgClass){f.bgClass=g9(a.styleClasses.bgClass,f.bgClass||"")}if(a.styleClasses.textClass){f.textClass=g9(a.styleClasses.textClass,f.textClass||"")}}if(f.map.length==0){f.map.push(0,0,f.content.appendChild(lP(c.display.measure)))}if(g==0){d.measure.map=f.map;d.measure.cache={}}else{(d.measure.maps||(d.measure.maps=[])).push(f.map);(d.measure.caches||(d.measure.caches=[])).push({})}}if(mU){var b=f.content.lastChild;if(/\bcm-tab\b/.test(b.className)||(b.querySelector&&b.querySelector(".cm-tab"))){f.content.className="cm-tab-wrap-hack"}}n9(c,"renderLine",c,d.line,f.pre);if(f.pre.className){f.textClass=g9(f.pre.className,f.textClass||"")}return f}function hn(b){var a=gZ("span","\u2022","cm-invalidchar");a.title="\\u"+b.charCodeAt(0).toString(16);a.setAttribute("aria-label",a.title);return a}function ke(e,k,u,c,g,r,l){if(!k){return}var a=e.splitSpaces?ma(k,e.trailingSpace):k;var q=e.cm.state.specialChars,p=false;var b;if(!q.test(k)){e.col+=k.length;b=document.createTextNode(a);e.map.push(e.pos,e.pos+k.length,b);if(kj&&kH<9){p=true}e.pos+=k.length}else{b=document.createDocumentFragment();var n=0;while(true){q.lastIndex=n;var d=q.exec(k);var s=d?d.index-n:k.length-n;if(s){var h=document.createTextNode(a.slice(n,n+s));if(kj&&kH<9){b.appendChild(gZ("span",[h]))}else{b.appendChild(h)}e.map.push(e.pos,e.pos+s,h);e.col+=s;e.pos+=s}if(!d){break}n+=s+1;var t=void 0;if(d[0]=="\t"){var f=e.cm.options.tabSize,j=f-e.col%f;t=b.appendChild(gZ("span",j7(j),"cm-tab"));t.setAttribute("role","presentation");t.setAttribute("cm-text","\t");e.col+=j}else{if(d[0]=="\r"||d[0]=="\n"){t=b.appendChild(gZ("span",d[0]=="\r"?"\u240d":"\u2424","cm-invalidchar"));t.setAttribute("cm-text",d[0]);e.col+=1}else{t=e.cm.options.specialCharPlaceholder(d[0]);t.setAttribute("cm-text",d[0]);if(kj&&kH<9){b.appendChild(gZ("span",[t]))}else{b.appendChild(t)}e.col+=1}}e.map.push(e.pos,e.pos+1,t);e.pos++}}e.trailingSpace=a.charCodeAt(k.length-1)==32;if(u||c||g||p||l){var o=u||"";if(c){o+=c}if(g){o+=g}var m=gZ("span",[b],o,l);if(r){m.title=r}return e.content.appendChild(m)}e.content.appendChild(b)}function ma(a,b){if(a.length>1&&!/  /.test(a)){return a}var e=b,f="";for(var d=0;d<a.length;d++){var c=a.charAt(d);if(c==" "&&e&&(d==a.length-1||a.charCodeAt(d+1)==32)){c="\u00a0"}f+=c;e=c==" "}return f}function lF(b,a){return function(f,d,n,j,c,e,g){n=n?n+" cm-force-border":"cm-force-border";var m=f.pos,k=m+d.length;for(;;){var l=void 0;for(var h=0;h<a.length;h++){l=a[h];if(l.to>m&&l.from<=m){break}}if(l.to>=k){return b(f,d,n,j,c,e,g)}b(f,d.slice(0,l.to-m),n,j,null,e,g);j=null;d=d.slice(l.to-m);m=l.to}}}function ny(e,c,b,d){var a=!d&&b.widgetNode;if(a){e.map.push(e.pos,e.pos+c,a)}if(!d&&e.cm.display.input.needsContentAttribute){if(!a){a=e.content.appendChild(document.createElement("span"))}a.setAttribute("cm-marker",b.id)}if(a){e.cm.display.input.setUneditable(a);e.content.appendChild(a)}e.pos+=c;e.trailingSpace=false}function lK(d,A,e){var o=d.markedSpans,h=d.text,C=0;if(!o){for(var l=1;l<e.length;l+=2){A.addToken(A,h.slice(C,C=e[l]),hO(e[l+1],A.cm.options))}return}var w=h.length,q=0,x=1,a="",s,c;var k=0,v,m,D,g,t;for(;;){if(k==q){v=m=D=g=c="";t=null;k=Infinity;var j=[],f=void 0;for(var z=0;z<o.length;++z){var y=o[z],B=y.marker;if(B.type=="bookmark"&&y.from==q&&B.widgetNode){j.push(B)}else{if(y.from<=q&&(y.to==null||y.to>q||B.collapsed&&y.to==q&&y.from==q)){if(y.to!=null&&y.to!=q&&k>y.to){k=y.to;m=""}if(B.className){v+=" "+B.className}if(B.css){c=(c?c+";":"")+B.css}if(B.startStyle&&y.from==q){D+=" "+B.startStyle}if(B.endStyle&&y.to==k){(f||(f=[])).push(B.endStyle,y.to)}if(B.title&&!g){g=B.title}if(B.collapsed&&(!t||lW(t.marker,B)<0)){t=y}}else{if(y.from>q&&k>y.from){k=y.from}}}}if(f){for(var n=0;n<f.length;n+=2){if(f[n+1]==k){m+=" "+f[n]}}}if(!t||t.from==q){for(var p=0;p<j.length;++p){ny(A,0,j[p])}}if(t&&(t.from||0)==q){ny(A,(t.to==null?w+1:t.to)-q,t.marker,t.from==null);if(t.to==null){return}if(t.to==q){t=false}}}if(q>=w){break}var b=Math.min(w,k);while(true){if(a){var u=q+a.length;if(!t){var r=u>b?a.slice(0,b-q):a;A.addToken(A,r,s?s+v:v,D,q+r.length==k?m:"",g,c)}if(u>=b){a=a.slice(b-q);q=b;break}q=u;D=""}a=h.slice(C,C=e[x++]);s=hO(e[x++],A.cm.options)}}}function lk(b,a,c){this.line=a;this.rest=kW(a);this.size=this.rest?m5(ji(this.rest))-c+1:1;this.node=this.text=null;this.hidden=il(b,a)}function hQ(e,a,b){var c=[],f;for(var d=a;d<b;d=f){var g=new lk(e.doc,hm(e.doc,d),d);f=d+g.size;c.push(g)}return c}var lG=null;function js(a){if(lG){lG.ops.push(a)}else{a.ownsGroup=lG={ops:[a],delayedCallbacks:[]}}}function nb(b){var c=b.delayedCallbacks,d=0;do{for(;d<c.length;d++){c[d].call(null)}for(var e=0;e<b.ops.length;e++){var a=b.ops[e];if(a.cursorActivityHandlers){while(a.cursorActivityCalled<a.cursorActivityHandlers.length){a.cursorActivityHandlers[a.cursorActivityCalled++].call(null,a.cm)}}}}while(d<c.length)}function nX(b,c){var a=b.ownsGroup;if(!a){return}try{nb(a)}finally{lG=null;c(a)}}var nB=null;function nw(a,c){var g=h4(a,c);if(!g.length){return}var e=Array.prototype.slice.call(arguments,2),b;if(lG){b=lG.delayedCallbacks}else{if(nB){b=nB}else{b=nB=[];setTimeout(n1,0)}}var f=function(h){b.push(function(){return g[h].apply(null,e)})};for(var d=0;d<g.length;++d){f(d)}}function n1(){var b=nB;nB=null;for(var a=0;a<b.length;++a){b[a]()}}function nC(d,e,b,a){for(var f=0;f<e.changes.length;f++){var c=e.changes[f];if(c=="text"){iH(d,e)}else{if(c=="gutter"){jo(d,e,b,a)}else{if(c=="class"){kA(e)}else{if(c=="widget"){nc(d,e,a)}}}}}e.changes=null}function jd(a){if(a.node==a.text){a.node=gZ("div",null,null,"position: relative");if(a.text.parentNode){a.text.parentNode.replaceChild(a.node,a.text)}a.node.appendChild(a.text);if(kj&&kH<8){a.node.style.zIndex=2}}return a.node}function jA(c){var a=c.bgClass?c.bgClass+" "+(c.line.bgClass||""):c.line.bgClass;if(a){a+=" CodeMirror-linebackground"}if(c.background){if(a){c.background.className=a}else{c.background.parentNode.removeChild(c.background);c.background=null}}else{if(a){var b=jd(c);c.background=b.insertBefore(gZ("div",null,a),b.firstChild)}}}function lH(a,c){var b=a.display.externalMeasured;if(b&&b.line==c.line){a.display.externalMeasured=null;c.measure=b.measure;return b.built}return j0(a,c)}function iH(b,a){var d=a.text.className;var c=lH(b,a);if(a.text==a.node){a.node=c.pre}a.text.parentNode.replaceChild(c.pre,a.text);a.text=c.pre;if(c.bgClass!=a.bgClass||c.textClass!=a.textClass){a.bgClass=c.bgClass;a.textClass=c.textClass;kA(a)}else{if(d){a.text.className=d}}}function kA(b){jA(b);if(b.line.wrapClass){jd(b).className=b.line.wrapClass}else{if(b.node!=b.text){b.node.className=""}}var a=b.textClass?b.textClass+" "+(b.line.textClass||""):b.line.textClass;b.text.className=a||""}function jo(d,f,g,e){if(f.gutter){f.node.removeChild(f.gutter);f.gutter=null}if(f.gutterBackground){f.node.removeChild(f.gutterBackground);f.gutterBackground=null}if(f.line.gutterClass){var l=jd(f);f.gutterBackground=gZ("div",null,"CodeMirror-gutter-background "+f.line.gutterClass,("left: "+(d.options.fixedGutter?e.fixedPos:-e.gutterTotalWidth)+"px; width: "+(e.gutterTotalWidth)+"px"));l.insertBefore(f.gutterBackground,f.text)}var j=f.line.gutterMarkers;if(d.options.lineNumbers||j){var c=jd(f);var h=f.gutter=gZ("div",null,"CodeMirror-gutter-wrapper",("left: "+(d.options.fixedGutter?e.fixedPos:-e.gutterTotalWidth)+"px"));d.display.input.setUneditable(h);c.insertBefore(h,f.text);if(f.line.gutterClass){h.className+=" "+f.line.gutterClass}if(d.options.lineNumbers&&(!j||!j["CodeMirror-linenumbers"])){f.lineNumber=h.appendChild(gZ("div",jF(d.options,g),"CodeMirror-linenumber CodeMirror-gutter-elt",("left: "+(e.gutterLeft["CodeMirror-linenumbers"])+"px; width: "+(d.display.lineNumInnerWidth)+"px")))}if(j){for(var k=0;k<d.options.gutters.length;++k){var b=d.options.gutters[k],a=j.hasOwnProperty(b)&&j[b];if(a){h.appendChild(gZ("div",[a],"CodeMirror-gutter-elt",("left: "+(e.gutterLeft[b])+"px; width: "+(e.gutterWidth[b])+"px")))}}}}}function nc(c,e,a){if(e.alignable){e.alignable=null}for(var b=e.node.firstChild,d=void 0;b;b=d){d=b.nextSibling;if(b.className=="CodeMirror-linewidget"){e.node.removeChild(b)}}it(c,e,a)}function n8(c,d,b,a){var e=lH(c,d);d.text=d.node=e.pre;if(e.bgClass){d.bgClass=e.bgClass}if(e.textClass){d.textClass=e.textClass}kA(d);jo(c,d,b,a);it(c,d,a);return d.node}function it(d,b,a){gX(d,b.line,b,a,true);if(b.rest){for(var c=0;c<b.rest.length;c++){gX(d,b.rest[c],b,a,false)}}}function gX(b,a,e,c,g){if(!a.widgets){return}var k=jd(e);for(var h=0,d=a.widgets;h<d.length;++h){var f=d[h],j=gZ("div",[f.node],"CodeMirror-linewidget");if(!f.handleMouseEvents){j.setAttribute("cm-ignore-events","true")}no(f,j,e,c);b.display.input.setUneditable(j);if(g&&f.above){k.insertBefore(j,e.gutter||e.text)}else{k.appendChild(j)}nw(f,"redraw")}}function no(c,d,b,a){if(c.noHScroll){(b.alignable||(b.alignable=[])).push(d);var e=a.wrapperWidth;d.style.left=a.fixedPos+"px";if(!c.coverGutter){e-=a.gutterTotalWidth;d.style.paddingLeft=a.gutterTotalWidth+"px"}d.style.width=e+"px"}if(c.coverGutter){d.style.zIndex=5;d.style.position="relative";if(!c.noHScroll){d.style.marginLeft=-a.gutterTotalWidth+"px"}}}function m0(b){if(b.height!=null){return b.height}var a=b.doc.cm;if(!a){return 0}if(!hR(document.body,b.node)){var c="position: relative;";if(b.coverGutter){c+="margin-left: -"+a.display.gutters.offsetWidth+"px;"}if(b.noHScroll){c+="width: "+a.display.wrapper.clientWidth+"px;"}mR(a.display.measure,gZ("div",[b.node],null,c))}return b.height=b.node.parentNode.offsetHeight}function my(c,a){for(var b=mb(a);b!=c.wrapper;b=b.parentNode){if(!b||(b.nodeType==1&&b.getAttribute("cm-ignore-events")=="true")||(b.parentNode==c.sizer&&b!=c.mover)){return true}}}function hs(a){return a.lineSpace.offsetTop}function ni(a){return a.mover.offsetHeight-a.lineSpace.offsetHeight}function hw(b){if(b.cachedPaddingH){return b.cachedPaddingH}var c=mR(b.measure,gZ("pre","x"));var a=window.getComputedStyle?window.getComputedStyle(c):c.currentStyle;var d={left:parseInt(a.paddingLeft),right:parseInt(a.paddingRight)};if(!isNaN(d.left)&&!isNaN(d.right)){b.cachedPaddingH=d}return d}function lh(a){return ko-a.display.nativeBarWidth}function i4(a){return a.display.scroller.clientWidth-lh(a)-a.display.barWidth}function m8(a){return a.display.scroller.clientHeight-lh(a)-a.display.barHeight}function kD(c,g,d){var h=c.options.lineWrapping;var f=h&&i4(c);if(!g.measure.heights||h&&g.measure.width!=f){var e=g.measure.heights=[];if(h){g.measure.width=f;var a=g.text.firstChild.getClientRects();for(var k=0;k<a.length-1;k++){var b=a[k],j=a[k+1];if(Math.abs(b.bottom-j.bottom)>2){e.push((b.bottom+j.top)/2-d.top)}}}e.push(d.bottom-d.top)}}function jT(c,e,b){if(c.line==e){return{map:c.measure.map,cache:c.measure.cache}}for(var d=0;d<c.rest.length;d++){if(c.rest[d]==e){return{map:c.measure.maps[d],cache:c.measure.caches[d]}}}for(var a=0;a<c.rest.length;a++){if(m5(c.rest[a])>b){return{map:c.measure.maps[a],cache:c.measure.caches[a],before:true}}}}function mP(c,d){d=jV(d);var a=m5(d);var e=c.display.externalMeasured=new lk(c.doc,d,a);e.lineN=a;var b=e.built=j0(c,e);e.text=b.pre;mR(c.display.lineMeasure,b.pre);return e}function ic(b,d,a,c){return mB(b,gP(b,d),a,c)}function hp(a,b){if(b>=a.display.viewFrom&&b<a.display.viewTo){return a.display.view[iR(a,b)]}var c=a.display.externalMeasured;if(c&&b>=c.lineN&&b<c.lineN+c.size){return c}}function gP(c,d){var b=m5(d);var e=hp(c,b);if(e&&!e.text){e=null}else{if(e&&e.changes){nC(c,e,b,ho(c));c.curOp.forceUpdate=true}}if(!e){e=mP(c,d)}var a=jT(e,d,b);return{line:d,view:e,rect:null,map:a.map,cache:a.cache,before:a.before,hasHeights:false}}function mB(e,a,c,g,d){if(a.before){c=-1}var f=c+(g||""),b;if(a.cache.hasOwnProperty(f)){b=a.cache[f]}else{if(!a.rect){a.rect=a.view.text.getBoundingClientRect()}if(!a.hasHeights){kD(e,a.view,a.rect);a.hasHeights=true}b=kL(e,a,c,g);if(!b.bogus){a.cache[f]=b}}return{left:b.left,right:b.right,top:d?b.rtop:b.top,bottom:d?b.rbottom:b.bottom}}var jk={left:0,right:0,top:0,bottom:0};function n3(a,k,d){var h,j,f,c,g,b;for(var e=0;e<a.length;e+=3){g=a[e];b=a[e+1];if(k<g){j=0;f=1;c="left"}else{if(k<b){j=k-g;f=j+1}else{if(e==a.length-3||k==b&&a[e+3]>k){f=b-g;j=f-1;if(k>=b){c="right"}}}}if(j!=null){h=a[e+2];if(g==b&&d==(h.insertLeft?"left":"right")){c=d}if(d=="left"&&j==0){while(e&&a[e-2]==a[e-3]&&a[e-1].insertLeft){h=a[(e-=3)+2];c="left"}}if(d=="right"&&j==b-g){while(e<a.length-3&&a[e+3]==a[e+4]&&!a[e+5].insertLeft){h=a[(e+=3)+2];c="right"}}break}}return{node:h,start:j,end:f,collapse:c,coverStart:g,coverEnd:b}}function hW(d,e){var b=jk;if(e=="left"){for(var c=0;c<d.length;c++){if((b=d[c]).left!=b.right){break}}}else{for(var a=d.length-1;a>=0;a--){if((b=d[a]).left!=b.right){break}}}return b}function kL(g,s,d,k){var f=n3(s.map,d,k);var u=f.node,l=f.start,m=f.end,p=f.collapse;var o;if(u.nodeType==3){for(var j=0;j<4;j++){while(l&&iB(s.line.text.charAt(f.coverStart+l))){--l}while(f.coverStart+m<f.coverEnd&&iB(s.line.text.charAt(f.coverStart+m))){++m}if(kj&&kH<9&&l==0&&m==f.coverEnd-f.coverStart){o=u.parentNode.getBoundingClientRect()}else{o=hW(ki(u,l,m).getClientRects(),k)}if(o.left||o.right||l==0){break}m=l;l=l-1;p="right"}if(kj&&kH<11){o=kk(g.display.measure,o)}}else{if(l>0){p=k="right"}var n;if(g.options.lineWrapping&&(n=u.getClientRects()).length>1){o=n[k=="right"?n.length-1:0]}else{o=u.getBoundingClientRect()}}if(kj&&kH<9&&!l&&(!o||!o.left&&!o.right)){var h=u.parentNode.getClientRects()[0];if(h){o={left:h.left,right:h.left+kJ(g.display),top:h.top,bottom:h.bottom}}else{o=jk}}var a=o.top-s.rect.top,c=o.bottom-s.rect.top;var q=(a+c)/2;var r=s.view.measure.heights;var t=0;for(;t<r.length-1;t++){if(q<r[t]){break}}var v=t?r[t-1]:0,b=r[t];var e={left:(p=="right"?o.right:o.left)-s.rect.left,right:(p=="left"?o.left:o.right)-s.rect.left,top:v,bottom:b};if(!o.left&&!o.right){e.bogus=true}if(!g.options.singleCursorHeightPerLine){e.rtop=a;e.rbottom=c}return e}function kk(c,b){if(!window.screen||screen.logicalXDPI==null||screen.logicalXDPI==screen.deviceXDPI||!n2(c)){return b}var d=screen.logicalXDPI/screen.deviceXDPI;var a=screen.logicalYDPI/screen.deviceYDPI;return{left:b.left*d,right:b.right*d,top:b.top*a,bottom:b.bottom*a}}function mS(a){if(a.measure){a.measure.cache={};a.measure.heights=null;if(a.rest){for(var b=0;b<a.rest.length;b++){a.measure.caches[b]={}}}}}function nZ(b){b.display.externalMeasure=null;iN(b.display.lineMeasure);for(var a=0;a<b.display.view.length;a++){mS(b.display.view[a])}}function nm(a){nZ(a);a.display.cachedCharWidth=a.display.cachedTextHeight=a.display.cachedPaddingH=null;if(!a.options.lineWrapping){a.display.maxLineChanged=true}a.display.lineNumChars=null}function jQ(){return window.pageXOffset||(document.documentElement||document.body).scrollLeft}function jW(){return window.pageYOffset||(document.documentElement||document.body).scrollTop}function j8(c,f,d,j,g){if(!g&&f.widgets){for(var h=0;h<f.widgets.length;++h){if(f.widgets[h].above){var a=m0(f.widgets[h]);d.top+=a;d.bottom+=a}}}if(j=="line"){return d}if(!j){j="local"}var e=m7(f);if(j=="local"){e+=hs(c.display)}else{e-=c.display.viewOffset}if(j=="page"||j=="window"){var k=c.display.lineSpace.getBoundingClientRect();e+=k.top+(j=="window"?0:jW());var b=k.left+(j=="window"?0:jQ());d.left+=b;d.right+=b}d.top+=e;d.bottom+=e;return d}function hI(g,c,f){if(f=="div"){return c}var a=c.left,b=c.top;if(f=="page"){a-=jQ();b-=jW()}else{if(f=="local"||!f){var e=g.display.sizer.getBoundingClientRect();a+=e.left;b+=e.top}}var d=g.display.lineSpace.getBoundingClientRect();return{left:a-d.left,top:b-d.top}}function lU(c,a,b,d,e){if(!d){d=hm(c.doc,a.line)}return j8(c,d,ic(c,d,a.ch,e),b)}function lL(d,e,l,g,a,f){g=g||hm(d.doc,e.line);if(!a){a=gP(d,g)}function j(n,o){var p=mB(d,a,n,o?"right":"left",f);if(o){p.left=p.right}else{p.right=p.left}return j8(d,g,p,l)}function b(n,q){var p=h[q],o=p.level%2;if(n==kT(p)&&q&&p.level<h[q-1].level){p=h[--q];n=hJ(p)-(p.level%2?0:1);o=true}else{if(n==hJ(p)&&q<h.length-1&&p.level<h[q+1].level){p=h[++q];n=kT(p)-p.level%2;o=false}}if(o&&n==p.to&&n>p.from){return j(n-1)}return j(n,o)}var h=ld(g),c=e.ch;if(!h){return j(c)}var m=n6(h,c);var k=b(c,m);if(hz!=null){k.other=b(c,hz)}return k}function kw(c,a){var b=0;a=i3(c.doc,a);if(!c.options.lineWrapping){b=kJ(c.display)*a.ch}var e=hm(c.doc,a.line);var d=m7(e)+hs(c.display);return{left:b,right:b,top:d,bottom:d+e.height}}function g1(c,e,d,a){var b=lA(c,e);b.xRel=a;if(d){b.outside=true}return b}function hg(d,g,h){var e=d.doc;h+=d.display.viewOffset;if(h<0){return g1(e.first,0,true,-1)}var j=nj(e,h),c=e.first+e.size-1;if(j>c){return g1(e.first+e.size-1,hm(e,c).text.length,true,1)}if(g<0){g=0}var k=hm(e,j);for(;;){var b=mX(d,k,j,g,h);var f=jy(k);var a=f&&f.find(0,true);if(f&&(b.ch>a.from.ch||b.ch==a.from.ch&&b.xRel>0)){j=m5(k=a.to.line)}else{return b}}}function mX(e,r,m,c,d){var f=d-m7(r);var k=false,y=2*e.display.wrapper.clientWidth;var B=gP(e,r);function q(C){var D=lL(e,lA(m,C),"line",r,B);k=true;if(f>D.bottom){return D.left-y}else{if(f<D.top){return D.left+y}else{k=false}}return D.left}var a=ld(r),z=r.text.length;var x=md(r),p=lj(r);var A=q(x),t=k,s=q(p),l=k;if(c>s){return g1(m,p,l,1)}for(;;){if(a?p==x||p==ka(r,x,1):p-x<=1){var b=c<A||c-A<=s-c?x:p;var o=b==x?t:l;var u=c-(b==x?A:s);if(l&&!a&&!/\s/.test(r.text.charAt(b))&&u>0&&b<r.text.length&&B.view.measure.heights.length>1){var w=mB(e,B,b,"right");if(f<=w.bottom&&f>=w.top&&Math.abs(c-w.right)<u){o=false;b++;u=c-w.right}}while(iB(r.text.charAt(b))){++b}var g=g1(m,b,o,u<-1?-1:u>1?1:0);return g}var h=Math.ceil(z/2),j=x+h;if(a){j=x;for(var v=0;v<h;++v){j=ka(r,j,1)}}var n=q(j);if(n>c){p=j;s=n;if(l=k){s+=1000}z=h}else{x=j;A=n;t=k;z-=h}}}var n7;function nF(a){if(a.cachedTextHeight!=null){return a.cachedTextHeight}if(n7==null){n7=gZ("pre");for(var b=0;b<49;++b){n7.appendChild(document.createTextNode("x"));n7.appendChild(gZ("br"))}n7.appendChild(document.createTextNode("x"))}mR(a.measure,n7);var c=n7.offsetHeight/50;if(c>3){a.cachedTextHeight=c}iN(a.measure);return c||1}function kJ(a){if(a.cachedCharWidth!=null){return a.cachedCharWidth}var c=gZ("span","xxxxxxxxxx");var b=gZ("pre",[c]);mR(a.measure,b);var d=c.getBoundingClientRect(),e=(d.right-d.left)/10;if(e>2){a.cachedCharWidth=e}return e||10}function ho(g){var b=g.display,d={},e={};var c=b.gutters.clientLeft;for(var a=b.gutters.firstChild,f=0;a;a=a.nextSibling,++f){d[g.options.gutters[f]]=a.offsetLeft+a.clientLeft+c;e[g.options.gutters[f]]=a.clientWidth}return{fixedPos:lw(b),gutterTotalWidth:b.gutters.offsetWidth,gutterLeft:d,gutterWidth:e,wrapperWidth:b.wrapper.clientWidth}}function lw(a){return a.scroller.getBoundingClientRect().left-a.sizer.getBoundingClientRect().left}function mp(b){var c=nF(b.display),d=b.options.lineWrapping;var a=d&&Math.max(5,b.display.scroller.clientWidth/kJ(b.display)-3);return function(f){if(il(b.doc,f)){return 0}var g=0;if(f.widgets){for(var e=0;e<f.widgets.length;e++){if(f.widgets[e].height){g+=f.widgets[e].height}}}if(d){return g+(Math.ceil(f.text.length/a)||1)*c}else{return g+c}}}function lr(a){var b=a.doc,c=mp(a);b.iter(function(e){var d=c(e);if(d!=e.height){gV(e,d)}})}function kg(b,h,l,k){var g=b.display;if(!l&&mb(h).getAttribute("cm-not-content")=="true"){return null}var d,f,c=g.lineSpace.getBoundingClientRect();try{d=h.clientX-c.left;f=h.clientY-c.top}catch(h){return null}var e=hg(b,d,f),a;if(k&&e.xRel==1&&(a=hm(b.doc,e.line).text).length==e.ch){var j=mV(a,a.length,b.options.tabSize)-a.length;e=lA(e.line,Math.max(0,Math.round((d-hw(b.display).left)/kJ(b.display))-j))}return e}function iR(d,a){if(a>=d.display.viewTo){return null}a-=d.display.viewFrom;if(a<0){return null}var c=d.display.view;for(var b=0;b<c.length;b++){a-=c[b].size;if(a<0){return b}}}function nu(a){a.display.input.showSelection(a.display.input.prepareSelection())}function i9(c,j){var d=c.doc,a={};var e=a.cursors=document.createDocumentFragment();var h=a.selection=document.createDocumentFragment();for(var f=0;f<d.sel.ranges.length;f++){if(j===false&&f==d.sel.primIndex){continue}var b=d.sel.ranges[f];if(b.from().line>=c.display.viewTo||b.to().line<c.display.viewFrom){continue}var g=b.empty();if(g||c.options.showCursorWhenSelecting){mE(c,b.head,e)}if(!g){ns(c,b,h)}}return a}function mE(d,c,e){var a=lL(d,c,"div",null,null,!d.options.singleCursorHeightPerLine);var b=e.appendChild(gZ("div","\u00a0","CodeMirror-cursor"));b.style.left=a.left+"px";b.style.top=a.top+"px";b.style.height=Math.max(0,a.bottom-a.top)*d.options.cursorHeight+"px";if(a.other){var f=e.appendChild(gZ("div","\u00a0","CodeMirror-cursor CodeMirror-secondarycursor"));f.style.display="";f.style.left=a.other.left+"px";f.style.top=a.other.top+"px";f.style.height=(a.other.bottom-a.other.top)*0.85+"px"}}function ns(l,m,k){var c=l.display,r=l.doc;var q=document.createDocumentFragment();var f=hw(l.display),n=f.left;var b=Math.max(c.sizerWidth,i4(l)-c.sizer.offsetLeft)-f.right;function e(t,u,v,w){if(u<0){u=0}u=Math.round(u);w=Math.round(w);q.appendChild(gZ("div",null,"CodeMirror-selected",("position: absolute; left: "+t+"px;\n                             top: "+u+"px; width: "+(v==null?b-t:v)+"px;\n                             height: "+(w-u)+"px")))}function p(y,w,t){var x=hm(r,y);var v=x.text.length;var A,z;function u(B,C){return lU(l,lA(y,B),"div",x,C)}iG(ld(x),w||0,t==null?v:t,function(B,C,I){var F=u(B,"left"),E,D,G;if(B==C){E=F;D=G=F.left}else{E=u(C-1,"right");if(I=="rtl"){var H=F;F=E;E=H}D=F.left;G=E.right}if(w==null&&B==0){D=n}if(E.top-F.top>3){e(D,F.top,null,F.bottom);D=n;if(F.bottom<E.top){e(D,F.bottom,null,E.top)}}if(t==null&&C==v){G=b}if(!A||F.top<A.top||F.top==A.top&&F.left<A.left){A=F}if(!z||E.bottom>z.bottom||E.bottom==z.bottom&&E.right>z.right){z=E}if(D<n+1){D=n}e(D,E.top,G-D,E.bottom)});return{start:A,end:z}}var s=m.from(),a=m.to();if(s.line==a.line){p(s.line,s.ch,a.ch)}else{var o=hm(r,s.line),h=hm(r,a.line);var j=jV(o)==jV(h);var g=p(s.line,s.ch,j?o.text.length+1:null).end;var d=p(a.line,j?0:null,a.ch).start;if(j){if(g.top<d.top-2){e(g.right,g.top,null,g.bottom);e(n,d.top,d.left,d.bottom)}else{e(g.right,g.top,d.left-g.right,g.bottom)}}if(g.bottom<d.top){e(n,g.bottom,null,d.top)}}k.appendChild(q)}function ku(a){if(!a.state.focused){return}var b=a.display;clearInterval(b.blinker);var c=true;b.cursorDiv.style.visibility="";if(a.options.cursorBlinkRate>0){b.blinker=setInterval(function(){return b.cursorDiv.style.visibility=(c=!c)?"":"hidden"},a.options.cursorBlinkRate)}else{if(a.options.cursorBlinkRate<0){b.cursorDiv.style.visibility="hidden"}}}function kh(a){if(!a.state.focused){a.display.input.focus();mm(a)}}function nk(a){a.state.delayingBlurEvent=true;setTimeout(function(){if(a.state.delayingBlurEvent){a.state.delayingBlurEvent=false;nL(a)}},100)}function mm(a,b){if(a.state.delayingBlurEvent){a.state.delayingBlurEvent=false}if(a.options.readOnly=="nocursor"){return}if(!a.state.focused){n9(a,"focus",a,b);a.state.focused=true;h6(a.display.wrapper,"CodeMirror-focused");if(!a.curOp&&a.display.selForContextMenu!=a.doc.sel){a.display.input.reset();if(mU){setTimeout(function(){return a.display.input.reset(true)},20)}}a.display.input.receivedFocus()}ku(a)}function nL(a,b){if(a.state.delayingBlurEvent){return}if(a.state.focused){n9(a,"blur",a,b);a.state.focused=false;kS(a.display.wrapper,"CodeMirror-focused")}clearInterval(a.display.blinker);setTimeout(function(){if(!a.state.focused){a.display.shift=false}},150)}function ja(a){var c=a.display,b=c.view;if(!c.alignWidgets&&(!c.gutters.firstChild||!a.options.fixedGutter)){return}var e=lw(c)-c.scroller.scrollLeft+a.doc.scrollLeft;var j=c.gutters.offsetWidth,h=e+"px";for(var f=0;f<b.length;f++){if(!b[f].hidden){if(a.options.fixedGutter){if(b[f].gutter){b[f].gutter.style.left=h}if(b[f].gutterBackground){b[f].gutterBackground.style.left=h}}var d=b[f].alignable;if(d){for(var g=0;g<d.length;g++){d[g].style.left=h}}}}if(a.options.fixedGutter){c.gutters.style.left=(e+j)+"px"}}function iE(e){if(!e.options.lineNumbers){return false}var b=e.doc,g=jF(e.options,b.first+b.size-1),c=e.display;if(g.length!=c.lineNumChars){var a=c.measure.appendChild(gZ("div",[gZ("div",g)],"CodeMirror-linenumber CodeMirror-gutter-elt"));var f=a.firstChild.offsetWidth,d=a.offsetWidth-f;c.lineGutter.style.width="";c.lineNumInnerWidth=Math.max(f,c.lineGutter.offsetWidth-d)+1;c.lineNumWidth=c.lineNumInnerWidth+d;c.lineNumChars=c.lineNumInnerWidth?g.length:-1;c.lineGutter.style.width=c.lineNumWidth+"px";jO(e);return true}return false}function i(c){var e=c.display;var j=e.lineDiv.offsetTop;for(var h=0;h<e.view.length;h++){var b=e.view[h],a=void 0;if(b.hidden){continue}if(kj&&kH<8){var f=b.node.offsetTop+b.node.offsetHeight;a=f-j;j=f}else{var g=b.node.getBoundingClientRect();a=g.bottom-g.top}var d=b.line.height-a;if(a<2){a=nF(e)}if(d>0.001||d<-0.001){gV(b.line,a);kX(b.line);if(b.rest){for(var k=0;k<b.rest.length;k++){kX(b.rest[k])}}}}}function kX(b){if(b.widgets){for(var a=0;a<b.widgets.length;++a){b.widgets[a].height=b.widgets[a].node.parentNode.offsetHeight}}}function lc(g,c,h){var f=h&&h.top!=null?Math.max(0,h.top):g.scroller.scrollTop;f=Math.floor(f-hs(g));var a=h&&h.bottom!=null?h.bottom:f+g.wrapper.clientHeight;var e=nj(c,f),d=nj(c,a);if(h&&h.ensure){var j=h.ensure.from.line,b=h.ensure.to.line;if(j<e){e=j;d=nj(c,m7(hm(c,j))+g.wrapper.clientHeight)}else{if(Math.min(b,c.lastLine())>=d){e=nj(c,m7(hm(c,b))-g.wrapper.clientHeight);d=b}}}return{from:e,to:Math.max(d,e+1)}}function l4(a,b){if(Math.abs(a.doc.scrollTop-b)<2){return}a.doc.scrollTop=b;if(!kc){lN(a,{top:b})}if(a.display.scroller.scrollTop!=b){a.display.scroller.scrollTop=b}a.display.scrollbars.setScrollTop(b);if(kc){lN(a)}ij(a,100)}function nq(a,b,c){if(c?b==a.doc.scrollLeft:Math.abs(a.doc.scrollLeft-b)<2){return}b=Math.min(b,a.display.scroller.scrollWidth-a.display.scroller.clientWidth);a.doc.scrollLeft=b;ja(a);if(a.display.scroller.scrollLeft!=b){a.display.scroller.scrollLeft=b}a.display.scrollbars.setScrollLeft(b)}var iF=0;var kG=null;if(kj){kG=-0.53}else{if(kc){kG=15}else{if(ju){kG=-0.7}else{if(ob){kG=-1/3}}}}function ls(b){var c=b.wheelDeltaX,a=b.wheelDeltaY;if(c==null&&b.detail&&b.axis==b.HORIZONTAL_AXIS){c=b.detail}if(a==null&&b.detail&&b.axis==b.VERTICAL_AXIS){a=b.detail}else{if(a==null){a=b.wheelDelta}}return{x:c,y:a}}function mF(a){var b=ls(a);b.x*=kG;b.y*=kG;return b}function k8(e,l){var c=ls(l),a=c.x,b=c.y;var j=e.display,f=j.scroller;var m=f.scrollWidth>f.clientWidth;var n=f.scrollHeight>f.clientHeight;if(!(a&&m||b&&n)){return}if(b&&k9&&mU){outer:for(var d=l.target,g=j.view;d!=f;d=d.parentNode){for(var o=0;o<g.length;o++){if(g[o].node==d){e.display.currentWheelTarget=d;break outer}}}}if(a&&!kc&&!iL&&kG!=null){if(b&&n){l4(e,Math.max(0,Math.min(f.scrollTop+b*kG,f.scrollHeight-f.clientHeight)))}nq(e,Math.max(0,Math.min(f.scrollLeft+a*kG,f.scrollWidth-f.clientWidth)));if(!b||(b&&n)){l7(l)}j.wheelStartX=null;return}if(b&&kG!=null){var p=b*kG;var h=e.doc.scrollTop,k=h+j.wrapper.clientHeight;if(p<0){h=Math.max(0,h+p-50)}else{k=Math.min(e.doc.height,k+p+50)}lN(e,{top:h,bottom:k})}if(iF<20){if(j.wheelStartX==null){j.wheelStartX=f.scrollLeft;j.wheelStartY=f.scrollTop;j.wheelDX=a;j.wheelDY=b;setTimeout(function(){if(j.wheelStartX==null){return}var s=f.scrollLeft-j.wheelStartX;var q=f.scrollTop-j.wheelStartY;var r=(q&&j.wheelDY&&q/j.wheelDY)||(s&&j.wheelDX&&s/j.wheelDX);j.wheelStartX=j.wheelStartY=null;if(!r){return}kG=(kG*iF+r)/(iF+1);++iF},200)}else{j.wheelDX+=a;j.wheelDY+=b}}}function kR(b){var a=b.display,c=a.gutters.offsetWidth;var d=Math.round(b.doc.height+ni(b.display));return{clientHeight:a.scroller.clientHeight,viewHeight:a.wrapper.clientHeight,scrollWidth:a.scroller.scrollWidth,clientWidth:a.scroller.clientWidth,viewWidth:a.wrapper.clientWidth,barLeft:b.options.fixedGutter?c:0,docHeight:d,scrollHeight:d+lh(b)+a.barHeight,nativeBarWidth:a.nativeBarWidth,gutterWidth:c}}function i7(d,e,c){this.cm=c;var b=this.vert=gZ("div",[gZ("div",null,null,"min-width: 1px")],"CodeMirror-vscrollbar");var a=this.horiz=gZ("div",[gZ("div",null,null,"height: 100%; min-height: 1px")],"CodeMirror-hscrollbar");d(b);d(a);nY(b,"scroll",function(){if(b.clientHeight){e(b.scrollTop,"vertical")}});nY(a,"scroll",function(){if(a.clientWidth){e(a.scrollLeft,"horizontal")}});this.checkedZeroWidth=false;if(kj&&kH<8){this.horiz.style.minHeight=this.vert.style.minWidth="18px"}}i7.prototype=n0({update:function(d){var b=d.scrollWidth>d.clientWidth+1;var e=d.scrollHeight>d.clientHeight+1;var a=d.nativeBarWidth;if(e){this.vert.style.display="block";this.vert.style.bottom=b?a+"px":"0";var f=d.viewHeight-(b?a:0);this.vert.firstChild.style.height=Math.max(0,d.scrollHeight-d.clientHeight+f)+"px"}else{this.vert.style.display="";this.vert.firstChild.style.height="0"}if(b){this.horiz.style.display="block";this.horiz.style.right=e?a+"px":"0";this.horiz.style.left=d.barLeft+"px";var c=d.viewWidth-d.barLeft-(e?a:0);this.horiz.firstChild.style.width=(d.scrollWidth-d.clientWidth+c)+"px"}else{this.horiz.style.display="";this.horiz.firstChild.style.width="0"}if(!this.checkedZeroWidth&&d.clientHeight>0){if(a==0){this.zeroWidthHack()}this.checkedZeroWidth=true}return{right:e?a:0,bottom:b?a:0}},setScrollLeft:function(a){if(this.horiz.scrollLeft!=a){this.horiz.scrollLeft=a}if(this.disableHoriz){this.enableZeroWidthBar(this.horiz,this.disableHoriz)}},setScrollTop:function(a){if(this.vert.scrollTop!=a){this.vert.scrollTop=a}if(this.disableVert){this.enableZeroWidthBar(this.vert,this.disableVert)}},zeroWidthHack:function(){var a=k9&&!jI?"12px":"18px";this.horiz.style.height=this.vert.style.width=a;this.horiz.style.pointerEvents=this.vert.style.pointerEvents="none";this.disableHoriz=new hA;this.disableVert=new hA},enableZeroWidthBar:function(c,a){c.style.pointerEvents="auto";function b(){var d=c.getBoundingClientRect();var e=document.elementFromPoint(d.left+1,d.bottom-1);if(e!=c){c.style.pointerEvents="none"}else{a.set(1000,b)}}a.set(1000,b)},clear:function(){var a=this.horiz.parentNode;a.removeChild(this.horiz);a.removeChild(this.vert)}},i7.prototype);function hy(){}hy.prototype=n0({update:function(){return{bottom:0,right:0}},setScrollLeft:function(){},setScrollTop:function(){},clear:function(){}},hy.prototype);function hK(c,a){if(!a){a=kR(c)}var d=c.display.barWidth,e=c.display.barHeight;nN(c,a);for(var b=0;b<4&&d!=c.display.barWidth||e!=c.display.barHeight;b++){if(d!=c.display.barWidth&&c.options.lineWrapping){i(c)}nN(c,kR(c));d=c.display.barWidth;e=c.display.barHeight}}function nN(b,d){var a=b.display;var c=a.scrollbars.update(d);a.sizer.style.paddingRight=(a.barWidth=c.right)+"px";a.sizer.style.paddingBottom=(a.barHeight=c.bottom)+"px";a.heightForcer.style.borderBottom=c.bottom+"px solid transparent";if(c.right&&c.bottom){a.scrollbarFiller.style.display="block";a.scrollbarFiller.style.height=c.bottom+"px";a.scrollbarFiller.style.width=c.right+"px"}else{a.scrollbarFiller.style.display=""}if(c.bottom&&b.options.coverGutterNextToScrollbar&&b.options.fixedGutter){a.gutterFiller.style.display="block";a.gutterFiller.style.height=c.bottom+"px";a.gutterFiller.style.width=d.gutterWidth+"px"}else{a.gutterFiller.style.display=""}}var lX={"native":i7,"null":hy};function oa(a){if(a.display.scrollbars){a.display.scrollbars.clear();if(a.display.scrollbars.addClass){kS(a.display.wrapper,a.display.scrollbars.addClass)}}a.display.scrollbars=new lX[a.options.scrollbarStyle](function(b){a.display.wrapper.insertBefore(b,a.display.scrollbarFiller);nY(b,"mousedown",function(){if(a.state.focused){setTimeout(function(){return a.display.input.focus()},0)}});b.setAttribute("cm-not-content","true")},function(b,c){if(c=="horizontal"){nq(a,b)}else{l4(a,b)}},a);if(a.display.scrollbars.addClass){h6(a.display.wrapper,a.display.scrollbars.addClass)}}function iD(f,b){if(nT(f,"scrollCursorIntoView")){return}var a=f.display,e=a.sizer.getBoundingClientRect(),d=null;if(b.top+e.top<0){d=true}else{if(b.bottom+e.top>(window.innerHeight||document.documentElement.clientHeight)){d=false}}if(d!=null&&!iq){var c=gZ("div","\u200b",null,("position: absolute;\n                         top: "+(b.top-a.viewOffset-hs(f.display))+"px;\n                         height: "+(b.bottom-b.top+lh(f)+a.barHeight)+"px;\n                         left: "+(b.left)+"px; width: 2px;"));f.display.lineSpace.appendChild(c);c.scrollIntoView(d);f.display.lineSpace.removeChild(c)}}function mx(a,d,h,j){if(j==null){j=0}var b;for(var g=0;g<5;g++){var f=false;b=lL(a,d);var c=!h||h==d?b:lL(a,h);var k=mn(a,Math.min(b.left,c.left),Math.min(b.top,c.top)-j,Math.max(b.left,c.left),Math.max(b.bottom,c.bottom)+j);var e=a.doc.scrollTop,l=a.doc.scrollLeft;if(k.scrollTop!=null){l4(a,k.scrollTop);if(Math.abs(a.doc.scrollTop-e)>1){f=true}}if(k.scrollLeft!=null){nq(a,k.scrollLeft);if(Math.abs(a.doc.scrollLeft-l)>1){f=true}}if(!f){break}}return b}function mt(d,e,b,f,c){var a=mn(d,e,b,f,c);if(a.scrollTop!=null){l4(d,a.scrollTop)}if(a.scrollLeft!=null){nq(d,a.scrollLeft)}}function mn(d,o,e,q,f){var j=d.display,l=nF(d.display);if(e<0){e=0}var n=d.curOp&&d.curOp.scrollTop!=null?d.curOp.scrollTop:j.scroller.scrollTop;var b=m8(d),r={};if(f-e>b){f=e+b}var p=d.doc.height+ni(j);var h=e<l,k=f>p-l;if(e<n){r.scrollTop=h?0:e}else{if(f>n+b){var g=Math.min(e,(k?p:f)-b);if(g!=n){r.scrollTop=g}}}var a=d.curOp&&d.curOp.scrollLeft!=null?d.curOp.scrollLeft:j.scroller.scrollLeft;var c=i4(d)-(d.options.fixedGutter?j.gutters.offsetWidth:0);var m=q-o>c;if(m){q=o+c}if(o<10){r.scrollLeft=0}else{if(o<a){r.scrollLeft=Math.max(0,o-(m?0:10))}else{if(q>c+a-3){r.scrollLeft=q+(m?0:10)-c}}}return r}function lM(a,b,c){if(b!=null||c!=null){h2(a)}if(b!=null){a.curOp.scrollLeft=(a.curOp.scrollLeft==null?a.doc.scrollLeft:a.curOp.scrollLeft)+b}if(c!=null){a.curOp.scrollTop=(a.curOp.scrollTop==null?a.doc.scrollTop:a.curOp.scrollTop)+c}}function jl(b){h2(b);var d=b.getCursor(),a=d,c=d;if(!b.options.lineWrapping){a=d.ch?lA(d.line,d.ch-1):d;c=lA(d.line,d.ch+1)}b.curOp.scrollToPos={from:a,to:c,margin:b.options.cursorScrollMargin,isCursor:true}}function h2(c){var d=c.curOp.scrollToPos;if(d){c.curOp.scrollToPos=null;var a=kw(c,d.from),b=kw(c,d.to);var e=mn(c,Math.min(a.left,b.left),Math.min(a.top,b.top)-d.margin,Math.max(a.right,b.right),Math.max(a.bottom,b.bottom)+d.margin);c.scrollTo(e.scrollLeft,e.scrollTop)}}var iv=0;function lY(a){a.curOp={cm:a,viewChanged:false,startHeight:a.doc.height,forceUpdate:false,updateInput:null,typing:false,changeObjs:null,cursorActivityHandlers:null,cursorActivityCalled:0,selectionChanged:false,updateMaxLine:false,scrollLeft:null,scrollTop:null,scrollToPos:null,focus:false,id:++iv};js(a.curOp)}function ng(a){var b=a.curOp;nX(b,function(c){for(var d=0;d<c.ops.length;d++){c.ops[d].cm.curOp=null}lQ(c)})}function lQ(b){var f=b.ops;for(var g=0;g<f.length;g++){nH(f[g])}for(var a=0;a<f.length;a++){m6(f[a])}for(var c=0;c<f.length;c++){nP(f[c])}for(var d=0;d<f.length;d++){m9(f[d])}for(var e=0;e<f.length;e++){hG(f[e])}}function nH(b){var a=b.cm,c=a.display;mj(a);if(b.updateMaxLine){kY(a)}b.mustUpdate=b.viewChanged||b.forceUpdate||b.scrollTop!=null||b.scrollToPos&&(b.scrollToPos.from.line<c.viewFrom||b.scrollToPos.to.line>=c.viewTo)||c.maxLineChanged&&a.options.lineWrapping;b.update=b.mustUpdate&&new n4(a,b.mustUpdate&&{top:b.scrollTop,ensure:b.scrollToPos},b.forceUpdate)}function m6(a){a.updatedDisplay=a.mustUpdate&&mC(a.cm,a.update)}function nP(b){var a=b.cm,c=a.display;if(b.updatedDisplay){i(a)}b.barMeasure=kR(a);if(c.maxLineChanged&&!a.options.lineWrapping){b.adjustWidthTo=ic(a,c.maxLine,c.maxLine.text.length).left+3;a.display.sizerWidth=b.adjustWidthTo;b.barMeasure.scrollWidth=Math.max(c.scroller.clientWidth,c.sizer.offsetLeft+b.adjustWidthTo+lh(a)+a.display.barWidth);b.maxScrollLeft=Math.max(0,c.sizer.offsetLeft+b.adjustWidthTo-i4(a))}if(b.updatedDisplay||b.selectionChanged){b.preparedSelection=c.input.prepareSelection(b.focus)}}function m9(b){var a=b.cm;if(b.adjustWidthTo!=null){a.display.sizer.style.minWidth=b.adjustWidthTo+"px";if(b.maxScrollLeft<a.doc.scrollLeft){nq(a,Math.min(a.display.scroller.scrollLeft,b.maxScrollLeft),true)}a.display.maxLineChanged=false}var c=b.focus&&b.focus==j3()&&(!document.hasFocus||document.hasFocus());if(b.preparedSelection){a.display.input.showSelection(b.preparedSelection,c)}if(b.updatedDisplay||b.startHeight!=a.doc.height){hK(a,b.barMeasure)}if(b.updatedDisplay){kV(a,b.barMeasure)}if(b.selectionChanged){ku(a)}if(a.state.focused&&b.updateInput){a.display.input.reset(b.typing)}if(c){kh(b.cm)}}function hG(f){var a=f.cm,d=a.display,b=a.doc;if(f.updatedDisplay){kt(a,f.update)}if(d.wheelStartX!=null&&(f.scrollTop!=null||f.scrollLeft!=null||f.scrollToPos)){d.wheelStartX=d.wheelStartY=null}if(f.scrollTop!=null&&(d.scroller.scrollTop!=f.scrollTop||f.forceScroll)){b.scrollTop=Math.max(0,Math.min(d.scroller.scrollHeight-d.scroller.clientHeight,f.scrollTop));d.scrollbars.setScrollTop(b.scrollTop);d.scroller.scrollTop=b.scrollTop}if(f.scrollLeft!=null&&(d.scroller.scrollLeft!=f.scrollLeft||f.forceScroll)){b.scrollLeft=Math.max(0,Math.min(d.scroller.scrollWidth-d.scroller.clientWidth,f.scrollLeft));d.scrollbars.setScrollLeft(b.scrollLeft);d.scroller.scrollLeft=b.scrollLeft;ja(a)}if(f.scrollToPos){var c=mx(a,i3(b,f.scrollToPos.from),i3(b,f.scrollToPos.to),f.scrollToPos.margin);if(f.scrollToPos.isCursor&&a.state.focused){iD(a,c)}}var e=f.maybeHiddenMarkers,j=f.maybeUnhiddenMarkers;if(e){for(var g=0;g<e.length;++g){if(!e[g].lines.length){n9(e[g],"hide")}}}if(j){for(var h=0;h<j.length;++h){if(j[h].lines.length){n9(j[h],"unhide")}}}if(d.wrapper.offsetHeight){b.scrollTop=a.display.scroller.scrollTop}if(f.changeObjs){n9(a,"changes",a,f.changeObjs)}if(f.update){f.update.finish()}}function lI(a,b){if(a.curOp){return b()}lY(a);try{return b()}finally{ng(a)}}function mQ(a,b){return function(){if(a.curOp){return b.apply(a,arguments)}lY(a);try{return b.apply(a,arguments)}finally{ng(a)}}}function jC(a){return function(){if(this.curOp){return a.apply(this,arguments)}lY(this);try{return a.apply(this,arguments)}finally{ng(this)}}}function mg(a){return function(){var b=this.cm;if(!b||b.curOp){return a.apply(this,arguments)}lY(b);try{return a.apply(this,arguments)}finally{ng(b)}}}function np(c,e,d,b){if(e==null){e=c.doc.first}if(d==null){d=c.doc.first+c.doc.size}if(!b){b=0}var h=c.display;if(b&&d<h.viewTo&&(h.updateLineNumbers==null||h.updateLineNumbers>e)){h.updateLineNumbers=e}c.curOp.viewChanged=true;if(e>=h.viewTo){if(gN&&nJ(c.doc,e)<h.viewTo){jw(c)}}else{if(d<=h.viewFrom){if(gN&&iJ(c.doc,d+b)>h.viewFrom){jw(c)}else{h.viewFrom+=b;h.viewTo+=b}}else{if(e<=h.viewFrom&&d>=h.viewTo){jw(c)}else{if(e<=h.viewFrom){var f=jq(c,d,d+b,1);if(f){h.view=h.view.slice(f.index);h.viewFrom=f.lineN;h.viewTo+=b}else{jw(c)}}else{if(d>=h.viewTo){var k=jq(c,e,e,-1);if(k){h.view=h.view.slice(0,k.index);h.viewTo=k.lineN}else{jw(c)}}else{var g=jq(c,e,e,-1);var j=jq(c,d,d+b,1);if(g&&j){h.view=h.view.slice(0,g.index).concat(hQ(c,g.lineN,j.lineN)).concat(h.view.slice(j.index));h.viewTo+=b}else{jw(c)}}}}}}var a=h.externalMeasured;if(a){if(d<a.lineN){a.lineN+=b}else{if(e<a.lineN+a.size){h.externalMeasured=null}}}}function lS(g,f,b){g.curOp.viewChanged=true;var a=g.display,c=g.display.externalMeasured;if(c&&f>=c.lineN&&f<c.lineN+c.size){a.externalMeasured=null}if(f<a.viewFrom||f>=a.viewTo){return}var e=a.view[iR(g,f)];if(e.node==null){return}var d=e.changes||(e.changes=[]);if(jb(d,b)==-1){d.push(b)}}function jw(a){a.display.viewFrom=a.display.viewTo=a.doc.first;a.display.view=[];a.display.viewOffset=0}function jq(a,g,e,h){var d=iR(a,g),b,c=a.display.view;if(!gN||e==a.doc.first+a.doc.size){return{index:d,lineN:e}}var j=a.display.viewFrom;for(var f=0;f<d;f++){j+=c[f].size}if(j!=g){if(h>0){if(d==c.length-1){return null}b=(j+c[d].size)-g;d++}else{b=j-g}g+=b;e+=b}while(nJ(a.doc,e)!=e){if(d==(h<0?0:c.length-1)){return null}e+=h*c[d-(h<0?1:0)].size;d+=h}return{index:d,lineN:e}}function lm(c,a,b){var d=c.display,e=d.view;if(e.length==0||a>=d.viewTo||b<=d.viewFrom){d.view=hQ(c,a,b);d.viewFrom=a}else{if(d.viewFrom>a){d.view=hQ(c,a,d.viewFrom).concat(d.view)}else{if(d.viewFrom<a){d.view=d.view.slice(iR(c,a))}}d.viewFrom=a;if(d.viewTo<b){d.view=d.view.concat(hQ(c,d.viewTo,b))}else{if(d.viewTo>b){d.view=d.view.slice(0,iR(c,b))}}}d.viewTo=b}function jv(e){var d=e.display.view,a=0;for(var b=0;b<d.length;b++){var c=d[b];if(!c.hidden&&(!c.node||c.changes)){++a}}return a}function ij(a,b){if(a.doc.mode.startState&&a.doc.frontier<a.display.viewTo){a.state.highlight.set(b,mD(lu,a))}}function lu(c){var a=c.doc;if(a.frontier<a.first){a.frontier=a.first}if(a.frontier>=c.display.viewTo){return}var d=+new Date+c.options.workTime;var b=nK(a.mode,kM(c,a.frontier));var e=[];a.iter(a.frontier,Math.min(a.first+a.size,c.display.viewTo+500),function(h){if(a.frontier>=c.display.viewFrom){var n=h.styles,j=h.text.length>c.options.maxHighlightLength;var l=ib(c,h,j?nK(a.mode,b):b,true);h.styles=l.styles;var f=h.styleClasses,m=l.classes;if(m){h.styleClasses=m}else{if(f){h.styleClasses=null}}var k=!n||n.length!=h.styles.length||f!=m&&(!f||!m||f.bgClass!=m.bgClass||f.textClass!=m.textClass);for(var g=0;!k&&g<n.length;++g){k=n[g]!=h.styles[g]}if(k){e.push(a.frontier)}h.stateAfter=j?b:nK(a.mode,b)}else{if(h.text.length<=c.options.maxHighlightLength){k0(c,h.text,b)}h.stateAfter=a.frontier%5==0?nK(a.mode,b):null}++a.frontier;if(+new Date>d){ij(c,c.options.workDelay);return true}});if(e.length){lI(c,function(){for(var f=0;f<e.length;f++){lS(c,e[f],"text")}})}}function n4(d,b,c){var a=d.display;this.viewport=b;this.visible=lc(a,d.doc,b);this.editorIsHidden=!a.wrapper.offsetWidth;this.wrapperHeight=a.wrapper.clientHeight;this.wrapperWidth=a.wrapper.clientWidth;this.oldDisplayWidth=i4(d);this.force=c;this.dims=ho(d);this.events=[]}n4.prototype.signal=function(b,a){if(iI(b,a)){this.events.push(arguments)}};n4.prototype.finish=function(){var a=this;for(var b=0;b<this.events.length;b++){n9.apply(null,a.events[b])}};function mj(a){var b=a.display;if(!b.scrollbarsClipped&&b.scroller.offsetWidth){b.nativeBarWidth=b.scroller.offsetWidth-b.scroller.clientWidth;b.heightForcer.style.height=lh(a)+"px";b.sizer.style.marginBottom=-b.nativeBarWidth+"px";b.sizer.style.borderRightWidth=lh(a)+"px";b.scrollbarsClipped=true}}function mC(b,h){var g=b.display,c=b.doc;if(h.editorIsHidden){jw(b);return false}if(!h.force&&h.visible.from>=g.viewFrom&&h.visible.to<=g.viewTo&&(g.updateLineNumbers==null||g.updateLineNumbers>=g.viewTo)&&g.renderedView==g.view&&jv(b)==0){return false}if(iE(b)){jw(b);h.dims=ho(b)}var j=c.first+c.size;var e=Math.max(h.visible.from-b.options.viewportMargin,c.first);var d=Math.min(j,h.visible.to+b.options.viewportMargin);if(g.viewFrom<e&&e-g.viewFrom<20){e=Math.max(c.first,g.viewFrom)}if(g.viewTo>d&&g.viewTo-d<20){d=Math.min(j,g.viewTo)}if(gN){e=nJ(b.doc,e);d=iJ(b.doc,d)}var k=e!=g.viewFrom||d!=g.viewTo||g.lastWrapHeight!=h.wrapperHeight||g.lastWrapWidth!=h.wrapperWidth;lm(b,e,d);g.viewOffset=m7(hm(b.doc,g.viewFrom));b.display.mover.style.top=g.viewOffset+"px";var a=jv(b);if(!k&&a==0&&!h.force&&g.renderedView==g.view&&(g.updateLineNumbers==null||g.updateLineNumbers>=g.viewTo)){return false}var f=j3();if(a>4){g.lineDiv.style.display="none"}km(b,g.updateLineNumbers,h.dims);if(a>4){g.lineDiv.style.display=""}g.renderedView=g.view;if(f&&j3()!=f&&f.offsetHeight){f.focus()}iN(g.cursorDiv);iN(g.selectionDiv);g.gutters.style.height=g.sizer.style.minHeight=0;if(k){g.lastWrapHeight=h.wrapperHeight;g.lastWrapWidth=h.wrapperWidth;ij(b,400)}g.updateLineNumbers=null;return true}function kt(e,a){var c=a.viewport;for(var b=true;;b=false){if(!b||!e.options.lineWrapping||a.oldDisplayWidth==i4(e)){if(c&&c.top!=null){c={top:Math.min(e.doc.height+ni(e.display)-m8(e),c.top)}}a.visible=lc(e.display,e.doc,c);if(a.visible.from>=e.display.viewFrom&&a.visible.to<=e.display.viewTo){break}}if(!mC(e,a)){break}i(e);var d=kR(e);nu(e);hK(e,d);kV(e,d)}a.signal(e,"update",e);if(e.display.viewFrom!=e.display.reportedViewFrom||e.display.viewTo!=e.display.reportedViewTo){a.signal(e,"viewportChange",e,e.display.viewFrom,e.display.viewTo);e.display.reportedViewFrom=e.display.viewFrom;e.display.reportedViewTo=e.display.viewTo}}function lN(d,b){var a=new n4(d,b);if(mC(d,a)){i(d);kt(d,a);var c=kR(d);nu(d);hK(d,c);kV(d,c);a.finish()}}function km(c,m,d){var g=c.display,a=c.options.lineNumbers;var o=g.lineDiv,b=o.firstChild;function h(p){var q=p.nextSibling;if(mU&&k9&&c.display.currentWheelTarget==p){p.style.display="none"}else{p.parentNode.removeChild(p)}return q}var f=g.view,j=g.viewFrom;for(var l=0;l<f.length;l++){var k=f[l];if(k.hidden){}else{if(!k.node||k.node.parentNode!=o){var n=n8(c,k,j,d);o.insertBefore(n,b)}else{while(b!=k.node){b=h(b)}var e=a&&m!=null&&m<=j&&k.lineNumber;if(k.changes){if(jb(k.changes,"gutter")>-1){e=false}nC(c,k,j,d)}if(e){iN(k.lineNumber);k.lineNumber.appendChild(document.createTextNode(jF(c.options,j)))}b=k.node.nextSibling}}j+=k.size}while(b){b=h(b)}}function jO(a){var b=a.display.gutters.offsetWidth;a.display.sizer.style.marginLeft=b+"px"}function kV(a,b){a.display.sizer.style.minHeight=b.docHeight+"px";a.display.heightForcer.style.top=b.docHeight+"px";a.display.gutters.style.height=(b.docHeight+a.display.barHeight+lh(a))+"px"}function io(f){var e=f.display.gutters,a=f.options.gutters;iN(e);var d=0;for(;d<a.length;++d){var c=a[d];var b=e.appendChild(gZ("div",null,"CodeMirror-gutter "+c));if(c=="CodeMirror-linenumbers"){f.display.lineGutter=b;b.style.width=(f.display.lineNumWidth||1)+"px"}}e.style.display=d?"":"none";jO(f)}function kK(a){var b=jb(a.gutters,"CodeMirror-linenumbers");if(b==-1&&a.lineNumbers){a.gutters=a.gutters.concat(["CodeMirror-linenumbers"])}else{if(b>-1&&!a.lineNumbers){a.gutters=a.gutters.slice(0);a.gutters.splice(b,1)}}}function g0(a,b){this.ranges=a;this.primIndex=b}g0.prototype={primary:function(){return this.ranges[this.primIndex]},equals:function(e){var a=this;if(e==this){return true}if(e.primIndex!=this.primIndex||e.ranges.length!=this.ranges.length){return false}for(var c=0;c<this.ranges.length;c++){var d=a.ranges[c],b=e.ranges[c];if(kI(d.anchor,b.anchor)!=0||kI(d.head,b.head)!=0){return false}}return true},deepCopy:function(){var a=this;var c=[];for(var b=0;b<this.ranges.length;b++){c[b]=new lz(kz(a.ranges[b].anchor),kz(a.ranges[b].head))}return new g0(c,this.primIndex)},somethingSelected:function(){var a=this;for(var b=0;b<this.ranges.length;b++){if(!a.ranges[b].empty()){return true}}return false},contains:function(a,e){var b=this;if(!e){e=a}for(var c=0;c<this.ranges.length;c++){var d=b.ranges[c];if(kI(e,d.from())>=0&&kI(a,d.to())<=0){return c}}return -1}};function lz(a,b){this.anchor=a;this.head=b}lz.prototype={from:function(){return m3(this.anchor,this.head)},to:function(){return nD(this.anchor,this.head)},empty:function(){return this.head.line==this.anchor.line&&this.head.ch==this.anchor.ch}};function mA(j,b){var g=j[b];j.sort(function(l,k){return kI(l.from(),k.from())});b=jb(j,g);for(var e=1;e<j.length;e++){var a=j[e],h=j[e-1];if(kI(h.to(),a.from())>=0){var d=m3(h.from(),a.from()),c=nD(h.to(),a.to());var f=h.empty()?a.from()==a.head:h.from()==h.head;if(e<=b){--b}j.splice(--e,2,new lz(f?c:d,f?d:c))}}return new g0(j,b)}function j1(a,b){return new g0([new lz(a,b||a)],0)}function m1(a){if(!a.text){return a.to}return lA(a.from.line+a.text.length-1,ji(a.text).length+(a.text.length==1?a.from.ch:0))}function nS(b,c){if(kI(b,c.from)<0){return b}if(kI(b,c.to)<=0){return m1(c)}var a=b.line+c.text.length-(c.to.line-c.from.line)-1,d=b.ch;if(b.line==c.to.line){d+=m1(c).ch-c.to.ch}return lA(a,d)}function iK(b,a){var d=[];for(var c=0;c<b.sel.ranges.length;c++){var e=b.sel.ranges[c];d.push(new lz(nS(e.anchor,a),nS(e.head,a)))}return mA(d,b.sel.primIndex)}function ll(b,c,a){if(b.line==c.line){return lA(a.line,b.ch-c.ch+a.ch)}else{return lA(a.line+(b.line-c.line),b.ch)}}function nt(b,e,l){var k=[];var m=lA(b.first,0),a=m;for(var h=0;h<e.length;h++){var f=e[h];var c=ll(f.from,m,a);var d=ll(m1(f),m,a);m=f.to;a=d;if(l=="around"){var g=b.sel.ranges[h],j=kI(g.head,g.anchor)<0;k[h]=new lz(j?d:c,j?c:d)}else{k[h]=new lz(c,c)}}return new g0(k,b.sel.primIndex)}function ly(a){a.doc.mode=h8(a.options,a.doc.modeOption);h1(a)}function h1(a){a.doc.iter(function(b){if(b.stateAfter){b.stateAfter=null}if(b.styles){b.styles=null}});a.doc.frontier=a.doc.first;ij(a,100);a.state.modeGen++;if(a.curOp){np(a)}}function lR(a,b){return b.from.ch==0&&b.to.ch==0&&ji(b.text)==""&&(!a.cm||a.cm.options.wholeLineUpdateBefore)}function id(r,f,m,g){function n(t){return m?m[t]:null}function h(v,t,u){hY(v,t,u,g);nw(v,"change",v,f)}function b(t,v){var w=[];for(var u=t;u<v;++u){w.push(new gW(d[u],n(u),g))}return w}var a=f.from,p=f.to,d=f.text;var e=hm(r,a.line),q=hm(r,p.line);var o=ji(d),s=n(d.length-1),c=p.line-a.line;if(f.full){r.insert(0,b(0,d.length));r.remove(d.length,r.size-d.length)}else{if(lR(r,f)){var j=b(0,d.length-1);h(q,q.text,s);if(c){r.remove(a.line,c)}if(j.length){r.insert(a.line,j)}}else{if(e==q){if(d.length==1){h(e,e.text.slice(0,a.ch)+o+e.text.slice(p.ch),s)}else{var k=b(1,d.length-1);k.push(new gW(o+e.text.slice(p.ch),s,g));h(e,e.text.slice(0,a.ch)+d[0],n(0));r.insert(a.line+1,k)}}else{if(d.length==1){h(e,e.text.slice(0,a.ch)+d[0]+q.text.slice(p.ch),n(0));r.remove(a.line+1,c)}else{h(e,e.text.slice(0,a.ch)+d[0],n(0));h(q,o+q.text.slice(p.ch),s);var l=b(1,d.length-1);if(c>1){r.remove(a.line+1,c-1)}r.insert(a.line+1,l)}}}}nw(r,"change",r,f)}function iA(b,c,d){function a(j,e,g){if(j.linked){for(var f=0;f<j.linked.length;++f){var h=j.linked[f];if(h.doc==e){continue}var k=g&&h.sharedHist;if(d&&!k){continue}c(h.doc,k);a(h.doc,j,k)}}}a(b,null,true)}function ip(a,b){if(b.cm){throw new Error("This document is already in use.")}a.doc=b;b.cm=a;lr(a);ly(a);if(!a.options.lineWrapping){kY(a)}a.options.mode=b.modeOption;np(a)}function ha(a){this.done=[];this.undone=[];this.undoDepth=Infinity;this.lastModTime=this.lastSelTime=0;this.lastOp=this.lastSelOp=null;this.lastOrigin=this.lastSelOrigin=null;this.generation=this.maxGeneration=a||1}function k6(a,b){var c={from:kz(b.from),to:m1(b),text:gY(a,b.from,b.to)};nU(a,c,b.from.line,b.to.line+1);iA(a,function(d){return nU(d,c,b.from.line,b.to.line+1)},true);return c}function h3(b){while(b.length){var a=ji(b);if(a.ranges){b.pop()}else{break}}}function kl(b,a){if(a){h3(b.done);return ji(b.done)}else{if(b.done.length&&!ji(b.done).ranges){return ji(b.done)}else{if(b.done.length>1&&!b.done[b.done.length-2].ranges){b.done.pop();return ji(b.done)}}}}function iX(d,f,a,g){var h=d.history;h.undone.length=0;var j=+new Date,c;var b;if((h.lastOp==g||h.lastOrigin==f.origin&&f.origin&&((f.origin.charAt(0)=="+"&&d.cm&&h.lastModTime>j-d.cm.options.historyEventDelay)||f.origin.charAt(0)=="*"))&&(c=kl(h,h.lastOp==g))){b=ji(c.changes);if(kI(f.from,f.to)==0&&kI(f.from,b.to)==0){b.to=m1(f)}else{c.changes.push(k6(d,f))}}else{var e=ji(h.done);if(!e||!e.ranges){lx(d.sel,h.done)}c={changes:[k6(d,f)],generation:h.generation};h.done.push(c);while(h.done.length>h.undoDepth){h.done.shift();if(!h.done[0].ranges){h.done.shift()}}}h.done.push(a);h.generation=++h.maxGeneration;h.lastModTime=h.lastSelTime=j;h.lastOp=h.lastSelOp=g;h.lastOrigin=h.lastSelOrigin=f.origin;if(!b){n9(d,"historyAdded")}}function nx(a,c,d,b){var e=c.charAt(0);return e=="*"||e=="+"&&d.ranges.length==b.ranges.length&&d.somethingSelected()==b.somethingSelected()&&new Date-a.history.lastSelTime<=(a.cm?a.cm.options.historyEventDelay:500)}function hN(a,d,c,e){var b=a.history,f=e&&e.origin;if(c==b.lastSelOp||(f&&b.lastSelOrigin==f&&(b.lastModTime==b.lastSelTime&&b.lastOrigin==f||nx(a,f,ji(b.done),d)))){b.done[b.done.length-1]=d}else{lx(d,b.done)}b.lastSelTime=+new Date;b.lastSelOrigin=f;b.lastSelOp=c;if(e&&e.clearRedo!==false){h3(b.undone)}}function lx(c,a){var b=ji(a);if(!(b&&b.ranges&&b.equals(c))){a.push(c)}}function nU(f,a,b,d){var c=a["spans_"+f.id],e=0;f.iter(Math.max(f.first,b),Math.min(f.first+f.size,d),function(g){if(g.markedSpans){(c||(c=a["spans_"+f.id]={}))[e]=g.markedSpans}++e})}function l3(a){if(!a){return null}var c;for(var b=0;b<a.length;++b){if(a[b].marker.explicitlyCleared){if(!c){c=a.slice(0,b)}}else{if(c){c.push(a[b])}}}return !c?a:c.length?c:null}function nI(b,a){var c=a["spans_"+b.id];if(!c){return null}var e=[];for(var d=0;d<a.text.length;++d){e.push(l3(c[d]))}return e}function ix(b,d){var k=nI(b,d);var a=h5(b,d);if(!k){return a}if(!a){return k}for(var g=0;g<k.length;++g){var f=k[g],e=a[g];if(f&&e){spans:for(var h=0;h<e.length;++h){var c=e[h];for(var j=0;j<f.length;++j){if(f[j].marker==c.marker){continue spans}}f.push(c)}}else{if(e){k[g]=e}}}return k}function mZ(a,j,b){var l=[];for(var f=0;f<a.length;++f){var k=a[f];if(k.ranges){l.push(b?g0.prototype.deepCopy.call(k):k);continue}var d=k.changes,c=[];l.push({changes:c});for(var g=0;g<d.length;++g){var e=d[g],h=void 0;c.push({from:e.from,to:e.to,text:e.text});if(j){for(var m in e){if(h=m.match(/^spans_(\d+)$/)){if(jb(j,Number(h[1]))>-1){ji(c)[m]=e[m];delete e[m]}}}}}}return l}function im(a,f,b,d){if(a.cm&&a.cm.display.shift||a.extend){var c=f.anchor;if(d){var e=kI(b,c)<0;if(e!=(kI(d,c)<0)){c=b;b=d}else{if(e!=(kI(b,d)<0)){b=d}}}return new lz(c,b)}else{return new lz(d||b,b)}}function g5(b,c,a,d){mL(b,new g0([im(b,b.sel.primary(),c,a)],0),d)}function mN(a,b,d){var e=[];for(var c=0;c<a.sel.ranges.length;c++){e[c]=im(a,a.sel.ranges[c],b[c],null)}var f=mA(e,a.sel.primIndex);mL(a,f,d)}function k2(a,b,d,c){var e=a.sel.ranges.slice(0);e[b]=d;mL(a,mA(e,a.sel.primIndex),c)}function ms(b,d,c,a){mL(b,j1(d,c),a)}function lb(b,d,a){var c={ranges:d.ranges,update:function(g){var e=this;this.ranges=[];for(var f=0;f<g.length;f++){e.ranges[f]=new lz(i3(b,g[f].anchor),i3(b,g[f].head))}},origin:a&&a.origin};n9(b,"beforeSelectionChange",b,c);if(b.cm){n9(b.cm,"beforeSelectionChange",b.cm,c)}if(c.ranges!=d.ranges){return mA(c.ranges,c.ranges.length-1)}else{return d}}function ht(a,c,e){var b=a.history.done,d=ji(b);if(d&&d.ranges){b[b.length-1]=c;jN(a,c,e)}else{mL(a,c,e)}}function mL(b,c,a){jN(b,c,a);hN(b,b.sel,b.cm?b.cm.curOp.id:NaN,a)}function jN(b,c,d){if(iI(b,"beforeSelectionChange")||b.cm&&iI(b.cm,"beforeSelectionChange")){c=lb(b,c,d)}var a=d&&d.bias||(kI(c.primary().head,b.sel.primary().head)<0?-1:1);jD(b,kx(b,c,a,true));if(!(d&&d.scroll===false)&&b.cm){jl(b.cm)}}function jD(b,a){if(a.equals(b.sel)){return}b.sel=a;if(b.cm){b.cm.curOp.updateInput=b.cm.curOp.selectionChanged=true;lD(b.cm)}nw(b,"cursorActivity",b)}function jt(a){jD(a,kx(a,a.sel,null,false),ln)}function kx(a,k,d,c){var g;for(var f=0;f<k.ranges.length;f++){var e=k.ranges[f];var j=k.ranges.length==a.sel.ranges.length&&a.sel.ranges[f];var b=mJ(a,e.anchor,j&&j.anchor,d,c);var h=mJ(a,e.head,j&&j.head,d,c);if(g||b!=e.anchor||h!=e.head){if(!g){g=k.ranges.slice(0,f)}g[f]=new lz(b,h)}}return g?mA(g,k.primIndex):k}function iS(b,d,j,k,f){var a=hm(b,d.line);if(a.markedSpans){for(var h=0;h<a.markedSpans.length;++h){var m=a.markedSpans[h],l=m.marker;if((m.from==null||(l.inclusiveLeft?m.from<=d.ch:m.from<d.ch))&&(m.to==null||(l.inclusiveRight?m.to>=d.ch:m.to>d.ch))){if(f){n9(l,"beforeCursorEnter");if(l.explicitlyCleared){if(!a.markedSpans){break}else{--h;continue}}}if(!l.atomic){continue}if(j){var e=l.find(k<0?1:-1),c=void 0;if(k<0?l.inclusiveRight:l.inclusiveLeft){e=hF(b,e,-k,e&&e.line==d.line?a:null)}if(e&&e.line==d.line&&(c=kI(e,j))&&(k<0?c<0:c>0)){return iS(b,e,d,k,f)}}var g=l.find(k<0?-1:1);if(k<0?l.inclusiveLeft:l.inclusiveRight){g=hF(b,g,k,g.line==d.line?a:null)}return g?iS(b,g,d,k,f):null}}}return d}function mJ(b,a,e,g,d){var f=g||1;var c=iS(b,a,e,f,d)||(!d&&iS(b,a,e,f,true))||iS(b,a,e,-f,d)||(!d&&iS(b,a,e,-f,true));if(!c){b.cantEdit=true;return lA(b.first,0)}return c}function hF(c,b,d,a){if(d<0&&b.ch==0){if(b.line>c.first){return i3(c,lA(b.line-1))}else{return null}}else{if(d>0&&b.ch==(a||hm(c,b.line)).text.length){if(b.line<c.first+c.size-1){return lA(b.line+1,0)}else{return null}}else{return new lA(b.line,b.ch+d)}}}function nh(a){a.setSelection(lA(a.firstLine(),0),lA(a.lastLine()),ln)}function jR(d,b,c){var a={canceled:false,from:b.from,to:b.to,text:b.text,origin:b.origin,cancel:function(){return a.canceled=true}};if(c){a.update=function(e,f,g,h){if(e){a.from=i3(d,e)}if(f){a.to=i3(d,f)}if(g){a.text=g}if(h!==undefined){a.origin=h}}}n9(d,"beforeChange",d,a);if(d.cm){n9(d.cm,"beforeChange",d.cm,a)}if(a.canceled){return null}return{from:a.from,to:a.to,text:a.text,origin:a.origin}}function mi(b,a,c){if(b.cm){if(!b.cm.curOp){return mQ(b.cm,mi)(b,a,c)}if(b.cm.state.suppressEdits){return}}if(iI(b,"beforeChange")||b.cm&&iI(b.cm,"beforeChange")){a=jR(b,a,true);if(!a){return}}var d=hM&&!c&&l1(b,a.from,a.to);if(d){for(var e=d.length-1;e>=0;--e){mf(b,{from:d[e].from,to:d[e].to,text:e?[""]:a.text})}}else{mf(b,a)}}function mf(c,b){if(b.text.length==1&&b.text[0]==""&&kI(b.from,b.to)==0){return}var d=iK(c,b);iX(c,b,d,c.cm?c.cm.curOp.id:NaN);ik(c,b,d,h5(c,b));var a=[];iA(c,function(e,f){if(!f&&jb(a,e.history)==-1){kF(e.history,b);a.push(e.history)}ik(e,b,null,h5(e,b))})}function k5(c,d,a){if(c.cm&&c.cm.state.suppressEdits&&!a){return}var e=c.history,n,l=c.sel;var o=d=="undo"?e.done:e.undone,b=d=="undo"?e.undone:e.done;var h=0;for(;h<o.length;h++){n=o[h];if(a?n.ranges&&!n.equals(c.sel):!n.ranges){break}}if(h==o.length){return}e.lastOrigin=e.lastSelOrigin=null;for(;;){n=o.pop();if(n.ranges){lx(n,b);if(a&&!n.equals(c.sel)){mL(c,n,{clearRedo:false});return}l=n}else{break}}var f=[];lx(l,b);b.push({changes:f,generation:e.generation});e.generation=n.generation||++e.maxGeneration;var m=iI(c,"beforeChange")||c.cm&&iI(c.cm,"beforeChange");var g=function(r){var s=n.changes[r];s.origin=d;if(m&&!jR(c,s,false)){o.length=0;return{}}f.push(k6(c,s));var p=r?iK(c,s):ji(o);ik(c,s,p,ix(c,s));if(!r&&c.cm){c.cm.scrollIntoView({from:s.from,to:m1(s)})}var q=[];iA(c,function(u,t){if(!t&&jb(q,u.history)==-1){kF(u.history,s);q.push(u.history)}ik(u,s,null,ix(u,s))})};for(var k=n.changes.length-1;k>=0;--k){var j=g(k);if(j){return j.v}}}function iC(d,b){if(b==0){return}d.first+=b;d.sel=new g0(mO(d.sel.ranges,function(e){return new lz(lA(e.anchor.line+b,e.anchor.ch),lA(e.head.line+b,e.head.ch))}),d.sel.primIndex);if(d.cm){np(d.cm,d.first,d.first-b,b);for(var c=d.cm.display,a=c.viewFrom;a<c.viewTo;a++){lS(d.cm,a,"gutter")}}}function ik(b,a,d,f){if(b.cm&&!b.cm.curOp){return mQ(b.cm,ik)(b,a,d,f)}if(a.to.line<b.first){iC(b,a.text.length-1-(a.to.line-a.from.line));return}if(a.from.line>b.lastLine()){return}if(a.from.line<b.first){var c=a.text.length-1-(b.first-a.from.line);iC(b,c);a={from:lA(b.first,0),to:lA(a.to.line+c,a.to.ch),text:[ji(a.text)],origin:a.origin}}var e=b.lastLine();if(a.to.line>e){a={from:a.from,to:lA(e,hm(b,e).text.length),text:[a.text[0]],origin:a.origin}}a.removed=gY(b,a.from,a.to);if(!d){d=iK(b,a)}if(b.cm){n5(b.cm,a,f)}else{id(b,a,f)}jN(b,d,ln)}function n5(b,g,j){var c=b.doc,h=b.display,f=g.from,d=g.to;var e=false,k=f.line;if(!b.options.lineWrapping){k=m5(jV(hm(c,f.line)));c.iter(k,d.line+1,function(o){if(o==h.maxLine){e=true;return true}})}if(c.sel.contains(g.from,g.to)>-1){lD(b)}id(c,g,j,mp(b));if(!b.options.lineWrapping){c.iter(k,f.line+g.text.length,function(o){var p=hZ(o);if(p>h.maxLineLength){h.maxLine=o;h.maxLineLength=p;h.maxLineChanged=true;e=false}});if(e){b.curOp.updateMaxLine=true}}c.frontier=Math.min(c.frontier,f.line);ij(b,400);var a=g.text.length-(d.line-f.line)-1;if(g.full){np(b)}else{if(f.line==d.line&&g.text.length==1&&!lR(b.doc,g)){lS(b,f.line,"text")}else{np(b,f.line,d.line+1,a)}}var m=iI(b,"changes"),l=iI(b,"change");if(l||m){var n={from:f,to:d,text:g.text,removed:g.removed,origin:g.origin};if(l){nw(b,"change",b,n)}if(m){(b.curOp.changeObjs||(b.curOp.changeObjs=[])).push(n)}}b.display.selForContextMenu=null}function gT(d,e,a,b,c){if(!b){b=a}if(kI(b,a)<0){var f=b;b=a;a=f}if(typeof e=="string"){e=d.splitLines(e)}mi(d,{from:a,to:b,text:e,origin:c})}function ml(b,c,d,a){if(d<b.line){b.line+=a}else{if(c<b.line){b.line=c;b.ch=0}}}function iO(f,d,c,b){for(var g=0;g<f.length;++g){var k=f[g],e=true;if(k.ranges){if(!k.copied){k=f[g]=k.deepCopy();k.copied=true}for(var h=0;h<k.ranges.length;h++){ml(k.ranges[h].anchor,d,c,b);ml(k.ranges[h].head,d,c,b)}continue}for(var j=0;j<k.changes.length;++j){var a=k.changes[j];if(c<a.from.line){a.from=lA(a.from.line+b,a.from.ch);a.to=lA(a.to.line+b,a.to.ch)}else{if(d<=a.to.line){e=false;break}}}if(!e){f.splice(0,g+1);g=0}}}function kF(e,a){var c=a.from.line,d=a.to.line,b=a.text.length-(d-c)-1;iO(e.done,c,d,b);iO(e.undone,c,d,b)}function jp(d,e,c,a){var b=e,f=e;if(typeof e=="number"){f=hm(d,jL(d,e))}else{b=m5(e)}if(b==null){return null}if(a(f,b)&&d.cm){lS(d.cm,b,c)}return f}function hH(c){var a=this;this.lines=c;this.parent=null;var d=0;for(var b=0;b<c.length;++b){c[b].parent=a;d+=c[b].height}this.height=d}hH.prototype={chunkSize:function(){return this.lines.length},removeInner:function(f,a){var b=this;for(var d=f,c=f+a;d<c;++d){var e=b.lines[d];b.height-=e.height;nv(e);nw(e,"delete")}this.lines.splice(f,a)},collapse:function(a){a.push.apply(a,this.lines)},insertInner:function(d,c,e){var a=this;this.height+=e;this.lines=this.lines.slice(0,d).concat(c).concat(this.lines.slice(d));for(var b=0;b<c.length;++b){c[b].parent=a}},iterN:function(c,a,b){var d=this;for(var e=c+a;c<e;++c){if(b(d.lines[c])){return true}}}};function ig(c){var a=this;this.children=c;var d=0,f=0;for(var e=0;e<c.length;++e){var b=c[e];d+=b.chunkSize();f+=b.height;b.parent=a}this.size=d;this.height=f;this.parent=null}ig.prototype={chunkSize:function(){return this.size},removeInner:function(g,h){var e=this;this.size-=h;for(var f=0;f<this.children.length;++f){var j=e.children[f],c=j.chunkSize();if(g<c){var d=Math.min(h,c-g),b=j.height;j.removeInner(g,d);e.height-=b-j.height;if(c==d){e.children.splice(f--,1);j.parent=null}if((h-=d)==0){break}g=0}else{g-=c}}if(this.size-h<25&&(this.children.length>1||!(this.children[0] instanceof hH))){var a=[];this.collapse(a);this.children=[new hH(a)];this.children[0].parent=this}},collapse:function(c){var a=this;for(var b=0;b<this.children.length;++b){a.children[b].collapse(c)}},insertInner:function(j,a,b){var f=this;this.size+=a.length;this.height+=b;for(var g=0;g<this.children.length;++g){var k=f.children[g],d=k.chunkSize();if(j<=d){k.insertInner(j,a,b);if(k.lines&&k.lines.length>50){var h=k.lines.length%25+25;for(var c=h;c<k.lines.length;){var e=new hH(k.lines.slice(c,c+=25));k.height-=e.height;f.children.splice(++g,0,e);e.parent=f}k.lines=k.lines.slice(0,h);f.maybeSpill()}break}j-=d}},maybeSpill:function(){if(this.children.length<=10){return}var c=this;do{var e=c.children.splice(c.children.length-5,5);var d=new ig(e);if(!c.parent){var a=new ig(c.children);a.parent=c;c.children=[a,d];c=a}else{c.size-=d.size;c.height-=d.height;var b=jb(c.parent.children,c);c.parent.children.splice(b+1,0,d)}d.parent=c.parent}while(c.children.length>10);c.parent.maybeSpill()},iterN:function(g,h,a){var b=this;for(var f=0;f<this.children.length;++f){var c=b.children[f],d=c.chunkSize();if(g<d){var e=Math.min(h,d-g);if(c.iterN(g,e,a)){return true}if((h-=e)==0){break}g=0}else{g-=d}}}};function kO(c,d,b){var a=this;if(b){for(var e in b){if(b.hasOwnProperty(e)){a[e]=b[e]}}}this.doc=c;this.node=d}nA(kO);function lq(a,c,b){if(m7(c)<((a.curOp&&a.curOp.scrollTop)||a.doc.scrollTop)){lM(a,null,b)}}kO.prototype.clear=function(){var a=this;var f=this.doc.cm,d=this.line.widgets,e=this.line,b=m5(e);if(b==null||!d){return}for(var c=0;c<d.length;++c){if(d[c]==a){d.splice(c--,1)}}if(!d.length){e.widgets=null}var g=m0(this);gV(e,Math.max(0,e.height-g));if(f){lI(f,function(){lq(f,e,-g);lS(f,b,"widget")})}};kO.prototype.changed=function(){var d=this.height,b=this.doc.cm,c=this.line;this.height=null;var a=m0(this)-d;if(!a){return}gV(c,c.height+a);if(b){lI(b,function(){b.curOp.forceUpdate=true;lq(b,c,a)})}};function nl(a,b,e,f){var d=new kO(a,e,f);var c=a.cm;if(c&&d.noHScroll){c.display.alignWidgets=true}jp(a,b,"widget",function(g){var j=g.widgets||(g.widgets=[]);if(d.insertAt==null){j.push(d)}else{j.splice(Math.min(j.length-1,Math.max(0,d.insertAt)),0,d)}d.line=g;if(c&&!il(a,g)){var h=m7(g)<a.scrollTop;gV(g,g.height+m0(d));if(h){lM(c,null,d.height)}c.curOp.forceUpdate=true}return true});return d}var gQ=0;function lV(b,a){this.lines=[];this.type=a;this.doc=b;this.id=++gQ}nA(lV);lV.prototype.clear=function(){var g=this;if(this.explicitlyCleared){return}var c=this.doc.cm,k=c&&!c.curOp;if(k){lY(c)}if(iI(this,"clear")){var b=this.find();if(b){nw(this,"clear",b.from,b.to)}}var j=null,e=null;for(var h=0;h<this.lines.length;++h){var a=g.lines[h];var d=hr(a.markedSpans,g);if(c&&!g.collapsed){lS(c,m5(a),"text")}else{if(c){if(d.to!=null){e=m5(a)}if(d.from!=null){j=m5(a)}}}a.markedSpans=iY(a.markedSpans,d);if(d.from==null&&g.collapsed&&!il(g.doc,a)&&c){gV(a,nF(c.display))}}if(c&&this.collapsed&&!c.options.lineWrapping){for(var l=0;l<this.lines.length;++l){var m=jV(g.lines[l]),f=hZ(m);if(f>c.display.maxLineLength){c.display.maxLine=m;c.display.maxLineLength=f;c.display.maxLineChanged=true}}}if(j!=null&&c&&this.collapsed){np(c,j,e+1)}this.lines.length=0;this.explicitlyCleared=true;if(this.atomic&&this.doc.cantEdit){this.doc.cantEdit=false;if(c){jt(c.doc)}}if(c){nw(c,"markerCleared",c,this)}if(k){ng(c)}if(this.parent){this.parent.clear()}};lV.prototype.find=function(d,f){var h=this;if(d==null&&this.type=="bookmark"){d=1}var a,b;for(var e=0;e<this.lines.length;++e){var g=h.lines[e];var c=hr(g.markedSpans,h);if(c.from!=null){a=lA(f?g:m5(g),c.from);if(d==-1){return a}}if(c.to!=null){b=lA(f?g:m5(g),c.to);if(d==1){return b}}}return a&&{from:a,to:b}};lV.prototype.changed=function(){var b=this.find(-1,true),c=this,a=this.doc.cm;if(!b||!a){return}lI(a,function(){var g=b.line,f=m5(b.line);var h=hp(a,f);if(h){mS(h);a.curOp.selectionChanged=a.curOp.forceUpdate=true}a.curOp.updateMaxLine=true;if(!il(c.doc,g)&&c.height!=null){var d=c.height;c.height=null;var e=m0(c)-d;if(e){gV(g,g.height+e)}}})};lV.prototype.attachLine=function(a){if(!this.lines.length&&this.doc.cm){var b=this.doc.cm.curOp;if(!b.maybeHiddenMarkers||jb(b.maybeHiddenMarkers,this)==-1){(b.maybeUnhiddenMarkers||(b.maybeUnhiddenMarkers=[])).push(this)}}this.lines.push(a)};lV.prototype.detachLine=function(a){this.lines.splice(jb(this.lines,a),1);if(!this.lines.length&&this.doc.cm){var b=this.doc.cm.curOp;(b.maybeHiddenMarkers||(b.maybeHiddenMarkers=[])).push(this)}};function i5(c,e,d,a,g){if(a&&a.shared){return l6(c,e,d,a,g)}if(c.cm&&!c.cm.curOp){return mQ(c.cm,i5)(c,e,d,a,g)}var h=new lV(c,g),b=kI(e,d);if(a){n0(a,h,false)}if(b>0||b==0&&h.clearWhenEmpty!==false){return h}if(h.replacedWith){h.collapsed=true;h.widgetNode=gZ("span",[h.replacedWith],"CodeMirror-widget");if(!a.handleMouseEvents){h.widgetNode.setAttribute("cm-ignore-events","true")}if(a.insertLeft){h.widgetNode.insertLeft=true}}if(h.collapsed){if(jS(c,e.line,e,d,h)||e.line!=d.line&&jS(c,d.line,e,d,h)){throw new Error("Inserting collapsed marker partially overlapping an existing one")}lf()}if(h.addToHistory){iX(c,{from:e,to:d,origin:"markText"},c.sel,NaN)}var k=e.line,f=c.cm,l;c.iter(k,d.line+1,function(m){if(f&&h.collapsed&&!f.options.lineWrapping&&jV(m)==f.display.maxLine){l=true}if(h.collapsed&&k!=e.line){gV(m,0)}kP(m,new h7(h,k==e.line?e.ch:null,k==d.line?d.ch:null));++k});if(h.collapsed){c.iter(e.line,d.line+1,function(m){if(il(c,m)){gV(m,0)}})}if(h.clearOnEnter){nY(h,"beforeCursorEnter",function(){return h.clear()})}if(h.readOnly){ia();if(c.history.done.length||c.history.undone.length){c.clearHistory()}}if(h.collapsed){h.id=++gQ;h.atomic=true}if(f){if(l){f.curOp.updateMaxLine=true}if(h.collapsed){np(f,e.line,d.line+1)}else{if(h.className||h.title||h.startStyle||h.endStyle||h.css){for(var j=e.line;j<=d.line;j++){lS(f,j,"text")}}}if(h.atomic){jt(f.doc)}nw(f,"markerAdded",f,h)}return h}function jZ(b,c){var a=this;this.markers=b;this.primary=c;for(var d=0;d<b.length;++d){b[d].parent=a}}nA(jZ);jZ.prototype.clear=function(){var a=this;if(this.explicitlyCleared){return}this.explicitlyCleared=true;for(var b=0;b<this.markers.length;++b){a.markers[b].clear()}nw(this,"clear")};jZ.prototype.find=function(b,a){return this.primary.find(b,a)};function l6(d,a,b,f,g){f=n0(f);f.shared=false;var c=[i5(d,a,b,f,g)],h=c[0];var e=f.widgetNode;iA(d,function(j){if(e){f.widgetNode=e.cloneNode(true)}c.push(i5(j,i3(j,a),i3(j,b),f,g));for(var k=0;k<j.linked.length;++k){if(j.linked[k].isParent){return}}h=ji(c)});return new jZ(c,h)}function kd(a){return a.findMarks(lA(a.first,0),a.clipPos(lA(a.lastLine())),function(b){return b.parent})}function kC(b,a){for(var d=0;d<a.length;d++){var f=a[d],h=f.find();var g=b.clipPos(h.from),c=b.clipPos(h.to);if(kI(g,c)){var e=i5(b,g,c,f.primary,f.primary.type);f.markers.push(e);e.parent=f}}}function jP(a){var c=function(e){var g=a[e],h=[g.primary.doc];iA(g.primary.doc,function(j){return h.push(j)});for(var f=0;f<g.markers.length;f++){var d=g.markers[f];if(jb(h,d.doc)==-1){d.parent=null;g.markers.splice(f--,1)}}};for(var b=0;b<a.length;b++){c(b)}}var jY=0;var mT=function(c,d,b,e){if(!(this instanceof mT)){return new mT(c,d,b,e)}if(b==null){b=0}ig.call(this,[new hH([new gW("",null)])]);this.first=b;this.scrollTop=this.scrollLeft=0;this.cantEdit=false;this.cleanGeneration=1;this.frontier=b;var a=lA(b,0);this.sel=j1(a);this.history=new ha(null);this.id=++jY;this.modeOption=d;this.lineSep=e;this.extend=false;if(typeof c=="string"){c=this.splitLines(c)}id(this,{from:a,to:a,text:c});mL(this,j1(a),ln)};mT.prototype=ks(ig.prototype,{constructor:mT,iter:function(b,c,a){if(a){this.iterN(b-this.first,c-b,a)}else{this.iterN(this.first,this.first+this.size,b)}},insert:function(c,b){var d=0;for(var a=0;a<b.length;++a){d+=b[a].height}this.insertInner(c-this.first,b,d)},remove:function(a,b){this.removeInner(a-this.first,b)},getValue:function(b){var a=gS(this,this.first,this.first+this.size);if(b===false){return a}return a.join(b||this.lineSeparator())},setValue:mg(function(c){var b=lA(this.first,0),a=this.first+this.size-1;mi(this,{from:b,to:lA(a,hm(this,a).text.length),text:this.splitLines(c),origin:"setValue",full:true},true);mL(this,j1(b))}),replaceRange:function(d,b,c,a){b=i3(this,b);c=c?i3(this,c):b;gT(this,d,b,c,a)},getRange:function(b,c,d){var a=gY(this,i3(this,b),i3(this,c));if(d===false){return a}return a.join(d||this.lineSeparator())},getLine:function(b){var a=this.getLineHandle(b);return a&&a.text},getLineHandle:function(a){if(k3(this,a)){return hm(this,a)}},getLineNumber:function(a){return m5(a)},getLineHandleVisualStart:function(a){if(typeof a=="number"){a=hm(this,a)}return jV(a)},lineCount:function(){return this.size},firstLine:function(){return this.first},lastLine:function(){return this.first+this.size-1},clipPos:function(a){return i3(this,a)},getCursor:function(b){var a=this.sel.primary(),c;if(b==null||b=="head"){c=a.head}else{if(b=="anchor"){c=a.anchor}else{if(b=="end"||b=="to"||b===false){c=a.to()}else{c=a.from()}}}return c},listSelections:function(){return this.sel.ranges},somethingSelected:function(){return this.sel.somethingSelected()},setCursor:mg(function(a,b,c){ms(this,i3(this,typeof a=="number"?lA(a,b||0):a),null,c)}),setSelection:mg(function(c,b,a){ms(this,i3(this,c),i3(this,b||c),a)}),extendSelection:mg(function(b,a,c){g5(this,i3(this,b),a&&i3(this,a),c)}),extendSelections:mg(function(b,a){mN(this,lo(this,b),a)}),extendSelectionsBy:mg(function(b,a){var c=mO(this.sel.ranges,b);mN(this,lo(this,c),a)}),setSelections:mg(function(f,b,d){var a=this;if(!f.length){return}var e=[];for(var c=0;c<f.length;c++){e[c]=new lz(i3(a,f[c].anchor),i3(a,f[c].head))}if(b==null){b=Math.min(f.length-1,this.sel.primIndex)}mL(this,mA(e,b),d)}),addSelection:mg(function(c,b,d){var a=this.sel.ranges.slice(0);a.push(new lz(i3(this,c),i3(this,b||c)));mL(this,mA(a,a.length-1),d)}),getSelection:function(b){var a=this;var e=this.sel.ranges,f;for(var d=0;d<e.length;d++){var c=gY(a,e[d].from(),e[d].to());f=f?f.concat(c):c}if(b===false){return f}else{return f.join(b||this.lineSeparator())}},getSelections:function(b){var a=this;var c=[],f=this.sel.ranges;for(var e=0;e<f.length;e++){var d=gY(a,f[e].from(),f[e].to());if(b!==false){d=d.join(b||a.lineSeparator())}c[e]=d}return c},replaceSelection:function(c,a,e){var b=[];for(var d=0;d<this.sel.ranges.length;d++){b[d]=c}this.replaceSelections(b,a,e||"+input")},replaceSelections:mg(function(j,d,b){var e=this;var c=[],g=this.sel;for(var f=0;f<g.ranges.length;f++){var a=g.ranges[f];c[f]={from:a.from(),to:a.to(),text:e.splitLines(j[f]),origin:b}}var k=d&&d!="end"&&nt(this,c,d);for(var h=c.length-1;h>=0;h--){mi(e,c[h])}if(k){ht(this,k)}else{if(this.cm){jl(this.cm)}}}),undo:mg(function(){k5(this,"undo")}),redo:mg(function(){k5(this,"redo")}),undoSelection:mg(function(){k5(this,"undo",true)}),redoSelection:mg(function(){k5(this,"redo",true)}),setExtending:function(a){this.extend=a},getExtending:function(){return this.extend},historySize:function(){var b=this.history,e=0,c=0;for(var d=0;d<b.done.length;d++){if(!b.done[d].ranges){++e}}for(var a=0;a<b.undone.length;a++){if(!b.undone[a].ranges){++c}}return{undo:e,redo:c}},clearHistory:function(){this.history=new ha(this.history.maxGeneration)},markClean:function(){this.cleanGeneration=this.changeGeneration(true)},changeGeneration:function(a){if(a){this.history.lastOp=this.history.lastSelOp=this.history.lastOrigin=null}return this.history.generation},isClean:function(a){return this.history.generation==(a||this.cleanGeneration)},getHistory:function(){return{done:mZ(this.history.done),undone:mZ(this.history.undone)}},setHistory:function(b){var a=this.history=new ha(this.history.maxGeneration);a.done=mZ(b.done.slice(0),null,true);a.undone=mZ(b.undone.slice(0),null,true)},setGutterMarker:mg(function(a,c,b){return jp(this,a,"gutter",function(e){var d=e.gutterMarkers||(e.gutterMarkers={});d[c]=b;if(!b&&hS(d)){e.gutterMarkers=null}return true})}),clearGutter:mg(function(b){var a=this;var c=this.first;this.iter(function(d){if(d.gutterMarkers&&d.gutterMarkers[b]){jp(a,d,"gutter",function(){d.gutterMarkers[b]=null;if(hS(d.gutterMarkers)){d.gutterMarkers=null}return true})}++c})}),lineInfo:function(a){var b;if(typeof a=="number"){if(!k3(this,a)){return null}b=a;a=hm(this,a);if(!a){return null}}else{b=m5(a);if(b==null){return null}}return{line:b,handle:a,text:a.text,gutterMarkers:a.gutterMarkers,textClass:a.textClass,bgClass:a.bgClass,wrapClass:a.wrapClass,widgets:a.widgets}},addLineClass:mg(function(b,c,a){return jp(this,b,c=="gutter"?"gutter":"class",function(e){var d=c=="text"?"textClass":c=="background"?"bgClass":c=="gutter"?"gutterClass":"wrapClass";if(!e[d]){e[d]=a}else{if(lO(a).test(e[d])){return false}else{e[d]+=" "+a}}return true})}),removeLineClass:mg(function(b,c,a){return jp(this,b,c=="gutter"?"gutter":"class",function(g){var d=c=="text"?"textClass":c=="background"?"bgClass":c=="gutter"?"gutterClass":"wrapClass";var e=g[d];if(!e){return false}else{if(a==null){g[d]=null}else{var f=e.match(lO(a));if(!f){return false}var h=f.index+f[0].length;g[d]=e.slice(0,f.index)+(!f.index||h==e.length?"":" ")+e.slice(h)||null}}return true})}),addLineWidget:mg(function(b,c,a){return nl(this,b,c,a)}),removeLineWidget:function(a){a.clear()},markText:function(b,c,a){return i5(this,i3(this,b),i3(this,c),a,a&&a.type||"range")},setBookmark:function(b,a){var c={replacedWith:a&&(a.nodeType==null?a.widget:a),insertLeft:a&&a.insertLeft,clearWhenEmpty:false,shared:a&&a.shared,handleMouseEvents:a&&a.handleMouseEvents};b=i3(this,b);return i5(this,b,b,c,"bookmark")},findMarksAt:function(a){a=i3(this,a);var b=[],d=hm(this,a.line).markedSpans;if(d){for(var e=0;e<d.length;++e){var c=d[e];if((c.from==null||c.from<=a.ch)&&(c.to==null||c.to>=a.ch)){b.push(c.marker.parent||c.marker)}}}return b},findMarks:function(a,c,e){a=i3(this,a);c=i3(this,c);var d=[],b=a.line;this.iter(a.line,c.line+1,function(h){var f=h.markedSpans;if(f){for(var g=0;g<f.length;g++){var j=f[g];if(!(j.to!=null&&b==a.line&&a.ch>=j.to||j.from==null&&b!=a.line||j.from!=null&&b==c.line&&j.from>=c.ch)&&(!e||e(j.marker))){d.push(j.marker.parent||j.marker)}}}++b});return d},getAllMarks:function(){var a=[];this.iter(function(c){var d=c.markedSpans;if(d){for(var b=0;b<d.length;++b){if(d[b].from!=null){a.push(d[b].marker)}}}});return a},posFromIndex:function(b){var d,a=this.first,c=this.lineSeparator().length;this.iter(function(f){var e=f.text.length+c;if(e>b){d=b;return true}b-=e;++a});return i3(this,lA(a,d))},indexFromPos:function(b){b=i3(this,b);var a=b.ch;if(b.line<this.first||b.ch<0){return 0}var c=this.lineSeparator().length;this.iter(this.first,b.line,function(d){a+=d.text.length+c});return a},copy:function(a){var b=new mT(gS(this,this.first,this.first+this.size),this.modeOption,this.first,this.lineSep);b.scrollTop=this.scrollTop;b.scrollLeft=this.scrollLeft;b.sel=this.sel;b.extend=false;if(a){b.history.undoDepth=this.history.undoDepth;b.setHistory(this.getHistory())}return b},linkedDoc:function(b){if(!b){b={}}var a=this.first,c=this.first+this.size;if(b.from!=null&&b.from>a){a=b.from}if(b.to!=null&&b.to<c){c=b.to}var d=new mT(gS(this,a,c),b.mode||this.modeOption,a,this.lineSep);if(b.sharedHist){d.history=this.history}(this.linked||(this.linked=[])).push({doc:d,sharedHist:b.sharedHist});d.linked=[{doc:this,isParent:true,sharedHist:b.sharedHist}];kC(d,kd(this));return d},unlinkDoc:function(d){var a=this;if(d instanceof hx){d=d.doc}if(this.linked){for(var c=0;c<this.linked.length;++c){var b=a.linked[c];if(b.doc!=d){continue}a.linked.splice(c,1);d.unlinkDoc(a);jP(kd(a));break}}if(d.history==this.history){var e=[d.id];iA(d,function(f){return e.push(f.id)},true);d.history=new ha(null);d.history.done=mZ(this.history.done,e);d.history.undone=mZ(this.history.undone,e)}},iterLinkedDocs:function(a){iA(this,a)},getMode:function(){return this.mode},getEditor:function(){return this.cm},splitLines:function(a){if(this.lineSep){return a.split(this.lineSep)}return hd(a)},lineSeparator:function(){return this.lineSep||"\n"}});mT.prototype.eachLine=mT.prototype.iter;var nr=0;function l5(d){var b=this;jx(b);if(nT(b,d)||my(b.display,d)){return}l7(d);if(kj){nr=+new Date}var c=kg(b,d,true),l=d.dataTransfer.files;if(!c||b.isReadOnly()){return}if(l&&l.length&&window.FileReader&&window.File){var h=l.length,a=Array(h),k=0;var f=function(n,o){if(b.options.allowDropFileTypes&&jb(b.options.allowDropFileTypes,n.type)==-1){return}var p=new FileReader;p.onload=mQ(b,function(){var r=p.result;if(/[\x00-\x08\x0e-\x1f]{2}/.test(r)){r=""}a[o]=r;if(++k==h){c=i3(b.doc,c);var q={from:c,to:c,text:b.doc.splitLines(a.join(b.doc.lineSeparator())),origin:"paste"};mi(b.doc,q);ht(b.doc,j1(c,m1(q)))}});p.readAsText(n)};for(var e=0;e<h;++e){f(l[e],e)}}else{if(b.state.draggingText&&b.doc.sel.contains(c)>-1){b.state.draggingText(d);setTimeout(function(){return b.display.input.focus()},20);return}try{var m=d.dataTransfer.getData("Text");if(m){var g;if(b.state.draggingText&&!b.state.draggingText.copy){g=b.listSelections()}jN(b.doc,j1(c,c));if(g){for(var j=0;j<g.length;++j){gT(b.doc,"",g[j].anchor,g[j].head,"drag")}}b.replaceSelection(m,"around","paste");b.display.input.focus()}}catch(d){}}}function l0(a,b){if(kj&&(!a.state.draggingText||+new Date-nr<100)){jK(b);return}if(nT(a,b)||my(a.display,b)){return}b.dataTransfer.setData("Text",a.getSelection());b.dataTransfer.effectAllowed="copyMove";if(b.dataTransfer.setDragImage&&!ob){var c=gZ("img",null,null,"position: fixed; left: 0; top: 0;");c.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";if(iL){c.width=c.height=1;a.display.wrapper.appendChild(c);c._top=c.offsetTop}b.dataTransfer.setDragImage(c,0,0);if(iL){c.parentNode.removeChild(c)}}}function hD(b,d){var a=kg(b,d);if(!a){return}var c=document.createDocumentFragment();mE(b,a,c);if(!b.display.dragCursor){b.display.dragCursor=gZ("div",null,"CodeMirror-cursors CodeMirror-dragcursors");b.display.lineSpace.insertBefore(b.display.dragCursor,b.display.cursorDiv)}mR(b.display.dragCursor,c)}function jx(a){if(a.display.dragCursor){a.display.lineSpace.removeChild(a.display.dragCursor);a.display.dragCursor=null}}function od(a){if(!document.body.getElementsByClassName){return}var b=document.body.getElementsByClassName("CodeMirror");for(var c=0;c<b.length;c++){var d=b[c].CodeMirror;if(d){a(d)}}}var mh=false;function l8(){if(mh){return}jn();mh=true}function jn(){var a;nY(window,"resize",function(){if(a==null){a=setTimeout(function(){a=null;od(nO)},100)}});nY(window,"blur",function(){return od(nL)})}function nO(a){var b=a.display;if(b.lastWrapHeight==b.wrapper.clientHeight&&b.lastWrapWidth==b.wrapper.clientWidth){return}b.cachedCharWidth=b.cachedTextHeight=b.cachedPaddingH=null;b.scrollbarsClipped=false;a.setSize()}var iQ={3:"Enter",8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"PrintScrn",45:"Insert",46:"Delete",59:";",61:"=",91:"Mod",92:"Mod",93:"Mod",106:"*",107:"=",109:"-",110:".",111:"/",127:"Delete",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",63232:"Up",63233:"Down",63234:"Left",63235:"Right",63272:"Delete",63273:"Home",63275:"End",63276:"PageUp",63277:"PageDown",63302:"Insert"};for(var ii=0;ii<10;ii++){iQ[ii+48]=iQ[ii+96]=String(ii)}for(var hb=65;hb<=90;hb++){iQ[hb]=String.fromCharCode(hb)}for(var hc=1;hc<=12;hc++){iQ[hc+111]=iQ[hc+63235]="F"+hc}var hq={};hq.basic={Left:"goCharLeft",Right:"goCharRight",Up:"goLineUp",Down:"goLineDown",End:"goLineEnd",Home:"goLineStartSmart",PageUp:"goPageUp",PageDown:"goPageDown",Delete:"delCharAfter",Backspace:"delCharBefore","Shift-Backspace":"delCharBefore",Tab:"defaultTab","Shift-Tab":"indentAuto",Enter:"newlineAndIndent",Insert:"toggleOverwrite",Esc:"singleSelection"};hq.pcDefault={"Ctrl-A":"selectAll","Ctrl-D":"deleteLine","Ctrl-Z":"undo","Shift-Ctrl-Z":"redo","Ctrl-Y":"redo","Ctrl-Home":"goDocStart","Ctrl-End":"goDocEnd","Ctrl-Up":"goLineUp","Ctrl-Down":"goLineDown","Ctrl-Left":"goGroupLeft","Ctrl-Right":"goGroupRight","Alt-Left":"goLineStart","Alt-Right":"goLineEnd","Ctrl-Backspace":"delGroupBefore","Ctrl-Delete":"delGroupAfter","Ctrl-S":"save","Ctrl-F":"find","Ctrl-G":"findNext","Shift-Ctrl-G":"findPrev","Shift-Ctrl-F":"replace","Shift-Ctrl-R":"replaceAll","Ctrl-[":"indentLess","Ctrl-]":"indentMore","Ctrl-U":"undoSelection","Shift-Ctrl-U":"redoSelection","Alt-U":"redoSelection",fallthrough:"basic"};hq.emacsy={"Ctrl-F":"goCharRight","Ctrl-B":"goCharLeft","Ctrl-P":"goLineUp","Ctrl-N":"goLineDown","Alt-F":"goWordRight","Alt-B":"goWordLeft","Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd","Ctrl-V":"goPageDown","Shift-Ctrl-V":"goPageUp","Ctrl-D":"delCharAfter","Ctrl-H":"delCharBefore","Alt-D":"delWordAfter","Alt-Backspace":"delWordBefore","Ctrl-K":"killLine","Ctrl-T":"transposeChars","Ctrl-O":"openLine"};hq.macDefault={"Cmd-A":"selectAll","Cmd-D":"deleteLine","Cmd-Z":"undo","Shift-Cmd-Z":"redo","Cmd-Y":"redo","Cmd-Home":"goDocStart","Cmd-Up":"goDocStart","Cmd-End":"goDocEnd","Cmd-Down":"goDocEnd","Alt-Left":"goGroupLeft","Alt-Right":"goGroupRight","Cmd-Left":"goLineLeft","Cmd-Right":"goLineRight","Alt-Backspace":"delGroupBefore","Ctrl-Alt-Backspace":"delGroupAfter","Alt-Delete":"delGroupAfter","Cmd-S":"save","Cmd-F":"find","Cmd-G":"findNext","Shift-Cmd-G":"findPrev","Cmd-Alt-F":"replace","Shift-Cmd-Alt-F":"replaceAll","Cmd-[":"indentLess","Cmd-]":"indentMore","Cmd-Backspace":"delWrappedLineLeft","Cmd-Delete":"delWrappedLineRight","Cmd-U":"undoSelection","Shift-Cmd-U":"redoSelection","Ctrl-Up":"goDocStart","Ctrl-Down":"goDocEnd",fallthrough:["basic","emacsy"]};hq["default"]=k9?hq.macDefault:hq.pcDefault;function la(f){var h=f.split(/-(?!$)/);f=h[h.length-1];var a,b,g,c;for(var d=0;d<h.length-1;d++){var e=h[d];if(/^(cmd|meta|m)$/i.test(e)){c=true}else{if(/^a(lt)?$/i.test(e)){a=true}else{if(/^(c|ctrl|control)$/i.test(e)){b=true}else{if(/^s(hift)?$/i.test(e)){g=true}else{throw new Error("Unrecognized modifier name: "+e)}}}}}if(a){f="Alt-"+f}if(b){f="Ctrl-"+f}if(c){f="Cmd-"+f}if(g){f="Shift-"+f}return f}function l2(c){var j={};for(var d in c){if(c.hasOwnProperty(d)){var b=c[d];if(/^(name|fallthrough|(de|at)tach)$/.test(d)){continue}if(b=="..."){delete c[d];continue}var a=mO(d.split(" "),la);for(var e=0;e<a.length;e++){var g=void 0,h=void 0;if(e==a.length-1){h=a.join(" ");g=b}else{h=a.slice(0,e+1).join(" ");g="..."}var f=j[h];if(!f){j[h]=g}else{if(f!=g){throw new Error("Inconsistent bindings for "+h)}}}delete c[d]}}for(var k in j){c[k]=j[k]}return c}function kN(d,c,a,e){c=g6(c);var b=c.call?c.call(d,e):c[d];if(b===false){return"nothing"}if(b==="..."){return"multi"}if(b!=null&&a(b)){return"handled"}if(c.fallthrough){if(Object.prototype.toString.call(c.fallthrough)!="[object Array]"){return kN(d,c.fallthrough,a,e)}for(var f=0;f<c.fallthrough.length;f++){var g=kN(d,c.fallthrough[f],a,e);if(g){return g}}}}function jm(b){var a=typeof b=="string"?b:iQ[b.keyCode];return a=="Ctrl"||a=="Alt"||a=="Shift"||a=="Mod"}function iw(d,b){if(iL&&d.keyCode==34&&d["char"]){return false}var c=iQ[d.keyCode],a=c;if(a==null||d.altGraphKey){return false}if(d.altKey&&c!="Alt"){a="Alt-"+a}if((mW?d.metaKey:d.ctrlKey)&&c!="Ctrl"){a="Ctrl-"+a}if((mW?d.ctrlKey:d.metaKey)&&c!="Cmd"){a="Cmd-"+a}if(!b&&d.shiftKey&&c!="Shift"){a="Shift-"+a}return a}function g6(a){return typeof a=="string"?hq[a]:a}function hL(g,a){var f=g.doc.sel.ranges,c=[];for(var d=0;d<f.length;d++){var e=a(f[d]);while(c.length&&kI(e.from,ji(c).to)<=0){var b=c.pop();if(kI(b.from,e.from)<0){e.from=b.from;break}}c.push(e)}lI(g,function(){for(var h=c.length-1;h>=0;h--){gT(g.doc,"",c[h].from,c[h].to,"+delete")}jl(g)})}var jg={selectAll:nh,singleSelection:function(a){return a.setSelection(a.getCursor("anchor"),a.getCursor("head"),ln)},killLine:function(a){return hL(a,function(b){if(b.empty()){var c=hm(a.doc,b.head.line).text.length;if(b.head.ch==c&&b.head.line<a.lastLine()){return{from:b.head,to:lA(b.head.line+1,0)}}else{return{from:b.head,to:lA(b.head.line,c)}}}else{return{from:b.from(),to:b.to()}}})},deleteLine:function(a){return hL(a,function(b){return({from:lA(b.from().line,0),to:i3(a.doc,lA(b.to().line+1,0))})})},delLineLeft:function(a){return hL(a,function(b){return({from:lA(b.from().line,0),to:b.from()})})},delWrappedLineLeft:function(a){return hL(a,function(d){var b=a.charCoords(d.head,"div").top+5;var c=a.coordsChar({left:0,top:b},"div");return{from:c,to:d.from()}})},delWrappedLineRight:function(a){return hL(a,function(d){var b=a.charCoords(d.head,"div").top+5;var c=a.coordsChar({left:a.display.lineDiv.offsetWidth+100,top:b},"div");return{from:d.from(),to:c}})},undo:function(a){return a.undo()},redo:function(a){return a.redo()},undoSelection:function(a){return a.undoSelection()},redoSelection:function(a){return a.redoSelection()},goDocStart:function(a){return a.extendSelection(lA(a.firstLine(),0))},goDocEnd:function(a){return a.extendSelection(lA(a.lastLine()))},goLineStart:function(a){return a.extendSelectionsBy(function(b){return lp(a,b.head.line)},{origin:"+move",bias:1})},goLineStartSmart:function(a){return a.extendSelectionsBy(function(b){return kq(a,b.head)},{origin:"+move",bias:1})},goLineEnd:function(a){return a.extendSelectionsBy(function(b){return jU(a,b.head.line)},{origin:"+move",bias:-1})},goLineRight:function(a){return a.extendSelectionsBy(function(c){var b=a.charCoords(c.head,"div").top+5;return a.coordsChar({left:a.display.lineDiv.offsetWidth+100,top:b},"div")},m4)},goLineLeft:function(a){return a.extendSelectionsBy(function(c){var b=a.charCoords(c.head,"div").top+5;return a.coordsChar({left:0,top:b},"div")},m4)},goLineLeftSmart:function(a){return a.extendSelectionsBy(function(d){var c=a.charCoords(d.head,"div").top+5;var b=a.coordsChar({left:0,top:c},"div");if(b.ch<a.getLine(b.line).search(/\S/)){return kq(a,d.head)}return b},m4)},goLineUp:function(a){return a.moveV(-1,"line")},goLineDown:function(a){return a.moveV(1,"line")},goPageUp:function(a){return a.moveV(-1,"page")},goPageDown:function(a){return a.moveV(1,"page")},goCharLeft:function(a){return a.moveH(-1,"char")},goCharRight:function(a){return a.moveH(1,"char")},goColumnLeft:function(a){return a.moveH(-1,"column")},goColumnRight:function(a){return a.moveH(1,"column")},goWordLeft:function(a){return a.moveH(-1,"word")},goGroupRight:function(a){return a.moveH(1,"group")},goGroupLeft:function(a){return a.moveH(-1,"group")},goWordRight:function(a){return a.moveH(1,"word")},delCharBefore:function(a){return a.deleteH(-1,"char")},delCharAfter:function(a){return a.deleteH(1,"char")},delWordBefore:function(a){return a.deleteH(-1,"word")},delWordAfter:function(a){return a.deleteH(1,"word")},delGroupBefore:function(a){return a.deleteH(-1,"group")},delGroupAfter:function(a){return a.deleteH(1,"group")},indentAuto:function(a){return a.indentSelection("smart")},indentMore:function(a){return a.indentSelection("add")},indentLess:function(a){return a.indentSelection("subtract")},insertTab:function(a){return a.replaceSelection("\t")},insertSoftTab:function(g){var e=[],f=g.listSelections(),b=g.options.tabSize;for(var c=0;c<f.length;c++){var a=f[c].from();var d=mV(g.getLine(a.line),a.ch,b);e.push(j7(b-d%b))}g.replaceSelections(e)},defaultTab:function(a){if(a.somethingSelected()){a.indentSelection("add")}else{a.execCommand("insertTab")}},transposeChars:function(a){return lI(a,function(){var e=a.listSelections(),f=[];for(var d=0;d<e.length;d++){if(!e[d].empty()){continue}var b=e[d].head,g=hm(a.doc,b.line).text;if(g){if(b.ch==g.length){b=new lA(b.line,b.ch-1)}if(b.ch>0){b=new lA(b.line,b.ch+1);a.replaceRange(g.charAt(b.ch-1)+g.charAt(b.ch-2),lA(b.line,b.ch-2),b,"+transpose")}else{if(b.line>a.doc.first){var c=hm(a.doc,b.line-1).text;if(c){b=new lA(b.line,1);a.replaceRange(g.charAt(0)+a.doc.lineSeparator()+c.charAt(c.length-1),lA(b.line-1,c.length-1),b,"+transpose")}}}}f.push(new lz(b,b))}a.setSelections(f)})},newlineAndIndent:function(a){return lI(a,function(){var d=a.listSelections();for(var c=d.length-1;c>=0;c--){a.replaceRange(a.doc.lineSeparator(),d[c].anchor,d[c].head,"+input")}d=a.listSelections();for(var b=0;b<d.length;b++){a.indentLine(d[b].from().line,null,true)}jl(a)})},openLine:function(a){return a.replaceSelection("\n","start")},toggleOverwrite:function(a){return a.toggleOverwrite()}};function lp(f,b){var e=hm(f.doc,b);var a=jV(e);if(a!=e){b=m5(a)}var d=ld(a);var c=!d?0:d[0].level%2?lj(a):md(a);return lA(b,c)}function jU(e,a){var f,d=hm(e.doc,a);while(f=jy(d)){d=f.find(1,true).line;a=null}var c=ld(d);var b=!c?d.text.length:c[0].level%2?md(d):lj(d);return lA(a==null?m5(d):a,b)}function kq(g,a){var b=lp(g,a.line);var f=hm(g.doc,b.line);var e=ld(f);if(!e||e[0].level==0){var c=Math.max(0,f.text.search(/\S/));var d=a.line==b.line&&a.ch<=c&&a.ch;return lA(b.line,d?0:c)}return b}function he(e,a,c){if(typeof a=="string"){a=jg[a];if(!a){return false}}e.display.input.ensurePolled();var b=e.display.shift,d=false;try{if(e.isReadOnly()){e.state.suppressEdits=true}if(c){e.display.shift=false}d=a(e)!=kU}finally{e.display.shift=b;e.state.suppressEdits=false}return d}function iy(d,c,a){for(var b=0;b<d.state.keyMaps.length;b++){var e=kN(c,d.state.keyMaps[b],a,d);if(e){return e}}return(d.options.extraKeys&&kN(c,d.options.extraKeys,a,d))||kN(c,d.options.keyMap,a,d)}var j9=new hA;function mr(f,d,a,b){var e=f.state.keySeq;if(e){if(jm(d)){return"handled"}j9.set(50,function(){if(f.state.keySeq==e){f.state.keySeq=null;f.display.input.reset()}});d=e+" "+d}var c=iy(f,d,b);if(c=="multi"){f.state.keySeq=d}if(c=="handled"){nw(f,"keyHandled",f,d,a)}if(c=="handled"||c=="multi"){l7(a);ku(f)}if(e&&!c&&/\'$/.test(d)){l7(a);return true}return !!c}function iM(a,b){var c=iw(b,true);if(!c){return false}if(b.shiftKey&&!a.state.keySeq){return mr(a,"Shift-"+c,b,function(d){return he(a,d,true)})||mr(a,c,b,function(d){if(typeof d=="string"?/^go[A-Z]/.test(d):d.motion){return he(a,d)}})}else{return mr(a,c,b,function(d){return he(a,d)})}}function h9(a,b,c){return mr(a,"'"+c+"'",b,function(d){return he(a,d,true)})}var iW=null;function kp(b){var a=this;a.curOp.focus=j3();if(nT(a,b)){return}if(kj&&kH<11&&b.keyCode==27){b.returnValue=false}var d=b.keyCode;a.display.shift=d==16||b.shiftKey;var c=iM(a,b);if(iL){iW=c?d:null;if(!c&&d==88&&!jz&&(k9?b.metaKey:b.ctrlKey)){a.replaceSelection("",null,"cut")}}if(d==18&&!/\bCodeMirror-crosshair\b/.test(a.display.lineDiv.className)){mY(a)}}function mY(c){var b=c.display.lineDiv;h6(b,"CodeMirror-crosshair");function a(d){if(d.keyCode==18||!d.altKey){kS(b,"CodeMirror-crosshair");ih(document,"keyup",a);ih(document,"mouseover",a)}}nY(document,"keyup",a);nY(document,"mouseover",a)}function me(a){if(a.keyCode==16){this.doc.sel.shift=false}nT(this,a)}function mw(a){var c=this;if(my(c.display,a)||nT(c,a)||a.ctrlKey&&!a.altKey||k9&&a.metaKey){return}var b=a.keyCode,e=a.charCode;if(iL&&b==iW){iW=null;l7(a);return}if((iL&&(!a.which||a.which<10))&&iM(c,a)){return}var d=String.fromCharCode(e==null?b:e);if(d=="\x08"){return}if(h9(c,a,d)){return}c.display.input.onKeyPress(a)}function jB(c){var b=this,d=b.display;if(nT(b,c)||d.activeTouch&&d.input.supportsTouch()){return}d.input.ensurePolled();d.shift=c.shiftKey;if(my(d,c)){if(!mU){d.scroller.draggable=false;setTimeout(function(){return d.scroller.draggable=true},100)}return}if(kE(b,c)){return}var a=kg(b,c);window.focus();switch(hi(c)){case 1:if(b.state.selectingText){b.state.selectingText(c)}else{if(a){mK(b,c,a)}else{if(mb(c)==d.scroller){l7(c)}}}break;case 2:if(mU){b.state.lastMiddleDown=+new Date}if(a){g5(b.doc,a)}setTimeout(function(){return d.input.focus()},20);l7(c);break;case 3:if(hT){mI(b,c)}else{nk(b)}break}}var i1;var jr;function mK(h,b,a){if(kj){setTimeout(mD(kh,h),0)}else{h.curOp.focus=j3()}var g=+new Date,d;if(jr&&jr.time>g-400&&kI(jr.pos,a)==0){d="triple"}else{if(i1&&i1.time>g-400&&kI(i1.pos,a)==0){d="double";jr={time:g,pos:a}}else{d="single";i1={time:g,pos:a}}}var c=h.doc.sel,f=k9?b.metaKey:b.ctrlKey,e;if(h.options.dragDrop&&kr&&!h.isReadOnly()&&d=="single"&&(e=c.contains(a))>-1&&(kI((e=c.ranges[e]).from(),a)<0||a.xRel>0)&&(kI(e.to(),a)>0||a.xRel<0)){gR(h,b,a,f)}else{kB(h,b,a,d,f)}}function gR(f,b,a,g){var c=f.display,e=+new Date;var d=mQ(f,function(h){if(mU){c.scroller.draggable=false}f.state.draggingText=false;ih(document,"mouseup",d);ih(c.scroller,"drop",d);if(Math.abs(b.clientX-h.clientX)+Math.abs(b.clientY-h.clientY)<10){l7(h);if(!g&&+new Date-200<e){g5(f.doc,a)}if(mU||kj&&kH==9){setTimeout(function(){document.body.focus();c.input.focus()},20)}else{c.input.focus()}}});if(mU){c.scroller.draggable=true}f.state.draggingText=d;d.copy=k9?b.altKey:b.ctrlKey;if(c.scroller.dragDrop){c.scroller.dragDrop()}nY(document,"mouseup",d);nY(c.scroller,"drop",d)}function kB(m,t,n,p,k){var a=m.display,r=m.doc;l7(t);var o,s,l=r.sel,q=l.ranges;if(k&&!t.shiftKey){s=r.sel.contains(n);if(s>-1){o=q[s]}else{o=new lz(n,n)}}else{o=r.sel.primary();s=r.sel.primIndex}if(i6?t.shiftKey&&t.metaKey:t.altKey){p="rect";if(!k){o=new lz(n,n)}n=kg(m,t,true,true);s=-1}else{if(p=="double"){var v=m.findWordAt(n);if(m.display.shift||r.extend){o=im(r,o,v.anchor,v.head)}else{o=v}}else{if(p=="triple"){var g=new lz(lA(n.line,0),i3(r,lA(n.line+1,0)));if(m.display.shift||r.extend){o=im(r,o,g.anchor,g.head)}else{o=g}}else{o=im(r,o,n)}}}if(!k){s=0;mL(r,new g0([o],0),l9);l=r.sel}else{if(s==-1){s=q.length;mL(r,mA(q.concat([o]),s),{scroll:false,origin:"*mouse"})}else{if(q.length>1&&q[s].empty()&&p=="single"&&!t.shiftKey){mL(r,mA(q.slice(0,s).concat(q.slice(s+1)),0),{scroll:false,origin:"*mouse"});l=r.sel}else{k2(r,s,o,l9)}}}var b=n;function c(B){if(kI(b,B)==0){return}b=B;if(p=="rect"){var J=[],E=m.options.tabSize;var K=mV(hm(r,n.line).text,n.ch,E);var x=mV(hm(r,B.line).text,B.ch,E);var I=Math.min(K,x),z=Math.max(K,x);for(var w=Math.min(n.line,B.line),G=Math.min(m.lastLine(),Math.max(n.line,B.line));w<=G;w++){var y=hm(r,w).text,H=jM(y,I,E);if(I==z){J.push(new lz(lA(w,H),lA(w,H)))}else{if(y.length>H){J.push(new lz(lA(w,H),lA(w,jM(y,z,E))))}}}if(!J.length){J.push(new lz(n,n))}mL(r,mA(l.ranges.slice(0,s).concat(J),s),{origin:"*mouse",scroll:false});m.scrollIntoView(B)}else{var D=o;var F=D.anchor,C=B;if(p!="single"){var A;if(p=="double"){A=m.findWordAt(B)}else{A=new lz(lA(B.line,0),i3(r,lA(B.line+1,0)))}if(kI(A.anchor,F)>0){C=A.head;F=m3(D.from(),A.anchor)}else{C=A.anchor;F=nD(D.to(),A.head)}}var L=l.ranges.slice(0);L[s]=new lz(i3(r,F),C);mL(r,mA(L,s),l9)}}var e=a.wrapper.getBoundingClientRect();var j=0;function u(x){var z=++j;var A=kg(m,x,true,p=="rect");if(!A){return}if(kI(A,b)!=0){m.curOp.focus=j3();c(A);var w=lc(a,r);if(A.line>=w.to||A.line<w.from){setTimeout(mQ(m,function(){if(j==z){u(x)}}),150)}}else{var y=x.clientY<e.top?-20:x.clientY>e.bottom?20:0;if(y){setTimeout(mQ(m,function(){if(j!=z){return}a.scroller.scrollTop+=y;u(x)}),50)}}}function f(w){m.state.selectingText=false;j=Infinity;l7(w);a.input.focus();ih(document,"mousemove",d);ih(document,"mouseup",h);r.history.lastSelOrigin=null}var d=mQ(m,function(w){if(!hi(w)){f(w)}else{u(w)}});var h=mQ(m,f);m.state.selectingText=h;nY(document,"mousemove",d);nY(document,"mouseup",h)}function hC(b,f,d,c){var l,m;try{l=f.clientX;m=f.clientY}catch(f){return false}if(l>=Math.floor(b.display.gutters.getBoundingClientRect().right)){return false}if(c){l7(f)}var e=b.display;var g=e.lineDiv.getBoundingClientRect();if(m>g.bottom||!iI(b,d)){return na(f)}m-=g.top-e.viewOffset;for(var j=0;j<b.options.gutters.length;++j){var h=e.gutters.childNodes[j];if(h&&h.getBoundingClientRect().right>=l){var a=nj(b.doc,m);var k=b.options.gutters[j];n9(b,d,b,a,k,f);return na(f)}}}function kE(a,b){return hC(a,b,"gutterClick",true)}function mI(a,b){if(my(a.display,b)||jh(a,b)){return}if(nT(a,b,"contextmenu")){return}a.display.input.onContextMenu(b)}function jh(a,b){if(!iI(a,"gutterContextMenu")){return false}return hC(a,b,"gutterContextMenu",false)}function lC(a){a.display.wrapper.className=a.display.wrapper.className.replace(/\s*cm-s-\S+/g,"")+a.options.theme.replace(/(^|\s)\s*/g," cm-s-");nm(a)}var kQ={toString:function(){return"CodeMirror.Init"}};var hB={};var mk={};function i0(a){var b=a.optionHandlers;function c(g,d,e,f){a.defaults[g]=d;if(e){b[g]=f?function(h,j,k){if(k!=kQ){e(h,j,k)}}:e}}a.defineOption=c;a.Init=kQ;c("value","",function(e,d){return e.setValue(d)},true);c("mode",null,function(e,d){e.doc.modeOption=d;ly(e)},true);c("indentUnit",2,ly,true);c("indentWithTabs",false);c("smartIndent",true);c("tabSize",4,function(d){h1(d);nm(d);np(d)},true);c("lineSeparator",null,function(h,e){h.doc.lineSep=e;if(!e){return}var f=[],d=h.doc.first;h.doc.iter(function(l){for(var j=0;;){var k=l.text.indexOf(e,j);if(k==-1){break}j=k+e.length;f.push(lA(d,k))}d++});for(var g=f.length-1;g>=0;g--){gT(h.doc,e,f[g],lA(f[g].line,f[g].ch+e.length))}});c("specialChars",/[\u0000-\u001f\u007f\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g,function(f,d,e){f.state.specialChars=new RegExp(d.source+(d.test("\t")?"":"|\t"),"g");if(e!=kQ){f.refresh()}});c("specialCharPlaceholder",hn,function(d){return d.refresh()},true);c("electricChars",true);c("inputStyle",ie?"contenteditable":"textarea",function(){throw new Error("inputStyle can not (yet) be changed in a running editor")},true);c("spellcheck",false,function(e,d){return e.getInputField().spellcheck=d},true);c("rtlMoveVisually",!nW);c("wholeLineUpdateBefore",true);c("theme","default",function(d){lC(d);k1(d)},true);c("keyMap","default",function(h,d,g){var f=g6(d);var e=g!=kQ&&g6(g);if(e&&e.detach){e.detach(h,f)}if(f.attach){f.attach(h,e||null)}});c("extraKeys",null);c("lineWrapping",false,i2,true);c("gutters",[],function(d){kK(d.options);k1(d)},true);c("fixedGutter",true,function(e,d){e.display.gutters.style.left=d?lw(e.display)+"px":"0";e.refresh()},true);c("coverGutterNextToScrollbar",false,function(d){return hK(d)},true);c("scrollbarStyle","native",function(d){oa(d);hK(d);d.display.scrollbars.setScrollTop(d.doc.scrollTop);d.display.scrollbars.setScrollLeft(d.doc.scrollLeft)},true);c("lineNumbers",false,function(d){kK(d.options);k1(d)},true);c("firstLineNumber",1,k1,true);c("lineNumberFormatter",function(d){return d},k1,true);c("showCursorWhenSelecting",false,nu,true);c("resetSelectionOnContextMenu",true);c("lineWiseCopyCut",true);c("readOnly",false,function(e,d){if(d=="nocursor"){nL(e);e.display.input.blur();e.display.disabled=true}else{e.display.disabled=false}e.display.input.readOnlyChanged(d)});c("disableInput",false,function(e,d){if(!d){e.display.input.reset()}},true);c("dragDrop",true,g2);c("allowDropFileTypes",null);c("cursorBlinkRate",530);c("cursorScrollMargin",0);c("cursorHeight",1,nu,true);c("singleCursorHeightPerLine",true,nu,true);c("workTime",100);c("workDelay",100);c("flattenSpans",true,h1,true);c("addModeClass",false,h1,true);c("pollInterval",100);c("undoDepth",200,function(e,d){return e.doc.history.undoDepth=d});c("historyEventDelay",1250);c("viewportMargin",10,function(d){return d.refresh()},true);c("maxHighlightLength",10000,h1,true);c("moveInputWithCursor",true,function(e,d){if(!d){e.display.input.resetPosition()}});c("tabindex",null,function(e,d){return e.display.input.getField().tabIndex=d||""});c("autofocus",null)}function k1(a){io(a);np(a);setTimeout(function(){return ja(a)},20)}function g2(f,b,e){var a=e&&e!=kQ;if(!b!=!a){var d=f.display.dragFunctions;var c=b?nY:ih;c(f.display.scroller,"dragstart",d.start);c(f.display.scroller,"dragenter",d.enter);c(f.display.scroller,"dragover",d.over);c(f.display.scroller,"dragleave",d.leave);c(f.display.scroller,"drop",d.drop)}}function i2(a){if(a.options.lineWrapping){h6(a.display.wrapper,"CodeMirror-wrap");a.display.sizer.style.minWidth="";a.display.sizerWidth=null}else{kS(a.display.wrapper,"CodeMirror-wrap");kY(a)}lr(a);np(a);nm(a);setTimeout(function(){return hK(a)},100)}function hx(g,e){var h=this;if(!(this instanceof hx)){return new hx(g,e)}this.options=e=e?n0(e):{};n0(hB,e,false);kK(e);var a=e.value;if(typeof a=="string"){a=new mT(a,e.mode,null,e.lineSeparator)}this.doc=a;var f=new hx.inputStyles[e.inputStyle](this);var b=this.display=new iU(g,a,f);b.wrapper.CodeMirror=this;io(this);lC(this);if(e.lineWrapping){this.display.wrapper.className+=" CodeMirror-wrap"}if(e.autofocus&&!ie){b.input.focus()}oa(this);this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:false,delayingBlurEvent:false,focused:false,suppressEdits:false,pasteIncoming:false,cutIncoming:false,selectingText:false,draggingText:false,highlight:new hA(),keySeq:null,specialChars:null};if(kj&&kH<11){setTimeout(function(){return h.display.input.reset(true)},20)}hf(this);l8();lY(this);this.curOp.forceUpdate=true;ip(this,a);if((e.autofocus&&!ie)||this.hasFocus()){setTimeout(mD(mm,this),20)}else{nL(this)}for(var c in mk){if(mk.hasOwnProperty(c)){mk[c](h,e[c],kQ)}}iE(this);if(e.finishInit){e.finishInit(this)}for(var d=0;d<a9.length;++d){a9[d](h)}ng(this);if(mU&&e.lineWrapping&&getComputedStyle(b.lineDiv).textRendering=="optimizelegibility"){b.lineDiv.style.textRendering="auto"}}hx.defaults=hB;hx.optionHandlers=mk;function hf(h){var c=h.display;nY(c.scroller,"mousedown",mQ(h,jB));if(kj&&kH<11){nY(c.scroller,"dblclick",mQ(h,function(k){if(nT(h,k)){return}var j=kg(h,k);if(!j||kE(h,k)||my(h.display,k)){return}l7(k);var l=h.findWordAt(j);g5(h.doc,l.anchor,l.head)}))}else{nY(c.scroller,"dblclick",function(j){return nT(h,j)||l7(j)})}if(!hT){nY(c.scroller,"contextmenu",function(j){return mI(h,j)})}var a,f={end:0};function b(){if(c.activeTouch){a=setTimeout(function(){return c.activeTouch=null},1000);f=c.activeTouch;f.end=+new Date}}function e(k){if(k.touches.length!=1){return false}var j=k.touches[0];return j.radiusX<=1&&j.radiusY<=1}function g(j,m){if(m.left==null){return true}var k=m.left-j.left,l=m.top-j.top;return k*k+l*l>20*20}nY(c.scroller,"touchstart",function(j){if(!nT(h,j)&&!e(j)){c.input.ensurePolled();clearTimeout(a);var k=+new Date;c.activeTouch={start:k,moved:false,prev:k-f.end<=300?f:null};if(j.touches.length==1){c.activeTouch.left=j.touches[0].pageX;c.activeTouch.top=j.touches[0].pageY}}});nY(c.scroller,"touchmove",function(){if(c.activeTouch){c.activeTouch.moved=true}});nY(c.scroller,"touchend",function(l){var j=c.activeTouch;if(j&&!my(c,l)&&j.left!=null&&!j.moved&&new Date-j.start<300){var k=h.coordsChar(c.activeTouch,"page"),m;if(!j.prev||g(j,j.prev)){m=new lz(k,k)}else{if(!j.prev.prev||g(j,j.prev.prev)){m=h.findWordAt(k)}else{m=new lz(lA(k.line,0),i3(h.doc,lA(k.line+1,0)))}}h.setSelection(m.anchor,m.head);h.focus();l7(l)}b()});nY(c.scroller,"touchcancel",b);nY(c.scroller,"scroll",function(){if(c.scroller.clientHeight){l4(h,c.scroller.scrollTop);nq(h,c.scroller.scrollLeft,true);n9(h,"scroll",h)}});nY(c.scroller,"mousewheel",function(j){return k8(h,j)});nY(c.scroller,"DOMMouseScroll",function(j){return k8(h,j)});nY(c.wrapper,"scroll",function(){return c.wrapper.scrollTop=c.wrapper.scrollLeft=0});c.dragFunctions={enter:function(j){if(!nT(h,j)){jK(j)}},over:function(j){if(!nT(h,j)){hD(h,j);jK(j)}},start:function(j){return l0(h,j)},drop:mQ(h,l5),leave:function(j){if(!nT(h,j)){jx(h)}}};var d=c.input.getField();nY(d,"keyup",function(j){return me.call(h,j)});nY(d,"keydown",mQ(h,kp));nY(d,"keypress",mQ(h,mw));nY(d,"focus",function(j){return mm(h,j)});nY(d,"blur",function(j){return nL(h,j)})}var a9=[];hx.defineInitHook=function(a){return a9.push(a)};function nz(r,l,a,n){var b=r.doc,o;if(a==null){a="add"}if(a=="smart"){if(!b.mode.indent){a="prev"}else{o=kM(r,l)}}var g=r.options.tabSize;var q=hm(b,l),h=mV(q.text,null,g);if(q.stateAfter){q.stateAfter=null}var p=q.text.match(/^\s*/)[0],d;if(!n&&!/\S/.test(q.text)){d=0;a="not"}else{if(a=="smart"){d=b.mode.indent(o,q.text.slice(p.length),q.text);if(d==kU||d>150){if(!n){return}a="prev"}}}if(a=="prev"){if(l>b.first){d=mV(hm(b,l-1).text,null,g)}else{d=0}}else{if(a=="add"){d=h+r.options.indentUnit}else{if(a=="subtract"){d=h-r.options.indentUnit}else{if(typeof a=="number"){d=h+a}}}}d=Math.max(0,d);var c="",e=0;if(r.options.indentWithTabs){for(var k=Math.floor(d/g);k;--k){e+=g;c+="\t"}}if(e<d){c+=j7(d-e)}if(c!=p){gT(b,c,lA(l,0),lA(l,p.length),"+input");q.stateAfter=null;return true}else{for(var m=0;m<b.sel.ranges.length;m++){var j=b.sel.ranges[m];if(j.head.line==l&&j.head.ch<p.length){var f=lA(l,p.length);k2(b,m,new lz(f,f));break}}}}var lZ=null;function jJ(a){lZ=a}function g4(a,k,m,n,b){var c=a.doc;a.display.shift=false;if(!n){n=c.sel}var l=a.state.pasteIncoming||b=="paste";var h=hd(k),p=null;if(l&&n.ranges.length>1){if(lZ&&lZ.text.join("\n")==k){if(n.ranges.length%lZ.text.length==0){p=[];for(var j=0;j<lZ.text.length;j++){p.push(c.splitLines(lZ.text[j]))}}}else{if(h.length==n.ranges.length){p=mO(h,function(r){return[r]})}}}var g;for(var o=n.ranges.length-1;o>=0;o--){var q=n.ranges[o];var d=q.from(),e=q.to();if(q.empty()){if(m&&m>0){d=lA(d.line,d.ch-m)}else{if(a.state.overwrite&&!l){e=lA(e.line,Math.min(hm(c,e.line).text.length,e.ch+ji(h).length))}else{if(lZ&&lZ.lineWise&&lZ.text.join("\n")==k){d=e=lA(d.line,0)}}}}g=a.curOp.updateInput;var f={from:d,to:e,text:p?p[o%p.length]:h,origin:b||(l?"paste":a.state.cutIncoming?"cut":"+input")};mi(a.doc,f);nw(a,"inputRead",a,f)}if(k&&!l){g7(a,k)}jl(a);a.curOp.updateInput=g;a.curOp.typing=true;a.state.pasteIncoming=a.state.cutIncoming=false}function mz(b,a){var c=b.clipboardData&&b.clipboardData.getData("Text");if(c){b.preventDefault();if(!a.isReadOnly()&&!a.options.disableInput){lI(a,function(){return g4(a,c,0,null,"paste")})}return true}}function g7(g,d){if(!g.options.electricChars||!g.options.smartIndent){return}var c=g.doc.sel;for(var e=c.ranges.length-1;e>=0;e--){var a=c.ranges[e];if(a.head.ch>100||(e&&c.ranges[e-1].head.line==a.head.line)){continue}var b=g.getModeAt(a.head);var h=false;if(b.electricChars){for(var f=0;f<b.electricChars.length;f++){if(d.indexOf(b.electricChars.charAt(f))>-1){h=nz(g,a.head.line,"smart");break}}}else{if(b.electricInput){if(b.electricInput.test(hm(g.doc,a.head.line).text.slice(0,a.head.ch))){h=nz(g,a.head.line,"smart")}}}if(h){nw(g,"electricInput",g,a.head.line)}}}function jf(f){var a=[],d=[];for(var c=0;c<f.doc.sel.ranges.length;c++){var e=f.doc.sel.ranges[c].head.line;var b={anchor:lA(e,0),head:lA(e+1,0)};d.push(b);a.push(f.getRange(b.anchor,b.head))}return{text:a,ranges:d}}function hh(b,a){b.setAttribute("autocorrect","off");b.setAttribute("autocapitalize","off");b.setAttribute("spellcheck",!!a)}function nG(){var a=gZ("textarea",null,null,"position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none");var b=gZ("div",[a],null,"overflow: hidden; position: relative; width: 3px; height: 0px;");if(mU){a.style.width="1000px"}else{a.setAttribute("wrap","off")}if(hE){a.style.border="1px solid black"}hh(a);return b}var jX=function(a){var c=a.optionHandlers;var b=a.helpers={};a.prototype={constructor:a,focus:function(){window.focus();this.display.input.focus()},setOption:function(e,d){var f=this.options,g=f[e];if(f[e]==d&&e!="mode"){return}f[e]=d;if(c.hasOwnProperty(e)){mQ(this,c[e])(this,d,g)}},getOption:function(d){return this.options[d]},getDoc:function(){return this.doc},addKeyMap:function(d,e){this.state.keyMaps[e?"push":"unshift"](g6(d))},removeKeyMap:function(e){var d=this.state.keyMaps;for(var f=0;f<d.length;++f){if(d[f]==e||d[f].name==e){d.splice(f,1);return true}}},addOverlay:jC(function(f,e){var d=f.token?f:a.getMode(this.options,f);if(d.startState){throw new Error("Overlays may not be stateful.")}kZ(this.state.overlays,{mode:d,modeSpec:f,opaque:e&&e.opaque,priority:(e&&e.priority)||0},function(g){return g.priority});this.state.modeGen++;np(this)}),removeOverlay:jC(function(h){var d=this;var f=this.state.overlays;for(var g=0;g<f.length;++g){var e=f[g].modeSpec;if(e==h||typeof h=="string"&&e.name==h){f.splice(g,1);d.state.modeGen++;np(d);return}}}),indentLine:jC(function(d,f,e){if(typeof f!="string"&&typeof f!="number"){if(f==null){f=this.options.smartIndent?"smart":"prev"}else{f=f?"add":"subtract"}}if(k3(this.doc,d)){nz(this,d,f,e)}}),indentSelection:jC(function(e){var h=this;var o=this.doc.sel.ranges,l=-1;for(var j=0;j<o.length;j++){var d=o[j];if(!d.empty()){var g=d.from(),f=d.to();var n=Math.max(l,g.line);l=Math.min(h.lastLine(),f.line-(f.ch?0:1))+1;for(var k=n;k<l;++k){nz(h,k,e)}var m=h.doc.sel.ranges;if(g.ch==0&&o.length==m.length&&m[j].from().ch>0){k2(h.doc,j,new lz(g,m[j].to()),ln)}}else{if(d.head.line>l){nz(h,d.head.line,e,true);l=d.head.line;if(j==h.doc.sel.primIndex){jl(h)}}}}}),getTokenAt:function(d,e){return j4(this,d,e)},getLineTokens:function(d,e){return j4(this,lA(d),e,true)},getTokenTypeAt:function(j){j=i3(this.doc,j);var e=jG(this,hm(this.doc,j.line));var l=0,k=(e.length-1)/2,f=j.ch;var g;if(f==0){g=e[2]}else{for(;;){var h=(l+k)>>1;if((h?e[h*2-1]:0)>=f){k=h}else{if(e[h*2+1]<f){l=h+1}else{g=e[h*2+2];break}}}}var d=g?g.indexOf("overlay "):-1;return d<0?g:d==0?null:g.slice(0,d-1)},getModeAt:function(d){var e=this.doc.mode;if(!e.innerMode){return e}return a.innerMode(e,this.getTokenAt(d).state).mode},getHelper:function(d,e){return this.getHelpers(d,e)[0]},getHelpers:function(f,g){var j=this;var d=[];if(!b.hasOwnProperty(g)){return d}var l=b[g],h=this.getModeAt(f);if(typeof h[g]=="string"){if(l[h[g]]){d.push(l[h[g]])}}else{if(h[g]){for(var k=0;k<h[g].length;k++){var m=l[h[g][k]];if(m){d.push(m)}}}else{if(h.helperType&&l[h.helperType]){d.push(l[h.helperType])}else{if(l[h.name]){d.push(l[h.name])}}}}for(var n=0;n<l._global.length;n++){var e=l._global[n];if(e.pred(h,j)&&jb(d,e.val)==-1){d.push(e.val)}}return d},getStateAfter:function(e,f){var d=this.doc;e=jL(d,e==null?d.first+d.size-1:e);return kM(this,e+1,f)},cursorCoords:function(d,f){var e,g=this.doc.sel.primary();if(d==null){e=g.head}else{if(typeof d=="object"){e=i3(this.doc,d)}else{e=d?g.from():g.to()}}return lL(this,e,f||"page")},charCoords:function(d,e){return lU(this,i3(this.doc,d),e||"page")},coordsChar:function(e,d){e=hI(this,e,d||"page");return hg(this,e.left,e.top)},lineAtHeight:function(e,d){e=hI(this,{top:e,left:0},d||"page").top;return nj(this.doc,e+this.display.viewOffset)},heightAtLine:function(g,j,d){var h=false,f;if(typeof g=="number"){var e=this.doc.first+this.doc.size-1;if(g<this.doc.first){g=this.doc.first}else{if(g>e){g=e;h=true}}f=hm(this.doc,g)}else{f=g}return j8(this,f,{top:0,left:0},j||"page",d).top+(h?this.doc.height-m7(f):0)},defaultTextHeight:function(){return nF(this.display)},defaultCharWidth:function(){return kJ(this.display)},getViewport:function(){return{from:this.display.viewFrom,to:this.display.viewTo}},addWidget:function(h,l,f,k,d){var j=this.display;h=lL(this,i3(this.doc,h));var g=h.bottom,m=h.left;l.style.position="absolute";l.setAttribute("cm-ignore-events","true");this.display.input.setUneditable(l);j.sizer.appendChild(l);if(k=="over"){g=h.top}else{if(k=="above"||k=="near"){var n=Math.max(j.wrapper.clientHeight,this.doc.height),e=Math.max(j.sizer.clientWidth,j.lineSpace.clientWidth);if((k=="above"||h.bottom+l.offsetHeight>n)&&h.top>l.offsetHeight){g=h.top-l.offsetHeight}else{if(h.bottom+l.offsetHeight<=n){g=h.bottom}}if(m+l.offsetWidth>e){m=e-l.offsetWidth}}}l.style.top=g+"px";l.style.left=l.style.right="";if(d=="right"){m=j.sizer.clientWidth-l.offsetWidth;l.style.right="0px"}else{if(d=="left"){m=0}else{if(d=="middle"){m=(j.sizer.clientWidth-l.offsetWidth)/2}}l.style.left=m+"px"}if(f){mt(this,m,g,m+l.offsetWidth,g+l.offsetHeight)}},triggerOnKeyDown:jC(kp),triggerOnKeyPress:jC(mw),triggerOnKeyUp:me,execCommand:function(d){if(jg.hasOwnProperty(d)){return jg[d].call(null,this)}},triggerElectric:jC(function(d){g7(this,d)}),findPosH:function(j,e,d,g){var k=this;var h=1;if(e<0){h=-1;e=-e}var l=i3(this.doc,j);for(var f=0;f<e;++f){l=lg(k.doc,l,h,d,g);if(l.hitSide){break}}return l},moveH:jC(function(f,e){var d=this;this.extendSelectionsBy(function(g){if(d.display.shift||d.doc.extend||g.empty()){return lg(d.doc,g.head,f,e,d.options.rtlMoveVisually)}else{return f<0?g.from():g.to()}},m4)}),deleteH:jC(function(g,f){var e=this.doc.sel,d=this.doc;if(e.somethingSelected()){d.replaceSelection("",null,"+delete")}else{hL(this,function(j){var h=lg(d,j.head,g,f,false);return g<0?{from:h,to:j.head}:{from:j.head,to:h}})}}),findPosV:function(g,k,f,d){var l=this;var n=1,h=d;if(k<0){n=-1;k=-k}var e=i3(this.doc,g);for(var m=0;m<k;++m){var j=lL(l,e,"div");if(h==null){h=j.left}else{j.left=h}e=lB(l,j,n,f);if(e.hitSide){break}}return e},moveV:jC(function(h,f){var j=this;var d=this.doc,e=[];var k=!this.display.shift&&!d.extend&&d.sel.somethingSelected();d.extendSelectionsBy(function(n){if(k){return h<0?n.from():n.to()}var l=lL(j,n.head,"div");if(n.goalColumn!=null){l.left=n.goalColumn}e.push(l.left);var m=lB(j,l,h,f);if(f=="page"&&n==d.sel.primary()){lM(j,null,lU(j,m,"div").top-l.top)}return m},m4);if(e.length){for(var g=0;g<d.sel.ranges.length;g++){d.sel.ranges[g].goalColumn=e[g]}}}),findWordAt:function(j){var l=this.doc,e=hm(l,j.line).text;var k=j.ch,f=j.ch;if(e){var d=this.getHelper(j,"wordChars");if((j.xRel<0||f==e.length)&&k){--k}else{++f}var g=e.charAt(k);var h=mo(g,d)?function(m){return mo(m,d)}:/\s/.test(g)?function(m){return/\s/.test(m)}:function(m){return(!/\s/.test(m)&&!mo(m))};while(k>0&&h(e.charAt(k-1))){--k}while(f<e.length&&h(e.charAt(f))){++f}}return new lz(lA(j.line,k),lA(j.line,f))},toggleOverwrite:function(d){if(d!=null&&d==this.state.overwrite){return}if(this.state.overwrite=!this.state.overwrite){h6(this.display.cursorDiv,"CodeMirror-overwrite")}else{kS(this.display.cursorDiv,"CodeMirror-overwrite")}n9(this,"overwriteToggle",this,this.state.overwrite)},hasFocus:function(){return this.display.input.getField()==j3()},isReadOnly:function(){return !!(this.options.readOnly||this.doc.cantEdit)},scrollTo:jC(function(e,d){if(e!=null||d!=null){h2(this)}if(e!=null){this.curOp.scrollLeft=e}if(d!=null){this.curOp.scrollTop=d}}),getScrollInfo:function(){var d=this.display.scroller;return{left:d.scrollLeft,top:d.scrollTop,height:d.scrollHeight-lh(this)-this.display.barHeight,width:d.scrollWidth-lh(this)-this.display.barWidth,clientHeight:m8(this),clientWidth:i4(this)}},scrollIntoView:jC(function(d,e){if(d==null){d={from:this.doc.sel.primary().head,to:null};if(e==null){e=this.options.cursorScrollMargin}}else{if(typeof d=="number"){d={from:lA(d,0),to:null}}else{if(d.from==null){d={from:d,to:null}}}}if(!d.to){d.to=d.from}d.margin=e||0;if(d.from.line!=null){h2(this);this.curOp.scrollToPos=d}else{var f=mn(this,Math.min(d.from.left,d.to.left),Math.min(d.from.top,d.to.top)-d.margin,Math.max(d.from.right,d.to.right),Math.max(d.from.bottom,d.to.bottom)+d.margin);this.scrollTo(f.scrollLeft,f.scrollTop)}}),setSize:jC(function(e,h){var d=this;var f=function(j){return typeof j=="number"||/^\d+$/.test(String(j))?j+"px":j};if(e!=null){this.display.wrapper.style.width=f(e)}if(h!=null){this.display.wrapper.style.height=f(h)}if(this.options.lineWrapping){nZ(this)}var g=this.display.viewFrom;this.doc.iter(g,this.display.viewTo,function(k){if(k.widgets){for(var j=0;j<k.widgets.length;j++){if(k.widgets[j].noHScroll){lS(d,g,"widget");break}}}++g});this.curOp.forceUpdate=true;n9(this,"refresh",this)}),operation:function(d){return lI(this,d)},refresh:jC(function(){var d=this.display.cachedTextHeight;np(this);this.curOp.forceUpdate=true;nm(this);this.scrollTo(this.doc.scrollLeft,this.doc.scrollTop);jO(this);if(d==null||Math.abs(d-nF(this.display))>0.5){lr(this)}n9(this,"refresh",this)}),swapDoc:jC(function(d){var e=this.doc;e.cm=null;ip(this,d);nm(this);this.display.input.reset();this.scrollTo(d.scrollLeft,d.scrollTop);this.curOp.forceScroll=true;nw(this,"swapDoc",this,e);return e}),getInputField:function(){return this.display.input.getField()},getWrapperElement:function(){return this.display.wrapper},getScrollerElement:function(){return this.display.scroller},getGutterElement:function(){return this.display.gutters}};nA(a);a.registerHelper=function(e,f,d){if(!b.hasOwnProperty(e)){b[e]=a[e]={_global:[]}}b[e][f]=d};a.registerGlobalHelper=function(e,f,g,d){a.registerHelper(e,f,d);b[e]._global.push({pred:g,val:d})}};function lg(r,m,d,e,k){var g=m.line,f=m.ch,s=d;var p=hm(r,g);function a(){var t=g+d;if(t<r.first||t>=r.first+r.size){return false}g=t;return p=hm(r,t)}function b(t){var u=(k?ka:nn)(p,f,d,true);if(u==null){if(!t&&a()){if(k){f=(d<0?lj:md)(p)}else{f=d<0?p.text.length:0}}else{return false}}else{f=u}return true}if(e=="char"){b()}else{if(e=="column"){b(true)}else{if(e=="word"||e=="group"){var c=null,j=e=="group";var q=r.cm&&r.cm.getHelper(m,"wordChars");for(var l=true;;l=false){if(d<0&&!b(!l)){break}var o=p.text.charAt(f)||"\n";var n=mo(o,q)?"w":j&&o=="\n"?"n":!j||/\s/.test(o)?null:"p";if(j&&!l&&!n){n="s"}if(c&&c!=n){if(d<0){d=1;b()}break}if(n){c=n}if(d>0&&!b(!l)){break}}}}}var h=mJ(r,lA(g,f),m,s,true);if(!kI(m,h)){h.hitSide=true}return h}function lB(b,g,k,c){var d=b.doc,e=g.left,f;if(c=="page"){var h=Math.min(b.display.wrapper.clientHeight,window.innerHeight||document.documentElement.clientHeight);var a=Math.max(h-0.5*nF(b.display),3);f=(k>0?g.bottom:g.top)+k*a}else{if(c=="line"){f=k>0?g.bottom+3:g.top-3}}var j;for(;;){j=hg(b,e,f);if(!j.outside){break}if(k<0?f<=0:f>=d.height){j.hitSide=true;break}f+=k*5}return j}function k7(a){this.cm=a;this.lastAnchorNode=this.lastAnchorOffset=this.lastFocusNode=this.lastFocusOffset=null;this.polling=new hA();this.composing=null;this.gracePeriod=false;this.readDOMTimeout=null}k7.prototype=n0({init:function(d){var a=this;var e=this,c=e.cm;var b=e.div=d.lineDiv;hh(b,c.options.spellcheck);nY(b,"paste",function(g){if(nT(c,g)||mz(g,c)){return}if(kH<=11){setTimeout(mQ(c,function(){if(!e.pollContent()){np(c)}}),20)}});nY(b,"compositionstart",function(g){a.composing={data:g.data}});nY(b,"compositionupdate",function(g){if(!a.composing){a.composing={data:g.data}}});nY(b,"compositionend",function(g){if(a.composing){if(g.data!=a.composing.data){a.readFromDOMSoon()}a.composing=null}});nY(b,"touchstart",function(){return e.forceCompositionEnd()});nY(b,"input",function(){if(!a.composing){a.readFromDOMSoon()}});function f(k){if(nT(c,k)){return}if(c.somethingSelected()){jJ({lineWise:false,text:c.getSelections()});if(k.type=="cut"){c.replaceSelection("",null,"cut")}}else{if(!c.options.lineWiseCopyCut){return}else{var g=jf(c);jJ({lineWise:true,text:g.text});if(k.type=="cut"){c.operation(function(){c.setSelections(g.ranges,0,ln);c.replaceSelection("",null,"cut")})}}}if(k.clipboardData){k.clipboardData.clearData();var l=lZ.text.join("\n");k.clipboardData.setData("Text",l);if(k.clipboardData.getData("Text")==l){k.preventDefault();return}}var m=nG(),j=m.firstChild;c.display.lineSpace.insertBefore(m,c.display.lineSpace.firstChild);j.value=lZ.text.join("\n");var h=document.activeElement;kf(j);setTimeout(function(){c.display.lineSpace.removeChild(m);h.focus();if(h==b){e.showPrimarySelection()}},50)}nY(b,"copy",f);nY(b,"cut",f)},prepareSelection:function(){var a=i9(this.cm,false);a.focus=this.cm.state.focused;return a},showSelection:function(b,a){if(!b||!this.cm.display.view.length){return}if(b.focus||a){this.showPrimarySelection()}this.showMultipleSelections(b)},showPrimarySelection:function(){var k=window.getSelection(),g=this.cm.doc.sel.primary();var j=mG(this.cm,k.anchorNode,k.anchorOffset);var e=mG(this.cm,k.focusNode,k.focusOffset);if(j&&!j.bad&&e&&!e.bad&&kI(m3(j,e),g.from())==0&&kI(nD(j,e),g.to())==0){return}var l=mq(this.cm,g.from());var f=mq(this.cm,g.to());if(!l&&!f){return}var b=this.cm.display.view;var h=k.rangeCount&&k.getRangeAt(0);if(!l){l={node:b[0].measure.map[2],offset:0}}else{if(!f){var m=b[b.length-1].measure;var a=m.maps?m.maps[m.maps.length-1]:m.map;f={node:a[a.length-1],offset:a[a.length-2]-a[a.length-3]}}}var d;try{d=ki(l.node,l.offset,f.offset,f.node)}catch(c){}if(d){if(!kc&&this.cm.state.focused){k.collapse(l.node,l.offset);if(!d.collapsed){k.removeAllRanges();k.addRange(d)}}else{k.removeAllRanges();k.addRange(d)}if(h&&k.anchorNode==null){k.addRange(h)}else{if(kc){this.startGracePeriod()}}}this.rememberSelection()},startGracePeriod:function(){var a=this;clearTimeout(this.gracePeriod);this.gracePeriod=setTimeout(function(){a.gracePeriod=false;if(a.selectionChanged()){a.cm.operation(function(){return a.cm.curOp.selectionChanged=true})}},20)},showMultipleSelections:function(a){mR(this.cm.display.cursorDiv,a.cursors);mR(this.cm.display.selectionDiv,a.selection)},rememberSelection:function(){var a=window.getSelection();this.lastAnchorNode=a.anchorNode;this.lastAnchorOffset=a.anchorOffset;this.lastFocusNode=a.focusNode;this.lastFocusOffset=a.focusOffset},selectionInEditor:function(){var b=window.getSelection();if(!b.rangeCount){return false}var a=b.getRangeAt(0).commonAncestorContainer;return hR(this.div,a)},focus:function(){if(this.cm.options.readOnly!="nocursor"){if(!this.selectionInEditor()){this.showSelection(this.prepareSelection(),true)}this.div.focus()}},blur:function(){this.div.blur()},getField:function(){return this.div},supportsTouch:function(){return true},receivedFocus:function(){var a=this;if(this.selectionInEditor()){this.pollSelection()}else{lI(this.cm,function(){return a.cm.curOp.selectionChanged=true})}function b(){if(a.cm.state.focused){a.pollSelection();a.polling.set(a.cm.options.pollInterval,b)}}this.polling.set(this.cm.options.pollInterval,b)},selectionChanged:function(){var a=window.getSelection();return a.anchorNode!=this.lastAnchorNode||a.anchorOffset!=this.lastAnchorOffset||a.focusNode!=this.lastFocusNode||a.focusOffset!=this.lastFocusOffset},pollSelection:function(){if(!this.composing&&this.readDOMTimeout==null&&!this.gracePeriod&&this.selectionChanged()){var b=window.getSelection(),a=this.cm;this.rememberSelection();var d=mG(a,b.anchorNode,b.anchorOffset);var c=mG(a,b.focusNode,b.focusOffset);if(d&&c){lI(a,function(){mL(a.doc,j1(d,c),ln);if(d.bad||c.bad){a.curOp.selectionChanged=true}})}}},pollContent:function(){if(this.readDOMTimeout!=null){clearTimeout(this.readDOMTimeout);this.readDOMTimeout=null}var f=this.cm,t=f.display,v=f.doc.sel.primary();var u=v.from(),m=v.to();if(u.ch==0&&u.line>f.firstLine()){u=lA(u.line-1,hm(f.doc,u.line-1).length)}if(m.ch==hm(f.doc,m.line).text.length&&m.line<f.lastLine()){m=lA(m.line+1,0)}if(u.line<t.viewFrom||m.line>t.viewTo-1){return false}var j,l,g;if(u.line==t.viewFrom||(j=iR(f,u.line))==0){l=m5(t.view[0].line);g=t.view[0].node}else{l=m5(t.view[j].line);g=t.view[j-1].node.nextSibling}var w=iR(f,m.line);var d,a;if(w==t.view.length-1){d=t.viewTo-1;a=t.lineDiv.lastChild}else{d=m5(t.view[w+1].line)-1;a=t.view[w+1].node.previousSibling}if(!g){return false}var s=f.doc.splitLines(g3(f,g,a,l,d));var b=gY(f.doc,lA(l,0),lA(d,hm(f.doc,d).text.length));while(s.length>1&&b.length>1){if(ji(s)==ji(b)){s.pop();b.pop();d--}else{if(s[0]==b[0]){s.shift();b.shift();l++}else{break}}}var x=0,o=0;var e=s[0],p=b[0],q=Math.min(e.length,p.length);while(x<q&&e.charCodeAt(x)==p.charCodeAt(x)){++x}var h=ji(s),r=ji(b);var n=Math.min(h.length-(s.length==1?x:0),r.length-(b.length==1?x:0));while(o<n&&h.charCodeAt(h.length-o-1)==r.charCodeAt(r.length-o-1)){++o}s[s.length-1]=h.slice(0,h.length-o).replace(/^\u200b+/,"");s[0]=s[0].slice(x).replace(/\u200b+$/,"");var k=lA(l,x);var c=lA(d,b.length?ji(b).length-o:0);if(s.length>1||s[0]||kI(k,c)){gT(f.doc,s,k,c,"+input");return true}},ensurePolled:function(){this.forceCompositionEnd()},reset:function(){this.forceCompositionEnd()},forceCompositionEnd:function(){if(!this.composing){return}this.composing=null;if(!this.pollContent()){np(this.cm)}this.div.blur();this.div.focus()},readFromDOMSoon:function(){var a=this;if(this.readDOMTimeout!=null){return}this.readDOMTimeout=setTimeout(function(){a.readDOMTimeout=null;if(a.composing){return}if(a.cm.isReadOnly()||!a.pollContent()){lI(a.cm,function(){return np(a.cm)})}},80)},setUneditable:function(a){a.contentEditable="false"},onKeyPress:function(a){a.preventDefault();if(!this.cm.isReadOnly()){mQ(this.cm,g4)(this.cm,String.fromCharCode(a.charCode==null?a.keyCode:a.charCode),0)}},readOnlyChanged:function(a){this.div.contentEditable=String(a!="nocursor")},onContextMenu:g8,resetPosition:g8,needsContentAttribute:true},k7.prototype);function mq(d,f){var e=hp(d,f.line);if(!e||e.hidden){return null}var b=hm(d.doc,f.line);var j=jT(e,b,f.line);var h=ld(b),g="left";if(h){var a=n6(h,f.ch);g=a%2?"right":"left"}var c=n3(j.map,f.ch,g);c.offset=c.collapse=="right"?c.end:c.start;return c}function jH(b,a){if(a){b.bad=true}return b}function g3(c,e,d,h,k){var a="",j=false,b=c.doc.lineSeparator();function g(l){return function(m){return m.id==l}}function f(o){if(o.nodeType==1){var r=o.getAttribute("cm-text");if(r!=null){if(r==""){a+=o.textContent.replace(/\u200b/g,"")}else{a+=r}return}var p=o.getAttribute("cm-marker"),l;if(p){var n=c.findMarks(lA(h,0),lA(k+1,0),g(+p));if(n.length&&(l=n[0].find())){a+=gY(c.doc,l.from,l.to).join(b)}return}if(o.getAttribute("contenteditable")=="false"){return}for(var q=0;q<o.childNodes.length;q++){f(o.childNodes[q])}if(/^(pre|div|p)$/i.test(o.nodeName)){j=true}}else{if(o.nodeType==3){var m=o.nodeValue;if(!m){return}if(j){a+=b;j=false}a+=m}}}for(;;){f(e);if(e==d){break}e=e.nextSibling}return a}function mG(f,c,a){var b;if(c==f.display.lineDiv){b=f.display.lineDiv.childNodes[a];if(!b){return jH(f.clipPos(lA(f.display.viewTo-1)),true)}c=null;a=0}else{for(b=c;;b=b.parentNode){if(!b||b==f.display.lineDiv){return null}if(b.parentNode&&b.parentNode==f.display.lineDiv){break}}}for(var d=0;d<f.display.view.length;d++){var e=f.display.view[d];if(e.node==b){return li(e,c,a)}}}function li(h,m,k){var p=h.text.firstChild,n=false;if(!m||!hR(p,m)){return jH(lA(m5(h.line),0),true)}if(m==p){n=true;m=p.childNodes[k];k=0;if(!m){var a=h.rest?ji(h.rest):h.line;return jH(lA(m5(a),a.text.length),n)}}var l=m.nodeType==3?m:null,c=m;if(!l&&m.childNodes.length==1&&m.firstChild.nodeType==3){l=m.firstChild;if(k){k=l.nodeValue.length}}while(c.parentNode!=p){c=c.parentNode}var q=h.measure,e=q.maps;function j(y,t,w){for(var u=-1;u<(e?e.length:0);u++){var s=u<0?q.map:e[u];for(var v=0;v<s.length;v+=3){var x=s[v+2];if(x==y||x==t){var r=m5(u<0?h.line:h.rest[u]);var z=s[v]+w;if(w<0||x!=y){z=s[v+(w?1:0)]}return lA(r,z)}}}}var b=j(l,c,k);if(b){return jH(b,n)}for(var g=c.nextSibling,f=l?l.nodeValue.length-k:0;g;g=g.nextSibling){b=j(g,g.firstChild,0);if(b){return jH(lA(b.line,b.ch-f),n)}else{f+=g.textContent.length}}for(var d=c.previousSibling,o=k;d;d=d.previousSibling){b=j(d,d.firstChild,-1);if(b){return jH(lA(b.line,b.ch+o),n)}else{o+=d.textContent.length}}}function lt(a){this.cm=a;this.prevInput="";this.pollingFast=false;this.polling=new hA();this.inaccurateSelection=false;this.hasSelection=false;this.composing=null}lt.prototype=n0({init:function(f){var a=this;var g=this,e=this.cm;var b=this.wrapper=nG();var d=this.textarea=b.firstChild;f.wrapper.insertBefore(b,f.wrapper.firstChild);if(hE){d.style.width="0px"}nY(d,"input",function(){if(kj&&kH>=9&&a.hasSelection){a.hasSelection=null}g.poll()});nY(d,"paste",function(h){if(nT(e,h)||mz(h,e)){return}e.state.pasteIncoming=true;g.fastPoll()});function c(j){if(nT(e,j)){return}if(e.somethingSelected()){jJ({lineWise:false,text:e.getSelections()});if(g.inaccurateSelection){g.prevInput="";g.inaccurateSelection=false;d.value=lZ.text.join("\n");kf(d)}}else{if(!e.options.lineWiseCopyCut){return}else{var h=jf(e);jJ({lineWise:true,text:h.text});if(j.type=="cut"){e.setSelections(h.ranges,null,ln)}else{g.prevInput="";d.value=h.text.join("\n");kf(d)}}}if(j.type=="cut"){e.state.cutIncoming=true}}nY(d,"cut",c);nY(d,"copy",c);nY(f.scroller,"paste",function(h){if(my(f,h)||nT(e,h)){return}e.state.pasteIncoming=true;g.focus()});nY(f.lineSpace,"selectstart",function(h){if(!my(f,h)){l7(h)}});nY(d,"compositionstart",function(){var h=e.getCursor("from");if(g.composing){g.composing.range.clear()}g.composing={start:h,range:e.markText(h,e.getCursor("to"),{className:"CodeMirror-composing"})}});nY(d,"compositionend",function(){if(g.composing){g.poll();g.composing.range.clear();g.composing=null}})},prepareSelection:function(){var g=this.cm,b=g.display,c=g.doc;var e=i9(g);if(g.options.moveInputWithCursor){var a=lL(g,c.sel.primary().head,"div");var f=b.wrapper.getBoundingClientRect(),d=b.lineDiv.getBoundingClientRect();e.teTop=Math.max(0,Math.min(b.wrapper.clientHeight-10,a.top+d.top-f.top));e.teLeft=Math.max(0,Math.min(b.wrapper.clientWidth-10,a.left+d.left-f.left))}return e},showSelection:function(b){var a=this.cm,c=a.display;mR(c.cursorDiv,b.cursors);mR(c.selectionDiv,b.selection);if(b.teTop!=null){this.wrapper.style.top=b.teTop+"px";this.wrapper.style.left=b.teLeft+"px"}},reset:function(e){if(this.contextMenuPending){return}var g,f,d=this.cm,b=d.doc;if(d.somethingSelected()){this.prevInput="";var a=b.sel.primary();g=jz&&(a.to().line-a.from().line>100||(f=d.getSelection()).length>1000);var c=g?"-":f||d.getSelection();this.textarea.value=c;if(d.state.focused){kf(this.textarea)}if(kj&&kH>=9){this.hasSelection=c}}else{if(!e){this.prevInput=this.textarea.value="";if(kj&&kH>=9){this.hasSelection=null}}}this.inaccurateSelection=g},getField:function(){return this.textarea},supportsTouch:function(){return false},focus:function(){if(this.cm.options.readOnly!="nocursor"&&(!ie||j3()!=this.textarea)){try{this.textarea.focus()}catch(a){}}},blur:function(){this.textarea.blur()},resetPosition:function(){this.wrapper.style.top=this.wrapper.style.left=0},receivedFocus:function(){this.slowPoll()},slowPoll:function(){var a=this;if(this.pollingFast){return}this.polling.set(this.cm.options.pollInterval,function(){a.poll();if(a.cm.state.focused){a.slowPoll()}})},fastPoll:function(){var c=false,a=this;a.pollingFast=true;function b(){var d=a.poll();if(!d&&!c){c=true;a.polling.set(60,b)}else{a.pollingFast=false;a.slowPoll()}}a.polling.set(20,b)},poll:function(){var a=this;var f=this.cm,g=this.textarea,e=this.prevInput;if(this.contextMenuPending||!f.state.focused||(lv(g)&&!e&&!this.composing)||f.isReadOnly()||f.options.disableInput||f.state.keySeq){return false}var c=g.value;if(c==e&&!f.somethingSelected()){return false}if(kj&&kH>=9&&this.hasSelection===c||k9&&/[\uf700-\uf7ff]/.test(c)){f.display.input.reset();return false}if(f.doc.sel==f.display.selForContextMenu){var d=c.charCodeAt(0);if(d==8203&&!e){e="\u200b"}if(d==8666){this.reset();return this.cm.execCommand("undo")}}var b=0,h=Math.min(e.length,c.length);while(b<h&&e.charCodeAt(b)==c.charCodeAt(b)){++b}lI(f,function(){g4(f,c.slice(b),e.length-b,null,a.composing?"*compose":null);if(c.length>1000||c.indexOf("\n")>-1){g.value=a.prevInput=""}else{a.prevInput=c}if(a.composing){a.composing.range.clear();a.composing.range=f.markText(a.composing.start,f.getCursor("to"),{className:"CodeMirror-composing"})}});return true},ensurePolled:function(){if(this.pollingFast&&this.poll()){this.pollingFast=false}},onKeyPress:function(){if(kj&&kH>=9){this.hasSelection=null}this.fastPoll()},onContextMenu:function(l){var e=this,d=e.cm,j=d.display,p=e.textarea;var f=kg(d,l),g=j.scroller.scrollTop;if(!f||iL){return}var m=d.options.resetSelectionOnContextMenu;if(m&&d.doc.sel.contains(f)==-1){mQ(d,mL)(d.doc,j1(f),ln)}var k=p.style.cssText,a=e.wrapper.style.cssText;e.wrapper.style.cssText="position: absolute";var b=e.wrapper.getBoundingClientRect();p.style.cssText="position: absolute; width: 30px; height: 30px;\n      top: "+(l.clientY-b.top-5)+"px; left: "+(l.clientX-b.left-5)+"px;\n      z-index: 1000; background: "+(kj?"rgba(255, 255, 255, .05)":"transparent")+";\n      outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";var c;if(mU){c=window.scrollY}j.input.focus();if(mU){window.scrollTo(null,c)}j.input.reset();if(!d.somethingSelected()){p.value=e.prevInput=" "}e.contextMenuPending=true;j.selForContextMenu=d.doc.sel;clearTimeout(j.detectingSelectAll);function n(){if(p.selectionStart!=null){var r=d.somethingSelected();var q="\u200b"+(r?p.value:"");p.value="\u21da";p.value=q;e.prevInput=r?"":"\u200b";p.selectionStart=1;p.selectionEnd=q.length;j.selForContextMenu=d.doc.sel}}function h(){e.contextMenuPending=false;e.wrapper.style.cssText=a;p.style.cssText=k;if(kj&&kH<9){j.scrollbars.setScrollTop(j.scroller.scrollTop=g)}if(p.selectionStart!=null){if(!kj||(kj&&kH<9)){n()}var r=0,q=function(){if(j.selForContextMenu==d.doc.sel&&p.selectionStart==0&&p.selectionEnd>0&&e.prevInput=="\u200b"){mQ(d,nh)(d)}else{if(r++<10){j.detectingSelectAll=setTimeout(q,500)}else{j.input.reset()}}};j.detectingSelectAll=setTimeout(q,200)}}if(kj&&kH>=9){n()}if(hT){jK(l);var o=function(){ih(window,"mouseup",o);setTimeout(h,20)};nY(window,"mouseup",o)}else{setTimeout(h,50)}},readOnlyChanged:function(a){if(!a){this.reset()}},setUneditable:g8,needsContentAttribute:false},lt.prototype);function je(c,b){b=b?n0(b):{};b.value=c.value;if(!b.tabindex&&c.tabIndex){b.tabindex=c.tabIndex}if(!b.placeholder&&c.placeholder){b.placeholder=c.placeholder}if(b.autofocus==null){var a=j3();b.autofocus=a==c||c.getAttribute("autofocus")!=null&&a==document.body}function f(){c.value=d.getValue()}var e;if(c.form){nY(c.form,"submit",f);if(!b.leaveSubmitMethodAlone){var j=c.form;e=j.submit;try{var g=j.submit=function(){f();j.submit=e;j.submit();j.submit=g}}catch(h){}}}b.finishInit=function(k){k.save=f;k.getTextArea=function(){return c};k.toTextArea=function(){k.toTextArea=isNaN;f();c.parentNode.removeChild(k.getWrapperElement());c.style.display="";if(c.form){ih(c.form,"submit",f);if(typeof c.form.submit=="function"){c.form.submit=e}}}};c.style.display="none";var d=hx(function(k){return c.parentNode.insertBefore(k,c.nextSibling)},b);return d}function iZ(a){a.off=ih;a.on=nY;a.wheelEventPixels=mF;a.Doc=mT;a.splitLines=hd;a.countColumn=mV;a.findColumn=jM;a.isWordChar=h0;a.Pass=kU;a.signal=n9;a.Line=gW;a.changeEnd=m1;a.scrollbarModel=lX;a.Pos=lA;a.cmpPos=kI;a.modes=le;a.mimeModes=nQ;a.resolveMode=hP;a.getMode=h8;a.modeExtensions=iV;a.extendMode=jc;a.copyState=nK;a.startState=nR;a.innerMode=hX;a.commands=jg;a.keyMap=hq;a.keyName=iw;a.isModifierKey=jm;a.lookupKey=kN;a.normalizeKeyMap=l2;a.StringStream=hU;a.SharedTextMarker=jZ;a.TextMarker=lV;a.LineWidget=kO;a.e_preventDefault=l7;a.e_stopPropagation=iT;a.e_stop=jK;a.addClass=h6;a.contains=hR;a.rmClass=kS;a.keyNames=iQ}i0(hx);jX(hx);var k4="iter insert remove copy getEditor constructor".split(" ");for(var nd in mT.prototype){if(mT.prototype.hasOwnProperty(nd)&&jb(k4,nd)<0){hx.prototype[nd]=(function(a){return function(){return a.apply(this.doc,arguments)}})(mT.prototype[nd])}}nA(mT);hx.inputStyles={textarea:lt,contenteditable:k7};hx.defineMode=function(a){if(!hx.defaults.mode&&a!="null"){hx.defaults.mode=a}jE.apply(this,arguments)};hx.defineMIME=lT;hx.defineMode("null",function(){return({token:function(a){return a.skipToEnd()}})});hx.defineMIME("text/plain","null");hx.defineExtension=function(a,b){hx.prototype[a]=b};hx.defineDocExtension=function(a,b){mT.prototype[a]=b};hx.fromTextArea=je;iZ(hx);hx.version="5.21.0";return hx})));
\ No newline at end of file
diff --git a/route/static/codemirror/lib/index.html b/route/static/codemirror/lib/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/codemirror/lib/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/codemirror/mode/index.html b/route/static/codemirror/mode/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/codemirror/mode/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/codemirror/mode/modeAll.js b/route/static/codemirror/mode/modeAll.js
deleted file mode 100755
index 33a90a45b..000000000
--- a/route/static/codemirror/mode/modeAll.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(b){if(typeof exports=="object"&&typeof module=="object"){b(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],b)}else{b(CodeMirror)}}})(function(b){b.defineMode("sql",function(C,z){var B=z.client||{},w=z.atoms||{"false":true,"true":true,"null":true},s=z.builtin||{},y=z.keywords||{},x=z.operatorChars||/^[*+\-%<>!=&|~^]/,r=z.support||{},a=z.hooks||{},D=z.dateSQL||{date:true,time:true,timestamp:true};function A(c,e){var f=c.next();if(a[f]){var g=a[f](c,e);if(g!==false){return g}}if(r.hexNumber&&((f=="0"&&c.match(/^[xX][0-9a-fA-F]+/))||(f=="x"||f=="X")&&c.match(/^'[0-9a-fA-F]+'/))){return"number"}else{if(r.binaryNumber&&(((f=="b"||f=="B")&&c.match(/^'[01]+'/))||(f=="0"&&c.match(/^b[01]+/)))){return"number"}else{if(f.charCodeAt(0)>47&&f.charCodeAt(0)<58){c.match(/^[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?/);r.decimallessFloat&&c.eat(".");return"number"}else{if(f=="?"&&(c.eatSpace()||c.eol()||c.eat(";"))){return"variable-3"}else{if(f=="'"||(f=='"'&&r.doubleQuote)){e.tokenize=q(f);return e.tokenize(c,e)}else{if((((r.nCharCast&&(f=="n"||f=="N"))||(r.charsetCast&&f=="_"&&c.match(/[a-z][a-z0-9]*/i)))&&(c.peek()=="'"||c.peek()=='"'))){return"keyword"}else{if(/^[\(\),\;\[\]]/.test(f)){return null}else{if(r.commentSlashSlash&&f=="/"&&c.eat("/")){c.skipToEnd();return"comment"}else{if((r.commentHash&&f=="#")||(f=="-"&&c.eat("-")&&(!r.commentSpaceRequired||c.eat(" ")))){c.skipToEnd();return"comment"}else{if(f=="/"&&c.eat("*")){e.tokenize=u;return e.tokenize(c,e)}else{if(f=="."){if(r.zerolessFloat&&c.match(/^(?:\d+(?:e[+-]?\d+)?)/i)){return"number"}if(r.ODBCdotTable&&c.match(/^[a-zA-Z_]+/)){return"variable-2"}}else{if(x.test(f)){c.eatWhile(x);return null}else{if(f=="{"&&(c.match(/^( )*(d|D|t|T|ts|TS)( )*'[^']*'( )*}/)||c.match(/^( )*(d|D|t|T|ts|TS)( )*"[^"]*"( )*}/))){return"number"}else{c.eatWhile(/^[_\w\d]/);var d=c.current().toLowerCase();if(D.hasOwnProperty(d)&&(c.match(/^( )+'[^']*'/)||c.match(/^( )+"[^"]*"/))){return"number"}if(w.hasOwnProperty(d)){return"atom"}if(s.hasOwnProperty(d)){return"builtin"}if(y.hasOwnProperty(d)){return"keyword"}if(B.hasOwnProperty(d)){return"string-2"}return null}}}}}}}}}}}}}}function q(c){return function(d,f){var e=false,g;while((g=d.next())!=null){if(g==c&&!e){f.tokenize=A;break}e=!e&&g=="\\"}return"string"}}function u(c,d){while(true){if(c.skipTo("*")){c.next();if(c.eat("/")){d.tokenize=A;break}}else{c.skipToEnd();break}}return"comment"}function v(c,d,e){d.context={prev:d.context,indent:c.indentation(),col:c.column(),type:e}}function t(c){c.indent=c.context.indent;c.context=c.context.prev}return{startState:function(){return{tokenize:A,context:null}},token:function(c,d){if(c.sol()){if(d.context&&d.context.align==null){d.context.align=false}}if(c.eatSpace()){return null}var e=d.tokenize(c,d);if(e=="comment"){return e}if(d.context&&d.context.align==null){d.context.align=true}var f=c.current();if(f=="("){v(c,d,")")}else{if(f=="["){v(c,d,"]")}else{if(d.context&&d.context.type==f){t(d)}}}return e},indent:function(c,e){var f=c.context;if(!f){return b.Pass}var d=e.charAt(0)==f.type;if(f.align){return f.col+(d?0:1)}else{return f.indent+(d?0:C.indentUnit)}},blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:r.commentSlashSlash?"//":r.commentHash?"#":null}});(function(){function j(c){var d;while((d=c.next())!=null){if(d=="`"&&!c.eat("`")){return"variable-2"}}c.backUp(c.current().length-1);return c.eatWhile(/\w/)?"variable-2":null}function a(c){if(c.eat("@")){c.match(/^session\./);c.match(/^local\./);c.match(/^global\./)}if(c.eat("'")){c.match(/^.*'/);return"variable-2"}else{if(c.eat('"')){c.match(/^.*"/);return"variable-2"}else{if(c.eat("`")){c.match(/^.*`/);return"variable-2"}else{if(c.match(/^[0-9a-zA-Z$\.\_]+/)){return"variable-2"}}}}return null}function i(c){if(c.eat("N")){return"atom"}return c.match(/^[a-zA-Z.#!?]/)?"variable-2":null}var h="alter and as asc between by count create delete desc distinct drop from group having in insert into is join like not on or order select set table union update values where limit ";function g(c){var e={},d=c.split(" ");for(var f=0;f<d.length;++f){e[d[f]]=true}return e}b.defineMIME("text/x-sql",{name:"sql",keywords:g(h+"begin"),builtin:g("bool boolean bit blob enum long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision real date datetime year unsigned signed decimal numeric"),atoms:g("false true null unknown"),operatorChars:/^[*+\-%<>!=]/,dateSQL:g("date time timestamp"),support:g("ODBCdotTable doubleQuote binaryNumber hexNumber")});b.defineMIME("text/x-mssql",{name:"sql",client:g("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),keywords:g(h+"begin trigger proc view index for add constraint key primary foreign collate clustered nonclustered declare exec"),builtin:g("bigint numeric bit smallint decimal smallmoney int tinyint money float real char varchar text nchar nvarchar ntext binary varbinary image cursor timestamp hierarchyid uniqueidentifier sql_variant xml table "),atoms:g("false true null unknown"),operatorChars:/^[*+\-%<>!=]/,dateSQL:g("date datetimeoffset datetime2 smalldatetime datetime time"),hooks:{"@":a}});b.defineMIME("text/x-mysql",{name:"sql",client:g("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),keywords:g(h+"accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general get global grant grants group group_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),builtin:g("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),atoms:g("false true null unknown"),operatorChars:/^[*+\-%<>!=&|^]/,dateSQL:g("date time timestamp"),support:g("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),hooks:{"@":a,"`":j,"\\":i}});b.defineMIME("text/x-mariadb",{name:"sql",client:g("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),keywords:g(h+"accessible action add after algorithm all always analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general generated get global grant grants group groupby_concat handler hard hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password persistent phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show shutdown signal slave slow smallint snapshot soft soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views virtual warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),builtin:g("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),atoms:g("false true null unknown"),operatorChars:/^[*+\-%<>!=&|^]/,dateSQL:g("date time timestamp"),support:g("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),hooks:{"@":a,"`":j,"\\":i}});b.defineMIME("text/x-cassandra",{name:"sql",client:{},keywords:g("add all allow alter and any apply as asc authorize batch begin by clustering columnfamily compact consistency count create custom delete desc distinct drop each_quorum exists filtering from grant if in index insert into key keyspace keyspaces level limit local_one local_quorum modify nan norecursive nosuperuser not of on one order password permission permissions primary quorum rename revoke schema select set storage superuser table three to token truncate ttl two type unlogged update use user users using values where with writetime"),builtin:g("ascii bigint blob boolean counter decimal double float frozen inet int list map static text timestamp timeuuid tuple uuid varchar varint"),atoms:g("false true infinity NaN"),operatorChars:/^[<>=]/,dateSQL:{},support:g("commentSlashSlash decimallessFloat"),hooks:{}});b.defineMIME("text/x-plsql",{name:"sql",client:g("appinfo arraysize autocommit autoprint autorecovery autotrace blockterminator break btitle cmdsep colsep compatibility compute concat copycommit copytypecheck define describe echo editfile embedded escape exec execute feedback flagger flush heading headsep instance linesize lno loboffset logsource long longchunksize markup native newpage numformat numwidth pagesize pause pno recsep recsepchar release repfooter repheader serveroutput shiftinout show showmode size spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix tab term termout time timing trimout trimspool ttitle underline verify version wrap"),keywords:g("abort accept access add all alter and any array arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body boolean by case cast char char_base check close cluster clusters colauth column comment commit compress connect connected constant constraint crash create current currval cursor data_base database date dba deallocate debugoff debugon decimal declare default definition delay delete desc digits dispose distinct do drop else elseif elsif enable end entry escape exception exception_init exchange exclusive exists exit external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans insert interface intersect into is key level library like limited local lock log logging long loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base object of off offline on online only open option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw read rebuild record ref references refresh release rename replace resource restrict return returning returns reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate session set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable update use using validate value values variable view views when whenever where while with work"),builtin:g("abs acos add_months ascii asin atan atan2 average bfile bfilename bigserial bit blob ceil character chartorowid chr clob concat convert cos cosh count dec decode deref dual dump dup_val_on_index empty error exp false float floor found glb greatest hextoraw initcap instr instrb int integer isopen last_day least length lengthb ln lower lpad ltrim lub make_ref max min mlslabel mod months_between natural naturaln nchar nclob new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null number numeric nvarchar2 nvl others power rawtohex real reftohex round rowcount rowidtochar rowtype rpad rtrim serial sign signtype sin sinh smallint soundex sqlcode sqlerrm sqrt stddev string substr substrb sum sysdate tan tanh to_char text to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid unlogged upper user userenv varchar varchar2 variance varying vsize xml"),operatorChars:/^[*+\-%<>!=~]/,dateSQL:g("date time timestamp"),support:g("doubleQuote nCharCast zerolessFloat binaryNumber hexNumber")});b.defineMIME("text/x-hive",{name:"sql",keywords:g("select alter $elem$ $key$ $value$ add after all analyze and archive as asc before between binary both bucket buckets by cascade case cast change cluster clustered clusterstatus collection column columns comment compute concatenate continue create cross cursor data database databases dbproperties deferred delete delimited desc describe directory disable distinct distribute drop else enable end escaped exclusive exists explain export extended external false fetch fields fileformat first format formatted from full function functions grant group having hold_ddltime idxproperties if import in index indexes inpath inputdriver inputformat insert intersect into is items join keys lateral left like limit lines load local location lock locks mapjoin materialized minus msck no_drop nocompress not of offline on option or order out outer outputdriver outputformat overwrite partition partitioned partitions percent plus preserve procedure purge range rcfile read readonly reads rebuild recordreader recordwriter recover reduce regexp rename repair replace restrict revoke right rlike row schema schemas semi sequencefile serde serdeproperties set shared show show_database sort sorted ssl statistics stored streamtable table tables tablesample tblproperties temporary terminated textfile then tmp to touch transform trigger true unarchive undo union uniquejoin unlock update use using utc utc_tmestamp view when where while with"),builtin:g("bool boolean long timestamp tinyint smallint bigint int float double date datetime unsigned string array struct map uniontype"),atoms:g("false true null unknown"),operatorChars:/^[*+\-%<>!=]/,dateSQL:g("date timestamp"),support:g("ODBCdotTable doubleQuote binaryNumber hexNumber")});b.defineMIME("text/x-pgsql",{name:"sql",client:g("source"),keywords:g(h+"a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get global go goto grant granted greatest grouping groups handler header hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lead leading leakproof least left length level library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat"),builtin:g("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),atoms:g("false true null unknown"),operatorChars:/^[*+\-%<>!=&|^\/#@?~]/,dateSQL:g("date time timestamp"),support:g("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast")});b.defineMIME("text/x-gql",{name:"sql",keywords:g("ancestor and asc by contains desc descendant distinct from group has in is limit offset on order select superset where"),atoms:g("false true"),builtin:g("blob datetime first key __key__ string integer double boolean null"),operatorChars:/^[*+\-%<>!=]/})}())});(function(b){if(typeof exports=="object"&&typeof module=="object"){b(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],b)}else{b(CodeMirror)}}})(function(e){var d={autoSelfClosers:{area:true,base:true,br:true,col:true,command:true,embed:true,frame:true,hr:true,img:true,input:true,keygen:true,link:true,meta:true,param:true,source:true,track:true,wbr:true,menuitem:true},implicitlyClosed:{dd:true,li:true,optgroup:true,option:true,p:true,rp:true,rt:true,tbody:true,td:true,tfoot:true,th:true,tr:true},contextGrabbers:{dd:{dd:true,dt:true},dt:{dd:true,dt:true},li:{li:true},option:{option:true,optgroup:true},optgroup:{optgroup:true},p:{address:true,article:true,aside:true,blockquote:true,dir:true,div:true,dl:true,fieldset:true,footer:true,form:true,h1:true,h2:true,h3:true,h4:true,h5:true,h6:true,header:true,hgroup:true,hr:true,menu:true,nav:true,ol:true,p:true,pre:true,section:true,table:true,ul:true},rp:{rp:true,rt:true},rt:{rp:true,rt:true},tbody:{tbody:true,tfoot:true},td:{td:true,th:true},tfoot:{tbody:true},th:{td:true,th:true},thead:{tbody:true,tfoot:true},tr:{tr:true}},doNotIndent:{pre:true},allowUnquoted:true,allowMissing:true,caseFold:true};var f={autoSelfClosers:{},implicitlyClosed:{},contextGrabbers:{},doNotIndent:{},allowUnquoted:false,allowMissing:false,caseFold:false};e.defineMode("xml",function(O,b){var H=O.indentUnit;var a={};var P=b.htmlMode?d:f;for(var V in P){a[V]=P[V]}for(var V in b){a[V]=b[V]}var U,T;function L(g,h){function j(l){h.tokenize=l;return l(g,h)}var i=g.next();if(i=="<"){if(g.eat("!")){if(g.eat("[")){if(g.match("CDATA[")){return j(c("atom","]]>"))}else{return null}}else{if(g.match("--")){return j(c("comment","-->"))}else{if(g.match("DOCTYPE",true,true)){g.eatWhile(/[\w\._\-]/);return j(K(1))}else{return null}}}}else{if(g.eat("?")){g.eatWhile(/[\w\._\-]/);h.tokenize=c("meta","?>");return"meta"}else{U=g.eat("/")?"closeTag":"openTag";h.tokenize=M;return"tag bracket"}}}else{if(i=="&"){var k;if(g.eat("#")){if(g.eat("x")){k=g.eatWhile(/[a-fA-F\d]/)&&g.eat(";")}else{k=g.eatWhile(/[\d]/)&&g.eat(";")}}else{k=g.eatWhile(/[\w\.\-:]/)&&g.eat(";")}return k?"atom":"error"}else{g.eatWhile(/[^&<]/);return null}}}L.isInText=true;function M(g,h){var i=g.next();if(i==">"||(i=="/"&&g.eat(">"))){h.tokenize=L;U=i==">"?"endTag":"selfcloseTag";return"tag bracket"}else{if(i=="="){U="equals";return null}else{if(i=="<"){h.tokenize=L;h.state=N;h.tagName=h.tagStart=null;var j=h.tokenize(g,h);return j?j+" tag error":"tag error"}else{if(/[\'\"]/.test(i)){h.tokenize=Q(i);h.stringStartCol=g.column();return h.tokenize(g,h)}else{g.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/);return"word"}}}}}function Q(h){var g=function(i,j){while(!i.eol()){if(i.next()==h){j.tokenize=M;break}}return"string"};g.isInAttribute=true;return g}function c(g,h){return function(i,j){while(!i.eol()){if(i.match(h)){j.tokenize=L;break}i.next()}return g}}function K(g){return function(h,i){var j;while((j=h.next())!=null){if(j=="<"){i.tokenize=K(g+1);return i.tokenize(h,i)}else{if(j==">"){if(g==1){i.tokenize=L;break}else{i.tokenize=K(g-1);return i.tokenize(h,i)}}}}return"meta"}}function F(h,i,g){this.prev=h.context;this.tagName=i;this.indent=h.indented;this.startOfLine=g;if(a.doNotIndent.hasOwnProperty(i)||(h.context&&h.context.noIndent)){this.noIndent=true}}function C(g){if(g.context){g.context=g.context.prev}}function G(g,h){var i;while(true){if(!g.context){return}i=g.context.tagName;if(!a.contextGrabbers.hasOwnProperty(i)||!a.contextGrabbers[i].hasOwnProperty(h)){return}C(g)}}function N(i,g,h){if(i=="openTag"){h.tagStart=g.column();return X}else{if(i=="closeTag"){return D}else{return N}}}function X(i,g,h){if(i=="word"){h.tagName=g.current();T="tag";return W}else{T="error";return X}}function D(i,g,h){if(i=="word"){var j=g.current();if(h.context&&h.context.tagName!=j&&a.implicitlyClosed.hasOwnProperty(h.context.tagName)){C(h)}if((h.context&&h.context.tagName==j)||a.matchClosing===false){T="tag";return E}else{T="tag error";return J}}else{T="error";return J}}function E(h,i,g){if(h!="endTag"){T="error";return E}C(g);return N}function J(i,g,h){T="error";return E(i,g,h)}function W(h,j,g){if(h=="word"){T="attribute";return R}else{if(h=="endTag"||h=="selfcloseTag"){var i=g.tagName,k=g.tagStart;g.tagName=g.tagStart=null;if(h=="selfcloseTag"||a.autoSelfClosers.hasOwnProperty(i)){G(g,i)}else{G(g,i);g.context=new F(g,i,k==g.indented)}return N}}T="error";return W}function R(i,g,h){if(i=="equals"){return I}if(!a.allowMissing){T="error"}return W(i,g,h)}function I(i,g,h){if(i=="string"){return S}if(i=="word"&&a.allowUnquoted){T="string";return W}T="error";return W(i,g,h)}function S(i,g,h){if(i=="string"){return S}return W(i,g,h)}return{startState:function(h){var g={tokenize:L,state:N,indented:h||0,tagName:null,tagStart:null,context:null};if(h!=null){g.baseIndent=h}return g},token:function(g,h){if(!h.tagName&&g.sol()){h.indented=g.indentation()}if(g.eatSpace()){return null}U=null;var i=h.tokenize(g,h);if((i||U)&&i!="comment"){T=null;h.state=h.state(U||i,g,h);if(T){i=T=="error"?i+" error":T}}return i},indent:function(g,k,h){var i=g.context;if(g.tokenize.isInAttribute){if(g.tagStart==g.indented){return g.stringStartCol+1}else{return g.indented+H}}if(i&&i.noIndent){return e.Pass}if(g.tokenize!=M&&g.tokenize!=L){return h?h.match(/^(\s*)/)[0].length:0}if(g.tagName){if(a.multilineTagIndentPastTag!==false){return g.tagStart+g.tagName.length+2}else{return g.tagStart+H*(a.multilineTagIndentFactor||1)}}if(a.alignCDATA&&/<!\[CDATA\[/.test(k)){return 0}var l=k&&/^<(\/)?([\w_:\.-]*)/.exec(k);if(l&&l[1]){while(i){if(i.tagName==l[2]){i=i.prev;break}else{if(a.implicitlyClosed.hasOwnProperty(i.tagName)){i=i.prev}else{break}}}}else{if(l){while(i){var j=a.contextGrabbers[i.tagName];if(j&&j.hasOwnProperty(l[2])){i=i.prev}else{break}}}}while(i&&i.prev&&!i.startOfLine){i=i.prev}if(i){return i.indent+H}else{return g.baseIndent||0}},electricInput:/<\/[\s\w:]+>$/,blockCommentStart:"<!--",blockCommentEnd:"-->",configuration:a.htmlMode?"html":"xml",helperType:a.htmlMode?"html":"xml",skipAttribute:function(g){if(g.state==I){g.state=W}}}});e.defineMIME("text/xml","xml");e.defineMIME("application/xml","xml");if(!e.mimeModes.hasOwnProperty("text/html")){e.defineMIME("text/html",{name:"xml",htmlMode:true})}});(function(b){if(typeof exports=="object"&&typeof module=="object"){b(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],b)}else{b(CodeMirror)}}})(function(A){function B(f,b,c,d,a,e){this.indented=f;this.column=b;this.type=c;this.info=d;this.align=a;this.prev=e}function L(d,b,e,a){var c=d.indented;if(d.context&&d.context.type=="statement"&&e!="statement"){c=d.context.indented}return d.context=new B(c,b,e,a,null,d.context)}function y(a){var b=a.context.type;if(b==")"||b=="]"||b=="}"){a.indented=a.context.indented}return a.context=a.context.prev}function R(a,b,c){if(b.prevToken=="variable"||b.prevToken=="variable-3"){return true}if(/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(a.string.slice(0,c))){return true}if(b.typeAtEndOfLine&&a.column()==a.indentation()){return true}}function C(a){for(;;){if(!a||a.type=="top"){return true}if(a.type=="}"&&a.prev.info!="namespace"){return false}a=a.prev}}A.defineMode("clike",function(d,W){var h=d.indentUnit,k=W.statementIndentUnit||h,g=W.dontAlignCalls,t=W.keywords||{},n=W.types||{},c=W.builtin||{},f=W.blockKeywords||{},i=W.defKeywords||{},o=W.atoms||{},q=W.hooks||{},m=W.multiLineStrings,p=W.indentStatements!==false,u=W.indentSwitch!==false,Z=W.namespaceSeparator,X=W.isPunctuationChar||/[\[\]{}\(\),;\:\.]/,l=W.numberStart||/[\d\.]/,s=W.number||/^(?:0x[a-f\d]+|0b[01]+|(?:\d+\.?\d*|\.\d+)(?:e[-+]?\d+)?)(u|ll?|l|f)?/i,r=W.isOperatorChar||/[+\-*&%=<>!?|\/]/;var e,Y;function a(U,V){var aa=U.next();if(q[aa]){var S=q[aa](U,V);if(S!==false){return S}}if(aa=='"'||aa=="'"){V.tokenize=v(aa);return V.tokenize(U,V)}if(X.test(aa)){e=aa;return null}if(l.test(aa)){U.backUp(1);if(U.match(s)){return"number"}U.next()}if(aa=="/"){if(U.eat("*")){V.tokenize=j;return j(U,V)}if(U.eat("/")){U.skipToEnd();return"comment"}}if(r.test(aa)){while(!U.match(/^\/[\/*]/,false)&&U.eat(r)){}return"operator"}U.eatWhile(/[\w\$_\xa1-\uffff]/);if(Z){while(U.match(Z)){U.eatWhile(/[\w\$_\xa1-\uffff]/)}}var T=U.current();if(K(t,T)){if(K(f,T)){e="newstatement"}if(K(i,T)){Y=true}return"keyword"}if(K(n,T)){return"variable-3"}if(K(c,T)){if(K(f,T)){e="newstatement"}return"builtin"}if(K(o,T)){return"atom"}return"variable"}function v(S){return function(T,V){var U=false,aa,ab=false;while((aa=T.next())!=null){if(aa==S&&!U){ab=true;break}U=!U&&aa=="\\"}if(ab||!(U||m)){V.tokenize=null}return"string"}}function j(T,U){var S=false,V;while(V=T.next()){if(V=="/"&&S){U.tokenize=null;break}S=(V=="*")}return"comment"}function b(T,S){if(W.typeFirstDefinitions&&T.eol()&&C(S.context)){S.typeAtEndOfLine=R(T,S,T.pos)}}return{startState:function(S){return{tokenize:null,context:new B((S||0)-h,0,"top",null,false),indented:0,startOfLine:true,prevToken:null}},token:function(U,T){var aa=T.context;if(U.sol()){if(aa.align==null){aa.align=false}T.indented=U.indentation();T.startOfLine=true}if(U.eatSpace()){b(U,T);return null}e=Y=null;var V=(T.tokenize||a)(U,T);if(V=="comment"||V=="meta"){return V}if(aa.align==null){aa.align=true}if(e==";"||e==":"||(e==","&&U.match(/^\s*(?:\/\/.*)?$/,false))){while(T.context.type=="statement"){y(T)}}else{if(e=="{"){L(T,U.column(),"}")}else{if(e=="["){L(T,U.column(),"]")}else{if(e=="("){L(T,U.column(),")")}else{if(e=="}"){while(aa.type=="statement"){aa=y(T)}if(aa.type=="}"){aa=y(T)}while(aa.type=="statement"){aa=y(T)}}else{if(e==aa.type){y(T)}else{if(p&&(((aa.type=="}"||aa.type=="top")&&e!=";")||(aa.type=="statement"&&e=="newstatement"))){L(T,U.column(),"statement",U.current())}}}}}}}if(V=="variable"&&((T.prevToken=="def"||(W.typeFirstDefinitions&&R(U,T,U.start)&&C(T.context)&&U.match(/^\s*\(/,false))))){V="def"}if(q.token){var S=q.token(U,T,V);if(S!==undefined){V=S}}if(V=="def"&&W.styleDefs===false){V="variable"}T.startOfLine=false;T.prevToken=Y?"def":V||e;b(U,T);return V},indent:function(T,ad){if(T.tokenize!=a&&T.tokenize!=null||T.typeAtEndOfLine){return A.Pass}var S=T.context,ab=ad&&ad.charAt(0);if(S.type=="statement"&&ab=="}"){S=S.prev}if(W.dontIndentStatements){while(S.type=="statement"&&W.dontIndentStatements.test(S.info)){S=S.prev}}if(q.indent){var U=q.indent(T,S,ad);if(typeof U=="number"){return U}}var ac=ab==S.type;var V=S.prev&&S.prev.info=="switch";if(W.allmanIndentation&&/[{(]/.test(ab)){while(S.type!="top"&&S.type!="}"){S=S.prev}return S.indented}if(S.type=="statement"){return S.indented+(ab=="{"?0:k)}if(S.align&&(!g||S.type!=")")){return S.column+(ac?0:1)}if(S.type==")"&&!ac){return S.indented+k}return S.indented+(ac?0:h)+(!ac&&V&&!/^(?:case|default)\b/.test(ad)?h:0)},electricInput:u?/^\s*(?:case .*?:|default:|\{\}?|\})$/:/^\s*[{}]$/,blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//",fold:"brace"}});function D(c){var a={},d=c.split(" ");for(var b=0;b<d.length;++b){a[d[b]]=true}return a}function K(a,b){if(typeof a==="function"){return a(b)}else{return a.propertyIsEnumerable(b)}}var G="auto if break case register continue return default do sizeof static else struct switch extern typedef union for goto while enum const volatile";var z="int long char short double float unsigned signed void size_t ptrdiff_t";function F(c,d){if(!d.startOfLine){return false}for(var a,b=null;a=c.peek();){if(a=="\\"&&c.match(/^.$/)){b=F;break}else{if(a=="/"&&c.match(/^\/[\/\*]/,false)){break}}c.next()}d.tokenize=b;return"meta"}function O(b,a){if(a.prevToken=="variable-3"){return"variable-3"}return false}function M(a){a.eatWhile(/[\w\.']/);return"number"}function E(c,a){c.backUp(1);if(c.match(/(R|u8R|uR|UR|LR)/)){var b=c.match(/"([^\s\\()]{0,16})\(/);if(!b){return false}a.cpp11RawStringDelim=b[1];a.tokenize=J;return J(c,a)}if(c.match(/(u8|u|U|L)/)){if(c.match(/["']/,false)){return"string"}return false}c.next();return false}function w(a){var b=/(\w+)::(\w+)$/.exec(a);return b&&b[1]==b[2]}function x(c,a){var b;while((b=c.next())!=null){if(b=='"'&&!c.eat('"')){a.tokenize=null;break}}return"string"}function J(c,a){var d=a.cpp11RawStringDelim.replace(/[^\w\s]/g,"\\$&");var b=c.match(new RegExp(".*?\\)"+d+'"'));if(b){a.tokenize=null}else{c.skipToEnd()}return"string"}function H(c,b){if(typeof c=="string"){c=[c]}var d=[];function e(g){if(g){for(var f in g){if(g.hasOwnProperty(f)){d.push(f)}}}}e(b.keywords);e(b.types);e(b.builtin);e(b.atoms);if(d.length){b.helperType=c[0];A.registerHelper("hintWords",c[0],d)}for(var a=0;a<c.length;++a){A.defineMIME(c[a],b)}}H(["text/x-csrc","text/x-c","text/x-chdr"],{name:"clike",keywords:D(G),types:D(z+" bool _Complex _Bool float_t double_t intptr_t intmax_t int8_t int16_t int32_t int64_t uintptr_t uintmax_t uint8_t uint16_t uint32_t uint64_t"),blockKeywords:D("case do else for if switch while struct"),defKeywords:D("struct"),typeFirstDefinitions:true,atoms:D("null true false"),hooks:{"#":F,"*":O},modeProps:{fold:["brace","include"]}});H(["text/x-c++src","text/x-c++hdr"],{name:"clike",keywords:D(G+" asm dynamic_cast namespace reinterpret_cast try explicit new static_cast typeid catch operator template typename class friend private this using const_cast inline public throw virtual delete mutable protected alignas alignof constexpr decltype nullptr noexcept thread_local final static_assert override"),types:D(z+" bool wchar_t"),blockKeywords:D("catch class do else finally for if struct switch try while"),defKeywords:D("class namespace struct enum union"),typeFirstDefinitions:true,atoms:D("true false null"),dontIndentStatements:/^template$/,hooks:{"#":F,"*":O,u:E,U:E,L:E,R:E,"0":M,"1":M,"2":M,"3":M,"4":M,"5":M,"6":M,"7":M,"8":M,"9":M,token:function(c,a,b){if(b=="variable"&&c.peek()=="("&&(a.prevToken==";"||a.prevToken==null||a.prevToken=="}")&&w(c.current())){return"def"}}},namespaceSeparator:"::",modeProps:{fold:["brace","include"]}});H("text/x-java",{name:"clike",keywords:D("abstract assert break case catch class const continue default do else enum extends final finally float for goto if implements import instanceof interface native new package private protected public return static strictfp super switch synchronized this throw throws transient try volatile while"),types:D("byte short int long float double boolean char void Boolean Byte Character Double Float Integer Long Number Object Short String StringBuffer StringBuilder Void"),blockKeywords:D("catch class do else finally for if switch try while"),defKeywords:D("class interface package enum"),typeFirstDefinitions:true,atoms:D("true false null"),number:/^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,hooks:{"@":function(a){a.eatWhile(/[\w\$_]/);return"meta"}},modeProps:{fold:["brace","import"]}});H("text/x-csharp",{name:"clike",keywords:D("abstract as async await base break case catch checked class const continue default delegate do else enum event explicit extern finally fixed for foreach goto if implicit in interface internal is lock namespace new operator out override params private protected public readonly ref return sealed sizeof stackalloc static struct switch this throw try typeof unchecked unsafe using virtual void volatile while add alias ascending descending dynamic from get global group into join let orderby partial remove select set value var yield"),types:D("Action Boolean Byte Char DateTime DateTimeOffset Decimal Double Func Guid Int16 Int32 Int64 Object SByte Single String Task TimeSpan UInt16 UInt32 UInt64 bool byte char decimal double short int long object sbyte float string ushort uint ulong"),blockKeywords:D("catch class do else finally for foreach if struct switch try while"),defKeywords:D("class interface namespace struct var"),typeFirstDefinitions:true,atoms:D("true false null"),hooks:{"@":function(a,b){if(a.eat('"')){b.tokenize=x;return x(a,b)}a.eatWhile(/[\w\$_]/);return"meta"}}});function P(c,b){var a=false;while(!c.eol()){if(!a&&c.match('"""')){b.tokenize=null;break}a=c.next()=="\\"&&!a}return"string"}H("text/x-scala",{name:"clike",keywords:D("abstract case catch class def do else extends final finally for forSome if implicit import lazy match new null object override package private protected return sealed super this throw trait try type val var while with yield _ : = => <- <: <% >: # @ assert assume require print println printf readLine readBoolean readByte readShort readChar readInt readLong readFloat readDouble :: #:: "),types:D("AnyVal App Application Array BufferedIterator BigDecimal BigInt Char Console Either Enumeration Equiv Error Exception Fractional Function IndexedSeq Int Integral Iterable Iterator List Map Numeric Nil NotNull Option Ordered Ordering PartialFunction PartialOrdering Product Proxy Range Responder Seq Serializable Set Specializable Stream StringBuilder StringContext Symbol Throwable Traversable TraversableOnce Tuple Unit Vector Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable Compiler Double Exception Float Integer Long Math Number Object Package Pair Process Runtime Runnable SecurityManager Short StackTraceElement StrictMath String StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"),multiLineStrings:true,blockKeywords:D("catch class do else finally for forSome if match switch try while"),defKeywords:D("class def object package trait type val var"),atoms:D("true false null"),indentStatements:false,indentSwitch:false,hooks:{"@":function(a){a.eatWhile(/[\w\$_]/);return"meta"},'"':function(a,b){if(!a.match('""')){return false}b.tokenize=P;return b.tokenize(a,b)},"'":function(a){a.eatWhile(/[\w\$_\xa1-\uffff]/);return"atom"},"=":function(c,a){var b=a.context;if(b.type=="}"&&b.align&&c.eat(">")){a.context=new B(b.indented,b.column,b.type,b.info,null,b.prev);return"operator"}else{return false}}},modeProps:{closeBrackets:{triples:'"'}}});function Q(a){return function(f,d){var c=false,e,b=false;while(!f.eol()){if(!a&&!c&&f.match('"')){b=true;break}if(a&&f.match('"""')){b=true;break}e=f.next();if(!c&&e=="$"&&f.match("{")){f.skipTo("}")}c=!c&&e=="\\"&&!a}if(b||!a){d.tokenize=null}return"string"}}H("text/x-kotlin",{name:"clike",keywords:D("package as typealias class interface this super val var fun for is in This throw return break continue object if else while do try when !in !is as? file import where by get set abstract enum open inner override private public internal protected catch finally out final vararg reified dynamic companion constructor init sealed field property receiver param sparam lateinit data inline noinline tailrec external annotation crossinline const operator infix"),types:D("Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable Compiler Double Exception Float Integer Long Math Number Object Package Pair Process Runtime Runnable SecurityManager Short StackTraceElement StrictMath String StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"),intendSwitch:false,indentStatements:false,multiLineStrings:true,blockKeywords:D("catch class do else finally for if where try while enum"),defKeywords:D("class val var object package interface fun"),atoms:D("true false null this"),hooks:{'"':function(a,b){b.tokenize=Q(a.match('""'));return b.tokenize(a,b)}},modeProps:{closeBrackets:{triples:'"'}}});H(["x-shader/x-vertex","x-shader/x-fragment"],{name:"clike",keywords:D("sampler1D sampler2D sampler3D samplerCube sampler1DShadow sampler2DShadow const attribute uniform varying break continue discard return for while do if else struct in out inout"),types:D("float int bool void vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 mat2 mat3 mat4"),blockKeywords:D("for while do if else struct"),builtin:D("radians degrees sin cos tan asin acos atan pow exp log exp2 sqrt inversesqrt abs sign floor ceil fract mod min max clamp mix step smoothstep length distance dot cross normalize ftransform faceforward reflect refract matrixCompMult lessThan lessThanEqual greaterThan greaterThanEqual equal notEqual any all not texture1D texture1DProj texture1DLod texture1DProjLod texture2D texture2DProj texture2DLod texture2DProjLod texture3D texture3DProj texture3DLod texture3DProjLod textureCube textureCubeLod shadow1D shadow2D shadow1DProj shadow2DProj shadow1DLod shadow2DLod shadow1DProjLod shadow2DProjLod dFdx dFdy fwidth noise1 noise2 noise3 noise4"),atoms:D("true false gl_FragColor gl_SecondaryColor gl_Normal gl_Vertex gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 gl_FogCoord gl_PointCoord gl_Position gl_PointSize gl_ClipVertex gl_FrontColor gl_BackColor gl_FrontSecondaryColor gl_BackSecondaryColor gl_TexCoord gl_FogFragCoord gl_FragCoord gl_FrontFacing gl_FragData gl_FragDepth gl_ModelViewMatrix gl_ProjectionMatrix gl_ModelViewProjectionMatrix gl_TextureMatrix gl_NormalMatrix gl_ModelViewMatrixInverse gl_ProjectionMatrixInverse gl_ModelViewProjectionMatrixInverse gl_TexureMatrixTranspose gl_ModelViewMatrixInverseTranspose gl_ProjectionMatrixInverseTranspose gl_ModelViewProjectionMatrixInverseTranspose gl_TextureMatrixInverseTranspose gl_NormalScale gl_DepthRange gl_ClipPlane gl_Point gl_FrontMaterial gl_BackMaterial gl_LightSource gl_LightModel gl_FrontLightModelProduct gl_BackLightModelProduct gl_TextureColor gl_EyePlaneS gl_EyePlaneT gl_EyePlaneR gl_EyePlaneQ gl_FogParameters gl_MaxLights gl_MaxClipPlanes gl_MaxTextureUnits gl_MaxTextureCoords gl_MaxVertexAttribs gl_MaxVertexUniformComponents gl_MaxVaryingFloats gl_MaxVertexTextureImageUnits gl_MaxTextureImageUnits gl_MaxFragmentUniformComponents gl_MaxCombineTextureImageUnits gl_MaxDrawBuffers"),indentSwitch:false,hooks:{"#":F},modeProps:{fold:["brace","include"]}});H("text/x-nesc",{name:"clike",keywords:D(G+"as atomic async call command component components configuration event generic implementation includes interface module new norace nx_struct nx_union post provides signal task uses abstract extends"),types:D(z),blockKeywords:D("case do else for if switch while struct"),atoms:D("null true false"),hooks:{"#":F},modeProps:{fold:["brace","include"]}});H("text/x-objectivec",{name:"clike",keywords:D(G+"inline restrict _Bool _Complex _Imaginary BOOL Class bycopy byref id IMP in inout nil oneway out Protocol SEL self super atomic nonatomic retain copy readwrite readonly"),types:D(z),atoms:D("YES NO NULL NILL ON OFF true false"),hooks:{"@":function(a){a.eatWhile(/[\w\$]/);return"keyword"},"#":F,indent:function(c,b,a){if(b.type=="statement"&&/^@\w/.test(a)){return b.indented}}},modeProps:{fold:"brace"}});H("text/x-squirrel",{name:"clike",keywords:D("base break clone continue const default delete enum extends function in class foreach local resume return this throw typeof yield constructor instanceof static"),types:D(z),blockKeywords:D("case catch class else for foreach if switch try while"),defKeywords:D("function local class"),typeFirstDefinitions:true,atoms:D("true false null"),hooks:{"#":F},modeProps:{fold:["brace","include"]}});var N=null;function I(a){return function(f,d){var c=false,e,b=false;while(!f.eol()){if(!c&&f.match('"')&&(a=="single"||f.match('""'))){b=true;break}if(!c&&f.match("``")){N=I(a);b=true;break}e=f.next();c=a=="single"&&!c&&e=="\\"}if(b){d.tokenize=null}return"string"}}H("text/x-ceylon",{name:"clike",keywords:D("abstracts alias assembly assert assign break case catch class continue dynamic else exists extends finally for function given if import in interface is let module new nonempty object of out outer package return satisfies super switch then this throw try value void while"),types:function(b){var a=b.charAt(0);return(a===a.toUpperCase()&&a!==a.toLowerCase())},blockKeywords:D("case catch class dynamic else finally for function if interface module new object switch try while"),defKeywords:D("class dynamic function interface module object package value"),builtin:D("abstract actual aliased annotation by default deprecated doc final formal late license native optional sealed see serializable shared suppressWarnings tagged throws variable"),isPunctuationChar:/[\[\]{}\(\),;\:\.`]/,isOperatorChar:/[+\-*&%=<>!?|^~:\/]/,numberStart:/[\d#$]/,number:/^(?:#[\da-fA-F_]+|\$[01_]+|[\d_]+[kMGTPmunpf]?|[\d_]+\.[\d_]+(?:[eE][-+]?\d+|[kMGTPmunpf]|)|)/i,multiLineStrings:true,typeFirstDefinitions:true,atoms:D("true false null larger smaller equal empty finished"),indentSwitch:false,styleDefs:false,hooks:{"@":function(a){a.eatWhile(/[\w\$_]/);return"meta"},'"':function(a,b){b.tokenize=I(a.match('""')?"triple":"single");return b.tokenize(a,b)},"`":function(a,b){if(!N||!a.match("`")){return false}b.tokenize=N;N=null;return b.tokenize(a,b)},"'":function(a){a.eatWhile(/[\w\$_\xa1-\uffff]/);return"atom"},token:function(b,c,a){if((a=="variable"||a=="variable-3")&&c.prevToken=="."){return"variable-2"}}},modeProps:{fold:["brace","import"],closeBrackets:{triples:'"'}}})});(function(b){if(typeof exports=="object"&&typeof module=="object"){b(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],b)}else{b(CodeMirror)}}})(function(E){E.defineMode("css",function(b,r){var ac=r.inline;if(!r.propertyKeywords){r=E.resolveMode("text/css")}var j=b.indentUnit,af=r.tokenHooks,s=r.documentTypes||{},c=r.mediaTypes||{},o=r.mediaFeatures||{},k=r.mediaValueKeywords||{},t=r.propertyKeywords||{},ae=r.nonStandardPropertyKeywords||{},x=r.fontProperties||{},d=r.counterDescriptors||{},l=r.colorKeywords||{},h=r.valueKeywords||{},n=r.allowNested,f=r.supportsAtComponent===true;var ad,m;function a(X,W){ad=W;return X}function ag(W,X){var Y=W.next();if(af[Y]){var Z=af[Y](W,X);if(Z!==false){return Z}}if(Y=="@"){W.eatWhile(/[\w\\\-]/);return a("def",W.current())}else{if(Y=="="||(Y=="~"||Y=="|")&&W.eat("=")){return a(null,"compare")}else{if(Y=='"'||Y=="'"){X.tokenize=q(Y);return X.tokenize(W,X)}else{if(Y=="#"){W.eatWhile(/[\w\\\-]/);return a("atom","hash")}else{if(Y=="!"){W.match(/^\s*\w*/);return a("keyword","important")}else{if(/\d/.test(Y)||Y=="."&&W.eat(/\d/)){W.eatWhile(/[\w.%]/);return a("number","unit")}else{if(Y==="-"){if(/[\d.]/.test(W.peek())){W.eatWhile(/[\w.%]/);return a("number","unit")}else{if(W.match(/^-[\w\\\-]+/)){W.eatWhile(/[\w\\\-]/);if(W.match(/^\s*:/,false)){return a("variable-2","variable-definition")}return a("variable-2","variable")}else{if(W.match(/^\w+-/)){return a("meta","meta")}}}}else{if(/[,+>*\/]/.test(Y)){return a(null,"select-op")}else{if(Y=="."&&W.match(/^-?[_a-z][_a-z0-9-]*/i)){return a("qualifier","qualifier")}else{if(/[:;{}\[\]\(\)]/.test(Y)){return a(null,Y)}else{if((Y=="u"&&W.match(/rl(-prefix)?\(/))||(Y=="d"&&W.match("omain("))||(Y=="r"&&W.match("egexp("))){W.backUp(1);X.tokenize=ah;return a("property","word")}else{if(/[\w\\\-]/.test(Y)){W.eatWhile(/[\w\\\-]/);return a("property","word")}else{return a(null,null)}}}}}}}}}}}}}function q(W){return function(X,Z){var Y=false,aa;while((aa=X.next())!=null){if(aa==W&&!Y){if(W==")"){X.backUp(1)}break}Y=!Y&&aa=="\\"}if(aa==W||!Y&&W!=")"){Z.tokenize=null}return a("string","string")}}function ah(W,X){W.next();if(!W.match(/\s*[\"\')]/,false)){X.tokenize=q(")")}else{X.tokenize=null}return a(null,"(")}function i(X,Y,W){this.type=X;this.indent=Y;this.prev=W}function v(X,W,Y,Z){X.context=new i(Y,W.indentation()+(Z===false?0:j),X.context);return Y}function g(W){if(W.context.prev){W.context=W.context.prev}return W.context.type}function p(Y,W,X){return w[X.context.type](Y,W,X)}function e(Z,X,Y,W){for(var aa=W||1;aa>0;aa--){Y.context=Y.context.prev}return p(Z,X,Y)}function u(W){var X=W.current().toLowerCase();if(h.hasOwnProperty(X)){m="atom"}else{if(l.hasOwnProperty(X)){m="keyword"}else{m="variable"}}}var w={};w.top=function(Y,W,X){if(Y=="{"){return v(X,W,"block")}else{if(Y=="}"&&X.context.prev){return g(X)}else{if(f&&/@component/.test(Y)){return v(X,W,"atComponentBlock")}else{if(/^@(-moz-)?document$/.test(Y)){return v(X,W,"documentTypes")}else{if(/^@(media|supports|(-moz-)?document|import)$/.test(Y)){return v(X,W,"atBlock")}else{if(/^@(font-face|counter-style)/.test(Y)){X.stateArg=Y;return"restricted_atBlock_before"}else{if(/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(Y)){return"keyframes"}else{if(Y&&Y.charAt(0)=="@"){return v(X,W,"at")}else{if(Y=="hash"){m="builtin"}else{if(Y=="word"){m="tag"}else{if(Y=="variable-definition"){return"maybeprop"}else{if(Y=="interpolation"){return v(X,W,"interpolation")}else{if(Y==":"){return"pseudo"}else{if(n&&Y=="("){return v(X,W,"parens")}}}}}}}}}}}}}}return X.context.type};w.block=function(Z,W,Y){if(Z=="word"){var X=W.current().toLowerCase();if(t.hasOwnProperty(X)){m="property";return"maybeprop"}else{if(ae.hasOwnProperty(X)){m="string-2";return"maybeprop"}else{if(n){m=W.match(/^\s*:(?:\s|$)/,false)?"property":"tag";return"block"}else{m+=" error";return"maybeprop"}}}}else{if(Z=="meta"){return"block"}else{if(!n&&(Z=="hash"||Z=="qualifier")){m="error";return"block"}else{return w.top(Z,W,Y)}}}};w.maybeprop=function(Y,W,X){if(Y==":"){return v(X,W,"prop")}return p(Y,W,X)};w.prop=function(Y,W,X){if(Y==";"){return g(X)}if(Y=="{"&&n){return v(X,W,"propBlock")}if(Y=="}"||Y=="{"){return e(Y,W,X)}if(Y=="("){return v(X,W,"parens")}if(Y=="hash"&&!/^#([0-9a-fA-f]{3,4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/.test(W.current())){m+=" error"}else{if(Y=="word"){u(W)}else{if(Y=="interpolation"){return v(X,W,"interpolation")}}}return"prop"};w.propBlock=function(X,Y,W){if(X=="}"){return g(W)}if(X=="word"){m="property";return"maybeprop"}return W.context.type};w.parens=function(Y,W,X){if(Y=="{"||Y=="}"){return e(Y,W,X)}if(Y==")"){return g(X)}if(Y=="("){return v(X,W,"parens")}if(Y=="interpolation"){return v(X,W,"interpolation")}if(Y=="word"){u(W)}return"parens"};w.pseudo=function(Y,W,X){if(Y=="word"){m="variable-3";return X.context.type}return p(Y,W,X)};w.documentTypes=function(Y,W,X){if(Y=="word"&&s.hasOwnProperty(W.current())){m="tag";return X.context.type}else{return w.atBlock(Y,W,X)}};w.atBlock=function(Z,W,Y){if(Z=="("){return v(Y,W,"atBlock_parens")}if(Z=="}"||Z==";"){return e(Z,W,Y)}if(Z=="{"){return g(Y)&&v(Y,W,n?"block":"top")}if(Z=="interpolation"){return v(Y,W,"interpolation")}if(Z=="word"){var X=W.current().toLowerCase();if(X=="only"||X=="not"||X=="and"||X=="or"){m="keyword"}else{if(c.hasOwnProperty(X)){m="attribute"}else{if(o.hasOwnProperty(X)){m="property"}else{if(k.hasOwnProperty(X)){m="keyword"}else{if(t.hasOwnProperty(X)){m="property"}else{if(ae.hasOwnProperty(X)){m="string-2"}else{if(h.hasOwnProperty(X)){m="atom"}else{if(l.hasOwnProperty(X)){m="keyword"}else{m="error"}}}}}}}}}return Y.context.type};w.atComponentBlock=function(Y,W,X){if(Y=="}"){return e(Y,W,X)}if(Y=="{"){return g(X)&&v(X,W,n?"block":"top",false)}if(Y=="word"){m="error"}return X.context.type};w.atBlock_parens=function(Y,W,X){if(Y==")"){return g(X)}if(Y=="{"||Y=="}"){return e(Y,W,X,2)}return w.atBlock(Y,W,X)};w.restricted_atBlock_before=function(Y,W,X){if(Y=="{"){return v(X,W,"restricted_atBlock")}if(Y=="word"&&X.stateArg=="@counter-style"){m="variable";return"restricted_atBlock_before"}return p(Y,W,X)};w.restricted_atBlock=function(Y,W,X){if(Y=="}"){X.stateArg=null;return g(X)}if(Y=="word"){if((X.stateArg=="@font-face"&&!x.hasOwnProperty(W.current().toLowerCase()))||(X.stateArg=="@counter-style"&&!d.hasOwnProperty(W.current().toLowerCase()))){m="error"}else{m="property"}return"maybeprop"}return"restricted_atBlock"};w.keyframes=function(Y,W,X){if(Y=="word"){m="variable";return"keyframes"}if(Y=="{"){return v(X,W,"top")}return p(Y,W,X)};w.at=function(Y,W,X){if(Y==";"){return g(X)}if(Y=="{"||Y=="}"){return e(Y,W,X)}if(Y=="word"){m="tag"}else{if(Y=="hash"){m="builtin"}}return"at"};w.interpolation=function(Y,W,X){if(Y=="}"){return g(X)}if(Y=="{"||Y==";"){return e(Y,W,X)}if(Y=="word"){m="variable"}else{if(Y!="variable"&&Y!="("&&Y!=")"){m="error"}}return"interpolation"};return{startState:function(W){return{tokenize:null,state:ac?"block":"top",stateArg:null,context:new i(ac?"block":"top",W||0,null)}},token:function(W,X){if(!X.tokenize&&W.eatSpace()){return null}var Y=(X.tokenize||ag)(W,X);if(Y&&typeof Y=="object"){ad=Y[1];Y=Y[0]}m=Y;X.state=w[X.state](ad,W,X);return m},indent:function(W,Y){var Z=W.context,X=Y&&Y.charAt(0);var aa=Z.indent;if(Z.type=="prop"&&(X=="}"||X==")")){Z=Z.prev}if(Z.prev){if(X=="}"&&(Z.type=="block"||Z.type=="top"||Z.type=="interpolation"||Z.type=="restricted_atBlock")){Z=Z.prev;aa=Z.indent}else{if(X==")"&&(Z.type=="parens"||Z.type=="atBlock_parens")||X=="{"&&(Z.type=="at"||Z.type=="atBlock")){aa=Math.max(0,Z.indent-j);Z=Z.prev}}}return aa},electricChars:"}",blockCommentStart:"/*",blockCommentEnd:"*/",fold:"brace"}});function P(a){var b={};for(var c=0;c<a.length;++c){b[a[c].toLowerCase()]=true}return b}var L=["domain","regexp","url","url-prefix"],V=P(L);var U=["all","aural","braille","handheld","print","projection","screen","tty","tv","embossed"],A=P(U);var y=["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid","orientation","device-pixel-ratio","min-device-pixel-ratio","max-device-pixel-ratio","pointer","any-pointer","hover","any-hover"],N=P(y);var K=["landscape","portrait","none","coarse","fine","on-demand","hover","interlace","progressive"],G=P(K);var S=["align-content","align-items","align-self","alignment-adjust","alignment-baseline","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","baseline-shift","binding","bleed","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","flow-from","flow-into","font","font-feature-settings","font-family","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-weight","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-gap","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-gap","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","justify-content","left","letter-spacing","line-break","line-height","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","max-height","max-width","min-height","min-width","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","play-during","position","presentation-level","punctuation-trim","quotes","region-break-after","region-break-before","region-break-inside","region-fragment","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotation","rotation-point","ruby-align","ruby-overhang","ruby-position","ruby-span","shape-image-threshold","shape-inside","shape-margin","shape-outside","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-outline","text-overflow","text-shadow","text-size-adjust","text-space-collapse","text-transform","text-underline-position","text-wrap","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","user-select","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","word-break","word-spacing","word-wrap","z-index","clip-path","clip-rule","mask","enable-background","filter","flood-color","flood-opacity","lighting-color","stop-color","stop-opacity","pointer-events","color-interpolation","color-interpolation-filters","color-rendering","fill","fill-opacity","fill-rule","image-rendering","marker","marker-end","marker-mid","marker-start","shape-rendering","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-rendering","baseline-shift","dominant-baseline","glyph-orientation-horizontal","glyph-orientation-vertical","text-anchor","writing-mode"],O=P(S);var I=["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"],R=P(I);var C=["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"],Q=P(C);var F=["additive-symbols","fallback","negative","pad","prefix","range","speak-as","suffix","symbols","system"],B=P(F);var T=["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"],J=P(T);var M=["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","color","color-burn","color-dodge","column","column-reverse","compact","condensed","contain","content","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","darken","dashed","decimal","decimal-leading-zero","default","default-button","dense","destination-atop","destination-in","destination-out","destination-over","devanagari","difference","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","exclusion","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","flex-end","flex-start","footnotes","forwards","from","geometricPrecision","georgian","graytext","grid","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hard-light","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","hue","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-grid","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","lighten","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","luminosity","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","multiply","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row","row-resize","row-reverse","rtl","run-in","running","s-resize","sans-serif","saturation","scale","scale3d","scaleX","scaleY","scaleZ","screen","scroll","scrollbar","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","soft-light","solid","somali","source-atop","source-in","source-out","source-over","space","space-around","space-between","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","wrap","wrap-reverse","x-large","x-small","xor","xx-large","xx-small"],D=P(M);var H=L.concat(U).concat(y).concat(K).concat(S).concat(I).concat(T).concat(M);E.registerHelper("hintWords","css",H);function z(d,a){var c=false,b;while((b=d.next())!=null){if(c&&b=="/"){a.tokenize=null;break}c=(b=="*")}return["comment","comment"]}E.defineMIME("text/css",{documentTypes:V,mediaTypes:A,mediaFeatures:N,mediaValueKeywords:G,propertyKeywords:O,nonStandardPropertyKeywords:R,fontProperties:Q,counterDescriptors:B,colorKeywords:J,valueKeywords:D,tokenHooks:{"/":function(a,b){if(!a.eat("*")){return false}b.tokenize=z;return z(a,b)}},name:"css"});E.defineMIME("text/x-scss",{mediaTypes:A,mediaFeatures:N,mediaValueKeywords:G,propertyKeywords:O,nonStandardPropertyKeywords:R,colorKeywords:J,valueKeywords:D,fontProperties:Q,allowNested:true,tokenHooks:{"/":function(a,b){if(a.eat("/")){a.skipToEnd();return["comment","comment"]}else{if(a.eat("*")){b.tokenize=z;return z(a,b)}else{return["operator","operator"]}}},":":function(a){if(a.match(/\s*\{/)){return[null,"{"]}return false},"$":function(a){a.match(/^[\w-]+/);if(a.match(/^\s*:/,false)){return["variable-2","variable-definition"]}return["variable-2","variable"]},"#":function(a){if(!a.eat("{")){return false}return[null,"interpolation"]}},name:"css",helperType:"scss"});E.defineMIME("text/x-less",{mediaTypes:A,mediaFeatures:N,mediaValueKeywords:G,propertyKeywords:O,nonStandardPropertyKeywords:R,colorKeywords:J,valueKeywords:D,fontProperties:Q,allowNested:true,tokenHooks:{"/":function(a,b){if(a.eat("/")){a.skipToEnd();return["comment","comment"]}else{if(a.eat("*")){b.tokenize=z;return z(a,b)}else{return["operator","operator"]}}},"@":function(a){if(a.eat("{")){return[null,"interpolation"]}if(a.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/,false)){return false}a.eatWhile(/[\w\\\-]/);if(a.match(/^\s*:/,false)){return["variable-2","variable-definition"]}return["variable-2","variable"]},"&":function(){return["atom","atom"]}},name:"css",helperType:"less"});E.defineMIME("text/x-gss",{documentTypes:V,mediaTypes:A,mediaFeatures:N,propertyKeywords:O,nonStandardPropertyKeywords:R,fontProperties:Q,counterDescriptors:B,colorKeywords:J,valueKeywords:D,supportsAtComponent:true,tokenHooks:{"/":function(a,b){if(!a.eat("*")){return false}b.tokenize=z;return z(a,b)}},name:"css",helperType:"gss"})});(function(b){if(typeof exports=="object"&&typeof module=="object"){b(require("../../lib/codemirror"),require("../xml/xml"),require("../javascript/javascript"),require("../css/css"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror","../xml/xml","../javascript/javascript","../css/css"],b)}else{b(CodeMirror)}}})(function(o){var l={script:[["lang",/(javascript|babel)/i,"javascript"],["type",/^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^$/i,"javascript"],["type",/./,"text/plain"],[null,null,"javascript"]],style:[["lang",/^css$/i,"css"],["type",/^(text\/)?(x-)?(stylesheet|css)$/i,"css"],["type",/./,"text/plain"],[null,null,"css"]]};function m(e,d,c){var a=e.current(),b=a.search(d);if(b>-1){e.backUp(a.length-b)}else{if(a.match(/<\/?$/)){e.backUp(a.length);if(!e.match(d,false)){e.match(a)}}}return c}var n={};function p(b){var a=n[b];if(a){return a}return n[b]=new RegExp("\\s+"+b+"\\s*=\\s*('|\")?([^'\"]+)('|\")?\\s*")}function r(a,c){var b=a.match(p(c));return b?/^\s*(.*?)\s*$/.exec(b[2])[1]:""}function j(a,b){return new RegExp((b?"^":"")+"</s*"+a+"s*>","i")}function k(e,f){for(var d in e){var c=f[d]||(f[d]=[]);var a=e[d];for(var b=a.length-1;b>=0;b--){c.unshift(a[b])}}}function q(b,a){for(var c=0;c<b.length;c++){var d=b[c];if(!d[0]||d[1].test(r(a,d[0]))){return d[2]}}}o.defineMode("htmlmixed",function(c,g){var e=o.getMode(c,{name:"xml",htmlMode:true,multilineTagIndentFactor:g.multilineTagIndentFactor,multilineTagIndentPastTag:g.multilineTagIndentPastTag});var d={};var f=g&&g.tags,h=g&&g.scriptTypes;k(l,d);if(f){k(f,d)}if(h){for(var a=h.length-1;a>=0;a--){d.script.unshift(["type",h[a].matches,h[a].mode])}}function b(C,i){var J=e.token(C,i.htmlState),B=/\btag\b/.test(J),H;if(B&&!/[<>\s\/]/.test(C.current())&&(H=i.htmlState.tagName&&i.htmlState.tagName.toLowerCase())&&d.hasOwnProperty(H)){i.inTag=H+" "}else{if(i.inTag&&B&&/>$/.test(C.current())){var I=/^([\S]+) (.*)/.exec(i.inTag);i.inTag=null;var D=C.current()==">"&&q(d[I[1]],I[2]);var E=o.getMode(c,D);var F=j(I[1],true),G=j(I[1],false);i.token=function(s,t){if(s.match(F,false)){t.token=b;t.localState=t.localMode=null;return null}return m(s,G,t.localMode.token(s,t.localState))};i.localMode=E;i.localState=o.startState(E,e.indent(i.htmlState,""))}else{if(i.inTag){i.inTag+=C.current();if(C.eol()){i.inTag+=" "}}}}return J}return{startState:function(){var i=o.startState(e);return{token:b,inTag:null,localMode:null,localState:null,htmlState:i}},copyState:function(i){var t;if(i.localState){t=o.copyState(i.localMode,i.localState)}return{token:i.token,inTag:i.inTag,localMode:i.localMode,localState:t,htmlState:o.copyState(e,i.htmlState)}},token:function(i,t){return t.token(i,t)},indent:function(i,t){if(!i.localMode||/^\s*<\//.test(t)){return e.indent(i.htmlState,t)}else{if(i.localMode.indent){return i.localMode.indent(i.localState,t)}else{return o.Pass}}},innerMode:function(i){return{state:i.localState||i.htmlState,mode:i.localMode||e}}}},"xml","javascript","css");o.defineMIME("text/html","htmlmixed")});(function(b){if(typeof exports=="object"&&typeof module=="object"){b(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],b)}else{b(CodeMirror)}}})(function(d){function c(a,b,f){return/^(?:operator|sof|keyword c|case|new|[\[{}\(,;:]|=>)$/.test(b.lastType)||(b.lastType=="quasi"&&/\{\s*$/.test(a.string.slice(0,a.pos-(f||0))))}d.defineMode("javascript",function(bU,bK){var a0=bU.indentUnit;var bE=bK.statementIndent;var b8=bK.jsonld;var bG=bK.json||b8;var a6=bK.typescript;var cd=bK.wordCharacters||/[\w$\xa1-\uffff]/;var bt=function(){function f(o){return{type:o,style:"keyword"}}var k=f("keyword a"),m=f("keyword b"),n=f("keyword c");var l=f("operator"),h={type:"atom",style:"atom"};var j={"if":f("if"),"while":k,"with":k,"else":m,"do":m,"try":m,"finally":m,"return":n,"break":n,"continue":n,"new":f("new"),"delete":n,"throw":n,"debugger":n,"var":f("var"),"const":f("var"),let:f("var"),"function":f("function"),"catch":f("catch"),"for":f("for"),"switch":f("switch"),"case":f("case"),"default":f("default"),"in":l,"typeof":l,"instanceof":l,"true":h,"false":h,"null":h,"undefined":h,"NaN":h,"Infinity":h,"this":f("this"),"class":f("class"),"super":f("atom"),yield:n,"export":f("export"),"import":f("import"),"extends":n,await:n,async:f("async")};if(a6){var e={type:"variable",style:"variable-3"};var i={"interface":f("class"),"implements":n,namespace:n,module:f("module"),"enum":f("module"),type:f("type"),"public":f("modifier"),"private":f("modifier"),"protected":f("modifier"),"abstract":f("modifier"),as:l,string:e,number:e,"boolean":e,any:e};for(var g in i){j[g]=i[g]}}return j}();var bh=/[+\-*&%=<>!?|~^]/;var bv=/^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/;function bu(e){var g=false,h,f=false;while((h=e.next())!=null){if(!g){if(h=="/"&&!f){return}if(h=="["){f=true}else{if(f&&h=="]"){f=false}}}g=!g&&h=="\\"}}var bd,bs;function bl(e,f,g){bd=e;bs=g;return f}function bb(i,f){var h=i.next();if(h=='"'||h=="'"){f.tokenize=be(h);return f.tokenize(i,f)}else{if(h=="."&&i.match(/^\d+(?:[eE][+\-]?\d+)?/)){return bl("number","number")}else{if(h=="."&&i.match("..")){return bl("spread","meta")}else{if(/[\[\]{}\(\),;\:\.]/.test(h)){return bl(h)}else{if(h=="="&&i.eat(">")){return bl("=>","operator")}else{if(h=="0"&&i.eat(/x/i)){i.eatWhile(/[\da-f]/i);return bl("number","number")}else{if(h=="0"&&i.eat(/o/i)){i.eatWhile(/[0-7]/i);return bl("number","number")}else{if(h=="0"&&i.eat(/b/i)){i.eatWhile(/[01]/i);return bl("number","number")}else{if(/\d/.test(h)){i.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);return bl("number","number")}else{if(h=="/"){if(i.eat("*")){f.tokenize=b9;return b9(i,f)}else{if(i.eat("/")){i.skipToEnd();return bl("comment","comment")}else{if(c(i,f,1)){bu(i);i.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);return bl("regexp","string-2")}else{i.eatWhile(bh);return bl("operator","operator",i.current())}}}}else{if(h=="`"){f.tokenize=b7;return b7(i,f)}else{if(h=="#"){i.skipToEnd();return bl("error","error")}else{if(bh.test(h)){i.eatWhile(bh);return bl("operator","operator",i.current())}else{if(cd.test(h)){i.eatWhile(cd);var e=i.current(),g=bt.propertyIsEnumerable(e)&&bt[e];return(g&&f.lastType!=".")?bl(g.type,g.style,e):bl("variable","variable",e)}}}}}}}}}}}}}}}function be(e){return function(i,g){var f=false,h;if(b8&&i.peek()=="@"&&i.match(bv)){g.tokenize=bb;return bl("jsonld-keyword","meta")}while((h=i.next())!=null){if(h==e&&!f){break}f=!f&&h=="\\"}if(!f){g.tokenize=bb}return bl("string","string")}}function b9(e,f){var h=false,g;while(g=e.next()){if(g=="/"&&h){f.tokenize=bb;break}h=(g=="*")}return bl("comment","comment")}function b7(e,g){var f=false,h;while((h=e.next())!=null){if(!f&&(h=="`"||h=="$"&&e.eat("{"))){g.tokenize=bb;break}f=!f&&h=="\\"}return bl("quasi","string-2",e.current())}var aZ="([{}])";function cb(e,k){if(k.fatArrowAt){k.fatArrowAt=null}var f=e.string.indexOf("=>",e.start);if(f<0){return}if(a6){var i=/:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(e.string.slice(e.start,f));if(i){f=i.index}}var h=0,j=false;for(var g=f-1;g>=0;--g){var m=e.string.charAt(g);var l=aZ.indexOf(m);if(l>=0&&l<3){if(!h){++g;break}if(--h==0){if(m=="("){j=true}break}}else{if(l>=3&&l<6){++h}else{if(cd.test(m)){j=true}else{if(/["'\/]/.test(m)){return}else{if(j&&!h){++g;break}}}}}}if(j&&!h){k.fatArrowAt=g}}var ba={atom:true,number:true,variable:true,string:true,regexp:true,"this":true,"jsonld-keyword":true};function bn(i,g,h,j,f,e){this.indented=i;this.column=g;this.type=h;this.prev=f;this.info=e;if(j!=null){this.align=j}}function aS(e,f){for(var g=e.localVars;g;g=g.next){if(g.name==f){return true}}for(var h=e.context;h;h=h.prev){for(var g=h.vars;g;g=g.next){if(g.name==f){return true}}}}function a7(k,g,h,e,j){var i=k.cc;bx.state=k;bx.stream=j;bx.marked=null,bx.cc=i;bx.style=g;if(!k.lexical.hasOwnProperty("align")){k.lexical.align=true}while(true){var f=i.length?i.pop():bG?bD:b2;if(f(h,e)){while(i.length&&i[i.length-1].lex){i.pop()()}if(bx.marked){return bx.marked}if(h=="variable"&&aS(k,e)){return"variable-2"}return g}}}var bx={state:null,column:null,marked:null,cc:null};function bT(){for(var e=arguments.length-1;e>=0;e--){bx.cc.push(arguments[e])}}function bO(){bT.apply(null,arguments);return true}function cc(f){function g(i){for(var h=i;h;h=h.next){if(h.name==f){return true}}return false}var e=bx.state;bx.marked="def";if(e.context){if(g(e.localVars)){return}e.localVars={name:f,next:e.localVars}}else{if(g(e.globalVars)){return}if(bK.globalVars){e.globalVars={name:f,next:e.globalVars}}}}var aU={name:"this",next:{name:"arguments"}};function b(){bx.state.context={prev:bx.state.context,vars:bx.state.localVars};bx.state.localVars=aU}function a(){bx.state.localVars=bx.state.context.vars;bx.state.context=bx.state.context.prev}function b4(f,e){var g=function(){var i=bx.state,h=i.indented;if(i.lexical.type=="stat"){h=i.lexical.indented}else{for(var j=i.lexical;j&&j.type==")"&&j.align;j=j.prev){h=j.indented}}i.lexical=new bn(h,bx.stream.column(),f,null,i.lexical,e)};g.lex=true;return g}function a5(){var e=bx.state;if(e.lexical.prev){if(e.lexical.type==")"){e.indented=e.lexical.indented}e.lexical=e.lexical.prev}}a5.lex=true;function aT(f){function e(g){if(g==f){return bO()}else{if(f==";"){return bT()}else{return bO(e)}}}return e}function b2(f,e){if(f=="var"){return bO(b4("vardef",e.length),a9,aT(";"),a5)}if(f=="keyword a"){return bO(b4("form"),bB,b2,a5)}if(f=="keyword b"){return bO(b4("form"),b2,a5)}if(f=="{"){return bO(b4("}"),bH,a5)}if(f==";"){return bO()}if(f=="if"){if(bx.state.lexical.info=="else"&&bx.state.cc[bx.state.cc.length-1]==a5){bx.state.cc.pop()()}return bO(b4("form"),bB,b2,a5,a8)}if(f=="function"){return bO(bk)}if(f=="for"){return bO(b4("form"),aQ,b2,a5)}if(f=="variable"){return bO(b4("stat"),b1)}if(f=="switch"){return bO(b4("form"),bB,b4("}","switch"),aT("{"),bH,a5,a5)}if(f=="case"){return bO(bD,aT(":"))}if(f=="default"){return bO(aT(":"))}if(f=="catch"){return bO(b4("form"),b,aT("("),bP,aT(")"),b2,a5,a)}if(f=="class"){return bO(b4("form"),bY,a5)}if(f=="export"){return bO(b4("stat"),b3,a5)}if(f=="import"){return bO(b4("stat"),bN,a5)}if(f=="module"){return bO(b4("form"),a4,b4("}"),aT("{"),bH,a5,a5)}if(f=="type"){return bO(a3,aT("operator"),a3,aT(";"))}if(f=="async"){return bO(b2)}return bT(b4("stat"),bD,aT(";"),a5)}function bD(e){return bV(e,false)}function b5(e){return bV(e,true)}function bB(e){if(e!="("){return bT()}return bO(b4(")"),bD,aT(")"),a5)}function bV(g,e){if(bx.state.fatArrowAt==bx.stream.start){var h=e?bj:bX;if(g=="("){return bO(b,b4(")"),ce(a4,")"),a5,aT("=>"),h,a)}else{if(g=="variable"){return bT(b,a4,aT("=>"),h,a)}}}var f=e?a2:bS;if(ba.hasOwnProperty(g)){return bO(f)}if(g=="function"){return bO(bk,f)}if(g=="class"){return bO(b4("form"),bp,a5)}if(g=="keyword c"||g=="async"){return bO(e?bJ:bL)}if(g=="("){return bO(b4(")"),bL,aT(")"),a5,f)}if(g=="operator"||g=="spread"){return bO(e?b5:bD)}if(g=="["){return bO(b4("]"),aY,a5,f)}if(g=="{"){return ca(aR,"}",null,f)}if(g=="quasi"){return bT(bg,f)}if(g=="new"){return bO(bq(e))}return bO()}function bL(e){if(e.match(/[;\}\)\],]/)){return bT()}return bT(bD)}function bJ(e){if(e.match(/[;\}\)\],]/)){return bT()}return bT(b5)}function bS(f,e){if(f==","){return bO(bD)}return a2(f,e,false)}function a2(h,f,i){var g=i==false?bS:a2;var e=i==false?bD:b5;if(h=="=>"){return bO(b,i?bj:bX,a)}if(h=="operator"){if(/\+\+|--/.test(f)){return bO(g)}if(f=="?"){return bO(bD,aT(":"),e)}return bO(e)}if(h=="quasi"){return bT(bg,g)}if(h==";"){return}if(h=="("){return ca(b5,")","call",g)}if(h=="."){return bO(bI,g)}if(h=="["){return bO(b4("]"),bL,aT("]"),a5,g)}}function bg(f,e){if(f!="quasi"){return bT()}if(e.slice(e.length-2)!="${"){return bO(bg)}return bO(bD,aV)}function aV(e){if(e=="}"){bx.marked="string-2";bx.state.tokenize=b7;return bO(bg)}}function bX(e){cb(bx.stream,bx.state);return bT(e=="{"?b2:bD)}function bj(e){cb(bx.stream,bx.state);return bT(e=="{"?b2:b5)}function bq(e){return function(f){if(f=="."){return bO(e?aX:bZ)}else{return bT(e?b5:bD)}}}function bZ(f,e){if(e=="target"){bx.marked="keyword";return bO(bS)}}function aX(f,e){if(e=="target"){bx.marked="keyword";return bO(a2)}}function b1(e){if(e==":"){return bO(a5,b2)}return bT(bS,aT(";"),a5)}function bI(e){if(e=="variable"){bx.marked="property";return bO()}}function aR(f,e){if(f=="async"){bx.marked="property";return bO(aR)}else{if(f=="variable"||bx.style=="keyword"){bx.marked="property";if(e=="get"||e=="set"){return bO(bo)}return bO(bm)}else{if(f=="number"||f=="string"){bx.marked=b8?"property":(bx.style+" property");return bO(bm)}else{if(f=="jsonld-keyword"){return bO(bm)}else{if(f=="modifier"){return bO(aR)}else{if(f=="["){return bO(bD,aT("]"),bm)}else{if(f=="spread"){return bO(bD)}else{if(f==":"){return bT(bm)}}}}}}}}}function bo(e){if(e!="variable"){return bT(bm)}bx.marked="property";return bO(bk)}function bm(e){if(e==":"){return bO(b5)}if(e=="("){return bT(bk)}}function ce(e,g){function f(j,i){if(j==","){var h=bx.state.lexical;if(h.info=="call"){h.pos=(h.pos||0)+1}return bO(function(l,k){if(l==g||k==g){return bT()}return bT(e)},f)}if(j==g||i==g){return bO()}return bO(aT(g))}return function(h,i){if(h==g||i==g){return bO()}return bT(e,f)}}function ca(e,h,f){for(var g=3;g<arguments.length;g++){bx.cc.push(arguments[g])}return bO(b4(h,f),ce(e,h),a5)}function bH(e){if(e=="}"){return bO()}return bT(b2,bH)}function bc(f,e){if(a6){if(f==":"){return bO(a3)}if(e=="?"){return bO(bc)}}}function a3(e){if(e=="variable"){bx.marked="variable-3";return bO(br)}if(e=="{"){return bO(ce(bF,"}"))}if(e=="("){return bO(ce(bR,")"),bf)}}function bf(e){if(e=="=>"){return bO(a3)}}function bF(e){if(e=="variable"||bx.style=="keyword"){bx.marked="property";return bO(bF)}else{if(e==":"){return bO(a3)}}}function bR(e){if(e=="variable"){return bO(bR)}else{if(e==":"){return bO(a3)}}}function br(f,e){if(e=="<"){return bO(ce(a3,">"),br)}if(f=="["){return bO(aT("]"),br)}}function a9(){return bT(a4,bc,bQ,bW)}function a4(f,e){if(f=="modifier"){return bO(a4)}if(f=="variable"){cc(e);return bO()}if(f=="spread"){return bO(a4)}if(f=="["){return ca(a4,"]")}if(f=="{"){return ca(b6,"}")}}function b6(f,e){if(f=="variable"&&!bx.stream.match(/^\s*:/,false)){cc(e);return bO(bQ)}if(f=="variable"){bx.marked="property"}if(f=="spread"){return bO(a4)}if(f=="}"){return bT()}return bO(aT(":"),a4,bQ)}function bQ(f,e){if(e=="="){return bO(b5)}}function bW(e){if(e==","){return bO(a9)}}function a8(f,e){if(f=="keyword b"&&e=="else"){return bO(b4("form","else"),b2,a5)}}function aQ(e){if(e=="("){return bO(b4(")"),bz,aT(")"),a5)}}function bz(e){if(e=="var"){return bO(a9,aT(";"),bA)}if(e==";"){return bO(bA)}if(e=="variable"){return bO(aP)}return bT(bD,aT(";"),bA)}function aP(f,e){if(e=="in"||e=="of"){bx.marked="keyword";return bO(bD)}return bO(bS,bA)}function bA(f,e){if(f==";"){return bO(bC)}if(e=="in"||e=="of"){bx.marked="keyword";return bO(bD)}return bT(bD,aT(";"),bC)}function bC(e){if(e!=")"){bO(bD)}}function bk(f,e){if(e=="*"){bx.marked="keyword";return bO(bk)}if(f=="variable"){cc(e);return bO(bk)}if(f=="("){return bO(b,b4(")"),ce(bP,")"),a5,bc,b2,a)}}function bP(e){if(e=="spread"){return bO(bP)}return bT(a4,bc,bQ)}function bp(f,e){if(f=="variable"){return bY(f,e)}return bi(f,e)}function bY(f,e){if(f=="variable"){cc(e);return bO(bi)}}function bi(f,e){if(e=="extends"||e=="implements"){return bO(a6?a3:bD,bi)}if(f=="{"){return bO(b4("}"),aW,a5)}}function aW(f,e){if(f=="variable"||bx.style=="keyword"){if((e=="static"||e=="get"||e=="set"||(a6&&(e=="public"||e=="private"||e=="protected"||e=="readonly"||e=="abstract")))&&bx.stream.match(/^\s+[\w$\xa1-\uffff]/,false)){bx.marked="keyword";return bO(aW)}bx.marked="property";return bO(a6?b0:bk,aW)}if(e=="*"){bx.marked="keyword";return bO(aW)}if(f==";"){return bO(aW)}if(f=="}"){return bO()}}function b0(f,e){if(e=="?"){return bO(b0)}if(f==":"){return bO(a3,bQ)}return bT(bk)}function b3(f,e){if(e=="*"){bx.marked="keyword";return bO(bM,aT(";"))}if(e=="default"){bx.marked="keyword";return bO(bD,aT(";"))}return bT(b2)}function bN(e){if(e=="string"){return bO()}return bT(bw,bM)}function bw(f,e){if(f=="{"){return ca(bw,"}")}if(f=="variable"){cc(e)}if(e=="*"){bx.marked="keyword"}return bO(a1)}function a1(f,e){if(e=="as"){bx.marked="keyword";return bO(bw)}}function bM(f,e){if(e=="from"){bx.marked="keyword";return bO(bD)}}function aY(e){if(e=="]"){return bO()}return bT(ce(b5,"]"))}function by(e,f){return e.lastType=="operator"||e.lastType==","||bh.test(f.charAt(0))||/[,.]/.test(f.charAt(0))}return{startState:function(e){var f={tokenize:bb,lastType:"sof",cc:[],lexical:new bn((e||0)-a0,0,"block",false),localVars:bK.localVars,context:bK.localVars&&{vars:bK.localVars},indented:e||0};if(bK.globalVars&&typeof bK.globalVars=="object"){f.globalVars=bK.globalVars}return f},token:function(e,f){if(e.sol()){if(!f.lexical.hasOwnProperty("align")){f.lexical.align=false}f.indented=e.indentation();cb(e,f)}if(f.tokenize!=b9&&e.eatSpace()){return null}var g=f.tokenize(e,f);if(bd=="comment"){return g}f.lastType=bd=="operator"&&(bs=="++"||bs=="--")?"incdec":bd;return a7(f,g,bd,bs,e)},indent:function(m,j){if(m.tokenize==b9){return d.Pass}if(m.tokenize!=bb){return 0}var f=j&&j.charAt(0),e=m.lexical,g;if(!/^\s*else\b/.test(j)){for(var k=m.cc.length-1;k>=0;--k){var i=m.cc[k];if(i==a5){e=e.prev}else{if(i!=a8){break}}}}while((e.type=="stat"||e.type=="form")&&(f=="}"||((g=m.cc[m.cc.length-1])&&(g==bS||g==a2)&&!/^[,\.=+\-*:?[\(]/.test(j)))){e=e.prev}if(bE&&e.type==")"&&e.prev.type=="stat"){e=e.prev}var h=e.type,l=f==h;if(h=="vardef"){return e.indented+(m.lastType=="operator"||m.lastType==","?e.info+1:0)}else{if(h=="form"&&f=="{"){return e.indented}else{if(h=="form"){return e.indented+a0}else{if(h=="stat"){return e.indented+(by(m,j)?bE||a0:0)}else{if(e.info=="switch"&&!l&&bK.doubleIndentSwitch!=false){return e.indented+(/^(?:case|default)\b/.test(j)?a0:2*a0)}else{if(e.align){return e.column+(l?0:1)}else{return e.indented+(l?0:a0)}}}}}}},electricInput:/^\s*(?:case .*?:|default:|\{|\})$/,blockCommentStart:bG?null:"/*",blockCommentEnd:bG?null:"*/",lineComment:bG?null:"//",fold:"brace",closeBrackets:"()[]{}''\"\"``",helperType:bG?"json":"javascript",jsonldMode:b8,jsonMode:bG,expressionAllowed:c,skipExpression:function(f){var e=f.cc[f.cc.length-1];if(e==bD||e==b5){f.cc.pop()}}}});d.registerHelper("wordChars","javascript",/[\w$]/);d.defineMIME("text/javascript","javascript");d.defineMIME("text/ecmascript","javascript");d.defineMIME("application/javascript","javascript");d.defineMIME("application/x-javascript","javascript");d.defineMIME("application/ecmascript","javascript");d.defineMIME("application/json",{name:"javascript",json:true});d.defineMIME("application/x-json",{name:"javascript",json:true});d.defineMIME("application/ld+json",{name:"javascript",jsonld:true});d.defineMIME("text/typescript",{name:"javascript",typescript:true});d.defineMIME("application/typescript",{name:"javascript",typescript:true})});(function(b){if(typeof exports=="object"&&typeof module=="object"){b(require("../../lib/codemirror"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror"],b)}else{b(CodeMirror)}}})(function(b){b.defineMode("nginx",function(w){function p(c){var e={},d=c.split(" ");for(var f=0;f<d.length;++f){e[d[f]]=true}return e}var t=p("break return rewrite set accept_mutex accept_mutex_delay access_log add_after_body add_before_body add_header addition_types aio alias allow ancient_browser ancient_browser_value auth_basic auth_basic_user_file auth_http auth_http_header auth_http_timeout autoindex autoindex_exact_size autoindex_localtime charset charset_types client_body_buffer_size client_body_in_file_only client_body_in_single_buffer client_body_temp_path client_body_timeout client_header_buffer_size client_header_timeout client_max_body_size connection_pool_size create_full_put_path daemon dav_access dav_methods debug_connection debug_points default_type degradation degrade deny devpoll_changes devpoll_events directio directio_alignment empty_gif env epoll_events error_log eventport_events expires fastcgi_bind fastcgi_buffer_size fastcgi_buffers fastcgi_busy_buffers_size fastcgi_cache fastcgi_cache_key fastcgi_cache_methods fastcgi_cache_min_uses fastcgi_cache_path fastcgi_cache_use_stale fastcgi_cache_valid fastcgi_catch_stderr fastcgi_connect_timeout fastcgi_hide_header fastcgi_ignore_client_abort fastcgi_ignore_headers fastcgi_index fastcgi_intercept_errors fastcgi_max_temp_file_size fastcgi_next_upstream fastcgi_param fastcgi_pass_header fastcgi_pass_request_body fastcgi_pass_request_headers fastcgi_read_timeout fastcgi_send_lowat fastcgi_send_timeout fastcgi_split_path_info fastcgi_store fastcgi_store_access fastcgi_temp_file_write_size fastcgi_temp_path fastcgi_upstream_fail_timeout fastcgi_upstream_max_fails flv geoip_city geoip_country google_perftools_profiles gzip gzip_buffers gzip_comp_level gzip_disable gzip_hash gzip_http_version gzip_min_length gzip_no_buffer gzip_proxied gzip_static gzip_types gzip_vary gzip_window if_modified_since ignore_invalid_headers image_filter image_filter_buffer image_filter_jpeg_quality image_filter_transparency imap_auth imap_capabilities imap_client_buffer index ip_hash keepalive_requests keepalive_timeout kqueue_changes kqueue_events large_client_header_buffers limit_conn limit_conn_log_level limit_rate limit_rate_after limit_req limit_req_log_level limit_req_zone limit_zone lingering_time lingering_timeout lock_file log_format log_not_found log_subrequest map_hash_bucket_size map_hash_max_size master_process memcached_bind memcached_buffer_size memcached_connect_timeout memcached_next_upstream memcached_read_timeout memcached_send_timeout memcached_upstream_fail_timeout memcached_upstream_max_fails merge_slashes min_delete_depth modern_browser modern_browser_value msie_padding msie_refresh multi_accept open_file_cache open_file_cache_errors open_file_cache_events open_file_cache_min_uses open_file_cache_valid open_log_file_cache output_buffers override_charset perl perl_modules perl_require perl_set pid pop3_auth pop3_capabilities port_in_redirect postpone_gzipping postpone_output protocol proxy proxy_bind proxy_buffer proxy_buffer_size proxy_buffering proxy_buffers proxy_busy_buffers_size proxy_cache proxy_cache_key proxy_cache_methods proxy_cache_min_uses proxy_cache_path proxy_cache_use_stale proxy_cache_valid proxy_connect_timeout proxy_headers_hash_bucket_size proxy_headers_hash_max_size proxy_hide_header proxy_ignore_client_abort proxy_ignore_headers proxy_intercept_errors proxy_max_temp_file_size proxy_method proxy_next_upstream proxy_pass_error_message proxy_pass_header proxy_pass_request_body proxy_pass_request_headers proxy_read_timeout proxy_redirect proxy_send_lowat proxy_send_timeout proxy_set_body proxy_set_header proxy_ssl_session_reuse proxy_store proxy_store_access proxy_temp_file_write_size proxy_temp_path proxy_timeout proxy_upstream_fail_timeout proxy_upstream_max_fails random_index read_ahead real_ip_header recursive_error_pages request_pool_size reset_timedout_connection resolver resolver_timeout rewrite_log rtsig_overflow_events rtsig_overflow_test rtsig_overflow_threshold rtsig_signo satisfy secure_link_secret send_lowat send_timeout sendfile sendfile_max_chunk server_name_in_redirect server_names_hash_bucket_size server_names_hash_max_size server_tokens set_real_ip_from smtp_auth smtp_capabilities smtp_client_buffer smtp_greeting_delay so_keepalive source_charset ssi ssi_ignore_recycled_buffers ssi_min_file_chunk ssi_silent_errors ssi_types ssi_value_length ssl ssl_certificate ssl_certificate_key ssl_ciphers ssl_client_certificate ssl_crl ssl_dhparam ssl_engine ssl_prefer_server_ciphers ssl_protocols ssl_session_cache ssl_session_timeout ssl_verify_client ssl_verify_depth starttls stub_status sub_filter sub_filter_once sub_filter_types tcp_nodelay tcp_nopush thread_stack_size timeout timer_resolution types_hash_bucket_size types_hash_max_size underscores_in_headers uninitialized_variable_warn use user userid userid_domain userid_expires userid_mark userid_name userid_p3p userid_path userid_service valid_referers variables_hash_bucket_size variables_hash_max_size worker_connections worker_cpu_affinity worker_priority worker_processes worker_rlimit_core worker_rlimit_nofile worker_rlimit_sigpending worker_threads working_directory xclient xml_entities xslt_stylesheet xslt_typesdrew@li229-23");var q=p("http mail events server types location upstream charset_map limit_except if geo map");var u=p("include root server server_name listen internal proxy_pass memcached_pass fastcgi_pass try_files");var s=w.indentUnit,o;function r(d,c){o=c;return d}function v(c,e){c.eatWhile(/[\w\$_]/);var d=c.current();if(t.propertyIsEnumerable(d)){return"keyword"}else{if(q.propertyIsEnumerable(d)){return"variable-2"}else{if(u.propertyIsEnumerable(d)){return"string-2"}}}var f=c.next();if(f=="@"){c.eatWhile(/[\w\\\-]/);return r("meta",c.current())}else{if(f=="/"&&c.eat("*")){e.tokenize=a;return a(c,e)}else{if(f=="<"&&c.eat("!")){e.tokenize=x;return x(c,e)}else{if(f=="="){r(null,"compare")}else{if((f=="~"||f=="|")&&c.eat("=")){return r(null,"compare")}else{if(f=='"'||f=="'"){e.tokenize=n(f);return e.tokenize(c,e)}else{if(f=="#"){c.skipToEnd();return r("comment","comment")}else{if(f=="!"){c.match(/^\s*\w*/);return r("keyword","important")}else{if(/\d/.test(f)){c.eatWhile(/[\w.%]/);return r("number","unit")}else{if(/[,.+>*\/]/.test(f)){return r(null,"select-op")}else{if(/[;{}:\[\]]/.test(f)){return r(null,f)}else{c.eatWhile(/[\w\\\-]/);return r("variable","variable")}}}}}}}}}}}}function a(c,d){var f=false,e;while((e=c.next())!=null){if(f&&e=="/"){d.tokenize=v;break}f=(e=="*")}return r("comment","comment")}function x(c,d){var e=0,f;while((f=c.next())!=null){if(e>=2&&f==">"){d.tokenize=v;break}e=(f=="-")?e+1:0}return r("comment","comment")}function n(c){return function(d,f){var e=false,g;while((g=d.next())!=null){if(g==c&&!e){break}e=!e&&g=="\\"}if(!e){f.tokenize=v}return r("string","string")}}return{startState:function(c){return{tokenize:v,baseIndent:c||0,stack:[]}},token:function(c,d){if(c.eatSpace()){return null}o=null;var e=d.tokenize(c,d);var f=d.stack[d.stack.length-1];if(o=="hash"&&f=="rule"){e="atom"}else{if(e=="variable"){if(f=="rule"){e="number"}else{if(!f||f=="@media{"){e="tag"}}}}if(f=="rule"&&/^[\{\};]$/.test(o)){d.stack.pop()}if(o=="{"){if(f=="@media"){d.stack[d.stack.length-1]="@media{"}else{d.stack.push("{")}}else{if(o=="}"){d.stack.pop()}else{if(o=="@media"){d.stack.push("@media")}else{if(f=="{"&&o!="comment"){d.stack.push("rule")}}}}return e},indent:function(d,e){var c=d.stack.length;if(/^\}/.test(e)){c-=d.stack[d.stack.length-1]=="rule"?2:1}return d.baseIndent+c*s},electricChars:"}"}});b.defineMIME("text/x-nginx-conf","nginx")});(function(b){if(typeof exports=="object"&&typeof module=="object"){b(require("../../lib/codemirror"),require("../htmlmixed/htmlmixed"),require("../clike/clike"))}else{if(typeof define=="function"&&define.amd){define(["../../lib/codemirror","../htmlmixed/htmlmixed","../clike/clike"],b)}else{b(CodeMirror)}}})(function(o){function m(a){var c={},b=a.split(" ");for(var d=0;d<b.length;++d){c[b[d]]=true}return c}function n(a,c,b){if(a.length==0){return q(c)}return function(e,f){var g=a[0];for(var d=0;d<g.length;d++){if(e.match(g[d][0])){f.tokenize=n(a.slice(1),c);return g[d][1]}}f.tokenize=q(c,b);return"string"}}function q(a,b){return function(c,d){return p(c,d,a,b)}}function p(e,b,c,d){if(d!==false&&e.match("${",false)||e.match("{$",false)){b.tokenize=null;return"string"}if(d!==false&&e.match(/^\$[a-zA-Z_][a-zA-Z0-9_]*/)){if(e.match("[",false)){b.tokenize=n([[["[",null]],[[/\d[\w\.]*/,"number"],[/\$[a-zA-Z_][a-zA-Z0-9_]*/,"variable-2"],[/[\w\$]+/,"variable"]],[["]",null]]],c,d)}if(e.match(/\-\>\w/,false)){b.tokenize=n([[["->",null]],[[/[\w]+/,"variable"]]],c,d)}return"variable-2"}var a=false;while(!e.eol()&&(a||d===false||(!e.match("{$",false)&&!e.match(/^(\$[a-zA-Z_][a-zA-Z0-9_]*|\$\{)/,false)))){if(!a&&e.match(c)){b.tokenize=null;b.tokStack.pop();b.tokStack.pop();break}a=e.next()=="\\"&&!a}return"string"}var k="abstract and array as break case catch class clone const continue declare default do else elseif enddeclare endfor endforeach endif endswitch endwhile extends final for foreach function global goto if implements interface instanceof namespace new or private protected public static switch throw trait try use var while xor die echo empty exit eval include include_once isset list require require_once return print unset __halt_compiler self static parent yield insteadof finally";var j="true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__";var r="func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents file_put_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists array_intersect_key array_combine array_column pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count";o.registerHelper("hintWords","php",[k,j,r].join(" ").split(" "));o.registerHelper("wordChars","php",/[\w$]/);var l={name:"clike",helperType:"php",keywords:m(k),blockKeywords:m("catch do else elseif for foreach if switch try while finally"),defKeywords:m("class function interface namespace trait"),atoms:m(j),builtin:m(r),multiLineStrings:true,hooks:{"$":function(a){a.eatWhile(/[\w\$_]/);return"variable-2"},"<":function(e,b){var c;if(c=e.match(/<<\s*/)){var d=e.eat(/['"]/);e.eatWhile(/[\w\.]/);var a=e.current().slice(c[0].length+(d?2:1));if(d){e.eat(d)}if(a){(b.tokStack||(b.tokStack=[])).push(a,0);b.tokenize=q(a,d!="'");return"string"}}return false},"#":function(a){while(!a.eol()&&!a.match("?>",false)){a.next()}return"comment"},"/":function(a){if(a.eat("/")){while(!a.eol()&&!a.match("?>",false)){a.next()}return"comment"}return false},'"':function(b,a){(a.tokStack||(a.tokStack=[])).push('"',0);a.tokenize=q('"');return"string"},"{":function(b,a){if(a.tokStack&&a.tokStack.length){a.tokStack[a.tokStack.length-1]++}return false},"}":function(b,a){if(a.tokStack&&a.tokStack.length>0&&!--a.tokStack[a.tokStack.length-1]){a.tokenize=q(a.tokStack[a.tokStack.length-2])}return false}}};o.defineMode("php",function(b,a){var e=o.getMode(b,"text/html");var d=o.getMode(b,l);function c(f,h){var i=h.curMode==d;if(f.sol()&&h.pending&&h.pending!='"'&&h.pending!="'"){h.pending=null}if(!i){if(f.match(/^<\?\w*/)){h.curMode=d;if(!h.php){h.php=o.startState(d,e.indent(h.html,""))}h.curState=h.php;return"meta"}if(h.pending=='"'||h.pending=="'"){while(!f.eol()&&f.next()!=h.pending){}var v="string"}else{if(h.pending&&f.pos<h.pending.end){f.pos=h.pending.end;var v=h.pending.style}else{var v=e.token(f,h.curState)}}if(h.pending){h.pending=null}var g=f.current(),w=g.search(/<\?/),x;if(w!=-1){if(v=="string"&&(x=g.match(/[\'\"]$/))&&!/\?>/.test(g)){h.pending=x[0]}else{h.pending={end:f.pos,style:v}}f.backUp(g.length-w)}return v}else{if(i&&h.php.tokenize==null&&f.match("?>")){h.curMode=e;h.curState=h.html;if(!h.php.context.prev){h.php=null}return"meta"}else{return d.token(f,h.curState)}}}return{startState:function(){var g=o.startState(e);var f=a.startOpen?o.startState(d):null;return{html:g,php:f,curMode:a.startOpen?d:e,curState:a.startOpen?f:g,pending:null}},copyState:function(h){var u=h.html,i=o.copyState(e,u),f=h.php,v=f&&o.copyState(d,f),g;if(h.curMode==e){g=i}else{g=v}return{html:i,php:v,curMode:h.curMode,curState:g,pending:h.pending}},token:c,indent:function(f,g){if((f.curMode!=d&&/^\s*<\//.test(g))||(f.curMode==d&&/^\?>/.test(g))){return e.indent(f.html,g)}return f.curMode.indent(f.curState,g)},blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//",innerMode:function(f){return{state:f.curState,mode:f.curMode}}}},"htmlmixed","clike");o.defineMIME("application/x-httpd-php","php");o.defineMIME("application/x-httpd-php-open",{name:"php",startOpen:true});o.defineMIME("text/x-php",l)});
\ No newline at end of file
diff --git a/route/static/css/ensite.css b/route/static/css/ensite.css
deleted file mode 100755
index 531a660fe..000000000
--- a/route/static/css/ensite.css
+++ /dev/null
@@ -1,3703 +0,0 @@
-body {
-    line-height: 1.4;
-    color: #333;
-    font-family: "微软雅黑", Arial, Helvetica, sans-serif;
-    font-size: 12px
-}
-
-input,
-textarea,
-select {
-    font-size: 100%;
-    font-family: inherit
-}
-
-body,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-ul,
-ol,
-form {
-    margin: 0
-}
-
-h4,
-h5,
-h6 {
-    font-size: 1em
-}
-
-ul,
-ol {
-    padding-left: 0;
-    list-style-type: none
-}
-
-fieldset,
-img {
-    border: 0
-}
-
-a {
-    color: #333;
-    border: 0;
-    text-decoration: none
-}
-
-a:hover {
-    text-decoration: none
-}
-
-a:link {
-    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-    -webkit-touch-callout: none
-}
-
-:-moz-placeholder {
-    color: #999
-}
-
-::-moz-placeholder {
-    color: #999
-}
-
-input:-ms-input-placeholder {
-    color: #999
-}
-
-input::-webkit-input-placeholder {
-    color: #999
-}
-
-body,
-html {
-    height: 100%
-}
-
-.f12 {
-    font-size: 12px
-}
-
-.f14 {
-    font-size: 14px
-}
-
-.f15 {
-    font-size: 15px
-}
-
-.f16 {
-    font-size: 16px
-}
-
-.f18 {
-    font-size: 18px
-}
-
-.f20 {
-    font-size: 20px
-}
-
-.cw {
-    color: white
-}
-
-.c0 {
-    color: #000
-}
-
-.c3 {
-    color: #333
-}
-
-.c4 {
-    color: #444
-}
-
-.c5 {
-    color: #555
-}
-
-.c6 {
-    color: #666
-}
-
-.c7 {
-    color: #777
-}
-
-.c8 {
-    color: #888
-}
-
-.c9 {
-    color: #999
-}
-
-.cbt {
-    color: #20a53a
-}
-
-.bgw {
-    background-color: white
-}
-
-.bge6 {
-    background-color: #e6e9ee
-}
-
-.plr10 {
-    padding: 0 10px
-}
-
-.plr15 {
-    padding: 0 15px
-}
-
-.plr20 {
-    padding: 0 20px
-}
-
-.ptb10 {
-    padding: 10px 0
-}
-
-.ptb15 {
-    padding: 15px 0
-}
-
-.ptb20 {
-    padding: 20px 0
-}
-
-.pd0 {
-    padding: 0
-}
-
-.pd15 {
-    padding: 15px
-}
-
-.pd20 {
-    padding: 20px
-}
-
-.pr8 {
-    padding-right: 8px
-}
-
-.pl7 {
-    padding-left: 7px
-}
-
-.pb15 {
-    padding-bottom: 15px
-}
-
-.pb55 {
-    padding-bottom: 55px
-}
-
-.pb70 {
-    padding-bottom: 70px
-}
-
-.mt10 {
-    margin-top: 10px
-}
-
-.mtb10 {
-    margin: 10px 0
-}
-
-.mtb15 {
-    margin: 15px 0
-}
-
-.mtb20 {
-    margin: 20px 0
-}
-
-.mlr15 {
-    margin: 0 15px
-}
-
-.mlr20 {
-    margin: 0 20px
-}
-
-.mb15 {
-    margin-bottom: 15px
-}
-
-.mr50 {
-    margin-right: 50px
-}
-
-.ml5 {
-    margin-left: 5px
-}
-
-.mr5 {
-    margin-right: 5px
-}
-
-.mr20 {
-    margin-right: 20px
-}
-
-.mg10 {
-    margin: 10px
-}
-
-.va0 {
-    vertical-align: 0
-}
-
-.ico-font-ask {
-    border: 1px solid #999;
-    border-radius: 8px;
-    display: inline-block;
-    font-family: arial;
-    font-size: 11px;
-    font-style: normal;
-    height: 16px;
-    line-height: 16px;
-    margin-left: 5px;
-    text-align: center;
-    width: 16px;
-    cursor: help
-}
-
-.btlink {
-    color: #20a53a
-}
-
-.btlink:hover {
-    cursor: pointer
-}
-
-.btn-btlink {
-    border-color: #20a53a;
-    color: #20a53a;
-    vertical-align: 1px
-}
-
-.btn-btlink:hover {
-    border-color: orange;
-    color: orange
-}
-
-.b-shadown {
-    transition: border-color .15s ease-in-out 0s, box-shadow .15s ease-in-out 0s
-}
-
-.b-shadown:hover {
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6)
-}
-
-.important-title {
-    background-color: #fbfbfb;
-    border: 1px solid #eee;
-    border-radius: 3px;
-    line-height: 28px;
-    margin-bottom: 15px;
-    padding: 5px 10px
-}
-
-.bt-input-text {
-    border: 1px solid #ccc;
-    height: 30px;
-    line-height: 30px;
-    padding-left: 5px;
-    border-radius: 3px;
-    -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-    -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s
-}
-
-.bt-input-text:focus,
-.bt-input-text:active {
-    border: #66afe9 1px solid;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6)
-}
-
-.bt-submit {
-    background-color: #20a53a;
-    border-radius: 3px;
-    width: 140px;
-    height: 34px;
-    line-height: 34px;
-    text-align: center;
-    color: #fff;
-    cursor: pointer
-}
-
-.cursor {
-    cursor: pointer
-}
-
-.help-info-text {
-    margin-top: 15px
-}
-
-.help-info-text>li {
-    list-style: inside disc;
-    line-height: 24px
-}
-
-.relative {
-    position: relative
-}
-
-.ico-copy {
-    background: url(../img/ico-copy.png) no-repeat;
-    height: 14px;
-    width: 12px;
-    display: inline-block;
-    vertical-align: -2px
-}
-
-.zclip embed {
-    vertical-align: top
-}
-
-.webDelete .options {
-    padding: 20px 0
-}
-
-.webDelete .options label {
-    width: 30%;
-    float: left;
-    font-weight: normal
-}
-
-.webDelete .options label input {
-    float: left;
-    margin: 0 10px 0 0;
-    margin-top: 1px
-}
-
-.webDelete .options label span {
-    float: left;
-    margin: 0;
-    line-height: 16px
-}
-
-.webDelete .vcode {
-    background-color: #f0f0f0;
-    clear: both;
-    font-size: 14px;
-    height: 40px;
-    line-height: 40px;
-    margin: 10px 0;
-    padding-left: 12px;
-    text-align: left;
-    color: #444
-}
-
-.webDelete .vcode .text {
-    margin-right: 10px;
-    margin-left: 10px
-}
-
-.webDelete .vcode #vcodeResult {
-    display: inline;
-    height: 26px;
-    line-height: 26px;
-    margin-left: 10px;
-    width: 50px;
-    color: #444
-}
-
-.btswitch {
-    display: none
-}
-
-.btswitch+.btswitch-btn {
-    outline: 0;
-    display: block;
-    width: 3em;
-    height: 1.8em;
-    position: relative;
-    cursor: pointer
-}
-
-.btswitch+.btswitch-btn:after,
-.btswitch+.btswitch-btn:before {
-    position: relative;
-    display: block;
-    content: "";
-    width: 50%;
-    height: 100%
-}
-
-.btswitch+.btswitch-btn:after {
-    left: 0
-}
-
-.btswitch+.btswitch-btn:before {
-    display: none
-}
-
-.btswitch:checked+.btswitch-btn:after {
-    left: 50%
-}
-
-.btswitch-ios+.btswitch-btn {
-    background: #cdcdcd;
-    border-radius: .9em;
-    padding: 2px;
-    -webkit-transition: all .4s ease;
-    transition: all .4s ease;
-    border: 1px solid #e8eae9
-}
-
-.btswitch-ios+.btswitch-btn:after {
-    border-radius: .9em;
-    background: #fbfbfb;
-    -webkit-transition: left .3s cubic-bezier(.175, .885, .32, 1.275), padding .3s ease, margin .3s ease;
-    transition: left .3s cubic-bezier(.175, .885, .32, 1.275), padding .3s ease, margin .3s ease;
-    -webkit-box-shadow: 0 0 0 1px rgba(0, 0, 0, .1), 0 4px 0 rgba(0, 0, 0, .08);
-    box-shadow: 0 0 0 1px rgba(0, 0, 0, .1), 0 4px 0 rgba(0, 0, 0, .08)
-}
-
-.btswitch-ios+.btswitch-btn:active {
-    -webkit-box-shadow: inset 0 0 0 2em #e8eae9;
-    box-shadow: inset 0 0 0 2em #e8eae9
-}
-
-.btswitch-ios+.btswitch-btn:active:after {
-    padding-right: .8em
-}
-
-.btswitch-ios:checked+.btswitch-btn {
-    background: #20a53a
-}
-
-.btswitch-ios:checked+.btswitch-btn:active {
-    -webkit-box-shadow: none;
-    box-shadow: none
-}
-
-.btswitch-ios:checked+.btswitch-btn:active:after {
-    margin-left: -.8em
-}
-
-.bt-warp {
-    position: relative;
-    min-height: 100%
-}
-
-.bt-warp>.container-fluid {
-    padding: 0
-}
-
-.main-content {
-    margin-left: 180px
-}
-
-.sidebar-scroll {
-    background-color: #3c444d;
-    width: 180px;
-    z-index: 100;
-    height: 100%;
-    position: fixed;
-    overflow: hidden
-}
-
-.sidebar-auto {
-    overflow: auto;
-    height: 100%;
-    margin-right: -18px
-}
-
-.mypcip {
-    display: block;
-    padding: 0 10px;
-    position: relative;
-    transition-duration: 500ms;
-    transition-property: background;
-    transition-timing-function: ease;
-    width: 100%;
-    cursor: pointer;
-    margin: 1px 0
-}
-
-.mypcip:hover {
-    background: #20a53a;
-    opacity: 1
-}
-
-.mypcip span {
-    background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAQCAYAAAAS7Y8mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAdgAAAHYBTnsmCAAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAGPSURBVDiNldQ9ixRBEAbgZ3Zn1fVOuQU/wK9AMDDS1MvuRxj5CwTBP2CiYmYmGBsYGRsaa2qkkSiCgRd4y3ri3XqzbdDV7Lgs7uwLRc90V1dXv29VVymluxiiRoVkNaoYG7wN+9chpTTBBn7jKA5YhYR+JPQEDxYd6rAPeIwDnOgQuMEIz3F8mUMdC9/wqkPAxb1P0Yv/6ziLX/hTy9c6jXPYXSPwBQywF+Mz7GCCSRGMbqK1Ufwbmb4beI9TuNZFqFWoZCH7Mp0XcaX33y3dUDKfmRdD1bM+BYuoWtaEKeIdyqSvg5+RZSWX6Ri3ZUqmRbxjcqnsx3cyF7Utbpmf4YxcapXcWFNcjiSbOk7Yxhu5BocRaGBeoyXYNII32MTJsJ7cvR/D92aN1xFsFA6HYZ/iiiWjTVyVGyrhBz7jXSQxxq3wPahxJ7JuX30sd9IoshviC77KzdSmag+XYm4QNq0tF+0e7sc1SwPs4xFeLPHvt2ibsfwl24rFl/KLV/jdCho2ZC3a+I6HOB9rR38B10ZjDE49T6kAAAAASUVORK5CYII=") no-repeat 0 center;
-    display: inline-block;
-    line-height: 46px;
-    padding-left: 30px
-}
-
-.btpc-plus {
-    line-height: 40px;
-    color: #aaa;
-    font-family: arial;
-    font-size: 26px;
-    cursor: pointer;
-    padding-left: 80px;
-    transition-duration: 500ms;
-    transition-property: background;
-    transition-timing-function: ease
-}
-
-.btpc-plus:hover {
-    background-color: #20a53a;
-    color: #fff
-}
-
-.mypcip .btedit {
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAFVSURBVDiNndO/ahRRFMfxz+zOav6goKC1S54gBBUECy0lIKTeyrXwFcROyBuENCHdNhaCoCgiWoggGPAJxFgIsbEJJBmTrCfFnBFZNjHrDy4z5849935/Z84tIsJ/6gneFhFR4AHuYHjM4jN4iZWM13ALSyWWcR+rOERrzAYFNvP9Ka7jKrZExKeIWI8IpxivIuJrRFxo5lqJXfzDbwfvcQU3cAnTUOIsfif6zeYDfuEDzuM5LuIatrGBu/hcInCAy1mH2STawyLmknI+56bykFZDsJsUP7CAdhIMUeELXo9YGmbOn4o3Nah6vd5Ot9vd6ff7lfr3dXKMVZnIVVp4MRgMZtLW6LpneJhxpB1lJnfwE49yblRtfPsrLhoLpbqA7fT15jjUERXNQeO6biK11DXYnyCnymdIjI+4jXuJdlJXHqq7cArf620izkXEu5hMj5u7cAQCwbENi6a1WQAAAABJRU5ErkJggg==) no-repeat center center;
-    width: 16px;
-    height: 16px;
-    display: none;
-    position: absolute;
-    left: 156px;
-    top: 14px
-}
-
-.mypcip:hover .btedit {
-    display: block
-}
-
-.task {
-    position: absolute;
-    right: 6px;
-    top: 14px;
-    height: 20px;
-    width: 20px;
-    line-height: 20px;
-    background-color: #fc6d26;
-    z-index: 99;
-    text-align: center;
-    border-radius: 6px;
-    cursor: pointer;
-    font-family: arial;
-    font-size: 14px;
-    font-weight: bold
-}
-
-.softnum {
-    position: absolute;
-    left: 154px;
-    top: 12px;
-    height: 20px;
-    width: 20px;
-    line-height: 20px;
-    background-color: #fc6d26;
-    z-index: 99;
-    text-align: center;
-    border-radius: 6px;
-    cursor: pointer;
-    font-family: arial;
-    font-size: 14px;
-    font-weight: bold;
-    display: none;
-    color: #fff
-}
-
-.cmdlist li {
-    border-bottom: 1px solid #dbdbea;
-    line-height: 48px
-}
-
-.cmdlist li .titlename {
-    padding-left: 12px;
-    position: relative
-}
-
-.cmdlist li .titlename:before {
-    background-color: #20a53a;
-    border-radius: 3px;
-    content: "";
-    height: 5px;
-    left: 0;
-    position: absolute;
-    top: 6px;
-    width: 5px
-}
-
-.cmdlist li .cmd {
-    height: 200px;
-    background-color: #424251;
-    overflow: auto;
-    line-height: 22px;
-    color: #fff;
-    padding-left: 10px;
-    font-family: arial
-}
-
-#remind td {
-    vertical-align: middle
-}
-
-#remind .titlename {
-    position: relative
-}
-
-#remind .titlename:before {
-    background-color: #20a53a;
-    border-radius: 3px;
-    content: "";
-    height: 5px;
-    left: -10px;
-    position: absolute;
-    top: 6px;
-    width: 5px
-}
-
-.btn-default[disabled],
-.btn-default:active[disabled] {
-    background-color: #f7f7f7;
-    color: #bbb;
-    opacity: 1
-}
-
-.table-page {
-    height: 32px
-}
-
-.table-page a {
-    border: 1px solid #ccc;
-    float: left;
-    height: 30px;
-    margin-left: -1px;
-    outline: 0 none;
-    position: relative;
-    width: 34px;
-    z-index: 1;
-    color: #666;
-    vertical-align: middle;
-    text-align: center;
-    line-height: 30px
-}
-
-.table-page a:hover {
-    border: 1px solid #20a53a;
-    color: #20a53a;
-    z-index: 3
-}
-
-.table-page a.disable {
-    background-color: #f3f3f3;
-    cursor: not-allowed;
-    color: #bbb
-}
-
-.table-page a.disable:hover {
-    border: 1px solid #ccc
-}
-
-.table-page-select {
-    float: left;
-    position: relative
-}
-
-.table-page .table-page-num {
-    width: 60px
-}
-
-.page-select-ul {
-    background-color: #fff;
-    border: 1px solid #ccc;
-    bottom: 29px;
-    left: -1px;
-    line-height: 22px;
-    max-height: 150px;
-    min-width: 100%;
-    overflow: auto;
-    position: absolute;
-    top: auto;
-    width: 60px;
-    display: none
-}
-
-.page-selected .page-select-ul {
-    display: block
-}
-
-.page-select-ul li {
-    padding: 0 12px
-}
-
-.page-select-ul li:hover {
-    background-color: #f0f0f0
-}
-
-.sidebar-auto .menu {
-    background-color: #353d44
-}
-
-.menu li {
-    margin-bottom: 1px;
-    position: relative
-}
-
-.menu li a {
-    font-size: 15px;
-    color: #d6d7d9;
-    display: block;
-    line-height: 44px;
-    padding-left: 52px;
-    background-repeat: no-repeat;
-    background-size: 16px auto;
-    background-position: 25px 14px;
-    border-left: #404040 2px solid
-}
-
-.menu li.current a,
-.menu li a:hover {
-    background-color: #2c3138;
-    color: #fff;
-    border-left: #20a53a 2px solid
-}
-
-.menu .menu_home {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKwwAACsMBNCkkqwAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAFZSURBVDiNpdO9a1VBEAXw3zOioIUQEdFGkQdWVtr6D1ikERtRppLU6awUsUkh2CgoBNwhoPhsLESxERR7wcI2XSBNMAHRNFmLbB6Xa64RXFjYOXvmzMfOjmqt/mcd2I+QmUuZOcgbDWWQmTN4iFms4wGu4jC+RMT7wQwy8xBe4FtE3MBXPMdqE5sfLCEzj+Il3kXEE4iIJTzFFbzB9z0FMvMYJphExLPuXUQs4y1eYfmPHmTmbHN+FBGv92zMDm+ulXAzItZHtVaZeRH3sBgRn4ecOyKXcRt3dkuYwyJOZeaJfZyP42TjX1Nrne5SyqSUMu5ho559tpQy2bUP9gL8wHYnzbtYzczTuB8RHzs8/H0Sz+ETbuEDxg3f7pL6AhW/2vknNiNiCxvY6uDT8e2XMINLmbmC89js3I0z8wLOdP36Aht43KIcwULD1+w82/WGT+dk8DP96/oNlqecb6uu8YEAAAAASUVORK5CYII=")
-}
-
-.menu .current .menu_home,
-.menu .menu_home:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKTQAACk0BtZPkxgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAFVSURBVDiNpdO9atVBFATw3/UjBEGidkJSRFFIiKJBsAmaBxDFQptUIoJPYCc2Wmpjo4haRUFMnsEmnXUIKQXFRlEvaiIxY/HfheXCNUUWht2dM+fsYXe2l8Ruxp4d4jN4gDNlvw/70dMQw8ZRXMdFbOAvpjGJ93iHrWEdHMdDfMMcPuMpjiC4hYPDOpjCPazgceGeYS8m8BYj2AZJWpxOspTk9gBfcTPJSpJrlRtMXk5yY0hyxUKSF0lOtQWuJHmV5NIOyRWXk7xOcrVe4iSW8BXj/3mZ+jpfiv5ErThS5udJzjcnHUgyXubKnU3yUrcerR38wSH0sVm4C3iDO+Xm5wu/hX44jI3WB4OePoaPeIIPOm9U3XYVtQV6JfC77PtYxyrW8KPwP9vDWiNFZ5BzOtvO4Fejm8ZJzGqM1BbYLHiE77pPc7fEPuE+FjCGxaLV2+13/gdXJgTGYi2BZQAAAABJRU5ErkJggg==")
-}
-
-.menu .menu_web {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAHuSURBVDiNpZO/S9ZRGMU/5xZl0NJQDf2ybAgrGgylGloiCR0jDAO3+4WQlqA/oiHkpUGvgYtFRENL5g+CCEIiqSjMoFKsaJFqScMXfU9DV3vVluiZDs997odzuM+Vbf6n1v+tmVJqA9okHba9CXgF9McY+1fPqtpBSmkH0Al8B45Iema7DDRlyHagK8b4ZQ2gp6dnn6QB2+2SdgFvJW2xPQeUbdcCM5L6gNYY4/QyIKW0AbgGPAb2AueALuAQMA9MApeAu7YnJZ0ALscYyyE7aZf0JsZ4R1I/MAKMAwFYl+0/AW4URXFb0gTQTh4AOGP7Xta7gbEY43NJw8BA1hPAHoA821wdYUxSCZi13QhslPTI9kmgLGkUOG37m6QXwGbbF2OMTUvPuGD7JzCbM2N7FigD87bnJC3r7HyhOsK0pNEY46CkoRxhRNJDYDjGOGz7fdYPsqNP1YBB2y0Ai4uLH4GjKaUG281AS0qpAThQqVSmsrsWYAj+bOIt4Gpvb+/ZEMJ+4BTwLp8ZaASOhRA6UkofgHrgyupFqpN0H7gA7ATGJW21/SNvY10IYcZ2n+3WoiimVgAAuru7a0MIncBXoF7SU9sLwHHgJbDN9vWiKD4v3VkBACiVSqqpqekAzgMHc/s1vz/TTVbVGsC/1i9dw/hm1FHr2QAAAABJRU5ErkJggg==")
-}
-
-.menu .current .menu_web,
-.menu .menu_web:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKnAAACpwB9NLfEgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAGCSURBVDiNpdLPaw9wGAfw13fExWVq1IzYJEkc5kezgws5zM2S+irOWi7KH+EgB0e1m9ZycMGWm0jLRYqUWNNyIDkw2lq9Hb7P5rsfDvKpT717Pp/n/byf53k3kvif0/GX+AXcx3t8wgQurvexsUrBDozgGw7jBRZwHK+wHbeKdA1BLx6iiZ14i078LJLd+IJRnMVMO8Em3MQT7MH5qnQQ8/iAq7hXeBDXsLCxqjfxBuPVRide4xA2lPxnuIPP2Fo5o5JIMp6ku/BAkuHCp5MMFr6S5Gjh7iRjSSwp6MUpzOEYNmMRJ6v/rmqnG7uwpVpdJljEryKYr9hcJc+3DXIJd1TOMsEMnmMW36vSYzQq4Sn21Vqn0INz/DHSBIYKf8QR9ONMxfuxH9P1ZwiT7Qru4gaGsbfm8a7eUnMZwCUtdx7AdVYaqQ8PtCzbo7XGLvyo/vusNNL0agJabhvB16oyVcM6gZfYhts1q9LX2mv7bSS5nGQyyWzdR0ma6/xdo+Cfz28JnsxkWP6vVAAAAABJRU5ErkJggg==")
-}
-
-.menu .menu_ftp {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAH6SURBVDiNpdM/qJZlGAbw3/1+n31o/0BJrMFaGmoRRBsM14M4iINLixBxHs6pxSxBmhpCqEk5CL2Pp5ZAdBD/UIJNhdBQzTqJYKkoB8HEY+r53rvB99hnuXlNNzfXfT3X9dzPE5npWTB8WrPWuhvvYwvGOI+vSykn/8uNSQfz8/MvdV33DRaxBlMInMZ9LI7H449mZ2cfLM80y0Xbtiu7rjsZEecz8ws8xBEc7l3swfXBYHB8bm6u+Z9A0zSfYmtmXoyIg/gKV3AJLQ7hV+wcjUYzT0Sota7C2Yg4kJm7sQM/YQOWcAFb+ygn8HHXdVMzMzMPlx1swML09PSPEXEIpzCNc/gBH+D7zPyylHIGt5umeWsywou4B5n5BhZKKTdwFddKKTdxJyLe7PmLWD0pcB2v9PVlvN627WZsxKZa6ya8hj96zsuZuUD/DobD4YWlpaUVtdbP8A62RcRNrO+38SG2I2qtv2AUERcfXyLUWnfhu8zcGBEFv+PVPtp9vI2j+A3vlVKOPSHQi+zHrcz8NiLebZrmr3yE1ePx+OfBYLAfK0opnz9eY9u2WzJzHRJ/Yy3uRsTePnfgSmYexAu4gZX9/NUh9kXElH8xxgjPTfTWR8RmPMBg+XCcGOKTiHh+gtxFxKqu685gXd/7MyJ29g6bCe7teNbv/A8ZE8Q3GMBOFwAAAABJRU5ErkJggg==")
-}
-
-.menu .current .menu_ftp,
-.menu .menu_ftp:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKnAAACpwB9NLfEgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAGVSURBVDiNpdLdaw9wFAbwzw+jzVspIxdIuXHhQqbGHVmSRLlx4w9YKbkhpVz4A6SkKOWlldA0uXA1Um645motL7NImsnYNI+LnZ9+W63IqW+dzvc8zznPOaeRxP/YgnnixzCISUzgEQ7/DcEK3MEefEMDbfiKI7iKxfMRtKMfT3EePwtwCdM4gVHcnoVL0nxnk0wl2ZvkYZLuJKeSHE+yO0lfkgOZsd4mrgnuSPI4SU+SW0nGkwwkeZ1kKMmDJGNJric5mGQwSVsrQXeSu+V3JbmRZE2SK0kuJuks4i2Vcz/J1iR/tCzH9/I34hM+YATv8bEGublyJrCqdYijWF3+MDagC9uwvd46vK2clVXEogq8rHWdwQ7sq6rraxu92F9rfYYleNVKMI3LuFlVh/ECQyVtEmPow3McLYzGnFM+jc+4hl0YR0rvk/pvw7kmoJFkJ9ZW4g90mrnCk6W7gTe4gGU13PbCjzSS9KOnpYvp0jjrZEvGFBY2i+NeI8kmLG1J/IUODFRn8A6HqsPW8/8ydwb/bL8B1eb4OuOuSusAAAAASUVORK5CYII=")
-}
-
-.menu .menu_data {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAK6wAACusBgosNWgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAHISURBVDiNpZPPi81RGMY/z+3mpmasGBOZEgthQ5SFTDM2svMjOyt9X1eUEhshRbGx1e1cO5M/YVIzSWbjx4RidTeKbl3XgoyYW5rHwvlO35TZzFtn8fac5znPc855ZZvVVL3apJR2AGeAw5JGbI9m6Iukvu0ZIEVEp+TINimlOnANGAc6wCvbHUm/AAHrgZ3AHmA7MC3pVlEUS6WDWaALHIuIb/9xOw3QarVGa7XafduzwGQtg+PA+xXIy9VsNnvAHDBRvYMBcDyldEDSvO1nkj7lCNhea3uLpEO29wOjmbMsUAfOAYu2C+CC7XW2hzL+A1iw3QWu5/0vqgIAD4A7EXFxpQgppRPA1bIvBX4Dt4GJlNIV4DPQlTTIERrApryeA3eBh1WBBkBEnM+n7AO22R7O+ALwISJeZvxkySn/wQD4CDyV9Nj2XET0/7G+ATgIHAEmgbGIaJQO1gCngF22A7iRUloCfgLOpwnoA4+AFvC6GmEGOA1ciogpgHa7vRkYygLfi6LoVdzcI79CGUHAZf5+jh4wb/udpK/5EoclbQX2AruBt8DNiFhUdRpTSmPAWeCopI22R7KDfh6mJ8BURLwpOVrtOP8BlJPKP95zNKgAAAAASUVORK5CYII=")
-}
-
-.menu .current .menu_data,
-.menu .menu_data:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKdQAACnUBSiXd/QAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAF3SURBVDiNpdI5a5VhEAXg58qFRDBi4RIiBkSJoiIoihZi0EpsFWy0FAtbSwvB0uUn2LiUliIWMWgT90i0sRFcYxqFiCYQcizufHK9hUQcGIZh3jnvOYdpJfE/sayn34pLeI4PWKj8jJe4jJHuhVYxaOM8RvEGT6r+RAursQ27sBl3cBGLkkgynuRmklXV/y0Hk9xOMpbkt4RRvMK3JciexkMc6pYwhyl8wlM8wPuSAMuxAQexF4PYif4GYAH7C+g0hrASKwrgO2bxEdfKs0doN7oWkkwmObEED44leVY7f0g4Wbr24Uv9Nl8M+orVECZwH9fR3+56AGer7sEmDFQ/i7d4XP3xZqdhMI93GMfdcnmmx/01OIAjOIxh9DUAwW5sx6lyeRE/atanc1AzuIXXOtfaaoy5l+Rqj1nrk2xJMlLH0z27kmSi28QWzpWJ0zq3MIWvRX8AG4vlDkziAuYagCaGcQZHsQ5rS8JM5Rhu4EWz0Avwz/ELJiL9PSckq44AAAAASUVORK5CYII=")
-}
-
-.menu .menu_set {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAH3SURBVDiNpZI/SJZhFMV/90kicsv+EdEQRUNQYC1S0R+ag2hxMKPgvc/r0Ba2FFEpJARhiF/P9QsaGippimgoG4QgI6egICcJEkoIEyI/9L0NvV98llLQmS6c5x7OPc8Rd+d/0LQcUa1W1xZFcR9ocvfOGOPkXwXMbDvQoqov3b0NuA00i8gBYNLM9gBfVXWiviP1E8xsB3AZmANmgHVAt4jMu/sl4DuwFfgI9KvqO4DQYKAFmFXVU8Bj4JqqfsiybAroBZ6r6jFglbtv+MNB6aIHeKKqL4aGhra4eycQRORelmXvU0pHgPYYoy4SSCltFJGDwEngCjANXHT3WyGEeXfvAq4Dze7eKyJ3i6IYyfN8KgCIyAjQDFxQ1VfAaaA/xjiWZdm4iPQBHao6LiLdwJoQwsiiX3D3z0VR1NNd4e5zDfnUACnnWeATsNB4wjYR2Q8cdfcbIYSau58D+kRkwd273X1QRGaAAWC4KIrRPM8nfg/xqrs/jTGOmtlOoKN08zDGOGZm+0SkPcuys7+W3J3Sxd6U0s1ybk0ptda5SqWyOqW0u+QepJTa6lxjD2rASjO7A5wBBszsEEAI4TzQZWaDwBfg23I92AWsV9VnZnYC2OTur0Vks6oOm9lhYFpV3ywp0IiySI/42bzjMca3S71bVuBf8QODpRL9eTmkdgAAAABJRU5ErkJggg==")
-}
-
-.menu .current .menu_set,
-.menu .menu_set:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKnAAACpwB9NLfEgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAF0SURBVDiNpdJNiM5RGAXw38ukkJVvMYqZRsqYZmyYDTZWbCxsKLG3pCSaWNmNJU2NmhU7pQjFRhYsJCTWykfJRz5eH8fmefn39lLy1FPn3nPv7Zzz3FYS/1Oz/sItwg3cwuo/HWp1KRjEQtzBTizAfHzCDMbwDk97PTCECXzBWyzGYXzDCXzGGjzHJB6DJJ3ekuRc4R1JNja4VUl2FZ5OsrXDNTO4jRcYx1W8wTEcx1xcwna0cbM7xGXYgxF8LakTuIbLZWVdWevHXixvWniY5ECSkVqfbGBJBpOcKjyc5FCSR90WXjXSnV1hdqqNVuH3eInvTQUDSfYnmUkylmRDkvNJ1icZSjJV+wNJriQ5WKr01avPqtfW3O/hNPaVmrO1N14qp35pa/jclORM4dHqDjevMdYLSTZ3uD6/q405mMYHjOJojewIluJHjfdj51L3Vx7GElzHbqzAXazERWzDazzoZaG7+5PcT/Kkwux5rlvBP9dPgIpDWf6ENxgAAAAASUVORK5CYII=")
-}
-
-.menu .menu_folder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAE3SURBVDiNpZO9SgNBFIW/OySiaBCtbCwE8ReUgGDpE9gExNJmd6O+hM8gmGJn3yKxt7WyEARBUUSbIPhTGFAwxyarSwoZ2AO3mjkf98y9Y5IoI1fKDVQA0jRtOOd2B8BRST5Jkk4IwCSRZVkbOAYeACdpD3iX9DrUpQO+gHaz2XwuRnCSLuM4vpU0AnSAvplNmdlkocbNbN3MTrz3de/9WKVA/07TdN85twbcA5/A8AsLuAO6wI6k2UrhoGZmy3EcH4Zk995vAAd5hA9gBXgJMQ+0ZWanOaAH1IGrEGer1TJgxszOckAFWATOQwDVanUO6EVR9JYD5oGJJEmeAtvfBG7gb4xLwEWgGWA1v59PoQs8Zlm2ANg/RgETwLRz7voXIOnIzBrAdgCgBvgoivowWOUyKv0bfwCvBmEVd9ynHgAAAABJRU5ErkJggg==")
-}
-
-.menu .current .menu_folder,
-.menu .menu_folder:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKnAAACpwB9NLfEgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAADuSURBVDiNpdO9SkQxEIbh56ynUHQbQbCxEMR/BEGw9B4s1m6t9W5svQgL3d7Wyk4QLES0EcGfQkGbsTgJuywIwTMQEsh8b+ZLJlVEaBOdVmrUad7HQQJO4hQXJYAqWTjHCR4S5BAfeBursoOflP8CIkJEDCJiLq03ozymcgUD9NHDFu7xjfEbjmR7Oo2FemSjizUcl3jHDo6yv0+s47VQDHsYZMAXtnFTKK4wj8sMqLGCq0LAYjr0PQOWMIOnQsAu7hi+8SquC8WwkfPzKzzjEcsaf39FpEpnccuwE3uadp4oAHQ1rX42Cvh3tP6Nv5Cebn/RRiyLAAAAAElFTkSuQmCC")
-}
-
-.menu .menu_day {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKwwAACsMBNCkkqwAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAFrSURBVDiNpZMxSFxBEIa/ed49tQsBQdEqgrVgithFW1sr62PhKttXpjy0vWb2WjkQrk6rjWUgjY3ICorYGCFV9C7vxuJ24fE4Y8SBZf/9d3b2n/1ZMTPeE1l10ev1Frz3Wy8lq+pXVf1Y5cTM6Ha7jTzPd4BtYBUYAHO184/ALnAJnJRl+b3dbo8aAM1m8xB4AO6BT2b2C5ivFxCRv8AtsJ5l2SZQYGao6kBVFyNeNjOmDVVdifOSqh6Z2aQF7/0xcGNmF4BMkV9tw0RkDfjgnGs14kYJXInIOTALjGOhukUZ8AQ0gc+JIJI/nHNnIYRWCME5505CCC7i04hbzrkz4Gc8Q1IwEwedTmcvXfcSruZnNZKiKPpFUfT/hZnYX1YVyGu31hRk6X2SgnEi/lPBb6JTSUFuZsM3KPiTWk4FbkXki/d+CORMbK3aKEzsTXhDRK6rBb4B+2bWAkbVN5kSDRG5E5EDiJ/pPfEM08DH4VH64rEAAAAASUVORK5CYII=")
-}
-
-.menu .current .menu_day,
-.menu .menu_day:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKnAAACpwB9NLfEgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAEPSURBVDiNpdO9SkNBEIbh58RoFKwEwT8QFOwEQQvt1NbW+7Cx8B7svAZLa1tbG0sbEQQh2KigjcZoxsI9YT2EGMnCMt8us+98s8sWEWGYUausp7HTJ38bU/lGPYt72MUyFjFeOfyOfdziAudol4BjPOMRS3jCRA/AJ5pYwxaORISIOIuImaTnU+w1F1KcjYjTiOi28IVD3KDoYT93EVhJ+hfgDtdooJNA1SeqoYVRbOSAFq5wmR0q+mhYzQEjaeYJ/XQ3v1bZlCrFH7rw03bXwSBVc10rYaWDzgBVc/0ivVTpYAwf/3DwJrVcAprYTJCx1F/15huZXsc9FOk3TuIAc2hXqlVHHQ84wWsx7Hf+BgvadUGnT3fcAAAAAElFTkSuQmCC")
-}
-
-.menu .menu_control {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAK6wAACusBgosNWgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAF5SURBVDiNpdM9ixNRFMbx3yRZ3/ANbCxEcBubpNJSLIQFaxs7D4JfQSz9CpYWItyPYCOIFtqvhQxopSyCb1gpEuNukrHImewQY7UHLsOce85z/vPMvVXTNA4SAyilfMI2Zpn/n2rV6RtGxOYgE9sITLK5Qa8jVGGezwpH8VgWwRTjiJigj6vYwrVcW5nrZ824pW0Jeh0xSVJhr4M86ez32/qBf6OH04nZCmzk1HbI0qN1AhO8zuYfOJ5i8xWKZq1AREzxpZRyAlfwJiI+r5RVrUCLNOvgtnER93FpDeV0laBnYcwMSimHcQpP7Z+V2xZelA7FkuA8opRyK9/P4gIeYq+Ucj2/fwM3Lc7Mua7AVzzH91LKHZxBExE/s/EudiwOz0u8wLeuwDgidvAMf3APr3LvHR7gfUT8joiPw+HwQwqrmqZRSnmSWL9wEpt4a/Hr5qPRaLeu60OdgcfwKCJutCZeTnNmuXZxpDWqruvG/j1o0vDhkuAg8RdE7nuSY6nc+gAAAABJRU5ErkJggg==")
-}
-
-.menu .current .menu_control,
-.menu .menu_control:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKwwAACsMBNCkkqwAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAFaSURBVDiNpdM7a5RREAbg59uLJOgSkRQhfYSIhWWsQgj+gfgLTJEmBJLa0tZW0MbawtbaUkQEQ8Q/YCWIIAqb7G1S7JzNYdlUOfAxlzPznndevmkiwk1OJ+03nGKMBpNr6lsIdLGBrQJwimP05wCatFEBTHAHL2sGY/zHEMt4jBWMKqZ/8RkXVc8MoJX+MF8bJJth3nczV5i0s2cGUJ82eslgkLlbOU57vngRwAA/sqmftp35AhiFzSKAIX6mv4+3C2pa887YlTjlPMAJtjNeMtVC1k5qgA5Wa2Q8xQvsZnyI51jD3cK+jLCOA/xLyn1TET/m3U4+0M+xRpmfAfzGBzzBM/zB17Rf8B57+ISHpsI+AhEhIt6kbSLiKCLOImIzc72IOIyIbsblex0RMwZLuGf6t73Dd/zK/AVepYDLKV4v7zS5jfUyjXCO25Wok/TLnnRwH1vNTdf5EpkVg1v2kuagAAAAAElFTkSuQmCC")
-}
-
-.menu .menu_soft {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAF7SURBVDiNrdPPi41hFAfwz72uoVsUWZOFJbKThYkVe1mpx13YjcmU/NwrZCKRLNRZsrSZErvJ1h+glFgiYxC6Pyze8zSvOwsLzuZ5T9/n/T7n+z3ndCaTiX+JHkTELlzHHozQxQrOl1JeRcReLGIbxtiAN7jcS6JrCT5OcIx9mMcAZ/EBz5N8hCO4UQl240kp5XYtLSJmsZDpdjwspTxr4V9xppv5EP0peVuzEnlumcL7GFaCDn5OXfj+l/wHulXCBIci4rXG2BFmMZP4RhyLiBmNR0McxqgSLGBOY1iNIW7l96LGyNMtfBXznf81B/vzhR0pB37hbillOSIO4hw2JdbBJ9yrEu7gIx7504OLWMYFvMcLax6cwv1K0MPLUsrTWlr2eS7TEZZKKUstfCcGtY3jVnk1+i05E+vnZDPGlaBnfZ+/aMZWnqtT+Df0qoR3ON7qc92FlcQ/YxARB6ztwlG8rQRXNdt4Mn/u5AuXEn+AmziRcroaU6/8BgTXdRpxDzi5AAAAAElFTkSuQmCC")
-}
-
-.menu .current .menu_soft,
-.menu .menu_soft:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKnAAACpwB9NLfEgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAFsSURBVDiNrdO/jw1RFAfwz4xnVzYIydZeY0tEKETChkIoNGrNtkKyhQL/gUg0YgudQiciGpVEIRsdPdlkQ0usH4vNvHcUc27e9bbkm9zMmfnOPfP9nvneJiL8CwZ5PYS72I8xdmANN/EeQ9zGAkZosYHrTSp4gD14m+QIZ/ATl/AI83iRzcc4jC0RISIeR8S5rMu6EhFvsl6NiOUpfjEinrZpYZwKasyhy7rL+xp7MW6rB5tTL/xKO9Dg9xS/WQ9xJ85jJj12OJ2zgMBJvMs9IyxipgzxFK5lo4JvWMFrHMNV7Kv4DivN/8rBkVQwn3JhC/fwCiewjNnkGnzG/aLgJT7h4ZTHBVzEE3w0yUGHyxgWBQOs4lml7rvet2z4PFfBASzVOZj1N+YqO2F7DnapcjCwPQdfTXLQ6v9KjR8YFAsfcMEkByXrG8l/wRKOmpyVs1gvQzyoP23D3NzkF27oc3Acd7A77bT6od76A2AskgeNVoIQAAAAAElFTkSuQmCC")
-}
-
-.menu .menu_firewall {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAK6wAACusBgosNWgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAG0SURBVDiNhdNPiI5RFAbw352ZsGBDMhkpYyE12cxOyYIFayW7SY2zkCxIlkrZKIrJjPe+X1FksrQQo/xp2IhZiPXUxIoaGxa+mGsx78dn+vDUvXVu53l6znO6qZSig6mpqbX9/f37cRB7sDOl1C6lzOIZHkXEK11IpRR1Xe8upRzFKNqYxzt8xGpsxy6swwCeYjIi5gcaoTt4i8BcRBQ90Gq11i8tLY3gCjZibABKKUu4FxGvexE7GB8fX8RsVVVPUkqDGjtQGqv/RM75CJ6nlH6gT+dCwvf/kE9hGlvwrZfAqrqu+3LOQz3Ix3EJpyPipeUwdQt8RbuUshkLjdUOeQzXcD4iLnfptvmdwXtsjYgPOefrmM45f0Y/buJiRJzrIm+wvOJfDl5gBCLiBFp4iPuYiIizK6YaSim96Ra4jeGc86ZG5BhyQz65Io9hDJZSZkApRSlFVVUTVVXd7dR/O1VVPaiq6mqn7jiQUjqD0Zxzd1B/IOc8iW1N7zKv+zM1I8zgE8YjYqF534EbTegHImKxp0DTnHABh3ALa3AY0ys20Vugg7qu95ZSHuML9kXEXK++ny1tzgEddf2OAAAAAElFTkSuQmCC")
-}
-
-.menu .current .menu_firewall,
-.menu .menu_firewall:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKdQAACnUBSiXd/QAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAFrSURBVDiNhdMvaJZRGAXw36viFrRoENxw4IJYLDMJalkxC8OkrC5qNAwEi+CC4lAsikGMY0FQmGIQ/AMKyjDIUGYyqMXgmB7Dd9/P63j37cAN73OfczjPc+7bJFFhFyZxCsdxGGt4hqd4hFc1oSkCxzCNiUJYwXt8xRDGcQS7sQNPMI8VSST5lGQxydEkTal1nT1JTiR5k+RuEtuKkz9YwGv8N9MGfCvjLBUnfYEUq1vhDEbwu+W2Ag3WtyCfx32M4leXwM7yPdJBnsFVXMALvWWqBX7qbX8/PherLc7hBi5hrqqvURaBVRzAF9wsVr9jO+7gCmYr8l69iLXxXEyyUMV1O/9wrSPOpSRnk/QFxpK8S7Kvarq1CflgkuW2t764nuTBgEfUnoe1cH0xnORjkrkB5PkkH5IMdQkott4meVzGauuHkjxP8rI85z6n/ZlqNLiM07iHYUyVZGY3Ng+a9WSS9SQ/kkxs1vcXeVqZSyUF+yoAAAAASUVORK5CYII=")
-}
-
-.menu .menu_exit {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAK6wAACusBgosNWgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAEYSURBVDiNpZOtTkNBEEbPFCQIUHgEBoJAYFDgERgSCBjSvU9Q0/AkX5+ApB6PI6lAYPhJUCgEgkApkHyI/nBpb28DPWozu3MyuzsTtpmG2f5CUs32BlABouBsAK8RUU8pPY4IImIfOLd9k4/n+IyII2AZGBUAM8BZlmXX48qVtAksFl6hx/y45B5N4C4fqExI+EVK6QJYkLT9L0GPJ+BU0hYUP9YAScfACtDh52c6wAPQlHRQKoiIN+B5WGC7DXzYfi8VVKvV5nCs0WgsRcSh7b0sy1qlgiJszwG1lFIL/viIknaAdkrpsh8bruBlgmOXbq8UduIXcCLpvkDc31+j20wDBgdty/Y6sMroMJnuda+A2/xGTDvO32OQXrvPg7l3AAAAAElFTkSuQmCC")
-}
-
-.menu .current .menu_exit,
-.menu .menu_exit:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKdQAACnUBSiXd/QAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAADvSURBVDiNpdO7LkRRFAbg7wwlBZVeoSEKEtHSayUSGs+g8RwqbyDR6ycaiYRC45KoVAqFuAySpdhzODn2mWMyf7KSvdflz7oWEWEUjFfee1hCB0XGt8AL9vGQI9jECa5r+hKf2MZsE8EYjnA1IOMVTDeVAJMDguEYt1VFpyWgji6msNaUwX/wiAN84LSNYAdz6PmdTA/3UjlbbQSveMoQvPUzeBcRpVxExGrl3yQzEdGNiOWIGLqJMCEt3TnDT2G9n/5Zqaj34LmFYEPalewmfmEXdxni0r4gdf8HVcdDLGLe32MKqdxL3FQNxajn/A0ZS19hUhhlTwAAAABJRU5ErkJggg==")
-}
-
-html .menu .menu_home:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQANUAAPPz8+np6d3d3c/Pz8vLy8XFxb+/v729vbu7u7e3t7W1tbGxsa+vr62traurq6mpqaenp6WlpaOjo6GhoZ2dnZubmwrPOpmZmQzLPJeXl5WVlRLFPhLDPhy5RI+Pjx63RImJiYeHhyypSiirSIODgzKfToGBgTabUDibUDiZUH5+fj6TUnx8fECRVEKPVHp6ekSNVkCPVESLVnZ2dnR0dEyDWnBwcFR4XlZ2Xlh2XlpyYGZmZgAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJHgA7ACwAAAEAEAAOAAAGhsCdcLgzJUjE5HCmECxMFYZHuWMRHDuJINIg2JIqAmQYOS6SpEEkORFciOkJlVIwCTUEDfVOyOweFyAzVDMgFw1DBSFDOkMkBUQ2B0g1HyIdNUUGX0OTOy0jNyMrRQecOzYIKjsyKDspMDsvpkQGFDklJzsoJTgVBkkIAAEYLjsuGAEACEJBACH5BAkeADsALAAAAQAQAA4AAAZxwJ1wuDMlSMTkcKYQLEwVhke5YxEcO4kg0iDYkioCZBg5LpKkQSQ5EVyI6QmVUjAJNQQN9U7I7B4XIDNUMyAXDUMFIVQkBUQ2B0hKJgZfQ5FUJgeWOzYIKlQvm0QGFEM6QxUGSQgAARYcIhsWAQAIQkEAIfkECR4AOwAsAAABABAADgAABnfAnXC4MyVIxORwphAsTBWGR7ljERw7iSDSINiSKgJkGDkukqRBJDkRXIjpCZVSMAk1BA31TsjsHhcgM1QzIBcNQwUhVCQFRDYHSEomBl9DkVQmB5Y7NggqQzpDL5tEBhQ5NR8iHTU4FQZJCAABGC47LhgBAAhCQQAh+QQJHgA7ACwAAAEAEAAOAAAGfcCdcLgzJUjE5HCmECxMFYZHuWMRHDuJINIg2JIqAmQYOS6SpEEkORFciOkJlVIwCTUEDfVOyOweFyAzVDMgFw1DBSFUJAVENgdISiYGX0ORQzpDJgeWOzYIKjs1HyIdNTsvnUQGFDklJzsoJTgVBkkIAAEYLjsuGAEACEJBACH5BAUeADsALAAAAQAQAA4AAAaCwJ1wuDMlSMTkcKYQLEwVhke5YxEcO4kg0iDYkioCZBg5LpKkQSQ5EVyI6QmVUjAJNQQN9U7I7B4XIDNUMyAXDUMFIVQkBUQ2B0hCOkMmBl9DkTs1HyIdNUUHmDs2CCo7Mig7KTA7L6JEBhQ5JSc7KCU4FQZJCAABGC47LhgBAAhCQQAh+QQFHgA7ACwGAAkABQADAAAGDsDdTiesfUSdWmt0G62CACH5BAkyADsALAAAAQAQAA4AAAYVwJ1wSCwaj8ikcslsOp/QqHRKdQYBADs=")
-}
-
-html .menu .menu_web:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQAOYAAPHx8e/v7+vr6+np6efn5+Xl5eHh4d/f393d3dXV1dHR0c3NzcvLy8nJycfHx7+/v729vbu7u7m5ube3t6+vr62traurq6mpqaenp6WlpaGhoZ+fn52dnZubm5mZmZeXlxTDPpOTkyqrSiqpSoeHhy6nSiynSoWFhS6lTDCjTDKhTjSfTjadTjadUDSdTjabUDyXUjqXUjyVUj6TUkCRVHp6ekSNVkaLVkSLVnh4eEqHWHZ2dkiHWEqFWE6BWlB+XFJ8XFJ6XFR6XFZ4XlZ2XlpyYFxwYmZmZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFDgBHACwAAAEADwAOAAAHbYBHgoIdCgIACRyDizsTFQ0XGA4WEjuLNQMnH4shJwU1gw8di4sdD4IaGKSkGBpHC5argzsMRwYbsoMbB0cHHrmCHghHDDnARzm1GhnHGa5HEL+yHxCDmJqcJASg1hEUDRgZkxLGqxoJAQGJi4EAIfkEBQ4ARwAsBAADAAgAAgAABxGAR0dDPkBDgi0gNCgqNCAsgQAh+QQFDgBHACwEAAUACAACAAAHEYBFKUAogyNGPjZHPT5HMD+BACH5BAUOAEcALAMABwAKAAIAAAcWgDcoJjclKDciKTc6Kig9KCo6Jis6gQAh+QQFDgBHACwEAAkACAABAAAHCoA+Nkc6PkcwP4EAIfkEBQ4ARwAsBAAKAAgAAQAABwqARShAJSlAI0aBACH5BAUOAEcALAQACwAIAAIAAAcRgCwgMyUpMiAvR0dDPkJDioEAIfkECTIARwAsAAABAA8ADgAABxaAR4KDhIWGh4iJiouMjY6PkJGSk5SBADs=")
-}
-
-html .menu .menu_ftp:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQAOYAAP////39/fv7+/f39+3t7evr6+Pj49/f39nZ2dfX19XV1dPT09HR0c/Pz83NzcvLy8nJycfHx8XFxcPDw8HBwb+/v729vbu7u7W1tbOzs7Gxsa+vr62trampqaenp6OjowDZNp+fnwLXNp2dnQTVOATTOJubmwrPOpmZmQrNOgzLPJeXl5WVlRi/QBa/QJGRkY+PjyC1RI2NjSSxRomJiYeHh4WFhYODg4GBgX5+fnx8fECRVESNVkSLVkaLVkiHWHR0dE6BWnJyclB+XFJ8XFR6XlR4Xlp0YFh0YGZmZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJMgBJACwAAAEAEAAOAAAHvYBJgoIhCAICCiuDi4IOEQsBAQ4QE4yCCR06DRUWD0AYDYwaATALNBweMA8sAB6LCC8QAwwEBQwDESwIgzQOSTURQBMVQBA5SQw3grFJKBdJGRtJFCxJDzKCOApJNg01DA42DDZJCziDCRsMAhQGBxIBDBsJiygCORYjqB8XNgAmjDZ8SCLjxg0YSTRkGBSkh48fO3i0UKGiRY8dP3z4GBKDhMcSIkCIBCGihEcSM5AUWVlkyAmRKYiwLHIkEAAh+QQFDgBJACwAAAEADwALAAAHj4BJgoIhCAICCiuDi0kOEQsBAQ4QE4xJCR06DRUWD0AYDYsaATALNBweMA8sAB6DCC8QAwwEBQwDESwIgjQOSTURQBMVQBA5SQw3SbFJKBdJGRtJFCxJDzJJOApJNg01DA42DDZJCziCCRsMAhQGBxIBDBsJgygCORYjqB8XNgAmizZ8SCLjxg0YSTRkEBQIACH5BAUOAEkALAAADAACAAMAAAcIgEE9MSRIRYEAIfkEBQ4ASQAsAgAMAAEAAwAABwWAPiRFgQAh+QQJDgBJACwAAAEADwAOAAAHIIBJgoOEhYaHiImKi4yNjo+QkY8/OzyMJCUijEVFQ4mBACH5BAkOAEkALAAAAQAPAA4AAAepgEmCgiEIAgIKK4OLSQ4RCwEBDhATjEkJHToNFRYPQBgNixoBMAs0HB4wDywAHoMILxADDAQFDAMRLAiCNA5JNRFAExVAEDlJDDdJsUkoF0kZG0kULEkPMkk4Ckk2DTUMDjYMNkkLOIIJGwwCFAYHEgEMGwmDKAI5FiOoHxc2ACaLNnxIIuPGDRhJNGQQFKSHjx87eFgaFIOExRIiQGgEwQhJkY9FJg4KBAAh+QQFDgBJACwAAAEADwAOAAAHsYBJgoIhCAICCiuDi0kOEQsBAQ4QE4xJCR06DRUWD0AYDYsaATALNBweMA8sAB6DCC8QAwwEBQwDESwIgjQOSTURQBMVQBA5SQw3SbFJKBdJGRtJFCxJDzJJOApJNg01DA42DDZJCziCCRsMAhQGBxIBDBsJgygCORYjqB8XNgAmizZ8SCLjxg0YSTRkEBSkh48fO3gs6rHjh6AYJDKWEAGiIwgRJUgIQlKkpKUkJpMEAgAh+QQFDgBJACwNAAwAAwADAAAHC4A+PkMkJDNFRUeBACH5BAUOAEkALAQADAAGAAMAAAcOgElJLSoqLYKISUVDiYEAIfkECTIASQAsAAABABAADgAABx2ASYKDhIWGh4iJiouMjY6PkJGSk5SEJyAgKUSFgQA7")
-}
-
-html .menu .menu_data:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQAOYAAP////39/fv7+/Hx8e/v7+np6ePj4+Hh4d/f393d3dfX19XV1dPT08XFxcPDw8HBwb+/v7u7u7m5ube3t62traenp6OjowDZNgLXNp2dnZubmwrPOpmZmQrNOpeXlxLFPhTDQBTDPhbBQBTBQBa/QBq9Qhi9Qh63RBy5QiC1RCC1RiKzRiSxRouLi4mJiYeHhyirSCynSoWFhS6lTIODgzKhTjSfTjadTjKfToGBgTibUDiZUHx8fD6TUnh4eHZ2dkiHWHR0dEyDWnJyclB+XFZ4XlZ2Xlh0YFxwYGZmZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFMgBJACwAAAEADwAOAAAHr4BJgkUzIB0XFxsfM0WCgjUlMD1CRERAOiwiNoIlLEiOoElIKSVJFzehoTsXSRggJzZCR0hIR0I2JyIYSQEyOTErKCQkKCoxNDIBvAYaqYIcB8oCHBAHDA4QEA4MBg8cAkkAHIIyGhYWGi/PAEkCBQ4cQaBBHg4F4AA0GQsGBgkJB6xloMFOQQRHP3jwkCcoAgJBFBg0qNAiRw4XGSIskADKxwQDAwIEIGAgAg1BgQAAIfkECQ8ASQAsAAABAA8ADgAABxaASYKDhIWGh4iJiouMjY6PkJGSk5SBACH5BAkPAEkALAAAAAAPAA8AAAe0gEmCRTMgHRcXGx8zRYKCNSUwPUJEREA6LCI2giUsSI6gSUgpJUkXN6GhOxdJGCAnNkJHSEhHQjYnIhigMSsoJCQoKjGgATI5qYI0MgFJAQYayUkcB80CHBAHDA4QEA4MBg8cAkkAHIIyGhYWGi+CHABJAgUOHEGgQR4OBeQANBkLDBhIkOCAtgw04imI4OgHDx73BEVAIIgCgwYVWuTI4SJDhAUSQPmYYGBAgAAEDESgISgQACH5BAkPAEkALAAAAQAPAA4AAAevgEmCRTMgHRcXGx8zRYKCNSUwPUJEREA6LCI2giUsSI6gSUgpJUkXN6GhOxdJGCAnNkJHSEhHQjYnIhhJATI5MSsoJCQoKjE0MgG8BhqpghwHygIcEAcMDhAQDgwGDxwCSQAcgjIaFhYaL88ASQIFDhxBoEEeDgXgADQZCwYGCQkHrGWgwU5BBEc/ePCQJygCAkEUGDSo0CJHDhcZIiyQAMrHBAMDAgQgYCACDUGBAAAh+QQJDwBJACwAAAAADwAPAAAHtIBJgkUzIB0XFxsfM0WCgjUlMD1CRERAOiwiNoIlLEiOoElIKSVJFzehoTsXSRggJzZCR0hIR0I2JyIYoDErKCQkKCoxoAEyOamCNDIBSQEGGslJHAfNAhwQBwwOEBAODAYPHAJJAByCMhoWFhovghwASQIFDhxBoEEeDgXkADQZCwwYSJDggLYMNOIpiODoBw8e9wRFQCCIAoMGFVrkyOEiQ4QFEkD5mGBgQIAABAxEoCEoEAA7")
-}
-
-html .menu .menu_control:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQAPcAAOTk5N/f38bUxsnQycTTxMfOx8XLxcPKw8bKxsfHx8TIxMbGxsXGxcXFxcfFx8PGw8TExMXExcbCxsfCx8PDw8PEw8PCw8PBw8HBwcW/xcHAwb7AvsK/whzVHBzTHCDOICLLIjC2MDO0MzOzMzKzMjWxNTOyMzWvNTavNjirOE2hTTqpOjunOzylPEmhSUqgSjqlOoaGhj+iPz6iPoSEhD6hPj6fPj+fP4ODg0CfQDqhOoKCgkGcQUObQ4CAgEWXRUaWRkWWRUqQSkiSSEiRSEyNTFuHW3p6eluGW3l5eU6KTliFWE6JTk2JTVaFVlWFVWB/YFGGUXV1dVGEUVWAVVSAVHRzdHNzc3FxcVV9VXZvdlp4Wm9vb2hyaGF0YVt2W1x1XFx0XGFyYWNwY15yXl1zXWtra15xXmNtY2FuYWpqamBvYG1obWJtYmlpaWJsYmhpaGNqY2hoaGJrYmRqZGRpZGdnZ2VpZWVoZWRoZGZmZmVnZWdlZ2VlZWdkZ2djZ2hjaGxdbG9ab2ZmZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFCACDACwAAAEADwAOAAAIhgAHAUgAYcGCBggbGISQIMCgBlwG9dFjp6IdPX0GYaEwCMKgQWqO4NixA8cRNR89LvjoJglJkkncpBy0EqSPGDRoxPCBsiPNj3KwSLlyRQoWOTNrflzK1GeDplAHcWQQtWmFQQOqMi0wCIHWpQoGWfj6cSzEQXC63IG6UWCCBhA2KDS4sGFAACH5BAUIAIMALAIACQACAAMAAAgJAMUMcsHjSZSAACH5BAUIAIMALAMACgADAAQAAAgQAGGUGbSCxaBBJ4IM8gIlIAAh+QQFCACDACwEAAoAAwAEAAAIEAAHhTkzKAeVFiCoDDIyKCAAIfkEBQgAgwAsBQAIAAMABAAACBAABzFJM6jElj0pwAwaMiggACH5BAUIAIMALAYABwADAAUAAAgSAAfpGFSlQ5FBQEIMGpRiYZiAACH5BAUIAIMALAgACQADAAQAAAgQAAcN2jJIiIwpHogMujEoIAAh+QQFCACDACwJAAcABQAFAAAIGQAHCRw4kI2gHiK+iBlEwoQNFYOaBMqyJCAAIfkECTIAgwAsAAABAA8ADgAACBkABwkcSLCgwYMIEypcyLChw4cQI0qcSDEgADs=")
-}
-
-html .menu .menu_firewall:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQANUAAP////39/fv7+/f39+3t7evr6+np6efn5+Xl5ePj4+Hh4d/f393d3dnZ2dfX19XV1dHR0cvLy8nJycfHx8PDw8HBwb+/v729vbu7u7m5ube3t7W1tbOzs7Gxsa+vr6enp6WlpaOjo5+fnwDZNpeXl42NjYuLi4mJiSitSCqpSiypSoeHhyirSC6lTIWFhTKhTjiZUDyXUnx8fECRVEKPVHp6enh4eEqHWEiHWHR0dFB+XHBwcFpyYGZmZgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFAwA9ACwAAAAADwAQAAAGdMCesEeiHAACR2c17J0oiUXEE/pgHAsFptYjQFzN4c6UmPQKoXAYIzl/1M1M5AyCDzdzwtveu8wRdXwXbQ8afD0SGD0dEIcNIj01CDl2NQeUPRZzcA8WTQWKYRUGYTkJDlw9MgwLO3AaBh0bBhyHJQEDYE1BACH5BAUEAD0ALAMABgACAAMAAAYHwB6PN+qlggAh+QQFBAA9ACwFAAcAAQADAAAGBUDaCBUEACH5BAUIAD0ALAYACAACAAMAAAYHwBtuNGKpggAh+QQFCAA9ACwIAAcAAQADAAAGBcDZSBUEACH5BAUIAD0ALAkABgABAAMAAAYFwNioFQQAIfkEBQgAPQAsCgAFAAEAAwAABgVA2OgVBAAh+QQFBgA9ACwLAAQAAgADAAAGB0Aab6SD9YIAIfkECTIAPQAsAAAAAA8AEAAABhXAnnBILBqPyKRyyWw6n9CodEqtJoMAOw==")
-}
-
-html .menu .menu_day:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQANUAANPT09HR0c3NzcvLy8nJycfHx8XFxcPDw8HBwb+/v729vbu7u7m5ubW1tbOzs7Gxsa2trampqaenp6WlpaOjo6GhoQDZNpubm5WVlY+Pj42NjYuLi4mJiYeHh4WFhYODg35+fnZ2dnR0dHJycnBwcGZmZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFCgAlACwAAAEADwAOAAAGesCSUKQRGkua0RGjAFQm0EkFoMAIFY9HAHPpXjABiINREohKoaMwHSKUBgvKJEKvTygLw1vCyWj+gBkcEnoGHCUWFmpCHAglBYeLRhsHjxuSRhqOBJeYSI4FnZgeegMdniUgBSULER8dHrCxG7QRDUIPCQq7vLsJDyVBACH5BAUKACUALAcABwACAAEAAAYEQIslCAAh+QQFCgAlACwKAAcAAgABAAAGBECLJQgAIfkEBQoAJQAsBAAJAAIAAQAABgRAiyUIACH5BAUKACUALAcACQACAAEAAAYEQIslCAAh+QQFCgAlACwKAAkAAgABAAAGBECLJQgAIfkEBQoAJQAsBAALAAIAAQAABgRAiyUIACH5BAUKACUALAcACwACAAEAAAYEQIslCAAh+QQFCgAlACwKAAsAAgABAAAGBECLJQgAIfkECTIAJQAsAAABAA8ADgAABhTAknBILBqPyKRyyWw6n9CodEoNAgA7")
-}
-
-html .menu .menu_soft:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQAOYAAOPj4+Hh4d/f393d3dvb29nZ2dfX19XV1dPT09HR0c/Pz83NzcvLy8nJycfHx8XFxcPDw7+/v729vbu7u6+vr62traurq6mpqaenp6WlpZmZmZeXl5WVlRTDQBTDPpOTkxLDPhbBQBi/QBTBQBq9Qha/QJGRkRi9Qhi9QI+Pjxq7Qhy5RB63RBy5QiC1RiC1RI2NjSKzRiSxRouLiyKxRiavSCitSCSvSImJiSatSCypSiirSCynSoWFhYODg4GBgTadUDadTjabUDSdTjibUDiZUDyXUn5+fjqXUjyVUnx8fHh4eESLVkaLVkaJWEaJVkqHWEiHWEqFWE6DWkyDWk6BWlB+WlB8XFJ8XFJ6XFR6XlR4Xlh2Xlp0YGZmZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFHgBeACwAAAEAEAAPAAAHtoBeXTEdIR0qWF4/BgECAQtKXjIrQkBAMjVeEAwVFBUHCl4iRV6lUy5eCyalXhgAXidArE6oCxqsFQGiRKxStR+sGLonLk5MTTwsXgoSHBscCwJeWDUu1jFUXjMLCt0OOKzh4uI+DwndDDNeOAzdCQ89XgUKzhwTCcsR9dFeAxasKUItAFZKmBcCFFhxEHirVK5+F1jBwKeKVYZXDA50qtDAgZcHnDwdwKdEQaMABcD1KHAywZFAACH5BAUeAF4ALAAAAQAQAAcAAAdhgF5LDAECAQY+XloqHSEdMVxeDQcVFBUND147MkBAQisuXgMXXqUwCV4uUKVeRh1eBBSsHApeMUysRK8EFqwptTGrpa6wChwbHBMIqTxNTE4xIV49DwrWCzBeUzEu3TVWgQAh+QQFHgBeACwJAAEABwAPAAAHWIA/BgECAQtKEAwVFBUHCgsmXpIYAAsakl4Vhh+YGAEKEhwbHAsCMwsKqQ44mK1WMS6xNlguOk1MTjEhMVCYRh0xTJhEHS69kkkdNjJAQEIrLlckHSHFWoEAIfkECR4AXgAsAAABABAADwAAB3CAXoKDhIWGh4iJiouMjY6PiVg2LpQxVV44DAoKCQ89XiQuTkxNPCxeChEcGxwLAl4iRINSLl4LH4MYAV4nQINOtQsagxW7IkWDU8EmgxkAXjErQkBAMjVeDwwVFBUHCV5cLh0hHSRWXj0FAQIBCUeBADs=")
-}
-
-html .menu .menu_set:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQAOYAAMfHx8XFxbm5ube3t7W1tbOzs7GxsQbROGqpeg7JPBDHPpWVlRLFPmylemCnchTDQBbBQFqnbBTBQFSpaBi/QEqrYpGRkRq9QlinbBa/QI+RkRi9QBi9Qh65RI+Pjxq7QkqpYhy5RIuPjRy5Qh63RCC1RIePiSKzRiSxRn6Rg4uLiyKxRiavSCitSCSvSImJiSqrSiatSIeHhyypSiirSCqpSiynSoWFhS6lTHyJfjCjTHyHfjKhTDKhToODgzSfTmaNcIGBgTadTjKfTjabUDSdTjqZUDiZUH5+fjyXUjqXUDqXUj6VUjyVUj6TVHx8fD6TUkCRVEKPVHp6ekKNVnJ8dECPVESNVkaLVkSLVnh4eEiJWEaJVkaJWEiHWEqHWHZ2dkyFWkqFWE6DWkyDWk6BWlB+XFB+WlB8XFJ8XFR6XlR6XFJ6XGR0aFR4XlZ4Xlp0YFh2XlZ2XlxyYFh0YFpyYFxwYlxwYF5uYmZmZgAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJDwB5ACwAAAEADwAOAAAHpoB5goN4Hxdwg4l5b2Z5W1JMUnlpb4lvJywzKHBzMDYkMJWCZS15Fj6CWgt5LGSJOi95WgYFSHkeNINzVCQyUwEyNwFINyFSc3kKTml5BKh5TwR5akYKyVuCA7Z5UwN5cFIMeXFRKDdBAEhIATdPIU6ieTwqeUEDAjJ5LzOJZvw3NwahOlFmkBoYmSi46gGjITODYfJgUVLmSh4yahQNgsMgQcZEgQAAIfkECQ8AeQAsAAABAA8ADgAAB7CAeYJ5c15pgjo2eIODeEIXLExJQh1mjIM/aXhGUXlRW4xzZVcsGj6CWggwMEeLJxdMGHlaBgVIeSJfJGR5NUp5MlMBMjcBSDdwLId5QlJ5BKd5TwR5PE6DUUx5A7d5UwPMRIJpNnk3QQBISAE3T3MwOHlbJWMmeUEDAjJ5E1IbM3nsCNHRocKNQTtKYBmzKM8iL+LGJJmzJd6lPGQeMHESpUWJIxcdtgCYx0yYhnkCAQAh+QQJDwB5ACwAAAAADwAPAAAHqoB5goN5c4SHhEIoUYiDb3lvNk4wW2UoSYQlEEYhZXlqLFg2KIQtWGkNPoJVC2SMg2FOL3laBgVIeQ4zhFI2MlMBMjcBSDdOJFh5RD+CBKp5TwSCNUlwM06CA7h5UwN5Ui1feU41RjdBAEhIATdAEHCEFBF5QQMCMnkpRPCDRmo3OQS1AZEGgo5BaQ4YoQIjTZ4eLZpQ8DRISY85ZWjAqCEITyNBTpKMORQIACH5BAkPAHkALAAAAQAPAA4AAAemgHmCg3gfF3CDiXlvZnlbUkxSeWlviW8nLDMocHMwNiQwlYJlLXkWPoJaC3ksZIk6L3laBgVIeR40g3NUJDJTATI3AUg3IVJzeQpOaXkEqHlPBHlqRgrJW4IDtnlTA3lwUgx5cVEoN0EASEgBN08hTqJ5PCp5QQMCMnkvM4lm/Dc3BqE6UWaQGhiZKLjqAaMhM4Nh8mBRUuZKHjJqFA2CwyBBxkSBAAAh+QQJDwB5ACwAAAEADwAOAAAHsIB5gnlzXmmCOjZ4g4N4QhcsTElCHWaMgz9peEZReVFbjHNlVywaPoJaCDAwR4snF0wYeVoGBUh5Il8kZHk1SnkyUwEyNwFIN3Ash3lCUnkEp3lPBHk8ToNRTHkDt3lTA8xEgmk2eTdBAEhIATdPczA4eVslYyZ5QQMCMnkTUhszeewI0dGhwo1BO0pgGbMozyIv4sYkmbMl3qU8ZB4wcRKlRYkjFx22AJjHTJiGeQIBACH5BAkPAHkALAAAAAAPAA8AAAeqgHmCg3lzhIeEQihRiINveW82TjBbZShJhCUQRiFleWosWDYohC1YaQ0+glULZIyDYU4veVoGBUh5DjOEUjYyUwEyNwFIN04kWHlEP4IEqnlPBII1SXAzToIDuHlTA3lSLV95TjVGN0EASEgBN0AQcIQUEXlBAwIyeSlE8INGajc5BLUBkQaCjkFpDhihAiNNnh4tmlDwNEhJjzllaMCoIQhPI0FOkow5FAgAIfkECQ8AeQAsAAABAA8ADgAAB6aAeYKDeB8XcIOJeW9meVtSTFJ5aW+JbycsMyhwczA2JDCVgmUteRY+gloLeSxkiToveVoGBUh5HjSDc1QkMlMBMjcBSDchUnN5Ck5peQSoeU8EeWpGCslbggO2eVMDeXBSDHlxUSg3QQBISAE3TyFOonk8KnlBAwIyeS8ziWb8NzcGoTpRZpAaGJkouOoBoyEzg2HyYFFS5koeMmoUDYLDIEHGRIEAACH5BAkPAHkALAAAAQAPAA4AAAewgHmCeXNeaYI6NniDg3hCFyxMSUIdZoyDP2l4RlF5UVuMc2VXLBo+gloIMDBHiycXTBh5WgYFSHkiXyRkeTVKeTJTATI3AUg3cCyHeUJSeQSneU8EeTxOg1FMeQO3eVMDzESCaTZ5N0EASEgBN09zMDh5WyVjJnlBAwIyeRNSGzN57AjR0aHCjUE7SmAZsyjPIi/ixiSZsyXepTxkHjBxEqVFiSMXHbYAmMdMmIZ5AgEAOw==")
-}
-
-html .menu .menu_folder:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQANUAAPX19efn593d3dXV1dPT09HR0c/Pz83NzcvLy8nJycfHx8XFxcHBwb29vbm5ube3t7W1tbOzs7Gxsa+vr62traurq6mpqaenp6WlpaOjo6GhoQDZNp+fn52dnZubm5mZmZeXl5WVlZOTk4+Pj4WFhX5+fnx8fHp6enh4eHZ2dnJycnBwcGZmZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFDgAsACwAAAIAEAAMAAAGYEAWCHEohFjIpJJVGJlKD0oGQ8VoVEkCdslFajEMiuVCJlskjwTz1OgmSQsWQhRxIysg1mLysbMcKywKCih2J3UsAgZ+Hh1IABJ+ECVIARwlmJmZJAxJHkQHoaKhA3ksQQAh+QQJDgAsACwAAAAAEAAOAAAGGUCWULgpGo/DpHLJbDqf0Kh0Sq1ar9isMAgAIfkECQ4ALAAsAAABABAADQAABmZAllC4KRqPQhDiUAgNn8/CyFR6UDKYLEajGhK60LDwi2FQLJd02iJ5JFiFU0M8JC1YCFGELqyAWAsTH3wsDissCgoofCd7LAIGhB4dQgAShBAlQgEcJZ6fnyQMQx5LB6eopwN/LEEAIfkECQ4ALAAsAAACABAADAAABmNAFghxKGyOyCSLVRiZSg9KBkPFaFRLFgGb7Xq1KgyDYrmYzRbJI8E8Nb5d0oKFEEXg2QqItZh88EsOKywKCiiAJ3csAgaALB4dSwASjhAlSwEcJZucnCQMWR5EB6SlpAN7LEEAIfkECQ4ALAAsAAACABAADAAABlxAFghxKIRYyKSSVRiZSpuodIokqJbYpBXDoFguYLBF8kgwT41skrRgIUQRNbICYi0mHznLsWIpFChyJ3EsAgZ6Hh1IABJ6ECVIARwllJWVJAxJHkQHnZ6dA3UsQQAh+QQFDgAsACwAAAIAEAAMAAAGZUAWCHEohFjIpJJVGJlKD0oGQ8VoVEkClrXper9ILYZBsVzOZ4vkkWCeGsslacFCiCJxZQXEWkw+eUkOKywKCiiBLCd4LAIGiSweHUgAEpAQJUgBHCWdnp4kDEkeRAemp6YDfCxBACH5BAkOACwALAAAAgAQAAwAAAYUQJZwSCwaj8ikcslsOp/QqHQqDAIAIfkECQ4ALAAsAAACABAADAAABlxAFghxKIRYyKSSVRiZSpuodIokqJbYpBXDoFguYLBF8kgwT41skrRgIUQRNbICYi0mHznLsWIpFChyJ3EsAgZ6Hh1IABJ6ECVIARwllJWVJAxJHkQHnZ6dA3UsQQAh+QQJDgAsACwAAAIAEAAMAAAGY0AWCHEobI7IJItVGJlKD0oGQ8VoVEsWAZvterUqDINiuZjNFskjwTw1vl3SgoUQReDZCoi1mHzwSw4rLAoKKIAndywCBoAsHh1LABKOECVLARwlm5ycJAxZHkQHpKWkA3ssQQAh+QQJDgAsACwAAAEAEAANAAAGZkCWULgpGo9CEOJQCA2fz8LIVHpQMpgsRqMaErrQsPCLYVAsl3TaInkkWIVTQzwkLVgIUYQurIBYCxMffCwOKywKCih8J3ssAgaEHh1CABKEECVCARwlnp+fJAxDHksHp6inA38sQQAh+QQJDgAsACwAAAAAEAAOAAAGZkCWULgpGo/DpHIJQhwKoaWyMDKVHpQMZovRqIaEr3QZxjAolotabZE8EqzCqTEWkhYshChSZ1VALAsTH30OKywKCih1J3wsAgZ9Hh1CABJ9ECVCARwlnp+fJAxDHk4Hp6inA4AsQQA7")
-}
-
-html .menu .menu_exit:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQANUAAOPj4+Hh4dnZ2dXV1c3NzcvLy8fHx8PDw8HBwb+/v729vbu7u7W1ta2trampqaenp6Ojo6GhoZ2dnQzNOgjPOpeXlxq9Qhi9QI+Pj4uLi4mJiSatSCqpSjCjTDSfToGBgTadTjKfTjibUDqZUDqXUDyVUkCRVESNVnZ2dkyFWnR0dE6BWlB+XFB8XFR4Xlh2XlxwYF5uYmZmZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFCAAyACwCAAEACwAOAAAGQMBGgUAsEgyoAEMSaTYlgwzgI6taZYkKQHO1ZlDb7jUsrpLLZ3G6ux5zxRgwVayoBBQPh17/EGQgCQiCgwcLKkEAIfkEBQgAMgAsBwAHAAEAAgAABgRA0ykIACH5BAUIADIALAgABwABAAIAAAYEwI4oCAAh+QQFCAAyACwJAAcAAgACAAAGBkCPhzQKAgAh+QQFCAAyACwLAAcAAQACAAAGBEDPKAgAIfkEBQgAMgAsDAAHAAIAAgAABgZA0KbECQIAIfkEBQgAMgAsDAAFAAIAAgAABgZAVypmCQIAIfkEBQgAMgAsDgAGAAIAAwAABgfAlYySmqyCACH5BAUIADIALAwACQADAAEAAAYFQNiFFQQAIfkEBQgAMgAsDAAKAAIAAQAABgTAFysIACH5BAkyADIALAIAAQAOAA4AAAYUQJlwSCwaj8ikcslsOp/QqHRqDAIAOw==")
-}
-
-.pos-box {
-    height: 42px;
-    width: 100%
-}
-
-.position {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKwwAACsMBNCkkqwAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAFZSURBVDiNpdO9a1VBEAXw3zOioIUQEdFGkQdWVtr6D1ikERtRppLU6awUsUkh2CgoBNwhoPhsLESxERR7wcI2XSBNMAHRNFmLbB6Xa64RXFjYOXvmzMfOjmqt/mcd2I+QmUuZOcgbDWWQmTN4iFms4wGu4jC+RMT7wQwy8xBe4FtE3MBXPMdqE5sfLCEzj+Il3kXEE4iIJTzFFbzB9z0FMvMYJphExLPuXUQs4y1eYfmPHmTmbHN+FBGv92zMDm+ulXAzItZHtVaZeRH3sBgRn4ecOyKXcRt3dkuYwyJOZeaJfZyP42TjX1Nrne5SyqSUMu5ho559tpQy2bUP9gL8wHYnzbtYzczTuB8RHzs8/H0Sz+ETbuEDxg3f7pL6AhW/2vknNiNiCxvY6uDT8e2XMINLmbmC89js3I0z8wLOdP36Aht43KIcwULD1+w82/WGT+dk8DP96/oNlqecb6uu8YEAAAAASUVORK5CYII=");
-    background-position: 10px 10px;
-    background-repeat: no-repeat;
-    background-size: 22px auto;
-    line-height: 42px;
-    padding-left: 30px
-}
-
-.search {
-    width: 306px
-}
-
-.ser-text {
-    border: #20a53a 1px solid;
-    height: 30px;
-    width: 262px;
-    padding: 0 8px;
-    margin-top: 6px
-}
-
-.ser-sub {
-    width: 38px;
-    height: 30px;
-    border: 0;
-    background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxAAAAMQBz4pYTAAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAE2SURBVDiNndJBS1VRFMXx9UzNQUQD0caFk6YhEUFCOPETiJQfIygQbNQgCCeOGjYLGjRJkPoKoSGIRKADs1nQoEIEfw3cry6v+3oPN2z2ufuu8z/7nruC9ORNvMRXHOIFbrTogjQfOniKX87iR2P9HSv/A1zA+xK/wRwmMYV5vKt3r/sBnpTgcb9R8aw0D3sB1/GzTum3uZsfSnupCVgr8vwQgKXSLnR7I0nuJJFkN4PjY9WZbmMkyXGtx4YAjFY9aQI2knSS3B4CMFd1508HV3CE3QHfP17G2sdo7298UJfzChMtmy9jszTLbT4InpfgCx6Vme5hFd/8jW1cbQME93Hg39jDYmOKT5hGOmi7rNkk15KcJvmcZKv6E0k2k9xNsp1keZBx2vIi3tYkG+cBxJmV13HrN6Szg7ZCfX3NAAAAAElFTkSuQmCC") no-repeat center #20a53a;
-    cursor: pointer;
-    margin-right: 2px;
-    margin-top: 6px
-}
-
-.title {
-    height: 50px;
-    line-height: 50px;
-    border-bottom: 1px solid #ddd
-}
-
-.title h3 {
-    display: inline-block;
-    line-height: 50px;
-    margin-right: 12px
-}
-
-.divtable .table {
-    border: 1px solid #ddd;
-    color: #666;
-    font-size: 12px;
-    margin-bottom: 0
-}
-
-.divtable .table thead th {
-    background-color: #f5f6fa;
-    border-bottom: 1px solid #e1e6eb;
-    color: #999;
-    font-weight: normal;
-    padding: 8px
-}
-
-.table .btlinkbed {
-    color: #666;
-    padding: 1px 5px;
-    border: 1px solid transparent;
-    white-space: nowrap;
-    overflow: hidden;
-    float: left;
-    display: block
-}
-
-.table .btlinkbed:hover {
-    border: #ddd 1px solid
-}
-
-.dataTables_paginate {
-    display: block;
-    height: 30px;
-    margin-bottom: 10px;
-    margin-top: 15px
-}
-
-.page {
-    line-height: 16px;
-    text-align: right;
-    margin-top: 5px;
-    margin-right: 1px;
-    height: 30px
-}
-
-.page div {
-    float: right
-}
-
-.page span,
-.page a {
-    display: inline-block;
-    height: 28px;
-    padding: 0 11px;
-    border-right: #ddd solid 1px;
-    border-top: #ddd solid 1px;
-    border-bottom: #ddd solid 1px;
-    border-left: #ddd solid 1px;
-    line-height: 28px;
-    font-family: "Arial";
-    font-size: 13px;
-    color: #20a53a;
-    float: left;
-    margin-left: -1px
-}
-
-.page a.prev {
-    border-left: #ddd solid 1px
-}
-
-.page a:hover {
-    background: #e8e8e8;
-    color: #222;
-    text-shadow: 0 1px 0 #fff;
-    cursor: pointer
-}
-
-.page spanold {
-    font-size: 12px;
-    padding: 4px 10px !important;
-    border-style: solid;
-    border-width: 1px;
-    border-color: #ddd #ddd #ccc;
-    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-    display: inline-block;
-    line-height: 16px;
-    background: #f5f5f5;
-    color: #333;
-    text-shadow: 0 1px 0 #fff
-}
-
-.page .Pcurrent {
-    color: #999;
-    background: #f5f5f5;
-    cursor: default
-}
-
-.page .Pcount {
-    color: #777
-}
-
-.system-info-con {
-    width: 100%
-}
-
-.sys-i-c-box {
-    box-sizing: border-box;
-    max-width: 350px
-}
-
-.sys-i-c-box .siteinfo-box {
-    height: 110px;
-    position: relative;
-    width: 100%
-}
-
-.sys-i-c-box .siteinfo-box h3 {
-    background: #20a53a;
-    color: #fff;
-    font-style: normal;
-    height: 110px;
-    left: 0;
-    line-height: 110px;
-    position: absolute;
-    text-align: center;
-    top: 0;
-    width: 56px
-}
-
-.siteinfo-box-right {
-    border-bottom: 1px solid #ddd;
-    border-right: 1px solid #ddd;
-    border-top: 1px solid #ddd;
-    height: 110px;
-    margin-left: 56px;
-    overflow: hidden
-}
-
-.siteinfo-box-right h4 {
-    font-size: 32px;
-    height: 68px;
-    line-height: 60px;
-    overflow: hidden;
-    padding-top: 8px;
-    text-align: center
-}
-
-.siteinfo-box-right .sbr-btn {
-    color: #ccc;
-    display: block;
-    font-size: 14px;
-    height: 27px;
-    line-height: 22px;
-    padding-top: 5px;
-    text-align: center
-}
-
-.siteinfo-box-right .sbr-btn a {
-    color: #20a53a;
-    font-size: 16px;
-    padding: 0 10px
-}
-
-.circle-box h3,
-.circle-box h4 {
-    line-height: 30px
-}
-
-.circle {
-    width: 100px;
-    height: 100px;
-    position: relative;
-    border-radius: 50%;
-    background: #20a53a;
-    margin: 0 auto
-}
-
-.pie_left,
-.pie_right {
-    width: 100px;
-    height: 100px;
-    position: absolute;
-    top: 0;
-    left: 0
-}
-
-.left,
-.right {
-    width: 100px;
-    height: 100px;
-    background: #ccc;
-    border-radius: 50%;
-    position: absolute;
-    top: 0;
-    left: 0
-}
-
-.pie_right,
-.right {
-    clip: rect(0, auto, auto, 50px);
-    transition: transform 1s ease-in 0s;
-    -webkit-transition: -webkit-transform 1s ease-in 0s;
-    -moz-transition: -moz-transform 1s ease-in 0s
-}
-
-.pie_left,
-.left {
-    clip: rect(0, 50px, auto, 0);
-    transition: transform .4s ease-in 1s;
-    -webkit-transition: -webkit-transform .4s ease-in 1s;
-    -moz-transition: -moz-transform .4s ease-in 1s
-}
-
-.mask {
-    width: 88px;
-    height: 88px;
-    border-radius: 50%;
-    left: 6px;
-    top: 6px;
-    background: #FFF;
-    position: absolute;
-    line-height: 88px;
-    font-size: 18px;
-    color: #20a53a
-}
-
-@-webkit-keyframes shineGreen {
-    from {
-        -webkit-box-shadow: 0 0 10px #999
-    }
-
-    50% {
-        -webkit-box-shadow: 0 0 15px #20a53a
-    }
-
-    to {
-        -webkit-box-shadow: 0 0 10px #999
-    }
-}
-
-.shine_green {
-    -webkit-animation-name: shineGreen;
-    -webkit-animation-duration: 3s;
-    -webkit-animation-iteration-count: infinite
-}
-
-.mem-release {
-    cursor: pointer
-}
-
-.mem-re-min {
-    background: url(../img/ico/rocket_min.png) no-repeat center center;
-    height: 35px;
-    left: 40px;
-    position: absolute;
-    top: 8px;
-    width: 20px;
-    z-index: 9;
-    opacity: .9
-}
-
-.mem-re-con {
-    background: url(../img/ico/ico-rocket.gif) no-repeat center center;
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    z-index: 9;
-    display: none;
-    top: 15px
-}
-
-.mem-release:hover .mem-re-con {
-    display: block
-}
-
-.soft-man .col-lg-3 {
-    border-bottom: 1px solid #ececfb;
-    border-left: 1px solid #ececfb;
-    border-right: 1px solid #ececfb;
-    margin-right: -1px;
-    margin-bottom: -1px;
-    height: 148px;
-    cursor: pointer;
-    padding: 0
-}
-
-.soft-man .col-lg-3:hover {
-    box-shadow: 0 0 38px rgba(0, 0, 0, .08) inset;
-    -webkit-transition: all .25s ease;
-    transition: all .25s ease
-}
-
-.soft-man .dashed-border {
-    border: 1px dashed #20a53a;
-    z-index: 1
-}
-
-.soft-man .no-bg:hover {
-    box-shadow: 0 0 38px rgba(0, 0, 0, .01) inset;
-    -webkit-transition: all .15s ease;
-    transition: all .15s ease
-}
-
-.soft-man .image {
-    height: 40px;
-    margin: 30px 0 20px;
-    text-align: center
-}
-
-.soft-man .sname {
-    text-align: center;
-    color: #555
-}
-
-.soft-man .col-sm-3>div {
-    height: 100%;
-    left: 0;
-    position: absolute;
-    top: 0;
-    width: 100%;
-    z-index: 0
-}
-
-.soft-man .spanmove {
-    background: url(../images/move.png) no-repeat;
-    width: 30px;
-    height: 30px;
-    display: none;
-    position: absolute;
-    top: 5px;
-    right: 5px;
-    z-index: 3
-}
-
-.soft-man .col-lg-3:hover .spanmove {
-    display: block
-}
-
-.soft-man .text {
-    background-color: rgba(0, 0, 0, 0.3);
-    height: 100%;
-    left: 0;
-    position: absolute;
-    top: 0;
-    width: 100%;
-    display: none
-}
-
-.soft-man .text a {
-    background-color: #fff;
-    border-radius: 4px;
-    display: block;
-    height: 30px;
-    line-height: 30px;
-    margin: 59px auto;
-    text-align: center;
-    width: 100px
-}
-
-.soft-man-con p.status {
-    line-height: 40px;
-    margin-bottom: 20px;
-    font-size: 14px
-}
-
-.soft-man-con .sfm-opt .btn {
-    margin-right: 15px
-}
-
-.soft-man .sname .glyphicon-True {
-    color: #20a53a;
-    margin-left: 10px
-}
-
-.soft-man .sname .glyphicon-False {
-    color: red;
-    margin-left: 10px
-}
-
-.soft-man {
-    position: relative
-}
-
-.soft-man .rowbg {
-    position: absolute;
-    top: 0;
-    width: 100%;
-    z-index: 0
-}
-
-.soft-man .rowbg .col-lg-3 {
-    cursor: default
-}
-
-.soft-man .rowbg .col-lg-3:hover {
-    box-shadow: 0 0 38px rgba(0, 0, 0, .01) inset;
-    -webkit-transition: all .15s ease;
-    transition: all .15s ease
-}
-
-.bw-info ul li {
-    height: 56px;
-    line-height: 56px
-}
-
-.bw-info ul li.bi-line {
-    border-bottom: #ddd solid 1px
-}
-
-.bw-info ul li span {
-    display: block;
-    margin-right: 15px
-}
-
-.btn-zhm {
-    border-radius: 0 3px 0 0;
-    display: none;
-    position: absolute;
-    right: 42px;
-    top: 0
-}
-
-.line {
-    padding: 5px 0
-}
-
-.line .span_tit {
-    display: inline-block;
-    text-align: right;
-    width: 140px
-}
-
-.line .tname {
-    display: block;
-    float: left;
-    height: 30px;
-    line-height: 30px;
-    overflow: hidden;
-    padding-right: 20px;
-    text-align: right;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    width: 110px
-}
-
-.line .info-r {
-    margin-bottom: 5px;
-    margin-left: 110px;
-    position: relative
-}
-
-.placeholder {
-    cursor: text;
-    left: 20px;
-    line-height: 24px;
-    position: absolute;
-    top: 27px
-}
-
-.bt-form-submit-btn {
-    background: #f6f8f8;
-    border-top: 1px solid #edf1f2;
-    bottom: 0;
-    left: 0;
-    padding: 8px 20px 10px;
-    position: absolute;
-    text-align: right;
-    width: 100%
-}
-
-.bt-form-submit-btn .btn:first-child {
-    margin-right: 4px
-}
-
-.btn-danger {
-    background-color: #cbcbcb;
-    border-color: #cbcbcb;
-    color: #fff
-}
-
-.bt-w-main {
-    height: 525px
-}
-
-.bt-form {
-    height: 100%
-}
-
-.bt-w-menu {
-    float: left;
-    background-color: #f0f0f1;
-    height: 100%;
-    width: 110px
-}
-
-.bt-w-menu p {
-    cursor: pointer;
-    height: 40px;
-    line-height: 40px;
-    padding-left: 20px;
-    position: relative;
-    text-overflow: ellipsis;
-    overflow: hidden
-}
-
-.bt-w-menu p a {
-    display: block
-}
-
-.bt-w-menu p .spanmove {
-    display: none
-}
-
-.bt-w-con {
-    margin-left: 110px;
-    position: relative
-}
-
-.label-input-group input {
-    margin-top: 0;
-    margin-right: 5px;
-    vertical-align: -2px
-}
-
-.label-input-group label {
-    margin-bottom: 0;
-    font-weight: normal
-}
-
-.bingfa .line {
-    margin-bottom: 10px
-}
-
-.bingfa .line .span_tit {
-    text-align: right;
-    width: 120px;
-    display: inline-block
-}
-
-.bingfa .bt-input-text {
-    width: 100px
-}
-
-.ssl-con-key {
-    width: 47%
-}
-
-.ssl-con-key textarea {
-    height: 240px;
-    line-height: 18px;
-    width: 100%;
-    margin-top: 5px
-}
-
-.ssh-item {
-    float: left;
-    margin-left: 10px;
-    padding-top: 5px
-}
-
-.ss-text em {
-    color: #555;
-    float: left;
-    font-style: normal;
-    line-height: 32px;
-    padding-right: 2px
-}
-
-.view1,
-.view2 {
-    margin-bottom: 15px
-}
-
-.searcTime {
-    position: relative:z-index:999;
-    margin-top: 11px
-}
-
-.searcTime .tit {
-    float: left;
-    padding: 5px 10px;
-    display: none
-}
-
-.searcTime .gt {
-    padding: 5px 10px;
-    border: #ddd 1px solid;
-    margin-right: -1px;
-    cursor: pointer;
-    float: left;
-    line-height: 16px
-}
-
-.searcTime .gt.on,
-.searcTime .gt:hover,
-.searcTime .ss .st:hover,
-.searcTime .ss .st.on {
-    background-color: #20a53a;
-    color: #fff
-}
-
-.searcTime .ss {
-    display: inline-block;
-    position: relative;
-    float: left;
-    line-height: 16px
-}
-
-.searcTime .ss .st {
-    padding: 5px 10px;
-    border: #ddd 1px solid;
-    margin-right: -1px;
-    cursor: pointer;
-    float: left
-}
-
-.searcTime .ss .time {
-    background-color: #fff;
-    border: 1px solid #ddd;
-    display: none;
-    padding: 10px;
-    position: absolute;
-    right: -1px;
-    top: 27px;
-    width: 217px;
-    z-index: 99
-}
-
-.searcTime .ss .time span {
-    margin-bottom: 10px;
-    display: block
-}
-
-.searcTime .ss .time input {
-    border: 1px solid #ddd;
-    height: 22px;
-    padding: 0 5px;
-    width: 132px
-}
-
-.searcTime .ss .time input:focus {
-    border: #66afe9 1px solid;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6)
-}
-
-.searcTime .ss .sbtn {
-    background-color: #20a53a;
-    border: 1px solid #20a53a;
-    color: #fff;
-    line-height: 24px;
-    text-align: center;
-    cursor: pointer
-}
-
-.plan {
-    padding: 10px 20px;
-    margin-bottom: 10px
-}
-
-.plan .typename {
-    line-height: 34px;
-    width: 120px
-}
-
-.plan .textname {
-    height: 34px;
-    line-height: 34px;
-    float: left
-}
-
-.plan .planname input {
-    height: 34px;
-    width: 260px;
-    padding: 0 12px
-}
-
-.plan .dropdown button b {
-    font-weight: normal
-}
-
-.plan .dropdown-menu {
-    min-width: 100px
-}
-
-.dropdown-menu>li>a {
-    padding: 3px 12px
-}
-
-.plan-submit {
-    margin-left: 141px
-}
-
-.plan_hms {
-    position: relative;
-    height: 34px
-}
-
-.plan_hms span {
-    float: left;
-    height: 32px;
-    line-height: 32px;
-    position: relative
-}
-
-.plan_hms .name {
-    border-left: 1px solid #ccc;
-    width: 44px;
-    text-align: center;
-    background-color: #f6f6f6
-}
-
-.planSign {
-    margin-left: 10px;
-    height: 35px;
-    line-height: 35px
-}
-
-.planSign i {
-    margin-right: 8px;
-    font-size: 12px;
-    font-style: initial;
-    color: red
-}
-
-.plan_hms span input {
-    float: left;
-    width: 48px;
-    height: 32px;
-    line-height: 32px;
-    border: 0;
-    text-align: center;
-    font-size: 12px
-}
-
-.plan_hms span:first-child input {
-    border-radius: 4px 0 0 4px
-}
-
-.plan_hms span:last-child {
-    border-radius: 0 4px 4px 0
-}
-
-.plan .dropdown button {
-    width: 94px
-}
-
-.txtsjs {
-    width: 260px;
-    height: 80px
-}
-
-.sl-s-info {
-    width: 124px;
-    border: #ccc 1px solid
-}
-
-.rec-install {
-    padding: 16px;
-    width: 100%;
-    float: left
-}
-
-.rec-install .rec-box {
-    width: 296px;
-    float: left
-}
-
-.rec-install h3 {
-    font-size: 20px;
-    margin-bottom: 5px
-}
-
-.rec-box-con {
-    border: #ddd 1px solid;
-    border-radius: 3px;
-    padding: 10px
-}
-
-.rec-install .rec-box:hover .rec-box-con {
-    background-color: #f9f9f9;
-    border: #20a53a 1px solid
-}
-
-.rec-box-con .ico img {
-    width: 22px;
-    margin-right: 10px
-}
-
-.rec-box-con ul li {
-    line-height: 26px;
-    margin-bottom: 5px
-}
-
-.fangshi {
-    line-height: 19px;
-    margin-top: 10px;
-    display: block;
-    margin-bottom: 15px
-}
-
-.fangshi label {
-    font-weight: normal;
-    margin-right: 44px;
-    float: right
-}
-
-.fangshi label input {
-    vertical-align: -2px;
-    margin-left: 5px
-}
-
-.zun-form-new .fangshi {
-    padding: 0 30px 0;
-    line-height: 30px
-}
-
-.zun-form-new .fangshi label {
-    height: 20px;
-    line-height: 20px;
-    margin: 4px 20px 0 0
-}
-
-.zun-form-new .version {
-    padding: 0 30px
-}
-
-.zun-form-new .version select {
-    height: 28px;
-    margin-left: 30px;
-    width: 120px
-}
-
-.sec-install-btn {
-    font-family: "宋体";
-    width: 90px;
-    height: 30px;
-    line-height: 30px;
-    text-align: center;
-    background-color: #20a53a;
-    border-radius: 3px;
-    color: #fff;
-    cursor: pointer;
-    margin-top: 10px
-}
-
-.rec-box-con .onekey {
-    font-family: "宋体";
-    width: 90px;
-    height: 30px;
-    line-height: 30px;
-    text-align: center;
-    background-color: #20a53a;
-    border-radius: 3px;
-    color: #fff;
-    margin: 5px auto;
-    cursor: pointer
-}
-
-.rec-box-con .onekey:hover,
-.sec-install-btn:hover {
-    background: #10952a;
-    background: linear-gradient(#10952a, #088d22)
-}
-
-.phppz {
-    margin: 14px 0
-}
-
-.phppz span {
-    padding: 10px
-}
-
-.phppz textarea {
-    width: 500px;
-    margin: 0;
-    vertical-align: bottom;
-    padding: 0 5px;
-    height: 38px;
-    margin-right: 20px
-}
-
-.soft-man-con .user_pw {
-    display: none;
-    margin-top: 30px
-}
-
-.soft-man-con .user_pw_tit {
-    margin-top: 30px;
-    padding-top: 30px;
-    border-top: #ccc 1px dashed
-}
-
-.soft-man-con .user_pw p {
-    margin-bottom: 15px
-}
-
-.soft-man-con .user_pw_tit .tit {
-    float: left;
-    line-height: 22px
-}
-
-.soft-man-con .user_pw span,
-.soft-man-con .user_pw_tit span {
-    width: 50px;
-    display: inline-block
-}
-
-.soft-man-con .user_pw span {
-    margin-right: 10px
-}
-
-.btswitch-p {
-    margin-left: 10px
-}
-
-.soft-man-con .user_pw input {
-    width: 200px
-}
-
-.soft-man-con .conf_p {
-    margin-bottom: 10px
-}
-
-.soft-man-con .conf_p input {
-    width: 100px
-}
-
-.soft-man-con .funarea {
-    width: 100%;
-    height: 80px;
-    line-height: 22px;
-    margin-bottom: 10px
-}
-
-.soft-man-con .ver .btn {
-    vertical-align: 0;
-    margin-left: 10px
-}
-
-.webEdit-box .soft-man-con .phpmyadmindk {
-    width: 100px;
-    display: inline-block;
-    margin: 0;
-    padding-right: 0
-}
-
-.softlist td img {
-    width: 24px;
-    height: 20px;
-    margin-right: 5px
-}
-
-.softlist .glyphicon-folder-open {
-    cursor: pointer;
-    color: #efd566
-}
-
-.softlist .btswitch+.btswitch-btn {
-    width: 2.4em;
-    height: 1.4em;
-    margin-bottom: 0
-}
-
-.wafConf_checkbox label {
-    font-weight: normal;
-    margin-right: 22px
-}
-
-.wafConf button {
-    vertical-align: 0
-}
-
-.wafConf_cc {
-    border-bottom: 1px solid #ddd;
-    border-top: 1px solid #ddd;
-    margin: 10px 0;
-    padding: 15px 0
-}
-
-.wafConf_cc span {
-    margin-right: 5px
-}
-
-.wafConf fieldset {
-    border: 1px solid #ccc;
-    border-radius: 3px;
-    float: left;
-    padding-bottom: 0;
-    width: 240px
-}
-
-.wafConf fieldset:nth-of-type(2) {
-    margin: 0 10px
-}
-
-.wafConf legend {
-    border: 0 none;
-    font-size: 14px;
-    margin: 0 6px;
-    padding: 3px;
-    width: auto
-}
-
-.wafConf fieldset input {
-    margin-left: 4px
-}
-
-.wafConf fieldset .table {
-    margin-top: -1px;
-    margin-bottom: 0
-}
-
-.wafConf fieldset .table tr td:nth-of-type(2) {
-    width: 42px
-}
-
-.wafConf fieldset .table-overflow {
-    height: 210px;
-    overflow: auto;
-    margin-top: 10px;
-    border-top: #ddd 1px solid
-}
-
-.wafConf-btn {
-    border-bottom: #ddd 1px solid;
-    margin-bottom: 12px;
-    padding-bottom: 15px;
-    height: 45px
-}
-
-.wafConf-btn span {
-    float: left;
-    margin-right: 8px;
-    line-height: 33px
-}
-
-.wafConf-btn .btn {
-    margin-right: 10px
-}
-
-.wafConf-btn .ssh-item {
-    margin-right: 50px
-}
-
-.gzEdit {
-    padding: 13px 20px
-}
-
-.gzEdit button {
-    margin: 8px;
-    width: 140px
-}
-
-.setting-con p {
-    line-height: 30px
-}
-
-.setting-con p .set-tit {
-    display: inline-block;
-    height: 22px;
-    margin-right: 10px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    vertical-align: -2px;
-    width: 90px
-}
-
-.setting-con p .disable {
-    background-color: #ededed
-}
-
-.setting-con p .inputtxt {
-    width: 260px
-}
-
-.setting-con p .modify {
-    margin-left: -40px;
-    vertical-align: 0;
-    position: relative;
-    z-index: 10
-}
-
-.setting-con p .set-info {
-    margin-left: 20px
-}
-
-.set-submit {
-    margin: 20px 0 10px 100px
-}
-
-.changepath {
-    height: 500px
-}
-
-.changepath .path-top {
-    height: 50px;
-    line-height: 50px;
-    padding-left: 10px;
-    border-bottom: #aaa 1px solid
-}
-
-.changepath .path-top .btn {
-    margin-right: 10px
-}
-
-.changepath .path-top .btn span {
-    -moz-transform: scaleX(-1);
-    -webkit-transform: scaleX(-1);
-    -o-transform: scaleX(-1);
-    transform: scaleX(-1)；
-}
-
-.changepath .path-top .place {
-    display: inline-block
-}
-
-.changepath .path-top .place span {
-    color: #444;
-    font-size: 12px;
-    font-weight: bold
-}
-
-.changepath .path-con-left {
-    width: 130px;
-    height: 450px;
-    float: left;
-    border-right: #aaa 1px solid;
-    padding-top: 5px
-}
-
-.changepath .path-con-left dl dt {
-    background: url("../img/ico-computer.png") no-repeat left center;
-    height: 30px;
-    line-height: 30px;
-    padding-left: 23px;
-    font-size: 14px;
-    font-weight: normal;
-    margin-left: 10px
-}
-
-.changepath .path-con-left dl dd {
-    line-height: 30px;
-    padding-left: 12px;
-    cursor: pointer
-}
-
-.changepath .path-con-left dl dd span {
-    color: #666
-}
-
-.changepath .path-con-right {
-    float: left;
-    height: 450px;
-    overflow: auto;
-    width: 520px
-}
-
-.changepath .path-con-right .default li {
-    width: 25%;
-    float: left;
-    text-align: center;
-    margin-top: 20px;
-    cursor: pointer
-}
-
-.changepath .path-con-right .default li span {
-    font-size: 40px;
-    color: #666
-}
-
-.path-con-right .file-list {
-    display: none
-}
-
-.path-con-right .list-list td {
-    padding-left: 10px;
-    cursor: pointer
-}
-
-.list-list span.glyphicon {
-    color: #666;
-    margin-right: 10px;
-    font-size: 18px
-}
-
-.list-list span.glyphicon-folder-open {
-    color: #edca5c
-}
-
-.list-list span.glyphicon-cloud-download {
-    font-size: 12px
-}
-
-.newFolderName {
-    border: #ccc 1px solid;
-    height: 30px;
-    padding: 0 5px;
-    width: 90%
-}
-
-.path-con-right .list-list td .delfile-btn {
-    display: none;
-    float: right;
-    font-size: 14px;
-    text-align: center;
-    width: 18px
-}
-
-.path-con-right .list-list td .delfile-btn:hover {
-    color: red
-}
-
-.path-con-right .list-list tr:hover .delfile-btn {
-    display: block
-}
-
-.path-con-right .list-list td .btn-xs {
-    margin-top: 4px
-}
-
-.getfile-btn {
-    background: #f6f8f8 none repeat scroll 0 0;
-    border-top: 1px solid #edf1f2;
-    padding: 8px 20px 10px;
-    text-align: right;
-    width: 100%
-}
-
-.success-msg {
-    width: 100%;
-    padding: 30px 50px;
-    font-family: "Microsoft Yahei";
-    float: left;
-    position: relative
-}
-
-.success-msg .pic {
-    position: absolute;
-    top: 50%;
-    margin-top: -100px
-}
-
-.success-msg .pic img {
-    width: 158px
-}
-
-.success-msg .suc-con {
-    float: right;
-    width: 260px
-}
-
-.success-msg .suc-con h3 {
-    font-size: 16px;
-    margin-bottom: 15px
-}
-
-.success-msg .suc-con p {
-    line-height: 23px
-}
-
-.success-msg .suc-con .p1 {
-    border-bottom: 1px dashed #aaa;
-    color: #000;
-    height: 30px;
-    margin-bottom: 8px
-}
-
-.success-msg .bottom-btn {
-    margin-top: 60px;
-    width: 100%;
-    float: left
-}
-
-.success-msg .bottom-btn a {
-    width: 200px;
-    height: 40px;
-    line-height: 40px;
-    text-align: center;
-    display: inline-block;
-    border-radius: 5px;
-    margin-left: 30px;
-    color: #fff;
-    font-size: 16px;
-    cursor: pointer
-}
-
-.success-msg .bottom-btn .close-btn {
-    background-color: #cbcbcb
-}
-
-.success-msg .bottom-btn .blue-btn {
-    background-color: #5cb85c
-}
-
-.tasklist {
-    padding: 15px
-}
-
-.tab-nav {
-    border-bottom: #cacad9 1px solid
-}
-
-.tab-nav span {
-    background-color: #ddd;
-    background: -moz-linear-gradient(top, #f6f6f6, #ddd);
-    background: -webkit-gradient(linear, 0% 0, 0% 100%, from(#f6f6f6), to(#ddd));
-    background: -ms-linear-gradient(top, #f6f6f6, #ddd);
-    height: 32px;
-    line-height: 32px;
-    padding: 0 12px;
-    border: #cacad9 1px solid;
-    color: #444;
-    display: inline-block;
-    margin: 0 -1px -1px 0;
-    cursor: pointer
-}
-
-.tab-nav .on {
-    background: #fff;
-    border-bottom: #fff 1px solid;
-    color: #444
-}
-
-.tab-con {
-    height: 380px;
-    margin-right: -15px;
-    overflow: auto;
-    padding: 10px
-}
-
-.tab-con ul.cmdlist {
-    list-style-type: decimal
-}
-
-.tab-con ul.cmdlist li {
-    position: relative;
-    list-style-type: decimal;
-    list-style-position: inside;
-    line-height: 40px;
-    border-bottom: #dbdbea 1px solid;
-    margin-top: 6px
-}
-
-.tab-con ul.cmdlist li .com-progress,
-.tab-con ul.cmdlist li .state,
-.opencmd {
-    float: right;
-    margin-left: 20px;
-    color: #535362
-}
-
-.tab-con ul.cmdlist li .line-progress {
-    position: absolute;
-    bottom: -1px;
-    left: 0;
-    height: 1px;
-    background-color: #20a53a
-}
-
-.tab-con ul.cmdlist li .cmd {
-    border: 0 none;
-    border-radius: 0;
-    display: block;
-    width: 570px;
-    height: 200px;
-    line-height: 22px;
-    padding: 0 10px;
-    background-color: #333;
-    color: #eee;
-    overflow: auto
-}
-
-.yuandian {
-    width: 10px;
-    height: 10px;
-    border-radius: 5px;
-    background-color: #20a53a;
-    z-index: 999999
-}
-
-.DrawRecordL i,
-.DrawRecordR-T i {
-    background: url(../img/Detailsbg.png) no-repeat
-}
-
-.DrawRecordCon {
-    font-size: 14px;
-    height: 422px;
-    overflow: auto
-}
-
-.DrawRecord {
-    background: url(../img/DrawRecordord.png) repeat-y -204px center;
-    margin: 0 auto;
-    overflow: hidden;
-    line-height: 22px
-}
-
-.DrawRecordlist {
-    padding-top: 6px
-}
-
-.DrawRecord .DrawRecordL {
-    float: left;
-    color: #9a9a9a;
-    margin-top: 9px;
-    padding-right: 22px;
-    position: relative;
-    text-align: right;
-    width: 110px
-}
-
-.DrawRecord .DrawRecordL i {
-    background-position: 0 0;
-    display: inline-block;
-    height: 5px;
-    overflow: hidden;
-    position: absolute;
-    right: 0;
-    top: 9px;
-    width: 16px
-}
-
-.DrawRecord .DrawRecordR {
-    margin: 1px 1px 30px 112px;
-    color: #666;
-    padding-right: 5px
-}
-
-.DrawRecord .DrawRecordR h3 {
-    font-size: 14px;
-    font-weight: normal;
-    margin-bottom: 5px
-}
-
-.footer {
-    bottom: 0;
-    position: absolute;
-    text-align: center;
-    width: 100%;
-    line-height: 50px
-}
-
-.bingfa {
-    padding: 10px 0 60px 0
-}
-
-.bingfa p {
-    margin-bottom: 10px
-}
-
-.bingfa p .span_tit {
-    display: inline-block;
-    text-align: right;
-    width: 120px
-}
-
-.bingfa p input {
-    border: 1px solid #ccc;
-    height: 30px;
-    line-height: 30px;
-    padding-left: 5px;
-    border-radius: 3px;
-    -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-    -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s
-}
-
-.bingfa p input:focus,
-.bingfa p input:active {
-    border: #66afe9 1px solid;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6)
-}
-
-.bingfa .submit-btn {
-    background: #f6f8f8 none repeat scroll 0 0;
-    border-top: 1px solid #edf1f2;
-    bottom: 0;
-    left: 0;
-    padding: 8px 20px 10px;
-    position: absolute;
-    text-align: right;
-    width: 100%
-}
-
-.bingfa .submit-btn .btn-danger {
-    margin-right: 5px
-}
-
-.transfer .backupdata {
-    height: 150px
-}
-
-.selectdata .slabel {
-    font-weight: normal;
-    margin: 10px 41px 10px 0
-}
-
-.selectdata .slabel input {
-    margin-right: 5px;
-    margin-top: 0;
-    vertical-align: -2px
-}
-
-.backupbtn {
-    margin: 20px 0;
-    width: 100%
-}
-
-.neice_con {
-    padding: 7px 20px 20px
-}
-
-.neice_con .tit {
-    font-weight: bold;
-    line-height: 30px;
-    color: #777
-}
-
-.neice_con .nc_con {
-    background-color: #fdfdfd;
-    border: 1px solid #ddd;
-    line-height: 28px;
-    padding: 10px;
-    border-radius: 3px
-}
-
-.nc_opt {
-    padding-top: 6px;
-    text-align: right;
-    height: 24px
-}
-
-.neice_con .nc_opt input {
-    margin-right: 6px;
-    vertical-align: -2px
-}
-
-.neice_con .nc_opt label {
-    float: right;
-    width: 150px
-}
-
-.nc_con_user p {
-    margin: 15px 0
-}
-
-.nc_con p span {
-    width: 80px;
-    display: inline-block
-}
-
-.nc_con p input {
-    background-color: #fff;
-    border: #ccc 1px solid;
-    height: 30px;
-    line-height: 30px;
-    padding: 0 5px;
-    width: 280px
-}
-
-.nc_con p input.disabled {
-    background-color: #eee
-}
-
-.nc-tips {
-    padding: 20px
-}
-
-.nc-tips p {
-    line-height: 30px
-}
-
-.nc-tips p span {
-    font-size: 14px;
-    font-weight: bold
-}
-
-.nc-tips p a {
-    color: #20a53a
-}
-
-#BarTools .glyphicon {
-    color: #666
-}
-
-#BarTools .glyphicon:hover {
-    color: #fff
-}
-
-.list-list .ico {
-    background-position: center center;
-    background-repeat: no-repeat;
-    display: inline-block;
-    height: 30px;
-    margin-right: 10px;
-    width: 33px;
-    z-index: 1;
-    float: left
-}
-
-.fileList .ico {
-    background-position: center center;
-    background-repeat: no-repeat;
-    display: block;
-    height: 80px;
-    margin: 12px auto 4px;
-    width: 84px;
-    z-index: 1
-}
-
-.list-list .column-name .text {
-    color: #595c5f;
-    display: inline-block;
-    max-width: 85%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    line-height: 30px
-}
-
-.list-list .column-name .cursor {
-    display: inline-block;
-    cursor: pointer;
-    width: 200px\9
-}
-
-.table>tbody>tr>td {
-    vertical-align: middle
-}
-
-.showpicdiv {
-    max-height: 500px;
-    overflow: hidden;
-    width: 500px
-}
-
-#BarTools {
-    font-size: 16px;
-    float: left;
-    margin-right: 20px
-}
-
-#BarTools>button {
-    top: 0
-}
-
-.comlist {
-    float: left;
-    line-height: 28px;
-    margin-right: 10px
-}
-
-.comlist>span {
-    margin-right: 20px;
-    font-size: 14px;
-    float: left;
-    padding: 0 10px;
-    border: #fff 1px solid;
-    border-radius: 3px;
-    cursor: pointer
-}
-
-.comlist>span:hover {
-    border: #ccc 1px solid;
-    border-radius: 3px;
-    background-color: #f3f3f3
-}
-
-.PathPlaceText {
-    position: absolute;
-    right: 0;
-    top: 0;
-    background-color: #fff
-}
-
-.PathPlace {
-    color: #666;
-    float: left;
-    font-size: 16px;
-    line-height: 30px;
-    margin-right: 5px;
-    width: 170px\9;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap
-}
-
-.PathPlaceInfo {
-    font-size: 14px;
-    line-height: 30px;
-    float: left;
-    margin-right: 20px;
-    color: #999
-}
-
-.onPath {
-    float: left;
-    line-height: 30px;
-    font-size: 14px;
-    color: #666
-}
-
-.editmenu span {
-    display: none;
-    text-align: right;
-    width: 300px
-}
-
-.table tr.hover,
-.table tr.on,
-.ui-selecting,
-.ui-selected {
-    background-color: #f5f5f5
-}
-
-.table tr.on .editmenu span,
-.table tr.ui-selected .editmenu span,
-.table tr.ui-selecting .editmenu span,
-.table tr:hover .editmenu span {
-    display: inline
-}
-
-.ui-selectable-helper {
-    background: #6bb0c9;
-    border: 1px dotted #072246;
-    opacity: .25;
-    overflow: hidden;
-    position: absolute;
-    z-index: 99999
-}
-
-.list-list .ico-folder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAMpJREFUeNpi/P//P8NAAiaGAQYD7gAWdIFPpxIoMS8ZiOcQqfY5SD0LFT1jAsRTuaU0GZjZuAgq/vPto+S3V3fmUssBokC8llNEjp2ZFWjk/1+Eg56TE0RJsgCD3BPImAvikGs7IzMLAxuvKAMrNz9ZaWAul5iKJAsXPwUBAMzK//9AaDIcIAkODiKCbbQcGHXAqANGHTDqgFEHjDpg1AGjDqCVA57/+f6Z7hZD7XwBahOmfHv1ANQqlqCzG54CcRrjaOd0oB0AEGAAscwsxMSUtNsAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-folder-unempty {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAQRJREFUeNpi/P//P8NAAiaGAQYD7gAWcjR9OpWASyoZiOcQacxzkHoWKnrGBIincktpMjCzcRFU/OfbR8lvr+7MZSQnEbIzosbc65NxokDqDKeInBwrNz/xIfnwMgPjx5PxnkD2XCCWJNfrjMwsDGy8ogzs/CKkRSXQAaAomMslpiLJwsVPQegDQ/H/HwhNRiKUZOHkZPjx4xvD799/6ZLyWVmZGTjYWVBzAchybsUKujjg6/0OuAMGvBwAJcL/A14Q8SkYD4jlnx6chaaB/79GK6NRB4w6YNQBow4YdcDIdsDfP98/0d1iqJ1/QdVx47dXDxsGIDRADdBGxtHO6UA7ACDAAIASR69Q0kB9AAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-access,
-.list-list .ico-mdb,
-.list-list .ico-accdb,
-.list-list .ico-db,
-.list-list .ico-sql {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAwZJREFUeNrMV0trE1EU/jKJkzTTR4oJCX1lqq6q+GwriiLarS4VfCwqFEFxKShYUKE+Kv4GcVkquBE3glq0Vqt9iGg3qfZhSVttU0tNJk2aGc+9dGSSJmlaJqkfHG7OvZOc757v3HMnFk3TsJGwGZ2hoaEjNNwnazQxxh6yT8aJurq69AQIHT5CSUmJKZEDgQAbHpOdTCWhQ0jxfZIkQVVVU4zB7/c/XyaxOxcCpkMUxUtEojsTCaEQhUYkmmVZHkhHwpbPwKWlpXodMJxaHgfJLOsiEB4eRqi7B+HvI1CjUUQnp/i8o7ICgihC2rYVmw8fgrNW5vMejwderzddYa49A7NvujHzsgvlBw+gnIJYHXbYfT6+Fg0GocbiiAx/w/jDR/CdOA5XYz1f04sxpz6QDTMvXqHy7Gk4t9SuWHNUVPDRKft5NqafPvtHYE2NKBvUpSVYbDaEet5B2CRCS5BvoRoWBKjxGKx2OxKLi7C73dDo2XV1wmxQxsZRVFPNLRsSigJlYsJ8Aq76fZjvH4CtrIzLYBGSTzDbdYSKMzo1BVdDg/kEfvf1Q758EbFfM5j/2M/TzqRgEiSUCEnggJNOgaO6CsGOTvhbzptLgOnPdil63NwyShAOr8iOSRLsJQkGYS2WYKX7wkFHUKCjqOu+OP0TSwsLiM+G1iRBzlTn3n+Aa38DP2oMf6ihzHa95sa0Z5CoNtgzc7295mdAl4Dt3klWcAk8TUcRaLvLOyHLgoVaLxs16nTK+A/empXRMd4n3E3HzCdQde4MIiOjCL3twWQfOwVx7rPdFvlrIFAjYneAfKGF+6YT4K2WAugXjVkoyPvAf00gSYJQ602EChH1SWfmGrDa8vqShETKTZkx2s57t/H52vUkXwebN/pG6N/R143PGn8vp1Ogk0hHJlc/dS1vRcgCZdp1pmyZSoAFMu40VxJJEgjFxQlNUay72u+sSOFqNbDa7tln9keYxUi6Y4z/jvvaH7TGvny9pYbDeekPgiSp4o7tN+qvXmlLS2Aj8FeAAQC23WzgeNtzYAAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-c {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAmlJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwx4gIUp4F/wHIsfu9Tht//yCvQSHLA9fc/Ge58/IUidvHtDwZtIXYGViZGsBxIDdUd8Ovvf4bpV94xzLj6nkGQnRlFbuejLwyusjxgNkgOpAakFqSHKg648u4nQ9ah5wxiXCwME2wkGIQ5EA4ABfs1oLy+MAeYD5IDqQGpBekB6SWpLsAGqk+8ZJjhIMUgyYWp9NiL7wyWEpwMTIwIMRAzWImPwUqCiyHjwDOGjV5ylIWALA8rw9YHn7Emst2PvzC4yfFgiIPUgvSA9FIcBZNsJRl42ZjAQYqcwL78/sfw4tsfBmU+NoyEClIL0gPSS3EUgII3XIWfwRoYpN0X3jKkagky6ABT/YGnXxnspbgw0svsa+8ZGkxFGaS5WambDWWAwQlKYIq8EIP3PPkKT/0wAJIDqSHWcpJLQlAC42aFuBlkETqAydGsIKIFGHXAgDsAJRHGnP0LbL/eorml57Tw5AImFuKz0K4QDTjbbc0N4qrvP7+p0yABWY5sKTqf7mmAHMuHVy5ATg9k5wJ+VoZ/n/79Z2JkZCQqyElNhKCOMB8Lwz+cDjAVYGw69f5P3ac/xIWMy4rLJPkW6MG/QDuaUeqXge6eAwQYABvvATpIEEu4AAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-cpp {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAoBJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwx4gIUp4F/wHIsfu9Tht//yCvQSHLA9fc/Ge58/IUidvHtDwZtIXYGViZGsBxIDdUd8Ovvf4bpV94xzLj6nkGQnRlFbuejLwyusjxgNkgOpAakFqSHKg648u4nQ9ah5wxiXCwME2wkGIQ5EA4ABfs1oLy+MAeYD5IDqQGpBekB6SWpLsAGqk+8ZJjhIMUgyYWp9NiL7wyWEpwMTIwIMRAzWImPwUqCiyHjwDOGjV5ylIWALA8rw9YHn7Emst2PvzC4yfFgiIPUgvSA9FIcBZNsJRl42ZjAQYqcwL78/sfw4tsfBmU+NoyEClIL0gPSS3EUgII3XIWfwRoYpN0X3jKkagky6ABT/YGnXxnspbgw0svsa+8ZGkxFGaS5WambDWWAwQlKYIq8EIP3PPkKT/0wAJIDqSHWcpJLQlAC42aFuBlkETqAydGsIKIFGHXAgDsAJRHGnP0LbL/eorml57Tw5AImFuxZaFeIBpzttuYGSWIo1fef36RnQ5ChyIYh85EtxidG1TRAyFCy0wA5ABbk6CFErENZyLUUPbjJDSEUB/CzMvz79O8/EyMjI4aBhBIXMQDUEeZjYUBppTIi947LdlypP/X+f92nP7QpH4Ae/GsqwNjc5aHTiNUBAwEAAgwALWAgpic4qfUAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-cs {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAoFJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwx4gIUp4F/wHIsfu9Tht//yCvQSHLA9fc/Ge58/IUidvHtDwZtIXYGViZGsBxIDdUd8Ovvf4bpV94xzLj6nkGQnRlFbuejLwyusjxgNkgOpAakFqSHKg648u4nQ9ah5wxiXCwME2wkGIQ5EA4ABfs1oLy+MAeYD5IDqQGpBekB6SWpLsAGqk+8ZJjhIMUgyYWp9NiL7wyWEpwMTIwIMRAzWImPwUqCiyHjwDOGjV5ylIWALA8rw9YHn7Emst2PvzC4yfFgiIPUgvSA9FIcBZNsJRl42ZjAQYqcwL78/sfw4tsfBmU+NoyEClIL0gPSS3EUgII3XIWfwRoYpN0X3jKkagky6ABT/YGnXxnspbgw0svsa+8ZGkxFGaS5WambDWWAwQlKYIq8EIP3PPkKT/0wAJIDqSHWcpJLQlAC42aFuBlkETqAydGsIKIFGHXAgDsAJRHGnP0LbL/eorml57Tw5AImFvxZaFeIBpzttuYGhjiyGNbq+89v8rMhyBJ0S0F8ZHF0NTRNAzCLYI4gJgRolgiRHUE3B8AsRPY9qY5gRO6cOq64/PfTPxYmRkZGmiRCkF28jH/+HYjUZcaaCE0FGJtOvf9T9+kP7pBxWXGZJHFkwM/K8BdoRzPOEBgIABBgAMrJHxYdaBS2AAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-fla,
-.list-list .ico-flv {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAYFJREFUeNpi/P//P8NAAhZkzrVr1+yBVBcQm1HRDkMgvoAsoKWlhd0BQLBCAgh4eXmpYvPt27dB1GogDkV3BAwwofEluLm5Gf79+0cVDALy8vK7oI4wIMYBVAdsbGxZQEccweUIJnokNKAjEhQUFM5hcwQLLS3m4+ODpQMQCIPS54GYkS4OEBUVZRAXF8eWMMkLgZf1fQx/37yD85lFhBjEG4sYPizfCOYLRPpj6IElRqLKAWIAyBIuG1OqhRITwwCDAXcAyVEAim9YnLNrKDMI5ybS1wGjaWDA0wAu8O3IaTCGAVDaAKURQoARuUECbA/8V1ZWpqmP7969C2oPMI6mgVEHDM5syNI+k+EhkXn0DyUWLp6I2w5cliq1laDw71X1gMVANDa12MSxOZykggiXoXRLAyCfoYcELt8TUkfTECDWcqo3StHjHl9awB4F3Fx//5NhKbE+/g+1A2dldGPCrBqm6/caGb59Z6JJNuTi/PdPU6leoyCtBasDBgIABBgAWP2ttPWI30cAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-css {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAALdSURBVFiF7ZfLTxNRFMZ/M/RBnwik0FYpoJIYhJioLFSIupCoWzVqotGNCeEPcGPiI+50Q9xAYli5MaEbFyTiI0EWhhghGkohlgVREVzQhpfals64qB067ZRpoaALv6Rp73dPzvnuud/cOxVkWeZvwpA+CAaDZ4BewFPEGoeBkXSisbFRWwDQ6/V6PTabrSiVQ6EQQB9woaGhYUQrRswYeywWC5IkFeUD4PP5BoC+UCh0KB8BRYfZbO6ora19A/i1RGy5AACTyXS9rq5uWEtEpgeKCqfTmfIBwKU/3+8BYVsEuFwuqqurVVyaoK0XAChmzIVNe0CS4drrGeLSxg60ggRMRKJMLcRU3Mf5X+yvMGMUBaYWYkxEosUXEEvIdAfC9IxHKDeXqOYGPi9zqsYOQLm5hJ7xCN2BMLFEfh3RFRAIR+kcmqXKaqCr1U1l6ZqAuCQTDEc5UFkKQGVpCV2tbqqsBjqHZgmE9buha8Jbw9/pOeHFY80OfTv3kyNuC6KwxgnAud1OjrqtdAx+49lZ37r5dTtQYzfSP72kabKXX5Zp99mz+Lgk0z+9RI3dqJdeX8CjNg8Ok0jn0KzKYMtxibkfq+xxmlTxE5HkljlMIo/a9C9V3S0QBbi4t4xjbisPP8xzo7GcpgozgzMrHPdaVbGBcJTHwQh3W1zstOmvHgp4DHfZjXS1uql3JBO/+rqiuD+FekcyJt/iUOBJKAA2Y1JzV6s7az41Vwi25Tb8L+CfFqAy4ZWRBIx8UsaiIX835wNpNQ7A6NpLcfZToFX0xfl9yu92/+SGedFgVETkFKBVPDN5u3+yYD4XhPR/RgefjMmZHVgvQWqlmfO5eEhuw+jVZuX62pQJ2/2Tyqrz4bVQsIBU0sx91uNzQbUFJ5+OJRYlgygIgiqoWCaUZRmHsCoNXm5W3mpUAm4+D9x5F5FvL65uzflQZiTRskO4/+B00z1NAQqZ0YFiI73mb2NmSwowsJSgAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-js {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAALFSURBVFiF7ZfLTxNRFIe/GTotffJKoa1SQCUx1cSFslBLdKFNdKtGFya6MSH8CybG6NJNwwYS496EblywwEeCLAwx1mgshVgWREVwQRteamk746K2dNopM5WCLvwlTXvPPTn3u+f+5lFBURT+pkylg3g8fgF4BHjruMYJIFoaCAQC2gDAI5/P57Xb7XVZOZFIAIwCV3p7e6NaOWLZ2Gu1WpFluS4fAL/fPw6MJhKJ40YA6i6LxTLQ1dX1EohoQew6AIDZbL7Z3d09pQVR7oG6yuVyFXwAcO339xtA2BMAt9tNR0eHKlYCtPsAQNGM1bRjD8gK3HixQEb+sxtaTQAzqTRzK5uq2PvlnxxptSCJAnMrm8yk0vUH2MwpDMeSjEynaLE0qObGP61zvtMBQIulgZHpFMOxJJs5Yx3RBYgl0wxOLtJuMxEOemhr3ALIyArxZJpjbY0AtDU2EA56aLeZGJxcJJbU74auCW9PfWPkrA+vrTL11dIPTnqsiMJWTAAuHXBxymNjYOIrTy76t62v24FOh8TY/JqmyZ59Xifkd1TEM7LC2PwanQ5Jr7w+wFC/F6dZZHByUWWw9YzM0vcsB11mVf5MKn9kTrPIUL/+Q1X3CEQBrh5q4rTHxoN3y9wKtHC01cLEwgZnfDZVbiyZ5mE8xd0+N/vs+ruHGi7D/Q6JcNBDjzNf+PmXjaL7C+px5nOMLg413gkFwC7lmcNBT8V8Ya4W7cnT8D/APw2gMuH1aA6iH4tj0WTczUYkZzMAvN16Ka68Cowu+vTyYUKR2eLvggoxLYkmqQhRFaBWlYJojfVUFw8Y7YCWdtyBWo+hXDV1oHSR8lgoMlvz7qGsA00S8qqsiIIgVMuvgAhFZg3vXlEUXCZUb6kqgL5m4d7rVPbOala7M+cef9AsXC1eriaJXF+zcL80Jhj5e75dR7aTkdq/AFCYGAYKWHWoAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-htm {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAnhJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwx4gIUp4F/wHIsfu9Tht//yCvQSHLA9fc/Ge58/IUidvHtDwZtIXYGViZGsBxIDdUd8Ovvf4bpV94xzLj6nkGQnRlFbuejLwyusjxgNkgOpAakFqSHKg648u4nQ9ah5wxiXCwME2wkGIQ5EA4ABfs1oLy+MAeYD5IDqQGpBekB6SWpLsAGqk+8ZJjhIMUgyYWp9NiL7wyWEpwMTIwIMRAzWImPwUqCiyHjwDOGjV5ylIWALA8rw9YHn7Emst2PvzC4yfFgiIPUgvSA9FIcBZNsJRl42ZjAQYqcwL78/sfw4tsfBmU+NoyEClIL0gPSS3EUgII3XIWfwRoYpN0X3jKkagky6ABT/YGnXxnspbgw0svsa+8ZGkxFGaS5WambDWWAwQlKYIq8EIP3PPkKT/0wAJIDqSHWcpJLQlAC42aFuBlkETqAydGsIKIFGHXAgDsAJRHGnP0LbL/eorml57Tw5AImFtQstCtEg8FtzQ04GxsAycPkYGqR1SOL/fvzm7IGCbJjkA2maRoAWYbL97hCglgHMhHra2r4li65ABYKxDoYxQH8rMAmHg07qyCz+VgYUFqpjMgWlu24Un/q/f+6T39oUz4APfjXVICxuctDpxGrAwYCAAQYAPufFoHFXwuVAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-html {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAnpJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwx4gIUp4F/wHIsfu9Tht//yCvQSHLA9fc/Ge58/IUidvHtDwZtIXYGViZGsBxIDdUd8Ovvf4bpV94xzLj6nkGQnRlFbuejLwyusjxgNkgOpAakFqSHKg648u4nQ9ah5wxiXCwME2wkGIQ5EA4ABfs1oLy+MAeYD5IDqQGpBekB6SWpLsAGqk+8ZJjhIMUgyYWp9NiL7wyWEpwMTIwIMRAzWImPwUqCiyHjwDOGjV5ylIWALA8rw9YHn7Emst2PvzC4yfFgiIPUgvSA9FIcBZNsJRl42ZjAQYqcwL78/sfw4tsfBmU+NoyEClIL0gPSS3EUgII3XIWfwRoYpN0X3jKkagky6ABT/YGnXxnspbgw0svsa+8ZGkxFGaS5WambDWWAwQlKYIq8EIP3PPkKT/0wAJIDqSHWcpJLQlAC42aFuBlkETqAydGsIKIFGHXAgDsAJRHGnP0LbL/eorml57Tw5AImFkgW2hWiweC25gacjQ2A5GFyMLXI6mHyyHL//vwmLxsiOwbZQJqmAZBluHyPKyRIdSATIYOp6Vua5gJs8U2yA/hZgU08GnRWYVEJMpuPhQGllcqIbGHZjiv1p97/r/v0hzblA9CDf00FGJu7PHQasTpgIABAgAEAooAb7fMLYAoAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-java {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAvRJREFUeNrUV0toE1EUPfPJTJNp82lNY1PaBGwtpn6q9bNQQRFFpSAKgrgQu3PpXlBEBMGNWwU3LtwoxYULhSoKgkJbawVDta3WT5XWEPpL2iSTifeNjqY6TeNkavDA5c375N1z7z3v8cLlcjmUE2J+JxqNHqDmOlmdjT42k/XlD0QiEXMCzHkwGKxTFMUWz0NDQ6y5RXa0ubm5z2wN/1u/zul0QtM0W4yhsbHxPiNBZNqLIWAZI+PzpuOyLJ8KhUKP6fO2GQlbCLyPpfAhll50XpKkk+Fw+JkZCbFU56qWw72BKRxq9/0x53a7DR0wHPvR9pJxthCYSmbR1RPHnlY32GEei6cRrJZ+7u73+xEIBMyEWXoJBt4ncfXBOLavrkLv2wSVIIX6POcGzIRZMoGZ+Szu9MbRuasW/aMJ+BQB25oqLQViiYDIcwj7ZfirRF0D6az129QSAafEY+uqSnyZzKBjow89IwlEx+b+HQGGNfVOVDg4uJ0C2kIuVMr88hNgwnv+LoHYjKr3fYoIjlS3b71Hzwq7jNJqDk9ez+Bu/yS0IipT9DFkG8dnVYxPZ/DyYxJM0FnyUOHg4RA5NNRIlAkFEn3vaKnCtYcTiH5KYm2Dyx4CbOPddN5Hv6b0aAMex4J5Rkbgvx9ClURpCNW2DBiYoAw8fTMLmerPiLhkQXfICO7f4NXHWIlO7FwBUeDsIZBMaxj8PId6n6Srn1kheFyCnhHbCDyKTuMFXThNKyvgdYkUNdWdNmcOHMKvtCdSml4iNn94S/Xfv4gWw8E2L/au8+jpj02rmJrLIp5QkSFhZsixTOmXSYw1dDF1bPLqp8PSk6wQWKSsBMzsBI8yo+wEFpTgUjddXd3Dy+70RqRABiRZXmCXO1tt7f/fGrh4vAlnbg7rrYH8vjFfaH3JGSi0mZX14lLRFtM3oix2/aIZUCT2btSW/JFVsL1d5CN/jMv/d3yl69W5wQmcTaaXR5wUYLalFhdOH2k9b0qgHPgmwABqjFw0GGyiFAAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-log {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAVBJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkLQSevnqLU05aTBivXlhiJKocINcSSgATwwADiqOA0pAbjYLRKBiNgtEoGHXA4MoFE+fsooulM/twt4pBzScMDY3VmQz1rdMxxGAAWQ6XOAz8+vWL9GxIyEEwPi7xAUsDhCynqQNAvkeODro7gBjfY6QBLk62f79+/2MCAqw+ghkMi290y9DFsTVQQXYgizEi946nzllbf+f+y7pv33/RJGS4ONn/qiiKNWenBDdidcBAAIAAAwBHPa+btF94QQAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-mht {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAnVJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwx4gIUp4F/wHIsfu9Tht//yCvQSHLA9fc/Ge58/IUidvHtDwZtIXYGViZGsBxIDdUd8Ovvf4bpV94xzLj6nkGQnRlFbuejLwyusjxgNkgOpAakFqSHKg648u4nQ9ah5wxiXCwME2wkGIQ5EA4ABfs1oLy+MAeYD5IDqQGpBekB6SWpLsAGqk+8ZJjhIMUgyYWp9NiL7wyWEpwMTIwIMRAzWImPwUqCiyHjwDOGjV5ylIWALA8rw9YHn7Emst2PvzC4yfFgiIPUgvSA9FIcBZNsJRl42ZjAQYqcwL78/sfw4tsfBmU+NoyEClIL0gPSS3EUgII3XIWfwRoYpN0X3jKkagky6ABT/YGnXxnspbgw0svsa+8ZGkxFGaS5WambDWWAwQlKYIq8EIP3PPkKT/0wAJIDqSHWcpJLQlAC42aFuBlkETqAydGsIKIFGHXAgDsAJRHGnP0LbL/eorml57Tw5AImFtQstCtEA0y7rbmBVQzEhsnBxNEBst5/f37TtkGC7BhkiylKAzCf4jIYJIbL93RJhCAHEeNbihyAHt80yYb8rMAmHg07qyCz+VgYUFqpjMgWlu24Un/q/f+6T39oUz4APfjXVICxuctDpxGrAwYCAAQYAIH+FoEeflonAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-php {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA1ZJREFUeNrsVktPU0EUPn3dPq73QmmbFlRaAw1Q5KUiYCIkmmjUGEMUdGWMSze6cmViTFwYVv4Aw8KNRhe6kA0SAonRGGNBHpWkBAXFIFAeLS307ZyB1ku90EJvdeOXTO7c6XS+b8755tyRxeNx+JdQCl9cLlcLeXSQdlRCjjrSBoUDDodDXADBUwsBx3GSMLvdbnw8J63NbrcPis2Rp7xbWJaFWCwmSUNYrdZuFEHE1GYiQHIwDHODiHizlQj53zAaEXHNZrM5xUQoc0nM83zCB4j2jecAabJdCVgLx8D5xQ9j06swOR+CGDnCkWgcWLUCrCY1VO3XQlWxDhTy9fVNJhOYzWYxY+48Akj8eniZkOjgdE0+mHgVMMp1In8wBnPeMJ3TM+KFC0f0YLdo6G8JM2ZUB7ZCn8tLCW6esYBG9ds27pk1sns5FOkZYEkEbKShmGfvPOBbjcKhA2zatdOacGI2SMIdhLZGwyZyBI5j+IVAQVebjfB+fIWK3lElFEM/2f3Zunzax0WnF0IgI5E/V6eHmaUwdA8tQa2N1A5S0Ycm/RAhET9RycOp6jzo/+yDSw0F2UVgZjkM5jwV7X+dC0JLBQ+lZg18J0ICJNwXGwzwaTJAhVXs1dL8D5H3YqMapkiEsk6B8GPl8UVAv0cJPxZDNNScVgFoeJVCRsONXvjmCdHxTJFWgJFTUUKaL0L08sMC5OmUEIrEwWpkqOlYzfoyvaNeGJ4KQH0JS71TSARl7YGTB3l45VyC9sYCKCvS0BQkaoKJV9LdN9k56B1ZhvOH9clj2eVchCvHDNlHoITku5Sc6SdvPVBWqE2O44nAhkUH09G8IQzT9Kh3Fo6XczQlWUcAga42kNx39s3SAlNtZYHTyJMEaEDfWhS6Bvy0QrbW66G8SLvzC8l2qLHqwLFPS3P8cWIF5slOkRhNiLnGyohV8nKTIVmKJRWAwHxjdcukwkl2CnKN/wI2eeBBD6l6PeM5J33s2MaEjFr9xx86rpcm+7c7x5NjqX2xeakIBYO7SwEumEqSzTxJ7oSZkkgiIEEmDK0wBdvNk0RApgtmOk/UAywD0XSXyGyAayOHcEwmvHA8fDF6Z+wn3AuEclMfdAzEys1w91Zr5X1RAf8CvwQYAB0rcvQMbg3OAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-url {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAr5JREFUeNpi/P//P8NAAhZkzrVr1+yBVBcQm1HRDkMgvoAsoKWlhd0BQLBCAgh4eXmpYvPt27dB1GogDlVVVb2ATQ0TGl+Cm5ub4d+/f1TBICAvL78L5AigYwyIcQDVARsbWxbQEUdwOYKJHgkN6IgEBQWFc9gcwUJLi/n4+GDpAATCoPR5IGakmgP+/P/LsP/FJYZzb+8wMDEyMchyizD4yVgwcLGwM4iKijKIi4tjS5jkh8DLHx8Ytj45xXDj4xOG59/fMfCwcDBYi2kxBMpZMajxSYPVgMRBDgABWGIkqhwgBO5+fs7QcWUVw4+/vxn42bgZtATkGAwElRjWPDzCsPf5RYZcTT8GIyFlBklOIfIKInwAZOnE6xsZ/gB9FKfszOAqaYgoWIAOmXlrG8P0m1sYuoyTGQTZeIh2ANG54Oirqwzvf31hiFC0R7EcnNe5xRhKtUMY/gGL9d3PzpNfFOMN/i8vGJR5JYHBfZhhyb19eNQ9J8kBRIeAOIcAgzA7Lzgq8IGfBOTJDgE9QUVwYmszTABnNWoBokPg+OvrYHrD42NY5S+9v88Qe6SH4dy7u7RxAMgCHQF5hlNvboFzw+sfH8Hiv/79AWbBC2AxDX5ZcDakSRR8+v2dockglmHu7Z0Mx4ChcebtbXBh8+3PT7A8yHHZGr6UNUjwATEOfgYWRmaGTHVvBlMRNYbTwJB4+u0tg7iAANByBQZHCT3KW0T4QISCHcPBl5eBiVGBwUBIicFEWJX6TTJ8ABS/IExtQJf2wKB2AEoUTHixg4HhBe0tnYXUKiYqBNqdMrDyQTQyxqWeau0BbKBy3wwUi5H5Qy8NkAOQg5tU3w+KKEBxADcT+9+v/34yY7OEVJ/C1KOrBdmBzGdE7h1PPbGm5vaPF43f/v2iSdrgYmL7p8ohUZ9tEdKC1QEDAQACDADzFSd59WqSKgAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-xml {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAnhJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwx4gIUp4F/wHIsfu9Tht//yCvQSHLA9fc/Ge58/IUidvHtDwZtIXYGViZGsBxIDdUd8Ovvf4bpV94xzLj6nkGQnRlFbuejLwyusjxgNkgOpAakFqSHKg648u4nQ9ah5wxiXCwME2wkGIQ5EA4ABfs1oLy+MAeYD5IDqQGpBekB6SWpLsAGqk+8ZJjhIMUgyYWp9NiL7wyWEpwMTIwIMRAzWImPwUqCiyHjwDOGjV5ylIWALA8rw9YHn7Emst2PvzC4yfFgiIPUgvSA9FIcBZNsJRl42ZjAQYqcwL78/sfw4tsfBmU+NoyEClIL0gPSS3EUgII3XIWfwRoYpN0X3jKkagky6ABT/YGnXxnspbgw0svsa+8ZGkxFGaS5WambDWWAwQlKYIq8EIP3PPkKT/0wAJIDqSHWcpJLQlAC42aFuBlkETqAydGsIKIFGHXAgDsAJRHGnP0LbL/eorml57TwhAATCysK3hOhi5UPorHJIcujmwXCJEeB25obDLtCNMBsEA3i0z0NwByBbjk1HDc0cgHMdzDfEhM6ZDmAnxXYxEPrrCIbjssR+ByOrB5kNh8LA0orlRHZwrIdV+pPvf9f9+kPbaIG6MG/pgKMzV0eOo1YHTAQACDAAOGRHaFJlGXVAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-ai {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAg9JREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByK7ggYYELjS3JycjL8+/ePKhgE5OTkdkIdYUyMA6gO2NnZM+Tl5Q8CmWuwOYKJHgmNjY0tQUFB4QQ2R7DQ0mI+Pj5YOgCBCCh9BogZ6eIAAQEBsCMYGRnh+OHDh7SLgvdXNjK82N8K57OysjIwMzMTXw4QC96dX87w7elRBin3HgYmVg64uKCOP5D0R7WAhYXh79+/OM0iOQT+/f4BtpyJjZfh65MzROkBhQITExM4Cih2AMhSNkFVBl5Vb4bvz1DLljen5oCjARuApQGKHQCylFPKmIFTQofh1/vbDL8/vSBaL8UOAFkGspRbxoSBhVOAgUPMgOHbi8sUJVySHACyDGQpLOGxi2owfH2wj3q1IcH4B1r279dnhidbclCj5cU1YJRo0dYBIEtAAD3rgbLk9+cXyXYA0VEAsoRDVA/FchDglNQHZ0tQ9iQHMCK3iIANkv/Kyso0rZju3r0LapAw0rU2pFouGHUAzVvFLEfSGR4eoYOFWodxhwA7C3FYLWweXj4uPDzSgHzQPIaH65LA9IAlQmpYTlaTDOZ7XHzKQoCV798/GvZVwWaz8v7DWRfc2Fxbz/TmbB3D78+0SZxsfH//CRs1a/g2N2J1wEAAgAADAIk82p3e8s5qAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-bmp {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAmtJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgTqTi1guPH+MVkO0BCUZWgySyC+HMAGQJavcq8lywFhO5tJK4gIgfNv7jDMuLIZzM7Q8WUwFFGhOJpIygUgywv1Q8AY5hC6OgAGGIFpmFo1CElRkKHty9B3cQ0DE9AFmUA23R1gKKrCMMuhEKvc+59fGA49u8Tw5MtrBjZmFgZNQXnqOwAXAFm88f5xBjdZYwYXIP725wfDqZc3qeeAv///MRx5foXh3OvbDF9+f2eQ4BJicJDWZ1Dll2a48OYuw9EXVxlaLRIZOJjZEKEFzCF7n5yjjgOaTi9m4GblYHCVMWYQYOdhePb1DcP86zuAYpwMr769Z2ixSEKxnOppQFVAmiFGzQXOV+STYLCQ0GK49OYegxS3MAMv0CE0S4SsTCwMm4DxC8KkAnUBWcodsNS1kqZVNV3aA4PaAShRMOHFDgaGF7S3dBaeVjEDFzM7anvAKhs1Sx6biiIO46OLIetDVvPt708yygE0S5D5xOjDp4eoNAAyAIaRDUL2KSkOo1sIYIsmqldGsFDAZgkxDkVxABcT2z9gxcPEzMiEMyGSE8zIlRrIDpTGDXLveOqJNfW3f7yo+/bvF03KB24m9r8qHOLN2RYhjVgdMBAAIMAA9C4L2PHEWagAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-cdr {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAmRJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgTqTi1guPH+MVkO0BCUZWgySyC+HMAGQJavcq8lywFhO5tJK4gIgfNv7jDMuLIZzM7Q8WUwFFGhOJpIygUgywv1Q8AY5hC6OgAGGIFpmFo1CElRkKHty9B3cQ0DE9AFmUA23R1gKKrCMMuhEKvc+59fGA49u8Tw5MtrBjZmFgZNQXnqOwAXAFm88f5xBjdZYwYXIP725wfDqZc3qeeAv///MRx5foXh3OvbDF9+f2eQ4BJicJDWZ1Dll2a48OYuw9EXVxlaLRIZOJjZEKEFzCF7n5yjjgOaTi9m4GblYHCVMWYQYOdhePb1DcP86zuAYpwMr769Z2ixSEKxnOppQFVAmiFGzQXOV+STYLCQ0GK49OYegxS3MAMv0CE0S4SsTCwMm4DxC8KkAnUBWcodsNS1kqZVNV3aA4PaAShRMOHFDgaGF7S3dBaeVjEDFzM7Cr/WPhHObj44H0OMGHFk8O3vT+ITIchAZEOQ+aSKUyUNEDKM5pURMQBblFEtBNDjGFcowTAx6lFCgIuJ7R+w4mFiZmSCG4bLR6T6FFapgexAadwg946nnlhTf/vHi7pv/37RpHzgZmL/q8Ih3pxtEdKI1QEDAQACDAD7sQauaYXLQgAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-gif {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAmBJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgTqTi1guPH+MVkO0BCUZWgySyC+HMAGQJavcq8lywFhO5tJK4gIgfNv7jDMuLIZzM7Q8WUwFFGhOJpIygUgywv1Q8AY5hC6OgAGGIFpmFo1CElRkKHty9B3cQ0DE9AFmUA23R1gKKrCMMuhEKvc+59fGA49u8Tw5MtrBjZmFgZNQXnqOwAXAFm88f5xBjdZYwYXIP725wfDqZc3qeeAv///MRx5foXh3OvbDF9+f2eQ4BJicJDWZ1Dll2a48OYuw9EXVxlaLRIZOJjZEKEFzCF7n5yjjgOaTi9m4GblYHCVMWYQYOdhePb1DcP86zuAYpwMr769Z2ixSEKxnOppQFVAmiFGzQXOV+STYLCQ0GK49OYegxS3MAMv0CE0S4SsTCwMm4DxC8KkAnUBWcodsNS1kqZVNV3aA4PaAShRMOHFDgaGF7S3dBaeVjEDFzM77raBVTYiax6bChcDsZHlkOXRwbe/P8krCWEW4eLjs5QmaQCbZSBHoYcETeoCmCUDFgLkWERUCHAxsf0DVjxMzIxMWC0lNXixVWogO1AaN8i946kn1tTf/vGi7tu/XzQpH7iZ2P+qcIg3Z1uENGJ1wEAAgAADACWJ9+r79LDyAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-ico {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAaVJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLBSZ/Pc3w+/HVxhYZHUYGJlZMaT5+Phg6QAEIqD0GSBmpIoDfl7Zx/Dt4EIGLvt4BnZ9dwx5UVFRBnFxcWwJkzohwKpoxMD+9gmYxgVgiZGocoBUwMQnysDllEy9gogU8H5SFJzN5ZjEwK7rQp4nyHUAl1MKGFMKyHYAu44TGA+YA6gFRh0w4A5goTQLgsC3/fPAGAQE85bR3gGc1pEDGwIcxr6jiXD4OIARuVn+sECTLm10+QnX8TRIWNixa6rewvCw1QfOhjsaKoZPHAX8+UlZLkB2CDIflzjN0wAxlgzvXIAc7xSXhP85Bf4x/vrKxMDIhDfIsSU2XOIo4P8/oB38/3BmwzuzCutZ7h+vY/z+kSZR859L4O8fBYtmlbT+RqwOGAgAEGAAjiC9hXL1ZWMAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-jpeg {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAnpJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgTqTi1guPH+MVkO0BCUZWgySyC+HMAGQJavcq8lywFhO5tJK4gIgfNv7jDMuLIZzM7Q8WUwFFGhOJpIygUgywv1Q8AY5hC6OgAGGIFpmFo1CElRkKHty9B3cQ0DE9AFmUA23R1gKKrCMMuhEKvc+59fGA49u8Tw5MtrBjZmFgZNQXnqOwAXAFm88f5xBjdZYwYXIP725wfDqZc3qeeAv///MRx5foXh3OvbDF9+f2eQ4BJicJDWZ1Dll2a48OYuw9EXVxlaLRIZOJjZEKEFzCF7n5yjjgOaTi9m4GblYHCVMWYQYOdhePb1DcP86zuAYpwMr769Z2ixSEKxnOppQFVAmiFGzQXOV+STYLCQ0GK49OYegxS3MAMv0CE0S4SsTCwMm4DxC8KkAnUBWcodsNS1kqZVNV3aA4PaAShRMOHFDgaGF7S3dBaeVjEDFzM7hoZa+0SG5oPzwTQMgPgwOWSATRwmBgLf/v6krCREtgDGRrYAXQ4bn+ppAGQBekhgczRV6gKYRciG4rMAm3qiQwCbr0AG4bOQFN9jhAAXE9s/YMXDxMzIRFT8YXMozIHYHA+q1EB2oDRukHvHU0+sqb/940Xdt3+/aFI+cDOx/1XhEG/OtghpxOqAgQAAAQYA3ogNywRusk8AAAAASUVORK5CYII=")
-}
-
-.list-list .ico-jpg,
-.list-list .ico-JPG {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAm1JREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgTqTi1guPH+MVkO0BCUZWgySyC+HMAGQJavcq8lywFhO5tJK4gIgfNv7jDMuLIZzM7Q8WUwFFGhOJpIygUgywv1Q8AY5hC6OgAGGIFpmFo1CElRkKHty9B3cQ0DE9AFmUA23R1gKKrCMMuhEKvc+59fGA49u8Tw5MtrBjZmFgZNQXnqOwAXAFm88f5xBjdZYwYXIP725wfDqZc3qeeAv///MRx5foXh3OvbDF9+f2eQ4BJicJDWZ1Dll2a48OYuw9EXVxlaLRIZOJjZEKEFzCF7n5yjjgOaTi9m4GblYHCVMWYQYOdhePb1DcP86zuAYpwMr769Z2ixSEKxnOppQFVAmiFGzQXOV+STYLCQ0GK49OYegxS3MAMv0CE0S4SsTCwMm4DxC8KkAnUBWcodsNS1kqZVNV3aA4PaAShRMOHFDgaGF7S3dBaeVjEDFzM7/vaBVTZD07GpYBqeTYF8ZHls4jDw7e9P6pWEMAuQHYXuGGyOoFsaIGQ5xSEAC25sFuGTIysEkOMW2Ye4LCDG9xghwMXE9g9Y8TAxMzLhTYD4ghybQ5ErNZAdKI0b5N7x1BNr6m//eFH37d8vmqQNbib2vyoc4s3ZFiGNWB0wEAAgwADnlgGzkKaAXwAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-png {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAmhJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgTqTi1guPH+MVkO0BCUZWgySyC+HMAGQJavcq8lywFhO5tJK4gIgfNv7jDMuLIZzM7Q8WUwFFGhOJpIygUgywv1Q8AY5hC6OgAGGIFpmFo1CElRkKHty9B3cQ0DE9AFmUA23R1gKKrCMMuhEKvc+59fGA49u8Tw5MtrBjZmFgZNQXnqOwAXAFm88f5xBjdZYwYXIP725wfDqZc3qeeAv///MRx5foXh3OvbDF9+f2eQ4BJicJDWZ1Dll2a48OYuw9EXVxlaLRIZOJjZEKEFzCF7n5yjjgOaTi9m4GblYHCVMWYQYOdhePb1DcP86zuAYpwMr769Z2ixSEKxnOppQFVAmiFGzQXOV+STYLCQ0GK49OYegxS3MAMv0CE0S4SsTCwMm4DxC8KkAnUBWcodsNS1kqZVNV3aA4PaAShRMOHFDgaGF7S3dBaeVjEDFzM7anvAKhuRHY9NRRFD5qPLIcsjg29/f5JRDmCxCGvjBU2ekHqK0gDIYGTf4nM4xQURepBTUw8Tsb7FZhC+UCDWsSghwMXE9g9Y8TAxMzLRJFpAlRrIDpTGDXLveOqJNfW3f7yo+/bvF03KB24m9r8qHOLN2RYhjVgdMBAAIMAADIwGkBp21VIAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-psd {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAkRJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByK7ggYYELjS3JycjL8+/ePKhgE5OTkdkIdYUyMA6gO2NnZM+Tl5Q8CmWuwOYKJHgmNjY0tQUFB4QQ2R7DQ0mI+Pj5YOgCBCCh9BogZ6eIAAQEBsCMYGRnh+OHDh/SLAlZWVgZmZmbiywFCYMKxewyvvv1CZHAJPoYgHSn8FrCwMPz9+5c6DgCBcC1JBn0pfoaXn38wLL/8jOHA3dcMDsqiePWAQgFU4mIrdclOA+K8HAyWMgIMl15+Ajvg5KN3DBtvvYLLt7looKgHxT9VQgAbAIUGyPIMYzkGOUEunOqwOYLsRPjo/TeGPfffMuiJ8zEIcLKCxd5//01ZZUQMWHntORiDgL+aGIO5nBA8bex/8JZhy+1XDC6KwnBxqjsAlgjRAUgMhC8++wh2oCQwjeCLDpqVAwpCXAzcrMwM3//8pU0I4EoPM84+gvPdgFGgLspLlF5G5LwJbJD8V1ZWpmnFdPfuXVCDhJGutSFd08CoAygqiGLOArPO2Vs0t/ScFp5syMTCiqFhmZ8anB216RaGOEwMWR26Whj49+c3eeUAsiUgNoxGFsPmQGyOoEoagDkCl0+pnghBlqH7CNkRNHcAyDJc8U+JI1DSAD8rw79P//4z4Wq9EBMFuBIsCICKfT4Whn8464KyHVfqT73/X/fpD23KB6AH/5oKMDZ3eeg0YnXAQACAAAMAI0n+E64by+4AAAAASUVORK5CYII=")
-}
-
-.list-list .ico-webp {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAo1JREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgTqTi1guPH+MVkO0BCUZWgySyC+HMAGQJavcq8lywFhO5tJK4gIgfNv7jDMuLIZzM7Q8WUwFFGhOJpIygUgywv1Q8AY5hC6OgAGGIFpmFo1CElRkKHty9B3cQ0DE9AFmUA23R1gKKrCMMuhEKvc+59fGA49u8Tw5MtrBjZmFgZNQXnqOwAXAFm88f5xBjdZYwYXIP725wfDqZc3qeeAv///MRx5foXh3OvbDF9+f2eQ4BJicJDWZ1Dll2a48OYuw9EXVxlaLRIZOJjZEKEFzCF7n5yjjgOaTi9m4GblYHCVMWYQYOdhePb1DcP86zuAYpwMr769Z2ixSEKxnOppQFVAmiFGzQXOV+STYLCQ0GK49OYegxS3MAMv0CE0S4SsTCwMm4DxC8KkAnUBWcodsNS1kqZVNV3aA4PaAShRMOHFDgaGF7S3dBaeVjEDFzM7Q5V9PEPbwYUYGmHitfaJKOLNB+eD5ZABTD+yWpC6b39/UqckBBmGDpAdjewJmFqQYyr3zSCcBkAaYT5CppEtABmGHhIgNTCMLQSpWheQEgIwh2LTg9MBsFBApqnpWKwO4GJi+weseJiYGQnnTvTEhRxd6KGBXKmB7EBp3CD3jqeeWFN/+8eLum//ftGkfOBmYv+rwiHenG0R0ojVAQMBAAIMAErgG/MeljhhAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-ape {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAZNJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwxElUOEAM+dpYTpY6/vJP0gohYQMhwYh1Jt1ww6oBB7QCiE+Gn/lqG/79+DZwDiLH887Q2hn+fP9ImChjZ2FBorIUOiZaTFAJ8hc2EfcPLD3YEiKa6A4gBvFlVo9lw6DmAEblZ/rwwhi5tdMn+JbgbJGyMjFg1Cdf0MbxtKULhwwBMHFkMWRwZ/ELrh1CUC5AthrGxWUpxGoBZgO5DXGqJUUdyCGAzFCaG7GtSQ4CFWN9j45NqGUEH/OPk/vfvxzcmSvImtsQJNx9UqQHtwJkNH8zur2e7f6OO8ftXmpQP/7i4//5W0GhWSC1sxOqAgQAAAQYADkDCgkQGXJUAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-avi {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAtpJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLKQa9vXnP4ajNz8z3Hj2g+HN5z9gMVE+FgZNaU4GS1UeBm52hJ/4+Phg6QAEIqD0GSBmJMsBV558Z9h45j2DvjwXQ6CpIIM4PytY/OXH3wwXH31jmLD9BYO/iSCDjgwnxGGiogzi4uLYEibpIQCyfOv5DwxJDqIMkgKsKHKywmxgbKzIzbDo8BuwGMwRsMSICzARG+wgn8fZimBYjpKFgHIgNSC1X378I8pjRDng+O0vDHpyXBiWzz3wmuH91z8YjgCpPXbrM/UccP3pdwYDYLyjg7svfzJM3fWK4faLHyjiILWgREo1B7z+9IdBShB70H/79Y9hwaE3DAeuIXwsCVT7+vMf6jmAIADWZ/+QKjVQumMm0mSicgEonz97/xuc0tEBBysTQ5iFEIOGFAdcDJQthXhYqOcAUCEDyufoDlAQZWcINhNkEEazDKRWQ5KDelFgocLDcPHhN4bnH36jiKc5iWJY/gKoBqTWSo2Xeg7g4WACl3CgQgbdEcgAJLcQqAakFqSHalEAL9mA6Wzu/tcMBgpcDIbArCbKxwrNJb8ZzgN9feHBN4YAU0RRTFUHgB0hy8mgKMYOrozWnHoProxAqV2El4VBXZKTodBLAqUyoroDQABkgZsePxhTA9ClPTCoHYASBR17gKlszx2aW7pIC08IsLGz48SdqZpE8dHFkfHQTQPNcUoMtYvugWkYQObD5GmaCJEtp0kiJOR7bHxYKJDje4wQ4GYDtSH/0Sy+QWZzAe1AFmNE7h1PWHe1/sYrhrpvv2iTOIEe/KsuxtBcEKTdiNUBAwEAAgwAcCQxq0cx9U0AAAAASUVORK5CYII=")
-}
-
-.list-list .ico-flv {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAuNJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLKQa9vXnP4ajNz8z3Hj2g+HN5z9gMVE+FgZNaU4GS1UeBm52hJ/4+Phg6QAEIqD0GSBmJMsBV558Z9h45j2DvjwXQ6CpIIM4PytY/OXH3wwXH31jmLD9BYO/iSCDjgwnxGGiogzi4uLYEibpIQCyfOv5DwxJDqIMkgKsKHKywmxgbKzIzbDo8BuwGMwRsMSICzARG+wgn8fZimBYjpKFgHIgNSC1X378I8pjRDng+O0vDHpyXBiWzz3wmuH91z8YjgCpPXbrM/UccP3pdwYDYLyjg7svfzJM3fWK4faLHyjiILWgREo1B7z+9IdBShB70H/79Y9hwaE3DAeuIXwsCVT7+vMf6jmAIADWZ/+QKjVQumMm0mSicgEonz97/xuc0tEBBysTQ5iFEIOGFAdcDJQthXhYqOcAUCEDyufoDlAQZWcINhNkEEazDKRWQ5KDelFgocLDcPHhN4bnH36jiKc5iWJY/gKoBqTWSo2Xeg7g4WACl3CgQgbdEcgAJLcQqAakFqSHalEAL9mA6Wzu/tcMBgpcDIbArCbKxwrNJb8ZzgN9feHBN4YAU0RRTFUHgB0hy8mgKMYOrozWnHoProxAqV2El4VBXZKTodBLAqUyoroDQABkgZsePxhTA9ClPTCoHYASBR17gKlszx2aW7pIC08aYGNnx9DQHKeEwq9ddA8sBqKR1eDjw8Cvnz/JS4TYDKNrGgD5CD0ksIUKPt9TlA0HPASIdSQpvsdwADcbqA35j4Fa0YIOQGZzAe1AFmNE7h1PWHe1/sYrhrpvv2hTPgA9+FddjKG5IEi7EasDBgIABBgAhSU3wy5Zmw0AAAAASUVORK5CYII=")
-}
-
-.list-list .ico-mkv {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAq1JREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYkayHfD333+GE4/fMVx88ZHhxecfYDEJXg4GfQl+BgtZIQZmJrjZDKKiogzi4uLYEiZ5IfDpx2+GBeceMvBzsDK4q4ozyPJzgsUff/zOcOTBG4azT98zJBjJM/AB5WEAlhiJKgcI+RxkuQ7Qp05KomCxGafugekMMyUGZSFuhn33XjPMB6rJtlBmYEEKCXyA6ER48sk7sM9hlsMAckEKkhMAqjkFVEtWSYgPXHj+ERzsyADkc3RgoyDCsPP2SwYrOWHqOuDpp+8MMnycKMGOjZ1opMDwDKiWWEBWOYAc7OhsRmDUMzEyUj8KpIG+fwL0GXKwY2PfffcVnC2pHgKgfA7KasgAFOywoIcBkBp1ER7qO8AcWMh8AJYDoKyGKzpAcg8/fAOnF2IBI3KDBNge+K+srEywIBLgZGWwlhfBKIhADowzlGNYevExgwgXO4OzsiiDKDc7ihl3794FtQcYyXIAclF8/tkHhldff4LFxICWGEoJwIviP0A1oLLg5OP3DIXWKngdQHJdALLAWl4YjHGmbKAaUDlATFlAl+p41AFEF0QxZ/8C26+3aG7pOS08IcDEwoqCt4ZogzEuMWQ5bGLofJpFweYANQbfDbdokwZABoMswGURuhgh9UMzF8B8hc03yD4mRj1OB/CzMvwjt7OKzRGY7Yj/DHwsDP9wVkZlO67Un3r/v+7TH9pEDdCDf00FGJu7PHQasTpgIABAgAEAZzJTrgcAEqEAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-mov {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAupJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLKQa9vXnP4ajNz8z3Hj2g+HN5z9gMVE+FgZNaU4GS1UeBm52hJ/4+Phg6QAEIqD0GSBmJMsBV558Z9h45j2DvjwXQ6CpIIM4PytY/OXH3wwXH31jmLD9BYO/iSCDjgwnxGGiogzi4uLYEibpIQCyfOv5DwxJDqIMkgKsKHKywmxgbKzIzbDo8BuwGMwRsMSICzARG+wgn8fZimBYjpKFgHIgNSC1X378I8pjRDng+O0vDHpyXBiWzz3wmuH91z8YjgCpPXbrM/UccP3pdwYDYLyjg7svfzJM3fWK4faLHyjiILWgREo1B7z+9IdBShB70H/79Y9hwaE3DAeuIXwsCVT7+vMf6jmAIADWZ/+QKjVQumMm0mSicgEonz97/xuc0tEBBysTQ5iFEIOGFAdcDJQthXhYqOcAUCEDyufoDlAQZWcINhNkEEazDKRWQ5KDelFgocLDcPHhN4bnH36jiKc5iWJY/gKoBqTWSo2Xeg7g4WACl3CgQgbdEcgAJLcQqAakFqSHalEAL9mA6Wzu/tcMBgpcDIbArCbKxwrNJb8ZzgN9feHBN4YAU0RRTFUHgB0hy8mgKMYOrozWnHoProxAqV2El4VBXZKTodBLAqUyoroDQABkgZsePxhTA9ClPTCoHYASBR17gKlszx2aW7pIC08aYGNnh7Ob45TAdO2iezjFYHx0MXQ9MP6vnz8pS4TIAJ9FVEsDIANhviTWAlL0DI1cAPMRKcFLrB6UNMDNxvDv579/TEBAkiXoiRAXADVQuYB2IIsxIveOJ6y7Wn/jFUPdt1+0iRqgB/+qizE0FwRpN2J1wEAAgAADAIjpSLqXWcBIAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-mp3 {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAZBJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwxElUOEAM+dpYTpY6/vJP0gohYQMhwYh1Jt1ww6oBB7QCiE+Gn/lqG/79+DZwDiLH887Q2hn+fP9ImChjZ2FBorIUOiZaTFAJ8hc2EfcPLD3YEiKa6A4gBvFlVo9lw6DmAEblZ/rwwhi5tdMn+JbgbJGyMjCh84Zo+MP22pQirGIyNTw0y+IXWD6FKFIAsQXYMiEYXoygNYDOckHpi1VIlBEAWYbOMaiGAbBg2H8GCGz3+SS4J/3Fy//v34xsTExXSBLZECGqe/gfagTMbPpjdX892/0Yd4/evNCkf/nFx//2toNGskFrYiNUBAwEAAgwArNbTCDlVe6IAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-mp4 {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAvBJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLKQa9vXnP4ajNz8z3Hj2g+HN5z9gMVE+FgZNaU4GS1UeBm52hJ/4+Phg6QAEIqD0GSBmJMsBV558Z9h45j2DvjwXQ6CpIIM4PytY/OXH3wwXH31jmLD9BYO/iSCDjgwnxGGiogzi4uLYEibpIQCyfOv5DwxJDqIMkgKsKHKywmxgbKzIzbDo8BuwGMwRsMSICzARG+wgn8fZimBYjpKFgHIgNSC1X378I8pjRDng+O0vDHpyXBiWzz3wmuH91z8YjgCpPXbrM/UccP3pdwYDYLyjg7svfzJM3fWK4faLHyjiILWgREo1B7z+9IdBShB70H/79Y9hwaE3DAeuIXwsCVT7+vMf6jmAIADWZ/+QKjVQumMm0mSicgEonz97/xuc0tEBBysTQ5iFEIOGFAdcDJQthXhYqOcAUCEDyufoDlAQZWcINhNkEEazDKRWQ5KDelFgocLDcPHhN4bnH36jiKc5iWJY/gKoBqTWSo2Xeg7g4WACl3CgQgbdEcgAJLcQqAakFqSHalEAL9mA6Wzu/tcMBgpcDIbArCbKxwrNJb8ZzgN9feHBN4YAU0RRTFUHgB0hy8mgKMYOrozWnHoProxAqV2El4VBXZKTodBLAqUyoroDQABkgZsePxhTA9ClPTCoHYASBR17gKlszx2aW7pIC08aYGNnx9DQHKcEpmsX3cMqBmOjq4GpQxb79fMnbaIAZAm6Y5DZFKcBZMPRfTUoEiHIUcgOI9aRTKQGMy6DYVGALe3giwoUB3CzgdqQ/6iaJpATJshsLqAdyOoYkXvHE9Zdrb/xiqHu2y/alA9AD/5VF2NoLgjSbsTqgIEAAAEGAKRaSLN4Zv7KAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-mpeg {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAwJJREFUeNrMV01ME0EUftS2221LscBSt0pbjBWsBjGAQRMT48FEL/5F44kYD8ajnjypMVw8cvFkSJSrxMSDMRoSUeNPDARJtKBVo0Sx0CZFC6Wldeu8laWz2y0sMoAvedmZN1/nfe/NezNQls/nYS3FTE/C4fAh8ukiKjL00UJ0gDaEQiF9Aujc6/WKDoeDiedIJIKfO0RPBoPBAT2MSTMXeZ4HSZKYKIrP53uIJAiZZiMEmAvHcef9fv8TMuzRI2FajUKzWq1nAoHAKz0S5qVuNp2R4Pn7JIyMpSGezMk2wWWGbRt52BN0goMrxORyuZQ6QDk99+0nWvZPBN5+m4F7/QnY6bfDsVY3eCossn38ZxaGRlPQ+SAKR1rcsGMT/5eYIIDH49ErzKVnAJ3fH5yEs/sFENdbVGu1VVZZm+sc0P0sLtsUEkoxlhKT0bRj5O37qoucq1qIrCEGsVNpyVBghgi8jExBo89e5LyrLwaJ6VwRCcS++JBkR2D4+ww0kXPXyqfxDNx4NAGRaFplRywWKTMCsV858Lr1U5+aleDW0zj0hQsRiwQbS+bYEVhUyHsmUY8a1t06gzsb6gLs87FEVq50rdgsJjjVVgkNXtu8Dduy0mlmRwAvGexzLYGAwMGJ3W6o0jhDbINoY3cEbVucMPQ1BT8msyr7uQNCkfMowSB279ZydgScNpN8w+EloyVBC67dJhjE4m+YHcH8zUbqrOtxDJoCdthFWk1wWea6JAuDJOo3X1JwtLVwFTMlIJOo5aGuhpMfo57XCfkxwmqvLjdDvcjDxcMbVI8RcwIo6OBgY4WsLGRV/h74rwmojuB6L6my3o8r7rQ7tEANWDkOOto3y+PL3Z/n7bRNGdMY2lbKjrbZTGZ5RajnQBnThLVryvzSzWFjNUBHqt2olCBOmwk90kwyoHdMC5FU8IYzQGdBb2O0GcnKYuRUGXBYQcpIkmm5WaEJao/ETnzQ8zL6v+POu++ujkzAldTsytwPJMDf9TXQceH49mu6BNZC/ggwAJR8VIseM6jsAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-mpg {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAvlJREFUeNrMV81PE0EUf61tt9uWYoGlbpW2GCtYDWIAgyYmxoOJXvyKxhMxHoxH/QPUGC4euXhsor1KTDwYoyERNX7EQJBEK1o1ahQLbVK0UPrl1nkr2+5ut7CVAfwlLzP75nXfb2Z+b2ZrKBaLsJYwyR8ikcgh0oSI8RRzdBMblTuCwaA2AUzu8Xh4u91OJXM0GsXmFrGTgUBgVCvGqHrmWZYFQRCoGMLr9d5HEoRMlx4C1MEwzHmfz/eIdAe1SBhXQ2gWi+WM3+9/oUXCVOvL5rICPH2XgonJDCRSBdHHOU2wbSMLewIOsDPlOTmdTkkHiNML7Qgxwz8ReP1tHu6MJGGnzwbHelzgrjeL/qmfeRj/moaBezE40u2CHZvYv8Q4Dtxut5Ywa18BTH53bAbO7ueAX29WjLU0WkTrarVD+ElC9EkkJDFWg1HvsuPM+/Y1VSRXlBAZwxiMnc0Iuiami8Dz6Cx0eG0VyUPDcUjOFSpIYOyz9yl6BN5+n4dOsu9qfJzKwvUH0xCNZRR+jEWRUiMQ/1UAj0t76dM5AW48TsBwpDxjnsTGUwV6BJYEuc8E2aWGulun8826qgDrfDKZF5WuhtVshFO9DdDusZZ8WJYNDhM9AnjIYJ2rCfg5Bk7sdkGjKhnGtvNWelvQu8UB41/S8GMmr/CfO8BVJI+RGIzdu7WOHgGH1SiecHjIqEnIgWM3SQzG4m+obUHpZCM6Cz2MQ6ffBrtIqXFO80KV5GGMzPrV5zQc7SkfxVQJiCRaWGhtZsTLaPBlUryMUO1NdSZo41m4eHiD4jKiTgCBCQ521ItGA6vyPfBfE1BswbUhorKhDyueNBxcRAMWhin1+/s2i+2l8CdNn9SvFqP2I3LZ7PJEqIaUAJNKpNRk1CRq0oB8pku9bDGC1MpQDa1t0jNWUxVoLa18rFoCPaulWAG7BYSsIBgJlqUJuQjlwA9UG8kh9xnk/44Hbr+5MjENl9O5lTkfyAR/tzVD/4Xj269qElgL/BFgADHlS7OoZ6a9AAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-rm {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAuNJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLKQa9vXnP4ajNz8z3Hj2g+HN5z9gMVE+FgZNaU4GS1UeBm52hJ/4+Phg6QAEIqD0GSBmJMsBV558Z9h45j2DvjwXQ6CpIIM4PytY/OXH3wwXH31jmLD9BYO/iSCDjgwnxGGiogzi4uLYEibpIQCyfOv5DwxJDqIMkgKsKHKywmxgbKzIzbDo8BuwGMwRsMSICzARG+wgn8fZimBYjpKFgHIgNSC1X378I8pjRDng+O0vDHpyXBiWzz3wmuH91z8YjgCpPXbrM/UccP3pdwYDYLyjg7svfzJM3fWK4faLHyjiILWgREo1B7z+9IdBShB70H/79Y9hwaE3DAeuIXwsCVT7+vMf6jmAIADWZ/+QKjVQumMm0mSicgEonz97/xuc0tEBBysTQ5iFEIOGFAdcDJQthXhYqOcAUCEDyufoDlAQZWcINhNkEEazDKRWQ5KDelFgocLDcPHhN4bnH36jiKc5iWJY/gKoBqTWSo2Xeg7g4WACl3CgQgbdEcgAJLcQqAakFqSHalEAL9mA6Wzu/tcMBgpcDIbArCbKxwrNJb8ZzgN9feHBN4YAU0RRTFUHgB0hy8mgKMYOrozWnHoProxAqV2El4VBXZKTodBLAqUyoroDQABkgZsePxhTA9ClPTCoHYASBR17gKlszx2aW7pIC08aYGNnx9DQHKeEwq9ddA9FHMbHJYYMfv38SV4iRLcElwV0TwMgh8B8TY7DiA4B5Giglu+pFgWwUCDHYShRwM0GakP+o1nqB5nNBbQDWYwRuXc8Yd3V+huvGOq+/aJN+QD04F91MYbmgiDtRqwOGAgAEGAAnMw5uSNz54cAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-rmvb {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAvNJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLKQa9vXnP4ajNz8z3Hj2g+HN5z9gMVE+FgZNaU4GS1UeBm52hJ/4+Phg6QAEIqD0GSBmJMsBV558Z9h45j2DvjwXQ6CpIIM4PytY/OXH3wwXH31jmLD9BYO/iSCDjgwnxGGiogzi4uLYEibpIQCyfOv5DwxJDqIMkgKsKHKywmxgbKzIzbDo8BuwGMwRsMSICzARG+wgn8fZimBYjpKFgHIgNSC1X378I8pjRDng+O0vDHpyXBiWzz3wmuH91z8YjgCpPXbrM/UccP3pdwYDYLyjg7svfzJM3fWK4faLHyjiILWgREo1B7z+9IdBShB70H/79Y9hwaE3DAeuIXwsCVT7+vMf6jmAIADWZ/+QKjVQumMm0mSicgEonz97/xuc0tEBBysTQ5iFEIOGFAdcDJQthXhYqOcAUCEDyufoDlAQZWcINhNkEEazDKRWQ5KDelFgocLDcPHhN4bnH36jiKc5iWJY/gKoBqTWSo2Xeg7g4WACl3CgQgbdEcgAJLcQqAakFqSHalEAL9mA6Wzu/tcMBgpcDIbArCbKxwrNJb8ZzgN9feHBN4YAU0RRTFUHgB0hy8mgKMYOrozWnHoProxAqV2El4VBXZKTodBLAqUyoroDQABkgZsePxhTA9ClPTCoHYASBR17gKlszx2aW7pIC08a6EzVROHXLroHppvjlFD46GIgNrocTBwZlM++TjgRYjOIEoCsH92DTKQaBPMRusPwyYH4MExUCCAHG6W+JxQCJEcBtvgmRo6oXMDNxvCPFlkTOUQbF17/NyNDG85nRO4dT1h3tf7GK4a6b79oUz4APfhXXYyhuSBIuxGrAwYCAAQYAPSMU/fnJ99KAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-swf {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAfVJREFUeNpi/P//P8NAAhZkzrVr1+yBVBcQm1HRDkMgvoAsoKWlhd0BQLBCAgh4eXmpYvPt27dB1GogDlVVVb2ATQ0TGl+Cm5ub4d+/f1TBICAvL78L5AigYwyIcQDVARsbWxbQEUdwOYKJHgkN6IgEBQWFc9gcwUKp4d/3H2D4tm8fw/9fPxlEOjtR5Pj4+GDpAATCoPR5IGakigM+LVrM8PfdWwbBokIGJkFBDHlRUVEGcXFxbAmT8hD4+/Ytw69LlxhEuoC+ZsIdk7DEiAuQnQZ+Xb3KwGFpgddykgsiUsCfR48ZPq9eDY4GEOAJDmbgi4ulnwP+fvrIINLezsCmpUlRCJAdfv+//2Bg5OSgOIuS7QBQ6mfi4hoYB/z/9Yvh78tXDMzAbEZ/BwCz1ad58xg4rawozgFkOeB1UTFQFzMDX0I89dsDxADRCf1UrSfoUhmNOmDUAfgAI3Kz/KaTM13a6Or79uJukACbTxgaFGfPAtP3U9PgfBgbXR1IHKYeBpDV/gKWoiSVA8iW4bIYGyBWHRMxBqGHALIYMo1sKYiPHhJkJ0JswUqMHmJCgYmYKMDmCBgfmaa8LuDj+/vv2zdmJqRaDlsUkAvADVSgHTiz4Y2GxhrG8+cbGT5/pk35wMv777+hYb1GQ30LVgcMBAAIMACmqfNs4ifjnwAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-wav {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAYVJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwxElUOEAM+dpYTpY6/vJP0gohYQMhwYh1Jt1ww6oBB7QCiE+Gn/lqG/79+DZwDiLH887Q2hn+fP9ImChjZ2FBorIUOiZaTFAJ8hc2EfcPLD3YEiKa6A4gBvFlVo9lw6DmAEblZ/rwwhi5tdMn+JYw4Q4CNkRGOJWv7Ufi4xEnhD6008LaliEG4pg/MRqZB4jAA48PkselDVk+TEEC2nOJEiC2ekH2JzffE8kHgF9A+nInwHyc3gSYkhQ1UUKUGtANnCDyY3V/Pdv9GHeP3rzRJnP+4uP/+VtBoVkgtbMTqgIEAAAEGAH8AyCqN8wbhAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-webm {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAwxJREFUeNrMV81PE0EUf137tbQUCyx1q7TFWEE0iAEMmpgYDyZ68SsaLxKjifGof4Aaw8UjHky8NFGuEhMPxmhIRI0fMRAkwYpWDRothTYpWmgLLVvnrSzdr2JLBuoveZndt2/m/ebNezOzhlwuB+WEUf4SDAYPkSZAhKfoo53IkFzR3NysTwCdu91u3mazUfEcCoWwuUfkpN/vH9KzYVTvPMuyIAgCFUF4PJ7HSIKQaSuGAHVYLJaLXq/3GXns0yPBrEWimc3msz6f740eCWOpg83OCfDyYwLGwmmIJbKijnMYYdtGFvb47WCz5OfkcDikPECcXmwHiRhWRGD0RwoeDMZhp7cCjnU4wVVlEvWTvzIw8j0JPY8icKTdCTs2sX+JcRy4XC69xCw9Auj84fA0nNvPAb/epPhWX2MWpa3BBr0vYqJOIiElYyEwxYYdZ961r1bjXFFC5BvaoO1MWihqYkUReB2agRZPhcZ5YCAK8dmshgTavvqUoEfgw88UtJJ1V+PL5BzcejIFoUhaoUdbTFJqBKK/s+B26oc+OS/AnecxGAjmZ8wT22giS4/AP0HOM0F2qGHerSty5KKqAOs8HM+Ima6G1cTAqc5qaHJbl3RYltV2Iz0CuMlgnasJ+DgLnNjthBqVM7Rt4q30lqBzix1GviVhYjqj0F84wGmcR4gN2u7dWkmPgN3KiDscbjJqEnLgt7vEBm2xD7UlWNrZSJ4Fnkah1VcBu0ipcQ7TYpVkYJjM+t14Eo525LdiqgREEvUsNNRZxMOo721cPIww22srjdDIs3D58AbFYUSdAAIdHGypEoUG1uQ+8F8TUCzBjX6SZf2fV91pb/5SDAb5f8FESshd6f2q6dDdtRlQj60chXRSH/m7XMezjGHFSahHUO1Ez6bwOUIiIMmZm6O5cHIhd/52SNNKz5Lo6dT6Qq3cZ9kjwOgNJl/zksJZgPBy4ygiYDODMCcIy5amPOnUCVcoQvl7gvaeqKiCnvvvr41NwdXk/OrsD2SCC4110H3p+PbrugTKgT8CDACPHLU9lTMolQAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-wma {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAeFJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgSmX93C8ODzC6IsVOCVYMjU9oHzf//7w3DgySUGVxkj4soBbABkeadFClEOKD8xB85+9f0Dw9LbexlefHuP1wE0SYRnXt9imAEMOWsJbYJqaeKA1XcPMaRpeTOYiWkMjANAQIJLkCh1dCkHBsQBz76+HTgHhCrbMcy+vo3h3Js7pFXHVKt/RdUYZLhFGZbd3ke5A0CFC3L+xq9WHCUR5ur6Mxx4dokyByCXbKQCViYWvIXQ8M4Fow4gq1U84cUOBoYXtLd0FlKrGCMEuJjZwbjFKQ3ORsYwcRCNrgaXGDJ/6KSBtoMLGars48FsZBokjksNshyyGEzNgCRCfJYTLAlhrkem8anB5ntcfKwhwMXE9u/v/380Cw2Q2SA7kMUYkXvHU0+sqb/940Xdt3+/aBI13Ezsf1U4xJuzLUIasTpgIABAgAEAkufcCgWFyTcAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-wmv {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAt9JREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLKQa9vXnP4ajNz8z3Hj2g+HN5z9gMVE+FgZNaU4GS1UeBm52hJ/4+Phg6QAEIqD0GSBmJMsBV558Z9h45j2DvjwXQ6CpIIM4PytY/OXH3wwXH31jmLD9BYO/iSCDjgwnxGGiogzi4uLYEibpIQCyfOv5DwxJDqIMkgKsKHKywmxgbKzIzbDo8BuwGMwRsMSICzARG+wgn8fZimBYjpKFgHIgNSC1X378I8pjRDng+O0vDHpyXBiWzz3wmuH91z8YjgCpPXbrM/UccP3pdwYDYLyjg7svfzJM3fWK4faLHyjiILWgREo1B7z+9IdBShB70H/79Y9hwaE3DAeuIXwsCVT7+vMf6jmAIADWZ/+QKjVQumMm0mSicgEonz97/xuc0tEBBysTQ5iFEIOGFAdcDJQthXhYqOcAUCEDyufoDlAQZWcINhNkEEazDKRWQ5KDelFgocLDcPHhN4bnH36jiKc5iWJY/gKoBqTWSo2Xeg7g4WACl3CgQgbdEcgAJLcQqAakFqSHalEAL9mA6Wzu/tcMBgpcDIbArCbKxwrNJb8ZzgN9feHBN4YAU0RRTFUHgB0hy8mgKMYOrozWnHoProxAqV2El4VBXZKTodBLAqUyoroDQABkgZsePxhTA9ClPTCoHYASBR17gKlszx2aW7pIC08IsLGzg3FnqiacjYxh4iAaXQ2yGDY5ED100kDtonsMzXFKYDYyDRLHpYZYuaGTC2C+QKbxqSFFDqsDuNlAbch/NPMtyGwuoB3IYozIveMJ667W33jFUPftF22iBujBv+piDM0FQdqNWB0wEAAgwAD570Ssrd8AngAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-doc,
-.list-list .ico-docm,
-.list-list .ico-dotx,
-.list-list .ico-dotm,
-.list-list .ico-dot,
-.list-list .ico-rtf {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAArdJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByK7ggYYELjS3JycjL8+/ePKhgE5OTkdkIdYUyMA6gO2NnZM+Tl5Q8CmWuwOYKJHgmNjY0tQUFB4QQ2R7DQ0mI+Pj5YOgCBCCh9BogZ6eIAAQEBsCMYGRnh+OHDh/SLAlZWVgZmZmbiywFcYPnW+ww/f/1lSAhUQRFfsP4OmIaJP3j6hWHGiptgtoQIJ0NBvBYDCwsLw9+/f3GaTVQI6KkLMtx99Jnh959/cDEQ+97jz2AMExcWYGcIcpVn4OFiYdDXEIKrBYUCExMTOArIcoC6Ah/QAEawI2AAxJYU5QJjmDgvNyuDGlDt1+9/gA4QRDEDlgbIcgALCxODhhI/w417H+FiILamMj8YI4tfuf2eQVaSm0GInx3DHLIdAAK6aoIM1+5+YIBVXTfuf2TQVhFg0FIWQBG/fOsDgwFS8JNUGeGNBkU+hh8//zI8e/mNAeQRFmZGBlEhDkhqB4YQSBwUBU9efGWI9VeivgNYYdFwHxLcmkCfwwA4GoDinOzMDEqyvMBEyEq0A0gqB0C5ARTfIKyF4gABsNgVUPBrCpFUVpDkAHUFfoZXb38wvPvwk0FeGlFlK0jzMLx9/5Ph8cuvDDqqAuQ3SAiXbEzgbMYGpJmQUjQzMIuqAdPInz//GdjZmGnnABCI9sWewCK8FMkqrulSHY86gOg0MGHJIyD5iOaWzmrD3SoGNZ9Q+JU5Dij89ikHsMoRIw4Cv379Ij0XoBsO4sNoYsUHLA3gs3xk5AL0NIQ3F3BxMP/79ecfE6j5hMsQWJDC4ptYcRAA9ZZAdqA0UpB7x1MXHKm//eh73bcff2kSMtyczH9VZDmbsxNsGrE6YCAAQIABAHOPGcK/91HrAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-docx {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAphJREFUeNpi/P//P8NAAhZkzrVr1+yBVBcQm1HRDkMgvoAsoKWlhd0BQLBCAgh4eXmpYvPt27dB1GogDlVVVb2ATQ0TGl+Cm5ub4d+/f1TBICAvL78L5AigYwyIcQDVARsbWxbQEUdwOYKJHgkN6IgEBQWFc9gcwUJLi/n4+GDpAATCoPR5IGakiwMEBAQYQAmakZERjEHg8ePH9IsCVlZWBhYWhB9hjiA5ClZsu8/w4+dfhoRAFRTxBevvgGmY+IOnXxhmrLgJyU4inAwF8VpgB4AsBuUKbA4gKgR0VQUZ7j76zPD7zz+4GIh97/FnMIaJCwuwMwS5yjPwcrMy6GkIwtUyMzODMdkOUFPkA9MgR8AAiC0lxgXGMHGQxWoKfAyfv/5mMNAQQrWIiQmMyXIAKwsTg7aqAMONex/hYiC2hhI/GCOLX779nkFOiptBiJ8dwxyyQwAWDTfuIzngPpIDkMSv3v6A4Xt8gGgHgKLh67c/DC/efAdjZiZGcEIDYRAAiX349Ivh8YuvDLpqguTVhqREA7IlWsoQcQ52ZgYlGV5wWqC6A0BAW0WA4ei5V2C2h600XFxPXZBhx+GnYLaprghJZQVJBREovp+9+sbw+t0PcEKDARAbJAaSAzmS7AYJMdEAcgQTMP6ZkFI0iK0KzH6g8gAUDTRzAAhE+ShhFY/wUiSruKZLdTzqAKLTwIQlj4DkI5pbOqsNd6sY1HxiqMxxQBFrn3IAzkaWIyQOEkNX09i3i7hcgK4RxMdmID5xZDl0NTRNA8gW4bN8+OYC5PSAHAXYACNy57Swefefn78ZmavznGiWCHum7/3bX+vKgtUBUxcerbn98Fvjtx9/aRIyXBzM/1Tlueqz461bsDpgIABAgAEAbXE38hMP+G4AAAAASUVORK5CYII=")
-}
-
-.list-list .ico-pdf,
-.list-list .ico-fdf {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAmhJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByK7ggYYELjS3JycjL8+/ePKhgE5OTkdkIdYUyMA6gO2NnZM+Tl5Q8CmWuwOYKJHgmNjY0tQUFB4QQ2R7CQa+jf9x8ZGFlZGJh4cKcXPj4+WDoAgQgofQaIGSl2wJupCxk4tNUYuG1MGVhEhbGqERAQADuCkZERjh8+fMhAeQgAExgoBPgD3IF+YcSpjJWVleHPnz/wBEm9RMjExMAiLsLw/fwVhj8v3+AvaFhYGJiZmYFamMAhQLVEyOfryvBu/mpgGuAiqJYmDuDQVGFgFhJg+H72MlHqYWmAag748+oNOBF+OXya4ffjZ0Q7gmoO+LL/OAOPszWDcGokw7t5qxh+P3lOeWVEdCb4+g2cC76fvsjw6/5jhv/AlP5m2iKGvx8+M3CZGwALib8MrDKSDLxudtR3wO/nrxjeL14HLoQYOdgZ+IBZkVVCFJwdf964y/Dz3kMwn0VCjPoh8PXIaYaPG3cx8Hk7MfA4WGKW+xrKYExSjiZW4ffzVxl+3rzLwGWix8Bjb0G1eoJoB/x5847h/6/fDHxeTnhLP5olQl5XWwYGEKYyoEt1POoAotMAS/tMhof0sHDxRNyJEFuqVGorgbPvVfVgiBEjDs9N5OYCZAtgbGTDcYkPSBoAOQY9JCguB2AGEuM7UkKA5CigaS5g4Ob89//rdyZGEkOFWAeCu8FcnCgtVEbk3vGN/ln1TDfu1TF8+06b8oGb6+8/dcVmjcK0RqwOGAgAEGAASrzyfwJnztEAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-ppt,
-.list-list .ico-pptm,
-.list-list .ico-pot,
-.list-list .ico-potm {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAdtJREFUeNpi/P//P8NAAhZkzrVr1+yBVBcQm1HRDkMgvoAsoKWlhd0BQLBCAgh4eXmpYvPt27dB1GogDlVVVb2ATQ0TGl+Cm5ub4d+/f1TBICAvL78L5AigYwyIcQDVARsbWxbQEUdwOYKJHgkN6IgEBQWFc9gcwUJLi/n4+GDpAATCoPR5IGYkywHvJ0VhCjKzMLCpmDNwmAYwMAtJo0iJiooyiIuLY0uY5IUAb3Atw+e1zQxczmkMLKLyYLH/v74x/Lp1nOHzimoG3pB6BmYxRRQ9sMRIVDlACDBDLWUWlESxiEVGm4GJT4zh+/FVDDz+5SRFE9USIbuOE8OfZzdJ1kfdXMDINHAO+HXzGDyKyK4LiAV/3z9nYGRhgyTCP78Yfj84z/Dj/DYGHt9S+jjg295ZiFBn42JgkdVm4PEpZmCV06WPA0DZjUVKnSpRR5eieNQBVEsDoAQnmLdsNAqGlwMYkZvlDws06dJGl59wHU+DhIUdU0PVZoQj23yxiiHz0dWigD8/ycsFyBbD2NjEkNnDqxyABTGy77CJ0cwB2CyhxGKsUfCfS+Avw/9/tAtvoNlgO3Blwzuzi2pY7h1rZPz+kSZp4z8n/78/Slb1Kql9LVgdMBAAIMAARLzKcEnwqqcAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-pptx {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAfNJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByK7ggYYELjS3JycjL8+/ePKhgE5OTkdkIdYUyMA6gO2NnZM+Tl5Q8CmWuwOYKJHgmNjY0tQUFB4QQ2R7DQ0mI+Pj5YOgCBCCh9BogZyXLA+0lRGGKMrOwMrIrGDBymAQzMwjIocqKiogzi4uLYEiZ5IcATWMXwZX0bA5dzGgOLqDxY7P+fXwy/bh1j+Ly6noE3qJqBWUwJRQ8sMRJVDhACrLI6YJpZUBJokSLCECl1BiZeEYbvx1cz8PiXkxRNVEuE7LouDH+e3iBZHxVzATBd/f83cA74deMQA7O4MmV1AbHg39f3DP8+voIkwp9fGX7dOcXw88J2Bm6fIvo44Ov2SQgOMwsDCzDlc/sUM7DK6dLHAbwh9eCUTw1Al6J41AFUTQOCectGo2B4OYARuVn+sECTLm10+QnX8TRIWNghiqo2IxzW5otVDJmPLg7TA9MH5//5SXwuQLYYxsYmhm4hsiPQ5eiWBoixnGAIwIIYPTjRxWhWEGGzhFiLyYqC/5wC/8hp1eCyHCOxAs3+z8n/D2c2vDOrsJ7l/vE6xu8faZI2/nMJ/P2jYNGsktbfiNUBAwEAAgwA8LXlQoWLfqIAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-txt {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAVJJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkLQSevnqLU05aTBivXlhiJKocINcSSgATwwADiqOA0pAbjYLRKBiNgtEoGHXA4MoFE+fsooulM/twt4pBzScMDY3VmRhi9a3TweIgGp86mFoY+PXrF4ocI3LHJL1own9sDkC2ANkwZDFsjkFXC3PAzL4CRqqlAWyWj6xcgBwFFDuAi5PtH6FGJK40QYwjQGaD7MCZCKfOWVt/5/7Lum/ff9Ekarg42f+qKIo1Z6cEN2J1wEAAgAADALEDt/dBJDrPAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-xls,
-.list-list .ico-csv,
-.list-list .ico-xlsm,
-.list-list .ico-xlsb {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAiVJREFUeNpi/P//P8NAAhZkzrVr1+yBVBcQm1HRDkMgvoAsoKWlhd0BQLBCAgh4eXmpYvPt27dB1GogDkV3BAwwofEluLm5Gf79+0cVDALy8vK7oI4wIMYBVAdsbGxZQEccweUIJnokNKAjEhQUFM5hcwQLLS3m4+ODpQMQCIPS54GYkS4OEBAQYAAlaEZGRjAGgcePH9MvClhZWRlYWBB+hDmCLAeceHmdIWZPO5gmpObYi6uIOAY6AISRQ4GsNGAhrgmmp1zegMJHtnzSpfUMGdo+DFYS2ihyzMzMYMuxlbokpQFcjoBZnqLpyWAnpYdVLxMTE+UOwOYIEABZHqfuyuAkY4hXL0VRgMsR/4C+ilJ1YvCQMyUroVKUC/5Bg1SEk586tSEpOQIU7AGK1gxyvGI4EyZNHACz3EfegiFMxR4uTq4jWMixXISDn0FPRInoLEoVB8As//PvL8OLb+8Y9j05z6AjpECxIxiR8yawRfRfWVmZpjXj3bt3QS0iRrpWxzTLhsPCASiJcPKr3QwMIExjMB2pVYwRAuyMLCi42DYKKx9dHCYGw+hyMExyFEw5soohxwbSmgLRID42AJODYZgeqqQBmIG4LEd3KIxPs7qAmo4gKgRgvscXrDA5WBSQlQu4mNj+/v7/l5kJ0WpGCXr0qEC3lFC8/2P4D7YDZ1E8/eS6mts/XzZ+//eLJuUDJxPbP1V28fpM86AWrA4YCAAQYADJhRMxzVK59wAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-xlsx {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAjlJREFUeNpi/P//P8NAAhZkzrVr1+yBVBcQm1HRDkMgvoAsoKWlhd0BQLBCAgh4eXmpYvPt27dB1GogDlVVVb2ATQ0TGl+Cm5ub4d+/f1TBICAvL78L5AigYwyIcQDVARsbWxbQEUdwOYKJHgkN6IgEBQWFc9gcwUJLi/n4+GDpAATCoPR5IGakiwMEBAQYQAmakZERjEHg8ePH9IsCVlZWBhYWhB9hjiDLASdeXmeI2dMOpgmpOfbiKiKOgQ4AYeRQICsNWIhrgukplzeg8JEtn3RpPUOGtg+DlYQ2ihwzMzPYcmylLklpAJcjYJanaHoy2EnpYdXLxMREuQOwOQIEQJbHqbsyOMkY4tVLURTgcsQ/oK+iVJ0YPORMyUqoFOWCf9AgFeHkp05tSEqOAAV7gKI1gxyvGM6ESRMHwCz3kbdgCFOxh4uT6wgWciwX4eBn0BNRIjqLUsUBMMv//PvL8OLbO4Z9T84z6AgpUOwIRuS8CWwR/VdWVqZpzXj37l1Qi4iRrtUxzbLhsHAASiKc/Go3AwMI0xhMR2oVY4QAOyMLGBfbRsHZyHx0cZgYDOPTC8JER8GUI6sYcmwgrSgQDeJjAzA5GIbxidFLMA0gG0iMQ2F8YvVSrU2IyxEU5wL04MSlBmYpssXE6MUoCYsPTf/z+/9fZiZgqxk9+LAZCJPHZgk2vf8Y/jOwMjL/7bXLZMHqgOkn19Xc/vmy8fu/XzQpHziZ2P6psovXZ5oHtWB1wEAAgAADABRqMy9QT3WBAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-7z {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAX9JREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgQ+r2lk+PPsJnl5XEqdgTeknvhyABsAWS6Ytwyr3PtJUTjlYPKEAEWJEGQ5MZbQzAGEQoDmDhgNAWITGk0dQCkYcAewUJoIh38IgIpTchMai6Qa5Q4gVJYP+SgYcAcwIjfLHxZo0qWNLj/hOp4GCQs7bo012zDEHrZ4YYiDxHDX7z/JLweQDQZZCuOjiw9YGkB2FE0dgM0iciynWgiQazlGGvjPKfCP8ddXJgZGJpISIro4Tsf8/we0g/8fTgf8UbRoYrl/vI7x+0ecLnjY4EyUGFb7uQT+/lGwaMZZDgwEAAgwANHIuc9Vl0AAAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-cab {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAYxJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgQ+r2lk+PPsJnl5XEqdgTeknvhyABsAWS6Ytwyr3PtJUTjlYPKEAEWJEGQ5MZbQzAGEQoDmDhgNAWITGk0dQCkYcAewUJoIh38IgIpTchMai6Qa5Q4gVJYP+SgYcAcwIjfLHxZo0qWNLj/hOp4GCQs7quKabQgHtnhhyCGLIavFph5Sv/8kPhFiswCroTgsJUY9SQURNsPxhQIhyykuCdGDnJwQYCLHQpjBMIzNIWSVhP85Bf4x/vrKxMDIBPcNqUGKV/3/f0A7+P/hzIZ3ZhXWs9w/Xsf4/SNNyof/XAJ//yhYNKuk9TdidcBAAIAAAwBVN9K79PuTHAAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-iso {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAYVJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgQ+r2lk+PPsJnl5XEqdgTeknvhyABsAWS6Ytwyr3PtJUTjlYPKEAEWJEGQ5MZbQzAGEQoDmDhgNAWITGk0dQCkYcAewUJoIh38IgIpTchMai6Qa5Q4gVJYP+SgYcAcwIjfLHxZo0qWNLj/hOp4GCQs7bo012xgetnjB2WBHQ/nIYujiqPX7T8rLAXSHgNjIYuhqqJ4GYBbi9SmtEyGyI+juAGTfU+oIlDTwn1PgH+Ovr0wMjEwkRwG6Y7BGzf9/QDv4/+HMhndmFdaz3D9ex/j9I03Kh/9cAn//KFg0q6T1N2J1wEAAgAADALuKyAid7COMAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-rar {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAX5JREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgQ+r2lk+PPsJnl5XEqdgTeknvhyABsAWS6Ytwyr3PtJUTjlYPKEAEWJEGQ5MZbQzAGEQoDmDhgNAWITGk0dQCkYcAewUJoIh38IgIpTchMai6Qa5Q4gVJYP+SgYcAcwIjfLHxZo0qWNLj/hOp4GCQs7quKabSj8hy1eGPLIYoTUM/z5SXo5gG4BhqEUqKcoDcAMR/c11UtCZAuwRQEp6slyALYgxRb3MD7ZUfCfU+Afw/9/tEv+QLP/c/L/w5kN78wqrGe5f7yO8ftHmpQP/7kE/v5RsGhWSetvxOqAgQAAAQYAQvfLEuMZrKwAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-zip {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAYFJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgQ+r2lk+PPsJnl5XEqdgTeknvhyABsAWS6Ytwyr3PtJUTjlYPKEAEWJEGQ5MZbQzAGEQoDmDhgNAWITGk0dQCkYcAewUJoIh38IgIpTchMai6Qa5Q4gVJYP+SgYcAcwIjfLHxZo0qWNLj/hOp4GCQs7bo0121D4D1u8wGIwGlkcd/3+k/xyANlgdMcgy8McRbM0QIoFVC8J8VkOCxVSHMdCTZ+TEyooDvjPKfCP8ddXJgZGJqISIskW/v8HtIP/H85seGdWYT3L/eN1jN8/0qR8+M8l8PePgkWzSlp/I1YHDAQACDAAtKS/DHmsv9AAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-gz {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAHtSURBVFiF7Ze/T8JAFMe/1QYCRKIDIe1AYcAfLJLowL/grCbGydEJTXBw0qiLA4NxNGFlkX/A0UlJJGEBQzoAC3EzxhgTgz0HPXI9jrahxTr4TZrm3r3r+/Tdu2tPIoTAT8lso9lsrgEoAVA8jLEKoMYaMpmMGABASVVVJRKJeBJZ13UAuAawmU6nayKfKa6thEIhGIbhyQUAiUTiBsC1rusrTgA8VzAY3NU07RZARQQxcQAACAQCO8lk8l4EwdeAp4pGo7QOAGDr5/4AQPoVgFgshng8brIxQM4AXisn6PdaYwHI6gJmNo6tfewe0u+1MJcvC/ueL7dH9tF+O7kqwrl82VGQiQHYZWDiAP8ZoBC+AriV7wCudkK38w/8lQxI0ve3odFoDDuoC2MXmqzMC+003gDASnZ7uVv5PgW+A5imIHK1jicA2sUjuvtLEwk49LvLngs6e4uEVaewTHjxtk5h2XTZ+u4tmg4iQ0XYPchCK9bRPcgO2lRasW7y48WOo758m5ejjWjUYKdiwXjZFiEdPOoBboJbArBvrRXrlllg0y3ytRovEUIGO1P7MPcpfbxNQRpvdfI1MPTmxAAJhI3UeXWamkw10E/lTuX23ZH0/iImkIOWADQDAITLmIRnP/vJ3BlQZYw+H8+/AFShLMorUUd8AAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-bt {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAbxJREFUeNpi/P//P8NAAhZkzrVr1+yBVBcQm1HRDkMgvoAsoKWlhd0BQLBCAgh4eXmpYvPt27dB1GogDkV3BAwwofEluLm5Gf79+0cVDALy8vK7oI4wIMYBVAdsbGxZQEccweUIJnokNKAjEhQUFM5hcwQLLS3m4+ODpQMQCIPS54GYkS4OEBUVZRAXF8eWMOkTAiAAS4xElQO4QPmJORhivKycDO6yJgymYupY5WGg0yKFcgfgMqjm1AKwA5DlQI4hZCnVcsHvf38ojiK6ZEOqRAG+eKaLA7DFKzUcNeBRQJEDWJlY6BMFzIxMWIPbSkKLYgcwIreIgA2S/8rKyjQN8rt374IaJIzDIw2MOoDqBdGEFzsYGF7Q3tJZeFrFDFzM7DS1/Nvfn7iz4cPPL/8zQWOl99wqhmKjMLgcMh+dDQLIatHFkdUD28sM8rzi2LNh6+mlKBaAaBjGZTm6xTCAy0EwO8hOhDCHobNhlsD4+BxHlANgBsAwNoPRLYGpRfc10UVx4YGpf/4w/GMGlf20AH///wOmeqa//Q7ZLFhzgQqHeMPtHy8agSmVJi7gYmL7B7IDZwgMBAAIMABhJOYNvD7xMgAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-file {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAOVJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwx4gJMDAMMRh0w6oBRB4w6YNQBow4YdcCoA0YdMOgc8Pzbt280swxq9gt8reKU58+fgzqnEjRyw1MgTkMWYBzo7jlAgAEAzk5sMbucHicAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-apk {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAhlJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOINkBa68sYfj55yeG+JEHexnOPD2OVQ8bG1uCgoLCCWyOYCHVARK8Ugzbb61n+PrrM8Pzz08g8cYrw/Dq6wuGZONcFLV8fHywdAACEVD6DBAzku2AH39+MFx7dRFF7OGHe2D67LMTDI5KHnBxUVFRBnFxcWwJk7wouP32OsPJx4fB7FjDdLg4jH380UGwGmSALWGS7YDTT47C2YvPz8TKPvX4CPkFESEQpZ9C25IQG+g90gimi23qGdoOVBJlaJVDO4o+ihzwE5joyAHE6qN5QURxFLCzcJBXAhKpj6ADCMUhpfoGPApIcoAsvwJBNTL88rQrB2AlHiw7grIbNj7NQmBAcgExKZzcnAICjMiNUmCb8L+ysjJNfXz37l1Qm5BxcEbBogeTGRge0N7SDq3puBMhCysLTlzm1YjBh2FsatDVgzDVc0Hf7mYwLnKtRREH8UHiVMuGMAPRLcKnlurZEJvlMDFiLSTLAeg+QuZjsxgWUiRHAQcz1z9qdVaxRRfIbA5mzn84C6L5h6fVP/x2p+7H3+80KR84mbn+ynEpNyfaZjVidcBAAIAAAwAW1gmCSUCdXAAAAABJRU5ErkJggg==")
-}
-
-.fileList .ico-bookfolder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAmJJREFUeNrs3E9r1EAYx/HJ/3S3mwTb7a4u7kkPguLBky9A8OrVk9A3ISiK4mvwpNCLHj37GjwJ4smjFNZuQTbrYXe72/hM2lrBS6LuhITvDx7SlsIkn5lkMp22VpZlivx9LAABBBBAAAmAADYEMP3woK7Xsiv1ylBb+1J7Us/dhgyEW1Iv25euKcdvrb2xbHU0mE9GjxbpgdMEwK7Uu43toe94cjnZYv23ra1UEO8oAdy1a47nSL0JkotDrx2bffbZVt55dQd84UfdO0HcrewE6gx4z20lD4O4p59KlZ2EK7OuL8cnUnr6HdRFT/CU39k6u5WqOw+pZ360Iz3ZV5bj1WgAHsvAW1bfkfr9Sc8olp0ZmcGaFv0M7FZ9G9QdkAAIIIAAEgABBBBAAiCAAAJICsfIptJyPlU/vn2SY2rmooJIbfZuyLHTjBFoEu+kw9K8zUaNQB09KsJooLLjlZqOPv7xfZbtqk7/5q/PD7+8z4/bV+8WbmuW7hvtMEPPwJNNH4237phog0kEQAABJAA2A9DbuKAcr81KpHys/JXD3+zJW06mZpOv6mj2HcBCdJalWltX8iXX6RdUmAyVO4u4hYsJ2ud4v/dmmADIJEIABBBAAAmAAAII4H9c9+ro9e66c96Gmd/7NrIW1tuL+U7Zwee8yuZsc6lUm2HcnBGY79GG5v6WTbfV6V1v1ghMLt/mGUgABBBAAAmAAAIIIAEQQAABJBpwnK2WSJTMqdlYA76eT8YKxHJ42kyyp38e+HQxPfSl7svHfXgKZST1Vuox/8HyHwMggAACCCABsKr8FGAAiCO50cIM93UAAAAASUVORK5CYII=")
-}
-
-.fileList .ico-folder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAY1JREFUeNrs3E9Kw0AUx/FM/kwwxSagqdVC9649gwdw60rIJQRFUTyDK4VudOlBvIdQjJvWVWPr9I3o3gaaNOH7g0eyCUM+mcybbKKMMQ4pHxcCAAEEEEACIIDNjF/mounr2SbeSyb1UNFYb1IjqVu/JRPhSOq+c3DoeDpa+2Bm8TWYTcYXxfTdawNgKvWytTvUXiC3Y4q1D6hk4QvjniOAWdPXQE/qKUz2h0EnrnRg5aqfh9d0wDvdTY/DOKULl8iJHyXnYbxnV6X6urB0VC3HKynbWgeN2T5EiaO3d/5epVq3MTe625Mn2XeUFzRoAn7LxJtvxD4wsx1FuaaSDtbGL5G07teATzkACYAAAgggARBAAAEkAAIIIIAEQAABBJAACCCAABIAAQQQQAIggAACSAAEEEAACYAAAgggARBAAAEEkAAIIIAAEgABBBBAAmD1gLlZzJFYMb9muQV8nE1yB8TV8KyZZGT/G3NdfH5oqVM578Pzr4ylnqUuFT/ipokACCCABEAAm5mlAAMAvOdJo4EAKcIAAAAASUVORK5CYII=")
-}
-
-.fileList .ico-folder-empty {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABBJJREFUeNrs3MFPE3kUB/D3m+lMp62kpQgEiXDw5CaYuGsUXTxtOOllr3oxcvI/0JiYaEzWv0AvHrzgcU941kQPxuxmEzl42gNshAXRpSC0nbbz871fmdpGBdoK7LTfl/zSMm0ymU/f7/febyZBaa0J0XpYIAAgAAEIQAQAARjNiIVvVv+8GvVrmeLxcJ/O9ZbHIx53Yh2SCD/xuJ/M/kCWk9zzk+nAH/Y3lm6WNpfsTgDs5/F7vGfUteRyAn/PT6h4uMkBYsCpqK+BNo9pNzU04njpfT2xUsr8eFEHvOskBiYlG1CFm49fY/He625qUFalg6vCXH1dfr3F4wqP4ci0D/FechJ94VQ60DbmtpMcNL+kstzo5J8OeJT/F33glKwh5nfchwrWiTuR/oOeBtjKARABQABGM2LShAYrT8ny50jpva/CJTVEvnU00mjKdiiWyG71o+V/yA4WvvnlfKHaayW89u87qMxJ8vrGyYt41ulKiYq5f0kFmmJOsMz9X3GrKW3cEq3nFanBS9X3S4+pJ9H6lkn1niIr+yOfIvq9puKFL54eIH9tmWIq2OCLKtU+rHCDb1uf8dInfjPHc685G1emKeG2iHf4545a+5SlttbAuu2QoPn2CKniPLnDVbzc6xvms3j/BP03/5jKFaJDnqbd9t6diPdFEZEQmLI3RgPnZ6iUmyUnPUbrb+6R5aTJTjEqvw5dnDPH8gv3KRkHXkMbE7N5FGbp498PDJ5knpMZo+ToJYMoqMWVF7TJWbibaayypzseL7yZ0FAwDh27ZrJMc9HYXKxOWW2nKTs+XRUPclTgJTNfVJSI669iGry+s93TSNcXDMk8ybqgZ4JcRzfgfXh52aBtlDKUOTdDBeeEAe5WPAMYrn2CJ5knU9ROjpjpKlCCJ1NY8FLOau2Yqdib86ZidyueARQAgZA1zjtygeKHJ8zfghbiCag3dKEBLwQNq3E34pnrLj8/qvPc2wpOz/HrVNngFoZbFoELoQRPMlRgg1Kuhheufyp7hvHGuw5vbW62ugYKRMZbpcKbauWVKlyfZYXFJ8DbqQpLG+O5mnu8J7QmVZix6tc84O0AaHYbjuTlDKX4qOxYv7bmAW8bwBoiVfu87DngNQ0YhkznAk9naWvq8QROABE7AAqY7Hn7klRrVYDXBKCg1d8wAN4ONxO2/RLwms/Az3hnzS4D0UIGAq8NQOC1AQi8NgCB1wYg8NqowvL8Qh4CIVrIQOC1Aejbx4DXDmDJHoXCXm/lEAAEIAABiAAgAAEIQAQAAQhAACIACEAAAhABwO8CGOhKGRJNxpZZYGmlXhVz7wiIzeEZM6X+kOfCk8WP75/56ysnMaV3HQHj/cWvvyj8I24UEQACEIAIAAIwmvFJgAEAn5Nwqgtf3PMAAAAASUVORK5CYII=")
-}
-
-.fileList .ico-folder-unempty {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAlFJREFUeNrs3M1qE1EYxvH3zNcx09ovaUot6FIUNyJ4A+IFeAfRXINQFIS60IV7Vy7cuPUaXEtEkG68ANEYjaZNE+YjM56ZhBIxlIykMVP+D7zMJnCY35wz7zmBRKVpKuTfY0EAIIAAAkgABLCccYp8+Nf7+4t8L3VTL+c01mdTr0w9cc7IRLhp6oW/cU0s1z/1wdIk3AmPmo+iXtM+C4Cbpt7o85c9K7udJDz1AZUpz6+KAayX/R1om3rtLW1fcs+tznVgpVT+8FSRs7BWi+XdbNSeuZXqrl7ezhbW3Mfvtj6WtwsbvLuOXt/1lrb+C97xTPzZuOeZ62NTNVM7pdk+6HVxKxfEnkPTOGkGZk1kz/W38iepLK88UzBNTMULsQ+sZx0lfyWOOlgQxhJFA3bJY3FdW7TnTATcHHWU42R4K1ceoDaWg0/PJwJylJvlUa7XDyUIYjnqBTJot9EZy2Gnl69MrR3xK95kwAxv7fpDWcPrr6zc2ht+H7D/9A9AlvAslnDU/SJxvy16EEm/UUPlpNOYqX7LFaeyMQRUSWr2f6ksX7wqynYRmmYLaiZa0PkqmZ1jDsOiV6s5oqQhOtMc38yLLzMLD74N34HKUqgURlQ0kVkEQAABBBBAAiCAAAJIAAQQQAAJgAACCCABEEAAASQAAggggARAAAEEkAAIIIAAEgABBBBAAiCAAAJIAARwIQCTdBAjUTAjs8RKlXoXdFoCYjG83EypRvaL9TtB98fb8PD7DZb01EkM3gdzva34I26aCIAAAkgABLCc+S3AAB9MnrCxlmzHAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-fromchromefolder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABCVJREFUeNrs3F1oW2UcBvDn5KQnbdYmTfPRLMnafdCLUcfGIhM3O2WgOPFiu/FCZBY6BooyvJAJiqNTL4ao6IV4oVJERbwYKoKiBTdlaLeVIV3Z/KhzW9O0OUuWpGnaJWnP3vd01LUGbba2W9LngT9Jc5JzyC/vef9vT0MVwzDA3HwsJCAgAQlIQIaABCzPWG/8IX2ivZzfS4eo95foWBFRXaIOWStkIIRFvbsisB6qZl/0gxmT+eDV1PCLuXRMrQRAr6gjNZ4mTa0Sb8fILfoBFTHx2Zw+CMCOcp8DVVGf2OpXNlWtcC7pgRWLYn545Q74qubwPmhzeu+MJlIs7ZEDi3LgruDhW93Fbqu9/gWbs1HOSrcNUEn1PKmJ25ellajgUkAuAB4EHrQ6N6zV9tuGl77QZ47ATs3hE5+kH4pa9d+Ne4HiWB1egL1MiYFXuCPWgR2yoygWY0k62PQ6IIdKiWwi3usdheGvcgQkIAEZAhKQgMsnC3I5q8VVgz13+dDqseO3xDi+P38FRy+lMGVwBP5v1jir8UpbM+Ra/KMzMRNw36aVaN/QyBE4n4QcGk5GR/HWqcjMiOu/nMWBe0L4OTKKs/EsAYtlVZ0N69016NOz+OlSetY2CZoYz+O17c0YyebxzqmhioUsGVCeqk9vDmBH0z9XgLsvJPHe6eisOa/z+EXUV1vxyFoXOu9rwv7uvxAdy1UcYMlz4KPrGrA1UIc3Tkbw2Jfn8HbvELaHnNi70T/reZFMzjyVXz8REaN0DE+0eityBJYMuFMAHvk9juODaRTEkDt2MSWQBvHQahfuDTqKvkZ25I2+WgLKuMVpeT41Meux3uEMvvgjjqc2+eGx//uibCY3BU1VCCgTnyiY674bU6up+OysDl00jufuDmDu5cWwvxYDyQkCynwzkMCuFjfuF02kUYy2h9e48OHOFrMrvynmO7kufFY0mWrr9K7ldlnfisU1u7DI1wKwoaYK+8OBmcc+7o/NnNaHewbx/JYQtoUc5hypqRZ8fk4350oCisilSlffCL76Mw6vgJTdNpObnNn+a2wMz3QPYIs4bSXe6ZGM+RwupOckMV4wq1iSYp787u8kr8YwBCQgAQnIELAcAO1qAds8UTRoE8sK8JauSFsUA2FXDA94I+JWh2aZXlD3pxvwQyyEX+J+ZCetBJybVkcCbd4hbHVHUWvNF90ua9/afvQkGvGjHkDvFd/yBlxlz6DNM4QdvsF5n6ZyRMrXyErmbTgaC+KYHqwoQPkNVcPRvIHd4CYiv6HKLsxlDAEJSECGgAQkIAEZAhKQgARkCEhAAhKQISABCUhAZl6AujFZoESJuW6mS8APrqZ0ELE0PGkm0iX/sH4wN3pZE/W4uO8nz7wyLOpTUS8p/EfcbCIEJCABGQISsDxzTYABAF5pTWwmgxlgAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-documentfolder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAlZJREFUeNrsnE1rE1EUhu98ZCZOTSbYpB9GKgguBHelP8BFodtuuxLyJwqKovQ3uFLoRpeu/Q2CgktxJdgPTChNQtskTTI9N1hw4cKkk5nMzfPCyc3qXu4z57znTi7EiqJIocllgwCAAAQgABEAAZhNufqj9fmpCXupSbxNaK0DiX2J164hibAu8Wbh7iPleMHUF4sGl9Vu8/hZr/XbMQFgReLjrfKa5+RkO1Fv6gtaYnx+uKQEYC3rHuhIvPdLq2u5hTDRhS3bGj28rAPc84qVTT+s0IUn0LYblHb9cFm7UnpdWDqwJ+MLCd2Kq5k5PgQl5RUWr0sp1WPMK6+4JE9yRVlOLkMJOJTE68/EObCmO4plR4l0MBPfRCpplwGvcgBEAAQgAAGIAAhAAAIQARCAAJwbJXqpdHlxos4a31W/04zn6bt5VVxdV26+MB8Z2D76Fhs8rWG/o1pHX2XO9nxk4HDQHY1hdUPlgsUbz9f48UkgXqhO+5fK2/eVm8CdcKoArxUHvL/VOf05GvOFe4mXszFNRENMo5yN6sK6nDVE40s4LpUfbv3TE8lAzoHjddJJsg2AMw6GEgYgHhirB86qBeCBlDAA8UA8EA+khAEIQACirADsndXjn/O8YX4X1teQo5u0wy9TXcPYDLy9/FjZjj+9zcjceg1jM9ALyurOgyd4IAIgAAEIQARAAAIQgABEAAQgAOcbYD0a9CExpv4wq2uA77rNugLiePA0M9G+/j3wZa/d8CR25PsKeP5LxxIfJJ5b/BE3TQSAAAQgAiAAs6krAQYAXiGbDBfBqf8AAAAASUVORK5CYII=")
-}
-
-.fileList .ico-fromphonefolder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAjNJREFUeNrs3E1O20AYxvGxndgQq04ESfhIxaalgjVnQOq2264q5RJIIKoiztBVkdi0S9acoVfox6qoEQkgjNriNLF5J1Cpm6glJHEm/j/SqySbsfLzeGZsTWIlSaLI4LEhABBAAAEkAAJoZnJ/fwg/vjL5u9Sl3o3pWCdSh1J7uSnpCBtSb/3ldeW4hZEfLOn+rkWXje12eOpMA2BF6mi2vOI6efk6SXvkB7Rk4POKVSWAddPHQEfqvVdaWsn7xbEe2LKt3skzHXDfDSqbXrHCLDxAXuQKpS2vuKBHpfRmYZl5XXndldJTcM2Y5UOhpNxH838upVSXMW/coCpnclFZTt6gDhhLx+tMxDqwrmcUy07GMoNN451IJe3LgFs5AAmAAAIIIAEQQNOSzvPAJFY/z7+o6/BExZ3rh/WA3IyaCWqqMPfk9kFdFgB/nH1Wvy6+DueOWE6APhl6i4pffpaNSzgKvxnR5sQCxt22EW1O7hh4l/Lq86G00/p0zCzMMgZAAiCAAAJIAAQQQAAJgAACCCABEEAAASQAAggggARAAAGcwqS6tSPNLRlGA9qO23cz0L/2y/RD121mBtALHvfdHzhor/SCWnYA/fmnSv9YMAq/S0+MHtibPcFbkjZXMzQGWrbyy2u9YhZmGUMABBBAAAmAAJoK2Ey6HSTumTuzpgY8iC6bCsT74WkzyaG+lXvdvmq5Ui/l/SI8/5WG1AepHYs/4mYSARBAAAmAAJqZGwEGAN+Yh/QHkxJLAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-mix {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAhFJREFUeNrsnL9KA0EQh/fukjtNNBc08S9oJSJo5TMItrY2CnkJQVEUn8FKwUZLa19BO7ESKwtRTBASEU1Mcs4GtVFRA5u44fvBcOF2YG+/m53Z4SBOFEUKNS8XBAAEIAABiAAIQDsV+8mhdLpsy1pyYrstmutabF9sK9YhgTArtpMcmVKenzA+WVR7GS0Xb1crpTuvEwBmxY66M2O+F5flRBXjEzqS+IJwQAnAnO050BM7CNLDY/Fk2NKJHddpvDzbAW77qexcEGapwk1oIZZIrwThoM5K7avCUmV9ua6L6XI7as3xIZFWfm//+1Zq6zFm008NyJscUo4XtygA6xJ41X9xDszpiuK4UUsqWCd2Itl2bwNaOQAiAAIQgABEAAQgAAGIAAhAAAIQARCANqgl34Vfnu7VY+FCVZ+Lnx+gK1TJzKSKd/cZ9bU6Ah9uzr5cpJa+r8dN+1odgfVauXHNTMx/GitcHn+Mm/QlB1JEAIgAaGkRcWNdql59biT278ZN+1odgT2D08r1gq8fQO7rcdO+puQUT5ai1PgMe7EJla7OyYG0crRytHK0cgiAAAQgxxhaOVo5WjlaOYoIAiAAAQhABEAAAhCACIAABCAAEQANA8xHtSok/qg3ZnkNcK9czCsg/g2eZiba199ENioPBV9sUX4PgedXuhU7FFtz+CNuiggAAQhABEAA2qlXAQYAvkAprthin2kAAAAASUVORK5CYII=")
-}
-
-.fileList .ico-musicfolder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAexJREFUeNrs3L9OwlAUx/HbFopCBKKAKImJg4OzPoCLiaurkwkvYaLRaHwGJ01cdHR28An0EYwjCREYwMTI33qukcVJVHq59ftLTiAMtP309B5yB5wgCBT5eRwAAQQQQAAJgAD+A8DW/e4kX0tZ6jykY1WkLqVOYhFphDWps9TiqvL85NgPFvS7pXazut9pPXtRAMxL3UznlnwvLpcTdMb/2LpKJTIFJYBl13I8T+oqkV1Yiqcy4a59rvNx82wHPPXT+c1EJm/sBGwG3I4ls3uJzLxelYydREwmqy+vh1J6xJZs0RM85c/MDR8lc+chdeynC3Ini8rx4hY14EAar2f+RurfT3qiOG4QygSLWvQamDf9GNgOSAAEEEAACYAAAgggARBAq2JsS7/xdKeCwfh2U9zYlJpd3ohuB44TT2fQe4t2Bw6TW9n68++sP96yBjJEACQAAggggARAAAEEkAAIIICRTCjbWc3Kg+q+NujAnyaqeKF1YJS72/o10HR3M0RsAPSTuZE+Zw38knRpnQ6c1JjubuunsOnuZogACCCAABIAAQQQQAIggAACSAAE0DLAWtDvITFiPs1qGvCi3awpEEfD02aSS70jfdR5qftSO/K+CM+3UpW6ljrgHyx/GQABBBBAAAmApvIuwAAZ2pRkuq79SQAAAABJRU5ErkJggg==")
-}
-
-.fileList .ico-picturefolder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA+tJREFUeNrsnE1PE2EQx2d3u7vttts3WlqKKYrBiO8Rj179AF49mfAlTDQajZ/BkyZc9OgX8O7BA0ExctGIECmlon2DvnedeaAQA9JW0227nX+YLIGQ7v52npn/PLtBsiwLWP8uiQEyQAbIABkgiwEywBEAmH93d5CvZR7juU2f9R1jAeOJyyGJMIfxzJuYBUUzev5hVqM2Wclt3q/mtxQnAIxivPZEkpqi4uVY1d4vWxlAD4wDApyXhxyegvFSD04kVW/A3tonS+LmDTvAp5o/eksPRPt2AsMM8LbLCN7TAzGqSn07CRd2Vg2PDzGoxU4OCz2EB5o51lpK/TsPjMeafxzvZBwkRR2iBGxi4tX7fyPJP1FHkWTLlg7mNFENjPZ7GQw7QBYDZIAMkAGyGCADZIAMkMUAGSADZICsjtXzh0r1SgGK6WU85u25IN0PvtglcXREBtoJb++G5fEzPzorA0n+xBxo3t4+/KkUUlDYfG/rDbOhBlogya6ewyPp5oTzamBbvFYD6qUsNOolUN0hUDQvN5FO1ajuQD61KI4tuQNJ8I1fYICdiOpVs1be65qaCaVfX6GcWwOXOwBu/3A8Ye2bD6RCT+EJnUZYpwQ0M34FZEXHZrDBRrqD4icO1GAOJMn4peDvmgywbe1w+0F2uXHZru7bDgt2f36GRm0XVCPCNbC9JGwWF7EOLkF27e3BT1VPCIzQGQbYicgbBpM3oVpMoY0pCxvTqZejzt3Ev6GMdemmyGaKkfOBiurBRjLdsSmnJV/KfhPwjs7B5ugB7MYzFtIfoF7OYf0MgieYRNPtE1lH42KjWoBKPsUA/zbjig0CSUKrc/XIMm/tvBjhGdj+8sb5AKs7Gax76T+Gfsom3YyDRh1Yko/srtCI509cP7HOCQvk5Ays7W5DMbOCy614eNGKSm+9C1BkoBXVACNyDnRfXCzN/MYiKLoPAokbA/n+om0Ay9k1AY8ageaLYQ2bQssSPqxxtRKOcevYIFahkFqCImYTZRs1CzN2eWBf/rQHIE4dxcwnHNM08EZnj7Uq1I29mHme0BTsbK1ApbgpvKI3ch6N9dho+0DasiIYtKlKM++JoxHOwubENRCGhEY6abAf29h2dkZ4ui28Y7pCt7fKuQCpOfS+zq4fjImOWMLUGFoqpJdF2HJRNk4kPc1A8mVG+KzwePbt8gTAh13bERlIXdcYmxHhVPGbCQyQATJABshigAyQATJAFgNkgAyQAbIYoN0AM1ajziS61D6zDAF8UcllgCF2B4+YoRZoQ/VRtfBDw7iD38cZT0eiZ66vMB7wf7D8TzFABsgAGSADZDHAfum3AAMAO2tj3VmRR4EAAAAASUVORK5CYII=")
-}
-
-.fileList .ico-videofolder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABSdJREFUeNrsnNtuG2UQgGft9a7Ph8R27KQyLVSgCCICBSTENQ/ALVdIeQkkEAjEM3BFpd7AJQ9RiQsqJGgJIIFapS0hjp3E8dler73MjO3QSNheO+na3sxIv7KKvPNrP88/x00Uy7JAZHbxCAIBKAAFoAAUEYACcDlFneWmyr2PFvFZdnB949Be+7ju4PpSdYkh3ML1dWh9E7xa8LlvZnU7G+1y/hOjUvC6AWAK1/eBZE7z+vBxLOO5b6ig49NjaUCAO8vuA724vtXj2ZwvFHN0Y8Wj8Je37AC/0qKp9/VYSqLwDPKBGox/rMfWyCvNLwpjRNXw52e4KLRuLE36EIyDFlkdHqW5pjFfaNE0fpMZULy+JTLAHhqeuRB54A5FFMVjORLB3FiJpOZ9DKSUE4AiAlAACkABKCIABaAAFIAiAlAACsArI4szVLJ6YDSOwagXwGyVwTRq/DsWxQOqFgbVHwMtlAYtuNqf7AhAZGR1oVnag+bpHo0LR8I12xVerfJTbvwG4tchkLgOiuK9ugA7zRLUDh9At9Ps+xPVD3okgxaWYkiqHiV6CK4Kva4BRq2A6xCv29A4/othRjKvgy+QuHoAW5V9hLfLgAhccPUm+KPX/ueTygAkINgkQHqTwdURYM9sQfnvexBeew3v3bg6ANvVA4T3K1/r4QwC2EKXZvcoKuCP5fC+LFTyv0AH/SbpUtAn6pGs+6MwBYjqAF4g/gJEsttTwHsGIx7x2MZbZ1ZLOs3WqdsBWlDN3+egQJYXSm1eUJ+C1vsq+Cgqo85q/gE4PSN2FCD5rm6nwT4vnNm6JK0KRDPbbJGkm/ZwJ0C0kMbxQ74MJV8Zm36cPvkBaoXfOMWxe5yDiRf5unHy6L/80U0AjcYRpx/DVGWsn8S0hSyp/PRHjrR2hPwpgaTPG/WiCwHWj/pRN7LOx85WwMHEuYTWSJF2shl6ODL3v6xj9wEcRkgtlJzu5GN1Ut7/CY/mw4mf9QVXzu3lKoDk4Dnx1CIzRW+qPCoHP6N7G+0XqV5+di8XAbTwwc0zhz+zG8AyrlbYHRNMtEG8Mh1LZxwCeHnv3li2I6ziriPsGVrHqI6LDaGmQXhM8m11jQtb+eIC9PXfnjeN6kz3BzDPi117h9OgkYGKeogoXl/IfQCHLadpczSypuj6LUy+X554LDuNk3N7uQqgFkqddWLsOngCkci9d3bvpEqnXTs4t5cTojpngSvg1ULQNeoMsZ9Qj4AdXgNVj0Bw5SXbwaB5+pj9K+1Be7mymRBI3OCf9aM/x9a50ewbCO+mbXjUrW6UHp3bw5UAqWus+uNcr1YP7l9ak4JaZGR9pNvpzrTD/UAFrWubUxqavtWLf1wc3uEu18qkk3Q7lf/NCWB/cBRdf5PbWeS3KljnjivPJtXI7eo/rIt0jktxXAOQIxceNc7pvDq3uUp7d6FVfmIvOqPV0Rj05PFd6DRPWAfpIp1zeRaYk9CQPJ57l2cZPBgq/M4NVy2c5uG5R9UxIQ5S7QZds9nv82EtTHlkb1BxUCs/srY1F8ubO8DhcY5tvM1W2MDIPBycT2rL05gziIk1jznnLAvxageB0HJJHrAbmAx3WmXo4fXQ0ihAeHwB8NGrHeEsWmYAFkUW6g+uCQzVvAFYHpG3swSgABSAAlBEAApAASgARQTgfAAWra4pJKaUAbMiAbzdLhdBIE4Hj5ih3KFmwudG9UjD9SFeZwSPLcnj+g7Xp4r8I24JIgJQAApAEQEoAJdT/hVgAK5f795U9dlNAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-sefolder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA/9JREFUeNrs3G9IG2ccB/Dv5ZKLuUSN1miMq3/atVU6aauu615so6ulY+2gK0ihrFhwZRR801LGcLJRcXtRxmAwBhtzyFYHZUPYi/XNBlspdK3rnznHWitpFfvHNkprUqOJJrfnuZYiYiA6tRq/X/jhn3uSI588d7/nzqBiGAaY2cdCAgISkIAEZAhIwKUZa7IDgx0HFvtrqRP19QLt65aoVlFN1hSZCJWivnD6yqBq+rzvzIiNF0SGB96PBu+pqQDoEdXuyCnUVJt4OUZ03neoiBOfPTMXArBuqZ8DVVFtdnd+oc2ZuaA7ViyK+eYtdcBmLcOz3Z7pWbxNpP5c0bzs+GPL1v/7FG9adfd79sw8eVZ6aoDK8PlaTXz9QJRsswWJBjbEf1tMeBB40NJXwJqmPzW8YF+XOQOPaRm54p30QlFtiUdfnzvAjOLKOXiWuJh4E4tiHVgnO4piMRakgz1aB0SRKpFNxPO4ozC8lCMgAQnIEJCABFw+mfPbWT69FNW+d5Cl+TAWC6F7+Cx+H/iGgNNFVWzYln8QG7J34BnnevN3ofEhE6zN/y5ixjgcajqy7D7cj9wm4OR4HWtwcO1XyHOsMn8eivTjzmgP7BYduwsbsDlnD1p6DuHu6HVE42OcgZOjW92oLzsBt+bFucAPaO9rRnjigblNzridK4/g5bxa1Je2ofnvakRiI2wik7Mt/20TTx6qJ/xHn+DJjIrz3o+9x/DrnS/NQ/dVMZZdeEo2Zu80oU7d/CzhmJ/7PzVhN2S9xi48NTlpK3F6oBXHqzq5DpzNg87c/Q7lWduTGpvKDWTWM9Af/NNsEg0XqxAcD3AGzjQVOW/AoqioKWlKOKamuAmfb+lLeqYuK8ASVwX6Hv6FTdmv463Vn8CuOp9ss1nSsKeoEa94a9F1/xezeAhPiVzrfXSlGvtWH8cWT425aO4f6ULciKPQVW5eoXQMtuPkjUZeC0+X2+FuqBYNLdcO4cXcvXgpbz+KXBvNbTdCl8wmIwF5MyFBvvUfRuWKXbg8dAoXBn/CH/dO8m7MTBIY6xXrwF4wvB9IQAISkIBzEodY1lQ418KtutiFk9dXsF4vwWZXKZ7Ti2FTHj1dz9gtnA/9i86wH6PxKAGnZk1aAapc67DJ+Sx0cek23XZZe42t6Bzx48JIN/4J9y5vQK8tG88LtBfSy5I+TOWMlNCygrEwOh5eFXUlpQDlJ1SNjKJydoNZRH5ClV2YyxgCEpCADAEJSEACMgQkIAEJyBCQgAQkIENAAhKQgExSgAEjNkGJGeaxWUACtkSGAyDizPCkmUir/MP6h9HQoCZqn/jeS56kMiDqe1GNCv8RN5sIAQlIQIaABFya+U+AAQBLjB3QxtGdmwAAAABJRU5ErkJggg==")
-}
-
-.fileList .ico-access,
-.fileList .ico-mdb,
-.fileList .ico-accdb,
-.fileList .ico-sql,
-.fileList .ico-db {
-    background-image: url("../img/ico/ico-access.png")
-}
-
-.fileList .ico-c {
-    background-image: url("../img/ico/ico-c.png")
-}
-
-.fileList .ico-cpp {
-    background-image: url("../img/ico/ico-cpp.png")
-}
-
-.fileList .ico-cs {
-    background-image: url("../img/ico/ico-cs.png")
-}
-
-.fileList .ico-js {
-    background-image: url("../img/ico/ico-js.png")
-}
-
-.fileList .ico-fla,
-.fileList .ico-flv {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAz5JREFUeNrsnL1vEmEcxx8OOE1LEUyKthATgqYJ6eKEM8QRZ1+WmrropJs6mLjof6CJL9HFl7nMJY7SmLg0JIaBRBKrkBhDW2Io3Hm/B69eT6D3Qjm4+36TJwcctL1Pvr+3p+F8siwzyLoEIABARxUYdrJcLovK4YGyVpQVd8tFxxOJp8rhltH3nwiHrQFU9DASidyNRqMsEAi4Al6lUmGNev3mfCzGzEC0CnCV4AmCwCRJck3YnV5YYN+3tkYC8bAcOE/w3KZjosghkhOVp09QRByE6OkqPAqInm9j7EJEH2gTIgDahAiANiECoE2IAGgTom/YdpYyC8upVMpVcBqNBms2m6Y+k06nfVZHOddJme1ZKBTqucf3j8ugx7VaDSGsVTAY3N8Y0Uaf1Y1lzzlQhUjqdrv/uW6QEwGwD0QC1Ol0+NEsOM8D5Bf/N5S1W3UT78AfK9dNvf/U61d9P69/3Q5ECmVa+jBGCBuU3+/fd6IZeI4CHJWDRgmRoGmrsRGImES0MATBtAMBsA9EM//GAMB+862urUERsQgRDhwDRAC0mzOBAACdHQed+sWHjXST1mjDgW5z4LQ4DA4EQAAEQAgAARAAARCaqEb6KEfBcTbpcOC0OdCuOyZtBIQDARAAARAAIQAEQAAEQAgAARAAARACQACcIg39tuaXbA53JlO0VFy3/m1NURQ9Da/dbiOEj1Jj3dIP5/MscuVy33P1R4+ZmEzy81+vXhv6c44vL7PY/XusU6+zb7fveAegqkGACKARzVzIMGl3lwViMQ7z9+YmqrDhP3h2loWyWdZcK3AHEky0MSZE8Eg7xSJrlUpsJpPhUD0VwmfevjnwnGD8fPHScPi2PpZ4CNOR8ip3ZKGAHHhoS6XkSFo768Vei1Gt8kVQPQXQcvjmeuF78sYqX3q4BBMAhxQPynfktF/v3h94PfH8GXehEwCnpoioxYLynlZqLqQ86EQxmUgH6ouMCkrNeXq1NkrcgU4Uk+GbCflLXXFvz9PjXjsYlJYKa35LISyfO7tBd7Pw4u3i6Zr5tadSn6yH8OLixY4kf/BVq+fZ9ra3nDg3J8nJ5GeWiOcshzDkwlEOAF2mPwIMAMxjFWM7SdA6AAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-htm {
-    background-image: url("../img/ico/ico-htm.png")
-}
-
-.fileList .ico-html {
-    background-image: url("../img/ico/ico-html.png")
-}
-
-.fileList .ico-java {
-    background-image: url("../img/ico/ico-java.png")
-}
-
-.fileList .ico-log {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA9lJREFUeNrsnE9IFFEcx9/srlMbq+2fXHZdD8pG0WIHKQ92iP6QYhRFtzyVHiI7FJ2KIAiMTkoeMoSwTnoqhKLQQ0kHgzI8FAaZGIiu7JKKRVuLO9P83jrjpOu4M7Pu6rzfF5aZffNmYT78/nzfWxhOFEWCMi4bIkCABZVD6+Lo6CgvHW5LnwvSJ2SVhw6Vlz+UDi3Zzt9ZUmIMoKQ7brf7hsfjIQ6HwxLwxsbGSDwWu1zq9xM9EI0CbAZ4NpuNCIJgmbQLBINkJhrNCcT1amApwLOatvE8hQiRKH3txCZSQIhMd+FcQGTexpiFiD7QJEQEaBIiAjQJEQGahIgATULktLazpLWwGA6HLQUnHo+ThYUFXfdEIhHO6FLOcpLW9sTlcqWjh1vmstb55OQkprBaRUVFysaIOvuMbiwzF4EyRFAqlVoVdWtFYt4BTsV+5AVGyO8zDBEALS4u0qNecBsO0OiD5VNyKqu36vSCZN7GAES73b4qjVdGJdZADckAIRIz1UIEmCVEgKbuxpjCOgW773ojEAFmgKjnbwxmbYzm+nYp+rIx10zbmGwgYgpvMEQEaLZmIgIEiAC39FJwq9uYQrsCtDGYwggQASJAFAJEG4M2Bm0MCgEiQASIAFFoY9DGYApjDUQhQASIABEgCgEiQASIAFEIEAFuWmluJnQ8GkBCkrraI8YAgnieZxpeMpnEFC5YCudKh2urSP2xg+TW3SdrzvF6iknd0QNk/74KZezbxDQZePORTEX/35wNBX107u7KsnXnWgLgegIgFxvryOzcT9LZ/ZxCAKBnGmpJS9Np0t3TT8YnonRuuDJImhrrKbDWth6S+JOk98tz2zqf0t9hqgtDNCUSSQneCyWCAMLjngEK6mzDIWUunMMYXAN4ILgn/f0vjXamIhCiB1Kx//VwxusfRr6S8+eOkKql1IbI7JdSdaUAZmtbrzVroJY87uJ0FM1krl3TS+Net0sZG5cikKkmspGC2qluJpD6UAeZATg3ny74oYBPaRRqlQXS/+7Nzv9aHgsuz4Xap9THk7UkXFHG1lIOGgA0hZrqvRmv11TvoVH1+ct3mrrQKDLNdW7n8w5v03Rh8G9OJy/ZkFO0qcjNQk7PvldDSqPofTZIvSJcA2hqGwT35Fuaby66dP2+mIulnGykM6nv5RDttGaN9Nt3n+i8emk8lzUQlnJd7dc4QwCv3nyQEkSO6eWejROFjntX7IZSuDzofQ8vp2HxdfHwzPDsoYBn2HAX9nldJwRRHJyJzVf/TiSZisQdTl4I+H0ju3zFxw3XQNQW6cIIkGH9E2AAawxpPqroZK8AAAAASUVORK5CYII=")
-}
-
-.fileList .ico-mht {
-    background-image: url("../img/ico/ico-mht.png")
-}
-
-.fileList .ico-php {
-    background-image: url("../img/ico/ico-php.png")
-}
-
-.fileList .ico-url {
-    background-image: url("../img/ico/ico-url.png")
-}
-
-.fileList .ico-xml {
-    background-image: url("../img/ico/ico-xml.png")
-}
-
-.fileList .ico-ai {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABLNJREFUeNrsml2LE1cYx59MZpKNSTYb2tUsG0trqsX0YrVUL1pvpNSXFgr1poIgpUVEP4FXgvQ72ItCL7wuxStxlQVfSxFBS+lCXSPupl2XTeu62d1uncyL5zmzEyfZ3UlmEpJJzvOHw8mZOSdkfjxv52RCpmkCyb8kQkAAuyrZ7ebk5GSEdedZ+5q10X556NFs9nvWnW12fmpw0B9ApgtDQ0Pn0uk0yLLcF/CmpqagND9/ZnjrVvAC0S/AbxGeJElgGEbfuF1mZATmnj1rC8RGMXAY4fWbopEIh4iWyIYXKYl0EaLQWbgdEIUvY1qFSHVgixAJYIsQCWCLEAlgixAJYIsQQ27HWWwvbOZyub6CUyqVoFwue1qTz+dDfrdyfSe2t4dEImFZT+g1l80+F4tFcmGnFEWpHow4vc/vwbJwFmhDROm6vs7qNrNEArgBRASkaRrvvYITHiB/+DVXdh7V9bwFlsdPgbH0F0jJLAwe/qEjENGVsdW7cTMAA5VEtH/+4PC4VbAex51QOBzmzSu8wAFUn45bDzS0o2bcSYjOeNhTFmhWVqBSvMk/x/ZYp+w4xuudEp6+96wFqjM3wNRVCKfeBvnN93mPY7zeSSFEL39jSEFzX2Vkf02vTl9vav3yrXO8tUP1ZU3gAeqLT0FfmLKyYmZ/Ta8//5Pfb/jQksJbu9QsRDlI1heKJEF+Y7f1w1iPY1Nd4vdjY6ddvyN+4Lu2/66eSCI8zk1PWG6b+RBNyTYpa8zdeILPC6K6DrDy911uZZbb7qt1j7Ux3sd5bnrx01HehANYrfUcFlfdrzosspM1Yc8ANJZnQZv/rSbm1cQgR0zEeTifADqtz1Gi2Fl3XZZzXG+2pBEDoGkwt3wNxK776uW8zuebwXrJqWtlTGXuPhir/1bHS9fPNHZ5Nh/XbQZbKAv0mxSClky6YoHG/wtQmf3VShTRFAx+dglC4YhrrVi+chLMl4t8Ha6XBtLiWqAzlkVzn7vC45DZ/Wjuiw1jp6AAx9eDaSAn6CC5cccBaqXfq/Vc5J0j3IWb2peyeTi/vn4UDmC1lmM7jOjOLz2t5fPtncnMhHgAnafOSvYASPGMtx/L5uM6XgZ1+LQ6EADtU2fUwHtf+foOe103Tqu7D3At+MvbPqj+ceRVuA7XByWZCPd2llcVCgXXt7Po/cBePo0hgCQCSAAJIAEkgCQCSAAJIAEkEUACSACFk+v/wvKd0zB9hwBB/rY/gKioLDbAlxq5sHgxcPjgBcgevwzx3KFab9g2tuF1AuiMKYkMB2VUlmHLWx+TBXoVWhfCW3x4iYNEoATQC8B3D8HK42uwWrReKo9t/4gANqsYc1lJSXB4hrrC+2T+GAFsVluYtWnLc6A+L/Dxf8VfONBYgGNhYKo8jHWx7RYozLT1YFdn7hJAV/ddi3WzP5/g7msrNXYSkruPgRS5SC7cKPvasc8pO5nEc4cJoFvyQBfGmFcvjIfqQoEDlpSBwAF0fbno0Y9H9AisSCEQU0hGhbix65urYV8WaKZ23dMN64tEhMefPbXzvu8kYsZHP9XAuKGXn+yFypJYBw9K0jDTOx6Y8ewnvl2Y1INbOQIomF4JMACqJM9nuTUMmgAAAABJRU5ErkJggg==")
-}
-
-.fileList .ico-bmp {
-    background-image: url("../img/ico/ico-bmp.png")
-}
-
-.fileList .ico-cdr {
-    background-image: url("../img/ico/ico-cdr.png")
-}
-
-.fileList .ico-gif {
-    background-image: url("../img/ico/ico-gif.png")
-}
-
-.fileList .ico-ico {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA7lJREFUeNrsnEFIFGEUx9/szu66uOvumCtuSlREkB2ChII6dEgisFtCEQVBetBD4KU8lBAFURejg0HSqYgKjwke8tBBrEPSaYMMCrRW1NpCxTZmdvrep7vsrLObO+vubPO9P4zfOPNWmB//9733fYsj6boOJOtyEQICaKvkQjdjsZiXDQPsuMiOZqc8dHNLywM29G42PlRXZw0g041wONyvKArIsuwIeNPT07AwP98TaWyEYiBaBXgJ4blcLkilUo5Ju6ZoFObi8S2B+K85MILwnCaf18shohPZr0NURGyEKHQV3gqIwrcxpUKkPrBEiASwRIgEsESIBLBEiASwRIiyaHDq2LoWl3Ob1dfZ2Z5Qa2svAVwXW9tDIBDg55IkZa7nO5+ZmaEUzpbH48lsjGRvJlvdWBbOgWmIKE3TNrgunxMJoAlEBKSqKh+LBSc8QP7w66mcvVVXLMiqnwNXJ19A4v45PpYLotvt3pDGua78bwEm348ZxnIIAZpBdMRKxHfghGEsN8Rs5zmiiPiPnOVHJZT+6gJbGsc4sNJCiMV8jUEATbTZAlLVKYyVN1fK5acVhUgOrADEqnVgttvM3Fg1cyb5jAASQAJIAEkEkAASQAJIIoAEkAASQFIxqrrdmEI7L3bvEZIDRXCg3Y4iBxJAAkgASQSQABJAAkgigASQABJAEgEkgATQwSq4H1j78DTMCQ6oFn/c+2AN4FqET2yCapJS2LYULod8uw5C5MJdSIwOwsq70cz1UHsXBLP+H+RP/COsxl7D0sRzw+fN4lamRg1/y9EAzdTYPQSumoAB6rbO6xA63s3PESLeb2Dgc+OUU32gdPTx67mwhajCwaNnwBvdCz9Gbhlc9H3kJiQ/T7H7a26rbevgcYtPrhriEi8H4df4MIctK1HxAPpbj/FUxVTM1cLjKzA/3MvdhSAxTk3EN8SlgSJk4QCiq9Sf8fxFcB2YqyZoChmV+r3M4r6BHBbQgbQSKVHoKnRhvvmxZeAVuPxB5rKlvHGY4rKyvaCTHQsQ5zVsbczg1Oxu46mJabw08YzPl2aFIj332dHK2A4QHxoh1XdeMxQB7BUR7K/xR5k4dGvD+TuGOGxjsAJjJTYrMI7vA7EAYKUNtXfzfg6PdGpjv4cONcZ1mcbZ1UhLhV4486X/kCapSeZSCcSUDrrHn9p5+43bUgpr0f2TkNLwtT4CsmPPzJ5da9o3aTmF9fodJ1WAMffCp8PS8qJQ75jRAw2qFtnzFhlYTmESNdIEsNr1V4ABAKATVWjNArx4AAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-jpeg {
-    background-image: url("../img/ico/ico-jpeg.png")
-}
-
-.fileList .ico-jpg,
-.fileList .ico-JPG {
-    background-image: url("../img/ico/ico-jpg.png")
-}
-
-.fileList .ico-png {
-    background-image: url("../img/ico/ico-png.png")
-}
-
-.fileList .ico-psd {
-    background-image: url("../img/ico/ico-psd.png")
-}
-
-.fileList .ico-webp {
-    background-image: url("../img/ico/ico-webp.png")
-}
-
-.fileList .ico-ape {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA7JJREFUeNrsnE9M01Acx9+27g9jIkOZTMAYiTEZF4melJtwNJ6MHgwx/jlovHhSL0ZOejNGo4l6Mh7wZMSjHDyoB4NycolZNJpFZhiJSmRs0K6+X6FzsNKtLdtK+/0mTbf2tUs/+/5+v/fe8uaRZZlB5uUFAgBsqgS9k8lkMsB31/l2mm/dTnno7p6eB3x3sdb2W9vazAHkGm1vb78ajUaZIAiOgJdKpVh2ZuZCZyzGjEA0C/AswfN6vaxYLDom7LricfYzk9kQiNVyYCfBc5qCgYACkZzI395HEWkiRFdX4Y2A6PpujFWI6AdahAiAFiECoEWIAGgRIgBahOjRm87iY2G5r6/PUXCy2Sybm5szdE0ikfCYHco5TnxszyKRyLJ7PP+5rPc6nU4jhMvl9/tLEyPl0Wd2Ytl1DlQhkiRJqnDdek4EQA2IBEgURWVvFFzTAM4/e8zEb6m6f46wey9rPXFOv81KKJdP1RkF2fAc2Ah4Rj6HIPp8voowXutK24VwZOQS88V7N/y+UibN/j65Z+gaFSA5USsX2hJgPeBZuS9BJGjl1diWIWxn0ey7UQcCoAZEIz9jAKDW+LbGAuLqfmAtEOHABkAEQKs5EwgAEAABEAAhAARAAHSl6jaUmx97yMTvX+BAs3IDvLo6sBGyg8s3dQ60g8tRRADQoQCFPftMnUMRWVHr8TNwoO2/fRu4fFN3Y+zgchQRAARAAARACAABEAABEAJAAARAAIQMSXe1ZubyKfwzGVf89lPzqzUDBpY9OVGLVRYhIoQtqmkTqltGLimzxrmXY6zw4W3puJ8fo1VMayXnc2zh1bjSdr02pOKvWfbnzqizAXqj2xV4BCXQP7AKoCparrX09fMq4OGjJ1cdW9vGNVU4eOBwyVEEkoBWU27iRcmhru/GBA8eYoXJd2zx09RyoerfjxxYqyhkPaEwW0x+VFxIEEODwyz/ZkL3uvDQMWVPIeuLblNea+XBBe7Uavfa1AD9iQEl0UvTy3/msJScUqDSpjpSCw7BpoJD16oA7ZADGwqQch2BIkVv3K0AWw7QDnBsB1DNdb9vXVEcpaqFh2docIg7LIyxcLXqSy4rh6f09nk+VIsLiohO8aAQXpoYrzhH+ZA2ApybfV7zPbWKSKM70rqTCdPXzkvBQt7Vw71CMFTcefORz1QIi1273kscsBunZOiZ6dnFrt5J0yEsdcSG87L8Wpj5MeBZmHeVE+WW1qIY656SOnYcMR3CkE2HcgAIlfRPgAEAIIZMFb61acMAAAAASUVORK5CYII=")
-}
-
-.fileList .ico-avi {
-    background-image: url("../img/ico/ico-avi.png")
-}
-
-.fileList .ico-flv {
-    background-image: url("../img/ico/ico-flv.png")
-}
-
-.fileList .ico-mkv {
-    background-image: url("../img/ico/ico-mkv.png")
-}
-
-.fileList .ico-mov {
-    background-image: url("../img/ico/ico-mov.png")
-}
-
-.fileList .ico-mp3 {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA/xJREFUeNrsnLtv01AUxm8SO0mbUOKKhj4RaoUqpQsFJuhGOyImHhNCBQYQf0BZECwgJgYQSBQxIIaiTsBIBwZgQIVOREIRCBTRogaBVEjzsmPucevgJm4aX+fhXp9Pct3G17b883fOufe6jkdVVYJilxcRIMCWSqi2MR6P++nqKl3O0qWPl4vu6++/T1eXam2/s6ODDSDV9UgkMiVJEhEEgQt4iUSCpJaXL3ZFo8QKRFaA5wCe1+slxWKRm7Dr7ukhP5aW6gJxqxzYBfB4U8Dv1yCCE+mf97CItBCiq6twPSC6vhtjFyL2A21CRIA2ISJAmxARoE2ICNAmRE+16Sw6FlaHhoa4gpNKpcjKyoqlfWKxmId1KMed6NiehMPhNfd4/nPZ7PdkMokhbJQoiqWJEWP0sU4su86BOkSQoigVrtvMiQjQBCIAkmVZW1sF1zKA6acPifw10fDzCHv3kdCp89XbrIeycarOKsim58BmwLNyHoDo8/kqwrjclY4L4fCZy8TXM1D34ypLSfL38V1L++gAwYlmudCRABsBz85xASJAM1ZjR4awkwWz71YdiABNIFp5jIEAzca3NRYQV/cDa4GIDmwCRARoN2ciAgSIABEgAkQhQASIAF2phg3l0jMPiPztMzqQVW6A11AHNkNOcPm2zoFOcDkWEQTIKUBhcJhpGxaRdYVOTKIDHX/3HeDybd2NcYLLsYggQASIABEgCgEiQASIAFEIEAEiQASIsqSqszHS9A3yy+WAJPhx+wkbQJDfwmtPPCq/xUuIGMKNDOF6Kjg2TtrGjxP5yyfyx+RNItgGbXLv35DVFzNEHBzW3mYql5pdJZmXz7V2xv10ZeaekezrOf4Alk5IwXilXaT4++eGzwOHDpu2h9e2ChS6rh0Uavux09pnABngAXAAGjh4RNumZjIlwNxVYXCQf2T/xjw7Mko8wfYKqGZapQ4DATy4GcpisgRLX/t6B/h1YG7+reYUY5iJsVEttK0qPfuoIk2ACh8X+O0H5uMftBAW15+agfPAgfkaL7qd5jwNkgE43BDp2p1Sji0w3Ixt40AIOVhECg0uFHIfhDUABJDlKi8k0BZynjHcIXRhgZsSOjmpPa0rdyc3AHUXBscmtGrqjx3Q4AGYWopINUE7SBEQyulZjodycJEQugAREj5rzopM3dLC1qxQcT0W1kMWnAKhyJqz9GPo+RRyIaSEfBOLSMv+M6EQX8t5dvprkAvL86TeEW+Wqn710+KVC0ogl3X1cC8XCBZ7b077mEJY7t7zTqGA3fhl8XDNcO1y98A8cwgrndGJrKq+Epa/j3oyaVc5UW0LFeVo34LSufsocwijHFqFESCqpH8CDACOqX4es1WjewAAAABJRU5ErkJggg==")
-}
-
-.fileList .ico-mp4 {
-    background-image: url("../img/ico/ico-mp4.png")
-}
-
-.fileList .ico-mpeg {
-    background-image: url("../img/ico/ico-mpeg.png")
-}
-
-.fileList .ico-mpg {
-    background-image: url("../img/ico/ico-mpg.png")
-}
-
-.fileList .ico-rm {
-    background-image: url("../img/ico/ico-rm.png")
-}
-
-.fileList .ico-rmvb {
-    background-image: url("../img/ico/ico-rmvb.png")
-}
-
-.fileList .ico-swf {
-    background-image: url("../img/ico/ico-swf.png")
-}
-
-.fileList .ico-wav {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABE9JREFUeNrsnDts01AUhm8S59E2lKbQ0PQl1AgVpQsFJuhGOzMhFlQhXhKoCwuPBcEEGwMIJGBCDLDCyMICAyqEpRFV1AqIaFADKqpIX/EDn5vc5CZO09hpXNc+R4qcHD+i+/n/z7Fv5LgURSEYxsONCBDgtoZQa2UikfCpi1vq66z66rXLoHv7+h6riyv1br+7vd0YQDXudHR03AiFQkQQBFvASyaTJLOwcLkrHCZ6IBoFeB7gud1uIsuybWzXHYmQX+n0lkDcrAZ2ATy7hd/noxBBierHR9hEthGio7vwVkB0/GVMoxDxOrBBiAiwQYgIsEGICLBBiAiwQYiuWtNZ6r2wEo1GbQUnk8mQpaUlXfvEYjGX0Vs524V6b0+CwWBePa4Sl43ep1IptDAfXq+3ODHCu8/oxLLjFMggQkiSpFHdRkpEgFUgAiBRFOlSL7htA5h99YyI35JN/x5h/wHSdvpC7W0KVuan6vSCNL0GmgFPz/cARI/Ho7FxpSotZ+HgxCTxRPq3/LhSOkX+PX+oax8GEJRYrRZaEmAz4DVyXIAI0PhubEkLWzlg9l2vAhFgFYh6fsZAgNXub+tsII6+DqwHIirQBIgIsNGaiQgQIAJEgAgQAwEiQAToyGjarVz25RMifp9FBRoNJ8BrqgLNCCuofEfXQCuoHJsIArQpQGFwyNA6bCKFaDt1DhVo+bNvAZXv6MsYK6gcmwgCRIAIEAFiIEAEiAARIAYCRIAIEAFi6IqaT2umr57BfyZTI3L/hfGnNX06HnuyY6xv8hAiWtjqNdAd2ktCtx+QlrGTZfn2S9do3tNTejDGFWituu2uiUma9x85Xsx5B4doLjA6pnXN8AhdB8sdD1Be/E2k+RQdMA+KgePz3mj+vZT+UXYCYHpeWV0uA5Kbm6HH9cUOa77TGxuh269Px+3RhWGw7s49GlCimvdEBop5eA8Dz83OFHOgOsitvH1NQQLQYn1KfKYngs/ByYHjr019sM9lDCiKVx2AAvXk5r5SVcE6pkaAB8CKAI8eozCYmnzDh0oAp79ocgAPjgdwbQOQKYrZFZYwQFAmP2gAzNuXwYVtmSUDo+Oa8sDbGOzL8rYBCIOHAYHyGChWw1heKKiTQa0GI5eI0/35WsjbuGjfT+9N68Km/awJYMCOMHgGlOW9tElky/IAhIGCjlrZJJilwd7QtcHG8uKfvGIL1rYVwHwdHKOXHXyTgDzkvBXNg9W1v/eul9VEgAXbL79ppXl4ifQkHCTySv4EgGptdy/M4ICy+DrH8tBh+Tx0X1AZD49ZljWXUjOJ0/3BvmY1D9MB8vbkLVZpZ9Y8ADTUPI2SC3UTALPuzewMn826fKlrMmH+5kXJv7bq6Nu9NX9A7rn71GNIgWL3wEdJBezEKRkYM4xd7O6fMtxEpM7w+KqivBMWfo64VrKOUqLS0iaL4d641LnvhGELY1ioiSBAjKrxX4ABABrs14sDnYP6AAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-webm {
-    background-image: url("../img/ico/ico-webm.png")
-}
-
-.fileList .ico-wma {
-    background-image: url("../img/ico/ico-wma.png")
-}
-
-.fileList .ico-wmv {
-    background-image: url("../img/ico/ico-wmv.png")
-}
-
-.fileList .ico-doc,
-.fileList .ico-docm,
-.fileList .ico-dotx,
-.fileList .ico-dotm,
-.fileList .ico-dot,
-.fileList .ico-rtf {
-    background-image: url("../img/ico/ico-doc.png")
-}
-
-.fileList .ico-docx {
-    background-image: url("../img/ico/ico-docx.png")
-}
-
-.fileList .ico-pdf,
-.fileList .ico-fdf {
-    background-image: url("../img/ico/ico-pdf.png")
-}
-
-.fileList .ico-ppt,
-.fileList .ico-pptm,
-.fileList .ico-pot,
-.fileList .ico-potm {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABWZJREFUeNrsnF1oHFUUgM/O7272J7s1iVkT2mrAmBRREQUpiFCtCj74pFAoCOJDlIogSJ8K+qL45A8qqPhSEH0VLAit+lKF0tIXiaQBUaLd2m3zs5tkd+fnjufObtIkZmdmZzLb2Z1zYJifPXdm7rfn3HPO3ZlNWJYFJP4lQQAJYHQBzs7OKrg6hctLuIz1S6fHxsc/w9WrXvUHc7m2n0kubd/O5/MnC4UCSJLUF/Dm5+ehfP36zPDICHQC0S/Alzk8QRCAMdY3bjdaLMK1UmlPIAounw9zeP0mqqLYELkl4u6nYQLsW9kriLEFuFcQYw1wLyDGHmBQiAQwIEQCGBAiAQwIkQAGhOhWC1sTExO+b2Tth09AmzvvSVcsFEF98FlQp5/AnfDKxnK5DJVKpaM209PTCb+lXNfEXCrB+k9fQf3id5A+OgPS2FQo18HaHjKZTNN6Ere4tNteWFiA22aBG7L00TF7XXj967Y6xtU5G6B5c8G2wMxzb4J84AFP529UFyEhSCDKKoiK6qqv6zoYhtEW3E6AThYYmTFQumsScsfeBfmeh9EcDdv92frydshaHWEtQW25DGs3rm4eZwhDkhUw9ebnlmk4XkuWZXt2yQ3e1u3eCCIJAdLPnABx5G6w6qug/fZj8zh6SW35Bhi1VTROCdRU+v9fgKpCMpMDCS2wjhCN+roniBugNpat+z2ZxiQkBVKPvWBva1d+bfJjDC1MhmQaAaGbCg5BRk6mYCBXQLM0QUfgjlaPANtZYm9a4BZ3tl2zUm52RBRBVlPevwSuP5BB8CaY6PZuEEXU3+nGXq0wmnmgxVqe638Sl/edQ9dra/YQ4JhCIcDdIPZsJcKqN5s3ly5sEPV1HhHdXpRkMPSGu24L4s6xsCcB6n9carnyfUH4tSAqwHTNmzUJQscWGLlfinj0rV8+0yypph/f5tKOVc9i2SG4i96npxAiz429/twbKYCWocHqmQ9tiPL++0EaP+QJYKowsreZQMv6vECMDECjNA/r5z4Hc/EfELJDMHB0pjUgMtcgEEo6FUUX3ijp3FKY9NOvgTCQb4KzzN3zPTW5rRpxQAHpoWJoECNjgeK+MUg+8jwok4dvuS3mce2sT0ll7MU5G2JQW62Eet9dBeg0mbBtZgaTX17P8vo20AyPqdupTJgSyTSGD96m1gh8HlPTQFSS8QMoYadNE8swQ/cPD9vyc0hxBMjrMCWdBb1R95VD8za8LT8HeIym/QWQWyHWsQKWYXxGxergwSauy9vwtlIHExB9B9COtOkcr8VgvbKEFlVzLwHR6rgub2O37cYXDREXZSBrz6rUq8s4rmFkVhQst8TNOUGG0ZphumNgwODBJ5UfRuvrXrd64qnJBMJK5YfAQAsztBqmOHVgrQDDXZXP/0nJNLpssvtDTZTyP/dxMXlbIPXsGNgLQgAJ4G1Ot8I8eaO6HJmOqtl87wEM66bJhQkgCQEkgBSFKQpTFCYXJoAEkAASQBICSAAJIAEkIYAEsAfF8V25v96Yov+FQjnwwe8B3taU1HjTMxrkwmFKVx/tGD91dtfj1V++gZWzX7rqrF36HkZPnHa8xrWPj4OxVOpPgFxWzn0B1fPfbu5nD78Ig0desTvNAbnp/P3Ok5vHh4+/b6/Lp9+KbxTmoFi9Ckrx3kA6lMZQHuhPuHsKySxopSuBdGIRRLjwsYwvuwWITnRiC3BngPCrQy5MYyAJAQx7MuHPk4+aCaMh8Dce4ykWWJLKDr53QfRlgWbx0AX7jUmwYgmP952NTl30HYWtffufMi32s/Dv3EOJ2kqs3N1KDTJ25+RldsfBI75dmCTgGEhCAEOX/wQYAOhdFmkKB8pMAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-pptx {
-    background-image: url("../img/ico/ico-pptx.png")
-}
-
-.fileList .ico-txt {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2JJREFUeNrsnN9LU2EYx5/98KgxbXM6tuZFMSgaeiHmhV4IGSVFkX+C1FV20W0hBF1IVwVeaAQR/QNBERR5UeGFg1K8MAyySBCbbP1cP6zhzul9js6t1NP5oW6e8/3C4WznbBfvZ8/3fb7vOzguRVEIMi83EABgSeXVujk9PS2J02Vx9IojapdBRxsbb4hTn97P766tNQdQ6Irf778YCATI6/XaAt7MzAylU6lzDaEQGYFoFuBZhud2u0mWZdvYLhyJ0EIyuSkQ/zcHNjA8u6lSklSIXIni7TCaSAkhOroLbwZEx8cYqxCRAy1CBECLEAHQIkQAtAgRAC1CdGltZ4m1sBKLxWwFJ51OUyaTMfSdeDzuMruUs53E2p58Pt9y9bgKXDZ6PTc3BwsXq6KiYnVjpNh9ZjeWHVeBeYisXC63puo2qsRtBzif+rgtMKKhoGmIDGhpaUk9GwW35QDNDmw7lbdy8VadUZCOjzEM0ePxrLHxv1WJOVBDeYBcievNhQCoEyJDK+7GsLBB8e670QoEwHUgGvkbw7ExRnN9u1J9esK1o2OMHoiw8BZDBECrcyYQACAA7uil4E6PMaVOBYgxsDAAAiAAQgCIGIMYgxgDASAAAiAAQogxiDGwMOZACAABEAABEAJAAARAAIQAEADLVpqbCYO3RkBI6Ob1uDmALEmSHA0vm83CwiWz8GaqrWU/9Zzo2PD+18wP+v5jkeoCNXRt6C4t/ir88n1nTlJ1VaV6T0v3Ho7Ri8nX9gTIAyse3EB/Lz1+Mk6jiZer16KRoIB1irq7WgWMhHqts71JXK+n4dsPaD5Z2OXm691dh6h/4A66cF4MiKG2tRyg2L6ICpQhjSam/oLnSAvrFVdk08G91HO8Q9j4twD3QUCdQA40ovuPEup8x9bl1wjSBhXwF5rFnnB5/zlVdhaurpJEt26nqVez6ntuKG9nk/Tp8zdUoB6dXok6I08n1IN17HArLKw3KzaLBsJNgyuOj9GxKfUaxxYA1NByZGlVrVucF7krv3n3njo7mtVoU27SfPTThUtDOVlxOXq553Yp8uDV8x5TFdgYqXvOD6dx4uPiecw89mg4MG66CwfrfEdlRXm2kPrS8nMx66hK3FUtyeFQcLI+WHPEtIWhHRqkAdBB+iPAAD3HE9ONhnJoAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-xls,
-.fileList .ico-csv,
-.fileList .ico-xlsm,
-.fileList .ico-xlsb {
-    background-image: url("../img/ico/ico-xls.png")
-}
-
-.fileList .ico-xlsx {
-    background-image: url("../img/ico/ico-xlsx.png")
-}
-
-.fileList .ico-7z {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABAFJREFUeNrsnF1IU2EYx5+znW3aNvcR6qZS0shwXmUQVFAXKgTrKoSiiwjMiwRDb0ToA/q46E5JsCDpoiAKuuhCIajsAyqQspua5IgKq6mLmV+zyc45nfcs15pnunO2M7ed5w8vZ+Ocs5fz4/9/n/d956Q4jgOUfFEIEAHmLkCv16vnD+f5doJvlYXy0JVVVdf4Q1uq11tKSpKeo9e594LVau222WxA03RBwPP5fBCYnj5VWlYGUiDKBdhC4Gk0GmBZtmBi53A6YdLvzwhEzTrnSwm8QpNBrxcgEifyb/uVBFiwyhRE1QLMFERVA8wERNUDTBciAkwTIgJMEyICTBMiAkwT4nprYc7lchUUnEAgAHNzc5LucbvdlNylXMGJX9uDyWSKuof6xyXZ64mJCYxwvHQ6XWxjJD59crf1VOfAFYhEDMOscl0yJyJAEYgEUCQSEY5SwakeoPDwf6Mcv1WXcw6MTH2CxaEeYBeCWQekMdnB6OkEuty1JkQSZdISY5wKQMWLSGh4YEPgCc7i+w09ur7udVqtVmhS4WXFgczP6DTAeLAd9DV7Ur5v5uqx2Gvb6TuS+10efw2LD/uACX5P6XoCkECLr8Y54UDgouOLFHiZkJz+yO67VAfiUk4EopSvMXK2CsfHNt04S9WK+1KZXNPoubUhYoQVhpizDsx2bGWPmegzBLixy0GswuhABIgRVrgKowMxwqi8XMolVtxcjHVOA8yHcRAjrIaJNDoQq3AGxGX5r/yz1J/yAKloF+H3w1nlF+uPUvYRFR8DaYcLIn4fhJ7eFFrWB3mHK78daGxqA7qqbmMqJN8v6T+vHaixloP58BksIigEiAARIAJEIUAEiAARIAoBIkAEiABRRGv+WvNrRy3+XyheW3vH0vi1Jm1QN71IGCOspDb8a03boU4w1ntEz3272AiO9ltA2ypEz4c/j0Lgdpe6Ac4M9ggtFokiE5S19sPS2Avh/WTf8VX3mPcdAUtDKyy8HcIqLOZI9vcCzD4eED1f7D4gwJt/dReWvM8RYCIc0n4N9orHxebkAXfAsn88KWBVA7Q0tMDi6JAASEz25nPALs1D8P4lnEiLuY8Ui9AH8VhaGk+C3lnDw7sMkRk/AkzUJvd+HswPobImyrjLA+a9R2H2yY2k7lQ9QMO2+ljljRdxnc3TKRSM+Zf3cC0sJgJJU2ReFU0ypbE3nxWcGT/VwYl0gnQV26OrpuD/AHU82JVJdEXXg9WrLB6s2DwxZzYTvnTvZqhImHcpBeoUBxxtYKuvjGhlRZhx1o0AywgfpEZ45NlZR+0b2RHm7FuaGI59ppn6uJNamlXVxgNXbGHZ8h3v2M3VDbIjjEpzDEQhQMX1R4ABANtbXMt+ZZZBAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-gz {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAP3SURBVHic7ZzBa9NQHMe/L8k6pd3WTra1rDihoGy7zJueZSB48+hJ8LSBMmEHQRC8C4qCepAd/Q8EQdi8CSroQSpaPJQhc61MHFtl0iQeutSsbV6T/vqS1/Z9Lm2T9/JLPvv98l6ypsy2bSg6R4t6B3odJZCIwVuZz+djAO4AuApgOowdCoPpbPYJgGW/7cdGRz3XcQUCuJtMJm+lUikYRrumvUGhUEC5VFqamJwEAkj0op2Va6lUCpqmwbIsaixpSGcy+LG11RWJ7c6BE5rWf6fJ4VgM6UwG5VJpCcBjyrb6z45PuiVxYAUC3ZE40AIBusSBFwjQJCqBh3QqUQl00YlEJbCBoBKVwBYEkch4t7Py+bydy+W6vX+RUi6Xsbu7G6jP3Nwc81rXHxe4AUgmk0gkEgAAxv578Xq/ubnJ3d7AlfDQ0FD9xoi7+jq9sTxwGQjUJAKAaZr1ZU7WeWWiFwMpEKhJZIyhWq2CMRZYnMPACgRQL2X3rTrpMrC6/Q37L+7D2tsRHaoJLTGO+KWbMKa8ZxKGYcA0TZim2VTGfgQKH0Qq688ikQcA1t4OKq+etm2n6zp0XQcQTB4QQgaaP2vTgPjF64idPu+736+HV+rvUzeeB4779+sb7L98BHPnu6/2uq6DMXZkNJYiA2HXzi9B5HWDTuJpmhY4AwduHtgOTdMQ5N8Y0o7C7rKllnNQnOzzM7mWVmDUqBLuAlLMAzsl7LLtFJWBRJRAItKWcJSjcBBUBhJRAolIW8LuspUZlYFElEAi0pYw0DziyljWUguUUVgjqoSJSJuBsk2YvVAZSCQ8gXbI3/IPKZ54gawW4uDTuvBQburxmNhDFH4ONNI5VLcKqGysobKxJjpcy/giEZ6B8cVlGNl50WFaYmTnEV8kP4zEjyF06wC05BRGLt8WHSYy1ChMRAkkogQSUQKJKIFElEAiSiARJZCIEkhECSSiBBJRAokogUS4T2sWV2bVL5MBmHnwmfC0pjHc1Z3pOaoH3NXCS3jm3kfRISJFnQOJCL0j7WSf81pcXTjy2cFZ7qwrri409Wm1XWd9Y59GWm2jWwgV6D44h8bPrZa1asNr647HayuC0EvYzwEFOWi/okUR2Vc7+mVwiUQgrwxFbF8koZdwmAcXBpFPY6jZ19g/7D9QKCXsnpI0Tjd40w93f0cKr3/jq7uNKNpfC/fApZzQrKsecK+FuSVsHxuxALnuJ4Q7etuHDrzhlrCZmX9rFN+dg6YD8P9bKiJpVfJiss8GLBNWevY9rxVXoD1+ctG0rdfa9pez7M/vyAcch+LKrPAY9vExy5o688E6ceoCrx33HOiXIL/0IxvU45cmq3oVJZDIP8OiU3PHSqspAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-cab {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABLVJREFUeNrsnF1oU2cYx59zepp+JTSp1CZaNl3AYXo1hQ0V9EIFobsYQ5gMBMFVWGFjvRHBWZjbhXjTMaEKftwIoqCXBWGrzsI2lM3dzAwt4kbR1GZr1takq5wP3+dtczxJTr5OkpP0nOcPh3ydnJfzy///PO970lTQNA1I1iUSAgJYV0mFXoxGox52M8y2Q2xb75STXt/be/a/4fcGzV5LHrmR81wkErEGkOkrv99/LBAIgCRJjoA3OTkJ8ZmZT7tP3oV8EKvmQKbDCE8URVBV1TGxC4ZCMB2LVQVisRrYjfCcphaPh0NEJ/pP3h2lJlJHiK7uwtWA6PppTKUQaR6YBZFNcUYJoI0QCWCFEAlghRAJYIUQhUKXs9haWAuHw46CE4/HYX5+vqz3sLWwYHUp5zixtT14vd5l9wivueS7PzU1RRE2qrm5Wb8wYkyf1QvLrnNgGiJKUZQc1+VzIgE0gYiAZFnmt+WCcz1AfvIrUTZeqms4B8rPH0NybATUF7O2AxK9XdDRPwRST7ggRIwybtkxLgVgzZtI6taFusDjzmLjpr4/V3S/pqYmvpULzxYHKv8sTwM69n0Gnk3bSn5f4ruP9fuBz6+UPe7LR79A8uYZUGaflrQ/AkRoxm7cEA4Ebbm+lAOvGrIyHl59L9eBtJQzgVjO1xgN24WNsa00zuUq7b5SJtcSea4wRIpwjSE2rAPtjq3lmkk+I4D1XQ5SFyYHEkCKcI27MDmQIkxalUu57I7biLFuaICroQ5ShN0wkSYHUheugjSb/8rfpvFqD1BYHmLpj1u28tPHE2p7ijWvgVIwDHJsElK3L/HN9iIfDK9uB3bsHQSpt68+HZKNi+OvageK/h7wfXicmgiJABJAAkgASQSQABJAAkgigASQABJAEqrgrzX//mIz/Wcypje//bOCX2tKLe6mJy9RhGsp27/W7NzzCfi2H9Afv4w9gsXoHVj46VrOvt0HT0PLxi2QGBuB5G9j+vP4HL5mprnx86bHcgTAtQOjILZ6M4Cs2X8COncP8PvGE5cCIQ5K/X8B2iO7MgCmFb98FJae3NcfB94f4seSE9P8Q3FUF/bt+Ag8oU0we/2bDBj/Xv+aQ/DtOJCxf8fWfg5vbvwCB4lAiyn14M4K/KDzpjFtzEXoCoysmZNmzg9yd+oAt/RD8v4YLK5AaYvsLDpGe98uDn0xOuG8CKP7Fgxxy2l2iVgGbLHVx+BNMCAvOHh0aHZtM6uDWAONx3JcEylF7cxtcuKZ7tYUcxRCTbs4Xw3E2Af6h3LqqSMAIgx0Yb76iMV/+sxB3YGo3uEfcsAWag5YWzH6rW9tdR5APHGEhBCz6yCeMDoOo4cwUc9Of8Djmz39EVtHii+vDLXUMU0E3YGQuvZ/yaOWPdebG7+oNw+EbYTHP4AHE3pM8wlfww8Im4/jaiACwU7buWeA16l0rUI34rwQoWF0pcA6HWZ2CcANAcuJi3mbyMLPV03njHW5mPDXsXcVQV5iLhXAndJAk1rUDafuNVmKsBLquweqwg/kRnh47mpw86+WI6x1vbFX0dQfxecP3xEW51x14UFr61TVnrd/V9ds2G05wqQG6sIEkGSqVwIMAG021uWJKtY8AAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-iso {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABH9JREFUeNrsnEtoE1EUhs9MJmlLUpu0tk20+CCotK5UEMSFCxWEuhARFFERbBcWFN1oQRTUjbpRFFRocVMRBRduCoJvQQTxsdGIFlGpNm1TW9qa1pZ5eM9NZ4w1jZlJ85xz4DLp5N7czpf/v+fMTVNB0zSgsB4iISCAOQ0p2ZOhUMjFDidY28va/GK56Pl1dVfYoSXV/hVz5lgDyOKk1+tt9fl8IElSUcDr6uqCSH///uqaGjAD0SrAfQhPFEVQVbVobOcPBKA3HJ4ViP9bA6sRXrFFicvFIaIS2Y+XKYnkEKKts/BsQLR9GZMuRKoD04RIANOESADThEgA04RIANOEKCTbzmL3wlowGCwqOJFIBEZGRkyNaWhoEKzeyhVdsHt78Hg8MfUIf7jM9Li7u5ssHB9Op9PYGIl3n9WNZdspUIeIoSjKP6qbSYkEMAFEBCTLMj+aBWd7gPzip6wcv1WXdwqU+z5BtPM8qD8Hsw5I9FSCu/EwSLXBpBDRytim2zgVgBlPImMP23MCjyuLzTt27+p/+zkcDt7MwsuKApWBWBng3nQAXEvXpDxu6OJO47Hv4A3T805+fA7Ru5dAGfyeUn8EiNDis3FeKBC02PpiBt5shJX5cPfdrALpVi4BRDMfY+RtFo63bbp2Nhu6+lIpriXSXHKIZOEMQ8xbBWbbtpbXTNIZAczt7SBlYVIgASQLZzgLkwLJwhQFeSs3PePmo63zGmAhrINkYTsU0qRAysKzEFqW/8o/S/NlHqAQm2Li7cOs8jPmEzJ7iRlfAyV/EORwF4w9usZb1hd5f7CwFeje2AJS3fLcZEg2L85f0AoUvbVQvvUYJREKAkgACSABpCCABJAAEkAKAkgACSABpMBI+m3Nr4fq6T+TsVh44X0a39aUSuxNT54gC2cycvKxZvXuc+Dw+qH30p7YL+ELQMX6JihrWGf0GQ89geEH7SAPhY1zJYtXQsWGJnAFlhrnoq87Yfh+G6i/ftoziYilHpi76yw4GMSec1vg26kNEOk4As7AEn5eD/eqRg5eYUCn96tpvszfBFsCdDI1Sb55TEXthoomPr/mysLzqDaEjArFcz9un/6r3wCDKJaVQ/naHfYEqE3BQGsiKD1Gn93iKpsMf+TqE0vLIfqq85/xCBPBulc2/jW+qNfA+EBAww/amMKaYd6RO8a6Jg/1cIj8XWYK0/smTJRT6yQqdqY+RQtQVxs2VJqLWzrAFYVt4PpRysLJImZPDweIFo1CzKYIEpMDPq+OjxrnEilMTyCoWltmYbTv9PULQSEQfe1Tf41ymInGo1LR9rkoZXIOcDz0lMOZy0qU+PrOt/kwX9PG3j3hYLAmRFBV244bsLEuxHGo0NFnN+1pYUwAAx1HWRmynVs2XoFY52GpwhMLU6E8GObZWk82+VBIJ91M+NK6WhHkCaZSAewZGmhSibrozAuHJQsrgeUvQFX4C9kRHl676q9/adnCWuWCjYqmPhb7PqwQxodttfGglVWoau2yN2rVovWWLUxRAFmYANo8fgswAF4ssuGz3PXWAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-rar {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABGNJREFUeNrsnEtoE1EUhs+k07Q1qclUahMtvoJK05UtCCrUhQpCXblRBEFQFxaUdiMFQVA34qaioC6KG0EU3BYE6xNUEI0bqWjxRZWo0UpfaSOZGe+5adIkjdPMpJkkM+fAZSYzk3uZL/85/52bpoKqqkBhPByEgACWNEStk0NDQ062Oc3aIdZWWuWmVzY3X2Wbrnyv9yxdagwgizNer7dXkiQQRdES8IaHhyHy8+exxuXLQQ9EowAPIzyHwwGKolgm7Xx+P3wPhxcF4kI1sBHhWS1qnE4OEZXIXl4hEykhRFu78GJAtP00plCINA8sECIBLBAiASwQIgEsECIBLBCioLWcxZ6F1UAgYCk4kUgExsfHdb0nGAwKRh/lLBfs2R7cbndCPcIcl//tj4yMUAqnR3V1dWphJD37jC4s206BSYgYsizPU93/lEgAc0BEQPF4nG/1grM9QH7zs6mcvlRXdgqM//gAUwN9oEyOmg7I4W4AV2cPiE0BTYiYytiy0zgfgEU3keiD/pLA48pi40bvXVvwuqqqKt70wjNFgfKvxDTAtfs4ODdsyft9fy4dSO1LJ27qHvfv++cwdfcyyKPf8roeASK0dDcuCwWCmqgveuAtRhgZD1ff9SqQHuVyQNTzNUbZunB62haaznojqb58JtciaU4bIqVwkSGWrQLNTlvDNZN0RgBL+zhILkwKJICUwkV2YVIgpTBFRT7KZTtuOaZ1WQOshDpIKWyHiTQpkFx4EUI1+a/8TRqv+ACFxBCxNw9M5ZcaTyjuLRa9Boq+AMTDwxB9eJ0304u8L1DZCnTt6gKxubU0DsnGxfErWoEObxPU7z1FJkJBAAkgASSAFASQABJAAkhBAAkgASSAFBiav9b80t1C/5mMxeqLbwv4taZYY2968RilcDHDtK81a9a2QePBCznPTTy7BWOD/ZmfbK0bfCdusG09fL98EOJ/wqlz9dv2gWfH0Xn9KDMTMHa/H6ZeDVgPYDIiN05C7FMo9drV3glSZw8HlH7jda3bOTyEUhfsgImnt+f19fXszozX0p4e3lfsYygDuKVdGKEhJKd/Q8ZxV1snTA89Zu0J38+3L672dW32m8ZgyiYDYWKLMngzTE2itIKXACN9WR4g1jNM1cmM9O3gqkwo8DHfd7cvrELPziP8WkvXwFxGgiaSURd5+j6ZS83QANRv3c9A9zFAk6njzacH5/X1+865jGssbyJJR535EOLH0VRQkQgxu/bhuXQzyTYR/HCkPd3MRF6ZBrEsTITXvRXr+XZJcDv8Db/ncNIbHqtj57QCywDCx5ppmxqISsG6xdNB8nOzwLqXHXgMjUXLTOTZqYtgJxPhEKcnuLpcs0aRywSSx7TMJPlB1AbMm8ZoLiZ87t0sC/EYgyyAPUMFVaxR1px/UWVIgbK/9QUoMu/IjvDw3hVfy0vDLqw2rNolq8ojx493m4TpMVstPKh1HkVp2vhaWbZmh+EUpqigRzkCaNP4J8AArrWcCArY0yoAAAAASUVORK5CYII=")
-}
-
-.fileList .ico-zip {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA+hJREFUeNrsnF1IU2EYx5+zHTdkU7eZuuUocWA4r/QiqC68UCHQqxCKiAiqiwRD74RKyKu6UhIqULoJouhWIcjsAyqQsJtY5IgKq5krze8m56P3PWtruA/Px77P84fDmTvvu5fz2/95n+d958aIoggo9TIgAgSYU7GpLvp8PhM5DZLjDDlqi+Wma93uW+TUI7d9RXm5OoBEV20224DdbgeWZYsCnt/vh+Di4oWq6mpQAlEtwLMUnsFgAEEQiibsnC4XLAQCaYG42xxYReEVm8wmkwSROpH8eROTSA4h6joLpwOi7ssYrRCxDtQIEQFqhIgANUJEgBohIkCNEJlU21lkLSx6PJ6ighMMBmF1dVVRH6/Xy6hdyhWdyNoerFZr2D3Mfy7JHs/Pz2MIx6qkpCS6MRIbfWo3lnXnwAhEKp7n41yXzIkIMAFECojjOOmsFJzuAUo3/y+UY7fq8s6B3I+PsDE5DML6UtYBGawOsHT2A1vjSQmRhjI9doaxHIAZTyKb0+M5gSc5i4y7+fj2ru2MRqN0KIWXFQfyP8NlgOVoL5gaDsnut3zjZPSx/eI9xeNuz72GjUejwC99k9WeAqTQYrNxXjgQxPD8ogReOqRmPLr7rtSBuJRLAFHJxxh5m4Vjw1ZrOCtVxH1yimsWPZcaIoZwhiHmrQOzHbaq50z0GQLM7XIQszA6EAFiCGc4C6MDMYRRBbmU25lx8zGs8xpgIcyDGMJ6KKTRgZiF0yAxy//ln6XxMg+QCQ8RejedVX7R8ZjM3mLG50DW6QEu4IfNp3ekI+uTvNNT2A60dPQA627KTYYk49LxC9qBBlsNlB27hEkEhQARIAJEgCgEiAARIAJEIUAEiAARIIoq5bc1v/Q14i+TEe0fea/h25qsWd/0uBCGcCaVk481WbsLnL13k15feTIGay8fgHtwCjZmJ2F5YhjKjhyHirbzcW23A3Pwe2JEOusGILccgK9D7XHPV3ZfAXN9C2z5XiTtG9uPvhF7Tl0HR/dlWBg9re8sXNF+Dkq9rcRtIxJguW8EdShr3yvB1C1ACq7s8AlYe3WfuO851oFK50N7Vx+EPs3CytS44r6Wlk7ixO+yXVsUc2CsHGTeE7bW4NfDIVntaWJJlER0lYUjsnf1g8nVAItjPSD8WZfVJ1Hy0WUI07KEhh8tWXJVghQsQOo6WtPRhEHrPSykFcpc3xzNvu7B1rjrkeK54DcTPg8c5BkuRFzKgD4lgsiahbprM0ZVIcy7mmZA4KUX0iM8eu+Cs/GN6hAWHfs6eFF4ZvjxoZnZWtHVxoNYWiEINQfeCpV1bapDGFVAa2EEqFP9FWAAVhNMgyXjjfoAAAAASUVORK5CYII=")
-}
-
-.fileList .ico-bt {
-    background-image: url("../img/ico/ico-bt.png")
-}
-
-.fileList .ico-file {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAehJREFUeNrs3D9PwkAcxvFrKXUhCAMEAhsbL8nJxElfgYPR+CZ0MnHyJbEwMkDoQGAG6h2CNlIo16t/cvd9kktL2g73ye9a7gj14jgWJH88AAH8v4CDwSCUm3vZLmXr2NLpTrf7LDc3p55/Xq0ePBZkXPtYq9Vu6/W6CILACrzhcCii6fS60WwKHcS8gFcKz/d9sV6vrRl2rXZbTMbjQhD9jOMNhWdbzsJwg6gqUX58+klAa1MUorOARSE6DVgEovOApogAGiICaIgIoCEigIaIWXPhuNfrWYUTRZFYLBZa1/T7fS/vVM66yLm9qFQqH9Xjfbkc2h+NRgzhZMrl8ufCSHL05V3Wc64Cd4gqq9Vqr+oOVSKAKYgKaLlcbra6cM4Dbjq/HcrJpTpdSOe/xijEUqm0N4y/VyUVeCQ7QFWJafdCAE9EVGjJpzFDWDNq9V23AgFMQdT5GQPAtPntiQ8Q7oEZiFTgLyACaHrPhABAAAEEkAAIIIAAEgABBBBAAiCAAAJIAAQQQAAJgAACCCABEEAAASQAAggggARAAAEEkAAIIIAAEgABBNBywCj5bhXXsu17ZAL4MpvNhIuIqs+q7zKvx87L+sP1w3w+D2W7kPstxwwnsr3JdnfsJF4FbxgAAfzbvAswAK/3kejP2oZLAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-apk {
-    background-image: url("../img/ico/ico-apk.png")
-}
-
-.fileList .ico-css {
-    background-image: url("../img/ico/ico-css.png")
-}
-
-.ico-cmd {
-    background: url("../img/soft_ico/ico-cmd.png") no-repeat center center;
-    height: 18px;
-    width: 16px;
-    display: block
-}
-
-.btn:hover .ico-cmd {
-    background: url("../img/soft_ico/ico-cmd-hover.png") no-repeat center center;
-    height: 18px;
-    width: 16px;
-    display: block
-}
-
-.fileUploadDiv {
-    padding: 10px
-}
-
-#file_input {
-    display: none
-}
-
-#up_box {
-    background-color: #fafbfe;
-    border: #e4e5e9 1px solid;
-    margin: 0;
-    padding: 10px;
-    clear: both;
-    height: 360px;
-    overflow: auto
-}
-
-#up_box li {
-    list-style-type: none;
-    height: 30px;
-    line-height: 30px;
-    font-size: 12px;
-    width: 100%;
-    margin: 0 0 5px;
-    padding: 0
-}
-
-#up_box li .filename {
-    display: inline-block;
-    height: 30px;
-    margin-right: 20px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    width: 240px
-}
-
-#up_box li .filesize {
-    color: #999;
-    display: inline-block;
-    height: 30px;
-    overflow: hidden
-}
-
-.fileUploadDiv button {
-    float: left;
-    border-radius: 3px;
-    border-style: solid;
-    border-width: 1px;
-    width: 75px;
-    height: 30px;
-    color: #fff;
-    margin-bottom: 10px;
-    cursor: pointer
-}
-
-#up {
-    background-color: #5cb85c;
-    border-color: #4cae4c;
-    color: #fff;
-    text-align: center;
-    margin-left: 10px;
-    position: absolute;
-    bottom: 0;
-    right: 10px
-}
-
-#filesClose {
-    position: absolute;
-    bottom: 0;
-    right: 95px;
-    background-color: #cbcbcb;
-    border-color: #cbcbcb;
-    color: #fff
-}
-
-#opt {
-    background-color: #4592f0;
-    border-color: #367fa9
-}
-
-#up_box li em {
-    font-style: normal;
-    color: #06F;
-    float: right;
-    margin-right: 10px
-}
-
-.cancel {
-    float: right;
-    cursor: pointer;
-    color: #c00
-}
-
-#textBody {
-    min-height: 450px;
-    _height: 450px
-}
-
-#filesClose:hover {
-    background-color: #c9302c;
-    border-color: #ac2925;
-    color: #fff
-}
-
-#up:hover {
-    background-color: #449d44;
-    border-color: #398439
-}
-
-#totalProgress progress {
-    width: 180px;
-    height: 10px;
-    border: 1px solid #ccc;
-    background-color: #e6e6e6;
-    color: #0064b4;
-    opacity: .9
-}
-
-#totalProgress p {
-    color: #666
-}
-
-.setchmod fieldset {
-    margin-left: 15px;
-    margin-bottom: 15px;
-    border: 1px solid #ccc;
-    float: left;
-    width: 114px;
-    padding-bottom: 10px;
-    border-radius: 3px
-}
-
-.setchmod legend {
-    padding: 3px;
-    border: 0;
-    width: auto;
-    margin: 0 6px;
-    font-size: 14px
-}
-
-.setchmod fieldset p {
-    margin-left: 10px
-}
-
-.setchmod fieldset p input {
-    position: relative;
-    top: 2px;
-    margin-right: 5px
-}
-
-.setchmodnum {
-    clear: both;
-    margin: 0 15px -10px
-}
-
-.setchmodnum #access,
-#chown {
-    width: 60px;
-    margin-right: 5px;
-    height: 28px
-}
-
-.setchmodnum span {
-    margin-left: 10px
-}
-
-#chown {
-    margin-left: 5px
-}
-
-.shellcode {
-    margin-bottom: 5px;
-    height: 490px;
-    overflow: auto
-}
-
-.shellcode pre {
-    background-color: #111;
-    color: white;
-    padding: 5px 10px;
-    border: 0 none;
-    border-radius: 0;
-    min-height: 490px;
-    margin: 0
-}
-
-#mExec {
-    width: 89%;
-    margin-top: 0;
-    float: left
-}
-
-.editmenu {
-    text-align: right
-}
-
-#filesBody {
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none
-}
-
-.folderBox input {
-    display: none
-}
-
-.fileList>div:hover,
-.fileList div.ui-selecting {
-    background: #f6f8fd;
-    border-color: #d3dfec
-}
-
-.fileList div.active,
-.fileList div.focus,
-.fileList div.ui-selected {
-    background: #eff3f9 none repeat scroll 0 0;
-    border-color: #bcccde
-}
-
-.fileList .file {
-    background: rgba(0, 0, 0, 0) none repeat scroll 0 0;
-    border: 1px solid #fff;
-    border-radius: 2px;
-    display: inline-block;
-    height: 136px;
-    margin: 0 5px 10px 0;
-    text-align: center;
-    width: 112px
-}
-
-.fileList div.file {
-    transition: all .2s ease 0s
-}
-
-.fileList .file .titleBox {
-    color: #595c5f;
-    display: block;
-    height: 23px;
-    line-height: 23px;
-    overflow: hidden;
-    text-align: center;
-    text-overflow: ellipsis;
-    width: 100px;
-    margin-left: 5px
-}
-
-#DirPathPlace {
-    display: none;
-    padding: 0
-}
-
-#DirPathPlace>input {
-    border: 1px solid #ccc;
-    height: 28px;
-    line-height: 28px;
-    padding: 0 5px;
-    width: 280px
-}
-
-#DirPathPlace>input:active,
-#DirPathPlace>input:focus {
-    border: #66afe9 1px solid;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6)
-}
-
-#PathPlaceBtn {
-    background-color: #f3f3f3;
-    border: 1px solid #ccc;
-    height: 28px;
-    line-height: 26px;
-    padding: 0;
-    width: 290px;
-    cursor: text;
-    overflow: hidden
-}
-
-#PathPlaceBtn ul {
-    display: inline-block;
-    height: 26px;
-    width: auto;
-    position: relative
-}
-
-#PathPlaceBtn li {
-    background: url("../img/ico/ico-ltr.png") no-repeat right center;
-    padding-left: 10px;
-    padding-right: 18px;
-    float: left;
-    height: 26px;
-    line-height: 26px
-}
-
-#PathPlaceBtn li a {
-    display: inline-block;
-    cursor: pointer;
-    height: 26px;
-    line-height: 26px
-}
-
-.backBtn {
-    color: #666;
-    border-radius: 0;
-    height: 28px;
-    line-height: 8px;
-    margin-right: -1px;
-    margin-top: -1px
-}
-
-#tipTools {
-    background: #fff url(../img/ico_line.png) repeat-x 0 55px;
-    height: 110px;
-    border-bottom: #ccc 1px solid;
-    position: absolute;
-    top: 0;
-    left: 0
-}
-
-.re-head {
-    border-bottom: 1px solid #ccc;
-    float: left;
-    padding: 15px 20px;
-    width: 100%
-}
-
-.re-con {
-    float: left;
-    height: 500px;
-    width: 100%
-}
-
-.re-con-menu {
-    background-color: #f0f0f1;
-    float: left;
-    height: 100%;
-    width: 120px
-}
-
-.re-con-menu p {
-    cursor: pointer;
-    line-height: 40px;
-    padding-left: 30px;
-    position: relative
-}
-
-.re-con-menu p.on {
-    background-color: #fff
-}
-
-.re-con-con {
-    height: 500px;
-    margin-left: 120px;
-    overflow: auto
-}
-
-@media only screen and (max-width:990px) {
-    .pr8 {
-        padding-right: 0
-    }
-
-    .pl7 {
-        padding-left: 0;
-        margin-top: 15px
-    }
-}
-
-.bt-ico-ask {
-    border: 1px solid #fb7d00;
-    border-radius: 8px;
-    color: #fb7d00;
-    cursor: help;
-    display: inline-block;
-    font-family: arial;
-    font-size: 11px;
-    font-style: normal;
-    height: 16px;
-    line-height: 16px;
-    margin-left: 5px;
-    text-align: center;
-    width: 16px
-}
-
-.bt-ico-ask:hover {
-    background-color: #fb7d00;
-    color: #fff
-}
-
-#RecycleBody .tname {
-    line-height: 30px
-}
-
-.menu-sub {
-    border-bottom: 1px solid #ccc;
-    height: 40px;
-    line-height: 30px;
-    margin-bottom: 15px
-}
-
-.menu-sub span {
-    display: inline-block;
-    font-size: 14px;
-    height: 40px;
-    padding: 0 25px;
-    cursor: pointer
-}
-
-.menu-sub .on {
-    border-bottom: 2px solid #20a53a;
-    color: #20a53a;
-    font-weight: bold
-}
-
-.bt-progress {
-    background-color: #e2e2e2;
-    border-radius: 8px;
-    height: 16px;
-    line-height: 16px;
-    position: relative;
-    margin: 5px 0
-}
-
-.bt-progress-bar {
-    background-color: #5ab76c;
-    border-radius: 8px;
-    height: 16px;
-    max-width: 100%;
-    position: absolute;
-    text-align: right;
-    transition: all .3s ease 0s;
-    width: 0
-}
-
-.bt-progress-text {
-    font-size: 12px;
-    color: #fff;
-    padding: 0 10px;
-    position: static
-}
\ No newline at end of file
diff --git a/route/static/css/index.html b/route/static/css/index.html
deleted file mode 100755
index e69de29bb..000000000
diff --git a/route/static/css/install.css b/route/static/css/install.css
deleted file mode 100755
index fa853aabc..000000000
--- a/route/static/css/install.css
+++ /dev/null
@@ -1,181 +0,0 @@
-html,
-body,
-div,
-span,
-p,
-a,
-table,
-input,
-ul,
-li,
-* {
-    margin: 0;
-    padding: 0;
-    font-size: 12px
-}
-
-body {
-    background-color: #444;
-    height: 100%;
-    min-height: 768px
-}
-
-.main {
-    height: 900px;
-    width: 100%;
-    background-size: cover;
-    position: relative;
-    z-index: 0
-}
-
-.warp {
-    background-color: #f6f6f6;
-    width: 700px;
-    height: 370px;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    margin-top: -340px;
-    margin-left: -350px;
-    box-shadow: 0 0 10px #666;
-    border-radius: 3px
-}
-
-.warp .logo {
-    background: url(../images/logo.png) no-repeat;
-    height: 37px;
-    left: 50%;
-    margin-left: -52px;
-    position: absolute;
-    top: -67px;
-    width: 103px
-}
-
-.warp .title {
-    height: 70px;
-    line-height: 70px;
-    text-align: center;
-    font-size: 26px;
-    border-bottom: #ababab 1px solid;
-    margin: 0 20px;
-    color: #444
-}
-
-.warp .form {
-    padding: 20px
-}
-
-fieldset {
-    background-color: #fff;
-    padding: 10px;
-    margin-bottom: 20px;
-    border: #ccc 1px solid
-}
-
-fieldset legend {
-    padding: 0 5px;
-    font-size: 14px;
-    color: #000
-}
-
-fieldset p {
-    line-height: 40px;
-    color: #555
-}
-
-fieldset p .tit {
-    display: inline-block;
-    margin-right: 10px;
-    text-align: right;
-    width: 100px
-}
-
-fieldset input {
-    margin: 0 7px;
-    height: 28px;
-    border: #ccc 1px solid;
-    width: 200px;
-    padding: 0 5px;
-    border-radius: 2px;
-    -webkit-border-radius: 2px;
-    -moz-border-radius: 2px;
-    -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-    -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s
-}
-
-fieldset input:focus,
-fieldset input:active {
-    border: #66afe9 1px solid;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6)
-}
-
-.text {
-    background-color: #f3f3f3;
-    border: 1px solid #ccc;
-    border-radius: 2px;
-    display: inline-block;
-    height: 26px;
-    line-height: 28px;
-    margin: 0 7px;
-    padding: 0 5px;
-    width: 188px
-}
-
-.submit-btn {
-    background-color: #20a53a;
-    border: 1px solid #20a53a;
-    color: #fff;
-    cursor: pointer;
-    font-size: 16px;
-    height: 42px;
-    line-height: 35px;
-    text-align: center;
-    width: 330px;
-    margin: 12px 164px;
-    border-radius: 3px
-}
-
-.submit-btn:hover {
-    background-color: #10952a;
-    border: 1px solid #10952a
-}
-
-.success {
-    background-color: #f6f6f6;
-    border-radius: 5px;
-    box-shadow: 0 0 140px #556789;
-    height: 140px;
-    left: 50%;
-    margin-left: -150px;
-    margin-top: -70px;
-    position: absolute;
-    text-align: center;
-    top: 50%;
-    width: 300px
-}
-
-.success p {
-    font-size: 20px;
-    line-height: 90px
-}
-
-.success a {
-    color: #3385d6;
-    font-size: 16px;
-    text-decoration: none
-}
-
-.copyright {
-    color: #9d9d9d;
-    text-align: center;
-    margin-top: -50px;
-    position: relative;
-    z-index: 3
-}
-
-.copyright a {
-    color: #9d9d9d;
-    text-decoration: none
-}
\ No newline at end of file
diff --git a/route/static/css/login.css b/route/static/css/login.css
deleted file mode 100755
index 97116e984..000000000
--- a/route/static/css/login.css
+++ /dev/null
@@ -1,539 +0,0 @@
-body {
-    background-color: #444;
-    font-family: 华文黑体, "Microsoft YaHei", 微软雅黑, STHei, "Helvetica Neue", Helvetica, Arial, sans-serif
-}
-
-input {
-    -webkit-appearance: none
-}
-
-.main .login {
-    background-color: #fff;
-    border-radius: 4px;
-    height: 290px;
-    left: 50%;
-    margin-left: -220px;
-    margin-top: -180px;
-    padding: 35px 40px 50px;
-    position: absolute;
-    top: 50%;
-    width: 360px
-}
-
-.main .login .rlogo {
-    text-align: center;
-    font-size: 26px;
-    color: #444;
-    cursor: pointer;
-    height: 40px;
-    margin-bottom: 40px;
-    overflow: hidden
-}
-
-.main .login .title {
-    color: #444;
-    font-family: "微软雅黑";
-    font-size: 28px;
-    margin: -10px 0 46px;
-    text-align: center
-}
-
-.main .login .line {
-    height: 42px;
-    margin-bottom: 20px;
-    line-height: 42px;
-    position: relative
-}
-
-.main .login .line span {
-    width: 70px;
-    float: left;
-    color: #757584
-}
-
-.main .login .line .inputtxt {
-    background: transparent;
-    float: left;
-    width: 338px;
-    height: 30px;
-    line-height: 30px;
-    border: #d1d1d1 1px solid;
-    padding: 5px 10px;
-    position: relative;
-    z-index: 1;
-    box-shadow: 0 3px 5px -4px rgba(0, 0, 0, 0.4) inset, -1px 0 3px -2px rgba(0, 0, 0, 0.1) inset;
-    border-radius: 3px
-}
-
-.main .login .line .code {
-    width: 230px
-}
-
-.main .login .line .getcode,
-.main .login .line .picgetcode {
-    width: 100px;
-    text-align: center;
-    height: 38px;
-    line-height: 38px;
-    border: #cacad9 1px solid;
-    background-color: #dbdbea;
-    color: #757584;
-    font-size: 14px;
-    float: left;
-    margin-left: 17px;
-    cursor: pointer
-}
-
-.main .login .line .getcode.no-drop {
-    cursor: no-drop
-}
-
-.main .login .line .getcode.pointer {
-    border: #47acff 1px solid;
-    background-color: #47acff;
-    color: #fff
-}
-
-.main .login .line .picgetcode img {
-    width: 100%;
-    height: 100%
-}
-
-.main .login .line .codemsg {
-    background: #e53451;
-    border-radius: 3px;
-    color: #fff;
-    font-size: 12px;
-    height: 21px;
-    line-height: 22px;
-    overflow: hidden;
-    padding: 0 6px;
-    position: absolute;
-    right: 127px;
-    text-align: right;
-    top: 5px;
-    z-index: 0
-}
-
-.main .login .line .inputtxt:focus {
-    border: #70c3ec 1px solid;
-    box-shadow: 0 0 5px #eee
-}
-
-.main .login .yzm .inputtxt {
-    width: 64%
-}
-
-.login_btn input {
-    width: 100%;
-    height: 44px;
-    background: #20a53a;
-    background: linear-gradient(#20a53a, #189d32);
-    box-shadow: inset 0 1px 2px #30ad42;
-    color: #fff;
-    text-shadow: #00851a 0 -1px 0;
-    border: 1px solid #20a53a;
-    text-align: center;
-    font-size: 16px;
-    color: #fff;
-    border-radius: 3px;
-    cursor: pointer
-}
-
-.login_btn input:hover {
-    background: #10952a;
-    background: linear-gradient(#10952a, #088d22);
-    border: 1px solid #10952a
-}
-
-.login-link {
-    text-align: right;
-    margin-top: 22px
-}
-
-.login-link span {
-    color: #cacad9;
-    padding: 0 8px;
-    text-align: center
-}
-
-.login-link a {
-    color: #757584
-}
-
-.copyright {
-    color: #9d9d9d;
-    text-align: center;
-    margin-top: -50px;
-    position: relative;
-    z-index: 3
-}
-
-.copyright a {
-    color: #9d9d9d;
-    text-decoration: none
-}
-
-.pwinfo {
-    bottom: 19px;
-    color: #999;
-    position: absolute
-}
-
-.resetpw {
-    bottom: 20px;
-    color: #20a53a;
-    position: absolute;
-    right: 40px
-}
-
-.Validform_checktip {
-    color: #999;
-    font-size: 12px;
-    height: 24px;
-    line-height: 24px;
-    overflow: hidden;
-    padding: 0 6px;
-    position: absolute;
-    right: 10px;
-    text-align: right;
-    top: 14px;
-    z-index: 1
-}
-
-.Validform_wrong {
-    background: #e53451;
-    border-radius: 3px;
-    color: #fff;
-    float: right
-}
-
-.Validform_right {
-    padding: 0 10px;
-    color: #71b83d;
-    background: url(../images/right.png) no-repeat right center/16px auto
-}
-
-.main .login .line .Validform_error {
-    border: #e53451 1px solid;
-    box-shadow: 0 0 2px #ea5d74
-}
-
-.main .login .yzm .Validform_wrong {
-    background: #e53451;
-    border-radius: 3px;
-    color: #fff;
-    font-size: 12px;
-    height: 24px;
-    line-height: 24px;
-    overflow: hidden;
-    padding: 0 6px;
-    position: absolute;
-    right: 127px;
-    text-align: right;
-    top: 14px;
-    z-index: 1
-}
-
-.main .login .yzm .Validform_right {
-    color: #71b83d;
-    padding: 0 10px;
-    right: 130px
-}
-
-.main .login .line .inputcode {
-    width: 208px
-}
-
-.zun-form {
-    background: #fff none repeat scroll 0 0;
-    border-radius: 5px;
-    color: #888;
-    font: 12px "Helvetica Neue", Helvetica, Arial, sans-serif;
-    margin-left: auto;
-    margin-right: auto;
-    max-width: 90%;
-    padding: 20px 10px;
-    text-shadow: 1px 1px 1px #fff
-}
-
-.zun-form-new {
-    background: #FFF;
-    padding: 20px 0 0;
-    font: 12px "Helvetica Neue", Helvetica, Arial, sans-serif;
-    color: #888
-}
-
-.zun-form-new .line {
-    padding: 5px 20px
-}
-
-.zun-form-new .line:first-child {
-    padding-top: 0
-}
-
-.zun-form-new .line:after {
-    display: table;
-    content: "";
-    clear: both
-}
-
-.zun-form-new h1 {
-    font: 25px "Helvetica Neue", Helvetica, Arial, sans-serif;
-    padding: 0 0 10px 40px;
-    display: block;
-    border-bottom: 1px solid #dadada;
-    margin: -10px -30px 30px -30px;
-    color: #888
-}
-
-.zun-form-new h1>span {
-    display: block;
-    font-size: 11px
-}
-
-.zun-form-new label {
-    display: block;
-    float: left;
-    width: 80px
-}
-
-.zun-form-new .info-r {
-    margin-bottom: 5px;
-    margin-left: 80px;
-    position: relative;
-    color: #666
-}
-
-.zun-form-new .info-r label {
-    margin-bottom: 0;
-    padding-top: 5px
-}
-
-.zun-form-new .info-r label input {
-    margin-right: 5px
-}
-
-.zun-form-new .info-r p {
-    margin-top: 10px;
-    color: #999
-}
-
-.zun-form-new label>span {
-    float: left;
-    text-align: right;
-    padding-right: 10px;
-    margin-top: 8px;
-    color: #565656;
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    font-weight: bold
-}
-
-.zun-form-new input[type="text"],
-.zun-form-new input[type="email"],
-.zun-form-new input[type="password"],
-.zun-form-new input[type="number"],
-.zun-form-new textarea,
-.zun-form-new select,
-.webEdit-box input,
-.webEdit-box textarea,
-.webEdit-box select {
-    border: 1px solid #ccc;
-    color: #888;
-    height: 30px;
-    line-height: 30px;
-    margin-right: 6px;
-    margin-top: 2px;
-    outline: 0 none;
-    padding-left: 5px;
-    width: 100%;
-    border-radius: 2px;
-    -webkit-border-radius: 2px;
-    -moz-border-radius: 2px;
-    -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-    -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s
-}
-
-.zun-form-new input:focus,
-.zun-form-new input:active,
-.zun-form-new select:focus,
-.zun-form-new select:active,
-.dataTables_paginate select:focus,
-.dataTables_paginate select:active,
-textarea:focus,
-textarea:active,
-.webEdit-box input:focus,
-.webEdit-box select:focus,
-.webEdit-box input:active,
-.webEdit-box select:active,
-.dlt-text:focus,
-.sp-text:focus {
-    border: #66afe9 1px solid;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6)
-}
-
-.zun-form-new select {
-    height: 32px;
-    padding: 0\9;
-    margin: 0\9
-}
-
-.zun-form-new textarea {
-    height: 100px;
-    padding: 5px 0 0 5px;
-    width: 80%
-}
-
-.zun-form-new .submit-btn,
-.getfile-btn {
-    text-align: right;
-    padding: 7px 20px 10px;
-    background: #f6f8f8;
-    border-top: 1px solid #edf1f2;
-    margin-top: 10px;
-    clear: both
-}
-
-.zun-form-new .submit-btn button:first-child,
-.getfile-btn button:first-child {
-    margin-right: 4px
-}
-
-.zun-form-new .button {
-    background: #FFF;
-    border: 1px solid #CCC;
-    padding: 10px 25px 10px 25px;
-    color: #333;
-    border-radius: 0
-}
-
-.zun-form-new .button:hover {
-    color: #333;
-    background-color: #ebebeb;
-    border-color: #adadad
-}
-
-.btn {
-    display: inline-block;
-    padding: 5px 12px;
-    margin-bottom: 0;
-    font-size: 14px;
-    font-weight: 400;
-    line-height: 1.42857143;
-    text-align: center;
-    white-space: nowrap;
-    vertical-align: middle;
-    -ms-touch-action: manipulation;
-    touch-action: manipulation;
-    cursor: pointer;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    background-image: none;
-    border: 1px solid transparent;
-    border-radius: 3px
-}
-
-.btn-sm {
-    border-radius: 3px;
-    font-size: 12px;
-    line-height: 1.5;
-    padding: 4px 10px
-}
-
-.btn-danger {
-    background-color: #cbcbcb;
-    border-color: #cbcbcb;
-    color: #fff
-}
-
-.btn-danger:focus,
-.btn-danger.focus {
-    color: #fff;
-    background-color: #c9302c;
-    border-color: #761c19
-}
-
-.btn-danger:hover {
-    color: #fff;
-    background-color: #c9302c;
-    border-color: #ac2925
-}
-
-.btn-danger:active,
-.btn-danger.active,
-.open>.dropdown-toggle.btn-danger {
-    color: #fff;
-    background-color: #c9302c;
-    border-color: #ac2925
-}
-
-.btn-success {
-    color: #fff;
-    background-color: #5cb85c;
-    border-color: #4cae4c
-}
-
-.btn-success:focus,
-.btn-success.focus {
-    color: #fff;
-    background-color: #449d44;
-    border-color: #255625
-}
-
-.btn-success:hover {
-    color: #fff;
-    background-color: #449d44;
-    border-color: #398439
-}
-
-.btn-success:active,
-.btn-success.active,
-.open>.dropdown-toggle.btn-success {
-    color: #fff;
-    background-color: #449d44;
-    border-color: #398439
-}
-
-@media screen and (max-width:640px) {
-    body {
-        background-color: #eee
-    }
-
-    .main .login .rlogo {
-        background-color: rgba(0, 0, 0, 0.8);
-        color: #fff;
-        font-size: 20px;
-        height: 2.8em;
-        line-height: 2.8em;
-        margin: 0 -3.3% 25px -3.3%
-    }
-
-    .main .login {
-        background-color: #eee;
-        border-radius: 0;
-        height: 330px;
-        left: 0;
-        margin-left: 0;
-        margin-top: 0;
-        padding: 0 3%;
-        position: absolute;
-        top: 0;
-        width: 94%
-    }
-
-    .main .login .line .inputtxt {
-        background-color: #fff;
-        border: 1px solid #d1d1d1;
-        width: 93.6%;
-        padding: 5px 3%;
-        font-size: 1.2em
-    }
-
-    .main .login .yzm .inputtxt {
-        width: 57%
-    }
-}
\ No newline at end of file
diff --git a/route/static/css/site.css b/route/static/css/site.css
deleted file mode 100755
index 358ac8c93..000000000
--- a/route/static/css/site.css
+++ /dev/null
@@ -1,5211 +0,0 @@
-body {
-    line-height: 1.4;
-    color: #333;
-    font-family: "微软雅黑", Arial, Helvetica, sans-serif;
-    font-size: 12px
-}
-
-input,
-textarea,
-select {
-    font-size: 100%;
-    font-family: inherit;
-    outline: none;
-}
-
-body,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-ul,
-ol,
-form {
-    margin: 0
-}
-
-h4,
-h5,
-h6 {
-    font-size: 1em
-}
-
-ul,
-ol {
-    padding-left: 0;
-    list-style-type: none
-}
-
-fieldset,
-img {
-    border: 0
-}
-
-a {
-    color: #333;
-    border: 0;
-    text-decoration: none
-}
-
-a:hover {
-    text-decoration: none
-}
-
-a:link {
-    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-    -webkit-touch-callout: none
-}
-
-:-moz-placeholder {
-    color: #999
-}
-
-::-moz-placeholder {
-    color: #999
-}
-
-input:-ms-input-placeholder {
-    color: #999
-}
-
-input::-webkit-input-placeholder {
-    color: #999
-}
-
-body,
-html {
-    height: 100%
-}
-
-.f12 {
-    font-size: 12px
-}
-
-.f14 {
-    font-size: 14px
-}
-
-.f15 {
-    font-size: 15px
-}
-
-.f16 {
-    font-size: 16px
-}
-
-.f18 {
-    font-size: 18px
-}
-
-.f20 {
-    font-size: 20px
-}
-
-.cw {
-    color: white
-}
-
-.c0 {
-    color: #000
-}
-
-.c3 {
-    color: #333
-}
-
-.c4 {
-    color: #444
-}
-
-.c5 {
-    color: #555
-}
-
-.c6 {
-    color: #666
-}
-
-.c7 {
-    color: #777
-}
-
-.c8 {
-    color: #888
-}
-
-.c9 {
-    color: #999
-}
-
-.cbt {
-    color: #20a53a
-}
-
-.bgw {
-    background-color: white
-}
-.move_class{
-    float:right;
-}
-.bge6 {
-    background-color: #f2f2f2;
-}
-/* .bge6 {
-    background-color: #e6e9ee
-}
- */
- .btn{
-    vertical-align: inherit;
- }
- .file-box .btn{
-    vertical-align: middle;
- }
-.file-box .page{
-    border:none;
-}
-.file-box .Pcount-item{
-  border-right:1px solid #ececec;
-}
-.file-box{
-  padding-bottom: 1px;
-}
-
-.plr10 {
-    padding: 0 10px;
-}
-
-.plr15 {
-    padding: 0 15px;
-}
-
-.plr20 {
-    padding: 0 20px;
-}
-
-.ptb10 {
-    padding: 10px 0;
-}
-
-.ptb15 {
-    padding: 15px 0;
-}
-
-.ptb20 {
-    padding: 20px 0;
-}
-
-.pd0 {
-    padding: 0;
-}
-
-.pd15 {
-    padding: 15px;
-}
-
-.pd20 {
-    padding: 20px;
-}
-
-.pr8 {
-    padding-right: 8px;
-}
-
-.pl7 {
-    padding-left: 7px;
-}
-
-.pb15 {
-    padding-bottom: 15px;
-}
-
-.pb55 {
-    padding-bottom: 55px;
-}
-
-.pb70 {
-    padding-bottom: 70px;
-}
-
-.mt10 {
-    margin-top: 10px;
-}
-
-.mtb10 {
-    margin: 10px 0;
-}
-
-.mtb15 {
-    margin: 15px 0;
-}
-
-.mtb20 {
-    margin: 20px 0;
-}
-
-.mlr15 {
-    margin: 0 15px;
-}
-
-.mlr20 {
-    margin: 0 20px;
-}
-
-.mb15 {
-    margin-bottom: 15px;
-}
-
-.mr50 {
-    margin-right: 50px;
-}
-
-.mr20 {
-    margin-right: 20px;
-}
-
-.ml33{
-    margin-left: 38px;
-}
-.ml45 {
-    margin-left: 50px;
-}
-
-.ml5 {
-    margin-left: 5px;
-}
-
-.ml10 {
-    margin-left: 10px;
-}
-
-.mr5 {
-    margin-right: 5px;
-}
-
-.mr20 {
-    margin-right: 20px;
-}
-
-.ml0{
-    margin-left: 0;
-}
-
-.mg10 {
-    margin: 10px;
-}
-
-.va0 {
-    vertical-align: 0
-}
-
-.ico-font-ask {
-    border: 1px solid #999;
-    border-radius: 8px;
-    display: inline-block;
-    font-family: arial;
-    font-size: 11px;
-    font-style: normal;
-    height: 16px;
-    line-height: 16px;
-    margin-left: 5px;
-    text-align: center;
-    width: 16px;
-    cursor: help
-}
-
-.btlink {
-    color: #20a53a
-}
-
-.btlink:hover {
-    cursor: pointer
-}
-
-.btn-btlink {
-    border-color: #20a53a;
-    color: #20a53a;
-    vertical-align: 1px
-}
-
-.btn-btlink:hover {
-    border-color: orange;
-    color: orange
-}
-.input-edit{
-    cursor: pointer;
-    border:transparent 1px solid;
-    min-height: 20px;
-    /*min-width: 150px;*/
-    display: inline-block;
-}
-.input-edit:hover{
-    border:#ccc 1px solid;
-    background-color: #fff;
-}
-.baktext{
-    height: 20px;
-    border:#ccc 1px solid;
-    min-width: 150px;
-}
-.b-shadown {
-    transition: border-color .15s ease-in-out 0s, box-shadow .15s ease-in-out 0s
-}
-
-.b-shadown:hover {
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6)
-}
-
-
-
-.info-title-tips {
-    background-color: #fbfbfb;
-    border: 1px solid #eee;
-    line-height: 46px;
-    margin-bottom: 15px;
-    padding-left: 10px;
-}
-
-.bt-input-text {
-    border: 1px solid #ccc;
-    height: 30px;
-    line-height: 30px;
-    padding-left: 5px;
-    border-radius: 2px;
-    -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-    -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s
-}
-
-.bt-input-text:focus,
-.bt-input-text:active {
-    border: #66afe9 1px solid;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6)
-}
-
-.bt-submit {
-    background-color: #20a53a;
-    border-radius: 3px;
-    width: 140px;
-    height: 34px;
-    line-height: 34px;
-    text-align: center;
-    color: #fff;
-    cursor: pointer
-}
-
-.cursor {
-    cursor: pointer;
-}
-
-.help-info-text {
-    margin-top: 15px;
-}
-
-.help-info-text>li {
-    list-style: inside disc;
-    line-height: 24px;
-}
-
-.relative {
-    position: relative;
-}
-
-.ico-copy {
-    background: url(/static/img/ico-copy.png) no-repeat;
-    height: 14px;
-    width: 12px;
-    display: inline-block;
-    vertical-align: -2px
-}
-
-.zclip embed {
-    vertical-align: top;
-}
-
-.webDelete .options {
-    padding: 20px 0;
-}
-
-.webDelete .options label {
-    width: 30%;
-    float: left;
-    font-weight: normal
-}
-
-.webDelete .options label input {
-    float: left;
-    margin: 0 10px 0 0;
-    margin-top: 1px
-}
-
-.webDelete .options label span {
-    float: left;
-    margin: 0;
-    line-height: 16px
-}
-
-.webDelete .vcode {
-    background-color: #f0f0f0;
-    clear: both;
-    font-size: 14px;
-    height: 40px;
-    line-height: 40px;
-    margin: 10px 0;
-    padding-left: 12px;
-    text-align: left;
-    color: #444
-}
-
-.webDelete .vcode .text {
-    margin-right: 10px;
-    margin-left: 10px
-}
-
-.webDelete .vcode #vcodeResult {
-    display: inline;
-    height: 26px;
-    line-height: 26px;
-    margin-left: 10px;
-    width: 50px;
-    color: #444
-}
-
-.btswitch {
-    display: none
-}
-
-.btswitch+.btswitch-btn {
-    outline: 0;
-    display: block;
-    width: 3em;
-    height: 1.8em;
-    position: relative;
-    cursor: pointer
-}
-
-.btswitch+.btswitch-btn:after,
-.btswitch+.btswitch-btn:before {
-    position: relative;
-    display: block;
-    content: "";
-    width: 50%;
-    height: 100%
-}
-
-.btswitch+.btswitch-btn:after {
-    left: 0
-}
-
-.btswitch+.btswitch-btn:before {
-    display: none
-}
-
-.btswitch:checked+.btswitch-btn:after {
-    left: 50%
-}
-
-.btswitch-ios+.btswitch-btn {
-    background: #cdcdcd;
-    border-radius: .9em;
-    padding: 2px;
-    -webkit-transition: all .4s ease;
-    transition: all .4s ease;
-    border: 1px solid #e8eae9
-}
-
-.btswitch-ios+.btswitch-btn:after {
-    border-radius: .9em;
-    background: #fbfbfb;
-    -webkit-transition: left .3s cubic-bezier(.175, .885, .32, 1.275), padding .3s ease, margin .3s ease;
-    transition: left .3s cubic-bezier(.175, .885, .32, 1.275), padding .3s ease, margin .3s ease;
-    -webkit-box-shadow: 0 0 0 1px rgba(0, 0, 0, .1), 0 4px 0 rgba(0, 0, 0, .08);
-    box-shadow: 0 0 0 1px rgba(0, 0, 0, .1), 0 4px 0 rgba(0, 0, 0, .08)
-}
-
-.btswitch-ios+.btswitch-btn:active {
-    -webkit-box-shadow: inset 0 0 0 2em #e8eae9;
-    box-shadow: inset 0 0 0 2em #e8eae9
-}
-
-.btswitch-ios+.btswitch-btn:active:after {
-    padding-right: .8em
-}
-
-.btswitch-ios:checked+.btswitch-btn {
-    background: #20a53a
-}
-
-.btswitch-ios:checked+.btswitch-btn:active {
-    -webkit-box-shadow: none;
-    box-shadow: none
-}
-
-.btswitch-ios:checked+.btswitch-btn:active:after {
-    margin-left: -.8em
-}
-
-.bt-warp {
-    position: relative;
-    min-height: 100%
-}
-
-.bt-warp>.container-fluid {
-    padding: 0
-}
-
-.main-content {
-    margin-left: 180px
-}
-
-.sidebar-scroll {
-    background-color: #3c444d;
-    width: 180px;
-    z-index: 100;
-    height: 100%;
-    position: fixed;
-    overflow: hidden
-}
-
-.sidebar-auto {
-    overflow: auto;
-    height: 100%;
-    margin-right: -18px
-}
-
-.mypcip {
-    display: block;
-    padding: 0 10px;
-    position: relative;
-    transition-duration: 500ms;
-    transition-property: background;
-    transition-timing-function: ease;
-    width: 100%;
-    cursor: pointer;
-    margin: 1px 0
-}
-
-.mypcip:hover {
-    background: #20a53a;
-    opacity: 1
-}
-
-.mypcip span {
-    background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAQCAYAAAAS7Y8mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAdgAAAHYBTnsmCAAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAGPSURBVDiNldQ9ixRBEAbgZ3Zn1fVOuQU/wK9AMDDS1MvuRxj5CwTBP2CiYmYmGBsYGRsaa2qkkSiCgRd4y3ri3XqzbdDV7Lgs7uwLRc90V1dXv29VVymluxiiRoVkNaoYG7wN+9chpTTBBn7jKA5YhYR+JPQEDxYd6rAPeIwDnOgQuMEIz3F8mUMdC9/wqkPAxb1P0Yv/6ziLX/hTy9c6jXPYXSPwBQywF+Mz7GCCSRGMbqK1Ufwbmb4beI9TuNZFqFWoZCH7Mp0XcaX33y3dUDKfmRdD1bM+BYuoWtaEKeIdyqSvg5+RZSWX6Ri3ZUqmRbxjcqnsx3cyF7Utbpmf4YxcapXcWFNcjiSbOk7Yxhu5BocRaGBeoyXYNII32MTJsJ7cvR/D92aN1xFsFA6HYZ/iiiWjTVyVGyrhBz7jXSQxxq3wPahxJ7JuX30sd9IoshviC77KzdSmag+XYm4QNq0tF+0e7sc1SwPs4xFeLPHvt2ibsfwl24rFl/KLV/jdCho2ZC3a+I6HOB9rR38B10ZjDE49T6kAAAAASUVORK5CYII=") no-repeat 0 center;
-    display: inline-block;
-    line-height: 46px;
-    padding-left: 30px;
-    white-space: nowrap;
-    max-width: 146px;
-    overflow: hidden;
-}
-
-.btpc-plus {
-    line-height: 40px;
-    color: #aaa;
-    font-family: arial;
-    font-size: 26px;
-    cursor: pointer;
-    padding-left: 80px;
-    transition-duration: 500ms;
-    transition-property: background;
-    transition-timing-function: ease
-}
-
-.btpc-plus:hover {
-    background-color: #20a53a;
-    color: #fff
-}
-
-.mypcip .btedit {
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAFVSURBVDiNndO/ahRRFMfxz+zOav6goKC1S54gBBUECy0lIKTeyrXwFcROyBuENCHdNhaCoCgiWoggGPAJxFgIsbEJJBmTrCfFnBFZNjHrDy4z5849935/Z84tIsJ/6gneFhFR4AHuYHjM4jN4iZWM13ALSyWWcR+rOERrzAYFNvP9Ka7jKrZExKeIWI8IpxivIuJrRFxo5lqJXfzDbwfvcQU3cAnTUOIsfif6zeYDfuEDzuM5LuIatrGBu/hcInCAy1mH2STawyLmknI+56bykFZDsJsUP7CAdhIMUeELXo9YGmbOn4o3Nah6vd5Ot9vd6ff7lfr3dXKMVZnIVVp4MRgMZtLW6LpneJhxpB1lJnfwE49yblRtfPsrLhoLpbqA7fT15jjUERXNQeO6biK11DXYnyCnymdIjI+4jXuJdlJXHqq7cArf620izkXEu5hMj5u7cAQCwbENi6a1WQAAAABJRU5ErkJggg==) no-repeat center center;
-    width: 16px;
-    height: 16px;
-    display: none;
-    position: absolute;
-    left: 156px;
-    top: 14px
-}
-
-.mypcip:hover .btedit {
-    display: block
-}
-
-.task {
-    position: absolute;
-    right: 6px;
-    top: 14px;
-    height: 20px;
-    width: 20px;
-    line-height: 20px;
-    background-color: #fc6d26;
-    z-index: 99;
-    text-align: center;
-    border-radius: 6px;
-    cursor: pointer;
-    font-family: arial;
-    font-size: 14px;
-    font-weight: bold
-}
-
-.softnum {
-    position: absolute;
-    left: 154px;
-    top: 12px;
-    height: 20px;
-    width: 20px;
-    line-height: 20px;
-    background-color: #fc6d26;
-    z-index: 99;
-    text-align: center;
-    border-radius: 6px;
-    cursor: pointer;
-    font-family: arial;
-    font-size: 14px;
-    font-weight: bold;
-    display: none;
-    color: #fff
-}
-
-.cmdlist li {
-    border-bottom: 1px solid #dbdbea;
-    line-height: 48px
-}
-
-.cmdlist li .titlename {
-    padding-left: 12px;
-    position: relative
-}
-
-.cmdlist li .state {
-    float: right
-}
-
-.cmdlist li .titlename:before {
-    background-color: #20a53a;
-    border-radius: 3px;
-    content: "";
-    height: 5px;
-    left: 0;
-    position: absolute;
-    top: 6px;
-    width: 5px
-}
-
-.cmdlist li .cmd {
-    height: 200px;
-    background-color: #424251;
-    overflow: auto;
-    line-height: 22px;
-    color: #fff;
-    padding-left: 10px;
-    font-family: arial
-}
-
-#remind td {
-    vertical-align: middle
-}
-
-#remind .titlename {
-    position: relative;
-    text-overflow: ellipsis;
-    height: 20px;
-    overflow: hidden;
-    width: 300px;
-    white-space: nowrap
-}
-
-#remind .titlename:before {
-    background-color: #20a53a;
-    border-radius: 3px;
-    content: "";
-    height: 5px;
-    left: -10px;
-    position: absolute;
-    top: 6px;
-    width: 5px
-}
-
-.btn-default[disabled],
-.btn-default:active[disabled] {
-    background-color: #f7f7f7;
-    color: #bbb;
-    opacity: 1
-}
-
-.table-page {
-    height: 32px
-}
-
-.table-page a {
-    border: 1px solid #ccc;
-    float: left;
-    height: 30px;
-    margin-left: -1px;
-    outline: 0 none;
-    position: relative;
-    width: 34px;
-    z-index: 1;
-    color: #666;
-    vertical-align: middle;
-    text-align: center;
-    line-height: 30px
-}
-
-.table-page a:hover {
-    border: 1px solid #20a53a;
-    color: #20a53a;
-    z-index: 3
-}
-
-.table-page a.disable {
-    background-color: #f3f3f3;
-    cursor: not-allowed;
-    color: #bbb
-}
-
-.table-page a.disable:hover {
-    border: 1px solid #ccc
-}
-
-.table-page-select {
-    float: left;
-    position: relative
-}
-
-.table-page .table-page-num {
-    width: 60px
-}
-
-.page-select-ul {
-    background-color: #fff;
-    border: 1px solid #ccc;
-    bottom: 29px;
-    left: -1px;
-    line-height: 22px;
-    max-height: 150px;
-    min-width: 100%;
-    overflow: auto;
-    position: absolute;
-    top: auto;
-    width: 60px;
-    display: none
-}
-
-.page-selected .page-select-ul {
-    display: block
-}
-
-.page-select-ul li {
-    padding: 0 12px
-}
-
-.page-select-ul li:hover {
-    background-color: #f0f0f0
-}
-
-.sidebar-auto .menu {
-    background-color: #353d44
-}
-
-.menu li {
-    margin-bottom: 1px;
-    position: relative
-}
-
-.menu li a {
-    font-size: 15px;
-    color: #d6d7d9;
-    display: block;
-    line-height: 44px;
-    padding-left: 52px;
-    background-repeat: no-repeat;
-    background-size: 16px auto;
-    background-position: 25px 14px;
-    border-left: #404040 2px solid
-}
-
-.menu li.current a,
-.menu li a:hover {
-    background-color: #2c3138;
-    color: #fff;
-    border-left: #20a53a 2px solid;
-}
-
-.menu .menu_home {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKwwAACsMBNCkkqwAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAFZSURBVDiNpdO9a1VBEAXw3zOioIUQEdFGkQdWVtr6D1ikERtRppLU6awUsUkh2CgoBNwhoPhsLESxERR7wcI2XSBNMAHRNFmLbB6Xa64RXFjYOXvmzMfOjmqt/mcd2I+QmUuZOcgbDWWQmTN4iFms4wGu4jC+RMT7wQwy8xBe4FtE3MBXPMdqE5sfLCEzj+Il3kXEE4iIJTzFFbzB9z0FMvMYJphExLPuXUQs4y1eYfmPHmTmbHN+FBGv92zMDm+ulXAzItZHtVaZeRH3sBgRn4ecOyKXcRt3dkuYwyJOZeaJfZyP42TjX1Nrne5SyqSUMu5ho559tpQy2bUP9gL8wHYnzbtYzczTuB8RHzs8/H0Sz+ETbuEDxg3f7pL6AhW/2vknNiNiCxvY6uDT8e2XMINLmbmC89js3I0z8wLOdP36Aht43KIcwULD1+w82/WGT+dk8DP96/oNlqecb6uu8YEAAAAASUVORK5CYII=")
-}
-
-.menu .current .menu_home,
-.menu .menu_home:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKTQAACk0BtZPkxgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAFVSURBVDiNpdO9atVBFATw3/UjBEGidkJSRFFIiKJBsAmaBxDFQptUIoJPYCc2Wmpjo4haRUFMnsEmnXUIKQXFRlEvaiIxY/HfheXCNUUWht2dM+fsYXe2l8Ruxp4d4jN4gDNlvw/70dMQw8ZRXMdFbOAvpjGJ93iHrWEdHMdDfMMcPuMpjiC4hYPDOpjCPazgceGeYS8m8BYj2AZJWpxOspTk9gBfcTPJSpJrlRtMXk5yY0hyxUKSF0lOtQWuJHmV5NIOyRWXk7xOcrVe4iSW8BXj/3mZ+jpfiv5ErThS5udJzjcnHUgyXubKnU3yUrcerR38wSH0sVm4C3iDO+Xm5wu/hX44jI3WB4OePoaPeIIPOm9U3XYVtQV6JfC77PtYxyrW8KPwP9vDWiNFZ5BzOtvO4Fejm8ZJzGqM1BbYLHiE77pPc7fEPuE+FjCGxaLV2+13/gdXJgTGYi2BZQAAAABJRU5ErkJggg==")
-}
-
-.menu .menu_web {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAHuSURBVDiNpZO/S9ZRGMU/5xZl0NJQDf2ybAgrGgylGloiCR0jDAO3+4WQlqA/oiHkpUGvgYtFRENL5g+CCEIiqSjMoFKsaJFqScMXfU9DV3vVluiZDs997odzuM+Vbf6n1v+tmVJqA9okHba9CXgF9McY+1fPqtpBSmkH0Al8B45Iema7DDRlyHagK8b4ZQ2gp6dnn6QB2+2SdgFvJW2xPQeUbdcCM5L6gNYY4/QyIKW0AbgGPAb2AueALuAQMA9MApeAu7YnJZ0ALscYyyE7aZf0JsZ4R1I/MAKMAwFYl+0/AW4URXFb0gTQTh4AOGP7Xta7gbEY43NJw8BA1hPAHoA821wdYUxSCZi13QhslPTI9kmgLGkUOG37m6QXwGbbF2OMTUvPuGD7JzCbM2N7FigD87bnJC3r7HyhOsK0pNEY46CkoRxhRNJDYDjGOGz7fdYPsqNP1YBB2y0Ai4uLH4GjKaUG281AS0qpAThQqVSmsrsWYAj+bOIt4Gpvb+/ZEMJ+4BTwLp8ZaASOhRA6UkofgHrgyupFqpN0H7gA7ATGJW21/SNvY10IYcZ2n+3WoiimVgAAuru7a0MIncBXoF7SU9sLwHHgJbDN9vWiKD4v3VkBACiVSqqpqekAzgMHc/s1vz/TTVbVGsC/1i9dw/hm1FHr2QAAAABJRU5ErkJggg==")
-}
-
-.menu .current .menu_web,
-.menu .menu_web:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKnAAACpwB9NLfEgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAGCSURBVDiNpdLPaw9wGAfw13fExWVq1IzYJEkc5kezgws5zM2S+irOWi7KH+EgB0e1m9ZycMGWm0jLRYqUWNNyIDkw2lq9Hb7P5rsfDvKpT717Pp/n/byf53k3kvif0/GX+AXcx3t8wgQurvexsUrBDozgGw7jBRZwHK+wHbeKdA1BLx6iiZ14i078LJLd+IJRnMVMO8Em3MQT7MH5qnQQ8/iAq7hXeBDXsLCxqjfxBuPVRide4xA2lPxnuIPP2Fo5o5JIMp6ku/BAkuHCp5MMFr6S5Gjh7iRjSSwp6MUpzOEYNmMRJ6v/rmqnG7uwpVpdJljEryKYr9hcJc+3DXIJd1TOMsEMnmMW36vSYzQq4Sn21Vqn0INz/DHSBIYKf8QR9ONMxfuxH9P1ZwiT7Qru4gaGsbfm8a7eUnMZwCUtdx7AdVYaqQ8PtCzbo7XGLvyo/vusNNL0agJabhvB16oyVcM6gZfYhts1q9LX2mv7bSS5nGQyyWzdR0ma6/xdo+Cfz28JnsxkWP6vVAAAAABJRU5ErkJggg==")
-}
-
-.menu .menu_ftp {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAH6SURBVDiNpdM/qJZlGAbw3/1+n31o/0BJrMFaGmoRRBsM14M4iINLixBxHs6pxSxBmhpCqEk5CL2Pp5ZAdBD/UIJNhdBQzTqJYKkoB8HEY+r53rvB99hnuXlNNzfXfT3X9dzPE5npWTB8WrPWuhvvYwvGOI+vSykn/8uNSQfz8/MvdV33DRaxBlMInMZ9LI7H449mZ2cfLM80y0Xbtiu7rjsZEecz8ws8xBEc7l3swfXBYHB8bm6u+Z9A0zSfYmtmXoyIg/gKV3AJLQ7hV+wcjUYzT0Sota7C2Yg4kJm7sQM/YQOWcAFb+ygn8HHXdVMzMzMPlx1swML09PSPEXEIpzCNc/gBH+D7zPyylHIGt5umeWsywou4B5n5BhZKKTdwFddKKTdxJyLe7PmLWD0pcB2v9PVlvN627WZsxKZa6ya8hj96zsuZuUD/DobD4YWlpaUVtdbP8A62RcRNrO+38SG2I2qtv2AUERcfXyLUWnfhu8zcGBEFv+PVPtp9vI2j+A3vlVKOPSHQi+zHrcz8NiLebZrmr3yE1ePx+OfBYLAfK0opnz9eY9u2WzJzHRJ/Yy3uRsTePnfgSmYexAu4gZX9/NUh9kXElH8xxgjPTfTWR8RmPMBg+XCcGOKTiHh+gtxFxKqu685gXd/7MyJ29g6bCe7teNbv/A8ZE8Q3GMBOFwAAAABJRU5ErkJggg==")
-}
-
-.menu .current .menu_ftp,
-.menu .menu_ftp:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKnAAACpwB9NLfEgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAGVSURBVDiNpdLdaw9wFAbwzw+jzVspIxdIuXHhQqbGHVmSRLlx4w9YKbkhpVz4A6SkKOWlldA0uXA1Um645motL7NImsnYNI+LnZ9+W63IqW+dzvc8zznPOaeRxP/YgnnixzCISUzgEQ7/DcEK3MEefEMDbfiKI7iKxfMRtKMfT3EePwtwCdM4gVHcnoVL0nxnk0wl2ZvkYZLuJKeSHE+yO0lfkgOZsd4mrgnuSPI4SU+SW0nGkwwkeZ1kKMmDJGNJric5mGQwSVsrQXeSu+V3JbmRZE2SK0kuJuks4i2Vcz/J1iR/tCzH9/I34hM+YATv8bEGublyJrCqdYijWF3+MDagC9uwvd46vK2clVXEogq8rHWdwQ7sq6rraxu92F9rfYYleNVKMI3LuFlVh/ECQyVtEmPow3McLYzGnFM+jc+4hl0YR0rvk/pvw7kmoJFkJ9ZW4g90mrnCk6W7gTe4gGU13PbCjzSS9KOnpYvp0jjrZEvGFBY2i+NeI8kmLG1J/IUODFRn8A6HqsPW8/8ydwb/bL8B1eb4OuOuSusAAAAASUVORK5CYII=")
-}
-
-.menu .menu_data {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAK6wAACusBgosNWgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAHISURBVDiNpZPPi81RGMY/z+3mpmasGBOZEgthQ5SFTDM2svMjOyt9X1eUEhshRbGx1e1cO5M/YVIzSWbjx4RidTeKbl3XgoyYW5rHwvlO35TZzFtn8fac5znPc855ZZvVVL3apJR2AGeAw5JGbI9m6Iukvu0ZIEVEp+TINimlOnANGAc6wCvbHUm/AAHrgZ3AHmA7MC3pVlEUS6WDWaALHIuIb/9xOw3QarVGa7XafduzwGQtg+PA+xXIy9VsNnvAHDBRvYMBcDyldEDSvO1nkj7lCNhea3uLpEO29wOjmbMsUAfOAYu2C+CC7XW2hzL+A1iw3QWu5/0vqgIAD4A7EXFxpQgppRPA1bIvBX4Dt4GJlNIV4DPQlTTIERrApryeA3eBh1WBBkBEnM+n7AO22R7O+ALwISJeZvxkySn/wQD4CDyV9Nj2XET0/7G+ATgIHAEmgbGIaJQO1gCngF22A7iRUloCfgLOpwnoA4+AFvC6GmEGOA1ciogpgHa7vRkYygLfi6LoVdzcI79CGUHAZf5+jh4wb/udpK/5EoclbQX2AruBt8DNiFhUdRpTSmPAWeCopI22R7KDfh6mJ8BURLwpOVrtOP8BlJPKP95zNKgAAAAASUVORK5CYII=")
-}
-
-.menu .current .menu_data,
-.menu .menu_data:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKdQAACnUBSiXd/QAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAF3SURBVDiNpdI5a5VhEAXg58qFRDBi4RIiBkSJoiIoihZi0EpsFWy0FAtbSwvB0uUn2LiUliIWMWgT90i0sRFcYxqFiCYQcizufHK9hUQcGIZh3jnvOYdpJfE/sayn34pLeI4PWKj8jJe4jJHuhVYxaOM8RvEGT6r+RAursQ27sBl3cBGLkkgynuRmklXV/y0Hk9xOMpbkt4RRvMK3JciexkMc6pYwhyl8wlM8wPuSAMuxAQexF4PYif4GYAH7C+g0hrASKwrgO2bxEdfKs0doN7oWkkwmObEED44leVY7f0g4Wbr24Uv9Nl8M+orVECZwH9fR3+56AGer7sEmDFQ/i7d4XP3xZqdhMI93GMfdcnmmx/01OIAjOIxh9DUAwW5sx6lyeRE/atanc1AzuIXXOtfaaoy5l+Rqj1nrk2xJMlLH0z27kmSi28QWzpWJ0zq3MIWvRX8AG4vlDkziAuYagCaGcQZHsQ5rS8JM5Rhu4EWz0Avwz/ELJiL9PSckq44AAAAASUVORK5CYII=")
-}
-
-.menu .menu_set {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAH3SURBVDiNpZI/SJZhFMV/90kicsv+EdEQRUNQYC1S0R+ag2hxMKPgvc/r0Ba2FFEpJARhiF/P9QsaGippimgoG4QgI6egICcJEkoIEyI/9L0NvV98llLQmS6c5x7OPc8Rd+d/0LQcUa1W1xZFcR9ocvfOGOPkXwXMbDvQoqov3b0NuA00i8gBYNLM9gBfVXWiviP1E8xsB3AZmANmgHVAt4jMu/sl4DuwFfgI9KvqO4DQYKAFmFXVU8Bj4JqqfsiybAroBZ6r6jFglbtv+MNB6aIHeKKqL4aGhra4eycQRORelmXvU0pHgPYYoy4SSCltFJGDwEngCjANXHT3WyGEeXfvAq4Dze7eKyJ3i6IYyfN8KgCIyAjQDFxQ1VfAaaA/xjiWZdm4iPQBHao6LiLdwJoQwsiiX3D3z0VR1NNd4e5zDfnUACnnWeATsNB4wjYR2Q8cdfcbIYSau58D+kRkwd273X1QRGaAAWC4KIrRPM8nfg/xqrs/jTGOmtlOoKN08zDGOGZm+0SkPcuys7+W3J3Sxd6U0s1ybk0ptda5SqWyOqW0u+QepJTa6lxjD2rASjO7A5wBBszsEEAI4TzQZWaDwBfg23I92AWsV9VnZnYC2OTur0Vks6oOm9lhYFpV3ywp0IiySI/42bzjMca3S71bVuBf8QODpRL9eTmkdgAAAABJRU5ErkJggg==")
-}
-
-.menu .current .menu_set,
-.menu .menu_set:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKnAAACpwB9NLfEgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAF0SURBVDiNpdJNiM5RGAXw38ukkJVvMYqZRsqYZmyYDTZWbCxsKLG3pCSaWNmNJU2NmhU7pQjFRhYsJCTWykfJRz5eH8fmefn39lLy1FPn3nPv7Zzz3FYS/1Oz/sItwg3cwuo/HWp1KRjEQtzBTizAfHzCDMbwDk97PTCECXzBWyzGYXzDCXzGGjzHJB6DJJ3ekuRc4R1JNja4VUl2FZ5OsrXDNTO4jRcYx1W8wTEcx1xcwna0cbM7xGXYgxF8LakTuIbLZWVdWevHXixvWniY5ECSkVqfbGBJBpOcKjyc5FCSR90WXjXSnV1hdqqNVuH3eInvTQUDSfYnmUkylmRDkvNJ1icZSjJV+wNJriQ5WKr01avPqtfW3O/hNPaVmrO1N14qp35pa/jclORM4dHqDjevMdYLSTZ3uD6/q405mMYHjOJojewIluJHjfdj51L3Vx7GElzHbqzAXazERWzDazzoZaG7+5PcT/Kkwux5rlvBP9dPgIpDWf6ENxgAAAAASUVORK5CYII=")
-}
-
-.menu .menu_folder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAE3SURBVDiNpZO9SgNBFIW/OySiaBCtbCwE8ReUgGDpE9gExNJmd6O+hM8gmGJn3yKxt7WyEARBUUSbIPhTGFAwxyarSwoZ2AO3mjkf98y9Y5IoI1fKDVQA0jRtOOd2B8BRST5Jkk4IwCSRZVkbOAYeACdpD3iX9DrUpQO+gHaz2XwuRnCSLuM4vpU0AnSAvplNmdlkocbNbN3MTrz3de/9WKVA/07TdN85twbcA5/A8AsLuAO6wI6k2UrhoGZmy3EcH4Zk995vAAd5hA9gBXgJMQ+0ZWanOaAH1IGrEGer1TJgxszOckAFWATOQwDVanUO6EVR9JYD5oGJJEmeAtvfBG7gb4xLwEWgGWA1v59PoQs8Zlm2ANg/RgETwLRz7voXIOnIzBrAdgCgBvgoivowWOUyKv0bfwCvBmEVd9ynHgAAAABJRU5ErkJggg==")
-}
-
-.menu .current .menu_folder,
-.menu .menu_folder:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKnAAACpwB9NLfEgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAADuSURBVDiNpdO9SkQxEIbh56ynUHQbQbCxEMR/BEGw9B4s1m6t9W5svQgL3d7Wyk4QLES0EcGfQkGbsTgJuywIwTMQEsh8b+ZLJlVEaBOdVmrUad7HQQJO4hQXJYAqWTjHCR4S5BAfeBursoOflP8CIkJEDCJiLq03ozymcgUD9NHDFu7xjfEbjmR7Oo2FemSjizUcl3jHDo6yv0+s47VQDHsYZMAXtnFTKK4wj8sMqLGCq0LAYjr0PQOWMIOnQsAu7hi+8SquC8WwkfPzKzzjEcsaf39FpEpnccuwE3uadp4oAHQ1rX42Cvh3tP6Nv5Cebn/RRiyLAAAAAElFTkSuQmCC")
-}
-
-.menu .menu_day {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKwwAACsMBNCkkqwAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAFrSURBVDiNpZMxSFxBEIa/ed49tQsBQdEqgrVgithFW1sr62PhKttXpjy0vWb2WjkQrk6rjWUgjY3ICorYGCFV9C7vxuJ24fE4Y8SBZf/9d3b2n/1ZMTPeE1l10ev1Frz3Wy8lq+pXVf1Y5cTM6Ha7jTzPd4BtYBUYAHO184/ALnAJnJRl+b3dbo8aAM1m8xB4AO6BT2b2C5ivFxCRv8AtsJ5l2SZQYGao6kBVFyNeNjOmDVVdifOSqh6Z2aQF7/0xcGNmF4BMkV9tw0RkDfjgnGs14kYJXInIOTALjGOhukUZ8AQ0gc+JIJI/nHNnIYRWCME5505CCC7i04hbzrkz4Gc8Q1IwEwedTmcvXfcSruZnNZKiKPpFUfT/hZnYX1YVyGu31hRk6X2SgnEi/lPBb6JTSUFuZsM3KPiTWk4FbkXki/d+CORMbK3aKEzsTXhDRK6rBb4B+2bWAkbVN5kSDRG5E5EDiJ/pPfEM08DH4VH64rEAAAAASUVORK5CYII=")
-}
-
-.menu .current .menu_day,
-.menu .menu_day:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKnAAACpwB9NLfEgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAEPSURBVDiNpdO9SkNBEIbh58RoFKwEwT8QFOwEQQvt1NbW+7Cx8B7svAZLa1tbG0sbEQQh2KigjcZoxsI9YT2EGMnCMt8us+98s8sWEWGYUausp7HTJ38bU/lGPYt72MUyFjFeOfyOfdziAudol4BjPOMRS3jCRA/AJ5pYwxaORISIOIuImaTnU+w1F1KcjYjTiOi28IVD3KDoYT93EVhJ+hfgDtdooJNA1SeqoYVRbOSAFq5wmR0q+mhYzQEjaeYJ/XQ3v1bZlCrFH7rw03bXwSBVc10rYaWDzgBVc/0ivVTpYAwf/3DwJrVcAprYTJCx1F/15huZXsc9FOk3TuIAc2hXqlVHHQ84wWsx7Hf+BgvadUGnT3fcAAAAAElFTkSuQmCC")
-}
-
-.menu .menu_logs {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABHNCSVQICAgIfAhkiAAAApJJREFUeJztm71y4yAQx3dvzn4t41dIm8pzAV+6K65LIblId8WVMeReIa9g/FaZcbFXBGdkjBD6iBAyv5kUktB6+QcW7bAAZDKZWwZDGimlGBEV5pJ9nTuDoBFRc853IY2/hTQiogN8dJx192s0GBGVSqmiuWmAAKGGpgYRlSHtGqeAlJIuXkAMMhyLascRcc05177239sYR8QydG7FQCnFrFsrANC+d4JiwJzJAsR2IDZZgNgOxCYLENuB2LT6DnAhpXwFgB8D+BIEEb0tl8v7zWbzPoS9XiNgv98/wYidBwBAxLvT6fR3KHs3PwV6CbDdbp8B4N9AvgRBRG+LxeLXUPZ6xwAhxAMAPAzgSxTyFIjtQGyyALEdiE0WILYDsbl5AXIu0OflnAvMgJwL9DWQc4HEyQLEdmBIOOe6sncZtEXeOwZMDdPp4P3LWY2ALiQ/As71C0RU2rvXSqnCbJdrRNy5tspb1QdMbXu80kEbDY5qFpf/U8oFXoQQjy1+90BErOax874pnYGqCFPKBX5KKX+HNkZE3fF3jtWLmw+CU8oFXoQQf0Ibe4a/rvy5WFUvkguCJvAxuJ7nV/WBpr7x4DDzuSokNQVM4CvBHeF39j/HfBmuHaYYER2UUkVSAkB9oaauK4ezPo8vIKIyNQGcIGLnaTkLAcAKbG2YiwBePCtGWgL45nJdTbO5z2pMprUKcM53Jqpr+5lLhLpcARFLRFwLIdbJfQec8SRCTWghxOfSmNQIsDg2N7nGziFSFqBz5K+SsgBduRg5ITHgfFzm44WRD0z4Yo4rDhj/jgCwsp45zxK1FmBsQgJvNfo7kqHCd4iqUQBPRjUKX73yNMYAzrkWQmCks0IaOkb7TCaTCeE/v6cw3cuvVicAAAAASUVORK5CYII=")
-}
-
-.menu .current .menu_logs,
-.menu .menu_logs:hover {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABHNCSVQICAgIfAhkiAAAAf9JREFUaIHtmUFOwzAQRccWmyaN2HIEOAXpIag4BnsWcRfsOQZSD9EgNhyBI3SLnMnSw6IpciI7iUMdB8lv0zTxKDPyOF/6AxCJ/AnW9xARCyLKGWP5TPm0IKKSMVamabqzrbEWgIgFAAgfibmilNpkWVaanl31xInzBREZg30zZuf7CgCAU/Lr9XpzkYwckFL+ti7n/B4AStM6PmNOXogFhCYWEJrBr5AOEV0j4idj7PbCeezTNN1OCXTagbqunzwkDwDwUNf145RApwKSJHkloq8pLxpgnyTJ25RApxZijH0DwN2UF/ni3x/iWEBoYgGhiUJ2IaKQjSIK2ZwgIiEiVVV1CJhDMfn9SyhgDItsISll3vhSxv86TofYN10zDRFBdwYRUQCA0J26PmeOANq+0B+E7Mg5365Wqw/bAillzjkf1a66UzeXkN0opZ4nxA0yl5AdOecvvYmc3LcWRFQO2ZrBhayxEAsAyPX7XUO3qqqDZjUemvMQ/hAzxgqDiSu6bjQR7TrrBMBCP6OmeUCWZcZ2WmQBNkx2+yILMImWTciCF9BojOjcFl0l7q4holIptXESMp+4CBloahx8B87YZmBDLKYAF5RS7+drawvpwnHpIZ9tdGoY6wr9t1Hmnb5bIceswjb/bQ5tq62klLmpzQYH3eChiDED7EhkJn4A1qwofp3F9mcAAAAASUVORK5CYII=")
-}
-
-.menu .menu_control {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAK6wAACusBgosNWgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAF5SURBVDiNpdM9ixNRFMbx3yRZ3/ANbCxEcBubpNJSLIQFaxs7D4JfQSz9CpYWItyPYCOIFtqvhQxopSyCb1gpEuNukrHImewQY7UHLsOce85z/vPMvVXTNA4SAyilfMI2Zpn/n2rV6RtGxOYgE9sITLK5Qa8jVGGezwpH8VgWwRTjiJigj6vYwrVcW5nrZ824pW0Jeh0xSVJhr4M86ez32/qBf6OH04nZCmzk1HbI0qN1AhO8zuYfOJ5i8xWKZq1AREzxpZRyAlfwJiI+r5RVrUCLNOvgtnER93FpDeV0laBnYcwMSimHcQpP7Z+V2xZelA7FkuA8opRyK9/P4gIeYq+Ucj2/fwM3Lc7Mua7AVzzH91LKHZxBExE/s/EudiwOz0u8wLeuwDgidvAMf3APr3LvHR7gfUT8joiPw+HwQwqrmqZRSnmSWL9wEpt4a/Hr5qPRaLeu60OdgcfwKCJutCZeTnNmuXZxpDWqruvG/j1o0vDhkuAg8RdE7nuSY6nc+gAAAABJRU5ErkJggg==")
-}
-
-.menu .current .menu_control,
-.menu .menu_control:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKwwAACsMBNCkkqwAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAFaSURBVDiNpdM7a5RREAbg59uLJOgSkRQhfYSIhWWsQgj+gfgLTJEmBJLa0tZW0MbawtbaUkQEQ8Q/YCWIIAqb7G1S7JzNYdlUOfAxlzPznndevmkiwk1OJ+03nGKMBpNr6lsIdLGBrQJwimP05wCatFEBTHAHL2sGY/zHEMt4jBWMKqZ/8RkXVc8MoJX+MF8bJJth3nczV5i0s2cGUJ82eslgkLlbOU57vngRwAA/sqmftp35AhiFzSKAIX6mv4+3C2pa887YlTjlPMAJtjNeMtVC1k5qgA5Wa2Q8xQvsZnyI51jD3cK+jLCOA/xLyn1TET/m3U4+0M+xRpmfAfzGBzzBM/zB17Rf8B57+ISHpsI+AhEhIt6kbSLiKCLOImIzc72IOIyIbsblex0RMwZLuGf6t73Dd/zK/AVepYDLKV4v7zS5jfUyjXCO25Wok/TLnnRwH1vNTdf5EpkVg1v2kuagAAAAAElFTkSuQmCC")
-}
-
-.menu .menu_soft {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAF7SURBVDiNrdPPi41hFAfwz72uoVsUWZOFJbKThYkVe1mpx13YjcmU/NwrZCKRLNRZsrSZErvJ1h+glFgiYxC6Pyze8zSvOwsLzuZ5T9/n/T7n+z3ndCaTiX+JHkTELlzHHozQxQrOl1JeRcReLGIbxtiAN7jcS6JrCT5OcIx9mMcAZ/EBz5N8hCO4UQl240kp5XYtLSJmsZDpdjwspTxr4V9xppv5EP0peVuzEnlumcL7GFaCDn5OXfj+l/wHulXCBIci4rXG2BFmMZP4RhyLiBmNR0McxqgSLGBOY1iNIW7l96LGyNMtfBXznf81B/vzhR0pB37hbillOSIO4hw2JdbBJ9yrEu7gIx7504OLWMYFvMcLax6cwv1K0MPLUsrTWlr2eS7TEZZKKUstfCcGtY3jVnk1+i05E+vnZDPGlaBnfZ+/aMZWnqtT+Df0qoR3ON7qc92FlcQ/YxARB6ztwlG8rQRXNdt4Mn/u5AuXEn+AmziRcroaU6/8BgTXdRpxDzi5AAAAAElFTkSuQmCC")
-}
-
-.menu .current .menu_soft,
-.menu .menu_soft:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKnAAACpwB9NLfEgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAFsSURBVDiNrdO/jw1RFAfwz4xnVzYIydZeY0tEKETChkIoNGrNtkKyhQL/gUg0YgudQiciGpVEIRsdPdlkQ0usH4vNvHcUc27e9bbkm9zMmfnOPfP9nvneJiL8CwZ5PYS72I8xdmANN/EeQ9zGAkZosYHrTSp4gD14m+QIZ/ATl/AI83iRzcc4jC0RISIeR8S5rMu6EhFvsl6NiOUpfjEinrZpYZwKasyhy7rL+xp7MW6rB5tTL/xKO9Dg9xS/WQ9xJ85jJj12OJ2zgMBJvMs9IyxipgzxFK5lo4JvWMFrHMNV7Kv4DivN/8rBkVQwn3JhC/fwCiewjNnkGnzG/aLgJT7h4ZTHBVzEE3w0yUGHyxgWBQOs4lml7rvet2z4PFfBASzVOZj1N+YqO2F7DnapcjCwPQdfTXLQ6v9KjR8YFAsfcMEkByXrG8l/wRKOmpyVs1gvQzyoP23D3NzkF27oc3Acd7A77bT6od76A2AskgeNVoIQAAAAAElFTkSuQmCC")
-}
-
-.menu .menu_firewall {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAK6wAACusBgosNWgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAG0SURBVDiNhdNPiI5RFAbw352ZsGBDMhkpYyE12cxOyYIFayW7SY2zkCxIlkrZKIrJjPe+X1FksrQQo/xp2IhZiPXUxIoaGxa+mGsx78dn+vDUvXVu53l6znO6qZSig6mpqbX9/f37cRB7sDOl1C6lzOIZHkXEK11IpRR1Xe8upRzFKNqYxzt8xGpsxy6swwCeYjIi5gcaoTt4i8BcRBQ90Gq11i8tLY3gCjZibABKKUu4FxGvexE7GB8fX8RsVVVPUkqDGjtQGqv/RM75CJ6nlH6gT+dCwvf/kE9hGlvwrZfAqrqu+3LOQz3Ix3EJpyPipeUwdQt8RbuUshkLjdUOeQzXcD4iLnfptvmdwXtsjYgPOefrmM45f0Y/buJiRJzrIm+wvOJfDl5gBCLiBFp4iPuYiIizK6YaSim96Ra4jeGc86ZG5BhyQz65Io9hDJZSZkApRSlFVVUTVVXd7dR/O1VVPaiq6mqn7jiQUjqD0Zxzd1B/IOc8iW1N7zKv+zM1I8zgE8YjYqF534EbTegHImKxp0DTnHABh3ALa3AY0ys20Vugg7qu95ZSHuML9kXEXK++ny1tzgEddf2OAAAAAElFTkSuQmCC")
-}
-
-.menu .current .menu_firewall,
-.menu .menu_firewall:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKdQAACnUBSiXd/QAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAFrSURBVDiNhdMvaJZRGAXw36viFrRoENxw4IJYLDMJalkxC8OkrC5qNAwEi+CC4lAsikGMY0FQmGIQ/AMKyjDIUGYyqMXgmB7Dd9/P63j37cAN73OfczjPc+7bJFFhFyZxCsdxGGt4hqd4hFc1oSkCxzCNiUJYwXt8xRDGcQS7sQNPMI8VSST5lGQxydEkTal1nT1JTiR5k+RuEtuKkz9YwGv8N9MGfCvjLBUnfYEUq1vhDEbwu+W2Ag3WtyCfx32M4leXwM7yPdJBnsFVXMALvWWqBX7qbX8/PherLc7hBi5hrqqvURaBVRzAF9wsVr9jO+7gCmYr8l69iLXxXEyyUMV1O/9wrSPOpSRnk/QFxpK8S7Kvarq1CflgkuW2t764nuTBgEfUnoe1cH0xnORjkrkB5PkkH5IMdQkott4meVzGauuHkjxP8rI85z6n/ZlqNLiM07iHYUyVZGY3Ng+a9WSS9SQ/kkxs1vcXeVqZSyUF+yoAAAAASUVORK5CYII=")
-}
-
-.menu .menu_exit {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAK6wAACusBgosNWgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAEYSURBVDiNpZOtTkNBEEbPFCQIUHgEBoJAYFDgERgSCBjSvU9Q0/AkX5+ApB6PI6lAYPhJUCgEgkApkHyI/nBpb28DPWozu3MyuzsTtpmG2f5CUs32BlABouBsAK8RUU8pPY4IImIfOLd9k4/n+IyII2AZGBUAM8BZlmXX48qVtAksFl6hx/y45B5N4C4fqExI+EVK6QJYkLT9L0GPJ+BU0hYUP9YAScfACtDh52c6wAPQlHRQKoiIN+B5WGC7DXzYfi8VVKvV5nCs0WgsRcSh7b0sy1qlgiJszwG1lFIL/viIknaAdkrpsh8bruBlgmOXbq8UduIXcCLpvkDc31+j20wDBgdty/Y6sMroMJnuda+A2/xGTDvO32OQXrvPg7l3AAAAAElFTkSuQmCC")
-}
-
-.menu .current .menu_exit,
-.menu .menu_exit:hover {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKdQAACnUBSiXd/QAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAADvSURBVDiNpdO7LkRRFAbg7wwlBZVeoSEKEtHSayUSGs+g8RwqbyDR6ycaiYRC45KoVAqFuAySpdhzODn2mWMyf7KSvdflz7oWEWEUjFfee1hCB0XGt8AL9vGQI9jECa5r+hKf2MZsE8EYjnA1IOMVTDeVAJMDguEYt1VFpyWgji6msNaUwX/wiAN84LSNYAdz6PmdTA/3UjlbbQSveMoQvPUzeBcRpVxExGrl3yQzEdGNiOWIGLqJMCEt3TnDT2G9n/5Zqaj34LmFYEPalewmfmEXdxni0r4gdf8HVcdDLGLe32MKqdxL3FQNxajn/A0ZS19hUhhlTwAAAABJRU5ErkJggg==")
-}
-
-html .menu .menu_home:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQANUAAPPz8+np6d3d3c/Pz8vLy8XFxb+/v729vbu7u7e3t7W1tbGxsa+vr62traurq6mpqaenp6WlpaOjo6GhoZ2dnZubmwrPOpmZmQzLPJeXl5WVlRLFPhLDPhy5RI+Pjx63RImJiYeHhyypSiirSIODgzKfToGBgTabUDibUDiZUH5+fj6TUnx8fECRVEKPVHp6ekSNVkCPVESLVnZ2dnR0dEyDWnBwcFR4XlZ2Xlh2XlpyYGZmZgAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJHgA7ACwAAAEAEAAOAAAGhsCdcLgzJUjE5HCmECxMFYZHuWMRHDuJINIg2JIqAmQYOS6SpEEkORFciOkJlVIwCTUEDfVOyOweFyAzVDMgFw1DBSFDOkMkBUQ2B0g1HyIdNUUGX0OTOy0jNyMrRQecOzYIKjsyKDspMDsvpkQGFDklJzsoJTgVBkkIAAEYLjsuGAEACEJBACH5BAkeADsALAAAAQAQAA4AAAZxwJ1wuDMlSMTkcKYQLEwVhke5YxEcO4kg0iDYkioCZBg5LpKkQSQ5EVyI6QmVUjAJNQQN9U7I7B4XIDNUMyAXDUMFIVQkBUQ2B0hKJgZfQ5FUJgeWOzYIKlQvm0QGFEM6QxUGSQgAARYcIhsWAQAIQkEAIfkECR4AOwAsAAABABAADgAABnfAnXC4MyVIxORwphAsTBWGR7ljERw7iSDSINiSKgJkGDkukqRBJDkRXIjpCZVSMAk1BA31TsjsHhcgM1QzIBcNQwUhVCQFRDYHSEomBl9DkVQmB5Y7NggqQzpDL5tEBhQ5NR8iHTU4FQZJCAABGC47LhgBAAhCQQAh+QQJHgA7ACwAAAEAEAAOAAAGfcCdcLgzJUjE5HCmECxMFYZHuWMRHDuJINIg2JIqAmQYOS6SpEEkORFciOkJlVIwCTUEDfVOyOweFyAzVDMgFw1DBSFUJAVENgdISiYGX0ORQzpDJgeWOzYIKjs1HyIdNTsvnUQGFDklJzsoJTgVBkkIAAEYLjsuGAEACEJBACH5BAUeADsALAAAAQAQAA4AAAaCwJ1wuDMlSMTkcKYQLEwVhke5YxEcO4kg0iDYkioCZBg5LpKkQSQ5EVyI6QmVUjAJNQQN9U7I7B4XIDNUMyAXDUMFIVQkBUQ2B0hCOkMmBl9DkTs1HyIdNUUHmDs2CCo7Mig7KTA7L6JEBhQ5JSc7KCU4FQZJCAABGC47LhgBAAhCQQAh+QQFHgA7ACwGAAkABQADAAAGDsDdTiesfUSdWmt0G62CACH5BAkyADsALAAAAQAQAA4AAAYVwJ1wSCwaj8ikcslsOp/QqHRKdQYBADs=")
-}
-
-html .menu .menu_web:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQAOYAAPHx8e/v7+vr6+np6efn5+Xl5eHh4d/f393d3dXV1dHR0c3NzcvLy8nJycfHx7+/v729vbu7u7m5ube3t6+vr62traurq6mpqaenp6WlpaGhoZ+fn52dnZubm5mZmZeXlxTDPpOTkyqrSiqpSoeHhy6nSiynSoWFhS6lTDCjTDKhTjSfTjadTjadUDSdTjabUDyXUjqXUjyVUj6TUkCRVHp6ekSNVkaLVkSLVnh4eEqHWHZ2dkiHWEqFWE6BWlB+XFJ8XFJ6XFR6XFZ4XlZ2XlpyYFxwYmZmZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFDgBHACwAAAEADwAOAAAHbYBHgoIdCgIACRyDizsTFQ0XGA4WEjuLNQMnH4shJwU1gw8di4sdD4IaGKSkGBpHC5argzsMRwYbsoMbB0cHHrmCHghHDDnARzm1GhnHGa5HEL+yHxCDmJqcJASg1hEUDRgZkxLGqxoJAQGJi4EAIfkEBQ4ARwAsBAADAAgAAgAABxGAR0dDPkBDgi0gNCgqNCAsgQAh+QQFDgBHACwEAAUACAACAAAHEYBFKUAogyNGPjZHPT5HMD+BACH5BAUOAEcALAMABwAKAAIAAAcWgDcoJjclKDciKTc6Kig9KCo6Jis6gQAh+QQFDgBHACwEAAkACAABAAAHCoA+Nkc6PkcwP4EAIfkEBQ4ARwAsBAAKAAgAAQAABwqARShAJSlAI0aBACH5BAUOAEcALAQACwAIAAIAAAcRgCwgMyUpMiAvR0dDPkJDioEAIfkECTIARwAsAAABAA8ADgAABxaAR4KDhIWGh4iJiouMjY6PkJGSk5SBADs=")
-}
-
-html .menu .menu_ftp:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQAOYAAP////39/fv7+/f39+3t7evr6+Pj49/f39nZ2dfX19XV1dPT09HR0c/Pz83NzcvLy8nJycfHx8XFxcPDw8HBwb+/v729vbu7u7W1tbOzs7Gxsa+vr62trampqaenp6OjowDZNp+fnwLXNp2dnQTVOATTOJubmwrPOpmZmQrNOgzLPJeXl5WVlRi/QBa/QJGRkY+PjyC1RI2NjSSxRomJiYeHh4WFhYODg4GBgX5+fnx8fECRVESNVkSLVkaLVkiHWHR0dE6BWnJyclB+XFJ8XFR6XlR4Xlp0YFh0YGZmZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJMgBJACwAAAEAEAAOAAAHvYBJgoIhCAICCiuDi4IOEQsBAQ4QE4yCCR06DRUWD0AYDYwaATALNBweMA8sAB6LCC8QAwwEBQwDESwIgzQOSTURQBMVQBA5SQw3grFJKBdJGRtJFCxJDzKCOApJNg01DA42DDZJCziDCRsMAhQGBxIBDBsJiygCORYjqB8XNgAmjDZ8SCLjxg0YSTRkGBSkh48fO3i0UKGiRY8dP3z4GBKDhMcSIkCIBCGihEcSM5AUWVlkyAmRKYiwLHIkEAAh+QQFDgBJACwAAAEADwALAAAHj4BJgoIhCAICCiuDi0kOEQsBAQ4QE4xJCR06DRUWD0AYDYsaATALNBweMA8sAB6DCC8QAwwEBQwDESwIgjQOSTURQBMVQBA5SQw3SbFJKBdJGRtJFCxJDzJJOApJNg01DA42DDZJCziCCRsMAhQGBxIBDBsJgygCORYjqB8XNgAmizZ8SCLjxg0YSTRkEBQIACH5BAUOAEkALAAADAACAAMAAAcIgEE9MSRIRYEAIfkEBQ4ASQAsAgAMAAEAAwAABwWAPiRFgQAh+QQJDgBJACwAAAEADwAOAAAHIIBJgoOEhYaHiImKi4yNjo+QkY8/OzyMJCUijEVFQ4mBACH5BAkOAEkALAAAAQAPAA4AAAepgEmCgiEIAgIKK4OLSQ4RCwEBDhATjEkJHToNFRYPQBgNixoBMAs0HB4wDywAHoMILxADDAQFDAMRLAiCNA5JNRFAExVAEDlJDDdJsUkoF0kZG0kULEkPMkk4Ckk2DTUMDjYMNkkLOIIJGwwCFAYHEgEMGwmDKAI5FiOoHxc2ACaLNnxIIuPGDRhJNGQQFKSHjx87eFgaFIOExRIiQGgEwQhJkY9FJg4KBAAh+QQFDgBJACwAAAEADwAOAAAHsYBJgoIhCAICCiuDi0kOEQsBAQ4QE4xJCR06DRUWD0AYDYsaATALNBweMA8sAB6DCC8QAwwEBQwDESwIgjQOSTURQBMVQBA5SQw3SbFJKBdJGRtJFCxJDzJJOApJNg01DA42DDZJCziCCRsMAhQGBxIBDBsJgygCORYjqB8XNgAmizZ8SCLjxg0YSTRkEBSkh48fO3gs6rHjh6AYJDKWEAGiIwgRJUgIQlKkpKUkJpMEAgAh+QQFDgBJACwNAAwAAwADAAAHC4A+PkMkJDNFRUeBACH5BAUOAEkALAQADAAGAAMAAAcOgElJLSoqLYKISUVDiYEAIfkECTIASQAsAAABABAADgAABx2ASYKDhIWGh4iJiouMjY6PkJGSk5SEJyAgKUSFgQA7")
-}
-
-html .menu .menu_data:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQAOYAAP////39/fv7+/Hx8e/v7+np6ePj4+Hh4d/f393d3dfX19XV1dPT08XFxcPDw8HBwb+/v7u7u7m5ube3t62traenp6OjowDZNgLXNp2dnZubmwrPOpmZmQrNOpeXlxLFPhTDQBTDPhbBQBTBQBa/QBq9Qhi9Qh63RBy5QiC1RCC1RiKzRiSxRouLi4mJiYeHhyirSCynSoWFhS6lTIODgzKhTjSfTjadTjKfToGBgTibUDiZUHx8fD6TUnh4eHZ2dkiHWHR0dEyDWnJyclB+XFZ4XlZ2Xlh0YFxwYGZmZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFMgBJACwAAAEADwAOAAAHr4BJgkUzIB0XFxsfM0WCgjUlMD1CRERAOiwiNoIlLEiOoElIKSVJFzehoTsXSRggJzZCR0hIR0I2JyIYSQEyOTErKCQkKCoxNDIBvAYaqYIcB8oCHBAHDA4QEA4MBg8cAkkAHIIyGhYWGi/PAEkCBQ4cQaBBHg4F4AA0GQsGBgkJB6xloMFOQQRHP3jwkCcoAgJBFBg0qNAiRw4XGSIskADKxwQDAwIEIGAgAg1BgQAAIfkECQ8ASQAsAAABAA8ADgAABxaASYKDhIWGh4iJiouMjY6PkJGSk5SBACH5BAkPAEkALAAAAAAPAA8AAAe0gEmCRTMgHRcXGx8zRYKCNSUwPUJEREA6LCI2giUsSI6gSUgpJUkXN6GhOxdJGCAnNkJHSEhHQjYnIhigMSsoJCQoKjGgATI5qYI0MgFJAQYayUkcB80CHBAHDA4QEA4MBg8cAkkAHIIyGhYWGi+CHABJAgUOHEGgQR4OBeQANBkLDBhIkOCAtgw04imI4OgHDx73BEVAIIgCgwYVWuTI4SJDhAUSQPmYYGBAgAAEDESgISgQACH5BAkPAEkALAAAAQAPAA4AAAevgEmCRTMgHRcXGx8zRYKCNSUwPUJEREA6LCI2giUsSI6gSUgpJUkXN6GhOxdJGCAnNkJHSEhHQjYnIhhJATI5MSsoJCQoKjE0MgG8BhqpghwHygIcEAcMDhAQDgwGDxwCSQAcgjIaFhYaL88ASQIFDhxBoEEeDgXgADQZCwYGCQkHrGWgwU5BBEc/ePCQJygCAkEUGDSo0CJHDhcZIiyQAMrHBAMDAgQgYCACDUGBAAAh+QQJDwBJACwAAAAADwAPAAAHtIBJgkUzIB0XFxsfM0WCgjUlMD1CRERAOiwiNoIlLEiOoElIKSVJFzehoTsXSRggJzZCR0hIR0I2JyIYoDErKCQkKCoxoAEyOamCNDIBSQEGGslJHAfNAhwQBwwOEBAODAYPHAJJAByCMhoWFhovghwASQIFDhxBoEEeDgXkADQZCwwYSJDggLYMNOIpiODoBw8e9wRFQCCIAoMGFVrkyOEiQ4QFEkD5mGBgQIAABAxEoCEoEAA7")
-}
-
-html .menu .menu_control:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQAPcAAOTk5N/f38bUxsnQycTTxMfOx8XLxcPKw8bKxsfHx8TIxMbGxsXGxcXFxcfFx8PGw8TExMXExcbCxsfCx8PDw8PEw8PCw8PBw8HBwcW/xcHAwb7AvsK/whzVHBzTHCDOICLLIjC2MDO0MzOzMzKzMjWxNTOyMzWvNTavNjirOE2hTTqpOjunOzylPEmhSUqgSjqlOoaGhj+iPz6iPoSEhD6hPj6fPj+fP4ODg0CfQDqhOoKCgkGcQUObQ4CAgEWXRUaWRkWWRUqQSkiSSEiRSEyNTFuHW3p6eluGW3l5eU6KTliFWE6JTk2JTVaFVlWFVWB/YFGGUXV1dVGEUVWAVVSAVHRzdHNzc3FxcVV9VXZvdlp4Wm9vb2hyaGF0YVt2W1x1XFx0XGFyYWNwY15yXl1zXWtra15xXmNtY2FuYWpqamBvYG1obWJtYmlpaWJsYmhpaGNqY2hoaGJrYmRqZGRpZGdnZ2VpZWVoZWRoZGZmZmVnZWdlZ2VlZWdkZ2djZ2hjaGxdbG9ab2ZmZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFCACDACwAAAEADwAOAAAIhgAHAUgAYcGCBggbGISQIMCgBlwG9dFjp6IdPX0GYaEwCMKgQWqO4NixA8cRNR89LvjoJglJkkncpBy0EqSPGDRoxPCBsiPNj3KwSLlyRQoWOTNrflzK1GeDplAHcWQQtWmFQQOqMi0wCIHWpQoGWfj6cSzEQXC63IG6UWCCBhA2KDS4sGFAACH5BAUIAIMALAIACQACAAMAAAgJAMUMcsHjSZSAACH5BAUIAIMALAMACgADAAQAAAgQAGGUGbSCxaBBJ4IM8gIlIAAh+QQFCACDACwEAAoAAwAEAAAIEAAHhTkzKAeVFiCoDDIyKCAAIfkEBQgAgwAsBQAIAAMABAAACBAABzFJM6jElj0pwAwaMiggACH5BAUIAIMALAYABwADAAUAAAgSAAfpGFSlQ5FBQEIMGpRiYZiAACH5BAUIAIMALAgACQADAAQAAAgQAAcN2jJIiIwpHogMujEoIAAh+QQFCACDACwJAAcABQAFAAAIGQAHCRw4kI2gHiK+iBlEwoQNFYOaBMqyJCAAIfkECTIAgwAsAAABAA8ADgAACBkABwkcSLCgwYMIEypcyLChw4cQI0qcSDEgADs=")
-}
-
-html .menu .menu_firewall:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQANUAAP////39/fv7+/f39+3t7evr6+np6efn5+Xl5ePj4+Hh4d/f393d3dnZ2dfX19XV1dHR0cvLy8nJycfHx8PDw8HBwb+/v729vbu7u7m5ube3t7W1tbOzs7Gxsa+vr6enp6WlpaOjo5+fnwDZNpeXl42NjYuLi4mJiSitSCqpSiypSoeHhyirSC6lTIWFhTKhTjiZUDyXUnx8fECRVEKPVHp6enh4eEqHWEiHWHR0dFB+XHBwcFpyYGZmZgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFAwA9ACwAAAAADwAQAAAGdMCesEeiHAACR2c17J0oiUXEE/pgHAsFptYjQFzN4c6UmPQKoXAYIzl/1M1M5AyCDzdzwtveu8wRdXwXbQ8afD0SGD0dEIcNIj01CDl2NQeUPRZzcA8WTQWKYRUGYTkJDlw9MgwLO3AaBh0bBhyHJQEDYE1BACH5BAUEAD0ALAMABgACAAMAAAYHwB6PN+qlggAh+QQFBAA9ACwFAAcAAQADAAAGBUDaCBUEACH5BAUIAD0ALAYACAACAAMAAAYHwBtuNGKpggAh+QQFCAA9ACwIAAcAAQADAAAGBcDZSBUEACH5BAUIAD0ALAkABgABAAMAAAYFwNioFQQAIfkEBQgAPQAsCgAFAAEAAwAABgVA2OgVBAAh+QQFBgA9ACwLAAQAAgADAAAGB0Aab6SD9YIAIfkECTIAPQAsAAAAAA8AEAAABhXAnnBILBqPyKRyyWw6n9CodEqtJoMAOw==")
-}
-
-html .menu .menu_day:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQANUAANPT09HR0c3NzcvLy8nJycfHx8XFxcPDw8HBwb+/v729vbu7u7m5ubW1tbOzs7Gxsa2trampqaenp6WlpaOjo6GhoQDZNpubm5WVlY+Pj42NjYuLi4mJiYeHh4WFhYODg35+fnZ2dnR0dHJycnBwcGZmZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFCgAlACwAAAEADwAOAAAGesCSUKQRGkua0RGjAFQm0EkFoMAIFY9HAHPpXjABiINREohKoaMwHSKUBgvKJEKvTygLw1vCyWj+gBkcEnoGHCUWFmpCHAglBYeLRhsHjxuSRhqOBJeYSI4FnZgeegMdniUgBSULER8dHrCxG7QRDUIPCQq7vLsJDyVBACH5BAUKACUALAcABwACAAEAAAYEQIslCAAh+QQFCgAlACwKAAcAAgABAAAGBECLJQgAIfkEBQoAJQAsBAAJAAIAAQAABgRAiyUIACH5BAUKACUALAcACQACAAEAAAYEQIslCAAh+QQFCgAlACwKAAkAAgABAAAGBECLJQgAIfkEBQoAJQAsBAALAAIAAQAABgRAiyUIACH5BAUKACUALAcACwACAAEAAAYEQIslCAAh+QQFCgAlACwKAAsAAgABAAAGBECLJQgAIfkECTIAJQAsAAABAA8ADgAABhTAknBILBqPyKRyyWw6n9CodEoNAgA7")
-}
-
-html .menu .menu_soft:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQAOYAAOPj4+Hh4d/f393d3dvb29nZ2dfX19XV1dPT09HR0c/Pz83NzcvLy8nJycfHx8XFxcPDw7+/v729vbu7u6+vr62traurq6mpqaenp6WlpZmZmZeXl5WVlRTDQBTDPpOTkxLDPhbBQBi/QBTBQBq9Qha/QJGRkRi9Qhi9QI+Pjxq7Qhy5RB63RBy5QiC1RiC1RI2NjSKzRiSxRouLiyKxRiavSCitSCSvSImJiSatSCypSiirSCynSoWFhYODg4GBgTadUDadTjabUDSdTjibUDiZUDyXUn5+fjqXUjyVUnx8fHh4eESLVkaLVkaJWEaJVkqHWEiHWEqFWE6DWkyDWk6BWlB+WlB8XFJ8XFJ6XFR6XlR4Xlh2Xlp0YGZmZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFHgBeACwAAAEAEAAPAAAHtoBeXTEdIR0qWF4/BgECAQtKXjIrQkBAMjVeEAwVFBUHCl4iRV6lUy5eCyalXhgAXidArE6oCxqsFQGiRKxStR+sGLonLk5MTTwsXgoSHBscCwJeWDUu1jFUXjMLCt0OOKzh4uI+DwndDDNeOAzdCQ89XgUKzhwTCcsR9dFeAxasKUItAFZKmBcCFFhxEHirVK5+F1jBwKeKVYZXDA50qtDAgZcHnDwdwKdEQaMABcD1KHAywZFAACH5BAUeAF4ALAAAAQAQAAcAAAdhgF5LDAECAQY+XloqHSEdMVxeDQcVFBUND147MkBAQisuXgMXXqUwCV4uUKVeRh1eBBSsHApeMUysRK8EFqwptTGrpa6wChwbHBMIqTxNTE4xIV49DwrWCzBeUzEu3TVWgQAh+QQFHgBeACwJAAEABwAPAAAHWIA/BgECAQtKEAwVFBUHCgsmXpIYAAsakl4Vhh+YGAEKEhwbHAsCMwsKqQ44mK1WMS6xNlguOk1MTjEhMVCYRh0xTJhEHS69kkkdNjJAQEIrLlckHSHFWoEAIfkECR4AXgAsAAABABAADwAAB3CAXoKDhIWGh4iJiouMjY6PiVg2LpQxVV44DAoKCQ89XiQuTkxNPCxeChEcGxwLAl4iRINSLl4LH4MYAV4nQINOtQsagxW7IkWDU8EmgxkAXjErQkBAMjVeDwwVFBUHCV5cLh0hHSRWXj0FAQIBCUeBADs=")
-}
-
-html .menu .menu_logs:hover {
-  background-image: url("data:image/gif;base64,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cENlaGlIenJlU3pOVGN6a2M5ZCI/Pgo8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA2LjAtYzAwMyA3OS4xNjQ1MjcsIDIwMjAvMTAvMTUtMTc6NDg6MzIgICAgICAgICI+CiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIKICAgIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiCiAgICB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIKICAgIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIKICAgIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIKICAgIHhtbG5zOnhtcERNPSJodHRwOi8vbnMuYWRvYmUuY29tL3htcC8xLjAvRHluYW1pY01lZGlhLyIKICAgIHhtbG5zOnN0RGltPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvRGltZW5zaW9ucyMiCiAgIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ZmYyZWY0OTItM2JkZC05OTQ3LTk5YWMtMmQzMzI3MDVhMzIzIgogICB4bXBNTTpEb2N1bWVudElEPSJmZWI4MmYyNS1mZmZiLTNkYjgtY2EzMC0wNjE4MDAwMDAwM2YiCiAgIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxYTVlZTUyOS03NWE4LTg0NDctODMzMi01NDRiZTAyMTFlYzUiCiAgIHhtcDpNZXRhZGF0YURhdGU9IjIwMjItMTItMTVUMTc6Mzc6NTErMDg6MDAiCiAgIHhtcDpNb2RpZnlEYXRlPSIyMDIyLTEyLTE1VDE3OjM3OjUxKzA4OjAwIgogICB4bXA6Q3JlYXRlRGF0ZT0iMjAyMi0xMi0xNVQxNzozNzoyMSswODowMCIKICAgZGM6Zm9ybWF0PSLliqjnlLsgR0lGIgogICB4bXBETTp2aWRlb0ZyYW1lUmF0ZT0iMjUuMDAwMDAwIgogICB4bXBETTp2aWRlb0ZpZWxkT3JkZXI9IlByb2dyZXNzaXZlIgogICB4bXBETTp2aWRlb1BpeGVsQXNwZWN0UmF0aW89IjEvMSIKICAgeG1wRE06c3RhcnRUaW1lU2NhbGU9IjI1IgogICB4bXBETTpzdGFydFRpbWVTYW1wbGVTaXplPSIxIj4KICAgPHhtcE1NOkhpc3Rvcnk+CiAgICA8cmRmOlNlcT4KICAgICA8cmRmOmxpCiAgICAgIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiCiAgICAgIHN0RXZ0Omluc3RhbmNlSUQ9IjlkMWU4YTJjLWE4NGUtM2U1Ni04ZDI0LWRjZjEwMDAwMDA2YyIKICAgICAgc3RFdnQ6d2hlbj0iMjAyMi0xMi0xNVQxNzozNzo1MSswODowMCIKICAgICAgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgQWRvYmUgTWVkaWEgRW5jb2RlciAyMDIwLjAgKFdpbmRvd3MpIgogICAgICBzdEV2dDpjaGFuZ2VkPSIvIi8+CiAgICAgPHJkZjpsaQogICAgICBzdEV2dDphY3Rpb249ImNyZWF0ZWQiCiAgICAgIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6MTJjMmZmZmItZGM3NC02ODQyLWIxOTEtMDhhMzgzM2RhMDgyIgogICAgICBzdEV2dDp3aGVuPSIyMDIyLTEyLTE1VDE0OjUwOjAyKzA4OjAwIi8+CiAgICAgPHJkZjpsaQogICAgICBzdEV2dDphY3Rpb249InNhdmVkIgogICAgICBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOmYxNDI3ZWYyLTQ1ZjEtMmY0Zi1hNDY0LTU4MzgyOGMxNjJlNyIKICAgICAgc3RFdnQ6d2hlbj0iMjAyMi0xMi0xNVQxNDo1MjoxNCswODowMCIKICAgICAgc3RFdnQ6Y2hhbmdlZD0iL2NvbnRlbnQiLz4KICAgICA8cmRmOmxpCiAgICAgIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiCiAgICAgIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6NTZjODkxYmQtMzQ4YS01OTQ3LTk2MDItMjFkM2JlZmRiZjAwIgogICAgICBzdEV2dDp3aGVuPSIyMDIyLTEyLTE1VDE1OjQwOjE5KzA4OjAwIgogICAgICBzdEV2dDpjaGFuZ2VkPSIvY29udGVudCIvPgogICAgIDxyZGY6bGkKICAgICAgc3RFdnQ6YWN0aW9uPSJkZXJpdmVkIgogICAgICBzdEV2dDpwYXJhbWV0ZXJzPSJzYXZlZCB0byBuZXcgbG9jYXRpb24iLz4KICAgICA8cmRmOmxpCiAgICAgIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiCiAgICAgIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6NThkMTQ4M2QtZjAyMy02ZTQ4LWE0NTYtZDg3YTA1YWEzMWQ1IgogICAgICBzdEV2dDp3aGVuPSIyMDIyLTEyLTE1VDE1OjQwOjI2KzA4OjAwIgogICAgICBzdEV2dDpjaGFuZ2VkPSIvIi8+CiAgICAgPHJkZjpsaQogICAgICBzdEV2dDphY3Rpb249InNhdmVkIgogICAgICBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOmRmMzhmYzNiLTE5ZGEtNGY0MC1iMjU2LWVhYzIxOWFjZGNmMiIKICAgICAgc3RFdnQ6d2hlbj0iMjAyMi0xMi0xNVQxNjowMzo0NiswODowMCIKICAgICAgc3RFdnQ6Y2hhbmdlZD0iL2NvbnRlbnQiLz4KICAgICA8cmRmOmxpCiAgICAgIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiCiAgICAgIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6NzZjOTFlOGYtZTkyZC1iMjQ1LWJkYWItODdiYThmMDU5ZjkwIgogICAgICBzdEV2dDp3aGVuPSIyMDIyLTEyLTE1VDE3OjM3OjQ4KzA4OjAwIgogICAgICBzdEV2dDpjaGFuZ2VkPSIvY29udGVudCIvPgogICAgIDxyZGY6bGkKICAgICAgc3RFdnQ6YWN0aW9uPSJzYXZlZCIKICAgICAgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDpiNDJmZDUyMi00NGM4LTdmNDUtYTJjNS1iMjU0ZDdiNDdjMDciCiAgICAgIHN0RXZ0OndoZW49IjIwMjItMTItMTVUMTc6Mzc6NDgrMDg6MDAiCiAgICAgIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4KICAgICA8cmRmOmxpCiAgICAgIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiCiAgICAgIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6MThjMjc4NjktMDAyMS04YzRmLThjMDMtMzVlZTU3MzAwZGQ5IgogICAgICBzdEV2dDp3aGVuPSIyMDIyLTEyLTE1VDE3OjM3OjUxKzA4OjAwIgogICAgICBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBBZG9iZSBNZWRpYSBFbmNvZGVyIDIwMjAuMCAoV2luZG93cykiCiAgICAgIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4KICAgICA8cmRmOmxpCiAgICAgIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiCiAgICAgIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6ZmYyZWY0OTItM2JkZC05OTQ3LTk5YWMtMmQzMzI3MDVhMzIzIgogICAgICBzdEV2dDp3aGVuPSIyMDIyLTEyLTE1VDE3OjM3OjUxKzA4OjAwIgogICAgICBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBBZG9iZSBNZWRpYSBFbmNvZGVyIDIwMjAuMCAoV2luZG93cykiCiAgICAgIHN0RXZ0OmNoYW5nZWQ9Ii9tZXRhZGF0YSIvPgogICAgPC9yZGY6U2VxPgogICA8L3htcE1NOkhpc3Rvcnk+CiAgIDx4bXBNTTpEZXJpdmVkRnJvbQogICAgc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2ZGUxZmEzNC0wNzNlLTJiNDgtYTNmYi0yY2Y3ZjFhMzczNjAiCiAgICBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjZkZTFmYTM0LTA3M2UtMmI0OC1hM2ZiLTJjZjdmMWEzNzM2MCIKICAgIHN0UmVmOm9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxMmMyZmZmYi1kYzc0LTY4NDItYjE5MS0wOGEzODMzZGEwODIiLz4KICAgPHhtcE1NOkluZ3JlZGllbnRzPgogICAgPHJkZjpCYWc+CiAgICAgPHJkZjpsaQogICAgICBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjg1NmYwYzA0LWU0MzUtNzk0Ny1iMmQwLTkwMDliMjlhYzdmNiIKICAgICAgc3RSZWY6ZnJvbVBhcnQ9InRpbWU6MGQ3NjgwMDBmMjU2MDAiCiAgICAgIHN0UmVmOnRvUGFydD0idGltZTowZDc2ODAwMGYyNTYwMCIKICAgICAgc3RSZWY6bWFza01hcmtlcnM9Ik5vbmUiLz4KICAgIDwvcmRmOkJhZz4KICAgPC94bXBNTTpJbmdyZWRpZW50cz4KICAgPHhtcE1NOlBhbnRyeT4KICAgIDxyZGY6QmFnPgogICAgIDxyZGY6bGk+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24KICAgICAgIGRjOmZvcm1hdD0iYXBwbGljYXRpb24vdm5kLmFkb2JlLmFmdGVyZWZmZWN0cy5sYXllciIKICAgICAgIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NWI1MGU1ZTktMTRlMy0zZDQyLWEyMmMtMDY5NjNjNGY3ZWJjIj4KICAgICAgPGRjOnRpdGxlPgogICAgICAgPHJkZjpBbHQ+CiAgICAgICAgPHJkZjpsaSB4bWw6bGFuZz0ieC1kZWZhdWx0Ij7mt7HoibIg5ZOB6JOd6ImyIOe6r+iJsiAxPC9yZGY6bGk+CiAgICAgICA8L3JkZjpBbHQ+CiAgICAgIDwvZGM6dGl0bGU+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICAgIDwvcmRmOmxpPgogICAgIDxyZGY6bGk+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24KICAgICAgIGRjOmZvcm1hdD0iYXBwbGljYXRpb24vdm5kLmFkb2JlLmFmdGVyZWZmZWN0cy5sYXllciIKICAgICAgIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6N2U1M2FmMjctYzQzNS1iNjQ5LTk4MTAtNTYzYjE4ZmI5ZDI1Ij4KICAgICAgPGRjOnRpdGxlPgogICAgICAgPHJkZjpBbHQ+CiAgICAgICAgPHJkZjpsaSB4bWw6bGFuZz0ieC1kZWZhdWx0Ij7nn6nlvaIgODEucG5nPC9yZGY6bGk+CiAgICAgICA8L3JkZjpBbHQ+CiAgICAgIDwvZGM6dGl0bGU+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICAgIDwvcmRmOmxpPgogICAgIDxyZGY6bGk+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24KICAgICAgIGRjOmZvcm1hdD0iYXBwbGljYXRpb24vdm5kLmFkb2JlLmFmdGVyZWZmZWN0cy5jb21wIgogICAgICAgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo4NTZmMGMwNC1lNDM1LTc5NDctYjJkMC05MDA5YjI5YWM3ZjYiPgogICAgICA8ZGM6dGl0bGU+CiAgICAgICA8cmRmOkFsdD4KICAgICAgICA8cmRmOmxpIHhtbDpsYW5nPSJ4LWRlZmF1bHQiPuWQiOaIkCAxPC9yZGY6bGk+CiAgICAgICA8L3JkZjpBbHQ+CiAgICAgIDwvZGM6dGl0bGU+CiAgICAgIDx4bXBNTTpJbmdyZWRpZW50cz4KICAgICAgIDxyZGY6QmFnPgogICAgICAgIDxyZGY6bGkKICAgICAgICAgc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo1YjUwZTVlOS0xNGUzLTNkNDItYTIyYy0wNjk2M2M0ZjdlYmMiCiAgICAgICAgIHN0UmVmOmZyb21QYXJ0PSJ0aW1lOjBkNzY4MDAwZjI1NjAwIgogICAgICAgICBzdFJlZjp0b1BhcnQ9InRpbWU6MGQ3NjgwMDBmMjU2MDAiCiAgICAgICAgIHN0UmVmOm1hc2tNYXJrZXJzPSJOb25lIi8+CiAgICAgICAgPHJkZjpsaQogICAgICAgICBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjdlNTNhZjI3LWM0MzUtYjY0OS05ODEwLTU2M2IxOGZiOWQyNSIKICAgICAgICAgc3RSZWY6ZnJvbVBhcnQ9InRpbWU6MGQ3NjgwMDBmMjU2MDAiCiAgICAgICAgIHN0UmVmOnRvUGFydD0idGltZTowZDc2ODAwMGYyNTYwMCIKICAgICAgICAgc3RSZWY6bWFza01hcmtlcnM9Ik5vbmUiLz4KICAgICAgICA8cmRmOmxpCiAgICAgICAgIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6YWM5NGVmNzAtMmVkNC03YjQzLTg5YTktNzU0NTkwMjExOGVmIgogICAgICAgICBzdFJlZjpmcm9tUGFydD0idGltZTowZDc2ODAwMGYyNTYwMCIKICAgICAgICAgc3RSZWY6dG9QYXJ0PSJ0aW1lOjBkNzY4MDAwZjI1NjAwIgogICAgICAgICBzdFJlZjptYXNrTWFya2Vycz0iTm9uZSIvPgogICAgICAgIDxyZGY6bGkKICAgICAgICAgc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpiMjY3NDgyNS05MjE4LTQ1NDYtYjA4ZS01ZTI3M2QyNDAyMjgiCiAgICAgICAgIHN0UmVmOmZyb21QYXJ0PSJ0aW1lOjBkNzY4MDAwZjI1NjAwIgogICAgICAgICBzdFJlZjp0b1BhcnQ9InRpbWU6MGQ3NjgwMDBmMjU2MDAiCiAgICAgICAgIHN0UmVmOm1hc2tNYXJrZXJzPSJOb25lIi8+CiAgICAgICAgPHJkZjpsaQogICAgICAgICBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOmNiYmJlOTY0LTM0MmYtYTM0ZC1iM2Q2LTI3ZGUyOTE3MWFhYSIKICAgICAgICAgc3RSZWY6ZnJvbVBhcnQ9InRpbWU6MGQ3NjgwMDBmMjU2MDAiCiAgICAgICAgIHN0UmVmOnRvUGFydD0idGltZTowZDc2ODAwMGYyNTYwMCIKICAgICAgICAgc3RSZWY6bWFza01hcmtlcnM9Ik5vbmUiLz4KICAgICAgIDwvcmRmOkJhZz4KICAgICAgPC94bXBNTTpJbmdyZWRpZW50cz4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgICAgPC9yZGY6bGk+CiAgICAgPHJkZjpsaT4KICAgICAgPHJkZjpEZXNjcmlwdGlvbgogICAgICAgZGM6Zm9ybWF0PSJhcHBsaWNhdGlvbi92bmQuYWRvYmUuYWZ0ZXJlZmZlY3RzLmxheWVyIgogICAgICAgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDphYzk0ZWY3MC0yZWQ0LTdiNDMtODlhOS03NTQ1OTAyMTE4ZWYiPgogICAgICA8ZGM6dGl0bGU+CiAgICAgICA8cmRmOkFsdD4KICAgICAgICA8cmRmOmxpIHhtbDpsYW5nPSJ4LWRlZmF1bHQiPue7hOWQiCAxNS5wbmc8L3JkZjpsaT4KICAgICAgIDwvcmRmOkFsdD4KICAgICAgPC9kYzp0aXRsZT4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgICAgPC9yZGY6bGk+CiAgICAgPHJkZjpsaT4KICAgICAgPHJkZjpEZXNjcmlwdGlvbgogICAgICAgZGM6Zm9ybWF0PSJhcHBsaWNhdGlvbi92bmQuYWRvYmUuYWZ0ZXJlZmZlY3RzLmxheWVyIgogICAgICAgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpiMjY3NDgyNS05MjE4LTQ1NDYtYjA4ZS01ZTI3M2QyNDAyMjgiPgogICAgICA8ZGM6dGl0bGU+CiAgICAgICA8cmRmOkFsdD4KICAgICAgICA8cmRmOmxpIHhtbDpsYW5nPSJ4LWRlZmF1bHQiPuefqeW9oiA2NS5wbmc8L3JkZjpsaT4KICAgICAgIDwvcmRmOkFsdD4KICAgICAgPC9kYzp0aXRsZT4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgICAgPC9yZGY6bGk+CiAgICAgPHJkZjpsaT4KICAgICAgPHJkZjpEZXNjcmlwdGlvbgogICAgICAgZGM6Zm9ybWF0PSJhcHBsaWNhdGlvbi92bmQuYWRvYmUuYWZ0ZXJlZmZlY3RzLmxheWVyIgogICAgICAgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpjYmJiZTk2NC0zNDJmLWEzNGQtYjNkNi0yN2RlMjkxNzFhYWEiPgogICAgICA8ZGM6dGl0bGU+CiAgICAgICA8cmRmOkFsdD4KICAgICAgICA8cmRmOmxpIHhtbDpsYW5nPSJ4LWRlZmF1bHQiPuefqeW9oiA4MC5wbmc8L3JkZjpsaT4KICAgICAgIDwvcmRmOkFsdD4KICAgICAgPC9kYzp0aXRsZT4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgICAgPC9yZGY6bGk+CiAgICA8L3JkZjpCYWc+CiAgIDwveG1wTU06UGFudHJ5PgogICA8eG1wRE06dmlkZW9GcmFtZVNpemUKICAgIHN0RGltOnc9IjE2IgogICAgc3REaW06aD0iMTYiCiAgICBzdERpbTp1bml0PSJwaXhlbCIvPgogICA8eG1wRE06ZHVyYXRpb24KICAgIHhtcERNOnZhbHVlPSIyNSIKICAgIHhtcERNOnNjYWxlPSIxLzI1Ii8+CiAgIDx4bXBETTpzdGFydFRpbWVjb2RlCiAgICB4bXBETTp0aW1lRm9ybWF0PSIyNVRpbWVjb2RlIgogICAgeG1wRE06dGltZVZhbHVlPSIwMDowMDowMDowMCIvPgogICA8eG1wRE06YWx0VGltZWNvZGUKICAgIHhtcERNOnRpbWVWYWx1ZT0iMDA6MDA6MDA6MDAiCiAgICB4bXBETTp0aW1lRm9ybWF0PSIyNVRpbWVjb2RlIi8+CiAgPC9yZGY6RGVzY3JpcHRpb24+CiA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgo8P3hwYWNrZXQgZW5kPSJyIj8+Af/+/fz7+vn49/b19PPy8fDv7u3s6+rp6Ofm5eTj4uHg397d3Nva2djX1tXU09LR0M/OzczLysnIx8bFxMPCwcC/vr28u7q5uLe2tbSzsrGwr66trKuqqainpqWko6KhoJ+enZybmpmYl5aVlJOSkZCPjo2Mi4qJiIeGhYSDgoGAf359fHt6eXh3dnV0c3JxcG9ubWxramloZ2ZlZGNiYWBfXl1cW1pZWFdWVVRTUlFQT05NTEtKSUhHRkVEQ0JBQD8+PTw7Ojk4NzY1NDMyMTAvLi0sKyopKCcmJSQjIiEgHx4dHBsaGRgXFhUUExIREA8ODQwLCgkIBwYFBAMCAQAAOw==")
-}
-
-html .menu .menu_set:hover {
-    background-image: url("data:image/gif;base64,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")
-}
-
-html .menu .menu_folder:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQANUAAPX19efn593d3dXV1dPT09HR0c/Pz83NzcvLy8nJycfHx8XFxcHBwb29vbm5ube3t7W1tbOzs7Gxsa+vr62traurq6mpqaenp6WlpaOjo6GhoQDZNp+fn52dnZubm5mZmZeXl5WVlZOTk4+Pj4WFhX5+fnx8fHp6enh4eHZ2dnJycnBwcGZmZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFDgAsACwAAAIAEAAMAAAGYEAWCHEohFjIpJJVGJlKD0oGQ8VoVEkCdslFajEMiuVCJlskjwTz1OgmSQsWQhRxIysg1mLysbMcKywKCih2J3UsAgZ+Hh1IABJ+ECVIARwlmJmZJAxJHkQHoaKhA3ksQQAh+QQJDgAsACwAAAAAEAAOAAAGGUCWULgpGo/DpHLJbDqf0Kh0Sq1ar9isMAgAIfkECQ4ALAAsAAABABAADQAABmZAllC4KRqPQhDiUAgNn8/CyFR6UDKYLEajGhK60LDwi2FQLJd02iJ5JFiFU0M8JC1YCFGELqyAWAsTH3wsDissCgoofCd7LAIGhB4dQgAShBAlQgEcJZ6fnyQMQx5LB6eopwN/LEEAIfkECQ4ALAAsAAACABAADAAABmNAFghxKGyOyCSLVRiZSg9KBkPFaFRLFgGb7Xq1KgyDYrmYzRbJI8E8Nb5d0oKFEEXg2QqItZh88EsOKywKCiiAJ3csAgaALB4dSwASjhAlSwEcJZucnCQMWR5EB6SlpAN7LEEAIfkECQ4ALAAsAAACABAADAAABlxAFghxKIRYyKSSVRiZSpuodIokqJbYpBXDoFguYLBF8kgwT41skrRgIUQRNbICYi0mHznLsWIpFChyJ3EsAgZ6Hh1IABJ6ECVIARwllJWVJAxJHkQHnZ6dA3UsQQAh+QQFDgAsACwAAAIAEAAMAAAGZUAWCHEohFjIpJJVGJlKD0oGQ8VoVEkClrXper9ILYZBsVzOZ4vkkWCeGsslacFCiCJxZQXEWkw+eUkOKywKCiiBLCd4LAIGiSweHUgAEpAQJUgBHCWdnp4kDEkeRAemp6YDfCxBACH5BAkOACwALAAAAgAQAAwAAAYUQJZwSCwaj8ikcslsOp/QqHQqDAIAIfkECQ4ALAAsAAACABAADAAABlxAFghxKIRYyKSSVRiZSpuodIokqJbYpBXDoFguYLBF8kgwT41skrRgIUQRNbICYi0mHznLsWIpFChyJ3EsAgZ6Hh1IABJ6ECVIARwllJWVJAxJHkQHnZ6dA3UsQQAh+QQJDgAsACwAAAIAEAAMAAAGY0AWCHEobI7IJItVGJlKD0oGQ8VoVEsWAZvterUqDINiuZjNFskjwTw1vl3SgoUQReDZCoi1mHzwSw4rLAoKKIAndywCBoAsHh1LABKOECVLARwlm5ycJAxZHkQHpKWkA3ssQQAh+QQJDgAsACwAAAEAEAANAAAGZkCWULgpGo9CEOJQCA2fz8LIVHpQMpgsRqMaErrQsPCLYVAsl3TaInkkWIVTQzwkLVgIUYQurIBYCxMffCwOKywKCih8J3ssAgaEHh1CABKEECVCARwlnp+fJAxDHksHp6inA38sQQAh+QQJDgAsACwAAAAAEAAOAAAGZkCWULgpGo/DpHIJQhwKoaWyMDKVHpQMZovRqIaEr3QZxjAolotabZE8EqzCqTEWkhYshChSZ1VALAsTH30OKywKCih1J3wsAgZ9Hh1CABJ9ECVCARwlnp+fJAxDHk4Hp6inA4AsQQA7")
-}
-
-html .menu .menu_exit:hover {
-    background-image: url("data:image/gif;base64,R0lGODlhEAAQANUAAOPj4+Hh4dnZ2dXV1c3NzcvLy8fHx8PDw8HBwb+/v729vbu7u7W1ta2trampqaenp6Ojo6GhoZ2dnQzNOgjPOpeXlxq9Qhi9QI+Pj4uLi4mJiSatSCqpSjCjTDSfToGBgTadTjKfTjibUDqZUDqXUDyVUkCRVESNVnZ2dkyFWnR0dE6BWlB+XFB8XFR4Xlh2XlxwYF5uYmZmZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFCAAyACwCAAEACwAOAAAGQMBGgUAsEgyoAEMSaTYlgwzgI6taZYkKQHO1ZlDb7jUsrpLLZ3G6ux5zxRgwVayoBBQPh17/EGQgCQiCgwcLKkEAIfkEBQgAMgAsBwAHAAEAAgAABgRA0ykIACH5BAUIADIALAgABwABAAIAAAYEwI4oCAAh+QQFCAAyACwJAAcAAgACAAAGBkCPhzQKAgAh+QQFCAAyACwLAAcAAQACAAAGBEDPKAgAIfkEBQgAMgAsDAAHAAIAAgAABgZA0KbECQIAIfkEBQgAMgAsDAAFAAIAAgAABgZAVypmCQIAIfkEBQgAMgAsDgAGAAIAAwAABgfAlYySmqyCACH5BAUIADIALAwACQADAAEAAAYFQNiFFQQAIfkEBQgAMgAsDAAKAAIAAQAABgTAFysIACH5BAkyADIALAIAAQAOAA4AAAYUQJlwSCwaj8ikcslsOp/QqHRqDAIAOw==")
-}
-
-.pos-box {
-  height: 50px;
-  width: 100%;
-  box-shadow: 0 3px 2px 0 rgba(0, 0, 0, 5%) !important;
-  border-radius: 4px;
-}
-
-.conter-box{
-    box-shadow: 0 1px 2px 0 rgba(0,0,0,.1);
-}
-
-.position {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKwwAACsMBNCkkqwAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAFZSURBVDiNpdO9a1VBEAXw3zOioIUQEdFGkQdWVtr6D1ikERtRppLU6awUsUkh2CgoBNwhoPhsLESxERR7wcI2XSBNMAHRNFmLbB6Xa64RXFjYOXvmzMfOjmqt/mcd2I+QmUuZOcgbDWWQmTN4iFms4wGu4jC+RMT7wQwy8xBe4FtE3MBXPMdqE5sfLCEzj+Il3kXEE4iIJTzFFbzB9z0FMvMYJphExLPuXUQs4y1eYfmPHmTmbHN+FBGv92zMDm+ulXAzItZHtVaZeRH3sBgRn4ecOyKXcRt3dkuYwyJOZeaJfZyP42TjX1Nrne5SyqSUMu5ho559tpQy2bUP9gL8wHYnzbtYzczTuB8RHzs8/H0Sz+ETbuEDxg3f7pL6AhW/2vknNiNiCxvY6uDT8e2XMINLmbmC89js3I0z8wLOdP36Aht43KIcwULD1+w82/WGT+dk8DP96/oNlqecb6uu8YEAAAAASUVORK5CYII=");
-    background-position: 17px 14px;
-    background-repeat: no-repeat;
-    background-size: 20px auto;
-    line-height: 50px;
-    padding-left: 30px;
-}
-
-.search {
-    width: 306px;
-}
-
-.ser-text {
-    border: #20a53a 1px solid;
-    height: 30px;
-    width: 250px;
-    padding: 0 8px;
-    margin-top: 10px;
-    outline: none;
-}
-
-.ser-text:focus {
-    border-color: #20a53a;
-}
-
-.ser-text:focus + span.glyphicon-search {
-    color: #20a53a;
-}
-
-.ser-sub {
-    width: 38px;
-    height: 30px;
-    border: 0;
-    background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxAAAAMQBz4pYTAAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAE2SURBVDiNndJBS1VRFMXx9UzNQUQD0caFk6YhEUFCOPETiJQfIygQbNQgCCeOGjYLGjRJkPoKoSGIRKADs1nQoEIEfw3cry6v+3oPN2z2ufuu8z/7nruC9ORNvMRXHOIFbrTogjQfOniKX87iR2P9HSv/A1zA+xK/wRwmMYV5vKt3r/sBnpTgcb9R8aw0D3sB1/GzTum3uZsfSnupCVgr8vwQgKXSLnR7I0nuJJFkN4PjY9WZbmMkyXGtx4YAjFY9aQI2knSS3B4CMFd1508HV3CE3QHfP17G2sdo7298UJfzChMtmy9jszTLbT4InpfgCx6Vme5hFd/8jW1cbQME93Hg39jDYmOKT5hGOmi7rNkk15KcJvmcZKv6E0k2k9xNsp1keZBx2vIi3tYkG+cBxJmV13HrN6Szg7ZCfX3NAAAAAElFTkSuQmCC") no-repeat center #20a53a;
-    cursor: pointer;
-    margin-right: 2px;
-    margin-top: 10px
-}
-
-.title {
-    height: 50px;
-    line-height: 50px;
-    border-bottom: 1px solid #eee
-}
-
-.title h3 {
-    display: inline-block;
-    line-height: 50px;
-    margin-right: 12px
-}
-.tablescroll {
-    overflow: auto;
-    border: #e6e6e6 1px solid;
-}
-.divtable .table {
-    border: 1px solid #ddd;
-    color: #666;
-    font-size: 12px;
-    margin-bottom: 0;
-}
-.divtable{
-    position: relative;
-}
-.table-fixed-box{
-    overflow-y:auto;
-}
-.ui-selectable{
-    padding-bottom: 0;
-}
-
-.divtable .table thead th {
-    vertical-align: inherit;
-    background-color: #f6f6f6;
-    border-bottom: 1px solid #e6e6e6;
-    color: #666;
-    font-weight: normal;
-    padding: 8px;
-}
-.divtable .table_toolbar{
-    left: 8px;
-    bottom: 6px;
-    position: absolute;
-}
-.table .btlink{
-    word-break: break-word;
-}
-.table .btlinkbed {
-    color: #666;
-    padding: 1px 5px;
-    border: 1px solid transparent;
-    white-space: nowrap;
-    overflow: hidden;
-    float: left;
-    display: block
-}
-
-.table .btlinkbed:hover {
-    border: #ddd 1px solid;
-}
-
-.dataTables_paginate {
-    display: block;
-    height: 35px;
-    margin-bottom: 0px;
-    margin-top: 5px;
-    position:relative;
-}
-
-#filePage{
-    margin-bottom: 10px;
-}
-
-.page {
-    /* line-height: 16px; */
-    text-align: right;
-    padding: 8px 0;
-    /* margin-right: 1px; */
-    height: 44px;
-    /* border: 1px solid #e6e6e6;*/
-    border-top: none;
-    margin: 0;
-}
-
-.site_type {
-    height: 30px;
-    line-height: 30px;
-    bottom: -9px;
-    position: absolute;
-}
-
-.site_type span{
-    display: inline-block;
-    height: 30px;
-    line-height: 30px;
-    padding: 0 10px;
-    font-family: "Arial";
-    font-size: 13px;
-    color: #666;
-    float: left;
-    border: 1px solid #ececec;
-    border-right: none;
-    /* border: 1px solid #ececec; */
-}
-
-.site_type select{
-    border-radius: 0px;
-}
-.site_type_table{
-    padding: 15px;
-    min-height: 100px;
-}
-.edit_site_type{
-    padding:0 15px;
-}
-.edit_site_type .line .info-r{
-    margin-left:0px;
-}
-.edit_site_type input{
-    width: 80% !important;
-}
-.edit_site_type .btn{
-    margin-right: 0px;
-}
-.page div {
-    float: right
-}
-
-.page span,
-.page a {
-    display: inline-block;
-    height: 28px;
-    line-height: 28px;
-    padding: 0 10px;
-    font-family: "Arial";
-    font-size: 13px;
-    color: #666;
-    float: left;
-    border: 1px solid #ececec;
-    border-right: none;
-}
-
-.page a.prev {
-    border-left: #ddd solid 1px
-}
-
-.page a:hover {
-    background: #e8e8e8;
-    color: #20a53a;
-    text-shadow: 0 1px 0 #fff;
-    cursor: pointer
-}
-
-.page spanold {
-    font-size: 12px;
-    padding: 4px 10px!important;
-    border-style: solid;
-    border-width: 1px;
-    border-color: #ddd #ddd #ccc;
-    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-    display: inline-block;
-    line-height: 16px;
-    background: #f5f5f5;
-    color: #333;
-    text-shadow: 0 1px 0 #fff
-}
-
-.page .Pcurrent {
-    color: #fff;
-    background: #20a53a;
-    cursor: default;
-    border-color: #20a53a;
-}
-
-.page .Pcount {
-    color: #333;
-    padding: 0 10px;
-    margin-right: 0px;
-    border-right: 1px solid #ececec;
-}
-
-.system-info-con {
-    width: 100%
-}
-.sys-li-box{
-    height:100px;
-    background-color:#f9f9f9;
-    border:#f0f0f0 1px solid;
-    margin-left:20px;
-    max-width:230px;
-}
-.sys-li-box .name{
-    line-height:40px;
-    margin-top:8px;
-}
-.sys-li-box .val a{
-    font-size:26px;
-    font-family:arial;
-}
-.sys-i-c-box {
-    box-sizing: border-box;
-    max-width: 350px
-}
-
-.sys-i-c-box .siteinfo-box {
-    height: 110px;
-    position: relative;
-    width: 100%
-}
-
-.sys-i-c-box .siteinfo-box h3 {
-    background: #20a53a;
-    color: #fff;
-    font-style: normal;
-    height: 110px;
-    left: 0;
-    line-height: 110px;
-    position: absolute;
-    text-align: center;
-    top: 0;
-    width: 56px
-}
-
-.siteinfo-box-right {
-    border-bottom: 1px solid #ddd;
-    border-right: 1px solid #ddd;
-    border-top: 1px solid #ddd;
-    height: 110px;
-    margin-left: 56px;
-    overflow: hidden
-}
-
-.siteinfo-box-right h4 {
-    font-size: 32px;
-    height: 68px;
-    line-height: 60px;
-    overflow: hidden;
-    padding-top: 8px;
-    text-align: center
-}
-
-.siteinfo-box-right .sbr-btn {
-    color: #ccc;
-    display: block;
-    font-size: 14px;
-    height: 27px;
-    line-height: 22px;
-    padding-top: 5px;
-    text-align: center
-}
-
-.siteinfo-box-right .sbr-btn a {
-    color: #20a53a;
-    font-size: 16px;
-    padding: 0 10px
-}
-
-.circle-box h3,
-.circle-box h4 {
-    line-height: 30px
-}
-
-.circle {
-    width: 100px;
-    height: 100px;
-    position: relative;
-    border-radius: 50%;
-    background: #20a53a;
-    margin: 0 auto
-}
-
-.pie_left,
-.pie_right {
-    width: 100px;
-    height: 100px;
-    position: absolute;
-    top: 0;
-    left: 0
-}
-
-.left,
-.right {
-    width: 100px;
-    height: 100px;
-    background: #ccc;
-    border-radius: 50%;
-    position: absolute;
-    top: 0;
-    left: 0
-}
-
-.pie_right,
-.right {
-    clip: rect(0, auto, auto, 50px);
-    transition: transform 1s ease-in 0s;
-    -webkit-transition: -webkit-transform 1s ease-in 0s;
-    -moz-transition: -moz-transform 1s ease-in 0s
-}
-
-.pie_left,
-.left {
-    clip: rect(0, 50px, auto, 0);
-    transition: transform .4s ease-in 1s;
-    -webkit-transition: -webkit-transform .4s ease-in 1s;
-    -moz-transition: -moz-transform .4s ease-in 1s
-}
-
-.mask {
-    width: 88px;
-    height: 88px;
-    border-radius: 50%;
-    left: 6px;
-    top: 6px;
-    background: #FFF;
-    position: absolute;
-    line-height: 88px;
-    font-size: 18px;
-    color: #20a53a
-}
-
-@-webkit-keyframes shineGreen {
-    from {
-        -webkit-box-shadow: 0 0 10px #999
-    }
-    50% {
-        -webkit-box-shadow: 0 0 15px #20a53a
-    }
-    to {
-        -webkit-box-shadow: 0 0 10px #999
-    }
-}
-
-.shine_green {
-    -webkit-animation-name: shineGreen;
-    -webkit-animation-duration: 3s;
-    -webkit-animation-iteration-count: infinite
-}
-
-.mem-release {
-    cursor: pointer
-}
-
-.mem-re-min {
-    background: url(/static/img/ico/rocket_min.png) no-repeat center center;
-    height: 35px;
-    left: 35px;
-    position: absolute;
-    top: 2px;
-    width: 20px;
-    z-index: 9;
-    opacity: .9;
-}
-
-.mem-re-con {
-    background: url(/static/img/ico/ico-rocket.gif) no-repeat center center;
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    z-index: 9;
-    display: none;
-    top: 15px
-}
-
-.mem-release:hover .mem-re-con {
-    display: block
-}
-
-.soft-man .col-lg-3 {
-    border-bottom: 1px solid #ececfb;
-    border-left: 1px solid #ececfb;
-    border-right: 1px solid #ececfb;
-    margin-right: -1px;
-    margin-bottom: -1px;
-    height: 148px;
-    cursor: pointer;
-    padding: 0
-}
-
-.soft-man .col-lg-3:hover {
-    box-shadow: 0 0 38px rgba(0, 0, 0, .08) inset;
-    -webkit-transition: all .25s ease;
-    transition: all .25s ease
-}
-
-.soft-man .dashed-border {
-    border: 1px dashed #20a53a;
-    z-index: 1
-}
-
-.soft-man .no-bg:hover {
-    box-shadow: 0 0 38px rgba(0, 0, 0, .01) inset;
-    -webkit-transition: all .15s ease;
-    transition: all .15s ease
-}
-
-.soft-man .image {
-    height: 40px;
-    margin: 30px 0 20px;
-    text-align: center
-}
-
-.soft-man .sname {
-    text-align: center;
-    color: #999
-}
-
-.soft-man .col-sm-3>div {
-    height: 100%;
-    left: 0;
-    position: absolute;
-    top: 0;
-    width: 100%;
-    z-index: 0
-}
-
-.soft-man .spanmove {
-    background: url(/static/images/move.png) no-repeat;
-    width: 30px;
-    height: 30px;
-    display: none;
-    position: absolute;
-    top: 5px;
-    right: 5px;
-    z-index: 3
-}
-
-.soft-man .col-lg-3:hover .spanmove {
-    display: block
-}
-
-.soft-man .text {
-    background-color: rgba(0, 0, 0, 0.3);
-    height: 100%;
-    left: 0;
-    position: absolute;
-    top: 0;
-    width: 100%;
-    display: none
-}
-
-.soft-man .text a {
-    background-color: #fff;
-    border-radius: 4px;
-    display: block;
-    height: 30px;
-    line-height: 30px;
-    margin: 59px auto;
-    text-align: center;
-    width: 100px
-}
-
-.soft-man-con p.status {
-    line-height: 40px;
-    margin-bottom: 10px;
-    font-size: 14px
-}
-
-.soft-man-con .sfm-opt .btn {
-    margin-right: 15px
-}
-
-.soft-man .sname .glyphicon-True {
-    color: #20a53a;
-    margin-left: 10px
-}
-
-.soft-man .sname .glyphicon-False {
-    color: red;
-    margin-left: 10px
-}
-
-.soft-man {
-    position: relative
-}
-
-.soft-man .rowbg {
-    position: absolute;
-    top: 0;
-    width: 100%;
-    z-index: 0;
-}
-
-.soft-man .rowbg .col-lg-3 {
-    cursor: default;
-}
-
-.soft-man .rowbg .col-lg-3:hover {
-    box-shadow: 0 0 38px rgba(0, 0, 0, .01) inset;
-    -webkit-transition: all .15s ease;
-    transition: all .15s ease
-}
-.bw-info{
-    height:80px;
-}
-.bw-info > div{
-    float:left;
-    padding-top:25px;
-    text-align:center;
-}
-.bw-info > div p{
-    margin-bottom:7px;
-}
-.bw-info > div a{
-    font-size:14px;
-    color: #666;
-}
-.bw-info .ico-up{
-    width:14px;
-    height:8px;
-    background-color:#f7b851;
-    display:inline-block;
-    margin-right:3px;
-}
-.bw-info .ico-down{
-    width:14px;
-    height:8px;
-    background-color:#52a9ff;
-    display:inline-block;
-    margin-right:3px;
-}
-.bw-info ul li {
-    height: 56px;
-    line-height: 56px;
-}
-
-.bw-info ul li.bi-line {
-    border-bottom: #ddd solid 1px;
-}
-
-.bw-info ul li span {
-    display: block;
-    margin-right: 15px;
-}
-
-.btn-zhm {
-    border-radius: 0 3px 0 0;
-    display: none;
-    position: absolute;
-    right: 42px;
-    top: 0;
-}
-
-.ellipsis_text {
-    width: 220px;
-    text-overflow: ellipsis;
-    overflow: hidden;
-}
-
-.ssl_state_info{
-  padding: 15px 30px;
-  background: #f5faf2;
-  margin-top: 5px;
-  border-radius: 4px;
-  border: 1px solid #EAF1F2;
-  font-size: 12px;
-  position: relative;
-}
-
-.ssl_state_info .state_item{
-  width: 49%;
-  height: 25px;
-  line-height: 25px;
-  display: inline-block;
-  vertical-align: top;
-}
-
-.ssl_state_info .state_item span{
-  height: 25px;
-  line-height: 25px;
-  vertical-align: top;
-}
-
-
-.ssl_state_info .state_item span:nth-child(1){
-  font-weight: bold;
-  color: #666;
-}
-
-
-
-.ssl_state_info  .state_item .switch{
-  display: inline-block;
-}
-
-
-.ssl_state_info  .state_item .btswitch-btn{
-  margin-bottom: 0;
-  height: 1.9rem;
-  width: 3.2rem;
-  position: relative;
-  top:2.5px;
-}
-
-.custom_certificate_info{
-  margin-top: 15px;
-}
-
-.custom_certificate_info .state_item{
-  width: 48%;
-  height: 50px;
-  display: inline-block;
-  margin-right: 4%;
-}
-.custom_certificate_info .state_item:nth-child(2){
-  margin-right: 0;
-}
-
-.custom_certificate_info .state_item span{
-  width:100%;
-  margin-bottom: 5px;
-}
-
-.custom_certificate_info .state_item textarea{
-  width: 100%;
-  height: 250px;
-  line-height: 25px;
-}
-
-.line {
-    padding: 5px 0
-}
-
-.line .span_tit {
-    display: inline-block;
-    text-align: right;
-    width: 64px
-}
-
-.line .tname {
-    display: block;
-    float: left;
-    height: 32px;
-    line-height: 32px;
-    overflow: hidden;
-    padding-right: 20px;
-    text-align: right;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    width: 100px
-}
-
-.line .info-r {
-    margin-bottom: 5px;
-    margin-left: 100px;
-    position: relative
-}
-
-.placeholder {
-    cursor: text;
-    left: 20px;
-    line-height: 24px;
-    position: absolute;
-    top: 27px
-}
-
-.bt-form-submit-btn {
-    background: #f6f8f8;
-    border-top: 1px solid #edf1f2;
-    bottom: 0;
-    left: 0;
-    padding: 8px 20px 10px;
-    position: absolute;
-    text-align: right;
-    width: 100%
-}
-
-.bt-form-submit-btn .btn:first-child {
-    margin-right: 4px
-}
-
-.btn-danger {
-    background-color: #cbcbcb;
-    border-color: #cbcbcb;
-    color: #fff
-}
-
-.bt-w-main {
-    height: 555px
-}
-
-.bt-form {
-    height: 100%
-}
-
-.bt-w-menu {
-    float: left;
-    background-color: #f0f0f1;
-    height: 100%;
-    width: 110px
-}
-
-.bt-w-menu p {
-    cursor: pointer;
-    height: 40px;
-    line-height: 40px;
-    padding-left: 20px;
-    position: relative;
-    text-overflow: ellipsis;
-    overflow: hidden
-}
-
-.bt-w-menu p a {
-    display: block
-}
-
-.bt-w-menu p .spanmove {
-    display: none
-}
-
-.bt-w-con {
-    margin-left: 110px;
-    position: relative
-}
-
-.explain-describe-list{
-  border: 1px solid #ececec;
-  border-radius: 6px;
-  margin: 0 auto;
-  margin-top: 20px;
-  margin-bottom: 20px;
-  background: #f7f7f7;
-  padding: 15px;
-  list-style-type: inherit;
-}
-
-
-.agreement-box label{
-  font-weight: 400;
-  margin: 0 0 0 5px;
-  vertical-align: middle;
-  cursor: pointer;
-}
-
-.agreement-box input{
-  height: 15px;
-  width: 15px;
-  vertical-align: middle;
-  margin-top: 0;
-  cursor: pointer;
-}
-
-.label-input-group input {
-    margin-top: 0;
-    margin-right: 5px;
-    vertical-align: -2px
-}
-
-.label-input-group label {
-    margin-bottom: 0;
-    font-weight: normal
-}
-
-.bingfa .line {
-    margin-bottom: 10px
-}
-
-.bingfa .line .span_tit {
-    text-align: right;
-    width: 120px;
-    display: inline-block
-}
-
-.bingfa .bt-input-text {
-    width: 100px
-}
-
-.ssl-con-key {
-    width: 47%
-}
-
-.ssl-con-key textarea {
-    height: 240px;
-    line-height: 18px;
-    width: 100%;
-    margin-top: 5px
-}
-
-.ssh-item {
-    float: left;
-    margin-left: 10px;
-    padding-top: 5px
-}
-
-.ss-text em {
-    color: #555;
-    float: left;
-    font-style: normal;
-    line-height: 32px;
-    padding-right: 2px
-}
-
-.view1,
-.view2 {
-    margin-bottom: 15px;
-}
-
-.searcTime {
-    position: relative:z-index:999;
-    margin-top: 11px
-}
-
-.searcTime .tit {
-    float: left;
-    padding: 5px 10px;
-    display: none
-}
-
-.searcTime .gt {
-    padding: 5px 10px;
-    border: #ddd 1px solid;
-    margin-right: -1px;
-    cursor: pointer;
-    float: left;
-    line-height: 16px
-}
-
-.searcTime .gt.on,
-.searcTime .gt:hover,
-.searcTime .ss .st:hover,
-.searcTime .ss .st.on {
-    background-color: #20a53a;
-    color: #fff
-}
-
-.searcTime .ss {
-    display: inline-block;
-    position: relative;
-    float: left;
-    line-height: 16px;
-}
-
-.searcTime .ss .st {
-    padding: 5px 10px;
-    border: #ddd 1px solid;
-    margin-right: -1px;
-    cursor: pointer;
-    float: left;
-}
-
-.searcTime .ss .time {
-    background-color: #fff;
-    border: 1px solid #ddd;
-    display: none;
-    padding: 10px;
-    position: absolute;
-    right: -1px;
-    top: 27px;
-    width: 306px;
-    z-index: 99;
-}
-
-.searcTime .ss .time span {
-    margin-bottom: 10px;
-    display: block;
-}
-
-.searcTime .ss .time input {
-    border: 1px solid #ddd;
-    height: 22px;
-    padding: 0 5px;
-    margin-left:5px;
-    width: 227px;
-}
-
-.searcTime .ss .time input:focus {
-    border: #66afe9 1px solid;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
-}
-
-.searcTime .ss .sbtn {
-    background-color: #20a53a;
-    border: 1px solid #20a53a;
-    color: #fff;
-    line-height: 24px;
-    text-align: center;
-    cursor: pointer;
-}
-
-.plan {
-    padding: 10px 20px;
-    margin-bottom: 10px;
-}
-
-.plan .typename {
-    line-height: 34px;
-    width: 120px;
-    font-size: 12px;
-}
-
-.plan .textname {
-    height: 34px;
-    line-height: 34px;
-    float: left;
-}
-
-.plan .planname input {
-    height: 34px;
-    width: 260px;
-    padding: 0 12px;
-}
-
-.plan .dropdown button b {
-    font-weight: normal;
-    font-size: 12px;
-}
-
-.plan .dropdown-menu {
-    min-width: 100px
-}
-
-.dropdown-menu>li>a {
-    padding: 3px 12px
-}
-
-.plan-submit {
-    margin-left: 141px
-}
-
-.plan_hms {
-    position: relative;
-    height: 34px
-}
-
-.plan_hms span {
-    float: left;
-    height: 32px;
-    line-height: 32px;
-    position: relative
-}
-
-.plan_hms .name {
-    border-left: 1px solid #ccc;
-    width: 44px;
-    text-align: center;
-    background-color: #f6f6f6
-}
-
-.planSign {
-    margin-left: 10px;
-    height: 35px;
-    line-height: 35px
-}
-
-.planSign i {
-    margin-right: 8px;
-    font-size: 12px;
-    font-style: initial;
-    color: red
-}
-
-.plan_hms span input {
-    float: left;
-    width: 48px;
-    height: 32px;
-    line-height: 32px;
-    border: 0;
-    text-align: center;
-    font-size: 12px
-}
-
-.plan_hms span:first-child input {
-    border-radius: 4px 0 0 4px
-}
-
-.plan_hms span:last-child {
-    border-radius: 0 4px 4px 0
-}
-
-.plan .dropdown button {
-    width: 94px
-}
-
-.txtsjs {
-    width: 450px;
-    height: 80px;
-}
-
-.sl-s-info {
-    width: 210px;
-    border: #ccc 1px solid;
-}
-
-.important-title {
-    display: flex;
-    color:red;
-    background-color: #fef3e2;
-    line-height: 46px;
-    margin-bottom: 15px;
-    padding-left: 10px;
-    box-shadow: 0 1px 2px 0 rgba(0,0,0,.2);
-}
-
-.important-title>p {
-    flex: 1;
-}
-
-.rec-box-con .onekey {
-    font-family: "宋体";
-    width: 90px;
-    height: 30px;
-    line-height: 30px;
-    text-align: center;
-    background-color: #20a53a;
-    border-radius: 3px;
-    color: #fff;
-    margin: 20px auto 15px;
-    cursor: pointer;
-}
-
-.rec-install {
-    padding: 16px;
-    width: 100%;
-    float: left;
-}
-
-.rec-install .rec-box {
-    width: 290px;
-    float: left;
-}
-
-.rec-install h3 {
-    font-size: 20px;
-    margin-bottom: 5px
-}
-
-.rec-box-con {
-    border: #ddd 1px solid;
-    border-radius: 3px;
-    padding: 10px
-}
-
-.rec-install .rec-box:hover .rec-box-con,.rec-box-con-hover {
-    background-color: #f9f9f9;
-    border: #20a53a 1px solid
-}
-
-.rec-box-con .ico img {
-    width: 22px;
-    margin-right: 10px
-}
-
-.rec-box-con ul li {
-    line-height: 26px;
-    margin-bottom: 5px
-}
-
-.fangshi {
-    line-height: 19px;
-    margin-top: 10px;
-    display: block;
-    margin-bottom: 15px
-}
-
-.fangshi label {
-    font-weight: normal;
-    margin-right: 44px;
-    float: right
-}
-
-.fangshi label input {
-    vertical-align: -2px;
-    margin-left: 5px
-}
-
-.zun-form-new .fangshi {
-    padding: 0 30px 0;
-    line-height: 30px
-}
-
-.zun-form-new .fangshi label {
-    height: 20px;
-    line-height: 20px;
-    margin: 4px 20px 0 0
-}
-
-.zun-form-new .version {
-    padding: 0 30px
-}
-
-.zun-form-new .version select {
-    height: 28px;
-    margin-left: 30px;
-    width: 120px
-}
-
-.sec-install-btn {
-    font-family: "宋体";
-    width: 90px;
-    height: 30px;
-    line-height: 30px;
-    text-align: center;
-    background-color: #20a53a;
-    border-radius: 3px;
-    color: #fff;
-    cursor: pointer;
-    margin-top: 10px
-}
-
-.rec-box-con .onekey {
-    font-family: "宋体";
-    width: 90px;
-    height: 30px;
-    line-height: 30px;
-    text-align: center;
-    background-color: #20a53a;
-    border-radius: 3px;
-    color: #fff;
-    margin: 20px auto 15px;
-    cursor: pointer
-}
-
-.rec-box-con .onekey:hover,
-.sec-install-btn:hover {
-    background: #10952a;
-    background: linear-gradient(#10952a, #088d22)
-}
-
-.phppz {
-    margin: 14px 0
-}
-
-.phppz span {
-    padding: 10px
-}
-
-.phppz textarea {
-    width: 500px;
-    margin: 0;
-    vertical-align: bottom;
-    padding: 0 5px;
-    height: 38px;
-    margin-right: 20px
-}
-
-.soft-man-con .user_pw {
-    display: none;
-    margin-top: 30px
-}
-
-.soft-man-con .user_pw_tit {
-    margin-top: 30px;
-    padding-top: 30px;
-    border-top: #ccc 1px dashed
-}
-
-.soft-man-con .user_pw p {
-    margin-bottom: 15px
-}
-
-.soft-man-con .user_pw_tit .tit {
-    float: left;
-    line-height: 22px
-}
-
-.soft-man-con .user_pw span,
-.soft-man-con .user_pw_tit span {
-    width: 75px;
-    display: inline-block;
-    text-align: left;
-}
-
-.soft-man-con .user_pw span {
-    margin-right: 10px
-}
-
-.btswitch-p {
-    margin-left: 10px
-}
-
-.soft-man-con .user_pw input {
-    width: 200px
-}
-
-.soft-man-con .conf_p {
-    margin-bottom: 10px
-}
-
-.soft-man-con .conf_p input {
-    width: 100px
-}
-
-.soft-man-con .funarea {
-    width: 100%;
-    height: 80px;
-    line-height: 22px;
-    margin-bottom: 10px
-}
-
-.soft-man-con .ver .btn {
-    vertical-align: 0;
-    margin-left: 10px
-}
-
-.webEdit-box .soft-man-con .phpmyadmindk {
-    width: 100px;
-    display: inline-block;
-    margin: 0;
-    padding-right: 0
-}
-
-.softlist td img {
-    width: 24px;
-    height: 20px;
-    margin-right: 5px
-}
-
-.softlist .glyphicon-folder-open {
-    cursor: pointer;
-    color: #efd566
-}
-
-.softlist .btswitch+.btswitch-btn {
-    width: 2.4em;
-    height: 1.4em;
-    margin-bottom: 0
-}
-
-.wafConf_checkbox label {
-    font-weight: normal;
-    margin-right: 20px
-}
-
-.wafConf button {
-    vertical-align: 0
-}
-
-.wafConf_cc {
-    border-bottom: 1px solid #ddd;
-    border-top: 1px solid #ddd;
-    margin: 10px 0;
-    padding: 15px 0
-}
-
-.wafConf_cc span {
-    margin-right: 5px
-}
-
-.wafConf fieldset {
-    border: 1px solid #ccc;
-    border-radius: 3px;
-    float: left;
-    padding-bottom: 0;
-    width: 240px
-}
-
-.wafConf fieldset:nth-of-type(2) {
-    margin: 0 10px
-}
-
-.wafConf legend {
-    border: 0 none;
-    font-size: 14px;
-    margin: 0 6px;
-    padding: 3px;
-    width: auto
-}
-
-.wafConf fieldset input {
-    margin-left: 4px
-}
-
-.wafConf fieldset .table {
-    margin-top: -1px;
-    margin-bottom: 0
-}
-
-.wafConf fieldset .table tr td:nth-of-type(2) {
-    width: 42px
-}
-
-.wafConf fieldset .table-overflow {
-    height: 210px;
-    overflow: auto;
-    margin-top: 10px;
-    border-top: #ddd 1px solid
-}
-
-.wafConf-btn {
-    border-bottom: #ddd 1px solid;
-    margin-bottom: 12px;
-    padding-bottom: 15px;
-    height: 45px
-}
-
-.wafConf-btn span {
-    float: left;
-    margin-right: 8px;
-    line-height: 33px
-}
-
-.wafConf-btn .btn {
-    margin-right: 10px
-}
-
-.wafConf-btn .ssh-item {
-    margin-right: 50px
-}
-
-.gzEdit {
-    padding: 13px 20px
-}
-
-.gzEdit button {
-    margin: 8px;
-    width: 140px
-}
-
-.setting-con p {
-    line-height: 30px
-}
-
-.setting-con p .set-tit {
-    display: inline-block;
-    height: 22px;
-    margin-right: 10px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    vertical-align: -2px;
-    width: 90px
-}
-
-.setting-con p .disable {
-    background-color: #ededed
-}
-
-.setting-con p .inputtxt {
-    width: 260px
-}
-
-.setting-con p .modify {
-    margin-left: -40px;
-    vertical-align: 0;
-    position: relative;
-    z-index: 10;
-}
-
-.setting-con p .set-info {
-    margin-left: 10px;
-}
-
-.set-submit {
-    margin: 20px 0 10px 100px;
-}
-
-.changepath {
-    height: 500px;
-}
-
-.changepath .path-top {
-    height: 50px;
-    line-height: 50px;
-    padding-left: 10px;
-    border-bottom: #aaa 1px solid;
-}
-
-.changepath .path-top .btn {
-    margin-right: 10px
-}
-
-.changepath .path-top .btn span {
-    -moz-transform: scaleX(-1);
-    -webkit-transform: scaleX(-1);
-    -o-transform: scaleX(-1);
-    transform: scaleX(-1)；
-}
-
-.changepath .path-top .place {
-    display: inline-block
-}
-
-.changepath .path-top .place span {
-    color: #444;
-    font-size: 12px;
-    font-weight: bold
-}
-
-.changepath .path-con-left {
-    width: 130px;
-    height: 450px;
-    float: left;
-    border-right: #aaa 1px solid;
-    padding-top: 5px
-}
-
-.changepath .path-con-left dl dt {
-    background: url("../img/ico-computer.png") no-repeat left center;
-    height: 30px;
-    line-height: 30px;
-    padding-left: 23px;
-    font-size: 14px;
-    font-weight: normal;
-    margin-left: 10px
-}
-
-.changepath .path-con-left dl dd {
-    line-height: 30px;
-    padding-left: 12px;
-    cursor: pointer
-}
-
-.changepath .path-con-left dl dd span {
-    color: #666
-}
-
-.changepath .path-con-right {
-    float: left;
-    height: 450px;
-    overflow: auto;
-    width: 520px
-}
-
-.changepath .path-con-right .default li {
-    width: 25%;
-    float: left;
-    text-align: center;
-    margin-top: 20px;
-    cursor: pointer
-}
-
-.changepath .path-con-right .default li span {
-    font-size: 40px;
-    color: #666
-}
-
-.path-con-right .file-list {
-    display: none
-}
-
-.path-con-right .list-list td {
-    padding-left: 10px;
-    cursor: pointer
-}
-
-.list-list span.glyphicon {
-    color: #666;
-    margin-right: 10px;
-    font-size: 18px
-}
-
-.list-list span.glyphicon-folder-open {
-    color: #edca5c
-}
-
-.list-list span.glyphicon-cloud-download {
-    font-size: 12px
-}
-
-.newFolderName {
-    border: #ccc 1px solid;
-    height: 30px;
-    padding: 0 5px;
-    width: 90%
-}
-
-.path-con-right .list-list td .delfile-btn {
-    display: none;
-    float: right;
-    font-size: 14px;
-    text-align: center;
-    width: 18px
-}
-
-.path-con-right .list-list td .delfile-btn:hover {
-    color: red
-}
-
-.path-con-right .list-list tr:hover .delfile-btn {
-    display: block
-}
-
-.path-con-right .list-list td .btn-xs {
-    margin-top: 4px
-}
-
-.getfile-btn {
-    background: #f6f8f8 none repeat scroll 0 0;
-    border-top: 1px solid #edf1f2;
-    padding: 8px 20px 10px;
-    text-align: right;
-    width: 100%
-}
-
-.warning_info {
-    color: #a94442;
-    background-color: #f2dede;
-    border-color: #ebccd1;
-    height: 40px;
-    line-height: 20px;
-    padding: 10px 15px;
-    border-radius: 4px;
-}
-
-.success-msg {
-    width: 100%;
-    padding: 30px 50px;
-    font-family: "Microsoft Yahei";
-    float: left;
-    position: relative
-}
-
-.success-msg .pic {
-    position: absolute;
-    top: 50%;
-    margin-top: -100px
-}
-
-.success-msg .pic img {
-    width: 158px
-}
-
-.success-msg .suc-con {
-    float: right;
-    width: 260px
-}
-
-.success-msg .suc-con h3 {
-    font-size: 16px;
-    margin-bottom: 15px
-}
-
-.success-msg .suc-con p {
-    line-height: 23px
-}
-
-.success-msg .suc-con .p1 {
-    border-bottom: 1px dashed #aaa;
-    color: #000;
-    height: 30px;
-    margin-bottom: 8px
-}
-
-.success-msg .bottom-btn {
-    margin-top: 60px;
-    width: 100%;
-    float: left
-}
-
-.success-msg .bottom-btn a {
-    width: 200px;
-    height: 40px;
-    line-height: 40px;
-    text-align: center;
-    display: inline-block;
-    border-radius: 5px;
-    margin-left: 30px;
-    color: #fff;
-    font-size: 16px;
-    cursor: pointer
-}
-
-.success-msg .bottom-btn .close-btn {
-    background-color: #cbcbcb
-}
-
-.success-msg .bottom-btn .blue-btn {
-    background-color: #5cb85c
-}
-
-.tasklist {
-    padding: 15px
-}
-
-.tab-nav {
-    border-bottom: #cacad9 1px solid
-}
-
-.tab-nav span {
-    background-color: #ddd;
-    background: -moz-linear-gradient(top, #f6f6f6, #ddd);
-    background: -webkit-gradient(linear, 0% 0, 0% 100%, from(#f6f6f6), to(#ddd));
-    background: -ms-linear-gradient(top, #f6f6f6, #ddd);
-    height: 32px;
-    line-height: 32px;
-    padding: 0 12px;
-    border: #cacad9 1px solid;
-    color: #444;
-    display: inline-block;
-    margin: 0 -5px -1px 0;
-    cursor: pointer
-}
-
-.tab-nav .on {
-    background: #fff;
-    border-bottom: #fff 1px solid;
-    color: #444
-}
-
-.tab-con {
-    overflow: auto;
-    padding: 10px
-}
-
-.tab-con ul.cmdlist {
-    list-style-type: decimal
-}
-
-.tab-con ul.cmdlist li {
-    position: relative;
-    list-style-type: decimal;
-    list-style-position: inside;
-    line-height: 40px;
-    border-bottom: #dbdbea 1px solid;
-    margin-top: 6px
-}
-
-.tab-con ul.cmdlist li .com-progress,
-.tab-con ul.cmdlist li .state,
-.opencmd {
-    float: right;
-    margin-left: 20px;
-    color: #535362
-}
-
-.tab-con ul.cmdlist li .line-progress {
-    position: absolute;
-    bottom: -1px;
-    left: 0;
-    height: 1px;
-    background-color: #20a53a
-}
-
-.tab-con ul.cmdlist li .cmd {
-    border: 0 none;
-    border-radius: 0;
-    display: block;
-    width: 570px;
-    height: 200px;
-    line-height: 22px;
-    padding: 0 10px;
-    background-color: #333;
-    color: #eee;
-    overflow: auto
-}
-
-.yuandian {
-    width: 10px;
-    height: 10px;
-    border-radius: 5px;
-    background-color: #20a53a;
-    z-index: 999999
-}
-
-.DrawRecordL i,
-.DrawRecordR-T i {
-    background: url(/static/img/Detailsbg.png) no-repeat
-}
-
-.DrawRecordCon {
-    font-size: 14px;
-    height: 422px;
-    overflow: auto
-}
-
-.DrawRecord {
-    background: url(/static/img/DrawRecordord.png) repeat-y -204px center;
-    margin: 0 auto;
-    overflow: hidden;
-    line-height: 22px
-}
-
-.DrawRecordlist {
-    padding-top: 6px
-}
-
-.DrawRecord .DrawRecordL {
-    float: left;
-    color: #9a9a9a;
-    margin-top: 9px;
-    padding-right: 22px;
-    position: relative;
-    text-align: right;
-    width: 110px
-}
-
-.DrawRecord .DrawRecordL i {
-    background-position: 0 0;
-    display: inline-block;
-    height: 5px;
-    overflow: hidden;
-    position: absolute;
-    right: 0;
-    top: 9px;
-    width: 16px
-}
-
-.DrawRecord .DrawRecordR {
-    margin: 1px 1px 30px 112px;
-    color: #666;
-    padding-right: 5px
-}
-
-.DrawRecord .DrawRecordR h3 {
-    font-size: 14px;
-    font-weight: normal;
-    margin-bottom: 5px
-}
-
-.footer {
-    bottom: 0;
-    position: absolute;
-    text-align: center;
-    width: 100%;
-    line-height: 50px
-}
-
-.bingfa {
-    padding: 10px 0 60px 0
-}
-
-.bingfa p {
-    margin-bottom: 10px
-}
-
-.bingfa p .span_tit {
-    display: inline-block;
-    text-align: right;
-    width: 120px
-}
-
-.bingfa p input {
-    border: 1px solid #ccc;
-    height: 30px;
-    line-height: 30px;
-    padding-left: 5px;
-    border-radius: 3px;
-    -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-    -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s
-}
-
-.bingfa p input:focus,
-.bingfa p input:active {
-    border: #66afe9 1px solid;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6)
-}
-
-.bingfa .submit-btn {
-    background: #f6f8f8 none repeat scroll 0 0;
-    border-top: 1px solid #edf1f2;
-    bottom: 0;
-    left: 0;
-    padding: 8px 20px 10px;
-    position: absolute;
-    text-align: right;
-    width: 100%
-}
-
-.bingfa .submit-btn .btn-danger {
-    margin-right: 5px
-}
-
-.transfer .backupdata {
-    height: 150px
-}
-
-.selectdata .slabel {
-    font-weight: normal;
-    margin: 10px 41px 10px 0
-}
-
-.selectdata .slabel input {
-    margin-right: 5px;
-    margin-top: 0;
-    vertical-align: -2px
-}
-
-.backupbtn {
-    margin: 20px 0;
-    width: 100%
-}
-
-.neice_con {
-    padding: 7px 20px 20px
-}
-
-.neice_con .tit {
-    font-weight: bold;
-    line-height: 30px;
-    color: #777
-}
-
-.neice_con .nc_con {
-    background-color: #fdfdfd;
-    border: 1px solid #ddd;
-    line-height: 28px;
-    padding: 10px;
-    border-radius: 3px
-}
-
-.nc_opt {
-    padding-top: 6px;
-    text-align: right;
-    height: 24px
-}
-
-.neice_con .nc_opt input {
-    margin-right: 6px;
-    vertical-align: -2px
-}
-
-.neice_con .nc_opt label {
-    float: right;
-    width: 150px
-}
-
-.nc_con_user p {
-    margin: 15px 0
-}
-
-.nc_con p span {
-    width: 80px;
-    display: inline-block
-}
-
-.nc_con p input {
-    background-color: #fff;
-    border: #ccc 1px solid;
-    height: 30px;
-    line-height: 30px;
-    padding: 0 5px;
-    width: 280px
-}
-
-.nc_con p input.disabled {
-    background-color: #eee
-}
-
-.nc-tips {
-    padding: 20px
-}
-
-.nc-tips p {
-    line-height: 30px
-}
-
-.nc-tips p span {
-    font-size: 14px;
-    font-weight: bold
-}
-
-.nc-tips p a {
-    color: #20a53a
-}
-
-#BarTools .glyphicon {
-    color: #666
-}
-
-#BarTools .glyphicon:hover {
-    color: #fff
-}
-
-.list-list .ico {
-    background-position: center center;
-    background-repeat: no-repeat;
-    display: inline-block;
-    height: 30px;
-    margin-right: 10px;
-    width: 33px;
-    z-index: 1;
-    float: left
-}
-
-.fileList .ico {
-    background-position: center center;
-    background-repeat: no-repeat;
-    display: block;
-    height: 80px;
-    margin: 12px auto 4px;
-    width: 84px;
-    z-index: 1
-}
-
-.list-list .column-name .text {
-    color: #595c5f;
-    display: inline-block;
-    max-width: 85%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    line-height: 30px
-}
-
-.list-list .column-name .cursor {
-    display: inline-block;
-    cursor: pointer;
-    width: 200px\9
-}
-
-.table>tbody>tr>td {
-    vertical-align: middle;
-}
-
-.showpicdiv {
-    max-height: 400px;
-    overflow: hidden;
-    width: 400px;
-}
-
-#BarTools {
-    font-size: 16px;
-    float: left;
-    margin-right: 20px;
-}
-
-#BarTools>button {
-    top: 0;
-}
-
-.comlist {
-    float: left;
-    line-height: 28px;
-    margin-right: 10px
-}
-
-.comlist>span {
-    margin-right: 20px;
-    font-size: 14px;
-    float: left;
-    padding: 0 10px;
-    border: #fff 1px solid;
-    border-radius: 3px;
-    cursor: pointer
-}
-
-.comlist>span:hover {
-    border: #ccc 1px solid;
-    border-radius: 3px;
-    background-color: #f3f3f3
-}
-
-.PathPlaceText {
-    position: absolute;
-    right: 0;
-    top: 0;
-    background-color: #fff
-}
-
-.PathPlace {
-    color: #666;
-    float: left;
-    font-size: 16px;
-    line-height: 30px;
-    margin-right: 5px;
-    width: 170px\9;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap
-}
-
-.PathPlaceInfo {
-    font-size: 14px;
-    line-height: 30px;
-    float: left;
-    margin-right: 20px;
-    color: #999
-}
-
-.onPath {
-    float: left;
-    line-height: 30px;
-    font-size: 14px;
-    color: #666
-}
-
-.editmenu span {
-    display: none;
-    text-align: right;
-    width: 300px
-}
-
-.table tr.hover,
-.table tr.on,
-.ui-selecting,
-.ui-selected {
-    background-color: #f5f5f5
-}
-
-.table tr.on .editmenu span,
-.table tr.ui-selected .editmenu span,
-.table tr.ui-selecting .editmenu span,
-.table tr:hover .editmenu span {
-    display: inline
-}
-
-.ui-selectable-helper {
-    background: #6bb0c9;
-    border: 1px dotted #072246;
-    opacity: .25;
-    overflow: hidden;
-    position: absolute;
-    z-index: 99999
-}
-
-.list-list .ico-folder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAMpJREFUeNpi/P//P8NAAiaGAQYD7gAWdIFPpxIoMS8ZiOcQqfY5SD0LFT1jAsRTuaU0GZjZuAgq/vPto+S3V3fmUssBokC8llNEjp2ZFWjk/1+Eg56TE0RJsgCD3BPImAvikGs7IzMLAxuvKAMrNz9ZaWAul5iKJAsXPwUBAMzK//9AaDIcIAkODiKCbbQcGHXAqANGHTDqgFEHjDpg1AGjDqCVA57/+f6Z7hZD7XwBahOmfHv1ANQqlqCzG54CcRrjaOd0oB0AEGAAscwsxMSUtNsAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-folder-unempty {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAQRJREFUeNpi/P//P8NAAiaGAQYD7gAWcjR9OpWASyoZiOcQacxzkHoWKnrGBIincktpMjCzcRFU/OfbR8lvr+7MZSQnEbIzosbc65NxokDqDKeInBwrNz/xIfnwMgPjx5PxnkD2XCCWJNfrjMwsDGy8ogzs/CKkRSXQAaAomMslpiLJwsVPQegDQ/H/HwhNRiKUZOHkZPjx4xvD799/6ZLyWVmZGTjYWVBzAchybsUKujjg6/0OuAMGvBwAJcL/A14Q8SkYD4jlnx6chaaB/79GK6NRB4w6YNQBow4YdcDIdsDfP98/0d1iqJ1/QdVx47dXDxsGIDRADdBGxtHO6UA7ACDAAIASR69Q0kB9AAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-access,
-.list-list .ico-mdb,
-.list-list .ico-accdb,
-.list-list .ico-db,
-.list-list .ico-sql {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAwZJREFUeNrMV0trE1EU/jKJkzTTR4oJCX1lqq6q+GwriiLarS4VfCwqFEFxKShYUKE+Kv4GcVkquBE3glq0Vqt9iGg3qfZhSVttU0tNJk2aGc+9dGSSJmlaJqkfHG7OvZOc757v3HMnFk3TsJGwGZ2hoaEjNNwnazQxxh6yT8aJurq69AQIHT5CSUmJKZEDgQAbHpOdTCWhQ0jxfZIkQVVVU4zB7/c/XyaxOxcCpkMUxUtEojsTCaEQhUYkmmVZHkhHwpbPwKWlpXodMJxaHgfJLOsiEB4eRqi7B+HvI1CjUUQnp/i8o7ICgihC2rYVmw8fgrNW5vMejwderzddYa49A7NvujHzsgvlBw+gnIJYHXbYfT6+Fg0GocbiiAx/w/jDR/CdOA5XYz1f04sxpz6QDTMvXqHy7Gk4t9SuWHNUVPDRKft5NqafPvtHYE2NKBvUpSVYbDaEet5B2CRCS5BvoRoWBKjxGKx2OxKLi7C73dDo2XV1wmxQxsZRVFPNLRsSigJlYsJ8Aq76fZjvH4CtrIzLYBGSTzDbdYSKMzo1BVdDg/kEfvf1Q758EbFfM5j/2M/TzqRgEiSUCEnggJNOgaO6CsGOTvhbzptLgOnPdil63NwyShAOr8iOSRLsJQkGYS2WYKX7wkFHUKCjqOu+OP0TSwsLiM+G1iRBzlTn3n+Aa38DP2oMf6ihzHa95sa0Z5CoNtgzc7295mdAl4Dt3klWcAk8TUcRaLvLOyHLgoVaLxs16nTK+A/empXRMd4n3E3HzCdQde4MIiOjCL3twWQfOwVx7rPdFvlrIFAjYneAfKGF+6YT4K2WAugXjVkoyPvAf00gSYJQ602EChH1SWfmGrDa8vqShETKTZkx2s57t/H52vUkXwebN/pG6N/R143PGn8vp1Ogk0hHJlc/dS1vRcgCZdp1pmyZSoAFMu40VxJJEgjFxQlNUay72u+sSOFqNbDa7tln9keYxUi6Y4z/jvvaH7TGvny9pYbDeekPgiSp4o7tN+qvXmlLS2Aj8FeAAQC23WzgeNtzYAAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-c {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAmlJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwx4gIUp4F/wHIsfu9Tht//yCvQSHLA9fc/Ge58/IUidvHtDwZtIXYGViZGsBxIDdUd8Ovvf4bpV94xzLj6nkGQnRlFbuejLwyusjxgNkgOpAakFqSHKg648u4nQ9ah5wxiXCwME2wkGIQ5EA4ABfs1oLy+MAeYD5IDqQGpBekB6SWpLsAGqk+8ZJjhIMUgyYWp9NiL7wyWEpwMTIwIMRAzWImPwUqCiyHjwDOGjV5ylIWALA8rw9YHn7Emst2PvzC4yfFgiIPUgvSA9FIcBZNsJRl42ZjAQYqcwL78/sfw4tsfBmU+NoyEClIL0gPSS3EUgII3XIWfwRoYpN0X3jKkagky6ABT/YGnXxnspbgw0svsa+8ZGkxFGaS5WambDWWAwQlKYIq8EIP3PPkKT/0wAJIDqSHWcpJLQlAC42aFuBlkETqAydGsIKIFGHXAgDsAJRHGnP0LbL/eorml57Tw5AImFuKz0K4QDTjbbc0N4qrvP7+p0yABWY5sKTqf7mmAHMuHVy5ATg9k5wJ+VoZ/n/79Z2JkZCQqyElNhKCOMB8Lwz+cDjAVYGw69f5P3ac/xIWMy4rLJPkW6MG/QDuaUeqXge6eAwQYABvvATpIEEu4AAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-cpp {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAoBJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwx4gIUp4F/wHIsfu9Tht//yCvQSHLA9fc/Ge58/IUidvHtDwZtIXYGViZGsBxIDdUd8Ovvf4bpV94xzLj6nkGQnRlFbuejLwyusjxgNkgOpAakFqSHKg648u4nQ9ah5wxiXCwME2wkGIQ5EA4ABfs1oLy+MAeYD5IDqQGpBekB6SWpLsAGqk+8ZJjhIMUgyYWp9NiL7wyWEpwMTIwIMRAzWImPwUqCiyHjwDOGjV5ylIWALA8rw9YHn7Emst2PvzC4yfFgiIPUgvSA9FIcBZNsJRl42ZjAQYqcwL78/sfw4tsfBmU+NoyEClIL0gPSS3EUgII3XIWfwRoYpN0X3jKkagky6ABT/YGnXxnspbgw0svsa+8ZGkxFGaS5WambDWWAwQlKYIq8EIP3PPkKT/0wAJIDqSHWcpJLQlAC42aFuBlkETqAydGsIKIFGHXAgDsAJRHGnP0LbL/eorml57Tw5AImFuxZaFeIBpzttuYGSWIo1fef36RnQ5ChyIYh85EtxidG1TRAyFCy0wA5ABbk6CFErENZyLUUPbjJDSEUB/CzMvz79O8/EyMjI4aBhBIXMQDUEeZjYUBppTIi947LdlypP/X+f92nP7QpH4Ae/GsqwNjc5aHTiNUBAwEAAgwALWAgpic4qfUAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-cs {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAoFJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwx4gIUp4F/wHIsfu9Tht//yCvQSHLA9fc/Ge58/IUidvHtDwZtIXYGViZGsBxIDdUd8Ovvf4bpV94xzLj6nkGQnRlFbuejLwyusjxgNkgOpAakFqSHKg648u4nQ9ah5wxiXCwME2wkGIQ5EA4ABfs1oLy+MAeYD5IDqQGpBekB6SWpLsAGqk+8ZJjhIMUgyYWp9NiL7wyWEpwMTIwIMRAzWImPwUqCiyHjwDOGjV5ylIWALA8rw9YHn7Emst2PvzC4yfFgiIPUgvSA9FIcBZNsJRl42ZjAQYqcwL78/sfw4tsfBmU+NoyEClIL0gPSS3EUgII3XIWfwRoYpN0X3jKkagky6ABT/YGnXxnspbgw0svsa+8ZGkxFGaS5WambDWWAwQlKYIq8EIP3PPkKT/0wAJIDqSHWcpJLQlAC42aFuBlkETqAydGsIKIFGHXAgDsAJRHGnP0LbL/eorml57Tw5AImFvxZaFeIBpzttuYGhjiyGNbq+89v8rMhyBJ0S0F8ZHF0NTRNAzCLYI4gJgRolgiRHUE3B8AsRPY9qY5gRO6cOq64/PfTPxYmRkZGmiRCkF28jH/+HYjUZcaaCE0FGJtOvf9T9+kP7pBxWXGZJHFkwM/K8BdoRzPOEBgIABBgAMrJHxYdaBS2AAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-fla,
-.list-list .ico-flv {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAYFJREFUeNpi/P//P8NAAhZkzrVr1+yBVBcQm1HRDkMgvoAsoKWlhd0BQLBCAgh4eXmpYvPt27dB1GogDkV3BAwwofEluLm5Gf79+0cVDALy8vK7oI4wIMYBVAdsbGxZQEccweUIJnokNKAjEhQUFM5hcwQLLS3m4+ODpQMQCIPS54GYkS4OEBUVZRAXF8eWMMkLgZf1fQx/37yD85lFhBjEG4sYPizfCOYLRPpj6IElRqLKAWIAyBIuG1OqhRITwwCDAXcAyVEAim9YnLNrKDMI5ybS1wGjaWDA0wAu8O3IaTCGAVDaAKURQoARuUECbA/8V1ZWpqmP7969C2oPMI6mgVEHDM5syNI+k+EhkXn0DyUWLp6I2w5cliq1laDw71X1gMVANDa12MSxOZykggiXoXRLAyCfoYcELt8TUkfTECDWcqo3StHjHl9awB4F3Fx//5NhKbE+/g+1A2dldGPCrBqm6/caGb59Z6JJNuTi/PdPU6leoyCtBasDBgIABBgAWP2ttPWI30cAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-css {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAALdSURBVFiF7ZfLTxNRFMZ/M/RBnwik0FYpoJIYhJioLFSIupCoWzVqotGNCeEPcGPiI+50Q9xAYli5MaEbFyTiI0EWhhghGkohlgVREVzQhpfals64qB067ZRpoaALv6Rp73dPzvnuud/cOxVkWeZvwpA+CAaDZ4BewFPEGoeBkXSisbFRWwDQ6/V6PTabrSiVQ6EQQB9woaGhYUQrRswYeywWC5IkFeUD4PP5BoC+UCh0KB8BRYfZbO6ora19A/i1RGy5AACTyXS9rq5uWEtEpgeKCqfTmfIBwKU/3+8BYVsEuFwuqqurVVyaoK0XAChmzIVNe0CS4drrGeLSxg60ggRMRKJMLcRU3Mf5X+yvMGMUBaYWYkxEosUXEEvIdAfC9IxHKDeXqOYGPi9zqsYOQLm5hJ7xCN2BMLFEfh3RFRAIR+kcmqXKaqCr1U1l6ZqAuCQTDEc5UFkKQGVpCV2tbqqsBjqHZgmE9buha8Jbw9/pOeHFY80OfTv3kyNuC6KwxgnAud1OjrqtdAx+49lZ37r5dTtQYzfSP72kabKXX5Zp99mz+Lgk0z+9RI3dqJdeX8CjNg8Ok0jn0KzKYMtxibkfq+xxmlTxE5HkljlMIo/a9C9V3S0QBbi4t4xjbisPP8xzo7GcpgozgzMrHPdaVbGBcJTHwQh3W1zstOmvHgp4DHfZjXS1uql3JBO/+rqiuD+FekcyJt/iUOBJKAA2Y1JzV6s7az41Vwi25Tb8L+CfFqAy4ZWRBIx8UsaiIX835wNpNQ7A6NpLcfZToFX0xfl9yu92/+SGedFgVETkFKBVPDN5u3+yYD4XhPR/RgefjMmZHVgvQWqlmfO5eEhuw+jVZuX62pQJ2/2Tyqrz4bVQsIBU0sx91uNzQbUFJ5+OJRYlgygIgiqoWCaUZRmHsCoNXm5W3mpUAm4+D9x5F5FvL65uzflQZiTRskO4/+B00z1NAQqZ0YFiI73mb2NmSwowsJSgAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-js {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAALFSURBVFiF7ZfLTxNRFIe/GTotffJKoa1SQCUx1cSFslBLdKFNdKtGFya6MSH8CybG6NJNwwYS496EblywwEeCLAwx1mgshVgWREVwQRteamk746K2dNopM5WCLvwlTXvPPTn3u+f+5lFBURT+pkylg3g8fgF4BHjruMYJIFoaCAQC2gDAI5/P57Xb7XVZOZFIAIwCV3p7e6NaOWLZ2Gu1WpFluS4fAL/fPw6MJhKJ40YA6i6LxTLQ1dX1EohoQew6AIDZbL7Z3d09pQVR7oG6yuVyFXwAcO339xtA2BMAt9tNR0eHKlYCtPsAQNGM1bRjD8gK3HixQEb+sxtaTQAzqTRzK5uq2PvlnxxptSCJAnMrm8yk0vUH2MwpDMeSjEynaLE0qObGP61zvtMBQIulgZHpFMOxJJs5Yx3RBYgl0wxOLtJuMxEOemhr3ALIyArxZJpjbY0AtDU2EA56aLeZGJxcJJbU74auCW9PfWPkrA+vrTL11dIPTnqsiMJWTAAuHXBxymNjYOIrTy76t62v24FOh8TY/JqmyZ59Xifkd1TEM7LC2PwanQ5Jr7w+wFC/F6dZZHByUWWw9YzM0vcsB11mVf5MKn9kTrPIUL/+Q1X3CEQBrh5q4rTHxoN3y9wKtHC01cLEwgZnfDZVbiyZ5mE8xd0+N/vs+ruHGi7D/Q6JcNBDjzNf+PmXjaL7C+px5nOMLg413gkFwC7lmcNBT8V8Ya4W7cnT8D/APw2gMuH1aA6iH4tj0WTczUYkZzMAvN16Ka68Cowu+vTyYUKR2eLvggoxLYkmqQhRFaBWlYJojfVUFw8Y7YCWdtyBWo+hXDV1oHSR8lgoMlvz7qGsA00S8qqsiIIgVMuvgAhFZg3vXlEUXCZUb6kqgL5m4d7rVPbOala7M+cef9AsXC1eriaJXF+zcL80Jhj5e75dR7aTkdq/AFCYGAYKWHWoAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-htm {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAnhJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwx4gIUp4F/wHIsfu9Tht//yCvQSHLA9fc/Ge58/IUidvHtDwZtIXYGViZGsBxIDdUd8Ovvf4bpV94xzLj6nkGQnRlFbuejLwyusjxgNkgOpAakFqSHKg648u4nQ9ah5wxiXCwME2wkGIQ5EA4ABfs1oLy+MAeYD5IDqQGpBekB6SWpLsAGqk+8ZJjhIMUgyYWp9NiL7wyWEpwMTIwIMRAzWImPwUqCiyHjwDOGjV5ylIWALA8rw9YHn7Emst2PvzC4yfFgiIPUgvSA9FIcBZNsJRl42ZjAQYqcwL78/sfw4tsfBmU+NoyEClIL0gPSS3EUgII3XIWfwRoYpN0X3jKkagky6ABT/YGnXxnspbgw0svsa+8ZGkxFGaS5WambDWWAwQlKYIq8EIP3PPkKT/0wAJIDqSHWcpJLQlAC42aFuBlkETqAydGsIKIFGHXAgDsAJRHGnP0LbL/eorml57Tw5AImFtQstCtEg8FtzQ04GxsAycPkYGqR1SOL/fvzm7IGCbJjkA2maRoAWYbL97hCglgHMhHra2r4li65ABYKxDoYxQH8rMAmHg07qyCz+VgYUFqpjMgWlu24Un/q/f+6T39oUz4APfjXVICxuctDpxGrAwYCAAQYAPufFoHFXwuVAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-html {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAnpJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwx4gIUp4F/wHIsfu9Tht//yCvQSHLA9fc/Ge58/IUidvHtDwZtIXYGViZGsBxIDdUd8Ovvf4bpV94xzLj6nkGQnRlFbuejLwyusjxgNkgOpAakFqSHKg648u4nQ9ah5wxiXCwME2wkGIQ5EA4ABfs1oLy+MAeYD5IDqQGpBekB6SWpLsAGqk+8ZJjhIMUgyYWp9NiL7wyWEpwMTIwIMRAzWImPwUqCiyHjwDOGjV5ylIWALA8rw9YHn7Emst2PvzC4yfFgiIPUgvSA9FIcBZNsJRl42ZjAQYqcwL78/sfw4tsfBmU+NoyEClIL0gPSS3EUgII3XIWfwRoYpN0X3jKkagky6ABT/YGnXxnspbgw0svsa+8ZGkxFGaS5WambDWWAwQlKYIq8EIP3PPkKT/0wAJIDqSHWcpJLQlAC42aFuBlkETqAydGsIKIFGHXAgDsAJRHGnP0LbL/eorml57Tw5AImFkgW2hWiweC25gacjQ2A5GFyMLXI6mHyyHL//vwmLxsiOwbZQJqmAZBluHyPKyRIdSATIYOp6Vua5gJs8U2yA/hZgU08GnRWYVEJMpuPhQGllcqIbGHZjiv1p97/r/v0hzblA9CDf00FGJu7PHQasTpgIABAgAEAooAb7fMLYAoAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-java {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAvRJREFUeNrUV0toE1EUPfPJTJNp82lNY1PaBGwtpn6q9bNQQRFFpSAKgrgQu3PpXlBEBMGNWwU3LtwoxYULhSoKgkJbawVDta3WT5XWEPpL2iSTifeNjqY6TeNkavDA5c375N1z7z3v8cLlcjmUE2J+JxqNHqDmOlmdjT42k/XlD0QiEXMCzHkwGKxTFMUWz0NDQ6y5RXa0ubm5z2wN/1u/zul0QtM0W4yhsbHxPiNBZNqLIWAZI+PzpuOyLJ8KhUKP6fO2GQlbCLyPpfAhll50XpKkk+Fw+JkZCbFU56qWw72BKRxq9/0x53a7DR0wHPvR9pJxthCYSmbR1RPHnlY32GEei6cRrJZ+7u73+xEIBMyEWXoJBt4ncfXBOLavrkLv2wSVIIX6POcGzIRZMoGZ+Szu9MbRuasW/aMJ+BQB25oqLQViiYDIcwj7ZfirRF0D6az129QSAafEY+uqSnyZzKBjow89IwlEx+b+HQGGNfVOVDg4uJ0C2kIuVMr88hNgwnv+LoHYjKr3fYoIjlS3b71Hzwq7jNJqDk9ez+Bu/yS0IipT9DFkG8dnVYxPZ/DyYxJM0FnyUOHg4RA5NNRIlAkFEn3vaKnCtYcTiH5KYm2Dyx4CbOPddN5Hv6b0aAMex4J5Rkbgvx9ClURpCNW2DBiYoAw8fTMLmerPiLhkQXfICO7f4NXHWIlO7FwBUeDsIZBMaxj8PId6n6Srn1kheFyCnhHbCDyKTuMFXThNKyvgdYkUNdWdNmcOHMKvtCdSml4iNn94S/Xfv4gWw8E2L/au8+jpj02rmJrLIp5QkSFhZsixTOmXSYw1dDF1bPLqp8PSk6wQWKSsBMzsBI8yo+wEFpTgUjddXd3Dy+70RqRABiRZXmCXO1tt7f/fGrh4vAlnbg7rrYH8vjFfaH3JGSi0mZX14lLRFtM3oix2/aIZUCT2btSW/JFVsL1d5CN/jMv/d3yl69W5wQmcTaaXR5wUYLalFhdOH2k9b0qgHPgmwABqjFw0GGyiFAAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-log {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAVBJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkLQSevnqLU05aTBivXlhiJKocINcSSgATwwADiqOA0pAbjYLRKBiNgtEoGHXA4MoFE+fsooulM/twt4pBzScMDY3VmQz1rdMxxGAAWQ6XOAz8+vWL9GxIyEEwPi7xAUsDhCynqQNAvkeODro7gBjfY6QBLk62f79+/2MCAqw+ghkMi290y9DFsTVQQXYgizEi946nzllbf+f+y7pv33/RJGS4ONn/qiiKNWenBDdidcBAAIAAAwBHPa+btF94QQAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-mht {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAnVJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwx4gIUp4F/wHIsfu9Tht//yCvQSHLA9fc/Ge58/IUidvHtDwZtIXYGViZGsBxIDdUd8Ovvf4bpV94xzLj6nkGQnRlFbuejLwyusjxgNkgOpAakFqSHKg648u4nQ9ah5wxiXCwME2wkGIQ5EA4ABfs1oLy+MAeYD5IDqQGpBekB6SWpLsAGqk+8ZJjhIMUgyYWp9NiL7wyWEpwMTIwIMRAzWImPwUqCiyHjwDOGjV5ylIWALA8rw9YHn7Emst2PvzC4yfFgiIPUgvSA9FIcBZNsJRl42ZjAQYqcwL78/sfw4tsfBmU+NoyEClIL0gPSS3EUgII3XIWfwRoYpN0X3jKkagky6ABT/YGnXxnspbgw0svsa+8ZGkxFGaS5WambDWWAwQlKYIq8EIP3PPkKT/0wAJIDqSHWcpJLQlAC42aFuBlkETqAydGsIKIFGHXAgDsAJRHGnP0LbL/eorml57Tw5AImFtQstCtEA0y7rbmBVQzEhsnBxNEBst5/f37TtkGC7BhkiylKAzCf4jIYJIbL93RJhCAHEeNbihyAHt80yYb8rMAmHg07qyCz+VgYUFqpjMgWlu24Un/q/f+6T39oUz4APfjXVICxuctDpxGrAwYCAAQYAIH+FoEeflonAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-php {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA1ZJREFUeNrsVktPU0EUPn3dPq73QmmbFlRaAw1Q5KUiYCIkmmjUGEMUdGWMSze6cmViTFwYVv4Aw8KNRhe6kA0SAonRGGNBHpWkBAXFIFAeLS307ZyB1ku90EJvdeOXTO7c6XS+b8755tyRxeNx+JdQCl9cLlcLeXSQdlRCjjrSBoUDDodDXADBUwsBx3GSMLvdbnw8J63NbrcPis2Rp7xbWJaFWCwmSUNYrdZuFEHE1GYiQHIwDHODiHizlQj53zAaEXHNZrM5xUQoc0nM83zCB4j2jecAabJdCVgLx8D5xQ9j06swOR+CGDnCkWgcWLUCrCY1VO3XQlWxDhTy9fVNJhOYzWYxY+48Akj8eniZkOjgdE0+mHgVMMp1In8wBnPeMJ3TM+KFC0f0YLdo6G8JM2ZUB7ZCn8tLCW6esYBG9ds27pk1sns5FOkZYEkEbKShmGfvPOBbjcKhA2zatdOacGI2SMIdhLZGwyZyBI5j+IVAQVebjfB+fIWK3lElFEM/2f3Zunzax0WnF0IgI5E/V6eHmaUwdA8tQa2N1A5S0Ycm/RAhET9RycOp6jzo/+yDSw0F2UVgZjkM5jwV7X+dC0JLBQ+lZg18J0ICJNwXGwzwaTJAhVXs1dL8D5H3YqMapkiEsk6B8GPl8UVAv0cJPxZDNNScVgFoeJVCRsONXvjmCdHxTJFWgJFTUUKaL0L08sMC5OmUEIrEwWpkqOlYzfoyvaNeGJ4KQH0JS71TSARl7YGTB3l45VyC9sYCKCvS0BQkaoKJV9LdN9k56B1ZhvOH9clj2eVchCvHDNlHoITku5Sc6SdvPVBWqE2O44nAhkUH09G8IQzT9Kh3Fo6XczQlWUcAga42kNx39s3SAlNtZYHTyJMEaEDfWhS6Bvy0QrbW66G8SLvzC8l2qLHqwLFPS3P8cWIF5slOkRhNiLnGyohV8nKTIVmKJRWAwHxjdcukwkl2CnKN/wI2eeBBD6l6PeM5J33s2MaEjFr9xx86rpcm+7c7x5NjqX2xeakIBYO7SwEumEqSzTxJ7oSZkkgiIEEmDK0wBdvNk0RApgtmOk/UAywD0XSXyGyAayOHcEwmvHA8fDF6Z+wn3AuEclMfdAzEys1w91Zr5X1RAf8CvwQYAB0rcvQMbg3OAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-url {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAr5JREFUeNpi/P//P8NAAhZkzrVr1+yBVBcQm1HRDkMgvoAsoKWlhd0BQLBCAgh4eXmpYvPt27dB1GogDlVVVb2ATQ0TGl+Cm5ub4d+/f1TBICAvL78L5AigYwyIcQDVARsbWxbQEUdwOYKJHgkN6IgEBQWFc9gcwUJLi/n4+GDpAATCoPR5IGakmgP+/P/LsP/FJYZzb+8wMDEyMchyizD4yVgwcLGwM4iKijKIi4tjS5jkh8DLHx8Ytj45xXDj4xOG59/fMfCwcDBYi2kxBMpZMajxSYPVgMRBDgABWGIkqhwgBO5+fs7QcWUVw4+/vxn42bgZtATkGAwElRjWPDzCsPf5RYZcTT8GIyFlBklOIfIKInwAZOnE6xsZ/gB9FKfszOAqaYgoWIAOmXlrG8P0m1sYuoyTGQTZeIh2ANG54Oirqwzvf31hiFC0R7EcnNe5xRhKtUMY/gGL9d3PzpNfFOMN/i8vGJR5JYHBfZhhyb19eNQ9J8kBRIeAOIcAgzA7Lzgq8IGfBOTJDgE9QUVwYmszTABnNWoBokPg+OvrYHrD42NY5S+9v88Qe6SH4dy7u7RxAMgCHQF5hlNvboFzw+sfH8Hiv/79AWbBC2AxDX5ZcDakSRR8+v2dockglmHu7Z0Mx4ChcebtbXBh8+3PT7A8yHHZGr6UNUjwATEOfgYWRmaGTHVvBlMRNYbTwJB4+u0tg7iAANByBQZHCT3KW0T4QISCHcPBl5eBiVGBwUBIicFEWJX6TTJ8ABS/IExtQJf2wKB2AEoUTHixg4HhBe0tnYXUKiYqBNqdMrDyQTQyxqWeau0BbKBy3wwUi5H5Qy8NkAOQg5tU3w+KKEBxADcT+9+v/34yY7OEVJ/C1KOrBdmBzGdE7h1PPbGm5vaPF43f/v2iSdrgYmL7p8ohUZ9tEdKC1QEDAQACDADzFSd59WqSKgAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-xml {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAnhJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwx4gIUp4F/wHIsfu9Tht//yCvQSHLA9fc/Ge58/IUidvHtDwZtIXYGViZGsBxIDdUd8Ovvf4bpV94xzLj6nkGQnRlFbuejLwyusjxgNkgOpAakFqSHKg648u4nQ9ah5wxiXCwME2wkGIQ5EA4ABfs1oLy+MAeYD5IDqQGpBekB6SWpLsAGqk+8ZJjhIMUgyYWp9NiL7wyWEpwMTIwIMRAzWImPwUqCiyHjwDOGjV5ylIWALA8rw9YHn7Emst2PvzC4yfFgiIPUgvSA9FIcBZNsJRl42ZjAQYqcwL78/sfw4tsfBmU+NoyEClIL0gPSS3EUgII3XIWfwRoYpN0X3jKkagky6ABT/YGnXxnspbgw0svsa+8ZGkxFGaS5WambDWWAwQlKYIq8EIP3PPkKT/0wAJIDqSHWcpJLQlAC42aFuBlkETqAydGsIKIFGHXAgDsAJRHGnP0LbL/eorml57TwhAATCysK3hOhi5UPorHJIcujmwXCJEeB25obDLtCNMBsEA3i0z0NwByBbjk1HDc0cgHMdzDfEhM6ZDmAnxXYxEPrrCIbjssR+ByOrB5kNh8LA0orlRHZwrIdV+pPvf9f9+kPbaIG6MG/pgKMzV0eOo1YHTAQACDAAOGRHaFJlGXVAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-ai {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAg9JREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByK7ggYYELjS3JycjL8+/ePKhgE5OTkdkIdYUyMA6gO2NnZM+Tl5Q8CmWuwOYKJHgmNjY0tQUFB4QQ2R7DQ0mI+Pj5YOgCBCCh9BogZ6eIAAQEBsCMYGRnh+OHDh7SLgvdXNjK82N8K57OysjIwMzMTXw4QC96dX87w7elRBin3HgYmVg64uKCOP5D0R7WAhYXh79+/OM0iOQT+/f4BtpyJjZfh65MzROkBhQITExM4Cih2AMhSNkFVBl5Vb4bvz1DLljen5oCjARuApQGKHQCylFPKmIFTQofh1/vbDL8/vSBaL8UOAFkGspRbxoSBhVOAgUPMgOHbi8sUJVySHACyDGQpLOGxi2owfH2wj3q1IcH4B1r279dnhidbclCj5cU1YJRo0dYBIEtAAD3rgbLk9+cXyXYA0VEAsoRDVA/FchDglNQHZ0tQ9iQHMCK3iIANkv/Kyso0rZju3r0LapAw0rU2pFouGHUAzVvFLEfSGR4eoYOFWodxhwA7C3FYLWweXj4uPDzSgHzQPIaH65LA9IAlQmpYTlaTDOZ7XHzKQoCV798/GvZVwWaz8v7DWRfc2Fxbz/TmbB3D78+0SZxsfH//CRs1a/g2N2J1wEAAgAADAIk82p3e8s5qAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-bmp {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAmtJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgTqTi1guPH+MVkO0BCUZWgySyC+HMAGQJavcq8lywFhO5tJK4gIgfNv7jDMuLIZzM7Q8WUwFFGhOJpIygUgywv1Q8AY5hC6OgAGGIFpmFo1CElRkKHty9B3cQ0DE9AFmUA23R1gKKrCMMuhEKvc+59fGA49u8Tw5MtrBjZmFgZNQXnqOwAXAFm88f5xBjdZYwYXIP725wfDqZc3qeeAv///MRx5foXh3OvbDF9+f2eQ4BJicJDWZ1Dll2a48OYuw9EXVxlaLRIZOJjZEKEFzCF7n5yjjgOaTi9m4GblYHCVMWYQYOdhePb1DcP86zuAYpwMr769Z2ixSEKxnOppQFVAmiFGzQXOV+STYLCQ0GK49OYegxS3MAMv0CE0S4SsTCwMm4DxC8KkAnUBWcodsNS1kqZVNV3aA4PaAShRMOHFDgaGF7S3dBaeVjEDFzM7anvAKhs1Sx6biiIO46OLIetDVvPt708yygE0S5D5xOjDp4eoNAAyAIaRDUL2KSkOo1sIYIsmqldGsFDAZgkxDkVxABcT2z9gxcPEzMiEMyGSE8zIlRrIDpTGDXLveOqJNfW3f7yo+/bvF03KB24m9r8qHOLN2RYhjVgdMBAAIMAA9C4L2PHEWagAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-cdr {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAmRJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgTqTi1guPH+MVkO0BCUZWgySyC+HMAGQJavcq8lywFhO5tJK4gIgfNv7jDMuLIZzM7Q8WUwFFGhOJpIygUgywv1Q8AY5hC6OgAGGIFpmFo1CElRkKHty9B3cQ0DE9AFmUA23R1gKKrCMMuhEKvc+59fGA49u8Tw5MtrBjZmFgZNQXnqOwAXAFm88f5xBjdZYwYXIP725wfDqZc3qeeAv///MRx5foXh3OvbDF9+f2eQ4BJicJDWZ1Dll2a48OYuw9EXVxlaLRIZOJjZEKEFzCF7n5yjjgOaTi9m4GblYHCVMWYQYOdhePb1DcP86zuAYpwMr769Z2ixSEKxnOppQFVAmiFGzQXOV+STYLCQ0GK49OYegxS3MAMv0CE0S4SsTCwMm4DxC8KkAnUBWcodsNS1kqZVNV3aA4PaAShRMOHFDgaGF7S3dBaeVjEDFzM7Cr/WPhHObj44H0OMGHFk8O3vT+ITIchAZEOQ+aSKUyUNEDKM5pURMQBblFEtBNDjGFcowTAx6lFCgIuJ7R+w4mFiZmSCG4bLR6T6FFapgexAadwg946nnlhTf/vHi7pv/37RpHzgZmL/q8Ih3pxtEdKI1QEDAQACDAD7sQauaYXLQgAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-gif {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAmBJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgTqTi1guPH+MVkO0BCUZWgySyC+HMAGQJavcq8lywFhO5tJK4gIgfNv7jDMuLIZzM7Q8WUwFFGhOJpIygUgywv1Q8AY5hC6OgAGGIFpmFo1CElRkKHty9B3cQ0DE9AFmUA23R1gKKrCMMuhEKvc+59fGA49u8Tw5MtrBjZmFgZNQXnqOwAXAFm88f5xBjdZYwYXIP725wfDqZc3qeeAv///MRx5foXh3OvbDF9+f2eQ4BJicJDWZ1Dll2a48OYuw9EXVxlaLRIZOJjZEKEFzCF7n5yjjgOaTi9m4GblYHCVMWYQYOdhePb1DcP86zuAYpwMr769Z2ixSEKxnOppQFVAmiFGzQXOV+STYLCQ0GK49OYegxS3MAMv0CE0S4SsTCwMm4DxC8KkAnUBWcodsNS1kqZVNV3aA4PaAShRMOHFDgaGF7S3dBaeVjEDFzM77raBVTYiax6bChcDsZHlkOXRwbe/P8krCWEW4eLjs5QmaQCbZSBHoYcETeoCmCUDFgLkWERUCHAxsf0DVjxMzIxMWC0lNXixVWogO1AaN8i946kn1tTf/vGi7tu/XzQpH7iZ2P+qcIg3Z1uENGJ1wEAAgAADACWJ9+r79LDyAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-ico {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAaVJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLBSZ/Pc3w+/HVxhYZHUYGJlZMaT5+Phg6QAEIqD0GSBmpIoDfl7Zx/Dt4EIGLvt4BnZ9dwx5UVFRBnFxcWwJkzohwKpoxMD+9gmYxgVgiZGocoBUwMQnysDllEy9gogU8H5SFJzN5ZjEwK7rQp4nyHUAl1MKGFMKyHYAu44TGA+YA6gFRh0w4A5goTQLgsC3/fPAGAQE85bR3gGc1pEDGwIcxr6jiXD4OIARuVn+sECTLm10+QnX8TRIWNixa6rewvCw1QfOhjsaKoZPHAX8+UlZLkB2CDIflzjN0wAxlgzvXIAc7xSXhP85Bf4x/vrKxMDIhDfIsSU2XOIo4P8/oB38/3BmwzuzCutZ7h+vY/z+kSZR859L4O8fBYtmlbT+RqwOGAgAEGAAjiC9hXL1ZWMAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-jpeg {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAnpJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgTqTi1guPH+MVkO0BCUZWgySyC+HMAGQJavcq8lywFhO5tJK4gIgfNv7jDMuLIZzM7Q8WUwFFGhOJpIygUgywv1Q8AY5hC6OgAGGIFpmFo1CElRkKHty9B3cQ0DE9AFmUA23R1gKKrCMMuhEKvc+59fGA49u8Tw5MtrBjZmFgZNQXnqOwAXAFm88f5xBjdZYwYXIP725wfDqZc3qeeAv///MRx5foXh3OvbDF9+f2eQ4BJicJDWZ1Dll2a48OYuw9EXVxlaLRIZOJjZEKEFzCF7n5yjjgOaTi9m4GblYHCVMWYQYOdhePb1DcP86zuAYpwMr769Z2ixSEKxnOppQFVAmiFGzQXOV+STYLCQ0GK49OYegxS3MAMv0CE0S4SsTCwMm4DxC8KkAnUBWcodsNS1kqZVNV3aA4PaAShRMOHFDgaGF7S3dBaeVjEDFzM7hoZa+0SG5oPzwTQMgPgwOWSATRwmBgLf/v6krCREtgDGRrYAXQ4bn+ppAGQBekhgczRV6gKYRciG4rMAm3qiQwCbr0AG4bOQFN9jhAAXE9s/YMXDxMzIRFT8YXMozIHYHA+q1EB2oDRukHvHU0+sqb/940Xdt3+/aFI+cDOx/1XhEG/OtghpxOqAgQAAAQYA3ogNywRusk8AAAAASUVORK5CYII=")
-}
-
-.list-list .ico-jpg,
-.list-list .ico-JPG {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAm1JREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgTqTi1guPH+MVkO0BCUZWgySyC+HMAGQJavcq8lywFhO5tJK4gIgfNv7jDMuLIZzM7Q8WUwFFGhOJpIygUgywv1Q8AY5hC6OgAGGIFpmFo1CElRkKHty9B3cQ0DE9AFmUA23R1gKKrCMMuhEKvc+59fGA49u8Tw5MtrBjZmFgZNQXnqOwAXAFm88f5xBjdZYwYXIP725wfDqZc3qeeAv///MRx5foXh3OvbDF9+f2eQ4BJicJDWZ1Dll2a48OYuw9EXVxlaLRIZOJjZEKEFzCF7n5yjjgOaTi9m4GblYHCVMWYQYOdhePb1DcP86zuAYpwMr769Z2ixSEKxnOppQFVAmiFGzQXOV+STYLCQ0GK49OYegxS3MAMv0CE0S4SsTCwMm4DxC8KkAnUBWcodsNS1kqZVNV3aA4PaAShRMOHFDgaGF7S3dBaeVjEDFzM7/vaBVTZD07GpYBqeTYF8ZHls4jDw7e9P6pWEMAuQHYXuGGyOoFsaIGQ5xSEAC25sFuGTIysEkOMW2Ye4LCDG9xghwMXE9g9Y8TAxMzLhTYD4ghybQ5ErNZAdKI0b5N7x1BNr6m//eFH37d8vmqQNbib2vyoc4s3ZFiGNWB0wEAAgwADnlgGzkKaAXwAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-png {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAmhJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgTqTi1guPH+MVkO0BCUZWgySyC+HMAGQJavcq8lywFhO5tJK4gIgfNv7jDMuLIZzM7Q8WUwFFGhOJpIygUgywv1Q8AY5hC6OgAGGIFpmFo1CElRkKHty9B3cQ0DE9AFmUA23R1gKKrCMMuhEKvc+59fGA49u8Tw5MtrBjZmFgZNQXnqOwAXAFm88f5xBjdZYwYXIP725wfDqZc3qeeAv///MRx5foXh3OvbDF9+f2eQ4BJicJDWZ1Dll2a48OYuw9EXVxlaLRIZOJjZEKEFzCF7n5yjjgOaTi9m4GblYHCVMWYQYOdhePb1DcP86zuAYpwMr769Z2ixSEKxnOppQFVAmiFGzQXOV+STYLCQ0GK49OYegxS3MAMv0CE0S4SsTCwMm4DxC8KkAnUBWcodsNS1kqZVNV3aA4PaAShRMOHFDgaGF7S3dBaeVjEDFzM7anvAKhuRHY9NRRFD5qPLIcsjg29/f5JRDmCxCGvjBU2ekHqK0gDIYGTf4nM4xQURepBTUw8Tsb7FZhC+UCDWsSghwMXE9g9Y8TAxMzLRJFpAlRrIDpTGDXLveOqJNfW3f7yo+/bvF03KB24m9r8qHOLN2RYhjVgdMBAAIMAADIwGkBp21VIAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-psd {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAkRJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByK7ggYYELjS3JycjL8+/ePKhgE5OTkdkIdYUyMA6gO2NnZM+Tl5Q8CmWuwOYKJHgmNjY0tQUFB4QQ2R7DQ0mI+Pj5YOgCBCCh9BogZ6eIAAQEBsCMYGRnh+OHDh/SLAlZWVgZmZmbiywFCYMKxewyvvv1CZHAJPoYgHSn8FrCwMPz9+5c6DgCBcC1JBn0pfoaXn38wLL/8jOHA3dcMDsqiePWAQgFU4mIrdclOA+K8HAyWMgIMl15+Ajvg5KN3DBtvvYLLt7looKgHxT9VQgAbAIUGyPIMYzkGOUEunOqwOYLsRPjo/TeGPfffMuiJ8zEIcLKCxd5//01ZZUQMWHntORiDgL+aGIO5nBA8bex/8JZhy+1XDC6KwnBxqjsAlgjRAUgMhC8++wh2oCQwjeCLDpqVAwpCXAzcrMwM3//8pU0I4EoPM84+gvPdgFGgLspLlF5G5LwJbJD8V1ZWpmnFdPfuXVCDhJGutSFd08CoAygqiGLOArPO2Vs0t/ScFp5syMTCiqFhmZ8anB216RaGOEwMWR26Whj49+c3eeUAsiUgNoxGFsPmQGyOoEoagDkCl0+pnghBlqH7CNkRNHcAyDJc8U+JI1DSAD8rw79P//4z4Wq9EBMFuBIsCICKfT4Whn8464KyHVfqT73/X/fpD23KB6AH/5oKMDZ3eeg0YnXAQACAAAMAI0n+E64by+4AAAAASUVORK5CYII=")
-}
-
-.list-list .ico-webp {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAo1JREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgTqTi1guPH+MVkO0BCUZWgySyC+HMAGQJavcq8lywFhO5tJK4gIgfNv7jDMuLIZzM7Q8WUwFFGhOJpIygUgywv1Q8AY5hC6OgAGGIFpmFo1CElRkKHty9B3cQ0DE9AFmUA23R1gKKrCMMuhEKvc+59fGA49u8Tw5MtrBjZmFgZNQXnqOwAXAFm88f5xBjdZYwYXIP725wfDqZc3qeeAv///MRx5foXh3OvbDF9+f2eQ4BJicJDWZ1Dll2a48OYuw9EXVxlaLRIZOJjZEKEFzCF7n5yjjgOaTi9m4GblYHCVMWYQYOdhePb1DcP86zuAYpwMr769Z2ixSEKxnOppQFVAmiFGzQXOV+STYLCQ0GK49OYegxS3MAMv0CE0S4SsTCwMm4DxC8KkAnUBWcodsNS1kqZVNV3aA4PaAShRMOHFDgaGF7S3dBaeVjEDFzM7Q5V9PEPbwYUYGmHitfaJKOLNB+eD5ZABTD+yWpC6b39/UqckBBmGDpAdjewJmFqQYyr3zSCcBkAaYT5CppEtABmGHhIgNTCMLQSpWheQEgIwh2LTg9MBsFBApqnpWKwO4GJi+weseJiYGQnnTvTEhRxd6KGBXKmB7EBp3CD3jqeeWFN/+8eLum//ftGkfOBmYv+rwiHenG0R0ojVAQMBAAIMAErgG/MeljhhAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-ape {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAZNJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwxElUOEAM+dpYTpY6/vJP0gohYQMhwYh1Jt1ww6oBB7QCiE+Gn/lqG/79+DZwDiLH887Q2hn+fP9ImChjZ2FBorIUOiZaTFAJ8hc2EfcPLD3YEiKa6A4gBvFlVo9lw6DmAEblZ/rwwhi5tdMn+JbgbJGyMjFg1Cdf0MbxtKULhwwBMHFkMWRwZ/ELrh1CUC5AthrGxWUpxGoBZgO5DXGqJUUdyCGAzFCaG7GtSQ4CFWN9j45NqGUEH/OPk/vfvxzcmSvImtsQJNx9UqQHtwJkNH8zur2e7f6OO8ftXmpQP/7i4//5W0GhWSC1sxOqAgQAAAQYADkDCgkQGXJUAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-avi {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAtpJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLKQa9vXnP4ajNz8z3Hj2g+HN5z9gMVE+FgZNaU4GS1UeBm52hJ/4+Phg6QAEIqD0GSBmJMsBV558Z9h45j2DvjwXQ6CpIIM4PytY/OXH3wwXH31jmLD9BYO/iSCDjgwnxGGiogzi4uLYEibpIQCyfOv5DwxJDqIMkgKsKHKywmxgbKzIzbDo8BuwGMwRsMSICzARG+wgn8fZimBYjpKFgHIgNSC1X378I8pjRDng+O0vDHpyXBiWzz3wmuH91z8YjgCpPXbrM/UccP3pdwYDYLyjg7svfzJM3fWK4faLHyjiILWgREo1B7z+9IdBShB70H/79Y9hwaE3DAeuIXwsCVT7+vMf6jmAIADWZ/+QKjVQumMm0mSicgEonz97/xuc0tEBBysTQ5iFEIOGFAdcDJQthXhYqOcAUCEDyufoDlAQZWcINhNkEEazDKRWQ5KDelFgocLDcPHhN4bnH36jiKc5iWJY/gKoBqTWSo2Xeg7g4WACl3CgQgbdEcgAJLcQqAakFqSHalEAL9mA6Wzu/tcMBgpcDIbArCbKxwrNJb8ZzgN9feHBN4YAU0RRTFUHgB0hy8mgKMYOrozWnHoProxAqV2El4VBXZKTodBLAqUyoroDQABkgZsePxhTA9ClPTCoHYASBR17gKlszx2aW7pIC08IsLGz48SdqZpE8dHFkfHQTQPNcUoMtYvugWkYQObD5GmaCJEtp0kiJOR7bHxYKJDje4wQ4GYDtSH/0Sy+QWZzAe1AFmNE7h1PWHe1/sYrhrpvv2iTOIEe/KsuxtBcEKTdiNUBAwEAAgwAcCQxq0cx9U0AAAAASUVORK5CYII=")
-}
-
-.list-list .ico-flv {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAuNJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLKQa9vXnP4ajNz8z3Hj2g+HN5z9gMVE+FgZNaU4GS1UeBm52hJ/4+Phg6QAEIqD0GSBmJMsBV558Z9h45j2DvjwXQ6CpIIM4PytY/OXH3wwXH31jmLD9BYO/iSCDjgwnxGGiogzi4uLYEibpIQCyfOv5DwxJDqIMkgKsKHKywmxgbKzIzbDo8BuwGMwRsMSICzARG+wgn8fZimBYjpKFgHIgNSC1X378I8pjRDng+O0vDHpyXBiWzz3wmuH91z8YjgCpPXbrM/UccP3pdwYDYLyjg7svfzJM3fWK4faLHyjiILWgREo1B7z+9IdBShB70H/79Y9hwaE3DAeuIXwsCVT7+vMf6jmAIADWZ/+QKjVQumMm0mSicgEonz97/xuc0tEBBysTQ5iFEIOGFAdcDJQthXhYqOcAUCEDyufoDlAQZWcINhNkEEazDKRWQ5KDelFgocLDcPHhN4bnH36jiKc5iWJY/gKoBqTWSo2Xeg7g4WACl3CgQgbdEcgAJLcQqAakFqSHalEAL9mA6Wzu/tcMBgpcDIbArCbKxwrNJb8ZzgN9feHBN4YAU0RRTFUHgB0hy8mgKMYOrozWnHoProxAqV2El4VBXZKTodBLAqUyoroDQABkgZsePxhTA9ClPTCoHYASBR17gKlszx2aW7pIC08aYGNnx9DQHKeEwq9ddA8sBqKR1eDjw8Cvnz/JS4TYDKNrGgD5CD0ksIUKPt9TlA0HPASIdSQpvsdwADcbqA35j4Fa0YIOQGZzAe1AFmNE7h1PWHe1/sYrhrpvv2hTPgA9+FddjKG5IEi7EasDBgIABBgAhSU3wy5Zmw0AAAAASUVORK5CYII=")
-}
-
-.list-list .ico-mkv {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAq1JREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYkayHfD333+GE4/fMVx88ZHhxecfYDEJXg4GfQl+BgtZIQZmJrjZDKKiogzi4uLYEiZ5IfDpx2+GBeceMvBzsDK4q4ozyPJzgsUff/zOcOTBG4azT98zJBjJM/AB5WEAlhiJKgcI+RxkuQ7Qp05KomCxGafugekMMyUGZSFuhn33XjPMB6rJtlBmYEEKCXyA6ER48sk7sM9hlsMAckEKkhMAqjkFVEtWSYgPXHj+ERzsyADkc3RgoyDCsPP2SwYrOWHqOuDpp+8MMnycKMGOjZ1opMDwDKiWWEBWOYAc7OhsRmDUMzEyUj8KpIG+fwL0GXKwY2PfffcVnC2pHgKgfA7KasgAFOywoIcBkBp1ER7qO8AcWMh8AJYDoKyGKzpAcg8/fAOnF2IBI3KDBNge+K+srEywIBLgZGWwlhfBKIhADowzlGNYevExgwgXO4OzsiiDKDc7ihl3794FtQcYyXIAclF8/tkHhldff4LFxICWGEoJwIviP0A1oLLg5OP3DIXWKngdQHJdALLAWl4YjHGmbKAaUDlATFlAl+p41AFEF0QxZ/8C26+3aG7pOS08IcDEwoqCt4ZogzEuMWQ5bGLofJpFweYANQbfDbdokwZABoMswGURuhgh9UMzF8B8hc03yD4mRj1OB/CzMvwjt7OKzRGY7Yj/DHwsDP9wVkZlO67Un3r/v+7TH9pEDdCDf00FGJu7PHQasTpgIABAgAEAZzJTrgcAEqEAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-mov {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAupJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLKQa9vXnP4ajNz8z3Hj2g+HN5z9gMVE+FgZNaU4GS1UeBm52hJ/4+Phg6QAEIqD0GSBmJMsBV558Z9h45j2DvjwXQ6CpIIM4PytY/OXH3wwXH31jmLD9BYO/iSCDjgwnxGGiogzi4uLYEibpIQCyfOv5DwxJDqIMkgKsKHKywmxgbKzIzbDo8BuwGMwRsMSICzARG+wgn8fZimBYjpKFgHIgNSC1X378I8pjRDng+O0vDHpyXBiWzz3wmuH91z8YjgCpPXbrM/UccP3pdwYDYLyjg7svfzJM3fWK4faLHyjiILWgREo1B7z+9IdBShB70H/79Y9hwaE3DAeuIXwsCVT7+vMf6jmAIADWZ/+QKjVQumMm0mSicgEonz97/xuc0tEBBysTQ5iFEIOGFAdcDJQthXhYqOcAUCEDyufoDlAQZWcINhNkEEazDKRWQ5KDelFgocLDcPHhN4bnH36jiKc5iWJY/gKoBqTWSo2Xeg7g4WACl3CgQgbdEcgAJLcQqAakFqSHalEAL9mA6Wzu/tcMBgpcDIbArCbKxwrNJb8ZzgN9feHBN4YAU0RRTFUHgB0hy8mgKMYOrozWnHoProxAqV2El4VBXZKTodBLAqUyoroDQABkgZsePxhTA9ClPTCoHYASBR17gKlszx2aW7pIC08aYGNnh7Ob45TAdO2iezjFYHx0MXQ9MP6vnz8pS4TIAJ9FVEsDIANhviTWAlL0DI1cAPMRKcFLrB6UNMDNxvDv579/TEBAkiXoiRAXADVQuYB2IIsxIveOJ6y7Wn/jFUPdt1+0iRqgB/+qizE0FwRpN2J1wEAAgAADAIjpSLqXWcBIAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-mp3 {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAZBJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwxElUOEAM+dpYTpY6/vJP0gohYQMhwYh1Jt1ww6oBB7QCiE+Gn/lqG/79+DZwDiLH887Q2hn+fP9ImChjZ2FBorIUOiZaTFAJ8hc2EfcPLD3YEiKa6A4gBvFlVo9lw6DmAEblZ/rwwhi5tdMn+JbgbJGyMjCh84Zo+MP22pQirGIyNTw0y+IXWD6FKFIAsQXYMiEYXoygNYDOckHpi1VIlBEAWYbOMaiGAbBg2H8GCGz3+SS4J/3Fy//v34xsTExXSBLZECGqe/gfagTMbPpjdX892/0Yd4/evNCkf/nFx//2toNGskFrYiNUBAwEAAgwArNbTCDlVe6IAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-mp4 {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAvBJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLKQa9vXnP4ajNz8z3Hj2g+HN5z9gMVE+FgZNaU4GS1UeBm52hJ/4+Phg6QAEIqD0GSBmJMsBV558Z9h45j2DvjwXQ6CpIIM4PytY/OXH3wwXH31jmLD9BYO/iSCDjgwnxGGiogzi4uLYEibpIQCyfOv5DwxJDqIMkgKsKHKywmxgbKzIzbDo8BuwGMwRsMSICzARG+wgn8fZimBYjpKFgHIgNSC1X378I8pjRDng+O0vDHpyXBiWzz3wmuH91z8YjgCpPXbrM/UccP3pdwYDYLyjg7svfzJM3fWK4faLHyjiILWgREo1B7z+9IdBShB70H/79Y9hwaE3DAeuIXwsCVT7+vMf6jmAIADWZ/+QKjVQumMm0mSicgEonz97/xuc0tEBBysTQ5iFEIOGFAdcDJQthXhYqOcAUCEDyufoDlAQZWcINhNkEEazDKRWQ5KDelFgocLDcPHhN4bnH36jiKc5iWJY/gKoBqTWSo2Xeg7g4WACl3CgQgbdEcgAJLcQqAakFqSHalEAL9mA6Wzu/tcMBgpcDIbArCbKxwrNJb8ZzgN9feHBN4YAU0RRTFUHgB0hy8mgKMYOrozWnHoProxAqV2El4VBXZKTodBLAqUyoroDQABkgZsePxhTA9ClPTCoHYASBR17gKlszx2aW7pIC08aYGNnx9DQHKcEpmsX3cMqBmOjq4GpQxb79fMnbaIAZAm6Y5DZFKcBZMPRfTUoEiHIUcgOI9aRTKQGMy6DYVGALe3giwoUB3CzgdqQ/6iaJpATJshsLqAdyOoYkXvHE9Zdrb/xiqHu2y/alA9AD/5VF2NoLgjSbsTqgIEAAAEGAKRaSLN4Zv7KAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-mpeg {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAwJJREFUeNrMV01ME0EUftS2221LscBSt0pbjBWsBjGAQRMT48FEL/5F44kYD8ajnjypMVw8cvFkSJSrxMSDMRoSUeNPDARJtKBVo0Sx0CZFC6Wldeu8laWz2y0sMoAvedmZN1/nfe/NezNQls/nYS3FTE/C4fAh8ukiKjL00UJ0gDaEQiF9Aujc6/WKDoeDiedIJIKfO0RPBoPBAT2MSTMXeZ4HSZKYKIrP53uIJAiZZiMEmAvHcef9fv8TMuzRI2FajUKzWq1nAoHAKz0S5qVuNp2R4Pn7JIyMpSGezMk2wWWGbRt52BN0goMrxORyuZQ6QDk99+0nWvZPBN5+m4F7/QnY6bfDsVY3eCossn38ZxaGRlPQ+SAKR1rcsGMT/5eYIIDH49ErzKVnAJ3fH5yEs/sFENdbVGu1VVZZm+sc0P0sLtsUEkoxlhKT0bRj5O37qoucq1qIrCEGsVNpyVBghgi8jExBo89e5LyrLwaJ6VwRCcS++JBkR2D4+ww0kXPXyqfxDNx4NAGRaFplRywWKTMCsV858Lr1U5+aleDW0zj0hQsRiwQbS+bYEVhUyHsmUY8a1t06gzsb6gLs87FEVq50rdgsJjjVVgkNXtu8Dduy0mlmRwAvGexzLYGAwMGJ3W6o0jhDbINoY3cEbVucMPQ1BT8msyr7uQNCkfMowSB279ZydgScNpN8w+EloyVBC67dJhjE4m+YHcH8zUbqrOtxDJoCdthFWk1wWea6JAuDJOo3X1JwtLVwFTMlIJOo5aGuhpMfo57XCfkxwmqvLjdDvcjDxcMbVI8RcwIo6OBgY4WsLGRV/h74rwmojuB6L6my3o8r7rQ7tEANWDkOOto3y+PL3Z/n7bRNGdMY2lbKjrbZTGZ5RajnQBnThLVryvzSzWFjNUBHqt2olCBOmwk90kwyoHdMC5FU8IYzQGdBb2O0GcnKYuRUGXBYQcpIkmm5WaEJao/ETnzQ8zL6v+POu++ujkzAldTsytwPJMDf9TXQceH49mu6BNZC/ggwAJR8VIseM6jsAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-mpg {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAvlJREFUeNrMV81PE0EUf61tt9uWYoGlbpW2GCtYDWIAgyYmxoOJXvyKxhMxHoxH/QPUGC4euXhsor1KTDwYoyERNX7EQJBEK1o1ahQLbVK0UPrl1nkr2+5ut7CVAfwlLzP75nXfb2Z+b2ZrKBaLsJYwyR8ikcgh0oSI8RRzdBMblTuCwaA2AUzu8Xh4u91OJXM0GsXmFrGTgUBgVCvGqHrmWZYFQRCoGMLr9d5HEoRMlx4C1MEwzHmfz/eIdAe1SBhXQ2gWi+WM3+9/oUXCVOvL5rICPH2XgonJDCRSBdHHOU2wbSMLewIOsDPlOTmdTkkHiNML7Qgxwz8ReP1tHu6MJGGnzwbHelzgrjeL/qmfeRj/moaBezE40u2CHZvYv8Q4Dtxut5Ywa18BTH53bAbO7ueAX29WjLU0WkTrarVD+ElC9EkkJDFWg1HvsuPM+/Y1VSRXlBAZwxiMnc0Iuiami8Dz6Cx0eG0VyUPDcUjOFSpIYOyz9yl6BN5+n4dOsu9qfJzKwvUH0xCNZRR+jEWRUiMQ/1UAj0t76dM5AW48TsBwpDxjnsTGUwV6BJYEuc8E2aWGulun8826qgDrfDKZF5WuhtVshFO9DdDusZZ8WJYNDhM9AnjIYJ2rCfg5Bk7sdkGjKhnGtvNWelvQu8UB41/S8GMmr/CfO8BVJI+RGIzdu7WOHgGH1SiecHjIqEnIgWM3SQzG4m+obUHpZCM6Cz2MQ6ffBrtIqXFO80KV5GGMzPrV5zQc7SkfxVQJiCRaWGhtZsTLaPBlUryMUO1NdSZo41m4eHiD4jKiTgCBCQ521ItGA6vyPfBfE1BswbUhorKhDyueNBxcRAMWhin1+/s2i+2l8CdNn9SvFqP2I3LZ7PJEqIaUAJNKpNRk1CRq0oB8pku9bDGC1MpQDa1t0jNWUxVoLa18rFoCPaulWAG7BYSsIBgJlqUJuQjlwA9UG8kh9xnk/44Hbr+5MjENl9O5lTkfyAR/tzVD/4Xj269qElgL/BFgADHlS7OoZ6a9AAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-rm {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAuNJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLKQa9vXnP4ajNz8z3Hj2g+HN5z9gMVE+FgZNaU4GS1UeBm52hJ/4+Phg6QAEIqD0GSBmJMsBV558Z9h45j2DvjwXQ6CpIIM4PytY/OXH3wwXH31jmLD9BYO/iSCDjgwnxGGiogzi4uLYEibpIQCyfOv5DwxJDqIMkgKsKHKywmxgbKzIzbDo8BuwGMwRsMSICzARG+wgn8fZimBYjpKFgHIgNSC1X378I8pjRDng+O0vDHpyXBiWzz3wmuH91z8YjgCpPXbrM/UccP3pdwYDYLyjg7svfzJM3fWK4faLHyjiILWgREo1B7z+9IdBShB70H/79Y9hwaE3DAeuIXwsCVT7+vMf6jmAIADWZ/+QKjVQumMm0mSicgEonz97/xuc0tEBBysTQ5iFEIOGFAdcDJQthXhYqOcAUCEDyufoDlAQZWcINhNkEEazDKRWQ5KDelFgocLDcPHhN4bnH36jiKc5iWJY/gKoBqTWSo2Xeg7g4WACl3CgQgbdEcgAJLcQqAakFqSHalEAL9mA6Wzu/tcMBgpcDIbArCbKxwrNJb8ZzgN9feHBN4YAU0RRTFUHgB0hy8mgKMYOrozWnHoProxAqV2El4VBXZKTodBLAqUyoroDQABkgZsePxhTA9ClPTCoHYASBR17gKlszx2aW7pIC08aYGNnx9DQHKeEwq9ddA9FHMbHJYYMfv38SV4iRLcElwV0TwMgh8B8TY7DiA4B5Giglu+pFgWwUCDHYShRwM0GakP+o1nqB5nNBbQDWYwRuXc8Yd3V+huvGOq+/aJN+QD04F91MYbmgiDtRqwOGAgAEGAAnMw5uSNz54cAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-rmvb {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAvNJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLKQa9vXnP4ajNz8z3Hj2g+HN5z9gMVE+FgZNaU4GS1UeBm52hJ/4+Phg6QAEIqD0GSBmJMsBV558Z9h45j2DvjwXQ6CpIIM4PytY/OXH3wwXH31jmLD9BYO/iSCDjgwnxGGiogzi4uLYEibpIQCyfOv5DwxJDqIMkgKsKHKywmxgbKzIzbDo8BuwGMwRsMSICzARG+wgn8fZimBYjpKFgHIgNSC1X378I8pjRDng+O0vDHpyXBiWzz3wmuH91z8YjgCpPXbrM/UccP3pdwYDYLyjg7svfzJM3fWK4faLHyjiILWgREo1B7z+9IdBShB70H/79Y9hwaE3DAeuIXwsCVT7+vMf6jmAIADWZ/+QKjVQumMm0mSicgEonz97/xuc0tEBBysTQ5iFEIOGFAdcDJQthXhYqOcAUCEDyufoDlAQZWcINhNkEEazDKRWQ5KDelFgocLDcPHhN4bnH36jiKc5iWJY/gKoBqTWSo2Xeg7g4WACl3CgQgbdEcgAJLcQqAakFqSHalEAL9mA6Wzu/tcMBgpcDIbArCbKxwrNJb8ZzgN9feHBN4YAU0RRTFUHgB0hy8mgKMYOrozWnHoProxAqV2El4VBXZKTodBLAqUyoroDQABkgZsePxhTA9ClPTCoHYASBR17gKlszx2aW7pIC08a6EzVROHXLroHppvjlFD46GIgNrocTBwZlM++TjgRYjOIEoCsH92DTKQaBPMRusPwyYH4MExUCCAHG6W+JxQCJEcBtvgmRo6oXMDNxvCPFlkTOUQbF17/NyNDG85nRO4dT1h3tf7GK4a6b79oUz4APfhXXYyhuSBIuxGrAwYCAAQYAPSMU/fnJ99KAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-swf {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAfVJREFUeNpi/P//P8NAAhZkzrVr1+yBVBcQm1HRDkMgvoAsoKWlhd0BQLBCAgh4eXmpYvPt27dB1GogDlVVVb2ATQ0TGl+Cm5ub4d+/f1TBICAvL78L5AigYwyIcQDVARsbWxbQEUdwOYKJHgkN6IgEBQWFc9gcwUKp4d/3H2D4tm8fw/9fPxlEOjtR5Pj4+GDpAATCoPR5IGakigM+LVrM8PfdWwbBokIGJkFBDHlRUVEGcXFxbAmT8hD4+/Ytw69LlxhEuoC+ZsIdk7DEiAuQnQZ+Xb3KwGFpgddykgsiUsCfR48ZPq9eDY4GEOAJDmbgi4ulnwP+fvrIINLezsCmpUlRCJAdfv+//2Bg5OSgOIuS7QBQ6mfi4hoYB/z/9Yvh78tXDMzAbEZ/BwCz1ad58xg4rawozgFkOeB1UTFQFzMDX0I89dsDxADRCf1UrSfoUhmNOmDUAfgAI3Kz/KaTM13a6Or79uJukACbTxgaFGfPAtP3U9PgfBgbXR1IHKYeBpDV/gKWoiSVA8iW4bIYGyBWHRMxBqGHALIYMo1sKYiPHhJkJ0JswUqMHmJCgYmYKMDmCBgfmaa8LuDj+/vv2zdmJqRaDlsUkAvADVSgHTiz4Y2GxhrG8+cbGT5/pk35wMv777+hYb1GQ30LVgcMBAAIMACmqfNs4ifjnwAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-wav {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAYVJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwxElUOEAM+dpYTpY6/vJP0gohYQMhwYh1Jt1ww6oBB7QCiE+Gn/lqG/79+DZwDiLH887Q2hn+fP9ImChjZ2FBorIUOiZaTFAJ8hc2EfcPLD3YEiKa6A4gBvFlVo9lw6DmAEblZ/rwwhi5tdMn+JYw4Q4CNkRGOJWv7Ufi4xEnhD6008LaliEG4pg/MRqZB4jAA48PkselDVk+TEEC2nOJEiC2ekH2JzffE8kHgF9A+nInwHyc3gSYkhQ1UUKUGtANnCDyY3V/Pdv9GHeP3rzRJnP+4uP/+VtBoVkgtbMTqgIEAAAEGAH8AyCqN8wbhAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-webm {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAwxJREFUeNrMV81PE0EUf137tbQUCyx1q7TFWEE0iAEMmpgYDyZ68SsaLxKjifGof4Aaw8UjHky8NFGuEhMPxmhIRI0fMRAkwYpWDRothTYpWmgLLVvnrSzdr2JLBuoveZndt2/m/ebNezOzhlwuB+WEUf4SDAYPkSZAhKfoo53IkFzR3NysTwCdu91u3mazUfEcCoWwuUfkpN/vH9KzYVTvPMuyIAgCFUF4PJ7HSIKQaSuGAHVYLJaLXq/3GXns0yPBrEWimc3msz6f740eCWOpg83OCfDyYwLGwmmIJbKijnMYYdtGFvb47WCz5OfkcDikPECcXmwHiRhWRGD0RwoeDMZhp7cCjnU4wVVlEvWTvzIw8j0JPY8icKTdCTs2sX+JcRy4XC69xCw9Auj84fA0nNvPAb/epPhWX2MWpa3BBr0vYqJOIiElYyEwxYYdZ961r1bjXFFC5BvaoO1MWihqYkUReB2agRZPhcZ5YCAK8dmshgTavvqUoEfgw88UtJJ1V+PL5BzcejIFoUhaoUdbTFJqBKK/s+B26oc+OS/AnecxGAjmZ8wT22giS4/AP0HOM0F2qGHerSty5KKqAOs8HM+Ima6G1cTAqc5qaHJbl3RYltV2Iz0CuMlgnasJ+DgLnNjthBqVM7Rt4q30lqBzix1GviVhYjqj0F84wGmcR4gN2u7dWkmPgN3KiDscbjJqEnLgt7vEBm2xD7UlWNrZSJ4Fnkah1VcBu0ipcQ7TYpVkYJjM+t14Eo525LdiqgREEvUsNNRZxMOo721cPIww22srjdDIs3D58AbFYUSdAAIdHGypEoUG1uQ+8F8TUCzBjX6SZf2fV91pb/5SDAb5f8FESshd6f2q6dDdtRlQj60chXRSH/m7XMezjGHFSahHUO1Ez6bwOUIiIMmZm6O5cHIhd/52SNNKz5Lo6dT6Qq3cZ9kjwOgNJl/zksJZgPBy4ygiYDODMCcIy5amPOnUCVcoQvl7gvaeqKiCnvvvr41NwdXk/OrsD2SCC4110H3p+PbrugTKgT8CDACPHLU9lTMolQAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-wma {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAeFJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgSmX93C8ODzC6IsVOCVYMjU9oHzf//7w3DgySUGVxkj4soBbABkeadFClEOKD8xB85+9f0Dw9LbexlefHuP1wE0SYRnXt9imAEMOWsJbYJqaeKA1XcPMaRpeTOYiWkMjANAQIJLkCh1dCkHBsQBz76+HTgHhCrbMcy+vo3h3Js7pFXHVKt/RdUYZLhFGZbd3ke5A0CFC3L+xq9WHCUR5ur6Mxx4dokyByCXbKQCViYWvIXQ8M4Fow4gq1U84cUOBoYXtLd0FlKrGCMEuJjZwbjFKQ3ORsYwcRCNrgaXGDJ/6KSBtoMLGars48FsZBokjksNshyyGEzNgCRCfJYTLAlhrkem8anB5ntcfKwhwMXE9u/v/380Cw2Q2SA7kMUYkXvHU0+sqb/940Xdt3+/aBI13Ezsf1U4xJuzLUIasTpgIABAgAEAkufcCgWFyTcAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-wmv {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAt9JREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLKQa9vXnP4ajNz8z3Hj2g+HN5z9gMVE+FgZNaU4GS1UeBm52hJ/4+Phg6QAEIqD0GSBmJMsBV558Z9h45j2DvjwXQ6CpIIM4PytY/OXH3wwXH31jmLD9BYO/iSCDjgwnxGGiogzi4uLYEibpIQCyfOv5DwxJDqIMkgKsKHKywmxgbKzIzbDo8BuwGMwRsMSICzARG+wgn8fZimBYjpKFgHIgNSC1X378I8pjRDng+O0vDHpyXBiWzz3wmuH91z8YjgCpPXbrM/UccP3pdwYDYLyjg7svfzJM3fWK4faLHyjiILWgREo1B7z+9IdBShB70H/79Y9hwaE3DAeuIXwsCVT7+vMf6jmAIADWZ/+QKjVQumMm0mSicgEonz97/xuc0tEBBysTQ5iFEIOGFAdcDJQthXhYqOcAUCEDyufoDlAQZWcINhNkEEazDKRWQ5KDelFgocLDcPHhN4bnH36jiKc5iWJY/gKoBqTWSo2Xeg7g4WACl3CgQgbdEcgAJLcQqAakFqSHalEAL9mA6Wzu/tcMBgpcDIbArCbKxwrNJb8ZzgN9feHBN4YAU0RRTFUHgB0hy8mgKMYOrozWnHoProxAqV2El4VBXZKTodBLAqUyoroDQABkgZsePxhTA9ClPTCoHYASBR17gKlszx2aW7pIC08IsLGzg3FnqiacjYxh4iAaXQ2yGDY5ED100kDtonsMzXFKYDYyDRLHpYZYuaGTC2C+QKbxqSFFDqsDuNlAbch/NPMtyGwuoB3IYozIveMJ667W33jFUPftF22iBujBv+piDM0FQdqNWB0wEAAgwAD570Ssrd8AngAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-doc,
-.list-list .ico-docm,
-.list-list .ico-dotx,
-.list-list .ico-dotm,
-.list-list .ico-dot,
-.list-list .ico-rtf {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAArdJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByK7ggYYELjS3JycjL8+/ePKhgE5OTkdkIdYUyMA6gO2NnZM+Tl5Q8CmWuwOYKJHgmNjY0tQUFB4QQ2R7DQ0mI+Pj5YOgCBCCh9BogZ6eIAAQEBsCMYGRnh+OHDh/SLAlZWVgZmZmbiywFcYPnW+ww/f/1lSAhUQRFfsP4OmIaJP3j6hWHGiptgtoQIJ0NBvBYDCwsLw9+/f3GaTVQI6KkLMtx99Jnh959/cDEQ+97jz2AMExcWYGcIcpVn4OFiYdDXEIKrBYUCExMTOArIcoC6Ah/QAEawI2AAxJYU5QJjmDgvNyuDGlDt1+9/gA4QRDEDlgbIcgALCxODhhI/w417H+FiILamMj8YI4tfuf2eQVaSm0GInx3DHLIdAAK6aoIM1+5+YIBVXTfuf2TQVhFg0FIWQBG/fOsDgwFS8JNUGeGNBkU+hh8//zI8e/mNAeQRFmZGBlEhDkhqB4YQSBwUBU9efGWI9VeivgNYYdFwHxLcmkCfwwA4GoDinOzMDEqyvMBEyEq0A0gqB0C5ARTfIKyF4gABsNgVUPBrCpFUVpDkAHUFfoZXb38wvPvwk0FeGlFlK0jzMLx9/5Ph8cuvDDqqAuQ3SAiXbEzgbMYGpJmQUjQzMIuqAdPInz//GdjZmGnnABCI9sWewCK8FMkqrulSHY86gOg0MGHJIyD5iOaWzmrD3SoGNZ9Q+JU5Dij89ikHsMoRIw4Cv379Ij0XoBsO4sNoYsUHLA3gs3xk5AL0NIQ3F3BxMP/79ecfE6j5hMsQWJDC4ptYcRAA9ZZAdqA0UpB7x1MXHKm//eh73bcff2kSMtyczH9VZDmbsxNsGrE6YCAAQIABAHOPGcK/91HrAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-docx {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAphJREFUeNpi/P//P8NAAhZkzrVr1+yBVBcQm1HRDkMgvoAsoKWlhd0BQLBCAgh4eXmpYvPt27dB1GogDlVVVb2ATQ0TGl+Cm5ub4d+/f1TBICAvL78L5AigYwyIcQDVARsbWxbQEUdwOYKJHgkN6IgEBQWFc9gcwUJLi/n4+GDpAATCoPR5IGakiwMEBAQYQAmakZERjEHg8ePH9IsCVlZWBhYWhB9hjiA5ClZsu8/w4+dfhoRAFRTxBevvgGmY+IOnXxhmrLgJyU4inAwF8VpgB4AsBuUKbA4gKgR0VQUZ7j76zPD7zz+4GIh97/FnMIaJCwuwMwS5yjPwcrMy6GkIwtUyMzODMdkOUFPkA9MgR8AAiC0lxgXGMHGQxWoKfAyfv/5mMNAQQrWIiQmMyXIAKwsTg7aqAMONex/hYiC2hhI/GCOLX779nkFOiptBiJ8dwxyyQwAWDTfuIzngPpIDkMSv3v6A4Xt8gGgHgKLh67c/DC/efAdjZiZGcEIDYRAAiX349Ivh8YuvDLpqguTVhqREA7IlWsoQcQ52ZgYlGV5wWqC6A0BAW0WA4ei5V2C2h600XFxPXZBhx+GnYLaprghJZQVJBREovp+9+sbw+t0PcEKDARAbJAaSAzmS7AYJMdEAcgQTMP6ZkFI0iK0KzH6g8gAUDTRzAAhE+ShhFY/wUiSruKZLdTzqAKLTwIQlj4DkI5pbOqsNd6sY1HxiqMxxQBFrn3IAzkaWIyQOEkNX09i3i7hcgK4RxMdmID5xZDl0NTRNA8gW4bN8+OYC5PSAHAXYACNy57Swefefn78ZmavznGiWCHum7/3bX+vKgtUBUxcerbn98Fvjtx9/aRIyXBzM/1Tlueqz461bsDpgIABAgAEAbXE38hMP+G4AAAAASUVORK5CYII=")
-}
-
-.list-list .ico-pdf,
-.list-list .ico-fdf {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAmhJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByK7ggYYELjS3JycjL8+/ePKhgE5OTkdkIdYUyMA6gO2NnZM+Tl5Q8CmWuwOYKJHgmNjY0tQUFB4QQ2R7CQa+jf9x8ZGFlZGJh4cKcXPj4+WDoAgQgofQaIGSl2wJupCxk4tNUYuG1MGVhEhbGqERAQADuCkZERjh8+fMhAeQgAExgoBPgD3IF+YcSpjJWVleHPnz/wBEm9RMjExMAiLsLw/fwVhj8v3+AvaFhYGJiZmYFamMAhQLVEyOfryvBu/mpgGuAiqJYmDuDQVGFgFhJg+H72MlHqYWmAag748+oNOBF+OXya4ffjZ0Q7gmoO+LL/OAOPszWDcGokw7t5qxh+P3lOeWVEdCb4+g2cC76fvsjw6/5jhv/AlP5m2iKGvx8+M3CZGwALib8MrDKSDLxudtR3wO/nrxjeL14HLoQYOdgZ+IBZkVVCFJwdf964y/Dz3kMwn0VCjPoh8PXIaYaPG3cx8Hk7MfA4WGKW+xrKYExSjiZW4ffzVxl+3rzLwGWix8Bjb0G1eoJoB/x5847h/6/fDHxeTnhLP5olQl5XWwYGEKYyoEt1POoAotMAS/tMhof0sHDxRNyJEFuqVGorgbPvVfVgiBEjDs9N5OYCZAtgbGTDcYkPSBoAOQY9JCguB2AGEuM7UkKA5CigaS5g4Ob89//rdyZGEkOFWAeCu8FcnCgtVEbk3vGN/ln1TDfu1TF8+06b8oGb6+8/dcVmjcK0RqwOGAgAEGAASrzyfwJnztEAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-ppt,
-.list-list .ico-pptm,
-.list-list .ico-pot,
-.list-list .ico-potm {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAdtJREFUeNpi/P//P8NAAhZkzrVr1+yBVBcQm1HRDkMgvoAsoKWlhd0BQLBCAgh4eXmpYvPt27dB1GogDlVVVb2ATQ0TGl+Cm5ub4d+/f1TBICAvL78L5AigYwyIcQDVARsbWxbQEUdwOYKJHgkN6IgEBQWFc9gcwUJLi/n4+GDpAATCoPR5IGYkywHvJ0VhCjKzMLCpmDNwmAYwMAtJo0iJiooyiIuLY0uY5IUAb3Atw+e1zQxczmkMLKLyYLH/v74x/Lp1nOHzimoG3pB6BmYxRRQ9sMRIVDlACDBDLWUWlESxiEVGm4GJT4zh+/FVDDz+5SRFE9USIbuOE8OfZzdJ1kfdXMDINHAO+HXzGDyKyK4LiAV/3z9nYGRhgyTCP78Yfj84z/Dj/DYGHt9S+jjg295ZiFBn42JgkdVm4PEpZmCV06WPA0DZjUVKnSpRR5eieNQBVEsDoAQnmLdsNAqGlwMYkZvlDws06dJGl59wHU+DhIUdU0PVZoQj23yxiiHz0dWigD8/ycsFyBbD2NjEkNnDqxyABTGy77CJ0cwB2CyhxGKsUfCfS+Avw/9/tAtvoNlgO3Blwzuzi2pY7h1rZPz+kSZp4z8n/78/Slb1Kql9LVgdMBAAIMAARLzKcEnwqqcAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-pptx {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAfNJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByK7ggYYELjS3JycjL8+/ePKhgE5OTkdkIdYUyMA6gO2NnZM+Tl5Q8CmWuwOYKJHgmNjY0tQUFB4QQ2R7DQ0mI+Pj5YOgCBCCh9BogZyXLA+0lRGGKMrOwMrIrGDBymAQzMwjIocqKiogzi4uLYEiZ5IcATWMXwZX0bA5dzGgOLqDxY7P+fXwy/bh1j+Ly6noE3qJqBWUwJRQ8sMRJVDhACrLI6YJpZUBJokSLCECl1BiZeEYbvx1cz8PiXkxRNVEuE7LouDH+e3iBZHxVzATBd/f83cA74deMQA7O4MmV1AbHg39f3DP8+voIkwp9fGX7dOcXw88J2Bm6fIvo44Ov2SQgOMwsDCzDlc/sUM7DK6dLHAbwh9eCUTw1Al6J41AFUTQOCectGo2B4OYARuVn+sECTLm10+QnX8TRIWNghiqo2IxzW5otVDJmPLg7TA9MH5//5SXwuQLYYxsYmhm4hsiPQ5eiWBoixnGAIwIIYPTjRxWhWEGGzhFiLyYqC/5wC/8hp1eCyHCOxAs3+z8n/D2c2vDOrsJ7l/vE6xu8faZI2/nMJ/P2jYNGsktbfiNUBAwEAAgwA8LXlQoWLfqIAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-txt {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAVJJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkLQSevnqLU05aTBivXlhiJKocINcSSgATwwADiqOA0pAbjYLRKBiNgtEoGHXA4MoFE+fsooulM/twt4pBzScMDY3VmRhi9a3TweIgGp86mFoY+PXrF4ocI3LHJL1own9sDkC2ANkwZDFsjkFXC3PAzL4CRqqlAWyWj6xcgBwFFDuAi5PtH6FGJK40QYwjQGaD7MCZCKfOWVt/5/7Lum/ff9Ekarg42f+qKIo1Z6cEN2J1wEAAgAADALEDt/dBJDrPAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-xls,
-.list-list .ico-csv,
-.list-list .ico-xlsm,
-.list-list .ico-xlsb {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAiVJREFUeNpi/P//P8NAAhZkzrVr1+yBVBcQm1HRDkMgvoAsoKWlhd0BQLBCAgh4eXmpYvPt27dB1GogDkV3BAwwofEluLm5Gf79+0cVDALy8vK7oI4wIMYBVAdsbGxZQEccweUIJnokNKAjEhQUFM5hcwQLLS3m4+ODpQMQCIPS54GYkS4OEBAQYAAlaEZGRjAGgcePH9MvClhZWRlYWBB+hDmCLAeceHmdIWZPO5gmpObYi6uIOAY6AISRQ4GsNGAhrgmmp1zegMJHtnzSpfUMGdo+DFYS2ihyzMzMYMuxlbokpQFcjoBZnqLpyWAnpYdVLxMTE+UOwOYIEABZHqfuyuAkY4hXL0VRgMsR/4C+ilJ1YvCQMyUroVKUC/5Bg1SEk586tSEpOQIU7AGK1gxyvGI4EyZNHACz3EfegiFMxR4uTq4jWMixXISDn0FPRInoLEoVB8As//PvL8OLb+8Y9j05z6AjpECxIxiR8yawRfRfWVmZpjXj3bt3QS0iRrpWxzTLhsPCASiJcPKr3QwMIExjMB2pVYwRAuyMLCi42DYKKx9dHCYGw+hyMExyFEw5soohxwbSmgLRID42AJODYZgeqqQBmIG4LEd3KIxPs7qAmo4gKgRgvscXrDA5WBSQlQu4mNj+/v7/l5kJ0WpGCXr0qEC3lFC8/2P4D7YDZ1E8/eS6mts/XzZ+//eLJuUDJxPbP1V28fpM86AWrA4YCAAQYADJhRMxzVK59wAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-xlsx {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAjlJREFUeNpi/P//P8NAAhZkzrVr1+yBVBcQm1HRDkMgvoAsoKWlhd0BQLBCAgh4eXmpYvPt27dB1GogDlVVVb2ATQ0TGl+Cm5ub4d+/f1TBICAvL78L5AigYwyIcQDVARsbWxbQEUdwOYKJHgkN6IgEBQWFc9gcwUJLi/n4+GDpAATCoPR5IGakiwMEBAQYQAmakZERjEHg8ePH9IsCVlZWBhYWhB9hjiDLASdeXmeI2dMOpgmpOfbiKiKOgQ4AYeRQICsNWIhrgukplzeg8JEtn3RpPUOGtg+DlYQ2ihwzMzPYcmylLklpAJcjYJanaHoy2EnpYdXLxMREuQOwOQIEQJbHqbsyOMkY4tVLURTgcsQ/oK+iVJ0YPORMyUqoFOWCf9AgFeHkp05tSEqOAAV7gKI1gxyvGM6ESRMHwCz3kbdgCFOxh4uT6wgWciwX4eBn0BNRIjqLUsUBMMv//PvL8OLbO4Z9T84z6AgpUOwIRuS8CWwR/VdWVqZpzXj37l1Qi4iRrtUxzbLhsHAASiKc/Go3AwMI0xhMR2oVY4QAOyMLGBfbRsHZyHx0cZgYDOPTC8JER8GUI6sYcmwgrSgQDeJjAzA5GIbxidFLMA0gG0iMQ2F8YvVSrU2IyxEU5wL04MSlBmYpssXE6MUoCYsPTf/z+/9fZiZgqxk9+LAZCJPHZgk2vf8Y/jOwMjL/7bXLZMHqgOkn19Xc/vmy8fu/XzQpHziZ2P6psovXZ5oHtWB1wEAAgAADABRqMy9QT3WBAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-7z {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAX9JREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgQ+r2lk+PPsJnl5XEqdgTeknvhyABsAWS6Ytwyr3PtJUTjlYPKEAEWJEGQ5MZbQzAGEQoDmDhgNAWITGk0dQCkYcAewUJoIh38IgIpTchMai6Qa5Q4gVJYP+SgYcAcwIjfLHxZo0qWNLj/hOp4GCQs7bo012zDEHrZ4YYiDxHDX7z/JLweQDQZZCuOjiw9YGkB2FE0dgM0iciynWgiQazlGGvjPKfCP8ddXJgZGJpISIro4Tsf8/we0g/8fTgf8UbRoYrl/vI7x+0ecLnjY4EyUGFb7uQT+/lGwaMZZDgwEAAgwANHIuc9Vl0AAAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-cab {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAYxJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgQ+r2lk+PPsJnl5XEqdgTeknvhyABsAWS6Ytwyr3PtJUTjlYPKEAEWJEGQ5MZbQzAGEQoDmDhgNAWITGk0dQCkYcAewUJoIh38IgIpTchMai6Qa5Q4gVJYP+SgYcAcwIjfLHxZo0qWNLj/hOp4GCQs7quKabQgHtnhhyCGLIavFph5Sv/8kPhFiswCroTgsJUY9SQURNsPxhQIhyykuCdGDnJwQYCLHQpjBMIzNIWSVhP85Bf4x/vrKxMDIBPcNqUGKV/3/f0A7+P/hzIZ3ZhXWs9w/Xsf4/SNNyof/XAJ//yhYNKuk9TdidcBAAIAAAwBVN9K79PuTHAAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-iso {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAYVJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgQ+r2lk+PPsJnl5XEqdgTeknvhyABsAWS6Ytwyr3PtJUTjlYPKEAEWJEGQ5MZbQzAGEQoDmDhgNAWITGk0dQCkYcAewUJoIh38IgIpTchMai6Qa5Q4gVJYP+SgYcAcwIjfLHxZo0qWNLj/hOp4GCQs7bo012xgetnjB2WBHQ/nIYujiqPX7T8rLAXSHgNjIYuhqqJ4GYBbi9SmtEyGyI+juAGTfU+oIlDTwn1PgH+Ovr0wMjEwkRwG6Y7BGzf9/QDv4/+HMhndmFdaz3D9ex/j9I03Kh/9cAn//KFg0q6T1N2J1wEAAgAADALuKyAid7COMAAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-rar {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAX5JREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgQ+r2lk+PPsJnl5XEqdgTeknvhyABsAWS6Ytwyr3PtJUTjlYPKEAEWJEGQ5MZbQzAGEQoDmDhgNAWITGk0dQCkYcAewUJoIh38IgIpTchMai6Qa5Q4gVJYP+SgYcAcwIjfLHxZo0qWNLj/hOp4GCQs7quKabSj8hy1eGPLIYoTUM/z5SXo5gG4BhqEUqKcoDcAMR/c11UtCZAuwRQEp6slyALYgxRb3MD7ZUfCfU+Afw/9/tEv+QLP/c/L/w5kN78wqrGe5f7yO8ftHmpQP/7kE/v5RsGhWSetvxOqAgQAAAQYAQvfLEuMZrKwAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-zip {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAYFJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8IkPgQ+r2lk+PPsJnl5XEqdgTeknvhyABsAWS6Ytwyr3PtJUTjlYPKEAEWJEGQ5MZbQzAGEQoDmDhgNAWITGk0dQCkYcAewUJoIh38IgIpTchMai6Qa5Q4gVJYP+SgYcAcwIjfLHxZo0qWNLj/hOp4GCQs7bo0121D4D1u8wGIwGlkcd/3+k/xyANlgdMcgy8McRbM0QIoFVC8J8VkOCxVSHMdCTZ+TEyooDvjPKfCP8ddXJgZGJqISIskW/v8HtIP/H85seGdWYT3L/eN1jN8/0qR8+M8l8PePgkWzSlp/I1YHDAQACDAAtKS/DHmsv9AAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-gz {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAHtSURBVFiF7Ze/T8JAFMe/1QYCRKIDIe1AYcAfLJLowL/grCbGydEJTXBw0qiLA4NxNGFlkX/A0UlJJGEBQzoAC3EzxhgTgz0HPXI9jrahxTr4TZrm3r3r+/Tdu2tPIoTAT8lso9lsrgEoAVA8jLEKoMYaMpmMGABASVVVJRKJeBJZ13UAuAawmU6nayKfKa6thEIhGIbhyQUAiUTiBsC1rusrTgA8VzAY3NU07RZARQQxcQAACAQCO8lk8l4EwdeAp4pGo7QOAGDr5/4AQPoVgFgshng8brIxQM4AXisn6PdaYwHI6gJmNo6tfewe0u+1MJcvC/ueL7dH9tF+O7kqwrl82VGQiQHYZWDiAP8ZoBC+AriV7wCudkK38w/8lQxI0ve3odFoDDuoC2MXmqzMC+003gDASnZ7uVv5PgW+A5imIHK1jicA2sUjuvtLEwk49LvLngs6e4uEVaewTHjxtk5h2XTZ+u4tmg4iQ0XYPchCK9bRPcgO2lRasW7y48WOo758m5ejjWjUYKdiwXjZFiEdPOoBboJbArBvrRXrlllg0y3ytRovEUIGO1P7MPcpfbxNQRpvdfI1MPTmxAAJhI3UeXWamkw10E/lTuX23ZH0/iImkIOWADQDAITLmIRnP/vJ3BlQZYw+H8+/AFShLMorUUd8AAAAAElFTkSuQmCC")
-}
-
-.list-list .ico-bt {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAbxJREFUeNpi/P//P8NAAhZkzrVr1+yBVBcQm1HRDkMgvoAsoKWlhd0BQLBCAgh4eXmpYvPt27dB1GogDkV3BAwwofEluLm5Gf79+0cVDALy8vK7oI4wIMYBVAdsbGxZQEccweUIJnokNKAjEhQUFM5hcwQLLS3m4+ODpQMQCIPS54GYkS4OEBUVZRAXF8eWMOkTAiAAS4xElQO4QPmJORhivKycDO6yJgymYupY5WGg0yKFcgfgMqjm1AKwA5DlQI4hZCnVcsHvf38ojiK6ZEOqRAG+eKaLA7DFKzUcNeBRQJEDWJlY6BMFzIxMWIPbSkKLYgcwIreIgA2S/8rKyjQN8rt374IaJIzDIw2MOoDqBdGEFzsYGF7Q3tJZeFrFDFzM7DS1/Nvfn7iz4cPPL/8zQWOl99wqhmKjMLgcMh+dDQLIatHFkdUD28sM8rzi2LNh6+mlKBaAaBjGZTm6xTCAy0EwO8hOhDCHobNhlsD4+BxHlANgBsAwNoPRLYGpRfc10UVx4YGpf/4w/GMGlf20AH///wOmeqa//Q7ZLFhzgQqHeMPtHy8agSmVJi7gYmL7B7IDZwgMBAAIMABhJOYNvD7xMgAAAABJRU5ErkJggg==")
-}
-
-.list-list .ico-file {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAOVJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwx4gJMDAMMRh0w6oBRB4w6YNQBow4YdcCoA0YdMOgc8Pzbt280swxq9gt8reKU58+fgzqnEjRyw1MgTkMWYBzo7jlAgAEAzk5sMbucHicAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-svg {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAOVJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOYKJHQmNjY0tQUFA4gc0RLLS0mI+PD5YOQCACSp8BYka6OEBUVJRBXFwcW8KkTwiAACwx4gJMDAMMRh0w6oBRB4w6YNQBow4YdcCoA0YdMOgc8Pzbt280swxq9gt8reKU58+fgzqnEjRyw1MgTkMWYBzo7jlAgAEAzk5sMbucHicAAAAASUVORK5CYII=")
-}
-
-.list-list .ico-apk {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAhlJREFUeNpi/P//P8NAAhZkzrVr1zyB1FwglqSiHSZAfBZZQEtLC7sDQJZLSUlJcnNzU8Xm27dvg6jVQByqqqp6FpsaJjS+JCcnJ8O/f/+ogkFATk5uJ8gRQMcYE+MAqgN2dvYMeXn5g0DmGmyOINkBa68sYfj55yeG+JEHexnOPD2OVQ8bG1uCgoLCCWyOYCHVARK8Ugzbb61n+PrrM8Pzz08g8cYrw/Dq6wuGZONcFLV8fHywdAACEVD6DBAzku2AH39+MFx7dRFF7OGHe2D67LMTDI5KHnBxUVFRBnFxcWwJk7wouP32OsPJx4fB7FjDdLg4jH380UGwGmSALWGS7YDTT47C2YvPz8TKPvX4CPkFESEQpZ9C25IQG+g90gimi23qGdoOVBJlaJVDO4o+ihzwE5joyAHE6qN5QURxFLCzcJBXAhKpj6ADCMUhpfoGPApIcoAsvwJBNTL88rQrB2AlHiw7grIbNj7NQmBAcgExKZzcnAICjMiNUmCb8L+ysjJNfXz37l1Qm5BxcEbBogeTGRge0N7SDq3puBMhCysLTlzm1YjBh2FsatDVgzDVc0Hf7mYwLnKtRREH8UHiVMuGMAPRLcKnlurZEJvlMDFiLSTLAeg+QuZjsxgWUiRHAQcz1z9qdVaxRRfIbA5mzn84C6L5h6fVP/x2p+7H3+80KR84mbn+ynEpNyfaZjVidcBAAIAAAwAW1gmCSUCdXAAAAABJRU5ErkJggg==")
-}
-
-.fileList .ico-bookfolder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAmJJREFUeNrs3E9r1EAYx/HJ/3S3mwTb7a4u7kkPguLBky9A8OrVk9A3ISiK4mvwpNCLHj37GjwJ4smjFNZuQTbrYXe72/hM2lrBS6LuhITvDx7SlsIkn5lkMp22VpZlivx9LAABBBBAAAmAADYEMP3woK7Xsiv1ylBb+1J7Us/dhgyEW1Iv25euKcdvrb2xbHU0mE9GjxbpgdMEwK7Uu43toe94cjnZYv23ra1UEO8oAdy1a47nSL0JkotDrx2bffbZVt55dQd84UfdO0HcrewE6gx4z20lD4O4p59KlZ2EK7OuL8cnUnr6HdRFT/CU39k6u5WqOw+pZ360Iz3ZV5bj1WgAHsvAW1bfkfr9Sc8olp0ZmcGaFv0M7FZ9G9QdkAAIIIAAEgABBBBAAiCAAAJICsfIptJyPlU/vn2SY2rmooJIbfZuyLHTjBFoEu+kw9K8zUaNQB09KsJooLLjlZqOPv7xfZbtqk7/5q/PD7+8z4/bV+8WbmuW7hvtMEPPwJNNH4237phog0kEQAABJAA2A9DbuKAcr81KpHys/JXD3+zJW06mZpOv6mj2HcBCdJalWltX8iXX6RdUmAyVO4u4hYsJ2ud4v/dmmADIJEIABBBAAAmAAAII4H9c9+ro9e66c96Gmd/7NrIW1tuL+U7Zwee8yuZsc6lUm2HcnBGY79GG5v6WTbfV6V1v1ghMLt/mGUgABBBAAAmAAAIIIAEQQAABJBpwnK2WSJTMqdlYA76eT8YKxHJ42kyyp38e+HQxPfSl7svHfXgKZST1Vuox/8HyHwMggAACCCABsKr8FGAAiCO50cIM93UAAAAASUVORK5CYII=")
-}
-
-.fileList .ico-folder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAY1JREFUeNrs3E9Kw0AUx/FM/kwwxSagqdVC9649gwdw60rIJQRFUTyDK4VudOlBvIdQjJvWVWPr9I3o3gaaNOH7g0eyCUM+mcybbKKMMQ4pHxcCAAEEEEACIIDNjF/mounr2SbeSyb1UNFYb1IjqVu/JRPhSOq+c3DoeDpa+2Bm8TWYTcYXxfTdawNgKvWytTvUXiC3Y4q1D6hk4QvjniOAWdPXQE/qKUz2h0EnrnRg5aqfh9d0wDvdTY/DOKULl8iJHyXnYbxnV6X6urB0VC3HKynbWgeN2T5EiaO3d/5epVq3MTe625Mn2XeUFzRoAn7LxJtvxD4wsx1FuaaSDtbGL5G07teATzkACYAAAgggARBAAAEkAAIIIIAEQAABBJAACCCAABIAAQQQQAIggAACSAAEEEAACYAAAgggARBAAAEEkAAIIIAAEgABBBBAAmD1gLlZzJFYMb9muQV8nE1yB8TV8KyZZGT/G3NdfH5oqVM578Pzr4ylnqUuFT/ipokACCCABEAAm5mlAAMAvOdJo4EAKcIAAAAASUVORK5CYII=")
-}
-
-.fileList .ico-folder-empty {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABBJJREFUeNrs3MFPE3kUB/D3m+lMp62kpQgEiXDw5CaYuGsUXTxtOOllr3oxcvI/0JiYaEzWv0AvHrzgcU941kQPxuxmEzl42gNshAXRpSC0nbbz871fmdpGBdoK7LTfl/zSMm0ymU/f7/febyZBaa0J0XpYIAAgAAEIQAQAARjNiIVvVv+8GvVrmeLxcJ/O9ZbHIx53Yh2SCD/xuJ/M/kCWk9zzk+nAH/Y3lm6WNpfsTgDs5/F7vGfUteRyAn/PT6h4uMkBYsCpqK+BNo9pNzU04njpfT2xUsr8eFEHvOskBiYlG1CFm49fY/He625qUFalg6vCXH1dfr3F4wqP4ci0D/FechJ94VQ60DbmtpMcNL+kstzo5J8OeJT/F33glKwh5nfchwrWiTuR/oOeBtjKARABQABGM2LShAYrT8ny50jpva/CJTVEvnU00mjKdiiWyG71o+V/yA4WvvnlfKHaayW89u87qMxJ8vrGyYt41ulKiYq5f0kFmmJOsMz9X3GrKW3cEq3nFanBS9X3S4+pJ9H6lkn1niIr+yOfIvq9puKFL54eIH9tmWIq2OCLKtU+rHCDb1uf8dInfjPHc685G1emKeG2iHf4545a+5SlttbAuu2QoPn2CKniPLnDVbzc6xvms3j/BP03/5jKFaJDnqbd9t6diPdFEZEQmLI3RgPnZ6iUmyUnPUbrb+6R5aTJTjEqvw5dnDPH8gv3KRkHXkMbE7N5FGbp498PDJ5knpMZo+ToJYMoqMWVF7TJWbibaayypzseL7yZ0FAwDh27ZrJMc9HYXKxOWW2nKTs+XRUPclTgJTNfVJSI669iGry+s93TSNcXDMk8ybqgZ4JcRzfgfXh52aBtlDKUOTdDBeeEAe5WPAMYrn2CJ5knU9ROjpjpKlCCJ1NY8FLOau2Yqdib86ZidyueARQAgZA1zjtygeKHJ8zfghbiCag3dKEBLwQNq3E34pnrLj8/qvPc2wpOz/HrVNngFoZbFoELoQRPMlRgg1Kuhheufyp7hvHGuw5vbW62ugYKRMZbpcKbauWVKlyfZYXFJ8DbqQpLG+O5mnu8J7QmVZix6tc84O0AaHYbjuTlDKX4qOxYv7bmAW8bwBoiVfu87DngNQ0YhkznAk9naWvq8QROABE7AAqY7Hn7klRrVYDXBKCg1d8wAN4ONxO2/RLwms/Az3hnzS4D0UIGAq8NQOC1AQi8NgCB1wYg8NqowvL8Qh4CIVrIQOC1Aejbx4DXDmDJHoXCXm/lEAAEIAABiAAgAAEIQAQAAQhAACIACEAAAhABwO8CGOhKGRJNxpZZYGmlXhVz7wiIzeEZM6X+kOfCk8WP75/56ysnMaV3HQHj/cWvvyj8I24UEQACEIAIAAIwmvFJgAEAn5Nwqgtf3PMAAAAASUVORK5CYII=")
-}
-
-.fileList .ico-folder-unempty {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAlFJREFUeNrs3M1qE1EYxvH3zNcx09ovaUot6FIUNyJ4A+IFeAfRXINQFIS60IV7Vy7cuPUaXEtEkG68ANEYjaZNE+YjM56ZhBIxlIykMVP+D7zMJnCY35wz7zmBRKVpKuTfY0EAIIAAAkgABLCccYp8+Nf7+4t8L3VTL+c01mdTr0w9cc7IRLhp6oW/cU0s1z/1wdIk3AmPmo+iXtM+C4Cbpt7o85c9K7udJDz1AZUpz6+KAayX/R1om3rtLW1fcs+tznVgpVT+8FSRs7BWi+XdbNSeuZXqrl7ezhbW3Mfvtj6WtwsbvLuOXt/1lrb+C97xTPzZuOeZ62NTNVM7pdk+6HVxKxfEnkPTOGkGZk1kz/W38iepLK88UzBNTMULsQ+sZx0lfyWOOlgQxhJFA3bJY3FdW7TnTATcHHWU42R4K1ceoDaWg0/PJwJylJvlUa7XDyUIYjnqBTJot9EZy2Gnl69MrR3xK95kwAxv7fpDWcPrr6zc2ht+H7D/9A9AlvAslnDU/SJxvy16EEm/UUPlpNOYqX7LFaeyMQRUSWr2f6ksX7wqynYRmmYLaiZa0PkqmZ1jDsOiV6s5oqQhOtMc38yLLzMLD74N34HKUqgURlQ0kVkEQAABBBBAAiCAAAJIAAQQQAAJgAACCCABEEAAASQAAggggARAAAEEkAAIIIAAEgABBBBAAiCAAAJIAARwIQCTdBAjUTAjs8RKlXoXdFoCYjG83EypRvaL9TtB98fb8PD7DZb01EkM3gdzva34I26aCIAAAkgABLCc+S3AAB9MnrCxlmzHAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-fromchromefolder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABCVJREFUeNrs3F1oW2UcBvDn5KQnbdYmTfPRLMnafdCLUcfGIhM3O2WgOPFiu/FCZBY6BooyvJAJiqNTL4ao6IV4oVJERbwYKoKiBTdlaLeVIV3Z/KhzW9O0OUuWpGnaJWnP3vd01LUGbba2W9LngT9Jc5JzyC/vef9vT0MVwzDA3HwsJCAgAQlIQIaABCzPWG/8IX2ivZzfS4eo95foWBFRXaIOWStkIIRFvbsisB6qZl/0gxmT+eDV1PCLuXRMrQRAr6gjNZ4mTa0Sb8fILfoBFTHx2Zw+CMCOcp8DVVGf2OpXNlWtcC7pgRWLYn545Q74qubwPmhzeu+MJlIs7ZEDi3LgruDhW93Fbqu9/gWbs1HOSrcNUEn1PKmJ25ellajgUkAuAB4EHrQ6N6zV9tuGl77QZ47ATs3hE5+kH4pa9d+Ne4HiWB1egL1MiYFXuCPWgR2yoygWY0k62PQ6IIdKiWwi3usdheGvcgQkIAEZAhKQgMsnC3I5q8VVgz13+dDqseO3xDi+P38FRy+lMGVwBP5v1jir8UpbM+Ra/KMzMRNw36aVaN/QyBE4n4QcGk5GR/HWqcjMiOu/nMWBe0L4OTKKs/EsAYtlVZ0N69016NOz+OlSetY2CZoYz+O17c0YyebxzqmhioUsGVCeqk9vDmBH0z9XgLsvJPHe6eisOa/z+EXUV1vxyFoXOu9rwv7uvxAdy1UcYMlz4KPrGrA1UIc3Tkbw2Jfn8HbvELaHnNi70T/reZFMzjyVXz8REaN0DE+0eityBJYMuFMAHvk9juODaRTEkDt2MSWQBvHQahfuDTqKvkZ25I2+WgLKuMVpeT41Meux3uEMvvgjjqc2+eGx//uibCY3BU1VCCgTnyiY674bU6up+OysDl00jufuDmDu5cWwvxYDyQkCynwzkMCuFjfuF02kUYy2h9e48OHOFrMrvynmO7kufFY0mWrr9K7ldlnfisU1u7DI1wKwoaYK+8OBmcc+7o/NnNaHewbx/JYQtoUc5hypqRZ8fk4350oCisilSlffCL76Mw6vgJTdNpObnNn+a2wMz3QPYIs4bSXe6ZGM+RwupOckMV4wq1iSYp787u8kr8YwBCQgAQnIELAcAO1qAds8UTRoE8sK8JauSFsUA2FXDA94I+JWh2aZXlD3pxvwQyyEX+J+ZCetBJybVkcCbd4hbHVHUWvNF90ua9/afvQkGvGjHkDvFd/yBlxlz6DNM4QdvsF5n6ZyRMrXyErmbTgaC+KYHqwoQPkNVcPRvIHd4CYiv6HKLsxlDAEJSECGgAQkIAEZAhKQgARkCEhAAhKQISABCUhAZl6AujFZoESJuW6mS8APrqZ0ELE0PGkm0iX/sH4wN3pZE/W4uO8nz7wyLOpTUS8p/EfcbCIEJCABGQISsDxzTYABAF5pTWwmgxlgAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-documentfolder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAlZJREFUeNrsnE1rE1EUhu98ZCZOTSbYpB9GKgguBHelP8BFodtuuxLyJwqKovQ3uFLoRpeu/Q2CgktxJdgPTChNQtskTTI9N1hw4cKkk5nMzfPCyc3qXu4z57znTi7EiqJIocllgwCAAAQgABEAAZhNufqj9fmpCXupSbxNaK0DiX2J164hibAu8Wbh7iPleMHUF4sGl9Vu8/hZr/XbMQFgReLjrfKa5+RkO1Fv6gtaYnx+uKQEYC3rHuhIvPdLq2u5hTDRhS3bGj28rAPc84qVTT+s0IUn0LYblHb9cFm7UnpdWDqwJ+MLCd2Kq5k5PgQl5RUWr0sp1WPMK6+4JE9yRVlOLkMJOJTE68/EObCmO4plR4l0MBPfRCpplwGvcgBEAAQgAAGIAAhAAAIQARCAAJwbJXqpdHlxos4a31W/04zn6bt5VVxdV26+MB8Z2D76Fhs8rWG/o1pHX2XO9nxk4HDQHY1hdUPlgsUbz9f48UkgXqhO+5fK2/eVm8CdcKoArxUHvL/VOf05GvOFe4mXszFNRENMo5yN6sK6nDVE40s4LpUfbv3TE8lAzoHjddJJsg2AMw6GEgYgHhirB86qBeCBlDAA8UA8EA+khAEIQACirADsndXjn/O8YX4X1teQo5u0wy9TXcPYDLy9/FjZjj+9zcjceg1jM9ALyurOgyd4IAIgAAEIQARAAAIQgABEAAQgAOcbYD0a9CExpv4wq2uA77rNugLiePA0M9G+/j3wZa/d8CR25PsKeP5LxxIfJJ5b/BE3TQSAAAQgAiAAs6krAQYAXiGbDBfBqf8AAAAASUVORK5CYII=")
-}
-
-.fileList .ico-fromphonefolder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAjNJREFUeNrs3E1O20AYxvGxndgQq04ESfhIxaalgjVnQOq2264q5RJIIKoiztBVkdi0S9acoVfox6qoEQkgjNriNLF5J1Cpm6glJHEm/j/SqySbsfLzeGZsTWIlSaLI4LEhABBAAAEkAAJoZnJ/fwg/vjL5u9Sl3o3pWCdSh1J7uSnpCBtSb/3ldeW4hZEfLOn+rkWXje12eOpMA2BF6mi2vOI6efk6SXvkB7Rk4POKVSWAddPHQEfqvVdaWsn7xbEe2LKt3skzHXDfDSqbXrHCLDxAXuQKpS2vuKBHpfRmYZl5XXndldJTcM2Y5UOhpNxH838upVSXMW/coCpnclFZTt6gDhhLx+tMxDqwrmcUy07GMoNN451IJe3LgFs5AAmAAAIIIAEQQNOSzvPAJFY/z7+o6/BExZ3rh/WA3IyaCWqqMPfk9kFdFgB/nH1Wvy6+DueOWE6APhl6i4pffpaNSzgKvxnR5sQCxt22EW1O7hh4l/Lq86G00/p0zCzMMgZAAiCAAAJIAAQQQAAJgAACCCABEEAAASQAAggggARAAAGcwqS6tSPNLRlGA9qO23cz0L/2y/RD121mBtALHvfdHzhor/SCWnYA/fmnSv9YMAq/S0+MHtibPcFbkjZXMzQGWrbyy2u9YhZmGUMABBBAAAmAAJoK2Ey6HSTumTuzpgY8iC6bCsT74WkzyaG+lXvdvmq5Ui/l/SI8/5WG1AepHYs/4mYSARBAAAmAAJqZGwEGAN+Yh/QHkxJLAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-mix {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAhFJREFUeNrsnL9KA0EQh/fukjtNNBc08S9oJSJo5TMItrY2CnkJQVEUn8FKwUZLa19BO7ESKwtRTBASEU1Mcs4GtVFRA5u44fvBcOF2YG+/m53Z4SBOFEUKNS8XBAAEIAABiAAIQDsV+8mhdLpsy1pyYrstmutabF9sK9YhgTArtpMcmVKenzA+WVR7GS0Xb1crpTuvEwBmxY66M2O+F5flRBXjEzqS+IJwQAnAnO050BM7CNLDY/Fk2NKJHddpvDzbAW77qexcEGapwk1oIZZIrwThoM5K7avCUmV9ua6L6XI7as3xIZFWfm//+1Zq6zFm008NyJscUo4XtygA6xJ41X9xDszpiuK4UUsqWCd2Itl2bwNaOQAiAAIQgABEAAQgAAGIAAhAAAIQARCANqgl34Vfnu7VY+FCVZ+Lnx+gK1TJzKSKd/cZ9bU6Ah9uzr5cpJa+r8dN+1odgfVauXHNTMx/GitcHn+Mm/QlB1JEAIgAaGkRcWNdql59biT278ZN+1odgT2D08r1gq8fQO7rcdO+puQUT5ai1PgMe7EJla7OyYG0crRytHK0cgiAAAQgxxhaOVo5WjlaOYoIAiAAAQhABEAAAhCACIAABCAAEQANA8xHtSok/qg3ZnkNcK9czCsg/g2eZiba199ENioPBV9sUX4PgedXuhU7FFtz+CNuiggAAQhABEAA2qlXAQYAvkAprthin2kAAAAASUVORK5CYII=")
-}
-
-.fileList .ico-musicfolder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAexJREFUeNrs3L9OwlAUx/HbFopCBKKAKImJg4OzPoCLiaurkwkvYaLRaHwGJ01cdHR28An0EYwjCREYwMTI33qukcVJVHq59ftLTiAMtP309B5yB5wgCBT5eRwAAQQQQAAJgAD+A8DW/e4kX0tZ6jykY1WkLqVOYhFphDWps9TiqvL85NgPFvS7pXazut9pPXtRAMxL3UznlnwvLpcTdMb/2LpKJTIFJYBl13I8T+oqkV1Yiqcy4a59rvNx82wHPPXT+c1EJm/sBGwG3I4ls3uJzLxelYydREwmqy+vh1J6xJZs0RM85c/MDR8lc+chdeynC3Ini8rx4hY14EAar2f+RurfT3qiOG4QygSLWvQamDf9GNgOSAAEEEAACYAAAgggARBAq2JsS7/xdKeCwfh2U9zYlJpd3ohuB44TT2fQe4t2Bw6TW9n68++sP96yBjJEACQAAggggARAAAEEkAAIIICRTCjbWc3Kg+q+NujAnyaqeKF1YJS72/o10HR3M0RsAPSTuZE+Zw38knRpnQ6c1JjubuunsOnuZogACCCAABIAAQQQQAIggAACSAAE0DLAWtDvITFiPs1qGvCi3awpEEfD02aSS70jfdR5qftSO/K+CM+3UpW6ljrgHyx/GQABBBBAAAmApvIuwAAZ2pRkuq79SQAAAABJRU5ErkJggg==")
-}
-
-.fileList .ico-picturefolder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA+tJREFUeNrsnE1PE2EQx2d3u7vttts3WlqKKYrBiO8Rj179AF49mfAlTDQajZ/BkyZc9OgX8O7BA0ExctGIECmlon2DvnedeaAQA9JW0227nX+YLIGQ7v52npn/PLtBsiwLWP8uiQEyQAbIABkgiwEywBEAmH93d5CvZR7juU2f9R1jAeOJyyGJMIfxzJuYBUUzev5hVqM2Wclt3q/mtxQnAIxivPZEkpqi4uVY1d4vWxlAD4wDApyXhxyegvFSD04kVW/A3tonS+LmDTvAp5o/eksPRPt2AsMM8LbLCN7TAzGqSn07CRd2Vg2PDzGoxU4OCz2EB5o51lpK/TsPjMeafxzvZBwkRR2iBGxi4tX7fyPJP1FHkWTLlg7mNFENjPZ7GQw7QBYDZIAMkAGyGCADZIAMkMUAGSADZICsjtXzh0r1SgGK6WU85u25IN0PvtglcXREBtoJb++G5fEzPzorA0n+xBxo3t4+/KkUUlDYfG/rDbOhBlogya6ewyPp5oTzamBbvFYD6qUsNOolUN0hUDQvN5FO1ajuQD61KI4tuQNJ8I1fYICdiOpVs1be65qaCaVfX6GcWwOXOwBu/3A8Ye2bD6RCT+EJnUZYpwQ0M34FZEXHZrDBRrqD4icO1GAOJMn4peDvmgywbe1w+0F2uXHZru7bDgt2f36GRm0XVCPCNbC9JGwWF7EOLkF27e3BT1VPCIzQGQbYicgbBpM3oVpMoY0pCxvTqZejzt3Ev6GMdemmyGaKkfOBiurBRjLdsSmnJV/KfhPwjs7B5ugB7MYzFtIfoF7OYf0MgieYRNPtE1lH42KjWoBKPsUA/zbjig0CSUKrc/XIMm/tvBjhGdj+8sb5AKs7Gax76T+Gfsom3YyDRh1Yko/srtCI509cP7HOCQvk5Ays7W5DMbOCy614eNGKSm+9C1BkoBXVACNyDnRfXCzN/MYiKLoPAokbA/n+om0Ay9k1AY8ageaLYQ2bQssSPqxxtRKOcevYIFahkFqCImYTZRs1CzN2eWBf/rQHIE4dxcwnHNM08EZnj7Uq1I29mHme0BTsbK1ApbgpvKI3ch6N9dho+0DasiIYtKlKM++JoxHOwubENRCGhEY6abAf29h2dkZ4ui28Y7pCt7fKuQCpOfS+zq4fjImOWMLUGFoqpJdF2HJRNk4kPc1A8mVG+KzwePbt8gTAh13bERlIXdcYmxHhVPGbCQyQATJABshigAyQATJAFgNkgAyQAbIYoN0AM1ajziS61D6zDAF8UcllgCF2B4+YoRZoQ/VRtfBDw7iD38cZT0eiZ66vMB7wf7D8TzFABsgAGSADZDHAfum3AAMAO2tj3VmRR4EAAAAASUVORK5CYII=")
-}
-
-.fileList .ico-videofolder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABSdJREFUeNrsnNtuG2UQgGft9a7Ph8R27KQyLVSgCCICBSTENQ/ALVdIeQkkEAjEM3BFpd7AJQ9RiQsqJGgJIIFapS0hjp3E8dler73MjO3QSNheO+na3sxIv7KKvPNrP88/x00Uy7JAZHbxCAIBKAAFoAAUEYACcDlFneWmyr2PFvFZdnB949Be+7ju4PpSdYkh3ML1dWh9E7xa8LlvZnU7G+1y/hOjUvC6AWAK1/eBZE7z+vBxLOO5b6ig49NjaUCAO8vuA724vtXj2ZwvFHN0Y8Wj8Je37AC/0qKp9/VYSqLwDPKBGox/rMfWyCvNLwpjRNXw52e4KLRuLE36EIyDFlkdHqW5pjFfaNE0fpMZULy+JTLAHhqeuRB54A5FFMVjORLB3FiJpOZ9DKSUE4AiAlAACkABKCIABaAAFIAiAlAACsArI4szVLJ6YDSOwagXwGyVwTRq/DsWxQOqFgbVHwMtlAYtuNqf7AhAZGR1oVnag+bpHo0LR8I12xVerfJTbvwG4tchkLgOiuK9ugA7zRLUDh9At9Ps+xPVD3okgxaWYkiqHiV6CK4Kva4BRq2A6xCv29A4/othRjKvgy+QuHoAW5V9hLfLgAhccPUm+KPX/ueTygAkINgkQHqTwdURYM9sQfnvexBeew3v3bg6ANvVA4T3K1/r4QwC2EKXZvcoKuCP5fC+LFTyv0AH/SbpUtAn6pGs+6MwBYjqAF4g/gJEsttTwHsGIx7x2MZbZ1ZLOs3WqdsBWlDN3+egQJYXSm1eUJ+C1vsq+Cgqo85q/gE4PSN2FCD5rm6nwT4vnNm6JK0KRDPbbJGkm/ZwJ0C0kMbxQ74MJV8Zm36cPvkBaoXfOMWxe5yDiRf5unHy6L/80U0AjcYRpx/DVGWsn8S0hSyp/PRHjrR2hPwpgaTPG/WiCwHWj/pRN7LOx85WwMHEuYTWSJF2shl6ODL3v6xj9wEcRkgtlJzu5GN1Ut7/CY/mw4mf9QVXzu3lKoDk4Dnx1CIzRW+qPCoHP6N7G+0XqV5+di8XAbTwwc0zhz+zG8AyrlbYHRNMtEG8Mh1LZxwCeHnv3li2I6ziriPsGVrHqI6LDaGmQXhM8m11jQtb+eIC9PXfnjeN6kz3BzDPi117h9OgkYGKeogoXl/IfQCHLadpczSypuj6LUy+X554LDuNk3N7uQqgFkqddWLsOngCkci9d3bvpEqnXTs4t5cTojpngSvg1ULQNeoMsZ9Qj4AdXgNVj0Bw5SXbwaB5+pj9K+1Be7mymRBI3OCf9aM/x9a50ewbCO+mbXjUrW6UHp3bw5UAqWus+uNcr1YP7l9ak4JaZGR9pNvpzrTD/UAFrWubUxqavtWLf1wc3uEu18qkk3Q7lf/NCWB/cBRdf5PbWeS3KljnjivPJtXI7eo/rIt0jktxXAOQIxceNc7pvDq3uUp7d6FVfmIvOqPV0Rj05PFd6DRPWAfpIp1zeRaYk9CQPJ57l2cZPBgq/M4NVy2c5uG5R9UxIQ5S7QZds9nv82EtTHlkb1BxUCs/srY1F8ubO8DhcY5tvM1W2MDIPBycT2rL05gziIk1jznnLAvxageB0HJJHrAbmAx3WmXo4fXQ0ihAeHwB8NGrHeEsWmYAFkUW6g+uCQzVvAFYHpG3swSgABSAAlBEAApAASgARQTgfAAWra4pJKaUAbMiAbzdLhdBIE4Hj5ih3KFmwudG9UjD9SFeZwSPLcnj+g7Xp4r8I24JIgJQAApAEQEoAJdT/hVgAK5f795U9dlNAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-sefolder {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA/9JREFUeNrs3G9IG2ccB/Dv5ZKLuUSN1miMq3/atVU6aauu615so6ulY+2gK0ihrFhwZRR801LGcLJRcXtRxmAwBhtzyFYHZUPYi/XNBlspdK3rnznHWitpFfvHNkprUqOJJrfnuZYiYiA6tRq/X/jhn3uSI588d7/nzqBiGAaY2cdCAgISkIAEZAhIwKUZa7IDgx0HFvtrqRP19QLt65aoVlFN1hSZCJWivnD6yqBq+rzvzIiNF0SGB96PBu+pqQDoEdXuyCnUVJt4OUZ03neoiBOfPTMXArBuqZ8DVVFtdnd+oc2ZuaA7ViyK+eYtdcBmLcOz3Z7pWbxNpP5c0bzs+GPL1v/7FG9adfd79sw8eVZ6aoDK8PlaTXz9QJRsswWJBjbEf1tMeBB40NJXwJqmPzW8YF+XOQOPaRm54p30QlFtiUdfnzvAjOLKOXiWuJh4E4tiHVgnO4piMRakgz1aB0SRKpFNxPO4ozC8lCMgAQnIEJCABFw+mfPbWT69FNW+d5Cl+TAWC6F7+Cx+H/iGgNNFVWzYln8QG7J34BnnevN3ofEhE6zN/y5ixjgcajqy7D7cj9wm4OR4HWtwcO1XyHOsMn8eivTjzmgP7BYduwsbsDlnD1p6DuHu6HVE42OcgZOjW92oLzsBt+bFucAPaO9rRnjigblNzridK4/g5bxa1Je2ofnvakRiI2wik7Mt/20TTx6qJ/xHn+DJjIrz3o+9x/DrnS/NQ/dVMZZdeEo2Zu80oU7d/CzhmJ/7PzVhN2S9xi48NTlpK3F6oBXHqzq5DpzNg87c/Q7lWduTGpvKDWTWM9Af/NNsEg0XqxAcD3AGzjQVOW/AoqioKWlKOKamuAmfb+lLeqYuK8ASVwX6Hv6FTdmv463Vn8CuOp9ss1nSsKeoEa94a9F1/xezeAhPiVzrfXSlGvtWH8cWT425aO4f6ULciKPQVW5eoXQMtuPkjUZeC0+X2+FuqBYNLdcO4cXcvXgpbz+KXBvNbTdCl8wmIwF5MyFBvvUfRuWKXbg8dAoXBn/CH/dO8m7MTBIY6xXrwF4wvB9IQAISkIBzEodY1lQ418KtutiFk9dXsF4vwWZXKZ7Ti2FTHj1dz9gtnA/9i86wH6PxKAGnZk1aAapc67DJ+Sx0cek23XZZe42t6Bzx48JIN/4J9y5vQK8tG88LtBfSy5I+TOWMlNCygrEwOh5eFXUlpQDlJ1SNjKJydoNZRH5ClV2YyxgCEpCADAEJSEACMgQkIAEJyBCQgAQkIENAAhKQgExSgAEjNkGJGeaxWUACtkSGAyDizPCkmUir/MP6h9HQoCZqn/jeS56kMiDqe1GNCv8RN5sIAQlIQIaABFya+U+AAQBLjB3QxtGdmwAAAABJRU5ErkJggg==")
-}
-
-.fileList .ico-access,
-.fileList .ico-mdb,
-.fileList .ico-accdb,
-.fileList .ico-sql,
-.fileList .ico-db {
-    background-image: url("../img/ico/ico-access.png")
-}
-
-.fileList .ico-c {
-    background-image: url("../img/ico/ico-c.png")
-}
-
-.fileList .ico-cpp {
-    background-image: url("../img/ico/ico-cpp.png")
-}
-
-.fileList .ico-cs {
-    background-image: url("../img/ico/ico-cs.png")
-}
-
-.fileList .ico-js {
-    background-image: url("../img/ico/ico-js.png")
-}
-
-.fileList .ico-fla,
-.fileList .ico-flv {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAz5JREFUeNrsnL1vEmEcxx8OOE1LEUyKthATgqYJ6eKEM8QRZ1+WmrropJs6mLjof6CJL9HFl7nMJY7SmLg0JIaBRBKrkBhDW2Io3Hm/B69eT6D3Qjm4+36TJwcctL1Pvr+3p+F8siwzyLoEIABARxUYdrJcLovK4YGyVpQVd8tFxxOJp8rhltH3nwiHrQFU9DASidyNRqMsEAi4Al6lUmGNev3mfCzGzEC0CnCV4AmCwCRJck3YnV5YYN+3tkYC8bAcOE/w3KZjosghkhOVp09QRByE6OkqPAqInm9j7EJEH2gTIgDahAiANiECoE2IAGgTom/YdpYyC8upVMpVcBqNBms2m6Y+k06nfVZHOddJme1ZKBTqucf3j8ugx7VaDSGsVTAY3N8Y0Uaf1Y1lzzlQhUjqdrv/uW6QEwGwD0QC1Ol0+NEsOM8D5Bf/N5S1W3UT78AfK9dNvf/U61d9P69/3Q5ECmVa+jBGCBuU3+/fd6IZeI4CHJWDRgmRoGmrsRGImES0MATBtAMBsA9EM//GAMB+862urUERsQgRDhwDRAC0mzOBAACdHQed+sWHjXST1mjDgW5z4LQ4DA4EQAAEQAgAARAAARCaqEb6KEfBcTbpcOC0OdCuOyZtBIQDARAAARAAIQAEQAAEQAgAARAAARACQACcIg39tuaXbA53JlO0VFy3/m1NURQ9Da/dbiOEj1Jj3dIP5/MscuVy33P1R4+ZmEzy81+vXhv6c44vL7PY/XusU6+zb7fveAegqkGACKARzVzIMGl3lwViMQ7z9+YmqrDhP3h2loWyWdZcK3AHEky0MSZE8Eg7xSJrlUpsJpPhUD0VwmfevjnwnGD8fPHScPi2PpZ4CNOR8ip3ZKGAHHhoS6XkSFo768Vei1Gt8kVQPQXQcvjmeuF78sYqX3q4BBMAhxQPynfktF/v3h94PfH8GXehEwCnpoioxYLynlZqLqQ86EQxmUgH6ouMCkrNeXq1NkrcgU4Uk+GbCflLXXFvz9PjXjsYlJYKa35LISyfO7tBd7Pw4u3i6Zr5tadSn6yH8OLixY4kf/BVq+fZ9ra3nDg3J8nJ5GeWiOcshzDkwlEOAF2mPwIMAMxjFWM7SdA6AAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-htm {
-    background-image: url("../img/ico/ico-htm.png")
-}
-
-.fileList .ico-html {
-    background-image: url("../img/ico/ico-html.png")
-}
-
-.fileList .ico-java {
-    background-image: url("../img/ico/ico-java.png")
-}
-
-.fileList .ico-log {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA9lJREFUeNrsnE9IFFEcx9/srlMbq+2fXHZdD8pG0WIHKQ92iP6QYhRFtzyVHiI7FJ2KIAiMTkoeMoSwTnoqhKLQQ0kHgzI8FAaZGIiu7JKKRVuLO9P83jrjpOu4M7Pu6rzfF5aZffNmYT78/nzfWxhOFEWCMi4bIkCABZVD6+Lo6CgvHW5LnwvSJ2SVhw6Vlz+UDi3Zzt9ZUmIMoKQ7brf7hsfjIQ6HwxLwxsbGSDwWu1zq9xM9EI0CbAZ4NpuNCIJgmbQLBINkJhrNCcT1amApwLOatvE8hQiRKH3txCZSQIhMd+FcQGTexpiFiD7QJEQEaBIiAjQJEQGahIgATULktLazpLWwGA6HLQUnHo+ThYUFXfdEIhHO6FLOcpLW9sTlcqWjh1vmstb55OQkprBaRUVFysaIOvuMbiwzF4EyRFAqlVoVdWtFYt4BTsV+5AVGyO8zDBEALS4u0qNecBsO0OiD5VNyKqu36vSCZN7GAES73b4qjVdGJdZADckAIRIz1UIEmCVEgKbuxpjCOgW773ojEAFmgKjnbwxmbYzm+nYp+rIx10zbmGwgYgpvMEQEaLZmIgIEiAC39FJwq9uYQrsCtDGYwggQASJAFAJEG4M2Bm0MCgEiQASIAFFoY9DGYApjDUQhQASIABEgCgEiQASIAFEIEAFuWmluJnQ8GkBCkrraI8YAgnieZxpeMpnEFC5YCudKh2urSP2xg+TW3SdrzvF6iknd0QNk/74KZezbxDQZePORTEX/35wNBX107u7KsnXnWgLgegIgFxvryOzcT9LZ/ZxCAKBnGmpJS9Np0t3TT8YnonRuuDJImhrrKbDWth6S+JOk98tz2zqf0t9hqgtDNCUSSQneCyWCAMLjngEK6mzDIWUunMMYXAN4ILgn/f0vjXamIhCiB1Kx//VwxusfRr6S8+eOkKql1IbI7JdSdaUAZmtbrzVroJY87uJ0FM1krl3TS+Net0sZG5cikKkmspGC2qluJpD6UAeZATg3ny74oYBPaRRqlQXS/+7Nzv9aHgsuz4Xap9THk7UkXFHG1lIOGgA0hZrqvRmv11TvoVH1+ct3mrrQKDLNdW7n8w5v03Rh8G9OJy/ZkFO0qcjNQk7PvldDSqPofTZIvSJcA2hqGwT35Fuaby66dP2+mIulnGykM6nv5RDttGaN9Nt3n+i8emk8lzUQlnJd7dc4QwCv3nyQEkSO6eWejROFjntX7IZSuDzofQ8vp2HxdfHwzPDsoYBn2HAX9nldJwRRHJyJzVf/TiSZisQdTl4I+H0ju3zFxw3XQNQW6cIIkGH9E2AAawxpPqroZK8AAAAASUVORK5CYII=")
-}
-
-.fileList .ico-mht {
-    background-image: url("../img/ico/ico-mht.png")
-}
-
-.fileList .ico-php {
-    background-image: url("../img/ico/ico-php.png")
-}
-
-.fileList .ico-url {
-    background-image: url("../img/ico/ico-url.png")
-}
-
-.fileList .ico-xml {
-    background-image: url("../img/ico/ico-xml.png")
-}
-
-.fileList .ico-ai {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABLNJREFUeNrsml2LE1cYx59MZpKNSTYb2tUsG0trqsX0YrVUL1pvpNSXFgr1poIgpUVEP4FXgvQ72ItCL7wuxStxlQVfSxFBS+lCXSPupl2XTeu62d1uncyL5zmzEyfZ3UlmEpJJzvOHw8mZOSdkfjxv52RCpmkCyb8kQkAAuyrZ7ebk5GSEdedZ+5q10X556NFs9nvWnW12fmpw0B9ApgtDQ0Pn0uk0yLLcF/CmpqagND9/ZnjrVvAC0S/AbxGeJElgGEbfuF1mZATmnj1rC8RGMXAY4fWbopEIh4iWyIYXKYl0EaLQWbgdEIUvY1qFSHVgixAJYIsQCWCLEAlgixAJYIsQQ27HWWwvbOZyub6CUyqVoFwue1qTz+dDfrdyfSe2t4dEImFZT+g1l80+F4tFcmGnFEWpHow4vc/vwbJwFmhDROm6vs7qNrNEArgBRASkaRrvvYITHiB/+DVXdh7V9bwFlsdPgbH0F0jJLAwe/qEjENGVsdW7cTMAA5VEtH/+4PC4VbAex51QOBzmzSu8wAFUn45bDzS0o2bcSYjOeNhTFmhWVqBSvMk/x/ZYp+w4xuudEp6+96wFqjM3wNRVCKfeBvnN93mPY7zeSSFEL39jSEFzX2Vkf02vTl9vav3yrXO8tUP1ZU3gAeqLT0FfmLKyYmZ/Ta8//5Pfb/jQksJbu9QsRDlI1heKJEF+Y7f1w1iPY1Nd4vdjY6ddvyN+4Lu2/66eSCI8zk1PWG6b+RBNyTYpa8zdeILPC6K6DrDy911uZZbb7qt1j7Ux3sd5bnrx01HehANYrfUcFlfdrzosspM1Yc8ANJZnQZv/rSbm1cQgR0zEeTifADqtz1Gi2Fl3XZZzXG+2pBEDoGkwt3wNxK776uW8zuebwXrJqWtlTGXuPhir/1bHS9fPNHZ5Nh/XbQZbKAv0mxSClky6YoHG/wtQmf3VShTRFAx+dglC4YhrrVi+chLMl4t8Ha6XBtLiWqAzlkVzn7vC45DZ/Wjuiw1jp6AAx9eDaSAn6CC5cccBaqXfq/Vc5J0j3IWb2peyeTi/vn4UDmC1lmM7jOjOLz2t5fPtncnMhHgAnafOSvYASPGMtx/L5uM6XgZ1+LQ6EADtU2fUwHtf+foOe103Tqu7D3At+MvbPqj+ceRVuA7XByWZCPd2llcVCgXXt7Po/cBePo0hgCQCSAAJIAEkgCQCSAAJIAEkEUACSACFk+v/wvKd0zB9hwBB/rY/gKioLDbAlxq5sHgxcPjgBcgevwzx3KFab9g2tuF1AuiMKYkMB2VUlmHLWx+TBXoVWhfCW3x4iYNEoATQC8B3D8HK42uwWrReKo9t/4gANqsYc1lJSXB4hrrC+2T+GAFsVluYtWnLc6A+L/Dxf8VfONBYgGNhYKo8jHWx7RYozLT1YFdn7hJAV/ddi3WzP5/g7msrNXYSkruPgRS5SC7cKPvasc8pO5nEc4cJoFvyQBfGmFcvjIfqQoEDlpSBwAF0fbno0Y9H9AisSCEQU0hGhbix65urYV8WaKZ23dMN64tEhMefPbXzvu8kYsZHP9XAuKGXn+yFypJYBw9K0jDTOx6Y8ewnvl2Y1INbOQIomF4JMACqJM9nuTUMmgAAAABJRU5ErkJggg==")
-}
-
-.fileList .ico-bmp {
-    background-image: url("../img/ico/ico-bmp.png")
-}
-
-.fileList .ico-cdr {
-    background-image: url("../img/ico/ico-cdr.png")
-}
-
-.fileList .ico-gif {
-    background-image: url("../img/ico/ico-gif.png")
-}
-
-.fileList .ico-ico {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA7lJREFUeNrsnEFIFGEUx9/szu66uOvumCtuSlREkB2ChII6dEgisFtCEQVBetBD4KU8lBAFURejg0HSqYgKjwke8tBBrEPSaYMMCrRW1NpCxTZmdvrep7vsrLObO+vubPO9P4zfOPNWmB//9733fYsj6boOJOtyEQICaKvkQjdjsZiXDQPsuMiOZqc8dHNLywM29G42PlRXZw0g041wONyvKArIsuwIeNPT07AwP98TaWyEYiBaBXgJ4blcLkilUo5Ju6ZoFObi8S2B+K85MILwnCaf18shohPZr0NURGyEKHQV3gqIwrcxpUKkPrBEiASwRIgEsESIBLBEiASwRIiyaHDq2LoWl3Ob1dfZ2Z5Qa2svAVwXW9tDIBDg55IkZa7nO5+ZmaEUzpbH48lsjGRvJlvdWBbOgWmIKE3TNrgunxMJoAlEBKSqKh+LBSc8QP7w66mcvVVXLMiqnwNXJ19A4v45PpYLotvt3pDGua78bwEm348ZxnIIAZpBdMRKxHfghGEsN8Rs5zmiiPiPnOVHJZT+6gJbGsc4sNJCiMV8jUEATbTZAlLVKYyVN1fK5acVhUgOrADEqnVgttvM3Fg1cyb5jAASQAJIAEkEkAASQAJIIoAEkAASQFIxqrrdmEI7L3bvEZIDRXCg3Y4iBxJAAkgASQSQABJAAkgigASQABJAEgEkgATQwSq4H1j78DTMCQ6oFn/c+2AN4FqET2yCapJS2LYULod8uw5C5MJdSIwOwsq70cz1UHsXBLP+H+RP/COsxl7D0sRzw+fN4lamRg1/y9EAzdTYPQSumoAB6rbO6xA63s3PESLeb2Dgc+OUU32gdPTx67mwhajCwaNnwBvdCz9Gbhlc9H3kJiQ/T7H7a26rbevgcYtPrhriEi8H4df4MIctK1HxAPpbj/FUxVTM1cLjKzA/3MvdhSAxTk3EN8SlgSJk4QCiq9Sf8fxFcB2YqyZoChmV+r3M4r6BHBbQgbQSKVHoKnRhvvmxZeAVuPxB5rKlvHGY4rKyvaCTHQsQ5zVsbczg1Oxu46mJabw08YzPl2aFIj332dHK2A4QHxoh1XdeMxQB7BUR7K/xR5k4dGvD+TuGOGxjsAJjJTYrMI7vA7EAYKUNtXfzfg6PdGpjv4cONcZ1mcbZ1UhLhV4486X/kCapSeZSCcSUDrrHn9p5+43bUgpr0f2TkNLwtT4CsmPPzJ5da9o3aTmF9fodJ1WAMffCp8PS8qJQ75jRAw2qFtnzFhlYTmESNdIEsNr1V4ABAKATVWjNArx4AAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-jpeg {
-    background-image: url("../img/ico/ico-jpeg.png")
-}
-
-.fileList .ico-jpg,
-.fileList .ico-JPG {
-    background-image: url("../img/ico/ico-jpg.png")
-}
-
-.fileList .ico-png {
-    background-image: url("../img/ico/ico-png.png")
-}
-
-.fileList .ico-psd {
-    background-image: url("../img/ico/ico-psd.png")
-}
-
-.fileList .ico-webp {
-    background-image: url("../img/ico/ico-webp.png")
-}
-
-.fileList .ico-ape {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA7JJREFUeNrsnE9M01Acx9+27g9jIkOZTMAYiTEZF4melJtwNJ6MHgwx/jlovHhSL0ZOejNGo4l6Mh7wZMSjHDyoB4NycolZNJpFZhiJSmRs0K6+X6FzsNKtLdtK+/0mTbf2tUs/+/5+v/fe8uaRZZlB5uUFAgBsqgS9k8lkMsB31/l2mm/dTnno7p6eB3x3sdb2W9vazAHkGm1vb78ajUaZIAiOgJdKpVh2ZuZCZyzGjEA0C/AswfN6vaxYLDom7LricfYzk9kQiNVyYCfBc5qCgYACkZzI395HEWkiRFdX4Y2A6PpujFWI6AdahAiAFiECoEWIAGgRIgBahOjRm87iY2G5r6/PUXCy2Sybm5szdE0ikfCYHco5TnxszyKRyLJ7PP+5rPc6nU4jhMvl9/tLEyPl0Wd2Ytl1DlQhkiRJqnDdek4EQA2IBEgURWVvFFzTAM4/e8zEb6m6f46wey9rPXFOv81KKJdP1RkF2fAc2Ah4Rj6HIPp8voowXutK24VwZOQS88V7N/y+UibN/j65Z+gaFSA5USsX2hJgPeBZuS9BJGjl1diWIWxn0ey7UQcCoAZEIz9jAKDW+LbGAuLqfmAtEOHABkAEQKs5EwgAEAABEAAhAARAAHSl6jaUmx97yMTvX+BAs3IDvLo6sBGyg8s3dQ60g8tRRADQoQCFPftMnUMRWVHr8TNwoO2/fRu4fFN3Y+zgchQRAARAAARACAABEAABEAJAAARAAIQMSXe1ZubyKfwzGVf89lPzqzUDBpY9OVGLVRYhIoQtqmkTqltGLimzxrmXY6zw4W3puJ8fo1VMayXnc2zh1bjSdr02pOKvWfbnzqizAXqj2xV4BCXQP7AKoCparrX09fMq4OGjJ1cdW9vGNVU4eOBwyVEEkoBWU27iRcmhru/GBA8eYoXJd2zx09RyoerfjxxYqyhkPaEwW0x+VFxIEEODwyz/ZkL3uvDQMWVPIeuLblNea+XBBe7Uavfa1AD9iQEl0UvTy3/msJScUqDSpjpSCw7BpoJD16oA7ZADGwqQch2BIkVv3K0AWw7QDnBsB1DNdb9vXVEcpaqFh2docIg7LIyxcLXqSy4rh6f09nk+VIsLiohO8aAQXpoYrzhH+ZA2ApybfV7zPbWKSKM70rqTCdPXzkvBQt7Vw71CMFTcefORz1QIi1273kscsBunZOiZ6dnFrt5J0yEsdcSG87L8Wpj5MeBZmHeVE+WW1qIY656SOnYcMR3CkE2HcgAIlfRPgAEAIIZMFb61acMAAAAASUVORK5CYII=")
-}
-
-.fileList .ico-avi {
-    background-image: url("../img/ico/ico-avi.png")
-}
-
-.fileList .ico-flv {
-    background-image: url("../img/ico/ico-flv.png")
-}
-
-.fileList .ico-mkv {
-    background-image: url("../img/ico/ico-mkv.png")
-}
-
-.fileList .ico-mov {
-    background-image: url("../img/ico/ico-mov.png")
-}
-
-.fileList .ico-mp3 {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA/xJREFUeNrsnLtv01AUxm8SO0mbUOKKhj4RaoUqpQsFJuhGOyImHhNCBQYQf0BZECwgJgYQSBQxIIaiTsBIBwZgQIVOREIRCBTRogaBVEjzsmPucevgJm4aX+fhXp9Pct3G17b883fOufe6jkdVVYJilxcRIMCWSqi2MR6P++nqKl3O0qWPl4vu6++/T1eXam2/s6ODDSDV9UgkMiVJEhEEgQt4iUSCpJaXL3ZFo8QKRFaA5wCe1+slxWKRm7Dr7ukhP5aW6gJxqxzYBfB4U8Dv1yCCE+mf97CItBCiq6twPSC6vhtjFyL2A21CRIA2ISJAmxARoE2ICNAmRE+16Sw6FlaHhoa4gpNKpcjKyoqlfWKxmId1KMed6NiehMPhNfd4/nPZ7PdkMokhbJQoiqWJEWP0sU4su86BOkSQoigVrtvMiQjQBCIAkmVZW1sF1zKA6acPifw10fDzCHv3kdCp89XbrIeycarOKsim58BmwLNyHoDo8/kqwrjclY4L4fCZy8TXM1D34ypLSfL38V1L++gAwYlmudCRABsBz85xASJAM1ZjR4awkwWz71YdiABNIFp5jIEAzca3NRYQV/cDa4GIDmwCRARoN2ciAgSIABEgAkQhQASIAF2phg3l0jMPiPztMzqQVW6A11AHNkNOcPm2zoFOcDkWEQTIKUBhcJhpGxaRdYVOTKIDHX/3HeDybd2NcYLLsYggQASIABEgCgEiQASIAFEIEAEiQASIsqSqszHS9A3yy+WAJPhx+wkbQJDfwmtPPCq/xUuIGMKNDOF6Kjg2TtrGjxP5yyfyx+RNItgGbXLv35DVFzNEHBzW3mYql5pdJZmXz7V2xv10ZeaekezrOf4Alk5IwXilXaT4++eGzwOHDpu2h9e2ChS6rh0Uavux09pnABngAXAAGjh4RNumZjIlwNxVYXCQf2T/xjw7Mko8wfYKqGZapQ4DATy4GcpisgRLX/t6B/h1YG7+reYUY5iJsVEttK0qPfuoIk2ACh8X+O0H5uMftBAW15+agfPAgfkaL7qd5jwNkgE43BDp2p1Sji0w3Ixt40AIOVhECg0uFHIfhDUABJDlKi8k0BZynjHcIXRhgZsSOjmpPa0rdyc3AHUXBscmtGrqjx3Q4AGYWopINUE7SBEQyulZjodycJEQugAREj5rzopM3dLC1qxQcT0W1kMWnAKhyJqz9GPo+RRyIaSEfBOLSMv+M6EQX8t5dvprkAvL86TeEW+Wqn710+KVC0ogl3X1cC8XCBZ7b077mEJY7t7zTqGA3fhl8XDNcO1y98A8cwgrndGJrKq+Epa/j3oyaVc5UW0LFeVo34LSufsocwijHFqFESCqpH8CDACOqX4es1WjewAAAABJRU5ErkJggg==")
-}
-
-.fileList .ico-mp4 {
-    background-image: url("../img/ico/ico-mp4.png")
-}
-
-.fileList .ico-mpeg {
-    background-image: url("../img/ico/ico-mpeg.png")
-}
-
-.fileList .ico-mpg {
-    background-image: url("../img/ico/ico-mpg.png")
-}
-
-.fileList .ico-rm {
-    background-image: url("../img/ico/ico-rm.png")
-}
-
-.fileList .ico-rmvb {
-    background-image: url("../img/ico/ico-rmvb.png")
-}
-
-.fileList .ico-swf {
-    background-image: url("../img/ico/ico-swf.png")
-}
-
-.fileList .ico-wav {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABE9JREFUeNrsnDts01AUhm8S59E2lKbQ0PQl1AgVpQsFJuhGOzMhFlQhXhKoCwuPBcEEGwMIJGBCDLDCyMICAyqEpRFV1AqIaFADKqpIX/EDn5vc5CZO09hpXNc+R4qcHD+i+/n/z7Fv5LgURSEYxsONCBDgtoZQa2UikfCpi1vq66z66rXLoHv7+h6riyv1br+7vd0YQDXudHR03AiFQkQQBFvASyaTJLOwcLkrHCZ6IBoFeB7gud1uIsuybWzXHYmQX+n0lkDcrAZ2ATy7hd/noxBBierHR9hEthGio7vwVkB0/GVMoxDxOrBBiAiwQYgIsEGICLBBiAiwQYiuWtNZ6r2wEo1GbQUnk8mQpaUlXfvEYjGX0Vs524V6b0+CwWBePa4Sl43ep1IptDAfXq+3ODHCu8/oxLLjFMggQkiSpFHdRkpEgFUgAiBRFOlSL7htA5h99YyI35JN/x5h/wHSdvpC7W0KVuan6vSCNL0GmgFPz/cARI/Ho7FxpSotZ+HgxCTxRPq3/LhSOkX+PX+oax8GEJRYrRZaEmAz4DVyXIAI0PhubEkLWzlg9l2vAhFgFYh6fsZAgNXub+tsII6+DqwHIirQBIgIsNGaiQgQIAJEgAgQAwEiQAToyGjarVz25RMifp9FBRoNJ8BrqgLNCCuofEfXQCuoHJsIArQpQGFwyNA6bCKFaDt1DhVo+bNvAZXv6MsYK6gcmwgCRIAIEAFiIEAEiAARIAYCRIAIEAFi6IqaT2umr57BfyZTI3L/hfGnNX06HnuyY6xv8hAiWtjqNdAd2ktCtx+QlrGTZfn2S9do3tNTejDGFWituu2uiUma9x85Xsx5B4doLjA6pnXN8AhdB8sdD1Be/E2k+RQdMA+KgePz3mj+vZT+UXYCYHpeWV0uA5Kbm6HH9cUOa77TGxuh269Px+3RhWGw7s49GlCimvdEBop5eA8Dz83OFHOgOsitvH1NQQLQYn1KfKYngs/ByYHjr019sM9lDCiKVx2AAvXk5r5SVcE6pkaAB8CKAI8eozCYmnzDh0oAp79ocgAPjgdwbQOQKYrZFZYwQFAmP2gAzNuXwYVtmSUDo+Oa8sDbGOzL8rYBCIOHAYHyGChWw1heKKiTQa0GI5eI0/35WsjbuGjfT+9N68Km/awJYMCOMHgGlOW9tElky/IAhIGCjlrZJJilwd7QtcHG8uKfvGIL1rYVwHwdHKOXHXyTgDzkvBXNg9W1v/eul9VEgAXbL79ppXl4ifQkHCTySv4EgGptdy/M4ICy+DrH8tBh+Tx0X1AZD49ZljWXUjOJ0/3BvmY1D9MB8vbkLVZpZ9Y8ADTUPI2SC3UTALPuzewMn826fKlrMmH+5kXJv7bq6Nu9NX9A7rn71GNIgWL3wEdJBezEKRkYM4xd7O6fMtxEpM7w+KqivBMWfo64VrKOUqLS0iaL4d641LnvhGELY1ioiSBAjKrxX4ABABrs14sDnYP6AAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-webm {
-    background-image: url("../img/ico/ico-webm.png")
-}
-
-.fileList .ico-wma {
-    background-image: url("../img/ico/ico-wma.png")
-}
-
-.fileList .ico-wmv {
-    background-image: url("../img/ico/ico-wmv.png")
-}
-
-.fileList .ico-doc,
-.fileList .ico-docm,
-.fileList .ico-dotx,
-.fileList .ico-dotm,
-.fileList .ico-dot,
-.fileList .ico-rtf {
-    background-image: url("../img/ico/ico-doc.png")
-}
-
-.fileList .ico-docx {
-    background-image: url("../img/ico/ico-docx.png")
-}
-
-.fileList .ico-pdf,
-.fileList .ico-fdf {
-    background-image: url("../img/ico/ico-pdf.png")
-}
-
-.fileList .ico-ppt,
-.fileList .ico-pptm,
-.fileList .ico-pot,
-.fileList .ico-potm {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABWZJREFUeNrsnF1oHFUUgM/O7272J7s1iVkT2mrAmBRREQUpiFCtCj74pFAoCOJDlIogSJ8K+qL45A8qqPhSEH0VLAit+lKF0tIXiaQBUaLd2m3zs5tkd+fnjufObtIkZmdmZzLb2Z1zYJifPXdm7rfn3HPO3ZlNWJYFJP4lQQAJYHQBzs7OKrg6hctLuIz1S6fHxsc/w9WrXvUHc7m2n0kubd/O5/MnC4UCSJLUF/Dm5+ehfP36zPDICHQC0S/Alzk8QRCAMdY3bjdaLMK1UmlPIAounw9zeP0mqqLYELkl4u6nYQLsW9kriLEFuFcQYw1wLyDGHmBQiAQwIEQCGBAiAQwIkQAGhOhWC1sTExO+b2Tth09AmzvvSVcsFEF98FlQp5/AnfDKxnK5DJVKpaM209PTCb+lXNfEXCrB+k9fQf3id5A+OgPS2FQo18HaHjKZTNN6Ere4tNteWFiA22aBG7L00TF7XXj967Y6xtU5G6B5c8G2wMxzb4J84AFP529UFyEhSCDKKoiK6qqv6zoYhtEW3E6AThYYmTFQumsScsfeBfmeh9EcDdv92frydshaHWEtQW25DGs3rm4eZwhDkhUw9ebnlmk4XkuWZXt2yQ3e1u3eCCIJAdLPnABx5G6w6qug/fZj8zh6SW35Bhi1VTROCdRU+v9fgKpCMpMDCS2wjhCN+roniBugNpat+z2ZxiQkBVKPvWBva1d+bfJjDC1MhmQaAaGbCg5BRk6mYCBXQLM0QUfgjlaPANtZYm9a4BZ3tl2zUm52RBRBVlPevwSuP5BB8CaY6PZuEEXU3+nGXq0wmnmgxVqe638Sl/edQ9dra/YQ4JhCIcDdIPZsJcKqN5s3ly5sEPV1HhHdXpRkMPSGu24L4s6xsCcB6n9carnyfUH4tSAqwHTNmzUJQscWGLlfinj0rV8+0yypph/f5tKOVc9i2SG4i96npxAiz429/twbKYCWocHqmQ9tiPL++0EaP+QJYKowsreZQMv6vECMDECjNA/r5z4Hc/EfELJDMHB0pjUgMtcgEEo6FUUX3ijp3FKY9NOvgTCQb4KzzN3zPTW5rRpxQAHpoWJoECNjgeK+MUg+8jwok4dvuS3mce2sT0ll7MU5G2JQW62Eet9dBeg0mbBtZgaTX17P8vo20AyPqdupTJgSyTSGD96m1gh8HlPTQFSS8QMoYadNE8swQ/cPD9vyc0hxBMjrMCWdBb1R95VD8za8LT8HeIym/QWQWyHWsQKWYXxGxergwSauy9vwtlIHExB9B9COtOkcr8VgvbKEFlVzLwHR6rgub2O37cYXDREXZSBrz6rUq8s4rmFkVhQst8TNOUGG0ZphumNgwODBJ5UfRuvrXrd64qnJBMJK5YfAQAsztBqmOHVgrQDDXZXP/0nJNLpssvtDTZTyP/dxMXlbIPXsGNgLQgAJ4G1Ot8I8eaO6HJmOqtl87wEM66bJhQkgCQEkgBSFKQpTFCYXJoAEkAASQBICSAAJIAEkIYAEsAfF8V25v96Yov+FQjnwwe8B3taU1HjTMxrkwmFKVx/tGD91dtfj1V++gZWzX7rqrF36HkZPnHa8xrWPj4OxVOpPgFxWzn0B1fPfbu5nD78Ig0desTvNAbnp/P3Ok5vHh4+/b6/Lp9+KbxTmoFi9Ckrx3kA6lMZQHuhPuHsKySxopSuBdGIRRLjwsYwvuwWITnRiC3BngPCrQy5MYyAJAQx7MuHPk4+aCaMh8Dce4ykWWJLKDr53QfRlgWbx0AX7jUmwYgmP952NTl30HYWtffufMi32s/Dv3EOJ2kqs3N1KDTJ25+RldsfBI75dmCTgGEhCAEOX/wQYAOhdFmkKB8pMAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-pptx {
-    background-image: url("../img/ico/ico-pptx.png")
-}
-
-.fileList .ico-txt {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2JJREFUeNrsnN9LU2EYx5/98KgxbXM6tuZFMSgaeiHmhV4IGSVFkX+C1FV20W0hBF1IVwVeaAQR/QNBERR5UeGFg1K8MAyySBCbbP1cP6zhzul9js6t1NP5oW6e8/3C4WznbBfvZ8/3fb7vOzguRVEIMi83EABgSeXVujk9PS2J02Vx9IojapdBRxsbb4hTn97P766tNQdQ6Irf778YCATI6/XaAt7MzAylU6lzDaEQGYFoFuBZhud2u0mWZdvYLhyJ0EIyuSkQ/zcHNjA8u6lSklSIXIni7TCaSAkhOroLbwZEx8cYqxCRAy1CBECLEAHQIkQAtAgRAC1CdGltZ4m1sBKLxWwFJ51OUyaTMfSdeDzuMruUs53E2p58Pt9y9bgKXDZ6PTc3BwsXq6KiYnVjpNh9ZjeWHVeBeYisXC63puo2qsRtBzif+rgtMKKhoGmIDGhpaUk9GwW35QDNDmw7lbdy8VadUZCOjzEM0ePxrLHxv1WJOVBDeYBcievNhQCoEyJDK+7GsLBB8e670QoEwHUgGvkbw7ExRnN9u1J9esK1o2OMHoiw8BZDBECrcyYQACAA7uil4E6PMaVOBYgxsDAAAiAAQgCIGIMYgxgDASAAAiAAQogxiDGwMOZACAABEAABEAJAAARAAIQAEADLVpqbCYO3RkBI6Ob1uDmALEmSHA0vm83CwiWz8GaqrWU/9Zzo2PD+18wP+v5jkeoCNXRt6C4t/ir88n1nTlJ1VaV6T0v3Ho7Ri8nX9gTIAyse3EB/Lz1+Mk6jiZer16KRoIB1irq7WgWMhHqts71JXK+n4dsPaD5Z2OXm691dh6h/4A66cF4MiKG2tRyg2L6ICpQhjSam/oLnSAvrFVdk08G91HO8Q9j4twD3QUCdQA40ovuPEup8x9bl1wjSBhXwF5rFnnB5/zlVdhaurpJEt26nqVez6ntuKG9nk/Tp8zdUoB6dXok6I08n1IN17HArLKw3KzaLBsJNgyuOj9GxKfUaxxYA1NByZGlVrVucF7krv3n3njo7mtVoU27SfPTThUtDOVlxOXq553Yp8uDV8x5TFdgYqXvOD6dx4uPiecw89mg4MG66CwfrfEdlRXm2kPrS8nMx66hK3FUtyeFQcLI+WHPEtIWhHRqkAdBB+iPAAD3HE9ONhnJoAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-xls,
-.fileList .ico-csv,
-.fileList .ico-xlsm,
-.fileList .ico-xlsb {
-    background-image: url("../img/ico/ico-xls.png")
-}
-
-.fileList .ico-xlsx {
-    background-image: url("../img/ico/ico-xlsx.png")
-}
-
-.fileList .ico-7z {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABAFJREFUeNrsnF1IU2EYx5+znW3aNvcR6qZS0shwXmUQVFAXKgTrKoSiiwjMiwRDb0ToA/q46E5JsCDpoiAKuuhCIajsAyqQspua5IgKq6mLmV+zyc45nfcs15pnunO2M7ed5w8vZ+Ocs5fz4/9/n/d956Q4jgOUfFEIEAHmLkCv16vnD+f5doJvlYXy0JVVVdf4Q1uq11tKSpKeo9e594LVau222WxA03RBwPP5fBCYnj5VWlYGUiDKBdhC4Gk0GmBZtmBi53A6YdLvzwhEzTrnSwm8QpNBrxcgEifyb/uVBFiwyhRE1QLMFERVA8wERNUDTBciAkwTIgJMEyICTBMiAkwT4nprYc7lchUUnEAgAHNzc5LucbvdlNylXMGJX9uDyWSKuof6xyXZ64mJCYxwvHQ6XWxjJD59crf1VOfAFYhEDMOscl0yJyJAEYgEUCQSEY5SwakeoPDwf6Mcv1WXcw6MTH2CxaEeYBeCWQekMdnB6OkEuty1JkQSZdISY5wKQMWLSGh4YEPgCc7i+w09ur7udVqtVmhS4WXFgczP6DTAeLAd9DV7Ur5v5uqx2Gvb6TuS+10efw2LD/uACX5P6XoCkECLr8Y54UDgouOLFHiZkJz+yO67VAfiUk4EopSvMXK2CsfHNt04S9WK+1KZXNPoubUhYoQVhpizDsx2bGWPmegzBLixy0GswuhABIgRVrgKowMxwqi8XMolVtxcjHVOA8yHcRAjrIaJNDoQq3AGxGX5r/yz1J/yAKloF+H3w1nlF+uPUvYRFR8DaYcLIn4fhJ7eFFrWB3mHK78daGxqA7qqbmMqJN8v6T+vHaixloP58BksIigEiAARIAJEIUAEiAARIAoBIkAEiABRRGv+WvNrRy3+XyheW3vH0vi1Jm1QN71IGCOspDb8a03boU4w1ntEz3272AiO9ltA2ypEz4c/j0Lgdpe6Ac4M9ggtFokiE5S19sPS2Avh/WTf8VX3mPcdAUtDKyy8HcIqLOZI9vcCzD4eED1f7D4gwJt/dReWvM8RYCIc0n4N9orHxebkAXfAsn88KWBVA7Q0tMDi6JAASEz25nPALs1D8P4lnEiLuY8Ui9AH8VhaGk+C3lnDw7sMkRk/AkzUJvd+HswPobImyrjLA+a9R2H2yY2k7lQ9QMO2+ljljRdxnc3TKRSM+Zf3cC0sJgJJU2ReFU0ypbE3nxWcGT/VwYl0gnQV26OrpuD/AHU82JVJdEXXg9WrLB6s2DwxZzYTvnTvZqhImHcpBeoUBxxtYKuvjGhlRZhx1o0AywgfpEZ45NlZR+0b2RHm7FuaGI59ppn6uJNamlXVxgNXbGHZ8h3v2M3VDbIjjEpzDEQhQMX1R4ABANtbXMt+ZZZBAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-gz {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAP3SURBVHic7ZzBa9NQHMe/L8k6pd3WTra1rDihoGy7zJueZSB48+hJ8LSBMmEHQRC8C4qCepAd/Q8EQdi8CSroQSpaPJQhc61MHFtl0iQeutSsbV6T/vqS1/Z9Lm2T9/JLPvv98l6ypsy2bSg6R4t6B3odJZCIwVuZz+djAO4AuApgOowdCoPpbPYJgGW/7cdGRz3XcQUCuJtMJm+lUikYRrumvUGhUEC5VFqamJwEAkj0op2Va6lUCpqmwbIsaixpSGcy+LG11RWJ7c6BE5rWf6fJ4VgM6UwG5VJpCcBjyrb6z45PuiVxYAUC3ZE40AIBusSBFwjQJCqBh3QqUQl00YlEJbCBoBKVwBYEkch4t7Py+bydy+W6vX+RUi6Xsbu7G6jP3Nwc81rXHxe4AUgmk0gkEgAAxv578Xq/ubnJ3d7AlfDQ0FD9xoi7+jq9sTxwGQjUJAKAaZr1ZU7WeWWiFwMpEKhJZIyhWq2CMRZYnMPACgRQL2X3rTrpMrC6/Q37L+7D2tsRHaoJLTGO+KWbMKa8ZxKGYcA0TZim2VTGfgQKH0Qq688ikQcA1t4OKq+etm2n6zp0XQcQTB4QQgaaP2vTgPjF64idPu+736+HV+rvUzeeB4779+sb7L98BHPnu6/2uq6DMXZkNJYiA2HXzi9B5HWDTuJpmhY4AwduHtgOTdMQ5N8Y0o7C7rKllnNQnOzzM7mWVmDUqBLuAlLMAzsl7LLtFJWBRJRAItKWcJSjcBBUBhJRAolIW8LuspUZlYFElEAi0pYw0DziyljWUguUUVgjqoSJSJuBsk2YvVAZSCQ8gXbI3/IPKZ54gawW4uDTuvBQburxmNhDFH4ONNI5VLcKqGysobKxJjpcy/giEZ6B8cVlGNl50WFaYmTnEV8kP4zEjyF06wC05BRGLt8WHSYy1ChMRAkkogQSUQKJKIFElEAiSiARJZCIEkhECSSiBBJRAokogUS4T2sWV2bVL5MBmHnwmfC0pjHc1Z3pOaoH3NXCS3jm3kfRISJFnQOJCL0j7WSf81pcXTjy2cFZ7qwrri409Wm1XWd9Y59GWm2jWwgV6D44h8bPrZa1asNr647HayuC0EvYzwEFOWi/okUR2Vc7+mVwiUQgrwxFbF8koZdwmAcXBpFPY6jZ19g/7D9QKCXsnpI0Tjd40w93f0cKr3/jq7uNKNpfC/fApZzQrKsecK+FuSVsHxuxALnuJ4Q7etuHDrzhlrCZmX9rFN+dg6YD8P9bKiJpVfJiss8GLBNWevY9rxVXoD1+ctG0rdfa9pez7M/vyAcch+LKrPAY9vExy5o688E6ceoCrx33HOiXIL/0IxvU45cmq3oVJZDIP8OiU3PHSqspAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-cab {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABLVJREFUeNrsnF1oU2cYx59zepp+JTSp1CZaNl3AYXo1hQ0V9EIFobsYQ5gMBMFVWGFjvRHBWZjbhXjTMaEKftwIoqCXBWGrzsI2lM3dzAwt4kbR1GZr1takq5wP3+dtczxJTr5OkpP0nOcPh3ydnJfzy///PO970lTQNA1I1iUSAgJYV0mFXoxGox52M8y2Q2xb75STXt/be/a/4fcGzV5LHrmR81wkErEGkOkrv99/LBAIgCRJjoA3OTkJ8ZmZT7tP3oV8EKvmQKbDCE8URVBV1TGxC4ZCMB2LVQVisRrYjfCcphaPh0NEJ/pP3h2lJlJHiK7uwtWA6PppTKUQaR6YBZFNcUYJoI0QCWCFEAlghRAJYIUQhUKXs9haWAuHw46CE4/HYX5+vqz3sLWwYHUp5zixtT14vd5l9wivueS7PzU1RRE2qrm5Wb8wYkyf1QvLrnNgGiJKUZQc1+VzIgE0gYiAZFnmt+WCcz1AfvIrUTZeqms4B8rPH0NybATUF7O2AxK9XdDRPwRST7ggRIwybtkxLgVgzZtI6taFusDjzmLjpr4/V3S/pqYmvpULzxYHKv8sTwM69n0Gnk3bSn5f4ruP9fuBz6+UPe7LR79A8uYZUGaflrQ/AkRoxm7cEA4Ebbm+lAOvGrIyHl59L9eBtJQzgVjO1xgN24WNsa00zuUq7b5SJtcSea4wRIpwjSE2rAPtjq3lmkk+I4D1XQ5SFyYHEkCKcI27MDmQIkxalUu57I7biLFuaICroQ5ShN0wkSYHUheugjSb/8rfpvFqD1BYHmLpj1u28tPHE2p7ijWvgVIwDHJsElK3L/HN9iIfDK9uB3bsHQSpt68+HZKNi+OvageK/h7wfXicmgiJABJAAkgASQSQABJAAkgigASQABJAEqrgrzX//mIz/Wcypje//bOCX2tKLe6mJy9RhGsp27/W7NzzCfi2H9Afv4w9gsXoHVj46VrOvt0HT0PLxi2QGBuB5G9j+vP4HL5mprnx86bHcgTAtQOjILZ6M4Cs2X8COncP8PvGE5cCIQ5K/X8B2iO7MgCmFb98FJae3NcfB94f4seSE9P8Q3FUF/bt+Ag8oU0we/2bDBj/Xv+aQ/DtOJCxf8fWfg5vbvwCB4lAiyn14M4K/KDzpjFtzEXoCoysmZNmzg9yd+oAt/RD8v4YLK5AaYvsLDpGe98uDn0xOuG8CKP7Fgxxy2l2iVgGbLHVx+BNMCAvOHh0aHZtM6uDWAONx3JcEylF7cxtcuKZ7tYUcxRCTbs4Xw3E2Af6h3LqqSMAIgx0Yb76iMV/+sxB3YGo3uEfcsAWag5YWzH6rW9tdR5APHGEhBCz6yCeMDoOo4cwUc9Of8Djmz39EVtHii+vDLXUMU0E3YGQuvZ/yaOWPdebG7+oNw+EbYTHP4AHE3pM8wlfww8Im4/jaiACwU7buWeA16l0rUI34rwQoWF0pcA6HWZ2CcANAcuJi3mbyMLPV03njHW5mPDXsXcVQV5iLhXAndJAk1rUDafuNVmKsBLquweqwg/kRnh47mpw86+WI6x1vbFX0dQfxecP3xEW51x14UFr61TVnrd/V9ds2G05wqQG6sIEkGSqVwIMAG021uWJKtY8AAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-iso {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABH9JREFUeNrsnEtoE1EUhs9MJmlLUpu0tk20+CCotK5UEMSFCxWEuhARFFERbBcWFN1oQRTUjbpRFFRocVMRBRduCoJvQQTxsdGIFlGpNm1TW9qa1pZ5eM9NZ4w1jZlJ85xz4DLp5N7czpf/v+fMTVNB0zSgsB4iISCAOQ0p2ZOhUMjFDidY28va/GK56Pl1dVfYoSXV/hVz5lgDyOKk1+tt9fl8IElSUcDr6uqCSH///uqaGjAD0SrAfQhPFEVQVbVobOcPBKA3HJ4ViP9bA6sRXrFFicvFIaIS2Y+XKYnkEKKts/BsQLR9GZMuRKoD04RIANOESADThEgA04RIANOEKCTbzmL3wlowGCwqOJFIBEZGRkyNaWhoEKzeyhVdsHt78Hg8MfUIf7jM9Li7u5ssHB9Op9PYGIl3n9WNZdspUIeIoSjKP6qbSYkEMAFEBCTLMj+aBWd7gPzip6wcv1WXdwqU+z5BtPM8qD8Hsw5I9FSCu/EwSLXBpBDRytim2zgVgBlPImMP23MCjyuLzTt27+p/+zkcDt7MwsuKApWBWBng3nQAXEvXpDxu6OJO47Hv4A3T805+fA7Ru5dAGfyeUn8EiNDis3FeKBC02PpiBt5shJX5cPfdrALpVi4BRDMfY+RtFo63bbp2Nhu6+lIpriXSXHKIZOEMQ8xbBWbbtpbXTNIZAczt7SBlYVIgASQLZzgLkwLJwhQFeSs3PePmo63zGmAhrINkYTsU0qRAysKzEFqW/8o/S/NlHqAQm2Li7cOs8jPmEzJ7iRlfAyV/EORwF4w9usZb1hd5f7CwFeje2AJS3fLcZEg2L85f0AoUvbVQvvUYJREKAkgACSABpCCABJAAEkAKAkgACSABpMBI+m3Nr4fq6T+TsVh44X0a39aUSuxNT54gC2cycvKxZvXuc+Dw+qH30p7YL+ELQMX6JihrWGf0GQ89geEH7SAPhY1zJYtXQsWGJnAFlhrnoq87Yfh+G6i/ftoziYilHpi76yw4GMSec1vg26kNEOk4As7AEn5eD/eqRg5eYUCn96tpvszfBFsCdDI1Sb55TEXthoomPr/mysLzqDaEjArFcz9un/6r3wCDKJaVQ/naHfYEqE3BQGsiKD1Gn93iKpsMf+TqE0vLIfqq85/xCBPBulc2/jW+qNfA+EBAww/amMKaYd6RO8a6Jg/1cIj8XWYK0/smTJRT6yQqdqY+RQtQVxs2VJqLWzrAFYVt4PpRysLJImZPDweIFo1CzKYIEpMDPq+OjxrnEilMTyCoWltmYbTv9PULQSEQfe1Tf41ymInGo1LR9rkoZXIOcDz0lMOZy0qU+PrOt/kwX9PG3j3hYLAmRFBV244bsLEuxHGo0NFnN+1pYUwAAx1HWRmynVs2XoFY52GpwhMLU6E8GObZWk82+VBIJ91M+NK6WhHkCaZSAewZGmhSibrozAuHJQsrgeUvQFX4C9kRHl676q9/adnCWuWCjYqmPhb7PqwQxodttfGglVWoau2yN2rVovWWLUxRAFmYANo8fgswAF4ssuGz3PXWAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-rar {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABGNJREFUeNrsnEtoE1EUhs+k07Q1qclUahMtvoJK05UtCCrUhQpCXblRBEFQFxaUdiMFQVA34qaioC6KG0EU3BYE6xNUEI0bqWjxRZWo0UpfaSOZGe+5adIkjdPMpJkkM+fAZSYzk3uZL/85/52bpoKqqkBhPByEgACWNEStk0NDQ062Oc3aIdZWWuWmVzY3X2Wbrnyv9yxdagwgizNer7dXkiQQRdES8IaHhyHy8+exxuXLQQ9EowAPIzyHwwGKolgm7Xx+P3wPhxcF4kI1sBHhWS1qnE4OEZXIXl4hEykhRFu78GJAtP00plCINA8sECIBLBAiASwQIgEsECIBLBCioLWcxZ6F1UAgYCk4kUgExsfHdb0nGAwKRh/lLBfs2R7cbndCPcIcl//tj4yMUAqnR3V1dWphJD37jC4s206BSYgYsizPU93/lEgAc0BEQPF4nG/1grM9QH7zs6mcvlRXdgqM//gAUwN9oEyOmg7I4W4AV2cPiE0BTYiYytiy0zgfgEU3keiD/pLA48pi40bvXVvwuqqqKt70wjNFgfKvxDTAtfs4ODdsyft9fy4dSO1LJ27qHvfv++cwdfcyyKPf8roeASK0dDcuCwWCmqgveuAtRhgZD1ff9SqQHuVyQNTzNUbZunB62haaznojqb58JtciaU4bIqVwkSGWrQLNTlvDNZN0RgBL+zhILkwKJICUwkV2YVIgpTBFRT7KZTtuOaZ1WQOshDpIKWyHiTQpkFx4EUI1+a/8TRqv+ACFxBCxNw9M5ZcaTyjuLRa9Boq+AMTDwxB9eJ0304u8L1DZCnTt6gKxubU0DsnGxfErWoEObxPU7z1FJkJBAAkgASSAFASQABJAAkhBAAkgASSAFBiav9b80t1C/5mMxeqLbwv4taZYY2968RilcDHDtK81a9a2QePBCznPTTy7BWOD/ZmfbK0bfCdusG09fL98EOJ/wqlz9dv2gWfH0Xn9KDMTMHa/H6ZeDVgPYDIiN05C7FMo9drV3glSZw8HlH7jda3bOTyEUhfsgImnt+f19fXszozX0p4e3lfsYygDuKVdGKEhJKd/Q8ZxV1snTA89Zu0J38+3L672dW32m8ZgyiYDYWKLMngzTE2itIKXACN9WR4g1jNM1cmM9O3gqkwo8DHfd7cvrELPziP8WkvXwFxGgiaSURd5+j6ZS83QANRv3c9A9zFAk6njzacH5/X1+865jGssbyJJR535EOLH0VRQkQgxu/bhuXQzyTYR/HCkPd3MRF6ZBrEsTITXvRXr+XZJcDv8Db/ncNIbHqtj57QCywDCx5ppmxqISsG6xdNB8nOzwLqXHXgMjUXLTOTZqYtgJxPhEKcnuLpcs0aRywSSx7TMJPlB1AbMm8ZoLiZ87t0sC/EYgyyAPUMFVaxR1px/UWVIgbK/9QUoMu/IjvDw3hVfy0vDLqw2rNolq8ojx493m4TpMVstPKh1HkVp2vhaWbZmh+EUpqigRzkCaNP4J8AArrWcCArY0yoAAAAASUVORK5CYII=")
-}
-
-.fileList .ico-zip {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA+hJREFUeNrsnF1IU2EYx5+zHTdkU7eZuuUocWA4r/QiqC68UCHQqxCKiAiqiwRD74RKyKu6UhIqULoJouhWIcjsAyqQsJtY5IgKq5krze8m56P3PWtruA/Px77P84fDmTvvu5fz2/95n+d958aIoggo9TIgAgSYU7GpLvp8PhM5DZLjDDlqi+Wma93uW+TUI7d9RXm5OoBEV20224DdbgeWZYsCnt/vh+Di4oWq6mpQAlEtwLMUnsFgAEEQiibsnC4XLAQCaYG42xxYReEVm8wmkwSROpH8eROTSA4h6joLpwOi7ssYrRCxDtQIEQFqhIgANUJEgBohIkCNEJlU21lkLSx6PJ6ighMMBmF1dVVRH6/Xy6hdyhWdyNoerFZr2D3Mfy7JHs/Pz2MIx6qkpCS6MRIbfWo3lnXnwAhEKp7n41yXzIkIMAFECojjOOmsFJzuAUo3/y+UY7fq8s6B3I+PsDE5DML6UtYBGawOsHT2A1vjSQmRhjI9doaxHIAZTyKb0+M5gSc5i4y7+fj2ru2MRqN0KIWXFQfyP8NlgOVoL5gaDsnut3zjZPSx/eI9xeNuz72GjUejwC99k9WeAqTQYrNxXjgQxPD8ogReOqRmPLr7rtSBuJRLAFHJxxh5m4Vjw1ZrOCtVxH1yimsWPZcaIoZwhiHmrQOzHbaq50z0GQLM7XIQszA6EAFiCGc4C6MDMYRRBbmU25lx8zGs8xpgIcyDGMJ6KKTRgZiF0yAxy//ln6XxMg+QCQ8RejedVX7R8ZjM3mLG50DW6QEu4IfNp3ekI+uTvNNT2A60dPQA627KTYYk49LxC9qBBlsNlB27hEkEhQARIAJEgCgEiAARIAJEIUAEiAARIIoq5bc1v/Q14i+TEe0fea/h25qsWd/0uBCGcCaVk481WbsLnL13k15feTIGay8fgHtwCjZmJ2F5YhjKjhyHirbzcW23A3Pwe2JEOusGILccgK9D7XHPV3ZfAXN9C2z5XiTtG9uPvhF7Tl0HR/dlWBg9re8sXNF+Dkq9rcRtIxJguW8EdShr3yvB1C1ACq7s8AlYe3WfuO851oFK50N7Vx+EPs3CytS44r6Wlk7ixO+yXVsUc2CsHGTeE7bW4NfDIVntaWJJlER0lYUjsnf1g8nVAItjPSD8WZfVJ1Hy0WUI07KEhh8tWXJVghQsQOo6WtPRhEHrPSykFcpc3xzNvu7B1rjrkeK54DcTPg8c5BkuRFzKgD4lgsiahbprM0ZVIcy7mmZA4KUX0iM8eu+Cs/GN6hAWHfs6eFF4ZvjxoZnZWtHVxoNYWiEINQfeCpV1bapDGFVAa2EEqFP9FWAAVhNMgyXjjfoAAAAASUVORK5CYII=")
-}
-
-.fileList .ico-bt {
-    background-image: url("../img/ico/ico-bt.png")
-}
-
-.fileList .ico-file {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAehJREFUeNrs3D9PwkAcxvFrKXUhCAMEAhsbL8nJxElfgYPR+CZ0MnHyJbEwMkDoQGAG6h2CNlIo16t/cvd9kktL2g73ye9a7gj14jgWJH88AAH8v4CDwSCUm3vZLmXr2NLpTrf7LDc3p55/Xq0ePBZkXPtYq9Vu6/W6CILACrzhcCii6fS60WwKHcS8gFcKz/d9sV6vrRl2rXZbTMbjQhD9jOMNhWdbzsJwg6gqUX58+klAa1MUorOARSE6DVgEovOApogAGiICaIgIoCEigIaIWXPhuNfrWYUTRZFYLBZa1/T7fS/vVM66yLm9qFQqH9Xjfbkc2h+NRgzhZMrl8ufCSHL05V3Wc64Cd4gqq9Vqr+oOVSKAKYgKaLlcbra6cM4Dbjq/HcrJpTpdSOe/xijEUqm0N4y/VyUVeCQ7QFWJafdCAE9EVGjJpzFDWDNq9V23AgFMQdT5GQPAtPntiQ8Q7oEZiFTgLyACaHrPhABAAAEEkAAIIIAAEgABBBBAAiCAAAJIAAQQQAAJgAACCCABEEAAASQAAggggARAAAEEkAAIIIAAEgABBNBywCj5bhXXsu17ZAL4MpvNhIuIqs+q7zKvx87L+sP1w3w+D2W7kPstxwwnsr3JdnfsJF4FbxgAAfzbvAswAK/3kejP2oZLAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-svg,.ico-css {
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAehJREFUeNrs3D9PwkAcxvFrKXUhCAMEAhsbL8nJxElfgYPR+CZ0MnHyJbEwMkDoQGAG6h2CNlIo16t/cvd9kktL2g73ye9a7gj14jgWJH88AAH8v4CDwSCUm3vZLmXr2NLpTrf7LDc3p55/Xq0ePBZkXPtYq9Vu6/W6CILACrzhcCii6fS60WwKHcS8gFcKz/d9sV6vrRl2rXZbTMbjQhD9jOMNhWdbzsJwg6gqUX58+klAa1MUorOARSE6DVgEovOApogAGiICaIgIoCEigIaIWXPhuNfrWYUTRZFYLBZa1/T7fS/vVM66yLm9qFQqH9Xjfbkc2h+NRgzhZMrl8ufCSHL05V3Wc64Cd4gqq9Vqr+oOVSKAKYgKaLlcbra6cM4Dbjq/HcrJpTpdSOe/xijEUqm0N4y/VyUVeCQ7QFWJafdCAE9EVGjJpzFDWDNq9V23AgFMQdT5GQPAtPntiQ8Q7oEZiFTgLyACaHrPhABAAAEEkAAIIIAAEgABBBBAAiCAAAJIAAQQQAAJgAACCCABEEAAASQAAggggARAAAEEkAAIIIAAEgABBNBywCj5bhXXsu17ZAL4MpvNhIuIqs+q7zKvx87L+sP1w3w+D2W7kPstxwwnsr3JdnfsJF4FbxgAAfzbvAswAK/3kejP2oZLAAAAAElFTkSuQmCC")
-}
-
-.fileList .ico-apk {
-    background-image: url("../img/ico/ico-apk.png")
-}
-
-.ico-cmd {
-    background: url("../img/soft_ico/ico-cmd.png") no-repeat center center;
-    height: 18px;
-    width: 16px;
-    display: block
-}
-
-.btn:hover .ico-cmd {
-    background: url("../img/soft_ico/ico-cmd-hover.png") no-repeat center center;
-    height: 18px;
-    width: 16px;
-    display: block
-}
-
-.fileUploadDiv {
-    padding: 10px
-}
-
-#file_input {
-    display: none
-}
-
-#up_box {
-    background-color: #fafbfe;
-    border: #e4e5e9 1px solid;
-    margin: 0;
-    padding: 10px;
-    clear: both;
-    height: 160px;
-    overflow: auto;
-}
-
-#up_box li {
-    list-style-type: none;
-    height: 30px;
-    line-height: 30px;
-    font-size: 12px;
-    width: 100%;
-    margin: 0 0 5px;
-    padding: 0
-}
-
-#up_box li .filename {
-    display: inline-block;
-    height: 30px;
-    margin-right: 20px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    width: 240px
-}
-
-#up_box li .filesize {
-    color: #999;
-    display: inline-block;
-    height: 30px;
-    overflow: hidden
-}
-
-.fileUploadDiv button {
-    float: left;
-    border-radius: 3px;
-    border-style: solid;
-    border-width: 1px;
-    width: 75px;
-    height: 30px;
-    color: #fff;
-    margin-bottom: 10px;
-    cursor: pointer
-}
-
-#up {
-    background-color: #5cb85c;
-    border-color: #4cae4c;
-    color: #fff;
-    text-align: center;
-    margin-left: 10px;
-    position: absolute;
-    bottom: 0;
-    right: 10px
-}
-
-#filesClose {
-    position: absolute;
-    bottom: 0;
-    right: 95px;
-    background-color: #cbcbcb;
-    border-color: #cbcbcb;
-    color: #fff
-}
-
-#opt {
-    background-color: #4592f0;
-    border-color: #367fa9
-}
-
-#up_box li em {
-    font-style: normal;
-    color: #06F;
-    float: right;
-    margin-right: 10px
-}
-
-.cancel {
-    float: right;
-    cursor: pointer;
-    color: #c00
-}
-
-#textBody {
-    min-height: 450px;
-    _height: 450px
-}
-
-#filesClose:hover {
-    background-color: #c9302c;
-    border-color: #ac2925;
-    color: #fff
-}
-
-#up:hover {
-    background-color: #449d44;
-    border-color: #398439
-}
-
-#totalProgress progress {
-    width: 180px;
-    height: 10px;
-    border: 1px solid #ccc;
-    background-color: #e6e6e6;
-    color: #0064b4;
-    opacity: .9
-}
-
-#totalProgress p {
-    color: #666
-}
-
-.setchmod fieldset {
-    margin-left: 15px;
-    margin-bottom: 15px;
-    border: 1px solid #ccc;
-    float: left;
-    width: 114px;
-    padding-bottom: 10px;
-    border-radius: 3px
-}
-
-.setchmod legend {
-    padding: 3px;
-    border: 0;
-    width: auto;
-    margin: 0 6px;
-    font-size: 14px
-}
-
-.setchmod fieldset p {
-    margin-left: 10px
-}
-
-.setchmod fieldset p input {
-    position: relative;
-    top: 2px;
-    margin-right: 5px
-}
-
-.setchmodnum {
-    clear: both;
-    margin: 0 15px -10px
-}
-
-.setchmodnum #access,
-#chown {
-    width: 60px;
-    margin-right: 5px;
-    height: 28px
-}
-
-.setchmodnum span {
-    margin-left: 10px
-}
-
-#chown {
-    margin-left: 5px
-}
-
-.shellcode {
-    margin-bottom: 5px;
-    height: 490px;
-    overflow: auto
-}
-
-.shellcode pre {
-    background-color: #111;
-    color: white;
-    padding: 5px 10px;
-    border: 0 none;
-    border-radius: 0;
-    min-height: 490px;
-    margin: 0
-}
-
-#mExec {
-    width: 89%;
-    margin-top: 0;
-    float: left
-}
-
-.editmenu {
-    text-align: right
-}
-
-#filesBody {
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none
-}
-
-.folderBox input {
-    display: none
-}
-
-.fileList>div:hover,
-.fileList div.ui-selecting {
-    background: #f6f8fd;
-    border-color: #d3dfec
-}
-
-.fileList div.active,
-.fileList div.focus,
-.fileList div.ui-selected {
-    background: #eff3f9 none repeat scroll 0 0;
-    border-color: #bcccde
-}
-
-.fileList .file {
-    background: rgba(0, 0, 0, 0) none repeat scroll 0 0;
-    border: 1px solid #fff;
-    border-radius: 2px;
-    display: inline-block;
-    height: 136px;
-    margin: 0 5px 10px 0;
-    text-align: center;
-    width: 112px
-}
-
-.fileList div.file {
-    transition: all .2s ease 0s
-}
-
-.fileList .file .titleBox {
-    color: #595c5f;
-    display: block;
-    height: 23px;
-    line-height: 23px;
-    overflow: hidden;
-    text-align: center;
-    text-overflow: ellipsis;
-    width: 100px;
-    margin-left: 5px
-}
-
-#DirPathPlace {
-    display: none;
-    padding: 0
-}
-
-#DirPathPlace>input {
-    border: 1px solid #ccc;
-    height: 28px;
-    line-height: 28px;
-    padding: 0 5px;
-    width: 280px
-}
-
-#DirPathPlace>input:active,
-#DirPathPlace>input:focus {
-    border: #66afe9 1px solid;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6)
-}
-
-#PathPlaceBtn {
-    background-color: #f3f3f3;
-    border: 1px solid #ccc;
-    height: 28px;
-    line-height: 26px;
-    padding: 0;
-    width: 290px;
-    cursor: text;
-    overflow: hidden
-}
-
-#PathPlaceBtn ul {
-    display: inline-block;
-    height: 26px;
-    width: auto;
-    position: relative
-}
-
-#PathPlaceBtn li {
-    background: url("../img/ico/ico-ltr.png") no-repeat right center;
-    padding-left: 10px;
-    padding-right: 18px;
-    float: left;
-    height: 26px;
-    line-height: 26px
-}
-
-#PathPlaceBtn li a {
-    display: inline-block;
-    cursor: pointer;
-    height: 26px;
-    line-height: 26px
-}
-
-.backBtn {
-    color: #666;
-    border-radius: 0;
-    height: 28px;
-    line-height: 8px;
-    margin-right: -1px;
-    margin-top: -1px
-}
-
-#tipTools {
-    background: #fff url(/static/img/ico_line.png) repeat-x 0 55px;
-    height: 110px;
-    border-bottom: #ccc 1px solid;
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 999;
-}
-
-.re-head {
-    border-bottom: 1px solid #ccc;
-    float: left;
-    padding: 15px 20px;
-    width: 100%
-}
-
-.re-con {
-    float: left;
-    height: 500px;
-    width: 100%
-}
-
-.re-con-menu {
-    background-color: #f0f0f1;
-    float: left;
-    height: 100%;
-    width: 120px
-}
-
-.re-con-menu p {
-    cursor: pointer;
-    line-height: 40px;
-    padding-left: 30px;
-    position: relative
-}
-
-.re-con-menu p.on {
-    background-color: #fff
-}
-
-.re-con-con {
-    height: 500px;
-    margin-left: 120px;
-    overflow: auto
-}
-
-@media only screen and (max-width:768px) {
-    .sys-i-c-box:nth-of-type(3){
-        margin-top: 20px;
-    }
-}
-@media only screen and (max-width:990px) {
-    .pr8 {
-        padding-right: 0
-    }
-    .pl7 {
-        padding-left: 0;
-        margin-top: 15px
-    }
-}
-@media only screen and (max-width:1200px) {
-    .btvipbox{
-        margin-top: 20px;
-    }
-}
-
-.bt-ico-ask {
-    border: 1px solid #fb7d00;
-    border-radius: 8px;
-    color: #fb7d00;
-    cursor: help;
-    display: inline-block;
-    font-family: arial;
-    font-size: 11px;
-    font-style: normal;
-    height: 16px;
-    line-height: 16px;
-    margin-left: 5px;
-    text-align: center;
-    width: 16px
-}
-
-.bt-ico-ask:hover {
-    background-color: #fb7d00;
-    color: #fff
-}
-
-#RecycleBody .tname {
-    line-height: 30px
-}
-
-.menu-sub {
-    border-bottom: 1px solid #ccc;
-    height: 40px;
-    line-height: 30px;
-    margin-bottom: 15px
-}
-
-.menu-sub span {
-    display: inline-block;
-    font-size: 13px;
-    height: 40px;
-    padding: 0 25px;
-    cursor: pointer
-}
-
-.menu-sub .on {
-    border-bottom: 2px solid #20a53a;
-    color: #20a53a;
-    font-weight: bold
-}
-
-.bt-progress {
-    background-color: #e2e2e2;
-    border-radius: 8px;
-    height: 16px;
-    line-height: 16px;
-    position: relative;
-    margin: 5px 0
-}
-
-.bt-progress-bar {
-    background-color: #5ab76c;
-    border-radius: 8px;
-    height: 16px;
-    max-width: 100%;
-    position: absolute;
-    text-align: right;
-    transition: all .3s ease 0s;
-    width: 0
-}
-
-.bt-progress-text {
-    font-size: 12px;
-    color: #fff;
-    padding: 0 10px;
-    position: static
-}
-.conf_p{
-    overflow: hidden;
-}
-.conf_p p{
-    margin-bottom: 1px;
-}
-.conf_p span{
-    display: inline-block;
-    margin-right: 10px;
-    width: 140px;
-    text-align: right;
-}
-.btvipbox{
-    border: #ddd 1px solid;
-}
-.btvip{
-    border-right: #ddd 1px solid;
-    float: left;
-    width: 40%;
-    height: 108px;
-    text-align: center;
-}
-.btvip-r{
-    width: 60%;
-    float: right;
-    overflow: hidden;
-}
-.btvip .t2{
-    font-size: 16px;
-    padding: 10px 0 5px;
-    float: left;
-    width: 100%;
-}
-.btvip p{
-    float: left;
-    width: 100%;
-    margin-bottom: 8px;
-    font-size: 14px;
-}
-.btvip p .price{
-    margin-right: 3px;
-}
-.btvipinfo{
-    width: 200px;
-    float: left;
-    padding:5px 10px;
-    line-height: 32px;
-}
-/*付费插件*/
-.libLogin{
-    width: 340px;
-    margin: 0 auto 20px;
-}
-.libLogin .bt-input-text {
-    width: 300px;
-    height: 34px;
-    line-height: 34px;
-}
-.libLogin .line{
-    margin-bottom: 10px;
-}
-.libLogin .login-button,.shuoming .login-button{
-    width: 300px;
-    height: 36px;
-    background: #20a53a;
-    background: linear-gradient(#20a53a,#189d32);
-    box-shadow: inset 0 1px 2px #30ad42;
-    color: #fff;
-    text-shadow: #00851a 0 -1px 0;
-    border: 1px solid #20a53a;
-    text-align: center;
-    font-size: 16px;
-    color: #fff;
-    border-radius: 3px;
-    cursor: pointer;
-}
-.libLogin .login-button:hover,.shuoming .login-button:hover{background:#10952a;background:linear-gradient(#10952a,#088d22);border:1px solid #10952a}
-.shuoming{
-    line-height: 24px;
-}
-.shuoming .login-button{
-    width: 100px;
-    height: 30px;
-    font-size: 14px;
-    margin: 15px;
-}
-.sm-content{
-    border: #ccc 1px solid;
-    padding: 10px;
-    height: 200px;
-    background-color: #f9f9f9;
-    overflow: auto;
-}
-.libPay .btn-group .btn{
-    width: 80px;
-}
-.libPay .btn-group .btn em{
-    position: absolute;
-    right: -2px;
-    top: -9px;
-    width: 33px;
-    height: 19px;
-    background: #ff7300;
-    border-radius: 2px;
-    font-size: 10px;
-    line-height: 19px;
-    color: #fff;
-    transform: scale(.9, .8);
-    font-style: normal;
-}
-.libPay .price{
-    font-size: 28px;
-    color: #FF6600;
-    margin-right: 3px;
-    line-height: 30px;
-}
-.libPay .sprice{
-    font-size: 14px;
-    display: inline-block;
-    line-height: 30px;
-    margin-right: 3px;
-}
-.wxPay{
-    width: 160px;
-    margin: 10px auto 20px;
-}
-.wxPay .ewm canvas{
-    border: #ccc 1px solid;
-    padding: 6px;
-    width: 160px;
-}
-.wx-pic{
-    width: 160px;
-    height: 36px;
-    background: url(/static/images/weixin.png) no-repeat top center;
-    margin-bottom: 10px;
-}
-.wx-pay-info{
-    width: 160px;
-    height: 30px;
-    background-color: #00C800;
-    color: #fff;
-    font-size: 14px;
-    line-height: 30px;
-    text-align: center;
-    margin-top: 10px;
-}
-.color-red{
-    color:red;
-}
-.color-green{
-    color:green;
-}
-.btpro{
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADsAAAAUCAMAAAAEAbViAAAAA3NCSVQICAjb4U/gAAABXFBMVEX///+7jAC7jAC7jAC7jAC7jAC7jAC7jAC7jAC7jAC7jAC7jAC7jAC7jAC7jAD////+/fv+/fr8+vX8+vP69uv38eD28N3179v07NXz69Lz6tHz6c/x6Mzv48Pu48Hr3rX74jnq27D54Djp2av43zfo16fo2Kj33TX33Tbm1aLl1Z/12Tbl057z1zLk0Znj0Jfx1DDizpPu0DPv0S7fyIbqzCroyC/cxH3oySjawXXZv3DkwyTYvWzivyzXu2jWumXevCDUtVzctinathzSslXSs1bRsVHRsVLWsBjVrSbNqkPTrBXLqD3PpCLJozTOphHIozLIojDIoS/HoCzKoQ7GninGnyrFnifJnB/FnCTFnSbEmiDEmyLFmQnCmBvBlxjBlhbBlRXAlRPCkhy/kxDAkwW+kQq9kAi9jwa9jwK9jQC8jgS8jQO8ihm7jAC2gRWweBKpbw+jZgydXgnhk9RtAAAAdHRSTlMAESIzRFVmd4iZqrvM3e7//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////wol0KMAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAWdEVYdENyZWF0aW9uIFRpbWUAMDUvMzEvMTikOWwBAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAAg5JREFUOI2dlGlz0zAQhhUHJ45jST2gXKUVR4BijmKKCwX1CKcKLoVQcCmFYgcSjqiy8/9nWCtOJvlEwusZe3Q80rurlRFCyLDsSi7bMtAkKlSlU602W61o+3VDvrnOxlTGliUxkdFcfRjN0aWm3ByXBdgglaqN7N2pmb2t6edba0e3xmctBxWxjecoPfPh2afTtPGkN+J6/2SLxC6ajrQvLC4uPJXvLs6/aC7rkZD35/Awb8RMMc5FGAc9FktMiJS42W5HX+SP6Nv+n13GlFJdlWmEVfCkYcD9fF9MTNO0iHX15o3aRnTncq0W7WcDQvQmeEHO1rlm1ZBnw6lAvrBJQY+3s9fOPSbCMA21BEvdHnvssa7qCm3Hz3N1gpQRsu1ZSk8drFC60nrAmM/DmGv5LAg06yVM75mF0fFyFpWkiUrEoHTx6wKt/d7U/R2hUZjkppoFBxCrYCrkfd9ZcVSkUcAlOrW+Q8+3X13S/SIzHHeFXiZjlctYwiFevwNrDdgCdsD09OzbtZmPh9d6/QFQbiJGzsgFksM5Zcv0WVSUlumcPHdwdv3Xcp5DF5KVowMWvioW7nHKh1gIuYznlxq35aOhshFJCBvEaqC4ztKkntQ9FQ+xEDK5u3r08+Vo0dVHm3Ayvu9nhr1htuDIvc/y/RU2ifqX2MBSHo59g0ZZZJLv9/8ThXyZE/1tQH8B/ly2lqVFKXEAAAAASUVORK5CYII=");
-    background-repeat:no-repeat;
-    padding:2px 0 2px 64px;
-    margin-right:5px;
-}
-.btpro-gray{
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADsAAAAUCAMAAAAEAbViAAAAA3NCSVQICAjb4U/gAAAA51BMVEX////6+vr4+Pj29vbx8fHu7u7r6+vp6eno6Ojl5eXk5OTj4+Pi4uLf39/e3t7d3d3b29vU1NTT09PNzc3Ly8vIyMjFxcXDw8PAwMC+vr67u7u6urq5ubm4uLi3t7e2tra0tLSzs7OysrKxsbGvr6+srKyrq6upqamoqKikpKSjo6OgoKCfn5+enp6dnZ2cnJybm5uampqZmZmYmJiXl5eWlpaVlZWTk5OSkpKQkJCPj4+NjY2MjIyLi4uKioqIiIiHh4eGhoaFhYWDg4OCgoKBgYGAgIB/f39+fn59fX14eHh0dHT///9HdDDXAAAATXRSTlP/////////////////////////////////////////////////////////////////////////////////////////////////////ANNqEYAAAAAJcEhZcwAADpwAAA6cAQeUU90AAAAcdEVYdFNvZnR3YXJlAEFkb2JlIEZpcmV3b3JrcyBDUzbovLKMAAAAFnRFWHRDcmVhdGlvbiBUaW1lADA1LzMxLzE4pDlsAQAAAeZJREFUOI2VlH1XmzAUxjNbZutxL2hnXeiGA1kiNdspbJlEC9FmLtD7/T/PkkC78tfw4Rw4IfeXPDf3AgIALyBRJxJ4MFgIYLTU+XJZbTYluVnp4jMeKMvOtfTBq84/lAAnlV4OZTECT0ZLAoQB5AuIFhcPX4azQQ5TQYQxgLKrnwhWq3YmjP/LTiWZ+rkmr8bjoyv93UNR1UKc7mIo7wYFVphSxousZYUWUmotKqVKoZ/Kkj8zjJVSW2XVY5W5Gp7RpNtXSN/3Axkcn55OPpZvX08mJbcTjLUBcdaxKXWsOvDs5ZGpsPBtwebE3m6vMeO84U4MN2HLPsZ4q7bM2Um6s3on5wDEUnB3BnC2IRgnlBfUKcFZ5ti4xm5Pm8Y67liYaR9m0vTT+P4IJr/b+q6ZQ01Q2DjWODC5Mqw43fk2LETaG4kZwOUtQoov3HtmDRdb5paxrAoxrqnJN1lT/o8didyZ/naBflRdS2aGCmvWq1FoSGrqZJfZsTDVgZ8DukOXf3YNEZrD6tA9a56qYOFjQw9Yk/JcoJPVG31z0Das5maDQu1VpLip0zqNVXHAmpTl+/OH57zfdGl/aCqTJIk1HB+yo1znv/T9J/wSdazpDq2rwV9QnwVfbr6+DIU9CzN/+N+m1V+TNr+ixpmAWwAAAABJRU5ErkJggg==");
-    background-repeat:no-repeat;
-    padding:2px 0 2px 64px;
-    margin-right:5px;
-}
-
-/*插件付费*/
-.wx-pay-ico{
-    background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAMAAAAR8Wy4AAAAA3NCSVQICAjb4U/gAAAAtFBMVEUAzABM2Ezx/PHB8sEazhqf6p+B5IE61TrU9tRm3mYq0Sqz77P///8Lygvj+ePI88iP549U2lR54nlF10Wm7KY31Dcj0CPS9dL1/fW58Lnr++sx0zHY99jD8sMSzBJc3FxA1kCU6JQfzx+t7a1s32zm+uaj66O377cPyw+q7ar////c99zH88fL9Mu177VG10Yk0CSR55Eczxw81TzX9tdp32k41Ti78Lsy0zLF88UhzyHB88EyB+unAAAACXBIWXMAAA7DAAAOwwHHb6hkAAAAFnRFWHRDcmVhdGlvbiBUaW1lADA1LzI5LzE4XO1tXgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAACTSURBVAiZRU8JDsIwDHNXGMcCjHNjMBhnQTAVcQjE/x9G0qHOUtLYal0HJEiiXaQzN4JrU/TAmL2WTgjG8GiyEHxqvj2yEHra0pdYEW7AgwtqTnkBXMF+w35n3aanlWtnEZATpfvq3QRd7jaNV3+jAWI5Gt6Yc0zrb3EqJZjy/Ktd9DdwF7oYZdUuoU0OxpjS7UY/XkQJtfApswsAAAAASUVORK5CYII=") no-repeat;
-    display: inline-block;
-    width: 16px;
-    height: 14px;
-}
-.libPay-item{
-    margin-bottom: 30px;
-}
-.libPay-item .li-tit{
-    margin-bottom: 10px;
-}
-.libPay-item .li-c-item li{
-    font-size: 0;
-    margin-bottom:20px;
-    border: #ddd 1px solid;
-    border-radius: 4px;
-    height: 42px;
-    line-height: 40px;
-    padding: 0 20px;
-    cursor: pointer;
-    box-sizing: border-box;
-    transition: border-color .1s ease-in,color .1s ease-in;
-}
-.libPay-item .li-c-item li:hover{
-    border: #20a53a 1px solid;
-    color: #20A53A;
-}
-.libPay-item .li-c-item li.active,.libPay-item .li-c-item li.active:hover{
-    border: #20a53a 2px solid;
-    color: #20A53A;
-    padding: 0 19px;
-    line-height: 38px;
-}
-.libPay-item .li-c-item li .item-name{
-    font-size: 14px;
-    vertical-align: middle;
-}
-.libPay-item .li-c-item li .item-info{
-    font-size: 14px;
-    vertical-align: middle;
-}
-.pay-btn-group{
-    position: relative;
-    display: inline-block;
-    vertical-align: middle;
-}
-.pay-btn-group>.pay-cycle-btn {
-    position: relative;
-    float: left;
-}
-.pay-cycle-btn {
-    font-size: 0;
-    width: 106px;
-    height: 40px;
-    line-height: 38px;
-    display: block;
-    margin-bottom: -1px;
-    text-align: center;
-    vertical-align: middle;
-    border: 1px solid #ddd;
-    box-sizing: border-box;
-    margin-left: -1px;
-    transition: border-color .1s ease-in,color .1s ease-in;
-}
-.pay-cycle-btn span{
-    font-size: 14px;
-    line-height: 25px;
-    vertical-align: middle;
-}
-.pay-btn-group>.pay-cycle-btn:first-child {
-    margin-left: 0;
-    border-top-left-radius: 4px;
-    border-bottom-left-radius: 4px;
-}
-.pay-btn-group>.pay-cycle-btn:nth-of-type(5n+1){
-    margin-left: 0;
-}
-.pay-btn-group>.pay-cycle-btn:last-child {
-    border-top-right-radius: 4px;
-    border-bottom-right-radius: 4px;
-}
-.pay-btn-group .active,.li-c-item .active{
-    background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAMAAADzapwJAAAAA3NCSVQICAjb4U/gAAAAclBMVEX///8fpTofpTogpTogpTogpTrw+fLt+O/i8+be8uLb8d/T7djP7NXR7NbE58u548G34sCr3bWU1KGT05+FzpN+y413yIZ0x4RxxoJwxYFnwnliv3RWu2pUumhMt2FGtVxDs1k6sFE4r1Avq0cjpjwgpTpRW86VAAAAJnRSTlMAEXd3iO7//////////////////////////////////////////0c8mUAAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAWdEVYdENyZWF0aW9uIFRpbWUAMDUvMjkvMThc7W1eAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAAHhJREFUGJVtzskSgkAMBFB2AUcR2QTcEPr/fxFmmFiW0znk8CrVac9jE1CNYqoAV8JaXTbq8K7/bBVcwRVcwRVcwbRTIDqcWrjaJ3cJ0VrdjDaHh2Sb2/F43XadPuWlTfjkJersLU2+ufNFnSdb0P/5thQv6R2CzQo9Oh+AlBF9bAAAAABJRU5ErkJggg==") no-repeat right bottom;
-}
-.pay-btn-group .pay-cycle-btn:hover{
-    border: 1px solid #20a53a;
-    color: #20a53a;
-    z-index: 2;
-    cursor: pointer;
-}
-.pay-btn-group .active,.pay-btn-group .active:hover{
-    border: 2px solid #20a53a;
-    color: #20a53a;
-    z-index: 2;
-    cursor: pointer;
-}
-.pay-btn-group .active span{
-    line-height: 22px;
-}
-.pay-cycle-btn em {
-    position: absolute;
-    right: -2px;
-    top: -9px;
-    width: 33px;
-    height: 19px;
-    background: #ff7300;
-    border-radius: 2px;
-    font-size: 10px;
-    line-height: 19px;
-    color: #fff;
-    transform: scale(.9, .8);
-    font-style: normal;
-}
-.pay-btn-group .active em{
-    right: -3px;
-    top: -10px;
-}
-.paymethod{
-    margin: 0 auto;
-    width: 160px;
-}
-.paymethod .pay-wx{
-    height:175px;
-}
-.paymethod .pay-wx canvas {
-    width: 160px;
-    height: 160px;
-    border: #ddd 1px solid;
-    margin: 6px auto;
-    padding: 5px;
-    border-bottom-color: #00c800;
-}
-.lib-price-box{
-    padding-bottom: 5px;
-}
-.price-txt{
-    color:#FF7301
-}
-.sale-price{
-    font-size: 20px;
-    margin-right: 5px;
-}
-.lib-price-name,.price-txt{
-    margin-right: 15px;
-}
-/*input样式*/
-.bt-label{
-    margin:20px 20px 0 0;
-    display:inline-block;
-    font-weight:normal
-}
-.bt-radio,.bt-checked{
-    display:none
-}
-.bt-radioinput{
-    background-color:#fff;
-    border:1px solid #ccc;
-    border-radius:100%;
-    display:inline-block;
-    height:16px;
-    margin-right:10px;
-    margin-top:-1px;
-    vertical-align:middle;
-    width:16px;
-    line-height:1
-}
-.bt-radio:checked + .bt-radioinput,.bt-checked:checked + .bt-radioinput{
-    border:1px solid #20a53a;
-    background-color: #20A53A;
-}
-.bt-radio:checked + .bt-radioinput:after{
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAKBAMAAAB293L0AAAAA3NCSVQICAjb4U/gAAAAKlBMVEX///////////////////////////////////////////////////////9q+00tAAAADnRSTlMAETNEVWZ3iJmqu93u/wlUiAQAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAWdEVYdENyZWF0aW9uIFRpbWUAMDYvMDIvMTjAxKOiAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAADpJREFUCJljYACDTAjFcgRC+xpAuFcYGCqAtK0DA4P2BAbmq0A2404G3QSQpPTi62BFjGsTIJpEQQQATscJDpRQCfQAAAAASUVORK5CYII=");
-    background-repeat: no-repeat;   
-    border-radius:100%;
-    content:"";
-    display:inline-block;
-    height:12px;
-    width:12px;
-    margin: 1px;
-}
-.bt-checkbox.bt-radioinput,.bt-radio:checked + .bt-checkbox.bt-radioinput:after{
-    border-radius:0
-}
-.loading{
-    background-image: url("data:image/gif;base64,R0lGODlhJQAlAJECAL3L2AYrTv///wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFCgACACwAAAAAJQAlAAACi5SPqcvtDyGYIFpF690i8xUw3qJBwUlSadmcLqYmGQu6KDIeM13beGzYWWy3DlB4IYaMk+Dso2RWkFCfLPcRvFbZxFLUDTt21BW56TyjRep1e20+i+eYMR145W2eefj+6VFmgTQi+ECVY8iGxcg35phGo/iDFwlTyXWphwlm1imGRdcnuqhHeop6UAAAIfkEBQoAAgAsEAACAAQACwAAAgWMj6nLXAAh+QQFCgACACwVAAUACgALAAACFZQvgRi92dyJcVJlLobUdi8x4bIhBQAh+QQFCgACACwXABEADAADAAACBYyPqcsFACH5BAUKAAIALBUAFQAKAAsAAAITlGKZwWoMHYxqtmplxlNT7ixGAQAh+QQFCgACACwQABgABAALAAACBYyPqctcACH5BAUKAAIALAUAFQAKAAsAAAIVlC+BGL3Z3IlxUmUuhtR2LzHhsiEFACH5BAUKAAIALAEAEQAMAAMAAAIFjI+pywUAIfkEBQoAAgAsBQAFAAoACwAAAhOUYJnAagwdjGq2amXGU1PuLEYBACH5BAUKAAIALBAAAgAEAAsAAAIFhI+py1wAIfkEBQoAAgAsFQAFAAoACwAAAhWUL4AIvdnciXFSZS6G1HYvMeGyIQUAIfkEBQoAAgAsFwARAAwAAwAAAgWEj6nLBQAh+QQFCgACACwVABUACgALAAACE5RgmcBqDB2MarZqZcZTU+4sRgEAIfkEBQoAAgAsEAAYAAQACwAAAgWEj6nLXAAh+QQFCgACACwFABUACgALAAACFZQvgAi92dyJcVJlLobUdi8x4bIhBQAh+QQFCgACACwBABEADAADAAACBYSPqcsFADs=");
-    background-repeat:no-repeat;
-    background-position:62px 41px;
-    border: #ddd 1px solid;
-    width: 160px;
-    height: 160px;
-    padding:5px;
-    background-color: #787878;
-    color: #fff;
-    display: inline-block;
-    margin: 6px auto;
-    line-height: 200px;
-    font-size: 14px;
-    text-align:center;
-}
-
-.cloading {
-    background-image: url("data:image/gif;base64,R0lGODlhJQAlAJECAL3L2AYrTv///wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFCgACACwAAAAAJQAlAAACi5SPqcvtDyGYIFpF690i8xUw3qJBwUlSadmcLqYmGQu6KDIeM13beGzYWWy3DlB4IYaMk+Dso2RWkFCfLPcRvFbZxFLUDTt21BW56TyjRep1e20+i+eYMR145W2eefj+6VFmgTQi+ECVY8iGxcg35phGo/iDFwlTyXWphwlm1imGRdcnuqhHeop6UAAAIfkEBQoAAgAsEAACAAQACwAAAgWMj6nLXAAh+QQFCgACACwVAAUACgALAAACFZQvgRi92dyJcVJlLobUdi8x4bIhBQAh+QQFCgACACwXABEADAADAAACBYyPqcsFACH5BAUKAAIALBUAFQAKAAsAAAITlGKZwWoMHYxqtmplxlNT7ixGAQAh+QQFCgACACwQABgABAALAAACBYyPqctcACH5BAUKAAIALAUAFQAKAAsAAAIVlC+BGL3Z3IlxUmUuhtR2LzHhsiEFACH5BAUKAAIALAEAEQAMAAMAAAIFjI+pywUAIfkEBQoAAgAsBQAFAAoACwAAAhOUYJnAagwdjGq2amXGU1PuLEYBACH5BAUKAAIALBAAAgAEAAsAAAIFhI+py1wAIfkEBQoAAgAsFQAFAAoACwAAAhWUL4AIvdnciXFSZS6G1HYvMeGyIQUAIfkEBQoAAgAsFwARAAwAAwAAAgWEj6nLBQAh+QQFCgACACwVABUACgALAAACE5RgmcBqDB2MarZqZcZTU+4sRgEAIfkEBQoAAgAsEAAYAAQACwAAAgWEj6nLXAAh+QQFCgACACwFABUACgALAAACFZQvgAi92dyJcVJlLobUdi8x4bIhBQAh+QQFCgACACwBABEADAADAAACBYSPqcsFADs=");
-    background-repeat: no-repeat;
-    background-position: center 45px;
-    height: 150px;
-    width: 100%;
-    line-height: 210px;
-    text-align: center;
-    font-size: 14px;
-}
-
-/*重启*/
-.rebt-con {
-    height: 106px;
-    padding: 15px;
-    width: 330px;
-}
-.rebt-li {
-    float: left;
-    line-height: 40px;
-    margin: 15px;
-    text-align: center;
-    width: 120px;
-}
-.rebt-li a {
-    display: block;
-    background: #eee;
-    border: #ddd 1px solid;
-}
-.rebt-li a:hover{
-    background-color:#20a53a;
-    color:#fff;
-}
-/*绑定宝塔微信*/
-.bind-weixin{
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAASBAMAAACtCzMeAAAAA3NCSVQICAjb4U/gAAAAKlBMVEX19fXr6+vg4ODW1tbMzMzCwsK4uLitra2jo6OZmZmPj4+FhYV6enr////oR1GpAAAADnRSTlP/////////////////AEXA3MgAAAAJcEhZcwAADpwAAA6cAQeUU90AAAAWdEVYdENyZWF0aW9uIFRpbWUAMDgvMTYvMTgi+WYYAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAAK9JREFUCJljuHuXyS1I4C4IMNy9MiNYpF0XzL5Qznv37uUpYPbVWBDF4Qtii9+N8b2y5WIRiB1810L3UuHdEBC7FqTkYlhnqyyUbcJ798rSuwxBQOYVkE5OX6Deu3dVedMulF1oYLgCNDPpbujd1LtJDEDqbhDYCc4Md9WUBIrB7ESGu15pLiUg5oUAhrvKd+9etQWy2WUZwEJAPUCbwey7zCHu04ug7LsMDExL7gIAh3d+c1Jd4JYAAAAASUVORK5CYII=");
-    background-repeat: no-repeat;
-    padding-left:26px;
-    margin-right:30px;
-}
-.bind-user{
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASBAMAAACk4JNkAAAAA3NCSVQICAjb4U/gAAAAMFBMVEX19fXr6+vg4ODW1tbMzMzCwsK4uLitra2jo6OZmZmPj4+FhYV6enpwcHBmZmb///+wFcT2AAAAEHRSTlP///////////////////8A4CNdGQAAAAlwSFlzAAAOnAAADpwBB5RT3QAAABZ0RVh0Q3JlYXRpb24gVGltZQAwOC8xNi8xOCL5ZhgAAAAcdEVYdFNvZnR3YXJlAEFkb2JlIEZpcmV3b3JrcyBDUzbovLKMAAAAh0lEQVQImWP4//+/2KxiIMnw//+X2+1rCsCsuP7/n26CWB+PA6X04oGsbweBrJ/rgawf64GsbxtQWBDZ+TAdNv5gUxL+s74EmfJpz6mOtWdAYnYTNFZP/vb0P8OHU///f/j/P0+f4duF/yDwaz4Ddz2Y9ekQg448mPV/G4M3hPG/g8ESygoHALeIhpF8DGw6AAAAAElFTkSuQmCC");
-    background-repeat: no-repeat;
-    padding-left:24px;
-    margin-right:20px;
-}
-/*系统图标*/
-.ico-linux{
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAATBAMAAACEi/vCAAAAA3NCSVQICAjb4U/gAAAAMFBMVEX///9mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmambAcKAAAAEHRSTlMAESIzRFVmd4iZqrvM3e7/dpUBFQAAAAlwSFlzAAAOwwAADsMBx2+oZAAAABZ0RVh0Q3JlYXRpb24gVGltZQAwOC8xNi8xOCL5ZhgAAAAcdEVYdFNvZnR3YXJlAEFkb2JlIEZpcmV3b3JrcyBDUzbovLKMAAAAmUlEQVQImWNgYGCQ/GvAAAHz/1+CMBjPvvoOYTFVLXkNZZ2u+isAZjE/4vyvAGaxlgbnJ4BZHAoM3A/BLA8GBpafYNYiIL4PMpt1A5DYPwFIcDWArDkAJPgWAInzF4BE9jMGBvb/QM2SBfEGDFy7UhkY3Bk4CxisGdgCGMwYGI97vGKwSmAQC1G8e+aN2WagDuP0IEGbawIMAPDJKG706GgtAAAAAElFTkSuQmCC");
-    background-repeat:no-repeat;
-    padding-left: 20px;
-}
-.ico-windows{
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAA3NCSVQICAjb4U/gAAAALVBMVEX///+ZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZny8jBSAAAAD3RSTlMAESIzRFVmd4iZqrvM7v/Y8bBbAAAACXBIWXMAAA7DAAAOwwHHb6hkAAAAFnRFWHRDcmVhdGlvbiBUaW1lADA4LzE2LzE4IvlmGAAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAABGSURBVAiZY2AAAkbTqrMMDEJuHvfevXvHcPbdu+53IMY7Ihi7d+9O7QACBiB2BTOAol0wNbgY59696wQzGFQqw8GWwpwBAGURWs03JAEWAAAAAElFTkSuQmCC");
-    background-repeat:no-repeat;
-    background-position: 0 2px;
-    padding-left: 20px;
-}
-.ico-centos{
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAPCAMAAADjyg5GAAAAA3NCSVQICAjb4U/gAAAASFBMVEX///9mZmZmZmZiYmJaWlpYWFhmZmZiYmJgYGBmZmZgYGBmZmZiYmJmZmZiYmJmZmZiYmJmZmZmZmZmZmZmZmZmZmZmZmZmZmbwNFvuAAAAGHRSTlMAESIiIiIzMzNERFVVZmZ3d4iZqrvM3f93YyfbAAAACXBIWXMAAA7DAAAOwwHHb6hkAAAAFnRFWHRDcmVhdGlvbiBUaW1lADA4LzE3LzE4mkUBfQAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAB6SURBVAiZVY5ZEsIwDEMdUpYQghIv9f1vWpNCp/hH1oz1LKI5if5G5ezuzLff7ibO7KK+H2LaBp1WDMLcYDNf3A31CXMvRCy995rSK0SExhjAkh/XEK5E2YOCN5r75RNGUJgtZJLXoMQjw/ot2LR3baJHSbN8Ll3LrhtQxAfrvVHLpQAAAABJRU5ErkJggg==");
-    background-repeat:no-repeat;
-    padding-left: 20px;
-}
-.ico-ubuntu{
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAMAAAAolt3jAAAAA3NCSVQICAjb4U/gAAAAOVBMVEX///9mZmZhYWFmZmZiYmJmZmZiYmJmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZVQ1Z+AAAAE3RSTlMAEREiIjMzRFVmd4iZqrvM3e7/67N/KAAAAAlwSFlzAAAOwwAADsMBx2+oZAAAABZ0RVh0Q3JlYXRpb24gVGltZQAwOC8xNy8xOJpFAX0AAAAcdEVYdFNvZnR3YXJlAEFkb2JlIEZpcmV3b3JrcyBDUzbovLKMAAAAbElEQVQImU2OWQ6AMAhEcW3Z2jL3P6xWjHE+CMPwCESfDOXtFmutAp6OtwC0jUwZVlWHaaaBniyYVq6B/Rn3G3aEjDxRuPwtN6NFzkB97IAlE3ddHTimPUKkd3TlhLb5huvLzAWWE2j0k0elCynoBUe/zXGJAAAAAElFTkSuQmCC");
-    background-repeat:no-repeat;
-    padding-left: 20px;
-}
-.ico-debian{
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAMAAAARSr4IAAAAA3NCSVQICAjb4U/gAAAAPFBMVEX///9paWlmZmZgYGBdXV1mZmZgYGBmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmYdQ+x6AAAAFHRSTlMAERERESIiM0RVZneImaq7zN3u/ynguF0AAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAWdEVYdENyZWF0aW9uIFRpbWUAMDgvMTcvMTiaRQF9AAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAAHJJREFUCJlVjlESwjAIRLFFIRhCaO5/VyHijN2vt+zCABBq87IhT/hK1+zdfOl2Y71r2rPp1UKfAOdFgaTtAWIRWgacMUUquSi7TR6U2LflFuW0nOVjYB7JQBqwHklOe49f9dOAf+HvjRIZ3L3ePTIWfQAgiAODqr7Z+QAAAABJRU5ErkJggg==");
-    background-repeat:no-repeat;
-    padding-left: 20px;
-}
-.ico-fedora{
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAMAAAAolt3jAAAAA3NCSVQICAjb4U/gAAAAPFBMVEX///9VVVVLS0tmZmZaWlpmZmZiYmJmZmZiYmJmZmZiYmJiYmJmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmYd2jWRAAAAFHRSTlMAEREiIjMzRERVVWaImaq7zN3u/2KENScAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAWdEVYdENyZWF0aW9uIFRpbWUAMDgvMTcvMTiaRQF9AAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAAGJJREFUCJlFj1kSwCAIQ9N9Lxjuf9faUKf5IPNQiAJAZ4yg9ZCWkMj5pxWwGCqK5skLg8AphMv2dIJC0106nNmu5VLA1bBmfqclF7fZO9HTYqzO4tMuOt5XGLA1enMzQ194ADH/CrSqGfFbAAAAAElFTkSuQmCC");
-    background-repeat:no-repeat;
-    padding-left: 20px;
-}
-.ico-mac{
-    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAA9ElEQVQ4T5XSvyvGURTH8dej+AsMyGAykEWSTSkyPFJMyvAsYjFZJWZ/gQyKYjEZLcrkRzZZTXomgyzKj3TkW99u6l63bt3OPe/z43NOQ/6sI+5g6trIsMs4wjUm/gs/og+TuMrBA1jAO06wgn3MohfHeKqC1MvexBY6fz/fcI+xWsZXNHEZtgpu4SCvnRfM4KYOn2O6AF7DXr3syB4ldhXAw3hIe/5ERwEc/d+lcBs9BfAOtlM4RrBUAH8hprKLj0rtRZwWwOES4xupqx3vWMHxggDzOEvhftxmer/A1F8bFrYhbKAbh3jGKOYQoq4ituznfAP/VikQF8NdKgAAAABJRU5ErkJggg==");
-    background-repeat:no-repeat;
-    padding-top: 2px;
-    padding-left: 20px;
-}
-
-.index-pos-box{
-    height: 52px;
-    box-shadow: 0 1px 2px 0 rgba(0,0,0,.1);
-}
-.index-pos-box .position{
-    line-height: 52px;
-}
-.change-id{
-    margin-left: 8px;
-    color: #20a53a;
-}
-.bind-user .glyphicon{
-    color: #20a53a;
-    font-size: 12px;
-    margin-right: 3px;
-}
-/*微信二维码*/
-.boxConter {
-    height: 458px;
-    position: relative;
-    overflow: auto;
-}
-
-.iconCode {
-    padding: 50px 60px;
-}
-
-.box-conter {
-    width: 100%;
-}
-
-#QRcode {
-    margin-bottom: 25px;
-    text-align: center;
-}
-
-.iconCode #QRcode,
-.iconCode .codeTip {
-    width: 100%;
-    text-align: center;
-    font-size: 17px;
-}
-
-.iconCode .weChatSamll img {
-    width: 100%;
-}
-
-.iconCode .weChatSamll {
-    display: none;
-    width: 200px;
-    height: 200px;
-    position: absolute;
-    border: 1px solid #ececec;
-    border-radius: 5px;
-    bottom: 150px;
-    right: 50px;
-    padding: 20px;
-    background-color: #fff;
-}
-
-.iconCode .weChatSamll:after {
-    content: '';
-    width: 15px;
-    height: 15px;
-    background: #ffffff;
-    border-bottom: 1px solid #ececec;
-    border-right: 1px solid #ececec;
-    transform: rotate(45deg);
-    position: absolute;
-    border-radius: 4px;
-    left: 90px;
-    bottom: -8px;
-}
-
-.iconCode .weChat {
-    margin-left: 15px;
-}
-
-.iconCode .weChat:hover .weChatSamll {
-    display: block;
-}
-
-.iconCode .QRcode {
-    margin-bottom: 15px;
-    text-align: center;
-}
-
-.codeTip ul li {
-    margin-bottom: 10px;
-}
-
-.personalDetails .head_img {
-    width: 50px;
-    height: 50px;
-    float: left;
-    margin-right: 30px;
-}
-
-.personalDetails .head_img img {
-    height: 100%;
-    border-radius: 50%;
-}
-
-.personalDetails .nick_name {
-    height: 50px;
-    line-height: 50px;
-    width: 148px;
-    float: left;
-    font-size: 15px;
-    color: #808080;
-}
-
-.personalDetails .userList {
-    height: 100%;
-}
-
-.personalDetails .userList .addweChat {
-    height: 50px;
-    text-align: center;
-    padding-top: 20px;
-    color: #20a53a;
-    font-size: 16px;
-}
-
-.personalDetails .userList .addweChat:hover {
-}
-
-.personalDetails .userList .item {
-    height: 70px;
-    padding: 10px 15px;
-    border: 1px solid #ececec;
-    margin: 15px 65px;
-    border-radius: 5px;
-}
-
-.personalDetails .userList .cancelBind {
-    height: 50px;
-    width: 60px;
-    float: right;
-    line-height: 50px;
-    text-align: center;
-}
-
-.libLogin .line{
-    position:relative;
-}
-.libLogin .tips {
-    position: absolute;
-    top: 13px;
-    right: 28px;
-    background: #ff4949;
-    color: #fff;
-    padding: 4px 6px;
-    border-radius: 5px;
-}
-.change-id{
-    cursor:pointer;
-}
-.red{
-    color: red;
-}
-
-select[disabled]{
-    border:1px solid #DDD;
-    background-color:#F5F5F5;
-    color:#ACA899;
-}
-
-.cicle {
-    position: relative;
-    width: 88px;
-    height: 88px;
-    margin: 0 auto;
-    border-width: 6px;
-    border-color: #ccc;
-    border-style: solid;
-    border-radius: 50%;
-}
-
-.cicle *,
-.cicle{
-    box-sizing:content-box;
-    -webkit-box-sizing:content-box;
-    -moz-box-sizing: content-box;
-}
-
-.cicle .bar {
-    position: absolute;
-    width: 50px;
-    height: 100px;
-    overflow: hidden;
-}
-
-.cicle .bar-left {
-    top: -6px;
-    left: -6px;
-}
-
-.cicle .bar-an {
-    position: absolute;
-    width: 88px;
-    height: 88px;
-    border-width:6px;
-    border-style: solid;
-    border-radius: 50%;
-    transform: rotate(-135deg);
-}
-
-.cicle .bar-left .bar-left-an {
-    z-index: 10;
-    border-color: transparent transparent #20a53a #20a53a;
-}
-
-.cicle .bar-right {
-    top: -6px;
-    left: 44px;
-}
-
-.cicle .bar-right .bar-right-an {
-    left: -50px;
-    z-index: 20;
-    border-color: #20a53a #20a53a transparent transparent;
-}
-
-.cicle .occupy {
-    position: absolute;
-    width: 88px;
-    height: 88px;
-    line-height: 88px;
-    text-align: center;
-    font-size: 18px;
-    color: #20a53a;
-}
-
-.mem-action .occupy{
-    font-size: 14px;
-}
-.mem-action .occupy.line{
-    line-height: 22px;
-    padding-top: 22px;
-}
-
-.change-default button{
-    width: 188px;
-    margin: 10px
-}
-.bt-w-con .line .info-r{
-    margin-left:0;
-}
-
-.bt-logs textarea{
-    white-space: pre;
-    margin: 0px;
-    width: 500px;
-    height: 520px;
-    background-color: #333;
-    color: #fff;
-    padding: 0 5px;
-}
-.dir-rewrite-man-con{
-     margin-left: 15px;
-}
-
-.domain-ul-list{
-    padding: 5px 10px;
-    max-height: 180px;
-    overflow: auto;
-    width: 260px;
-    border: #ccc 1px solid;
-    border-radius: 3px;
-}
-.domain-ul-list li{
-    line-height:26px;
-}
-.domain-ul-list li .checkbox-text{
-    margin-right:5px; 
-    vertical-align:-2px
-}
-.btswitch-btn.bt-waf-firewall{
-    width:2.4em;height:1.4em;margin-bottom: 0
-}
-
-
-/*6.0终端样式*/
-.term-box{
-    padding:5px 10px 10px;
-    background-color:#333333;
-}
-.shell-text-input .bt-input-text-shell{
-    width:100%;
-    padding:10px 10px 0;
-    border:0 none;
-    height:60px;
-    overflow:auto;
-    resize:none;
-}
-
-.shell-text-input .bt-input-text-shell:focus,.shell-text-input .bt-input-text-shell:active{
-    border:0 none;
-    outline:none;
-}
-
-.shell-btn-group {
-    height:30px;
-    position:absolute;
-    bottom:20px;
-    right:10px;
-}
-.shell_btn_close {
-    margin-right:8px;
-}
-
-.file_search {
-    position: absolute;
-    right: 58px;
-    font-size: 12px;
-    color: #666;
-    width: 85px;
-    border-top: none;
-    background: #fff;
-    height: 8px;
-    line-height: 48px;
-    top: 0;
-}
-
-.file_search .file_search_checked {
-  position: relative;
-  height: 15px;
-  width: 15px;
-  border-radius: 1px;
-  cursor: pointer;
-  text-align: center;
-  margin: 0;
-  vertical-align: sub;
-  border:1px solid #aaa;
-  border-radius: 2px;
-  display: inline-block;
-  font-family: 'Glyphicons Halflings';
-  font-style: normal;
-  font-weight: 400;
-  line-height: 1;
-  -webkit-font-smoothing: antialiased;
-}
-
-.file_search .file_search_checked.active {
-  background: #20a53a;
-  color: #fff;
-  border-color:#20a53a ;
-}
-
-.file_search .file_search_checked.active:after {
-  content: "\e013";
-  font-size: 12px;
-  transform: scale(.85);
-  position: absolute;
-  left: .75px;
-  top: .75px;
-}
-
-
-.file_search label {
-  position: absolute;
-  right: 5px;
-  cursor: pointer;
-  top: 0;
-  font-weight: 400;
-}
-
-#form_proxy .sub-groud .bt-input-text{
-    margin-right: 10px;
-}
-#form_proxy .sub-groud {
-    margin-bottom: 15px;
-}
-#form_proxy .btswitch-btn{
-    display:inline-block;
-}
-#form_proxy .add-replace-prosy {
-    position: relative;
-    top: -10px;
-}
-#form_proxy .disabled{
-    background-color: #eee !important;
-    cursor: default;
-    border: 1px solid #dbdbea;
-}
-
-
-/* site的tab切换 */
-.tab-list .tabs-item:hover {
-  background: #20a53a08;
-}
-
-.tab-list .tabs-item:first-child {
-  border-top-left-radius: 4px;
-  border-bottom-left-radius: 4px;
-}
-
-.tab-list .tabs-item {
-  display: inline-block;
-  height: 45px;
-  min-width: 100px;
-  padding: 0 20px;
-  line-height: 45px;
-  font-size: 13px;
-  cursor: pointer;
-  white-space: nowrap;
-  position: relative;
-  text-align: center;
-}
-@media screen and (max-width: 1300px) {
-    .tab-list .tabs-item{
-        padding: 0 10px;
-        min-width: 80px;
-    }
-}
-.tab-list .tabs-item.active:after {
-  content: '';
-  width: 20px;
-  height: 2px;
-  position: absolute;
-  left: 50%;
-  bottom: 0px;
-  background: red;
-  margin-left: -10px;
-  background: #20a53a;
-}
-
-.tab-list .tabs-item.active {
-  color: #20a53a;
-  background: #20a53a10;
-}
-
-.tab-view-box {
-  padding: 15px;
-  border-radius: 4px;
-  box-shadow: 0 0 1px 0 rgb(0 0 0 / 5%);
-}
-
-.radius4 {
-  border-radius: 4px;
-  box-shadow: 0 0 1px 0 rgb(0 0 0 / 5%);
-}
-.radius2 {
-  border-radius: 2px;
-}
-
-
-.tootls_group {
-    height: 30px;
-    line-height: 30px;
-}
-
-.tootls_group .search {
-    display: inline-block;
-    height: 30px;
-    line-height: 30px;
-    position: relative;
-    width: 230px;
-}
-
-.tootls_group .search .search_input {
-    height: 30px;
-    line-height: 30px;
-    border-radius: 2px;
-    border: 1px solid #ccc;
-    outline: none;
-    padding-left: 8px;
-    vertical-align: top;
-    width: 230px;
-}
-
-.tootls_group .search .search_input:focus {
-    border-color: #20a53a;
-}
-
-.tootls_group .search .search_input:focus + span.glyphicon-search {
-    color: #20a53a;
-}
-
-.tootls_group .search .glyphicon-remove-sign {
-    position: absolute;
-    top: 8px;
-    right: 30px;
-    font-size: 15px;
-    cursor: pointer;
-}
-
-.tootls_group .search .glyphicon-search {
-    height: 28px;
-    line-height: 28px;
-    padding: 0 10px;
-    color: #888;
-    position: absolute;
-    right: 0;
-    font-size: 14px;
-    cursor: pointer;
-    float: left;
-}
-
-.tootls_group .page .page_jump_group .page_jump_btn:hover {
-    background-color: #10952a;
-    border-color: #398439;
-}
-
-.tootls_group .search .search-btn span {
-    font-size: 15px;
-    vertical-align: middle;
-    position: relative;
-    top: -1px;
-}
-
-.tootls_group .page {
-    padding: 0;
-    height: 30px;
-}
-
-.tootls_group .page .page_select_number,
-.tootls_group .page .page_jump_group {
-    height: 28px;
-    line-height: 26px;
-    margin-left: 8px;
-    vertical-align: top;
-    float: left;
-}
-
-.tootls_group .page .page_jump_group span {
-    border: none;
-    padding: 0 8px;
-}
-
-.tootls_group .page .page_select_number {
-    border: 1px solid #ececec;
-    border-radius: 0;
-    padding: 0 5px;
-    border-left: 0;
-    margin-left: 0;
-}
-
-.tootls_group .page .page_jump_group input {
-    height: 28px;
-    line-height: 28px;
-    width: 30px;
-    max-width: 50px;
-    vertical-align: top;
-    border: 1px solid #ececec;
-    outline: none;
-    text-align: center;
-    float: left;
-}
-
-.tootls_group .page .page_jump_group input:focus {
-    border-color: #20a53a;
-}
-
-.tootls_group .page .page_jump_group .page-jump-title {
-    height: 28px;
-    line-height: 28px;
-    color: #555;
-    border: none;
-    padding: 0 5px;
-}
-
-.tootls_group .page .page_jump_group .page_jump_btn {
-    height: 28px;
-    line-height: 24px;
-    border-radius: 0;
-    outline: none;
-    margin-left: 8px;
-    border-radius: 2px;
-    color: #555;
-    background-color: #fff;
-    border: 1px solid #ccc;
-}
-
-.tootls_group .page .page_jump_group .page_jump_btn:hover {
-    color: #fff;
-    background-color: #20a53a;
-    border-color: #20a53a;
-}
-
-.size_ellipsis {
-    display: inline-block;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-
-.title.tabs-nav {
-    padding: 0;
-    position: relative;
-}
-
-.title.tabs-nav span {
-    display: inline-block;
-    height: 50px;
-    min-width: 100px;
-    padding: 0 20px;
-    line-height: 50px;
-    font-size: 15px;
-    cursor: pointer;
-    position: relative;
-    text-align: center;
-}
-
-.title.tabs-nav span.active {
-    color: #20a53a;
-    background: #20a53a08;
-}
-
-
-.title.tabs-nav select {
-    position: absolute;
-    right: 5px;
-    top: 50%;
-    margin-top: -12px;
-}
-
-select[name="network-io"], select[name="disk-io"] {
-    font-size: 13px;
-    height: 24px;
-    line-height: 24px;
-    padding: 2px;
-    border-radius: 0;
-    border-color: #ececec;
-}
-
-.tabs-content .tabs-item {
-    display: none;
-    height: 100%;
-    width: 100%;
-    background-color: #fff;
-}
-
-.tabs-content .tabs-active.tabs-item {
-    display: inline-block;
-}
-
-.bw-info {
-  height: 80px;
-}
-
-.bw-info>div {
-  float: left;
-  padding-top: 35px;
-  text-align: center;
-}
-
-.bw-info>div p {
-  margin-bottom: 7px;
-}
-
-.bw-info>div a {
-  font-size: 14px;
-  color: #666;
-}
-
-.bw-info .ico-down,
-.bw-info .ico-up,
-.bw-info .ico-write,
-.bw-info .ico-read {
-  width: 10px;
-  height: 10px;
-  display: inline-block;
-  margin-right: 3px;
-  border-radius: 5px;
-}
-
-.bw-info .ico-down {
-  background-color: #52a9ff;
-}
-
-.bw-info .ico-up {
-  background-color: #f7b851;
-}
-
-.bw-info .ico-write {
-  background-color: #6CC0CF;
-}
-
-.bw-info .ico-read {
-  background-color: #FF4683;
-}
-
-.bw-info ul li {
-  height: 56px;
-  line-height: 56px;
-}
-
-.bw-info ul li.bi-line {
-  border-bottom: #ddd solid 1px;
-}
\ No newline at end of file
diff --git a/route/static/favicon.ico b/route/static/favicon.ico
deleted file mode 100644
index 17e918a805f4f1f16613716ef3238518435197cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9662
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

diff --git a/route/static/images/ico-ts-cpu-active.png b/route/static/images/ico-ts-cpu-active.png
deleted file mode 100755
index 1abf4f009e9fb10342b560060fb502da88b7647a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 780
zcmV+n1M~ceP)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_0008hNkl<ZcmdRu
z1MD0@6vk`Y?p$qacH4hY2Q}i_wrw}Ab;?DxV;gPE+P1gfn|zy0&RaLhFEej;-uu3r
zd2@w4&&!F5=tU~(d;+Z{##k4;13M(<+A83wcn@Xbc+Vz?pR1_ekdMZHXJiJ7ehfvO
zdK4`K-hd63kp;#`qFW`2Ly3ZFh@Zm9^1wzKhTXPEo&n~N*<hxMxo1SAVbs}zaSB+g
zBCgjk=3K>mnt=I5S;Kst?7`km7{4I*g4AHGIb?=tWi&z)-@se&3cNNWVf>OK=OoLX
zq+0K&u`rtvar+)uF<OOtv;iGRd(f66*OFuI$)3{&wMRhX1DK!7$SWkYlK6L^&}TfI
zmD!BUHk;u7HyUZgMqiP=M`(nx!n}_P>j5~@ff?uz3e?eV<(Sg~Iek@_-;rx-pq6~c
zyd6(urmb!MBghPN_$gjZJChXC=Dz`a0iVF<BtG%`6VQP<`?<#N$dwqiEF-UsmS|GH
zkZdOJ!B_B7nv6x)N+CSW2^fcfVMz=I5%3uJ=8s_h966&U2je8Ef%P?(k(V_1-q#l+
ztw{^K{jEHa_B`gL;9V%Ht7Q4J8;d>9Fm|Vr6Nqp6-y0>mls1C+QQY55t_E6rMbp<$
z?vZgxJu;u~zGW68ljH<2_OguJR%hB5HF3O0P1^|OAvWu5yN+yBq@jws>yu7oF^{il
z79-PmBAP~yixHXANOi;?<Z8ITDVueN(WHJMHWqO~N{@WN#@bn);{x_bd**~$?-)d-
zaT9FT4R()E%f}R2MHb-R&L_PZ-$<RjjYRbd%&&vH;2yXGu3>!=jkFgHXq_{;)K4xt
zDXB*m@oJi7xtgiG8pp)PbV<bJK{<=^STDhv{?&Y6KC(H3#vy|yY6eYW9W>c@&=hEc
zridRjmENFf1`KG!Xs|aG>EC!B?A;0acd!P3mvi7d;RrlBJ^}#jY=k=dMk3z;0000<
KMNUMnLSTY=qjOaN

diff --git a/route/static/images/ico-ts-cpu.png b/route/static/images/ico-ts-cpu.png
deleted file mode 100755
index 5c9d3eb38c5bdf58aebc87cff15efa2b97e2747e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 645
zcmV;00($+4P)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_0006^Nkl<ZcmdSb
z1*jE46vlD8yW7`Yl&yqK*g@Of-Q6v1cT#rKDGf@e-QB%@3;zp;5ysYez>n*>vvcNi
zXYRf&5k=8=UAS<0hJ27*>c;X$)|qP-NF+(rY4TK-dHbW-1sNyrr3rN<c_qutHPZ-E
zgSw79mbpI_gvt3VItdeHyqsi_RWeEzQ(uxXILCKOxMqcXlC$)fX!?$md|!}p@<m?D
z3wbFo5~!c^$-m*h#`b!{8q<A2CdpeFD0xzZLdoZ|2-MCso;mdFC+}pcHwdY7;`(oh
z&lz`TzAwl`E-LzqK~gyA^ZaLoAk<0HNxDgQxVlOQsluEr>1@Wk(IbiR0@fIB*Nz8f
zV4NIhYYLoa!zcM59~~bUe`LaMmB@^LqF!KvykM<yiS^@w4|pq|Ipz6GT1=y1(o6a{
zdddNLXu|K3r!tT^Bj~Zn1bNPPZxids1G&hO)ub(C(rkGnwLE)1Se{5r>V0zEj8|mA
z#nc&W&1Tljjk!&SIA>%kL9#tTMsNq(n;<u(G<AI^NHT|YqI*V?&|H=}cVs3_(mg@O
za7S8G@0FWoyso@6Ta(Uzb{%Ub#o~d;a?c1&8hV0ElZPh!e){a;;2x!3=A4np;FlpZ
zJY#<~CP<^72r^Hu%5AwLx8#b9V7!nuPBV8w?3?{|&d3b5Cc_hCG+Wb#y1Z1CDhbr(
zoUNH;`vemtn5_xsum<z<4d#Is%p*RSKYGEu1_bb86vnG!_%F|2N7wGeVDDhjzsos@
fJK+dCIz9pb3Uug+80>8z00000NkvXXu0mjf-p($g

diff --git a/route/static/images/ico-ts-disk-active.png b/route/static/images/ico-ts-disk-active.png
deleted file mode 100755
index acaca696eecc89b7795976e2d6775a0a713b2ac9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1072
zcmV-01kd}4P)<h;3K|Lk000e1NJLTq0018V001Ef1^@s6A>MH0000B`Nkl<ZcmchZ
z^MCA07>Da)TS>OZ_Q__FYumPM+qSLUOmb}7{-1iEx1DZsZ&P>s!}HnkcV5h!t!QXy
zXv7KglO3%#z;QTL22Q{xC-UYrYnH@wp&u}L41R!j%fPpAEEjp_w-9IIde{%+q~Fs_
zDtf~>dv8vw+ggf8{)0^JfidL}x3oWmvv<K$S(d*FJ11+mt{mdI)k~{5f2*UtceBL5
zfi-0iPHPn4*DP@+{2x1d(0IM1#?kJe33_QwNB7uTeU47-d_JeDByRuh^<{7syw(2g
z-3d;po-kJIgpmI8u%P|D{)?<%&vP4G5_dv>6oXqBe6-EYk$)ZQw%OW`;a=L8!i`R(
zzT@{O`=54JFRp5Jf9T!Ax*e<=pNPkPuJIX!>V`IMEkdVlth7V_d^=Ll(qE9c)bmXt
zd9e-g%b7onm!>7++Mg#I89Xa<({i`JWU3XZ#}U1a_S0NqQpVv+q(WMu?`NHZam%FI
zv2JlnTq!tBLd<NDBvDY$-1mrX#a(yMeyGjRm}-`taCu8~;B4s|0prq04KE$?-poo|
zDXu*VD`{WL?==(u@%ptReg;Nt$`lX10nDF-n-X!Y9>nDboucZSBo|}UVlH%XXWlZ2
zIM-PB#KbrllAd$oppFo4r_el^7Jr$VyLxh@YNRjOXk#&4*_ASiC!e>QF0g#!a&J`g
z+|)H^ROO<^C;E0e=AW|or<CiiferR@*Lb4y*u}i$%5K8-ae5phzm%L9weHNSifQ`H
zIy!%lz3-;p^COJu?te@?iT?>JRHIXdy$sQ$LeQ6+<OdOh^%R;Xk|#qkkxKN7TiqRT
z>Va5)z#_|2xpbctnn^l81R*sX4oam;-OhrOmS$m`pA7Xdxf6)!EX2PRE1h^*O_Fr}
zWnAC{29K5)I8ATd3;z4Q)$KA4hhRS(=n%=;<M8Vw9oYYi`64)7uhnd^GJumjv)N`r
zdSQ;a8HVYdU?xl+|JRc0j4#_X=8kaoMTq-1(Anb@^EsI;H&*OTl#dfn?k<V>lagF8
zsyD>Z844>g`W4B(59t&qhxvZJB3?M77QH{=+X@i|Q($@r5vG=`m4Xt}dDAMmgPnpq
z3PzWezn2b1?=@IcVdA|9w!%)>Rc1tIFKid_1El|NQe@z^9^fjt0d9pW;1<)r+RWdG
z-Y@(f6!DYrOpnDg^p`rZ8gF8IVIO^6rKN-Mv=^mf{t%q5X!Czp=WDrqq_q4|gmI=i
zPBC8in@@FLBmQKw_(^!8$1IQL)t1_SxdRhx=hdVvzpq(*H>`nodx$sTEz^Dj-ZA|*
qQ)^bj5vjF*)7S^6dXfF;7XAh38QM<hP9-w{0000<MNUMnLSTXx^&M{j

diff --git a/route/static/images/ico-ts-disk.png b/route/static/images/ico-ts-disk.png
deleted file mode 100755
index 73da82c16ab7483c1c257bf6ca747f296e3ad9d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 758
zcmV<S0tx+zP)<h;3K|Lk000e1NJLTq0018V001Ef1^@s6A>MH00008LNkl<ZcmciE
z1CJz86o%o^+O}=mwr$(C#<p$Swx|Bn>|2}a%}u4PBu`T3>gyCv+M&O{|DT$g?s+Id
zH~MU#2W42U$rQu4qYDvmwSiD{VZXNU^JvBtxwbaW9fL+((-!^^4VYx3@KLD4D{bLl
zQHy~#3U@*!T(yOVpuh&fVn!-rwS}i5(u9LtFaj<n?D0nyoc@PX3`QP)8F9cgyg({y
zk&gFRZN%P>D8@)Jd;%)))WGI*s6rO*;wUa644rrlCq4V`paxUL@HuG21)UoSf`s?j
zkGEJY%x^;vKI%E+INGsL3}1;J?9#DmC@S$B*YFxMw5(f?Zfw(W&PMcMofy6q5|(J$
zFc;yd#0@+$@Mv5Ss$*^@B<z-J^(`GMEOf+MbRrjLaRx&SgzrF^j=5pz#U(NPAzCq5
z)$zJ;*u-yn1th${DAn9RRO6)>{u%jjQR=Da#7Q&T=zB=W#spQDOT}+7+!s;8qBAJL
zU<<n0T-3u`H6DmiIB9N00$ha!Pmp1ScDe&Sm`E+&<xC8gixDWs3so~IhO>p?bJ2pC
z!q`33V3b^pMJq0<K8ar3!#vEzJQK{tQiLKCF2dQzG<QQTW<$bu)vvw|32kUbi!p??
z-H633)wydSVVQ#*ie4<!a@*!$v0{-4mS7&7wVb&S9XKQx7tnw?$^x4rXF95IOD<lb
z7!&LiJ{r0BA{U-W!w@@#4?rS9DF{{?jJ?RgD3mX<@Dn330TXR(B)*|Q4lhOnDp89%
z8>>VksvVSXG7cAU%?eK80<Pi&t|;|sT*F1gpj8g<#TzR=&kdNWTpxrZredwI<`E<Z
z@qd>Uf(If4cQ6HQn2)PS#$aXLOHFt$URd)}60U~}*J6LarwOk|0bH%*Cw{>dKk!GX
of5KIfiw+0nb~K^Sj+&AB7eFLbfUXKcQ~&?~07*qoM6N<$f|(6Xr2qf`

diff --git a/route/static/images/ico-ts-mem-active.png b/route/static/images/ico-ts-mem-active.png
deleted file mode 100755
index d71de28ed34f05c9196efe729f9d7167897bb67f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 503
zcmV<T0SNwyP)<h;3K|Lk000e1NJLTq0015U001Hg1^@s6NQh~40005LNkl<ZcmeE|
z0YpPV7{`ZD1ZXvDdv_5aM9X{M_ZANVU;-fw0bmq{NB{%?f~9wN%R>bM7=VBXq!B<e
zK)}qp?_><!J*~Zl{`}p{x9_*_zVF_>9Fy4R5{G0)>*S_90~UveIg1GV!s8$!GvObZ
zABy0D3%~Ibdjih5&|s4X&%Xt81)b4niFE?gpU6!hCWAdL!w(G}dI~PxU<I|`0F%7f
z-{lf|CSM!xG6R#!?XaRNe>XV=+-C+h@at$p=X|5QYZ4zy2`pp+CKZ#a#}#%BT;XFO
z*~w=DCav7yvW7o@9l7olrrM%TG{+P^5n~KoiecS=^>=!0P0uhG1CzLbrg^AHe4Un=
zgx(08r8NBZ@4)|HF2aD0lg*y0R_SQ)Ry6O5HI}$(1(&bFO4>V@64ITUHr@(0RY=^|
zuG{PhJjf@}Vo_}^xnhkK)Mm5Cre^}0T;i$COyY^DwjFR+tg(QG6-+~rwr4b8w2dj>
z!TRp0ZfzH+5}Q|rUmC?bV#%~Sv)f}P;W$Olnl#l^IrZBeAAT-_Kt8t8AtjDM*=jV7
t2fUIPwRqHGcsG@v7}T}~+5UeZFaWFL;Gcy`#=Zam002ovPDHLkV1f><-ZKCI

diff --git a/route/static/images/ico-ts-mem.png b/route/static/images/ico-ts-mem.png
deleted file mode 100755
index d12b654389b21843e76dab8c8ed48d17f707a3e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 359
zcmV-t0hs=YP)<h;3K|Lk000e1NJLTq0015U001Hg1^@s6NQh~40003lNkl<ZcmeIy
z0Yn2~6u|M}Pz-P-Ob!8tA%x+B0GL1+4nu%ZIE)hj0f3+YfC4cvfC6G5Hv&io2$*^O
z<HHK~UbB50?(w7eyg%MqZ8&_MK~`*zUaf3+P{4VY5Zt1_q-!4*+?0h!3xB5&xZ0BA
z_nhGif_qE2qleA$Q%oUv3>NnLj`0b>Q?Rh#*~A9~FW3zd_InR8f#4N;LBf9bKHeah
zC|~u;;}OP?zu_YYMz~v}`LD2#XDIN#MpGXSJ2W3Q7p}tme*&jyBf<`xL8~<Ee_O@K
zp$D<h!V%7qD!Qm6MrzR6&KvuiWylo+#7K}E^tEscV$?<oF_>At>H{Q-#=`r=Al~X5
zUm;gysH1^_;r)dcZvOMe-Rj25RN*jFg$uaA#y?@%gm1f%8N#hDVom@6002ovPDHLk
FV1k+Pn@<1$

diff --git a/route/static/images/ico-ts-refresh.png b/route/static/images/ico-ts-refresh.png
deleted file mode 100755
index b292189d8160308ffd92f9ee4e980211eb854e41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1185
zcmV;S1YY}zP)<h;3K|Lk000e1NJLTq003kF003kN0{{R3M?7U_0005bP)t-s|NsBw
z^yjVKwvW=BX~KF@xn(h|Ng$;<@%i$w-??wafGDU!JFrr5#)6R2oweb;&Fa$Z_wM}u
z{q+0xsNAwlw_-Q1Ph`P%sN1sZ_wM@r`~3d={{H^{|Nh$W-e<yjFRMpq!Fj{x%Juv9
z`u+O#`}b(VdC%+AQMqP0uTPuTrR(?Y`26|({{5QQrB%CWL9$o1;lA|x^+B>&eaehN
zvsjteqv`hR`~Cds_Uyst$TO}>cgTm~^W<^Hfkm`izU9V8vsv5l-_PvSFsw(I)uiqC
z@9p^Tq}s1LuTr<-zW4n2pxLW5txUM%z`5hVT)uF?=EwW~{G-~gHLXp-=Eu$J(>t(J
z`~Caq_UkaKN4Da=NVHm))uZ|S`g6yGXu^8G<;F&|THEp8G_6Z?#)bC#_}A~;;Pd4E
z|NmCIYW)BG%<9s$;J#A1X7l>>Ij>Or{{5NOr7o&Q^ZN8;z;~(Kv%}}gIImCe`SN4H
zcKrSQ?Dy>{s6ukbg8lydkkg&E;l8`$!{zkoi_n<r_w0twlyb&{bH{_U;l1kj?fm`x
z!{^Io!FVsKNB{r+nbxHH{`<M(!J*l#T)uBqx@g(&-7c#}X2E&H=E^aW6|(>U0**;U
zK~#7FVi=iV6fhF45CWjQ{}4b;OE`e0qget6Kd54fFwFe#T#S$5qO$+Lal-5Yur^PJ
z5k&zM08dcC`(4|%ZQC|lPY)?zbu|slA2=yhYK>N>m++LNH)u6#qY^w!W{cHkci;_&
z-R88IO<<*TxjkMzKGJ(VK9>?K9R5Hs6b6xSBpC2JKrI@JC+r|*PsC$UP)erKUQqF-
zQ%TT>WPY<UP?BYTGZ7HW<qJhHC>8QK5Gq%yH881FD`gO=H<~gqlC>IjqNCmEf|;z-
zCRlp?fdd>IgMJSm3`eaoxQtt)A>NuyXA(F`v*`ry%oj^=TQ25!W3?^<{EF)pUfOJT
z5MsC8;Dzu$4MEcTFrM=tju7N{@Z+gd;Cz7~mvi8RXRd`Cgt-;2c;fDkTp-LP;{GSj
zuJIZO!yt@L^!sHS+}#?a&k1q_Xj8@A-4&0X7I$dydGqhrx0=TXK7Rmw!H^Sl;fNi4
zd(jx^CgTav9VBPKx06bPZYg5{U3OjrojaF@fRGM!O9egXiX{W+R?0@ut&E$%H(>^u
zssIY8C=gY(+Mcr2v?`eDjizcf>L6>YGG3Hb8)WrHOEnvHkiU;j9p8T+`9F=oJOMt_
z_zLKZ<rUBwN=4A=3rnEWg&-iGTLGOmzXUo<<^*)<)E4+=P7gqrIGY4r?0oM6boR>*
z=$xS#_yT^=@W%rF?7<&!_*0bds3t!T0?q##I-By7tsWm-Utj-ye7--)S2KFoia)V-
zj}C=`z!!S`zom_SPdw7_a}z(D@e`nY%#_cv@`3r@>frmSe6Tv&=>N6h-Q=gwn2B%s
z!ps@d)uz#XAqM43N@SoSPY_E=26S=EC>R9*qL$No@JmEa00000NkvXXu0mjfNNkT#

diff --git a/route/static/images/ico-ts-score.gif b/route/static/images/ico-ts-score.gif
deleted file mode 100755
index e4c8a65cadb083c0fc6ce2e2be22130042bea7cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9773
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

diff --git a/route/static/images/ico-ts-score.jpg b/route/static/images/ico-ts-score.jpg
deleted file mode 100755
index 8eb5d62e5d72fa1315b96637724c2a6b0ff2b1de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3961
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
UHgDO~RXV{!b`xU>H0FHrKQq!lz5oCK

diff --git a/route/static/images/ico-ts-score1.png b/route/static/images/ico-ts-score1.png
deleted file mode 100755
index 8219d32af1c21cf368b6cca5c93db0bc74db6b04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2061
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

diff --git a/route/static/images/ico-ts-score2.png b/route/static/images/ico-ts-score2.png
deleted file mode 100755
index 1eff7f3b3837425b5e39f28fff46b16ad70b3873..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2191
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
R{$v0E002ovPDHLkV1kjr11A6g

diff --git a/route/static/images/ico-ts-score3.png b/route/static/images/ico-ts-score3.png
deleted file mode 100755
index 43cf9600f8461adc021672336eb2f404d8349764..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2119
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

diff --git a/route/static/images/index.html b/route/static/images/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/images/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/images/logo.png b/route/static/images/logo.png
deleted file mode 100755
index 4d96d6b6e76c2294a7e9b38fcae6bd13310d2810..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1939
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
Z{{U1^9{XkihzkG!002ovPDHLkV1f~NmxTZT

diff --git a/route/static/images/move.png b/route/static/images/move.png
deleted file mode 100755
index 85763763ef0642efd96511e4647bae1576ad5b47..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^av;pe3?v!<**pYNYymzYuK)l4PfJVddzZ5SBvBIN
y7tG-B>_!@pBk1Yk7*fHQtiXKbzhYF64+BGlJWG*9PS6CPB!j1`pUXO@geCwh+8eb1

diff --git a/route/static/images/right.png b/route/static/images/right.png
deleted file mode 100755
index 86e3aa594c11e3be98e6d492a33b0358112a4ea2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 396
zcmV;70dxL|P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0003~Nkl<Zcmb@`
zfkp&D9LMox&e^IWpb8d13t(~RDfS`m8SVu(>~mCAdVmw9RI$K9rh0`1u&}ay<&QDu
zcE;`DgE4czAOD@XsPB8PvxhWBhPlWPhy2zTTA)UU220VPlf7c7Y*qLS8WnORjx&ku
zRnVAu3pg}Ii53f}fbl6g+oHsDsG!6rQb(AtD3#xq&H@=r>kappwC1?X52~?{jkU?R
zG-9)$Kn1md0wr06Sx_S%5qgMw9LPFH{a+yC>5!}$egus>DB}uuh$DHG&B*XuOsu^I
zStL(?X>D#{;t4;-7j9f<<;Ble6`bQ0d!F!X`(oGy&JnTR#S7l-64od9#+5VNF(T(j
zX1#-FykkE+-1^8v*HlWL@PSkO;BqM3yr$lVCVSg>#4j$O!XH}TUxk$X%?G5Jl%j&B
qg&iG=Yx-9>lvkMpQt8vY*#ZDhT8!vo{i4bM0000<MNUMnLSTX!W3=`F

diff --git a/route/static/images/weixin.png b/route/static/images/weixin.png
deleted file mode 100755
index b0083a93b509a58814c59e362136d2f7cf3354c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2139
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
RXFmV{002ovPDHLkV1h(z21x(_

diff --git a/route/static/img/Detailsbg.png b/route/static/img/Detailsbg.png
deleted file mode 100755
index 28f5277d941061a10f57f0017eaa1e78dc182ce8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 110
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~i!3HGN^yhQ|DN|1u$B+ufWQ)TG9xxqw-|)kJ
zO4(0;ri6xUw+H1*q&~>Y+E;#RiSXIUt-;Ui^>GE`VzveYhCH72<zh2~nt=u|c)I$z
JtaD0e0suD(AqW5f

diff --git a/route/static/img/DrawRecordord.png b/route/static/img/DrawRecordord.png
deleted file mode 100755
index 72c3966bdc5fd8fb324c5e718ffec8e6392f6881..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 95
zcmeAS@N?(olHy`uVBq!ia0y~yV6+0V1sR!vWch?oaX^YKz$e7@|Ns9_o;*p5+1(8k
t5%F|!45?sDR^TdN_^1$Mv8o_MkzvzBhR&>_=~saA44$rjF6*2UngDbD8%zKI

diff --git a/route/static/img/account.png b/route/static/img/account.png
deleted file mode 100755
index 8755ebff16f9bf0ca75bb486e3777b6ec84a1ddb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmV;P0b%}$P)<h;3K|Lk000e1NJLTq000gE002b@1^@s6de_%}0004HNkl<Zc-rmP
zF{?pg9LI5kBQ~XEQAYc%n_V$`3o>C*Qj8X*yZ|9A78|1%;7*EUJA;xdQcA4P{XXT^
zzw4gsu-@~l&vH87;XLOo$EB2#Lg?cnoKb;K-YX+7X0TezD(v9VGC#v0wl=~sJTgq;
zY9m}BEW>x4Y=lz;Wa!2cdTkU@zA2$64@ibu3VI8~#PtZ~I3OxRDKDP&h&}X7B;c|N
z4aAYd2m_??2G?()4^3>aKo?ciFocOU3NrL#0=uij&|w45E=%~*b~=2C6FQ+2I-wIf
zp%XgczX(4*RS11tgflAe$$Mqw#SF?q%PQ<ZJ&=*1j)K_Q2*>cqFo~;;aD}i8-*K`L
zP7#oy8%rp(QAGKsgq}E{yTeIAVS$*q9>E+3M6KRqUOej&dnlMl{Ph7Ch$Dv)21w)n
z_u&@!(8LA{bWueOLzq~j@Ez*Nj|r4bbr?EqKs_m|L-m5)7mNG>Ida{3@c;k-07*qo
IM6N<$f@!X>*#H0l

diff --git a/route/static/img/alipay_zz.png b/route/static/img/alipay_zz.png
deleted file mode 100644
index 98d99a533275efa448841105b1d36f5de459dc94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7307
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

diff --git a/route/static/img/ico-close.png b/route/static/img/ico-close.png
deleted file mode 100755
index d5b8a22c979644c0d3cd4fd8314561c64283bda3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 260
zcmV+f0sH=mP)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg0002XNkl<Zc-rlh
zyA6Xd6aeWH!Uh=yA-*fHLNX3L)8vOl#V|m5Q5=gT0z0-V3SRqsXTOi^d0VV3IC5gA
zJ>hfas7}|wg}pK#&;Yes5HbQ+d<{Ml>Yi8##ci&b@Zw(|@+HND=O(SpgyPO&hG(YJ
zNEv{~TOsj*)MlWQ!U-3OL?{}GCoXFh)ANd+*ljNZIw9x?-0()+-ity4S3H)5*eO2v
zS1-&Jzqqwxj$0{~abtxVH&jsR*G4KTwV<RW(v}#}Qf{CB+Tsb|8yd*veHuUj0000<
KMNUMnLSTY7{%QIE

diff --git a/route/static/img/ico-computer.png b/route/static/img/ico-computer.png
deleted file mode 100755
index e383922da9d8a7b012e589350d1352c02debe237..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 246
zcmV<S015wzP)<h;3K|Lk000e1NJLTq000pH000jN1^@s60<k0!0002JNkl<Zcmdtd
z0S1Er6vpuYbc$}!9Xe8A*d|l}+B5^$0S03Pqt-wxgqRq1kKyfmd?Qg)fZ^wDz22XU
zFx=U2gbMBxRJ^k_lJG$U+X*7xB^qgAAtJ_9dIzokXdsvw384AYh(9ypcO%}+i1&@u
za0M6EJ*$rX&gEULksM^e8xEW@AlHZkC&n^L=><>DlrqYB=luHSJ&4Y+_xeXBEFp#s
wJV12vf6To(7O~(4B@}RhGiL!M_g44r1Lo+QdwA4rX8-^I07*qoM6N<$f|rqFssI20

diff --git a/route/static/img/ico-copy.png b/route/static/img/ico-copy.png
deleted file mode 100755
index adede38d2a59e136e93dcee7cf7370b51311e9dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 281
zcmV+!0p|XRP)<h;3K|Lk000e1NJLTq000aC000gM1ONa4v9vX30002sNkl<ZcmV~$
zy)Hum7y!_7@BJv1RQ!erPasHimoQl*1`J-q;0X*igTx}SF^C7KpIstpEC!31Of*3&
zb?aW|1f}|zJu|vU6hh%VmZM&?X49<?Ays&@ZawVUP}S0w$@ENVy0j2h^z8dHA;GUD
z+n(j&OVi^6fcmRBsVpQiBlQE5a^b?gejQ1m&!;m33aKZfNC*G`KpDu@?3j=XSDJDi
z1A##;`zR!G^D1Vgq0}+t*tj1Rr*15ob`nxuZHFrUWL_lR9chG)EyH?Buxe4&o$qjM
f#5{mfRl^VeQDj3L^cI%{00000NkvXXu0mjf`VerW

diff --git a/route/static/img/ico-home.png b/route/static/img/ico-home.png
deleted file mode 100755
index 9de21b9d0672e99d783b697dbaa8e052e9fa3a7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc0wmQNuC@WGU7jwEAr-fh6AmyK?@oJWB*13e
zo&InB&(t&x#Z*<}|IH80_jsjGbDrAxVExRCM>LoZ${Q<xi0tAqlx;|q;`uj6(zVAZ
zh5by*oXBQ(NtR<xBCpQRF)zM%rr$!;cBW<ivnw-=c#I>{jEoG<?CA}D=*QMJ^NjJ#
z#C1nj3*59We;_nFZPz)TIh8!;?zeg;O3&CoWy2vkgL>7(*1ZY;w0>#s;hz42`E&T;
rpSuG^wa#8?aWXWBmpV7Sbp-=Md1XYeslY3cw-`KK{an^LB{Ts5^hjVH

diff --git a/route/static/img/ico-success.png b/route/static/img/ico-success.png
deleted file mode 100755
index ba677b2c3b3471674c687b6c6005da8a1aad1584..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 585
zcmeAS@N?(olHy`uVBq!ia0vp^S|H593?x6vT4n;N$pJnguK)l4=i1H6v73!+4;vSd
z1S5{!91t#uv6~G@a_;5iLK1{4VB5*YxtEoD4>!klu*#im96LF<w*yJAQE)T&urcgs
z0P5o1%m7pX)ee^B-Os?cgMoW1H^+VspcK%+>$`W|1Uk>KB*-tA!MJ?p?z``1-u-Vp
z^PO>r@hX?yyIquw1(iBNU5v}i&xD@o5KI$PIup7oO;Au!$=LX-!~s(V21XN47srqa
z#wk}=%MKd|uv{?o_+)bC%$c44pPtGSZG33|O?rJrBF7;Ov7jysF6I=D5GUV7H7~b!
zEm;_~^58<h<yJnuYPPeE=|tsLmF~LmMa9@-ZQkOuK6C44$(YPsY<cDSyxf+2(}OXK
zzRIrMz`)AD$j!;1kv6gFW{adt{+xTV35R&5YNq`$b)2!+wRqW~p0C}OUz|j@yxbVE
zPvz#ZuDrLL8<wT9zVys%5G)Pq&x;P)|65rq@L&iNPxyZOo1R>?kyB;AiB4))-e5R6
zNBPly;Ra)VXLnyCr;NDM+;cqJjveeXV<?EdY{tlUZS($+4C@=y3s~mVlv^9@x17v#
z%65j)`3*-NAJg5Rdgr6|3xmtA8tu;?ddq8(b|qH#<D&QZNBL*CMP{3CnX<%j)wSaq
ft9v-Y3mIasnq4});MH?r;4^r-`njxgN@xNAmfqmu

diff --git a/route/static/img/ico/ico-access.png b/route/static/img/ico/ico-access.png
deleted file mode 100755
index 1a69b17decebf60a23615bd8fe7d2e5b4d86a27b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1331
zcmcJO`&W_&7{_1IBU+MX(?AcWd0N?8Q**W9*2N<8k}@e2n<y$6#d48hV&$bZH`6?B
zscGf~<2X&b$Xu2=3+FAo<ptCMsVT1_sPMkr6f;J@?H}0poaghL?=Ro;obNf$jW9w0
zYQ5`v002-yfk#hRcG!opwX(4J^}0#`KtzOvko?VNv-m&KK#;|OAZRccOeT|5Dz(_<
z<z=l-H#0M%84-!1;+Bm@Jq&A?mLQc%qfjh?pdNy>TCG~G)@UpN5DdeUH}Z@|BcxR7
zAV{y(8gx3N!2n5Qvh?dZjRsy^H0bqHzZEUM>Y2(fFla6DI(X`>D4HfozPxNOXcrf!
zOUjfjt(v(xcws@W*Xw3y#ngl`=6Rz|C$HqqH8ko~3*xxbqjaW0tu{cAW_}*5sRMbx
zgVnW`Q}px7xkvoz(sCoL9Xpda-}G!e@gh7iscd~YnVT=U$kB*L7dpCRnOV}y8Pe3W
zrM`YxrD`XJcZHvtD63pqQiJ?PQTjFY;7~s^QPI-6(A6!yRrI#zJ}i+M<e-pB8_Uie
zWT$jQQH591J5G{?m(%(RiY)A;#7_F>6kCc;VxJ(K1Z;kin{WSODcY?3fd5fz-DaVE
z-x~3CLn#1Qxdt6QOyVHqeQgLoKS%4sXc-^=mTbK?{=N=it~^ebj-;?SF|;Od7Q%>&
zi@OW$Jo0_yLqFqs9FJ}NTY*QX+43CXbnZ95d>43s!(vmMw|zV9-GIp>r~RBguN}9(
zu({RjcE`t=?y#%!MHfDwXo8OgZ<1}3Y-Ut>=brg)udDb^+uSTcu7{J5?o$+8J#seO
z8()a<>b>WC+v}s`XfGFdw^PEYAQBSg6Y2v*Ht~9Wo3hF|>Q3i2r=ngGf*YQE-XGP%
z6i!kon;v{s`Y@uAh?Mks22$EiC)yG@`}Q^9qq)bi0x`DUSOO}D*(O=N*c3b!i*vP_
z8Das)jaxcfpJ_z`yU@0~!`4+9*Ov#?#zVE4jVtkX6JwoMZC;X>ZGzr$t<!6^PRl*g
zkP$1>GadttSFQ6CiUeT%GZ%)+{iXQag@mV94veavEIL2s{p#<`!eg@=s!^K9DLXrA
z+SaUYeLWsv$oROz#z8nzrFMB3<Hx!x!gb-h^LTse!lOw~B$seo9QRk93@jhEJ5nF>
zn4wK{zO?R8lIrGwdoqFXIlU6v=%sL~2zd@vAYzD^iXJv<-lhD~H;x>9zsvq7rR?hu
z&UZy1z3y+IMnAXyfj3lJ4@QQta=40OTj04Hj>+}j6wBeH?!6sAOBD%-RspD+_t0E7
zbf`P`?zKI@5#g>qv5vO)kXRdsmci8w@{SXsIjX1xQJIf05-1G*V>_2vtxl1qhWBn`
zmH1`~m4P%|4w!YTdC-;QGUGWOFv|0olGBm0IuYH^Z6lT<5ajb+oeG*%h{!LJR;M1}
z-59tCY9>V5w|eLx+a}0<KXnJ8mU2)O-{H9z)4tieLD2jLkX942?@09HxSj*7Kx8|8
zcw+i&5_XF>JFhI7oGZnKDR+94!%WVF97NQ6^oG^A?(C<6Gc7Tw!)IxjNRlM7IkTYu
z?LQPu)+;u0_YRPMq3Sa}R>1s3WePd>=F>{@_B)&3uY2)V-tdFsywkA+&xBcUwhB{1
k4MY1QcJ6+~K=T1$z?a6r#DCvx`B5OqpK$cik=P&q1w_CDdjJ3c

diff --git a/route/static/img/ico/ico-apk.png b/route/static/img/ico/ico-apk.png
deleted file mode 100755
index 27880ca2be0507cc054dfb51fb14ebf3d31ddc4a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1010
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPVEzz^EMH6XN>+|NpB<;KRp{K;F}*
zPrrTp_UqTL+qZ86xj%mV`26L|#V2RKe*1d%;fZU{F73LpWzUVR>n|;T^!CB0ub&p3
zp85Fk<M*H6%{w_|>(#YW4tLh=D6HREJo8xprpv3Ao|$v+)$PxpKfizf{=)~L4Ie*!
z`t<tatEor29=^HXx~H;zZ}r}r+Z%V4TzPuo%a<?R`|H1a`@H|wjsv%Mef|1%<@tqu
z2b#Wr|Mva+_u0oMzWDI`>AS}>j`dAD+VkM`-36znx9l!I^YHlbdxtvr)%6@`oOr0M
z|6ohU-kS2Q8P&UTW}oi=^yA~B5BD#<INQ9hbkp@!hwkrr_2tE>$47SG-aPqO`>i+E
zR$pG&eW-5n`5ATF3#RVxuH2qAWq;SQqw|1d{f@$ue_D%yp_W(@<QL4q*7D^4w02;q
z{eJ}_s0aQY|9_I_%wNUH9hM9XOtPLXjv*C{Z!R})d+i|7@UVMVu=MV2xxfF$ub2_%
zQa#sE-2b1_zen=-x6j{S7yV=NqXlQ*6%?fxK3sI$@yF(hf{RWr4(fVbO*=HWk``HX
zbUsp0>T2%L;8RlKtEzRG7|;7iiI1)6RObY#Bd#(k4^QmBnBh~pqp(}4%wVF=(ua|1
zvrmh6Y)V=gqBmW8s@K-2RQBx3AMtw=6+Sh#s%f15arIIB`V(AkQ4G14mPyE#?Q)4+
z@3T|Mcm`{OMkmuB>2K^=AK!kJaD2}#HAzvUO?gq)pD$H=4V5hzYfBdi#>;72m@-%!
zFFI!^*DuSVAs{NdMnS^0<ZR@DV@lgx4ul%*ywt&yAe+$JP}*Q}u_M0eij%|Q&t{Io
zHB;GcC_G?OILn_WZhg$WRqd}{y^xGYgD-Qw{bUCIs*RN@j}+ckSXJMz`d_m^c~S!R
z11I-&49oo+d>f2qEtySP9fWQE?$w;me^=!HQuzhS_imrn=HHZN=qPM*(7m#x@q&SX
zOX7^zrN7-?fBZe4N$ud=$UXIU_T9*52)}B}=ACNKvd(d1f{Tu;;B2<DP0u3OPZ;NM
zXKd7G=bG|{O-Fi`BcDE}R?6#70x9>O?tfSpTy}wd{TT(%W^0*s7ydTSf7InGWpd^%
z*XOt97GkYxjvsT+Y~0I#Z2J*CcDZTX=6d{&g_C$B;`OZ@<r_A(-)Ea06#1DWXSdb*
n*Yb^rE!JwyI`;5U&TbYB8wvhxY5m`Tsgl9d)z4*}Q$iB}GJ`!Y

diff --git a/route/static/img/ico/ico-avi.png b/route/static/img/ico/ico-avi.png
deleted file mode 100755
index e35454ca9c846681c3db6c9e141ff3ad68fa0266..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1139
zcmb_ado-H|98Kz3k78$CsWHmBowgpUdTgB2QQ2rqHPo^pQdY+FSThr*UWs=PqeneT
zbvloldOxzPF|0bPhEVZX@+IL*qC`l(d|w`{d`th^Kl^X@+~2+Dp7Z<bo?99g`l-3e
zQ4<UXV;&q7h}U`8>oeBVDT96BJ_dvJ4Z9eDLs4|$Ur<1hE=eR3wOYNqyUXM8bWy9-
z!U!S~iC`F(%jF7%?h8^Xl~TECbY6CEL{i=lQagp@W?)GKRStp@8B+JFIHQ&S?5}P9
zOXd2u3PF&CRVb@n@O_(rIkyR`G!u(kX%B#=-z0LSS^=w7D%BuMIy^1CJtV4sES?7B
z8jXg*-mDk^#hVDFh2OxGbpN@bL^MB+uF)Q?a3#v-v9*EcQk7Z*O5w8J)s+o+oFjW7
zRCGLDe>}U%SyBAHu*KrZb325a3e^;MJNuy^riv3^$1CX*D^!2;*EKCqq`94|-BYrc
z@}2ZnA$@i`rHMbj2u%U-ZTecn$T|m9CDd@@Yq<sO98&dCTrHQ@#;G6RP}?|(wH&Kl
z7Nl!4DGeVQjxj6{qcz34Hc{zo`M<G;PNL{DGu9q3TD^<G9LNa{^pD8E##uA+s!DCf
zl4Bg`hxGleU5(qHls0;KgxA$W`}9ofxr`XWg4XSHPFzv~&|qgVGwpWjBkzGT#Asq(
zmd8oaQyXXOk-~>Y|3QP#5|4%GMMuR7mzS3T0N`@T7&?W?aixR{W`;jc)0?*`y7mH(
zjCfvfZ*YQ%&4hpsf<pPF>n(z$JQuk8E}^48GIgxya!=nER$y*Vih);D3dOREm(W>C
z7&%L100Y>QE^0^H-YZsMEZdM3X>LE8ctti@NbI4Lu!lCrBO0<QL8`$o?Bq$~^q(I&
z2=dMARvlS(N@IMZnLX_67aPi+v0C(5g-U#^{KPnI5tA9PJakp^9@XCTa%ERTl=kpC
zgI3GDl`r0-q3Vj-ZBls*Rw<qvB@(_h3J$7tfm+keGmFrB9%sw5Gj>|I#qHqx@J=+P
z+9K1=*J7RvD=Kyr=aYmJ-PL|_!2fN?V2zkjP=!!z6D`jTU*9fPlZOAmeq!5O6JiJs
zUGuqHoHBCEvBbNdj~j%&c8Vq(1n{d2Q+5-NZm}k8#@u-2@!?HyK&wh6`xKezpCAv<
z<?SPPE@Z>LcTC&e?5sB^S!wwqcQgI4wA4EJ2N&x$_Ky(W!Vy9kd!;TpZQfe)itSBW
zJ;SM_kCz|nXX$*vdAik|T3ANIzmXS77{^ml$7BniBo?Xibkf1Dz@Rc4*@*`QsK?h=
z4SyP({qAGQ4Uk209L0U*eEf&Qr#zut08cyaq($EhOFCG1{tPW<@=|%h{SJ|S?>p|E
sh|xEV31-vtWX#faw%HbM7wXT(8gw6xue|g;L^pp-FfKH(JAg#}2clZ8g#Z8m

diff --git a/route/static/img/ico/ico-bmp.png b/route/static/img/ico/ico-bmp.png
deleted file mode 100755
index 83f1278290b6917f3937d1100de6441903284248..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1027
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPVEzz-Sua6XN>+|NpB<;KRp{K;F}*
zPrrTp_UqTL+qZ86xj%mV`26L|<HwIbfByXb{re9efT})z`t<3`moLX2UryWI>$kD`
z$fHY9+gf6_w|@Ql_1%|`C!SnA^zg#>@83%fP7m5#ci`dqoP86QUEA~F>!%gh_g;B<
zZ{DSCMF*x<9iIK<!^?YbpVl3nH|5;AXCGgOZD~x}*|p^Au1hcOy!iO0>(ufy&u%Qb
zvh&l|FSlMldiCjD#MY*L56+eynh~<4zF_~98?PTceE0m?tNVHTCik6Lwczshj6Ho@
z?i`zSar2)0XSUrrzUB5Y|BW?qJK9tC_U0d$vijD+k3YY@`1)?*`E}=B-M;?z;o|GN
z%a6>u|M5lV>E(MLo!fHn#L;J0W?kOWcw%Ah{z-WUCU+iPlDTg}$I&HoPj2iuvN(VL
zWUjqT8-U@MUJ~RN%)r+2<o~pGU^xDN1tO>n{{BDy|0K_uzs)y`Z!j=0iFvv>hEy;n
zN$hNx*eQ8H%QnGMm^D$tuH*C36*so!7XLr})9|u+`i(W^jOSgadR9NX@7R4c?fRUP
zA9ugl;#jSA{rw`&Du>+yHyso=H9Dm*x1M0*n#e1nB(LFO7tm3&K)}*r`%7n;1;<~1
z{aI7D-(G-YLxa;3=7)mw+Bsb=d_Ptxaxh><3b%X9k9Vw74`^tLG>80|FV1sJ^Z-ks
zkkQf(A^ng0mov4*bn+|Ye5|;0jD_psF>a-`az1IBW-d|c*b-&n^8d7ElgDb7&mj(t
zpH3-+G(~DH@`$uE@K>E;kuM=we}YwM>Ovo`pr>A@ZV#hY<}v&USnL^eGi)|vPsxhg
zubG=qOwh=Ykx9+8Iaqz!Mv^VPIO;)Y;YxlV-p^a2!p#_>t{iUPR(0U+yd`|Qm9O%w
z_sw!$UMzb<Hr(ZR&V7R&i@Hr(9;sUGKV;xxUUSC6g2lLEI<s<=qm9QxjV+BUm+$%R
zlgaXbo4a^BFSDaaTkyjBd>xX%^%adD{z#K#-T&c>ZtNXKxd%X0eBkocxy?H^9dB;5
z5p&Qy(5<np-hZ;|g1wVEgq(vSBrR8bQ=g*G`gX44%p-N(U!+}T>djANaaNiy*q(iG
zzU`F*oLZ~$H$ItjWWtdZL50oEj!p+1F5meRX;i=(VG$H~@TBj7Ij{IzG>>0haNN*t
zLemqc4Vi_Zxy5W{e?yaQ^QS+sIJ;bX*7A?J+xIdX$_N>m-J0qGOq2|su6{1-oD!M<
DduUS?

diff --git a/route/static/img/ico/ico-bt.png b/route/static/img/ico/ico-bt.png
deleted file mode 100755
index 387293f80940ddd49241d107cfdbf530f66e212a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1166
zcmcIjdoUXY98N^cD{7;}tHnBFdTMQrP1m7urt_*fQ|;E$m38y%Qo+0;h#2ZshamA7
zrKPl*(jZBbAZ_MRkEqNmi6BDWkGfeF|Lv}S@4N5&e)rvde|>j9Ojt+&#L(Ih002M&
zzlMctZ`h&qL0TW0(!l`$Kv-B%guh0kng0*O5{Wi#Y-}i%%KiO)Hk+-DYPDJ>mvgyX
znM@`UiNs=UOCps@<#IWdGm}BXCX;Ir)CPq@!Q?N_ZZC@!Qk6=TMQ?(?s8gy`EpvmZ
zlzXFVlaH3DGNrtL(S~`|nMrS45UdWaFo>(K#&~mgsP#iDFWExw!#9+5(N@R8@NG(M
z*WzgV0+BD-L5{aH&k__WCHD2ej!aa<Xs?-iR5jVVyvy5@OG=qt<$rePj^j7P0;xh)
zIoX4L*|9C%t)F?4Khe4+5#r{a<&5Fh_V}Hwk$J(&z+dAO&NO*_>gGsU(>y`)R<SDC
zday*<QtY*{h?4>~g4Qs?nM6*suy)rgr+Vr9xq+35hS`BcQdJVU8bfctHCj<jZ*OAs
z7t`93N!8hvE_K>j6X4+?-vaasc$!+Yc2<qx(Ebk`XvQ@RW9C8BLf0|?pi>qI^NmOc
z#zKekDlt~%Prg6lWdgbcT{){VqW%)s;r?q;{a$XZ&*$xZXBEjzTw<V&GSN-%83B>j
z!(O~{a!*7ag{;P=g51`6iyQEV?0$#V_}m+g5O-7KBEOatFIx=EoLqTd-_c#JbJ4!l
zVO?hj+3&S!e%GpX)1RfYnaKk>c?&aUw$`KVGYaa<1M6Z}uUMX||IH%K8;wSLXX1;!
zpWBB#^=*vK6Cx}?BYc$CQ^1VKR-9&;7X?1Xus%nEx|reNw+x#5S@RzJJkOe>U9$HI
z_4n8MHAy0MO3Zubn`H)2S0{DQDA|O@b;VgCLwPm{z9%@tKtA(y)o=;r7)(&QZDdc)
zdGmgH<qf{Ro4pil@lD?4E+#8r5P3i1GO=(bvFQk8F#jjQVv_a8OIfO8d-mtEc-c2O
z)nE1RTWLTXr4cCy3yqMW?0l|fZQeC+$Hnt2o+HVp#>`NKZ%1^&rk+^`kiT;_PWgao
zXU;HwEXu`$IijPC+-XoMJS9aJG5tqb5)po9!`<`(5Kc`0DCj~txs>vcM#U63GclyJ
zAG{v-qCco3$5)Yc<Bo6I($MvGS1SsEF^)$8exEjgB3&;oUW;hK1MnS<jK_ng{YnhG
z)eh0H=^R$1K{TCo66~R;ql`~8O5l1ZW0sM(AK<wk_Bmvj2<N_N&@(APW$H$LIUkA)
zj<LIku#Dbcq_g_`FCnok3dwlX1yUXWO%^ZIga)MRwstC;f~}mRz`+Q^TITrLlX0i8
z9c*}GK6J}!`UnB#p~!LVIk;|9EcnbTMD0AAuIKjMam?(`*?LI?q7Wq{U~#$FYsQ{f
VwvE}t7utsa1p0@-di}2F{|h;%uNnXV

diff --git a/route/static/img/ico/ico-c.png b/route/static/img/ico/ico-c.png
deleted file mode 100755
index 21e4deb3e6dd830954a4cedc88d9f404103a09ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1037
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPVEzz~~s@6XN>+|NpB<;KRp{K;F}*
zPrrTp_UqTL+qZ86xj%mV`26L|<HwIbfByXb{re9efT})z`t<3`moHzxe*O6MyUnVb
zZtHG+`~G9=owvrzu6Lh)mb>ra#TOsHfB$~#_2;4k4_|!zYP$S-;O09Sdmh|*^LfJA
z=N2n&*ss31^y;gb7hX&`|9sE=cU~KAAAS5je#gE0Z@(OV^xl8d9iNT2_dR%*zyG1t
z${VvUzWDs@d*aUf)6c(n`0mTf>#tvZ`WC$9&bj9w-+%cQw&iZy$*0@zzI9x4v-ap?
z=e4(Py!yQ1)|>icPuAUhleYUo<>ANGM;`Z{d3OBChs!TNJ^k=CW!L=$mtW4i^fGGO
zJ;OzpQg%N)_Uy~+Z@(8_d+W3DPT|4FYj3~5^!nTVk3Tz4zlhj&ulCqe+hv#1HeEJa
zawTQc<>uX&fu#MiOH3Q?YyyU9c1e(5Faul5lmFA&fnoap6^Nh(_<Q{SNuD!*1-`#K
z%)r1T;OXKRQo;D-Osn7_2L=`gm0#;B{^vg8Yrpd+V_SnP@AV3!wg18&Z^+#JFMsNR
z#c!_s*Xlj)WthnCX2+r||7arL#S`rbPn-=tDN6hl=&9jw(=xd_S7>4BxoUZ*4#TDi
zGBX8wrk@w%3jK8aoROl0f4r91sy+XMPK9tBJAAxl^UtJ}_g)sAlNDTdO?v5p8*gu|
zT>Yh`QG@G1EW`S%-Me@1w!TtWe&avWFU6T0R=j-QQ+0kOr+<>4!2YMyyJ@cDLXOg-
zLNB*WJQ?0?-RRG?l#BPuf|+IuuGp;=DrYRMnjm%I1jn+><ZTUCw>^6BcEL$LzUAD!
zPan)HkC9`)vG>M;(<d#?GTW7C%Gp@QRxEJj3X{z}w&=^{IJW~0tgEJQ{aVf6G}ns9
z*Iryq;@Jglrodk=68t@mcl>4dtA%W_{&rlkjaBWgfOp_AGmqfu!JGx$hRKsV9jDo-
zvroxaIOC+#Jm0x~-W?IecDcV9%Ph}ye=O?Q<osre$R6Rz@)<(hF6PGnry2d2V<!F0
zi2Zf`XH~`EFTQ^zW+<$Z|FM+sW;1JN`F@2}))nmUAIR=$Ue4aVrkj)Lw3T6mR=C#G
ztla#By_W(USKbVH%Nep&YV++iTfVbg)1F(oe6#w7*g)N?=Umscmqy-R_3roLlJBCk
zzv-B*{q(Qt?p)UBR_1RFsb3`$>JOZg=8=4mVWYWe#mR~<1)IOJZ+Mu#A<>_C5im(I
Nc)I$ztaD0e0s!h=ZrA_-

diff --git a/route/static/img/ico/ico-cdr.png b/route/static/img/ico/ico-cdr.png
deleted file mode 100755
index 2e16c24e06556aae8e9c67bbead175dc24e4e123..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1035
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPVEzz-Sua6XN>+|NpB<;KRp{K;F}*
zPrrTp_UqTL+qZ86xj%mV`26L|<HwIbfByXb{re9efT})z`t<3`moLX2UryWI>$kD`
z$fHY9+gf6_w|@Ql_1%|`C!SnA^zg#>@83%fP7m5#ci`dqoP86QUEA~F>!%gh_g;B<
zZ{DSCMF*x<9iIK<!^?YbpVl3nH|5;AXCGgOZD~x}*|p^Au1hcOy!iO0>(ufy&u%Qb
zvh&l|FSlMldiCjD#MY*L56+eynh~<4zF_~98?PTceE0m?tNVHTCik6Lwczshj6Ho@
z?i`zSar2)0XSUrrzUB5Y|BW?qJK9tC_U0d$(s*Lw(Pvja{``9G)$NJr*WLg4V)d<q
z*WW(uJiYwI*LUSdW-Y$Hd)DPGTkf6M`{-Qm{z-WUCU+iPlDTg}$I&HoPj2iuvN(VL
z<n4m<4*|n5y(Gvln1QY3$^U8Xz;OKk3PeyD{QZCY|4E)Rf17U>-(X;1lJj(N45?sD
zlGxcWu~YJZmTiKiFl(ZOUB~C6D{gGdE&hM{r{QJu^c!o+8PB^;^{jq&-?95@+Vwdn
zKkk09#j#rL`ujzkRSvraZaOG#YII6rZau-qHIY|DNnXRnE})}kfq<pM_Lt5w3y#13
z`m?5Pzr6s*h6bl6%nt?UwR5^$_<pQX<Y2&z6mIvHAMaSF9?;MfX%6`_U!3Qd=mC~M
zA)}=oLi!)~FK23r>Eu_)`B-u17z@|MW86w><$TgM&0M0?u_emD<^O5TCXdxDpF<oP
zKb=wtX^PZZ<Pm9S;IBHxB40wV{sgPi)P+7=K~KF*-5y4*%wzZyu-G%`X4q`To{|-}
zUo$tKn4pm(Ba@nGbFlidjU-!oanys*!j=3!yq~v3g_|)%T{+yot?Iztc}w_qD_`YV
z@0;biyjb>zY`Dwsocjhl7ImAnJW{pVf5^bYyylFB1&eXTbY|r!M;niY8e1AyF5mOr
zCzIv>HgEAx(KZ8thU!D+1`!W_=6~Ps*n36x)!Q{`UlmWz{>=Zc`Tqm^AEpmhS$}sd
zd8X}<>}kbsF^Na;){G^bCYGE&iw;;a7)D<S3(8=M)nM@2Huc~v>D-CS7<GEKb{IYQ
zCN+iaLNRl1Q)2jRPQLfdQL<dzR`YV2n_6$LlaAw0E&p2_ciYUo@zCk5C*7{MS;t)V
zRX8$nOHuX4_2Ms53+f%h`F>YFD10Hrf4G8w&a>336I18;{mVJW(9<OpaoZ}{1eiD(
NJYD@<);T3K0RU?^R`CD;

diff --git a/route/static/img/ico/ico-cpp.png b/route/static/img/ico/ico-cpp.png
deleted file mode 100755
index 7a8a5cf90ba7eba1ec22d89dee3c0d46dbd03886..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1057
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPVEzz~~a-6XN>+|NpB<;KRp{K;F}*
zPrrTp_UqTL+qZ86xj%mV`26L|<HwIbfByXb{re9efT})z`t<3`moHzxe*O6MyUnVb
zZtHG+`~G9=owvrzu6Lh)mb>ra#TOsHfB$~#_2;4k4_|!zYP$S-;O09Sdmh|*^LfJA
z=N2n&*ss31^y;gb7hX&`|9sE=cU~KAAAS5je#gE0Z@(OV^xl8d9iNT2_dR%*zyG1t
z${VvUzWDs@d*aUf)6c(n`0mTf>#tvZ`WC$9&bj9w-+%cQw&iZy$*0@zzI9x4v-ap?
z=e4(Py!yQ1)|>icPuAUhleYUo<>ANGM;`Z{d3OBChs!TNJ^k=CW!L=$mtW4i^fGGO
zJ;OzpI#0j2^!nTDZ@=$<{5kdFtF^b^*B*PCvio7gwtEY&z1{Wj)3Ik?d^X;(U3MvL
z(`BP2S5h`zZr*(vNZK#E<jJzt3>d6AB|(0{3~Vh={!eQM2J8P<Ac7{~@A3a9dCvUp
z&Dr0{z`&&7>Eakt!T97%tKcCA1{MdEU+XIV=RV?Vzw;+!TZ1g`^$Mf4|H2<{$lU!e
zf9iq7Z?62;>OJmdn8@#D$D%C%Xd>Um6YU94oDDuHO8gY)so`+bGPyceXkqEOYI&y)
z!=?!`GX;94pBLi_{dD}Ck)niuyq4IiJ^zDFg>W1@e7t4z&!m<2UKX8`6<l{sdg*~1
zh7Z@x-Q-m+-PKrN9yq5vF)i)c5*Y)L!#Dp|S3f#$B*J_2HD~XW7xpT@g~IReD*1c)
z!0hNvdfVIoR@BC;{*(F8XfLotp~c|0qr#^L*+=Fxx+Q-&qUoh@vMwkyWmEjm&;5-j
zWj?hkwc1Tl3D$W&akT`S827GCMypJ&sLF|T9cw7$HwyGslU<Q%wph-bg@^6Wt+n|I
z%lT%%*}=mYy-RfK#fxfD#~Nb4WWD-PXuo1+;oA0fiVqgFybBObHw=oG`xdy%@P^rA
zJvFbhBCCvd%v@k?cCUTw%%WhE&xTbOHrUPC+4EKLYhTTBo{u4Zc8ixND)_otdF#(R
zZ8>Y3U)wx0{X1Ubd-o`2OL$bZUVnALs^Hza8{8^?D;F@AH1J(uv^vn5`m%Au3VY_5
zbryZ%3<c?&DLzcBd7L_yf(g$yS34gQ`JlTx?df|3%YU|#!48e>D!Uux?IvwaJ;}1=
zZ2*g1Mcf7(Lxz+!vZrpTDY&f6Wx2t6WYY5;SA~`}NJm_8W54q*!E^Usz6y(ZVqzs$
fa_{a&)-o-4TlM)6=Lue58fEZw^>bP0l+XkK9nW@v

diff --git a/route/static/img/ico/ico-cs.png b/route/static/img/ico/ico-cs.png
deleted file mode 100755
index 6588319769571ec47bb20c22fbb5830aa4ebd523..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1085
zcmcJN{ZrBh9LK*pQOCm4Yg9TfbLN)0O6SZ|r{yCS5*a%3=G4yX+%0qxnVofbT0V2>
znyE{tu6$NzXp#?8919;J6;Syq1R^4!BJ!+QF#2u(z}|PC*XQ1M@1NfHE<vNBVNho%
z006KUL`0nBqd%PeM-~puST_KGRWurji8Pzd^Z(JdN@Z~piA1m08;wRDk7uzvJ3AV!
zRxB24G#aH+xxH;ksnlw<R;$(NbSj-8xMMMjyrehmyx=RoZsC@_Uc-%uSTdEtU|8DF
z;AtY6O7~4G_i`^keR!F_si}A)4QK;HI~SYh*K22Gzs^X9g<BVTc(26D<d*`WLQ7v!
zUZU`k&v_%uTbZMxz;^HnOQz8qQU`?9GcwVZww=4NuGU}a<4;RfO07Pj?``3vg!)!-
zzH9N`D{*-D61cAES=uBrR>_N-*N2wx(8am`h)K+~@zrgPTrJtwr40%jIr87x^2C0D
z&mZh6*7}BikFlmLc`aja=<hKk-8?0>Uoa?A3st+w=lrGxMZya~)|mL)7WQ=t$M@M>
z8ii9Z#IZ26h25}>{oc|nju3~s0@&VPH9s!0G;3b}fd5DD$IX-bnD1S7$`b&<Iv^(E
zJSN9#mHEK&?{k37IS(T_$BbKXDB{0M@6U6EadUjTP2Y)oejGAoR?(hr&Y8VP;}?8V
z_eX`;e13GL(t$Nml(HIrMt$t??t${V_EBDb^Yu<mx2AKCh86qdSA14`puBnp4vklj
zPx~G_d@0!r-Z5;Bo5I*L=;QZ$cdxYz<oIb<NAiM8GYwQAPPA&F`EJn6#$@_U9FKuj
znW(>H&J~}e{xD^3>@<ebyz#<jHPIGc%J;51+0?Nx;$ed2BxU*yaKeHx=>+nqy9oj+
zn%GhSKu41pHOSE~O|AiTsUuiCwJ`pMH}@vfKW!PWYQmAeB4XfY%Z|gqKU3K8?qUXN
z_sCwz$KZ{*`D7vunf*|dRhjoi%hZwIoC8>Sf#vm^!rE8~>9#GwX*TgZ^*9k4jpBJG
zKvuw)fx#^C)6;Q~{eu@9=t*vmR|1r(GS51CW5kp2kRW*rn1d*I7>ux1SC`CCN?XzG
zLtRjL|D96}Sg+F%#wmcIE<NixnL9+l(a!9HSk2|W^R3FBa4vkrMD9^jGpwaO(}eln
zV!OW<>+F;yi0dbbv-$A5Fd1jS<^j`X49N5EycXu>=hsF@coaGo#Fijt-L4YZNH!sf
zQe&fYn3&J{`CxI15D$~N*E$@$99cP5(TKWz@oI+Mq43z=6QYbRN4x_@WCWkJd0@+8
zYA90lrvRZZ2>eOw-vjs6LBPH`ZuX&+(DIPVELr{N8>d^=1mvR#8_+UdASMzOK@LmF
F{}+dGkH`Q3

diff --git a/route/static/img/ico/ico-doc.png b/route/static/img/ico/ico-doc.png
deleted file mode 100755
index ca27a9666d17fe07a524285e1180f62fe9285dda..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1158
zcmcJN`7_%I7{=om>t?dHlpa>8-P-LkZS9z@9Ta6Lsj8aY&9>@j(ZhDI+SNK1O{8(g
z(K?rHv@D6lRgpmuLJ&tn#F3LY65kxY!6KXfw*SC>X5Qy{pPBckXI>;M=&FgKwIKuo
zG4c2F4$(O5<LK*X^uwff4FsYU1`7=JQLEL={{YBjnj{j5KoH#D-{){Rnz*~Wt57Nh
z0)axI*xud-0L_(5E|()-Pdv$?Zb}rON|l^D%oT1YWDj)@@W@pD5>L9ZrN9!|c{PkK
z3Rfakh{S++Lrxmvl{d^PmCB+&r&rfy6^+dF;xQ?p92gUJ^soG$N2|ll_t6A9J3C3p
z;hgeuz6cPk0#!|{WxkX$Din!j<1^xx?#0@cxfg|_AgEF(!Dnb%_1~;a3|*yCu@*N+
zCRdxg7T>ik;7Lmi);e=xQ?jjmOJL_#OinPxsLDxn6{EO*n!}Y0jf();&f117`e|o;
z8ac0e9FXq~(nUF?Gy-{v#gWuDGoR-VjnA$pzU*HX$Vh{{_w8))=1z9WNI7;2T}6MG
z{sCFme?PT5?nMuxw6Cgxs?o<8-K`hkdYYo2B!&dtfaqlj)uk^rMXNVH%KyjVuv$$s
zrXQ*pBbOl%?T7x}o}npPLb{8!hqHOMXSlttKX~*TGw$f_O2dUu%6Yxi*p9C3fusO8
zdh)6KQ2v&1Di<1aYN+7qrNQgQ5wlmUcFcX<v#y(cT$uo&>>CP+#rko3Y3Vd;!)^*`
z3!wl|r%G&bE=dFD5T_jp^hCDrN8V2L)jERqHe*~XE{+Dt=TLRliHz8{sKnzUFlAkb
zYbKuY8T+RZ@&_e88ljfq_4zWpl_Y7Cp*O~b$VYlF(*Hte2m1`5-t}3`#6%O=uU@-h
zfd_lNzt|Vu%Ak2oA)q(DEJcIIic&mhzjHtsHZj5?$rEp?U8u6@<u%2g>IZ!P*|zot
zkIPN>-k8*WiU(n-I6V?MOE=xyNNiTyJio~onJ{g+JbjM>H``&`^mFcgO?B2M*7Hvj
zb?4pmoO${<R2=N=Gbj+%CcUP`4)W{y{u1K&nnx=x`oI#;HSWxC=)gw>1vnOmw?-YJ
z(QxCtaIx$CxyI3Jot;!P&fGN5(VZNHW7i5|7++I3U4=aO&s~r8S}iHDm@5`w*U7-b
zoAstbnJM=@qnP!yHi2+Ny_Gtaw%{<Vn-k%jF2%%KlURpop~TL(Q769TbDi?r;;c=_
zgnPR-om-FC22~6L@>Hc!zh9~4K3<1+K6v3oG(4}~)#)IDl5AyZuH%2xX@=1j9pJ*X
z;Ac>d`DA4Dj3psqgmHgVj*-ctNm;?jqmq+n!ba}kiC+i@%(tx0zruc26#tWN93FP=
zS4oHx_Bj@`f8e||K$X+9ZBTI0nFwQFXpKSfMVtDu>4U&<Ov$&IjbDYO1?bp8gK=IE
SPon1SA^tu=-Ys5tGXDj^Fvf=f

diff --git a/route/static/img/ico/ico-docx.png b/route/static/img/ico/ico-docx.png
deleted file mode 100755
index 702d2633d55507b26ce8f9be572071fef02c5b2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1195
zcmcJO{WIGK9LK+&%G#-E(GA5dS9WgOX*!!-kI_XNty*N}sXd&>*4lZv#<5MPDHRX%
zES(CglA<DLJViVQ5nsYYr4bTIJS6h`MAc>KZ~F)KzWco1_x{}Hr}y2b2oZG6@}&Jq
z001ll;4q}Y5%0&s#K6Ht<3<25LLdS|{PlW0^FNX+6ow=e3bk78+qZAoY_=gD92}_B
zYCfN@QmJGznOttTQYe+m$4?g03#P>ql~$+Az|3$3veZY^p-CQPdW*x8iuP5ly{xiE
z#=rzuB2@`@<+~y!naacBSJY~C<=@NOdy4vYW^NT-Dpya^1%2b2zm?IRb*+uj_!^A{
zRWwt81-FE9{<gfKV|8OoIx!~@?kd24b_ql4O@!CziaD)Tr&4QwEv4aJuI5$G>vX!+
zb@A-tcIUwQi&t-mWDa9>kNHL{k*QmHSeW|71?Fz?)5X#TMpg4Nn=7G$Lb*b-BT^(}
z_5YkhX(O@Z%0u!L??K^s_Mg<Lc_Fy6S5QkU!-1=8Ne_jy!B^~xHQ3grrcUPl+`*!{
z@jJf{C8LKQ*N!#drwvSbIFt-lIvFZXeSi%55jc@A(AO3kD%OkM<Nwm}j9yRsaQ?Wi
zd;9_b82=Rj^9#u|+Gjor<@<i@%d>r2TxI!gfXSgyIhy0>_=NP-?fDG6cu?bdxJ4uD
z`*qGf8Kmfbr~N&NIE73wqIj)cJ3?9RQNKi+?uW&?`IX)=N`{?6Kq7PPmyAPV@xJdD
z{+AhNCF4AT8_L-6lk?{t92}gT8?jiA+^PlqQI~Y3x;Qx!=DKMEa!cknavIJ)`QCGs
z_}PsyCFXjOZsW1hZIqpClt6<xrG{ojr3R)!T+7Sz6&P5v^>A#EMHB{i?yHAs0o<Cv
zmdebQ3kx04XiAJnoN*k>v3+=okMt#BOBDqN;H5m9mghcnWE(sp+ww+!zla_W&Av)>
z_tZqB_(EDnT%Vr=YmRW3>_j5T31##QwYFyJ(!a4K>6>@?eD-Ui`&~HQ9Z_k<z$B*L
zx;YBT!q%RT3F})bPGpo4$i#Bf@J*9`Yt&NG309rS?0o>{%0p<oO;pGo_%hIYh99of
z;k(1wE^e&QpIU>D_^(LlJmDEA<T6<-swYQv%$0b0$xIhMePO&~owQ*um`F<u2EACP
z_Qwa{A23^HYrJPs863)}ReTro?mbc+c*yNCO&Mv<iK{uL?8_3I)qc*yB<Y3BBvzN%
zX!-T1h|_-{Z0Jy`r?(YSr}s98QrNXO&4U|G6q{eEu7>)yHABloa+~Mud5$T#^<>vT
z|1h=9B^lT>+l_=XD&hf%;)@BJQf_BYB)mPM%r8tf7YKE<y|w0Y`(=lRMS2kK+%T=%
ze+~UnL2E)W5xuUQ<k-QtS6-hgl+@q&_ToL}yGR~QRG7ry?!8;nWY)7KEzEB3UH;B)
zM}W4)v1o_#3c6<c^e?ZEc#t3HAl(WN2zG?fl5haHIEom-_xgNe_z)n#KL|#+5|j5Y
Dx8T|o

diff --git a/route/static/img/ico/ico-flv.png b/route/static/img/ico/ico-flv.png
deleted file mode 100755
index 973435f5d77f0aaf22822aa0cd1264c477282e66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1116
zcmb_aeK4B`9Daj@^KG}?m~p7ydNbOqQXMzP*lN_Nk1i`B)#CKrT4~nA%xEaJ9!ICX
zqBa}CQlCL;O^RY#L!w?EOWq{pLn8_Kc=Kt<(*Jh1fA`$;d!Bplet$jpR3{~V?qvU-
zJpcesapz-_EuQq|?5r(1&a(Om01)9x38}GWvw8JjP^s0HB#}t;dj0<XK9|e2M5ECN
zYqcVg2!>&$QmIl|zSJ6xMyAwFtSBBaB{joB5><fffYwFox)Gs7p>6(MOzh&l{A-W*
zS|i=lX|>wbEp;)4|7|y)u`GvmhMBcp{4Y@ZGl^28SHXInPB*e38(Wk;7!|cV6)!?c
zgTXM)lGoCNV!4*k$s;o){V#SjTEov1+vSfpITB6B<TmY3nNDvI%HSUcw>Ed+DNylB
zpz58KK4r_nP1W<&-36|)v{xWk>E=0mB|ZGidhlv9_ui0LrTe>cTK0gx4GMKrYwFiZ
z)9o%nK|8O1UQtTj;z<qj5KLxD>FmASM(}DAr-A}v8`iU%IOW}73k@W7gLzG0E_(S_
zOPl%l<ir#JRUtMvR$1CK%ihTUjYIRC+5FOR;Sic=*arZsyttUCR3akVeY~u`+GFy1
zrVriOCdxg?jxt@{78;z=+@e0B7r8GJGx@8=lc&GW&d-I&UM@?ECqMf5EbR;?15;KU
z93YzY@JGDc)r0ElvHcH`cYA;@^ZYJYXQXEdHa0dO2;y*X0G+@9g9s`7rLnK@)+-*B
zIj@qn%#ip~<YO?V10CIqR%xyU-A7AmN}<-{=-%N=Hzo%z4h&s(6P6AXAVbp&2(EqH
zTxvC%8HpK(Xo!G7y|3qBnwv0-g<81e<ju}YQ_S7P4A8L%=bfoka&euIgnYufK4*9P
zx5qyGJ5J48z6)L&yW}=UZ`eN~E0MM2widRfz8B^eA&xaxG8oYtqgNy!kh~o(*7cFo
zjqgau%bOVY?}!h}&HCD=J#0-TLL*+Dz@Ts0#+|PVG<D&eiYm>If+K56h^9_X6-9Ug
zHf0bRT#CHHT~;`-s@A0XB404m-w>gMqTW{{w=u+udXV5raQ$>FP+8T89s2|Ende~R
z1(a|!C#<!qfa&LZ@9Z!yb_5PJRnGYE;RB)rtDQ@C*%ovFg$Kdsz7x`nx*NE#N_(3R
zabwG6N7{$+C2;sd2g-n8mpzM^KIMpHf9)RCJT+pr%6ay7C$7}}pdb#_E^#@UiZrHR
z{g=+!J!ha|E?3pxgkMnO6V!)3?HNB_`zA4%ZPkJ+^9xv=Y$K)>9#>pp+OCICLVEgc
zrroL^@<Y4MH3X2@XY#FDvGE?%GC7{w+WW*=Ve6VBWla{Iev6f$cf@}ZL$XokMv{?@
W3J;ePEPRJ$=RjO+VoZNDmh=xEHm4l`

diff --git a/route/static/img/ico/ico-gif.png b/route/static/img/ico/ico-gif.png
deleted file mode 100755
index 53a13516824131a278c46d7c9b601818740ff3f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 973
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPVEzz^EVK6XN>+|NpB<;KRp{K;F}*
zPrrTp_UqTL+qZ86xj%mV`26L|<HwIbfByXb{re9efT})z`t<3`moLX2UryWI>$kD`
z$fHY9+gf6_w|@Ql_1%|`C!SnA^zg#>@83%fP7m5#ci`dqoP86QUEA~F>!%gh_g;B<
zZ{DSCMF*x<9iIK<!^?YbpVl3nH|5;AXCGgOZD~x}*|p^Au1hcOy!iO0>(ufy&u%Qb
zvh&l|FSlMldiCjD#MY*L56+eynh~<4zF_~98?PTceE0m?tNVHTCik6Lwczshj6Ho@
z?i`zSar2)0XSUrrzUB5Y|BW?qJK9tC_U0d$viSP$>u(=^{P}h7qjTj)X05(;u<^vg
zbFXf1xp(6J#}^aNuY2+JUFYfLx%(&O9hlsCbV=sE2^~k5%ssiW<H+Lt{gd}r`fUS-
zU}{N_UoZn(%ai}p+JPbX{}qU!D){^V`2UkUXZ}uMV|WLQs~4Uwjv*C{NfJ97CU#05
z(6d#r6lYD8&^z)osU+w2ww?c<{@J5$y64TOJ=_(1yL@jM*YiiMG28vjr|-S%a^73U
zJNJqEUSPh}dV-B>BCm*&w1$gWKu693fu9bFpBkN>Ft?sy+~u49h`}~){rTsgfB$WC
zXkZmllIQ6EVB@3Ew6A`SyC6@i=e7cuj{kcX2uY~6CQa!2|FP-d4yG9jUQWwI0w1aV
z`x??PLHi?Hi>_S%?HLY=w<;W$Tx~w-V>UU2Wnvh2+lzclSAoo_3G=u#0^%fFybQcu
zMKn*dKU>)%^qg1u5&uqyB}P*`9aqJyJf;z&eU-N%Kg+~Z>vooL!$iK)>e>VWNuk!>
z=EXX_>ObzA__rOrIY+D_H0Bj^@L`*^*QW9|h<*LAY^_|ucJ-Bq-+7oG&Ym1~@nsBq
z*>TZ}cDK!W*1b^TU0Bh1ZoL7|CEk2vKE8uI_nsc;2ovBB(%{NXc%}K?HdxB>?B9m{
zx0iM^w<St6EShWJb>__P^#N}3+S7ltSFpV_eIWm*xxT>ZdUL~@&<A@2oHUppxG>yQ
zH&js1>dvZVvHaHd$U(x0pGh>aAVWYyd<WxqPL&<$FIK4EK0NuW#swJ;cPoLtX0jcz
zIcKlRF5qv_`oY)3soFNhdczen#jLGs>bCK|Hx~F{-BIccOk@n6u6{1-oD!M<y`?co

diff --git a/route/static/img/ico/ico-htm.png b/route/static/img/ico/ico-htm.png
deleted file mode 100755
index 14665dda02ad0b3cb3bebb9d485926353a76fed5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1066
zcmcJN`%hB`9L2BI0iwLzAc&hA5s6_iX%|VE5MHH-An%loj1?m?5D6f2LlCV{<xw5V
zaEdr^I1reH+VZHBp~!obS3xMW^g&xFE#-21Z*L1**VW(l59}o0&o?JIKb@TNn5Zxt
zYZq$(0Bpif5#r20=G|HCHuL2arXB!xg~dcBgqlpIxBt-=1eu*ep+He|XJ<zs5SXpO
zV1N-sCX>N141(a+mN^A!wORy0bUGcR)BCk965Ezgy`fX6`Mha?HoltGC!JA3dcA&0
z4PSaKRYJNG&lX}?!t`E=a09+Ov4(Hv2mHR+_*PXjt*o9}>lJUFW(bC4Aek)^Ymk8z
zFq$chd?DzQY-Ycbe$m3Ool(N5{_IQfgDItS6KPpctF&l*hj4NY0uhwdv3zSx(Y>q*
zdcIgRBnzQ0@l`NmY2*5^ylrtKjU%}-AS)b{-Qli|$hT(KwTdlWYLEEI?0Ow<J*i8C
zZQ!MHq-yl9U*|PEH5&Os*dx`Jk1NH{_V6lle@0a_toX7^L>GX${WAY1UK(>2_uE`5
zbGC#tYi2+b@8YVLhq>9T@8Y830Sl_!^mD1XS(EA={vR1fOk?}G#zThNBmlr14JQO8
z<nNMmZ#rPGz@9+)a&m()vHawRmwt-vq9p&_uDGBvPL7<lCqh%bdnz-kjg#Y$@_eLo
z$vwON(b9ak5Wgzd!(;Z9sbyif!6OG(?pf~xZ_yafTYK7Sn=%AW)Va}{DSp=*pL(lR
zA&EFw=SuRLCwFIg;j+JDajpp~^^VFzPtWO#2-M(K&)w$+sY#FaGX&qO3b0o`u>cJE
z1NB~P4u>;vmCfljiPf%&HKK|TAGX^x*-IgKLa2zZ`TB-aqbeCHlziMtr0x4iIfHQ-
zsMimI6yp2GxNIiH(aYx~{xNuUJ9Aov=^mj)I2uUh3!p_J#ThBU*KWI({cx1}>hSS{
z=_Ja)sEU8Wb$-aIwmgtdoajRwa<JpadXfn#xATa(rx=H@IPbkJ_N;&E=b1m^tBc(n
z9zsF5@#bIdp1bz=Oi6Sw-e=qG17%jlYqn(-#toL|IeX05h0bN|M0@4iM&RD~4zgI+
z;+Q#{43X5`x6C%}^6~pQl}@WHu1y2E*3#EMw9@dVssvvrsrgE4NtWNx6yt5}zUluo
z|GjpJqbF?pnU$XmNNG$8ilB>{+n&ZIcXlNFX-NPl+zZ-Cnduo>b{D%l=XfpIHXEcu
zz<5DjD)D%jk{L)}E;yeV#&?NJ;B<!CFO3S_`Skd2|2V@S)6p*L;AeEB6CP8CU7^VK
o24v$D6xMbF_lOg`*iO5XI1x-O?VGMYU|uQ^9vVex3r;Ei7Z-1d<^TWy

diff --git a/route/static/img/ico/ico-html.png b/route/static/img/ico/ico-html.png
deleted file mode 100755
index a29b6297fe9fdb4dfc77f5077127979309a27c55..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1072
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPVEzz~~j=6XN>+|NpB<;KRp{K;F}*
zPrrTp_UqTL+qZ86xj%mV`26L|<HwIbfByXb{re9efT})z`t<3`moHzxe*O6MyUnVb
zZtHG+`~G9=owvrzu6Lh)mb>ra#TOsHfB$~#_2;4k4_|!zYP$S-;O09Sdmh|*^LfJA
z=N2n&*ss31^y;gb7hX&`|9sE=cU~KAAAS5je#gE0Z@(OV^xl8d9iNT2_dR%*zyG1t
z${VvUzWDs@d*aUf)6c(n`0mTf>#tvZ`WC$9&bj9w-+%cQw&iZy$*0@zzI9x4v-ap?
z=e4(Py!yQ1)|>icPuAUhleYUo<>ANGM;`Z{d3OBChs!TNJ^k=CW!L=$mtW4i^fGGO
zJ;OzpUVr=DdHO}|v8Rc<9{6m$ld}8au7{r%UVD50<IiKyz5u1CUVIg??cUnk?+Xt;
zwq159ZPR6=C09~5U2fie8A#eMyR@s~<^o{g=9L8b1v9X<Jo!JZ9T>R(Ux5f3fxpN9
zpX537mzU|f0s{k+x~Gd{NCo4QGp&M$7#Lg)m%MxT_FwcPKK`HAgN+=-{%7xulHPA@
zxh3cL-<c0TzOX*{zGs5Fa)8rxcf%)vyoDmpaz`hCm^_sbre;r%ba6}Jq$QcNQX}U*
z7w}pvcBtatqnU>mc<{%rX)%!7pR~<DqdY!vN)X56f5C@V<=uK9x?IQGonv<$2a|-X
zs?2XqhUk;RxeJ<<=B!+@hG|jA)eW;a7A%=1WYpF4fvu`H{#kzPZMVGt)+c43?6gTf
z|6e38hNq23BJt0s!wH){&OP>DW6rq(tMm&@r>EcdYFt%&_|Nu3OZg6Ok*MJN{Wigp
ztz`O|3r6;xmLF!Uw9T0%=KJuE$g7Y;8qD!tZU*X_GJJYZuC!lpHK@`Q_e}hwxrk+D
zPe&$~@soWV`QpwelkMHzf+B96&|<t6(EVgpL#;>7Y&GZ8sa9t!Uv6-{cH#Gh_df$%
zj=f2}xWVpCe`f88s^`f;S}}DB>m?>FnPB-j?6h&r{y%jypPF9Uw$t)qY{_XM@9-1r
ztnd7HTc%xOQ8@qB;?>M-j2dl=w(1%&3Qug`z4?Fs-MvR2J}TQFf51N4l-chA3kWUv
zRlZ%}-<r$`O}<j4az-A)v!|TZ(s`YJfq`%OWHU3*(glw-X1Bf$W&3rdq2ZHq#S5k>
z1)IOvZr-FmC1dkbkJblnw`YVl?b}}YTI*oL6)o0>R;T1_{%j0S=&|q4KcI3ne(6o#
k8RAQSxu;G%?{-`2iF4Nv>oP4*U}9zPboFyt=akR{05GtKxBvhE

diff --git a/route/static/img/ico/ico-java.png b/route/static/img/ico/ico-java.png
deleted file mode 100755
index 20affd3205723d6dd7a7a3e32271a628f1d8c5ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1417
zcmcgrS634T7!3g;rocfQ1Wv4ZP!WnaQQJ}nqe8TREEUB@P@up;84W^3AP9oYSRnx_
z0c1p`Bw&~t5Qzq4h8aQ<G6;}8kzpF&`U`r`x%ZxXAHJ7+zAP_~izZ+zFaQ8Bad&g^
z*16X=8tLn_V+4o;0Q54vF8jJ_wc5%5Kq`~z5|77ItJUl4>vTF@7uVL-6iTI7t{$8d
zPc6y_)aAMlOW7@~zuzpf1d6D#xkAz+hr_|Na~dfEg+d{bNTgETC7E0<r_6|=%jvvT
z<-(FYwu0VE6V7mC$d~ioW2*|4MyXW39bX-o7KvnPfk??&QRETXV@xTXC&zYjR4SEP
zv)1-`<w4cFRH3f!<EJ$+`9h_xee`N!h%WxChJo*2%4lM)N>!Q7toyjR)cS>#x&@6!
zGs~6b64)IhE9_-OTqV7KO0+CiO|YZ|t?U;)+<Cqn_m=ncHLGt@SpJUptZgv~&yXuM
z%^wBnjm*x`)k-q2w3|CTFL^g1{4^_W`6NiFo~N;;RlWR@E-q<!B@j&u#?muexKh;y
zL!hC~E0!c*Xp5?<_ba4P@iP)Xxt<+a#whI(G*N}UQ!->VGo*+XjG22}OG7-L4#Lc(
z)zFHGG*k^O6hk|d2yD>}gNpO^@Bx4xbG1cJbi-&@zRCZFEiFZ>{bW3}m0)4q1OVtC
zb$7Yo`#>)U(vgDBvLwR;!yKCWqoL<eiudf_<Kr>&O8;o<A+T8b_1^2fj*%I}6CzR+
z?v14-`kt?GUase5`03*Z_S9O#m>+YlK~uqJY|JJvq~cA%E`NI2)ur9^H4Hs`!QK`X
zt0;n5Op?=GBMP$NtZ@Q>TM2A;I)x?VKZNVW73{3J8AYOSWQjdzah`fgADGb(S9Tbu
z+n|~|7924rA-Pwe-3DhdO2=6HKaTD;t<t-*_{wf*F&pz-KQ;kukrHIXr%Y3mjuhJs
zrWA%_!(C|(>z)*5VTZN;DY%Pv+gRk-xLrfZA<W=Tb3`eA!u90&9s`(}_5Slog;U4z
z4T|fB!ks~p=B^udXcMz+bJoE&KwQ=v>5DZ9qM8)2t-v~feA?X@eyrOB5sJb81T{-9
zF-7EuIh=%=efH+@JR_We=u3K7>j21}%>GAOrwC$N+Ux_<=DkqlF&O?x7!Fyl+2LLl
zd1<)7u|3Ac1AD@o61it%ApZb(WDu1LQPm$q;$@LJEq(!8mJbtT7F%c0251?s2*MFw
z3jOkdzkzqjETO)97zFv%h(DagFC-f`5Ydg5z%q%|YunbuXrSTIE_mvA8JZoR8?yOq
z@4L0cx7+b4#2a_&NFOU^`}~{}s)ZXCt=|n`YXUDmwPwAD+kF)-4KYORBCm^zWB2tb
z8=x~YdFXw8{38Lx7z7d%Ru~v2bEBO}wP9!#dH#~SS^^su8=pghj|B34L3e9Aw#Z^Z
zL?fkk^!(4r>GphO*JSHg)jt*Wd4%?JR!*Qit25yU&<6m6d>P!E0x^Q+8WUg!w;_qQ
z4nIcicKo{kJ`ii~&DhlVM0JH83>m1lNoV_O_58yeA~qil6>rasMPO^Gh9E`|LG%mg
z>DUf)KTa=%XZr<uZNRo}IDZJ095rI&m804v6dKtiKUN2pZvg!#-0&RR&fw!F$kZP_
z5h=Fj<G33fZvmi`?D6WhEG9am^PpS3{b}xRh&x2(N@7V(=(2osG&${hCX-CHrN-Ry
zJ5Z83>CpBZd-aCTlMqCbb1=xTyrrV-c0UkMM91CjjpBT-`(%K-tA|UI69V-w)%;FR

diff --git a/route/static/img/ico/ico-jpeg.png b/route/static/img/ico/ico-jpeg.png
deleted file mode 100755
index f28f52905241b4ad533f959bafbbe5378f2c4491..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1018
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPVEzz-Sua6XN>+|NpB<;KRp{K;F}*
zPrrTp_UqTL+qZ86xj%mV`26L|<HwIbfByXb{re9efT})z`t<3`moLX2UryWI>$kD`
z$fHY9+gf6_w|@Ql_1%|`C!SnA^zg#>@83%fP7m5#ci`dqoP86QUEA~F>!%gh_g;B<
zZ{DSCMF*x<9iIK<!^?YbpVl3nH|5;AXCGgOZD~x}*|p^Au1hcOy!iO0>(ufy&u%Qb
zvh&l|FSlMldiCjD#MY*L56+eynh~<4zF_~98?PTceE0m?tNVHTCik6Lwczshj6Ho@
z?i`zSar2)0XSUrrzUB5Y|BW?qJK9tC_U0d$^6}@_)wd2_fBUfW^zyxr&XpgTwfOq(
z#uE$ge|&ND*_9Vx-<^APd&|8O6VI=kb$Ltf{z-WUCU+iPlDTg}$I&HoPj2iuvN(VL
zWH~we$-r<-FA4GsW?*Z1@_$-8FdYBC0ufXOfBzr<f0F0S-{zaeHy9Y0cs*SlLn;`P
zBz87T?36s9Wt(6r%$g`+*YWx2iW}Q<i~pbgX?WQ@{l=Pd#`CUIJ*%JHckI5Jc74vt
zkGo%NajaIm{(cc>mBVg<n+}Sb8l6&DT2HWZP2?9*lGkvt3+V7!ARy_m{iU<ag5$5h
z{;a9nZ!f@6&;V5SP;g#5r^|)!$0|h*2Fys|c5nIdj&<q*4NZ~ekU#Uqd5(!5U<nj5
zTG}C`|8f6vrk0paeubQm6?cxYa9upct+ZCoCvDTrB}yGzq6}RApVn;hSk3Y|#G&!i
zDTR=xNUcR4k#+|Ds#7fTB?RkFuqsVm=))EC)XUWEVbsbzhCcy|J%etB&1UQ=S#kR{
zbMuJ_8aXmDshKtht1sI~vZWVCJqRsa$?wDac}rBd8AH^S!|mIu4&0r$gm1U<Ri5>}
zS+2{AWpBuayZp|%Z?I!gw@J$*Rjd7n3_Q$h&RAHm7*|YZR*rJC@mQ#_rE%r*J>Px)
z=1!LrP-tml;3+?p7Psy7Kl2mY{=R?q>ycAIq5Y3$AiCc0<=HKToHtwooB}>cH)_}{
z8RmIk<5+#LLdz@2YO<P_;rY`VISh|CMl{Viq%ItKi}Oif^Om>U=PY}j@#brgf-dXj
zt&fxfuCLPeS)Dg?NpPZ~#|Ckq`)<F2p0qBQnB>O3#%^}2LPm#&*7CoJr{Ab#L~YPK
tozu8&v*#9>?W|RG4*41%Y+r45)q5eB`C2ZK2bdNaJYD@<);T3K0RSG7P|yGX

diff --git a/route/static/img/ico/ico-jpg.png b/route/static/img/ico/ico-jpg.png
deleted file mode 100755
index 989551b668646b76e9a7532f97de30b330330a91..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1007
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPVEzz-ScU6XN>+|NpB<;KRp{K;F}*
zPrrTp_UqTL+qZ86xj%mV`26L|<HwIbfByXb{re9efT})z`t<3`moLX2UryWI>$kD`
z$fHY9+gf6_w|@Ql_1%|`C!SnA^zg#>@83%fP7m5#ci`dqoP86QUEA~F>!%gh_g;B<
zZ{DSCMF*x<9iIK<!^?YbpVl3nH|5;AXCGgOZD~x}*|p^Au1hcOy!iO0>(ufy&u%Qb
zvh&l|FSlMldiCjD#MY*L56+eynh~<4zF_~98?PTceE0m?tNVHTCik6Lwczshj6Ho@
z?i`zSar2)0XSUrrzUB5Y|BW?qJK9tC_U0d$a_-gbiRagS{Q338*LRDr@4o)_;oe8*
z%8$%yJh5=~t%F<cow)z;Md#_|N1t8E-9IVsz~s)OOEULO=s3D$?#YcEM;7PrpL~74
zbQv%Z(@KK;f*IIap8TKI4h+QquRsKK!QcPK|DWVJ^S3ZgdoKe66Pu@tV@L&KlElu2
ziJg)Mv}_YBg;^6N>^eRlU2$VuZt?%qKMgONr{7pp&UoH+s%Q1H`;OgL)2`1s`EmD)
zEsoV{*WWMVta8{baMM9?Q=?M~bL$B<u8F)NO7a>mb^#qV3j{13w!d_iS#bRI*Pk_Y
z`|SldHZ(XrVSXq$ubtE7!uMm9A_oIzq;R{p{CLMY^?-(^NOQ=a`QkjsL=Uh83K=c!
z5Yqp+e>qc2OeeoW&c}*7$5^;79^+P8E9aB8Y3358jxA9JF8@z!HhHXO`5fZV`012F
zNK>TNB9BNr1Ao;i7Woo_^(R=BrY`j13VP~g>h>^dWgf$yfW@9cH^XK#_LQu+{hGP?
z!~~5T8JW~fn}gMtZ6w*!i=!Td7Ov#?;r+ZND%^}A>dN8vZB+;E&RfE_Tlp%_dfzP9
z<;Ai$WW!y4=iE2gv8dam<&mn@{zC>H<~3(5ELe;yrZX!?IofzE)Y#Iva`~R`KA9~4
zw|R@R3mgg%ab14s=aYwdp8r)J>^nGj_d)&%DP{6M8iD9}!~d(ij!`!w7pMq2&s&q?
z-o@o`IlNitexsw>8lJ6heI3}l7$<L%n9}ROeRzKC&(o83eOw}<uxU%`f`yWE_0Md2
z@@e|p)&#~<$1uOH=GFy#(`6!bBlKr4RnRng@Je<=#Eos4zD&0B!=6?%8*qeo)=BUl
jn9=>ei>1GQy)NsAw}SDLUkG0Zra=ZzS3j3^P6<r_vpY$1

diff --git a/route/static/img/ico/ico-js.png b/route/static/img/ico/ico-js.png
deleted file mode 100755
index 35691771d3cd21963ed1586d4f44b7ab5db8735e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1107
zcmcJN`A^da7{<SVGR6Qw7gQW50XBylLhBYbAb_B45fC{POdQm92!;xBES*PSP>x1G
z#z4lHZph(a(s0QgDHO`MifzG`w$PSuFM81Xpc{7OxBUZq^1h!pPx2;j^5n%Q#KW8&
zJsbf5a7MtR6Rk60za8wX99^;f4FGJ?6JnDuSS*&c|45})Tb)oSG#CtKvzg6iTdm1t
z(&}^|2x_%jrBbO<S+~?0jYg-_>GgWG-Wb}wev!a37)`G@3TP+e(V__RnopIejYcC&
zrp+hvC2IW_FBn$_I9U@sj$B)}EDrvI8UE*b$C|YHjig~kJi*<G>1EG?%Jh*<u0luJ
zQeN)o#P+dY^LBD4`CoT2Tc{GP!H68?HmykbJGw50OsX*?4RR=AwNhueI=E3WFC5-b
zM7~^qI15Jgu$WS9FH2rb77*6und7|gN#Ok%ux3d#Cs5J1HA0mhJ;wc=zWt20eSK&%
z=sC@rL*@h@zbK)}3^K#t56QwFwsMTG;i`9I`#5BguJx@Vb!by--fN^vMLIJP)Rz1u
zig?K?m=-kCWnrDPxIRv1KONG(iteYEjnl0R@1%tnmSkHKFDguoPXg?50?U(1>m`eH
zAOEZNEOVB5r=`7N<wx-VU>kslj!eed2$ss-rXzp@5x!;u)`Hn`spR~VHB{p1%)ml=
z-dzKGv&Y}%HWJ(9s}}#7xtJj2V;E${=fw1nPHK1s);B7&-rH;5^)b2%=6`PO>EYHQ
z%Kek)tAeKMj*YrjH?6okrfB9U5btA`)BWAMCoG8z$qr=F9ByFuX4mF+KE>0G@b*Lp
zkr~9Vt-lQ)I8`-u^k;>tcnHJJ;#dN-uN)OQ-8Vl$w3nuCGwq>i_9D$e@XV73pOc}c
z6hiXx#HbBZLiU5*v}#oE`uW!7UY9X4Lxu{}xz&Ej^hAa>Lk4lp2V=#kYIk%Q9e)W^
z>sQb?V?@V5nE@GZ8cy#m#Q2lP;vlI#4MJLO;9+VHHK2a#>6x}L7YGst#m;2=ZB2^1
zKU7O`KJ&b9E5H<D<p^FbJ3ioaH)jVHIzl;up)7>vP0+=8`mIZSp2N)6Ad#xEZP~lU
z^Hvf88xmdahOkcyyn6OgLd{upQ#hP)aZ&pz&C*eF!w(@uRu!IxH09fo8Zdx@R_<1s
z0aPH3rjIkcdCI{ML-@*0JDB3(1-X%T4MB9zncA=FXSkN<hc?RKseKu--=P+QZ=DOP
z%eR3CB-%BymTxzEV2khKBT-)sQ(nAh`$NGm^i?8h7UAW4U|is!*}QWl?<ZIJp}=Yw
za4&=kEywYKYr*&9Pa0hITz=h3@qv(z#wm%rw)pFxDT!<Mj`(E_d{gAXcIT$w`2Yn>
Rx>#QqKwOBACY;YG{TG8Wrj!5x

diff --git a/route/static/img/ico/ico-ltr.png b/route/static/img/ico/ico-ltr.png
deleted file mode 100755
index dc6d48718d317609272ccfb2506d33321ad1f559..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 233
zcmV<F02cp=P)<h;3K|Lk000e1NJLTq000XB000^Y1^@s6VJ4;+00026Nkl<Zcmb`{
z0R{p=6o>H*!WKYKfI7q03HA!9OC+FWb%6*01W}*^#6pT9bf@VX9)SMO8vFv^qcv|P
zYnsmn(-1<Y#CV4T`kuIleI(=fLpa7AD;e8Bi7!eS+rSzxOgwRpBhJYG#x^j*4YiDI
zV1_s5GPZ#wo+xB&16y1%^u!&UP@^mNfoOmWs<yHI8)-g}V1Wk;_o29tJJ}-X71hhH
jua&;A$)AGC`^fwN>xwy<D2r1h00000NkvXXu0mjfe#%@Z

diff --git a/route/static/img/ico/ico-mht.png b/route/static/img/ico/ico-mht.png
deleted file mode 100755
index 296a7ca14aa970c61ddd312739ab3aed963f2b4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1061
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPVEzz~~;}6XN>+|NpB<;KRp{K;F}*
zPrrTp_UqTL+qZ86xj%mV`26L|<HwIbfByXb{re9efT})z`t<3`moHzxe*O6MyUnVb
zZtHG+`~G9=owvrzu6Lh)mb>ra#TOsHfB$~#_2;4k4_|!zYP$S-;O09Sdmh|*^LfJA
z=N2n&*ss31^y;gb7hX&`|9sE=cU~KAAAS5je#gE0Z@(OV^xl8d9iNT2_dR%*zyG1t
z${VvUzWDs@d*aUf)6c(n`0mTf>#tvZ`WC$9&bj9w-+%cQw&iZy$*0@zzI9x4v-ap?
z=e4(Py!yQ1)|>icPuAUhleYUo<>ANGM;`Z{d3OBChs!TNJ^k=CW!L=$mtW4i^fGGO
zJ;OzpQg%Ol{q6Vtk3S0!KECw&Tj%K)wa1?NY`nAf_WNBAKTW;(>e#a{3$MM6*mlo$
z*`>5imyMQON!fI{dG}=?X}|1Jq7Zu#Fl2K}g8YIR*jk?apVkfx+5fLV1Z}|I<Nr_c
zocSyLqbH1kfl0yB#WAFU@yVH1!9xxVEDkEa)>Zt^eZ<#(=TFAA23g+g6-I0Sg+Jbq
zx%*%K)B}s(T=}ond)&(~k>AaZMOpsQM81nB+7q5Q8+=lf_$km+!{Mf7a&@lI!qRiq
z@=hIwO%r5h3iM1rFUA%6>G(M#MG60SEwNR5{s)~3;W&2qc+2LWNh|NYEIKDExbB+t
z(gQaPAFi9b%cDTL?GVEq=91_??K2ObIiqPlQ95nc|6O4YZ3~jbkLN3Ivg_tA+_LUv
zMf!&)Q&P{L)6XcX+!}R<v!=GT_%v7fj^&(ra&ha0${FS77bGUB8ta&Byp>SC=0}Bf
zM&Y5S-!?oF-Ltvp`17XA=XtB{tje=vxv`$_<FU67nSI4K*lT6wm^&U#YVnDA@b>K1
zqL+sYPIU|Jij7GKF<mV2=v0@6{0s*p4gLMzceUJPe3TBdF5Byol9I~4>C-bGu6x4g
zk|%pB=zrC8*v772sZ#Xkxk1DfJ=Y^&kH|??@pY%qc|Kw8+@HQD9~@rvNqO}X_Lm81
z)s>z8CN~SF#~1B2n}2?3@RwFy9s3iHwD+CtzIE{Z^SW9`F}92b5c=`_;G|~(%@-u<
z8FYjnPFrU0!Kx5CYwg6U)-#K?@msvU8qmP7D&@VP8RMNvU3m%J-_~>K-aW8M!RW2u
z)TYfBxVn;GPbv!CFIcvGS>FPS_=T&qBUF_Zs#kc=x*`0=G5JeKLj8iX(mbILGHf(6
hJ5E-7d35ubzfwd?+oOVM#=u0%;OXk;vd$@?2>^R=gggKM

diff --git a/route/static/img/ico/ico-mkv.png b/route/static/img/ico/ico-mkv.png
deleted file mode 100755
index 00abc0be98406277e2b9e7c04d705cf8d03d2c85..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1247
zcmcJO=~Gh&6vbZviBQ65iEK@+f}v<fss;z4lttN;hzMzAP-@B`s4bN$ow8Pl3!+FP
zvKT-?h*gSPfTEEgn{0xF1W3rjngtRFFL_B`5`w1jTmOOnX70IjX72fNW^Q40R5;4k
z)fNB%)WL|581s()IO{FVN@rTs001I98czr{nM@P^L8(%iokSvmVR&_QRUi<UtzNHJ
zYcwK}NUc_bAgENDuT&5O$yMqOzVz;Z;ASU>^oo7H=^b}LLGI>CR-ik5yo`UCgEO)z
zIk>1ar!^B&MfQu)tkzKmPojq5H&YAg%_H{)1)y51)M(ALOw3pH^M7j@X`K+2_wsJ{
zOqO(WDgFF+^KzX|N9T%*yEtNn>h~6A?OWmfA>pOAvH4|H^Y}b%Y!1@GT3ELLLT!^`
zws^TqAicsE8<#A@I$gJLK>=xo=j0dZtUNk<Nu_x^E6aV!@~R!h{l#5^jY(~DfsH&o
zP55dK>XT~NOK{=PVqEKV8B0E+GTi4Vo(RBSyF|Ht5<jXr!bzgBch!&K9&i$A?EF{k
z#OG}P2cvtv!7_8Rsp&CMv4Hhuv8lYk+^k9dQT`9!oBB<rLA&AiEN_7w09f!3h6EEb
z5X+oXiGrXF>t^@wbBGfA<8T$-!+2fCp*Sc@(Xdx^Uj4yYyR)aw<O2rgV8|(CWWm+&
zuwEBuQLk!aNeYqVgp9B(hUz{QhhhhA93nfFZTWgf@DBtM<B?V7Q5&evwi>ewa_?-A
z$tV;GkH@3aeG&UQX004)&S{QPm!nqJ2To(rEuq{h$mXhh(0F05L+Q2tYR?TevByhr
zOkwGfU1eb&Rq6m~lM6MrTtAP^%{N$F$L@*ssv|#aC2Vd_YMMvlH$~@uUJ>68`?;ae
zG39!(0nu}YTknx~<Qdo)as2(hm<B>vPF~I2%X9UBe5JtcHF;;T9_VmOsPo!Ojd9(6
zmgy5nTpu}Y46(X(S$D=}DCtIf*QUqPN7?5a<76AMNs)2xUQ2Oq-+UX4-0fJ@b?ee+
zlimv_1v$buS24r2KNqbywidCx+})9g3m-x^Vnw*obEp@z)bTXrm4w4z@YPHsqoLtP
zMRxsTM8)$F<^f{3-7ju$pO$()|I+%5i;=T-q4`fgd*^7n0OR%*Qii*}{71$(A#cvk
zHR0@JkO%%|_jL?aWKr%1_h8Y*HI-BTw=SjIqKA@_AFi){y{3`i?b(@Vr-x5?&DmM`
zi-sX%>Itub;P}jT-xI9w)>aMDS#1I%^FB}*vo@6+ZkzSuS;VZhPkzLLBGNwI0CxH)
zQ8||9jK!#FEoBA~kQR2VU}MNubWoKzpeJk<+!|Ceb+J!N>>L=ga#Y+sR<N#;IehFB
z2DHsY%=oDrqRc$8n@Xv+ukYNnnI+BeR<;E7L{iBXPBr3_r@zPVj9&2^&)7Clw4?bf
z+-MUJOh;dHC+B40P(>aQ_mcB5gv0uL*H|a-;=lV%rIZv*f{<Tp0V1hKQyCb(wM@T8
zN-`{V8C-VzVzFgS)fJVbWMX`lHCB3xno{R-r|hl+9x*UDlITnWfIUX<(8j3kx6SVb
N91M*LdAgrS`WG7);6eZZ

diff --git a/route/static/img/ico/ico-mov.png b/route/static/img/ico/ico-mov.png
deleted file mode 100755
index 4ab1a5c3d8be7399fd2510f806d8c2fc9bdfbf21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1175
zcmb_bX-v}x9Q_xNS+3QvIHH_0Hd9V9$dryzj(`)PtAu0G*@;jM&TDcA0pto`bt<W%
zLlFt!2++}TiP)B-$RS99KLu$^ZzyeP|GmrE)o=T-k9&E)_wth8r<c4+OkA|1-99@2
z031)oL}D$D`Fy*rE!sO}^%4MJA(+^ND6`o-_b)(dwIxX;5`)38v9ZBsvn|nNGHG=>
zkw~P~YE>!~1X;e+8jVJ#($i-ZFQ}6H6k%}-@8&Dcyh#19Qz%jBp1u|5G;+s2DY+{e
zsZy`g>E;CLyw^*)O-t{l<yyUw!CJdj&#9$JR2l=MHR$#F&Iwufq^zn-^sG-j$x#`N
z#@;FUA00xmT$kOzt$8OQjjn2R#ya|PNh^O*qIuQ7-0?xCHyDL7?cH_(e^omGDrR_4
z^RTp!DF^w`;N02-TUFT1lSBIPMP>e9OXnVesZZJC94(~ZY#5S(LVXQYN*Y(JsMfhs
zV_}QnN-ejCsjTW*t{{uE8hHaOb@~%9wR*AiHHah5U#MOzX#$^hfW=K9z8bvug+^*=
z^YSfh+!?^ORBV1yZfVmj`z-%Aw#_4E^O(cLHiu5!0067{lac6z9GHT&D~pXmlnKJW
z3w}P@o1SiW^eEn3bBOR>qt2_nx#<yDaN+XORv$IrSiqo7@9-B)jE2kuXSRn|;S0fm
zv*%q00{9IGecgYvi?4{OQ^7t?PWk)z`1twx`TC~Z`QROQ<#EdqeA@A!JFP|Vje|n$
zE$Z=zfM?&##vyAW{AzB@Ts&NfSugYFJoifemXbi~Z^QbLlM%us|7$jh8Lh#H))ai(
zT})g2FQL3Zn0-*Um%Kd@A;eGF#O^(Ss++7|c;MWYm@x<_X3z<lB=lWpTmA{c{h0Qj
zF2V%IV*71^_i&Ltp2GwDW7%8UwCrmh1&`gX8Y`>^PP?0~jSd|!xka~bg)x6c?xtkj
zwCizj%Yz=`y&j_I*Lk&Srn?XMP?+-U+j;v_22VJgf~0{YFC)~I-$Wk?MZLqW4V}9|
zyiNT(WV{CD^rHO6+U=b8orR5He0b82f8q_E-8m)Ft8dC`b=mtf5a(E@mF3Gg3d1Q^
z-cEFNV*KVSymXb4Mess%9_f+AYx83v4vxam$?_1h;y5)Ax8ZJwVDpgW(Wvy7v{)xL
zrYH>k@z_4*3mTS;4;{gtZ}R`%MfrotW9!SER6gMZoOXC~7e5-iYW1lIQBg15t3owQ
z=NRav{=_Ou!UKV;4g+`|hNWO*ue-Da<n~)(8Y2k@(Mh;Vt%H2vwDV|GWt~0b5hVAX
zcIEF0!J*-OR!rimEyLSAAURc94}O&#-%AQgI{5Vh@r}E}lLcp;^_)*ro<i;?i>%8j
zLERBW&2<8sBbf^%N6Z9NoZ{R~pjNHhLs=`}@AUjT4^{}yQ}Xp4ps@N$tsovY8WW%D
aLI!}y$o)k~aj30jBEZS0xJXhsuJ|8|54}GC

diff --git a/route/static/img/ico/ico-mp4.png b/route/static/img/ico/ico-mp4.png
deleted file mode 100755
index 9dd90f5c46b84d8c31ea34820dc9cb1f67238e1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1147
zcmb_bcTm#@7!43s*yAV!DO76_ET{!bI2l(9DhEvirP|{4K%t<5IfjiCDkBIYR%C->
zQC6tq5E4LH4N0I%3_A?TA|Zj05HfyQB!)Ep*Sr4Pci;Ekz5Cu@@9w*efS<O3Kp`Ly
z$R_GcM4UkpAJ)Rez=Jc!k3b-!6Ns4jNWEUa_%BGLQiJ31cuJ*GqtVc4G=o*E)qq^S
zzP=6sfLJV+NDL{dOePbE75IhiKSp_Xu^jX>R(30Wd0kr7$Kh?un})c#os7wMJB&>k
ze@7vg%NN<w{4Qo5hB-1P1Qe?ACDFAuddputu}moelnRBSk0KbD64dms-yh~q(Zwp2
zYH&taiQ{mE^6MRp<`G`^n=P4K^%%cV@_cQTCu<$sz`YeHlq!w@sOVv@Z2<)8_B>1S
zWP(3DE2OSTh>Ic$O<eedC6p-0t2;OTWd2l5O>UxfkOUHimP`k_$=feycglOYo8sN(
zQ9hNUKy|WeUT!e>s={Y%!jd$jg^}7oO>SJh*+osNTfW%1T7se8$5GK3YFZ<8A_F{N
zX!G*5IQVxUvzuIf!!1Lbdcg<!zoFB=*6Sy&DLOj7P6GlNmqkT<6`yOgy;O>#CD@m;
z^J$qVST$~n;+&c~t;NUu7}(G_BkiCUR!g0t0Tzp<7c=jz1g(1RbAQy-hfH~jhlLtx
zPo-+^9B?&zSl0%vYy0>=<Ko<A{LsTv?y^RI|DH%BayXp%`5Mz#Bb@QGgV3C_4egO9
zj<!5b-0vT`+#CR|_4z`Sf(_<k-MqiS)L7Ifs)<u>=+gbsJP6&F=Xl5TlLCe8R8s%n
zc_xGhzbrkqSk!QNfS*$jBH0~ln{GHOW5!aB5lvP<uh7BfuJnIqJ?8Hb@%<*W19kz_
zjaw-PyGOd%BT3+xOsBc4*;aA;tdTjd!xK>|CHvevHtHVCp3W`SmxY9&Sy|&`JFrJ8
z+AH0=EA#Dauesf?F2<99l}hAhCn7jD8*`^S^GAD9>}smK(mBy0XtrG<EluO6WV7q9
zc<xlRQ-n7du}p3jKjioH8Bzd7cet~_aVTy+1ZUnm;U00F<R|aI(|#!7W09HReW2Qd
zsM+(kI=Pu%$aII(Iko-gtt~l~&x0H?@NnjZOZKYEVf5X!nJtFNf(lWzviD_h2<Mnq
z{&V(983YWuIIz{YD6g*w1%ex7T}M0)Y0dXc^u>iv>NYs~1-ZaX-5W9lOL8qQKJ>u$
zz}+Rvi0)jKB`G$a60{KDvprz_=2P>pW0|P<4bxbw!^ouR<HI7vE5gaaOS54F+uz2A
zjt03V_~+q{^vqLiP$_10%3X58ZO=MiCqFZ-+UNL?a}{)I*$L}=1_JX!Xuw%7Q0V#g
z`fsZahPDPGykYPfYT#ZGfW_nrvAQCy!;Ixba=7m5M`5+lCO)Y$!SDv4s7QE3_sJym
EKkU=D-T(jq

diff --git a/route/static/img/ico/ico-mpeg.png b/route/static/img/ico/ico-mpeg.png
deleted file mode 100755
index c092f67ed40c3ee6d907ac8d2f2a09485b8feecf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1177
zcmb_bc`%y^9R1>!Vq@BFcU#mkYql+6QEFKgWzf|$n;Nvcy7Z9kXepzpxQe3GqU)$t
zia~1-H|q#daZ@RuV<jXKQIe4JOHx-h{cmUX-+l9b@6DU}{q<(vGYr~O7k&~B0D!Ky
zmpfMJn9rxBs?_comDd0ObHe!edMFf%`F}wm6e<&&&6Y}~ySuwoDpeWfa=BO{VX;_Z
zv6#>23k1q9p-3d+@S%Y@UKx>{)5=V#r$<)O7Foi)b|#xAdD*ibTeC9$_s+^k(dG^$
zkx1s(g!nhBakZ;`AGl&jMqb#Cs-l(mv-u*aKrDqIsC|mlIn8;|!7AxppQiC;GFkTw
z_xCpDI#&`?y;9o8CX8)~B(jQujnoFlGFwzh+Gv~PKvEf#BhG4GV{C~BLEbD~P&d5U
zOW}eH!MpkGDJnmyj?NW86U#dZZ&w5J!P_sXnJw!AXzwHc)BW<57hM}Gn=--#FS>?a
zJ;W&`ZVoO8Curg>$_~hclIqt&ion~&%V}@Gpn}C)#mlL+U`ZR8QVZgW!TBDedS#pU
zqOj;|fJWN7q9{Yzrh@ZX{%;&8Miq*2ov8!bK*25ms8oBqqkLmwyan}WDhBa%&FzB2
ztFi8o5V)-^PEmR$dqgC}mq+fMwn@BoZ*{+ym>^3e_kTEKEXm2$kIb$e3~y;KIoQno
zYA|Tcs6IAdaSZwoJ1P*z89c8FKJ5MUjFp9j1rmw0w7i}?c@BNQu>L#TUB?^ksx0l@
zZ<yF9qT?m&64N=fdFdr&X~gWEv(GS}o?6jfnFM^>>PsLsVv#KY2&TVPxSC&Rg9D=B
zI<7Gb(|Gl!3*82G<b0<Ix7iQD#LcMrd}-!fF<rHkd$iFn^c}#PMfpA=pt6o?Fuu>u
z@oN6*4s6Zdhot79zhd5HJUqy-kJ%UBjR`-USZEj~%Tyh_Vk8eA8#0p{dN%C4Qi9F3
zTB9T3T{?z%K_1Q|&w1b>y<A8!vS>Nuy7NoV;*lSv#@gDg<^#S26PchRp>|-@#kmi=
zJro#G@R-=-G*RlTSC$d6{Wx}{J*ft~>gIp>Pn^`aGd6WI?60TgV9Y5zB5*;MpOGHa
zO4f_xHWwJ^ksnwxe+z4k&Ne~O@*(q-?Zt5?9bKl&bcU0H=Sai{?Ha)mRJwVFr*p{b
zejhz5=7}rnz5Pi_SwFS~=Q4^tl+>u=_r5sPR2T{_%B#>RO%sVodA@JYWy)6?Pk?w2
z8_+9|pOmJ{<D;Fd=HvCX7(PvoaMOSZvF=&Z;N)R-Q%;9H#uIM3=3{37UE$sc{sZ}S
zmaP}<CMmPx1d0tzD#{9*NCav`Ix6>VC_8MjC>^r{n_G@k>pqv2H$qA-*o5J2k2^ap
zS~^76#Rn~0O@?A9)M0HnhNv;~fTd<@7p3W97k#29mtj3y`Fu$A!t|tmc*&yX!@Zy5
j(l4qToBfazOjZG+3QuiyoY(VLjs)=bK)Vy%f>Qngf%UtX

diff --git a/route/static/img/ico/ico-mpg.png b/route/static/img/ico/ico-mpg.png
deleted file mode 100755
index 4cc52b6fe7b11259e0a05f5340197394903c254b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1168
zcmb_bdobGv9RCGD5s%%iqsGwg`cRJ>(+qc=l$Lg!SKDkP3}wnKn_3e!i-vmjC_T?c
zjm>k^D<o6#DxJ{~Djv&|NR&|dCBHmPo2CElZvXCcpYP{$pS$m0pSw?Sc-SR`*)cN!
z01zR;fsuL-e|M&adL3dK{0smvzwj@jgLFFG^1lGeWcnl)i&ZMs!NCEC!_h~LMgu7n
zo12>u1WBb*5Y&Ik<Z`)0svKL|dpsg8?H7_d1sP4;)lFIXfKa@rsC_CTwD4yB+ULEJ
zZ|^G=3dQn<EW3?=r<G4%+=Z0tsg>86zi=By#ZtKngj7nUa)2SB&Pg5)Zq^Np=D1R|
zT0O+vEu#oUy9#_Wk4zVL|G6Vqs2j(&^19a9VtLc}7UhLRsZt9iP)YB``VKU~+IuMg
zJDzV3FYL0`!Dq{_85}9GL$C`fXW9EX?R-oHE3uXXD*rC(6QwusZnp?#xe#q(pCwe1
zN4A?MCA@7lv2$Z$MfOUn?VjCxNZU%TW+m3J^V?YQm8%Ig?7UW19fd_|Wu?@x9DH&8
z`ZiNDBg3Kq<9v~>x=`PyPV!FvZ@ke>>vS^~j5pk|$^!r}Acq77L=#{MwnMoU#dhO2
zF-|l~qX1iX)3(XtdLOT-+B(@=T9)l10mEO`czp6xLTWOX>|ixN=W*8e9K{<Oi_OjU
za@~AxcLMf7OS^GPyUBkDzt;|2PjLw~jE#vCtgWqaxm-3o1EAsQEO&eqf1dhfrs0xZ
z!Ht)ZijhyRc#@Ap*d{cp0}aZP-0!2sr9|$dkI^0d*Kp%K5j}lh*$9a}>2RNzbiDNw
zPI6~4dgMHIh)aRFx~ZJ)d#~CE<Cw;bYY4}Ml&gEw_pm**c$nqRL^L_OTu6fd&b&Eo
zdi%F7C;nYT?S?bML2epZZ{Y}?@Q({)&fBaYH)KUf8-G!drhraItqp!HK1p&kk0^ga
zj?uioJ(O2NzkgTsCQqj-tJ#k)#lYmE#W5`UmPtr(xtq2n1Cdprd+c?-G>4#VW*4>z
zPeIyPe5F;EgP+wB8v@I;;N?`oRClGnlpFA&48DaW<X5op_IT?HR5xj1bv*SC*hTx^
z>QH0h;0@%X!t@ar=c04{yr2QdM_VxE#D@+E=FA2T&1y@~1blz!_1TX?ibjdcKo*!8
zoynjs=Dt-_UCDv`s?6Iw95ln2JC`i2jSM{N?Vr9Vp-220AtjQ|CNUaAlN*DZh?HO%
z;!Kc-hV;NNt~YJp5|yX}TuQu6`%H>Yha4h7)Q<0W!IMeh^2^{wT$Q1`J#E~&sIdQ}
zDgRly`g8U%&(>Q=Z+Nh+{b-Yn5$IZS{V0-}dpv5QNZ6LN;Iz7$+tsJdMwKmyI$S5d
z8OeXoDD^ZV?uc(-4xE`5b%bP=2`9Q!@x;6(i_p0x#9{2pQ5<IU+jZ(km<!XRIsR1K
XsTq5Jbixl^`fUIqL1BU2sCd#pwFtWm

diff --git a/route/static/img/ico/ico-pdf.png b/route/static/img/ico/ico-pdf.png
deleted file mode 100755
index 2dbcafb3806951dbb7b46275b5687ba48268bd0a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1086
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPVEzz!(<b6XN>+|NpB<;KRp{K;F}*
zPrrTp_UqTL+qZ86xj%mV`26L|<HwIbfByXb{re9efT})z`t<4Jg)8?Gi(akV{G@f#
zozRTOwLPD%+<1^x{q4=WFJHcV|M2liWB=Eu&!03;{QC9lql&isY31KPeSUxF<m39@
zSIalPT(stHbne%eufBi({vfC3+v_*?;tSsHJa8|m<Zf*K*XJ)EmNdWFy!-X)E#JR<
zeOS=&w0+8*@T^bQZ@<~P_i5*}*K4=E-F@igf>occ-g>oU?d$bBUd&nkeA=Q9XD<Hu
z_U&o+^l$GzJex50eoEP+vetJ8jz6EW;KQl&cO$c(_0Ifo;@r!5E51B@^5y=c$JJf$
z_8xw_ec!8P>tD=Rd_SY|VNv6k$4_s@<lT+Qd%a-wpZ6cXUAq3bvg7@hJx`k_{<wYr
z?dmOGPMrJo^u^2Ri*BZt-DvK=9g}yXsqgxXg*O`eZl;x+PIz(;7|=x}L4LsuY%Ndz
zPiqGT^#4~Nf`;Jl@&6}z&ioBLzhM>w1Cy$!i(^Oy<CAl(yiSe+Y>7{H?tcC7uXu;`
zpXqPfG=dLIpZO>M^39lq%aZ~w^G=?Vlz7ohrmCyk_2|O}HG!WBKqPikK?ux%a6x3`
zg5@?}xi9cH8SpID=z2VZNi9=N^khQZ6j7o4dH#%-Z)M5^NYAsJ&s666{=u#8>p}+>
zO2~RXda-q_f~?*gH??^-TrZZKzItn73Wp*O*AC5Xoyy|8LOZNCnDIyO9Y_#p&^PE`
zy)yUqwzuE@9gldOIPuH;h<FK}hu2%KIw;>g5Wk44!^7a$@)b-~NnakXU(rygHc8Xd
z;O(gkY8>~BW}h}zU>EDsoYJM^-S{nu)nV$<SppI1k5e-y=?Y$u+Pt?n_tLdW-_^Hw
zGo9Jgc&yg`(EHB2&r1#-j7_n4<lXex??E4%b;A5FFR!z#y)3@^#pm;H)_d3I?2Gu;
zaLj@K%#jm;wV8jv9Zs>3(+@knm2bz*N#(oc>N<ra=1;!E9Q2^^XmSp>p@H}IjYju7
z8e?}kRm&-`E%U#a_hHUt=E%%*@AU+jojr|iw#sx|xR-r2cy~(S0Rs-!fVM=AX`Q<h
ze#>WBZ2$JZDz53U^T(F9_rh|AoGUoI4R&r|`ox!bHzw11_RE#4v)bHSr+4%&KFRae
z!<TP^ld$pR#Ir5hYo3WYzSvf?RQ_(}A^oEq;!||neQrPE+P%z8bX~Id$Ch`A_Z9DG
sDM)+XtYmHCo}@HYk1<2_<ozPHto1>cUwxit3QVpHp00i_>zopr05>L$+W-In

diff --git a/route/static/img/ico/ico-php.png b/route/static/img/ico/ico-php.png
deleted file mode 100755
index 7145c652fdac3f15c2ac09c7e4a15d55d79531fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1318
zcmcgr`&W_&0R5CjnB{1#tu$P(9m~>jaxLe!(oC(RIUg;z)J0{srq<?Tl9?VK<SaDN
z29cR>v{2MEqN$0GEJ#8PCFS9RhajlH$M@kY8U5B@uzSwE_uO;tZ};5Xpg_NMYwXtm
z0I=@Z(IX)i4|-1&!lF<4)};Vol^7Io!pCej4}AcgUT;YXg#w1*#l=ODNMwog^Yft5
zD3i%R5S*Kv)9EZNy}@8G8jUl0xKA|8c%i!0JaMCOJmaDC^8L~4^<%f0lg(W9z?e=4
z!Vm<t_G=0sPj(M!LCDn7r%tL6(YlnK0<A=87*~O?Y5uKD|7=iG$yQvc61NR#-i+%q
z>C%*Hv1}R?DGbS#;vB}<Q~tEUXsYX-iZ2uWSvqPmnI7~^DKtj%lgTEIiqtZZ+b~XS
z8fU$pPOFtbut}qX@*hnMPwJ&phI?)Dp5d9AZYBNsRQdyHuW*LRn=bEA+;5j>*Nv%W
zjOtm4!jkn%=SrU`QfZP|1FX~<8(yl4TjkV$W$ZWF#B$MV@f>GlwyIMZNfMm9Bl^2Z
zu7j4Q<`#<ERaM>7e^rk$xLU3lOs7vg>7R`z3(iqSvugyn+rqPy(JY#P+APSV2`*3s
z*h9k)Ei<Ghh6IKJ$ZWZpoMV~6JpEq&2fQ=CFq=7R``*bSB6a|Pwc^+juM>DHc^_fD
zH5Nd4R?RZa4_V#?5kD?irRh7!^vClhJ>`SFD*^7`r))@b+V1FsJABh`U(b%sU8Ii(
zUgqHB-dMx7O$%sZD$3V6V6vBprG&)9)k9JanizoU1u0I1GXif46-^9(t#bCd;s#Xy
z5y_YQhS!&MN?x&A9bA`AAGQ@3_D~ZxUOO0$r@zXI(Kr-e_m6jQY~b_#R;?ILh9Uej
zSIV}9NAFrDxr1axH>p;h|GfUAf|d|9(Vwd<e7p1|8nygr?VYb`RW4`fZNb6&A=3P-
zeYoQTM@w!Q4&1GGhgW_^#?l*~cbsP~JShzS?u*>htFlJlnT_zMxm5nl?%<~#NOEyb
z%(5`pjc4|7Wpdvx+2bohSA^757#w7{^%vR%2|KS0AMGT#=H+2GHPK_j(AXp;il~mB
z_~!CuqGo59b5un#dMI-FS8)B=eD>-%E3xV`W(#2?MZT3=bf0=W0q&nc5uMjIR{Ej#
zcqul!-jGAqZBo9YFD8Sx3crH99bV#xVb^<|io`V>KosY*z2mG{dpxfeB~@=7u5q!g
z8{v`dFc}C5z@f#z=pMF}25(|EV3RK8Me^Bs$b5Eg0M1{%8bd4Zuwi9wf%~HMj}dq7
zx?2|sJqY?;oHmVP5LJ-Gtq6^D!esP7OkW=R<S!Uyef#cww}Om7k2kxSm+Yv*ZwG)H
z96pTjNog#-OwxF+ppxk8kamze=CC^<I{`ho@%(|ku_bX)KW*-6_4J^)aQ@*`*V!f3
zop6;Eo}yr+wq2(hox_L5?cI@aNltkiWXDt70_}@jOEo!%eDY|hvLE6-aa)nrxb$LZ
z<W|EBOw8RsustICP&4ZDayqXa{rg}R`r>L^K+SN8^1RxXPGIq_J&KuN(01<6w&Jv-
z-L<Fj$qGbrm?O7F%jz(MinkNb*7|Ib*c5%8Wgm4h&1o-}J5=U;b0~HMShTq};(dYC
QV>uph%qQ>&<1jAsKezKCz5oCK

diff --git a/route/static/img/ico/ico-png.png b/route/static/img/ico/ico-png.png
deleted file mode 100755
index f39804a9c0700773f848981e3ea7c646c9efcf20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1023
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPVEzz-Sua6XN>+|NpB<;KRp{K;F}*
zPrrTp_UqTL+qZ86xj%mV`26L|<HwIbfByXb{re9efT})z`t<3`moLX2UryWI>$kD`
z$fHY9+gf6_w|@Ql_1%|`C!SnA^zg#>@83%fP7m5#ci`dqoP86QUEA~F>!%gh_g;B<
zZ{DSCMF*x<9iIK<!^?YbpVl3nH|5;AXCGgOZD~x}*|p^Au1hcOy!iO0>(ufy&u%Qb
zvh&l|FSlMldiCjD#MY*L56+eynh~<4zF_~98?PTceE0m?tNVHTCik6Lwczshj6Ho@
z?i`zSar2)0XSUrrzUB5Y|BW?qJK9tC_U0d$^6}@_E%#2Gdv&|>^zz0N3m0GCU4CTN
z-bd%IzkRs+*1`K9UmSgQ<;B-`6VI=kb$Ltf{z-WUCU+iPlDTg}$I&HoPj2iuvN(VL
zWba1F&A@O>FA4GsW?*Z1@_$-8FdYBC0ufXOfBzr<f0F0S-{zaeHy9Y0ggjjwLn;`P
zBz87T?36s9Wt(6r%$g`+*YWx2iW}Q<i~pbgX?WQ@{l=Pd#`CUIJ*%JHckI5Jc74vt
zkGo%NajaIm{(cc>mBVg<n+}Sb8l6&@TTifYP2?3(lGkvt3+Sj>AYkdR{iU<ag5$5h
z{;a9nZ!f^Hp~2}1^FzUT?VK(bz8|X;IT$b_h1<R5$2-=k2Q)NAnnV7~7w0)9dVnQR
z$Y^PYkp9R0%b8kYI{6iHK33d0#=>>+7`M_|IiIvmGnXiJY>6^(`F~oo$zwIk=Maa+
zPp1?@nj*Cpc|_V7_^VE_$d?eTKf$Urb)gSe&{Ho{w}(+H^BDdFEcOh#88(}-r)0(L
z*UZf)CTQfy$fRc49IU=<BgvLt9Q7cya3#MF@8>O1;bsg`R}Qytt2%IZ-V(mu%2#>T
z`)0W=FP6O_8}9Nu=f1&?McpPXk5sMpA2RSTuQ_93!D3u7omn}`(Z*w;#+JsF%lCZu
z$z(D8zCG5;F;Sqc$>5H#)#Mp>w}$QgFX**K*L7PG6VuuAb_dw|mo%{IBrvXLT>Yd^
zL1;I_lW7bp*$iD$2Gf>YR(Iq-5bS*E?E<cKZJ8_1H)rTBSzO<^&9rc`qTrS$t)@1n
z=#}cxEaC_IYUjCceDUJ`g8tQ3^+sj_O|n~Ws?TLKQ9Savxzl+vqs#gA`IDJj{?@!%
z_K#J@O~sUt{exYv=e;i$4WBoKajrdG^ZWL^?i8Ug;rdo!dSqbmboFyt=akR{0Eq!j
AO#lD@

diff --git a/route/static/img/ico/ico-pptx.png b/route/static/img/ico/ico-pptx.png
deleted file mode 100755
index f1be14b5c516e58f5cb4994f944143f54b44605f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1127
zcmV-t1ep7YP)<h;3K|Lk000e1NJLTq002+`002-31^@s6juG;$000CoNkl<ZcmeF#
zMY=0D5C!0jvX;!UfNUVsa3*19nuM8|nVFfHnVHet2DMt?=Rn1$ed{vlS&wAb;25e)
zhX0eAwjv@)L<B(qw_w0;zWHYBVa^_=G7L>hRGweEsQ}NbR;%QkqrqS>5dq*&KmEjr
z8y&C(yneqwF#%v<Ogv&B;6&juAZB7Dq5#Gt3Sc~<0LCK<U?iddMj{GeB%%PuAqrpw
z;>HK;JaGxtFWfOGt(y*`{G+F-Z_P#p{Ohm3fVf^s0+7?Z?m#lXe74a5i=v=juUAGX
zHJd!oXQQ>|Y+gVP<E++We*J=4w;VO<y<}G^e)u5x^Yg4my3-=7^BBa00Xg1L`{8rS
z-o}-ClIu1WB5O6os#CA=7j-JX&enVNKgnq|L~NGZy){9IYv7?LEkMK@O|9FHEBn=(
z_s+ojAzFo0vqGkqk;}VF00--Q8Jl-YV57QgewQ%@c+0{eNdh8RzUXh=e8dRVS}HnC
z>Kn~j5fEAD44H05MXw!%xDp<=B?;&YHCo1(?#?x!g#j{R-<M0;YPII~S!)@O;Skgl
z1=L+Wn2ZgGV0WOJRqO(S5EtVm3uvo9mHo}@51Og@u>g^x(;^cv3lZlW!y$N|CZKxj
z{<6RG<Yjyi85?kPbZ&8PFe09l1oWz1p2DEt{QSwN?(CX?s|Cv#eWCH*rwNFCR(9_x
zWpDfb)8@9>Vr9UM6d)!AXny+&r!9OrH+K^49KhlLBM`SJz>s8jpFl3F@V;-^*@x(?
z2E>5;7W3QF0mSUnU%WE^vX1e_j@OF1wLd2YFt{Hlzoyp)LR3sI!?p4B0h+u=d9xY|
zh|j=hO&=ikeOP){b;iZRSbPRPYx)3r7UKNPkAa6VDsJ|r4~XCj0!Le~)%qMbFov%_
zrW+8^-3+H9d^>Bk;JO#R7=y6_$nn<9+)%CZ4OK=fU!#U?=yAqii~uedlPgm5Zs{X<
zt+E=nabNm?=|=$LBY*-ZfO*!~Vj?q8maqU$a0E~Q1yGK{G6Mxr00mG01yBG5Pyhu`
z00mG01yBHgKWZELT@nd++_ux4WB~=Re)T@|Po6Ewp!q9h_nsKkgK%x7xbNR7`~N&?
zy9M8mdjIz?sB-r9X#?VUe%*fl0_yl<K|S;9sC6DacR{Uo@h)XOf9-azp$9c=<J!ak
z@*l?R3h7xBkiqzKcx>;vs{((k0M1{sct%hQh%Dj7=)830Ai_PNfX!Qu<nb6gVKXqI
zCj<~jV4xT8J&csE!;iiKI3EpROaTl4#ByD{Y|*m<Hb(&Yz_H?N!-44k0p&nu4_pA=
zFE{=BpjdANcjff{gTjF90K79H;rN3>ZID4DGVnltzuO;olI#Gyy{L`{Xuz5K73P0O
t+7K4V&mg~p!eH1Q1wVS0{%8P>VgMu<$j`AZGUosQ002ovPDHLkV1n8p5WoNc

diff --git a/route/static/img/ico/ico-psd.png b/route/static/img/ico/ico-psd.png
deleted file mode 100755
index f25968f4815573643150468b7919a415d5db4c4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1119
zcmcJN`A?b$7{^~;j~LO_#kF(VL}%N~*~Va(IoDCGtGarQShUW?#a6Ly#>S(pRjW~~
zSG890+>D)CN46SlJ&Gt=MHcWrUgS_vKtKgVt`|@@W%RfG1N$V;=gBvDe){IA#>9T(
z?C9<Y0DyDEjnFvj#=IK`8>>f_z~2A>fx|>&!z>mH=Rat5I%|^4<tCHq=;%lw5Ln~E
z!GQsWrBbQEV9;nZTCMd;r`PLY7|!mWFQ6>dOmIjGn^c~3YftxlMzC)%TG>=-i>S*b
zBP&X+p?->6N9QhXsYZFSj_Gx?*(_FR38RqFWY!x^2BQf-w5WxRlY;Gvadz>@3WY2E
zd1z6kgUe`8?!dy+NzRkEtBnkvK%uF6yUO3$m#TGa`QB?tGA-Kum9@qY?hLMO4X`Cs
z!tG_Ls&`pLWbihWnm3%S1&Ok7c)1S})A+LX>Gkq4Hg{XyIV;@O=)32HZOpaizxd;8
z@|Q~@wH`K^&3S_h<P|Y<b9Yv(@b88`Bk@$GznfQ-(fvZQKr<@QLn>4C+-?z59^AXe
z+=kO=5|Qq(i>pqgZ069VS4mL%0Q+*!YT5w1jK;P)m;}Y9qLtR(AKZ_Ny$RSqmRVXV
zt-V{6@AQ9j%(Bcl%^&aKNDKe~FGqxiU>_o6^X2b@{vX(4WWw%1#YD95_AhBW&o(cL
zW0;v&+V3iI&z`}>e=_Hero^}UsdR1l=)|&yQ}pS|6xnq&@ng3`m)b`T;X$_NJhvJg
zEBDGn{}>8jCT4czc}t3#kYC{~O&ETDo&t-d27ceiZC6j|jt;5Xd&8Q}?4z+$Ig*Ct
zf*Z9yRoy6b?IQd*OF&uR^DW+YXrt@LCw7m@3w8DBQBfTyAL{6?2t;#f_&>sdB=Qeu
zz%B@ad#RTkrlOI>Grmsi8LYhbb{=&5>~?#Y^T&dSCneHeABO@rTNlU1hK$-;n)b^O
zREVcI5+Z{20jP7xeH2pG#!9UN&(pnm#%tBMvGWL$Yr5ygX#kOcqqqJPAiVV~boM&X
zcvzvvkAIXIS$cr|J*;BkrKA+|W}_$IbF>QvKXgB{!U0_LW7ORyWW#(<->T$<3ec4N
z>I<QVeZ~_wj=D6mWaDJB%A01q(C5_jH+Gc-X4&S8)<%$^_|>0&?((S9C@-HTFxDP>
z%?>+xQ4v(eBgTMZ`FnNP(a8|Np5Rl!3C6SbJ%uk`b9OUtojvgS^kEgTNiRyVABc=0
zLpKR-rD%d(+I(MeGtapvBh{ugNq*&?S1zS~hL~Pl`lEXdhzq}9u`Roh=EEzT*`WL0
zwHZ`iUG`|>WOaIG(XkVy-?@5BI}(#D<o;ndmI*0T`#(LFAkpNWp-ay}OhVEW>J9>E
X$%_BBwq+BtJ}?jw78~04bqe8MDe$uV

diff --git a/route/static/img/ico/ico-rm.png b/route/static/img/ico/ico-rm.png
deleted file mode 100755
index e4cb6ca3eaeb1cb9d4c06c6ce8b85bd3836c8cdc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1129
zcmb_ado-H|9R1P=j#ky_svhH@?bg$Wu58%Y9LC11=GE4U$aG{nJ4PL1rk)Mf!|3r2
z#*XK-s31~FJv%KS)aTLUOF|w*XkK4lw0ukd+dunn_uSvT=brQX>z-R29Q38BiM0s;
z0Hy){zM*;#etX7fy;7Nn{r~`!NATC-eh7jr{R?u1LZ3t;kw&B0+uLKa+4`u{>0p&g
zAP~SXER)IPa{ZS=sZ>g2>XF5r2D+%EkDu4YOKFBy1d6hLzGz2P^H@k|<vf2W<!ma&
zQngB@T3T0RwsU`J<I)zkVYPO0`BmzlP~#JkOsSE>8ns&8&yWnxO70H`YKMihkW8!9
zQkmPOWWI1)mEOW3(L~+Pwv;Mu)5u2tgEf{&**v;Io{^|ETD}DSt#^HG3myY^Uhw3d
zPsPLY+u)jfeCZW~Ez9oYZOhfuENNB;H@Y0WS;LmAUr$4DVk4*Mk#JMCd!Mqw5o=o}
zB-vf-lzAzME*@J}bWiW3wemo|I=%|LS<NbF2XPfEvDK{nHn5fq=Cy(NYH+4<)<WNA
zLTYGG7+_c+M5+q)Z6cDl@_%C=nL?1~M;QCiNW~ri97+xF^$sVXVlAmT<;7N`x1#MS
zM-99!os8QjitAln!fI+22b2uU1wu4;Nq5QlPHaLvM6xxTo4s`56F2gQ*eGmHrptN3
zQ>)XclXp9e{)3q7c*iT~sK^-J>gp;4K`d4ZKuM>8PU&IXxxsH!(Ti5ZxEG-+`bU8u
zkWRta<_Mq82)Ximr+X2il5D8%OhjkjwWQIWke)|3%=y_pi5S<&#Pnki+3{V)5p*vs
z6(Xa~U(`6*^j<aR$1n{U*G%o^@mF`I?qYi=IMmUtv2apm89xs*#Jn|Soc7lPdv302
z&AJ1_R%sksf5Z+x?HLoqoHJi`Usn{ln|liVbVM4>XLaB^(ffIJheOI9k|K2{#MJz1
z+Pz%iem<fpt(M|SqESlW!U#6vwo!n8*+oTbnrQ|RX>jo>$s+8wunODxXW`wb^a`^K
zTMx5E7A!B_m4B7Mo9wReltJF_Dli*ZLP5DI-3EW`^TD5_g&N%8->5HadaJG&@(1GF
z>k1R;jt)g`eH_1j*majUY0rh<5DqgN*%Y%4UNeyV#^vK*`DC3sDaD;=VsI{Ha3SYF
zRT-ECdsM!5%i8jODNEZNC+1ob$A5OCZH``s4~~N;lMOJ#kk{Egp_k4GS^Flpc*wG#
z_j>L-&K9LKOm*mc=-W?BVx0X?4BbHcHe42)A{XM$HQ{@kEuLkaGP0W4b!Q^ojJvpw
z36wGsLybxrcdW6tf4m1QRDQOC`tkT^ea8|ikZ0F)CckU!PEJSj@1x0e4nH(j8Ank*
fHSbT_-oksJ8QIn$bfa+}{pf)JzaZakA6(u)g`BQs

diff --git a/route/static/img/ico/ico-rmvb.png b/route/static/img/ico/ico-rmvb.png
deleted file mode 100755
index 5b9805a017cb4021fc1b92efa72b87bc1dd03f98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1209
zcmb_bc}&v>7;T}TpmnHJqXNnT%;3C08P|jo*klmwDw%U^rWDJDLQ)XR;W%tDR0wVm
zDY8mcpfF(611nT21%U~r+B#Zvv;}(6lU~0b$l-7Gza{&3FW>iGUh@6*UcT$7v@hY_
zyS*V02t4^@BHE>>54+Lb#Vo$t9S8&(gGx<L0zpvpFPJSBms6=!4u@l9WkoC&yX^Av
zGGMbQ6bb+UOeT}r?7Fg8tyZ1M&Y3o}JX6&@k`sI83+_qYC@jA|ma7c5TThk6bm`>Z
zMycAWG1_f5n@DE4(m7Y!F~@$b2kg$VnWe&332jJavO3Iw!)~`f=INfi)HN^_&4bF9
z5|h*EWbySk`s7Nzt*Bi}WvdtyTC2@@m$OLvV_{Zhy*IqrH>I;XoN^sd^FX$s1xAF1
zzvj(d<C;N%UbtX>E?VM=O%+}9db6E7Yb^VH?uU9|)-AEwzRHyVxil&Hp;B#n*U-Nx
z)i~QnbwatFK%cMZk@X9V)MuKJ84H7J$fgLhnr5pyg_xUfuuZe14q<bjkk}#ou}KKQ
zVx+D#a|+REry-tIN{~|RN)yz5p#K}|;0q9(+{{~-aBi+ZAZ}yHiOBR~sA0yVKoReA
zO?C}`F0vlr@qDwh*<c<eDUTJ~Mv$!>4lBoYan?9x>y9$+kXE+9Gf3E%Pj4C>ACG$b
z8S~ipw-fyE=V~sXYD)hz-=WCf_>xdT<Zz=%#AGsE71h<jH{mZ$CFfp>k>%!nQA@yt
zC2`WxHH?1j#*XmwGn1-K`<0i{D7^Nq-2;y5jH9p=+&A6F2SnWnN=m|-9#J=3N_x42
z$fV{9w{`<l2X@4SV7f*Qo&P-ItAw?s=1Ofr)rP{eJ67`<(^}rH%Ccy3_oV;H{8tbO
zj)m}g!u>Q*Li4&MKhY{yL)#;F$13Y9hWzf_etw@YHVVxT8sLY6@RD*UXNugo*DIRm
zfs9}<WR$k7k7z&$tf9ZiDBeR8lMqilCfcqzOEbp<f&!5d$|mk{rPq4`*AVHDy(3-N
z8&KQEdvRL&^_&`~iA}x0AKjC^et=$rc#3|+ez+lj_>)BEnEU4TA@N(1rZ1;B?ig$u
z;W+Z`FO7w<KKwdz8;k#EIF?u(NX>)A<TV^7!{x`P`gei`R(VO51L5sc4Te+~vDI<!
zQ@2#3uEr<7ir6h^84A08syrm@y^ZdU+m3fj8@{7@?SUQJ=i?!m!>biOP6-IZos^!{
zt)AIt$ZUeqY5?E%=Rb#&eFKw`DU2fzyp6@-Zhm_U;sY|Y(ZrtyTCWA0rl}!;=pMdD
z7n7Y3a4_>=RMm3FpnK3g0O>z+V^?QP%GHbTZZU$ux=XB$qbmmQw**^H^#1lLYSj1C
zW&$O2zo$R({E1#v=|O%*W@D;n@NMJ(bTS@CRAzWizL`Bbf!1pSj<GNYwrMKymGF<t
z`f({NOs_j>8*vNDt-*MRUb@||A(ShKgTBZ)WLeB9abt+fLnnrM&+MdLEG+T6$eOCS
Q?0O<da#C6%BLPGF2kL#$VE_OC

diff --git a/route/static/img/ico/ico-rocket.gif b/route/static/img/ico/ico-rocket.gif
deleted file mode 100755
index 470b2e1c56eedad9c3ea28053f7de3d6e1a16dbd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1079
zcmc)I?@tqV90&04^{(w*uRX2@wpA#$lnF|4uAsu9v1qFp39FPejUfa(W_VysXLw+k
zF$X7s)0om!#^guPx=o0<HUk3<X`sUfD`_fg2<Zqx(lmrM4Pk^4vInj%b5HkhpFiN0
z_xqjCg^TCQ%CG9cDey-Yh;79psYq%swYI&sytO=?m|jRNZ2!5vxwpBoyRo&mHMcRh
zvb7RQhWrVCI2m5wS)YhcjIE75i9H#L4ZU1@d4J)4ayPlSx%hnL`K{2crOl<#Mkufz
zNbRPaQD@I$PhuxAvN96iiO09&Q;Dh7?bX@!*_OE$`<&e#wBHEcxE{RTJllLNaLpF5
zHBL7+OgGf~>#ct475^2>l%;N}u6C-{<TKUyYN{uyqp4^l8JSPc2RDMj^`I~A^Q?NF
zEkAp@{B$rjIJh*}ztrEm*y~z!xuPyd)bU{90k^<$5w0`R*%9ez3%9Xh_D=ZD?fKiS
z^R2C+)}}xc`2SA*9<MRhna@?4jJl)8U?`nLy@&7#kOj0PzySpg0U&(OWVN&H1a!BH
z6MR;z;T-CcGTI_^bRD6OAE!U>WzW)m19ZU<`dz>K=+HU0$D{B4)GbpICU>Dj;8s=~
ztU@a3a+3Q|RpBWEwKT!`DlU63@o6JhOe-Ru8YOM!bTQm}T1FRf17)WR%w}BgwsfH<
zJ?GC9s64j(KB(vdVJ)U!Fdbj~QgpMcbf(Xa$TAIh&Tl3t0iV2l;skjU!rzExzJ?U_
z3jT(06%S07s)zHmhfC^DeRbII_N>+1G+woLPsA6LTDU$+W9+ewx6F|59$WdMant16
zZkwjVRF=yOU)6UbO0A`8&7$wl$jLMJ*;Nm@H#J@D45McXUv=gi9-^;zn>!u6(lb(C
zrT%AO@a~asfe!iou|O;`c(tz$DEwvl*OTuamGBX)I{(-URRCoCkfCB4L#6G%ay;n6
z&KQy2TPp{J009~4olBSlfR(XeKcG0py-y%2yFju}oRK5V7b|cK1p-t=B0_*2Vo43l
zle6D@*tUNh_@k4Vc8tscggPh_OEXp3)c!05CC!5<B_-J>QRYYmIT9%X6u6v6YG5HY
z43iiPV{)&249-Qps1HVk-kA{*{I{I`gntuC)3W|QWvE}BjT0!TNEafpQA|E6{|V%x
yqv#|+h2SGfe2A+{*T&Ll9z#g@LJXG>JPAaIAOS%LfD<52G3>-JC(0w*K*e7$k6>5;

diff --git a/route/static/img/ico/ico-swf.png b/route/static/img/ico/ico-swf.png
deleted file mode 100755
index d043a2e2a54635757d88f8f175471dfb516fe074..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 964
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPVEzz^E4B6XN>+|NpB<;KRp{K;F}*
zPrrTp_UqTL+qZ86xj%mV`26L|<HwIbfByXb{re9efT})z`t<4B%UAC<Z+YI_@;EE|
zzOUc2>YDGLKE0eY`M$T$J$H`>fk7{)O#SlZ%afekhjH<*=gt3g`SQ0nZ+?9H_9Q?5
z_2R`}zkYqQeEIubyS{(;@NVO#2N97^OUu50|9;QY>+{W<pDtW{yMDuy!opXxW<T%f
zc)xGolj7o!r%rvoe*JM;`qzgKzudk1Fedih)@?5*O!)rg%lkchz5?A{Uh%BH;lq(5
zk25l#)z;l`bb1sU_i5|4KX2duxPJZHnKSPeEO-NS)xm=gf`XqFmpsYHd{JNj>(QeR
zt5?73?7HFOd%dvmwu|dsH}~uL1=qW~f#eN8|Cf;$!+`;pR1)MD%)r+2<o~pGV8H!<
z1tO>i{vQAT|0K_uzhzoGe1P%u+SA1`q=NCy8Rn$bi~?*2+AXA|<8!39mj3^J<*w0<
zl-Koq2K9C8_y7Ml`^lNj&fQnj#EmV}`u(I&&WzdYF1%LgR^=70$`Ec0#90}_ad(-z
ziBtde*Pnm>sjF8I2;iuUG304GG||K4TT;yrn@a}sJeVA`e9x!WY@h2c#kSc&FJ43F
z@yB<kPaF!8Jn7YWFJ$jOqnWF8)-aaNT3Yq_<RLe%%2{W_)`sOS+Rz!+{H)I`@`l^I
zXRl5ist~u0GVwZO7v<9J=4rtoeMx6h!4la%Lxp96#|$p=F28Ysck_)ayxTXdmEIN*
z!s~rE&(rkILA{l2)iYkT{q|Vh#;z-~s;&KnTxMIZOrNKrjRm8h=;2?I1%6$M4Q0;8
zJ#%D)G+UV5GFp^?SUkI0GRb$oK-@$(u~w$T4g#T{L`*jetgBa)S6cYcme<ZTsM3Jl
ziF3!|&9B%Gq}_Xw)*`io%Y^mRdam786QqKhm+eYe70<v|$-F@G|3Z__qpS*=nd%Q(
zSFHIVe<AYx_G$NHQ~5W3P?34sd&r!zt!d@T!kB*P10l>Cd?)Mr>EB_nJI$U`S|EC^
zn)QUnq&>_Fzn4$g;@j02I3;bbh6(fH<Rnc)Ju@}Fvj={(xae~^Bstj}?qFru;#pMv
UEjRfLFp)8My85}Sb4q9e01_Y}{r~^~

diff --git a/route/static/img/ico/ico-url.png b/route/static/img/ico/ico-url.png
deleted file mode 100755
index ab86ae7f9c75598c77e7f6d26a7868478d32908f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1152
zcmcIi`8V4K0RM)~oro2srF)LGytnqz8nxFtN^0I(GK85&NA=L>cy-T4i)fOTI+t2I
zb6<0;HOG`lkW5G<h`8bkNkkC26W6lzxBUbAy!ZKh-sio~PoMX}zytii24@Ta008@c
z<r}1N_y_7~YqX!PRSf{3Q24D7m|Cr7{s$tlSd+M1u0o+WJUnEvSemF(siZR5=H{kU
zD&61T7l|}2u|y*Io5yTg!WGb(Vn>Rj35D5|+5t9Irj-A=Hui9|3^9mA(VAOXgytpu
z6KY*0vs)&Uam9lC$;Nc@n=o9#{gIO5>5dg4m&j#M`HO53zi6sGbG(YVvo^c4I<?J`
z%jE>lRKyUvV|kRd$JvnzV}@Und2@9O0}7?`j}_v!WN&Dbo=C#Z@3NIjrARJqTORIb
zQzQymBp%bZJ`s*X-66af;mkBF4sJ<ylgBDIMca#e8znQHzs~iRG2X@#D=_rdnuY#H
z#PYR$-aTAV5}{&E%%=%hx#U{$fxK;Lcz%zKp)_X@Uz2#Ve7W#7qq}>RTuSe(pC3rT
zmn9O)F{FmLp%OHyp=$gcnpmHNFL!(MC`vPQa%xaOFrb6vsIe%`&}zX4`TuaD9#fAS
zQBRO*O*8<|df@Nt9g+#+Pzy}7oS}f1y)aL?c0mXo=$~HGN_UNvlFAC}xh0QnP$r0T
zJx-hGi^W6$8g9Xkjz*#iOwM8bGBYh7k5bTQqi!yXE^j=0Wn!1g0pH~Npq-m4l4*Ku
zmL4Q*XEMFdbFiqGu03+<NLC|s1$5!ZQdu>wp}9AKHFtz3V+U-lQy4iy$BjGfE#|8D
zo<-{bcW%}Z0heRS54|2$P2WLz!MkrnSE(2&mb!M|Ku8-H^tFnLl-5swqx^i?sOgF>
z?bT%VXXWM{gM8TJ6{DrAAr9D|0M~@XaM|_SjX{Cnytr-;#0Ww^)T0(r?vo{M^`5E%
z3Bc~NE!viS$Ds@d3n1pAJM%dRbWr|KuTVv(J{|dkr^@!pC*a(K8oSfk+Dj6YQ7%N3
z!L3U)wrcYB{Ko^o<pzd4(>KJsIT^p)T{g7}%vzRJm|X}yNZ}C#!2Q0DSWkm5C2OTH
z)=e$!eZyh^h_m7Q=|ij1;8MERjLX7s7chk6!1;zyC}X`0(FTDAZ`r1Np#x9)MYlfo
zUN5gsev6uab_f%4m;W3A>vZQ1xx!IaXMVSxe+uiZV_Jvf@^k0E6ilSmbgeojGs2RR
z!X4c{h8?&jQq8zoQ@$A@$b|KA)H(O_PDc5l)U93A)gGbxZg1cF>~~QvUq??>{%GS8
z3$>ZK^uQ*U2x$Z%<Nf|>vn<#%@HR+{Xo)bBbgp3GyUtEsr@rf>;6!6?Mv*?z_GB-l
z-d13o1M*vao6oC}Vnut5agO<UM;F`MLS*<Vxspe!dfP6j0i_{2%_%z0Cn0L)HAS}O
P@PI!oz_;_p_j&&U&$Fnu

diff --git a/route/static/img/ico/ico-webm.png b/route/static/img/ico/ico-webm.png
deleted file mode 100755
index e568c4250298d4917faa42b7188a236f8161084d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1214
zcmb_cSyU4T6dl4MrJx0^h?GU7^tht71<RrVL9if8SX(jRQm7m%iqv2M!zzMGBZn#w
zWhtA;Dp-&bga{hIKtPAZWRgH28j?UJGuhZo!(aQ~d+xjM-E;2O{dl<neqKff+YJB!
zFgoGwfz#}O_0iYXXeR?x1^`;l0lvYWYPEX&Ux1}jjpOtA3WZ{Md6~sxX{<`6LS?eq
z*;y1tB@zh?Yf@4KL4*={&s*`sZvLHCUPe7Pp#qwmm6D$F_+nYn-*ZXT?7?@7><@@w
zQ7)6o#%H9-wVdB-IFvCFDp&STEF}I3l|JW75Cx1X<Z}5_y0Cp%Sn$_uao5~1BvC4r
zoeWWa8*fe|BUG`;6n@jdJR(z;_q@++m}c^kir)8auZ41jk|#v-T4tu_Q7R~Y!-eZ!
z3c5x`;57VVe1XoA5bL-iSU$vDOnt;TeHT1e#OfGbgyk!7rR;)^_tXh#(~x)wLdo5N
zn@{Gd`h*`OOCV2vwVF$;pJ5A>(f7b}_nBF>U{vAc+561Q8nCzx%%}ll?t}ir)Sa3(
zFC^mpf&jg&IrY69O`B@ry8Pc*Q`6MyK|}f))Kj<&0GPoO9&W)&T4%R)rrpgo>y17A
zv*V{afnOZONg6w<92YPCN|;m<$^JfRXRfrqo+IvE?mH6=ku5fj4BPK@a%}qsAAwIx
z{(8^sOEX(7)9gnZs@JKjIsQxCuo(A~+7YKBxl>b95Ck!q2|x#d0`4aSaYovINYs97
zruWkuoUHp>p9AEbD83@xy)GO^&hNkF&A&s0O1=!QYYmO>Z4PXH@}n`2*c_+pa4L@Q
zSraR|KG(bZD83VF)7rC7vBSJ2#F!V!(4&VMS&qhph-umQ=8h<>jq}uCax#gRq5F&x
zOVhvlxWSs4Zd5e0gKmN7;~p4VqPB-4{TL(0;Nh9ez7O;*5u2oAc>E3lvjy4g_Ivh$
zfr;ULs|GTN>cjEGA|I*5WSS45<y8}K4G~1zH*{v&+78@P;ks_P^r=UR%U&I!q~I3%
zf-V;>r8GGY<xuh;<Xl*|mPAXrRQ)vGChYrC!lHG)3UkHY#eMG@`;}Qg=@;@!g=<mc
z<+LR2iPk|ZrQOgAB{hcG>PU~bcj*&2c3jf7{^U}tc<Q?=D+=nW^A_uTqFs)E%GREb
zCpXdp(y^W+4%<h|o+s4BU$0G&&Wjwo64SOH)Xxf3-Ar8yxl>6NbJQk{nCkFy?Q~3>
zr8Negw{^mLIja1ojX2XZekkeI+E>qZVS_QP?qhMyC1ynil?}rij(ZNoVkLzy8Xk}I
z+1R-PC8mal1fI01eNlg$iFIJOKD2f<-g3%L7#=@mS%iF2g`-4W?B9yBGS7=%UA>XB
z+pWv|wo`)5?!x|rzSMkQZp&6EiuBN-w*B)eQ{Q7NhuGF@Aa&KghkB&9ydlqu9?KOu
zAxE$UesE?WD`Inti<qucDc%Gx@o>!_FxU6*`Yzi9#T5jN8T$G#;9B5(Rqess;Q*jE
WvAE>z<+}c%fD@j69!>618UFz9-PDZ$

diff --git a/route/static/img/ico/ico-webp.png b/route/static/img/ico/ico-webp.png
deleted file mode 100755
index 6b8cc4dc7f5e3816d540c88e14d50056c5ee1651..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1060
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPVEzz-Sua6XN>+|NpB<;KRp{K;F}*
zPrrTp_UqTL+qZ86xj%mV`26L|<HwIbfByXb{re9efT})z`t<3`moLX2UryWI>$kD`
z$fHY9+gf6_w|@Ql_1%|`C!SnA^zg#>@83%fP7m5#ci`dqoP86QUEA~F>!%gh_g;B<
zZ{DSCMF*x<9iIK<!^?YbpVl3nH|5;AXCGgOZD~x}*|p^Au1hcOy!iO0>(ufy&u%Qb
zvh&l|FSlMldiCjD#MY*L56+eynh~<4zF_~98?PTceE0m?tNVHTCik6Lwczshj6Ho@
z?i`zSar2)0XSUrrzUB5Y|BW?qJK9tC_U0d$a{uFt>u(=!xp(5@&#$X*9h`W6-HWg9
z%8$%C`s~W$>$_)N-qLw``MFoO_dYt;cw%Ah{z-WUCU+iPlDTg}$I&HoPj2iuvN(VL
z<ZI2ZG=SllUJ~RN%)r+2<o~pGU^xDN1tO>n{{BDy|0K_uzs)y`Z!j=0nR~i8hEy=V
zxx~CnC6K4>VfMe=CAqh^?fn0g=k*t3owSPA(Fdw0#O%GhE<f-6mh$?qm*wQ<&oeFm
z{;BxmSI%3zH~)#*(=7KPvLk1Kz)uIoPmNAbm|IV<b4}zIQR3Hdu?y&sS@88;w}r#(
zyYC7t=J+i?{qzw->j{oSYBtis9NQlYrw6mx#!Wi=TKG}=`L!&+JQp%7X_B|uZoPt`
zt>e%HO(&6E9rCuK3QxFd86Rm%@YoqPI@LU46%6HXOa2%UA?OmK`(k0gs)(aYXp^Ux
zqN``BfYw2ar4yG~$j?~9V>HM7OQ-!4Cc(}?9j28zdh!bSioqrfb%85=f<AgpW&Cn=
z#k~wB-T2ujvSr>JS$X^L^Ix7uJbY~?hn9YckeA3*&onxFmLX(CqyDVdjN;ytqI9o?
z80;~d$eFv%HDTjC0o}*Ghaa?*T@tut{l9?!u!8J|)ME$DW*l5B^WrksBNwip3we9y
zJl$LDB4{#$bJhaRLoEL}e(a0c<Pf0Iw(!Bc2|rJIOW%3;&-_5?-QJ&ibImUOGWgzF
zGa+BpjBN*#f%dJ70=I&=GurpZz3?*Fs`%8kRaQ~Kw=?PcjmoVXR?DrdyL)e{_QP*?
zZga0}4(ATu7`n1M{N4Hs6}ttpAJ?wR&+jTbV%eV0FS$PAL0eO`B7exeIFVhiR&DRz
zRUSWsOC<m8;gH~)*PkxDa9{7v_cQ<g7(97c-Lmf7#_jLT%i6DVx+mKmsVMQcnAvCl
qWcImtoX@*cUo-27f8ISil~?7NaQBoa38KJM%i!ti=d#Wzp$Pz@c5(v%

diff --git a/route/static/img/ico/ico-wma.png b/route/static/img/ico/ico-wma.png
deleted file mode 100755
index 036e0b6427b6c7995ca440ed91b63af883e9fc1f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 978
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPVEzz$g;n6XN>+|NpB<;KRp{K;F}*
zPrrTp_UqTL+qZ86xj%mV`26L|<HwIbfByXb{re9efT})z`t<3`moG0ry`6G?eg1(d
z(=TlN{O!xvuV1HK*zokjtG1I%=3LrZa%e{3!Kr7S-6%agv;6R^Z{NSKxp}bv?3(Z2
zzh8ZIujc67uiwAzxOej0^P4j-Ztgn0;@QX7%dhW!@$pU7(K**%-9Pc<YSF=I`yQNo
z`2I!9$;FGW?)vogbI+NTyYHXA@%lmCvH7n*zn^q&UE}eEZ$E!nf9r7S-roBkUtE9t
zaLc_DAAf#bee2-F^Xp!GeOG>D)~w50_C7jy^x2ig*LQcGUViS??Zy)ebN5fmJ21KP
z=#tER6FQDAnR{|$$C1VP`zLD&8b1UEQ%p&aUoZn(%ai}p+JV9J{}qU!2Kf8``2UkU
zXZ|WEPpe>HU=s9naSW+od~+r=N!gLd_2SGUIWr&5oH_IGoWJ=eb69utEG@Xdp6TVE
z-@E_XTWxzY|Ek26o3iKjZr;)3y1n_^`A3Fgx+NShQUbYB0(r0@;V)71R2hH$`RAY@
zz{BRea017PMRq419sA7LD8i>>IUmSA#l8A~hsd#`N=J@9c9}Ax`eA_+tJ*@XQ^hMw
z+Qc3m3T}#=P<SHO?<Z5&>1O4L9u^@AA`11>P91pm#=~OEK@Zjy9}+^P*IaEZVpb6Q
zdLWJO=(SI07Kz<pv$`AJ9Hnp}dxDNfN|V|S^BdFI*qs9lrW~zM;=FWHvp`Io<)saC
z%okS2MW+p4?QTj|wTP2nw{D~MjkZ<a(%w81E8pE{KC?+N{KTElF)tGrv28VS6gF`b
z{v-7vaQAfuliwu;ZZ~Ca1n@LDNXR`_6XIL(HS_!Zr<H|FzMrOFc(V9rpK;mQNnbN=
z-u%M3@B4yc;bV+8UsUR&`k1#(s^=^_=ezdOl#@{ccUj8HeolXISl}q1zRFyAfu~IE
z2d|lONPlQ8;yt;B;Z1LuAM10|7p&Yn8Wk@{s|6=~xV<92dG6d|b4ymgQzAE3gkOJf
zIP8@cN6TJOrpbTj>}E}rS<cS$N%)7@m#o<4bMsGGJUHy@^83{J_;de1NJ|KLMV{m4
zbu>26v6-Uu`H=Djo}QkrvV{yT?yg2X5ey81x#=gCbH8E*CPD^JS3j3^P6<r_6>>TR

diff --git a/route/static/img/ico/ico-wmv.png b/route/static/img/ico/ico-wmv.png
deleted file mode 100755
index ba03d507fc8e9c15483f69892a654a01bbd8c480..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1211
zcmb_bZBWt&9R8!^kkr`qa=TK~ET_$^>84A`sp-t=kP+A0rlKX}DqUWw>7^4iOV16R
zWr-OzwYt#MeCb6*5>ZIf3|}S)h++!J`&*>`N8fh0uY2zKJ<mONzfaHIa}AA(afWY&
z0|4M0dngKHbM(i9+1vElh}|6kfP|vsvC$w1j{gf9t=5)gGMUL_vRbVIfxs3m7K`3s
zn46o^>-B22TBEUjX>~fCTy12$Ro<q{D%z#QN8+rz!pS);xkD;b8g4$H&uyIH{H>aK
zr(0AR4F<#btTz9?D6dJ>^G2aJnpqRe7w!q`du3{!NuxIzjmC~)c^6M!)j4<T#XL`_
zHk-}QMijq4k<Kd&ISn(E9$CxKlFneJG8RZQ$+S#&w{PLeE4k5Rmdf>It+SFPJ(I5-
z6Kft0EWQ|3@Fkj;<IBSWb>Ty?LSy7kt1dqfC06oJ-V}6?sx-zAXX|IGx)+!e+7_<z
zYTJBvqnInyzf-^GON|Zv^1?^6GmB;leGz|yf3jw}_&y(3J(*fFO={xbdcr3*@d-8j
z(X`K!ZEdDsz@QET4#o4}jZ#~ip!}o!-&h3)L6GA#yeec=TLHk19UB#a&4nl@)@2LO
zh?3dJZ-VQFp5gKEz(4{>@hxZTwE6W}AGQY+q^65jUeGU_3s}8x)+AFFR>MWF!>a>J
zj#I$_Z<Ae_`y>sU#;Kc(|6wN;v00)#L{&px^G5di`T6<#`|sIv{I^$Mpw3=@^d%u}
z|A`L!IY;X*Ddqxw|G|B?cDzM-Qx5u5&X1kieGUD-WUsK!^O#RNwxzEb<KK1+Aw9Y`
z6MEzfEf_&NPG~MeHzy>8i31?(zwYu>v>ri72_w+>EnY|}@7~lO8=H@uc?l@TBCr=*
zBFZ*8NJ7dh4z>Px3NjlM-v<r;bjG{eV}L0M%30B;<z#LzxbBu=zG~0>!QGNM)bC|+
zi=nNAkEVFT+OxCZ-A-=#8ZyC?jAZ;OuGfyb`?dLotA2hyxjxS1;po`z&A_&Jnl+u5
zn;3&($R5mcf8zP-OZ3N~Tnf_VcIo-$OS$Zh!bW~V<k9bI2_}!OT+(93(~^3A&bE9+
z;)Juh^a`$><&vjpt#)-`o!cWlozb3M?inGhG<p-4Cpn=`&eAYmX(*`NPtV6$-Qfs<
z*t;|aiNDhu?;=1Kg-5&&+B$l>7t=-v8^o*`8tr*o-)~s^1SA#ivfM)vA9D*rER}&F
zLzO<zA|Nl?kG!_SsxB;t)EPt~ENpY~S3&zKse=!2l0V}d>Qlx?E;+(?`i2sUZp3Y9
zg`d#Gk!K^EX|*_ZY$oz-^XXn_x{1oF-ih`RJ>TN~OZN0n=nB@;5m%TfhGzOaya>9Q
zL?SjGsESEI69W>+w90MCBqwpwV-u7!=7+Ap|8<7EzzzX1R8^P{6IQwc>{e1B{*nV8
z=K`&eO&#2V@LD!VjRe1&>MM@oW+kQC)fUBae5-HPRMnN?aVPSwe7nxW>p(>c%MO5%
VT$lPd=^tkV#73i{S|V}8e*n0&%*+4)

diff --git a/route/static/img/ico/ico-xls.png b/route/static/img/ico/ico-xls.png
deleted file mode 100755
index e141b11b2baf509468d769c37df87c353820f42d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1121
zcmcJNeK6Yx9L9fAiMB)OLg@^vxoM}HyYwtKFB8&3X)aQ`s`W@w?P|KTYFx9GWNnF;
zo|lL&l<Er|^%^B960dpj5<`f2Eh1h*l3!lQMwb4!+y8s+zR&kQch6tXJrpb^*y`}{
z!vFwSg@&MUrjLDp2M?H>H43Q&0JC6hc;s25(Kz`pDM8RgtE;Ozoz7q|%+Ai5aA#*n
zt<kKktf<v$g+ifJno^)jrRrZE$1(0jy&;P>7G`A2m}cTDaTlmjZ75`&i^JHKpQGFE
zOO-M_E1N#X(CT$^4cI!zz1;rbom{%9lHcem$Qi8B=(L*(nMR|j6>}uY4V6}NySwCW
zU)j@%_Qa0-b#P0k*OPfwTCJ8g+VlgvFmLF00*6{L-nIp9|J3`qX{K*l_72plho#eU
zl|rxA-((lRT^KAFc@3(;XCjtbr^yynU+;Vr*_uHWHuNt2!Iw<7%nk^pe_rPl{Mb#c
zo9O{}we*SB!qEot_EPHte?TfC@vGAM>FZiKWvHfWSt#6`T?E&ki#rHCB{#dNx!md`
zPEiiGx?->;hx_tY53MvQt=!aX@*N!J0sy-&G19V3%^Ek~+yA0HBhM(X9NrTK(jfo<
zxg3f{MW&m@Ij}MdDURLe{O~M$bc91pHX~l%Io(z{Fa4W$wC>hay=XfFh-G=MT`NJA
z%`f@-<c8VLTbEZ3xaHcfXJSwy3uuH39Q_N{MvM9nK)Yzg{t(UX9x1@p!SZ3?CkMQo
zC|p9c@1VKzkRU!d!VG=t31ub9o9BxSIdN&Ov_E=|=<jCZPWycNVtupq8M@#i!aSN}
zwT6I=B{uw;Jn#IMRcCCH>`flZ66thhKD{@_7B^8MzH#0zU>MmLH+jvvuAr>J&)p{V
z-bqO8R~@^jS(}s2^4sAx7qX5bE0jdN#q)1Su>+}%m|c&rMFD3F<p|YBJH_FH2=o0~
z^7_7;v5(2A#e1Hc;+=YSJnCeMw*(5uLF$60(i-Ksg`m_X<XS@KZ&EwL>GGBnOrPbL
zH2p*?DU5+|T2!{Z^`ZOFh80VGDVMekA1`Gv@Z>S1^@E8GixfPi4u_=1No<*-g+7A8
zF8i|uzb~OLLUOP6X2OpZSw74sJw`#RJOo3p3J=A{ORfUMJNYpY2cc%^#g4GF>@7})
z{9FI*EEaB`$8PUSrKVD$Ul2$xQ2+C5w*3igC>-9wd4Y{YqQ5Un><kLCaPbu46J|<7
z`<@<g^k#nG!8Fc#Sq6^dmSN$H;O15)nV%4v3KMy@ySf%7I$J=YBO`pRvc?Izf<fdR
z^OEf?Ha{Z21laHlm^&j&+;fCX0h_vCr-uYiep*i)wf>G5d6x)O#u})4l>uNUmp=J0
g(2Oq-#yK<t05{Vw$N!2e+%#|?^ehJ55Qr!L16U}LxBvhE

diff --git a/route/static/img/ico/ico-xlsx.png b/route/static/img/ico/ico-xlsx.png
deleted file mode 100755
index 66fb3421597f1c0d04f8b2eded4954f5dc7ce6d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1163
zcmcIj=}+1R0R4$KQ)x1d)@kR~P0eb>E?cT~@u+y!BTQ{7uCt7$n;Raj(b}l>K7i7B
z;W4d>T4X)uRkZU!P!tsvsmDC9-ck_-ew<2c8U40@U@v*^<t6XaOCBB>9%v4=g#rLz
z9vp;-&^hu0P4sozI|FG10KGtDXq3NJt6lgHq#&qEySuw8l}e-0@cDdQJUTj(D-_$?
z+j6;FB9Ta?x)vyt$wszjBVJ@hcjwIu*H%PZ;hh<OF494TOehfztWP1kGGlrQ1X2;Y
z7gzi0g;K2&D?r*R`})hm4Y6QfCjO0HO5jixD&@XJq);fHE;4qcLYY#L%&bgj)sg33
z{@nj?4?Iw*)p=u0N~N-DrXzl^j5zt^HiOhK+j9UO-W{&#SYa)RHbA9(O0XoBNz`g}
z;$TJJ8mDynIVcC4=X>QU1#Y4>Zs7MQS~iK>HoVCj-&yG5k8%aeag5R=CW*Vx2alCy
zGi|iB@n<VTi-((gN^$OZQ`$)FI=D9~n8#02TNe9k=V<gT?(Lz<L?-D0yA{hQC$L)^
zI9&ub<<3ymN4<O3bjv2BM1)5IMg=?Cs$$);+Wimmzu-hWrkyaGI^kZfg#ZAgC>Y@z
zbx#jt)0<O<Kg|sL(V^*dzOT)hA=LHiEwMN?jiE*H+~NeVOnXsAj?)?b$+D8n5+<+L
zPq$dpT~`~Ysn!Yi3{q|oFvzn|pNG!Cx6QzJR=eZ?%Uo)+-8?P=iBIMwc?xgj<f7dy
zp@po?pf50b0XIQ|@DTPNkOqhQ2MC%`*@U3ny$ar8LYfV#hEY1LV6jXnqHw|1V&Ri`
z$X|Cgm?9r1+BW1LhdviYN4xh%M<G8|6+31-g4;Ij3H!y4)Px-bFV*+z;S8%&<I_2J
z>@|WPW=s$jGaRP;b>d)9Qs0taCDyC4pU4yv;cwe*vdss+cgjfTI5kh2A+Y0L-b~6(
z6VkGZm>H3$PGCEM(dsqJ(2)tjJmMRD>{VCxJA-^8Q&SVB-1icxd3G*vk2-PdvEk8E
zk6V67dyw3oRqHB6U1A9@X0<<SIUXWp!m_(ci}w?VpHk2SumX0WcKUsJu2mxEQRd&o
z6C*G0f#O#OhB)tcp!KOovO@!E{OfF^){@WYA+oB)gSo;omYbyk&oQZc7>?`ILM+~2
z2n316H2iYb7CiqreT`A|7VB<w%ZvjUyEElO{j6i?7CPM6{5%jSGL5sFK>yUDSDLb}
ze}$Vv89Nu9><<l<#^+4T8h_>Jv0?t$7}=<DB)p+8VD=%Q67<y7l9kmx9_&i%m}lHs
zlw<B1Ct1JdbLur@Boz<$8%@!V>r#>4JaCK=k?D1Q-barMUE0YM3l_<W&Qs^%KSrWr
zeG8Uy0!r|v&d=|Y3tVEtBu{?*x@;;o%m)*coiESxLkZv;edmh@60{I6mvf#@1(4E;
d`cXHG9^iS=+j+0Q8>_nl5bPh0XuFKg`xggxwX*;K

diff --git a/route/static/img/ico/ico-xml.png b/route/static/img/ico/ico-xml.png
deleted file mode 100755
index 8368fb67bdb625e962a6fded1124f92112303a74..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1095
zcmcJN{WBW|9L7^6bB+}2(3W=E%9JaSY;LEFc&A3{ZC-ZQsI+A#M|It7^z;(-azfRp
zI%k_{wXCvuS6n5FM!kh3C5c2L@+vR#{z9i&`rH12J$K*F_ny1wr{|sqL~4SI(@7@)
z0N|387@KbUh!5v@)W(;qcE14tM-mVznQ>ODb^SlmXtg#c7K=?L)4{<3hr_X1i^ZZh
z7=%KhUawcH)f$a0rPb+l27|$9G-{3J@Bwx_e$!;OjB!=4K4#;R1pP`tlWEOn^QJ;y
zP87(r#xI^RuZ(buX12LXeanjU%jc}fKiN;$<(+G?wpHm2e=nK9c`a05o#gRV2J((N
zZJ3)f#Cf&7S2`;Q>t}V*WO|di;3dCfRVLUo^fMK5ohf6KOO<NX22=LvR_%g#VoL>o
z!M^)i7&ExZlIsbZ%4&)T&sN@;-u{U!teg`zElcJ_8pf_ptTCdd_`frDf2Hr{jq^hO
zpr;IRDG~!;yH8h`rUW{L>0QH;>@G!|GtTSTP@$#;?KJr<l5mitj_9M`7-m49yhRN&
zu+t11Bm3weaDJbyS@iemsTlxZjmY|_&ep6|{sI4w4(F{4&dZ0VEVyg{z%Du|7M@vg
zM6`V0?e8dnebo5_e1#Rg1FGZxQ#5|h$Awt|9en?dkWf7RzO<d#t9)w>XqrzBDL5AY
zmHoLhI}bs$H+4u+3`FPaweO0na*Pl7e7)Pf=MJ^<Omuw+rp3F{71y!q;gqGDr$T+b
z(yj)049r;57c(6x<oTMB{cHWa-Eyjr8-C-|Qz9!w(A@f6;>f4<B+thxP4zgMQ^d6f
z>BpQ@B?H$!OL~II*<}G?xj>1|K^XX`>LLYZ$--xzNRQdFAd0K@b8&?Pc684Q0W?Kn
zDheS6x8_imPeFJmbhM_^Aw^n<^FU!44VTf)ez)7_%&24-D+syP=6|@D96*`+8k#fM
zCZ?A{+-ZZfpjJ|MU~dEnT95#%m@D?%nUxM4*UD?oEo@(}6=o6ZCL5HB6C=*IO7;@M
zC#fH!sf*!dGYn~&ap&@o&jc=pEYY<0uK0HO+|0mNT#CK#mITa&WCu4Qnu1Xsk%`Rs
zCH)0D%&J-*gWn5rtt~KFk_VJTkDPKE|Bf{bGwq$q1OJ?s%LDS%_Rl6BRB4o&`eVGm
zFrU0YIs{r`h_`<*!y)g0hyeHED|sgsEg2hR_K#S{ak!lwZr$_d>BmE%ED!{h59pR)
z5P28QuRRA}6tR$m(Bo?lqe}feQ{vA;{pn#|WpFq-3X1g_UI6|AF7`*3UUL6-E&qZ2
zq%)@EDA=p$O=C|ewi_KxYOQwjCY8*5lnPtz>ZshFQb}<pbcAIh4y?hB&R!>-w#^uj
M6qg!{k49qt1^(@nrvLx|

diff --git a/route/static/img/ico/index.html b/route/static/img/ico/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/img/ico/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/img/ico/menu_icon_control.png b/route/static/img/ico/menu_icon_control.png
deleted file mode 100755
index c2ecbc0803d956683aefa960283080a8cdcedb5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 327
zcmV-N0l5B&P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0003FNkl<ZcmV~$
zF-lxP007W8v$Jtm6ooVvB50Gw&Qu`>$PMh=3FHc5=@l%kWITfy5G`VpN{duh1`*Uq
zDmAP>{{4>c0RR912$UOVI#d7zB&&HP;mk;*s-lYERS*pAkuWjNFJ;;%LlY#=e&%th
zIufD?8bOPs0X>lfAeuMSqHipsLITh@*LpBx=v4zM2_R40m06$t%C~@^647Y^A8cC#
zFi}Z}dOFIKIo~D9SAF{kL@XJV4J=r;t1VwN`qqss67k2ezvY|vYJSw%bY;&EC+>+D
z=PO74+j5EvJ1+BczRtfjButfg{~Wq-TLzx;L3vjOnARuZqkWyui-AC?f}rYI1poj5
Zz#H#)Uk_jFrXK(R002ovPDHLkV1hQ5e=-07

diff --git a/route/static/img/ico/menu_icon_control_active.gif b/route/static/img/ico/menu_icon_control_active.gif
deleted file mode 100755
index ba56df8e92a5e434de5e8605095f2b0180bb1006..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 805
zcmZ?wbhEHb6krfw_{PBCxzIDQC^4`tFtjz)agL*3r(a@TqQz<p(~YJclRRQdW1=de
zQqxnd7FzlA`nXMVlesDr(hw3;5@WE<z-Y5kZboi&S#(ZpPJUE=L~DfId^_JxU+3A*
zz6*Vgw-|@kh8k}&j&6^3nC}qU5Nfm3M(MOtTw$Eo1TXtV_8t>G?C0ADwgk#tmPx2j
zaGmCAwbClKIM#Z(wds1(#F9j-rB+Q%O-D`~Id<&W(PKw};K-39hk*b{96G%3z`iF>
zo@8cbHZ(M3WM&i>7au!ytgx^!BO@a}KR=@=BRxI6s;a88vNAO@H7zZzt*!0kg_A8U
zEvc!g_wV0tZf?%X$|@}_Jq`rtjx!7pQ2fvB=Nc01>=@u`q-Vg)2y}+xPZm}VAg#l|
zz{tSQz{kMAUf#f9A7*84ZrNekW)&91VCl{f=<7Mv(>IX8)tbSIfg!{z*wi%GD`fsW
z^Z5?mOO|*$tYlcdz|k)tz|V2T+%5CnTtl6mLtWiAZ=HYo%s$Jr7Z~PPTs&*T;D7Z@
zID^Zr(`F2|_vb&Jz~JQJb76K<n5C6nS6g>)Bh)Rd3_45<oD571%s{trG%&I<urM>h
zB!LcPX5a!!u>d9c8cYlr^bHvpjPw|cb&-^?ASq!GQe#k3R#8=EP-H+-!pgt_H-&+f
zje&!khn)*(Es_#826mtlR-i=!4Gg>tf&zRD{KD)E-3&rVia3CJV6I_c;AT+Q(ALpp
s(1Mx+3@ip6PM}plPXNskZD43(5S5UT6Jul$QIL{lkQSGhY-F$o089zWT>t<8

diff --git a/route/static/img/ico/menu_icon_control_active.png b/route/static/img/ico/menu_icon_control_active.png
deleted file mode 100755
index d698ab70e87897cd8a7be5d352ac69effe792c65..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 316
zcmV-C0mJ@@P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00034Nkl<ZcmV~$
zzbixm902god-uKTu3T3#-OeDz$SC;-D3gW3!ocJYU{oe$G8?RBnIz;#vYAXu%8z>P
zy?gKZe4+*b000CYJSrtB0HkV7<7NYowq+6(64XdlMjQ|*{VH_K=@}w?xi&yaAQcL=
zT&6%%u0}&j0BGpy$<dN%00e;Ci<V4FLoP?HCIA%Pu<isv3W3r9FlooDOKqjXKt&*o
z`A}imo&}dSbsZZD0(~2PoXGTC=$khtvu>zQ;KR8^Yd+oibmPpDD^pr#2z<NuV9Tx*
zr6>Dt@r-W*ZKJ-NdiJhu;7C(PrK?R~+M&|WpH(R;sYE4A5SRe~0DyluUssyEPV7(s
O0000<MNUMnLSTZ;9e(ft

diff --git a/route/static/img/ico/menu_icon_data.png b/route/static/img/ico/menu_icon_data.png
deleted file mode 100755
index c8ee474bf2d94b9a1713a472e107c827e90d4b6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 347
zcmV-h0i^zkP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0003ZNkl<Zcma*U
zze|*H901@?(a_jZC_#gRH5|l|2@U1m7G4~P<4tWr4GmID5Tt=fb<gLZ&8Y~Al&+x~
zI;b=+XV-rG3n#ts##eHY2A?Mm$vF>g<qwt0@7%U%GWI#<o)74BuefO1Rky7A;%**|
z!bhu4!~svoy!1W_wL9@2ZmOd&vf))On8}IWcyBx>%;bXCz8XcLGNobJbA1B?eJ?CK
z?}91{mG9bdfLY&EQ5b1?Y}1;|m0XeD*z&}6qbSr`5fP@eb#$~%M?`3;qp)j7FK3;K
zf1Gp;J9eW`Yns=$ZD`<=4V%`@YpSF0&ZF3qr}J!1=2+~p<Z~2`xNY4tH@cTKG`g3}
tS@hNe$77!}?i=PWl|O#w(2`~x&R?wEsjY^Q>MH;M002ovPDHLkV1mX-pIra|

diff --git a/route/static/img/ico/menu_icon_data_active.gif b/route/static/img/ico/menu_icon_data_active.gif
deleted file mode 100755
index 04b6e0d42f301b4ac9ff1967a108c7b5084b6f72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 936
zcmZ?wbhEHb6krfw_~y(IQIhcY?_Y+SW=z-3xXxQ~owX7=YA15oLF}M|*nS78y-sr5
zU1WATDQtC7*y^UV+0AI7pT=qro#kGwt*v@XeVUt_P3HTV&Gl<+Y_ymiU@<emZgP-E
zdxTGOR6t!!SVf%5Mz@%Pgp!hy-@ku<{P^+x`}Z$jzI^=n@xzA?@87?F_wL>6*RNl_
zdiC<<%SVqMJ$(4^!Gj0)@87?B_wJoLcW&RleeK${%a<=-ym)bEXJ>nR``o#6XV0Gf
z|NsA)GiR2Sl}(>My{4w7qN1X^yPIKX0>%H_ey$<G&W-`DMtTO!j6h!~{$yb_VsK{A
zVPIfn;Ah}tU|?V0;M^oH!p_RX#KI;b-_#_)B`7T`CnqDRz#-PerJ&fiz*&)(%b7`h
z;X)}UXJ&S8F<AyhMFv?hZVqN=MqvpdejZLv9zG#aVa7e`)+?KAHBKqp8fxh38yf2C
zsvFoUJKNYc30s?+TU(yDaaLB-w^dr8WUsIGz(&+cM_pY@OJmK;6$kQKdED(97$&NF
zxN$j}M(x<3$imDfW0kUD2BQ{7udoUei$<Z78>?d@*bkiiK)*o!zy|aKe*;5Pb4zPm
zdq-zicTZ0v$e%zpN(?$6PxCRb1J(F6C@CTNQwiChN??B~0sRT_CaN#{U|#G4dUr(=
b(4#08Faj+AIl_Z%3s6H5Y&a`TU2hElO~lOm

diff --git a/route/static/img/ico/menu_icon_data_active.png b/route/static/img/ico/menu_icon_data_active.png
deleted file mode 100755
index fe30c4b6370f5787b9cebd4fe5ae0666316d97c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 330
zcmV-Q0k!^#P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0003INkl<Zc-oE8
zzbnK67zS`;Fj|O|!GPgPmvd#nZj;lMj5pa7gW+OP%8!yLl+8qnkTYO#<;QW%xBBrf
zoP6t}?(56I;9cJ5?S0<odEefus{e&f3m!ZR1l~MZ)c(_~HS5BLjD9_m22I*=V@6F#
zxU{4Gmu8cF=OJYJPumGXP<H1))_^w6nzb2_b?8<(Bm@#-R_w~j%gfobqD!|RB0Ng}
zG8lFr5z1256dc>MYSpGA57v!D7NjaUAuS^#Em^5k(UR{<whU|hmTxd*L&<xj5H}|0
zNm1UFI|V1k#3O|>%U_c%I<#y0s+L@bpxTrZ+s5^YiRm?J(W!ZLKS#BiQ}inE;YHDs
c_&@*r3F$fHmO8#1^#A|>07*qoM6N<$f)#O@S^xk5

diff --git a/route/static/img/ico/menu_icon_day.png b/route/static/img/ico/menu_icon_day.png
deleted file mode 100755
index 9fbccf0befcfb857cbdaedb61c263a61dc5f78f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 291
zcmV+;0o?wHP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0002$Nkl<Zc-oDT
zu}eZx6vpq6TQmfMQU5@rVJJMc_uSR3*+~NjUBaQHrJ><LN?6}d1Igk^&=BMw7<zB<
zggbaXIGhiDeCJ+{F}u|?OO*Bsb@*?d_GmI@MT;w^7Ar<HpEH(zWXO;o)phCA;G1ji
z^soW=B4-T8=@pz9!x10Wd=jgzj(RC|)F$TD0tsCLYJ^0DPBj9$%q=jdWXvELB-@<;
zSztln`#M!-e?Zlna3PoQz6LxAkzVZZM#Y<OCilptir$1%E$k4}BTtb6=M*-*OqmLO
p?k%v-jV2mtyrl`Z(}NxE{0lE5h}9djY9Igr002ovPDHLkV1oJ#d!+yX

diff --git a/route/static/img/ico/menu_icon_day_active.gif b/route/static/img/ico/menu_icon_day_active.gif
deleted file mode 100755
index 6f98a0f0168734646dfa4a403e8b8001c0aee86d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 568
zcmZ?wbhEHb6krfw_^QIdaMSGK#fxXpo;`i~^vRPaj~_pN^ytyUhYue-cyRyz{d@QB
z-MxGF&Ye5AZr!?h^X82kH?Cc~cIC>I%a<=-x^(H{#fuj%TsV97?5R_y_V@Sq_V#vn
zcXxJnwzs#pwzf7mH`mqGm6es1l$2b)e7UHoh=B$`@jthpYe=xOV}PrXo&hr>&<e$$
zEUa7%DhxUd42%r?415d>Y*h}E45kQ5dCt7}agji%+67P7B|A7o``sTTy^PXh>}Ylr
zYVlaG*nn4Q0vq=!6{q$78r+AYHyup**B~J+RK+F@45ut7X$}?E_HH*R_I{~JZjya0
z(`R_}vCf?#Tg5ChPeq<pg<DWgMs~wSsV#!MPW+r)yZ7wo<X3ToI){-#hn<0)feGj&
r1~wK41_cg;1Q#v|76wl2I@obZaN&|*Vc^DP6sCj?(3Lt|XgaI`>L!Jj

diff --git a/route/static/img/ico/menu_icon_day_active.png b/route/static/img/ico/menu_icon_day_active.png
deleted file mode 100755
index e128e163f46126e4f2ae5df934d81d21d375e354..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 271
zcmV+q0r38bP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0002iNkl<Zc-noD
zO$z~06o&7Doh+0h{(vPBH9ltSv9q>9S+KD}HWn6BScszJBT^QM|M!S96O-XSb-Hz*
z-g7%gq5flEf*6hmoxof0P+`WM8cmBDccxVEiZEfofEy*M7G<t<88Q~(LI_2~(ISc>
z%t3@RCUqLLKWI?LWG%vx78*r#40MYk8Z9;=Y{;N^9%t29im*d-ok5<JE#zGj3U<Q&
zC46JB5MfKsH6dYt@<iG-A;wMwlQwbEBuSBc)ht<ZbQp=?qsN>nGY50}_}|<7$pa*v
VKWs+gm%{)6002ovPDHLkV1ngkYi|Gm

diff --git a/route/static/img/ico/menu_icon_exit.png b/route/static/img/ico/menu_icon_exit.png
deleted file mode 100755
index 75feec4b12b9882f1e432642c32d8b275a874e09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 240
zcmV<M01y9(P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0002DNkl<Zc-oE7
zu?j(P6vy%ZO9)v_GAa=UUcg`@S!B3jp-k=|E0J=(rwlgX0Zaxf<sD2O!@_m%mD@eP
z_0u{3|Ie5(!%%jzmxGg|Y)QC)-k3;3T2AVmD7nF%v~TB<su$#ZphP?n7(<G3Fo<xb
z@B?TvWsHr@hz-y8mM_qn4z#O1?P-S<56S;Mp)tLX33@}4Y|u9=-X?#GT6l}PGRLCt
q#NtfR?c1`FwR~nR$V{Rp+`Irq4Qi8h?r=T;0000<MNUMnLSTX;!)Gc0

diff --git a/route/static/img/ico/menu_icon_exit_active.gif b/route/static/img/ico/menu_icon_exit_active.gif
deleted file mode 100755
index b11bd5d3d69cc4ab8b11ea868646e5fbbf987ba0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 545
zcmZ?wbhEHb6krfw_{zXwH8a3uzMs|f0E^iH28(?hCWg55hDDUc1=Phz>~)AKNKjkr
zp|#S>W@?bxTtA+(RvhQ8d|IRY8l$B4I)zlk#pNYUpFaKJ!-xI-{oUQ&ot>SJA3wf%
z^XA#JXHTC#ef;?G!-o$aJa};b{{4IR?%ln6_tvdj*REZ=a^=e9%a<=+ym;Zlg>&c5
zZES2TD=RB0DY<&}Dg%i?@jthpYe=xOV}PrXo&hr>P`lz!7FG@*t;58?$iU6O$H2hm
z;4pc)vrd`aTJOxIS!Utu&$O|wh+<Sa?N+=sE$a3=Q=N5_PNx^{+AUXnRKg(CW>bvY
zipg>Pk5Yn^6q}kARP-DXhO#rT1C3<@8p?8@Ns$8~!GVx)IHUlRU}n(a1WGW0b+8?9
zaA4qIg6d&n(BVetIlutd19UnMLXX4oMF-(}z*4L*;~cz}7;(ak14{8RumPo*fo@}W
u;A9Z0^k_mjkB5O1C<6>1HdY5$CP5akj1?%Dco?{Vx<E242bh&O7_0$F<cqfe

diff --git a/route/static/img/ico/menu_icon_exit_active.png b/route/static/img/ico/menu_icon_exit_active.png
deleted file mode 100755
index dc81d480fc8eac76acc047b742b97dbb40dda9b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 232
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6)_b}*hE&|Dy|9tXF;M3C$In7e
zVUv5jj>xVPH@M*;CYiUc)o5q)8kg;Q%?H(N8eZ~+owA;>=V-X+^5S!6U+%86dVb%Z
zqtWyut8m{Oi_>~CCssZ<IET+Ra<+CK*F2Hl<>n@(0fr6E*Z5diW2`*{gT0&dxYJlz
zd~SX|X6o2&=v-67*0N{CzyC^ydndhZvq`-@k+=5blYs2n71r7|Zbtnxc5(e`amlH7
geG@S$tZ^y->6x-$wf>tK0-es_>FVdQ&MBb@0I_XbjsO4v

diff --git a/route/static/img/ico/menu_icon_firewall.png b/route/static/img/ico/menu_icon_firewall.png
deleted file mode 100755
index f05938dd84e324fc7f21212cd7b960c4681ca1bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 324
zcmV-K0lWT*P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0003CNkl<ZcmZv}
zJxfAS0LS6KEj2W`+`&L_=>t>*4K)T$jZU=)Lek=xEz%1VDRK+xckUEY;TR1LMq^aa
z3lvgO)<<X!gcBzXuj2Eltvt#i(7>7>>g1SGmzg2po@-86BSnTH7u;~i9tk<-i*qK4
zC?tq7%L7MpXp+(ZhXs!1@Igj>ND^b0Q#mwAs|Q&u(`-<c!zZg|h?qK9!IG6IQI*3p
zX~t-glq8n1<Rys`6*<({k~qLJ&jOYm{h>lZ4mr*wi2#emR|l77Ne*$I@FWTF)j@&=
zp4!-_sy@{4_0Np(PEjG0c`?K4!sC%TaY<sFD{hIZ7ZJ93Wt~ml$ZIe&M~iPJ6!Hu4
W#ETzH;e<#40000<MNUMnLSTY2eu44;

diff --git a/route/static/img/ico/menu_icon_firewall_active.gif b/route/static/img/ico/menu_icon_firewall_active.gif
deleted file mode 100755
index 3597a5b4278a3b9603251f53727268241b4b9858..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 550
zcmZ?wbhEHb6krfw_{zY*aMMg@rI*9R5Rdi<ul5Ly)gDg$ApvzUQAG(BGXsnk`f087
z(pc+ZGd)Oesn7A_#}6MqeDL7G{rmUt-Me@9?%g|g?%ck8`_`>nH*em&apT7I>(?(|
zzI^G@rHdCYo<D#7^y$<8|Nr0J-QC&Q+1}pX+S*!EQ&Uw{RZ>z?P*Bj@+xz$L-`~G~
zfB*jd_3PI!U%q_){Q1+TPai*i{P5w!`}gnPy?giO&70S+U%z_w>cxu}PoF-0^5n_4
zZ{Gr44F`(<x&2&2f}I@$T#fV$m>Gc*ia%LcnSrzpND)8Kn+$9v4h;ey8uvJ8N2i&v
zbSP|$^t*gBAjeqpD9eq99%mJ`M5-C0<`&FYWSxKItk=6Ujr{tb@80H{aVD{}MmX18
ztcJl#ghA4x-BgZ2%|N|OO@9i5P;r5|kgsl6qM%-)x}jMNgQ|(KMuC`~q`00$yQY>-
zg0CakAuJ4x3_8pVYz#~cKsT|mA7Ef&<j`qC$gwi81C@Z}SRI%f1X;i`96;qdYz!a@
ztjpmL1A_(&L>C88NQVPS7o&mzOc&5DPM}>-^A4~bfSU)D;bLHg%dj{=Wh_AM<7Qxi
N+r-RN-~qJB8UXF_xFP@m

diff --git a/route/static/img/ico/menu_icon_firewall_active.png b/route/static/img/ico/menu_icon_firewall_active.png
deleted file mode 100755
index 5c2f49f795f494c62305ceca38caa6fbbcd49f5c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 310
zcmV-60m=S}P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0002}Nkl<ZcmZv}
z!7Ckb00;0dmpM4Oyn~f;@du2Q!yMI4j!xS}DcZ#m7qJx~JyLR78oi@-aIkh<thOl<
zGV>?6D)m{vdGg5TlRH`sT6cmQdnWbdfj%34*|%lFurW)%I`Gqi&J?bE(XA;Bw0Z5f
zPbpj)&ND3foWdVtdBTu(^R`pCG?GV*qt}dD3V*%VtUYx`F`igfOX1jvmu?LuiFcSz
z63aGI*!3Z?iUDshm;Y>9OkvValGspGQ|FtvDRekeNfPU-snh91C3mc-<q5m0xu?a2
zr8KbS)Qdb&acECRlIZf?4{do&laJ0!nRRYD&(rVLwO48I4@>L2wKKLCK>z>%07*qo
IM6N<$g1ice>Hq)$

diff --git a/route/static/img/ico/menu_icon_folder.png b/route/static/img/ico/menu_icon_folder.png
deleted file mode 100755
index eb3461c42ac1450228901ce0b20009a0d65b52ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 274
zcmV+t0qy>YP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0002lNkl<Zc-muN
zpaPf?G;8Io)w4Fw^u?iI)}~p`vs7lO&1{`nHY0ULIv8foNS+}IQ?O;GC<DVxotYLh
zOJ<fqVad!%Ggr<uoXH7MAT%Rm*0forv+`!;LSfFVf?3tG+GZ{WDcC$ye&$4Mmd`Yq
zITxg0#Z1qc^;i`Y&k6)7m^ZU(W(cPA6vmm|vjsp37R_8ZQwEEErJ0QoUmTmc7OMr3
zGh-kM-p#DWs-R`27DU1InQ^n!W~rk<wOK|pr_E-9s0^F6V%F+eYf#|oSvzJ1F;E2n
Y04N=4ZdQVCh5!Hn07*qoM6N<$f;4k)ssI20

diff --git a/route/static/img/ico/menu_icon_folder_active.gif b/route/static/img/ico/menu_icon_folder_active.gif
deleted file mode 100755
index ac45643685c6fa7f84d74e7ac3ae405e35db302a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 719
zcmZ?wbhEHb6krfw_{zY*aMNt+)Tx&*U!FdFdQnkPe}Dh!)2Hj|>S}6gE?&HN_UzfE
zOP8))yLR#7#oM=UU$}7L`Sa&bo;-Q{`0=Ahj~+aDaPQu|J9qBfx^?U3&6_uF+_--I
z`jsnJE?>TU{`~oK=gyryd-lwkGbc};+}he&RaI3{QBhD(uzL0C=g*(ty?giS)vI5>
zf}B7JQ2fvB=Nc01>=@u`q-Vg)2sBIaCkrbdkk(;fU;=uQhk=1D!QsGx1s*I6Czc3J
z&`{vxb4zxNwc+q&EIa9%B`$KT%~>tqsE?yK<fWRcaD!q?p|UUY0T<>?%sQ$JLP9EK
z%B2h%0(J6o9$J!h;_M#kvg|Wv&Qucdly~7;xM-nfC4(c#QcgYwMg|>Lpv_!B1_K+L
zLqmZF4->K!BW@`stWr!M13^+uKm)lBG$eSaF!h~C5rBFUF3k*-76MCKN%XcBeN^CJ
zxUj;618O%kEch8f%D6zz(vj+ingVn+H-io%&;mZNwCI6G$B7&|eI6-`8Y~#*U0BgD
zVU1EV!V?IU(jb)#68$G!7z+ywq`F@`a^&Dx)wrfingix(0g%azK$BU37Rxzw2ry|#
z^)ojs2})SCb}~JBkYFNq<7hL3V8Q$c3Q#YBwJ-p+00WXu5vt|zk{}BM4WY)T27wMT
UGCjwVc2@`}G_5z0WMQxd06wL~jQ{`u

diff --git a/route/static/img/ico/menu_icon_folder_active.png b/route/static/img/ico/menu_icon_folder_active.png
deleted file mode 100755
index 871688f67de175aada565e0e6256cbc3543e3758..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 239
zcmV<L01*F)P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0002CNkl<Zcmb`!
zElWdT7y!`oyxyQ}D}rD#2;w(_AQ=4*3$x9v|Hir>VVJjDO>2T+5YZxnAHji^M}}o^
z*Yq5J7G&44V%{JwH3T_y?m=<l!<%BF_%@6e6ItgHxtp^r1X=6r*>mqp`jsjzEh`mL
z$5xza$OESZpSHc4<w#vHw(mwmhGka;l?~ULR*mDmU`;!oG#$F5VAIGfJ4RG^_L%F!
pwA8lfmLPk&=7edfV-Oeq!4IrmM5gZ3>TCc2002ovPDHLkV1kQ^Wk>)3

diff --git a/route/static/img/ico/menu_icon_ftp.png b/route/static/img/ico/menu_icon_ftp.png
deleted file mode 100755
index d57b21cd9bf4576b793e1ec501913f241c33ab9a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmV-`0e}99P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0003;Nkl<Zc-oDT
z&nv@m7{{Ls#la0X2j$>rer#$kv?5A0KT0Vsav)C1B9T8}v|`WevnYm=Y4c-6S(I{c
z@fRp^aMj8ThpF#2DF>eS?RmZGd3qj^{}&@%@=k(t+`nL;hy%7b<%3T`>=Ibd|ADoD
zn3>iJ!mP2%KE*5(_T_vFW`PgdiQ;6IDO~K)O^S)^>_V<g2Rp<$=8=0&cwvhkF8z6F
z!AVHOIM}8XgO3t+v`T~sb!nl4pa_F_MOefmf}dUy_Gn8BwVa7y=TIFS5yH+9jUq&~
z#u7Gc#F!&O5<hp`vdJgMc(}lpU2}jptz?B^W|(9QFLqK4{k)=wam}SQ&|vCut=pJq
zDT`XPPu<$3qdLG14?J?M{W_|h>Q=Wl3t?WZ#Ca!`Ns_qLOAr*wO|6ycfP-fXKba;|
eo#~eS`QtBMbHCt1iBA;(0000<MNUMnLSTZLzpCy4

diff --git a/route/static/img/ico/menu_icon_ftp_active.gif b/route/static/img/ico/menu_icon_ftp_active.gif
deleted file mode 100755
index 84d708723ba117cc4f40afb62100150ba4e8591c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1054
zcmdUs-%DCy7{{M;JbL_<xmH`wewnVcxzdxGSuM}fv+X8glZc4n{s*sy$niL{Fc)69
zh=?w_a9u=6copI#!i9*0h<FuSH-qSQF<Q9eDan6f@6`*R@B6;r&-1=|Ls>^Z$UzRj
zDS(Q__3^zu>cWcF*P%H_WEL%3u#$Dgx8MlRQsLS5v|XAT7w2tny$j-kttaW2^SGz|
z^Yb3JCP8g)Z*OgFZEkLEY;3Hrudl7G#bU8&G`hOF8i_=fmzP7KP%sz_1Ok4)-{<pr
zy<U&UQ>|8SZf>rxudlAIE-x=HE-uc`&(F@zDwRsPTrL)ir>CcdLLr~e=W@A|lap*V
zdwhI+baa%-WYXz$DwR4sJWM8&2L}g<L}G7mZ+CZhXJ;oKkC#d%_^+0#Dw%e=-c6A+
zPGZo&L)h}FKbVLB3iJR7`$;kYJVjFs^Jqw?b3O@#8PkYSt2J3hR~W<8)8VmkbKi^M
z6}z_6*!|McX;$_-!b2UF0pgjS7#L9w1-eaC&q&|sSf52h5xq=;QcO^jBxO@l<}OC<
zq*TK_gh@rHD5E-HAPJrA`Jh!xkcO~Arx}0zwQWMx-@d}Q3_r<FOEQZ7+pbahQ4|&H
z-QV0KieRl;JN%%thya!_x0}xLT6?iM1!Q>9rjC87K_#yl@mUSfBdn1OB&<=G1_tUz
zb)hia3k4d5m_{M!HbGqoh~9lrOu!@wHYJ$5)J~}DfKmOW!G_^%;+#!@Y=bVx(l3DT
z&7_~3_-#J`DWJe(`w8h5ksN=3`0vZ3EJQfSr^Wa!5ph~Pmhd<tp)r(?^8^SY<W90&
z2>KewIo?v^!l00iKo}5YF<5`#E+*z;io2Ky#cIjVAmHK1Vhm}l)70>&SS-ZxRs?xi
szm1(W#&Q97n~VmKNTm{H2@v7(ZG>P|^aA!X`0NI7oNfkalKElmAH<mRegFUf

diff --git a/route/static/img/ico/menu_icon_ftp_active.png b/route/static/img/ico/menu_icon_ftp_active.png
deleted file mode 100755
index 394a71a806c322037663e5ff3fd68e44fdd433be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 365
zcmV-z0h0cSP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0003rNkl<ZcmV~$
zNsA5u0D$2)gW}+Zn}c$&e6q|aE~JPOjir?0A_wB6OeFFHkdmU5wPZBbqKHxsE`EU`
z2Uksf*2Cj@DoK(gNs?4al7rs*<EK}~B}tWJo`-IE?yr9)-E+fiNtMj;#tBPIx$3e9
z=DT3Z45^Z{{@UV&^-ei%v-@`7s8pHjovrSg_S9FOJ@dmYJH0hamGvfN%xw!@cf|sC
zEtAJqs<PD`+2^91Ga=XPlKVEPGVoGHJu>ErNu!=vBQLB_WyBk&J@(r*pL}%FKTl0~
zZA6vq^~+M19B|Sxhg~#^{Zb{FaKua-t+vW$BhEN4DI4rIZo5PF`rwPN-rM7lZN`mT
zmnlO-L(~2M_-)$I&`)==*ucQRa$~-OZ`N9FU|?WTB}tMbNs|5p$y!S|4bG-h00000
LNkvXXu0mjfGA^oL

diff --git a/route/static/img/ico/menu_icon_home.png b/route/static/img/ico/menu_icon_home.png
deleted file mode 100755
index e198671c0db26bfec80d539ea822d638c50f4cab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 271
zcmV+q0r38bP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0002iNkl<Zcmb8c
zKP!X*00-b7iou{x7K0?K>DIesvPcGhQY4X-0h<)DnJ=U69x~m);<g+45>`HloOoSQ
zJWu}3mEQbDpPE}WV-6jeO*j3Tb`#qkt=Msw?+m)PnGWl&jjE?$NXu%zSn*^gpOmyM
zq>FhirMy%2ppqX{wUm=MSFvOyT?|`Pb&(I6CexuO9mX|N&@hpxYP-=kofy|hLBm91
z!>Iwswi06+DX1GwEIUZ-Sxbzlr{LPWDJS+5d(KRmbCZIa7tdZTB^JGS_UbZ!@dkfQ
VYC+90XtMwS002ovPDHLkV1oTVaTovq

diff --git a/route/static/img/ico/menu_icon_home_active.gif b/route/static/img/ico/menu_icon_home_active.gif
deleted file mode 100755
index 96c3bcbf9a14fb2aaa3ff93d3fa9388537cb896b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 976
zcmZ?wbhEHb6krfw_-e**`t)g;oh~{nz2vsL_%uiD-@kwF-o3kb@7}(B`_`>nH*Vax
ze*OBWqJ)(zS1w<^eCg7qix)3mxNzazxpQaFo;`Es%<0poPn|k-_3G6xU%u?`@9*sF
zY;SLGZf<UDY^<xRtEs7}s;Vk0D=R1{2rG+QyLN3vSsc%4o6ny=-@SYH{Q2`v{UJw>
z9yOaCU@<$uXuhAt%mA0}FqhsihlwE}6>)ZxgEUrq2pzQ(I&8;v-iiSmQ2fvB=Nc01
z>=@u`q-Vg)2vno^lZ8``!HhwNfq@a|Nj?S#wpNGP1sSguERH<MGEU*KT&<%1)x#}d
zN{VAp(Z(Fz>lr~FT=os!yiHXT7?c*WCK&QRpSqAybM@IQ6IZsvG(}DgE?Hr2$uv0z
zK4*S+E|*}zG9hhQCteXL#WF=H5fvw;YBLsQCPo%l))q4*b~!TxT{C?{Glgasc6A9g
zEi)}O33YZSN2tpf8FUzdF5?HfjDaoxKtsU|$AUJG6phB9618q0qYsQROafP$Sp*bq
z8IFHQ3{kLL>2B1ti09(OOovUcSacY=V>;HGXh<m*fvwh-E|Sr9R$_AxmSv4|nouOm
zHWlcCB86GbtU}H_&cdu7KsQ*JGnrW+yFmxp4W$m#P~9-;D`QLqb~k8xZ+f+XI5z-o
z2fIQQ95l)hm#As!poWG%vP-HCOh<LeC!kB>u)E|X&?S2axWt*q1sojuU?=D+%mxOE
zs-BL%t{&Vu`bf@Um18hMc20xCOjPFtePfJC!S0-uKAT>h!08+(9v4vT7=hhkB+E7p
z7)M41x<>kjMhXidjxs`Wlo7I{0)S~+hmC=gft7(7m}2-G7#b8+cvu*l)|jon*u-EB
E0QyoN$N&HU

diff --git a/route/static/img/ico/menu_icon_home_active.png b/route/static/img/ico/menu_icon_home_active.png
deleted file mode 100755
index 636e26ebef517827b166a4aea66594f095ee93f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 308
zcmV-40n7f0P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0002{Nkl<Zc-no@
zzbnK67{~EPq3afBR2C7D)7_*f8H^%v5eAZCQ1W|`Qbt^&7_j*<Fv(wlKf=I#f5po{
zeb1frS)QKWefoT!C&d4%Ty#5-6Kd6|sRo+td$B8P(vBguzkyaa)`UfGmTkM&SPpc$
zv+^@9Igq!jApv?kSSoW{@T!nx=<#U2BJPYU*>7Ofjp08kj<_`z!m4q7npHOHH(@J;
zdf`&95Yn2Zg^+hGq`v8lqMR_`$%$u!Le@!Av*8DrbD_(*1)*Cp0Wyws2;<g;RRy8N
zak;~(8Ey7#3LEycn{t*MD&<hgyHB&iv=8q}j-;x;S*0&xh%5SC7iFvf0000<MNUMn
GLSTaZM~i3x

diff --git a/route/static/img/ico/menu_icon_log.png b/route/static/img/ico/menu_icon_log.png
deleted file mode 100755
index 774743d9ca30c470da6efb581e607c4825740be4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6nmt_{Ln>}1Cn)fJ;r1zWIKU=m
z@^Yoz<ynH4F7x@%?^%{|t0d*#m!FeOmwh!}z_sx6vRgjc$5tlXs@mXcdU@AH5ufme
z11nW8zh189<2z%UtS_U70NceguBMDE8?_WNn2G`>E@zNc(9W2Ds#(u=e)6vri}Xon
mw!C}!bwxqc_Y~emk0crXX~i#zk_rI1iow&>&t;ucLK6V<o=HXk

diff --git a/route/static/img/ico/menu_icon_log_active.png b/route/static/img/ico/menu_icon_log_active.png
deleted file mode 100755
index 0d0e2f156341bc33eb7edaace117ef44cbabc747..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6sy$sCLn>}1Cn)g!5&!YNfhF?7
zQrmy#%AWH7>?M6q{(q^l=jVUZf8Q5t&FDY(JOA^3$?Z*F6S}khl`q!(v7Vt-_5bVt
z>VN!y?3ayoWMW!0vpcQnP(AA#E{<6ZA|X#S4{+3}u)h6YX|TldpTAo{%D?je>)o60
e{x|LDN@rmI(J7RtxaA(u84RATelF{r5}E*!lT0T7

diff --git a/route/static/img/ico/menu_icon_set.png b/route/static/img/ico/menu_icon_set.png
deleted file mode 100755
index 74b247163b33a59a10cbd13d15d6b00a3154a846..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 319
zcmV-F0l@x=P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00037Nkl<Zcmb8c
zy(`3V9KiAS%xYjj<UHn1e)4oBq)aRl$sjWF7f8udnS|Wu{Y5B6Mj0#yi(R7pH@e}v
z!Q}PgUoPr=^(~tD%bdfIW?XXJWiT^Gl^s5K>xuU^rUt`fpA5UGaMTNM+5&)$&Vn~F
zPL+EWAvL+>c4~*1j6_A$yWq2fwt5{yDf7}!vv_g2)IgbEuG$Cg+6Rzw?tytX{ie*X
zm^rTn526boHM<YCxacQk(dLSGk)>X5?M@wDMP{2Xu9b3BxEo_&kB1(`5Lis7R5{=Y
z*l#~Tsm22M=m-_&4R1X2-EnZo@LVlWW!@=p&W#vx9-Oe3zfzMQ{zNzb@eAvDddYw%
RSF8X4002ovPDHLkV1ks9j^6+P

diff --git a/route/static/img/ico/menu_icon_set_active.gif b/route/static/img/ico/menu_icon_set_active.gif
deleted file mode 100755
index 82fa4f2641057cec61638e9f36ae551e1555433b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1923
zcmeH{-EW#z9LEnY1)lOwAKprNEu$1zOK4Y1cSH)5QU>_Qup@+!+UU}l#*n5l4I!jF
z4;`bdAw<bs)JUC`QDU^ItP*Y1bPal8VlTa0yz>sdFnXmA-D;;--gsfM^ZNtN=llJA
z&Y7L_PTF4*00H<Ff^xasYPAjy4w}v8{{H^n-k$2fWBAx-{K#i&`1AR^rS7-X{2Ln^
z*1G|MAhOx))Ez97$xPkG9B)L@>9n&Pag`#eRLWbNUt3%A6{3NSSmL$C01*piW8ri>
zwz?2sS!lQ0x_z%_Yu-@__aC~jO#JxxSaj@|UrQJpzDlLy+L|9|dGvc;+jgi>C`3{T
z*_Te+cA!`+Mqf|xzJ-FeqyKYPsZ<IPv0`Z}T3e1M7e{si>3pVCE}QE9$vc=YAJsHH
zuhvttL#IC<Rkb|h?}aAb#wOkkp-0Y0eF@$U`x}e-QsMema(O4UP+Q5A3CY*aSZ(>`
z)g{KsB&>v2(yRXZV!Dt4|NYVa!4AztuDYkO8QX}JMj>z1{!T~u00IjD6u<{O;AGxi
zhd7~}8qyNPGZHITFenlYbH$^mnc&%Ae-B**FIx(5Yyisp)EA&?tYFqN*;cI%;V_W5
zpdHmf8Xp(ac7%4^$c9`laimv&VuT8*K?*fr;A$2GNAFyOOckyhVf4y|d%43R?x<9E
zsKBXJD5FB{$URx)h{0!3sm6y|;)kjnxqjl54rXT-J^;I4{cL(c^Ozd|3x(w7kpq~G
zb%5(;G&ql=#EZ({5YvDK{l;SPibg4v0EwcgQ(s`Z_;~*;f_RkrA%g>S(|~8^7%F!k
zI3v+AZv>@)_8}0{z$Fxy7y$J?kWoP}05lwMR)-F8D!ecZ1XM~dcwXvbKNsZr-ye^n
z4}1*OCMu@1X`45>P7CtO!w2*pHtUw4%&OAx9vn+zdZXZ+zq@rlIe@uK@)JOp%jbet
z$xXrx%p4R^sI6Gedrdg124hS)$C_iwH4#1@zo@!J44}4030`F9q?|K;lpzO!D>!YJ
z41l{aEgQwDpLGLBS#tn&3m+%AdQF=fk3Qm`4|E9O7&k$G<tOToo5Zx{Q%|xC=<71p
z{qH;DOD>L39o5Tp_uPZiXtgtmvd*<RuYa4=20zuNU_RTnnRvpDH(_`6WdGgWKjG3p
zG&mKg2E{ZuCbZj0Cz_{DNKJo}ar@E)>~;@rY{K{(DOpXgrhn&KFL)a=L}cpwCOdlr
lQTsa`>)=UMU`j>;e^Eb`=2ZKq()?>_ddTPbzx`=0{|O~Nv*7>$

diff --git a/route/static/img/ico/menu_icon_set_active.png b/route/static/img/ico/menu_icon_set_active.png
deleted file mode 100755
index 1f61f25396b6ed8a68e708361a9f408e60f6ea97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 308
zcmV-40n7f0P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0002{Nkl<Zcmb8c
zPb-4~0KnnjnX3bb5$!dbZ1T#?N=P})MI!AWa^w?8$xu!jY5rv^MUHaV#lgj0qI{a4
zc6fUaJMDSsh&{gh;Q;LnoCZs7xMLX%4TzcY*@ji0OxS15b6>5QCgO~@;F3826E1^w
z=ZIOc2==@0fy3Z}H$?1p%{QkU^1-~Jca9j^v}_+O{<!5hc;q;MffX?8p1-vCW65st
z#58~d9)p9f`%Q~UH+?j8%!V0L-W!^<>9zq8kDLWZJ@w2ySoDIJlUBhACjjg+2fkP!
zV%C~<Fa2~5JhbMO*XD?sbrD=~*Mh6yykoSp-!K2n(20L~(XDSkE$dPM0000<MNUMn
GLSTZO^Ngqf

diff --git a/route/static/img/ico/menu_icon_soft.png b/route/static/img/ico/menu_icon_soft.png
deleted file mode 100755
index 0ea48356bf128d6da5c8ab520cddc43a0b81f028..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 303
zcmV+~0nq-5P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0002?Nkl<Zc-oDT
z%}PR17)95cG;tI}gbf@N5kb%(1$&C3K~O0A5J3$?aurDaq~}6GMMP2&biL9mHSi!p
zgnhHU`Pl3qn13$Vc5G_qi!0!g&t|5M?U@5?`DDeKRa-W}3vaAiv*LpTz)z2&)`kgq
z>vqHkegnQ)kHoG6u<KsLCyoH$J&wdyeAtQj(D6i}Z_%<PPrV0&XO=8mv}+2Ow`njK
z?70c9+l~0z0{`h@*@lV1V8=DEVB26Y@zOltaK^(OIPiSx;S2C%CPe^yzf;WV;qNB*
zCrx%{wzvWt(=8rN0CV=uOdUD20IvG#$kfcl#UE>Zyo6V}hr0j(002ovPDHLkV1n<D
Bhy?%u

diff --git a/route/static/img/ico/menu_icon_soft_active.gif b/route/static/img/ico/menu_icon_soft_active.gif
deleted file mode 100755
index 779c78f23fd376db570b609782917555072f0979..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 955
zcmd6k-%nBj6vxjM0YOo?{sI(5^eQUXOa35DGC;T@ImgTyBXjxMV{>JVF&I%JrcRv`
zW^IWPFd%i!S}~^0Ip>@ibH<!w4*eTy>#6RDR)0e0<-DEq{d~TC{bXm?I2X9^9pLEb
z=-}XBYHDhKe_yd=424397shZnER1O!4hQKn?d|Q=t&`Dc^z`&Jl}gRb%#>`a#2aMg
z2kq+WYS|}MGMOaZBMS=)i9}*&XGiNESzKI9r_;yB$MviF&LyKPU~oE}gAViA+1cUY
zVJsFi-5)br&BKqzl#4@#r>4otNy%GM8rHj9t|7~4JRaZP-gdj)2B&FvcXxAh(_*n$
zt=6jd+5v~z@Ar3ljpm6v{7seJZojy=2m}INuXlcaes*@2AJ?3moXA23qh(YW*GQv!
z<-*XQ-3<Th)cnjJ)D7S0RU37!Epi${<*fOUORu7~3;>}@Dgt1>v%yuISIWzi!?iL|
zod~%M1;x1xMnN^S(l{lYDhzs*;IBmi(fUEH0v#j54kDTeN8}Sn+BbS5>W?~<T~S`s
z1=uBiB_F8+c{TbKzXELtmg*oP>GN}zP>`av0YOU%gc2aJ&-{A9zT#T~ikK0uh7KbJ
zJ}^s6<J`&c@Ea@L#M%lxJD$EtQ%>And&vOKbLGRW2P@i@LUPL`zt>8eR%KBLkRcRG
z5ilu~TQ(VuA}C`Kjd>Ii-jH8K0ptsbmI4MNw-_y=6TTb)fj0YyCSGAlh>sC?MMxZB
zhPdl^&=)SmsQC5px~9B>jh9M<*cT*+sKwD_wbcGs9gF(M%&0Tjvc|Ha5G~B9RfuK|
zI8S;#YEf1Pr6JToc%o7qT{p<lzRY#J+0(?sD?DNz8lSt)GyG1d@8^~7H2(7p0ah07
zwoPt8AL9d*L=2-W_WyCN$T;s2!*V;-QSUOSMLI^1{R+_pIienAuy#!w>{j8~PKB9H
T1q~=As9y>ak`gB9v_tnVD?RZQ

diff --git a/route/static/img/ico/menu_icon_soft_active.png b/route/static/img/ico/menu_icon_soft_active.png
deleted file mode 100755
index f0c8e4a989dbc47422063e6eb2e2fcef24a722dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 311
zcmV-70m%M|P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0002~Nkl<Zc-oDT
z&q_jZ5Ju0Nv~d+gge_bY5kb%*1$&C3MNlaA5J4?Nk^;#;>F+{8MMPo|biLvuofcl?
zmW!I*_c6?Ta|Zq{mwYiXc5K%ixM0h%v5Bv)0A6}))tVI_?SoC9tyr^a(+1$3+v%(W
zC*Y??sopRG?6{X2Cyv0Or>WkxKW*4ajYG%ayT_^Cnl=Q_Em^i`#~2*ivuN3pXFdR~
z+c6jn-dF(hHd5VnlmBp7wr*rF*meyp*fJQ5yfP0s$n3la`(Dg4eF1)CQU|d6^QyVK
ze{-25mm$0F1hAc9e+|}Wzj>OX&e=0DcI3bUxaylDV-q76zX7^5_vCd@Bn$um002ov
JPDHLkV1m%}hdclP

diff --git a/route/static/img/ico/menu_icon_web.png b/route/static/img/ico/menu_icon_web.png
deleted file mode 100755
index cad87fbe344cc63ec8d9a995a36aec114f55d662..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 363
zcmV-x0hIoUP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0003pNkl<Zcmb8c
z%PNF%9LM3W4R>HMMoy`*p^QTgTOymu7%9goHB7S*IhM`jFt0;QWd5Ju4k@hcZ~=-k
zHd3>(lk3piEX0cE(LXT4jlJ{99b@{93bt9|!sbYF$^ttC^v%^$aA6{Ztb-;RT)%7K
zl`0ic$}z(%lV=={G*i5==0-T8R6gRCl&pdb&Fr#CGe?w5mLx78*90W%U`Vnax+F`|
zDiPpPKAvsDqIeuygabT_*a;gJwMm}j<B=GBr19v%BTcUzvQ9rS9^~W7f|7L+ldP9+
zi4^UU1-X=uI0-3NiAR`ywh42bE0;(Rmya^CHpB{frrBqUS@JA0NR~1cxjG885TV{W
zX>=hsU~Rm)8hy)Ev&SmumSTo8=E=CAe#(|G#XTQ<aLcIv?h6a}o`~fY7UKW_002ov
JPDHLkV1oTWoJ#-z

diff --git a/route/static/img/ico/menu_icon_web_active.gif b/route/static/img/ico/menu_icon_web_active.gif
deleted file mode 100755
index 81c90c85dbdc6eaae1fee34327603b4e615be675..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 766
zcmZ?wbhEHb6krfw_{P8xP#5FU8|K#-Wivg<t35(%rI+4vFN4KCK{YW^MF}wlNqS3t
zyjmkn=KJX^_j2nF(^~Ciw9qfCBF=7dkl9>6k;8T&RWW9>18k-Oxd9FnL!Lf;`taey
z`}gnPy?giS)vFgTUOapD?CH~|Po6w^{P^+x`}gnOy?f`*o!hr>U%!6++O=y}uU@@!
z<;vyDmoHtqbm78<^XJc>J9qBv*|TTPoH>2^^vRPax3{;qwzgJPRaI0}eEj&atgP()
z`}eP3zkd1h<@4vy_wL=xFqDDfe{Mh5kYH!W09PYD17=2`Ulf0`u<`+E9R>zQ27U%0
zlRdYAp{dD8!PZLNu({h>LrYmlS4CUhy4%9e+@#yoT-u^p)u_AMNVQ2{cgYf6eFnv8
ztDCKr7-S4KH5<q>$Qti#GL~advOK_Gxm929xZXMjhy9yO9GYj$nqy|a;F_AIvaa4_
z^<%5`<!x*_yBiTMU}0cp;9y_^x<IgjfkB9gL#RnoREk?rN>l`<iiJUkg@F~Wij$p#
zyP1`XiIIheiG`T~rV8jAW(IZ!F0ff*4gB1E{A}F(0_^-Og4{gZf-HQzEHI_4AOksp
z1_Hx^ovVR~k(Gss6~!bLpgAyUPHql1b`Dl9h;9c^u(2?3!<{1{D$K?%Au0}XyqHi|
HBZD;n<oB>U

diff --git a/route/static/img/ico/menu_icon_web_active.png b/route/static/img/ico/menu_icon_web_active.png
deleted file mode 100755
index 262302881a9081072cda50ccd334b1ee73b6598f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 343
zcmV-d0jU0oP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0003VNkl<Zcmb8c
zJxkO900-b-i+%%#^Q1QdT?#xa%vL37InoQE7d;59!$FE(q2;LbZ%K;cUJ+PRTlE2i
zg03Y57dPo^Jn_dta;oRae=y~fUB7*CJ%{PF;DPt%wY+i9l1dIZVMk3}zhP$#7&qjX
zquHm+x~m@QxS`NC<EJO4tm#TgQ!CMH(V&-}8?>e;(b7!GN0r2|$;7CUM9bMk#b!!=
zxM@ORMcr$Kx(&}vnD#v--!xp(Rv1-i8?)l6aSdB3`JkE@(MXKBn3!`uQMH+prrAWF
zLd~)THS2m3vzjUCwrbKN9k(od;f{{`u2|KbeNNgjr0$dpPV0BsIoposfMZ^H?43Ec
py>-{3YX0Vk8DH($^VzlhyFXJt-4#5w#&iGx002ovPDHLkV1j~~pFRKp

diff --git a/route/static/img/ico/rocket_min.png b/route/static/img/ico/rocket_min.png
deleted file mode 100755
index 2198d40861f6e6ab3cb08a90d6bdbd096570750c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B0004cNkl<Zcmb8r
z1MeI`90uUpwr$(CgCeMH+qP{Ztj)0Br2Z1uXPdcXGyOBkv-r(>@62tHOeRxcO&<0u
zP8~+FmzR9yRbfinvy2@qWfHxZ$oqnxVjU+KP3dU8Gxzf=smM{bhv(`vjWUy1lUqS)
z+HiuE6lFX|ILHi&hU^OZ=Ty>)?R?;Tn6=;p6)Dedx=@sz)Qn4dax2_dP$$eAbB5+L
z<_HZL!6HhgOPX<t#=+WXlVKd@6r(7`Y1$?0*-%+daExhuVP+10y8-pX^G=ph^j}f(
zz!d(lnpU*u3JsD_EaVPRJUdH<#TY~9C_Iw;v`x*ra*`vIOy}dB>a&mr;e9mcS;j`T
z^OnZ(DT_qAonrxqXcFdwc*00}vz1~w7FnpnIR=LJjZ6v8J(xlhPSGMRNq_8_iPXt1
z(kQ&o<Q%8y5*MV4s<DRJEan<rLdgKWbCrhikK>|+JYo%VsS`?yGMZT-Ox{I@SU|0K
dG5V-^`U?^@q7_KI)_DK`002ovPDHLkV1i2h$MygK

diff --git a/route/static/img/ico_line.png b/route/static/img/ico_line.png
deleted file mode 100755
index 330c8a93b64ccc3a2b6ab5c1a07762029c0114df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^j3CSbBp9sfW`}|}#X;^)4C~IxyaaMM3p^r=85p>Q
zL70(Y)*K0-phB`okS_y6l_~>6Lo)-z&;LLgsJPUCf#FpG(3}|z4C48d;*Yuk)pB{d
gIEGZ*O5VZEz;K`8Udu-=YoI8Dr>mdKI;Vst0RCPfH2?qr

diff --git a/route/static/img/icon-item.png b/route/static/img/icon-item.png
deleted file mode 100755
index 4f7afd85f97954d7ed25eecdf1fa9d73e2ca0614..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 224
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt<(@8%Ar*{or#bQ-au8vi*ubJv
zqv>&gGi<^Jz6}k`1rD-X_IvW5jk{MlY37r=>1NeG#1)j3l=|=OE?<6X{qcV(KWm$H
z{=bZ!8Xi~qbZYp&Yt`Sneto)sIX3V}{^!|!ix>U<`AWB##nsN8;Yl%z176CN;fXU)
pi3^n4@ML+%#p;Vses*-6U}MraDr%r7?+J7=gQu&X%Q~loCIGpNR(=2g

diff --git a/route/static/img/icon3.png b/route/static/img/icon3.png
deleted file mode 100755
index d2b25e28db94efeb1a312102d301fc9104721d86..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 330
zcmV-Q0k!^#P)<h;3K|Lk000e1NJLTq000yK000yS1ONa4CxF$40003INkl<ZcmajM
zK`t`^00z)6wQvBH=^<1X4G{-&0%9TE*x9mhnNAalwPc2n-+~J?Ch1mqQiLJ>>%FvD
zO%kOtNvviOYfc;|iBg#)j-6P`Px@{>+e;FqGD+-tcB`LnHcizAd8bt7oq^iaW<Dr9
zs`c{8*f^i`)E*U?Gr}-mT)NB`LyVFrG)~jv!bMt~Y7}v3W-Bdr?4-q(nZvkurIRIe
zT=^G_^9N(%)g*r~A#PMUSwctUCicy2X9?S8_M@wDmL;5Nbdxy3F#lnQqs%EhsP(dd
zp4x*VA8eSqHpnjqu1#&^o4z|Q&h1)B5-WC{dvT|qpLC5ho>V3#Do+|C-7I3=fy!Lv
cz<OHV0H%TLt*v7@8UO$Q07*qoM6N<$f^*%9Q~&?~

diff --git a/route/static/img/icon4.png b/route/static/img/icon4.png
deleted file mode 100755
index ef34ed5f93c8f736203cf2f45498d04592b33789..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 358
zcmV-s0h#`ZP)<h;3K|Lk000e1NJLTq000&M000mO1ONa4xa3Ez0003kNkl<ZcmajM
zKWh_V901_wclTbCOKNGrD)?^@96IT$n;*i-Pap_>1{DXvO>lN_>g?zoS0|lB5ghDb
zLu_ag@9uRlbqK*ePs$I}l8~(nw8q9(lIMm_G?H~$srJm+N|Jo^)Lh@X*2pV8|0F%%
z9oQ^+p}@X9GryB;#|4KrxukNW^3q*X(<G2>meK0F>4S4_Bxebw(t*paC1=U#BuOOM
z|Ai1*ElIX8wb?J7FgI~eX_<sAdyZ|%0)Z?Go%0Hzv2@i!o0RT&XQoD_K<F%Gt!)DX
zg`rQvt>mrRNMT{&v$@dNc3n^Q(--emCT?rYllw}6FtKl>Rr~6j9a-SW6<MXSOfk(?
z9(rV;)pzWP*G`oRbR?&Cb>27;I=gy?X8!u&v5RJ!KY-F+{63K-9smFU07*qoM6N<$
Ef>R!%a{vGU

diff --git a/route/static/img/index.html b/route/static/img/index.html
deleted file mode 100755
index e69de29bb..000000000
diff --git a/route/static/img/ing.gif b/route/static/img/ing.gif
deleted file mode 100755
index 6b87c92713cb4d4d92df950fcdb15041da326087..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 131
zcmZ?wbhEHb<YQoB_`t|eTwKh+z@Ye_+s`#5*x50_)kx2PnGq!PlZBO!fssK6$ObB9
V0uoFufe2w1?7|$_g?UhftpQpu5mW#G

diff --git a/route/static/img/ings.gif b/route/static/img/ings.gif
deleted file mode 100755
index 88a26211689728e7f18a485e7369757e744c77d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 131
zcmZ?wbhEHb<YQoB_`t}ZxYX+Z|Nn~rx&2&2f}I@$T#fV$m>C%u7!-f9u<|i5GUx!=
YK&4DTf~h4CA<TkZm;<{o4~nog0EQwH_y7O^

diff --git a/route/static/img/label-icon.png b/route/static/img/label-icon.png
deleted file mode 100755
index 5d0aa3dce51578466b5d8bf9b752a9292027853b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 305
zcmeAS@N?(olHy`uVBq!ia0vp^VL+_G!3-pW7yK;&QuYBpA+A7LVW|}eEwNCTZ=kRQ
z%wB4#u-pPF4rBw-5=(`}KoKAts1i&r1CkbA*VRIRMu?UK`2{oh*T)OI|9@Y>V8ek2
z3miT)?4KWyaI|*gMxcToPZ!6K3dXl*wkEPTintt%t2%A-bGepm^Zoy8Rx)@+ezSIc
z8F2Miz;s@@+~w2v9ZjoP&uiy<g3C}F0?(JqsQ0{keZ_m$+Fb50yQF&GGOgKl^GxpJ
zd{f5mb!F+d*I)QHiLa)l{^oZv<-76bNB4A9ihkC57J6p&gz^i~dv`usd3kzqvB%a;
bI#=ws*BOV0dE8kFbQgoCtDnm{r-UW|^)q=4

diff --git a/route/static/img/loading.gif b/route/static/img/loading.gif
deleted file mode 100755
index e1691ac9812b124b689d37bc25cf4d83060bdb8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1785
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
VreKue;JXHW8d%Lm+sVMXe*?P3dK&-$

diff --git a/route/static/img/morebtn.png b/route/static/img/morebtn.png
deleted file mode 100755
index caf1d593f0c13d0957aa1c1d5d62bed1c1311d39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 530
zcmV+t0`2{YP)<h;3K|Lk000e1NJLTq002Ay001Be1ONa4<l)m90005mNkl<Zc-p;}
z`%9By7=~ZROr5JCBB%tSA`vMef}$u0N}w_df`(ui9VjD0#q;@q;Aw8osq?SB#IIU&
z-}7wy4%_|y_}=$@jqN?n5ao(<&WRJ}!Wsz@Bv~__MHRc8a%Qz(Sgn_&NRwgQ5F*B%
zFm9Rh44xq)cE6?Ok6~7vzGK`IHm0<G$TfXaOard5lS<=EzVWAGeB}x|qO^UsTLUbJ
z)--L7vAqiRhinhBBHH6LIl^{vEB5@RN{iI8B}R@2myB)YQtVhFSSVJ{o*3Jtx+H7^
zr(%AcC&i)>j>PD^`bGWEhS(RgJA_L4)Qy~o@vlX4K~}}wAx}&FotlXk-TL;_FEMjW
zgOio{Tv;L$YC=B!&YbOthoTPBV%4zdelL0xw7NNcUT`DUy|y{uh`yBbqvu~?k9fP>
z(D}$UC}OYa@^ZuUiKR(evW{-ik#Tp%=c0#{wHmQz+qo9!d%Zs+45MQ89swFjh;#kM
zA1RAxNjaxRjDI4kTy*v^X8e`1Q}f59@n1|A#lAD;5uXZTW2SuKyNdm2$}8m#`eMp0
z0xa6FbEXoanl-0y6Ti^4Y-h2{1s`#~qr)6n*p0vcf+~o9#y%U=naYcobhuC71H@bc
U)tbC_6951J07*qoM6N<$g3;Xpa{vGU

diff --git a/route/static/img/ns-loading.gif b/route/static/img/ns-loading.gif
deleted file mode 100755
index 095a1b5afb326e1df20e228b0ec574081450ca01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1513
zcmZ?wbhEHb)M8*`Sj5I~`t<3SFJFH6@ZtOS@3(H<`VR&S3=E3@x&2&2f}I@$T#fV$
zm>D5L5xxNmE{P?HK-$K>q98FjJGDe1DK$Ma&sORE?)^#%nJKnP;ikR@z6H*y8JQkc
zMXAA6ej&+K*~ykEO7?aNHWgMCxdpkYC5Z|ZxjA{oRu#5Ni7EL>sa8NXNLXJ<0j#7X
z+g8aDB%uJZ(>cE=Rl!uxOgGuk*h0bFQqR!T(!$6@N5ROz&`jUJQs2--*TB%qz|zXV
zPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj%k|2Q_413-^$jg8E%gnI^o@*kfhu&1
zEAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5FD<cE0=g99h1>$Tv3bRMVDIQ9=jZBI
zBo^o!>KTB%1XJkii(hGOE?jkSNl+@ny;uz{4yi0i)elN7&Mz%WP6aAg23b{L<y@4S
zSdw29lAoUg3&ntp{F40QjQj!xXJ=5TnJZ|7XXd5kmltb-_4xW)dFB<DB<3Zjdb-#u
z0Zq}%%uKN|wRCoKHMMjyHnDIuG;}q$ba8ZXb1^eCGBq<ZaB_8m>2=9ZF3nBND}m`v
zLFjeHsTY(SatnYqyQCInmZhe+73JqDfW2*%iQ6rfIL(9VO~LIJN1S@~fsWA!MJ`fg
z!-Rk-2*iXZT_6XZ_*3(MDZU7pv>E^Z`}^njub)4@fBX97^QVs=-oJbM=Jl(WFP=Yp
z`sDGWhY#-GyL;#Mt(!NlU%Ptc@}-Lx&YwGb=JctPCypOGdgSn-g9rBS+q-A?uAMu!
zZ`-<M^QMg()~{Q;X7#F-E0!-?x@7U9g$w4-n>%OrteG>WPn$Yr@}!9q`ulo&y1P0%
z+S^)NnwuIM>g#H2s;eq1%F9Yiii-*h^7C?Yva>QX($i8?l9Lh>;^SgtqN5@s!oxyC
zf`bAB{QZ1=yuCa<+}&JVoShsU?CorAtgS39%*{+qjExKp^!0Rgw6!!f)YVi~l$8_}
z<mF^#q@^S!#KlBKgoOkJ`1yEwxVbnv*x6WFn3;eDgyK&YRxV(vq5~`|7(m4f1GBZo
zuB)FmOm$eTV&Q$@cM{(hkEvHvqApk7SLjR*4ifju(Y~;2p~pE>k-V+d2kVw5teS9n
zYmc4ehZN~DA*|+c?7H@OgQVkX9t-b7Nao2y%#+H|zKCMpDMIFX?7H@0!%WB3A{M8S
z-6yXIcAr*GHmdv3&ErJ(uf(ovUp7cOtd_CxK8WPLc!>L~a#rIv4<r0Ec3u0pLDFe8
Ti^XYV^X5a$<H~uB$2@BQy{jrp

diff --git a/route/static/img/ref-icon.png b/route/static/img/ref-icon.png
deleted file mode 100755
index 8e64352183974b3c8f0cf195a4a73569705f0653..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 349
zcmV-j0iyniP)<h;3K|Lk000e1NJLTq000mG000pP1^@s6)UPbW0003bNkl<ZcmbW%
zfrbK66vpw1x?`tyWnQ46*H|G10Vo0)*ahhUA_7oEg!TbuU{@d#6hM$*7i`-T^bU9b
zH*>jKGuFi~PRDnSJ9CXArToKrb39b>oT$Px`VI8q-UnT@5n+eDAwmZQbg@Ly4Eu<2
z!59H@i3*1J!U!Q|@N`&UjU#;iOFP;lHn?H|p&JAIz)K01Fu^-kkeDN{nq?eN&)6)`
z#4B2;A-MID^K4aNLk&1%Y8B=ItDh5k7U3RFw<(s}r#P#^3gIn6T?DA1g%>m-GQxEn
zP*z1Ab4aZ4feA_};Rk$Upx=VP0#|JCl(E^z5o-uNz{3n7M)<@K732~D#<(DcZ{C9<
vmgu5@4r1&LJ49&1y}w8<`e^+3dtmwn^%@Xgpii-A00000NkvXXu0mjfpOlSA

diff --git a/route/static/img/return-icon.png b/route/static/img/return-icon.png
deleted file mode 100755
index 538fcdc6774bd05074281f2d16317da614cf2fbf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 363
zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)i!3-pq%)8qIr2GPWLR^7#z<h_0MJ^$WoCB6S
zgf4XrUF-rxAwaYU#0UkE&OmPHA|MH2xI$$YIR!6v28sg}KoG09rU%eOsgfYSU<QHy
z_X-B*|2q_XIIzCq{)2k^{TmVj=3mI4a71g(cc7|Go-U3d6^x}5n3;|kh`1c~3)ubL
z{zaakSTM``*)D;{SSzRMFnskgG5;odQD|CNzQ?r{9F@+ZQk8nS?w=EE+diiqSvTvb
zk$Rrn_Rv*QJO;t;8&2q)NI5vwxzs^U$|rmZ+w0!WV`p3WUYviy^}zOZUz*Q*^~7^8
zM8&fEq%<!sblusobK232gYK7j7H;Ql{c<^g+wJV-O%)rJ=f^6qoE>#UvhCg+EpO+a
jY@$CeeCu^F{>ykRh3(z5CGrn}u4nLc^>bP0l+XkKkxY_B

diff --git a/route/static/img/safety_ico.png b/route/static/img/safety_ico.png
deleted file mode 100755
index c3fd93edfb760abdd36d2aaa31ac6fc8c910449f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 410
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyegQrqt{}n1779zP6qZ<m5Rd^x
z%fO5!KsJy85d<@U;vhAa3d=1N<{N+&!}Wp`Hx<pE4Kz`zB*-tA!J)o?|M~y+^WQ%>
zU~qpzz=9770vi$<3NGZ!O%6^4s(R?@;uuoFxOM{Tro#pT&gM(xoev1?`tN98?mjt>
z{db$rYssg*Cb`$YGaG!Vy<TUtb@5?-JC=U=J2wJkm%q=7Tl6gT-!-+fLL0IIGF=rM
zc_KWv9dK@b5XZgq#ld9)v0GW+ZoJX-ZFYpy!h1rix^KOH{L_&;=1JVVx}x7^E7BJ(
z`XhZsJVdn2<Wsssb>@cG6^B3C-|Q%wFelU8%Dnqg?9T5;E4{3b?cVU{LB*@as<pv0
z<`fj#P1s~0B>Zd9^Y0#kc~cm!|I=Dpx<X4hy6JV%JDE#rYN`G|)ZV(rZMw4S#O$9;
Y-K)4I519R)4)iR8r>mdKI;Vst0Q;7#oB#j-

diff --git a/route/static/img/ser-icon.png b/route/static/img/ser-icon.png
deleted file mode 100755
index 6ac0130be1f388fdd9584c2dc7b6924324013cc9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 275
zcmV+u0qp*XP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0002mNkl<ZcmZ|6
zF)M@t7y#f`#0{4WLKcJVl9FUmSF-p4I>HYyuqjuH$)IF08Ewj7p{}#Yro<#!7!I2<
zxZCd0*U_D??s?*mNhdy39Lq(T4tr|&R>PO=Xr<E?&gJzRFsF>OXtIl9w6KrOXfUd(
z94YQpWh3DbbCF^R^O10?Za7lpun`G2>P8~PIMyPeh{Z^;j+sd4^X@VJ(XHY|S2S3`
zsZ9LRtAy2Pa)38m@@DP$lz1={O_sg-^Q54JXM@qol!65l5fL)3ac?Zz(c=P_(Vna$
Z(?2!FxoTp$Od9|I002ovPDHLkV1o5XdMW?_

diff --git a/route/static/img/soft_ico/ico-app.png b/route/static/img/soft_ico/ico-app.png
deleted file mode 100755
index 1f00d67120e07540f9a1f6e22fec28fd77dd6b1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 581
zcmeAS@N?(olHy`uVBq!ia0vp^MnJ5=!3-q3*F@F<sqg@w5ZC|z|8rc|;Ju>8dl`t-
z`9MewNOE6Q<+}u8^ITTpyQIboLaJaAB+CP2Ush+huK-j4)Cg3-b6FiI%XbAx0%cXI
zU*}B%S|M8!<QL4K5Wjx^|MU3<_v;-#Y)A-L@Sy*IK*NRi6XqBA+t-R-c4J^*Z18k(
z45?r|I;DNuBLf~+!zXET-aW8-`oF$-^)k-ZyTO8{=XZXZ+&|^=;X`xvWgYI@{`}8$
z&Ne<t;y<U4?3vS6fB(JTzTt4eKL41+`29;eE-Xz}D4p>2m(}Ip&WqB&wZ*J(Khyf?
zOi1IsZ_{S-I(>VobN66LMrE4mlfG}UAI=|mnlGw-c<t8CpSyQ3H7x0WBCVovHZ;m=
zY3r+hX)<{ePJO>6{qX#IrIlrSl*~?*D;jm~*U;Ru*~iYQ=}8Y)<P9Gc-k|-HlfKAC
z6<q(7C?RsGKJ59i*VaOcYONBxdm6+OPcORX8mCb4_KFMBC6}pJb<PEgOj>$aEi$m9
z^u#>J32_2@Hho+);d`6MpTA$vggLL&@vW=34>}jxd&p~}+L@CqOc~FcO_LiHj>jxm
zAsu&Pt>d)Bt%t&^PlSIko5<F*_tJ`cDpf1*cCdzB4z;X1VpdU>)xA+jbm8m7lK6(@
zTyIOvV;I_Azn)#5pP$U{QW~aa@>#N*Rl@M8>NMM9d*;fC*)w+93;k<qZkZ2^GzL#s
KKbLh*2~7anB?Zs`

diff --git a/route/static/img/soft_ico/ico-beta.png b/route/static/img/soft_ico/ico-beta.png
deleted file mode 100755
index bdbd32afb0bee541c04f16f77c6d8e684772d65c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 398
zcmV;90df9`P)<h;3K|Lk000e1NJLTq001xm001Zm0{{R3k6DRB0000mP)t-s|NsB<
z`ty_2lS{WtpV^;#%6o^;hgZB;+wt40-K)3ax6ka)Z^duJ=fh*cW9Rkfq>Z2Q00001
zbW%=J06^y0W&i*I3`s;mRCwCel+ljFAP7a(E22X6|NnNQJ2p*5XKc1Fdmj2gI10pK
z9>O~KTloYa*nJ_O;rA~<hs`&l?ddV$mn^Tq;@rTkY)gy*Q!`wP&+-9nLh>mOj(!3V
zCV~fo%qtB*dJhB6tjNGb;AobVnNaFl&}W28N#WQjDPAV*?g*CP&6be*w5!6KJ;5Q^
zmft;3C&#j+j3A0Up7<cIdpH0d1KMj^RLl*b^UsB<ZKRd*wos7!XS<}T?3MGK9uyGM
z5I;!vgCJ#WJi>|p^fXu;ob5N9tZ#^{wJn^qy96r9_(A`=1RmK-NM?obM4<I!stTG!
s3rdpsjwGG;Ck5acSlwL-bLevZ59Zknni8B$kpKVy07*qoM6N<$f<l$Mp#T5?

diff --git a/route/static/img/soft_ico/ico-cmd-hover.png b/route/static/img/soft_ico/ico-cmd-hover.png
deleted file mode 100755
index cad45fc5d0c1511b161816b07f740ecffb3e2ce0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6Dm`5sLn>}fofyb_z<`5wqXBos
zjMk_X(;`>wh&pgc=Z;;(?G0<ae|a2ccW<y06m;D0922tW+`m=j?x99*hfXwDB}`@z
zHG6Tn>0OsPS1Oyv0*&LsAHBQ}{d2k2VAgacIo~0|sOI{%qG$389DbQ--(9P}xh+S=
cWb1FHC;cLNHd<FZfsSDCboFyt=akR{08XSs=>Px#

diff --git a/route/static/img/soft_ico/ico-cmd.png b/route/static/img/soft_ico/ico-cmd.png
deleted file mode 100755
index 981e03f4c501848994f6c0476bddff585368188e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6YCK&WLn>}fofyk|K!K+vn~{5K
zLu=H5Ly<FBk0dg3Z$4mj%0FR4OWX<DFWI+(l$4m(yGn6*G{5`S6xRQep`F9A#hFQ4
z!2DFh$!#5z0-M|KGtOZ=W~w}ErP~JMBDO1H6V##`6Hh$cedgq>`UAH;ryZXZ^vg0V
f{0(>R`M(UiS1yliy;G|WbO(c{tDnm{r-UW|uj57F

diff --git a/route/static/img/soft_ico/ico-deployment.png b/route/static/img/soft_ico/ico-deployment.png
deleted file mode 100755
index dd2d565aa40c2aa2b887e7a602d0b53c5410855a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 422
zcmeAS@N?(olHy`uVBq!ia0vp^#z3sW!3-o*@{AmSltF+`i0l9V|BFch=N7!Q0qPYf
z3GxeOP`bPO|IE-;E@^_s<?lMqbR?LEF)%QSdb&7<RNR_-^>ts10uO6K0^g~%zy9T0
zH|F@6tv&em+w|to7Xxe!_k{UqvZdEHyis9qxST1}@JLzoz;X9mIhSkGe)wNzak%sE
z@R}F~qxUyod9JFP!*n9c_{lr|lzZX3QyH$mVsiK;d~ofphTC^sx?X&L#bQubp>%7K
z-Swyd55eC>O~Hz{CK-wU^j7q)c%vM#MUnk^Mxdw4GG9)9jj0=QYECjt^x3jZ`D?%A
zicQ<H)GdN%Gw$x%eD--lpzt=slsLhcJUJW_&mHKCm~!)&Q0uYxJV(qA`JFkiv@Pd^
z6Hml*(bb)5cWeXs|8|HzY$(1Wnef#{=R#nyi17mrx3j@l?=SoNxY)R6zBJ!j_V0!3
g9;{7nx&DjkpDEYPN7wHz0tOy~r>mdKI;Vst0G4dK2mk;8

diff --git a/route/static/img/soft_ico/ico-load_leveling.png b/route/static/img/soft_ico/ico-load_leveling.png
deleted file mode 100755
index c20e1edc66ca4cbfe2ae9df0a794ae7de825c4dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 477
zcmV<30V4j1P)<h;3K|Lk000e1NJLTq001xm001Zm1^@s6xQBUh0004`Nkl<Zc-rlm
z(QSh;5Qe(~3$)Z7!7H$WS73##zzRHCBrmMM3Z9@~(Fwc)y;CT0EJ`lM5}^3umx9lK
z&R@<L$Gi>0;H~%ShozMkYlPpiW(=zUU;sI2SgAY$1OPCp>;xzyN}y*?0Q&3FCuE=O
z67=i}0K}dEU=bh!M1Tko0U|&I2)db*odPvPsl9CGP62kKr!4_EsQ5><HOP9QAKw6g
z0@os(xvD1&a(4hayH%jiBEZW|q4D&fAc%ew(<MRxDA2HxR0x2^`s3bE<$$Xvy=L?^
zApx3DH!(fu_5cRu0}v~4Sb+50Czx=O>~O<Yf(pAG`?=naN^>hd?UUg1)Q)`~<s5w_
z=5}*Z00eP~6P`=1n(=w$qyZR^wnYM%_ZbSnf{zYhAJ{_4*`HF`V$2W#%E^b4ErYgt
z5nuvu?{bbY;|1^uiR~C(<F7&hC}v^>0YC!)b7E`_0Cxa5wtE7UL;&u@_@OGm&fj-A
z;n?240x;)u`^5xa6Dv@|yw7Ye{T^_0c23TNE~766KzenG{bruT*&`qJ37PX3G$fC>
TAVLd;00000NkvXXu0mjf$&AUM

diff --git a/route/static/img/soft_ico/ico-log.png b/route/static/img/soft_ico/ico-log.png
deleted file mode 100755
index efe1b77c1695620ddd86f55cd7b858d2eacb5396..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^DnP8s!VDzWZ<tmJqznRlLR|m<|DR6^2>-@!3Dhf4
z666=m;Bw|}=sV+8g1gg{I{wcrFS*dI2b5dv>Eakt!I-Qd#v!T9=sJPJ+hEg#mCOMe
zTbUxgs}&~9xYM9>B#~2PN}#V98|T7RMu#-7JUy^+F*DBtr*!6>Ch1KL%NRmB9_Mn{
z9|?6cP;9G}-yq>1toV*s!pZMy&-4Gy2Y&JzEWdW|(M~BYrf}H@tCkg7b2T|KAJVDX
zy^mcm?uL`7;5Rofg$0@og3i_*+Xan%6Z|a~WxV7z7S%g2DXf!)!C+T#G?Q{;J<z!f
Mp00i_>zopr0H?EWD*ylh

diff --git a/route/static/img/soft_ico/ico-logs.png b/route/static/img/soft_ico/ico-logs.png
deleted file mode 100755
index a27db7bbac950b89990ad790ad48c6b58904b212..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 753
zcmV<N0uKF&P)<h;3K|Lk000e1NJLTq001%o001Zm1^@s6ymF~b0008GNkl<ZcmeI1
zA#B_*6o$u{IhhPcjW%syl?z5TO=`4_OXhb?&v&iHO)71Zswrq_B%GPEa2C#vGw*lj
zNKa9GS2s@5Rt2AYC*O14Z~OgDaxa{7$*jsNx!&yL>ij!PjN^za&<g)OC&>X9mm7Aj
zFI(Ws?N+A5B1QuT>RE(rE_Mt_@(6+mQMB(Eh%rHkjr8BP*@TqXHW+k21p0jIJmGVM
zcx-t%w(%30N62<tgk+bX#rDl6M2124zyM7!pj(v+=mcz+>_A^NrI2Q*zpD{kP$U++
ziWR#bYZ4)`LG@<GV4)50dp^mv5Tk$tRmwH<3kj^ttv?Tv-KG3L2?FtKc_Ddu7V<2_
zpSnO!0GnG#1>6M4xrLY~A;jA)P@u?&0_>?3yLgmBPOrbQlb>h${jW3g?&fp-_U4m)
z`S*=`_2<NWxc>U^g&<i0ENH<#;7IGKfp~~QyZ{Djns5vv%uL~08n^^B5y3&zOR@q5
zVB|N&fY=(aCGA&}m1t5DBiqjfEMU3pSAq(dJ5Y7E_#tr@Fat>!K>K!}ucEPw)rg;2
zx)MXbA*<Cy`YqXxVksdtNrE3q)W#-*)Qp*32+jf?EY^XF_9Y1EPe?nv5P#T_nJh*M
zQDiJJ*0mI{$5@9V_a`>FI2$QMlCk70_6s4mv+r*^x<dEgM+%|av>0o@3N*kT0x@D>
zMfe?rG(h&?2`jRAjWobTFr-FYfY0q(jBJPch$FQTRNu7#TlyRk2W}>LXeoT)9MO4R
znWjH;&?2=dv61^Up7SMk68=G{OXT(Mk4>ToOGN0U|5oT1a1G=U5wf=u_TGQ=_?Of<
z>4|BBAl2DyXjRtdkyUxc{EO<Goc{Py_~-J-lVD4eCukxfUC5LK7c#^I`m{jP!d^^B
jLNN;<K|!|Iz3l!UA^yyp3I{(&00000NkvXXu0mjf4I*5J

diff --git a/route/static/img/soft_ico/ico-mongodb.png b/route/static/img/soft_ico/ico-mongodb.png
deleted file mode 100755
index 9c1eaac3e9a19da934e111a88a5950b67005edd4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 808
zcmV+@1K0eCP)<h;3K|Lk000e1NJLTq001%o001Zm1^@s6ymF~b0008-Nkl<ZcmdSd
z1#a9>5C-60!B@x?%G`R*b{NadBrJ-`7M3B*uwg1QQ|JKo6?}#1jHOY%&O*8GN&3UE
zpZ*!s0s#1{**;cwqB8AjfBXOZ)jz&_vO?QAQ2}nZ^+a08*0Hh(ff#~-(QfRO4zh8i
zbRj}u`*=Ap#Og38)zUy}hDsEK1e-@oBM7zPbw!OZW}z&Q{<@(O*gR5}gm41HC_+Oj
z28*?-p<*BiwgNO>2?(cNXh>PVH<g4?D_$o;S~DQ@`9dKfC26-BArOb~p5%Z$5fb9{
zIZsLlT)^>y8iX*0ATC4ZXQ5CKr`IV$2$ZHhs2K1dF<$u~{h~qk5(LK!c)V&75Un{2
zq*)I!iZBqn*Xc(LLukCX6^77@&XsB*AX=BDSiM$2kZj{c3-7d>pfzOz@N-VR5D=r=
zT8NO)jzPE;9xsOE$do9My%-<}k5?gx-e|-VVit-pT2BaqtuQ2Gydp>|Lh5rgQXgfn
z2#}B=JYL)i?+HWl#Q*P*RF?%BhA>G8jTb?zmV%J_{|-?*%?QG+B#&M-+=v8_Ae9Be
ztq_D7N!``rFPuJ)#}@(O$6Cp{Cj?RNr1(W=%l}{Yb)BY$kT5Y`KLZId3q^n^G+vny
zoA)GIcsi4-x3ePX>wz%WS_tXqqgV1UObc%`84)B$`bC0NXFGZ^gwEjWZ)HK;ic&2K
zgfT(Z!|;In9Wp<mdP7r0gY4zQaALgZaGMPQi13Ac_`t0sFCwF*zM)Yo@r3KR4FMrq
zwmnfZ0feHQ5c&ZfLi{+UvbO~6n-;9Sp)!CnCB?H}zO>hSOxV_23pKaPVD<I&j0iDB
zQb2I&6@*N!@6q8{dM6xd*a1tgu7Y)lz{v6JmxB;xRrmU-GwFlSI&hf~fyxM(Ae`p@
zb5k#$bi&hjeT<M3@^HM~fAOL_;LoLnJbBW#_rv?)Dd{0^-wagG%|4bNGX3Sg7JU8u
mM0yCep?uq`mp5rXJq-XZa?lpe<iwo-0000<MNUMnLSTX%EN)}~

diff --git a/route/static/img/soft_ico/ico-node.png b/route/static/img/soft_ico/ico-node.png
deleted file mode 100755
index 0474de49a12f9aa2da0155942fb708f71e10e3f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1423
zcmV;A1#tR_P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000G6Nkl<ZcmciG
zQ;;M}6oBFF9^Ap@+O}=mwr$(CZQHhO+qQS?y#GTzWMphrcTe^7M10GttaH+tv3~c{
zb?~VFP!=AsT=2tp+~K8hGh5i7n2C?56N5n~L_JK#W*ovsq%l)yVyr?01m2<*tWFHP
zFy`Pk!XPw37=S;_1iuSH;fKz!nhe|*1Mvw$5scojn&~#HAOPnjA@%X`Qp?K1FdQDy
z4gN38kP6r1hfc6W;~O0j2%(6;WO$ir+EoaLu)|l>aIpO1_z0oG0{EI8RNo;S@Dc4{
zwWI8~I0>P`I>d3ttWXy(Ayj6^1pnV$r)zFUd}q$dmGKtB0sd%jP^Kq#Kqw9(X-q6E
zt>Ncj0-X)YOQp6fP9aT9t&CQ5!dD0zqA(s7gYrrtP<f|~lVbfFCE%(4hXvK~8p4Ll
z$ZhbEMu>!vY=DOoDtZi#;cwkBVP_K8kVB`8W{852yhCOa!CTN7!MK2bjUKKd&)-ro
zsuM``oA+z!tS{Y7B+vpsAaDdewqED}f6XWygn()z;wtav$4>~wA^1ddy8jHJSq_Um
z{jEJZ!GiR-00Gr{B$M8ahwBiE?<nkGx2X+vn(q|dW=xM$5KtXM8tK`w5Kv8X;CmJD
z1w!%?>CMap8E_T?szZnm3+6&Vbr0F#W#c<}aTh|d8dkG&ab{eEP;9{8C}XhCio{DC
z#vF7;Ii$m1TKQRVRc8UM=B&jp8?Gq9$Hl)m3gLiYyv13pl!8~ybk<p2o^7sRA>wKO
z)*n$2P85!1h#M2zkR<TY{#*?2A)Lq$Bh~3QrV=>=;Y2r43vMwTyf>CY*x^2w<1PXa
zshp8N<0SeZg)1(mtQc&^(KG}rkY0N)0ZOAWI->(>ARGRS<)T|PH}r<T9UH#}@Y3E(
zgW=eOx_afiB7vHA9E6S`i*!HK2@fDNKhO>qR|j7Rk05kJVigigwZ2j6YJP}-z%O)h
zMH2Edf7?cXpCGNQxo`<Wa|5L?1OZY@)OSVj`EUb5M*s%GQ+qxIPO1ADX#$YP&_^_a
z#TkMAfz&8~{78d_cxof~?r@V1_s4WD$r?x#L1Vm^T4E@?%-q+P$9BBNFZ{$C{DROC
zgx*r{zE~%XhiA&=?t9ddzFQAJr1fATd>jq_A51n56#AF6?owG@5C(zcNR48+r6wUA
zUV0%A0uh)54@Xwhc@WVs2i{Uy|0!pN%~H$c)k#8LR|2J0?FV;z5@?SwWqv-4@feH!
z>YR@#Y(*UPD2Qr!CXJ1L@RBBi`$`gZq$GObhm^!n_!<SDTv=Scp{`P^UTCBou3sX9
z(TpXXjYBb8npz7eE%8}O!h*VZCv~S8@YMTIJ!LO53l^Pc$3SR)qM(hI%_G%zB<4v;
z<i$;cf!#=Ibw8BU`^Yc|O(4qHIK=#rx=?dFx@UEKl9HGUUxOrSO6!C?E=TEoV4~7}
zavB7aPC2x6wsVqbh%eF!Yapx!Nz{fn=0Io`=@s4=LKBMG27#1AfYdh|I515&##?2@
z_LauOJqXPgoKhx^;d%v^P`1QJ@Sn~)u~WJ4%;ex&Qywp+mY5@riG0$)R((Kj-79Nl
z$&bWrq=X0DkrK<46VxGiMPs$EqK*kEi6)4Ekc6TyEJlS^gSrAg!A|Uex^)gjBNKbA
z?g&znNRH8nQg*h(;c3t5s-IM-kx-0;hlvE-F%TirczU6HKMW(_X>Xw(XpYkegHVLw
z0@}gL2|Hd-^ul`xg&)SlD>?=LhsIclz1W9EsE0T)aK<Qr1-OiBSc}SVch0#0F1p=_
dgShqv{y(bKnb5;7sT}|S002ovPDHLkV1i`4k%0gJ

diff --git a/route/static/img/soft_ico/ico-phpsafe.png b/route/static/img/soft_ico/ico-phpsafe.png
deleted file mode 100755
index a3e1b61157fcbfe2386395f90aca28e61dc73296..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1169
zcmV;C1aA9@P)<h;3K|Lk000e1NJLTq001}u001Zm1^@s6t57+G000D7Nkl<ZcmZOd
zA{YfefbQ%$%5o%%<M?lE+qP{pc$r??wr$(CZ9S}Q+qUi9>^FVtkBmF7liJ-meLkmd
zBX#S(N+p$a!QbC6`o}=FSV>ZGS4B;VI|Y9s#6`iaL47D|nI~`yZXZAI-%nBBAb^K&
z_}McU0A(q&j=iEckU~zz&$z=c`CTES3qQ-_XJ+`UTroEk%0jvw7IKXkw1cw|;!O(J
z7FrUo;BCg=yowNK!=aC6P+Afnu%NJ@B?IY<J{Za%XEGPN5<iU3@eSU<x@ZJpspc2v
z*EfIrI=;r2<aro-(f8~q2l}9Mlp9JyNe>{=qxcS?@f+U8RSYPat)Wmk=wooy2kqr}
z1HU3PzQdzX5=wdi1NfUZj|s$GxQMhOZUCjMe$;oAgKT4Q3vmb~p`-_xPxA=Kvi%X-
zn8A?tNXV+Ze}I(&5wczmhiu}5-OoyaBn!Q~cPNwu$M(l;s7(7<E0FdOD51S^092+u
z?ag4pJ8UTzpn9lp)P!Qr#wKWwo@fTe)J6l;M_p(Uds$n9IBF@U(A78>7vM^40vWgA
zN}Pz(5q-H39NdI+a6YcYA*crd_AW9%;zTH>9Uj1V^g?fp!mV)830I&tWQ@a|sDsO~
zK6;`z2H`jy9=m!UN&B~r0^i2zP|O5e0xe=o>;z{C$8^M1Xo&038j2Z&n<=aYWD5Sm
z#u|Kx_A)4Di>2KBPrwvxgT0`b04Jdju7DP?)*^kLPwp2of8Zt24Y+&d!pb!u$ec=R
zKrzE`I~w6M%!Ok1#g<rg32V9;Zow4DC@_<y%(rSdh-7cD@ooS?=Av*rPQjTtA9r9b
zYU37kgJRCaK<tX=aWc-r*(hRrs8Xr&s`?zenG-U9;Ef)S@F_R%R*-pgx)swf0TVG9
zZ6VY~XVipZIzYG-n=Nu|AIK2TnoTMBBjO4hd(n=xZ(}xu^>8gzhW5Av4WXq8ia}KP
zhZNa8^EDV0f?6cIk5Ba&$P~IdRECb&7&W1#A<sdyk2oc#9+ZR$k}+%LX~>dCa1mtT
zK8T|4(SFAo><VScExPT=^%bu$R<`g?24EIzM@g|al(8N0EydP@k}^SZ<_Y`D;P#*u
zl!fRG8#z9rJqofkgMgo}+<$&gyf2gm`ridV<?^}CP&rIc9@gSs(OTq2+zComvGP9p
zB@TwlWrFfdyJ%WX+6Qnilq&Wzd_5Uodp6e~00z=Gnnl{vp)}Cn(fE<mbP!Y>X|0uM
z2yqfrO@|`HT&TLze68ou{)Wq)g3}mEf~|T3vq}G*oy*Gq$$!3hw|PSu;5&GWJ?r!Y
zFOw(ZHGGIsP+Clo9tPZmb#x(dh;xEc&<9!)e%~FZBE*$m(Q5&v$pq=6$Y>2cgYR%Y
zr|_`YBUgWZf2P?Dy#yc1f(bIUJ|4k0xCz(bYdlJko2&r;qX%!!+>$$u_9Zq5Z*b+E
jGw<ek^`NYoV8!(hr0mK3Z52Ro00000NkvXXu0mjf{9Gb3

diff --git a/route/static/img/soft_ico/ico-pm2.png b/route/static/img/soft_ico/ico-pm2.png
deleted file mode 100755
index 62cd3d1a1ca4c22b34626f3906fcf65d2708c996..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 870
zcmV-s1DX7ZP)<h;3K|Lk000e1NJLTq001xm001Zm1^@s6xQBUh0009mNkl<Zcmd5>
z;f<S25dB)9g>8Wr_KPq=_m386!3{()h*<ee3$)-^5%Qt@p#`@<3uK-(r|i9e6TqDJ
z$CDFaVBYMT+1a`OhGEzYMYA)&mfv{z3(HF!2&|wJ42rI7q7?UhCV+^;@yc<WQI~CE
zy(1uw8F6e+&R)O1?r;sby7%OI4x6VFfFz1boRWjRpf1|q4wmP{;2Q3^&&i6dmemTK
zN07^j9LN9DDLaY0Wg>4jhaby`EO9;*RN{;)mrjr!UU$J??HiDfGfHv*#KO%8950Ds
zJ?p<0>G>!UgYD@1<laLGOhl|In~{jkCvsa+l2s@9k*y~1t^GgXvPe2#1I~|>atf&6
z!(sxE4Cy>S{?ugK0H41{ftF)uwWE9uf!>L_>T-Js3FE9rzlOk|$nQUQ`=CVx|J<Ep
zqdAnT9CM9wcD%C(=q5M-s|jG|yz|Ukw0cfF*m3gHzR^)|$o69hgia~Uo$J+@!}6{%
zLV4Llfe!@sPE*%A$!`S)kayuXlxL^~iL5sS5K(e$$~NUZ^ML@D-^mTBXyX8mtE~1u
z5x7Z+lC{#xV!3CM>mcG!4sa3^dIfAw+yr_<z)9v>&^s6yYHz(Fz>+AN#Gvvxn_Bmd
zP@8lD<5Ln>;_%&W^>F@VsDZOjCs3Y~!0n;<c?OqUKUTnvY7?j2!8%UDwsVp@^n!q%
zeS62g#yvm?W%$+l-*Y?RPZIO-lfYAqvVGZfAK1?&pvOh48b7I2u8Qt<txf8wo!Xr<
zJ?KD_gmVdS85N0yg*<;~V)I4iGVXl*umerbqZ2_uQ6>WGj+7$<glaJXL<;&GJJjdr
zH~>J>S*dKrG4lPPzD@93%SxHW1oXHVXhL>OMA35@oC8S89jmD09rCXDhq2?l0WOHN
z$y7g+&x`m=z=JJu8U*&o83TkROC5rUO6#Q2OSOit8I;wiS|2u@hQk=hq7|m$RC-5_
zA;}H^k;PN$M@`kN(_I2JM(R{us*y2#M)Rhp5l}r-k1u+bdl~P@JivV>0nQIgWtR^z
wb=kxgmCg4*@})dBXPx^>fTs>2u;n*?0g?fl60QGr82|tP07*qoM6N<$f;uswk^lez

diff --git a/route/static/img/soft_ico/ico-psync.png b/route/static/img/soft_ico/ico-psync.png
deleted file mode 100755
index 31015316d02d093a3674fccf5bc8debc1d2c295b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 280
zcmeAS@N?(olHy`uVBq!ia0vp^20*OA!3-q(BRidelwW{Pi0l9V{}mQnC@i%Cp(U0e
za+$TlG8kjNgWM9Z)KV+?rPd1bO+gBlTSzT41~TM<Xc<Tr!~kiuG#9Pk0yJ5wB*-tA
z!Qpy+!T)}Z<?S3X@8|E9NKg=o*u46C^XmXFf!PT_Rq>uKjv*Dd-d;2pJD|YB5_mJI
zv(MuG|3&XY4=iqKdRcE8vNiFE(E^58mLAqQ?-ykXsx3)oOiPJki8wqhZ+Tqz(K9=g
zxeAmnt1>9xUCZ);Z$n#9>BTJyyau9Q_sCy;!>*mcwdcvi_N_px7(8A5T-G@yGywq0
Ci)Ebv

diff --git a/route/static/img/soft_ico/ico-rsync.png b/route/static/img/soft_ico/ico-rsync.png
deleted file mode 100755
index 2843739f1974fbbb88aa11b08b0bbb6783557b9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 835
zcmV-J1HAl+P)<h;3K|Lk000e1NJLTq001xm001Zm1^@s6xQBUh0009DNkl<Zcmd^^
z$C=wO5QTkrBIKNHw4j^MY=JGX04KJ<o8tyJ=YR$r*a92yYGHSP7U(zJ2Y(xs1#Ue2
z$|BxFn8AR@nx;9>9Bl)=<$+3;1{%*PD0)kS8qW@Ryl(Kk1+}#9@m%9Oi`PZ6(*95F
zo&k!c;1X02(h3HS)Sv>ER3w-Sc+l{*fvF7F(w!Pe(8z`mHoPRlr03UDyw>=BWN)5)
zJWwY$%xehk<5>ikH0L-%?)1u922^wdoFWYk6hUkZPAsj7u^d#=2Bwzjt^8Hd44`Ln
z_IlCnqGU(0t!M_&D>7ew^6a<n-oPI%Z3)o~aGo~2Z~;^YJ+CA(h4lccm?K~|MVN-6
zuw)q2^9lx9t|8aj92^9gF)<Cap%7C@8vWl(#BqcSzso^JQkoPpeqV<0I^;S9&|J(_
zbOYf%jA)87pbjy8Mm(r#CQFt$lAv<~n~|7}@A{j2nUpkW`CM)qp%m!h@xFTlozsN@
zy9WkrJOhkCyJdh;&c&WW4X~KEoh38wY;6~Lz;4<iJ7CaQKbCNA?hH4Go^9Fqc>tnm
zCWJx9?@EYh<37a*8mQh=!o-E&ryyfAGOQsyX*;IVC<K9uB6EK3$KZzG10r5Bu3Sr|
zrkLFIFq)Wwl5EQzYe7MF2nLkNQu~_}HAE}+z~zCPpKhnXfrDj$;x%vw(g4MKqNm6M
zb?ijuk`>oqO#JwsXOKu4Ad1*|pkd_5Sr5-T=NnM)eKv|KZ|)XDKJP~>Xf_r0223ny
zg7^h-QPu!r_4b0s^R)%#u!82C`H^0D@gYC|!sZuWJ(AwnbD*Lw;*e1(dX|F5%YH{O
z2Sgx3LGyGlte`204e-55cmlU)1{OsEz`h!RE{T0ER4<go$et`>CYJHXefv3#az9_v
zL<Mp=Bbw4cA7nF<f+C0q=|Tp=@d=O!;x->>@rXQQjiBWio#qzVH!0wz**DEo{%KZU
zW=KK{)Z1@#MBnt0g+n5b4hsscVQzR*qp4|np6CO2laB^GNRP~2%6|$aC?|VBK8yeW
N002ovPDHLkV1j%gc|8CC

diff --git a/route/static/img/soft_ico/ico-safelogin.png b/route/static/img/soft_ico/ico-safelogin.png
deleted file mode 100755
index 452dc0fbfdc364ac69f1e1f4bfbcef5ad3ffd777..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 603
zcmeAS@N?(olHy`uVBq!ia0vp^MnJ5=!3-q3*F@F<shj|x5ZC|z|0^uD!iy}RvWsDi
zr9g&-!g3RkIFJO11G(l3i_8=j0R=5UA`k==1Tui)%ghv(o1I^-0&<8-NswPKgP>Ac
z$L@FkXO_FToC!6)yDHRJ&{)YuP)SKJO{qLoumi|?d@nM9fq}8g)5S5Qg7M51)@g?g
zcw7S|m&h;odYbs`@B6~OSU%pvx`(-MUwK~BafZoZhv(XIljA#GL%whv&s$V{ddUix
zGbYd1q$#afBYE=HuX@AB6(v5|>dO^3&0KKeZyV!fnQ10lczUO;kyW{LY0G9d3waf{
zVymC>CtZa+#pONsG)ca?Ki|UG|H;`qyC<tGfBH1!Qnm2(saj{>?dAOZ%lqHXCq^@u
zp3;fkr`>5V`4rE`SkL5ndU`8t_L#o+iMhG(m&tUO6Ib(epYHrqxqaG)zLuW~nGLVw
zikM&C^H`D2>B;{4QYriIMFy{gKR5=x6=LR})N|I}`r+EM*W@@4DMY^6rsH^R!%r>d
z<;_o`US%D-%QdC#U4zBcln3+L<Z_C%UbEErDn~i=xz|s4IB$*W0kOre9Tsr*H<UKB
za(?ibtfX*O_-*AmhIbim3=68Yz1U9Jp0x^f_{1H`%{sw$??G3FX&ooh8C5K_?rl^$
ut-~PY|Nc?a!b`#K?@MEqYUe7Hc`_`p6YcO%zV;m$YYd*QelF{r5}E*(!Tc-$

diff --git a/route/static/img/soft_ico/ico-score.png b/route/static/img/soft_ico/ico-score.png
deleted file mode 100755
index 68e9077a637b5f2316893dcb4cd9de111479d9ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 457
zcmeAS@N?(olHy`uVBq!ia0vp^RzR%5!3-p4R7-XNDct~{5ZC`e;J`p6Qdzq2EKnnV
zNswPKgNu@&acJ7Aj@@_Potas_o9nv*0|TRtr;B4q#jUrKz59+R@VH1bv(-QNcU(46
zsdRRWXV_+m(zP5PC!c=$<m=V?fQIE$4O@FUESFfEoHVa+q0nhX8S@3Yc8ta+qgjuM
zde#|*%;cGU;)EL4cioA-!K-8icMFCtITpRiZ$n*Mlg^yHlV%=k&&8%qEV_NADyX2`
z(^Y55h5Cn|d#*?;PLvG#t(tn_qOhLZipNV1-Jan-Rj;z7TenBJd&^xX_lcFC1Z5R(
zUOTi+bNY2lrJ2UZHsx~by#CeD6Eb66gxTdqrm;#!UmsU)IXXA~|DxLq^0jvq%3M93
z&E~6H=d<qk;h+;Gw>I(5z40yO)4LtDyENE#o!`E(V87hf-}h6w{(gAcGs&Oxl%r6^
zlyfWeG-O}Aa@qc3SFqRjjL0<KEk3)<=afWhhoqj`*XDBgbyMzZ-6a))pRdNhWKX*&
Wa7+2vrQ^ULX7F_Nb6Mw<&;$Ui2F(fp

diff --git a/route/static/img/soft_ico/ico-task_manager.png b/route/static/img/soft_ico/ico-task_manager.png
deleted file mode 100755
index ad97d21811f955b38a6e81801ff56d7050074772..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 320
zcmV-G0l)r<P)<h;3K|Lk000e1NJLTq001xm001Zm1ONa45{|L@00038Nkl<Zc-q~U
zYY~Jn41}=|3$=iSTEN0usD)a<0v51P3s}GcH^3cJhLl&*yWz4w%jBCj*)|l#Hv@zQ
zgHTQ0^b-Qa1IF|{yih#`)I4BZ^5SEzF`&x{@TUMUkw_f?vnra~Gy^L=KtRvRXaTxJ
zdzM-NgOZcl5$PA%>jMZ5ZuTVHXY;B)Sc+L@GTH*LyU7gVAbkLCwrK<a-;!^6IpB&e
z15#H)ED?YX<wSrJEs5L!f{jW}>VP{&b2$Mm1_V^F0#yjf*$8G@lq<|{8(*{<L8KP-
zwISh80<@ZwZp}+q9DD1n-Um1q;2*SuM*(1%pNcl&*zK3cQwXf+ny7vc(2f^}Lu#I(
S>)F%*0000<MNUMnLSTZETYt|0

diff --git a/route/static/img/soft_ico/ico-test.png b/route/static/img/soft_ico/ico-test.png
deleted file mode 100755
index cb28b12e58a3c21ecd7a532d8e7f383050a6a8f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 654
zcmV;90&)F`P)<h;3K|Lk000e1NJLTq0018V001Zm1^@s62GJob00072Nkl<ZcmeI!
z1FRiE7(n6Lwr$(CZQHip#<gwRZsXdvZTs(e$!szYyS>_dRg&*|=G^s$5RqWx(V)sZ
zDo4g_2u35E?Qs=OfGzk2!B;FnG$-O~Awig6Yn(s~d^Cwa@hZ*)xe+&rXnYh#e|$EH
ze?m(XL41=ras`U>VLYtDLo7xVZBRn&!)yG2Son^&*oOq#9N{q?53s^mK)){{VjV;|
zhPc|mSm=#$>bYwG-OvWj(H33M1ktrQqGG4kScM3FUyRoF+Knh;$1$xo+j4E684^Oh
z_=YJyi&;=>>LbL6KSnl(;-PU-kKaKW+v5tYGkW|!GC8>9=K{tvyEr&J)}gV7@h~`V
z8MipYEys7vaV)ORQ2QYmgU~*WqX+sSY=8kta0G%;`ggvJPljMMBB~#!HFgm63u3Yn
zIOw7pR`Jki3Bejv(8BFZmSiKuMJ-I@+Jp`94WIEI^@9rAw!`th3XY(P`po{gg}*fZ
zKhAS{96|E{gVJLk+9Q-*@l?2rA83b=$b<{{hL*Ojc3vmL3B1Kv9L7^LbLuz`jiV5y
ztjT00Fv0~r5X04YC0x_u<4ocQAubwW8CTo5F+SoUN?;ZQ^AX*0$*slsRXhvc<1{j9
zcP|ql=#MbI+~)VRP%`XA=^*xj&8Xw+d$@Z@A6$2@kCEM>aJYc??O)Nup?G<`Hsbps
zxQ$#khm+wX1UrlmZfM(n2uh#;3ZbwU3ZWp1poex#b{&a~e^dmQAj)$*!BZc3h93}I
oL}8(;uae~02C>mLBsZEr0VljzCdA|g82|tP07*qoM6N<$f}2t*Pyhe`

diff --git a/route/static/img/soft_ico/ico-tomcat.png b/route/static/img/soft_ico/ico-tomcat.png
deleted file mode 100755
index 2e3e7dd5b08819a44ac138e695473f7bab5043c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2286
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

diff --git a/route/static/img/soft_ico/ico-txcos.png b/route/static/img/soft_ico/ico-txcos.png
deleted file mode 100755
index 9bc7d21d27736377b45c6d04391b906020c4665d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3136
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
ackv%$J;1I?663P~0000<MNUMnLSTaA_~~^3

diff --git a/route/static/img/soft_ico/ico-webhook.png b/route/static/img/soft_ico/ico-webhook.png
deleted file mode 100755
index bca24ab1b79dbbd10c9d3a688dff8af1f265b944..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 653
zcmV;80&@L{P)<h;3K|Lk000e1NJLTq001xm001Zm1^@s6xQBUh00071Nkl<ZcmeI1
z(T$ui5J1yG*053j-2yGp0xet%w6F!l%Q_{{f?J>g#96rt+ya?V=A@CrtbsV-lkVgF
zc)`rWz8MeqWuE5`P4WpZ-KdLhx&Z^=i2=vpw<=qK!b}weX@LOD0s*jiZB_yhP)%=o
zUWvzhvJik^>d0G{2ta+Rz@_`8Xn#uqdO{K$aE{XiAb?f~tOx3^KfOY(_o>D);o9~T
zfvXYUzI`HWmsSDiI$q$uxc5QmP00dpOVR=7I$QuA{32|JJ=^Xj7lCF)%5Aa`xZd{#
zqRjZ$3gBGF3ds52t+>w#_26KEA6^$`F$=XD_y6$CysC5RfSGPW0lSsms9E6e2fUC?
z9iYDhX%!G0cZ7J&^)czw1XxztdlqWWJPYlYpy0FW2O{Sko-*;8I?Imi@_1F{!)rkV
z$2172oLfp>rTLZ$yvXG)@G0;qfLY=R4FUy7B@)0itZ+`Eme?XNN5BeNB^0PwwH8?|
z5GhLicT9zew@_gxg>$D8h<*x5EkO5GK=|(~0OY;`vH)R|3(yyfqXZBOsDBl}ISMmb
zU`{D86E3o>Jy7iwpgm9X8*zTOSHJ-Z(2*49fg84%?EYp!pkZnAy+iZQQZ+qW0dA`R
znroh?0a1cIu&3bL1%Z}+>ti_|pT$4HlSscsfbVTC;Z`;)K^%|w3$8Syj>bf6?YtDg
z-flu@mA3W^yPJ8yCJf#J`q0xT9w#u1Ko{2H*4oh%JD`OQt}44xoqn9Yn5ioNd^WV~
nQ%WE_jai^oX3Xn<WM}dlD>J0x<M6Cl00000NkvXXu0mjfh_WbF

diff --git a/route/static/img/soft_ico/index.html b/route/static/img/soft_ico/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/img/soft_ico/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/img/success-pic.png b/route/static/img/success-pic.png
deleted file mode 100755
index c46be849e58c8557cd8a448d2d3ade843c985d5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3726
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

diff --git a/route/static/img/tip_suu.png b/route/static/img/tip_suu.png
deleted file mode 100755
index 3884ec96c2583756264898c05251821e0550d87b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2862
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

diff --git a/route/static/img/weixin_zz.jpg b/route/static/img/weixin_zz.jpg
deleted file mode 100644
index 4d3c6105b8a4d6f5c7ceb7d8b791fa6f460a74a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 60575
zcmeFZ2UJu|wg!3{kc>#qw2~1C5+o;)B$9I$kt`rNXNeL7B#7jkTO{WkB}XMglabKG
z1{!#+|J*w>_r15~zW3(N+_m0ctm;0ePjR|ypQ>GZfBV~Y`~7wqxc6K}UIqYx06-4;
z2i&dzI@0b|<^Z6m2s{J;024p~5dx^lBM|Zr2(<#xejft>6Y?DZP%}Y)y_$*gA6L=*
zGg1F~{Hx*Z9w4A%Y42?BWNH8QJ`V>MAn;UP5$)IAkmdI=<L|?JlQfY(Vt}t`+x}R|
zKjBY(Z`%L@Of-Kqe^d}1fI<L5B>>%a0bt}Wx&!)Me*YWt1%!f%b_X2;6AK#$*`WF!
z@~5MsqM)JPx%2C5Kt9Op02;v^!UvBf(TP+|Fz6hJxdUReFzKIGw3Dcf9WwB|aty@6
zCM6@Mpk!oXW?_BE%lCv|Ku}2PnY4_oocwcj4NWa=9bG-s*JkDxmR8nI&MvNQ?jD{&
z?}9@@!@?ut;y)%NCMADL$<E2m%P%M_D*jqoRb5kCSKrXl+11_C+t)uZJ~25pJ@fs?
z?8+*1ZGB^NYkLQFbbNApb`HO|{M9d{Jpbqx^7W6N{g-|bAp3=ahK7oU@vC1T6t`a;
zCqTRN;4wO(q$-Aq0}&l}04DL%*sO|nEP5WbLy}jHW7wn&yeo{bUtRm%v;SVl0{>t2
z>_0p9*M7|bQULnzf{l)jeHR-W`!3;KWFaIY{8h-P$$l5=zZAOPh51)`^q=Jxc@q!@
z1_ll`4iPps5eJwO%<=!Y+%6!8rQGc-fQt%34klCrKpeQtk6_6}`Lq7t$^id%^tX)A
zwsj_K5+94T>B1IdWOt+~*G5Rfu@G;FukR|Kl+zZmg;$Q1+1no6tHMilp}|BvT=&>d
z;OX=sP+ommFi*=iTExqho#Q^P$x0WZK1mR(avk#R#$EOn@WwyPy;J-U^8HQg<~zUh
zwp##Otkdik5TU;XS}@=$e_s1jE`N@RKj*`ry5LV8`Tvvk;S;^wM+R#WSqbzzfV{>&
zg#G6z?_T5yjr{LbwTNxVkJag1r|=9l!peZd<=$>0cT0yZ&q4^smg1XJ2uC?o>eKoc
z(8c#|+0mD`fSxTDk97n~5ykD;@0A?eEwRYMZuD`FC-|w5HW5dXAI{ImJYI!;;t8H4
z#1mhrYhrU1h_iRLZ0F9kTYMB<m?BvD-(s_5`~O*yGFY$nq0=?v*UE7{Xlg#*VJphv
zWqv7gM#FJq@tw}>+{9m8Xs@(PZFu3Oda8?9?rF(K^*8rarHTD-$Nw-kv!kXpbnmU}
zpx{>&S(n8iJS1-cgNX}lpjw((1@veAPZ^*o?Go}vzb(dM{;pB2b#)_Ba0`^%Bck+v
z8>{%Y6Mx9F`1>u;`w@IPB>tg9Q>*tzBoo=p3K0zGWk;|8f7bt$0ZQ39!b2H3*p@CR
zt2OOgp#y%G8@E8;R58Gk9Rb`<{wdG@l+}M{-25YXPW>s*f2usE|CHxHRh~0{%JZKp
z&p&_?lt0&_|K^(ekM!ps=IWpF{O_zqzuNpGdH%)z{BwN%lg8)&e*3eMFG_|6tWZD2
zyv`1_!aVJ@zIgxqI`b4K=ANv*oB4aQN9o46ZY<2eNhW?NOJP=mc{r1D!w$I*J|8<k
ztg85mM1eLa1#lrb>J7gUwbnBZXPWr=XsoPk$&~CBMYETKv8=nFc8uYeEnnDV_IwZ6
zYHx=H)%@QKr(@SH!PdpEo&46Ur!-q`ff&|XVE6MaK(AH!Ynq_`Z!>fwzY%_sc}adY
z!V6*~R+YG8ZbLSdzwO4~$4_o*jykWErrA`h-zaZuU}h$x4v$p9=sfeIY_cG2;j~CI
zB8|tp+eT*Ri8|e~QdO_;P0kK_RY_NO$u;C_<sPprq#VXsb(8*VKW7V{<Q&p5cj3Yb
zveG7U>;QA#T*u{{5QDaORiyzZU(VVq?GQc|V4-0Feu+D?u?nVxKZd?;?VH)|DIou>
zSRWP{8r&mRY;(-7_5SB&-k^l-4>nwI8Q}W?uC{Clw^6J|i)E~mWri$}jA~;Yj{8-?
ziR3=i{M0Yryk2B$%tZOH3{%i7-_NY5PCVKUl*T4=74@g!1+AqlwR2+adQRA=^N#VB
zQp$~mOw;dhvrU~`QQ2}2(1;DWN};@y+`8kTl>{s4@XW8`wLH&q{T|1^U~1HXNl)ib
ziX3og%s|F-cudzVKrUj1A7MdS`G{-oTLs;B%r?>EA)iKryE%v7+J*89t|1-;IR->^
zALMX-<S@|vg}`{$PBxSz>3MG(8Pd51MUP{)^{a8Yy6p+uvEMx-*Q5sSC`#P<^<YTI
z6X|YrOd2OdCO-m5m;PT>L4WJ~7XQuYM$S=b!0+~dlcNDDODnK9a4=5u<)1oTfr`r5
zl!R-!ms4{N%1mLb_trc%&Yn8L*uz<It)8-NQnjU}t5<&bN_;chnR%ymz+ZHC#V^8d
zh3zn^>|~^6<H6d<ZnHrDWhCW^9^7I%^u6B~Z>1E&&b^veG2Ib~&0z6#wteg0?(2~<
zF@pNAHlo^f+ODb3Jf7Af@jHGrw=87587w>griz^#k6B5X1IGpP{Y;FXlitVQI0LF2
zE_Qlo#05{c9}3^MTYzB5BljElhn=y<BaauSkTUDEh3kaC(B^ajk~(x5Z2V0L3L}!y
ziB4bI%CUR<SG*<)p0#RzLR;44<{|D~qe6X=+!RWZv|SpLfOaZEyWYz<^s+SUtsZ+u
z&^<g)zPHAN2ywSnd-NqMEw+}G1S7s-er~Qez5<!}0U`n+imv^{2~4loTsK-@uxsR1
z$tlT6Q=GOz!dqw&oG>exVbyGY276g^rM=rnTO%P*dTX#xn*cd6P=y=^9vNMJVbkfL
z%HUaXv5n<eYLA~n@p~%X{O|-@=+-__|CMNW&G@(PC2l0goW1Op)-8OAvriUiQZA&@
zQT@n{APU!?Pd*XiDeF1}`*9GT_bB*12QDLiDf7CFFfm4BEV$aSCNAmAbOW&#)5E$;
z7X(`kBvIV5dy48O70FQYj?D9eO^WkOe6+)}TFAH6&uooepVBuJ-ciiU3z~fJsW8s@
zK*l9wcC{{ZP%a3G5d+{)6&4(o35`0u-}ABIa4ioY98M?@yFXKYKha;H#J{4J_}l`t
z>bJlQ|BXzUrv3r^DC4HS^@z{<H{dCL`@g~OL`{ZSL^$69n3hL2lws!2mg!tfzhf_p
z;KAbMVCe<dAK3G%)4r-Z;FiTWEH;W$!)3q}TiljM&rM8^>7fE96Ld}AR+id5n&?Z*
ztBVXv4`{usBJT<A%V*+e{*p0U91Ifj5@r!v&g)Uf!5wuyO@rrBrGl}6mRNhKRBUTV
z!C{*>7wJf$#C8IaPTYXXRi+=>rpwV=fo@<b%DcMfv;>C>Q@6lbTK79;rw@xJ)N5`h
z<zX-13S?sZp(;&m#OTLF#3C-6$0b|$Lw5YIfracstILGM66@Lq=MrAdvB@>fOMq=n
zd=~Wu?9Onrl>;^RH><V1r~V(P9Qp(fjEywZq=?%d^_63o1Gj(>0D}a$>UAdtVO#gX
zLef%5eD8Kf_b&16X>@B!WBaqv0L$uIKrRC)&dR3aM#Oq{BWb0?DOdQ}*I`l%r7YJt
zbT20f+O^VB?p%UBB}ihc#hz1_Q1Iz>e%7P-Sq91W_%ulBTc2(p1&KQvEsYT!171H`
z)(EPiPE_Nyb_abqZ7^gGNwesv<=+P0xdm!Mt*)^$@q_rhF8B=9HdW#el<5U;fdJ~6
zC1Y%7<)55)bR|0RxsFr4YQf_z_YQ}XFGs>2@pe;OJ%eRkl2Tl=owO_x*9HpQdr21z
zc&VVBAZIlR?%Cmd&#O9#Ezh97qQXqftPnP5f{rX=R}%JLa4|_2{Gf+49dFcpGXFvT
z>@(KuO;K^&QH%#rzsLr%po8I$Uz*nkz>8@2A9@jb&DbuFkZ&*YjiZ+ol*sT@k6o5{
zB6anQ8~^2g5#!{K#EpHmUYZ{xlJJzPxfT0&jE8<9rj_-!6GK=1q9D;$Y~ZB$Ul0g*
zxa8OS@fJ88x&>m9nC|}>`u+Dq7au+d^2wjFi&ELlKP$+`i2$0VrHRL01gyN>@d}Dn
z8wE*ww012~DJ=Wp-vXAiJzovv>3YdcK46V77vwn@W3{kZ8}UwVj-9$g33H9!*i!EG
zp`qZ5oq!I0>2g_mZkgd61{4WMP&Ix;x`;91H@d|tFAj=lAZ<%fMJ@S|&#pmL3-)2|
zW$0OHgIS}&{=x<^#lr4sCSLOs54+O)^=YpC4Az69SR|e)04i#LQYK0Z-*xtCBQ4X{
z#HTOttWoZ^g}j;hp?SQyhn4+)1W$jbFSj}M9ieyweD^{HgY8P#Jwox^h&nA?{px#w
z=v_h7BS?wOaqWt4#dSE;=gIo#H}+gnBesyEj7{Tg4WupPQQLJu)f!O6*jg(cx9TBM
zH+4ac8y^|{5wy*#J(7VV#$oK<su3?c9mkg(HO7rsPt(595|oKjWUQmRqqS$_hpkNH
zB1=Ky+Qhj!(oG}P&ZBR2`NDEysQyzfl|N2&YIJ=j{>uqxTQ-^Stns~^S}nl`=sc%o
z&yPleeMRbEi?O2JJCEE*$I*O(fDj4{3bBM8XFz*ksmiGN=!d%}{nGFUFKEoBvBpe~
zAB_kPM0vGmiha*4efG6PWP}b1F^a%;UnZ`fe*?=T;tglUzRt7pYaK++E%0>6r{4(c
zkiLVz1w6Lz!mflK=+%*>*+WjZSt!cW?X`e3#EeA|R`8fYxM|;56>FEa8srl_fb(!O
zCf^cu>p9!zNT8U|3_>NzRd21;lFKpf9{<ZT1{X-?)*qhx`g(J4Rg&8aLV+Hg6vPcY
z9@^MSx%+hxOMxZ2kA8&QcvWn(%yXtUgZ2}XG3K_qchRvS$*CxrxRRoKOn^7N8x+qI
zPl%X_rfm?Kow++Q?l1azIkYplDN&rv`df0&#v->+t+}|;)al6cJQGvfd|fFM^FV=@
z(ow{&*jx_><9e~l5&{c%<l8c_Sc*~ACX)B`lfzFIA0FP1jFtx2f0@7kgO%iOqY;0%
z9{;w|F#bY9`Zr-g<x)LjkH@_!a$E9>1Qy0wLKkD3fgAINPkGUp=^oLOQ3{Vm{nutT
zlcEu-KF}DVeqOHy+;qbxLw9BXv}1{K5OKrm4(WDE9vb|hA0He-r*Y56VY<GsiGTGf
z_v)FR&(8>td3r~DXvF35ieJZjFwQJTL8(mq4!6Gt1p(@Ji`Fu)m(Ns#0gwdv^Apdd
z2n4e$8qb36^8!ZlufEncJ0l@}<a<qWV_UOVnD%q)vRhwim!dp-!@OCu;pzQ9PZgX$
za0$G@8}N~Y1c}(Juq(HT(LIUmwf+*fXa=Ph#6UXj`%7eSg%_~IxLKuqOvCoEUQLtH
zhz$hRVXO2Zd)G{&-GssOMv>m1^}~0J;kK)JFpJ<a$oz)0D)rI<1nq|J#}1jX$;3YA
z)BPhlkH@=JL=ixvwD+@CnkK`$O?LTaHj)p}aUE*Khg;eX&zenF73r3AC+2z8%YCLA
zi_X#g`K_tKy^|R}Q+&^>IH4#i%0<5;*T)Njp(5;H-bVENj><P-UzghhYRx^!PrH3G
za(7&3Thi|4ShweVLPZhXT^@N)OKy(~Z&>9u{9-`#=(TevHS`eTcAa)Q_kMx$T=p}g
zEsZXIc3qD+(yA4zZzbJkD~CH?DVW5IJj&UTB^g&Eh>ZXc)iQD8%Z~?|6ybsStqM(i
z#Z1+iKddd?JPvcfMJkHkcrZ@scqv$Uf#rZEt$Cst7j~Z;t`ASdW#h8OOdOn*bc-fz
zO-9*aPl9&LSoCJ>$)bJm&;2Kx19kLbpObEZGUKP(?-A}n!-vFCsUA)}elo<MV~h^A
zjIZ!x<yTkyH6!J#0+3Np#M~iCr@njd^H_(Bsvf~}6XV>Efc9tj!Af})Gz&MWbaVvW
zwJ+_h!w0{IClSX{ZmYF{2;st8z|30PVg%zZ0Y#u+lSC$-@f|qZ^Fx`GS>I3b8#Na+
z4HeY*1C0-}3ap=aR;OxTdIwrEQ6<b|k@)&!KLzdZ7~pp`+p8Vk0`KfjX;{FbGN^Zp
zF-2}jjzc>*Y2h`uKu_YV+3Ea@>$z}eNySU9+|BgV2;fQx=_X(&)qeP{C-3pL-85W*
z(5K`$s7LQ4oe{>jU#|0Yi1q0B2L`tI!^=+SW*A3R25x)7>>AZJcH><!6(Qg1V{oS*
zuKX&5cuprEIrd##db`H41X$mj{1AemUnC4!T@_8@Z*BIDe!JxCs{?si2#unPdL<dG
z0?>BkB0UsvxERCdjzz-8DfZBVx@hrN3%9_-gA$@H%DWk>iX67|>WYUi(0wFnFf;Lo
zyp3%r1H^gH$vEWqb(3e7{BWB{$bv+K@u~`2-z0m)f7z{X4HcV`>JZ2D=2@YU*m1oo
zX9DjGrvAKi*=R7PfhUS%!_5!0Os~41($SW?BT<mI;)FLGKim~xk5{?sp3;U=m&z_J
z&9=x-ddsekkQ&<7)zvq}4nMQjZDk}84-pYAalh&+v7jQ2TN#WWm=8u<Po7!yB|EeW
zT@hxenz%2~hIjPR&U8l+@CGr5c$=V5tW6xK$}&bOJ-*aB4-sR8*LJv}2$a8$BN4D<
zWK24;3u%2iP(*&8z(^9tykh=&_3BCEmuEq$k!A+C7^rZ4V$h^JxK~I!>ZIN4RlB(o
z)4S_6`+|b3@{Lvj1ZVk9IvPx9*zMWb(S=iQ>TA|cRO4(dx3^1rQeJj$(n62Id^AI(
z|3@S0{|LSQH$?;5XGG+);f@TSb?fzAoPrk?{rL+^o0)YcT)s*A<PBDK%-b33O=jK|
z@11C_4dSyh6)>^6kFiq+32PzNmG*;Pb5QhXnsJ*h5P!Lr_E}hs;;Z(%yF+R1v%R+_
z-CLv{Gu<kN0GIFwBTP(-UU0D&pu9NKy3jvi@)wtDz`kJaU83|>&V`pl6~@(A%J#6!
zsUKS~N-`|R=v_8UZ%}=6uCIML)`!%9cpklBz65aLuGyk#KFmDbB`QS0EF>CT5~DT`
zaG}MUVSsUlym9HzArKw(`XnpSmLPDp+GKhbUJ;^5IF5)}lw}(A2}dHOGozHQ8CH2Z
zodr6X(U`<^EI;pfS6@Aar%>#(Blzv4cy;28UwL8!W7nx1uPyngw3uIgkU*4dUl1_L
zMD=I}pm_#Ox42)YJ6o~yvPJ2=2yp(c;sfgOdw$8`FNOneUX~Z3hkPzEX&5+3io69}
zTEmr(ArjZAr{6|umMrm(^*<6puGmL!{Ki`nXApup@RY9Y*{QnpM{5>=1(O7Qr6V|S
zs!m^g!dt*(?!uOT$@SHs#1^-g3Wh0?JcB_11%tMH`D>!_41}s=Ss7lVgOf!xTJR5L
z-Y<U^e01`5?Rk6J+Wm_AFP%{uA0F997!!iqp47CO)go!=(qG6|G_@(1!Fs@H3R`ar
znYRk9h{AiDKGMbgB@ArG(z1Dr36h_@pkW&$qQmnrLx$-`&^qU>LBZ}fvwC{p_4D#l
zZHQGP9~QO&n#C*t<O#g`&5Ri8q^5*0O0C$ScuzA^JwB~|*~~jW7IH#d<^m&3UeLu-
zj#ABRby=qc!9Y~65uR__v$<@UQ{X1y;_bWcx0uT%NbuUYAVp)za)RAr*sUWf!=Nw|
zXYg(AB{pIVW;<a7|Eya7W__PQBo&%+&D{7w+KM;wEeZMN7TYn(k(B7#SE9Pc_zZ&-
z;A&*K<2e!|I@Wj9?K`8`HYzaycM7XoE&Fh@H_C@q(5^?hy=d2{*h05NVSDe+v0~%(
zj!<SfM7{6+G<wYPEr7R0R6QJTM$-gI{Tlt&W>cBi+jshrh@^vA&YXlT``Y7;7l}Rv
zXln!!m-?M41MWdjE2nb|1NVuO><#QFx&hlUX%9CfN*l($Ov8<}w~Q1zhbk&H3-CHV
z0@!ZSUA_kQ=($f+2fqrNi~Zm~;1JD?XAb9CSqxZy7k|YfccgHh`!VqQ2{}rAOmGI#
zI&8b4y17Q*>-|frHHH#aXzL5@ufJ`^-%KiFftxXYjueu-hE%rxII)Bi7kAm-AzJ-g
z0PFo$0Mk?_!OgG-FR1@!_z71SAD%>H{|Em|>`SVyhDuAlJNsXXHuy@}?;EQj7pNo1
z&#P6PH+<nIRB^<Hkv+=iq1KmY`{Ro@)B3`>_{0OMlP3>5(f!3_50iTFiI?2d7bn!B
zDcH-6O`hRWIE@DCAQz-7H0sF9nMBK0j3$z-oo}T-I@uH{7)fR4Bb48AiK`oBJgR7?
zQe?#r<Cgz<2k<6><quGChLJ7GwS8oG=k+ymX2uxD+$#py=9Y8x_7}gyfWK}`?EP#8
zBSOT=r%-axmN|h`xY#@MMqtQiYFUx}#2(Ws#W}-Q*qJ@OJ4Ei<616-#;@gx<6u)#0
zzh~+$np7htFqvJyhtn-Y7EUTNRvzc~XeIEJWEAPZ{(=|&x%JN9fNRBn>*N1&ABjQ#
z!I1mcMkpbl#6;btx+oXcL-O)E&hK@_P-O?Y#z_u~?rt}*pmzGAyIbfU?gu%}Ht;fS
zsEqZ@-vfFa4ve55gi`e2-=H;(kXd+}ZnqOJ={5@a6nSy#CUbPtD8`R!SZ_~8$X6?E
zNB11L$j`dTpAuv*YeeCDx{IjrxiZU2Y135-yoDre!+K}h`W*-3S31Vq4QHuIuF*-P
zwOH*txdfx57~QRReYtjw2v8NLK#gBSLCoHM`x(mCmy}CTw}66o&(G1hWn61jby^<5
z304-&W)EbTdYs}keOJV#CJrGiNoVe`=PmSg!AYX-+ZUr4R;vfI=)){VGaX|daa{Dn
z@tNnS&ED55dpP<q<gA<~G_vAgK=+6dmK2He3HHhlx)NHMR=#H#2U@3tipL=B_sCHZ
z{v3Dn?l-(PE`fZz0pGxCNQfch+1MU0&BG=63d0KhOv!_Q$?4|589YWLFlfh68QfY_
z?>muL`bFD*jK3d!#JOIGJ6(P7-lj_b{fBKxH$Ys#n_yJ|f(?(J)2L+z1<JK9s(GNd
z%4Q~51PV^<_hp5SM$QD)wt?}|-s~7T2hJnod-rKU!w#ty;3%(2hg{WCr1k}X6BK`j
z?1)uwD`*<H?M&XSm~e>AHk$8h&=R$#w9Jm^NsPxmfdw3-UNx8rMEGR8uP(~-*03=M
zEK&I^<NMBQTR5hhHN`@OV?)HU{lz&CRJwh*UD(+0`)0OofxrTOF@kXm`a3^Y1a1L;
zY{Usnv%VU}k!PoErSM4x!#;UtVF{b#&PeAqV>|O3VI&IpI^pIcXxcr*)HZX63@5VJ
zmJRocmG9y+`7wuvpGWVG&58CZ@2>5#?JJoBtA{s_>Taqpc5|N2P&VhXeiIoBfPcxv
zA4BFrNU%5Yn*f4y*vF?ECGIoYl;9A17s9vw6ga1RjRnj}1#>;_Y=rpz((aslc%{_^
zp=Hj6bLcxy2Zi@kdyg~mqx<9bx6&bOH)c`3iE!f=hE$!?lzJz%fxL*1+U*%QC-!@-
z6yNo~?#t!s>Q7*{9UEs;-(>;W1i}vds}5+b#&j3^M*C3@qMz+>b4k*M6e8r|K^Xog
zedQ#iHYK5R#1^A2%rwET5S;LQZx7L-;CY-oU6>41P9X-%mnVIhcp0Hfc)TM(UgzBN
zbE5f|yiq;G&H(nwz^^o{K(;U@Mw3_rh)OQC#>wySnwD=tfxh)L(e}*y7S_=m{8x|l
zkc<4L?0awa5;#T|-aU>$K^*--fq|f-)XUZ8-u71T>b+jG)w&iJkoU>Ken(5xbQKMA
zmlkKi&e^UA=Z{eOdD^Mtf-rFlOT!fVy9>nqtAckW5Pp{@pslY6yTeDS6r^kQsQc0R
zP57&vJyB9!ur#)3=;M9Y8)z4CKFTIq@n;?|Rd2qo`<}2HzU><lI7X(`n_8jW&p%`^
zpT70K#?S+fGJ;z1%wQx(HkYMlZ*1pD(ELhGM%ImO{4r3nY6Gcsv=$f895OqKBLR%e
zqAk=QcsLXv{?wbF=}T-l<0JZTWyQS-@#k>at`@GDCVjWFH1m~Q)P0$|1itUbTW(;X
z?@n$3iY-WvHCl1v-SQ?9lhK(pxbd<@2rpH;kEh=C=sH@fGuYrIssydWm8iR)=6j8X
z88exP(av?;HH=r1*WzV9_NubfZ+j}9WogPF^Ej~+|3~=U{}9Ukx3MV7#k*Uu$3#pm
z&TO^r8=w%Xps$Z)?HUFXgARuq57~M=U3O*jx@t#BFKBc%p!1K(Aw@S-?$%cwEu^*M
z)lBFv7s;p}a?gg`PE=4{tIf3C0)!%}tGTeW?{(=qxP-45(EN#=yFEGm#Y99K@{?AV
zUmJxxHpTwzyo>-Yha(`i4tVnf3;F`?c`ALKS?Ya!ul%tuzOBmk*h+OYT#WI4cJX5{
z*NU$f4fdfj7V&-s*XImVZIaKzUF>RYet+Z1vM<`ZD?xM6ITChh99^o^@u21X^&7O~
zm;=s2$aBbGGnwX;_v6xDkJoxs$>2N67z=Wcv1`I3TPfMf);hyDWn4$@OHvg@z<TVD
zP&SBoJePoXocbY({29sehnrC&%6Ofd5gV(-`Tj4;z2!WSn<NKhD(q8Di3e@5&og>j
zEXKtx;_b`c4=G)nRmt;*jmeo)^r5BS0epm_%d;le2x3q8jyd;e@(0f-eG8j<sY9Ne
z%?pU<`8)wsfMsl`h{p;8tRR$W3^$O>u{@681BH?_;Qi^4O49~REo-hsc*HDqs#@pw
z@G3PjQhVeUz!$@Aedp3W<09N$7kBTOJmm+FNua#g)CnHo>*y`(uMgkUj<mQDGdSLN
zGB)zQTgQVC`Kl&kYNd@@!(dn4?|!`OGZG;p{iLzLn1OEd&bTx)F1i5ywo(0Z29_S2
zQ!-S##)<VsRUARoa4!S&OXgiaC{2G2+^gt|ZQdBsZvCX`DI~m!;0;HUai0Dc2GL0g
z=!A>UF*F0aAhJo&DT_BBm17(dxsnis8}lOKNEw8{v&Y>Xv+=B6ou{%-VS%clAE+tk
z0Y3PIVNeZl2Y@J9HIAA6(gOSNMLnT1SQ}=ajErnudA2yfM%s2Wh}@%noRnL264wH^
z>Ea}TyO@_M7~)q#mW~vh)fZ$~vDkz{AGqK8QC@!eqM{oOti>C|1d7nxEH|Ujkp39V
za~zkG;TLvP5@jomCDfT^rqDto_-ToHe7p*IFTTPC(>U(9Dl6-cpml$UuX+l3d!6ph
z$)1+B6uvKm*LSZA|6Fpu_qf}92V9vNw^PQRm|bK(l2-bzp-5CffbXOxHgC?d;SHr>
za+eB=DqICU?JY8du2d-U!0$SmdfvkVMP$F{u0zB=D<&?NEYdc{fj{>~=6qsxXZ(1!
z?me=!={nkc?svL-pjU#Ime)uY$RHyshxDBOF7C_9Eu_U6w$EwnEc`7>(9MA1g^Jfq
zCoLgNITAlIGmdp5aaFg1!Gc*(B#;I51p8OO`hT$guVWXXf{j`~D~#E@kP{8YEn+cf
zo<7WtfI~Z4$(kG-R=)}CmwUtQ?9})}U!vN4QIB+doGu8d$&D7wu|z7K<q)*j_dJ6P
zo@5-3v{M@8H#A3orgp=e8>@Ycy_iWT4Y*~lVe91;Dl?Wvo<GJLBDP!hOrSt%p}qxz
zYoSYU`N&o~+jQS0dh4HajpRK%5@2^#ji1b3pQ*e)q0b~TxY7puGiVO{exAn})Cj)O
zCWkk^lOpfC!Hsp2eP<@~+TYHXKnMq$LMj`Lh*fGBmu(L1^0Bd#ssuSL*?8V4Lew-@
z>E?CfXz82IEc$ZM65ohuc|w+1c}z_edFD*iGC*G5$kqa8+|J*Sab}=h$iQAjD52&9
zg2-uUtMobIJ4jF)E_IHeFIfla)KBEtd~j-HK#_F>b-P-IQ=&-*tNLTSWIaLpIu_P?
zX^F9BOj(6;bRiECU-?NM7_qv+W;<9vJvy05=W;jY=#ZT-$(@ywuUrz$Nx9g(AzL#(
zLAOU>f)RG{H)KDJPcZ&CN#X|6i-l&lxFf}MMRpBBvd>U3ZUL&?|8k!534>lNEW5=G
z41RSBWb*heOWXobXTJ_a%#A-X`Wb+F3q*|#hW3qQvp~|tSA2SJ0SWV4pe+Ci#3BvR
z;0y3yZ;rfKB~sy%9FM}!@&Ed99<tf#-<;>9{c6TYa=ZnH5!?dF!hiWv7;GAua?R!X
zA9vrB{JG`>8ls*F#E-`G+qky`zb6h~5b?G{f;NMUtq1U5ztkz~ik0>tg~y1{mtRI4
z+2|bM2WyB#I7IplKKM(U=3LpIX5Y_C$5IZ(;YP8y!03b4!~4i)%71qzxJuh&7~_-O
zgmFWb>vw|rha_YEu8nA}S7=4-0b<OE$O_idqpQhrvKh$jVZwpH&u=#x%HPpKg4%9p
zgjgmYUvu38qE<!B72HA58^Oe?8WO6~kH4WYdfca0!FaIRO1(vUx5_3>>rLHN1v5wQ
z1WhaDp}z6#lN}#DmJ9{yN)MEbMWXv^4(Z9z36f<aj@GGaWkO^5qNX^-vv6Yc{<)C*
zfH24ia=5fSomV>FSppBxn;m|li}u<ixA(r&s0zl9w|z<XN;AE`vIvNURK6VL)z`0S
zsjUnVoQqqL;42}vBDNuXTMU3D)&AmWli(haXT?cVJj@N)4Uo9EXsl;-$T#$}1lMLN
zby+*iy#Trta^hxVNcv>b+#s;+XC%0YLOj8H3ffBPp427OJk*lsaz9XzLhX*Q3gFiu
zlu`B??$j<u4|~xe`fzFi3+R)a<=H`E0Il#T=(o9J50crra>p+{K`&`j*D{7%CJ)m~
zoXX&iotllx95!L9^LIbdr)o#SmCyXfcwsb4;f!AWp-c~sdhoM)<PqII7-;uqI})e2
z=%e|ti*o=_8;U>kf0JAL&*C)yJE(6UOthCL<@`4!w?L3zwRnwR<%27&y}3h&#u+<@
zjE+Vj7EmU@C4iFl+pO}Yg2vFgk8_eP6wEQ#aJ_iuz(xX~_R?&j9z0~rIBZ_uy9qG!
zC@j(sr^8)79dafHw9G5bXA|Sy3VP=BRw?K)M!&}DIU}h!7GWa%C2;fWpDvcPq+0h0
zxv1tTPg+AW$oc$mhHEIBAZ`UU=+yg`*ORBc)jlz+VBD=6<}W_t+5u)V)Q`d387f}d
zy?*z^@OExUF;vDi58gQSt0pNIQbQO0#rj4?q;uhk?R<E2&M8lJgZjkYxt7hs>6fSW
zYptN~^=-umkJcY?+_SJ7#eXCk&351kTy#QRuD==o*nZe0wH6+6_DDA=W1#6?XT<qP
zq{>D5{c3@2>()!EnGbwLC#AX7LM9af>#A$hKWfhMKl@n+j)kvHyc3&(ta+(VFSW4L
z{d|pyC!jyQI=5LZe`ah=i00ITZ>?N8^VHUTTk(qZB)iQ7)2C<^Y&}c5IO&r?Q@C!*
zJr1_6rm0}gv+TBwAFpBm*-Js9THx>`_C3jGg7I?3@ZRU!D_>QFG{-E1s%?Kd)6Y?B
zBtCO3=ClbIZ`@|r{!&_02JGo5rA3+Y4)eD8JQSy&ZIG>{O#u0$j#pM>b2Y_SD>KuS
zylsEMrBQ|1L*S)d=S|U4r+-z(Qo(g0^HLZcx1@K|=*9g5q#}r5Pr2^D1q!r~8g9He
zsVi~^fqO|8!BSr7|BGVP9p5=iTx)C>*RfE}lfl)MSGk+&QkMEE5y^5ZH#LTZhKfAK
z|6IB#izRw5wH^s8MB8lQllYD%smYzSkohxs2k-`Mh%KvNObVq}=UI+YMX7BFJFBKP
zf)Kl#_M|tXT89+2BJB4*Mx*VE8C?3?Y=~;>Pm4&p+PMgabC@|Ho~1YYLnIC%?FVG;
z9~nE_-s~Yw&C<{744%OvNN_@337!Eh;+ylzpUjU<F+&%7@<BggE>e5R)v@WULh*j5
zP@rr*g!Ry`y%iU(_qzF$@0@e;gEb25&N`A^Xh47jwdQ7L>z$<?42{O|6|X=?eKZs#
z!xrPHykT*6ahRmGD(Y1fI?25|Dx&@+e*+Eu6EVhrgfIR}nS6zV6>Ml0pcn~dri5>3
zuToQ~eQcJ&)b63(B~XQxN5{PkPO+4%_wQh=w`JmwQnKN6@+{87eLJ9P<n><egE`mP
zIed+OWnH{laQBmLZqWZ$BA5F~N$P8$lfH%us>U6FrHy!pB@>?mmelQs=gx8M{OvT+
zCNOKD3p9)WB2L<smJ-JCX|?R3sHyy`(f-&Fax?lux+baBnD#x3?i3_rZ~wi+y<>U}
z_jQJskhc<|C6g`Ga53XM?slTItE#+>k#XGDqeI^<ssXpjX-$`ho%c`C)8yn-<KD8M
zB(!`sv7%SBMRRC$F;l@Rne-3j79_3$EiVzT9P@p1x&@RvZviRmqv@J6h$%dl+{XyT
zZ*$&n%ht&5Fd}5gl#TjWf3>7Zpsb!ArE;CT^hec;2{7-eq>^1#@f81~G<p(&NOe=>
z>;0+ju=n5e>=UbB2E1U^q64#99%-ekjFJ?~gvwF|=@AH(nFsq$9=@ir&Jo5c`8+mX
zxU0+`COjj)Ay7Ctr2Vj~SZ;~`<$3XVAHHYzaY_)+jBvsbF^=7UHHx$rH>Ki6<``Xn
z?{o7zGUO8hg^rY3j2aMixK`ctKK`{Z_!`gVo61bF_oG|j!$R-17xDwE3Ev~Sujdp8
z#Hw;~)G2!+Fw6YFQtkr!**g62hWw%&xX|UfTwj_BqV08|sNAK>oeUyxsl$R`Q`4eF
z)&#%xNI#KxmoJ?WHX9k_2+yf%XB+XmJ=0tn7nb_x?|f;*g$}0-)%BY?!tKf##eT~3
z?WGgJu~zYPr=iBNZ`g;iRF4N_3o;QyfcyLYqFrsj$B8>0_<-5>8<JfkA~<-p%$t2U
zJ4dNjbbY<=O!eBqSOc!V0txnJ;@>{I+7LBM+OR()SptAIq)th7mt6@B@n*)p;Cgfp
z?&giaVxAN1_T=_Q#{kp||Kd>PxE1N>Jcv7UUr`+yY}5X1V@%P6lOy<kkJA}ig_G+0
zNXuW;DB{={9ieu(6lIsvt91OTPDQC-12<qxl5gJn$e=TCLE$xzP{+pOn^6p6kh21X
z-y^O^!WJ0=d5{rheD|0hjPA4YB%<a{gTmJg%j@-Mp4wZC^|6^zc`E~~_T_?^SX=)@
zR`B03js7o~zyDI2VX0Rd>a(T>vRW+_1%Yk)p1itqx*C>DbbsUn!gfI_Oe22S=N`|I
zpei;GXEpki4f{uZ61JJFBB(t!KiF`L4mYA!y}&=O?H24F3@_i6L~}!X837zF1-251
z$gh6BDq}PJV1NlFWcd6vc9_d`S$piXA8ykwMtK-0*ML{(|LuG}ZqQ-WEL@=ct3S5g
z`Y<<-uHNa;RC>6V%WEDH6**XRD|ZonOqs8TJT!yi{e<gm_4kiY{HAL_w}6`f;;{rc
z_oH@41Ang{ja4b>k<LL5O`Zh)MjhWSCG#Fpt^ts;@L9k1JV!X`s27|D_%KR4T=GXF
z*dTOiVmG9wh&z*9myt7i<>lP(?)k8QPLFPZJ=Ajed&RnmJ?HK9+Ui){@UVn=C^exd
z+Ya{7q;ndlcDTtD`>O_N;lP1_HZf$-B?^Jj2*W!FwX>McOSDA%lo*dwdOVD^NwPn6
zr@4u=;t^>@sVWk81&YP|9n^odm%eX(XmR6?e~nc#OcU&uLBudu+9tmJTSr-rZ`3oh
z$*0{5p6VIwME|<ZRMu!-*vgcXy2$nLaXva98}_@=T&n@4ud!-4k(%t2<7=8lI3LH!
z(DU?T7b`kbJO?H(zJFA$tL*Wdf~&FCsSi2HbABnqv^%>Cpr?Fh?5r4*eTlD*B%hlV
z9q4Qq_vHZCH4R<wOfAu4tkz^JlN^7HO`h<j@x4>6(6W=Z)VEd|x*D(J%Qye(5I3OQ
z@{mR$oV7c(Z2~vQ*@7<HmfLL45Inm#nGpHXOYMDOnxlKsSxJ%6EnpgFBTFOA{6l}d
zA?VQ?cVOb~par0%RvhIb*jgF;g6m6pFruaU`O~ywjeXu9lJtB#emF^#Q|(A|#`G4*
zD)aclHrvd<5{sdm>NkNjPDZDzayWem^p`E_W=2|RPsNF>QVc()JUVKBGrTJ--9AF)
zC`;e$b4RnhjNLxd#^!sRWyS$R1cmal&6vpXdW^r=eHc?#sgdrIfr67I-QtT<eVffl
zqFrN+5j1|TDl*KkGEm%7ZcMT4%BnOR*-;ZqUN5;a)$f&<lN|D=Wf8z;)d4o#N$%sk
zRfG3EIlu6Gs24L*($C_0*51AB@}vY3BO*MsFkh$L{Iu4&28O&V`1f!MWg*SkI$duP
z)yW0zx%?ecH^E3GPS?OM+}mlT6)Vz)pH2|7FVeC1usnYjNvw$85N~|Q7L$V;0iT01
z2R5m?K#@k*^t4Thmw*0~XXZHm=!+QCqZqbjzGDr}a{XD`2W)3npRI4C#D|-5bl^~E
zv$~^{15K($6${TrjiUCbFD`sW@8#>7Cl03z0&EwkkuzVAUVLR@5`p&g!TRSZIuOQ&
zlLVN3X*XrM^r{-CzZ~o4D)IWE4^OAi&DRy)IYD#gXwsI$u@(|{qGu2Gs`}O)5b7K1
z7f)oj4S$kOpH+m}zLNXktf7+Wi{dY43rDUuhKKv*Ep#)O@3Ogb=^3L}Vm=p?`S2)6
z1E$@XmLC?bTc}tFp^#*Hl^<g8vVSsg_7B0be{IfmcARB)Z^};nb{x8&P&|b9cizme
z9I9WHS?{>aZAClKWp#XBN0xY4o?H5(pxA%}L?+u`Ol`)`LSDj(7pGe+oI?_EapST!
zJJKOeYx%>9_dE>)CKZlxBb;)Lj*Jzump?jq^!o9_v%`jTsUkIes3B=QG=_95vOsCF
zoE~dTA<_71ZB2VCIwxyesDb>HN~ZwLbW_D<fUh;c=-w1gzd7Zw4E39Jr;}BGkr=7#
zESEXOqB4ov=R#kXAKyG}_L70`EvLN*J7Dx;7C)YnGrrn-tsP?nt{e$x*UTL+H)%l4
zj#I6GM`|ZqgYgiy`TgtjR@!(6lw{zP4S#XTlQL6<>AjX8x%0g)qz)}laCx@7t+hkE
zaSmH5Ru)j!Ps36c%Jc5Vw&D`wzK;F@amvI;ftN51IexdeF+?&Lk=EQX%PB+x-p-k{
zN~MZ4@sRYCtY#1XS)bjJ5*W`|&LO>OZlP|s#pf7Lle+UlnY<no6&_6|uG9RB?Bs9-
z4YOh%y30v(>C@sDIH2CL=aB`?X1r}~LpTB>d|J%OTPDx!@@rmxiE0zBNP(&?-#vA)
ze*)bsw2E=6Q=~~YA$QV>?;Pi+3U=h$C2Er@{nYzrM!|MfJ6imSPifBR@r8N=@;eyC
zB5M|D8zhfRia$1({WSLE>2@J)p_^a~6HHT|BpOm+YR+S!sFO-h=JSrV-cFWj*7!Nr
zNn*BKH1y0clw?x5(5jMVo7+ie!eD!Ooq|eqH#A+lI(pV=V}Y0;Ic4k}YA4~tg0pw5
z+b?Xj=mc^vKH2g-m5#)X7)aFI)6Adz5Pg@8)KEzzwjq_SD<KLZ;5k!>c$nnd__iex
ziR@+Nxyw&#oI?!Yj~$s|jI%+hdXJHNv4k7)5^c)xWz>!2vvF!nJC~7yoJtIOZ7G&{
zBZ<NJHfk;2@Y5AV`z}hCsQnlm0~{F#221Ym-Y)}|$RTpaQO(BCf`F5Wud^0SZ*GBa
zj10cs*gFU^7>*>Y$&rTrliB+Nq+-P=^A;`e7KY^)UfDV~`h(gzf&p=@ZXe~tpq2cB
z<uQ(&(ywJ*P!tBiS<#W_z=1D=e6jR$*>gqmx_ScdeDNl98HboRGyPypJH#_@uU8-X
zg=Kys(;Uz$)IKY@SuBy92LO?@32KWy15>jKmTFJz@+8nk?}YycL(GfvP~I2CQf+sy
z7#VA>O1FsLS8_Ok_+|UkNApJTMLZ6cAjX#vAYuHkZXyYxB5`i1U8!~<8np`AuS|*m
zn7#jB-~T>QxcG0k%K7bsf&a35*1v{=j=CBXH5(cRg~f(dRkT$=Vrzw!nHfx5Y_`RN
z<9BMsFelchQL)ZqkFQrV({gV}ek^S3*<}u#*T4q*&lPZEwbgjT(H#7dpxj-67_^GC
z(>+SvpAOG1$xt!Y_j9MWxzZvu?E@FZr@aknrV^{KdTT+6s`IqH#}GA`_&Z*4vLEl+
z?TF}D2ND={z^@*P<GAxk9J*A_S$;_F3Vk%#oqWUOFEkKhl~WtMnY<_0ZZ77pF{O6)
z!`_y$$|>L>34<5X^rTTZ3mts}S)88kunB{{%2#Z63W^LEQntT(23Ksqk}ex`-}W!d
znAA?TX$8F1@z%zzoTMCZ9-A%H>!WR=0XA{<a6V|GInJ4MyvRD100QYK=Vrmrmnl&8
zZIZva3`)iHmsrn1!JWIGL@EkBeD@<Uj`(0mko|6x)f?l%@r@3b`wrc&6;@*Iwbu?+
zd~&14Pb$j9A6FDspE$KK@yH*J?^vL?D{ZMAg1{a<EhFnp0?+P@VXfm4+fD+4;!$1+
z0I|0CYSeS6>?kK6oAkmX0-nO%K9a*{t%OZBd_S6PWh5W`1aK})i9wf~auTA_zCN=E
z6WDd}n;4b8TfmxEe7yE0{2coIvvZu}{a%?!{B<N-Iy>UX{@tQz3v4>pK`f6@*1?vk
z!*oT5AhvzTa|rP6gnd;9hudOY3qo!pJz<b4?P7#`{5O~)60a#>yamSMv_r2mXV~Sg
z2KNfYUFcuWdriE!IgPYq&0oHpbR-$J^~s^x4q2^;YR{(_DWlFBena&^c+z~!t<?Nu
z`YDwl-*XnF7t{Ro)1S^JhxxTw873U!hx8(N9L<lGx`*}i<gc>;3U-5y!OMxJKp)F>
zDJ5Ci>moa9j{W8xhoZT=U$NJ_OEOmM2T~v9i4w%DsJ|9>-<GMg8X0sy%NJ|34tl5n
ze!ht`Y|6c!-2w@`KNOMsSAO>;9uG5;S#=M_UwSI`@dSplFZ?lhZ-j67z1A=$uLoF<
z`W05+7TDOFTrvQ;th^bN+su1~DJ}Qla`LDvkClqERIZb}Tg9u#G+wi*R2|p(qqc-?
zqV$}00|J!%ZM9_7Z?n7g<h9H3O{Wp;N(|Ti>(xyYlIkbZtJlr;NwGyM22#Xo)6>F%
zcsA*cV`bi8Aa}e_={^3sxY$$#*U?Eowf8H4AsL|uSA#-FVm26hc^{+xFvS3;+hA|5
zp2w8KHg?G8t|uk0kzq#iuZ7?4VKi&S-SiNJTSN&XhB1!$E;=2cek2Qa$JG?k(D<O3
zbzOBE&+hiY8OMqqK~toE#N(dPS+mSL8~g<gdTpKVhpJa|t~C>jRmLE1DoR1lh3NJ*
z@~BmFsGox|wRB#mlW9|uT(m5mnQ~tUAJ1U8^2{L(RstkqhC&GRLo&P-VOP>)2WAr|
zyMi2xbQ<+9-^X6W8%ul*%u{~)*q9!kw2a>9P^#dPyU=l{wBG7Y&b_&H*Am3xXL+sK
z3Y}1la=&3_&gj#^U8*8`zi#%p6U{{VzD3G(?R6^O51z9$B}~{h)e}Ee{j=7}*Pzx3
zK6A5^==%kyO#Y(pS85}ddTD74wcOwF&?m2<Cd>=RbTnhv$6&i_zc}=brH#r%f1LG5
zcUU+1l&QfJSiO0mT%->dR!fq@wL@dJTWZ2^6vw{cSs~3^HHUSvQYq4j9aNzY1E=Cq
zK79k_c{;CYF-3QR^W*b%1}0|pWr<oBkr-1Z-ot-l2I4=Yr~ErNO#yMS=JSdoSppf-
z0L?E5IYKTc<w=C*-AFD;3N*^2A*p3Z=k5ii@t0)XXypWY76kfR@rS3#EiT$OuhS7k
z^rX=Wh3#8t{s9+7rAQ8%1s*Qsk|W2lECc#oM*I%R3CTu9p4A2aj7od7a`H~=;56=y
z_@Ut!bX%iAi-LoAge8hN8k|kxP$uE}Q~ti=UW+a`(RKR*dykDrVd`YadeUfHn_#{}
zo(lT1lfFjUY80c-xQZ$PW)=oMUTwX6^8C>B0mSh-8;h2s;ue4)b7aT9Y6t8ig8@(8
zk5+F?cz3GU@tP+@Y&^nZm702KwfZjPlj&d{A@ob}YT}3ee#G(h*oFG^7UU4Jt|?LQ
za|q;W$&^)lqg#Yvlc6!^Mdd0gC5fa=c!i$T%?)LW?wRW%6%PH3i8|Y8D0bXg``A7<
zL5@E1*hnIAEj=O2DtBrAxk%WLmcaTQwIKcPi+tuj1ZFGB_|}Ox&WvHAZ%+f<R`7Ae
za(R>O7_Q_E=g>Z_Hr?EC-gDQNCM%(DKTA4#x*6Z2OtLM8f4CT%FKfHX)=zO@_Kv8&
zGSIKDTwYCMWiWStSYP4uf}7y`R?v@jR>LD-rV8^zZ)`bjJ5ihIgKChQ;QhC3OmdxZ
z4$p}STbMi}9<OWbrK@rV{}6*(92VaKhcQaxVCz%+%E*(vE4oXq^3w3N@HI8d%HAm(
z!Jj&QcwW3`*4lY56${EeHDxM!J`!v&jYd!HErCpq5Ss1|w*UuH-{#PlOIDrU?0F`&
zUrAzw?Wf|JkA>cdC5%1Kag^IE!I8|6)y9BAKvqV=6XWBEDzy$b>4!e+BdWuWcy0;t
zB{q6Wp>`anUdd&zm@PeYSePf68b?G9h3$WIN@{|wC+!R?5mdycFm?Sez9TK@VexE+
z3h6`l!IzjMTchsh?Me5mgqlC0#+>%w@KxMx%$_H?XC$%Svj2m4Q!I59BYhS@1b4Ij
zk|xrp-8ir*uG&aai{Ehzfb;{2<Z1<P4%rd?<?Bo#%BOZ^CxS(ms42CFe!=WId@V_q
zk?7oX2GFDOK$celXeyb{j3ROXUzEK6`3*|{p|<$flG$36;1w|0u1n4crP$oM+K2^`
zdbA{F@jS1QPRPAQ_nZzb&*sbEbO|ZbtcMP<r<r%h<>|w5<Gx7K$P17JIjk<>>e-PA
zrImUK3MRN;+aOu_mV$iU6YTUA_-8WALo8UEOEe{GlJ;)Q3(+zonaGrsr{!YIaO^p%
zQ!m$H<-WNFA08bZ#9O!rfM!&c3SAE$Ie~=TA9X2-dq%3>BD8`J*IIAwJfJj4mCiG8
z9$|~wlmNfn_M>XTDK^GItBYfDMB$D7T0(R%2ZI=*ap4x+KY;{`@Elt7%$y&7b9ux5
zKnr(-9+1EobuxCGlREQqFKZu3jQDgq`&feXmqI*Je!s{+DMFShCHC>Lg9~S3xy)04
zEavpnBioT~Kd|9riz!BfNE0#DOYQj<w!{1cC=KToo0gg>E{(2d$=%haeEc7~9S)nr
zb?Glsqk~W<ngNfQ_N6efhs`ivy(c*??CVXPXmV~O=lvTkO?AiK;UY1uReP7vh&2&T
zWRhH`7=d|`oPW5^%f3x^M6l~5=;HG#rc1`&`;0w}<ar8xw`3}Y&Be-B6MU@E-^=nG
zk=D`)WWwrX7pFj%<AJQ1AX;>S3H!2gU4%F`a5&=M0-icizB@lu+;zx4*}f{fyo_r>
zQ)zT8Kas}{csn3>3Rt}YUmhA?Q!%>V<2z`r(nds`iJvb2R<_t7R)i8(R@oml5(OyT
z^8=Jo{G}SzKdKa4n@On+NIjh_t~!mJ?5Ciywo{WLaME7E7K+ffv0{E3ThuQe>_+Jp
z^72)g6Z0hYu)0h|SPHLeC5tix50X_&I7Z8O=Sdc7CiTQ4_Mhx@KWL}GdXt2+pad7>
zCjG%qb@LO+$DHAANtK-ii4@U-SaUm_8S92O0irFCoVleQiGe+~>uDp*Qc>H?=Bbl8
zVwM+<y!#5cXsF;Kz9$hd{hgH3Cu^9I1AUo+=-R2ie2#%@3KfrC-GnUnM&l$3$ThVK
zc)y#q2@;ntuia&%m9l&F$$-)hoi(rL=Y*S6_ucz>CI+|;x?i8+TaPl8d>LZX5saJw
zP9QRHGqR+z;qSLV5;7K*Rp#)(X0(NdgYQ?K6OuwRnpm9$%b^^ZxA;0U+**YnTAgP6
z;!DfK1CP~ei(^f0xur;I{5&5LISCQUQ+!@TW4z*|iLhBsg0caz$@Rl}-S{|i(;c=`
zioMMEgPwxJ(s0D%OhZ<M_bjPIalaA`8x_?xD&C%Hb9c0@5jz%$2m6M(qo1oydNUR*
zTF<piFg!OvT6>cdq5j_YYjK<#oFB{-kW3dBvpge5^=AQ{ARSy1qm2zJVGoXSsy7a-
zuFPLhnMyVBlzK#!mFp(f1$3d7{U`H}C1~$BTuHlo3fDwa35P#WlQ}Hr*^+p~_H^bf
z`0!1Z?-<P>L%I{K!v&F%RI%^KB2RTfYvn9X)d-qcXUyC0<$Alz2VFRZb5%!Iesw!P
zE|D0dy8f?;EwFK#vkB%^63?@nL#Q5-^mkaF?e_S(&LLpN_{xV@J&C=9+uAfd9h(<g
zk1o+`ZDYg+oJU?{A(`sHHAOAVK7^y@IzzqM2NC(a>884bHpheuohmF9EQ@hDvq7Z4
z(0iT}>#&2F7rnE;5D+aRgF&Bu0=kSWk2;qVmr{ld?)s6!<0ix{S`&C?(3^8sWV@D#
z4crr#q$e5q-x{nd9W>?QZt{Z86#t3Y>Hjbr{a?9L?*GBvdq*|Zt$U-P2!cqYcd1gP
z_YNvunp7!4=|!5f(3@20RS*bOIuYr;7Xj&l0#ZT;k%Sr$;$82%_de&`bH6+M#<=@?
z_dfRz#tJKBF*Dbkb3OC<l?NvR#nA`91+78xH@tp1!!)?z+=5eEQ>i&qb@H0Je*b2_
z&Vx1smFEC0{)YcsQ~%~MaowtDe}UnuVHxrK#SrEX5ekxwO#A4$Z{%18_p8=_CMkC*
z;anPo<a<(={x?~_wIl6Wd`Us7PFw69NlBMrW*~8n3P;$*d=JocUpwITaBzJ=P8#B3
zIYJ<L<+NSdq5WjmS_rbFA<TFv2;7C`I@C;$i7omd+q8u$Ki;hrCBFvIs|3>H?Jb(L
zy_|{|E;Wx!%XSqNq-%`my#CCKjU;)L6`@?icUtiGbHuGdaJAWx1EX6=8{-5>2fz7>
z4Ygdb9#4x1d?KRp+Chvm?oQRs;nh?~lbKyu07VI!QC-S5$K=65ryAp-v}etDh@9kg
zp>lu)fLcHRc}I~o92>hc^tvEZj;~h!<ZtVwfqJA9Lv-&<@9aK<`ukZA%H*dyTUBhz
z)hezgcNXj#9wxiT<Ry_AvDRBHG&!Gq`|`<k(V>=)fTqg)p>g+S!Sq&A95IjMyaMRQ
zn;&NsvjZ<G7izdU5A?>qI<Q$kd`_>x4H7gW{Sq1>GZ$jOP+?$mQvQAlc7~tiyuF{T
zx7MGm=wR#@qUlgXgfbCq0@V(Pu#ex}SNSmGC9U=?cg|K&4iP9MXexED{Z`o?y9gF;
z<@@7Fe)(!!bWic4dQXY|E*Qm(gTv+`-eOoE$2@z*1LatO9Zv7n^=gq;m}A6B+?)|F
zbKK{<KO9*(*t51g^xQLio{(j~lBH`Y#zl1CtZiRKyaQ~q0Z!rrlj8=z6ZxnY#BhKy
z_wLU#(}{y|l>tO&>Zrsx#ybu2IA6cMONyQWHp@rY4}i@wwxlH7t_D05ggt%bTRLPH
z@QFOBai>J9LR&Yy2e0GdxSaoVu>Ch%7AoWSu{I2k9~E4CK&p!Zype{b4SaEpFU9T5
z%C1z<MhQ;Ab@S0xN0&;oK2Bc*I9J{|4L88>ps9+<sZZ*lKs-n(RF8FeuXKMwtSn4Z
z?gv-shO<jB>!%k+o15=S%N?fiKQw3HF@Ce;nHF)4!$?hyl($jo!VR(>+M)I@C-GN2
zjXrgP(bvTAvc7lwjZQ8z428yT4!$iiU0yrwf)qgsks%C!XQ1Gym+uK1ER2k6cM&<C
z>I9dV6ov?FBbUQp5>D9M!hRW~AfIk&9w3P{SUwbg{QACt>ahHHn;$36hzme$##_f-
z5VHE2pn{%*MFvqrHF`56e}ObY$IwhN@y#KD5)?b0|5QQU@5nBHF*WXS=p10gw|y#4
z0rgPE-SdlRzoD$^K+ZT??VAo5w0B{fsBQMJ&C48F#Q{&=M9UD_#@MZPK}0U=K<mrB
zY?(Z3>(wxUk-(dx(~~!(_xEL`J|FUz7(b7*$sGs5iRXjl(H7d?QEKsrPd$!754KSQ
zK8)ltl4WREZ|ZKVk?@94je8pquHNDg{{_0^$}SKui0J8YpfLy*^1b53DVdX#Lyup{
zc;oS~afH)icLy3bSfjNO!3pwf_iEJ|Xlkso5faN>#G5wWAY@R(%1&2Z?s0mc_XR7%
zG~=6VA!VM00DdH__bz3##=eHD6o3uh?-InH#YqAKW-Gh|HbhW1y|Tg(nV<bDMD5Io
z#i=qU%90uop*cfRl9ZhTO}S@qWZumw?6<r^r2E6Z_;0>mHfs8$y$TV6l7og33HNT%
zM&P`sF6S9**G1X&EK`Ar<{xZr%5TQWOHLH9hN81C5(m2I+Vv2ixdo?Oxi4qYYZITN
z<f}n}GfGg`?k=)D3=8tK-><$}+C-h?o<|0^vYXm|>^V2+g6u3r6LbHA{K?;T<r`58
z9Y5DwT~L}?|B+FAU8P`1=9hcNggk}ltTK6#=%kV}#GoF#*0r|ck*;azLc_BV;?LN$
zO?078r8DAHNt7k3Rii1QQ?Zt-i_wQV_E|Lye$y9WA0Dp*X~odIdUjT)Pk7-1hsK55
z%b5o_E&0WtO5W!2JfTs9Xz`?JgaRbC+uf{^g{$mcj0?_KtKXTn;0{L8`Klij3Ax*n
zxxaJ7+B6?+UHIv@+@`DA@Dhcn3FO-r_^M7wR0wJ8&m~RY7fBmP&2tRRE<BF(o2IGV
zN;GkOd-&AC{%(EWOIdpyd(A^gB68~7NiXrzNB)v@KJixQKBNfw&O+F{nepWN$|bGg
ztel7qfMRz|DFs}h4hKxe!{0qM-W8T@ZnryTi%WmOE+8ajC%T*W{DeV;O?N~LP#_l2
zz+bg<po#{9=oejmxVjn{`vjNzc7|Ycoo|s{gJ67UnhO4cQppU`61KTLDY%O9#A>R%
z5<_Y=(l75OMFnXLcADDlHH&UsZht>0dR)yO;dLMU)!KRVs_t@rnkf=1ZR76A9_WIq
zuL~sF=InSY*90Nxd@D*??$~+53hsCLO<y_Gs4x!vM`9>|e|;h*Pb_gDJEEbnK(xy6
zSVVV-<_mUt_b`LUT=7(=EOb$efMI{Y@AdpA#pc9{1JRT7*dQvX#z1Pv=Jk7xOlqN_
zquL>lI6D-ae6GumC;c0Hco2Li)h#FsG>LCs5Hty)>#%uk9P|ClsoO2~pm6q%(Z`=f
zt|3$W^<OifY&1p>lP&Nqt{Bjv&-pVvx89J2ObIn#gBjxk&5?<{mjLDH{{4oCuQDk#
zVs_GsAgfr=sXAvB{~dIc268Zqy}I(_W)EZjM~?S^+TivA&!=`qlt$lO;Wnq+g3Hno
zxY3*DB_ThgjfyA#YCZB_$rr>*SR{ebbaNcR!#i066j9102<d%hFW!cF(t0&gLEQ+6
zZ3Z=X2hVr|JYpF<-+(uJc#xR0eP1Vp`Z6b6ff1&jY4q|r&dBy8C3_n$#~M8TG^NXG
zdW-NIt>Pwp>kGWY6Gnjcf27muoTh8lY?f+%6HA%=nGSwd054K$K1_tNt}_{e@CGwI
zOgFQO1C)&?{|F8Z{9nKISIzd%q7>0h8FK^W-=ZM@FhEGd{w!81LxQmy8vI&L8tU{&
zrD>|qk?J99Xrn+Nu;o&;5Q5eLvE!B5PgmQcXACUSNnHurB3P$Uu^18P!#@A&gUz3T
z!<d_LHu&FKjm98+=r#n5T)IEyt+e4V$)kR2|KzxNvO=hp8H%C1Y1%o@)++8q7xu(y
zXN53mLeBKwN^DIiQ~1UMVKk*YK)C<pXBbiKbk4G(){wEMj6tMc<b`#HAQQh|1WTI2
zDaIOi=ZE8dc$~6^USwY;s!g6$6MuCUY4Z#drM^&+&vlx_yBoT8z|$w?x10Tlg<5|*
zp*U}Qc5V|8oR0hg0g{&u`#K<v`3C}%2;s>ws=M-j0WBO0o=N!y+WE-SuQ4w(SNd4&
ze$;^a2ScB%Slq(WwBk<&Z~SJ<<vXk{W(jHml^+iS_7Y*5+0S_?KCWIwX;KMmf%roP
zM^;asJ4<>*C!F|#otdEXa=B?~BPotjf?a>1w1jw<8)gX`Sbdf)_S@%`T;c(<&6HVR
zRXhbG%cobtZ)i6Qa}d?H;)vS~weA%aI3>?!7u}oo_++I9l``OHX3u^n{g%``VKD!v
zMTeEhV4<)<8R6Dc+j%jS+-c0#^u?FbVS=~48-DXO0rYRw5IhCD_Q29;6z=;O0CjOz
zf@5lit|gl=aq1O1^~t$*KZN(x`{!k3i=ipQU-l{YWz3aV3H0{BR;HdtzFRO3Xw#X0
z%Y*qKvRrFO=c7^wM&%90A&TR<+O<zUee-xL#&sEAhrIQ|Ph@Wgy)|?xEp}KKs55cY
zVM8_d5CICJ8)ywgQ)~ba3yapg;b_S7^cd<B+--`J^H&&gs7C)iXL!!;Jnw?b9he<`
z5VVG4Ah>Rpis(Fuvi0aoN<d81=m`=22|Py>aLYu8_fg^9hI}n#S{1lRTc3;tU2{Z2
z`K(A6TZf~HxNw6k-@(Td2?LZ+;;(GRbLF#0_Q_kggIOfu?*i_j_WKq-+-q#3Gd9a1
zifexn7`+k15+ZvUTj}8I6iB#aqWWQQojGlTw&8CqT{lLOD`xR{8FBVhCzc@r=E+X)
z6lr?fwo6W&t(6Fin++3$PAiMqOUe8hRps=~&AHuid4kKGVW0Vy`yRJ+#QW3>N{8<0
z+tzc%RqW{wDpIq4nZ)mF<roChjw1Yh@>V~R*S)e2j&h=ZM))&`fatvn7d2l&?QU}R
z+I<W)T58CU_H#!*S*5G);N)_?)#ZFX!0kLxxb^q&_MfqM{x0VHO9_+zDK#0K^E%*A
zXcRZ8?o|k}+hQUEY_02*pbr89k(GO4J(j5>y!D!Sa?L}h@RyPLd2D&CX~_?{PI0Yu
za2t^P{S$OhnBhEJWU*x<a)Ik9<qc_NtRabgi$Ei;GAKuHcJ<0)!)+;o(s7LsM5%}S
z3XC{tpYBd}luW4SsERd5*3I77OO;+&-B!ANr5D0sVN0u1KbRX_zUQ=4>1668@#+uK
zAzVoTbj>{gvT^X^OE2thTrjBjMwJbcxCN8V&Q<>>(E<M>jFIjx_Xl910R$!h)Ekk-
zv(#lzy{S!VykxZ@=9qO(s_Jebe^|BT1)wO6*2Tx%S$+<Fk`LdsZP99re3m_V+p)8G
zgXKI&>8^W)bUfesa>A2Te&1PwK*x+d@u?Al%vWDZ2`WN7G&(bxX5-nCK9_BYCe<iu
zrI6?#Op;s3w`vFoOnMT`3~Jp6Y!UXwPko8~W=%g<z{MrYu9oz486};wi}-bXv))k^
zFiVnU79Za><bBMm)w{)e5!unUDh&jdfK^N>JJ9~*`LG{wU-S*~sD7U&>Wdpi?15v^
zj`<BN#T|2j&y~oH6bH$5A-56Q39ZVZaLvM!A}!t(>lC~pS)|}Xi0oEf0|Srd=X|k+
z^mZSTJb^v%=C1aP>+0wGOta1jmd)|j+5kPTLxE8WT?wd^L_za%bXirK`<vnuH1cDB
zt(a?!93#4@_efyY*>ps&ze4C;mkKvce&m+$?cV#*ew84_D?mFOfCdjPb4-dlIXO!q
z)R=uK9^XFZ!aV_<T=AUnwMfh3KsB^GFjI9iyz4piQ8$IaWi^d|lgk6*)IZEV|MUL+
zvtIvhs{OUhIiQkOja|PSFOc(&<Xu>Q+Ma-o_kb+ZwJ;7gU5$=)8g(YT43r^rOH!S}
zns?KS3lhC(aAz;CSZRW7Et#utGi@%_%H;sK&m@HJI^T<@dajc)&XjrhILBuAY(jga
zGx)P;ys3GsxL-+srm(n=<<Jh#oD2_Ac%XGDMyw)St3l#k$<_neBo9~(&u-UEAZ8hQ
zr57Mj{i$bPq~cZ(%{V8{CgTktU8E9Y8@uP^Q(reM_oB!}<-H6>0^at*nRIaE7UzXA
zt8ven&J7a~XKx%9V2S#7y5mi|q=8$*MfdcR<kFG-T~snavY0?I4KmD1CGk@p>3loB
zEhxw6Tdq@7a1;cbYD7C@taO%yc>LYW1z&P^UIgo_sp^dBkT8*O8JnNA{z)#E{hyTv
zUZa}AP7Y~zHJ|$)sb|^SFz9ym&2<`dpqbadaM&O47PTn2v5^jjB$^51Sh(sc{0QIy
z5~rpJm1`V;Xot=G3xwE}U(*Os1+<|re}PsX$zPcV&a0{Sc&uropRAAqj4`H7K(84c
zjBd5~<AnSUZ5NsZaGa&G@S0Kz&w>#ohIIjF>HmIK<G){i|3@q5dk^6?UF84mzXGJx
z2woH;CUg|gpx*ffLV2AVaF822YBJsehpmwO-2KOS&n{#Mh84)9O9mfa{n5G^B}ztV
zIci2cIo9BRoRkTmLC48&(RZC=7%_aE8^wh^;}g;NJrmJInCHNig4cjAx~GlSTOm=o
z>YK*^xXLfk!2DvG{!#u}96B1<S;Pi!-Tm9gQ!(V*{T7$_{MWxgQNKX1;Z62M$>4=L
zgdoxf!35}8{eFQ~(0_J_UKfe{&fh=QxmXBe0Xt5_fB|?X_ylb66L1p%`suMe9){&V
zS{m5#iGFH0>HubiXyXs-ly1(oYHif8=ExKpTm_r)kXh)W`Fj?E!$k_7+Z~Uf9ZF=)
zyZWZvxH)xIvot$;V>v6Bc(%Y40XN#_WYpX%9L}8>I%e~%Dv8p0M=d*Hg&{&G&O*F&
zY7Nu*k{ZS-Oxk+&SlP3GC>n}~3)8zzI1At0cqlFP;DCDc#yyqtAqr7)tc&9+^y1*d
zfe&M@HBaofztl!DVddOdwD8$6qB1h!P5-pR;>#4jf&1(SH^H^TJtXF}=+3N7T|^DO
z8X=eK1Wk3ovu8TkQx;fP>htaDozk<E4%^XvlE(VNpgV!zik3VE0?SuNa~~Y`E_jVs
zP@A>iwElJ;)4j3Xl1~ggV*g{3{A05Ge>wh^5ByiV{9y^^-L@Vmu%9%0J6z53G-e!G
zBw6kEpJkzHJPZL0<AiH&(XcCWS!E|~31ePa1b-dGi)I|i%oE7NEPwrx-~6Kg<2arl
zU_tlQ`}~gigC@#xfWOW?^77`HsH~g(ZO=fx2gty@+)CI={ztQId)Yek(?6Mu6v<`#
z3w$ZNcT0V5*QuR9N+5@gw^%Tue`+JeGUoLX#r71VnHl?s3gr4a0vO@YC}R|)%(a1r
zs7}?bLJF(^(2dpC^5~*7oP0=Gi6ZrqRB9<iePO-k@`f`3BzCS<*6JEUl`jnlR%uWE
z5aD;~qG2eX0a~h9_9;(SKI&>!+z%Oi?l9c}P@uVz8!#mT)VvT~w-%kK%2>0tsQDkL
zxM%<1#7fwwrSgc-1stJ#@8+T^ds-73Jr$1nm!HSmBrC*6ORR=L<q#c)M>t*%yziwS
zM;pmyQJ`cPaoSzHCh9)0xe<7r<@V8e%o5jQol`tVM?u~r$CKq6%1N0*tPf~7WI(`c
zXOggGiKlT9<Xl#t-wURm!eIa&9ccHxldf_4&egmgcHec{_5~tD8is#mj2w!CC%k=T
z6S+;J{|2j_xVeWl_T&;xwOW!k54&?ek466hn>Xu>1NF7jVFl<YnBwXgvguWW?bP9;
z8Lbc+nG#$+Ur>sQ#7Pa10iX9=A=ypZyVNf<W~ad~z;9-)#p}F<u9aE}Q21=FNN00v
z;wSfwKzSrF4J(rVrQ~pmgZfWUe=q>M6(Jb!ICN4^znk+i;=*OJ!(mHt1KlmoUc0)7
z^6%~Bn+^U@HTK?2VB~)HZS)=%?(t*vyi47c^sF!}b@X|n17)W;+F#lfx~Q70B|lw6
ze@O;x<%=mcIyuopYx0D9)kWVfW+v{+OmHdQ)RtgNzBH=h8pfaNBtXxXFo+M$r-0i$
zNp;a>_^0GpXPAhZ-A>l&wa+KzGQ)rWCbNbu%z#}a;YHh-=iH+O-mU2Et)|Q|i*qx(
zi>=Q1?0b0}5t#jQy@X~N9sGplD-Wb*Mulg`j5^MDVU}=e$-$Re?r5Xhhax_AijnWF
z-Ka^HXwj*9XsUJ2hIfs%@$3x_a%$%wvDDdwhBKG=XA8FJ&ZTXx_N+HeXJY|txxba*
z#Lg&SoBU#?@j_fZS(@qe83AK8Fgy{5G%)Jo-YpL|7qK@NgW^`yCj&uYUR6rStyh^{
z3mP_en&ppXTt%=-UmU5ql8uQC50^w0ux9h|J!?oDYj%s3PJO!2Sm#{ad)Fds@kiO7
z)5lW=!$ZBak8WQW(mb)-mt3p}@9urhg}z{`*q{7<*zQ0|njuIvME7Pj2)o5Ukz{Wk
zH&sw^r=75`u+ydSIiz%eb-wgf>Fs2XpUUXtZSieArOG{ET2$r^tv`N0<8n&H<=8T$
z_r<VeD5Aj>diAMd)oa1G<R*fxW!;}xD>mQ*-&gbqhMsqXAkAkSd|ET3g~H1%3n4j^
zKc@?aNQ~&GKM#|dtQzh~T1|Lmq|7K*t+}AJGg5<>gJA&YbHZhT04wHOu_>>@>6*pL
z<a~bE%};@HbYz66t<ZIYB5v1=hh>GaJ3>M~>do2DR?W>#hS(~nvR*=~nXp6ti&XEQ
zw`~7*$^I8H<WPq(E96GqPfVXKcJuM^;mFZR7|?qUnSjn{FT~fy`{gO^^SEi16TRn>
zR7k~#@r;|;QWW7Y(C+JB+I>sZpe#prp=YY$rLs4xbN#z9lqi{9uj(&D?%cNv#ud8{
zl9WJ}0lcWYC5S`<Q%92~;iIZmEAKg0`2?P6?gUurQwKx$FAk{tcOHoqGIe9O+aXp4
zu+}tOzsFN5NyQaqP`h#ky3dGU?E!Y(BK*XC+m7eD-O_l^Q_)5_A5k;iJ3n!&`Xq+w
zjfPtx@d!BMUKQ`0>DNSlR?-LId)hd=kUCeufj@K&EW4z-5xDYDf$_mkFxeFYTq1Vv
zlvHnuKE!F#AbnOSCwwv%jXz*PAY-~_<Mi&;l4&Wsam&ywu~Pxs4&`cqy#7vW*x)v^
zJH95&!7iXB+*We~<hL@I7}Yu-3t4$GrI=MnXTrb7!@p+N1OGmncrZaR&<dUS@$C6g
zIp)|8rhci#WtAtI%}$hnh5Pa*P#8>9L5D&aw8J&~#G1Gs)UXX<M_a5hQmouo(GTsv
za)B;7yzrYZoKm34)=GU|@I~dFL-NgMub%50=2B#p?_IjQc0H?pf{=zD$4?9BXgAv9
zXvL0BpT_f>HvWX9yEBYE?XmwN1}+$I1SF4KsHnBGf^}(Whm%6NsTV^V^8Hnka3=s}
zp#yf9eRLD}AKfeVC4TBxkdOxxo^tF%kRAzK_W9s(i<nz(osypiy8GxdSrhtEmquS1
z@xGh%t^LSOAgqr)dUh$D!B|jJs*kjYXsGN7u5dt3NDPgSejKWi!iY`{kn22p-&;Te
zGBBV95r+_h5OVB`4HF@!(X-e}bxrc$kFR-F8L-`*YmAo|FYILO5^X6ig%QJ)`@NUB
zZG5X|sYJxTK+Nz@uWbb(%B!nYu|aP{ur32FF*a$W!G0q0Zzztb4j790L=GINwxkO@
zz6&S^OI=F$Wn%9?_>d!ZFj*?E7`q+Bg4RcO^$9y9hi-%OSc2ODS5O#I+6?m%6>HMc
z?~|__)Utjt|1BLQ9)cl9_pS_hXG+BvEh;()4Uc~#p2JTZ>HM0H{r(<GF7!5f=3YmP
z3mEGb(N^QejpTGF8@<sMJm$cQfu}#yZH3bG%@%L->G(@xdz_Q{JIX3d)AOkTcY(S?
z+7UWtA3J}1ihJU>UXh9h9tc%`?s>62D>5^6pPF`zl@f-Fy0mW(`i0Y2&8)ko-Ton~
z?YKE;NkQvk`^673?a0AV?kMbNr0Fhrru&7kK#2lHmQ%vP<uXwer*Fg!R2DBGI<+7k
z%<vOz);$(j3PhKAYLjY|Ez6ela-S}!993qFIJZmSARl>cV;BQl+c`d0?v_II%{f(^
z9HFS<3hoq}35u^O4&|=V&u!=cMdFxIK6H+YCg1Cc@=Z3v<13OLIHO?cM~E6P@fF)e
zd1aKAlAmjYS7v+MSF=XzI2*M+CEs+D53MO9d(v;l2}xk3emTTklVv3{<;L0E#k{lU
ze%u{Z`yMW-a23$!*q_!jMk?bC&Nm8UxuXA|qWv>}ey2<RYiWjmuc8fSM<*jYXNKU;
z9@}r7Ub`8&(GZp9(4J;<;!I!|p~N%Yer6d0s<s(+D{N7nQsCYWV5fj1uiyDvW5&gc
zCV_OBBMI26Dmxtm2Ycwu0C(J=M*M?SK5dC*KMcirSHI>8@|EMy;O#l>O$*8^M#04B
zY@;`B;+?|#wY3V2u4uj9OS@MmZ%)2R-FpnOekN&q%HH&@y}rpS!M7;>ZN4p`_9Shc
z#f<>NMwBpg4^_k3%pB``;~@o4ec-h0F<?#A%2uY^ZSy<~%oL0ESl13?LUy)_-j))`
z$b<>#PFXa=tK}HkOBlmN>gRBHCttaO&qF>g!UCJ&Jl6$d!N~YUY~@1{tNCh>O8_y7
z6;Ro0@MNxtX8yR?ulKwbgv?v;U_LF@mS4JG^XvgNmDVQ`g1AxlqFx(m*0*FYEJ%<f
z>&8a%=Hy9T22q?bSUG0n#aE>}KbhkRgLw|;uOH_V)2*J>R_q7eY;6DhtvF3OKl$=Q
z`RaC8iC?-=V^i4pjmAbrdV2vt*F#vVa3f$Jb>5eaX|gLdbGW1CK~IEu6z#&)DBvb3
z%d>Oq?WhK4`~KIIn?oqo9+fQz=bCC)7BUm{RAvn47a@#gh@2l9Ypv^!ed9v>Ts3aS
z<Pvqi`!HdOk)*UXYZ<%<z_Nj98A4bZ>`M%@6FunZcPsan>#Z@uM+t41KpFLt8hb4X
z!7a}f?g}y<fZNP}3V+42wE5a4FSfMq6(~<vRrY~-<UKB<l|`nvZo|NLUCt$l67}gv
z`0Op!e#6>Fc-Vz;fj2-Z!HjRMWX#0}*N^eK1laEyj3%_1VIsSp(7Qa4RfLbhNfzIl
z2VH*6bV%?qBmM#`qPLJ|9`36hLY4xL<%g5abA9c4+9Fzzx09b}XP6TQDo&ij_5QYP
z?X*Gfuim;g)Nm!SH>{SaeDi~nIg_=b5#P+?Vtz(n2Y;*!B*TxmP3!#N7s#M7Wsb%`
zmr_T+4kyLU7txtr#@^i25ckQ0<xzO0Bq2V+QCef4XXk2>W<3{caA!$kVwOySatE0F
z4iYq?YnKgu=8j~KwO;mv^AR2Ic9NZ$86LnkA!PhQE%M8NB$(*THA7JL@dxgMxXLpr
zn;(UX&PneXv=#M%R2Ls5FNL{^ydazdE5cy!<;NW#%StJ?t(YM&f#WaGH;XaDxy&`Z
z1cU7B&|BkEEBgkFgFY1lkDPi~uTW3L^X|>U$qNEw{rM@r(mX5gw0>(RZJbppOPo4j
zQh)1($i5+N?M34W$h!ucAdkS%ejG4bR93S}d8ujKP}kCtI@0)Hdolkqd#&G+Bf5Mn
zvtUL&&Ea9%iIWAT!%Tl6(mCjYhQjt-eMa=HSl%R;CGk8&5-#1<(D*^ug>ft=@Tkix
zuw%aoX_{)o;!W%{-;1y@3F>Wa=`o3O7+RRNdn+a4qT9^v7EI`D?^s5ro2zm@aa?tI
zahbfC8nf4P%r;?wjQ9xCIC`_uzZp#2FlTgQ^<}`@(8ZUq>9)O}GOb$rEMJemlpTFe
z0mfvTmfPR=75}?7QosAV-xVMDD+z!9y{*6!`aV&A#>Mk%=jNC;$)&(RkVkSEnsvZ&
zyv;@AXULb+1-~GcE_I$h49^vSJvM%-+$Ch4EyP_VzIQijWpWa~5UnzhZSnf#%_*;x
zf)*$lysUh}(n|B9>Ic1=jNtI-<cBboZHt^stri3f%kjmWkeY)KitU9^b)o^ldvyw4
z;29w4CH0qfpa*vx6Jcob!L`e(`Eegvag}J;kRS@=%AhMl52E9Ru|sw1_~<71`s{~F
zgB2QvScz+Y67R%@SonrM%BOn?F5kd3Ob76zHT)6MZ@l6ih@=8s=p5)r>rXCeLFd|G
zcd1h!AhRJ$HDBSuP!+e*(p^Y{e}%)Pn_jRxJzX>17b1+8k-=;|;6rae<47eDyD%-Y
z>fTL{bya!1J=iHcdu3DESpeNomWX8v(!bjqBCq^Bn<u*ey@aPrTqzSqR1|vHjc#B=
zil{uXb)If{?fsH<ogwfTG5|n$`c&+SuFS6wze@)-BSPea(A(>hr?SC62}cY~o#fle
zSA|bxWqI1Kb2eu;XHJD*{+KJ6RB7ID=^2+NGWtYy83Zqf#+s@X`LyM|EWYE>@|NQK
zJhWZVbxoeQr=(Zz1zyrQpNa_97r<^63pGF3MGdXgMtSUJWD1#@^ha9}41Nz$o0#hu
zUAx;-wZBXnduSqEtk+-`N2w!~ec<Ivv_rdImEDnMbU&A7J{f&lZE9-j#A&!NEgCCA
zt*-#W+2O?g<jX%e8t%GESKWNQUg&X{dd)LeIga5#Lk<V>$lg8%R5*~D4@|Nn8&;?J
zV1UH}YDI~?b<x6E8WfWKVzlcQ2a@Gkhexgu$Y?twUI%KJHvJUs$O*-`RE@k8w6L1Q
zvdCe)Q#}BW7d6h5`1v>r<}G?DZ^3$Hj5b2ZYV^aacHHRR)Fh5kRWx;NE8NXQlCFMQ
z)umw-T#{H{!ujOy?CaWVadR2{u#eGtHpDb*Lr5xdjT%IF$_=DI|19Ae^%O8$hz@ut
zz4$n}hkT53<r%AE&a=EOfacVtq%*^}@C&3JcAEJ-Thy{M3#eKn=X+gX{n-+En)<Y^
z>aGWYcTO;v=4>CLh%_Dau+O`vDRyKl*3`vLFiZ@^>+C^UL>&ZZ7A!f4KV(so4tz^b
zdxd<f_SrKKy4x#mTIt(ZgD<JqLymQ6r=&YWw5`=7F25g8yn;ECtenNd-Q9YyBOjxB
zH2{6QXXs0QW+`uSK7xYXSqMxtNC)+H(g(?3`yo9>oO^}8`#pV8%|S-mVb=#c!m=nb
zN;RrNyJ8ercRmlK22)%zJdNt^(B?|LwhGkLu%G1Z6&=ZVEib^}uB(Qr?R=L7QTI+C
zpR1|z8C}zmo^GNPhOq&FWh}hhk+M}pMRQtZ;_9VOjqSXCXI;!%Q&L5jE`~y(*79kB
z+Md&7o=|qw4=dYqyZdfOFR#~I@hto6=u;tCtHUD>N9w^bpM2W|KFWkiWZr9rn<#05
zf!mQq#_=uQIZd&=^}|=1^^zZDyk9pL((-Js#--bWrHa(Y%wIP>dFjA2lG9SWx%4A;
zQ|)fzswc}bLfZ)Eh~k@7?DmzY-I*-6K+s8+6&fhsSD8<7_J+`foRu=*2fNv4wt>P}
zp7-7V%rN<nYyB=%{)<_V|Cu@d`x6QWs9{301|wttW;@9Bw*Jk+ItEw3X?$gsDkS$D
zw^=tYOiMo9-<ce1%Y>tsAKO0RUSyA55`AP&mi)t^T}Vm{JtwIEh5j>;0H~Zhp@e9j
zHgJq`oAe`D#a);nE_g0PP8$6gMe6LTli4Tb8UEeyFp4{PPU<pwQFQo<6Dfbi9>i?W
zs&~foSWR%~_D;*We2E>rPoCb~aa&vJMXz#F*mr^OJgpyZ;7#o$YjpDX_Q|^$BQkx*
z>g$!_00L04uuP``J#e07b1yT{oy0QyBP8UOq)8F8p<yDu5rAI~kS9jag$_Y0?sO%i
zoUiCXIM4W&^S%Kk#eRXl$MYOmxcp>ewEqRl>ohq8)FQRnQx#G#X3QLr+HP&u(9dt~
z_9r<0kqw6cfD>Y~G>ku0ttsk&N(ra=d&tSeT!`$u*tGzxbyExaovsBp=9sCmm(1UL
z+bTd@RXxhat6&qafEA!TP2^9_nUib2UY}P>!tHMfo*1~{v#y9>oj6KKEX7g#B{-ZO
zaeTjqJ5KM5o0uJIhybQ8w)e@8_h&>;|0v)0Hzxs#t$7&1)ve%421`UYP43ko)*DuF
zvvholT@f7|5=zmVA>5%M_=?)Vz~d3qWL3}DfP8eoF#}&XT0Qv%I-e6Z(f=FA*UTtR
z<gnh9_q!E86+Xi(0H=AU4JmnXE`<p=5h+m^zI_$XrSF!KB7@f<+?zRf<N#RoB!_sh
zJ<GAC-Mo5Os8(twGR61IBT2<-$0-N5d?bg_@j^<JBdqEo`G=NZzux)Ny{O&=9zmCv
z!3%)k{gs~5FOU=F5-#u)P+T8RbsZLIoV`xG*aKQMRRcR9WIW!bzJ3C~x{{T~kjPS9
z!+-8&Vo1!%Ujk5PpwXMack39xuIm%~pGrelC&52=rmhPBbPc8|S8jv}x?5AEI7Q}%
zYshe%aqSd7FZ$I>jgVvX=8kMo!$gYlW`cIdJr9I1jecTX*ay*~S2~$8xnB$iBT92s
zbQ10d#QKO&2FKejE`IV7>TxOg)`|t`C~zPsF*$ff1RrJGRW=Xzs$f4;eBICO_F-x9
zk-ko>0I0hZa7O&e2K{H@>HqaQzr)u5O5Wdp5BL7@JC3;i=lW~P5lt1ntY=}&8MZY}
zeZhCyc@QlN^D1qmkK4aLGl)K=srm(qy-PJ4V7lh(`HeRu=gwZ08y%n+<40z$`Meg9
zCw*5})zAAp<gPfLt;7ip5ZA!}5j$5A$Oz_Z1c-9oM>vJ}xN-}_OjZg*NHbzNv5F&Z
zBr1Li^0-p{+|}6bTmdOx>hxDGy?%qyy{bHPrQF*sK)*cKvr6P<QE3sqc>g%l=U(F2
zQH%VO!4SD`=v&2|u+>*>NzdW;e3gS+iKnhA7b{`N#tacxVuwqJfb+q+@-GmSb7J58
z28iN_<A8+&GdKN_vGvFl|GIi9ag^fpn+Ncqj}*}+TjZ^2aH%V#ukizr5#gY5G1AV0
zaz|=8ljs@Qn2Q+3GI&iT*#qQR@>-kxd;7`zBzEpNEwZ1Sfdm!B_6li$xqR4_Fdy8B
zI^*Ri{qxQp-X%c3KWPtt8$@wsKG$vlZ;YuLpgF$N?n=$-02z`*bf)BES1v6*v~#`p
zxz9P_9^dwqzIAr3z84+mDX-kRc3M&<iOgda9r`=Lxgh9ZCThEnHlv9$g*lroTai}1
z+v>iXkZ?EL6ITG&Q}ig|^-sCIMhH_=TYG0jHSgBbARV9gdP#zlcKa5F6%jf``P6?F
zNX9zO9D<WOEwG7so0uiy>V-ib4S)Q&&QgNDjR^EHt8Z)gZ0)-qer=YRnvi2X-?G=r
zmsP!Zov9ycmpB!{mtN$M&D-2Cy=u(LkfwuI0;r+xj1qYaTBbkb+Pm%BSi2_u+S}nf
zeioy7c-f^<sqS2hyRnql=XcJ^?d8(_7uV_OvG02r6!*Az7U1>fa#yy{!9W!}03*TW
zvUIKyOH`)0_OOsP<*20k;h1Qc_Z%N(?|VS;HMp0eEO^5B7sw=oAJ<%5XuR^o>=#Ja
zY?QZO{=*AYT3e2igRz77LTacp4Y&4vs4jZG@F`kDv$0Pj>y6*ZRb^>{NX!G}0)_89
zlYJW>Tu#jsOj=?WvIRxV30Kt2*SFK+C;`sGN?}H4WIE?e;(dzbO)VGKY(*t<!&iW-
z^WT_v|HR{OwO{`tirfDqu=sPGfZsxYM6v21t;JfsqYYg76urH%8kttz{8O(gm)@*t
z_z}%-Yxl>y979lfMP5+tA0_s>{@lvmA@Z<w1xBSST68*spTgo(@qURNcgdVif$EtA
zqB9;&fTmizS?_wAuf^?6Yu9L)U-TvCl{;*(W8u%7kfb)PJt-R2XXGbB%$nlaTe}PM
zyNK$6;mRoIu|%$$8zbr)lZ2n8STA^lcCXHV75Upk5rVb85<j}e>$#Ib$+BAr8u{^4
zMK%O9-$e>yJE6E}SzpX(MFo`zivbLdJ7A#TO=mkD!atZA>bC-EjO%9~w*NRjrxzw{
zZUEixu5<_YEgFHs@2AvG{M-muKa&FSz)&1fo)Z)fLOTl|GQ!Ll)7C=qnZgguZy2_=
zhK(#}v}F*GtDAp00TE?`j=S&!xRDcKa0{K8$J68M_6~0tDtAEG9b)Z?kI@sW2YOFw
zMTDf<#QMFd4dqQvJKJMH06!x{u%X&t4S8C+*x(=0^jhLZ8%*)><dsqpG~ruKy;EAV
zl7w?<fn38eU|z_2yJx1pEkrxz!-wQWcZj@#(?k%K(-Q}bu$03~md=Q@8t77&fW+w^
z0)eyBKL@eFZT0V89Gb*O+Tz>!`BuzhwSaP^T}lDkB?0cJ`eoK8D$+-1(_^*u*aCQS
z606tWF`{QVLcZ^dJH*Rg1S;EO|Ix%h({_Ks@wamLznr7?k4M}8>IfH^#gIWcj6T0L
zZm+vOiSmfBCH%CfAiC?RgDdcmqMpkY`&EMI%?b$+R>%#_KfSwc_Jzy_O3c-439>9L
z-|Xk;;3b@L*t4=W`2_~~IGFqb#mTSnCK%W7WgnFGv2T6cPEsieiX1c^EJ3poUE5=;
z12=(I;hEx&(?&4m6%h(Bz=*MJpC%No9zDE2hGllTntiz~u`y@uH<v6r^&$2LRgPDj
zRK``E0u6?AGP4iD@L>vT$+?Jd=yPl8#k?BOC?h%)o-luy*DFKrpi$=GGm5W<;?Ydv
zCKRX5gVs$+9y94cJ;Cx)^|OUI(t?W=1J+~s3@?kGT&jccOUTVH*XprXqb(L3I?38d
z^}a+~_!JyRi!Xq=WDHN(r6aI8pZEhn`2lmHCyM#1S9xZdJQfae0~_;#QPWO{#G8(G
zDkw2nxg9pwWYf>$RZRM&Y{gghl6U3~M?}^A+B5)LjEmx;y4->45&~y`E5nzn!Z+D0
zxjzUv=8P=cH2+5pui4X4C>P&4vL-JxKjzg#H<u1zpzqm(%D$263l8J(VBeIzDXXNW
z1oBOX_iE!j-P^C~v5C=bs>rYm?QqXNc@Ltd$I|-ihWZ~<>bJxFuO=`3BUJp|5r<Ef
zN<H@b%8)a4&S?^{)04j;IyiI|VMpta+MC`>G^bFJ`~tNr1qiOK5I{c%SYcNeqsCHy
z_)_1=w@Ym+Rlf$6^}9zdk=xDFPhvk{uvALTAjG;{&jx};P?=q{CQh%PRQlB*w<9Oc
z@yb9j_)60T;s2KNg-yD3TD{Bbbmj!V`Nbf-8JGHCg56f<o&L#QoWuue5?8|Jy7AOM
zY;Y6Mr9i|6&}g4}>?|038d)|oRX*ldVNEtk)4>LK>?OdK>z|!F_}{tS@A3=(BKE`o
zIvn_4EqniF=YE%I|Cd0U|7LykyZQWI-~U~I{wtA-|Ju&~DX)Lmpa1H7;{TL>{6{-~
z*Ps6msg{4V^?$<gcm4TqwLSeGu&(~DKmV<^F#kX3&wqm$`4}9%%-1oAXq-AxY}1>i
zdtrvt;5+J(_Y&U`bn>k`2WL7hsfZ2HtWB^(B}Y14!zb!L)RuLw$s;&yhLzMIu|D1Y
z3-rj@A7R+IFk>$IF44wKCVG8!w6<;4r+Y$n2WN%zUB!V;XE;T2)&8YQ)T(K&<(hMm
zN4@X~dx)5Q4L*i4I8=Uz2fPKKA`!4v?MuSGi)_$g*?)P*sb5BN{jG!?JH*1mQDTOE
ziTdlCi-6Q7oC_WN&-F%QdEDs4+of?Yym;yKO>-rZY-0o?x(6j0E>GbBQ!<(b=os^Q
zr{Wfp>w}ImoS;~q?f@ecSw9Aha-&UemeK%~-N9*NBJEBhRvaF5SGaqvWaA+9DYBvT
zUFmbC6e=40nSF=`N*F;IMHS`pT_jMEt&?{nEiQNev*}Sj*tM{oe{CZEO0WbCS!Qs3
z8oeyG&XoKn`Iw$q<sHw$3%GN`E#t!%#iV_lO9>s+ezBk?C8+pdyq(^(i>K&Jsr{o5
z>Wr?aXG3uq+m1RdTmM@=9vSvYsXz2}ZY=P;K{;==*c5&ekIFwj#1rF(tjh-0K{Sf4
z?EE#7-$4gQG@i~z+z%nid)25qw91LIL(3x;XgIQ{DOG=j+jNuB{X~{$BbNv9YG^RN
z#&O0hFx-O#S5f<hDo%>jT|b~MH@Q)4a4#C^9XtyOULgRyNjQPqa0t*zFV=j2f&QpZ
zImC&xumhJsb^(@nV04o%W^Bf?`Kg<hwE<3uwyj+H4p5sIqPq@`&31hyYVp0T(!nM$
ze-p%-1opn$07%7qF;iXJgWH%33k+X~TxemtiV}Lh*h#9oF_oft=Uk{*;k_C5262$p
zKIEIi4T|HE%;<(v^sJ|0i<RBhm`sge=&j^MS*1WKAiZe_j&VM{l}q^JHgDrny)`p~
z#}c?K|913tq~$1GCB<rp;?P_SM<hLsxt`4Jexmuopc`!{?WlHlJDaks<QjJ4;sm{%
z$Y%uGvcl$3gYn`6@l`bi_O?zGiuHr4H{FDDta7#i6tS?deQ1rZ+P@P0fXnquTmKf*
zP&o((HrFBbe>|P^+kN%Fe2)ds#E89Xc#dF@H=h}c*<>ae3I8E}f!CQ|k!fh?gNk;2
zp5Qs|JzNkO6d58D+;f>3-L8$?L+^zy?6}4=MAFQ1=N#{+LWGek{c?QMG7s$v9@&aj
zyVZ_j;X6h?qv<02$w$rH6sLrJ-(HG41ax)7AnNf<ezQ}VbD<h6BUuNJV<|KnGzrH?
zU;F~GY{IX-<%f;hjV54>E(+82`}a1B-)!$D$ftu;imqhP!GQ4nEHk)DGSaEdxI{Wj
z`Dqg6ph|gV7cw*ekmSNjeu27P{{r=YzE<g7CZBDmDu6(148x=~RCO(adNLp3Oa20R
zH&37+VQvLa0<(b~A3cfxI1hx@W39M1e7_$gGq3?e-}d#CyFI0c@POK`nSQsER#x_v
zV5q$`3M_*1tcfm{yAo&l*|ZSf6(tK((|(&T_c;rNMW=u+Epf7VNwe`va7Q4n?c&NF
zr+O}kHb4w{o!|L6E~(d;eLegm?#WGU$HOb;HCHg&?`!F#kY&q76R9L)(g~anT~s0d
zI^ba`lwZSnwN;IMS;5w<MggdwQn}N{qxyoEwXRX8w!clExHp7%POPP17sEWWqB*<1
zLWX&E32+pA5Dcb$ekKqH%6MNcw-Rzv_x)~B#JmNqjJai)=>c>812<X)eX`w@G^}rE
z{O;`e@Y2~Qi0#1Fct=I+TkD6x+P&?my(X>^qKp*#uMsJslxtTV+buqT^JUpdpt7b#
z-{jttnz=mEe&TOVn{Yz=yX5l$1~n>(m<+ZA;7_NcKWKFNo$herXduL5ke7W5Pp`zL
z-ohnSMtm0=>K5lIzM2F)x_cYh7-Rp!rtR37;#_6Y=8e@!4G)6<RVU+4E8#b^%jUgS
zVeU1%r^M4$+Bi#uXRbFst(_w~U)z*5)R}#Bk!jxiVisbI1k1*Q0!~q6h?}T@g%@Fi
zrWUo*jg06f^4*g~iw9TIs9}^D`{dJ)&S%DHE<y1j_!L`!&&7-T&V2PGPPp#)Db9=J
zd~Q~NhtL7#$oRZ=laswwbUjx}EIBOAYXJ0Oo*7ZMChY`0ywYM>#KDixA$^Dq23emm
zRFo!MSpmb)JN<04(Lc(g!96KIPv}#4;y#4A2yHO{BRdtD3wScESjvN^I{b_<HHSNg
zSm9@Hh%`8w7C%PD*{gJ6C#7I&Q)h8DgeuM^R8m%3(fm_Xs0{PkHJgfPy-O08T?V9-
z;UhK1AiU~I6$uM9!jSB+c<|;EG8-%uvHIwM&9+N?)6Y8A0fdxK<eG0<gF)_rxcH~~
z&<Xws{9Oh5>IeW~^x}^R^DkDdUy&HP)AQv^0JE&>L{R$4AiMx-q&2nu*=nXR%Q6vq
zv*dLkXy2?bfOfKLjfz&<>LB0cr;cK?oLtMGziqRs7c3e^v>_&y-kzP8lf#qSZ&h}I
z><;9_F<rHd;&cKWslGk3vhyGe6O04B#M<r%q=SgA9md@y?&NaXY)Jd?{sQ}|B$2^Q
z5^iNkR1g(pkFz-uEm+(|QAMiQqQL~{T3dN`)(Y&=j63BQMq`W=2XH<Ni|L}Vs%3K$
zXME3s;)3LG^&0XVF)qI$4Ojq&@&giD9lYS!gX#l0;obL(Oz|?K4?|}%DE2#9&?Rdt
zM0+0`Xd{7I)4VO+Yyl(Gp7^!!Jj>~ZZ;XhbOdAAUW?L)SqG0k;%YxZ6>(uGa(piAV
zQVl`DPw6<{WuaQWlBb4-e!LqNBB$SgdY1|w5JsGRJCheO-0_HtPjinul}kTZLAJL8
zB4$nb!wf*->-6yi26mu=QQJ;o#v=#0Z0;IPHDR-}##vSSi^pEwSmTi=a?JEz2;jPJ
znA$3!gez3QlmOT`)gVh>pG;6KsQJFLvwlqe1NUW6zTvx;N~MBby}i0hscx)=BDNF-
zkk!(Bd;sVdC^_gH(*{2h{V_d2zPtIjV0N83QiVR@HVEqT>g2#;P>u)SORSqTi8W5f
zne;<BCX-WM3J6cbuM|;y)xlo;q3zQ4M@wTAHgDosctA^Jp?NBPXEr*qfaqlvOPB3V
zakUUjRB(GYQI7k^Lj`I%vPl-?c$90gvJZ9C*vhi2$*%qX`NZ^ZADaI*i8Oe6C;J}G
zfSl}m<PX^Kb#A)F_39X4%g+EW|6)xtBZ^q2NBi5XetHSGZw;(u(K3Ehy*3IS&FJ3q
zhz0o!`g_)+p}bZ<Yc;UJg(v`A4wqp>F8u5>^zo}FX_%?>eKpFR6UpR8O`N{F%oE-x
z$BC@};ON79oy&NbXY9*5N`u)C=04^JUkRd}5Kb!XQ?C5%vBLE^5j~e83X}L;#k-es
zS*VopnFl%<m0QkOufeA;eJnM7<QZljJCiOvWxM51AN3Kksb;>CaYGkr6xGQ9M0hH!
zP`{&%m9J4GG0~umCoMhk+BC9zf#PdgrIpZ>^{1$+Ed*Oud)X23DUo|#J4u3s2v!zS
zT(z+yW4}K$CFVyr2`5{I!FuZ9QJlY#ug&`6=t}fU=#%ApDGLH4M?T6rpDtGk5u#lY
zmxocO%AW&nct1N1vfykj-_F7Ij<Ys$LXLL(K&TP|wVyg)#!p?e;5(uQRRXp<Kz?n7
z5`AT?OSbK->r1*SYfcZM$**grK=NVg=M_j;;>r<^N$~t$@J<US&Xf$xNawBE`|g;y
z;Oc<w)s>sOkozb|3uP%QOP||-cZzV!%4DMY>G~QuDltT)T5?OkIZjMvekYJ8J~+fX
zsYw0uHFp_X-WwbYjskTTX(xld95wQ2Pb#41h$dZNOtr^Q_Tx!eJK+Cp43Iv9L~7Y&
zb5v8F<&pUgF-Y>p9%*Vk5|rH>cwOIU_~8QL<nzMwV8`ERKASlCZU?e)MlH=++a8$H
zP<r^@4Un(JK(3*zOJ8qxRqzp#Vff@e3tJEkyrh2O0uP{z%v1jYosd{Cp@;ffyCOwk
z#14M-vES>)N2n^oELU@qEi4>hN4FaQ-%G$aVTUDzt+lS9GrGrzcH~ufL!`3eFq|4S
zG{6JHb1G8&02o)26!G5+LhgVN9fO@FsO_taKn_gXQ{bbPA%Zm+W<WR306Ff{8TIVO
z{(d+P!iihYKdA|0j5ith;Ol)!E(kB&08e-3eCZ5pS3zXPd0BuRTU~OChRcrA`2=T$
zDS)D@fcru3@jP%zBG~zifhjz}uQc=ZCtA{1>%?j_S5CX8cMfcD%s@7R<w5eV=`jrm
z7^8toM74k*CL4Cirw-Z|u^@zM_Zu3@vAxwy;E5qu7ZV1R%7ugkbDxZ-52J5k9v$#w
zn!#I6HTmFlxqA@B=P0@Hqus^<5<{yUvDh;blwJ2~@X*nG!j(o{xDFa-XX7cZ!e#J$
z4|o#`nc59dITM*LgCjuDjM^H9PG)q+J4Y!%DNWQ^+3Z(IG(V4D08c)R2Wuh^2fhhw
zO|Kv2lP)yMevNe6?FcrC(wO2q71&d1B}?*{SW{q>xsqYkL06Vpl#W%H*PTA$Sq^Y>
zUp=tEw3h;AG0qT4<Sk8hhKHu^sjL@380zB`Y;t<YD7J#P*LhY4{zMxhv$%R^D9ROF
z)ptRAo((u=k0uf=iC3+xL$?3vT#y_8FT9f9azy@ZlJ0O=kQh43tE1^vm4)ZL%R2+T
zE9p+NP|WoFq--<%_7sM8FMj<aFgn$qY~33j2=iql2@?PfK{#<B$B(qZSDei=4-UNE
zdnZ{jwhJ<>R9jx*0?${+ZA=?@A5w?V6g`c{{`ojA<ec(IIcv8iE%Y+`!l^IyN(G74
zJoDn@9Qy4@5eGNn)!llm9oQWif^w66L(F~Tix*AI-5C<0G;FI)qkF_)2A-+YL-Hl4
zQSX#fc6GCFcf3uE1&%+loBRF&1Q-Ul7!gs|*ujcsa~&Qi>7miPnI4v?o_5j#1+(pP
zCc9YBkAN2oE3eyyt=3(MwA~4ZTC%@B?Rxbg17ww?Eag*kxHgoqhDykc8P@nBkuLmk
z_ZVx49sr+9`)Ij$^6u78eZkpOiDXbV&X6y!5m!XpIOIcXEbe^On(F<!h<&m_5}vm-
ziC<w99uVktm#Xe@{K|`m3Fxo){6G0N^@Fj%biCQV%c@}t)*IJj^sAoZs`+3Jq+LwA
zE<*F6`unLusON#`&8(vbf_--G-3&KZ=haZGLoZjxWGL2z?Alt`xge}b1)WcTs?9ma
z1KtbU;al~{SFKdx(RFDDphUz)<ja1+9Uh!s3|>^X)V;Y5x3F_PRTDe5)UXQUh;gYr
zbUv~8Aci8mH<*a2Ry*6L#V89EHg5QEVnzaPgZ2gXj9TfxKxRONnqzppOkgGSY>*dk
zRLg!Mn@wUP1<TA!uHoR=QM?O$h3~*>dR=h9`Y2hY4eMZEfgU^rL;pmcUwgj27=T>A
z3mz7m$21QCel)Qc{QYvwpD`T!tp?R4uODSh2R(Su7PH^IXkqrWf70Y3j+g3Z?O7t7
z8x=@-N~kbowv&Aq!_*MvRZMCs-064o3ng3))fIi%&Rfi2I5KN~;~9e*D<}zH+XEu8
zLN3SRxT;dL(<|ghagiu1cV>^XGg>)nN=>_Wq!cSc!?(f77z0mRZ3&LCAS>!r(2Ord
zktEf=+kWB?&TasQ1#v<b6qecAC?~yu><;tEA3j^O=U@UThYB)2wC=s;1jpq^(?dCB
zdE(qM>^OPSE85Fft<O7DizCKfSTpM}tw(a;x*G?Ri2zzssNeE@-;*A<simsoi*T38
zDyg`0mimT?2ncxY>z2POyU)jClDCqws5ZtD-*{j}hf$%uwHwh7^?WI$l)w7~-3sf<
z1^IVHc<$%2_RX0%uVUM?5dPFs_V_Z_u=%YcqCPXzg*Eox{qI^Jkaac^U?wS`s<Joa
zXiyBH4lv22kSY-F5fx5@e`JvrajBJD?n_~cerK{k`e#7=4)}x)$?;C}buyVcH46Ej
zoo%Y|tPtW;fAXGZq-%&*eIp}Yq{iw=MDTyLcimA<W!*lCO3?uoB29>j2oj1SC_N(5
zf`arCibw|)5rTk**cddF&^tsSKnNxDUPQWx2n3KON+$?H=plr6oq4YH)?07A@mtUD
z&3xaQzix8x$+;){-o4K`d;j+Sg-vh22OK)kD;s*Bl4YJBX@47r=By4}8Nn>vD$YIs
zc5g{3M#*dNA*7RQ7d0v6myPIgl*0ox6!(XW*Psa=^W7`2<mACpp$PrOmcUPoh97HI
z=Z8~n&PO2JJE($YNelaGas4DIne7u()YqI!OO5k<>|b^X0fjsOLTQ-(()lux5T$GT
zLGzPB_mGNy2M!!KbWyPDlMTB_0A1ca<GOG8=xHY2yJz$!_8M%&D-3Nw^(8%OMO0TE
zP7pTMn;6Fzi^I-GW(t2Xz{W+W8g^!WwmwS&lH(563bPbHTlrcz6ub8^wMJwA;d77X
zFABylDsV!cG(JV=gkvY(LI>vJ7egPW@Gh?A1qXTr=#Ep~>Ojc-SN}S*#$PJ5hzAfC
z4>_5-gLeT;q2J;0Tu1<gal3bg3(r&!T;>C7Ufinyz=c_upLFmry#P*qho145cvc<7
zd}A&ChUw4(F@e7E++W%?cM;^pRs8$ee?rl;-|qI``u$e`d;cp$9>0(Ak0NG&M<D+*
zVg3iBb$=w!zax-8SDsz8R7?lfq{n`%jCF%v*9k@nWAx)j5Hp_UuX98e-%QGtRGuQ1
z!j>kPw>|YH#CnZ^tVygWY%T$P+~Tms4?flJ+Vbyy{9oQ)INYwCOHEpVL>?owWxEt?
z&-N@T*2TEV_dfMMZI*syO>?Jv1+(keguc4JGwP6wl)KOl$n+d`<52dUIg2Q^0(>11
z3^^vq{Mp>dWU;X~u;J8mud#JajTDhOo7(WQPpS+gQppH5nOir;PrFf0gA#f3#1yZz
zeRfd^^hpsZaIcM!`ozLO-c`P*6Ny!19zL`U?U>0UIF$!fUTOPu-7nSkhykiC4W<Eh
zK4Tj#FW5UFGwH1sC9GG_<kj%ZVeN(EqCouIKx%ca?EV?X1Qk813HFek*Oyx^R3<}a
zt<H4LY!iwuJi=-CsSDrH9&=mWn&bE11DQ7EYyv3QBqZu-=V9qy4e|}jBf%emm0RIh
zaQ~T<)5S1<5y%w?MXcK==nA^}3(gqUBinVffkPrAc!VwJWtF;P1}URX=P6wmmLm4X
z3ZcWuyX^jQUnTGYZa8>eV3p`{#fau=f1hptosNewdFv)iJD{9!ZptfT)7};G+#TGb
zPHKmP!h38Jl<TEPp-h%sj^@&lxH{wj1B1>JOWeqKk7`ZYz60#ud>wgwzREZgj8N=p
zT#n`aONQunIS{QBoo<Ncv?&`g>t8$xESjfdJby(fCWs5@wme`-lb!lXa>ceJKKk+k
z4bPwjEN^d40I7<h&;;{s@M2Sf_#RpjIcP8MZRQ$d)TL$>LFX1ai)l<zQBs9C>YYnT
zhsyEDjqA?&0t2(sZk3j3>X66>&TX;Cjg%(;F|E;u05?6ex~HCUqjH2s5ED~A8qBfj
z;Jy*Vh$HHa-Cx@Z;$!T=O<PWa+m!mj5>u}E#r<j~x7-Yp;YxJ?6dJ_N@!42#jjFdA
zDNidP7Msc}$vQ1*7pdz)?Rig5bg6?MIqmeUU_?{vWK{mJ7>%EfIGXZ-^nNV&R2mvG
zlA_o2oPmU6%6pUixozb{DrI}DdN~;g`};)PtVwKR<ui(qI}x`8?$ozB)G{ViJdoJX
zgSMwcHl4%PvEg0{(OtWJh(hb1Y*((MU*t(*W<uRDHqL=h@iYO7PfC3)wYBaV>}9q#
zY4%p1Rh_Z>B1tZ_EcCvWyQAZx%vMTDLTSRbB<GSG18FOni{FY!L-FuYF;JhSJq$97
z&)%+-S1j}DzHC*QVp=r5WOsMYg$^Jb@`&%Fk}CJo#lVLsUdoDTTt-1wruNWMJp<{W
zq(&r}Gog&o7opD6WWm|6#d9;A>Z#@6rSmToa-0@n<0jnS2EY5;;N5(t&77*71D|Al
zn6F4nm@sT|p?goD_+jsj=Ef4wt*3_h+l(VLWgC<;)EbPe*i$gm{f!B3NXa^5ATKGu
zav^GzIs`Gc-G(}ZzF12TevhLT-H0iQHR(a5zXr7YT{>du!dB67+L>HqXPwXC?1vGl
zlVH9|*vNJNUvU=J6G7@+hJVf^5fRsY0yV`%aj|}-f+6&mx~*pfqs)x1X1iqfeTFgN
zCe14WjXM#=KfoswpX1%{1q6;`253;otnpA|g7b`3Z4g5?sO1`>;|QT+JMsnHInTCQ
z-%;g@0i+de@u=Du0@MRpy@^&c*O7hQ;v1FUE7&?m$P=zMl-~*?&?3;Uv&){BFm>5M
z9_@hmn$7!oZw^UZr+6z;pzm;v3fW#^QeB#>`?Aj$WWhcr*B#)PG*hBI9+2+ahccfX
zNIPa4RWd)mJ&T7e3K<WKY~Ii#_eqbjY{wnR=g3wz&dW{PqNZ+}vE>bxCZ#1lrL&`>
zeFMNx%O9g1_vY-TbZVl|aO;Q#8WbI1jOH|x8ZqaeVP2K3*EiEq&Rf$yl7D8wJ7kOy
zIQ$6P`;hS~u@2)1qkPg|1<Z%4WiI$>(F3E}uGH5CR_u?ebqHmueA`?=dIzyHkAekE
zf4*|G=1L9*nqo%3T$U(dJ4-6GLTPL>R;d05G^s?AIEhgZgwl11GC7<r|3G&N!+P^E
zMl=T~hW%f*TmQpn^bYw)75zux?cdvosV5k1g*MD+5oR(H5xbmitVts&sz425*tnr&
zHi4u)x+Kp);?!LWz(>06x8zne3g;4tD{&05Oqx;qn8Y<C5@rnP&Y#IWa=voV{j2c%
zKx#6}()rZi70yr!BMF3IWnfpZbCylu98V?q)=ez2=L<4>tOAAs`G;U<4M-UB_MGR2
z3Oe1R*d*velT_K}eoEAqK>5<uvZYJoGpd<bF0+(^R@g3v?CUNIO~uAM0xqlPiyvr7
zG6`J^V+->MyaJ=X#}aXiB*oNRrw^g6I6_0kER$6?mR<(HdJuFm)tuQt{2UEH{P-q=
zQ#<F7S~mKDp5%SmnUGB%y?05n5=txOSjHA)+!~>7F~*jB{kadzic|LfA+>J%Z)AsB
zlD9gwxfmy^V=$!EUu{~Y2$Iuztai#gkmeK~!RQGtV|0$xChQPOZL1~U5km#NRXBWl
z%v@8`b|WFZ5xNOGNDExYTBcS<Sq`&D$bGY9=po4#Z5)FptMg2V{+RY;!LJ593AqKJ
z%u>41qfT^}(c3i;>PNk;`MPEtt)63on=CxMY5{#yI|^VuV26QpxmygGx<PIr^Lt5T
zdj<WimENWr<?w=E##LU~N%Y`_-!HAXpo>X6py@F^Aj6xHZ^$r_BIs05d}ZwWW6&-(
zJD|=++<F%tfG+_!k>{|lMVj9_GDBUm>NHBNCT#&#k{JGg0@PwRx>2>jm-|2f168*1
zTVJZ%Kr`d1P`5X=BlmYe%HO8YA-apo5a57R#{d4K9gx{^da%k%$?5DH5!IRVu}(Ri
zKo5Mj73InfKq~rfnYun8igT=Q*SfNsjAM0h`)SG-H0KrZmaJ3hOKc3iM)WoGTfe32
z3Oxr3LUWkMtu@v4XaG-G<PwAotM+TFC=;;P-@w?`6bm>8qhAI1UIoME4%CIAuUT~(
zD#WBH3<HQ36m}^?z*JYjN$*{CEhe@Rtf0F4m1NFJL(c3I0I~<X92&?GQFJ?+j;woK
z{Sgz0>zm~=CEE_KsErAn@e0GG;uZ<m=Q5vreCaUS>MQ+g%U?9@VT7KAdzwv0)bMv9
zuh1c9HZq1bY&}<xnI2MiT&~vhGN|wQ;;q@_sxn_eM?kt$-NEu(rJqm;Sa*dO^g`ko
zZitRCgQG%|Hd4QC*r@`<xh01H4e}GWo8j2#R|Gmy(%G^zb47*pEeR6*6tJn-xoZOV
zjBghmS^;#g&^aeX@!)#mR=d%0dd3si${=JiK;MC#yp}lEx7E{%{-jBF%>^em8r^RT
zF~rPh^}qp1eAw2O72q<tT2|q95h!H`(*G^-jq7I|ckT54GfdTYllAX%-0AyUN`IW&
zwbTFSO9_~J-k2MODTJL)M?G}lGVGQ=`L0O<tD11Q_LVe76c2bG=X2}pr_)*Xb?Nzh
zJXZ=3YR?jLTG&`s$b<LtPYHuhGzmR6)@I7pRFB)sW$;k@)kOD2VJ`f^I~u<zHHoSo
zH{e>IzY0`Z#Tc91=5m_V*4q7(3$XvA{c-HP|Fh+OSE$vyIUW0gH;>5USn?j{DnKp0
z*djNUwQ-Zle}H#;fN>)|v60(FNCSL_;|0lvna?O|%QdvWQXVR=YZ;C>y4)acCoLq2
z(tr}W4!!7^t_H<4a|^gyT~VHoe#yqv9-5NLRhICuTPU=7L{&_BV11g_w{qrv0~skS
zad?y*Pez_djmbQ{<`%gF5+7x3%Jl#0+&rzJPf-O|06Y=kPWm#uhG5B`dq9^04q}gP
z&5sh{g(nTUwe}Bo$l%N5&Fq%b%?i0angI;k&CWDZq~lwi%NlH<nZy03Z;3wkijVa%
zOcGq}OP{Rh8NKF)JdgtttdZY#yHXYzqoc!kdPB-fGOtp<V&77nN>@)eVRpZhGZw8F
zf{)fGuL2Y$@HN_5_r2{G^Lp3=%k-9V?jt@4pKl(}QS_1@tD1Y4<iX}=lM&p^ri(jW
zkQs6gC|#QzmjzLAORls!cIj%id}OI6xG%TykPSaeDnEP@Tc_k79Uw6{4A2^vSQ2c*
z$#yk7<!S>27bG&@z&*Z3*X3Z<Q-P~qeKdjI+}H58fy{DpvzA}>oTMOv1>NqMB}<m@
z#IQ;S6Y*JJBdtx?Wyk{B*~Pt~3GZ~_XFt?s&Ag^~$X2B;K+cTknkCfZyVDBUtHLIz
z$~&NDf|a?;T7<8mr4~Q$902Jc4#|)<H)H7xSxS3^bn>Uj`xMWUgBJ4>uCsm?136fz
zkXFO~p529x@AIBTpjtg*<XZZ2>TMmoBKYq=XH^#go>@O}@an{!dhgi7*DD`ZVXc30
z5;cejINjWiPz-^)QiI5^u{Yi*eKZnuBNYW+t`RTL@K=otA1v>ie7>F+dj;aqeOt2g
zqg^qI9oAfacOd-&@5#O|qX&yC{hrGVf=n-~mG5R2pg<MpRpd-AlpdCz76GNy!KXL#
z5-(mho36OSqTZrJGqx?@%rzIq*IvrHs&V1=*bc~L7PdT92h>7kD?qNX7ROZox;Hqo
z_|7?ccDS-zX3h4yz&$pj4QR0*4otEZc^cm4eJWj;8_XFC)X{2E{6`h}|Jt5or|Zu)
z1Tzn0JGMAzj_9~7$M^QW=G7a`SJgh(0RR<u+7vo2Cnz4$iH=)cC0U=#JSwh?ch8oW
z5HY4!378P<^9zfqAC6#;h6eKFWV;FX+QoPtzaZefmTmD;M60-SU6Tra<c1W+zjnq7
zt%5V8i@``<l6Sja7@?kOtr#X<c-E9hh>(|n-sCpi{%o`wFTNlkdF$Em_>}%OiZa<R
z2zllgZvGyhrBI+tY0|YE#=f1N_wSr04SG(lH+gaT(yDI=DDSR6)O;=&*IeO8@$z=)
zku=w3QP%uy?(j9fQhH#)80n6>?ZPqdJU{-JB^)kl8KHQ<qeIororw4v)fjSa2gD2b
zE26k#amxccps#5N?t)?SfhMS>_7rS!L0Nu1?}MF?!Ls&Nt#ebi$GR7}z&(?)XuZFN
z`1RdgO?jTx)Gfn^UVPaZ@w-|oHvnbhdy`*P>DJntewTH|jLZPMDq)f6O6UbEP4;Qk
z5|TlMl)i@Jad~-J$8Px)2j{SgORT%IO?5sOJ<k*(z?bvAqAlM1vfyPLd-7;d<S>8i
zvPk~N5or&GEIR=De1UY*&UM`{1fuVD({KyX5Kxw~@V6Yltx~f*Z{6r|kT7|2sFWrY
z-V=2*UgjPLo5IkCxb?@Z5Ju%hI!4RJKFwwB3Bud2i5`2l`D?VuzQi%9P1drlY|FSZ
zJ~9e#{kAW{0|!OKEnZrFliw_D_Q~|6-U*ikJN`TTZLjKAPa^4aoiCE-C(YBg+FSEN
z<pte2Ms$w1%RG$S$Tcywkol})gL#{D<!F+7f!lls8s907AsPwd)bw4>YS4`GH!&en
zS;RF6buVD!l|u}%7s>YO;l_6wgc4@fN`ys?^ryVZp=S8;`>vLP5UkR0=CnnB<z1VG
zy~T#2)Yzk*Da;!t%ygkj+`1`)md&S(FHLy$_&U=bkx-W|xYPhVBq}*h&jzJCf0W+E
z<KX=KT~9FC*l}@+qQ>YV_I@(b*2dq{yq<~?+xJH<fuDID{mmu+V}8V+yZ)}+50Kgq
z4r|Kn{ctaL#vnl3;%>pYNKB=vJPn%580rQ#t>mulGQb7ZnUz<Ubq&~`wzdp*ZnDEM
zGbAKpe~>pul<jOYN2ct%{!=HSj?J@L_9Z375L?tflfGMs>~rYrzPU9B`RPc8>^sEp
zRo5vkp6o-xSa?8O(Gj}{H)4wHB}`_!cUAnGAkVuMeRGbSnTTg9Qz|x@;MSg?vmnk_
z8GSs}nx#1994o#D;RUu5l2(t2hp&416`~U1Wu^W+kHQx~9oK?vYB6W|z8v$2U`HoA
zT3L1aio`40udU?;m;{I!gq$C8d{7h>8Pl2ry|1_BH`I1(4}W8_*;<bCsr$Yr_FHf6
zLM?8guf<(Ih+CLITePq$+^Nny6^}GZ$Lqhmg>T5@D52=8SYN{GZyIY<mh?)-lkCqn
zr?D`*Hbj`8x<M_taX%rnIOhCmQNw_=p$fL3nu%2fpJEg9BV(`aqokC8ayjpM4OSNp
ztm}X2JnA)8bXYUw$;&}?*SxX^$DMfs53sZWOxW`?y6nHm1)dy-F4*<uMSJ&Qj~hu^
zc`uniibwb;g}Oc1h*;-07W&P5*TO1#$&#9!K$Rp$T4q^ddNiu4aBriP%G=sRdIpQ#
zCyFYQWtK%lMFS-$qZ54s&Dp5CY;DH}@3TiIBb1EAJnp3Pk9xNnrHgc&_nLh<tbSs6
zPytT#e5|WCYhGDorQ_vP5!8Ni7dG9gNhbgNMqHLalWS>}uW%8fy`=2GZDn*a?A9f(
zVOi|h(a7M6va@b^-F?hmrw}niypg~f;6cBT$&o4Kqul6cA)#=9`zhRVL+P?}+Z#BI
z+axhTTfiySNib5b2sQTv*V->y77GWN^X&SnFJ36d)BDVjY=krmb}F8nG${ltSeDhM
zcX{~VQLE^zad*xi#uwTQPqSt2SsyF9g=}xvx_tJjSj`0{+_e6P+l78-ySre$Yc+GJ
z0j@HG#Hk@GmLw5q6I4jSuF}cfL}ZmPlUiN6u;7&o%+TL<5dUx32<9IT8T?#T|KrWx
fU+I4T9DnOy=^y@#vHb1o`4K7p?dtg<DGmGwA5|yz

diff --git a/route/static/index.html b/route/static/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/js/Validform_v5.3.2_min.js b/route/static/js/Validform_v5.3.2_min.js
deleted file mode 100755
index 4eb4f7d89..000000000
--- a/route/static/js/Validform_v5.3.2_min.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
-    Validform version 5.3.2
-	By sean during April 7, 2010 - March 26, 2013
-	For more information, please visit http://validform.rjboy.cn
-	Validform is available under the terms of the MIT license.
-*/
-
-(function(d,f,b){var g=null,j=null,i=true;var e={tit:"提示信息",w:{"*":"不能为空！","*6-16":"请填写6到16位任意字符！","n":"请填写数字！","n6-16":"请填写6到16位数字！","s":"不能输入特殊字符！","s6-18":"请填写6到18位字符！","p":"请填写邮政编码！","m":"请填写手机号码！","e":"邮箱地址格式不对！","url":"请填写网址！"},def:"请填写正确信息！",undef:"datatype未定义！",reck:"两次输入的内容不一致！",r:"",c:"正在检测信息…",s:"请{填写|选择}{0|信息}！",v:"所填信息没有经过验证，请稍后…",p:"正在提交数据…"};d.Tipmsg=e;var a=function(l,n,k){var n=d.extend({},a.defaults,n);n.datatype&&d.extend(a.util.dataType,n.datatype);var m=this;m.tipmsg={w:{}};m.forms=l;m.objects=[];if(k===true){return false}l.each(function(){if(this.validform_inited=="inited"){return true}this.validform_inited="inited";var p=this;p.settings=d.extend({},n);var o=d(p);p.validform_status="normal";o.data("tipmsg",m.tipmsg);o.delegate("[datatype]","blur",function(){var q=arguments[1];a.util.check.call(this,o,q)});o.delegate(":text","keypress",function(q){if(q.keyCode==13&&o.find(":submit").length==0){o.submit()}});a.util.enhance.call(o,p.settings.tiptype,p.settings.usePlugin,p.settings.tipSweep);p.settings.btnSubmit&&o.find(p.settings.btnSubmit).bind("click",function(){o.trigger("submit");return false});o.submit(function(){var q=a.util.submitForm.call(o,p.settings);q===b&&(q=true);return q});o.find("[type='reset']").add(o.find(p.settings.btnReset)).bind("click",function(){a.util.resetForm.call(o)})});if(n.tiptype==1||(n.tiptype==2||n.tiptype==3)&&n.ajaxPost){c()}};a.defaults={tiptype:1,tipSweep:false,showAllError:false,postonce:false,ajaxPost:false};a.util={dataType:{"*":/[\w\W]+/,"*6-16":/^[\w\W]{6,16}$/,n:/^\d+$/,"n6-16":/^\d{6,16}$/,s:/^[\u4E00-\u9FA5\uf900-\ufa2d\w\.\s]+$/,"s6-18":/^[\u4E00-\u9FA5\uf900-\ufa2d\w\.\s]{6,18}$/,p:/^[0-9]{6}$/,m:/^13[0-9]{9}$|14[0-9]{9}|15[0-9]{9}$|18[0-9]{9}$/,e:/^\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/,url:/^(\w+:\/\/)?\w+(\.\w+)+.*$/},toString:Object.prototype.toString,isEmpty:function(k){return k===""||k===d.trim(this.attr("tip"))},getValue:function(m){var l,k=this;if(m.is(":radio")){l=k.find(":radio[name='"+m.attr("name")+"']:checked").val();l=l===b?"":l}else{if(m.is(":checkbox")){l="";k.find(":checkbox[name='"+m.attr("name")+"']:checked").each(function(){l+=d(this).val()+","});l=l===b?"":l}else{l=m.val()}}l=d.trim(l);return a.util.isEmpty.call(m,l)?"":l},enhance:function(l,m,n,k){var o=this;o.find("[datatype]").each(function(){if(l==2){if(d(this).parent().next().find(".Validform_checktip").length==0){d(this).parent().next().append("<span class='Validform_checktip' />");d(this).siblings(".Validform_checktip").remove()}}else{if(l==3||l==4){if(d(this).siblings(".Validform_checktip").length==0){d(this).parent().append("<span class='Validform_checktip' />");d(this).parent().next().find(".Validform_checktip").remove()}}}});o.find("input[recheck]").each(function(){if(this.validform_inited=="inited"){return true}this.validform_inited="inited";var q=d(this);var p=o.find("input[name='"+d(this).attr("recheck")+"']");p.bind("keyup",function(){if(p.val()==q.val()&&p.val()!=""){if(p.attr("tip")){if(p.attr("tip")==p.val()){return false}}q.trigger("blur")}}).bind("blur",function(){if(p.val()!=q.val()&&q.val()!=""){if(q.attr("tip")){if(q.attr("tip")==q.val()){return false}}q.trigger("blur")}})});o.find("[tip]").each(function(){if(this.validform_inited=="inited"){return true}this.validform_inited="inited";var q=d(this).attr("tip");var p=d(this).attr("altercss");d(this).focus(function(){if(d(this).val()==q){d(this).val("");if(p){d(this).removeClass(p)}}}).blur(function(){if(d.trim(d(this).val())===""){d(this).val(q);if(p){d(this).addClass(p)}}})});o.find(":checkbox[datatype],:radio[datatype]").each(function(){if(this.validform_inited=="inited"){return true}this.validform_inited="inited";var q=d(this);var p=q.attr("name");o.find("[name='"+p+"']").filter(":checkbox,:radio").bind("click",function(){setTimeout(function(){q.trigger("blur")},0)})});o.find("select[datatype][multiple]").bind("click",function(){var p=d(this);setTimeout(function(){p.trigger("blur")},0)});a.util.usePlugin.call(o,m,l,n,k)},usePlugin:function(o,l,n,r){var s=this,o=o||{};if(s.find("input[plugin='swfupload']").length&&typeof(swfuploadhandler)!="undefined"){var k={custom_settings:{form:s,showmsg:function(v,t,u){a.util.showmsg.call(s,v,l,{obj:s.find("input[plugin='swfupload']"),type:t,sweep:n})}}};k=d.extend(true,{},o.swfupload,k);s.find("input[plugin='swfupload']").each(function(t){if(this.validform_inited=="inited"){return true}this.validform_inited="inited";d(this).val("");swfuploadhandler.init(k,t)})}if(s.find("input[plugin='datepicker']").length&&d.fn.datePicker){o.datepicker=o.datepicker||{};if(o.datepicker.format){Date.format=o.datepicker.format;delete o.datepicker.format}if(o.datepicker.firstDayOfWeek){Date.firstDayOfWeek=o.datepicker.firstDayOfWeek;delete o.datepicker.firstDayOfWeek}s.find("input[plugin='datepicker']").each(function(t){if(this.validform_inited=="inited"){return true}this.validform_inited="inited";o.datepicker.callback&&d(this).bind("dateSelected",function(){var u=new Date(d.event._dpCache[this._dpId].getSelected()[0]).asString(Date.format);o.datepicker.callback(u,this)});d(this).datePicker(o.datepicker)})}if(s.find("input[plugin*='passwordStrength']").length&&d.fn.passwordStrength){o.passwordstrength=o.passwordstrength||{};o.passwordstrength.showmsg=function(u,v,t){a.util.showmsg.call(s,v,l,{obj:u,type:t,sweep:n})};s.find("input[plugin='passwordStrength']").each(function(t){if(this.validform_inited=="inited"){return true}this.validform_inited="inited";d(this).passwordStrength(o.passwordstrength)})}if(r!="addRule"&&o.jqtransform&&d.fn.jqTransSelect){if(s[0].jqTransSelected=="true"){return}s[0].jqTransSelected="true";var m=function(t){var u=d(".jqTransformSelectWrapper ul:visible");u.each(function(){var v=d(this).parents(".jqTransformSelectWrapper:first").find("select").get(0);if(!(t&&v.oLabel&&v.oLabel.get(0)==t.get(0))){d(this).hide()}})};var p=function(t){if(d(t.target).parents(".jqTransformSelectWrapper").length===0){m(d(t.target))}};var q=function(){d(document).mousedown(p)};if(o.jqtransform.selector){s.find(o.jqtransform.selector).filter('input:submit, input:reset, input[type="button"]').jqTransInputButton();s.find(o.jqtransform.selector).filter("input:text, input:password").jqTransInputText();s.find(o.jqtransform.selector).filter("input:checkbox").jqTransCheckBox();s.find(o.jqtransform.selector).filter("input:radio").jqTransRadio();s.find(o.jqtransform.selector).filter("textarea").jqTransTextarea();if(s.find(o.jqtransform.selector).filter("select").length>0){s.find(o.jqtransform.selector).filter("select").jqTransSelect();q()}}else{s.jqTransform()}s.find(".jqTransformSelectWrapper").find("li a").click(function(){d(this).parents(".jqTransformSelectWrapper").find("select").trigger("blur")})}},getNullmsg:function(o){var n=this;var m=/[\u4E00-\u9FA5\uf900-\ufa2da-zA-Z\s]+/g;var k;var l=o[0].settings.label||".Validform_label";l=n.siblings(l).eq(0).text()||n.siblings().find(l).eq(0).text()||n.parent().siblings(l).eq(0).text()||n.parent().siblings().find(l).eq(0).text();l=l.replace(/\s(?![a-zA-Z])/g,"").match(m);l=l?l.join(""):[""];m=/\{(.+)\|(.+)\}/;k=o.data("tipmsg").s||e.s;if(l!=""){k=k.replace(/\{0\|(.+)\}/,l);if(n.attr("recheck")){k=k.replace(/\{(.+)\}/,"");n.attr("nullmsg",k);return k}}else{k=n.is(":checkbox,:radio,select")?k.replace(/\{0\|(.+)\}/,""):k.replace(/\{0\|(.+)\}/,"$1")}k=n.is(":checkbox,:radio,select")?k.replace(m,"$2"):k.replace(m,"$1");n.attr("nullmsg",k);return k},getErrormsg:function(s,n,u){var o=/^(.+?)((\d+)-(\d+))?$/,m=/^(.+?)(\d+)-(\d+)$/,l=/(.*?)\d+(.+?)\d+(.*)/,q=n.match(o),t,r;if(u=="recheck"){r=s.data("tipmsg").reck||e.reck;return r}var p=d.extend({},e.w,s.data("tipmsg").w);if(q[0] in p){return s.data("tipmsg").w[q[0]]||e.w[q[0]]}for(var k in p){if(k.indexOf(q[1])!=-1&&m.test(k)){r=(s.data("tipmsg").w[k]||e.w[k]).replace(l,"$1"+q[3]+"$2"+q[4]+"$3");s.data("tipmsg").w[q[0]]=r;return r}}return s.data("tipmsg").def||e.def},_regcheck:function(t,n,u,A){var A=A,y=null,v=false,o=/\/.+\//g,k=/^(.+?)(\d+)-(\d+)$/,l=3;if(o.test(t)){var s=t.match(o)[0].slice(1,-1);var r=t.replace(o,"");var q=RegExp(s,r);v=q.test(n)}else{if(a.util.toString.call(a.util.dataType[t])=="[object Function]"){v=a.util.dataType[t](n,u,A,a.util.dataType);if(v===true||v===b){v=true}else{y=v;v=false}}else{if(!(t in a.util.dataType)){var m=t.match(k),z;if(!m){v=false;y=A.data("tipmsg").undef||e.undef}else{for(var B in a.util.dataType){z=B.match(k);if(!z){continue}if(m[1]===z[1]){var w=a.util.dataType[B].toString(),r=w.match(/\/[mgi]*/g)[1].replace("/",""),x=new RegExp("\\{"+z[2]+","+z[3]+"\\}","g");w=w.replace(/\/[mgi]*/g,"/").replace(x,"{"+m[2]+","+m[3]+"}").replace(/^\//,"").replace(/\/$/,"");a.util.dataType[t]=new RegExp(w,r);break}}}}if(a.util.toString.call(a.util.dataType[t])=="[object RegExp]"){v=a.util.dataType[t].test(n)}}}if(v){l=2;y=u.attr("sucmsg")||A.data("tipmsg").r||e.r;if(u.attr("recheck")){var p=A.find("input[name='"+u.attr("recheck")+"']:first");if(n!=p.val()){v=false;l=3;y=u.attr("errormsg")||a.util.getErrormsg.call(u,A,t,"recheck")}}}else{y=y||u.attr("errormsg")||a.util.getErrormsg.call(u,A,t);if(a.util.isEmpty.call(u,n)){y=u.attr("nullmsg")||a.util.getNullmsg.call(u,A)}}return{passed:v,type:l,info:y}},regcheck:function(n,s,m){var t=this,k=null,l=false,r=3;if(m.attr("ignore")==="ignore"&&a.util.isEmpty.call(m,s)){if(m.data("cked")){k=""}return{passed:true,type:4,info:k}}m.data("cked","cked");var u=a.util.parseDatatype(n);var q;for(var p=0;p<u.length;p++){for(var o=0;o<u[p].length;o++){q=a.util._regcheck(u[p][o],s,m,t);if(!q.passed){break}}if(q.passed){break}}return q},parseDatatype:function(r){var q=/\/.+?\/[mgi]*(?=(,|$|\||\s))|[\w\*-]+/g,o=r.match(q),p=r.replace(q,"").replace(/\s*/g,"").split(""),l=[],k=0;l[0]=[];l[0].push(o[0]);for(var s=0;s<p.length;s++){if(p[s]=="|"){k++;l[k]=[]}l[k].push(o[s+1])}return l},showmsg:function(n,l,m,k){if(n==b){return}if(k=="bycheck"&&m.sweep&&(m.obj&&!m.obj.is(".Validform_error")||typeof l=="function")){return}d.extend(m,{curform:this});if(typeof l=="function"){l(n,m,a.util.cssctl);return}if(l==1||k=="byajax"&&l!=4){j.find(".Validform_info").html(n)}if(l==1&&k!="bycheck"&&m.type!=2||k=="byajax"&&l!=4){i=false;j.find(".iframe").css("height",j.outerHeight());j.show();h(j,100)}if(l==2&&m.obj){m.obj.parent().next().find(".Validform_checktip").html(n);a.util.cssctl(m.obj.parent().next().find(".Validform_checktip"),m.type)}if((l==3||l==4)&&m.obj){m.obj.siblings(".Validform_checktip").html(n);a.util.cssctl(m.obj.siblings(".Validform_checktip"),m.type)}},cssctl:function(l,k){switch(k){case 1:l.removeClass("Validform_right Validform_wrong").addClass("Validform_checktip Validform_loading");break;case 2:l.removeClass("Validform_wrong Validform_loading").addClass("Validform_checktip Validform_right");break;case 4:l.removeClass("Validform_right Validform_wrong Validform_loading").addClass("Validform_checktip");break;default:l.removeClass("Validform_right Validform_loading").addClass("Validform_checktip Validform_wrong")}},check:function(v,t,n){var o=v[0].settings;var t=t||"";var k=a.util.getValue.call(v,d(this));if(o.ignoreHidden&&d(this).is(":hidden")||d(this).data("dataIgnore")==="dataIgnore"){return true}if(o.dragonfly&&!d(this).data("cked")&&a.util.isEmpty.call(d(this),k)&&d(this).attr("ignore")!="ignore"){return false}var s=a.util.regcheck.call(v,d(this).attr("datatype"),k,d(this));if(k==this.validform_lastval&&!d(this).attr("recheck")&&t==""){return s.passed?true:false}this.validform_lastval=k;var r;g=r=d(this);if(!s.passed){a.util.abort.call(r[0]);if(!n){a.util.showmsg.call(v,s.info,o.tiptype,{obj:d(this),type:s.type,sweep:o.tipSweep},"bycheck");!o.tipSweep&&r.addClass("Validform_error")}return false}var q=d(this).attr("ajaxurl");if(q&&!a.util.isEmpty.call(d(this),k)&&!n){var m=d(this);if(t=="postform"){m[0].validform_subpost="postform"}else{m[0].validform_subpost=""}if(m[0].validform_valid==="posting"&&k==m[0].validform_ckvalue){return"ajax"}m[0].validform_valid="posting";m[0].validform_ckvalue=k;a.util.showmsg.call(v,v.data("tipmsg").c||e.c,o.tiptype,{obj:m,type:1,sweep:o.tipSweep},"bycheck");a.util.abort.call(r[0]);var u=d.extend(true,{},o.ajaxurl||{});var p={type:"POST",cache:false,url:q,data:"param="+encodeURIComponent(k)+"&name="+encodeURIComponent(d(this).attr("name")),success:function(x){if(d.trim(x.status)==="y"){m[0].validform_valid="true";x.info&&m.attr("sucmsg",x.info);a.util.showmsg.call(v,m.attr("sucmsg")||v.data("tipmsg").r||e.r,o.tiptype,{obj:m,type:2,sweep:o.tipSweep},"bycheck");r.removeClass("Validform_error");g=null;if(m[0].validform_subpost=="postform"){v.trigger("submit")}}else{m[0].validform_valid=x.info;a.util.showmsg.call(v,x.info,o.tiptype,{obj:m,type:3,sweep:o.tipSweep});r.addClass("Validform_error")}r[0].validform_ajax=null},error:function(x){if(x.status=="200"){if(x.responseText=="y"){u.success({status:"y"})}else{u.success({status:"n",info:x.responseText})}return false}if(x.statusText!=="abort"){var y="status: "+x.status+"; statusText: "+x.statusText;a.util.showmsg.call(v,y,o.tiptype,{obj:m,type:3,sweep:o.tipSweep});r.addClass("Validform_error")}m[0].validform_valid=x.statusText;r[0].validform_ajax=null;return true}};if(u.success){var w=u.success;u.success=function(x){p.success(x);w(x,m)}}if(u.error){var l=u.error;u.error=function(x){p.error(x)&&l(x,m)}}u=d.extend({},p,u,{dataType:"json"});r[0].validform_ajax=d.ajax(u);return"ajax"}else{if(q&&a.util.isEmpty.call(d(this),k)){a.util.abort.call(r[0]);r[0].validform_valid="true"}}if(!n){a.util.showmsg.call(v,s.info,o.tiptype,{obj:d(this),type:s.type,sweep:o.tipSweep},"bycheck");r.removeClass("Validform_error")}g=null;return true},submitForm:function(o,l,k,r,t){var w=this;if(w[0].validform_status==="posting"){return false}if(o.postonce&&w[0].validform_status==="posted"){return false}var v=o.beforeCheck&&o.beforeCheck(w);if(v===false){return false}var s=true,n;w.find("[datatype]").each(function(){if(l){return false}if(o.ignoreHidden&&d(this).is(":hidden")||d(this).data("dataIgnore")==="dataIgnore"){return true}var z=a.util.getValue.call(w,d(this)),A;g=A=d(this);n=a.util.regcheck.call(w,d(this).attr("datatype"),z,d(this));if(!n.passed){a.util.showmsg.call(w,n.info,o.tiptype,{obj:d(this),type:n.type,sweep:o.tipSweep});A.addClass("Validform_error");if(!o.showAllError){A.focus();s=false;return false}s&&(s=false);return true}if(d(this).attr("ajaxurl")&&!a.util.isEmpty.call(d(this),z)){if(this.validform_valid!=="true"){var y=d(this);a.util.showmsg.call(w,w.data("tipmsg").v||e.v,o.tiptype,{obj:y,type:3,sweep:o.tipSweep});A.addClass("Validform_error");y.trigger("blur",["postform"]);if(!o.showAllError){s=false;return false}s&&(s=false);return true}}else{if(d(this).attr("ajaxurl")&&a.util.isEmpty.call(d(this),z)){a.util.abort.call(this);this.validform_valid="true"}}a.util.showmsg.call(w,n.info,o.tiptype,{obj:d(this),type:n.type,sweep:o.tipSweep});A.removeClass("Validform_error");g=null});if(o.showAllError){w.find(".Validform_error:first").focus()}if(s){var q=o.beforeSubmit&&o.beforeSubmit(w);if(q===false){return false}w[0].validform_status="posting";if(o.ajaxPost||r==="ajaxPost"){var u=d.extend(true,{},o.ajaxpost||{});u.url=k||u.url||o.url||w.attr("action");a.util.showmsg.call(w,w.data("tipmsg").p||e.p,o.tiptype,{obj:w,type:1,sweep:o.tipSweep},"byajax");if(t){u.async=false}else{if(t===false){u.async=true}}if(u.success){var x=u.success;u.success=function(y){o.callback&&o.callback(y);w[0].validform_ajax=null;if(d.trim(y.status)==="y"){w[0].validform_status="posted"}else{w[0].validform_status="normal"}x(y,w)}}if(u.error){var m=u.error;u.error=function(y){o.callback&&o.callback(y);w[0].validform_status="normal";w[0].validform_ajax=null;m(y,w)}}var p={type:"POST",async:true,data:w.serializeArray(),success:function(y){if(d.trim(y.status)==="y"){w[0].validform_status="posted";a.util.showmsg.call(w,y.info,o.tiptype,{obj:w,type:2,sweep:o.tipSweep},"byajax")}else{w[0].validform_status="normal";a.util.showmsg.call(w,y.info,o.tiptype,{obj:w,type:3,sweep:o.tipSweep},"byajax")}o.callback&&o.callback(y);w[0].validform_ajax=null},error:function(y){var z="status: "+y.status+"; statusText: "+y.statusText;a.util.showmsg.call(w,z,o.tiptype,{obj:w,type:3,sweep:o.tipSweep},"byajax");o.callback&&o.callback(y);w[0].validform_status="normal";w[0].validform_ajax=null}};u=d.extend({},p,u,{dataType:"json"});w[0].validform_ajax=d.ajax(u)}else{if(!o.postonce){w[0].validform_status="normal"}var k=k||o.url;if(k){w.attr("action",k)}return o.callback&&o.callback(w)}}return false},resetForm:function(){var k=this;k.each(function(){this.reset&&this.reset();this.validform_status="normal"});k.find(".Validform_right").text("");k.find(".passwordStrength").children().removeClass("bgStrength");k.find(".Validform_checktip").removeClass("Validform_wrong Validform_right Validform_loading");k.find(".Validform_error").removeClass("Validform_error");k.find("[datatype]").removeData("cked").removeData("dataIgnore").each(function(){this.validform_lastval=null});k.eq(0).find("input:first").focus()},abort:function(){if(this.validform_ajax){this.validform_ajax.abort()}}};d.Datatype=a.util.dataType;a.prototype={dataType:a.util.dataType,eq:function(l){var k=this;if(l>=k.forms.length){return null}if(!(l in k.objects)){k.objects[l]=new a(d(k.forms[l]).get(),{},true)}return k.objects[l]},resetStatus:function(){var k=this;d(k.forms).each(function(){this.validform_status="normal"});return this},setStatus:function(k){var l=this;d(l.forms).each(function(){this.validform_status=k||"posting"});return this},getStatus:function(){var l=this;var k=d(l.forms)[0].validform_status;return k},ignore:function(k){var l=this;var k=k||"[datatype]";d(l.forms).find(k).each(function(){d(this).data("dataIgnore","dataIgnore").removeClass("Validform_error")});return this},unignore:function(k){var l=this;var k=k||"[datatype]";d(l.forms).find(k).each(function(){d(this).removeData("dataIgnore")});return this},addRule:function(n){var m=this;var n=n||[];for(var l=0;l<n.length;l++){var p=d(m.forms).find(n[l].ele);for(var k in n[l]){k!=="ele"&&p.attr(k,n[l][k])}}d(m.forms).each(function(){var o=d(this);a.util.enhance.call(o,this.settings.tiptype,this.settings.usePlugin,this.settings.tipSweep,"addRule")});return this},ajaxPost:function(k,m,l){var n=this;d(n.forms).each(function(){if(this.settings.tiptype==1||this.settings.tiptype==2||this.settings.tiptype==3){c()}a.util.submitForm.call(d(n.forms[0]),this.settings,k,l,"ajaxPost",m)});return this},submitForm:function(k,l){var m=this;d(m.forms).each(function(){var n=a.util.submitForm.call(d(this),this.settings,k,l);n===b&&(n=true);if(n===true){this.submit()}});return this},resetForm:function(){var k=this;a.util.resetForm.call(d(k.forms));return this},abort:function(){var k=this;d(k.forms).each(function(){a.util.abort.call(this)});return this},check:function(m,k){var k=k||"[datatype]",o=this,n=d(o.forms),l=true;n.find(k).each(function(){a.util.check.call(this,n,"",m)||(l=false)});return l},config:function(k){var l=this;k=k||{};d(l.forms).each(function(){var m=d(this);this.settings=d.extend(true,this.settings,k);a.util.enhance.call(m,this.settings.tiptype,this.settings.usePlugin,this.settings.tipSweep)});return this}};d.fn.Validform=function(k){return new a(this,k)};function h(n,m){var l=(d(window).width()-n.outerWidth())/2,k=(d(window).height()-n.outerHeight())/2,k=(document.documentElement.scrollTop?document.documentElement.scrollTop:document.body.scrollTop)+(k>0?k:0);n.css({left:l}).animate({top:k},{duration:m,queue:false})}function c(){if(d("#Validform_msg").length!==0){return false}j=d('<div id="Validform_msg"><div class="Validform_title">'+e.tit+'<a class="Validform_close" href="javascript:void(0);">&chi;</a></div><div class="Validform_info"></div><div class="iframe"><iframe frameborder="0" scrolling="no" height="100%" width="100%"></iframe></div></div>').appendTo("body");j.find("a.Validform_close").click(function(){j.hide();i=true;if(g){g.focus().addClass("Validform_error")}return false}).focus(function(){this.blur()});d(window).bind("scroll resize",function(){!i&&h(j,400)})}d.Showmsg=function(k){c();a.util.showmsg.call(f,k,1,{})};d.Hidemsg=function(){j.hide();i=true}})(jQuery,window);
diff --git a/route/static/js/bootstrap.min.js b/route/static/js/bootstrap.min.js
deleted file mode 100755
index 133aeecb9..000000000
--- a/route/static/js/bootstrap.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Bootstrap v3.3.5 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under the MIT license
- */
-if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.5",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.5",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")?(c.prop("checked")&&(a=!1),b.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==c.prop("type")&&(c.prop("checked")!==this.$element.hasClass("active")&&(a=!1),this.$element.toggleClass("active")),c.prop("checked",this.$element.hasClass("active")),a&&c.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),a(c.target).is('input[type="radio"]')||a(c.target).is('input[type="checkbox"]')||c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.5",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.5",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass("open")&&(c&&"click"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event("hide.bs.dropdown",f)),c.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger("hidden.bs.dropdown",f))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.5",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=b(e),g=f.hasClass("open");if(c(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",c);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger("shown.bs.dropdown",h)}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(".disabled, :disabled")){var e=b(d),g=e.hasClass("open");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find(".dropdown-menu"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&j<i.length-1&&j++,~j||(j=0),i.eq(j).trigger("focus")}}}};var h=a.fn.dropdown;a.fn.dropdown=d,a.fn.dropdown.Constructor=g,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=h,this},a(document).on("click.bs.dropdown.data-api",c).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",f,g.prototype.toggle).on("keydown.bs.dropdown.data-api",f,g.prototype.keydown).on("keydown.bs.dropdown.data-api",".dropdown-menu",g.prototype.keydown)}(jQuery),+function(a){"use strict";function b(b,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},c.DEFAULTS,e.data(),"object"==typeof b&&b);f||e.data("bs.modal",f=new c(this,g)),"string"==typeof b?f[b](d):g.show&&f.show(d)})}var c=function(b,c){this.options=c,this.$body=a(document.body),this.$element=a(b),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};c.VERSION="3.3.5",c.TRANSITION_DURATION=300,c.BACKDROP_TRANSITION_DURATION=150,c.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},c.prototype.toggle=function(a){return this.isShown?this.hide():this.show(a)},c.prototype.show=function(b){var d=this,e=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(e),this.isShown||e.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){d.$element.one("mouseup.dismiss.bs.modal",function(b){a(b.target).is(d.$element)&&(d.ignoreBackdropClick=!0)})}),this.backdrop(function(){var e=a.support.transition&&d.$element.hasClass("fade");d.$element.parent().length||d.$element.appendTo(d.$body),d.$element.show().scrollTop(0),d.adjustDialog(),e&&d.$element[0].offsetWidth,d.$element.addClass("in"),d.enforceFocus();var f=a.Event("shown.bs.modal",{relatedTarget:b});e?d.$dialog.one("bsTransitionEnd",function(){d.$element.trigger("focus").trigger(f)}).emulateTransitionEnd(c.TRANSITION_DURATION):d.$element.trigger("focus").trigger(f)}))},c.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",a.proxy(this.hideModal,this)).emulateTransitionEnd(c.TRANSITION_DURATION):this.hideModal())},c.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.trigger("focus")},this))},c.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},c.prototype.resize=function(){this.isShown?a(window).on("resize.bs.modal",a.proxy(this.handleUpdate,this)):a(window).off("resize.bs.modal")},c.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.$body.removeClass("modal-open"),a.resetAdjustments(),a.resetScrollbar(),a.$element.trigger("hidden.bs.modal")})},c.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},c.prototype.backdrop=function(b){var d=this,e=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var f=a.support.transition&&e;if(this.$backdrop=a(document.createElement("div")).addClass("modal-backdrop "+e).appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;f?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.adjustDialog()},c.prototype.adjustDialog=function(){var a=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth<a,this.scrollbarWidth=this.measureScrollbar()},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css("padding-right")||0,10);this.originalBodyPad=document.body.style.paddingRight||"",this.bodyIsOverflowing&&this.$body.css("padding-right",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad)},c.prototype.measureScrollbar=function(){var a=document.createElement("div");a.className="modal-scrollbar-measure",this.$body.append(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(c){var d=a(this),e=d.attr("href"),f=a(d.attr("data-target")||e&&e.replace(/.*(?=#[^\s]+$)/,"")),g=f.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is("a")&&c.preventDefault(),f.one("show.bs.modal",function(a){a.isDefaultPrevented()||f.one("hidden.bs.modal",function(){d.is(":visible")&&d.trigger("focus")})}),b.call(f,g,this)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.tooltip",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.inState=null,this.init("tooltip",a,b)};c.VERSION="3.3.5",c.TRANSITION_DURATION=150,c.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(a.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusin"==b.type?"focus":"hover"]=!0),c.tip().hasClass("in")||"in"==c.hoverState?void(c.hoverState="in"):(clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.isInStateTrue=function(){for(var a in this.inState)if(this.inState[a])return!0;return!1},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusout"==b.type?"focus":"hover"]=!1),c.isInStateTrue()?void 0:(clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide())},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.getPosition(this.$viewport);h="bottom"==h&&k.bottom+m>o.bottom?"top":"top"==h&&k.top-m<o.top?"bottom":"right"==h&&k.right+l>o.width?"left":"left"==h&&k.left-l<o.left?"right":h,f.removeClass(n).addClass(h)}var p=this.getCalculatedOffset(h,k,l,m);this.applyPlacement(p,h);var q=function(){var a=e.hoverState;e.$element.trigger("shown.bs."+e.type),e.hoverState=null,"out"==a&&e.leave(e)};a.support.transition&&this.$tip.hasClass("fade")?f.one("bsTransitionEnd",q).emulateTransitionEnd(c.TRANSITION_DURATION):q()}},c.prototype.applyPlacement=function(b,c){var d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),b.top+=g,b.left+=h,a.offset.setOffset(d[0],a.extend({using:function(a){d.css({top:Math.round(a.top),left:Math.round(a.left)})}},b),0),d.addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;"top"==c&&j!=f&&(b.top=b.top+f-j);var k=this.getViewportAdjustedDelta(c,b,i,j);k.left?b.left+=k.left:b.top+=k.top;var l=/top|bottom/.test(c),m=l?2*k.left-e+i:2*k.top-f+j,n=l?"offsetWidth":"offsetHeight";d.offset(b),this.replaceArrow(m,d[0][n],l)},c.prototype.replaceArrow=function(a,b,c){this.arrow().css(c?"left":"top",50*(1-a/b)+"%").css(c?"top":"left","")},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},c.prototype.hide=function(b){function d(){"in"!=e.hoverState&&f.detach(),e.$element.removeAttr("aria-describedby").trigger("hidden.bs."+e.type),b&&b()}var e=this,f=a(this.$tip),g=a.Event("hide.bs."+this.type);return this.$element.trigger(g),g.isDefaultPrevented()?void 0:(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one("bsTransitionEnd",d).emulateTransitionEnd(c.TRANSITION_DURATION):d(),this.hoverState=null,this)},c.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},c.prototype.hasContent=function(){return this.getTitle()},c.prototype.getPosition=function(b){b=b||this.$element;var c=b[0],d="BODY"==c.tagName,e=c.getBoundingClientRect();null==e.width&&(e=a.extend({},e,{width:e.right-e.left,height:e.bottom-e.top}));var f=d?{top:0,left:0}:b.offset(),g={scroll:d?document.documentElement.scrollTop||document.body.scrollTop:b.scrollTop()},h=d?{width:a(window).width(),height:a(window).height()}:null;return a.extend({},e,g,h,f)},c.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},c.prototype.getViewportAdjustedDelta=function(a,b,c,d){var e={top:0,left:0};if(!this.$viewport)return e;var f=this.options.viewport&&this.options.viewport.padding||0,g=this.getPosition(this.$viewport);if(/right|left/.test(a)){var h=b.top-f-g.scroll,i=b.top+f-g.scroll+d;h<g.top?e.top=g.top-h:i>g.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;j<g.left?e.left=g.left-j:k>g.right&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){if(!this.$tip&&(this.$tip=a(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),b?(c.inState.click=!c.inState.click,c.isInStateTrue()?c.enter(c):c.leave(c)):c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type),a.$tip&&a.$tip.detach(),a.$tip=null,a.$arrow=null,a.$viewport=null})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.5",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.5",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b<e[0])return this.activeTarget=null,this.clear();for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(void 0===e[a+1]||b<e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),
-d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.5",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.5",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return c>e?"top":!1;if("bottom"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:"bottom":a-d>=e+g?!1:"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=e?"top":null!=d&&i+j>=a-d?"bottom":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery);
\ No newline at end of file
diff --git a/route/static/js/clipboard.min.js b/route/static/js/clipboard.min.js
deleted file mode 100755
index 7a4fde688..000000000
--- a/route/static/js/clipboard.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * clipboard.js v2.0.1
- * https://zenorocha.github.io/clipboard.js
- * 
- * Licensed MIT © Zeno Rocha
- */
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.ClipboardJS=e():t.ClipboardJS=e()}(this,function(){return function(t){function e(o){if(n[o])return n[o].exports;var r=n[o]={i:o,l:!1,exports:{}};return t[o].call(r.exports,r,r.exports,e),r.l=!0,r.exports}var n={};return e.m=t,e.c=n,e.i=function(t){return t},e.d=function(t,n,o){e.o(t,n)||Object.defineProperty(t,n,{configurable:!1,enumerable:!0,get:o})},e.n=function(t){var n=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(n,"a",n),n},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=3)}([function(t,e,n){var o,r,i;!function(a,c){r=[t,n(7)],o=c,void 0!==(i="function"==typeof o?o.apply(e,r):o)&&(t.exports=i)}(0,function(t,e){"use strict";function n(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}var o=function(t){return t&&t.__esModule?t:{default:t}}(e),r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},i=function(){function t(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}return function(e,n,o){return n&&t(e.prototype,n),o&&t(e,o),e}}(),a=function(){function t(e){n(this,t),this.resolveOptions(e),this.initSelection()}return i(t,[{key:"resolveOptions",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};this.action=t.action,this.container=t.container,this.emitter=t.emitter,this.target=t.target,this.text=t.text,this.trigger=t.trigger,this.selectedText=""}},{key:"initSelection",value:function(){this.text?this.selectFake():this.target&&this.selectTarget()}},{key:"selectFake",value:function(){var t=this,e="rtl"==document.documentElement.getAttribute("dir");this.removeFake(),this.fakeHandlerCallback=function(){return t.removeFake()},this.fakeHandler=this.container.addEventListener("click",this.fakeHandlerCallback)||!0,this.fakeElem=document.createElement("textarea"),this.fakeElem.style.fontSize="12pt",this.fakeElem.style.border="0",this.fakeElem.style.padding="0",this.fakeElem.style.margin="0",this.fakeElem.style.position="absolute",this.fakeElem.style[e?"right":"left"]="-9999px";var n=window.pageYOffset||document.documentElement.scrollTop;this.fakeElem.style.top=n+"px",this.fakeElem.setAttribute("readonly",""),this.fakeElem.value=this.text,this.container.appendChild(this.fakeElem),this.selectedText=(0,o.default)(this.fakeElem),this.copyText()}},{key:"removeFake",value:function(){this.fakeHandler&&(this.container.removeEventListener("click",this.fakeHandlerCallback),this.fakeHandler=null,this.fakeHandlerCallback=null),this.fakeElem&&(this.container.removeChild(this.fakeElem),this.fakeElem=null)}},{key:"selectTarget",value:function(){this.selectedText=(0,o.default)(this.target),this.copyText()}},{key:"copyText",value:function(){var t=void 0;try{t=document.execCommand(this.action)}catch(e){t=!1}this.handleResult(t)}},{key:"handleResult",value:function(t){this.emitter.emit(t?"success":"error",{action:this.action,text:this.selectedText,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)})}},{key:"clearSelection",value:function(){this.trigger&&this.trigger.focus(),window.getSelection().removeAllRanges()}},{key:"destroy",value:function(){this.removeFake()}},{key:"action",set:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"copy";if(this._action=t,"copy"!==this._action&&"cut"!==this._action)throw new Error('Invalid "action" value, use either "copy" or "cut"')},get:function(){return this._action}},{key:"target",set:function(t){if(void 0!==t){if(!t||"object"!==(void 0===t?"undefined":r(t))||1!==t.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===this.action&&t.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===this.action&&(t.hasAttribute("readonly")||t.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes');this._target=t}},get:function(){return this._target}}]),t}();t.exports=a})},function(t,e,n){function o(t,e,n){if(!t&&!e&&!n)throw new Error("Missing required arguments");if(!c.string(e))throw new TypeError("Second argument must be a String");if(!c.fn(n))throw new TypeError("Third argument must be a Function");if(c.node(t))return r(t,e,n);if(c.nodeList(t))return i(t,e,n);if(c.string(t))return a(t,e,n);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList")}function r(t,e,n){return t.addEventListener(e,n),{destroy:function(){t.removeEventListener(e,n)}}}function i(t,e,n){return Array.prototype.forEach.call(t,function(t){t.addEventListener(e,n)}),{destroy:function(){Array.prototype.forEach.call(t,function(t){t.removeEventListener(e,n)})}}}function a(t,e,n){return u(document.body,t,e,n)}var c=n(6),u=n(5);t.exports=o},function(t,e){function n(){}n.prototype={on:function(t,e,n){var o=this.e||(this.e={});return(o[t]||(o[t]=[])).push({fn:e,ctx:n}),this},once:function(t,e,n){function o(){r.off(t,o),e.apply(n,arguments)}var r=this;return o._=e,this.on(t,o,n)},emit:function(t){var e=[].slice.call(arguments,1),n=((this.e||(this.e={}))[t]||[]).slice(),o=0,r=n.length;for(o;o<r;o++)n[o].fn.apply(n[o].ctx,e);return this},off:function(t,e){var n=this.e||(this.e={}),o=n[t],r=[];if(o&&e)for(var i=0,a=o.length;i<a;i++)o[i].fn!==e&&o[i].fn._!==e&&r.push(o[i]);return r.length?n[t]=r:delete n[t],this}},t.exports=n},function(t,e,n){var o,r,i;!function(a,c){r=[t,n(0),n(2),n(1)],o=c,void 0!==(i="function"==typeof o?o.apply(e,r):o)&&(t.exports=i)}(0,function(t,e,n,o){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function a(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function c(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function u(t,e){var n="data-clipboard-"+t;if(e.hasAttribute(n))return e.getAttribute(n)}var l=r(e),s=r(n),f=r(o),d="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},h=function(){function t(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}return function(e,n,o){return n&&t(e.prototype,n),o&&t(e,o),e}}(),p=function(t){function e(t,n){i(this,e);var o=a(this,(e.__proto__||Object.getPrototypeOf(e)).call(this));return o.resolveOptions(n),o.listenClick(t),o}return c(e,t),h(e,[{key:"resolveOptions",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};this.action="function"==typeof t.action?t.action:this.defaultAction,this.target="function"==typeof t.target?t.target:this.defaultTarget,this.text="function"==typeof t.text?t.text:this.defaultText,this.container="object"===d(t.container)?t.container:document.body}},{key:"listenClick",value:function(t){var e=this;this.listener=(0,f.default)(t,"click",function(t){return e.onClick(t)})}},{key:"onClick",value:function(t){var e=t.delegateTarget||t.currentTarget;this.clipboardAction&&(this.clipboardAction=null),this.clipboardAction=new l.default({action:this.action(e),target:this.target(e),text:this.text(e),container:this.container,trigger:e,emitter:this})}},{key:"defaultAction",value:function(t){return u("action",t)}},{key:"defaultTarget",value:function(t){var e=u("target",t);if(e)return document.querySelector(e)}},{key:"defaultText",value:function(t){return u("text",t)}},{key:"destroy",value:function(){this.listener.destroy(),this.clipboardAction&&(this.clipboardAction.destroy(),this.clipboardAction=null)}}],[{key:"isSupported",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:["copy","cut"],e="string"==typeof t?[t]:t,n=!!document.queryCommandSupported;return e.forEach(function(t){n=n&&!!document.queryCommandSupported(t)}),n}}]),e}(s.default);t.exports=p})},function(t,e){function n(t,e){for(;t&&t.nodeType!==o;){if("function"==typeof t.matches&&t.matches(e))return t;t=t.parentNode}}var o=9;if("undefined"!=typeof Element&&!Element.prototype.matches){var r=Element.prototype;r.matches=r.matchesSelector||r.mozMatchesSelector||r.msMatchesSelector||r.oMatchesSelector||r.webkitMatchesSelector}t.exports=n},function(t,e,n){function o(t,e,n,o,r){var a=i.apply(this,arguments);return t.addEventListener(n,a,r),{destroy:function(){t.removeEventListener(n,a,r)}}}function r(t,e,n,r,i){return"function"==typeof t.addEventListener?o.apply(null,arguments):"function"==typeof n?o.bind(null,document).apply(null,arguments):("string"==typeof t&&(t=document.querySelectorAll(t)),Array.prototype.map.call(t,function(t){return o(t,e,n,r,i)}))}function i(t,e,n,o){return function(n){n.delegateTarget=a(n.target,e),n.delegateTarget&&o.call(t,n)}}var a=n(4);t.exports=r},function(t,e){e.node=function(t){return void 0!==t&&t instanceof HTMLElement&&1===t.nodeType},e.nodeList=function(t){var n=Object.prototype.toString.call(t);return void 0!==t&&("[object NodeList]"===n||"[object HTMLCollection]"===n)&&"length"in t&&(0===t.length||e.node(t[0]))},e.string=function(t){return"string"==typeof t||t instanceof String},e.fn=function(t){return"[object Function]"===Object.prototype.toString.call(t)}},function(t,e){function n(t){var e;if("SELECT"===t.nodeName)t.focus(),e=t.value;else if("INPUT"===t.nodeName||"TEXTAREA"===t.nodeName){var n=t.hasAttribute("readonly");n||t.setAttribute("readonly",""),t.select(),t.setSelectionRange(0,t.value.length),n||t.removeAttribute("readonly"),e=t.value}else{t.hasAttribute("contenteditable")&&t.focus();var o=window.getSelection(),r=document.createRange();r.selectNodeContents(t),o.removeAllRanges(),o.addRange(r),e=o.toString()}return e}t.exports=n}])});
\ No newline at end of file
diff --git a/route/static/js/echarts.min.js b/route/static/js/echarts.min.js
deleted file mode 100644
index 85daf7e8d..000000000
--- a/route/static/js/echarts.min.js
+++ /dev/null
@@ -1,45 +0,0 @@
-
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements.  See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership.  The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License.  You may obtain a copy of the License at
-*
-*   http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).echarts={})}(this,(function(t){"use strict";
-/*! *****************************************************************************
-    Copyright (c) Microsoft Corporation.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose with or without fee is hereby granted.
-
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-    REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-    LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-    OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-    ***************************************************************************** */var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])},e(t,n)};function n(t,n){if("function"!=typeof n&&null!==n)throw new TypeError("Class extends value "+String(n)+" is not a constructor or null");function i(){this.constructor=t}e(t,n),t.prototype=null===n?Object.create(n):(i.prototype=n.prototype,new i)}var i=function(){this.firefox=!1,this.ie=!1,this.edge=!1,this.newEdge=!1,this.weChat=!1},r=new function(){this.browser=new i,this.node=!1,this.wxa=!1,this.worker=!1,this.svgSupported=!1,this.touchEventsSupported=!1,this.pointerEventsSupported=!1,this.domSupported=!1,this.transformSupported=!1,this.transform3dSupported=!1,this.hasGlobalWindow="undefined"!=typeof window};"object"==typeof wx&&"function"==typeof wx.getSystemInfoSync?(r.wxa=!0,r.touchEventsSupported=!0):"undefined"==typeof document&&"undefined"!=typeof self?r.worker=!0:"undefined"==typeof navigator?(r.node=!0,r.svgSupported=!0):function(t,e){var n=e.browser,i=t.match(/Firefox\/([\d.]+)/),r=t.match(/MSIE\s([\d.]+)/)||t.match(/Trident\/.+?rv:(([\d.]+))/),o=t.match(/Edge?\/([\d.]+)/),a=/micromessenger/i.test(t);i&&(n.firefox=!0,n.version=i[1]);r&&(n.ie=!0,n.version=r[1]);o&&(n.edge=!0,n.version=o[1],n.newEdge=+o[1].split(".")[0]>18);a&&(n.weChat=!0);e.svgSupported="undefined"!=typeof SVGRect,e.touchEventsSupported="ontouchstart"in window&&!n.ie&&!n.edge,e.pointerEventsSupported="onpointerdown"in window&&(n.edge||n.ie&&+n.version>=11),e.domSupported="undefined"!=typeof document;var s=document.documentElement.style;e.transform3dSupported=(n.ie&&"transition"in s||n.edge||"WebKitCSSMatrix"in window&&"m11"in new WebKitCSSMatrix||"MozPerspective"in s)&&!("OTransition"in s),e.transformSupported=e.transform3dSupported||n.ie&&+n.version>=9}(navigator.userAgent,r);var o="sans-serif",a="12px sans-serif";var s,l,u=function(t){var e={};if("undefined"==typeof JSON)return e;for(var n=0;n<t.length;n++){var i=String.fromCharCode(n+32),r=(t.charCodeAt(n)-20)/100;e[i]=r}return e}("007LLmW'55;N0500LLLLLLLLLL00NNNLzWW\\\\WQb\\0FWLg\\bWb\\WQ\\WrWWQ000CL5LLFLL0LL**F*gLLLL5F0LF\\FFF5.5N"),h={createCanvas:function(){return"undefined"!=typeof document&&document.createElement("canvas")},measureText:function(t,e){if(!s){var n=h.createCanvas();s=n&&n.getContext("2d")}if(s)return l!==e&&(l=s.font=e||a),s.measureText(t);t=t||"";var i=/(\d+)px/.exec(e=e||a),r=i&&+i[1]||12,o=0;if(e.indexOf("mono")>=0)o=r*t.length;else for(var c=0;c<t.length;c++){var p=u[t[c]];o+=null==p?r:p*r}return{width:o}},loadImage:function(t,e,n){var i=new Image;return i.onload=e,i.onerror=n,i.src=t,i}};function c(t){for(var e in h)t[e]&&(h[e]=t[e])}var p=V(["Function","RegExp","Date","Error","CanvasGradient","CanvasPattern","Image","Canvas"],(function(t,e){return t["[object "+e+"]"]=!0,t}),{}),d=V(["Int8","Uint8","Uint8Clamped","Int16","Uint16","Int32","Uint32","Float32","Float64"],(function(t,e){return t["[object "+e+"Array]"]=!0,t}),{}),f=Object.prototype.toString,g=Array.prototype,y=g.forEach,v=g.filter,m=g.slice,x=g.map,_=function(){}.constructor,b=_?_.prototype:null,w="__proto__",S=2311;function M(){return S++}function I(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];"undefined"!=typeof console&&console.error.apply(console,t)}function T(t){if(null==t||"object"!=typeof t)return t;var e=t,n=f.call(t);if("[object Array]"===n){if(!pt(t)){e=[];for(var i=0,r=t.length;i<r;i++)e[i]=T(t[i])}}else if(d[n]){if(!pt(t)){var o=t.constructor;if(o.from)e=o.from(t);else{e=new o(t.length);for(i=0,r=t.length;i<r;i++)e[i]=t[i]}}}else if(!p[n]&&!pt(t)&&!J(t))for(var a in e={},t)t.hasOwnProperty(a)&&a!==w&&(e[a]=T(t[a]));return e}function C(t,e,n){if(!q(e)||!q(t))return n?T(e):t;for(var i in e)if(e.hasOwnProperty(i)&&i!==w){var r=t[i],o=e[i];!q(o)||!q(r)||Y(o)||Y(r)||J(o)||J(r)||K(o)||K(r)||pt(o)||pt(r)?!n&&i in t||(t[i]=T(e[i])):C(r,o,n)}return t}function D(t,e){for(var n=t[0],i=1,r=t.length;i<r;i++)n=C(n,t[i],e);return n}function A(t,e){if(Object.assign)Object.assign(t,e);else for(var n in e)e.hasOwnProperty(n)&&n!==w&&(t[n]=e[n]);return t}function k(t,e,n){for(var i=G(e),r=0;r<i.length;r++){var o=i[r];(n?null!=e[o]:null==t[o])&&(t[o]=e[o])}return t}var L=h.createCanvas;function P(t,e){if(t){if(t.indexOf)return t.indexOf(e);for(var n=0,i=t.length;n<i;n++)if(t[n]===e)return n}return-1}function O(t,e){var n=t.prototype;function i(){}for(var r in i.prototype=e.prototype,t.prototype=new i,n)n.hasOwnProperty(r)&&(t.prototype[r]=n[r]);t.prototype.constructor=t,t.superClass=e}function R(t,e,n){if(t="prototype"in t?t.prototype:t,e="prototype"in e?e.prototype:e,Object.getOwnPropertyNames)for(var i=Object.getOwnPropertyNames(e),r=0;r<i.length;r++){var o=i[r];"constructor"!==o&&(n?null!=e[o]:null==t[o])&&(t[o]=e[o])}else k(t,e,n)}function N(t){return!!t&&("string"!=typeof t&&"number"==typeof t.length)}function E(t,e,n){if(t&&e)if(t.forEach&&t.forEach===y)t.forEach(e,n);else if(t.length===+t.length)for(var i=0,r=t.length;i<r;i++)e.call(n,t[i],i,t);else for(var o in t)t.hasOwnProperty(o)&&e.call(n,t[o],o,t)}function z(t,e,n){if(!t)return[];if(!e)return at(t);if(t.map&&t.map===x)return t.map(e,n);for(var i=[],r=0,o=t.length;r<o;r++)i.push(e.call(n,t[r],r,t));return i}function V(t,e,n,i){if(t&&e){for(var r=0,o=t.length;r<o;r++)n=e.call(i,n,t[r],r,t);return n}}function B(t,e,n){if(!t)return[];if(!e)return at(t);if(t.filter&&t.filter===v)return t.filter(e,n);for(var i=[],r=0,o=t.length;r<o;r++)e.call(n,t[r],r,t)&&i.push(t[r]);return i}function F(t,e,n){if(t&&e)for(var i=0,r=t.length;i<r;i++)if(e.call(n,t[i],i,t))return t[i]}function G(t){if(!t)return[];if(Object.keys)return Object.keys(t);var e=[];for(var n in t)t.hasOwnProperty(n)&&e.push(n);return e}var W=b&&U(b.bind)?b.call.bind(b.bind):function(t,e){for(var n=[],i=2;i<arguments.length;i++)n[i-2]=arguments[i];return function(){return t.apply(e,n.concat(m.call(arguments)))}};function H(t){for(var e=[],n=1;n<arguments.length;n++)e[n-1]=arguments[n];return function(){return t.apply(this,e.concat(m.call(arguments)))}}function Y(t){return Array.isArray?Array.isArray(t):"[object Array]"===f.call(t)}function U(t){return"function"==typeof t}function X(t){return"string"==typeof t}function Z(t){return"[object String]"===f.call(t)}function j(t){return"number"==typeof t}function q(t){var e=typeof t;return"function"===e||!!t&&"object"===e}function K(t){return!!p[f.call(t)]}function $(t){return!!d[f.call(t)]}function J(t){return"object"==typeof t&&"number"==typeof t.nodeType&&"object"==typeof t.ownerDocument}function Q(t){return null!=t.colorStops}function tt(t){return null!=t.image}function et(t){return"[object RegExp]"===f.call(t)}function nt(t){return t!=t}function it(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];for(var n=0,i=t.length;n<i;n++)if(null!=t[n])return t[n]}function rt(t,e){return null!=t?t:e}function ot(t,e,n){return null!=t?t:null!=e?e:n}function at(t){for(var e=[],n=1;n<arguments.length;n++)e[n-1]=arguments[n];return m.apply(t,e)}function st(t){if("number"==typeof t)return[t,t,t,t];var e=t.length;return 2===e?[t[0],t[1],t[0],t[1]]:3===e?[t[0],t[1],t[2],t[1]]:t}function lt(t,e){if(!t)throw new Error(e)}function ut(t){return null==t?null:"function"==typeof t.trim?t.trim():t.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")}var ht="__ec_primitive__";function ct(t){t[ht]=!0}function pt(t){return t[ht]}var dt=function(){function t(){this.data={}}return t.prototype.delete=function(t){var e=this.has(t);return e&&delete this.data[t],e},t.prototype.has=function(t){return this.data.hasOwnProperty(t)},t.prototype.get=function(t){return this.data[t]},t.prototype.set=function(t,e){return this.data[t]=e,this},t.prototype.keys=function(){return G(this.data)},t.prototype.forEach=function(t){var e=this.data;for(var n in e)e.hasOwnProperty(n)&&t(e[n],n)},t}(),ft="function"==typeof Map;var gt=function(){function t(e){var n=Y(e);this.data=ft?new Map:new dt;var i=this;function r(t,e){n?i.set(t,e):i.set(e,t)}e instanceof t?e.each(r):e&&E(e,r)}return t.prototype.hasKey=function(t){return this.data.has(t)},t.prototype.get=function(t){return this.data.get(t)},t.prototype.set=function(t,e){return this.data.set(t,e),e},t.prototype.each=function(t,e){this.data.forEach((function(n,i){t.call(e,n,i)}))},t.prototype.keys=function(){var t=this.data.keys();return ft?Array.from(t):t},t.prototype.removeKey=function(t){this.data.delete(t)},t}();function yt(t){return new gt(t)}function vt(t,e){for(var n=new t.constructor(t.length+e.length),i=0;i<t.length;i++)n[i]=t[i];var r=t.length;for(i=0;i<e.length;i++)n[i+r]=e[i];return n}function mt(t,e){var n;if(Object.create)n=Object.create(t);else{var i=function(){};i.prototype=t,n=new i}return e&&A(n,e),n}function xt(t){var e=t.style;e.webkitUserSelect="none",e.userSelect="none",e.webkitTapHighlightColor="rgba(0,0,0,0)",e["-webkit-touch-callout"]="none"}function _t(t,e){return t.hasOwnProperty(e)}function bt(){}var wt=180/Math.PI,St=Object.freeze({__proto__:null,guid:M,logError:I,clone:T,merge:C,mergeAll:D,extend:A,defaults:k,createCanvas:L,indexOf:P,inherits:O,mixin:R,isArrayLike:N,each:E,map:z,reduce:V,filter:B,find:F,keys:G,bind:W,curry:H,isArray:Y,isFunction:U,isString:X,isStringSafe:Z,isNumber:j,isObject:q,isBuiltInObject:K,isTypedArray:$,isDom:J,isGradientObject:Q,isImagePatternObject:tt,isRegExp:et,eqNaN:nt,retrieve:it,retrieve2:rt,retrieve3:ot,slice:at,normalizeCssArray:st,assert:lt,trim:ut,setAsPrimitive:ct,isPrimitive:pt,HashMap:gt,createHashMap:yt,concatArray:vt,createObject:mt,disableUserSelect:xt,hasOwn:_t,noop:bt,RADIAN_TO_DEGREE:wt});function Mt(t,e){return null==t&&(t=0),null==e&&(e=0),[t,e]}function It(t,e){return t[0]=e[0],t[1]=e[1],t}function Tt(t){return[t[0],t[1]]}function Ct(t,e,n){return t[0]=e,t[1]=n,t}function Dt(t,e,n){return t[0]=e[0]+n[0],t[1]=e[1]+n[1],t}function At(t,e,n,i){return t[0]=e[0]+n[0]*i,t[1]=e[1]+n[1]*i,t}function kt(t,e,n){return t[0]=e[0]-n[0],t[1]=e[1]-n[1],t}function Lt(t){return Math.sqrt(Ot(t))}var Pt=Lt;function Ot(t){return t[0]*t[0]+t[1]*t[1]}var Rt=Ot;function Nt(t,e,n){return t[0]=e[0]*n,t[1]=e[1]*n,t}function Et(t,e){var n=Lt(e);return 0===n?(t[0]=0,t[1]=0):(t[0]=e[0]/n,t[1]=e[1]/n),t}function zt(t,e){return Math.sqrt((t[0]-e[0])*(t[0]-e[0])+(t[1]-e[1])*(t[1]-e[1]))}var Vt=zt;function Bt(t,e){return(t[0]-e[0])*(t[0]-e[0])+(t[1]-e[1])*(t[1]-e[1])}var Ft=Bt;function Gt(t,e,n,i){return t[0]=e[0]+i*(n[0]-e[0]),t[1]=e[1]+i*(n[1]-e[1]),t}function Wt(t,e,n){var i=e[0],r=e[1];return t[0]=n[0]*i+n[2]*r+n[4],t[1]=n[1]*i+n[3]*r+n[5],t}function Ht(t,e,n){return t[0]=Math.min(e[0],n[0]),t[1]=Math.min(e[1],n[1]),t}function Yt(t,e,n){return t[0]=Math.max(e[0],n[0]),t[1]=Math.max(e[1],n[1]),t}var Ut=Object.freeze({__proto__:null,create:Mt,copy:It,clone:Tt,set:Ct,add:Dt,scaleAndAdd:At,sub:kt,len:Lt,length:Pt,lenSquare:Ot,lengthSquare:Rt,mul:function(t,e,n){return t[0]=e[0]*n[0],t[1]=e[1]*n[1],t},div:function(t,e,n){return t[0]=e[0]/n[0],t[1]=e[1]/n[1],t},dot:function(t,e){return t[0]*e[0]+t[1]*e[1]},scale:Nt,normalize:Et,distance:zt,dist:Vt,distanceSquare:Bt,distSquare:Ft,negate:function(t,e){return t[0]=-e[0],t[1]=-e[1],t},lerp:Gt,applyTransform:Wt,min:Ht,max:Yt}),Xt=function(t,e){this.target=t,this.topTarget=e&&e.topTarget},Zt=function(){function t(t){this.handler=t,t.on("mousedown",this._dragStart,this),t.on("mousemove",this._drag,this),t.on("mouseup",this._dragEnd,this)}return t.prototype._dragStart=function(t){for(var e=t.target;e&&!e.draggable;)e=e.parent||e.__hostTarget;e&&(this._draggingTarget=e,e.dragging=!0,this._x=t.offsetX,this._y=t.offsetY,this.handler.dispatchToElement(new Xt(e,t),"dragstart",t.event))},t.prototype._drag=function(t){var e=this._draggingTarget;if(e){var n=t.offsetX,i=t.offsetY,r=n-this._x,o=i-this._y;this._x=n,this._y=i,e.drift(r,o,t),this.handler.dispatchToElement(new Xt(e,t),"drag",t.event);var a=this.handler.findHover(n,i,e).target,s=this._dropTarget;this._dropTarget=a,e!==a&&(s&&a!==s&&this.handler.dispatchToElement(new Xt(s,t),"dragleave",t.event),a&&a!==s&&this.handler.dispatchToElement(new Xt(a,t),"dragenter",t.event))}},t.prototype._dragEnd=function(t){var e=this._draggingTarget;e&&(e.dragging=!1),this.handler.dispatchToElement(new Xt(e,t),"dragend",t.event),this._dropTarget&&this.handler.dispatchToElement(new Xt(this._dropTarget,t),"drop",t.event),this._draggingTarget=null,this._dropTarget=null},t}(),jt=function(){function t(t){t&&(this._$eventProcessor=t)}return t.prototype.on=function(t,e,n,i){this._$handlers||(this._$handlers={});var r=this._$handlers;if("function"==typeof e&&(i=n,n=e,e=null),!n||!t)return this;var o=this._$eventProcessor;null!=e&&o&&o.normalizeQuery&&(e=o.normalizeQuery(e)),r[t]||(r[t]=[]);for(var a=0;a<r[t].length;a++)if(r[t][a].h===n)return this;var s={h:n,query:e,ctx:i||this,callAtLast:n.zrEventfulCallAtLast},l=r[t].length-1,u=r[t][l];return u&&u.callAtLast?r[t].splice(l,0,s):r[t].push(s),this},t.prototype.isSilent=function(t){var e=this._$handlers;return!e||!e[t]||!e[t].length},t.prototype.off=function(t,e){var n=this._$handlers;if(!n)return this;if(!t)return this._$handlers={},this;if(e){if(n[t]){for(var i=[],r=0,o=n[t].length;r<o;r++)n[t][r].h!==e&&i.push(n[t][r]);n[t]=i}n[t]&&0===n[t].length&&delete n[t]}else delete n[t];return this},t.prototype.trigger=function(t){for(var e=[],n=1;n<arguments.length;n++)e[n-1]=arguments[n];if(!this._$handlers)return this;var i=this._$handlers[t],r=this._$eventProcessor;if(i)for(var o=e.length,a=i.length,s=0;s<a;s++){var l=i[s];if(!r||!r.filter||null==l.query||r.filter(t,l.query))switch(o){case 0:l.h.call(l.ctx);break;case 1:l.h.call(l.ctx,e[0]);break;case 2:l.h.call(l.ctx,e[0],e[1]);break;default:l.h.apply(l.ctx,e)}}return r&&r.afterTrigger&&r.afterTrigger(t),this},t.prototype.triggerWithContext=function(t){for(var e=[],n=1;n<arguments.length;n++)e[n-1]=arguments[n];if(!this._$handlers)return this;var i=this._$handlers[t],r=this._$eventProcessor;if(i)for(var o=e.length,a=e[o-1],s=i.length,l=0;l<s;l++){var u=i[l];if(!r||!r.filter||null==u.query||r.filter(t,u.query))switch(o){case 0:u.h.call(a);break;case 1:u.h.call(a,e[0]);break;case 2:u.h.call(a,e[0],e[1]);break;default:u.h.apply(a,e.slice(1,o-1))}}return r&&r.afterTrigger&&r.afterTrigger(t),this},t}(),qt=Math.log(2);function Kt(t,e,n,i,r,o){var a=i+"-"+r,s=t.length;if(o.hasOwnProperty(a))return o[a];if(1===e){var l=Math.round(Math.log((1<<s)-1&~r)/qt);return t[n][l]}for(var u=i|1<<n,h=n+1;i&1<<h;)h++;for(var c=0,p=0,d=0;p<s;p++){var f=1<<p;f&r||(c+=(d%2?-1:1)*t[n][p]*Kt(t,e-1,h,u,r|f,o),d++)}return o[a]=c,c}function $t(t,e){var n=[[t[0],t[1],1,0,0,0,-e[0]*t[0],-e[0]*t[1]],[0,0,0,t[0],t[1],1,-e[1]*t[0],-e[1]*t[1]],[t[2],t[3],1,0,0,0,-e[2]*t[2],-e[2]*t[3]],[0,0,0,t[2],t[3],1,-e[3]*t[2],-e[3]*t[3]],[t[4],t[5],1,0,0,0,-e[4]*t[4],-e[4]*t[5]],[0,0,0,t[4],t[5],1,-e[5]*t[4],-e[5]*t[5]],[t[6],t[7],1,0,0,0,-e[6]*t[6],-e[6]*t[7]],[0,0,0,t[6],t[7],1,-e[7]*t[6],-e[7]*t[7]]],i={},r=Kt(n,8,0,0,0,i);if(0!==r){for(var o=[],a=0;a<8;a++)for(var s=0;s<8;s++)null==o[s]&&(o[s]=0),o[s]+=((a+s)%2?-1:1)*Kt(n,7,0===a?1:0,1<<a,1<<s,i)/r*e[a];return function(t,e,n){var i=e*o[6]+n*o[7]+1;t[0]=(e*o[0]+n*o[1]+o[2])/i,t[1]=(e*o[3]+n*o[4]+o[5])/i}}}var Jt=[];function Qt(t,e,n,i,o){if(e.getBoundingClientRect&&r.domSupported&&!te(e)){var a=e.___zrEVENTSAVED||(e.___zrEVENTSAVED={}),s=function(t,e){var n=e.markers;if(n)return n;n=e.markers=[];for(var i=["left","right"],r=["top","bottom"],o=0;o<4;o++){var a=document.createElement("div"),s=o%2,l=(o>>1)%2;a.style.cssText=["position: absolute","visibility: hidden","padding: 0","margin: 0","border-width: 0","user-select: none","width:0","height:0",i[s]+":0",r[l]+":0",i[1-s]+":auto",r[1-l]+":auto",""].join("!important;"),t.appendChild(a),n.push(a)}return n}(e,a),l=function(t,e,n){for(var i=n?"invTrans":"trans",r=e[i],o=e.srcCoords,a=[],s=[],l=!0,u=0;u<4;u++){var h=t[u].getBoundingClientRect(),c=2*u,p=h.left,d=h.top;a.push(p,d),l=l&&o&&p===o[c]&&d===o[c+1],s.push(t[u].offsetLeft,t[u].offsetTop)}return l&&r?r:(e.srcCoords=a,e[i]=n?$t(s,a):$t(a,s))}(s,a,o);if(l)return l(t,n,i),!0}return!1}function te(t){return"CANVAS"===t.nodeName.toUpperCase()}var ee=/([&<>"'])/g,ne={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"};function ie(t){return null==t?"":(t+"").replace(ee,(function(t,e){return ne[e]}))}var re=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,oe=[],ae=r.browser.firefox&&+r.browser.version.split(".")[0]<39;function se(t,e,n,i){return n=n||{},i?le(t,e,n):ae&&null!=e.layerX&&e.layerX!==e.offsetX?(n.zrX=e.layerX,n.zrY=e.layerY):null!=e.offsetX?(n.zrX=e.offsetX,n.zrY=e.offsetY):le(t,e,n),n}function le(t,e,n){if(r.domSupported&&t.getBoundingClientRect){var i=e.clientX,o=e.clientY;if(te(t)){var a=t.getBoundingClientRect();return n.zrX=i-a.left,void(n.zrY=o-a.top)}if(Qt(oe,t,i,o))return n.zrX=oe[0],void(n.zrY=oe[1])}n.zrX=n.zrY=0}function ue(t){return t||window.event}function he(t,e,n){if(null!=(e=ue(e)).zrX)return e;var i=e.type;if(i&&i.indexOf("touch")>=0){var r="touchend"!==i?e.targetTouches[0]:e.changedTouches[0];r&&se(t,r,e,n)}else{se(t,e,e,n);var o=function(t){var e=t.wheelDelta;if(e)return e;var n=t.deltaX,i=t.deltaY;if(null==n||null==i)return e;return 3*(0!==i?Math.abs(i):Math.abs(n))*(i>0?-1:i<0?1:n>0?-1:1)}(e);e.zrDelta=o?o/120:-(e.detail||0)/3}var a=e.button;return null==e.which&&void 0!==a&&re.test(e.type)&&(e.which=1&a?1:2&a?3:4&a?2:0),e}function ce(t,e,n,i){t.addEventListener(e,n,i)}var pe=function(t){t.preventDefault(),t.stopPropagation(),t.cancelBubble=!0};function de(t){return 2===t.which||3===t.which}var fe=function(){function t(){this._track=[]}return t.prototype.recognize=function(t,e,n){return this._doTrack(t,e,n),this._recognize(t)},t.prototype.clear=function(){return this._track.length=0,this},t.prototype._doTrack=function(t,e,n){var i=t.touches;if(i){for(var r={points:[],touches:[],target:e,event:t},o=0,a=i.length;o<a;o++){var s=i[o],l=se(n,s,{});r.points.push([l.zrX,l.zrY]),r.touches.push(s)}this._track.push(r)}},t.prototype._recognize=function(t){for(var e in ye)if(ye.hasOwnProperty(e)){var n=ye[e](this._track,t);if(n)return n}},t}();function ge(t){var e=t[1][0]-t[0][0],n=t[1][1]-t[0][1];return Math.sqrt(e*e+n*n)}var ye={pinch:function(t,e){var n=t.length;if(n){var i,r=(t[n-1]||{}).points,o=(t[n-2]||{}).points||r;if(o&&o.length>1&&r&&r.length>1){var a=ge(r)/ge(o);!isFinite(a)&&(a=1),e.pinchScale=a;var s=[((i=r)[0][0]+i[1][0])/2,(i[0][1]+i[1][1])/2];return e.pinchX=s[0],e.pinchY=s[1],{type:"pinch",target:t[0].target,event:e}}}}};function ve(){return[1,0,0,1,0,0]}function me(t){return t[0]=1,t[1]=0,t[2]=0,t[3]=1,t[4]=0,t[5]=0,t}function xe(t,e){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t[3]=e[3],t[4]=e[4],t[5]=e[5],t}function _e(t,e,n){var i=e[0]*n[0]+e[2]*n[1],r=e[1]*n[0]+e[3]*n[1],o=e[0]*n[2]+e[2]*n[3],a=e[1]*n[2]+e[3]*n[3],s=e[0]*n[4]+e[2]*n[5]+e[4],l=e[1]*n[4]+e[3]*n[5]+e[5];return t[0]=i,t[1]=r,t[2]=o,t[3]=a,t[4]=s,t[5]=l,t}function be(t,e,n){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t[3]=e[3],t[4]=e[4]+n[0],t[5]=e[5]+n[1],t}function we(t,e,n){var i=e[0],r=e[2],o=e[4],a=e[1],s=e[3],l=e[5],u=Math.sin(n),h=Math.cos(n);return t[0]=i*h+a*u,t[1]=-i*u+a*h,t[2]=r*h+s*u,t[3]=-r*u+h*s,t[4]=h*o+u*l,t[5]=h*l-u*o,t}function Se(t,e,n){var i=n[0],r=n[1];return t[0]=e[0]*i,t[1]=e[1]*r,t[2]=e[2]*i,t[3]=e[3]*r,t[4]=e[4]*i,t[5]=e[5]*r,t}function Me(t,e){var n=e[0],i=e[2],r=e[4],o=e[1],a=e[3],s=e[5],l=n*a-o*i;return l?(l=1/l,t[0]=a*l,t[1]=-o*l,t[2]=-i*l,t[3]=n*l,t[4]=(i*s-a*r)*l,t[5]=(o*r-n*s)*l,t):null}function Ie(t){var e=[1,0,0,1,0,0];return xe(e,t),e}var Te=Object.freeze({__proto__:null,create:ve,identity:me,copy:xe,mul:_e,translate:be,rotate:we,scale:Se,invert:Me,clone:Ie}),Ce=function(){function t(t,e){this.x=t||0,this.y=e||0}return t.prototype.copy=function(t){return this.x=t.x,this.y=t.y,this},t.prototype.clone=function(){return new t(this.x,this.y)},t.prototype.set=function(t,e){return this.x=t,this.y=e,this},t.prototype.equal=function(t){return t.x===this.x&&t.y===this.y},t.prototype.add=function(t){return this.x+=t.x,this.y+=t.y,this},t.prototype.scale=function(t){this.x*=t,this.y*=t},t.prototype.scaleAndAdd=function(t,e){this.x+=t.x*e,this.y+=t.y*e},t.prototype.sub=function(t){return this.x-=t.x,this.y-=t.y,this},t.prototype.dot=function(t){return this.x*t.x+this.y*t.y},t.prototype.len=function(){return Math.sqrt(this.x*this.x+this.y*this.y)},t.prototype.lenSquare=function(){return this.x*this.x+this.y*this.y},t.prototype.normalize=function(){var t=this.len();return this.x/=t,this.y/=t,this},t.prototype.distance=function(t){var e=this.x-t.x,n=this.y-t.y;return Math.sqrt(e*e+n*n)},t.prototype.distanceSquare=function(t){var e=this.x-t.x,n=this.y-t.y;return e*e+n*n},t.prototype.negate=function(){return this.x=-this.x,this.y=-this.y,this},t.prototype.transform=function(t){if(t){var e=this.x,n=this.y;return this.x=t[0]*e+t[2]*n+t[4],this.y=t[1]*e+t[3]*n+t[5],this}},t.prototype.toArray=function(t){return t[0]=this.x,t[1]=this.y,t},t.prototype.fromArray=function(t){this.x=t[0],this.y=t[1]},t.set=function(t,e,n){t.x=e,t.y=n},t.copy=function(t,e){t.x=e.x,t.y=e.y},t.len=function(t){return Math.sqrt(t.x*t.x+t.y*t.y)},t.lenSquare=function(t){return t.x*t.x+t.y*t.y},t.dot=function(t,e){return t.x*e.x+t.y*e.y},t.add=function(t,e,n){t.x=e.x+n.x,t.y=e.y+n.y},t.sub=function(t,e,n){t.x=e.x-n.x,t.y=e.y-n.y},t.scale=function(t,e,n){t.x=e.x*n,t.y=e.y*n},t.scaleAndAdd=function(t,e,n,i){t.x=e.x+n.x*i,t.y=e.y+n.y*i},t.lerp=function(t,e,n,i){var r=1-i;t.x=r*e.x+i*n.x,t.y=r*e.y+i*n.y},t}(),De=Math.min,Ae=Math.max,ke=new Ce,Le=new Ce,Pe=new Ce,Oe=new Ce,Re=new Ce,Ne=new Ce,Ee=function(){function t(t,e,n,i){n<0&&(t+=n,n=-n),i<0&&(e+=i,i=-i),this.x=t,this.y=e,this.width=n,this.height=i}return t.prototype.union=function(t){var e=De(t.x,this.x),n=De(t.y,this.y);isFinite(this.x)&&isFinite(this.width)?this.width=Ae(t.x+t.width,this.x+this.width)-e:this.width=t.width,isFinite(this.y)&&isFinite(this.height)?this.height=Ae(t.y+t.height,this.y+this.height)-n:this.height=t.height,this.x=e,this.y=n},t.prototype.applyTransform=function(e){t.applyTransform(this,this,e)},t.prototype.calculateTransform=function(t){var e=this,n=t.width/e.width,i=t.height/e.height,r=[1,0,0,1,0,0];return be(r,r,[-e.x,-e.y]),Se(r,r,[n,i]),be(r,r,[t.x,t.y]),r},t.prototype.intersect=function(e,n){if(!e)return!1;e instanceof t||(e=t.create(e));var i=this,r=i.x,o=i.x+i.width,a=i.y,s=i.y+i.height,l=e.x,u=e.x+e.width,h=e.y,c=e.y+e.height,p=!(o<l||u<r||s<h||c<a);if(n){var d=1/0,f=0,g=Math.abs(o-l),y=Math.abs(u-r),v=Math.abs(s-h),m=Math.abs(c-a),x=Math.min(g,y),_=Math.min(v,m);o<l||u<r?x>f&&(f=x,g<y?Ce.set(Ne,-g,0):Ce.set(Ne,y,0)):x<d&&(d=x,g<y?Ce.set(Re,g,0):Ce.set(Re,-y,0)),s<h||c<a?_>f&&(f=_,v<m?Ce.set(Ne,0,-v):Ce.set(Ne,0,m)):x<d&&(d=x,v<m?Ce.set(Re,0,v):Ce.set(Re,0,-m))}return n&&Ce.copy(n,p?Re:Ne),p},t.prototype.contain=function(t,e){var n=this;return t>=n.x&&t<=n.x+n.width&&e>=n.y&&e<=n.y+n.height},t.prototype.clone=function(){return new t(this.x,this.y,this.width,this.height)},t.prototype.copy=function(e){t.copy(this,e)},t.prototype.plain=function(){return{x:this.x,y:this.y,width:this.width,height:this.height}},t.prototype.isFinite=function(){return isFinite(this.x)&&isFinite(this.y)&&isFinite(this.width)&&isFinite(this.height)},t.prototype.isZero=function(){return 0===this.width||0===this.height},t.create=function(e){return new t(e.x,e.y,e.width,e.height)},t.copy=function(t,e){t.x=e.x,t.y=e.y,t.width=e.width,t.height=e.height},t.applyTransform=function(e,n,i){if(i){if(i[1]<1e-5&&i[1]>-1e-5&&i[2]<1e-5&&i[2]>-1e-5){var r=i[0],o=i[3],a=i[4],s=i[5];return e.x=n.x*r+a,e.y=n.y*o+s,e.width=n.width*r,e.height=n.height*o,e.width<0&&(e.x+=e.width,e.width=-e.width),void(e.height<0&&(e.y+=e.height,e.height=-e.height))}ke.x=Pe.x=n.x,ke.y=Oe.y=n.y,Le.x=Oe.x=n.x+n.width,Le.y=Pe.y=n.y+n.height,ke.transform(i),Oe.transform(i),Le.transform(i),Pe.transform(i),e.x=De(ke.x,Le.x,Pe.x,Oe.x),e.y=De(ke.y,Le.y,Pe.y,Oe.y);var l=Ae(ke.x,Le.x,Pe.x,Oe.x),u=Ae(ke.y,Le.y,Pe.y,Oe.y);e.width=l-e.x,e.height=u-e.y}else e!==n&&t.copy(e,n)},t}(),ze="silent";function Ve(){pe(this.event)}var Be=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.handler=null,e}return n(e,t),e.prototype.dispose=function(){},e.prototype.setCursor=function(){},e}(jt),Fe=function(t,e){this.x=t,this.y=e},Ge=["click","dblclick","mousewheel","mouseout","mouseup","mousedown","mousemove","contextmenu"],We=new Ee(0,0,0,0),He=function(t){function e(e,n,i,r,o){var a=t.call(this)||this;return a._hovered=new Fe(0,0),a.storage=e,a.painter=n,a.painterRoot=r,a._pointerSize=o,i=i||new Be,a.proxy=null,a.setHandlerProxy(i),a._draggingMgr=new Zt(a),a}return n(e,t),e.prototype.setHandlerProxy=function(t){this.proxy&&this.proxy.dispose(),t&&(E(Ge,(function(e){t.on&&t.on(e,this[e],this)}),this),t.handler=this),this.proxy=t},e.prototype.mousemove=function(t){var e=t.zrX,n=t.zrY,i=Xe(this,e,n),r=this._hovered,o=r.target;o&&!o.__zr&&(o=(r=this.findHover(r.x,r.y)).target);var a=this._hovered=i?new Fe(e,n):this.findHover(e,n),s=a.target,l=this.proxy;l.setCursor&&l.setCursor(s?s.cursor:"default"),o&&s!==o&&this.dispatchToElement(r,"mouseout",t),this.dispatchToElement(a,"mousemove",t),s&&s!==o&&this.dispatchToElement(a,"mouseover",t)},e.prototype.mouseout=function(t){var e=t.zrEventControl;"only_globalout"!==e&&this.dispatchToElement(this._hovered,"mouseout",t),"no_globalout"!==e&&this.trigger("globalout",{type:"globalout",event:t})},e.prototype.resize=function(){this._hovered=new Fe(0,0)},e.prototype.dispatch=function(t,e){var n=this[t];n&&n.call(this,e)},e.prototype.dispose=function(){this.proxy.dispose(),this.storage=null,this.proxy=null,this.painter=null},e.prototype.setCursorStyle=function(t){var e=this.proxy;e.setCursor&&e.setCursor(t)},e.prototype.dispatchToElement=function(t,e,n){var i=(t=t||{}).target;if(!i||!i.silent){for(var r="on"+e,o=function(t,e,n){return{type:t,event:n,target:e.target,topTarget:e.topTarget,cancelBubble:!1,offsetX:n.zrX,offsetY:n.zrY,gestureEvent:n.gestureEvent,pinchX:n.pinchX,pinchY:n.pinchY,pinchScale:n.pinchScale,wheelDelta:n.zrDelta,zrByTouch:n.zrByTouch,which:n.which,stop:Ve}}(e,t,n);i&&(i[r]&&(o.cancelBubble=!!i[r].call(i,o)),i.trigger(e,o),i=i.__hostTarget?i.__hostTarget:i.parent,!o.cancelBubble););o.cancelBubble||(this.trigger(e,o),this.painter&&this.painter.eachOtherLayer&&this.painter.eachOtherLayer((function(t){"function"==typeof t[r]&&t[r].call(t,o),t.trigger&&t.trigger(e,o)})))}},e.prototype.findHover=function(t,e,n){var i=this.storage.getDisplayList(),r=new Fe(t,e);if(Ue(i,r,t,e,n),this._pointerSize&&!r.target){for(var o=[],a=this._pointerSize,s=a/2,l=new Ee(t-s,e-s,a,a),u=i.length-1;u>=0;u--){var h=i[u];h===n||h.ignore||h.ignoreCoarsePointer||h.parent&&h.parent.ignoreCoarsePointer||(We.copy(h.getBoundingRect()),h.transform&&We.applyTransform(h.transform),We.intersect(l)&&o.push(h))}if(o.length)for(var c=Math.PI/12,p=2*Math.PI,d=0;d<s;d+=4)for(var f=0;f<p;f+=c){if(Ue(o,r,t+d*Math.cos(f),e+d*Math.sin(f),n),r.target)return r}}return r},e.prototype.processGesture=function(t,e){this._gestureMgr||(this._gestureMgr=new fe);var n=this._gestureMgr;"start"===e&&n.clear();var i=n.recognize(t,this.findHover(t.zrX,t.zrY,null).target,this.proxy.dom);if("end"===e&&n.clear(),i){var r=i.type;t.gestureEvent=r;var o=new Fe;o.target=i.target,this.dispatchToElement(o,r,i.event)}},e}(jt);function Ye(t,e,n){if(t[t.rectHover?"rectContain":"contain"](e,n)){for(var i=t,r=void 0,o=!1;i;){if(i.ignoreClip&&(o=!0),!o){var a=i.getClipPath();if(a&&!a.contain(e,n))return!1;i.silent&&(r=!0)}var s=i.__hostTarget;i=s||i.parent}return!r||ze}return!1}function Ue(t,e,n,i,r){for(var o=t.length-1;o>=0;o--){var a=t[o],s=void 0;if(a!==r&&!a.ignore&&(s=Ye(a,n,i))&&(!e.topTarget&&(e.topTarget=a),s!==ze)){e.target=a;break}}}function Xe(t,e,n){var i=t.painter;return e<0||e>i.getWidth()||n<0||n>i.getHeight()}E(["click","mousedown","mouseup","mousewheel","dblclick","contextmenu"],(function(t){He.prototype[t]=function(e){var n,i,r=e.zrX,o=e.zrY,a=Xe(this,r,o);if("mouseup"===t&&a||(i=(n=this.findHover(r,o)).target),"mousedown"===t)this._downEl=i,this._downPoint=[e.zrX,e.zrY],this._upEl=i;else if("mouseup"===t)this._upEl=i;else if("click"===t){if(this._downEl!==this._upEl||!this._downPoint||Vt(this._downPoint,[e.zrX,e.zrY])>4)return;this._downPoint=null}this.dispatchToElement(n,t,e)}}));function Ze(t,e,n,i){var r=e+1;if(r===n)return 1;if(i(t[r++],t[e])<0){for(;r<n&&i(t[r],t[r-1])<0;)r++;!function(t,e,n){n--;for(;e<n;){var i=t[e];t[e++]=t[n],t[n--]=i}}(t,e,r)}else for(;r<n&&i(t[r],t[r-1])>=0;)r++;return r-e}function je(t,e,n,i,r){for(i===e&&i++;i<n;i++){for(var o,a=t[i],s=e,l=i;s<l;)r(a,t[o=s+l>>>1])<0?l=o:s=o+1;var u=i-s;switch(u){case 3:t[s+3]=t[s+2];case 2:t[s+2]=t[s+1];case 1:t[s+1]=t[s];break;default:for(;u>0;)t[s+u]=t[s+u-1],u--}t[s]=a}}function qe(t,e,n,i,r,o){var a=0,s=0,l=1;if(o(t,e[n+r])>0){for(s=i-r;l<s&&o(t,e[n+r+l])>0;)a=l,(l=1+(l<<1))<=0&&(l=s);l>s&&(l=s),a+=r,l+=r}else{for(s=r+1;l<s&&o(t,e[n+r-l])<=0;)a=l,(l=1+(l<<1))<=0&&(l=s);l>s&&(l=s);var u=a;a=r-l,l=r-u}for(a++;a<l;){var h=a+(l-a>>>1);o(t,e[n+h])>0?a=h+1:l=h}return l}function Ke(t,e,n,i,r,o){var a=0,s=0,l=1;if(o(t,e[n+r])<0){for(s=r+1;l<s&&o(t,e[n+r-l])<0;)a=l,(l=1+(l<<1))<=0&&(l=s);l>s&&(l=s);var u=a;a=r-l,l=r-u}else{for(s=i-r;l<s&&o(t,e[n+r+l])>=0;)a=l,(l=1+(l<<1))<=0&&(l=s);l>s&&(l=s),a+=r,l+=r}for(a++;a<l;){var h=a+(l-a>>>1);o(t,e[n+h])<0?l=h:a=h+1}return l}function $e(t,e){var n,i,r=7,o=0;t.length;var a=[];function s(s){var l=n[s],u=i[s],h=n[s+1],c=i[s+1];i[s]=u+c,s===o-3&&(n[s+1]=n[s+2],i[s+1]=i[s+2]),o--;var p=Ke(t[h],t,l,u,0,e);l+=p,0!==(u-=p)&&0!==(c=qe(t[l+u-1],t,h,c,c-1,e))&&(u<=c?function(n,i,o,s){var l=0;for(l=0;l<i;l++)a[l]=t[n+l];var u=0,h=o,c=n;if(t[c++]=t[h++],0==--s){for(l=0;l<i;l++)t[c+l]=a[u+l];return}if(1===i){for(l=0;l<s;l++)t[c+l]=t[h+l];return void(t[c+s]=a[u])}var p,d,f,g=r;for(;;){p=0,d=0,f=!1;do{if(e(t[h],a[u])<0){if(t[c++]=t[h++],d++,p=0,0==--s){f=!0;break}}else if(t[c++]=a[u++],p++,d=0,1==--i){f=!0;break}}while((p|d)<g);if(f)break;do{if(0!==(p=Ke(t[h],a,u,i,0,e))){for(l=0;l<p;l++)t[c+l]=a[u+l];if(c+=p,u+=p,(i-=p)<=1){f=!0;break}}if(t[c++]=t[h++],0==--s){f=!0;break}if(0!==(d=qe(a[u],t,h,s,0,e))){for(l=0;l<d;l++)t[c+l]=t[h+l];if(c+=d,h+=d,0===(s-=d)){f=!0;break}}if(t[c++]=a[u++],1==--i){f=!0;break}g--}while(p>=7||d>=7);if(f)break;g<0&&(g=0),g+=2}if((r=g)<1&&(r=1),1===i){for(l=0;l<s;l++)t[c+l]=t[h+l];t[c+s]=a[u]}else{if(0===i)throw new Error;for(l=0;l<i;l++)t[c+l]=a[u+l]}}(l,u,h,c):function(n,i,o,s){var l=0;for(l=0;l<s;l++)a[l]=t[o+l];var u=n+i-1,h=s-1,c=o+s-1,p=0,d=0;if(t[c--]=t[u--],0==--i){for(p=c-(s-1),l=0;l<s;l++)t[p+l]=a[l];return}if(1===s){for(d=(c-=i)+1,p=(u-=i)+1,l=i-1;l>=0;l--)t[d+l]=t[p+l];return void(t[c]=a[h])}var f=r;for(;;){var g=0,y=0,v=!1;do{if(e(a[h],t[u])<0){if(t[c--]=t[u--],g++,y=0,0==--i){v=!0;break}}else if(t[c--]=a[h--],y++,g=0,1==--s){v=!0;break}}while((g|y)<f);if(v)break;do{if(0!==(g=i-Ke(a[h],t,n,i,i-1,e))){for(i-=g,d=(c-=g)+1,p=(u-=g)+1,l=g-1;l>=0;l--)t[d+l]=t[p+l];if(0===i){v=!0;break}}if(t[c--]=a[h--],1==--s){v=!0;break}if(0!==(y=s-qe(t[u],a,0,s,s-1,e))){for(s-=y,d=(c-=y)+1,p=(h-=y)+1,l=0;l<y;l++)t[d+l]=a[p+l];if(s<=1){v=!0;break}}if(t[c--]=t[u--],0==--i){v=!0;break}f--}while(g>=7||y>=7);if(v)break;f<0&&(f=0),f+=2}(r=f)<1&&(r=1);if(1===s){for(d=(c-=i)+1,p=(u-=i)+1,l=i-1;l>=0;l--)t[d+l]=t[p+l];t[c]=a[h]}else{if(0===s)throw new Error;for(p=c-(s-1),l=0;l<s;l++)t[p+l]=a[l]}}(l,u,h,c))}return n=[],i=[],{mergeRuns:function(){for(;o>1;){var t=o-2;if(t>=1&&i[t-1]<=i[t]+i[t+1]||t>=2&&i[t-2]<=i[t]+i[t-1])i[t-1]<i[t+1]&&t--;else if(i[t]>i[t+1])break;s(t)}},forceMergeRuns:function(){for(;o>1;){var t=o-2;t>0&&i[t-1]<i[t+1]&&t--,s(t)}},pushRun:function(t,e){n[o]=t,i[o]=e,o+=1}}}function Je(t,e,n,i){n||(n=0),i||(i=t.length);var r=i-n;if(!(r<2)){var o=0;if(r<32)je(t,n,i,n+(o=Ze(t,n,i,e)),e);else{var a=$e(t,e),s=function(t){for(var e=0;t>=32;)e|=1&t,t>>=1;return t+e}(r);do{if((o=Ze(t,n,i,e))<s){var l=r;l>s&&(l=s),je(t,n,n+l,n+o,e),o=l}a.pushRun(n,o),a.mergeRuns(),r-=o,n+=o}while(0!==r);a.forceMergeRuns()}}}var Qe=!1;function tn(){Qe||(Qe=!0,console.warn("z / z2 / zlevel of displayable is invalid, which may cause unexpected errors"))}function en(t,e){return t.zlevel===e.zlevel?t.z===e.z?t.z2-e.z2:t.z-e.z:t.zlevel-e.zlevel}var nn=function(){function t(){this._roots=[],this._displayList=[],this._displayListLen=0,this.displayableSortFunc=en}return t.prototype.traverse=function(t,e){for(var n=0;n<this._roots.length;n++)this._roots[n].traverse(t,e)},t.prototype.getDisplayList=function(t,e){e=e||!1;var n=this._displayList;return!t&&n.length||this.updateDisplayList(e),n},t.prototype.updateDisplayList=function(t){this._displayListLen=0;for(var e=this._roots,n=this._displayList,i=0,r=e.length;i<r;i++)this._updateAndAddDisplayable(e[i],null,t);n.length=this._displayListLen,Je(n,en)},t.prototype._updateAndAddDisplayable=function(t,e,n){if(!t.ignore||n){t.beforeUpdate(),t.update(),t.afterUpdate();var i=t.getClipPath();if(t.ignoreClip)e=null;else if(i){e=e?e.slice():[];for(var r=i,o=t;r;)r.parent=o,r.updateTransform(),e.push(r),o=r,r=r.getClipPath()}if(t.childrenRef){for(var a=t.childrenRef(),s=0;s<a.length;s++){var l=a[s];t.__dirty&&(l.__dirty|=1),this._updateAndAddDisplayable(l,e,n)}t.__dirty=0}else{var u=t;e&&e.length?u.__clipPaths=e:u.__clipPaths&&u.__clipPaths.length>0&&(u.__clipPaths=[]),isNaN(u.z)&&(tn(),u.z=0),isNaN(u.z2)&&(tn(),u.z2=0),isNaN(u.zlevel)&&(tn(),u.zlevel=0),this._displayList[this._displayListLen++]=u}var h=t.getDecalElement&&t.getDecalElement();h&&this._updateAndAddDisplayable(h,e,n);var c=t.getTextGuideLine();c&&this._updateAndAddDisplayable(c,e,n);var p=t.getTextContent();p&&this._updateAndAddDisplayable(p,e,n)}},t.prototype.addRoot=function(t){t.__zr&&t.__zr.storage===this||this._roots.push(t)},t.prototype.delRoot=function(t){if(t instanceof Array)for(var e=0,n=t.length;e<n;e++)this.delRoot(t[e]);else{var i=P(this._roots,t);i>=0&&this._roots.splice(i,1)}},t.prototype.delAllRoots=function(){this._roots=[],this._displayList=[],this._displayListLen=0},t.prototype.getRoots=function(){return this._roots},t.prototype.dispose=function(){this._displayList=null,this._roots=null},t}(),rn=r.hasGlobalWindow&&(window.requestAnimationFrame&&window.requestAnimationFrame.bind(window)||window.msRequestAnimationFrame&&window.msRequestAnimationFrame.bind(window)||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame)||function(t){return setTimeout(t,16)},on={linear:function(t){return t},quadraticIn:function(t){return t*t},quadraticOut:function(t){return t*(2-t)},quadraticInOut:function(t){return(t*=2)<1?.5*t*t:-.5*(--t*(t-2)-1)},cubicIn:function(t){return t*t*t},cubicOut:function(t){return--t*t*t+1},cubicInOut:function(t){return(t*=2)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},quarticIn:function(t){return t*t*t*t},quarticOut:function(t){return 1- --t*t*t*t},quarticInOut:function(t){return(t*=2)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},quinticIn:function(t){return t*t*t*t*t},quinticOut:function(t){return--t*t*t*t*t+1},quinticInOut:function(t){return(t*=2)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},sinusoidalIn:function(t){return 1-Math.cos(t*Math.PI/2)},sinusoidalOut:function(t){return Math.sin(t*Math.PI/2)},sinusoidalInOut:function(t){return.5*(1-Math.cos(Math.PI*t))},exponentialIn:function(t){return 0===t?0:Math.pow(1024,t-1)},exponentialOut:function(t){return 1===t?1:1-Math.pow(2,-10*t)},exponentialInOut:function(t){return 0===t?0:1===t?1:(t*=2)<1?.5*Math.pow(1024,t-1):.5*(2-Math.pow(2,-10*(t-1)))},circularIn:function(t){return 1-Math.sqrt(1-t*t)},circularOut:function(t){return Math.sqrt(1- --t*t)},circularInOut:function(t){return(t*=2)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},elasticIn:function(t){var e,n=.1;return 0===t?0:1===t?1:(!n||n<1?(n=1,e=.1):e=.4*Math.asin(1/n)/(2*Math.PI),-n*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/.4))},elasticOut:function(t){var e,n=.1;return 0===t?0:1===t?1:(!n||n<1?(n=1,e=.1):e=.4*Math.asin(1/n)/(2*Math.PI),n*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/.4)+1)},elasticInOut:function(t){var e,n=.1,i=.4;return 0===t?0:1===t?1:(!n||n<1?(n=1,e=.1):e=i*Math.asin(1/n)/(2*Math.PI),(t*=2)<1?n*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/i)*-.5:n*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/i)*.5+1)},backIn:function(t){var e=1.70158;return t*t*((e+1)*t-e)},backOut:function(t){var e=1.70158;return--t*t*((e+1)*t+e)+1},backInOut:function(t){var e=2.5949095;return(t*=2)<1?t*t*((e+1)*t-e)*.5:.5*((t-=2)*t*((e+1)*t+e)+2)},bounceIn:function(t){return 1-on.bounceOut(1-t)},bounceOut:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},bounceInOut:function(t){return t<.5?.5*on.bounceIn(2*t):.5*on.bounceOut(2*t-1)+.5}},an=Math.pow,sn=Math.sqrt,ln=1e-8,un=1e-4,hn=sn(3),cn=1/3,pn=Mt(),dn=Mt(),fn=Mt();function gn(t){return t>-1e-8&&t<ln}function yn(t){return t>ln||t<-1e-8}function vn(t,e,n,i,r){var o=1-r;return o*o*(o*t+3*r*e)+r*r*(r*i+3*o*n)}function mn(t,e,n,i,r){var o=1-r;return 3*(((e-t)*o+2*(n-e)*r)*o+(i-n)*r*r)}function xn(t,e,n,i,r,o){var a=i+3*(e-n)-t,s=3*(n-2*e+t),l=3*(e-t),u=t-r,h=s*s-3*a*l,c=s*l-9*a*u,p=l*l-3*s*u,d=0;if(gn(h)&&gn(c)){if(gn(s))o[0]=0;else(M=-l/s)>=0&&M<=1&&(o[d++]=M)}else{var f=c*c-4*h*p;if(gn(f)){var g=c/h,y=-g/2;(M=-s/a+g)>=0&&M<=1&&(o[d++]=M),y>=0&&y<=1&&(o[d++]=y)}else if(f>0){var v=sn(f),m=h*s+1.5*a*(-c+v),x=h*s+1.5*a*(-c-v);(M=(-s-((m=m<0?-an(-m,cn):an(m,cn))+(x=x<0?-an(-x,cn):an(x,cn))))/(3*a))>=0&&M<=1&&(o[d++]=M)}else{var _=(2*h*s-3*a*c)/(2*sn(h*h*h)),b=Math.acos(_)/3,w=sn(h),S=Math.cos(b),M=(-s-2*w*S)/(3*a),I=(y=(-s+w*(S+hn*Math.sin(b)))/(3*a),(-s+w*(S-hn*Math.sin(b)))/(3*a));M>=0&&M<=1&&(o[d++]=M),y>=0&&y<=1&&(o[d++]=y),I>=0&&I<=1&&(o[d++]=I)}}return d}function _n(t,e,n,i,r){var o=6*n-12*e+6*t,a=9*e+3*i-3*t-9*n,s=3*e-3*t,l=0;if(gn(a)){if(yn(o))(h=-s/o)>=0&&h<=1&&(r[l++]=h)}else{var u=o*o-4*a*s;if(gn(u))r[0]=-o/(2*a);else if(u>0){var h,c=sn(u),p=(-o-c)/(2*a);(h=(-o+c)/(2*a))>=0&&h<=1&&(r[l++]=h),p>=0&&p<=1&&(r[l++]=p)}}return l}function bn(t,e,n,i,r,o){var a=(e-t)*r+t,s=(n-e)*r+e,l=(i-n)*r+n,u=(s-a)*r+a,h=(l-s)*r+s,c=(h-u)*r+u;o[0]=t,o[1]=a,o[2]=u,o[3]=c,o[4]=c,o[5]=h,o[6]=l,o[7]=i}function wn(t,e,n,i,r,o,a,s,l,u,h){var c,p,d,f,g,y=.005,v=1/0;pn[0]=l,pn[1]=u;for(var m=0;m<1;m+=.05)dn[0]=vn(t,n,r,a,m),dn[1]=vn(e,i,o,s,m),(f=Ft(pn,dn))<v&&(c=m,v=f);v=1/0;for(var x=0;x<32&&!(y<un);x++)p=c-y,d=c+y,dn[0]=vn(t,n,r,a,p),dn[1]=vn(e,i,o,s,p),f=Ft(dn,pn),p>=0&&f<v?(c=p,v=f):(fn[0]=vn(t,n,r,a,d),fn[1]=vn(e,i,o,s,d),g=Ft(fn,pn),d<=1&&g<v?(c=d,v=g):y*=.5);return h&&(h[0]=vn(t,n,r,a,c),h[1]=vn(e,i,o,s,c)),sn(v)}function Sn(t,e,n,i,r,o,a,s,l){for(var u=t,h=e,c=0,p=1/l,d=1;d<=l;d++){var f=d*p,g=vn(t,n,r,a,f),y=vn(e,i,o,s,f),v=g-u,m=y-h;c+=Math.sqrt(v*v+m*m),u=g,h=y}return c}function Mn(t,e,n,i){var r=1-i;return r*(r*t+2*i*e)+i*i*n}function In(t,e,n,i){return 2*((1-i)*(e-t)+i*(n-e))}function Tn(t,e,n){var i=t+n-2*e;return 0===i?.5:(t-e)/i}function Cn(t,e,n,i,r){var o=(e-t)*i+t,a=(n-e)*i+e,s=(a-o)*i+o;r[0]=t,r[1]=o,r[2]=s,r[3]=s,r[4]=a,r[5]=n}function Dn(t,e,n,i,r,o,a,s,l){var u,h=.005,c=1/0;pn[0]=a,pn[1]=s;for(var p=0;p<1;p+=.05){dn[0]=Mn(t,n,r,p),dn[1]=Mn(e,i,o,p),(y=Ft(pn,dn))<c&&(u=p,c=y)}c=1/0;for(var d=0;d<32&&!(h<un);d++){var f=u-h,g=u+h;dn[0]=Mn(t,n,r,f),dn[1]=Mn(e,i,o,f);var y=Ft(dn,pn);if(f>=0&&y<c)u=f,c=y;else{fn[0]=Mn(t,n,r,g),fn[1]=Mn(e,i,o,g);var v=Ft(fn,pn);g<=1&&v<c?(u=g,c=v):h*=.5}}return l&&(l[0]=Mn(t,n,r,u),l[1]=Mn(e,i,o,u)),sn(c)}function An(t,e,n,i,r,o,a){for(var s=t,l=e,u=0,h=1/a,c=1;c<=a;c++){var p=c*h,d=Mn(t,n,r,p),f=Mn(e,i,o,p),g=d-s,y=f-l;u+=Math.sqrt(g*g+y*y),s=d,l=f}return u}var kn=/cubic-bezier\(([0-9,\.e ]+)\)/;function Ln(t){var e=t&&kn.exec(t);if(e){var n=e[1].split(","),i=+ut(n[0]),r=+ut(n[1]),o=+ut(n[2]),a=+ut(n[3]);if(isNaN(i+r+o+a))return;var s=[];return function(t){return t<=0?0:t>=1?1:xn(0,i,o,1,t,s)&&vn(0,r,a,1,s[0])}}}var Pn=function(){function t(t){this._inited=!1,this._startTime=0,this._pausedTime=0,this._paused=!1,this._life=t.life||1e3,this._delay=t.delay||0,this.loop=t.loop||!1,this.onframe=t.onframe||bt,this.ondestroy=t.ondestroy||bt,this.onrestart=t.onrestart||bt,t.easing&&this.setEasing(t.easing)}return t.prototype.step=function(t,e){if(this._inited||(this._startTime=t+this._delay,this._inited=!0),!this._paused){var n=this._life,i=t-this._startTime-this._pausedTime,r=i/n;r<0&&(r=0),r=Math.min(r,1);var o=this.easingFunc,a=o?o(r):r;if(this.onframe(a),1===r){if(!this.loop)return!0;var s=i%n;this._startTime=t-s,this._pausedTime=0,this.onrestart()}return!1}this._pausedTime+=e},t.prototype.pause=function(){this._paused=!0},t.prototype.resume=function(){this._paused=!1},t.prototype.setEasing=function(t){this.easing=t,this.easingFunc=U(t)?t:on[t]||Ln(t)},t}(),On=function(t){this.value=t},Rn=function(){function t(){this._len=0}return t.prototype.insert=function(t){var e=new On(t);return this.insertEntry(e),e},t.prototype.insertEntry=function(t){this.head?(this.tail.next=t,t.prev=this.tail,t.next=null,this.tail=t):this.head=this.tail=t,this._len++},t.prototype.remove=function(t){var e=t.prev,n=t.next;e?e.next=n:this.head=n,n?n.prev=e:this.tail=e,t.next=t.prev=null,this._len--},t.prototype.len=function(){return this._len},t.prototype.clear=function(){this.head=this.tail=null,this._len=0},t}(),Nn=function(){function t(t){this._list=new Rn,this._maxSize=10,this._map={},this._maxSize=t}return t.prototype.put=function(t,e){var n=this._list,i=this._map,r=null;if(null==i[t]){var o=n.len(),a=this._lastRemovedEntry;if(o>=this._maxSize&&o>0){var s=n.head;n.remove(s),delete i[s.key],r=s.value,this._lastRemovedEntry=s}a?a.value=e:a=new On(e),a.key=t,n.insertEntry(a),i[t]=a}return r},t.prototype.get=function(t){var e=this._map[t],n=this._list;if(null!=e)return e!==n.tail&&(n.remove(e),n.insertEntry(e)),e.value},t.prototype.clear=function(){this._list.clear(),this._map={}},t.prototype.len=function(){return this._list.len()},t}(),En={transparent:[0,0,0,0],aliceblue:[240,248,255,1],antiquewhite:[250,235,215,1],aqua:[0,255,255,1],aquamarine:[127,255,212,1],azure:[240,255,255,1],beige:[245,245,220,1],bisque:[255,228,196,1],black:[0,0,0,1],blanchedalmond:[255,235,205,1],blue:[0,0,255,1],blueviolet:[138,43,226,1],brown:[165,42,42,1],burlywood:[222,184,135,1],cadetblue:[95,158,160,1],chartreuse:[127,255,0,1],chocolate:[210,105,30,1],coral:[255,127,80,1],cornflowerblue:[100,149,237,1],cornsilk:[255,248,220,1],crimson:[220,20,60,1],cyan:[0,255,255,1],darkblue:[0,0,139,1],darkcyan:[0,139,139,1],darkgoldenrod:[184,134,11,1],darkgray:[169,169,169,1],darkgreen:[0,100,0,1],darkgrey:[169,169,169,1],darkkhaki:[189,183,107,1],darkmagenta:[139,0,139,1],darkolivegreen:[85,107,47,1],darkorange:[255,140,0,1],darkorchid:[153,50,204,1],darkred:[139,0,0,1],darksalmon:[233,150,122,1],darkseagreen:[143,188,143,1],darkslateblue:[72,61,139,1],darkslategray:[47,79,79,1],darkslategrey:[47,79,79,1],darkturquoise:[0,206,209,1],darkviolet:[148,0,211,1],deeppink:[255,20,147,1],deepskyblue:[0,191,255,1],dimgray:[105,105,105,1],dimgrey:[105,105,105,1],dodgerblue:[30,144,255,1],firebrick:[178,34,34,1],floralwhite:[255,250,240,1],forestgreen:[34,139,34,1],fuchsia:[255,0,255,1],gainsboro:[220,220,220,1],ghostwhite:[248,248,255,1],gold:[255,215,0,1],goldenrod:[218,165,32,1],gray:[128,128,128,1],green:[0,128,0,1],greenyellow:[173,255,47,1],grey:[128,128,128,1],honeydew:[240,255,240,1],hotpink:[255,105,180,1],indianred:[205,92,92,1],indigo:[75,0,130,1],ivory:[255,255,240,1],khaki:[240,230,140,1],lavender:[230,230,250,1],lavenderblush:[255,240,245,1],lawngreen:[124,252,0,1],lemonchiffon:[255,250,205,1],lightblue:[173,216,230,1],lightcoral:[240,128,128,1],lightcyan:[224,255,255,1],lightgoldenrodyellow:[250,250,210,1],lightgray:[211,211,211,1],lightgreen:[144,238,144,1],lightgrey:[211,211,211,1],lightpink:[255,182,193,1],lightsalmon:[255,160,122,1],lightseagreen:[32,178,170,1],lightskyblue:[135,206,250,1],lightslategray:[119,136,153,1],lightslategrey:[119,136,153,1],lightsteelblue:[176,196,222,1],lightyellow:[255,255,224,1],lime:[0,255,0,1],limegreen:[50,205,50,1],linen:[250,240,230,1],magenta:[255,0,255,1],maroon:[128,0,0,1],mediumaquamarine:[102,205,170,1],mediumblue:[0,0,205,1],mediumorchid:[186,85,211,1],mediumpurple:[147,112,219,1],mediumseagreen:[60,179,113,1],mediumslateblue:[123,104,238,1],mediumspringgreen:[0,250,154,1],mediumturquoise:[72,209,204,1],mediumvioletred:[199,21,133,1],midnightblue:[25,25,112,1],mintcream:[245,255,250,1],mistyrose:[255,228,225,1],moccasin:[255,228,181,1],navajowhite:[255,222,173,1],navy:[0,0,128,1],oldlace:[253,245,230,1],olive:[128,128,0,1],olivedrab:[107,142,35,1],orange:[255,165,0,1],orangered:[255,69,0,1],orchid:[218,112,214,1],palegoldenrod:[238,232,170,1],palegreen:[152,251,152,1],paleturquoise:[175,238,238,1],palevioletred:[219,112,147,1],papayawhip:[255,239,213,1],peachpuff:[255,218,185,1],peru:[205,133,63,1],pink:[255,192,203,1],plum:[221,160,221,1],powderblue:[176,224,230,1],purple:[128,0,128,1],red:[255,0,0,1],rosybrown:[188,143,143,1],royalblue:[65,105,225,1],saddlebrown:[139,69,19,1],salmon:[250,128,114,1],sandybrown:[244,164,96,1],seagreen:[46,139,87,1],seashell:[255,245,238,1],sienna:[160,82,45,1],silver:[192,192,192,1],skyblue:[135,206,235,1],slateblue:[106,90,205,1],slategray:[112,128,144,1],slategrey:[112,128,144,1],snow:[255,250,250,1],springgreen:[0,255,127,1],steelblue:[70,130,180,1],tan:[210,180,140,1],teal:[0,128,128,1],thistle:[216,191,216,1],tomato:[255,99,71,1],turquoise:[64,224,208,1],violet:[238,130,238,1],wheat:[245,222,179,1],white:[255,255,255,1],whitesmoke:[245,245,245,1],yellow:[255,255,0,1],yellowgreen:[154,205,50,1]};function zn(t){return(t=Math.round(t))<0?0:t>255?255:t}function Vn(t){return t<0?0:t>1?1:t}function Bn(t){var e=t;return e.length&&"%"===e.charAt(e.length-1)?zn(parseFloat(e)/100*255):zn(parseInt(e,10))}function Fn(t){var e=t;return e.length&&"%"===e.charAt(e.length-1)?Vn(parseFloat(e)/100):Vn(parseFloat(e))}function Gn(t,e,n){return n<0?n+=1:n>1&&(n-=1),6*n<1?t+(e-t)*n*6:2*n<1?e:3*n<2?t+(e-t)*(2/3-n)*6:t}function Wn(t,e,n){return t+(e-t)*n}function Hn(t,e,n,i,r){return t[0]=e,t[1]=n,t[2]=i,t[3]=r,t}function Yn(t,e){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t[3]=e[3],t}var Un=new Nn(20),Xn=null;function Zn(t,e){Xn&&Yn(Xn,e),Xn=Un.put(t,Xn||e.slice())}function jn(t,e){if(t){e=e||[];var n=Un.get(t);if(n)return Yn(e,n);var i=(t+="").replace(/ /g,"").toLowerCase();if(i in En)return Yn(e,En[i]),Zn(t,e),e;var r,o=i.length;if("#"===i.charAt(0))return 4===o||5===o?(r=parseInt(i.slice(1,4),16))>=0&&r<=4095?(Hn(e,(3840&r)>>4|(3840&r)>>8,240&r|(240&r)>>4,15&r|(15&r)<<4,5===o?parseInt(i.slice(4),16)/15:1),Zn(t,e),e):void Hn(e,0,0,0,1):7===o||9===o?(r=parseInt(i.slice(1,7),16))>=0&&r<=16777215?(Hn(e,(16711680&r)>>16,(65280&r)>>8,255&r,9===o?parseInt(i.slice(7),16)/255:1),Zn(t,e),e):void Hn(e,0,0,0,1):void 0;var a=i.indexOf("("),s=i.indexOf(")");if(-1!==a&&s+1===o){var l=i.substr(0,a),u=i.substr(a+1,s-(a+1)).split(","),h=1;switch(l){case"rgba":if(4!==u.length)return 3===u.length?Hn(e,+u[0],+u[1],+u[2],1):Hn(e,0,0,0,1);h=Fn(u.pop());case"rgb":return u.length>=3?(Hn(e,Bn(u[0]),Bn(u[1]),Bn(u[2]),3===u.length?h:Fn(u[3])),Zn(t,e),e):void Hn(e,0,0,0,1);case"hsla":return 4!==u.length?void Hn(e,0,0,0,1):(u[3]=Fn(u[3]),qn(u,e),Zn(t,e),e);case"hsl":return 3!==u.length?void Hn(e,0,0,0,1):(qn(u,e),Zn(t,e),e);default:return}}Hn(e,0,0,0,1)}}function qn(t,e){var n=(parseFloat(t[0])%360+360)%360/360,i=Fn(t[1]),r=Fn(t[2]),o=r<=.5?r*(i+1):r+i-r*i,a=2*r-o;return Hn(e=e||[],zn(255*Gn(a,o,n+1/3)),zn(255*Gn(a,o,n)),zn(255*Gn(a,o,n-1/3)),1),4===t.length&&(e[3]=t[3]),e}function Kn(t,e){var n=jn(t);if(n){for(var i=0;i<3;i++)n[i]=e<0?n[i]*(1-e)|0:(255-n[i])*e+n[i]|0,n[i]>255?n[i]=255:n[i]<0&&(n[i]=0);return ii(n,4===n.length?"rgba":"rgb")}}function $n(t,e,n){if(e&&e.length&&t>=0&&t<=1){n=n||[];var i=t*(e.length-1),r=Math.floor(i),o=Math.ceil(i),a=e[r],s=e[o],l=i-r;return n[0]=zn(Wn(a[0],s[0],l)),n[1]=zn(Wn(a[1],s[1],l)),n[2]=zn(Wn(a[2],s[2],l)),n[3]=Vn(Wn(a[3],s[3],l)),n}}var Jn=$n;function Qn(t,e,n){if(e&&e.length&&t>=0&&t<=1){var i=t*(e.length-1),r=Math.floor(i),o=Math.ceil(i),a=jn(e[r]),s=jn(e[o]),l=i-r,u=ii([zn(Wn(a[0],s[0],l)),zn(Wn(a[1],s[1],l)),zn(Wn(a[2],s[2],l)),Vn(Wn(a[3],s[3],l))],"rgba");return n?{color:u,leftIndex:r,rightIndex:o,value:i}:u}}var ti=Qn;function ei(t,e,n,i){var r=jn(t);if(t)return r=function(t){if(t){var e,n,i=t[0]/255,r=t[1]/255,o=t[2]/255,a=Math.min(i,r,o),s=Math.max(i,r,o),l=s-a,u=(s+a)/2;if(0===l)e=0,n=0;else{n=u<.5?l/(s+a):l/(2-s-a);var h=((s-i)/6+l/2)/l,c=((s-r)/6+l/2)/l,p=((s-o)/6+l/2)/l;i===s?e=p-c:r===s?e=1/3+h-p:o===s&&(e=2/3+c-h),e<0&&(e+=1),e>1&&(e-=1)}var d=[360*e,n,u];return null!=t[3]&&d.push(t[3]),d}}(r),null!=e&&(r[0]=function(t){return(t=Math.round(t))<0?0:t>360?360:t}(e)),null!=n&&(r[1]=Fn(n)),null!=i&&(r[2]=Fn(i)),ii(qn(r),"rgba")}function ni(t,e){var n=jn(t);if(n&&null!=e)return n[3]=Vn(e),ii(n,"rgba")}function ii(t,e){if(t&&t.length){var n=t[0]+","+t[1]+","+t[2];return"rgba"!==e&&"hsva"!==e&&"hsla"!==e||(n+=","+t[3]),e+"("+n+")"}}function ri(t,e){var n=jn(t);return n?(.299*n[0]+.587*n[1]+.114*n[2])*n[3]/255+(1-n[3])*e:0}var oi=Object.freeze({__proto__:null,parse:jn,lift:Kn,toHex:function(t){var e=jn(t);if(e)return((1<<24)+(e[0]<<16)+(e[1]<<8)+ +e[2]).toString(16).slice(1)},fastLerp:$n,fastMapToColor:Jn,lerp:Qn,mapToColor:ti,modifyHSL:ei,modifyAlpha:ni,stringify:ii,lum:ri,random:function(){return ii([Math.round(255*Math.random()),Math.round(255*Math.random()),Math.round(255*Math.random())],"rgb")}}),ai=Math.round;function si(t){var e;if(t&&"transparent"!==t){if("string"==typeof t&&t.indexOf("rgba")>-1){var n=jn(t);n&&(t="rgb("+n[0]+","+n[1]+","+n[2]+")",e=n[3])}}else t="none";return{color:t,opacity:null==e?1:e}}var li=1e-4;function ui(t){return t<li&&t>-1e-4}function hi(t){return ai(1e3*t)/1e3}function ci(t){return ai(1e4*t)/1e4}var pi={left:"start",right:"end",center:"middle",middle:"middle"};function di(t){return t&&!!t.image}function fi(t){return di(t)||function(t){return t&&!!t.svgElement}(t)}function gi(t){return"linear"===t.type}function yi(t){return"radial"===t.type}function vi(t){return t&&("linear"===t.type||"radial"===t.type)}function mi(t){return"url(#"+t+")"}function xi(t){var e=t.getGlobalScale(),n=Math.max(e[0],e[1]);return Math.max(Math.ceil(Math.log(n)/Math.log(10)),1)}function _i(t){var e=t.x||0,n=t.y||0,i=(t.rotation||0)*wt,r=rt(t.scaleX,1),o=rt(t.scaleY,1),a=t.skewX||0,s=t.skewY||0,l=[];return(e||n)&&l.push("translate("+e+"px,"+n+"px)"),i&&l.push("rotate("+i+")"),1===r&&1===o||l.push("scale("+r+","+o+")"),(a||s)&&l.push("skew("+ai(a*wt)+"deg, "+ai(s*wt)+"deg)"),l.join(" ")}var bi=r.hasGlobalWindow&&U(window.btoa)?function(t){return window.btoa(unescape(encodeURIComponent(t)))}:"undefined"!=typeof Buffer?function(t){return Buffer.from(t).toString("base64")}:function(t){return null},wi=Array.prototype.slice;function Si(t,e,n){return(e-t)*n+t}function Mi(t,e,n,i){for(var r=e.length,o=0;o<r;o++)t[o]=Si(e[o],n[o],i);return t}function Ii(t,e,n,i){for(var r=e.length,o=0;o<r;o++)t[o]=e[o]+n[o]*i;return t}function Ti(t,e,n,i){for(var r=e.length,o=r&&e[0].length,a=0;a<r;a++){t[a]||(t[a]=[]);for(var s=0;s<o;s++)t[a][s]=e[a][s]+n[a][s]*i}return t}function Ci(t,e){for(var n=t.length,i=e.length,r=n>i?e:t,o=Math.min(n,i),a=r[o-1]||{color:[0,0,0,0],offset:0},s=o;s<Math.max(n,i);s++)r.push({offset:a.offset,color:a.color.slice()})}function Di(t,e,n){var i=t,r=e;if(i.push&&r.push){var o=i.length,a=r.length;if(o!==a)if(o>a)i.length=a;else for(var s=o;s<a;s++)i.push(1===n?r[s]:wi.call(r[s]));var l=i[0]&&i[0].length;for(s=0;s<i.length;s++)if(1===n)isNaN(i[s])&&(i[s]=r[s]);else for(var u=0;u<l;u++)isNaN(i[s][u])&&(i[s][u]=r[s][u])}}function Ai(t){if(N(t)){var e=t.length;if(N(t[0])){for(var n=[],i=0;i<e;i++)n.push(wi.call(t[i]));return n}return wi.call(t)}return t}function ki(t){return t[0]=Math.floor(t[0])||0,t[1]=Math.floor(t[1])||0,t[2]=Math.floor(t[2])||0,t[3]=null==t[3]?1:t[3],"rgba("+t.join(",")+")"}function Li(t){return 4===t||5===t}function Pi(t){return 1===t||2===t}var Oi=[0,0,0,0],Ri=function(){function t(t){this.keyframes=[],this.discrete=!1,this._invalid=!1,this._needsSort=!1,this._lastFr=0,this._lastFrP=0,this.propName=t}return t.prototype.isFinished=function(){return this._finished},t.prototype.setFinished=function(){this._finished=!0,this._additiveTrack&&this._additiveTrack.setFinished()},t.prototype.needsAnimate=function(){return this.keyframes.length>=1},t.prototype.getAdditiveTrack=function(){return this._additiveTrack},t.prototype.addKeyframe=function(t,e,n){this._needsSort=!0;var i=this.keyframes,r=i.length,o=!1,a=6,s=e;if(N(e)){var l=function(t){return N(t&&t[0])?2:1}(e);a=l,(1===l&&!j(e[0])||2===l&&!j(e[0][0]))&&(o=!0)}else if(j(e)&&!nt(e))a=0;else if(X(e))if(isNaN(+e)){var u=jn(e);u&&(s=u,a=3)}else a=0;else if(Q(e)){var h=A({},s);h.colorStops=z(e.colorStops,(function(t){return{offset:t.offset,color:jn(t.color)}})),gi(e)?a=4:yi(e)&&(a=5),s=h}0===r?this.valType=a:a===this.valType&&6!==a||(o=!0),this.discrete=this.discrete||o;var c={time:t,value:s,rawValue:e,percent:0};return n&&(c.easing=n,c.easingFunc=U(n)?n:on[n]||Ln(n)),i.push(c),c},t.prototype.prepare=function(t,e){var n=this.keyframes;this._needsSort&&n.sort((function(t,e){return t.time-e.time}));for(var i=this.valType,r=n.length,o=n[r-1],a=this.discrete,s=Pi(i),l=Li(i),u=0;u<r;u++){var h=n[u],c=h.value,p=o.value;h.percent=h.time/t,a||(s&&u!==r-1?Di(c,p,i):l&&Ci(c.colorStops,p.colorStops))}if(!a&&5!==i&&e&&this.needsAnimate()&&e.needsAnimate()&&i===e.valType&&!e._finished){this._additiveTrack=e;var d=n[0].value;for(u=0;u<r;u++)0===i?n[u].additiveValue=n[u].value-d:3===i?n[u].additiveValue=Ii([],n[u].value,d,-1):Pi(i)&&(n[u].additiveValue=1===i?Ii([],n[u].value,d,-1):Ti([],n[u].value,d,-1))}},t.prototype.step=function(t,e){if(!this._finished){this._additiveTrack&&this._additiveTrack._finished&&(this._additiveTrack=null);var n,i,r,o=null!=this._additiveTrack,a=o?"additiveValue":"value",s=this.valType,l=this.keyframes,u=l.length,h=this.propName,c=3===s,p=this._lastFr,d=Math.min;if(1===u)i=r=l[0];else{if(e<0)n=0;else if(e<this._lastFrP){for(n=d(p+1,u-1);n>=0&&!(l[n].percent<=e);n--);n=d(n,u-2)}else{for(n=p;n<u&&!(l[n].percent>e);n++);n=d(n-1,u-2)}r=l[n+1],i=l[n]}if(i&&r){this._lastFr=n,this._lastFrP=e;var f=r.percent-i.percent,g=0===f?1:d((e-i.percent)/f,1);r.easingFunc&&(g=r.easingFunc(g));var y=o?this._additiveValue:c?Oi:t[h];if(!Pi(s)&&!c||y||(y=this._additiveValue=[]),this.discrete)t[h]=g<1?i.rawValue:r.rawValue;else if(Pi(s))1===s?Mi(y,i[a],r[a],g):function(t,e,n,i){for(var r=e.length,o=r&&e[0].length,a=0;a<r;a++){t[a]||(t[a]=[]);for(var s=0;s<o;s++)t[a][s]=Si(e[a][s],n[a][s],i)}}(y,i[a],r[a],g);else if(Li(s)){var v=i[a],m=r[a],x=4===s;t[h]={type:x?"linear":"radial",x:Si(v.x,m.x,g),y:Si(v.y,m.y,g),colorStops:z(v.colorStops,(function(t,e){var n=m.colorStops[e];return{offset:Si(t.offset,n.offset,g),color:ki(Mi([],t.color,n.color,g))}})),global:m.global},x?(t[h].x2=Si(v.x2,m.x2,g),t[h].y2=Si(v.y2,m.y2,g)):t[h].r=Si(v.r,m.r,g)}else if(c)Mi(y,i[a],r[a],g),o||(t[h]=ki(y));else{var _=Si(i[a],r[a],g);o?this._additiveValue=_:t[h]=_}o&&this._addToTarget(t)}}},t.prototype._addToTarget=function(t){var e=this.valType,n=this.propName,i=this._additiveValue;0===e?t[n]=t[n]+i:3===e?(jn(t[n],Oi),Ii(Oi,Oi,i,1),t[n]=ki(Oi)):1===e?Ii(t[n],t[n],i,1):2===e&&Ti(t[n],t[n],i,1)},t}(),Ni=function(){function t(t,e,n,i){this._tracks={},this._trackKeys=[],this._maxTime=0,this._started=0,this._clip=null,this._target=t,this._loop=e,e&&i?I("Can' use additive animation on looped animation."):(this._additiveAnimators=i,this._allowDiscrete=n)}return t.prototype.getMaxTime=function(){return this._maxTime},t.prototype.getDelay=function(){return this._delay},t.prototype.getLoop=function(){return this._loop},t.prototype.getTarget=function(){return this._target},t.prototype.changeTarget=function(t){this._target=t},t.prototype.when=function(t,e,n){return this.whenWithKeys(t,e,G(e),n)},t.prototype.whenWithKeys=function(t,e,n,i){for(var r=this._tracks,o=0;o<n.length;o++){var a=n[o],s=r[a];if(!s){s=r[a]=new Ri(a);var l=void 0,u=this._getAdditiveTrack(a);if(u){var h=u.keyframes,c=h[h.length-1];l=c&&c.value,3===u.valType&&l&&(l=ki(l))}else l=this._target[a];if(null==l)continue;t>0&&s.addKeyframe(0,Ai(l),i),this._trackKeys.push(a)}s.addKeyframe(t,Ai(e[a]),i)}return this._maxTime=Math.max(this._maxTime,t),this},t.prototype.pause=function(){this._clip.pause(),this._paused=!0},t.prototype.resume=function(){this._clip.resume(),this._paused=!1},t.prototype.isPaused=function(){return!!this._paused},t.prototype.duration=function(t){return this._maxTime=t,this._force=!0,this},t.prototype._doneCallback=function(){this._setTracksFinished(),this._clip=null;var t=this._doneCbs;if(t)for(var e=t.length,n=0;n<e;n++)t[n].call(this)},t.prototype._abortedCallback=function(){this._setTracksFinished();var t=this.animation,e=this._abortedCbs;if(t&&t.removeClip(this._clip),this._clip=null,e)for(var n=0;n<e.length;n++)e[n].call(this)},t.prototype._setTracksFinished=function(){for(var t=this._tracks,e=this._trackKeys,n=0;n<e.length;n++)t[e[n]].setFinished()},t.prototype._getAdditiveTrack=function(t){var e,n=this._additiveAnimators;if(n)for(var i=0;i<n.length;i++){var r=n[i].getTrack(t);r&&(e=r)}return e},t.prototype.start=function(t){if(!(this._started>0)){this._started=1;for(var e=this,n=[],i=this._maxTime||0,r=0;r<this._trackKeys.length;r++){var o=this._trackKeys[r],a=this._tracks[o],s=this._getAdditiveTrack(o),l=a.keyframes,u=l.length;if(a.prepare(i,s),a.needsAnimate())if(!this._allowDiscrete&&a.discrete){var h=l[u-1];h&&(e._target[a.propName]=h.rawValue),a.setFinished()}else n.push(a)}if(n.length||this._force){var c=new Pn({life:i,loop:this._loop,delay:this._delay||0,onframe:function(t){e._started=2;var i=e._additiveAnimators;if(i){for(var r=!1,o=0;o<i.length;o++)if(i[o]._clip){r=!0;break}r||(e._additiveAnimators=null)}for(o=0;o<n.length;o++)n[o].step(e._target,t);var a=e._onframeCbs;if(a)for(o=0;o<a.length;o++)a[o](e._target,t)},ondestroy:function(){e._doneCallback()}});this._clip=c,this.animation&&this.animation.addClip(c),t&&c.setEasing(t)}else this._doneCallback();return this}},t.prototype.stop=function(t){if(this._clip){var e=this._clip;t&&e.onframe(1),this._abortedCallback()}},t.prototype.delay=function(t){return this._delay=t,this},t.prototype.during=function(t){return t&&(this._onframeCbs||(this._onframeCbs=[]),this._onframeCbs.push(t)),this},t.prototype.done=function(t){return t&&(this._doneCbs||(this._doneCbs=[]),this._doneCbs.push(t)),this},t.prototype.aborted=function(t){return t&&(this._abortedCbs||(this._abortedCbs=[]),this._abortedCbs.push(t)),this},t.prototype.getClip=function(){return this._clip},t.prototype.getTrack=function(t){return this._tracks[t]},t.prototype.getTracks=function(){var t=this;return z(this._trackKeys,(function(e){return t._tracks[e]}))},t.prototype.stopTracks=function(t,e){if(!t.length||!this._clip)return!0;for(var n=this._tracks,i=this._trackKeys,r=0;r<t.length;r++){var o=n[t[r]];o&&!o.isFinished()&&(e?o.step(this._target,1):1===this._started&&o.step(this._target,0),o.setFinished())}var a=!0;for(r=0;r<i.length;r++)if(!n[i[r]].isFinished()){a=!1;break}return a&&this._abortedCallback(),a},t.prototype.saveTo=function(t,e,n){if(t){e=e||this._trackKeys;for(var i=0;i<e.length;i++){var r=e[i],o=this._tracks[r];if(o&&!o.isFinished()){var a=o.keyframes,s=a[n?0:a.length-1];s&&(t[r]=Ai(s.rawValue))}}}},t.prototype.__changeFinalValue=function(t,e){e=e||G(t);for(var n=0;n<e.length;n++){var i=e[n],r=this._tracks[i];if(r){var o=r.keyframes;if(o.length>1){var a=o.pop();r.addKeyframe(a.time,t[i]),r.prepare(this._maxTime,r.getAdditiveTrack())}}}},t}();function Ei(){return(new Date).getTime()}var zi,Vi,Bi=function(t){function e(e){var n=t.call(this)||this;return n._running=!1,n._time=0,n._pausedTime=0,n._pauseStart=0,n._paused=!1,e=e||{},n.stage=e.stage||{},n}return n(e,t),e.prototype.addClip=function(t){t.animation&&this.removeClip(t),this._head?(this._tail.next=t,t.prev=this._tail,t.next=null,this._tail=t):this._head=this._tail=t,t.animation=this},e.prototype.addAnimator=function(t){t.animation=this;var e=t.getClip();e&&this.addClip(e)},e.prototype.removeClip=function(t){if(t.animation){var e=t.prev,n=t.next;e?e.next=n:this._head=n,n?n.prev=e:this._tail=e,t.next=t.prev=t.animation=null}},e.prototype.removeAnimator=function(t){var e=t.getClip();e&&this.removeClip(e),t.animation=null},e.prototype.update=function(t){for(var e=Ei()-this._pausedTime,n=e-this._time,i=this._head;i;){var r=i.next;i.step(e,n)?(i.ondestroy(),this.removeClip(i),i=r):i=r}this._time=e,t||(this.trigger("frame",n),this.stage.update&&this.stage.update())},e.prototype._startLoop=function(){var t=this;this._running=!0,rn((function e(){t._running&&(rn(e),!t._paused&&t.update())}))},e.prototype.start=function(){this._running||(this._time=Ei(),this._pausedTime=0,this._startLoop())},e.prototype.stop=function(){this._running=!1},e.prototype.pause=function(){this._paused||(this._pauseStart=Ei(),this._paused=!0)},e.prototype.resume=function(){this._paused&&(this._pausedTime+=Ei()-this._pauseStart,this._paused=!1)},e.prototype.clear=function(){for(var t=this._head;t;){var e=t.next;t.prev=t.next=t.animation=null,t=e}this._head=this._tail=null},e.prototype.isFinished=function(){return null==this._head},e.prototype.animate=function(t,e){e=e||{},this.start();var n=new Ni(t,e.loop);return this.addAnimator(n),n},e}(jt),Fi=r.domSupported,Gi=(Vi={pointerdown:1,pointerup:1,pointermove:1,pointerout:1},{mouse:zi=["click","dblclick","mousewheel","wheel","mouseout","mouseup","mousedown","mousemove","contextmenu"],touch:["touchstart","touchend","touchmove"],pointer:z(zi,(function(t){var e=t.replace("mouse","pointer");return Vi.hasOwnProperty(e)?e:t}))}),Wi=["mousemove","mouseup"],Hi=["pointermove","pointerup"],Yi=!1;function Ui(t){var e=t.pointerType;return"pen"===e||"touch"===e}function Xi(t){t&&(t.zrByTouch=!0)}function Zi(t,e){for(var n=e,i=!1;n&&9!==n.nodeType&&!(i=n.domBelongToZr||n!==e&&n===t.painterRoot);)n=n.parentNode;return i}var ji=function(t,e){this.stopPropagation=bt,this.stopImmediatePropagation=bt,this.preventDefault=bt,this.type=e.type,this.target=this.currentTarget=t.dom,this.pointerType=e.pointerType,this.clientX=e.clientX,this.clientY=e.clientY},qi={mousedown:function(t){t=he(this.dom,t),this.__mayPointerCapture=[t.zrX,t.zrY],this.trigger("mousedown",t)},mousemove:function(t){t=he(this.dom,t);var e=this.__mayPointerCapture;!e||t.zrX===e[0]&&t.zrY===e[1]||this.__togglePointerCapture(!0),this.trigger("mousemove",t)},mouseup:function(t){t=he(this.dom,t),this.__togglePointerCapture(!1),this.trigger("mouseup",t)},mouseout:function(t){Zi(this,(t=he(this.dom,t)).toElement||t.relatedTarget)||(this.__pointerCapturing&&(t.zrEventControl="no_globalout"),this.trigger("mouseout",t))},wheel:function(t){Yi=!0,t=he(this.dom,t),this.trigger("mousewheel",t)},mousewheel:function(t){Yi||(t=he(this.dom,t),this.trigger("mousewheel",t))},touchstart:function(t){Xi(t=he(this.dom,t)),this.__lastTouchMoment=new Date,this.handler.processGesture(t,"start"),qi.mousemove.call(this,t),qi.mousedown.call(this,t)},touchmove:function(t){Xi(t=he(this.dom,t)),this.handler.processGesture(t,"change"),qi.mousemove.call(this,t)},touchend:function(t){Xi(t=he(this.dom,t)),this.handler.processGesture(t,"end"),qi.mouseup.call(this,t),+new Date-+this.__lastTouchMoment<300&&qi.click.call(this,t)},pointerdown:function(t){qi.mousedown.call(this,t)},pointermove:function(t){Ui(t)||qi.mousemove.call(this,t)},pointerup:function(t){qi.mouseup.call(this,t)},pointerout:function(t){Ui(t)||qi.mouseout.call(this,t)}};E(["click","dblclick","contextmenu"],(function(t){qi[t]=function(e){e=he(this.dom,e),this.trigger(t,e)}}));var Ki={pointermove:function(t){Ui(t)||Ki.mousemove.call(this,t)},pointerup:function(t){Ki.mouseup.call(this,t)},mousemove:function(t){this.trigger("mousemove",t)},mouseup:function(t){var e=this.__pointerCapturing;this.__togglePointerCapture(!1),this.trigger("mouseup",t),e&&(t.zrEventControl="only_globalout",this.trigger("mouseout",t))}};function $i(t,e){var n=e.domHandlers;r.pointerEventsSupported?E(Gi.pointer,(function(i){Qi(e,i,(function(e){n[i].call(t,e)}))})):(r.touchEventsSupported&&E(Gi.touch,(function(i){Qi(e,i,(function(r){n[i].call(t,r),function(t){t.touching=!0,null!=t.touchTimer&&(clearTimeout(t.touchTimer),t.touchTimer=null),t.touchTimer=setTimeout((function(){t.touching=!1,t.touchTimer=null}),700)}(e)}))})),E(Gi.mouse,(function(i){Qi(e,i,(function(r){r=ue(r),e.touching||n[i].call(t,r)}))})))}function Ji(t,e){function n(n){Qi(e,n,(function(i){i=ue(i),Zi(t,i.target)||(i=function(t,e){return he(t.dom,new ji(t,e),!0)}(t,i),e.domHandlers[n].call(t,i))}),{capture:!0})}r.pointerEventsSupported?E(Hi,n):r.touchEventsSupported||E(Wi,n)}function Qi(t,e,n,i){t.mounted[e]=n,t.listenerOpts[e]=i,ce(t.domTarget,e,n,i)}function tr(t){var e,n,i,r,o=t.mounted;for(var a in o)o.hasOwnProperty(a)&&(e=t.domTarget,n=a,i=o[a],r=t.listenerOpts[a],e.removeEventListener(n,i,r));t.mounted={}}var er=function(t,e){this.mounted={},this.listenerOpts={},this.touching=!1,this.domTarget=t,this.domHandlers=e},nr=function(t){function e(e,n){var i=t.call(this)||this;return i.__pointerCapturing=!1,i.dom=e,i.painterRoot=n,i._localHandlerScope=new er(e,qi),Fi&&(i._globalHandlerScope=new er(document,Ki)),$i(i,i._localHandlerScope),i}return n(e,t),e.prototype.dispose=function(){tr(this._localHandlerScope),Fi&&tr(this._globalHandlerScope)},e.prototype.setCursor=function(t){this.dom.style&&(this.dom.style.cursor=t||"default")},e.prototype.__togglePointerCapture=function(t){if(this.__mayPointerCapture=null,Fi&&+this.__pointerCapturing^+t){this.__pointerCapturing=t;var e=this._globalHandlerScope;t?Ji(this,e):tr(e)}},e}(jt),ir=1;r.hasGlobalWindow&&(ir=Math.max(window.devicePixelRatio||window.screen&&window.screen.deviceXDPI/window.screen.logicalXDPI||1,1));var rr=ir,or="#333",ar="#ccc",sr=me,lr=5e-5;function ur(t){return t>lr||t<-5e-5}var hr=[],cr=[],pr=[1,0,0,1,0,0],dr=Math.abs,fr=function(){function t(){}return t.prototype.getLocalTransform=function(e){return t.getLocalTransform(this,e)},t.prototype.setPosition=function(t){this.x=t[0],this.y=t[1]},t.prototype.setScale=function(t){this.scaleX=t[0],this.scaleY=t[1]},t.prototype.setSkew=function(t){this.skewX=t[0],this.skewY=t[1]},t.prototype.setOrigin=function(t){this.originX=t[0],this.originY=t[1]},t.prototype.needLocalTransform=function(){return ur(this.rotation)||ur(this.x)||ur(this.y)||ur(this.scaleX-1)||ur(this.scaleY-1)||ur(this.skewX)||ur(this.skewY)},t.prototype.updateTransform=function(){var t=this.parent&&this.parent.transform,e=this.needLocalTransform(),n=this.transform;e||t?(n=n||[1,0,0,1,0,0],e?this.getLocalTransform(n):sr(n),t&&(e?_e(n,t,n):xe(n,t)),this.transform=n,this._resolveGlobalScaleRatio(n)):n&&sr(n)},t.prototype._resolveGlobalScaleRatio=function(t){var e=this.globalScaleRatio;if(null!=e&&1!==e){this.getGlobalScale(hr);var n=hr[0]<0?-1:1,i=hr[1]<0?-1:1,r=((hr[0]-n)*e+n)/hr[0]||0,o=((hr[1]-i)*e+i)/hr[1]||0;t[0]*=r,t[1]*=r,t[2]*=o,t[3]*=o}this.invTransform=this.invTransform||[1,0,0,1,0,0],Me(this.invTransform,t)},t.prototype.getComputedTransform=function(){for(var t=this,e=[];t;)e.push(t),t=t.parent;for(;t=e.pop();)t.updateTransform();return this.transform},t.prototype.setLocalTransform=function(t){if(t){var e=t[0]*t[0]+t[1]*t[1],n=t[2]*t[2]+t[3]*t[3],i=Math.atan2(t[1],t[0]),r=Math.PI/2+i-Math.atan2(t[3],t[2]);n=Math.sqrt(n)*Math.cos(r),e=Math.sqrt(e),this.skewX=r,this.skewY=0,this.rotation=-i,this.x=+t[4],this.y=+t[5],this.scaleX=e,this.scaleY=n,this.originX=0,this.originY=0}},t.prototype.decomposeTransform=function(){if(this.transform){var t=this.parent,e=this.transform;t&&t.transform&&(_e(cr,t.invTransform,e),e=cr);var n=this.originX,i=this.originY;(n||i)&&(pr[4]=n,pr[5]=i,_e(cr,e,pr),cr[4]-=n,cr[5]-=i,e=cr),this.setLocalTransform(e)}},t.prototype.getGlobalScale=function(t){var e=this.transform;return t=t||[],e?(t[0]=Math.sqrt(e[0]*e[0]+e[1]*e[1]),t[1]=Math.sqrt(e[2]*e[2]+e[3]*e[3]),e[0]<0&&(t[0]=-t[0]),e[3]<0&&(t[1]=-t[1]),t):(t[0]=1,t[1]=1,t)},t.prototype.transformCoordToLocal=function(t,e){var n=[t,e],i=this.invTransform;return i&&Wt(n,n,i),n},t.prototype.transformCoordToGlobal=function(t,e){var n=[t,e],i=this.transform;return i&&Wt(n,n,i),n},t.prototype.getLineScale=function(){var t=this.transform;return t&&dr(t[0]-1)>1e-10&&dr(t[3]-1)>1e-10?Math.sqrt(dr(t[0]*t[3]-t[2]*t[1])):1},t.prototype.copyTransform=function(t){yr(this,t)},t.getLocalTransform=function(t,e){e=e||[];var n=t.originX||0,i=t.originY||0,r=t.scaleX,o=t.scaleY,a=t.anchorX,s=t.anchorY,l=t.rotation||0,u=t.x,h=t.y,c=t.skewX?Math.tan(t.skewX):0,p=t.skewY?Math.tan(-t.skewY):0;if(n||i||a||s){var d=n+a,f=i+s;e[4]=-d*r-c*f*o,e[5]=-f*o-p*d*r}else e[4]=e[5]=0;return e[0]=r,e[3]=o,e[1]=p*r,e[2]=c*o,l&&we(e,e,l),e[4]+=n+u,e[5]+=i+h,e},t.initDefaultProps=function(){var e=t.prototype;e.scaleX=e.scaleY=e.globalScaleRatio=1,e.x=e.y=e.originX=e.originY=e.skewX=e.skewY=e.rotation=e.anchorX=e.anchorY=0}(),t}(),gr=["x","y","originX","originY","anchorX","anchorY","rotation","scaleX","scaleY","skewX","skewY"];function yr(t,e){for(var n=0;n<gr.length;n++){var i=gr[n];t[i]=e[i]}}var vr={};function mr(t,e){var n=vr[e=e||a];n||(n=vr[e]=new Nn(500));var i=n.get(t);return null==i&&(i=h.measureText(t,e).width,n.put(t,i)),i}function xr(t,e,n,i){var r=mr(t,e),o=Sr(e),a=br(0,r,n),s=wr(0,o,i);return new Ee(a,s,r,o)}function _r(t,e,n,i){var r=((t||"")+"").split("\n");if(1===r.length)return xr(r[0],e,n,i);for(var o=new Ee(0,0,0,0),a=0;a<r.length;a++){var s=xr(r[a],e,n,i);0===a?o.copy(s):o.union(s)}return o}function br(t,e,n){return"right"===n?t-=e:"center"===n&&(t-=e/2),t}function wr(t,e,n){return"middle"===n?t-=e/2:"bottom"===n&&(t-=e),t}function Sr(t){return mr("国",t)}function Mr(t,e){return"string"==typeof t?t.lastIndexOf("%")>=0?parseFloat(t)/100*e:parseFloat(t):t}function Ir(t,e,n){var i=e.position||"inside",r=null!=e.distance?e.distance:5,o=n.height,a=n.width,s=o/2,l=n.x,u=n.y,h="left",c="top";if(i instanceof Array)l+=Mr(i[0],n.width),u+=Mr(i[1],n.height),h=null,c=null;else switch(i){case"left":l-=r,u+=s,h="right",c="middle";break;case"right":l+=r+a,u+=s,c="middle";break;case"top":l+=a/2,u-=r,h="center",c="bottom";break;case"bottom":l+=a/2,u+=o+r,h="center";break;case"inside":l+=a/2,u+=s,h="center",c="middle";break;case"insideLeft":l+=r,u+=s,c="middle";break;case"insideRight":l+=a-r,u+=s,h="right",c="middle";break;case"insideTop":l+=a/2,u+=r,h="center";break;case"insideBottom":l+=a/2,u+=o-r,h="center",c="bottom";break;case"insideTopLeft":l+=r,u+=r;break;case"insideTopRight":l+=a-r,u+=r,h="right";break;case"insideBottomLeft":l+=r,u+=o-r,c="bottom";break;case"insideBottomRight":l+=a-r,u+=o-r,h="right",c="bottom"}return(t=t||{}).x=l,t.y=u,t.align=h,t.verticalAlign=c,t}var Tr="__zr_normal__",Cr=gr.concat(["ignore"]),Dr=V(gr,(function(t,e){return t[e]=!0,t}),{ignore:!1}),Ar={},kr=new Ee(0,0,0,0),Lr=function(){function t(t){this.id=M(),this.animators=[],this.currentStates=[],this.states={},this._init(t)}return t.prototype._init=function(t){this.attr(t)},t.prototype.drift=function(t,e,n){switch(this.draggable){case"horizontal":e=0;break;case"vertical":t=0}var i=this.transform;i||(i=this.transform=[1,0,0,1,0,0]),i[4]+=t,i[5]+=e,this.decomposeTransform(),this.markRedraw()},t.prototype.beforeUpdate=function(){},t.prototype.afterUpdate=function(){},t.prototype.update=function(){this.updateTransform(),this.__dirty&&this.updateInnerText()},t.prototype.updateInnerText=function(t){var e=this._textContent;if(e&&(!e.ignore||t)){this.textConfig||(this.textConfig={});var n=this.textConfig,i=n.local,r=e.innerTransformable,o=void 0,a=void 0,s=!1;r.parent=i?this:null;var l=!1;if(r.copyTransform(e),null!=n.position){var u=kr;n.layoutRect?u.copy(n.layoutRect):u.copy(this.getBoundingRect()),i||u.applyTransform(this.transform),this.calculateTextPosition?this.calculateTextPosition(Ar,n,u):Ir(Ar,n,u),r.x=Ar.x,r.y=Ar.y,o=Ar.align,a=Ar.verticalAlign;var h=n.origin;if(h&&null!=n.rotation){var c=void 0,p=void 0;"center"===h?(c=.5*u.width,p=.5*u.height):(c=Mr(h[0],u.width),p=Mr(h[1],u.height)),l=!0,r.originX=-r.x+c+(i?0:u.x),r.originY=-r.y+p+(i?0:u.y)}}null!=n.rotation&&(r.rotation=n.rotation);var d=n.offset;d&&(r.x+=d[0],r.y+=d[1],l||(r.originX=-d[0],r.originY=-d[1]));var f=null==n.inside?"string"==typeof n.position&&n.position.indexOf("inside")>=0:n.inside,g=this._innerTextDefaultStyle||(this._innerTextDefaultStyle={}),y=void 0,v=void 0,m=void 0;f&&this.canBeInsideText()?(y=n.insideFill,v=n.insideStroke,null!=y&&"auto"!==y||(y=this.getInsideTextFill()),null!=v&&"auto"!==v||(v=this.getInsideTextStroke(y),m=!0)):(y=n.outsideFill,v=n.outsideStroke,null!=y&&"auto"!==y||(y=this.getOutsideFill()),null!=v&&"auto"!==v||(v=this.getOutsideStroke(y),m=!0)),(y=y||"#000")===g.fill&&v===g.stroke&&m===g.autoStroke&&o===g.align&&a===g.verticalAlign||(s=!0,g.fill=y,g.stroke=v,g.autoStroke=m,g.align=o,g.verticalAlign=a,e.setDefaultTextStyle(g)),e.__dirty|=1,s&&e.dirtyStyle(!0)}},t.prototype.canBeInsideText=function(){return!0},t.prototype.getInsideTextFill=function(){return"#fff"},t.prototype.getInsideTextStroke=function(t){return"#000"},t.prototype.getOutsideFill=function(){return this.__zr&&this.__zr.isDarkMode()?ar:or},t.prototype.getOutsideStroke=function(t){var e=this.__zr&&this.__zr.getBackgroundColor(),n="string"==typeof e&&jn(e);n||(n=[255,255,255,1]);for(var i=n[3],r=this.__zr.isDarkMode(),o=0;o<3;o++)n[o]=n[o]*i+(r?0:255)*(1-i);return n[3]=1,ii(n,"rgba")},t.prototype.traverse=function(t,e){},t.prototype.attrKV=function(t,e){"textConfig"===t?this.setTextConfig(e):"textContent"===t?this.setTextContent(e):"clipPath"===t?this.setClipPath(e):"extra"===t?(this.extra=this.extra||{},A(this.extra,e)):this[t]=e},t.prototype.hide=function(){this.ignore=!0,this.markRedraw()},t.prototype.show=function(){this.ignore=!1,this.markRedraw()},t.prototype.attr=function(t,e){if("string"==typeof t)this.attrKV(t,e);else if(q(t))for(var n=G(t),i=0;i<n.length;i++){var r=n[i];this.attrKV(r,t[r])}return this.markRedraw(),this},t.prototype.saveCurrentToNormalState=function(t){this._innerSaveToNormal(t);for(var e=this._normalState,n=0;n<this.animators.length;n++){var i=this.animators[n],r=i.__fromStateTransition;if(!(i.getLoop()||r&&r!==Tr)){var o=i.targetName,a=o?e[o]:e;i.saveTo(a)}}},t.prototype._innerSaveToNormal=function(t){var e=this._normalState;e||(e=this._normalState={}),t.textConfig&&!e.textConfig&&(e.textConfig=this.textConfig),this._savePrimaryToNormal(t,e,Cr)},t.prototype._savePrimaryToNormal=function(t,e,n){for(var i=0;i<n.length;i++){var r=n[i];null==t[r]||r in e||(e[r]=this[r])}},t.prototype.hasState=function(){return this.currentStates.length>0},t.prototype.getState=function(t){return this.states[t]},t.prototype.ensureState=function(t){var e=this.states;return e[t]||(e[t]={}),e[t]},t.prototype.clearStates=function(t){this.useState(Tr,!1,t)},t.prototype.useState=function(t,e,n,i){var r=t===Tr;if(this.hasState()||!r){var o=this.currentStates,a=this.stateTransition;if(!(P(o,t)>=0)||!e&&1!==o.length){var s;if(this.stateProxy&&!r&&(s=this.stateProxy(t)),s||(s=this.states&&this.states[t]),s||r){r||this.saveCurrentToNormalState(s);var l=!!(s&&s.hoverLayer||i);l&&this._toggleHoverLayerFlag(!0),this._applyStateObj(t,s,this._normalState,e,!n&&!this.__inHover&&a&&a.duration>0,a);var u=this._textContent,h=this._textGuide;return u&&u.useState(t,e,n,l),h&&h.useState(t,e,n,l),r?(this.currentStates=[],this._normalState={}):e?this.currentStates.push(t):this.currentStates=[t],this._updateAnimationTargets(),this.markRedraw(),!l&&this.__inHover&&(this._toggleHoverLayerFlag(!1),this.__dirty&=-2),s}I("State "+t+" not exists.")}}},t.prototype.useStates=function(t,e,n){if(t.length){var i=[],r=this.currentStates,o=t.length,a=o===r.length;if(a)for(var s=0;s<o;s++)if(t[s]!==r[s]){a=!1;break}if(a)return;for(s=0;s<o;s++){var l=t[s],u=void 0;this.stateProxy&&(u=this.stateProxy(l,t)),u||(u=this.states[l]),u&&i.push(u)}var h=i[o-1],c=!!(h&&h.hoverLayer||n);c&&this._toggleHoverLayerFlag(!0);var p=this._mergeStates(i),d=this.stateTransition;this.saveCurrentToNormalState(p),this._applyStateObj(t.join(","),p,this._normalState,!1,!e&&!this.__inHover&&d&&d.duration>0,d);var f=this._textContent,g=this._textGuide;f&&f.useStates(t,e,c),g&&g.useStates(t,e,c),this._updateAnimationTargets(),this.currentStates=t.slice(),this.markRedraw(),!c&&this.__inHover&&(this._toggleHoverLayerFlag(!1),this.__dirty&=-2)}else this.clearStates()},t.prototype._updateAnimationTargets=function(){for(var t=0;t<this.animators.length;t++){var e=this.animators[t];e.targetName&&e.changeTarget(this[e.targetName])}},t.prototype.removeState=function(t){var e=P(this.currentStates,t);if(e>=0){var n=this.currentStates.slice();n.splice(e,1),this.useStates(n)}},t.prototype.replaceState=function(t,e,n){var i=this.currentStates.slice(),r=P(i,t),o=P(i,e)>=0;r>=0?o?i.splice(r,1):i[r]=e:n&&!o&&i.push(e),this.useStates(i)},t.prototype.toggleState=function(t,e){e?this.useState(t,!0):this.removeState(t)},t.prototype._mergeStates=function(t){for(var e,n={},i=0;i<t.length;i++){var r=t[i];A(n,r),r.textConfig&&A(e=e||{},r.textConfig)}return e&&(n.textConfig=e),n},t.prototype._applyStateObj=function(t,e,n,i,r,o){var a=!(e&&i);e&&e.textConfig?(this.textConfig=A({},i?this.textConfig:n.textConfig),A(this.textConfig,e.textConfig)):a&&n.textConfig&&(this.textConfig=n.textConfig);for(var s={},l=!1,u=0;u<Cr.length;u++){var h=Cr[u],c=r&&Dr[h];e&&null!=e[h]?c?(l=!0,s[h]=e[h]):this[h]=e[h]:a&&null!=n[h]&&(c?(l=!0,s[h]=n[h]):this[h]=n[h])}if(!r)for(u=0;u<this.animators.length;u++){var p=this.animators[u],d=p.targetName;p.getLoop()||p.__changeFinalValue(d?(e||n)[d]:e||n)}l&&this._transitionState(t,s,o)},t.prototype._attachComponent=function(t){if((!t.__zr||t.__hostTarget)&&t!==this){var e=this.__zr;e&&t.addSelfToZr(e),t.__zr=e,t.__hostTarget=this}},t.prototype._detachComponent=function(t){t.__zr&&t.removeSelfFromZr(t.__zr),t.__zr=null,t.__hostTarget=null},t.prototype.getClipPath=function(){return this._clipPath},t.prototype.setClipPath=function(t){this._clipPath&&this._clipPath!==t&&this.removeClipPath(),this._attachComponent(t),this._clipPath=t,this.markRedraw()},t.prototype.removeClipPath=function(){var t=this._clipPath;t&&(this._detachComponent(t),this._clipPath=null,this.markRedraw())},t.prototype.getTextContent=function(){return this._textContent},t.prototype.setTextContent=function(t){var e=this._textContent;e!==t&&(e&&e!==t&&this.removeTextContent(),t.innerTransformable=new fr,this._attachComponent(t),this._textContent=t,this.markRedraw())},t.prototype.setTextConfig=function(t){this.textConfig||(this.textConfig={}),A(this.textConfig,t),this.markRedraw()},t.prototype.removeTextConfig=function(){this.textConfig=null,this.markRedraw()},t.prototype.removeTextContent=function(){var t=this._textContent;t&&(t.innerTransformable=null,this._detachComponent(t),this._textContent=null,this._innerTextDefaultStyle=null,this.markRedraw())},t.prototype.getTextGuideLine=function(){return this._textGuide},t.prototype.setTextGuideLine=function(t){this._textGuide&&this._textGuide!==t&&this.removeTextGuideLine(),this._attachComponent(t),this._textGuide=t,this.markRedraw()},t.prototype.removeTextGuideLine=function(){var t=this._textGuide;t&&(this._detachComponent(t),this._textGuide=null,this.markRedraw())},t.prototype.markRedraw=function(){this.__dirty|=1;var t=this.__zr;t&&(this.__inHover?t.refreshHover():t.refresh()),this.__hostTarget&&this.__hostTarget.markRedraw()},t.prototype.dirty=function(){this.markRedraw()},t.prototype._toggleHoverLayerFlag=function(t){this.__inHover=t;var e=this._textContent,n=this._textGuide;e&&(e.__inHover=t),n&&(n.__inHover=t)},t.prototype.addSelfToZr=function(t){if(this.__zr!==t){this.__zr=t;var e=this.animators;if(e)for(var n=0;n<e.length;n++)t.animation.addAnimator(e[n]);this._clipPath&&this._clipPath.addSelfToZr(t),this._textContent&&this._textContent.addSelfToZr(t),this._textGuide&&this._textGuide.addSelfToZr(t)}},t.prototype.removeSelfFromZr=function(t){if(this.__zr){this.__zr=null;var e=this.animators;if(e)for(var n=0;n<e.length;n++)t.animation.removeAnimator(e[n]);this._clipPath&&this._clipPath.removeSelfFromZr(t),this._textContent&&this._textContent.removeSelfFromZr(t),this._textGuide&&this._textGuide.removeSelfFromZr(t)}},t.prototype.animate=function(t,e,n){var i=t?this[t]:this;var r=new Ni(i,e,n);return t&&(r.targetName=t),this.addAnimator(r,t),r},t.prototype.addAnimator=function(t,e){var n=this.__zr,i=this;t.during((function(){i.updateDuringAnimation(e)})).done((function(){var e=i.animators,n=P(e,t);n>=0&&e.splice(n,1)})),this.animators.push(t),n&&n.animation.addAnimator(t),n&&n.wakeUp()},t.prototype.updateDuringAnimation=function(t){this.markRedraw()},t.prototype.stopAnimation=function(t,e){for(var n=this.animators,i=n.length,r=[],o=0;o<i;o++){var a=n[o];t&&t!==a.scope?r.push(a):a.stop(e)}return this.animators=r,this},t.prototype.animateTo=function(t,e,n){Pr(this,t,e,n)},t.prototype.animateFrom=function(t,e,n){Pr(this,t,e,n,!0)},t.prototype._transitionState=function(t,e,n,i){for(var r=Pr(this,e,n,i),o=0;o<r.length;o++)r[o].__fromStateTransition=t},t.prototype.getBoundingRect=function(){return null},t.prototype.getPaintRect=function(){return null},t.initDefaultProps=function(){var e=t.prototype;e.type="element",e.name="",e.ignore=e.silent=e.isGroup=e.draggable=e.dragging=e.ignoreClip=e.__inHover=!1,e.__dirty=1;function n(t,n,i,r){function o(t,e){Object.defineProperty(e,0,{get:function(){return t[i]},set:function(e){t[i]=e}}),Object.defineProperty(e,1,{get:function(){return t[r]},set:function(e){t[r]=e}})}Object.defineProperty(e,t,{get:function(){this[n]||o(this,this[n]=[]);return this[n]},set:function(t){this[i]=t[0],this[r]=t[1],this[n]=t,o(this,t)}})}Object.defineProperty&&(n("position","_legacyPos","x","y"),n("scale","_legacyScale","scaleX","scaleY"),n("origin","_legacyOrigin","originX","originY"))}(),t}();function Pr(t,e,n,i,r){var o=[];Nr(t,"",t,e,n=n||{},i,o,r);var a=o.length,s=!1,l=n.done,u=n.aborted,h=function(){s=!0,--a<=0&&(s?l&&l():u&&u())},c=function(){--a<=0&&(s?l&&l():u&&u())};a||l&&l(),o.length>0&&n.during&&o[0].during((function(t,e){n.during(e)}));for(var p=0;p<o.length;p++){var d=o[p];h&&d.done(h),c&&d.aborted(c),n.force&&d.duration(n.duration),d.start(n.easing)}return o}function Or(t,e,n){for(var i=0;i<n;i++)t[i]=e[i]}function Rr(t,e,n){if(N(e[n]))if(N(t[n])||(t[n]=[]),$(e[n])){var i=e[n].length;t[n].length!==i&&(t[n]=new e[n].constructor(i),Or(t[n],e[n],i))}else{var r=e[n],o=t[n],a=r.length;if(N(r[0]))for(var s=r[0].length,l=0;l<a;l++)o[l]?Or(o[l],r[l],s):o[l]=Array.prototype.slice.call(r[l]);else Or(o,r,a);o.length=r.length}else t[n]=e[n]}function Nr(t,e,n,i,r,o,a,s){for(var l=G(i),u=r.duration,h=r.delay,c=r.additive,p=r.setToFinal,d=!q(o),f=t.animators,g=[],y=0;y<l.length;y++){var v=l[y],m=i[v];if(null!=m&&null!=n[v]&&(d||o[v]))if(!q(m)||N(m)||Q(m))g.push(v);else{if(e){s||(n[v]=m,t.updateDuringAnimation(e));continue}Nr(t,v,n[v],m,r,o&&o[v],a,s)}else s||(n[v]=m,t.updateDuringAnimation(e),g.push(v))}var x=g.length;if(!c&&x)for(var _=0;_<f.length;_++){if((w=f[_]).targetName===e)if(w.stopTracks(g)){var b=P(f,w);f.splice(b,1)}}if(r.force||(g=B(g,(function(t){return e=i[t],r=n[t],!(e===r||N(e)&&N(r)&&function(t,e){var n=t.length;if(n!==e.length)return!1;for(var i=0;i<n;i++)if(t[i]!==e[i])return!1;return!0}(e,r));var e,r})),x=g.length),x>0||r.force&&!a.length){var w,S=void 0,M=void 0,I=void 0;if(s){M={},p&&(S={});for(_=0;_<x;_++){M[v=g[_]]=n[v],p?S[v]=i[v]:n[v]=i[v]}}else if(p){I={};for(_=0;_<x;_++){I[v=g[_]]=Ai(n[v]),Rr(n,i,v)}}(w=new Ni(n,!1,!1,c?B(f,(function(t){return t.targetName===e})):null)).targetName=e,r.scope&&(w.scope=r.scope),p&&S&&w.whenWithKeys(0,S,g),I&&w.whenWithKeys(0,I,g),w.whenWithKeys(null==u?500:u,s?M:i,g).delay(h||0),t.addAnimator(w,e),a.push(w)}}R(Lr,jt),R(Lr,fr);var Er=function(t){function e(e){var n=t.call(this)||this;return n.isGroup=!0,n._children=[],n.attr(e),n}return n(e,t),e.prototype.childrenRef=function(){return this._children},e.prototype.children=function(){return this._children.slice()},e.prototype.childAt=function(t){return this._children[t]},e.prototype.childOfName=function(t){for(var e=this._children,n=0;n<e.length;n++)if(e[n].name===t)return e[n]},e.prototype.childCount=function(){return this._children.length},e.prototype.add=function(t){return t&&t!==this&&t.parent!==this&&(this._children.push(t),this._doAdd(t)),this},e.prototype.addBefore=function(t,e){if(t&&t!==this&&t.parent!==this&&e&&e.parent===this){var n=this._children,i=n.indexOf(e);i>=0&&(n.splice(i,0,t),this._doAdd(t))}return this},e.prototype.replace=function(t,e){var n=P(this._children,t);return n>=0&&this.replaceAt(e,n),this},e.prototype.replaceAt=function(t,e){var n=this._children,i=n[e];if(t&&t!==this&&t.parent!==this&&t!==i){n[e]=t,i.parent=null;var r=this.__zr;r&&i.removeSelfFromZr(r),this._doAdd(t)}return this},e.prototype._doAdd=function(t){t.parent&&t.parent.remove(t),t.parent=this;var e=this.__zr;e&&e!==t.__zr&&t.addSelfToZr(e),e&&e.refresh()},e.prototype.remove=function(t){var e=this.__zr,n=this._children,i=P(n,t);return i<0||(n.splice(i,1),t.parent=null,e&&t.removeSelfFromZr(e),e&&e.refresh()),this},e.prototype.removeAll=function(){for(var t=this._children,e=this.__zr,n=0;n<t.length;n++){var i=t[n];e&&i.removeSelfFromZr(e),i.parent=null}return t.length=0,this},e.prototype.eachChild=function(t,e){for(var n=this._children,i=0;i<n.length;i++){var r=n[i];t.call(e,r,i)}return this},e.prototype.traverse=function(t,e){for(var n=0;n<this._children.length;n++){var i=this._children[n],r=t.call(e,i);i.isGroup&&!r&&i.traverse(t,e)}return this},e.prototype.addSelfToZr=function(e){t.prototype.addSelfToZr.call(this,e);for(var n=0;n<this._children.length;n++){this._children[n].addSelfToZr(e)}},e.prototype.removeSelfFromZr=function(e){t.prototype.removeSelfFromZr.call(this,e);for(var n=0;n<this._children.length;n++){this._children[n].removeSelfFromZr(e)}},e.prototype.getBoundingRect=function(t){for(var e=new Ee(0,0,0,0),n=t||this._children,i=[],r=null,o=0;o<n.length;o++){var a=n[o];if(!a.ignore&&!a.invisible){var s=a.getBoundingRect(),l=a.getLocalTransform(i);l?(Ee.applyTransform(e,s,l),(r=r||e.clone()).union(e)):(r=r||s.clone()).union(s)}}return r||e},e}(Lr);Er.prototype.type="group";
-/*!
-    * ZRender, a high performance 2d drawing library.
-    *
-    * Copyright (c) 2013, Baidu Inc.
-    * All rights reserved.
-    *
-    * LICENSE
-    * https://github.com/ecomfe/zrender/blob/master/LICENSE.txt
-    */
-var zr={},Vr={};var Br=function(){function t(t,e,n){var i=this;this._sleepAfterStill=10,this._stillFrameAccum=0,this._needsRefresh=!0,this._needsRefreshHover=!0,this._darkMode=!1,n=n||{},this.dom=e,this.id=t;var o=new nn,a=n.renderer||"canvas";zr[a]||(a=G(zr)[0]),n.useDirtyRect=null!=n.useDirtyRect&&n.useDirtyRect;var s=new zr[a](e,o,n,t),l=n.ssr||s.ssrOnly;this.storage=o,this.painter=s;var u,h=r.node||r.worker||l?null:new nr(s.getViewportRoot(),s.root),c=n.useCoarsePointer;(null==c||"auto"===c?r.touchEventsSupported:!!c)&&(u=rt(n.pointerSize,44)),this.handler=new He(o,s,h,s.root,u),this.animation=new Bi({stage:{update:l?null:function(){return i._flush(!0)}}}),l||this.animation.start()}return t.prototype.add=function(t){t&&(this.storage.addRoot(t),t.addSelfToZr(this),this.refresh())},t.prototype.remove=function(t){t&&(this.storage.delRoot(t),t.removeSelfFromZr(this),this.refresh())},t.prototype.configLayer=function(t,e){this.painter.configLayer&&this.painter.configLayer(t,e),this.refresh()},t.prototype.setBackgroundColor=function(t){this.painter.setBackgroundColor&&this.painter.setBackgroundColor(t),this.refresh(),this._backgroundColor=t,this._darkMode=function(t){if(!t)return!1;if("string"==typeof t)return ri(t,1)<.4;if(t.colorStops){for(var e=t.colorStops,n=0,i=e.length,r=0;r<i;r++)n+=ri(e[r].color,1);return(n/=i)<.4}return!1}(t)},t.prototype.getBackgroundColor=function(){return this._backgroundColor},t.prototype.setDarkMode=function(t){this._darkMode=t},t.prototype.isDarkMode=function(){return this._darkMode},t.prototype.refreshImmediately=function(t){t||this.animation.update(!0),this._needsRefresh=!1,this.painter.refresh(),this._needsRefresh=!1},t.prototype.refresh=function(){this._needsRefresh=!0,this.animation.start()},t.prototype.flush=function(){this._flush(!1)},t.prototype._flush=function(t){var e,n=Ei();this._needsRefresh&&(e=!0,this.refreshImmediately(t)),this._needsRefreshHover&&(e=!0,this.refreshHoverImmediately());var i=Ei();e?(this._stillFrameAccum=0,this.trigger("rendered",{elapsedTime:i-n})):this._sleepAfterStill>0&&(this._stillFrameAccum++,this._stillFrameAccum>this._sleepAfterStill&&this.animation.stop())},t.prototype.setSleepAfterStill=function(t){this._sleepAfterStill=t},t.prototype.wakeUp=function(){this.animation.start(),this._stillFrameAccum=0},t.prototype.refreshHover=function(){this._needsRefreshHover=!0},t.prototype.refreshHoverImmediately=function(){this._needsRefreshHover=!1,this.painter.refreshHover&&"canvas"===this.painter.getType()&&this.painter.refreshHover()},t.prototype.resize=function(t){t=t||{},this.painter.resize(t.width,t.height),this.handler.resize()},t.prototype.clearAnimation=function(){this.animation.clear()},t.prototype.getWidth=function(){return this.painter.getWidth()},t.prototype.getHeight=function(){return this.painter.getHeight()},t.prototype.setCursorStyle=function(t){this.handler.setCursorStyle(t)},t.prototype.findHover=function(t,e){return this.handler.findHover(t,e)},t.prototype.on=function(t,e,n){return this.handler.on(t,e,n),this},t.prototype.off=function(t,e){this.handler.off(t,e)},t.prototype.trigger=function(t,e){this.handler.trigger(t,e)},t.prototype.clear=function(){for(var t=this.storage.getRoots(),e=0;e<t.length;e++)t[e]instanceof Er&&t[e].removeSelfFromZr(this);this.storage.delAllRoots(),this.painter.clear()},t.prototype.dispose=function(){var t;this.animation.stop(),this.clear(),this.storage.dispose(),this.painter.dispose(),this.handler.dispose(),this.animation=this.storage=this.painter=this.handler=null,t=this.id,delete Vr[t]},t}();function Fr(t,e){var n=new Br(M(),t,e);return Vr[n.id]=n,n}function Gr(t,e){zr[t]=e}var Wr=Object.freeze({__proto__:null,init:Fr,dispose:function(t){t.dispose()},disposeAll:function(){for(var t in Vr)Vr.hasOwnProperty(t)&&Vr[t].dispose();Vr={}},getInstance:function(t){return Vr[t]},registerPainter:Gr,version:"5.4.1"}),Hr=1e-4;function Yr(t,e,n,i){var r=e[0],o=e[1],a=n[0],s=n[1],l=o-r,u=s-a;if(0===l)return 0===u?a:(a+s)/2;if(i)if(l>0){if(t<=r)return a;if(t>=o)return s}else{if(t>=r)return a;if(t<=o)return s}else{if(t===r)return a;if(t===o)return s}return(t-r)/l*u+a}function Ur(t,e){switch(t){case"center":case"middle":t="50%";break;case"left":case"top":t="0%";break;case"right":case"bottom":t="100%"}return X(t)?(n=t,n.replace(/^\s+|\s+$/g,"")).match(/%$/)?parseFloat(t)/100*e:parseFloat(t):null==t?NaN:+t;var n}function Xr(t,e,n){return null==e&&(e=10),e=Math.min(Math.max(0,e),20),t=(+t).toFixed(e),n?t:+t}function Zr(t){return t.sort((function(t,e){return t-e})),t}function jr(t){if(t=+t,isNaN(t))return 0;if(t>1e-14)for(var e=1,n=0;n<15;n++,e*=10)if(Math.round(t*e)/e===t)return n;return qr(t)}function qr(t){var e=t.toString().toLowerCase(),n=e.indexOf("e"),i=n>0?+e.slice(n+1):0,r=n>0?n:e.length,o=e.indexOf("."),a=o<0?0:r-1-o;return Math.max(0,a-i)}function Kr(t,e){var n=Math.log,i=Math.LN10,r=Math.floor(n(t[1]-t[0])/i),o=Math.round(n(Math.abs(e[1]-e[0]))/i),a=Math.min(Math.max(-r+o,0),20);return isFinite(a)?a:20}function $r(t,e){var n=V(t,(function(t,e){return t+(isNaN(e)?0:e)}),0);if(0===n)return[];for(var i=Math.pow(10,e),r=z(t,(function(t){return(isNaN(t)?0:t)/n*i*100})),o=100*i,a=z(r,(function(t){return Math.floor(t)})),s=V(a,(function(t,e){return t+e}),0),l=z(r,(function(t,e){return t-a[e]}));s<o;){for(var u=Number.NEGATIVE_INFINITY,h=null,c=0,p=l.length;c<p;++c)l[c]>u&&(u=l[c],h=c);++a[h],l[h]=0,++s}return z(a,(function(t){return t/i}))}function Jr(t,e){var n=Math.max(jr(t),jr(e)),i=t+e;return n>20?i:Xr(i,n)}var Qr=9007199254740991;function to(t){var e=2*Math.PI;return(t%e+e)%e}function eo(t){return t>-1e-4&&t<Hr}var no=/^(?:(\d{4})(?:[-\/](\d{1,2})(?:[-\/](\d{1,2})(?:[T ](\d{1,2})(?::(\d{1,2})(?::(\d{1,2})(?:[.,](\d+))?)?)?(Z|[\+\-]\d\d:?\d\d)?)?)?)?)?$/;function io(t){if(t instanceof Date)return t;if(X(t)){var e=no.exec(t);if(!e)return new Date(NaN);if(e[8]){var n=+e[4]||0;return"Z"!==e[8].toUpperCase()&&(n-=+e[8].slice(0,3)),new Date(Date.UTC(+e[1],+(e[2]||1)-1,+e[3]||1,n,+(e[5]||0),+e[6]||0,e[7]?+e[7].substring(0,3):0))}return new Date(+e[1],+(e[2]||1)-1,+e[3]||1,+e[4]||0,+(e[5]||0),+e[6]||0,e[7]?+e[7].substring(0,3):0)}return null==t?new Date(NaN):new Date(Math.round(t))}function ro(t){return Math.pow(10,oo(t))}function oo(t){if(0===t)return 0;var e=Math.floor(Math.log(t)/Math.LN10);return t/Math.pow(10,e)>=10&&e++,e}function ao(t,e){var n=oo(t),i=Math.pow(10,n),r=t/i;return t=(e?r<1.5?1:r<2.5?2:r<4?3:r<7?5:10:r<1?1:r<2?2:r<3?3:r<5?5:10)*i,n>=-20?+t.toFixed(n<0?-n:0):t}function so(t,e){var n=(t.length-1)*e+1,i=Math.floor(n),r=+t[i-1],o=n-i;return o?r+o*(t[i]-r):r}function lo(t){t.sort((function(t,e){return s(t,e,0)?-1:1}));for(var e=-1/0,n=1,i=0;i<t.length;){for(var r=t[i].interval,o=t[i].close,a=0;a<2;a++)r[a]<=e&&(r[a]=e,o[a]=a?1:1-n),e=r[a],n=o[a];r[0]===r[1]&&o[0]*o[1]!=1?t.splice(i,1):i++}return t;function s(t,e,n){return t.interval[n]<e.interval[n]||t.interval[n]===e.interval[n]&&(t.close[n]-e.close[n]==(n?-1:1)||!n&&s(t,e,1))}}function uo(t){var e=parseFloat(t);return e==t&&(0!==e||!X(t)||t.indexOf("x")<=0)?e:NaN}function ho(t){return!isNaN(uo(t))}function co(){return Math.round(9*Math.random())}function po(t,e){return 0===e?t:po(e,t%e)}function fo(t,e){return null==t?e:null==e?t:t*e/po(t,e)}"undefined"!=typeof console&&console.warn&&console.log;function go(t){0}function yo(t){throw new Error(t)}function vo(t,e,n){return(e-t)*n+t}var mo="series\0",xo="\0_ec_\0";function _o(t){return t instanceof Array?t:null==t?[]:[t]}function bo(t,e,n){if(t){t[e]=t[e]||{},t.emphasis=t.emphasis||{},t.emphasis[e]=t.emphasis[e]||{};for(var i=0,r=n.length;i<r;i++){var o=n[i];!t.emphasis[e].hasOwnProperty(o)&&t[e].hasOwnProperty(o)&&(t.emphasis[e][o]=t[e][o])}}}var wo=["fontStyle","fontWeight","fontSize","fontFamily","rich","tag","color","textBorderColor","textBorderWidth","width","height","lineHeight","align","verticalAlign","baseline","shadowColor","shadowBlur","shadowOffsetX","shadowOffsetY","textShadowColor","textShadowBlur","textShadowOffsetX","textShadowOffsetY","backgroundColor","borderColor","borderWidth","borderRadius","padding"];function So(t){return!q(t)||Y(t)||t instanceof Date?t:t.value}function Mo(t){return q(t)&&!(t instanceof Array)}function Io(t,e,n){var i="normalMerge"===n,r="replaceMerge"===n,o="replaceAll"===n;t=t||[],e=(e||[]).slice();var a=yt();E(e,(function(t,n){q(t)||(e[n]=null)}));var s,l,u=function(t,e,n){var i=[];if("replaceAll"===n)return i;for(var r=0;r<t.length;r++){var o=t[r];o&&null!=o.id&&e.set(o.id,r),i.push({existing:"replaceMerge"===n||ko(o)?null:o,newOption:null,keyInfo:null,brandNew:null})}return i}(t,a,n);return(i||r)&&function(t,e,n,i){E(i,(function(r,o){if(r&&null!=r.id){var a=Co(r.id),s=n.get(a);if(null!=s){var l=t[s];lt(!l.newOption,'Duplicated option on id "'+a+'".'),l.newOption=r,l.existing=e[s],i[o]=null}}}))}(u,t,a,e),i&&function(t,e){E(e,(function(n,i){if(n&&null!=n.name)for(var r=0;r<t.length;r++){var o=t[r].existing;if(!t[r].newOption&&o&&(null==o.id||null==n.id)&&!ko(n)&&!ko(o)&&To("name",o,n))return t[r].newOption=n,void(e[i]=null)}}))}(u,e),i||r?function(t,e,n){E(e,(function(e){if(e){for(var i,r=0;(i=t[r])&&(i.newOption||ko(i.existing)||i.existing&&null!=e.id&&!To("id",e,i.existing));)r++;i?(i.newOption=e,i.brandNew=n):t.push({newOption:e,brandNew:n,existing:null,keyInfo:null}),r++}}))}(u,e,r):o&&function(t,e){E(e,(function(e){t.push({newOption:e,brandNew:!0,existing:null,keyInfo:null})}))}(u,e),s=u,l=yt(),E(s,(function(t){var e=t.existing;e&&l.set(e.id,t)})),E(s,(function(t){var e=t.newOption;lt(!e||null==e.id||!l.get(e.id)||l.get(e.id)===t,"id duplicates: "+(e&&e.id)),e&&null!=e.id&&l.set(e.id,t),!t.keyInfo&&(t.keyInfo={})})),E(s,(function(t,e){var n=t.existing,i=t.newOption,r=t.keyInfo;if(q(i)){if(r.name=null!=i.name?Co(i.name):n?n.name:mo+e,n)r.id=Co(n.id);else if(null!=i.id)r.id=Co(i.id);else{var o=0;do{r.id="\0"+r.name+"\0"+o++}while(l.get(r.id))}l.set(r.id,t)}})),u}function To(t,e,n){var i=Do(e[t],null),r=Do(n[t],null);return null!=i&&null!=r&&i===r}function Co(t){return Do(t,"")}function Do(t,e){return null==t?e:X(t)?t:j(t)||Z(t)?t+"":e}function Ao(t){var e=t.name;return!(!e||!e.indexOf(mo))}function ko(t){return t&&null!=t.id&&0===Co(t.id).indexOf(xo)}function Lo(t,e){return null!=e.dataIndexInside?e.dataIndexInside:null!=e.dataIndex?Y(e.dataIndex)?z(e.dataIndex,(function(e){return t.indexOfRawIndex(e)})):t.indexOfRawIndex(e.dataIndex):null!=e.name?Y(e.name)?z(e.name,(function(e){return t.indexOfName(e)})):t.indexOfName(e.name):void 0}function Po(){var t="__ec_inner_"+Oo++;return function(e){return e[t]||(e[t]={})}}var Oo=co();function Ro(t,e,n){var i=No(e,n),r=i.mainTypeSpecified,o=i.queryOptionMap,a=i.others,s=n?n.defaultMainType:null;return!r&&s&&o.set(s,{}),o.each((function(e,i){var r=Vo(t,i,e,{useDefault:s===i,enableAll:!n||null==n.enableAll||n.enableAll,enableNone:!n||null==n.enableNone||n.enableNone});a[i+"Models"]=r.models,a[i+"Model"]=r.models[0]})),a}function No(t,e){var n;if(X(t)){var i={};i[t+"Index"]=0,n=i}else n=t;var r=yt(),o={},a=!1;return E(n,(function(t,n){if("dataIndex"!==n&&"dataIndexInside"!==n){var i=n.match(/^(\w+)(Index|Id|Name)$/)||[],s=i[1],l=(i[2]||"").toLowerCase();if(s&&l&&!(e&&e.includeMainTypes&&P(e.includeMainTypes,s)<0))a=a||!!s,(r.get(s)||r.set(s,{}))[l]=t}else o[n]=t})),{mainTypeSpecified:a,queryOptionMap:r,others:o}}var Eo={useDefault:!0,enableAll:!1,enableNone:!1},zo={useDefault:!1,enableAll:!0,enableNone:!0};function Vo(t,e,n,i){i=i||Eo;var r=n.index,o=n.id,a=n.name,s={models:null,specified:null!=r||null!=o||null!=a};if(!s.specified){var l=void 0;return s.models=i.useDefault&&(l=t.getComponent(e))?[l]:[],s}return"none"===r||!1===r?(lt(i.enableNone,'`"none"` or `false` is not a valid value on index option.'),s.models=[],s):("all"===r&&(lt(i.enableAll,'`"all"` is not a valid value on index option.'),r=o=a=null),s.models=t.queryComponents({mainType:e,index:r,id:o,name:a}),s)}function Bo(t,e,n){t.setAttribute?t.setAttribute(e,n):t[e]=n}function Fo(t,e){var n=yt(),i=[];return E(t,(function(t){var r=e(t);(n.get(r)||(i.push(r),n.set(r,[]))).push(t)})),{keys:i,buckets:n}}function Go(t,e,n,i,r){var o=null==e||"auto"===e;if(null==i)return i;if(j(i))return Xr(f=vo(n||0,i,r),o?Math.max(jr(n||0),jr(i)):e);if(X(i))return r<1?n:i;for(var a=[],s=n,l=i,u=Math.max(s?s.length:0,l.length),h=0;h<u;++h){var c=t.getDimensionInfo(h);if(c&&"ordinal"===c.type)a[h]=(r<1&&s?s:l)[h];else{var p=s&&s[h]?s[h]:0,d=l[h],f=vo(p,d,r);a[h]=Xr(f,o?Math.max(jr(p),jr(d)):e)}}return a}var Wo="___EC__COMPONENT__CONTAINER___",Ho="___EC__EXTENDED_CLASS___";function Yo(t){var e={main:"",sub:""};if(t){var n=t.split(".");e.main=n[0]||"",e.sub=n[1]||""}return e}function Uo(t,e){t.$constructor=t,t.extend=function(t){var e,i,r=this;return U(i=r)&&/^class\s/.test(Function.prototype.toString.call(i))?e=function(t){function e(){return t.apply(this,arguments)||this}return n(e,t),e}(r):(e=function(){(t.$constructor||r).apply(this,arguments)},O(e,this)),A(e.prototype,t),e[Ho]=!0,e.extend=this.extend,e.superCall=jo,e.superApply=qo,e.superClass=r,e}}function Xo(t,e){t.extend=e.extend}var Zo=Math.round(10*Math.random());function jo(t,e){for(var n=[],i=2;i<arguments.length;i++)n[i-2]=arguments[i];return this.superClass.prototype[e].apply(t,n)}function qo(t,e,n){return this.superClass.prototype[e].apply(t,n)}function Ko(t){var e={};t.registerClass=function(t){var n,i=t.type||t.prototype.type;if(i){lt(/^[a-zA-Z0-9_]+([.][a-zA-Z0-9_]+)?$/.test(n=i),'componentType "'+n+'" illegal'),t.prototype.type=i;var r=Yo(i);if(r.sub){if(r.sub!==Wo){var o=function(t){var n=e[t.main];n&&n[Wo]||((n=e[t.main]={})[Wo]=!0);return n}(r);o[r.sub]=t}}else e[r.main]=t}return t},t.getClass=function(t,n,i){var r=e[t];if(r&&r[Wo]&&(r=n?r[n]:null),i&&!r)throw new Error(n?"Component "+t+"."+(n||"")+" is used but not imported.":t+".type should be specified.");return r},t.getClassesByMainType=function(t){var n=Yo(t),i=[],r=e[n.main];return r&&r[Wo]?E(r,(function(t,e){e!==Wo&&i.push(t)})):i.push(r),i},t.hasClass=function(t){var n=Yo(t);return!!e[n.main]},t.getAllClassMainTypes=function(){var t=[];return E(e,(function(e,n){t.push(n)})),t},t.hasSubTypes=function(t){var n=Yo(t),i=e[n.main];return i&&i[Wo]}}function $o(t,e){for(var n=0;n<t.length;n++)t[n][1]||(t[n][1]=t[n][0]);return e=e||!1,function(n,i,r){for(var o={},a=0;a<t.length;a++){var s=t[a][1];if(!(i&&P(i,s)>=0||r&&P(r,s)<0)){var l=n.getShallow(s,e);null!=l&&(o[t[a][0]]=l)}}return o}}var Jo=$o([["fill","color"],["shadowBlur"],["shadowOffsetX"],["shadowOffsetY"],["opacity"],["shadowColor"]]),Qo=function(){function t(){}return t.prototype.getAreaStyle=function(t,e){return Jo(this,t,e)},t}(),ta=new Nn(50);function ea(t){if("string"==typeof t){var e=ta.get(t);return e&&e.image}return t}function na(t,e,n,i,r){if(t){if("string"==typeof t){if(e&&e.__zrImageSrc===t||!n)return e;var o=ta.get(t),a={hostEl:n,cb:i,cbPayload:r};return o?!ra(e=o.image)&&o.pending.push(a):((e=h.loadImage(t,ia,ia)).__zrImageSrc=t,ta.put(t,e.__cachedImgObj={image:e,pending:[a]})),e}return t}return e}function ia(){var t=this.__cachedImgObj;this.onload=this.onerror=this.__cachedImgObj=null;for(var e=0;e<t.pending.length;e++){var n=t.pending[e],i=n.cb;i&&i(this,n.cbPayload),n.hostEl.dirty()}t.pending.length=0}function ra(t){return t&&t.width&&t.height}var oa=/\{([a-zA-Z0-9_]+)\|([^}]*)\}/g;function aa(t,e,n,i,r){if(!e)return"";var o=(t+"").split("\n");r=sa(e,n,i,r);for(var a=0,s=o.length;a<s;a++)o[a]=la(o[a],r);return o.join("\n")}function sa(t,e,n,i){var r=A({},i=i||{});r.font=e,n=rt(n,"..."),r.maxIterations=rt(i.maxIterations,2);var o=r.minChar=rt(i.minChar,0);r.cnCharWidth=mr("国",e);var a=r.ascCharWidth=mr("a",e);r.placeholder=rt(i.placeholder,"");for(var s=t=Math.max(0,t-1),l=0;l<o&&s>=a;l++)s-=a;var u=mr(n,e);return u>s&&(n="",u=0),s=t-u,r.ellipsis=n,r.ellipsisWidth=u,r.contentWidth=s,r.containerWidth=t,r}function la(t,e){var n=e.containerWidth,i=e.font,r=e.contentWidth;if(!n)return"";var o=mr(t,i);if(o<=n)return t;for(var a=0;;a++){if(o<=r||a>=e.maxIterations){t+=e.ellipsis;break}var s=0===a?ua(t,r,e.ascCharWidth,e.cnCharWidth):o>0?Math.floor(t.length*r/o):0;o=mr(t=t.substr(0,s),i)}return""===t&&(t=e.placeholder),t}function ua(t,e,n,i){for(var r=0,o=0,a=t.length;o<a&&r<e;o++){var s=t.charCodeAt(o);r+=0<=s&&s<=127?n:i}return o}var ha=function(){},ca=function(t){this.tokens=[],t&&(this.tokens=t)},pa=function(){this.width=0,this.height=0,this.contentWidth=0,this.contentHeight=0,this.outerWidth=0,this.outerHeight=0,this.lines=[]};function da(t,e,n,i,r){var o,a,s=""===e,l=r&&n.rich[r]||{},u=t.lines,h=l.font||n.font,c=!1;if(i){var p=l.padding,d=p?p[1]+p[3]:0;if(null!=l.width&&"auto"!==l.width){var f=Mr(l.width,i.width)+d;u.length>0&&f+i.accumWidth>i.width&&(o=e.split("\n"),c=!0),i.accumWidth=f}else{var g=ya(e,h,i.width,i.breakAll,i.accumWidth);i.accumWidth=g.accumWidth+d,a=g.linesWidths,o=g.lines}}else o=e.split("\n");for(var y=0;y<o.length;y++){var v=o[y],m=new ha;if(m.styleName=r,m.text=v,m.isLineHolder=!v&&!s,"number"==typeof l.width?m.width=l.width:m.width=a?a[y]:mr(v,h),y||c)u.push(new ca([m]));else{var x=(u[u.length-1]||(u[0]=new ca)).tokens,_=x.length;1===_&&x[0].isLineHolder?x[0]=m:(v||!_||s)&&x.push(m)}}}var fa=V(",&?/;] ".split(""),(function(t,e){return t[e]=!0,t}),{});function ga(t){return!function(t){var e=t.charCodeAt(0);return e>=33&&e<=383}(t)||!!fa[t]}function ya(t,e,n,i,r){for(var o=[],a=[],s="",l="",u=0,h=0,c=0;c<t.length;c++){var p=t.charAt(c);if("\n"!==p){var d=mr(p,e),f=!i&&!ga(p);(o.length?h+d>n:r+h+d>n)?h?(s||l)&&(f?(s||(s=l,l="",h=u=0),o.push(s),a.push(h-u),l+=p,s="",h=u+=d):(l&&(s+=l,l="",u=0),o.push(s),a.push(h),s=p,h=d)):f?(o.push(l),a.push(u),l=p,u=d):(o.push(p),a.push(d)):(h+=d,f?(l+=p,u+=d):(l&&(s+=l,l="",u=0),s+=p))}else l&&(s+=l,h+=u),o.push(s),a.push(h),s="",l="",u=0,h=0}return o.length||s||(s=t,l="",u=0),l&&(s+=l),s&&(o.push(s),a.push(h)),1===o.length&&(h+=r),{accumWidth:h,lines:o,linesWidths:a}}var va="__zr_style_"+Math.round(10*Math.random()),ma={shadowBlur:0,shadowOffsetX:0,shadowOffsetY:0,shadowColor:"#000",opacity:1,blend:"source-over"},xa={style:{shadowBlur:!0,shadowOffsetX:!0,shadowOffsetY:!0,shadowColor:!0,opacity:!0}};ma[va]=!0;var _a=["z","z2","invisible"],ba=["invisible"],wa=function(t){function e(e){return t.call(this,e)||this}var i;return n(e,t),e.prototype._init=function(e){for(var n=G(e),i=0;i<n.length;i++){var r=n[i];"style"===r?this.useStyle(e[r]):t.prototype.attrKV.call(this,r,e[r])}this.style||this.useStyle({})},e.prototype.beforeBrush=function(){},e.prototype.afterBrush=function(){},e.prototype.innerBeforeBrush=function(){},e.prototype.innerAfterBrush=function(){},e.prototype.shouldBePainted=function(t,e,n,i){var r=this.transform;if(this.ignore||this.invisible||0===this.style.opacity||this.culling&&function(t,e,n){Sa.copy(t.getBoundingRect()),t.transform&&Sa.applyTransform(t.transform);return Ma.width=e,Ma.height=n,!Sa.intersect(Ma)}(this,t,e)||r&&!r[0]&&!r[3])return!1;if(n&&this.__clipPaths)for(var o=0;o<this.__clipPaths.length;++o)if(this.__clipPaths[o].isZeroArea())return!1;if(i&&this.parent)for(var a=this.parent;a;){if(a.ignore)return!1;a=a.parent}return!0},e.prototype.contain=function(t,e){return this.rectContain(t,e)},e.prototype.traverse=function(t,e){t.call(e,this)},e.prototype.rectContain=function(t,e){var n=this.transformCoordToLocal(t,e);return this.getBoundingRect().contain(n[0],n[1])},e.prototype.getPaintRect=function(){var t=this._paintRect;if(!this._paintRect||this.__dirty){var e=this.transform,n=this.getBoundingRect(),i=this.style,r=i.shadowBlur||0,o=i.shadowOffsetX||0,a=i.shadowOffsetY||0;t=this._paintRect||(this._paintRect=new Ee(0,0,0,0)),e?Ee.applyTransform(t,n,e):t.copy(n),(r||o||a)&&(t.width+=2*r+Math.abs(o),t.height+=2*r+Math.abs(a),t.x=Math.min(t.x,t.x+o-r),t.y=Math.min(t.y,t.y+a-r));var s=this.dirtyRectTolerance;t.isZero()||(t.x=Math.floor(t.x-s),t.y=Math.floor(t.y-s),t.width=Math.ceil(t.width+1+2*s),t.height=Math.ceil(t.height+1+2*s))}return t},e.prototype.setPrevPaintRect=function(t){t?(this._prevPaintRect=this._prevPaintRect||new Ee(0,0,0,0),this._prevPaintRect.copy(t)):this._prevPaintRect=null},e.prototype.getPrevPaintRect=function(){return this._prevPaintRect},e.prototype.animateStyle=function(t){return this.animate("style",t)},e.prototype.updateDuringAnimation=function(t){"style"===t?this.dirtyStyle():this.markRedraw()},e.prototype.attrKV=function(e,n){"style"!==e?t.prototype.attrKV.call(this,e,n):this.style?this.setStyle(n):this.useStyle(n)},e.prototype.setStyle=function(t,e){return"string"==typeof t?this.style[t]=e:A(this.style,t),this.dirtyStyle(),this},e.prototype.dirtyStyle=function(t){t||this.markRedraw(),this.__dirty|=2,this._rect&&(this._rect=null)},e.prototype.dirty=function(){this.dirtyStyle()},e.prototype.styleChanged=function(){return!!(2&this.__dirty)},e.prototype.styleUpdated=function(){this.__dirty&=-3},e.prototype.createStyle=function(t){return mt(ma,t)},e.prototype.useStyle=function(t){t[va]||(t=this.createStyle(t)),this.__inHover?this.__hoverStyle=t:this.style=t,this.dirtyStyle()},e.prototype.isStyleObject=function(t){return t[va]},e.prototype._innerSaveToNormal=function(e){t.prototype._innerSaveToNormal.call(this,e);var n=this._normalState;e.style&&!n.style&&(n.style=this._mergeStyle(this.createStyle(),this.style)),this._savePrimaryToNormal(e,n,_a)},e.prototype._applyStateObj=function(e,n,i,r,o,a){t.prototype._applyStateObj.call(this,e,n,i,r,o,a);var s,l=!(n&&r);if(n&&n.style?o?r?s=n.style:(s=this._mergeStyle(this.createStyle(),i.style),this._mergeStyle(s,n.style)):(s=this._mergeStyle(this.createStyle(),r?this.style:i.style),this._mergeStyle(s,n.style)):l&&(s=i.style),s)if(o){var u=this.style;if(this.style=this.createStyle(l?{}:u),l)for(var h=G(u),c=0;c<h.length;c++){(d=h[c])in s&&(s[d]=s[d],this.style[d]=u[d])}var p=G(s);for(c=0;c<p.length;c++){var d=p[c];this.style[d]=this.style[d]}this._transitionState(e,{style:s},a,this.getAnimationStyleProps())}else this.useStyle(s);var f=this.__inHover?ba:_a;for(c=0;c<f.length;c++){d=f[c];n&&null!=n[d]?this[d]=n[d]:l&&null!=i[d]&&(this[d]=i[d])}},e.prototype._mergeStates=function(e){for(var n,i=t.prototype._mergeStates.call(this,e),r=0;r<e.length;r++){var o=e[r];o.style&&(n=n||{},this._mergeStyle(n,o.style))}return n&&(i.style=n),i},e.prototype._mergeStyle=function(t,e){return A(t,e),t},e.prototype.getAnimationStyleProps=function(){return xa},e.initDefaultProps=((i=e.prototype).type="displayable",i.invisible=!1,i.z=0,i.z2=0,i.zlevel=0,i.culling=!1,i.cursor="pointer",i.rectHover=!1,i.incremental=!1,i._rect=null,i.dirtyRectTolerance=0,void(i.__dirty=3)),e}(Lr),Sa=new Ee(0,0,0,0),Ma=new Ee(0,0,0,0);var Ia=Math.min,Ta=Math.max,Ca=Math.sin,Da=Math.cos,Aa=2*Math.PI,ka=Mt(),La=Mt(),Pa=Mt();function Oa(t,e,n){if(0!==t.length){for(var i=t[0],r=i[0],o=i[0],a=i[1],s=i[1],l=1;l<t.length;l++)i=t[l],r=Ia(r,i[0]),o=Ta(o,i[0]),a=Ia(a,i[1]),s=Ta(s,i[1]);e[0]=r,e[1]=a,n[0]=o,n[1]=s}}function Ra(t,e,n,i,r,o){r[0]=Ia(t,n),r[1]=Ia(e,i),o[0]=Ta(t,n),o[1]=Ta(e,i)}var Na=[],Ea=[];function za(t,e,n,i,r,o,a,s,l,u){var h=_n,c=vn,p=h(t,n,r,a,Na);l[0]=1/0,l[1]=1/0,u[0]=-1/0,u[1]=-1/0;for(var d=0;d<p;d++){var f=c(t,n,r,a,Na[d]);l[0]=Ia(f,l[0]),u[0]=Ta(f,u[0])}p=h(e,i,o,s,Ea);for(d=0;d<p;d++){var g=c(e,i,o,s,Ea[d]);l[1]=Ia(g,l[1]),u[1]=Ta(g,u[1])}l[0]=Ia(t,l[0]),u[0]=Ta(t,u[0]),l[0]=Ia(a,l[0]),u[0]=Ta(a,u[0]),l[1]=Ia(e,l[1]),u[1]=Ta(e,u[1]),l[1]=Ia(s,l[1]),u[1]=Ta(s,u[1])}function Va(t,e,n,i,r,o,a,s){var l=Tn,u=Mn,h=Ta(Ia(l(t,n,r),1),0),c=Ta(Ia(l(e,i,o),1),0),p=u(t,n,r,h),d=u(e,i,o,c);a[0]=Ia(t,r,p),a[1]=Ia(e,o,d),s[0]=Ta(t,r,p),s[1]=Ta(e,o,d)}function Ba(t,e,n,i,r,o,a,s,l){var u=Ht,h=Yt,c=Math.abs(r-o);if(c%Aa<1e-4&&c>1e-4)return s[0]=t-n,s[1]=e-i,l[0]=t+n,void(l[1]=e+i);if(ka[0]=Da(r)*n+t,ka[1]=Ca(r)*i+e,La[0]=Da(o)*n+t,La[1]=Ca(o)*i+e,u(s,ka,La),h(l,ka,La),(r%=Aa)<0&&(r+=Aa),(o%=Aa)<0&&(o+=Aa),r>o&&!a?o+=Aa:r<o&&a&&(r+=Aa),a){var p=o;o=r,r=p}for(var d=0;d<o;d+=Math.PI/2)d>r&&(Pa[0]=Da(d)*n+t,Pa[1]=Ca(d)*i+e,u(s,Pa,s),h(l,Pa,l))}var Fa={M:1,L:2,C:3,Q:4,A:5,Z:6,R:7},Ga=[],Wa=[],Ha=[],Ya=[],Ua=[],Xa=[],Za=Math.min,ja=Math.max,qa=Math.cos,Ka=Math.sin,$a=Math.abs,Ja=Math.PI,Qa=2*Ja,ts="undefined"!=typeof Float32Array,es=[];function ns(t){return Math.round(t/Ja*1e8)/1e8%2*Ja}function is(t,e){var n=ns(t[0]);n<0&&(n+=Qa);var i=n-t[0],r=t[1];r+=i,!e&&r-n>=Qa?r=n+Qa:e&&n-r>=Qa?r=n-Qa:!e&&n>r?r=n+(Qa-ns(n-r)):e&&n<r&&(r=n-(Qa-ns(r-n))),t[0]=n,t[1]=r}var rs=function(){function t(t){this.dpr=1,this._xi=0,this._yi=0,this._x0=0,this._y0=0,this._len=0,t&&(this._saveData=!1),this._saveData&&(this.data=[])}return t.prototype.increaseVersion=function(){this._version++},t.prototype.getVersion=function(){return this._version},t.prototype.setScale=function(t,e,n){(n=n||0)>0&&(this._ux=$a(n/rr/t)||0,this._uy=$a(n/rr/e)||0)},t.prototype.setDPR=function(t){this.dpr=t},t.prototype.setContext=function(t){this._ctx=t},t.prototype.getContext=function(){return this._ctx},t.prototype.beginPath=function(){return this._ctx&&this._ctx.beginPath(),this.reset(),this},t.prototype.reset=function(){this._saveData&&(this._len=0),this._pathSegLen&&(this._pathSegLen=null,this._pathLen=0),this._version++},t.prototype.moveTo=function(t,e){return this._drawPendingPt(),this.addData(Fa.M,t,e),this._ctx&&this._ctx.moveTo(t,e),this._x0=t,this._y0=e,this._xi=t,this._yi=e,this},t.prototype.lineTo=function(t,e){var n=$a(t-this._xi),i=$a(e-this._yi),r=n>this._ux||i>this._uy;if(this.addData(Fa.L,t,e),this._ctx&&r&&this._ctx.lineTo(t,e),r)this._xi=t,this._yi=e,this._pendingPtDist=0;else{var o=n*n+i*i;o>this._pendingPtDist&&(this._pendingPtX=t,this._pendingPtY=e,this._pendingPtDist=o)}return this},t.prototype.bezierCurveTo=function(t,e,n,i,r,o){return this._drawPendingPt(),this.addData(Fa.C,t,e,n,i,r,o),this._ctx&&this._ctx.bezierCurveTo(t,e,n,i,r,o),this._xi=r,this._yi=o,this},t.prototype.quadraticCurveTo=function(t,e,n,i){return this._drawPendingPt(),this.addData(Fa.Q,t,e,n,i),this._ctx&&this._ctx.quadraticCurveTo(t,e,n,i),this._xi=n,this._yi=i,this},t.prototype.arc=function(t,e,n,i,r,o){this._drawPendingPt(),es[0]=i,es[1]=r,is(es,o),i=es[0];var a=(r=es[1])-i;return this.addData(Fa.A,t,e,n,n,i,a,0,o?0:1),this._ctx&&this._ctx.arc(t,e,n,i,r,o),this._xi=qa(r)*n+t,this._yi=Ka(r)*n+e,this},t.prototype.arcTo=function(t,e,n,i,r){return this._drawPendingPt(),this._ctx&&this._ctx.arcTo(t,e,n,i,r),this},t.prototype.rect=function(t,e,n,i){return this._drawPendingPt(),this._ctx&&this._ctx.rect(t,e,n,i),this.addData(Fa.R,t,e,n,i),this},t.prototype.closePath=function(){this._drawPendingPt(),this.addData(Fa.Z);var t=this._ctx,e=this._x0,n=this._y0;return t&&t.closePath(),this._xi=e,this._yi=n,this},t.prototype.fill=function(t){t&&t.fill(),this.toStatic()},t.prototype.stroke=function(t){t&&t.stroke(),this.toStatic()},t.prototype.len=function(){return this._len},t.prototype.setData=function(t){var e=t.length;this.data&&this.data.length===e||!ts||(this.data=new Float32Array(e));for(var n=0;n<e;n++)this.data[n]=t[n];this._len=e},t.prototype.appendPath=function(t){t instanceof Array||(t=[t]);for(var e=t.length,n=0,i=this._len,r=0;r<e;r++)n+=t[r].len();ts&&this.data instanceof Float32Array&&(this.data=new Float32Array(i+n));for(r=0;r<e;r++)for(var o=t[r].data,a=0;a<o.length;a++)this.data[i++]=o[a];this._len=i},t.prototype.addData=function(t,e,n,i,r,o,a,s,l){if(this._saveData){var u=this.data;this._len+arguments.length>u.length&&(this._expandData(),u=this.data);for(var h=0;h<arguments.length;h++)u[this._len++]=arguments[h]}},t.prototype._drawPendingPt=function(){this._pendingPtDist>0&&(this._ctx&&this._ctx.lineTo(this._pendingPtX,this._pendingPtY),this._pendingPtDist=0)},t.prototype._expandData=function(){if(!(this.data instanceof Array)){for(var t=[],e=0;e<this._len;e++)t[e]=this.data[e];this.data=t}},t.prototype.toStatic=function(){if(this._saveData){this._drawPendingPt();var t=this.data;t instanceof Array&&(t.length=this._len,ts&&this._len>11&&(this.data=new Float32Array(t)))}},t.prototype.getBoundingRect=function(){Ha[0]=Ha[1]=Ua[0]=Ua[1]=Number.MAX_VALUE,Ya[0]=Ya[1]=Xa[0]=Xa[1]=-Number.MAX_VALUE;var t,e=this.data,n=0,i=0,r=0,o=0;for(t=0;t<this._len;){var a=e[t++],s=1===t;switch(s&&(r=n=e[t],o=i=e[t+1]),a){case Fa.M:n=r=e[t++],i=o=e[t++],Ua[0]=r,Ua[1]=o,Xa[0]=r,Xa[1]=o;break;case Fa.L:Ra(n,i,e[t],e[t+1],Ua,Xa),n=e[t++],i=e[t++];break;case Fa.C:za(n,i,e[t++],e[t++],e[t++],e[t++],e[t],e[t+1],Ua,Xa),n=e[t++],i=e[t++];break;case Fa.Q:Va(n,i,e[t++],e[t++],e[t],e[t+1],Ua,Xa),n=e[t++],i=e[t++];break;case Fa.A:var l=e[t++],u=e[t++],h=e[t++],c=e[t++],p=e[t++],d=e[t++]+p;t+=1;var f=!e[t++];s&&(r=qa(p)*h+l,o=Ka(p)*c+u),Ba(l,u,h,c,p,d,f,Ua,Xa),n=qa(d)*h+l,i=Ka(d)*c+u;break;case Fa.R:Ra(r=n=e[t++],o=i=e[t++],r+e[t++],o+e[t++],Ua,Xa);break;case Fa.Z:n=r,i=o}Ht(Ha,Ha,Ua),Yt(Ya,Ya,Xa)}return 0===t&&(Ha[0]=Ha[1]=Ya[0]=Ya[1]=0),new Ee(Ha[0],Ha[1],Ya[0]-Ha[0],Ya[1]-Ha[1])},t.prototype._calculateLength=function(){var t=this.data,e=this._len,n=this._ux,i=this._uy,r=0,o=0,a=0,s=0;this._pathSegLen||(this._pathSegLen=[]);for(var l=this._pathSegLen,u=0,h=0,c=0;c<e;){var p=t[c++],d=1===c;d&&(a=r=t[c],s=o=t[c+1]);var f=-1;switch(p){case Fa.M:r=a=t[c++],o=s=t[c++];break;case Fa.L:var g=t[c++],y=(x=t[c++])-o;($a(A=g-r)>n||$a(y)>i||c===e-1)&&(f=Math.sqrt(A*A+y*y),r=g,o=x);break;case Fa.C:var v=t[c++],m=t[c++],x=(g=t[c++],t[c++]),_=t[c++],b=t[c++];f=Sn(r,o,v,m,g,x,_,b,10),r=_,o=b;break;case Fa.Q:f=An(r,o,v=t[c++],m=t[c++],g=t[c++],x=t[c++],10),r=g,o=x;break;case Fa.A:var w=t[c++],S=t[c++],M=t[c++],I=t[c++],T=t[c++],C=t[c++],D=C+T;c+=1;t[c++];d&&(a=qa(T)*M+w,s=Ka(T)*I+S),f=ja(M,I)*Za(Qa,Math.abs(C)),r=qa(D)*M+w,o=Ka(D)*I+S;break;case Fa.R:a=r=t[c++],s=o=t[c++],f=2*t[c++]+2*t[c++];break;case Fa.Z:var A=a-r;y=s-o;f=Math.sqrt(A*A+y*y),r=a,o=s}f>=0&&(l[h++]=f,u+=f)}return this._pathLen=u,u},t.prototype.rebuildPath=function(t,e){var n,i,r,o,a,s,l,u,h,c,p=this.data,d=this._ux,f=this._uy,g=this._len,y=e<1,v=0,m=0,x=0;if(!y||(this._pathSegLen||this._calculateLength(),l=this._pathSegLen,u=e*this._pathLen))t:for(var _=0;_<g;){var b=p[_++],w=1===_;switch(w&&(n=r=p[_],i=o=p[_+1]),b!==Fa.L&&x>0&&(t.lineTo(h,c),x=0),b){case Fa.M:n=r=p[_++],i=o=p[_++],t.moveTo(r,o);break;case Fa.L:a=p[_++],s=p[_++];var S=$a(a-r),M=$a(s-o);if(S>d||M>f){if(y){if(v+(j=l[m++])>u){var I=(u-v)/j;t.lineTo(r*(1-I)+a*I,o*(1-I)+s*I);break t}v+=j}t.lineTo(a,s),r=a,o=s,x=0}else{var T=S*S+M*M;T>x&&(h=a,c=s,x=T)}break;case Fa.C:var C=p[_++],D=p[_++],A=p[_++],k=p[_++],L=p[_++],P=p[_++];if(y){if(v+(j=l[m++])>u){bn(r,C,A,L,I=(u-v)/j,Ga),bn(o,D,k,P,I,Wa),t.bezierCurveTo(Ga[1],Wa[1],Ga[2],Wa[2],Ga[3],Wa[3]);break t}v+=j}t.bezierCurveTo(C,D,A,k,L,P),r=L,o=P;break;case Fa.Q:C=p[_++],D=p[_++],A=p[_++],k=p[_++];if(y){if(v+(j=l[m++])>u){Cn(r,C,A,I=(u-v)/j,Ga),Cn(o,D,k,I,Wa),t.quadraticCurveTo(Ga[1],Wa[1],Ga[2],Wa[2]);break t}v+=j}t.quadraticCurveTo(C,D,A,k),r=A,o=k;break;case Fa.A:var O=p[_++],R=p[_++],N=p[_++],E=p[_++],z=p[_++],V=p[_++],B=p[_++],F=!p[_++],G=N>E?N:E,W=$a(N-E)>.001,H=z+V,Y=!1;if(y)v+(j=l[m++])>u&&(H=z+V*(u-v)/j,Y=!0),v+=j;if(W&&t.ellipse?t.ellipse(O,R,N,E,B,z,H,F):t.arc(O,R,G,z,H,F),Y)break t;w&&(n=qa(z)*N+O,i=Ka(z)*E+R),r=qa(H)*N+O,o=Ka(H)*E+R;break;case Fa.R:n=r=p[_],i=o=p[_+1],a=p[_++],s=p[_++];var U=p[_++],X=p[_++];if(y){if(v+(j=l[m++])>u){var Z=u-v;t.moveTo(a,s),t.lineTo(a+Za(Z,U),s),(Z-=U)>0&&t.lineTo(a+U,s+Za(Z,X)),(Z-=X)>0&&t.lineTo(a+ja(U-Z,0),s+X),(Z-=U)>0&&t.lineTo(a,s+ja(X-Z,0));break t}v+=j}t.rect(a,s,U,X);break;case Fa.Z:if(y){var j;if(v+(j=l[m++])>u){I=(u-v)/j;t.lineTo(r*(1-I)+n*I,o*(1-I)+i*I);break t}v+=j}t.closePath(),r=n,o=i}}},t.prototype.clone=function(){var e=new t,n=this.data;return e.data=n.slice?n.slice():Array.prototype.slice.call(n),e._len=this._len,e},t.CMD=Fa,t.initDefaultProps=function(){var e=t.prototype;e._saveData=!0,e._ux=0,e._uy=0,e._pendingPtDist=0,e._version=0}(),t}();function os(t,e,n,i,r,o,a){if(0===r)return!1;var s=r,l=0;if(a>e+s&&a>i+s||a<e-s&&a<i-s||o>t+s&&o>n+s||o<t-s&&o<n-s)return!1;if(t===n)return Math.abs(o-t)<=s/2;var u=(l=(e-i)/(t-n))*o-a+(t*i-n*e)/(t-n);return u*u/(l*l+1)<=s/2*s/2}function as(t,e,n,i,r,o,a,s,l,u,h){if(0===l)return!1;var c=l;return!(h>e+c&&h>i+c&&h>o+c&&h>s+c||h<e-c&&h<i-c&&h<o-c&&h<s-c||u>t+c&&u>n+c&&u>r+c&&u>a+c||u<t-c&&u<n-c&&u<r-c&&u<a-c)&&wn(t,e,n,i,r,o,a,s,u,h,null)<=c/2}function ss(t,e,n,i,r,o,a,s,l){if(0===a)return!1;var u=a;return!(l>e+u&&l>i+u&&l>o+u||l<e-u&&l<i-u&&l<o-u||s>t+u&&s>n+u&&s>r+u||s<t-u&&s<n-u&&s<r-u)&&Dn(t,e,n,i,r,o,s,l,null)<=u/2}var ls=2*Math.PI;function us(t){return(t%=ls)<0&&(t+=ls),t}var hs=2*Math.PI;function cs(t,e,n,i,r,o,a,s,l){if(0===a)return!1;var u=a;s-=t,l-=e;var h=Math.sqrt(s*s+l*l);if(h-u>n||h+u<n)return!1;if(Math.abs(i-r)%hs<1e-4)return!0;if(o){var c=i;i=us(r),r=us(c)}else i=us(i),r=us(r);i>r&&(r+=hs);var p=Math.atan2(l,s);return p<0&&(p+=hs),p>=i&&p<=r||p+hs>=i&&p+hs<=r}function ps(t,e,n,i,r,o){if(o>e&&o>i||o<e&&o<i)return 0;if(i===e)return 0;var a=(o-e)/(i-e),s=i<e?1:-1;1!==a&&0!==a||(s=i<e?.5:-.5);var l=a*(n-t)+t;return l===r?1/0:l>r?s:0}var ds=rs.CMD,fs=2*Math.PI;var gs=[-1,-1,-1],ys=[-1,-1];function vs(t,e,n,i,r,o,a,s,l,u){if(u>e&&u>i&&u>o&&u>s||u<e&&u<i&&u<o&&u<s)return 0;var h,c=xn(e,i,o,s,u,gs);if(0===c)return 0;for(var p=0,d=-1,f=void 0,g=void 0,y=0;y<c;y++){var v=gs[y],m=0===v||1===v?.5:1;vn(t,n,r,a,v)<l||(d<0&&(d=_n(e,i,o,s,ys),ys[1]<ys[0]&&d>1&&(h=void 0,h=ys[0],ys[0]=ys[1],ys[1]=h),f=vn(e,i,o,s,ys[0]),d>1&&(g=vn(e,i,o,s,ys[1]))),2===d?v<ys[0]?p+=f<e?m:-m:v<ys[1]?p+=g<f?m:-m:p+=s<g?m:-m:v<ys[0]?p+=f<e?m:-m:p+=s<f?m:-m)}return p}function ms(t,e,n,i,r,o,a,s){if(s>e&&s>i&&s>o||s<e&&s<i&&s<o)return 0;var l=function(t,e,n,i,r){var o=t-2*e+n,a=2*(e-t),s=t-i,l=0;if(gn(o))yn(a)&&(h=-s/a)>=0&&h<=1&&(r[l++]=h);else{var u=a*a-4*o*s;if(gn(u))(h=-a/(2*o))>=0&&h<=1&&(r[l++]=h);else if(u>0){var h,c=sn(u),p=(-a-c)/(2*o);(h=(-a+c)/(2*o))>=0&&h<=1&&(r[l++]=h),p>=0&&p<=1&&(r[l++]=p)}}return l}(e,i,o,s,gs);if(0===l)return 0;var u=Tn(e,i,o);if(u>=0&&u<=1){for(var h=0,c=Mn(e,i,o,u),p=0;p<l;p++){var d=0===gs[p]||1===gs[p]?.5:1;Mn(t,n,r,gs[p])<a||(gs[p]<u?h+=c<e?d:-d:h+=o<c?d:-d)}return h}d=0===gs[0]||1===gs[0]?.5:1;return Mn(t,n,r,gs[0])<a?0:o<e?d:-d}function xs(t,e,n,i,r,o,a,s){if((s-=e)>n||s<-n)return 0;var l=Math.sqrt(n*n-s*s);gs[0]=-l,gs[1]=l;var u=Math.abs(i-r);if(u<1e-4)return 0;if(u>=fs-1e-4){i=0,r=fs;var h=o?1:-1;return a>=gs[0]+t&&a<=gs[1]+t?h:0}if(i>r){var c=i;i=r,r=c}i<0&&(i+=fs,r+=fs);for(var p=0,d=0;d<2;d++){var f=gs[d];if(f+t>a){var g=Math.atan2(s,f);h=o?1:-1;g<0&&(g=fs+g),(g>=i&&g<=r||g+fs>=i&&g+fs<=r)&&(g>Math.PI/2&&g<1.5*Math.PI&&(h=-h),p+=h)}}return p}function _s(t,e,n,i,r){for(var o,a,s,l,u=t.data,h=t.len(),c=0,p=0,d=0,f=0,g=0,y=0;y<h;){var v=u[y++],m=1===y;switch(v===ds.M&&y>1&&(n||(c+=ps(p,d,f,g,i,r))),m&&(f=p=u[y],g=d=u[y+1]),v){case ds.M:p=f=u[y++],d=g=u[y++];break;case ds.L:if(n){if(os(p,d,u[y],u[y+1],e,i,r))return!0}else c+=ps(p,d,u[y],u[y+1],i,r)||0;p=u[y++],d=u[y++];break;case ds.C:if(n){if(as(p,d,u[y++],u[y++],u[y++],u[y++],u[y],u[y+1],e,i,r))return!0}else c+=vs(p,d,u[y++],u[y++],u[y++],u[y++],u[y],u[y+1],i,r)||0;p=u[y++],d=u[y++];break;case ds.Q:if(n){if(ss(p,d,u[y++],u[y++],u[y],u[y+1],e,i,r))return!0}else c+=ms(p,d,u[y++],u[y++],u[y],u[y+1],i,r)||0;p=u[y++],d=u[y++];break;case ds.A:var x=u[y++],_=u[y++],b=u[y++],w=u[y++],S=u[y++],M=u[y++];y+=1;var I=!!(1-u[y++]);o=Math.cos(S)*b+x,a=Math.sin(S)*w+_,m?(f=o,g=a):c+=ps(p,d,o,a,i,r);var T=(i-x)*w/b+x;if(n){if(cs(x,_,w,S,S+M,I,e,T,r))return!0}else c+=xs(x,_,w,S,S+M,I,T,r);p=Math.cos(S+M)*b+x,d=Math.sin(S+M)*w+_;break;case ds.R:if(f=p=u[y++],g=d=u[y++],o=f+u[y++],a=g+u[y++],n){if(os(f,g,o,g,e,i,r)||os(o,g,o,a,e,i,r)||os(o,a,f,a,e,i,r)||os(f,a,f,g,e,i,r))return!0}else c+=ps(o,g,o,a,i,r),c+=ps(f,a,f,g,i,r);break;case ds.Z:if(n){if(os(p,d,f,g,e,i,r))return!0}else c+=ps(p,d,f,g,i,r);p=f,d=g}}return n||(s=d,l=g,Math.abs(s-l)<1e-4)||(c+=ps(p,d,f,g,i,r)||0),0!==c}var bs=k({fill:"#000",stroke:null,strokePercent:1,fillOpacity:1,strokeOpacity:1,lineDashOffset:0,lineWidth:1,lineCap:"butt",miterLimit:10,strokeNoScale:!1,strokeFirst:!1},ma),ws={style:k({fill:!0,stroke:!0,strokePercent:!0,fillOpacity:!0,strokeOpacity:!0,lineDashOffset:!0,lineWidth:!0,miterLimit:!0},xa.style)},Ss=gr.concat(["invisible","culling","z","z2","zlevel","parent"]),Ms=function(t){function e(e){return t.call(this,e)||this}var i;return n(e,t),e.prototype.update=function(){var n=this;t.prototype.update.call(this);var i=this.style;if(i.decal){var r=this._decalEl=this._decalEl||new e;r.buildPath===e.prototype.buildPath&&(r.buildPath=function(t){n.buildPath(t,n.shape)}),r.silent=!0;var o=r.style;for(var a in i)o[a]!==i[a]&&(o[a]=i[a]);o.fill=i.fill?i.decal:null,o.decal=null,o.shadowColor=null,i.strokeFirst&&(o.stroke=null);for(var s=0;s<Ss.length;++s)r[Ss[s]]=this[Ss[s]];r.__dirty|=1}else this._decalEl&&(this._decalEl=null)},e.prototype.getDecalElement=function(){return this._decalEl},e.prototype._init=function(e){var n=G(e);this.shape=this.getDefaultShape();var i=this.getDefaultStyle();i&&this.useStyle(i);for(var r=0;r<n.length;r++){var o=n[r],a=e[o];"style"===o?this.style?A(this.style,a):this.useStyle(a):"shape"===o?A(this.shape,a):t.prototype.attrKV.call(this,o,a)}this.style||this.useStyle({})},e.prototype.getDefaultStyle=function(){return null},e.prototype.getDefaultShape=function(){return{}},e.prototype.canBeInsideText=function(){return this.hasFill()},e.prototype.getInsideTextFill=function(){var t=this.style.fill;if("none"!==t){if(X(t)){var e=ri(t,0);return e>.5?or:e>.2?"#eee":ar}if(t)return ar}return or},e.prototype.getInsideTextStroke=function(t){var e=this.style.fill;if(X(e)){var n=this.__zr;if(!(!n||!n.isDarkMode())===ri(t,0)<.4)return e}},e.prototype.buildPath=function(t,e,n){},e.prototype.pathUpdated=function(){this.__dirty&=-5},e.prototype.getUpdatedPathProxy=function(t){return!this.path&&this.createPathProxy(),this.path.beginPath(),this.buildPath(this.path,this.shape,t),this.path},e.prototype.createPathProxy=function(){this.path=new rs(!1)},e.prototype.hasStroke=function(){var t=this.style,e=t.stroke;return!(null==e||"none"===e||!(t.lineWidth>0))},e.prototype.hasFill=function(){var t=this.style.fill;return null!=t&&"none"!==t},e.prototype.getBoundingRect=function(){var t=this._rect,e=this.style,n=!t;if(n){var i=!1;this.path||(i=!0,this.createPathProxy());var r=this.path;(i||4&this.__dirty)&&(r.beginPath(),this.buildPath(r,this.shape,!1),this.pathUpdated()),t=r.getBoundingRect()}if(this._rect=t,this.hasStroke()&&this.path&&this.path.len()>0){var o=this._rectStroke||(this._rectStroke=t.clone());if(this.__dirty||n){o.copy(t);var a=e.strokeNoScale?this.getLineScale():1,s=e.lineWidth;if(!this.hasFill()){var l=this.strokeContainThreshold;s=Math.max(s,null==l?4:l)}a>1e-10&&(o.width+=s/a,o.height+=s/a,o.x-=s/a/2,o.y-=s/a/2)}return o}return t},e.prototype.contain=function(t,e){var n=this.transformCoordToLocal(t,e),i=this.getBoundingRect(),r=this.style;if(t=n[0],e=n[1],i.contain(t,e)){var o=this.path;if(this.hasStroke()){var a=r.lineWidth,s=r.strokeNoScale?this.getLineScale():1;if(s>1e-10&&(this.hasFill()||(a=Math.max(a,this.strokeContainThreshold)),function(t,e,n,i){return _s(t,e,!0,n,i)}(o,a/s,t,e)))return!0}if(this.hasFill())return function(t,e,n){return _s(t,0,!1,e,n)}(o,t,e)}return!1},e.prototype.dirtyShape=function(){this.__dirty|=4,this._rect&&(this._rect=null),this._decalEl&&this._decalEl.dirtyShape(),this.markRedraw()},e.prototype.dirty=function(){this.dirtyStyle(),this.dirtyShape()},e.prototype.animateShape=function(t){return this.animate("shape",t)},e.prototype.updateDuringAnimation=function(t){"style"===t?this.dirtyStyle():"shape"===t?this.dirtyShape():this.markRedraw()},e.prototype.attrKV=function(e,n){"shape"===e?this.setShape(n):t.prototype.attrKV.call(this,e,n)},e.prototype.setShape=function(t,e){var n=this.shape;return n||(n=this.shape={}),"string"==typeof t?n[t]=e:A(n,t),this.dirtyShape(),this},e.prototype.shapeChanged=function(){return!!(4&this.__dirty)},e.prototype.createStyle=function(t){return mt(bs,t)},e.prototype._innerSaveToNormal=function(e){t.prototype._innerSaveToNormal.call(this,e);var n=this._normalState;e.shape&&!n.shape&&(n.shape=A({},this.shape))},e.prototype._applyStateObj=function(e,n,i,r,o,a){t.prototype._applyStateObj.call(this,e,n,i,r,o,a);var s,l=!(n&&r);if(n&&n.shape?o?r?s=n.shape:(s=A({},i.shape),A(s,n.shape)):(s=A({},r?this.shape:i.shape),A(s,n.shape)):l&&(s=i.shape),s)if(o){this.shape=A({},this.shape);for(var u={},h=G(s),c=0;c<h.length;c++){var p=h[c];"object"==typeof s[p]?this.shape[p]=s[p]:u[p]=s[p]}this._transitionState(e,{shape:u},a)}else this.shape=s,this.dirtyShape()},e.prototype._mergeStates=function(e){for(var n,i=t.prototype._mergeStates.call(this,e),r=0;r<e.length;r++){var o=e[r];o.shape&&(n=n||{},this._mergeStyle(n,o.shape))}return n&&(i.shape=n),i},e.prototype.getAnimationStyleProps=function(){return ws},e.prototype.isZeroArea=function(){return!1},e.extend=function(t){var i=function(e){function i(n){var i=e.call(this,n)||this;return t.init&&t.init.call(i,n),i}return n(i,e),i.prototype.getDefaultStyle=function(){return T(t.style)},i.prototype.getDefaultShape=function(){return T(t.shape)},i}(e);for(var r in t)"function"==typeof t[r]&&(i.prototype[r]=t[r]);return i},e.initDefaultProps=((i=e.prototype).type="path",i.strokeContainThreshold=5,i.segmentIgnoreThreshold=0,i.subPixelOptimize=!1,i.autoBatch=!1,void(i.__dirty=7)),e}(wa),Is=k({strokeFirst:!0,font:a,x:0,y:0,textAlign:"left",textBaseline:"top",miterLimit:2},bs),Ts=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.prototype.hasStroke=function(){var t=this.style,e=t.stroke;return null!=e&&"none"!==e&&t.lineWidth>0},e.prototype.hasFill=function(){var t=this.style.fill;return null!=t&&"none"!==t},e.prototype.createStyle=function(t){return mt(Is,t)},e.prototype.setBoundingRect=function(t){this._rect=t},e.prototype.getBoundingRect=function(){var t=this.style;if(!this._rect){var e=t.text;null!=e?e+="":e="";var n=_r(e,t.font,t.textAlign,t.textBaseline);if(n.x+=t.x||0,n.y+=t.y||0,this.hasStroke()){var i=t.lineWidth;n.x-=i/2,n.y-=i/2,n.width+=i,n.height+=i}this._rect=n}return this._rect},e.initDefaultProps=void(e.prototype.dirtyRectTolerance=10),e}(wa);Ts.prototype.type="tspan";var Cs=k({x:0,y:0},ma),Ds={style:k({x:!0,y:!0,width:!0,height:!0,sx:!0,sy:!0,sWidth:!0,sHeight:!0},xa.style)};var As=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.prototype.createStyle=function(t){return mt(Cs,t)},e.prototype._getSize=function(t){var e=this.style,n=e[t];if(null!=n)return n;var i,r=(i=e.image)&&"string"!=typeof i&&i.width&&i.height?e.image:this.__image;if(!r)return 0;var o="width"===t?"height":"width",a=e[o];return null==a?r[t]:r[t]/r[o]*a},e.prototype.getWidth=function(){return this._getSize("width")},e.prototype.getHeight=function(){return this._getSize("height")},e.prototype.getAnimationStyleProps=function(){return Ds},e.prototype.getBoundingRect=function(){var t=this.style;return this._rect||(this._rect=new Ee(t.x||0,t.y||0,this.getWidth(),this.getHeight())),this._rect},e}(wa);As.prototype.type="image";var ks=Math.round;function Ls(t,e,n){if(e){var i=e.x1,r=e.x2,o=e.y1,a=e.y2;t.x1=i,t.x2=r,t.y1=o,t.y2=a;var s=n&&n.lineWidth;return s?(ks(2*i)===ks(2*r)&&(t.x1=t.x2=Os(i,s,!0)),ks(2*o)===ks(2*a)&&(t.y1=t.y2=Os(o,s,!0)),t):t}}function Ps(t,e,n){if(e){var i=e.x,r=e.y,o=e.width,a=e.height;t.x=i,t.y=r,t.width=o,t.height=a;var s=n&&n.lineWidth;return s?(t.x=Os(i,s,!0),t.y=Os(r,s,!0),t.width=Math.max(Os(i+o,s,!1)-t.x,0===o?0:1),t.height=Math.max(Os(r+a,s,!1)-t.y,0===a?0:1),t):t}}function Os(t,e,n){if(!e)return t;var i=ks(2*t);return(i+ks(e))%2==0?i/2:(i+(n?1:-1))/2}var Rs=function(){this.x=0,this.y=0,this.width=0,this.height=0},Ns={},Es=function(t){function e(e){return t.call(this,e)||this}return n(e,t),e.prototype.getDefaultShape=function(){return new Rs},e.prototype.buildPath=function(t,e){var n,i,r,o;if(this.subPixelOptimize){var a=Ps(Ns,e,this.style);n=a.x,i=a.y,r=a.width,o=a.height,a.r=e.r,e=a}else n=e.x,i=e.y,r=e.width,o=e.height;e.r?function(t,e){var n,i,r,o,a,s=e.x,l=e.y,u=e.width,h=e.height,c=e.r;u<0&&(s+=u,u=-u),h<0&&(l+=h,h=-h),"number"==typeof c?n=i=r=o=c:c instanceof Array?1===c.length?n=i=r=o=c[0]:2===c.length?(n=r=c[0],i=o=c[1]):3===c.length?(n=c[0],i=o=c[1],r=c[2]):(n=c[0],i=c[1],r=c[2],o=c[3]):n=i=r=o=0,n+i>u&&(n*=u/(a=n+i),i*=u/a),r+o>u&&(r*=u/(a=r+o),o*=u/a),i+r>h&&(i*=h/(a=i+r),r*=h/a),n+o>h&&(n*=h/(a=n+o),o*=h/a),t.moveTo(s+n,l),t.lineTo(s+u-i,l),0!==i&&t.arc(s+u-i,l+i,i,-Math.PI/2,0),t.lineTo(s+u,l+h-r),0!==r&&t.arc(s+u-r,l+h-r,r,0,Math.PI/2),t.lineTo(s+o,l+h),0!==o&&t.arc(s+o,l+h-o,o,Math.PI/2,Math.PI),t.lineTo(s,l+n),0!==n&&t.arc(s+n,l+n,n,Math.PI,1.5*Math.PI)}(t,e):t.rect(n,i,r,o)},e.prototype.isZeroArea=function(){return!this.shape.width||!this.shape.height},e}(Ms);Es.prototype.type="rect";var zs={fill:"#000"},Vs={style:k({fill:!0,stroke:!0,fillOpacity:!0,strokeOpacity:!0,lineWidth:!0,fontSize:!0,lineHeight:!0,width:!0,height:!0,textShadowColor:!0,textShadowBlur:!0,textShadowOffsetX:!0,textShadowOffsetY:!0,backgroundColor:!0,padding:!0,borderColor:!0,borderWidth:!0,borderRadius:!0},xa.style)},Bs=function(t){function e(e){var n=t.call(this)||this;return n.type="text",n._children=[],n._defaultStyle=zs,n.attr(e),n}return n(e,t),e.prototype.childrenRef=function(){return this._children},e.prototype.update=function(){t.prototype.update.call(this),this.styleChanged()&&this._updateSubTexts();for(var e=0;e<this._children.length;e++){var n=this._children[e];n.zlevel=this.zlevel,n.z=this.z,n.z2=this.z2,n.culling=this.culling,n.cursor=this.cursor,n.invisible=this.invisible}},e.prototype.updateTransform=function(){var e=this.innerTransformable;e?(e.updateTransform(),e.transform&&(this.transform=e.transform)):t.prototype.updateTransform.call(this)},e.prototype.getLocalTransform=function(e){var n=this.innerTransformable;return n?n.getLocalTransform(e):t.prototype.getLocalTransform.call(this,e)},e.prototype.getComputedTransform=function(){return this.__hostTarget&&(this.__hostTarget.getComputedTransform(),this.__hostTarget.updateInnerText(!0)),t.prototype.getComputedTransform.call(this)},e.prototype._updateSubTexts=function(){var t;this._childCursor=0,Xs(t=this.style),E(t.rich,Xs),this.style.rich?this._updateRichTexts():this._updatePlainTexts(),this._children.length=this._childCursor,this.styleUpdated()},e.prototype.addSelfToZr=function(e){t.prototype.addSelfToZr.call(this,e);for(var n=0;n<this._children.length;n++)this._children[n].__zr=e},e.prototype.removeSelfFromZr=function(e){t.prototype.removeSelfFromZr.call(this,e);for(var n=0;n<this._children.length;n++)this._children[n].__zr=null},e.prototype.getBoundingRect=function(){if(this.styleChanged()&&this._updateSubTexts(),!this._rect){for(var t=new Ee(0,0,0,0),e=this._children,n=[],i=null,r=0;r<e.length;r++){var o=e[r],a=o.getBoundingRect(),s=o.getLocalTransform(n);s?(t.copy(a),t.applyTransform(s),(i=i||t.clone()).union(t)):(i=i||a.clone()).union(a)}this._rect=i||t}return this._rect},e.prototype.setDefaultTextStyle=function(t){this._defaultStyle=t||zs},e.prototype.setTextContent=function(t){0},e.prototype._mergeStyle=function(t,e){if(!e)return t;var n=e.rich,i=t.rich||n&&{};return A(t,e),n&&i?(this._mergeRich(i,n),t.rich=i):i&&(t.rich=i),t},e.prototype._mergeRich=function(t,e){for(var n=G(e),i=0;i<n.length;i++){var r=n[i];t[r]=t[r]||{},A(t[r],e[r])}},e.prototype.getAnimationStyleProps=function(){return Vs},e.prototype._getOrCreateChild=function(t){var e=this._children[this._childCursor];return e&&e instanceof t||(e=new t),this._children[this._childCursor++]=e,e.__zr=this.__zr,e.parent=this,e},e.prototype._updatePlainTexts=function(){var t=this.style,e=t.font||a,n=t.padding,i=function(t,e){null!=t&&(t+="");var n,i=e.overflow,r=e.padding,o=e.font,a="truncate"===i,s=Sr(o),l=rt(e.lineHeight,s),u=!!e.backgroundColor,h="truncate"===e.lineOverflow,c=e.width,p=(n=null==c||"break"!==i&&"breakAll"!==i?t?t.split("\n"):[]:t?ya(t,e.font,c,"breakAll"===i,0).lines:[]).length*l,d=rt(e.height,p);if(p>d&&h){var f=Math.floor(d/l);n=n.slice(0,f)}if(t&&a&&null!=c)for(var g=sa(c,o,e.ellipsis,{minChar:e.truncateMinChar,placeholder:e.placeholder}),y=0;y<n.length;y++)n[y]=la(n[y],g);var v=d,m=0;for(y=0;y<n.length;y++)m=Math.max(mr(n[y],o),m);null==c&&(c=m);var x=m;return r&&(v+=r[0]+r[2],x+=r[1]+r[3],c+=r[1]+r[3]),u&&(x=c),{lines:n,height:d,outerWidth:x,outerHeight:v,lineHeight:l,calculatedLineHeight:s,contentWidth:m,contentHeight:p,width:c}}(Ks(t),t),r=$s(t),o=!!t.backgroundColor,s=i.outerHeight,l=i.outerWidth,u=i.contentWidth,h=i.lines,c=i.lineHeight,p=this._defaultStyle,d=t.x||0,f=t.y||0,g=t.align||p.align||"left",y=t.verticalAlign||p.verticalAlign||"top",v=d,m=wr(f,i.contentHeight,y);if(r||n){var x=br(d,l,g),_=wr(f,s,y);r&&this._renderBackground(t,t,x,_,l,s)}m+=c/2,n&&(v=qs(d,g,n),"top"===y?m+=n[0]:"bottom"===y&&(m-=n[2]));for(var b=0,w=!1,S=(js("fill"in t?t.fill:(w=!0,p.fill))),M=(Zs("stroke"in t?t.stroke:o||p.autoStroke&&!w?null:(b=2,p.stroke))),I=t.textShadowBlur>0,T=null!=t.width&&("truncate"===t.overflow||"break"===t.overflow||"breakAll"===t.overflow),C=i.calculatedLineHeight,D=0;D<h.length;D++){var A=this._getOrCreateChild(Ts),k=A.createStyle();A.useStyle(k),k.text=h[D],k.x=v,k.y=m,g&&(k.textAlign=g),k.textBaseline="middle",k.opacity=t.opacity,k.strokeFirst=!0,I&&(k.shadowBlur=t.textShadowBlur||0,k.shadowColor=t.textShadowColor||"transparent",k.shadowOffsetX=t.textShadowOffsetX||0,k.shadowOffsetY=t.textShadowOffsetY||0),k.stroke=M,k.fill=S,M&&(k.lineWidth=t.lineWidth||b,k.lineDash=t.lineDash,k.lineDashOffset=t.lineDashOffset||0),k.font=e,Ys(k,t),m+=c,T&&A.setBoundingRect(new Ee(br(k.x,t.width,k.textAlign),wr(k.y,C,k.textBaseline),u,C))}},e.prototype._updateRichTexts=function(){var t=this.style,e=function(t,e){var n=new pa;if(null!=t&&(t+=""),!t)return n;for(var i,r=e.width,o=e.height,a=e.overflow,s="break"!==a&&"breakAll"!==a||null==r?null:{width:r,accumWidth:0,breakAll:"breakAll"===a},l=oa.lastIndex=0;null!=(i=oa.exec(t));){var u=i.index;u>l&&da(n,t.substring(l,u),e,s),da(n,i[2],e,s,i[1]),l=oa.lastIndex}l<t.length&&da(n,t.substring(l,t.length),e,s);var h=[],c=0,p=0,d=e.padding,f="truncate"===a,g="truncate"===e.lineOverflow;function y(t,e,n){t.width=e,t.lineHeight=n,c+=n,p=Math.max(p,e)}t:for(var v=0;v<n.lines.length;v++){for(var m=n.lines[v],x=0,_=0,b=0;b<m.tokens.length;b++){var w=(P=m.tokens[b]).styleName&&e.rich[P.styleName]||{},S=P.textPadding=w.padding,M=S?S[1]+S[3]:0,I=P.font=w.font||e.font;P.contentHeight=Sr(I);var T=rt(w.height,P.contentHeight);if(P.innerHeight=T,S&&(T+=S[0]+S[2]),P.height=T,P.lineHeight=ot(w.lineHeight,e.lineHeight,T),P.align=w&&w.align||e.align,P.verticalAlign=w&&w.verticalAlign||"middle",g&&null!=o&&c+P.lineHeight>o){b>0?(m.tokens=m.tokens.slice(0,b),y(m,_,x),n.lines=n.lines.slice(0,v+1)):n.lines=n.lines.slice(0,v);break t}var C=w.width,D=null==C||"auto"===C;if("string"==typeof C&&"%"===C.charAt(C.length-1))P.percentWidth=C,h.push(P),P.contentWidth=mr(P.text,I);else{if(D){var A=w.backgroundColor,k=A&&A.image;k&&ra(k=ea(k))&&(P.width=Math.max(P.width,k.width*T/k.height))}var L=f&&null!=r?r-_:null;null!=L&&L<P.width?!D||L<M?(P.text="",P.width=P.contentWidth=0):(P.text=aa(P.text,L-M,I,e.ellipsis,{minChar:e.truncateMinChar}),P.width=P.contentWidth=mr(P.text,I)):P.contentWidth=mr(P.text,I)}P.width+=M,_+=P.width,w&&(x=Math.max(x,P.lineHeight))}y(m,_,x)}for(n.outerWidth=n.width=rt(r,p),n.outerHeight=n.height=rt(o,c),n.contentHeight=c,n.contentWidth=p,d&&(n.outerWidth+=d[1]+d[3],n.outerHeight+=d[0]+d[2]),v=0;v<h.length;v++){var P,O=(P=h[v]).percentWidth;P.width=parseInt(O,10)/100*n.width}return n}(Ks(t),t),n=e.width,i=e.outerWidth,r=e.outerHeight,o=t.padding,a=t.x||0,s=t.y||0,l=this._defaultStyle,u=t.align||l.align,h=t.verticalAlign||l.verticalAlign,c=br(a,i,u),p=wr(s,r,h),d=c,f=p;o&&(d+=o[3],f+=o[0]);var g=d+n;$s(t)&&this._renderBackground(t,t,c,p,i,r);for(var y=!!t.backgroundColor,v=0;v<e.lines.length;v++){for(var m=e.lines[v],x=m.tokens,_=x.length,b=m.lineHeight,w=m.width,S=0,M=d,I=g,T=_-1,C=void 0;S<_&&(!(C=x[S]).align||"left"===C.align);)this._placeToken(C,t,b,f,M,"left",y),w-=C.width,M+=C.width,S++;for(;T>=0&&"right"===(C=x[T]).align;)this._placeToken(C,t,b,f,I,"right",y),w-=C.width,I-=C.width,T--;for(M+=(n-(M-d)-(g-I)-w)/2;S<=T;)C=x[S],this._placeToken(C,t,b,f,M+C.width/2,"center",y),M+=C.width,S++;f+=b}},e.prototype._placeToken=function(t,e,n,i,r,o,s){var l=e.rich[t.styleName]||{};l.text=t.text;var u=t.verticalAlign,h=i+n/2;"top"===u?h=i+t.height/2:"bottom"===u&&(h=i+n-t.height/2),!t.isLineHolder&&$s(l)&&this._renderBackground(l,e,"right"===o?r-t.width:"center"===o?r-t.width/2:r,h-t.height/2,t.width,t.height);var c=!!l.backgroundColor,p=t.textPadding;p&&(r=qs(r,o,p),h-=t.height/2-p[0]-t.innerHeight/2);var d=this._getOrCreateChild(Ts),f=d.createStyle();d.useStyle(f);var g=this._defaultStyle,y=!1,v=0,m=js("fill"in l?l.fill:"fill"in e?e.fill:(y=!0,g.fill)),x=Zs("stroke"in l?l.stroke:"stroke"in e?e.stroke:c||s||g.autoStroke&&!y?null:(v=2,g.stroke)),_=l.textShadowBlur>0||e.textShadowBlur>0;f.text=t.text,f.x=r,f.y=h,_&&(f.shadowBlur=l.textShadowBlur||e.textShadowBlur||0,f.shadowColor=l.textShadowColor||e.textShadowColor||"transparent",f.shadowOffsetX=l.textShadowOffsetX||e.textShadowOffsetX||0,f.shadowOffsetY=l.textShadowOffsetY||e.textShadowOffsetY||0),f.textAlign=o,f.textBaseline="middle",f.font=t.font||a,f.opacity=ot(l.opacity,e.opacity,1),Ys(f,l),x&&(f.lineWidth=ot(l.lineWidth,e.lineWidth,v),f.lineDash=rt(l.lineDash,e.lineDash),f.lineDashOffset=e.lineDashOffset||0,f.stroke=x),m&&(f.fill=m);var b=t.contentWidth,w=t.contentHeight;d.setBoundingRect(new Ee(br(f.x,b,f.textAlign),wr(f.y,w,f.textBaseline),b,w))},e.prototype._renderBackground=function(t,e,n,i,r,o){var a,s,l,u=t.backgroundColor,h=t.borderWidth,c=t.borderColor,p=u&&u.image,d=u&&!p,f=t.borderRadius,g=this;if(d||t.lineHeight||h&&c){(a=this._getOrCreateChild(Es)).useStyle(a.createStyle()),a.style.fill=null;var y=a.shape;y.x=n,y.y=i,y.width=r,y.height=o,y.r=f,a.dirtyShape()}if(d)(l=a.style).fill=u||null,l.fillOpacity=rt(t.fillOpacity,1);else if(p){(s=this._getOrCreateChild(As)).onload=function(){g.dirtyStyle()};var v=s.style;v.image=u.image,v.x=n,v.y=i,v.width=r,v.height=o}h&&c&&((l=a.style).lineWidth=h,l.stroke=c,l.strokeOpacity=rt(t.strokeOpacity,1),l.lineDash=t.borderDash,l.lineDashOffset=t.borderDashOffset||0,a.strokeContainThreshold=0,a.hasFill()&&a.hasStroke()&&(l.strokeFirst=!0,l.lineWidth*=2));var m=(a||s).style;m.shadowBlur=t.shadowBlur||0,m.shadowColor=t.shadowColor||"transparent",m.shadowOffsetX=t.shadowOffsetX||0,m.shadowOffsetY=t.shadowOffsetY||0,m.opacity=ot(t.opacity,e.opacity,1)},e.makeFont=function(t){var e="";return Us(t)&&(e=[t.fontStyle,t.fontWeight,Hs(t.fontSize),t.fontFamily||"sans-serif"].join(" ")),e&&ut(e)||t.textFont||t.font},e}(wa),Fs={left:!0,right:1,center:1},Gs={top:1,bottom:1,middle:1},Ws=["fontStyle","fontWeight","fontSize","fontFamily"];function Hs(t){return"string"!=typeof t||-1===t.indexOf("px")&&-1===t.indexOf("rem")&&-1===t.indexOf("em")?isNaN(+t)?"12px":t+"px":t}function Ys(t,e){for(var n=0;n<Ws.length;n++){var i=Ws[n],r=e[i];null!=r&&(t[i]=r)}}function Us(t){return null!=t.fontSize||t.fontFamily||t.fontWeight}function Xs(t){if(t){t.font=Bs.makeFont(t);var e=t.align;"middle"===e&&(e="center"),t.align=null==e||Fs[e]?e:"left";var n=t.verticalAlign;"center"===n&&(n="middle"),t.verticalAlign=null==n||Gs[n]?n:"top",t.padding&&(t.padding=st(t.padding))}}function Zs(t,e){return null==t||e<=0||"transparent"===t||"none"===t?null:t.image||t.colorStops?"#000":t}function js(t){return null==t||"none"===t?null:t.image||t.colorStops?"#000":t}function qs(t,e,n){return"right"===e?t-n[1]:"center"===e?t+n[3]/2-n[1]/2:t+n[3]}function Ks(t){var e=t.text;return null!=e&&(e+=""),e}function $s(t){return!!(t.backgroundColor||t.lineHeight||t.borderWidth&&t.borderColor)}var Js=Po(),Qs=function(t,e,n,i){if(i){var r=Js(i);r.dataIndex=n,r.dataType=e,r.seriesIndex=t,"group"===i.type&&i.traverse((function(i){var r=Js(i);r.seriesIndex=t,r.dataIndex=n,r.dataType=e}))}},tl=1,el={},nl=Po(),il=Po(),rl=["emphasis","blur","select"],ol=["normal","emphasis","blur","select"],al=10,sl="highlight",ll="downplay",ul="select",hl="unselect",cl="toggleSelect";function pl(t){return null!=t&&"none"!==t}var dl=new Nn(100);function fl(t){if(X(t)){var e=dl.get(t);return e||(e=Kn(t,-.1),dl.put(t,e)),e}if(Q(t)){var n=A({},t);return n.colorStops=z(t.colorStops,(function(t){return{offset:t.offset,color:Kn(t.color,-.1)}})),n}return t}function gl(t,e,n){t.onHoverStateChange&&(t.hoverState||0)!==n&&t.onHoverStateChange(e),t.hoverState=n}function yl(t){gl(t,"emphasis",2)}function vl(t){2===t.hoverState&&gl(t,"normal",0)}function ml(t){gl(t,"blur",1)}function xl(t){1===t.hoverState&&gl(t,"normal",0)}function _l(t){t.selected=!0}function bl(t){t.selected=!1}function wl(t,e,n){e(t,n)}function Sl(t,e,n){wl(t,e,n),t.isGroup&&t.traverse((function(t){wl(t,e,n)}))}function Ml(t,e){switch(e){case"emphasis":t.hoverState=2;break;case"normal":t.hoverState=0;break;case"blur":t.hoverState=1;break;case"select":t.selected=!0}}function Il(t,e){var n=this.states[t];if(this.style){if("emphasis"===t)return function(t,e,n,i){var r=n&&P(n,"select")>=0,o=!1;if(t instanceof Ms){var a=nl(t),s=r&&a.selectFill||a.normalFill,l=r&&a.selectStroke||a.normalStroke;if(pl(s)||pl(l)){var u=(i=i||{}).style||{};"inherit"===u.fill?(o=!0,i=A({},i),(u=A({},u)).fill=s):!pl(u.fill)&&pl(s)?(o=!0,i=A({},i),(u=A({},u)).fill=fl(s)):!pl(u.stroke)&&pl(l)&&(o||(i=A({},i),u=A({},u)),u.stroke=fl(l)),i.style=u}}if(i&&null==i.z2){o||(i=A({},i));var h=t.z2EmphasisLift;i.z2=t.z2+(null!=h?h:al)}return i}(this,0,e,n);if("blur"===t)return function(t,e,n){var i=P(t.currentStates,e)>=0,r=t.style.opacity,o=i?null:function(t,e,n,i){for(var r=t.style,o={},a=0;a<e.length;a++){var s=e[a],l=r[s];o[s]=null==l?i&&i[s]:l}for(a=0;a<t.animators.length;a++){var u=t.animators[a];u.__fromStateTransition&&u.__fromStateTransition.indexOf(n)<0&&"style"===u.targetName&&u.saveTo(o,e)}return o}(t,["opacity"],e,{opacity:1}),a=(n=n||{}).style||{};return null==a.opacity&&(n=A({},n),a=A({opacity:i?r:.1*o.opacity},a),n.style=a),n}(this,t,n);if("select"===t)return function(t,e,n){if(n&&null==n.z2){n=A({},n);var i=t.z2SelectLift;n.z2=t.z2+(null!=i?i:9)}return n}(this,0,n)}return n}function Tl(t){t.stateProxy=Il;var e=t.getTextContent(),n=t.getTextGuideLine();e&&(e.stateProxy=Il),n&&(n.stateProxy=Il)}function Cl(t,e){!Nl(t,e)&&!t.__highByOuter&&Sl(t,yl)}function Dl(t,e){!Nl(t,e)&&!t.__highByOuter&&Sl(t,vl)}function Al(t,e){t.__highByOuter|=1<<(e||0),Sl(t,yl)}function kl(t,e){!(t.__highByOuter&=~(1<<(e||0)))&&Sl(t,vl)}function Ll(t){Sl(t,ml)}function Pl(t){Sl(t,xl)}function Ol(t){Sl(t,_l)}function Rl(t){Sl(t,bl)}function Nl(t,e){return t.__highDownSilentOnTouch&&e.zrByTouch}function El(t){var e=t.getModel(),n=[],i=[];e.eachComponent((function(e,r){var o=il(r),a="series"===e,s=a?t.getViewOfSeriesModel(r):t.getViewOfComponentModel(r);!a&&i.push(s),o.isBlured&&(s.group.traverse((function(t){xl(t)})),a&&n.push(r)),o.isBlured=!1})),E(i,(function(t){t&&t.toggleBlurSeries&&t.toggleBlurSeries(n,!1,e)}))}function zl(t,e,n,i){var r=i.getModel();function o(t,e){for(var n=0;n<e.length;n++){var i=t.getItemGraphicEl(e[n]);i&&Pl(i)}}if(n=n||"coordinateSystem",null!=t&&e&&"none"!==e){var a=r.getSeriesByIndex(t),s=a.coordinateSystem;s&&s.master&&(s=s.master);var l=[];r.eachSeries((function(t){var r=a===t,u=t.coordinateSystem;if(u&&u.master&&(u=u.master),!("series"===n&&!r||"coordinateSystem"===n&&!(u&&s?u===s:r)||"series"===e&&r)){if(i.getViewOfSeriesModel(t).group.traverse((function(t){ml(t)})),N(e))o(t.getData(),e);else if(q(e))for(var h=G(e),c=0;c<h.length;c++)o(t.getData(h[c]),e[h[c]]);l.push(t),il(t).isBlured=!0}})),r.eachComponent((function(t,e){if("series"!==t){var n=i.getViewOfComponentModel(e);n&&n.toggleBlurSeries&&n.toggleBlurSeries(l,!0,r)}}))}}function Vl(t,e,n){if(null!=t&&null!=e){var i=n.getModel().getComponent(t,e);if(i){il(i).isBlured=!0;var r=n.getViewOfComponentModel(i);r&&r.focusBlurEnabled&&r.group.traverse((function(t){ml(t)}))}}}function Bl(t,e,n,i){var r={focusSelf:!1,dispatchers:null};if(null==t||"series"===t||null==e||null==n)return r;var o=i.getModel().getComponent(t,e);if(!o)return r;var a=i.getViewOfComponentModel(o);if(!a||!a.findHighDownDispatchers)return r;for(var s,l=a.findHighDownDispatchers(n),u=0;u<l.length;u++)if("self"===Js(l[u]).focus){s=!0;break}return{focusSelf:s,dispatchers:l}}function Fl(t){E(t.getAllData(),(function(e){var n=e.data,i=e.type;n.eachItemGraphicEl((function(e,n){t.isSelected(n,i)?Ol(e):Rl(e)}))}))}function Gl(t){var e=[];return t.eachSeries((function(t){E(t.getAllData(),(function(n){n.data;var i=n.type,r=t.getSelectedDataIndices();if(r.length>0){var o={dataIndex:r,seriesIndex:t.seriesIndex};null!=i&&(o.dataType=i),e.push(o)}}))})),e}function Wl(t,e,n){jl(t,!0),Sl(t,Tl),Yl(t,e,n)}function Hl(t,e,n,i){i?function(t){jl(t,!1)}(t):Wl(t,e,n)}function Yl(t,e,n){var i=Js(t);null!=e?(i.focus=e,i.blurScope=n):i.focus&&(i.focus=null)}var Ul=["emphasis","blur","select"],Xl={itemStyle:"getItemStyle",lineStyle:"getLineStyle",areaStyle:"getAreaStyle"};function Zl(t,e,n,i){n=n||"itemStyle";for(var r=0;r<Ul.length;r++){var o=Ul[r],a=e.getModel([o,n]);t.ensureState(o).style=i?i(a):a[Xl[n]]()}}function jl(t,e){var n=!1===e,i=t;t.highDownSilentOnTouch&&(i.__highDownSilentOnTouch=t.highDownSilentOnTouch),n&&!i.__highDownDispatcher||(i.__highByOuter=i.__highByOuter||0,i.__highDownDispatcher=!n)}function ql(t){return!(!t||!t.__highDownDispatcher)}function Kl(t){var e=t.type;return e===ul||e===hl||e===cl}function $l(t){var e=t.type;return e===sl||e===ll}var Jl=rs.CMD,Ql=[[],[],[]],tu=Math.sqrt,eu=Math.atan2;function nu(t,e){if(e){var n,i,r,o,a,s,l=t.data,u=t.len(),h=Jl.M,c=Jl.C,p=Jl.L,d=Jl.R,f=Jl.A,g=Jl.Q;for(r=0,o=0;r<u;){switch(n=l[r++],o=r,i=0,n){case h:case p:i=1;break;case c:i=3;break;case g:i=2;break;case f:var y=e[4],v=e[5],m=tu(e[0]*e[0]+e[1]*e[1]),x=tu(e[2]*e[2]+e[3]*e[3]),_=eu(-e[1]/x,e[0]/m);l[r]*=m,l[r++]+=y,l[r]*=x,l[r++]+=v,l[r++]*=m,l[r++]*=x,l[r++]+=_,l[r++]+=_,o=r+=2;break;case d:s[0]=l[r++],s[1]=l[r++],Wt(s,s,e),l[o++]=s[0],l[o++]=s[1],s[0]+=l[r++],s[1]+=l[r++],Wt(s,s,e),l[o++]=s[0],l[o++]=s[1]}for(a=0;a<i;a++){var b=Ql[a];b[0]=l[r++],b[1]=l[r++],Wt(b,b,e),l[o++]=b[0],l[o++]=b[1]}}t.increaseVersion()}}var iu=Math.sqrt,ru=Math.sin,ou=Math.cos,au=Math.PI;function su(t){return Math.sqrt(t[0]*t[0]+t[1]*t[1])}function lu(t,e){return(t[0]*e[0]+t[1]*e[1])/(su(t)*su(e))}function uu(t,e){return(t[0]*e[1]<t[1]*e[0]?-1:1)*Math.acos(lu(t,e))}function hu(t,e,n,i,r,o,a,s,l,u,h){var c=l*(au/180),p=ou(c)*(t-n)/2+ru(c)*(e-i)/2,d=-1*ru(c)*(t-n)/2+ou(c)*(e-i)/2,f=p*p/(a*a)+d*d/(s*s);f>1&&(a*=iu(f),s*=iu(f));var g=(r===o?-1:1)*iu((a*a*(s*s)-a*a*(d*d)-s*s*(p*p))/(a*a*(d*d)+s*s*(p*p)))||0,y=g*a*d/s,v=g*-s*p/a,m=(t+n)/2+ou(c)*y-ru(c)*v,x=(e+i)/2+ru(c)*y+ou(c)*v,_=uu([1,0],[(p-y)/a,(d-v)/s]),b=[(p-y)/a,(d-v)/s],w=[(-1*p-y)/a,(-1*d-v)/s],S=uu(b,w);if(lu(b,w)<=-1&&(S=au),lu(b,w)>=1&&(S=0),S<0){var M=Math.round(S/au*1e6)/1e6;S=2*au+M%2*au}h.addData(u,m,x,a,s,_,S,c,o)}var cu=/([mlvhzcqtsa])([^mlvhzcqtsa]*)/gi,pu=/-?([0-9]*\.)?[0-9]+([eE]-?[0-9]+)?/g;var du=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.prototype.applyTransform=function(t){},e}(Ms);function fu(t){return null!=t.setData}function gu(t,e){var n=function(t){var e=new rs;if(!t)return e;var n,i=0,r=0,o=i,a=r,s=rs.CMD,l=t.match(cu);if(!l)return e;for(var u=0;u<l.length;u++){for(var h=l[u],c=h.charAt(0),p=void 0,d=h.match(pu)||[],f=d.length,g=0;g<f;g++)d[g]=parseFloat(d[g]);for(var y=0;y<f;){var v=void 0,m=void 0,x=void 0,_=void 0,b=void 0,w=void 0,S=void 0,M=i,I=r,T=void 0,C=void 0;switch(c){case"l":i+=d[y++],r+=d[y++],p=s.L,e.addData(p,i,r);break;case"L":i=d[y++],r=d[y++],p=s.L,e.addData(p,i,r);break;case"m":i+=d[y++],r+=d[y++],p=s.M,e.addData(p,i,r),o=i,a=r,c="l";break;case"M":i=d[y++],r=d[y++],p=s.M,e.addData(p,i,r),o=i,a=r,c="L";break;case"h":i+=d[y++],p=s.L,e.addData(p,i,r);break;case"H":i=d[y++],p=s.L,e.addData(p,i,r);break;case"v":r+=d[y++],p=s.L,e.addData(p,i,r);break;case"V":r=d[y++],p=s.L,e.addData(p,i,r);break;case"C":p=s.C,e.addData(p,d[y++],d[y++],d[y++],d[y++],d[y++],d[y++]),i=d[y-2],r=d[y-1];break;case"c":p=s.C,e.addData(p,d[y++]+i,d[y++]+r,d[y++]+i,d[y++]+r,d[y++]+i,d[y++]+r),i+=d[y-2],r+=d[y-1];break;case"S":v=i,m=r,T=e.len(),C=e.data,n===s.C&&(v+=i-C[T-4],m+=r-C[T-3]),p=s.C,M=d[y++],I=d[y++],i=d[y++],r=d[y++],e.addData(p,v,m,M,I,i,r);break;case"s":v=i,m=r,T=e.len(),C=e.data,n===s.C&&(v+=i-C[T-4],m+=r-C[T-3]),p=s.C,M=i+d[y++],I=r+d[y++],i+=d[y++],r+=d[y++],e.addData(p,v,m,M,I,i,r);break;case"Q":M=d[y++],I=d[y++],i=d[y++],r=d[y++],p=s.Q,e.addData(p,M,I,i,r);break;case"q":M=d[y++]+i,I=d[y++]+r,i+=d[y++],r+=d[y++],p=s.Q,e.addData(p,M,I,i,r);break;case"T":v=i,m=r,T=e.len(),C=e.data,n===s.Q&&(v+=i-C[T-4],m+=r-C[T-3]),i=d[y++],r=d[y++],p=s.Q,e.addData(p,v,m,i,r);break;case"t":v=i,m=r,T=e.len(),C=e.data,n===s.Q&&(v+=i-C[T-4],m+=r-C[T-3]),i+=d[y++],r+=d[y++],p=s.Q,e.addData(p,v,m,i,r);break;case"A":x=d[y++],_=d[y++],b=d[y++],w=d[y++],S=d[y++],hu(M=i,I=r,i=d[y++],r=d[y++],w,S,x,_,b,p=s.A,e);break;case"a":x=d[y++],_=d[y++],b=d[y++],w=d[y++],S=d[y++],hu(M=i,I=r,i+=d[y++],r+=d[y++],w,S,x,_,b,p=s.A,e)}}"z"!==c&&"Z"!==c||(p=s.Z,e.addData(p),i=o,r=a),n=p}return e.toStatic(),e}(t),i=A({},e);return i.buildPath=function(t){if(fu(t)){t.setData(n.data),(e=t.getContext())&&t.rebuildPath(e,1)}else{var e=t;n.rebuildPath(e,1)}},i.applyTransform=function(t){nu(n,t),this.dirtyShape()},i}function yu(t,e){return new du(gu(t,e))}function vu(t,e){e=e||{};var n=new Ms;return t.shape&&n.setShape(t.shape),n.setStyle(t.style),e.bakeTransform?nu(n.path,t.getComputedTransform()):e.toLocal?n.setLocalTransform(t.getComputedTransform()):n.copyTransform(t),n.buildPath=t.buildPath,n.applyTransform=n.applyTransform,n.z=t.z,n.z2=t.z2,n.zlevel=t.zlevel,n}var mu=function(){this.cx=0,this.cy=0,this.r=0},xu=function(t){function e(e){return t.call(this,e)||this}return n(e,t),e.prototype.getDefaultShape=function(){return new mu},e.prototype.buildPath=function(t,e){t.moveTo(e.cx+e.r,e.cy),t.arc(e.cx,e.cy,e.r,0,2*Math.PI)},e}(Ms);xu.prototype.type="circle";var _u=function(){this.cx=0,this.cy=0,this.rx=0,this.ry=0},bu=function(t){function e(e){return t.call(this,e)||this}return n(e,t),e.prototype.getDefaultShape=function(){return new _u},e.prototype.buildPath=function(t,e){var n=.5522848,i=e.cx,r=e.cy,o=e.rx,a=e.ry,s=o*n,l=a*n;t.moveTo(i-o,r),t.bezierCurveTo(i-o,r-l,i-s,r-a,i,r-a),t.bezierCurveTo(i+s,r-a,i+o,r-l,i+o,r),t.bezierCurveTo(i+o,r+l,i+s,r+a,i,r+a),t.bezierCurveTo(i-s,r+a,i-o,r+l,i-o,r),t.closePath()},e}(Ms);bu.prototype.type="ellipse";var wu=Math.PI,Su=2*wu,Mu=Math.sin,Iu=Math.cos,Tu=Math.acos,Cu=Math.atan2,Du=Math.abs,Au=Math.sqrt,ku=Math.max,Lu=Math.min,Pu=1e-4;function Ou(t,e,n,i,r,o,a){var s=t-n,l=e-i,u=(a?o:-o)/Au(s*s+l*l),h=u*l,c=-u*s,p=t+h,d=e+c,f=n+h,g=i+c,y=(p+f)/2,v=(d+g)/2,m=f-p,x=g-d,_=m*m+x*x,b=r-o,w=p*g-f*d,S=(x<0?-1:1)*Au(ku(0,b*b*_-w*w)),M=(w*x-m*S)/_,I=(-w*m-x*S)/_,T=(w*x+m*S)/_,C=(-w*m+x*S)/_,D=M-y,A=I-v,k=T-y,L=C-v;return D*D+A*A>k*k+L*L&&(M=T,I=C),{cx:M,cy:I,x0:-h,y0:-c,x1:M*(r/b-1),y1:I*(r/b-1)}}function Ru(t,e){var n,i=ku(e.r,0),r=ku(e.r0||0,0),o=i>0;if(o||r>0){if(o||(i=r,r=0),r>i){var a=i;i=r,r=a}var s=e.startAngle,l=e.endAngle;if(!isNaN(s)&&!isNaN(l)){var u=e.cx,h=e.cy,c=!!e.clockwise,p=Du(l-s),d=p>Su&&p%Su;if(d>Pu&&(p=d),i>Pu)if(p>Su-Pu)t.moveTo(u+i*Iu(s),h+i*Mu(s)),t.arc(u,h,i,s,l,!c),r>Pu&&(t.moveTo(u+r*Iu(l),h+r*Mu(l)),t.arc(u,h,r,l,s,c));else{var f=void 0,g=void 0,y=void 0,v=void 0,m=void 0,x=void 0,_=void 0,b=void 0,w=void 0,S=void 0,M=void 0,I=void 0,T=void 0,C=void 0,D=void 0,A=void 0,k=i*Iu(s),L=i*Mu(s),P=r*Iu(l),O=r*Mu(l),R=p>Pu;if(R){var N=e.cornerRadius;N&&(n=function(t){var e;if(Y(t)){var n=t.length;if(!n)return t;e=1===n?[t[0],t[0],0,0]:2===n?[t[0],t[0],t[1],t[1]]:3===n?t.concat(t[2]):t}else e=[t,t,t,t];return e}(N),f=n[0],g=n[1],y=n[2],v=n[3]);var E=Du(i-r)/2;if(m=Lu(E,y),x=Lu(E,v),_=Lu(E,f),b=Lu(E,g),M=w=ku(m,x),I=S=ku(_,b),(w>Pu||S>Pu)&&(T=i*Iu(l),C=i*Mu(l),D=r*Iu(s),A=r*Mu(s),p<wu)){var z=function(t,e,n,i,r,o,a,s){var l=n-t,u=i-e,h=a-r,c=s-o,p=c*l-h*u;if(!(p*p<Pu))return[t+(p=(h*(e-o)-c*(t-r))/p)*l,e+p*u]}(k,L,D,A,T,C,P,O);if(z){var V=k-z[0],B=L-z[1],F=T-z[0],G=C-z[1],W=1/Mu(Tu((V*F+B*G)/(Au(V*V+B*B)*Au(F*F+G*G)))/2),H=Au(z[0]*z[0]+z[1]*z[1]);M=Lu(w,(i-H)/(W+1)),I=Lu(S,(r-H)/(W-1))}}}if(R)if(M>Pu){var U=Lu(y,M),X=Lu(v,M),Z=Ou(D,A,k,L,i,U,c),j=Ou(T,C,P,O,i,X,c);t.moveTo(u+Z.cx+Z.x0,h+Z.cy+Z.y0),M<w&&U===X?t.arc(u+Z.cx,h+Z.cy,M,Cu(Z.y0,Z.x0),Cu(j.y0,j.x0),!c):(U>0&&t.arc(u+Z.cx,h+Z.cy,U,Cu(Z.y0,Z.x0),Cu(Z.y1,Z.x1),!c),t.arc(u,h,i,Cu(Z.cy+Z.y1,Z.cx+Z.x1),Cu(j.cy+j.y1,j.cx+j.x1),!c),X>0&&t.arc(u+j.cx,h+j.cy,X,Cu(j.y1,j.x1),Cu(j.y0,j.x0),!c))}else t.moveTo(u+k,h+L),t.arc(u,h,i,s,l,!c);else t.moveTo(u+k,h+L);if(r>Pu&&R)if(I>Pu){U=Lu(f,I),Z=Ou(P,O,T,C,r,-(X=Lu(g,I)),c),j=Ou(k,L,D,A,r,-U,c);t.lineTo(u+Z.cx+Z.x0,h+Z.cy+Z.y0),I<S&&U===X?t.arc(u+Z.cx,h+Z.cy,I,Cu(Z.y0,Z.x0),Cu(j.y0,j.x0),!c):(X>0&&t.arc(u+Z.cx,h+Z.cy,X,Cu(Z.y0,Z.x0),Cu(Z.y1,Z.x1),!c),t.arc(u,h,r,Cu(Z.cy+Z.y1,Z.cx+Z.x1),Cu(j.cy+j.y1,j.cx+j.x1),c),U>0&&t.arc(u+j.cx,h+j.cy,U,Cu(j.y1,j.x1),Cu(j.y0,j.x0),!c))}else t.lineTo(u+P,h+O),t.arc(u,h,r,l,s,c);else t.lineTo(u+P,h+O)}else t.moveTo(u,h);t.closePath()}}}var Nu=function(){this.cx=0,this.cy=0,this.r0=0,this.r=0,this.startAngle=0,this.endAngle=2*Math.PI,this.clockwise=!0,this.cornerRadius=0},Eu=function(t){function e(e){return t.call(this,e)||this}return n(e,t),e.prototype.getDefaultShape=function(){return new Nu},e.prototype.buildPath=function(t,e){Ru(t,e)},e.prototype.isZeroArea=function(){return this.shape.startAngle===this.shape.endAngle||this.shape.r===this.shape.r0},e}(Ms);Eu.prototype.type="sector";var zu=function(){this.cx=0,this.cy=0,this.r=0,this.r0=0},Vu=function(t){function e(e){return t.call(this,e)||this}return n(e,t),e.prototype.getDefaultShape=function(){return new zu},e.prototype.buildPath=function(t,e){var n=e.cx,i=e.cy,r=2*Math.PI;t.moveTo(n+e.r,i),t.arc(n,i,e.r,0,r,!1),t.moveTo(n+e.r0,i),t.arc(n,i,e.r0,0,r,!0)},e}(Ms);function Bu(t,e,n){var i=e.smooth,r=e.points;if(r&&r.length>=2){if(i){var o=function(t,e,n,i){var r,o,a,s,l=[],u=[],h=[],c=[];if(i){a=[1/0,1/0],s=[-1/0,-1/0];for(var p=0,d=t.length;p<d;p++)Ht(a,a,t[p]),Yt(s,s,t[p]);Ht(a,a,i[0]),Yt(s,s,i[1])}for(p=0,d=t.length;p<d;p++){var f=t[p];if(n)r=t[p?p-1:d-1],o=t[(p+1)%d];else{if(0===p||p===d-1){l.push(Tt(t[p]));continue}r=t[p-1],o=t[p+1]}kt(u,o,r),Nt(u,u,e);var g=zt(f,r),y=zt(f,o),v=g+y;0!==v&&(g/=v,y/=v),Nt(h,u,-g),Nt(c,u,y);var m=Dt([],f,h),x=Dt([],f,c);i&&(Yt(m,m,a),Ht(m,m,s),Yt(x,x,a),Ht(x,x,s)),l.push(m),l.push(x)}return n&&l.push(l.shift()),l}(r,i,n,e.smoothConstraint);t.moveTo(r[0][0],r[0][1]);for(var a=r.length,s=0;s<(n?a:a-1);s++){var l=o[2*s],u=o[2*s+1],h=r[(s+1)%a];t.bezierCurveTo(l[0],l[1],u[0],u[1],h[0],h[1])}}else{t.moveTo(r[0][0],r[0][1]);s=1;for(var c=r.length;s<c;s++)t.lineTo(r[s][0],r[s][1])}n&&t.closePath()}}Vu.prototype.type="ring";var Fu=function(){this.points=null,this.smooth=0,this.smoothConstraint=null},Gu=function(t){function e(e){return t.call(this,e)||this}return n(e,t),e.prototype.getDefaultShape=function(){return new Fu},e.prototype.buildPath=function(t,e){Bu(t,e,!0)},e}(Ms);Gu.prototype.type="polygon";var Wu=function(){this.points=null,this.percent=1,this.smooth=0,this.smoothConstraint=null},Hu=function(t){function e(e){return t.call(this,e)||this}return n(e,t),e.prototype.getDefaultStyle=function(){return{stroke:"#000",fill:null}},e.prototype.getDefaultShape=function(){return new Wu},e.prototype.buildPath=function(t,e){Bu(t,e,!1)},e}(Ms);Hu.prototype.type="polyline";var Yu={},Uu=function(){this.x1=0,this.y1=0,this.x2=0,this.y2=0,this.percent=1},Xu=function(t){function e(e){return t.call(this,e)||this}return n(e,t),e.prototype.getDefaultStyle=function(){return{stroke:"#000",fill:null}},e.prototype.getDefaultShape=function(){return new Uu},e.prototype.buildPath=function(t,e){var n,i,r,o;if(this.subPixelOptimize){var a=Ls(Yu,e,this.style);n=a.x1,i=a.y1,r=a.x2,o=a.y2}else n=e.x1,i=e.y1,r=e.x2,o=e.y2;var s=e.percent;0!==s&&(t.moveTo(n,i),s<1&&(r=n*(1-s)+r*s,o=i*(1-s)+o*s),t.lineTo(r,o))},e.prototype.pointAt=function(t){var e=this.shape;return[e.x1*(1-t)+e.x2*t,e.y1*(1-t)+e.y2*t]},e}(Ms);Xu.prototype.type="line";var Zu=[],ju=function(){this.x1=0,this.y1=0,this.x2=0,this.y2=0,this.cpx1=0,this.cpy1=0,this.percent=1};function qu(t,e,n){var i=t.cpx2,r=t.cpy2;return null!=i||null!=r?[(n?mn:vn)(t.x1,t.cpx1,t.cpx2,t.x2,e),(n?mn:vn)(t.y1,t.cpy1,t.cpy2,t.y2,e)]:[(n?In:Mn)(t.x1,t.cpx1,t.x2,e),(n?In:Mn)(t.y1,t.cpy1,t.y2,e)]}var Ku=function(t){function e(e){return t.call(this,e)||this}return n(e,t),e.prototype.getDefaultStyle=function(){return{stroke:"#000",fill:null}},e.prototype.getDefaultShape=function(){return new ju},e.prototype.buildPath=function(t,e){var n=e.x1,i=e.y1,r=e.x2,o=e.y2,a=e.cpx1,s=e.cpy1,l=e.cpx2,u=e.cpy2,h=e.percent;0!==h&&(t.moveTo(n,i),null==l||null==u?(h<1&&(Cn(n,a,r,h,Zu),a=Zu[1],r=Zu[2],Cn(i,s,o,h,Zu),s=Zu[1],o=Zu[2]),t.quadraticCurveTo(a,s,r,o)):(h<1&&(bn(n,a,l,r,h,Zu),a=Zu[1],l=Zu[2],r=Zu[3],bn(i,s,u,o,h,Zu),s=Zu[1],u=Zu[2],o=Zu[3]),t.bezierCurveTo(a,s,l,u,r,o)))},e.prototype.pointAt=function(t){return qu(this.shape,t,!1)},e.prototype.tangentAt=function(t){var e=qu(this.shape,t,!0);return Et(e,e)},e}(Ms);Ku.prototype.type="bezier-curve";var $u=function(){this.cx=0,this.cy=0,this.r=0,this.startAngle=0,this.endAngle=2*Math.PI,this.clockwise=!0},Ju=function(t){function e(e){return t.call(this,e)||this}return n(e,t),e.prototype.getDefaultStyle=function(){return{stroke:"#000",fill:null}},e.prototype.getDefaultShape=function(){return new $u},e.prototype.buildPath=function(t,e){var n=e.cx,i=e.cy,r=Math.max(e.r,0),o=e.startAngle,a=e.endAngle,s=e.clockwise,l=Math.cos(o),u=Math.sin(o);t.moveTo(l*r+n,u*r+i),t.arc(n,i,r,o,a,!s)},e}(Ms);Ju.prototype.type="arc";var Qu=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="compound",e}return n(e,t),e.prototype._updatePathDirty=function(){for(var t=this.shape.paths,e=this.shapeChanged(),n=0;n<t.length;n++)e=e||t[n].shapeChanged();e&&this.dirtyShape()},e.prototype.beforeBrush=function(){this._updatePathDirty();for(var t=this.shape.paths||[],e=this.getGlobalScale(),n=0;n<t.length;n++)t[n].path||t[n].createPathProxy(),t[n].path.setScale(e[0],e[1],t[n].segmentIgnoreThreshold)},e.prototype.buildPath=function(t,e){for(var n=e.paths||[],i=0;i<n.length;i++)n[i].buildPath(t,n[i].shape,!0)},e.prototype.afterBrush=function(){for(var t=this.shape.paths||[],e=0;e<t.length;e++)t[e].pathUpdated()},e.prototype.getBoundingRect=function(){return this._updatePathDirty.call(this),Ms.prototype.getBoundingRect.call(this)},e}(Ms),th=function(){function t(t){this.colorStops=t||[]}return t.prototype.addColorStop=function(t,e){this.colorStops.push({offset:t,color:e})},t}(),eh=function(t){function e(e,n,i,r,o,a){var s=t.call(this,o)||this;return s.x=null==e?0:e,s.y=null==n?0:n,s.x2=null==i?1:i,s.y2=null==r?0:r,s.type="linear",s.global=a||!1,s}return n(e,t),e}(th),nh=function(t){function e(e,n,i,r,o){var a=t.call(this,r)||this;return a.x=null==e?.5:e,a.y=null==n?.5:n,a.r=null==i?.5:i,a.type="radial",a.global=o||!1,a}return n(e,t),e}(th),ih=[0,0],rh=[0,0],oh=new Ce,ah=new Ce,sh=function(){function t(t,e){this._corners=[],this._axes=[],this._origin=[0,0];for(var n=0;n<4;n++)this._corners[n]=new Ce;for(n=0;n<2;n++)this._axes[n]=new Ce;t&&this.fromBoundingRect(t,e)}return t.prototype.fromBoundingRect=function(t,e){var n=this._corners,i=this._axes,r=t.x,o=t.y,a=r+t.width,s=o+t.height;if(n[0].set(r,o),n[1].set(a,o),n[2].set(a,s),n[3].set(r,s),e)for(var l=0;l<4;l++)n[l].transform(e);Ce.sub(i[0],n[1],n[0]),Ce.sub(i[1],n[3],n[0]),i[0].normalize(),i[1].normalize();for(l=0;l<2;l++)this._origin[l]=i[l].dot(n[0])},t.prototype.intersect=function(t,e){var n=!0,i=!e;return oh.set(1/0,1/0),ah.set(0,0),!this._intersectCheckOneSide(this,t,oh,ah,i,1)&&(n=!1,i)||!this._intersectCheckOneSide(t,this,oh,ah,i,-1)&&(n=!1,i)||i||Ce.copy(e,n?oh:ah),n},t.prototype._intersectCheckOneSide=function(t,e,n,i,r,o){for(var a=!0,s=0;s<2;s++){var l=this._axes[s];if(this._getProjMinMaxOnAxis(s,t._corners,ih),this._getProjMinMaxOnAxis(s,e._corners,rh),ih[1]<rh[0]||ih[0]>rh[1]){if(a=!1,r)return a;var u=Math.abs(rh[0]-ih[1]),h=Math.abs(ih[0]-rh[1]);Math.min(u,h)>i.len()&&(u<h?Ce.scale(i,l,-u*o):Ce.scale(i,l,h*o))}else if(n){u=Math.abs(rh[0]-ih[1]),h=Math.abs(ih[0]-rh[1]);Math.min(u,h)<n.len()&&(u<h?Ce.scale(n,l,u*o):Ce.scale(n,l,-h*o))}}return a},t.prototype._getProjMinMaxOnAxis=function(t,e,n){for(var i=this._axes[t],r=this._origin,o=e[0].dot(i)+r[t],a=o,s=o,l=1;l<e.length;l++){var u=e[l].dot(i)+r[t];a=Math.min(u,a),s=Math.max(u,s)}n[0]=a,n[1]=s},t}(),lh=[],uh=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.notClear=!0,e.incremental=!0,e._displayables=[],e._temporaryDisplayables=[],e._cursor=0,e}return n(e,t),e.prototype.traverse=function(t,e){t.call(e,this)},e.prototype.useStyle=function(){this.style={}},e.prototype.getCursor=function(){return this._cursor},e.prototype.innerAfterBrush=function(){this._cursor=this._displayables.length},e.prototype.clearDisplaybles=function(){this._displayables=[],this._temporaryDisplayables=[],this._cursor=0,this.markRedraw(),this.notClear=!1},e.prototype.clearTemporalDisplayables=function(){this._temporaryDisplayables=[]},e.prototype.addDisplayable=function(t,e){e?this._temporaryDisplayables.push(t):this._displayables.push(t),this.markRedraw()},e.prototype.addDisplayables=function(t,e){e=e||!1;for(var n=0;n<t.length;n++)this.addDisplayable(t[n],e)},e.prototype.getDisplayables=function(){return this._displayables},e.prototype.getTemporalDisplayables=function(){return this._temporaryDisplayables},e.prototype.eachPendingDisplayable=function(t){for(var e=this._cursor;e<this._displayables.length;e++)t&&t(this._displayables[e]);for(e=0;e<this._temporaryDisplayables.length;e++)t&&t(this._temporaryDisplayables[e])},e.prototype.update=function(){this.updateTransform();for(var t=this._cursor;t<this._displayables.length;t++){(e=this._displayables[t]).parent=this,e.update(),e.parent=null}for(t=0;t<this._temporaryDisplayables.length;t++){var e;(e=this._temporaryDisplayables[t]).parent=this,e.update(),e.parent=null}},e.prototype.getBoundingRect=function(){if(!this._rect){for(var t=new Ee(1/0,1/0,-1/0,-1/0),e=0;e<this._displayables.length;e++){var n=this._displayables[e],i=n.getBoundingRect().clone();n.needLocalTransform()&&i.applyTransform(n.getLocalTransform(lh)),t.union(i)}this._rect=t}return this._rect},e.prototype.contain=function(t,e){var n=this.transformCoordToLocal(t,e);if(this.getBoundingRect().contain(n[0],n[1]))for(var i=0;i<this._displayables.length;i++){if(this._displayables[i].contain(t,e))return!0}return!1},e}(wa),hh=Po();function ch(t,e,n,i,r){var o;if(e&&e.ecModel){var a=e.ecModel.getUpdatePayload();o=a&&a.animation}var s="update"===t;if(e&&e.isAnimationEnabled()){var l=void 0,u=void 0,h=void 0;return i?(l=rt(i.duration,200),u=rt(i.easing,"cubicOut"),h=0):(l=e.getShallow(s?"animationDurationUpdate":"animationDuration"),u=e.getShallow(s?"animationEasingUpdate":"animationEasing"),h=e.getShallow(s?"animationDelayUpdate":"animationDelay")),o&&(null!=o.duration&&(l=o.duration),null!=o.easing&&(u=o.easing),null!=o.delay&&(h=o.delay)),U(h)&&(h=h(n,r)),U(l)&&(l=l(n)),{duration:l||0,delay:h,easing:u}}return null}function ph(t,e,n,i,r,o,a){var s,l=!1;U(r)?(a=o,o=r,r=null):q(r)&&(o=r.cb,a=r.during,l=r.isFrom,s=r.removeOpt,r=r.dataIndex);var u="leave"===t;u||e.stopAnimation("leave");var h=ch(t,i,r,u?s||{}:null,i&&i.getAnimationDelayParams?i.getAnimationDelayParams(e,r):null);if(h&&h.duration>0){var c={duration:h.duration,delay:h.delay||0,easing:h.easing,done:o,force:!!o||!!a,setToFinal:!u,scope:t,during:a};l?e.animateFrom(n,c):e.animateTo(n,c)}else e.stopAnimation(),!l&&e.attr(n),a&&a(1),o&&o()}function dh(t,e,n,i,r,o){ph("update",t,e,n,i,r,o)}function fh(t,e,n,i,r,o){ph("enter",t,e,n,i,r,o)}function gh(t){if(!t.__zr)return!0;for(var e=0;e<t.animators.length;e++){if("leave"===t.animators[e].scope)return!0}return!1}function yh(t,e,n,i,r,o){gh(t)||ph("leave",t,e,n,i,r,o)}function vh(t,e,n,i){t.removeTextContent(),t.removeTextGuideLine(),yh(t,{style:{opacity:0}},e,n,i)}function mh(t,e,n){function i(){t.parent&&t.parent.remove(t)}t.isGroup?t.traverse((function(t){t.isGroup||vh(t,e,n,i)})):vh(t,e,n,i)}function xh(t){hh(t).oldStyle=t.style}var _h=Math.max,bh=Math.min,wh={};function Sh(t){return Ms.extend(t)}var Mh=function(t,e){var i=gu(t,e);return function(t){function e(e){var n=t.call(this,e)||this;return n.applyTransform=i.applyTransform,n.buildPath=i.buildPath,n}return n(e,t),e}(du)};function Ih(t,e){return Mh(t,e)}function Th(t,e){wh[t]=e}function Ch(t){if(wh.hasOwnProperty(t))return wh[t]}function Dh(t,e,n,i){var r=yu(t,e);return n&&("center"===i&&(n=kh(n,r.getBoundingRect())),Ph(r,n)),r}function Ah(t,e,n){var i=new As({style:{image:t,x:e.x,y:e.y,width:e.width,height:e.height},onload:function(t){if("center"===n){var r={width:t.width,height:t.height};i.setStyle(kh(e,r))}}});return i}function kh(t,e){var n,i=e.width/e.height,r=t.height*i;return n=r<=t.width?t.height:(r=t.width)/i,{x:t.x+t.width/2-r/2,y:t.y+t.height/2-n/2,width:r,height:n}}var Lh=function(t,e){for(var n=[],i=t.length,r=0;r<i;r++){var o=t[r];n.push(o.getUpdatedPathProxy(!0))}var a=new Ms(e);return a.createPathProxy(),a.buildPath=function(t){if(fu(t)){t.appendPath(n);var e=t.getContext();e&&t.rebuildPath(e,1)}},a};function Ph(t,e){if(t.applyTransform){var n=t.getBoundingRect().calculateTransform(e);t.applyTransform(n)}}function Oh(t,e){return Ls(t,t,{lineWidth:e}),t}var Rh=Os;function Nh(t,e){for(var n=me([]);t&&t!==e;)_e(n,t.getLocalTransform(),n),t=t.parent;return n}function Eh(t,e,n){return e&&!N(e)&&(e=fr.getLocalTransform(e)),n&&(e=Me([],e)),Wt([],t,e)}function zh(t,e,n){var i=0===e[4]||0===e[5]||0===e[0]?1:Math.abs(2*e[4]/e[0]),r=0===e[4]||0===e[5]||0===e[2]?1:Math.abs(2*e[4]/e[2]),o=["left"===t?-i:"right"===t?i:0,"top"===t?-r:"bottom"===t?r:0];return o=Eh(o,e,n),Math.abs(o[0])>Math.abs(o[1])?o[0]>0?"right":"left":o[1]>0?"bottom":"top"}function Vh(t){return!t.isGroup}function Bh(t,e,n){if(t&&e){var i,r=(i={},t.traverse((function(t){Vh(t)&&t.anid&&(i[t.anid]=t)})),i);e.traverse((function(t){if(Vh(t)&&t.anid){var e=r[t.anid];if(e){var i=o(t);t.attr(o(e)),dh(t,i,n,Js(t).dataIndex)}}}))}function o(t){var e={x:t.x,y:t.y,rotation:t.rotation};return function(t){return null!=t.shape}(t)&&(e.shape=A({},t.shape)),e}}function Fh(t,e){return z(t,(function(t){var n=t[0];n=_h(n,e.x),n=bh(n,e.x+e.width);var i=t[1];return i=_h(i,e.y),[n,i=bh(i,e.y+e.height)]}))}function Gh(t,e){var n=_h(t.x,e.x),i=bh(t.x+t.width,e.x+e.width),r=_h(t.y,e.y),o=bh(t.y+t.height,e.y+e.height);if(i>=n&&o>=r)return{x:n,y:r,width:i-n,height:o-r}}function Wh(t,e,n){var i=A({rectHover:!0},e),r=i.style={strokeNoScale:!0};if(n=n||{x:-1,y:-1,width:2,height:2},t)return 0===t.indexOf("image://")?(r.image=t.slice(8),k(r,n),new As(i)):Dh(t.replace("path://",""),i,n,"center")}function Hh(t,e,n,i,r){for(var o=0,a=r[r.length-1];o<r.length;o++){var s=r[o];if(Yh(t,e,n,i,s[0],s[1],a[0],a[1]))return!0;a=s}}function Yh(t,e,n,i,r,o,a,s){var l,u=n-t,h=i-e,c=a-r,p=s-o,d=Uh(c,p,u,h);if((l=d)<=1e-6&&l>=-1e-6)return!1;var f=t-r,g=e-o,y=Uh(f,g,u,h)/d;if(y<0||y>1)return!1;var v=Uh(f,g,c,p)/d;return!(v<0||v>1)}function Uh(t,e,n,i){return t*i-n*e}function Xh(t){var e=t.itemTooltipOption,n=t.componentModel,i=t.itemName,r=X(e)?{formatter:e}:e,o=n.mainType,a=n.componentIndex,s={componentType:o,name:i,$vars:["name"]};s[o+"Index"]=a;var l=t.formatterParamsExtra;l&&E(G(l),(function(t){_t(s,t)||(s[t]=l[t],s.$vars.push(t))}));var u=Js(t.el);u.componentMainType=o,u.componentIndex=a,u.tooltipConfig={name:i,option:k({content:i,formatterParams:s},r)}}function Zh(t,e){var n;t.isGroup&&(n=e(t)),n||t.traverse(e)}function jh(t,e){if(t)if(Y(t))for(var n=0;n<t.length;n++)Zh(t[n],e);else Zh(t,e)}Th("circle",xu),Th("ellipse",bu),Th("sector",Eu),Th("ring",Vu),Th("polygon",Gu),Th("polyline",Hu),Th("rect",Es),Th("line",Xu),Th("bezierCurve",Ku),Th("arc",Ju);var qh=Object.freeze({__proto__:null,updateProps:dh,initProps:fh,removeElement:yh,removeElementWithFadeOut:mh,isElementRemoved:gh,extendShape:Sh,extendPath:Ih,registerShape:Th,getShapeClass:Ch,makePath:Dh,makeImage:Ah,mergePath:Lh,resizePath:Ph,subPixelOptimizeLine:Oh,subPixelOptimizeRect:function(t){return Ps(t.shape,t.shape,t.style),t},subPixelOptimize:Rh,getTransform:Nh,applyTransform:Eh,transformDirection:zh,groupTransition:Bh,clipPointsByRect:Fh,clipRectByRect:Gh,createIcon:Wh,linePolygonIntersect:Hh,lineLineIntersect:Yh,setTooltipConfig:Xh,traverseElements:jh,Group:Er,Image:As,Text:Bs,Circle:xu,Ellipse:bu,Sector:Eu,Ring:Vu,Polygon:Gu,Polyline:Hu,Rect:Es,Line:Xu,BezierCurve:Ku,Arc:Ju,IncrementalDisplayable:uh,CompoundPath:Qu,LinearGradient:eh,RadialGradient:nh,BoundingRect:Ee,OrientedBoundingRect:sh,Point:Ce,Path:Ms}),Kh={};function $h(t,e){for(var n=0;n<rl.length;n++){var i=rl[n],r=e[i],o=t.ensureState(i);o.style=o.style||{},o.style.text=r}var a=t.currentStates.slice();t.clearStates(!0),t.setStyle({text:e.normal}),t.useStates(a,!0)}function Jh(t,e,n){var i,r=t.labelFetcher,o=t.labelDataIndex,a=t.labelDimIndex,s=e.normal;r&&(i=r.getFormattedLabel(o,"normal",null,a,s&&s.get("formatter"),null!=n?{interpolatedValue:n}:null)),null==i&&(i=U(t.defaultText)?t.defaultText(o,t,n):t.defaultText);for(var l={normal:i},u=0;u<rl.length;u++){var h=rl[u],c=e[h];l[h]=rt(r?r.getFormattedLabel(o,h,null,a,c&&c.get("formatter")):null,i)}return l}function Qh(t,e,n,i){n=n||Kh;for(var r=t instanceof Bs,o=!1,a=0;a<ol.length;a++){if((p=e[ol[a]])&&p.getShallow("show")){o=!0;break}}var s=r?t:t.getTextContent();if(o){r||(s||(s=new Bs,t.setTextContent(s)),t.stateProxy&&(s.stateProxy=t.stateProxy));var l=Jh(n,e),u=e.normal,h=!!u.getShallow("show"),c=ec(u,i&&i.normal,n,!1,!r);c.text=l.normal,r||t.setTextConfig(nc(u,n,!1));for(a=0;a<rl.length;a++){var p,d=rl[a];if(p=e[d]){var f=s.ensureState(d),g=!!rt(p.getShallow("show"),h);if(g!==h&&(f.ignore=!g),f.style=ec(p,i&&i[d],n,!0,!r),f.style.text=l[d],!r)t.ensureState(d).textConfig=nc(p,n,!0)}}s.silent=!!u.getShallow("silent"),null!=s.style.x&&(c.x=s.style.x),null!=s.style.y&&(c.y=s.style.y),s.ignore=!h,s.useStyle(c),s.dirty(),n.enableTextSetter&&(lc(s).setLabelText=function(t){var i=Jh(n,e,t);$h(s,i)})}else s&&(s.ignore=!0);t.dirty()}function tc(t,e){e=e||"label";for(var n={normal:t.getModel(e)},i=0;i<rl.length;i++){var r=rl[i];n[r]=t.getModel([r,e])}return n}function ec(t,e,n,i,r){var o={};return function(t,e,n,i,r){n=n||Kh;var o,a=e.ecModel,s=a&&a.option.textStyle,l=function(t){var e;for(;t&&t!==t.ecModel;){var n=(t.option||Kh).rich;if(n){e=e||{};for(var i=G(n),r=0;r<i.length;r++){e[i[r]]=1}}t=t.parentModel}return e}(e);if(l)for(var u in o={},l)if(l.hasOwnProperty(u)){var h=e.getModel(["rich",u]);ac(o[u]={},h,s,n,i,r,!1,!0)}o&&(t.rich=o);var c=e.get("overflow");c&&(t.overflow=c);var p=e.get("minMargin");null!=p&&(t.margin=p);ac(t,e,s,n,i,r,!0,!1)}(o,t,n,i,r),e&&A(o,e),o}function nc(t,e,n){e=e||{};var i,r={},o=t.getShallow("rotate"),a=rt(t.getShallow("distance"),n?null:5),s=t.getShallow("offset");return"outside"===(i=t.getShallow("position")||(n?null:"inside"))&&(i=e.defaultOutsidePosition||"top"),null!=i&&(r.position=i),null!=s&&(r.offset=s),null!=o&&(o*=Math.PI/180,r.rotation=o),null!=a&&(r.distance=a),r.outsideFill="inherit"===t.get("color")?e.inheritColor||null:"auto",r}var ic=["fontStyle","fontWeight","fontSize","fontFamily","textShadowColor","textShadowBlur","textShadowOffsetX","textShadowOffsetY"],rc=["align","lineHeight","width","height","tag","verticalAlign"],oc=["padding","borderWidth","borderRadius","borderDashOffset","backgroundColor","borderColor","shadowColor","shadowBlur","shadowOffsetX","shadowOffsetY"];function ac(t,e,n,i,r,o,a,s){n=!r&&n||Kh;var l=i&&i.inheritColor,u=e.getShallow("color"),h=e.getShallow("textBorderColor"),c=rt(e.getShallow("opacity"),n.opacity);"inherit"!==u&&"auto"!==u||(u=l||null),"inherit"!==h&&"auto"!==h||(h=l||null),o||(u=u||n.color,h=h||n.textBorderColor),null!=u&&(t.fill=u),null!=h&&(t.stroke=h);var p=rt(e.getShallow("textBorderWidth"),n.textBorderWidth);null!=p&&(t.lineWidth=p);var d=rt(e.getShallow("textBorderType"),n.textBorderType);null!=d&&(t.lineDash=d);var f=rt(e.getShallow("textBorderDashOffset"),n.textBorderDashOffset);null!=f&&(t.lineDashOffset=f),r||null!=c||s||(c=i&&i.defaultOpacity),null!=c&&(t.opacity=c),r||o||null==t.fill&&i.inheritColor&&(t.fill=i.inheritColor);for(var g=0;g<ic.length;g++){var y=ic[g];null!=(m=rt(e.getShallow(y),n[y]))&&(t[y]=m)}for(g=0;g<rc.length;g++){y=rc[g];null!=(m=e.getShallow(y))&&(t[y]=m)}if(null==t.verticalAlign){var v=e.getShallow("baseline");null!=v&&(t.verticalAlign=v)}if(!a||!i.disableBox){for(g=0;g<oc.length;g++){var m;y=oc[g];null!=(m=e.getShallow(y))&&(t[y]=m)}var x=e.getShallow("borderType");null!=x&&(t.borderDash=x),"auto"!==t.backgroundColor&&"inherit"!==t.backgroundColor||!l||(t.backgroundColor=l),"auto"!==t.borderColor&&"inherit"!==t.borderColor||!l||(t.borderColor=l)}}function sc(t,e){var n=e&&e.getModel("textStyle");return ut([t.fontStyle||n&&n.getShallow("fontStyle")||"",t.fontWeight||n&&n.getShallow("fontWeight")||"",(t.fontSize||n&&n.getShallow("fontSize")||12)+"px",t.fontFamily||n&&n.getShallow("fontFamily")||"sans-serif"].join(" "))}var lc=Po();function uc(t,e,n,i){if(t){var r=lc(t);r.prevValue=r.value,r.value=n;var o=e.normal;r.valueAnimation=o.get("valueAnimation"),r.valueAnimation&&(r.precision=o.get("precision"),r.defaultInterpolatedText=i,r.statesModels=e)}}function hc(t,e,n,i,r){var o=lc(t);if(o.valueAnimation&&o.prevValue!==o.value){var a=o.defaultInterpolatedText,s=rt(o.interpolatedValue,o.prevValue),l=o.value;t.percent=0,(null==o.prevValue?fh:dh)(t,{percent:1},i,e,null,(function(i){var u=Go(n,o.precision,s,l,i);o.interpolatedValue=1===i?null:u;var h=Jh({labelDataIndex:e,labelFetcher:r,defaultText:a?a(u):u+""},o.statesModels,u);$h(t,h)}))}}var cc,pc,dc=["textStyle","color"],fc=["fontStyle","fontWeight","fontSize","fontFamily","padding","lineHeight","rich","width","height","overflow"],gc=new Bs,yc=function(){function t(){}return t.prototype.getTextColor=function(t){var e=this.ecModel;return this.getShallow("color")||(!t&&e?e.get(dc):null)},t.prototype.getFont=function(){return sc({fontStyle:this.getShallow("fontStyle"),fontWeight:this.getShallow("fontWeight"),fontSize:this.getShallow("fontSize"),fontFamily:this.getShallow("fontFamily")},this.ecModel)},t.prototype.getTextRect=function(t){for(var e={text:t,verticalAlign:this.getShallow("verticalAlign")||this.getShallow("baseline")},n=0;n<fc.length;n++)e[fc[n]]=this.getShallow(fc[n]);return gc.useStyle(e),gc.update(),gc.getBoundingRect()},t}(),vc=[["lineWidth","width"],["stroke","color"],["opacity"],["shadowBlur"],["shadowOffsetX"],["shadowOffsetY"],["shadowColor"],["lineDash","type"],["lineDashOffset","dashOffset"],["lineCap","cap"],["lineJoin","join"],["miterLimit"]],mc=$o(vc),xc=function(){function t(){}return t.prototype.getLineStyle=function(t){return mc(this,t)},t}(),_c=[["fill","color"],["stroke","borderColor"],["lineWidth","borderWidth"],["opacity"],["shadowBlur"],["shadowOffsetX"],["shadowOffsetY"],["shadowColor"],["lineDash","borderType"],["lineDashOffset","borderDashOffset"],["lineCap","borderCap"],["lineJoin","borderJoin"],["miterLimit","borderMiterLimit"]],bc=$o(_c),wc=function(){function t(){}return t.prototype.getItemStyle=function(t,e){return bc(this,t,e)},t}(),Sc=function(){function t(t,e,n){this.parentModel=e,this.ecModel=n,this.option=t}return t.prototype.init=function(t,e,n){for(var i=[],r=3;r<arguments.length;r++)i[r-3]=arguments[r]},t.prototype.mergeOption=function(t,e){C(this.option,t,!0)},t.prototype.get=function(t,e){return null==t?this.option:this._doGet(this.parsePath(t),!e&&this.parentModel)},t.prototype.getShallow=function(t,e){var n=this.option,i=null==n?n:n[t];if(null==i&&!e){var r=this.parentModel;r&&(i=r.getShallow(t))}return i},t.prototype.getModel=function(e,n){var i=null!=e,r=i?this.parsePath(e):null;return new t(i?this._doGet(r):this.option,n=n||this.parentModel&&this.parentModel.getModel(this.resolveParentPath(r)),this.ecModel)},t.prototype.isEmpty=function(){return null==this.option},t.prototype.restoreData=function(){},t.prototype.clone=function(){return new(0,this.constructor)(T(this.option))},t.prototype.parsePath=function(t){return"string"==typeof t?t.split("."):t},t.prototype.resolveParentPath=function(t){return t},t.prototype.isAnimationEnabled=function(){if(!r.node&&this.option){if(null!=this.option.animation)return!!this.option.animation;if(this.parentModel)return this.parentModel.isAnimationEnabled()}},t.prototype._doGet=function(t,e){var n=this.option;if(!t)return n;for(var i=0;i<t.length&&(!t[i]||null!=(n=n&&"object"==typeof n?n[t[i]]:null));i++);return null==n&&e&&(n=e._doGet(this.resolveParentPath(t),e.parentModel)),n},t}();Uo(Sc),cc=Sc,pc=["__\0is_clz",Zo++].join("_"),cc.prototype[pc]=!0,cc.isInstance=function(t){return!(!t||!t[pc])},R(Sc,xc),R(Sc,wc),R(Sc,Qo),R(Sc,yc);var Mc=Math.round(10*Math.random());function Ic(t){return[t||"",Mc++].join("_")}function Tc(t,e){return C(C({},t,!0),e,!0)}var Cc="ZH",Dc="EN",Ac=Dc,kc={},Lc={},Pc=r.domSupported&&(document.documentElement.lang||navigator.language||navigator.browserLanguage).toUpperCase().indexOf(Cc)>-1?Cc:Ac;function Oc(t,e){t=t.toUpperCase(),Lc[t]=new Sc(e),kc[t]=e}function Rc(t){return Lc[t]}Oc(Dc,{time:{month:["January","February","March","April","May","June","July","August","September","October","November","December"],monthAbbr:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayOfWeek:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayOfWeekAbbr:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"]},legend:{selector:{all:"All",inverse:"Inv"}},toolbox:{brush:{title:{rect:"Box Select",polygon:"Lasso Select",lineX:"Horizontally Select",lineY:"Vertically Select",keep:"Keep Selections",clear:"Clear Selections"}},dataView:{title:"Data View",lang:["Data View","Close","Refresh"]},dataZoom:{title:{zoom:"Zoom",back:"Zoom Reset"}},magicType:{title:{line:"Switch to Line Chart",bar:"Switch to Bar Chart",stack:"Stack",tiled:"Tile"}},restore:{title:"Restore"},saveAsImage:{title:"Save as Image",lang:["Right Click to Save Image"]}},series:{typeNames:{pie:"Pie chart",bar:"Bar chart",line:"Line chart",scatter:"Scatter plot",effectScatter:"Ripple scatter plot",radar:"Radar chart",tree:"Tree",treemap:"Treemap",boxplot:"Boxplot",candlestick:"Candlestick",k:"K line chart",heatmap:"Heat map",map:"Map",parallel:"Parallel coordinate map",lines:"Line graph",graph:"Relationship graph",sankey:"Sankey diagram",funnel:"Funnel chart",gauge:"Gauge",pictorialBar:"Pictorial bar",themeRiver:"Theme River Map",sunburst:"Sunburst"}},aria:{general:{withTitle:'This is a chart about "{title}"',withoutTitle:"This is a chart"},series:{single:{prefix:"",withName:" with type {seriesType} named {seriesName}.",withoutName:" with type {seriesType}."},multiple:{prefix:". It consists of {seriesCount} series count.",withName:" The {seriesId} series is a {seriesType} representing {seriesName}.",withoutName:" The {seriesId} series is a {seriesType}.",separator:{middle:"",end:""}}},data:{allData:"The data is as follows: ",partialData:"The first {displayCnt} items are: ",withName:"the data for {name} is {value}",withoutName:"{value}",separator:{middle:", ",end:". "}}}}),Oc(Cc,{time:{month:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],monthAbbr:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],dayOfWeek:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],dayOfWeekAbbr:["日","一","二","三","四","五","六"]},legend:{selector:{all:"全选",inverse:"反选"}},toolbox:{brush:{title:{rect:"矩形选择",polygon:"圈选",lineX:"横向选择",lineY:"纵向选择",keep:"保持选择",clear:"清除选择"}},dataView:{title:"数据视图",lang:["数据视图","关闭","刷新"]},dataZoom:{title:{zoom:"区域缩放",back:"区域缩放还原"}},magicType:{title:{line:"切换为折线图",bar:"切换为柱状图",stack:"切换为堆叠",tiled:"切换为平铺"}},restore:{title:"还原"},saveAsImage:{title:"保存为图片",lang:["右键另存为图片"]}},series:{typeNames:{pie:"饼图",bar:"柱状图",line:"折线图",scatter:"散点图",effectScatter:"涟漪散点图",radar:"雷达图",tree:"树图",treemap:"矩形树图",boxplot:"箱型图",candlestick:"K线图",k:"K线图",heatmap:"热力图",map:"地图",parallel:"平行坐标图",lines:"线图",graph:"关系图",sankey:"桑基图",funnel:"漏斗图",gauge:"仪表盘图",pictorialBar:"象形柱图",themeRiver:"主题河流图",sunburst:"旭日图"}},aria:{general:{withTitle:"这是一个关于“{title}”的图表。",withoutTitle:"这是一个图表，"},series:{single:{prefix:"",withName:"图表类型是{seriesType}，表示{seriesName}。",withoutName:"图表类型是{seriesType}。"},multiple:{prefix:"它由{seriesCount}个图表系列组成。",withName:"第{seriesId}个系列是一个表示{seriesName}的{seriesType}，",withoutName:"第{seriesId}个系列是一个{seriesType}，",separator:{middle:"；",end:"。"}}},data:{allData:"其数据是——",partialData:"其中，前{displayCnt}项是——",withName:"{name}的数据是{value}",withoutName:"{value}",separator:{middle:"，",end:""}}}});var Nc=1e3,Ec=6e4,zc=36e5,Vc=864e5,Bc=31536e6,Fc={year:"{yyyy}",month:"{MMM}",day:"{d}",hour:"{HH}:{mm}",minute:"{HH}:{mm}",second:"{HH}:{mm}:{ss}",millisecond:"{HH}:{mm}:{ss} {SSS}",none:"{yyyy}-{MM}-{dd} {HH}:{mm}:{ss} {SSS}"},Gc="{yyyy}-{MM}-{dd}",Wc={year:"{yyyy}",month:"{yyyy}-{MM}",day:Gc,hour:"{yyyy}-{MM}-{dd} "+Fc.hour,minute:"{yyyy}-{MM}-{dd} "+Fc.minute,second:"{yyyy}-{MM}-{dd} "+Fc.second,millisecond:Fc.none},Hc=["year","month","day","hour","minute","second","millisecond"],Yc=["year","half-year","quarter","month","week","half-week","day","half-day","quarter-day","hour","minute","second","millisecond"];function Uc(t,e){return"0000".substr(0,e-(t+="").length)+t}function Xc(t){switch(t){case"half-year":case"quarter":return"month";case"week":case"half-week":return"day";case"half-day":case"quarter-day":return"hour";default:return t}}function Zc(t){return t===Xc(t)}function jc(t,e,n,i){var r=io(t),o=r[$c(n)](),a=r[Jc(n)]()+1,s=Math.floor((a-1)/3)+1,l=r[Qc(n)](),u=r["get"+(n?"UTC":"")+"Day"](),h=r[tp(n)](),c=(h-1)%12+1,p=r[ep(n)](),d=r[np(n)](),f=r[ip(n)](),g=(i instanceof Sc?i:Rc(i||Pc)||Lc.EN).getModel("time"),y=g.get("month"),v=g.get("monthAbbr"),m=g.get("dayOfWeek"),x=g.get("dayOfWeekAbbr");return(e||"").replace(/{yyyy}/g,o+"").replace(/{yy}/g,o%100+"").replace(/{Q}/g,s+"").replace(/{MMMM}/g,y[a-1]).replace(/{MMM}/g,v[a-1]).replace(/{MM}/g,Uc(a,2)).replace(/{M}/g,a+"").replace(/{dd}/g,Uc(l,2)).replace(/{d}/g,l+"").replace(/{eeee}/g,m[u]).replace(/{ee}/g,x[u]).replace(/{e}/g,u+"").replace(/{HH}/g,Uc(h,2)).replace(/{H}/g,h+"").replace(/{hh}/g,Uc(c+"",2)).replace(/{h}/g,c+"").replace(/{mm}/g,Uc(p,2)).replace(/{m}/g,p+"").replace(/{ss}/g,Uc(d,2)).replace(/{s}/g,d+"").replace(/{SSS}/g,Uc(f,3)).replace(/{S}/g,f+"")}function qc(t,e){var n=io(t),i=n[Jc(e)]()+1,r=n[Qc(e)](),o=n[tp(e)](),a=n[ep(e)](),s=n[np(e)](),l=0===n[ip(e)](),u=l&&0===s,h=u&&0===a,c=h&&0===o,p=c&&1===r;return p&&1===i?"year":p?"month":c?"day":h?"hour":u?"minute":l?"second":"millisecond"}function Kc(t,e,n){var i=j(t)?io(t):t;switch(e=e||qc(t,n)){case"year":return i[$c(n)]();case"half-year":return i[Jc(n)]()>=6?1:0;case"quarter":return Math.floor((i[Jc(n)]()+1)/4);case"month":return i[Jc(n)]();case"day":return i[Qc(n)]();case"half-day":return i[tp(n)]()/24;case"hour":return i[tp(n)]();case"minute":return i[ep(n)]();case"second":return i[np(n)]();case"millisecond":return i[ip(n)]()}}function $c(t){return t?"getUTCFullYear":"getFullYear"}function Jc(t){return t?"getUTCMonth":"getMonth"}function Qc(t){return t?"getUTCDate":"getDate"}function tp(t){return t?"getUTCHours":"getHours"}function ep(t){return t?"getUTCMinutes":"getMinutes"}function np(t){return t?"getUTCSeconds":"getSeconds"}function ip(t){return t?"getUTCMilliseconds":"getMilliseconds"}function rp(t){return t?"setUTCFullYear":"setFullYear"}function op(t){return t?"setUTCMonth":"setMonth"}function ap(t){return t?"setUTCDate":"setDate"}function sp(t){return t?"setUTCHours":"setHours"}function lp(t){return t?"setUTCMinutes":"setMinutes"}function up(t){return t?"setUTCSeconds":"setSeconds"}function hp(t){return t?"setUTCMilliseconds":"setMilliseconds"}function cp(t){if(!ho(t))return X(t)?t:"-";var e=(t+"").split(".");return e[0].replace(/(\d{1,3})(?=(?:\d{3})+(?!\d))/g,"$1,")+(e.length>1?"."+e[1]:"")}function pp(t,e){return t=(t||"").toLowerCase().replace(/-(.)/g,(function(t,e){return e.toUpperCase()})),e&&t&&(t=t.charAt(0).toUpperCase()+t.slice(1)),t}var dp=st;function fp(t,e,n){function i(t){return t&&ut(t)?t:"-"}function r(t){return!(null==t||isNaN(t)||!isFinite(t))}var o="time"===e,a=t instanceof Date;if(o||a){var s=o?io(t):t;if(!isNaN(+s))return jc(s,"{yyyy}-{MM}-{dd} {HH}:{mm}:{ss}",n);if(a)return"-"}if("ordinal"===e)return Z(t)?i(t):j(t)&&r(t)?t+"":"-";var l=uo(t);return r(l)?cp(l):Z(t)?i(t):"boolean"==typeof t?t+"":"-"}var gp=["a","b","c","d","e","f","g"],yp=function(t,e){return"{"+t+(null==e?"":e)+"}"};function vp(t,e,n){Y(e)||(e=[e]);var i=e.length;if(!i)return"";for(var r=e[0].$vars||[],o=0;o<r.length;o++){var a=gp[o];t=t.replace(yp(a),yp(a,0))}for(var s=0;s<i;s++)for(var l=0;l<r.length;l++){var u=e[s][r[l]];t=t.replace(yp(gp[l],s),n?ie(u):u)}return t}function mp(t,e){var n=X(t)?{color:t,extraCssText:e}:t||{},i=n.color,r=n.type;e=n.extraCssText;var o=n.renderMode||"html";return i?"html"===o?"subItem"===r?'<span style="display:inline-block;vertical-align:middle;margin-right:8px;margin-left:3px;border-radius:4px;width:4px;height:4px;background-color:'+ie(i)+";"+(e||"")+'"></span>':'<span style="display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:'+ie(i)+";"+(e||"")+'"></span>':{renderMode:o,content:"{"+(n.markerId||"markerX")+"|}  ",style:"subItem"===r?{width:4,height:4,borderRadius:2,backgroundColor:i}:{width:10,height:10,borderRadius:5,backgroundColor:i}}:""}function xp(t,e){return e=e||"transparent",X(t)?t:q(t)&&t.colorStops&&(t.colorStops[0]||{}).color||e}function _p(t,e){if("_blank"===e||"blank"===e){var n=window.open();n.opener=null,n.location.href=t}else window.open(t,e)}var bp=E,wp=["left","right","top","bottom","width","height"],Sp=[["width","left","right"],["height","top","bottom"]];function Mp(t,e,n,i,r){var o=0,a=0;null==i&&(i=1/0),null==r&&(r=1/0);var s=0;e.eachChild((function(l,u){var h,c,p=l.getBoundingRect(),d=e.childAt(u+1),f=d&&d.getBoundingRect();if("horizontal"===t){var g=p.width+(f?-f.x+p.x:0);(h=o+g)>i||l.newline?(o=0,h=g,a+=s+n,s=p.height):s=Math.max(s,p.height)}else{var y=p.height+(f?-f.y+p.y:0);(c=a+y)>r||l.newline?(o+=s+n,a=0,c=y,s=p.width):s=Math.max(s,p.width)}l.newline||(l.x=o,l.y=a,l.markRedraw(),"horizontal"===t?o=h+n:a=c+n)}))}var Ip=Mp;H(Mp,"vertical"),H(Mp,"horizontal");function Tp(t,e,n){n=dp(n||0);var i=e.width,r=e.height,o=Ur(t.left,i),a=Ur(t.top,r),s=Ur(t.right,i),l=Ur(t.bottom,r),u=Ur(t.width,i),h=Ur(t.height,r),c=n[2]+n[0],p=n[1]+n[3],d=t.aspect;switch(isNaN(u)&&(u=i-s-p-o),isNaN(h)&&(h=r-l-c-a),null!=d&&(isNaN(u)&&isNaN(h)&&(d>i/r?u=.8*i:h=.8*r),isNaN(u)&&(u=d*h),isNaN(h)&&(h=u/d)),isNaN(o)&&(o=i-s-u-p),isNaN(a)&&(a=r-l-h-c),t.left||t.right){case"center":o=i/2-u/2-n[3];break;case"right":o=i-u-p}switch(t.top||t.bottom){case"middle":case"center":a=r/2-h/2-n[0];break;case"bottom":a=r-h-c}o=o||0,a=a||0,isNaN(u)&&(u=i-p-o-(s||0)),isNaN(h)&&(h=r-c-a-(l||0));var f=new Ee(o+n[3],a+n[0],u,h);return f.margin=n,f}function Cp(t,e,n,i,r,o){var a,s=!r||!r.hv||r.hv[0],l=!r||!r.hv||r.hv[1],u=r&&r.boundingMode||"all";if((o=o||t).x=t.x,o.y=t.y,!s&&!l)return!1;if("raw"===u)a="group"===t.type?new Ee(0,0,+e.width||0,+e.height||0):t.getBoundingRect();else if(a=t.getBoundingRect(),t.needLocalTransform()){var h=t.getLocalTransform();(a=a.clone()).applyTransform(h)}var c=Tp(k({width:a.width,height:a.height},e),n,i),p=s?c.x-a.x:0,d=l?c.y-a.y:0;return"raw"===u?(o.x=p,o.y=d):(o.x+=p,o.y+=d),o===t&&t.markRedraw(),!0}function Dp(t){var e=t.layoutMode||t.constructor.layoutMode;return q(e)?e:e?{type:e}:null}function Ap(t,e,n){var i=n&&n.ignoreSize;!Y(i)&&(i=[i,i]);var r=a(Sp[0],0),o=a(Sp[1],1);function a(n,r){var o={},a=0,u={},h=0;if(bp(n,(function(e){u[e]=t[e]})),bp(n,(function(t){s(e,t)&&(o[t]=u[t]=e[t]),l(o,t)&&a++,l(u,t)&&h++})),i[r])return l(e,n[1])?u[n[2]]=null:l(e,n[2])&&(u[n[1]]=null),u;if(2!==h&&a){if(a>=2)return o;for(var c=0;c<n.length;c++){var p=n[c];if(!s(o,p)&&s(t,p)){o[p]=t[p];break}}return o}return u}function s(t,e){return t.hasOwnProperty(e)}function l(t,e){return null!=t[e]&&"auto"!==t[e]}function u(t,e,n){bp(t,(function(t){e[t]=n[t]}))}u(Sp[0],t,r),u(Sp[1],t,o)}function kp(t){return Lp({},t)}function Lp(t,e){return e&&t&&bp(wp,(function(n){e.hasOwnProperty(n)&&(t[n]=e[n])})),t}var Pp=Po(),Op=function(t){function e(e,n,i){var r=t.call(this,e,n,i)||this;return r.uid=Ic("ec_cpt_model"),r}return n(e,t),e.prototype.init=function(t,e,n){this.mergeDefaultAndTheme(t,n)},e.prototype.mergeDefaultAndTheme=function(t,e){var n=Dp(this),i=n?kp(t):{};C(t,e.getTheme().get(this.mainType)),C(t,this.getDefaultOption()),n&&Ap(t,i,n)},e.prototype.mergeOption=function(t,e){C(this.option,t,!0);var n=Dp(this);n&&Ap(this.option,t,n)},e.prototype.optionUpdated=function(t,e){},e.prototype.getDefaultOption=function(){var t=this.constructor;if(!function(t){return!(!t||!t[Ho])}(t))return t.defaultOption;var e=Pp(this);if(!e.defaultOption){for(var n=[],i=t;i;){var r=i.prototype.defaultOption;r&&n.push(r),i=i.superClass}for(var o={},a=n.length-1;a>=0;a--)o=C(o,n[a],!0);e.defaultOption=o}return e.defaultOption},e.prototype.getReferringComponents=function(t,e){var n=t+"Index",i=t+"Id";return Vo(this.ecModel,t,{index:this.get(n,!0),id:this.get(i,!0)},e)},e.prototype.getBoxLayoutParams=function(){var t=this;return{left:t.get("left"),top:t.get("top"),right:t.get("right"),bottom:t.get("bottom"),width:t.get("width"),height:t.get("height")}},e.prototype.getZLevelKey=function(){return""},e.prototype.setZLevel=function(t){this.option.zlevel=t},e.protoInitialize=function(){var t=e.prototype;t.type="component",t.id="",t.name="",t.mainType="",t.subType="",t.componentIndex=0}(),e}(Sc);Xo(Op,Sc),Ko(Op),function(t){var e={};t.registerSubTypeDefaulter=function(t,n){var i=Yo(t);e[i.main]=n},t.determineSubType=function(n,i){var r=i.type;if(!r){var o=Yo(n).main;t.hasSubTypes(n)&&e[o]&&(r=e[o](i))}return r}}(Op),function(t,e){function n(t,e){return t[e]||(t[e]={predecessor:[],successor:[]}),t[e]}t.topologicalTravel=function(t,i,r,o){if(t.length){var a=function(t){var i={},r=[];return E(t,(function(o){var a=n(i,o),s=function(t,e){var n=[];return E(t,(function(t){P(e,t)>=0&&n.push(t)})),n}(a.originalDeps=e(o),t);a.entryCount=s.length,0===a.entryCount&&r.push(o),E(s,(function(t){P(a.predecessor,t)<0&&a.predecessor.push(t);var e=n(i,t);P(e.successor,t)<0&&e.successor.push(o)}))})),{graph:i,noEntryList:r}}(i),s=a.graph,l=a.noEntryList,u={};for(E(t,(function(t){u[t]=!0}));l.length;){var h=l.pop(),c=s[h],p=!!u[h];p&&(r.call(o,h,c.originalDeps.slice()),delete u[h]),E(c.successor,p?f:d)}E(u,(function(){var t="";throw new Error(t)}))}function d(t){s[t].entryCount--,0===s[t].entryCount&&l.push(t)}function f(t){u[t]=!0,d(t)}}}(Op,(function(t){var e=[];E(Op.getClassesByMainType(t),(function(t){e=e.concat(t.dependencies||t.prototype.dependencies||[])})),e=z(e,(function(t){return Yo(t).main})),"dataset"!==t&&P(e,"dataset")<=0&&e.unshift("dataset");return e}));var Rp="";"undefined"!=typeof navigator&&(Rp=navigator.platform||"");var Np="rgba(0, 0, 0, 0.2)",Ep={darkMode:"auto",colorBy:"series",color:["#5470c6","#91cc75","#fac858","#ee6666","#73c0de","#3ba272","#fc8452","#9a60b4","#ea7ccc"],gradientColor:["#f6efa6","#d88273","#bf444c"],aria:{decal:{decals:[{color:Np,dashArrayX:[1,0],dashArrayY:[2,5],symbolSize:1,rotation:Math.PI/6},{color:Np,symbol:"circle",dashArrayX:[[8,8],[0,8,8,0]],dashArrayY:[6,0],symbolSize:.8},{color:Np,dashArrayX:[1,0],dashArrayY:[4,3],rotation:-Math.PI/4},{color:Np,dashArrayX:[[6,6],[0,6,6,0]],dashArrayY:[6,0]},{color:Np,dashArrayX:[[1,0],[1,6]],dashArrayY:[1,0,6,0],rotation:Math.PI/4},{color:Np,symbol:"triangle",dashArrayX:[[9,9],[0,9,9,0]],dashArrayY:[7,2],symbolSize:.75}]}},textStyle:{fontFamily:Rp.match(/^Win/)?"Microsoft YaHei":"sans-serif",fontSize:12,fontStyle:"normal",fontWeight:"normal"},blendMode:null,stateAnimation:{duration:300,easing:"cubicOut"},animation:"auto",animationDuration:1e3,animationDurationUpdate:500,animationEasing:"cubicInOut",animationEasingUpdate:"cubicInOut",animationThreshold:2e3,progressiveThreshold:3e3,progressive:400,hoverLayerThreshold:3e3,useUTC:!1},zp=yt(["tooltip","label","itemName","itemId","itemGroupId","seriesName"]),Vp="original",Bp="arrayRows",Fp="objectRows",Gp="keyedColumns",Wp="typedArray",Hp="unknown",Yp="column",Up="row",Xp=1,Zp=2,jp=3,qp=Po();function Kp(t,e,n){var i={},r=Jp(e);if(!r||!t)return i;var o,a,s=[],l=[],u=e.ecModel,h=qp(u).datasetMap,c=r.uid+"_"+n.seriesLayoutBy;E(t=t.slice(),(function(e,n){var r=q(e)?e:t[n]={name:e};"ordinal"===r.type&&null==o&&(o=n,a=f(r)),i[r.name]=[]}));var p=h.get(c)||h.set(c,{categoryWayDim:a,valueWayDim:0});function d(t,e,n){for(var i=0;i<n;i++)t.push(e+i)}function f(t){var e=t.dimsDef;return e?e.length:1}return E(t,(function(t,e){var n=t.name,r=f(t);if(null==o){var a=p.valueWayDim;d(i[n],a,r),d(l,a,r),p.valueWayDim+=r}else if(o===e)d(i[n],0,r),d(s,0,r);else{a=p.categoryWayDim;d(i[n],a,r),d(l,a,r),p.categoryWayDim+=r}})),s.length&&(i.itemName=s),l.length&&(i.seriesName=l),i}function $p(t,e,n){var i={};if(!Jp(t))return i;var r,o=e.sourceFormat,a=e.dimensionsDefine;o!==Fp&&o!==Gp||E(a,(function(t,e){"name"===(q(t)?t.name:t)&&(r=e)}));var s=function(){for(var t={},i={},s=[],l=0,u=Math.min(5,n);l<u;l++){var h=td(e.data,o,e.seriesLayoutBy,a,e.startIndex,l);s.push(h);var c=h===jp;if(c&&null==t.v&&l!==r&&(t.v=l),(null==t.n||t.n===t.v||!c&&s[t.n]===jp)&&(t.n=l),p(t)&&s[t.n]!==jp)return t;c||(h===Zp&&null==i.v&&l!==r&&(i.v=l),null!=i.n&&i.n!==i.v||(i.n=l))}function p(t){return null!=t.v&&null!=t.n}return p(t)?t:p(i)?i:null}();if(s){i.value=[s.v];var l=null!=r?r:s.n;i.itemName=[l],i.seriesName=[l]}return i}function Jp(t){if(!t.get("data",!0))return Vo(t.ecModel,"dataset",{index:t.get("datasetIndex",!0),id:t.get("datasetId",!0)},Eo).models[0]}function Qp(t,e){return td(t.data,t.sourceFormat,t.seriesLayoutBy,t.dimensionsDefine,t.startIndex,e)}function td(t,e,n,i,r,o){var a,s,l;if($(t))return jp;if(i){var u=i[o];q(u)?(s=u.name,l=u.type):X(u)&&(s=u)}if(null!=l)return"ordinal"===l?Xp:jp;if(e===Bp){var h=t;if(n===Up){for(var c=h[o],p=0;p<(c||[]).length&&p<5;p++)if(null!=(a=m(c[r+p])))return a}else for(p=0;p<h.length&&p<5;p++){var d=h[r+p];if(d&&null!=(a=m(d[o])))return a}}else if(e===Fp){var f=t;if(!s)return jp;for(p=0;p<f.length&&p<5;p++){if((y=f[p])&&null!=(a=m(y[s])))return a}}else if(e===Gp){if(!s)return jp;if(!(c=t[s])||$(c))return jp;for(p=0;p<c.length&&p<5;p++)if(null!=(a=m(c[p])))return a}else if(e===Vp){var g=t;for(p=0;p<g.length&&p<5;p++){var y,v=So(y=g[p]);if(!Y(v))return jp;if(null!=(a=m(v[o])))return a}}function m(t){var e=X(t);return null!=t&&isFinite(t)&&""!==t?e?Zp:jp:e&&"-"!==t?Xp:void 0}return jp}var ed=yt();var nd,id,rd,od=Po(),ad=Po(),sd=function(){function t(){}return t.prototype.getColorFromPalette=function(t,e,n){var i=_o(this.get("color",!0)),r=this.get("colorLayer",!0);return ud(this,od,i,r,t,e,n)},t.prototype.clearColorPalette=function(){!function(t,e){e(t).paletteIdx=0,e(t).paletteNameMap={}}(this,od)},t}();function ld(t,e,n,i){var r=_o(t.get(["aria","decal","decals"]));return ud(t,ad,r,null,e,n,i)}function ud(t,e,n,i,r,o,a){var s=e(o=o||t),l=s.paletteIdx||0,u=s.paletteNameMap=s.paletteNameMap||{};if(u.hasOwnProperty(r))return u[r];var h=null!=a&&i?function(t,e){for(var n=t.length,i=0;i<n;i++)if(t[i].length>e)return t[i];return t[n-1]}(i,a):n;if((h=h||n)&&h.length){var c=h[l];return r&&(u[r]=c),s.paletteIdx=(l+1)%h.length,c}}var hd=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.prototype.init=function(t,e,n,i,r,o){i=i||{},this.option=null,this._theme=new Sc(i),this._locale=new Sc(r),this._optionManager=o},e.prototype.setOption=function(t,e,n){var i=dd(e);this._optionManager.setOption(t,n,i),this._resetOption(null,i)},e.prototype.resetOption=function(t,e){return this._resetOption(t,dd(e))},e.prototype._resetOption=function(t,e){var n=!1,i=this._optionManager;if(!t||"recreate"===t){var r=i.mountOption("recreate"===t);0,this.option&&"recreate"!==t?(this.restoreData(),this._mergeOption(r,e)):rd(this,r),n=!0}if("timeline"!==t&&"media"!==t||this.restoreData(),!t||"recreate"===t||"timeline"===t){var o=i.getTimelineOption(this);o&&(n=!0,this._mergeOption(o,e))}if(!t||"recreate"===t||"media"===t){var a=i.getMediaOption(this);a.length&&E(a,(function(t){n=!0,this._mergeOption(t,e)}),this)}return n},e.prototype.mergeOption=function(t){this._mergeOption(t,null)},e.prototype._mergeOption=function(t,e){var n=this.option,i=this._componentsMap,r=this._componentsCount,o=[],a=yt(),s=e&&e.replaceMergeMainTypeMap;qp(this).datasetMap=yt(),E(t,(function(t,e){null!=t&&(Op.hasClass(e)?e&&(o.push(e),a.set(e,!0)):n[e]=null==n[e]?T(t):C(n[e],t,!0))})),s&&s.each((function(t,e){Op.hasClass(e)&&!a.get(e)&&(o.push(e),a.set(e,!0))})),Op.topologicalTravel(o,Op.getAllClassMainTypes(),(function(e){var o=function(t,e,n){var i=ed.get(e);if(!i)return n;var r=i(t);return r?n.concat(r):n}(this,e,_o(t[e])),a=i.get(e),l=a?s&&s.get(e)?"replaceMerge":"normalMerge":"replaceAll",u=Io(a,o,l);(function(t,e,n){E(t,(function(t){var i=t.newOption;q(i)&&(t.keyInfo.mainType=e,t.keyInfo.subType=function(t,e,n,i){return e.type?e.type:n?n.subType:i.determineSubType(t,e)}(e,i,t.existing,n))}))})(u,e,Op),n[e]=null,i.set(e,null),r.set(e,0);var h,c=[],p=[],d=0;E(u,(function(t,n){var i=t.existing,r=t.newOption;if(r){var o="series"===e,a=Op.getClass(e,t.keyInfo.subType,!o);if(!a)return;if("tooltip"===e){if(h)return void 0;h=!0}if(i&&i.constructor===a)i.name=t.keyInfo.name,i.mergeOption(r,this),i.optionUpdated(r,!1);else{var s=A({componentIndex:n},t.keyInfo);A(i=new a(r,this,this,s),s),t.brandNew&&(i.__requireNewView=!0),i.init(r,this,this),i.optionUpdated(null,!0)}}else i&&(i.mergeOption({},this),i.optionUpdated({},!1));i?(c.push(i.option),p.push(i),d++):(c.push(void 0),p.push(void 0))}),this),n[e]=c,i.set(e,p),r.set(e,d),"series"===e&&nd(this)}),this),this._seriesIndices||nd(this)},e.prototype.getOption=function(){var t=T(this.option);return E(t,(function(e,n){if(Op.hasClass(n)){for(var i=_o(e),r=i.length,o=!1,a=r-1;a>=0;a--)i[a]&&!ko(i[a])?o=!0:(i[a]=null,!o&&r--);i.length=r,t[n]=i}})),delete t["\0_ec_inner"],t},e.prototype.getTheme=function(){return this._theme},e.prototype.getLocaleModel=function(){return this._locale},e.prototype.setUpdatePayload=function(t){this._payload=t},e.prototype.getUpdatePayload=function(){return this._payload},e.prototype.getComponent=function(t,e){var n=this._componentsMap.get(t);if(n){var i=n[e||0];if(i)return i;if(null==e)for(var r=0;r<n.length;r++)if(n[r])return n[r]}},e.prototype.queryComponents=function(t){var e=t.mainType;if(!e)return[];var n,i=t.index,r=t.id,o=t.name,a=this._componentsMap.get(e);return a&&a.length?(null!=i?(n=[],E(_o(i),(function(t){a[t]&&n.push(a[t])}))):n=null!=r?cd("id",r,a):null!=o?cd("name",o,a):B(a,(function(t){return!!t})),pd(n,t)):[]},e.prototype.findComponents=function(t){var e,n,i,r,o,a=t.query,s=t.mainType,l=(n=s+"Index",i=s+"Id",r=s+"Name",!(e=a)||null==e[n]&&null==e[i]&&null==e[r]?null:{mainType:s,index:e[n],id:e[i],name:e[r]}),u=l?this.queryComponents(l):B(this._componentsMap.get(s),(function(t){return!!t}));return o=pd(u,t),t.filter?B(o,t.filter):o},e.prototype.eachComponent=function(t,e,n){var i=this._componentsMap;if(U(t)){var r=e,o=t;i.each((function(t,e){for(var n=0;t&&n<t.length;n++){var i=t[n];i&&o.call(r,e,i,i.componentIndex)}}))}else for(var a=X(t)?i.get(t):q(t)?this.findComponents(t):null,s=0;a&&s<a.length;s++){var l=a[s];l&&e.call(n,l,l.componentIndex)}},e.prototype.getSeriesByName=function(t){var e=Do(t,null);return B(this._componentsMap.get("series"),(function(t){return!!t&&null!=e&&t.name===e}))},e.prototype.getSeriesByIndex=function(t){return this._componentsMap.get("series")[t]},e.prototype.getSeriesByType=function(t){return B(this._componentsMap.get("series"),(function(e){return!!e&&e.subType===t}))},e.prototype.getSeries=function(){return B(this._componentsMap.get("series"),(function(t){return!!t}))},e.prototype.getSeriesCount=function(){return this._componentsCount.get("series")},e.prototype.eachSeries=function(t,e){id(this),E(this._seriesIndices,(function(n){var i=this._componentsMap.get("series")[n];t.call(e,i,n)}),this)},e.prototype.eachRawSeries=function(t,e){E(this._componentsMap.get("series"),(function(n){n&&t.call(e,n,n.componentIndex)}))},e.prototype.eachSeriesByType=function(t,e,n){id(this),E(this._seriesIndices,(function(i){var r=this._componentsMap.get("series")[i];r.subType===t&&e.call(n,r,i)}),this)},e.prototype.eachRawSeriesByType=function(t,e,n){return E(this.getSeriesByType(t),e,n)},e.prototype.isSeriesFiltered=function(t){return id(this),null==this._seriesIndicesMap.get(t.componentIndex)},e.prototype.getCurrentSeriesIndices=function(){return(this._seriesIndices||[]).slice()},e.prototype.filterSeries=function(t,e){id(this);var n=[];E(this._seriesIndices,(function(i){var r=this._componentsMap.get("series")[i];t.call(e,r,i)&&n.push(i)}),this),this._seriesIndices=n,this._seriesIndicesMap=yt(n)},e.prototype.restoreData=function(t){nd(this);var e=this._componentsMap,n=[];e.each((function(t,e){Op.hasClass(e)&&n.push(e)})),Op.topologicalTravel(n,Op.getAllClassMainTypes(),(function(n){E(e.get(n),(function(e){!e||"series"===n&&function(t,e){if(e){var n=e.seriesIndex,i=e.seriesId,r=e.seriesName;return null!=n&&t.componentIndex!==n||null!=i&&t.id!==i||null!=r&&t.name!==r}}(e,t)||e.restoreData()}))}))},e.internalField=(nd=function(t){var e=t._seriesIndices=[];E(t._componentsMap.get("series"),(function(t){t&&e.push(t.componentIndex)})),t._seriesIndicesMap=yt(e)},id=function(t){},void(rd=function(t,e){t.option={},t.option["\0_ec_inner"]=1,t._componentsMap=yt({series:[]}),t._componentsCount=yt();var n=e.aria;q(n)&&null==n.enabled&&(n.enabled=!0),function(t,e){var n=t.color&&!t.colorLayer;E(e,(function(e,i){"colorLayer"===i&&n||Op.hasClass(i)||("object"==typeof e?t[i]=t[i]?C(t[i],e,!1):T(e):null==t[i]&&(t[i]=e))}))}(e,t._theme.option),C(e,Ep,!1),t._mergeOption(e,null)})),e}(Sc);function cd(t,e,n){if(Y(e)){var i=yt();return E(e,(function(t){null!=t&&(null!=Do(t,null)&&i.set(t,!0))})),B(n,(function(e){return e&&i.get(e[t])}))}var r=Do(e,null);return B(n,(function(e){return e&&null!=r&&e[t]===r}))}function pd(t,e){return e.hasOwnProperty("subType")?B(t,(function(t){return t&&t.subType===e.subType})):t}function dd(t){var e=yt();return t&&E(_o(t.replaceMerge),(function(t){e.set(t,!0)})),{replaceMergeMainTypeMap:e}}R(hd,sd);var fd=["getDom","getZr","getWidth","getHeight","getDevicePixelRatio","dispatchAction","isSSR","isDisposed","on","off","getDataURL","getConnectedDataURL","getOption","getId","updateLabelLayout"],gd=function(t){E(fd,(function(e){this[e]=W(t[e],t)}),this)},yd={},vd=function(){function t(){this._coordinateSystems=[]}return t.prototype.create=function(t,e){var n=[];E(yd,(function(i,r){var o=i.create(t,e);n=n.concat(o||[])})),this._coordinateSystems=n},t.prototype.update=function(t,e){E(this._coordinateSystems,(function(n){n.update&&n.update(t,e)}))},t.prototype.getCoordinateSystems=function(){return this._coordinateSystems.slice()},t.register=function(t,e){yd[t]=e},t.get=function(t){return yd[t]},t}(),md=/^(min|max)?(.+)$/,xd=function(){function t(t){this._timelineOptions=[],this._mediaList=[],this._currentMediaIndices=[],this._api=t}return t.prototype.setOption=function(t,e,n){t&&(E(_o(t.series),(function(t){t&&t.data&&$(t.data)&&ct(t.data)})),E(_o(t.dataset),(function(t){t&&t.source&&$(t.source)&&ct(t.source)}))),t=T(t);var i=this._optionBackup,r=function(t,e,n){var i,r,o=[],a=t.baseOption,s=t.timeline,l=t.options,u=t.media,h=!!t.media,c=!!(l||s||a&&a.timeline);a?(r=a).timeline||(r.timeline=s):((c||h)&&(t.options=t.media=null),r=t);h&&Y(u)&&E(u,(function(t){t&&t.option&&(t.query?o.push(t):i||(i=t))}));function p(t){E(e,(function(e){e(t,n)}))}return p(r),E(l,(function(t){return p(t)})),E(o,(function(t){return p(t.option)})),{baseOption:r,timelineOptions:l||[],mediaDefault:i,mediaList:o}}(t,e,!i);this._newBaseOption=r.baseOption,i?(r.timelineOptions.length&&(i.timelineOptions=r.timelineOptions),r.mediaList.length&&(i.mediaList=r.mediaList),r.mediaDefault&&(i.mediaDefault=r.mediaDefault)):this._optionBackup=r},t.prototype.mountOption=function(t){var e=this._optionBackup;return this._timelineOptions=e.timelineOptions,this._mediaList=e.mediaList,this._mediaDefault=e.mediaDefault,this._currentMediaIndices=[],T(t?e.baseOption:this._newBaseOption)},t.prototype.getTimelineOption=function(t){var e,n=this._timelineOptions;if(n.length){var i=t.getComponent("timeline");i&&(e=T(n[i.getCurrentIndex()]))}return e},t.prototype.getMediaOption=function(t){var e,n,i=this._api.getWidth(),r=this._api.getHeight(),o=this._mediaList,a=this._mediaDefault,s=[],l=[];if(!o.length&&!a)return l;for(var u=0,h=o.length;u<h;u++)_d(o[u].query,i,r)&&s.push(u);return!s.length&&a&&(s=[-1]),s.length&&(e=s,n=this._currentMediaIndices,e.join(",")!==n.join(","))&&(l=z(s,(function(t){return T(-1===t?a.option:o[t].option)}))),this._currentMediaIndices=s,l},t}();function _d(t,e,n){var i={width:e,height:n,aspectratio:e/n},r=!0;return E(t,(function(t,e){var n=e.match(md);if(n&&n[1]&&n[2]){var o=n[1],a=n[2].toLowerCase();(function(t,e,n){return"min"===n?t>=e:"max"===n?t<=e:t===e})(i[a],t,o)||(r=!1)}})),r}var bd=E,wd=q,Sd=["areaStyle","lineStyle","nodeStyle","linkStyle","chordStyle","label","labelLine"];function Md(t){var e=t&&t.itemStyle;if(e)for(var n=0,i=Sd.length;n<i;n++){var r=Sd[n],o=e.normal,a=e.emphasis;o&&o[r]&&(t[r]=t[r]||{},t[r].normal?C(t[r].normal,o[r]):t[r].normal=o[r],o[r]=null),a&&a[r]&&(t[r]=t[r]||{},t[r].emphasis?C(t[r].emphasis,a[r]):t[r].emphasis=a[r],a[r]=null)}}function Id(t,e,n){if(t&&t[e]&&(t[e].normal||t[e].emphasis)){var i=t[e].normal,r=t[e].emphasis;i&&(n?(t[e].normal=t[e].emphasis=null,k(t[e],i)):t[e]=i),r&&(t.emphasis=t.emphasis||{},t.emphasis[e]=r,r.focus&&(t.emphasis.focus=r.focus),r.blurScope&&(t.emphasis.blurScope=r.blurScope))}}function Td(t){Id(t,"itemStyle"),Id(t,"lineStyle"),Id(t,"areaStyle"),Id(t,"label"),Id(t,"labelLine"),Id(t,"upperLabel"),Id(t,"edgeLabel")}function Cd(t,e){var n=wd(t)&&t[e],i=wd(n)&&n.textStyle;if(i){0;for(var r=0,o=wo.length;r<o;r++){var a=wo[r];i.hasOwnProperty(a)&&(n[a]=i[a])}}}function Dd(t){t&&(Td(t),Cd(t,"label"),t.emphasis&&Cd(t.emphasis,"label"))}function Ad(t){return Y(t)?t:t?[t]:[]}function kd(t){return(Y(t)?t[0]:t)||{}}function Ld(t,e){bd(Ad(t.series),(function(t){wd(t)&&function(t){if(wd(t)){Md(t),Td(t),Cd(t,"label"),Cd(t,"upperLabel"),Cd(t,"edgeLabel"),t.emphasis&&(Cd(t.emphasis,"label"),Cd(t.emphasis,"upperLabel"),Cd(t.emphasis,"edgeLabel"));var e=t.markPoint;e&&(Md(e),Dd(e));var n=t.markLine;n&&(Md(n),Dd(n));var i=t.markArea;i&&Dd(i);var r=t.data;if("graph"===t.type){r=r||t.nodes;var o=t.links||t.edges;if(o&&!$(o))for(var a=0;a<o.length;a++)Dd(o[a]);E(t.categories,(function(t){Td(t)}))}if(r&&!$(r))for(a=0;a<r.length;a++)Dd(r[a]);if((e=t.markPoint)&&e.data){var s=e.data;for(a=0;a<s.length;a++)Dd(s[a])}if((n=t.markLine)&&n.data){var l=n.data;for(a=0;a<l.length;a++)Y(l[a])?(Dd(l[a][0]),Dd(l[a][1])):Dd(l[a])}"gauge"===t.type?(Cd(t,"axisLabel"),Cd(t,"title"),Cd(t,"detail")):"treemap"===t.type?(Id(t.breadcrumb,"itemStyle"),E(t.levels,(function(t){Td(t)}))):"tree"===t.type&&Td(t.leaves)}}(t)}));var n=["xAxis","yAxis","radiusAxis","angleAxis","singleAxis","parallelAxis","radar"];e&&n.push("valueAxis","categoryAxis","logAxis","timeAxis"),bd(n,(function(e){bd(Ad(t[e]),(function(t){t&&(Cd(t,"axisLabel"),Cd(t.axisPointer,"label"))}))})),bd(Ad(t.parallel),(function(t){var e=t&&t.parallelAxisDefault;Cd(e,"axisLabel"),Cd(e&&e.axisPointer,"label")})),bd(Ad(t.calendar),(function(t){Id(t,"itemStyle"),Cd(t,"dayLabel"),Cd(t,"monthLabel"),Cd(t,"yearLabel")})),bd(Ad(t.radar),(function(t){Cd(t,"name"),t.name&&null==t.axisName&&(t.axisName=t.name,delete t.name),null!=t.nameGap&&null==t.axisNameGap&&(t.axisNameGap=t.nameGap,delete t.nameGap)})),bd(Ad(t.geo),(function(t){wd(t)&&(Dd(t),bd(Ad(t.regions),(function(t){Dd(t)})))})),bd(Ad(t.timeline),(function(t){Dd(t),Id(t,"label"),Id(t,"itemStyle"),Id(t,"controlStyle",!0);var e=t.data;Y(e)&&E(e,(function(t){q(t)&&(Id(t,"label"),Id(t,"itemStyle"))}))})),bd(Ad(t.toolbox),(function(t){Id(t,"iconStyle"),bd(t.feature,(function(t){Id(t,"iconStyle")}))})),Cd(kd(t.axisPointer),"label"),Cd(kd(t.tooltip).axisPointer,"label")}function Pd(t){t&&E(Od,(function(e){e[0]in t&&!(e[1]in t)&&(t[e[1]]=t[e[0]])}))}var Od=[["x","left"],["y","top"],["x2","right"],["y2","bottom"]],Rd=["grid","geo","parallel","legend","toolbox","title","visualMap","dataZoom","timeline"],Nd=[["borderRadius","barBorderRadius"],["borderColor","barBorderColor"],["borderWidth","barBorderWidth"]];function Ed(t){var e=t&&t.itemStyle;if(e)for(var n=0;n<Nd.length;n++){var i=Nd[n][1],r=Nd[n][0];null!=e[i]&&(e[r]=e[i])}}function zd(t){t&&"edge"===t.alignTo&&null!=t.margin&&null==t.edgeDistance&&(t.edgeDistance=t.margin)}function Vd(t){t&&t.downplay&&!t.blur&&(t.blur=t.downplay)}function Bd(t,e){if(t)for(var n=0;n<t.length;n++)e(t[n]),t[n]&&Bd(t[n].children,e)}function Fd(t,e){Ld(t,e),t.series=_o(t.series),E(t.series,(function(t){if(q(t)){var e=t.type;if("line"===e)null!=t.clipOverflow&&(t.clip=t.clipOverflow);else if("pie"===e||"gauge"===e){if(null!=t.clockWise&&(t.clockwise=t.clockWise),zd(t.label),(r=t.data)&&!$(r))for(var n=0;n<r.length;n++)zd(r[n]);null!=t.hoverOffset&&(t.emphasis=t.emphasis||{},(t.emphasis.scaleSize=null)&&(t.emphasis.scaleSize=t.hoverOffset))}else if("gauge"===e){var i=function(t,e){for(var n=e.split(","),i=t,r=0;r<n.length&&null!=(i=i&&i[n[r]]);r++);return i}(t,"pointer.color");null!=i&&function(t,e,n,i){for(var r,o=e.split(","),a=t,s=0;s<o.length-1;s++)null==a[r=o[s]]&&(a[r]={}),a=a[r];(i||null==a[o[s]])&&(a[o[s]]=n)}(t,"itemStyle.color",i)}else if("bar"===e){var r;if(Ed(t),Ed(t.backgroundStyle),Ed(t.emphasis),(r=t.data)&&!$(r))for(n=0;n<r.length;n++)"object"==typeof r[n]&&(Ed(r[n]),Ed(r[n]&&r[n].emphasis))}else if("sunburst"===e){var o=t.highlightPolicy;o&&(t.emphasis=t.emphasis||{},t.emphasis.focus||(t.emphasis.focus=o)),Vd(t),Bd(t.data,Vd)}else"graph"===e||"sankey"===e?function(t){t&&null!=t.focusNodeAdjacency&&(t.emphasis=t.emphasis||{},null==t.emphasis.focus&&(t.emphasis.focus="adjacency"))}(t):"map"===e&&(t.mapType&&!t.map&&(t.map=t.mapType),t.mapLocation&&k(t,t.mapLocation));null!=t.hoverAnimation&&(t.emphasis=t.emphasis||{},t.emphasis&&null==t.emphasis.scale&&(t.emphasis.scale=t.hoverAnimation)),Pd(t)}})),t.dataRange&&(t.visualMap=t.dataRange),E(Rd,(function(e){var n=t[e];n&&(Y(n)||(n=[n]),E(n,(function(t){Pd(t)})))}))}function Gd(t){E(t,(function(e,n){var i=[],r=[NaN,NaN],o=[e.stackResultDimension,e.stackedOverDimension],a=e.data,s=e.isStackedByIndex,l=e.seriesModel.get("stackStrategy")||"samesign";a.modify(o,(function(o,u,h){var c,p,d=a.get(e.stackedDimension,h);if(isNaN(d))return r;s?p=a.getRawIndex(h):c=a.get(e.stackedByDimension,h);for(var f=NaN,g=n-1;g>=0;g--){var y=t[g];if(s||(p=y.data.rawIndexOf(y.stackedByDimension,c)),p>=0){var v=y.data.getByRawIndex(y.stackResultDimension,p);if("all"===l||"positive"===l&&v>0||"negative"===l&&v<0||"samesign"===l&&d>=0&&v>0||"samesign"===l&&d<=0&&v<0){d=Jr(d,v),f=v;break}}}return i[0]=d,i[1]=f,i}))}))}var Wd,Hd,Yd,Ud,Xd,Zd=function(t){this.data=t.data||(t.sourceFormat===Gp?{}:[]),this.sourceFormat=t.sourceFormat||Hp,this.seriesLayoutBy=t.seriesLayoutBy||Yp,this.startIndex=t.startIndex||0,this.dimensionsDetectedCount=t.dimensionsDetectedCount,this.metaRawOption=t.metaRawOption;var e=this.dimensionsDefine=t.dimensionsDefine;if(e)for(var n=0;n<e.length;n++){var i=e[n];null==i.type&&Qp(this,n)===Xp&&(i.type="ordinal")}};function jd(t){return t instanceof Zd}function qd(t,e,n){n=n||$d(t);var i=e.seriesLayoutBy,r=function(t,e,n,i,r){var o,a;if(!t)return{dimensionsDefine:Jd(r),startIndex:a,dimensionsDetectedCount:o};if(e===Bp){var s=t;"auto"===i||null==i?Qd((function(t){null!=t&&"-"!==t&&(X(t)?null==a&&(a=1):a=0)}),n,s,10):a=j(i)?i:i?1:0,r||1!==a||(r=[],Qd((function(t,e){r[e]=null!=t?t+"":""}),n,s,1/0)),o=r?r.length:n===Up?s.length:s[0]?s[0].length:null}else if(e===Fp)r||(r=function(t){var e,n=0;for(;n<t.length&&!(e=t[n++]););if(e){var i=[];return E(e,(function(t,e){i.push(e)})),i}}(t));else if(e===Gp)r||(r=[],E(t,(function(t,e){r.push(e)})));else if(e===Vp){var l=So(t[0]);o=Y(l)&&l.length||1}return{startIndex:a,dimensionsDefine:Jd(r),dimensionsDetectedCount:o}}(t,n,i,e.sourceHeader,e.dimensions);return new Zd({data:t,sourceFormat:n,seriesLayoutBy:i,dimensionsDefine:r.dimensionsDefine,startIndex:r.startIndex,dimensionsDetectedCount:r.dimensionsDetectedCount,metaRawOption:T(e)})}function Kd(t){return new Zd({data:t,sourceFormat:$(t)?Wp:Vp})}function $d(t){var e=Hp;if($(t))e=Wp;else if(Y(t)){0===t.length&&(e=Bp);for(var n=0,i=t.length;n<i;n++){var r=t[n];if(null!=r){if(Y(r)){e=Bp;break}if(q(r)){e=Fp;break}}}}else if(q(t))for(var o in t)if(_t(t,o)&&N(t[o])){e=Gp;break}return e}function Jd(t){if(t){var e=yt();return z(t,(function(t,n){var i={name:(t=q(t)?t:{name:t}).name,displayName:t.displayName,type:t.type};if(null==i.name)return i;i.name+="",null==i.displayName&&(i.displayName=i.name);var r=e.get(i.name);return r?i.name+="-"+r.count++:e.set(i.name,{count:1}),i}))}}function Qd(t,e,n,i){if(e===Up)for(var r=0;r<n.length&&r<i;r++)t(n[r]?n[r][0]:null,r);else{var o=n[0]||[];for(r=0;r<o.length&&r<i;r++)t(o[r],r)}}function tf(t){var e=t.sourceFormat;return e===Fp||e===Gp}var ef=function(){function t(t,e){var n=jd(t)?t:Kd(t);this._source=n;var i=this._data=n.data;n.sourceFormat===Wp&&(this._offset=0,this._dimSize=e,this._data=i),Xd(this,i,n)}return t.prototype.getSource=function(){return this._source},t.prototype.count=function(){return 0},t.prototype.getItem=function(t,e){},t.prototype.appendData=function(t){},t.prototype.clean=function(){},t.protoInitialize=function(){var e=t.prototype;e.pure=!1,e.persistent=!0}(),t.internalField=function(){var t;Xd=function(t,r,o){var a=o.sourceFormat,s=o.seriesLayoutBy,l=o.startIndex,u=o.dimensionsDefine,h=Ud[pf(a,s)];if(A(t,h),a===Wp)t.getItem=e,t.count=i,t.fillStorage=n;else{var c=of(a,s);t.getItem=W(c,null,r,l,u);var p=lf(a,s);t.count=W(p,null,r,l,u)}};var e=function(t,e){t-=this._offset,e=e||[];for(var n=this._data,i=this._dimSize,r=i*t,o=0;o<i;o++)e[o]=n[r+o];return e},n=function(t,e,n,i){for(var r=this._data,o=this._dimSize,a=0;a<o;a++){for(var s=i[a],l=null==s[0]?1/0:s[0],u=null==s[1]?-1/0:s[1],h=e-t,c=n[a],p=0;p<h;p++){var d=r[p*o+a];c[t+p]=d,d<l&&(l=d),d>u&&(u=d)}s[0]=l,s[1]=u}},i=function(){return this._data?this._data.length/this._dimSize:0};function r(t){for(var e=0;e<t.length;e++)this._data.push(t[e])}(t={}).arrayRows_column={pure:!0,appendData:r},t.arrayRows_row={pure:!0,appendData:function(){throw new Error('Do not support appendData when set seriesLayoutBy: "row".')}},t.objectRows={pure:!0,appendData:r},t.keyedColumns={pure:!0,appendData:function(t){var e=this._data;E(t,(function(t,n){for(var i=e[n]||(e[n]=[]),r=0;r<(t||[]).length;r++)i.push(t[r])}))}},t.original={appendData:r},t.typedArray={persistent:!1,pure:!0,appendData:function(t){this._data=t},clean:function(){this._offset+=this.count(),this._data=null}},Ud=t}(),t}(),nf=function(t,e,n,i){return t[i]},rf=((Wd={}).arrayRows_column=function(t,e,n,i){return t[i+e]},Wd.arrayRows_row=function(t,e,n,i,r){i+=e;for(var o=r||[],a=t,s=0;s<a.length;s++){var l=a[s];o[s]=l?l[i]:null}return o},Wd.objectRows=nf,Wd.keyedColumns=function(t,e,n,i,r){for(var o=r||[],a=0;a<n.length;a++){var s=n[a].name;0;var l=t[s];o[a]=l?l[i]:null}return o},Wd.original=nf,Wd);function of(t,e){var n=rf[pf(t,e)];return n}var af=function(t,e,n){return t.length},sf=((Hd={}).arrayRows_column=function(t,e,n){return Math.max(0,t.length-e)},Hd.arrayRows_row=function(t,e,n){var i=t[0];return i?Math.max(0,i.length-e):0},Hd.objectRows=af,Hd.keyedColumns=function(t,e,n){var i=n[0].name;var r=t[i];return r?r.length:0},Hd.original=af,Hd);function lf(t,e){var n=sf[pf(t,e)];return n}var uf=function(t,e,n){return t[e]},hf=((Yd={}).arrayRows=uf,Yd.objectRows=function(t,e,n){return t[n]},Yd.keyedColumns=uf,Yd.original=function(t,e,n){var i=So(t);return i instanceof Array?i[e]:i},Yd.typedArray=uf,Yd);function cf(t){var e=hf[t];return e}function pf(t,e){return t===Bp?t+"_"+e:t}function df(t,e,n){if(t){var i=t.getRawDataItem(e);if(null!=i){var r=t.getStore(),o=r.getSource().sourceFormat;if(null!=n){var a=t.getDimensionIndex(n),s=r.getDimensionProperty(a);return cf(o)(i,a,s)}var l=i;return o===Vp&&(l=So(i)),l}}}var ff=/\{@(.+?)\}/g,gf=function(){function t(){}return t.prototype.getDataParams=function(t,e){var n=this.getData(e),i=this.getRawValue(t,e),r=n.getRawIndex(t),o=n.getName(t),a=n.getRawDataItem(t),s=n.getItemVisual(t,"style"),l=s&&s[n.getItemVisual(t,"drawType")||"fill"],u=s&&s.stroke,h=this.mainType,c="series"===h,p=n.userOutput&&n.userOutput.get();return{componentType:h,componentSubType:this.subType,componentIndex:this.componentIndex,seriesType:c?this.subType:null,seriesIndex:this.seriesIndex,seriesId:c?this.id:null,seriesName:c?this.name:null,name:o,dataIndex:r,data:a,dataType:e,value:i,color:l,borderColor:u,dimensionNames:p?p.fullDimensions:null,encode:p?p.encode:null,$vars:["seriesName","name","value"]}},t.prototype.getFormattedLabel=function(t,e,n,i,r,o){e=e||"normal";var a=this.getData(n),s=this.getDataParams(t,n);(o&&(s.value=o.interpolatedValue),null!=i&&Y(s.value)&&(s.value=s.value[i]),r)||(r=a.getItemModel(t).get("normal"===e?["label","formatter"]:[e,"label","formatter"]));return U(r)?(s.status=e,s.dimensionIndex=i,r(s)):X(r)?vp(r,s).replace(ff,(function(e,n){var i=n.length,r=n;"["===r.charAt(0)&&"]"===r.charAt(i-1)&&(r=+r.slice(1,i-1));var s=df(a,t,r);if(o&&Y(o.interpolatedValue)){var l=a.getDimensionIndex(r);l>=0&&(s=o.interpolatedValue[l])}return null!=s?s+"":""})):void 0},t.prototype.getRawValue=function(t,e){return df(this.getData(e),t)},t.prototype.formatTooltip=function(t,e,n){},t}();function yf(t){var e,n;return q(t)?t.type&&(n=t):e=t,{text:e,frag:n}}function vf(t){return new mf(t)}var mf=function(){function t(t){t=t||{},this._reset=t.reset,this._plan=t.plan,this._count=t.count,this._onDirty=t.onDirty,this._dirty=!0}return t.prototype.perform=function(t){var e,n=this._upstream,i=t&&t.skip;if(this._dirty&&n){var r=this.context;r.data=r.outputData=n.context.outputData}this.__pipeline&&(this.__pipeline.currentTask=this),this._plan&&!i&&(e=this._plan(this.context));var o,a=h(this._modBy),s=this._modDataCount||0,l=h(t&&t.modBy),u=t&&t.modDataCount||0;function h(t){return!(t>=1)&&(t=1),t}a===l&&s===u||(e="reset"),(this._dirty||"reset"===e)&&(this._dirty=!1,o=this._doReset(i)),this._modBy=l,this._modDataCount=u;var c=t&&t.step;if(this._dueEnd=n?n._outputDueEnd:this._count?this._count(this.context):1/0,this._progress){var p=this._dueIndex,d=Math.min(null!=c?this._dueIndex+c:1/0,this._dueEnd);if(!i&&(o||p<d)){var f=this._progress;if(Y(f))for(var g=0;g<f.length;g++)this._doProgress(f[g],p,d,l,u);else this._doProgress(f,p,d,l,u)}this._dueIndex=d;var y=null!=this._settedOutputEnd?this._settedOutputEnd:d;0,this._outputDueEnd=y}else this._dueIndex=this._outputDueEnd=null!=this._settedOutputEnd?this._settedOutputEnd:this._dueEnd;return this.unfinished()},t.prototype.dirty=function(){this._dirty=!0,this._onDirty&&this._onDirty(this.context)},t.prototype._doProgress=function(t,e,n,i,r){xf.reset(e,n,i,r),this._callingProgress=t,this._callingProgress({start:e,end:n,count:n-e,next:xf.next},this.context)},t.prototype._doReset=function(t){var e,n;this._dueIndex=this._outputDueEnd=this._dueEnd=0,this._settedOutputEnd=null,!t&&this._reset&&((e=this._reset(this.context))&&e.progress&&(n=e.forceFirstProgress,e=e.progress),Y(e)&&!e.length&&(e=null)),this._progress=e,this._modBy=this._modDataCount=null;var i=this._downstream;return i&&i.dirty(),n},t.prototype.unfinished=function(){return this._progress&&this._dueIndex<this._dueEnd},t.prototype.pipe=function(t){(this._downstream!==t||this._dirty)&&(this._downstream=t,t._upstream=this,t.dirty())},t.prototype.dispose=function(){this._disposed||(this._upstream&&(this._upstream._downstream=null),this._downstream&&(this._downstream._upstream=null),this._dirty=!1,this._disposed=!0)},t.prototype.getUpstream=function(){return this._upstream},t.prototype.getDownstream=function(){return this._downstream},t.prototype.setOutputEnd=function(t){this._outputDueEnd=this._settedOutputEnd=t},t}(),xf=function(){var t,e,n,i,r,o={reset:function(l,u,h,c){e=l,t=u,n=h,i=c,r=Math.ceil(i/n),o.next=n>1&&i>0?s:a}};return o;function a(){return e<t?e++:null}function s(){var o=e%r*n+Math.ceil(e/r),a=e>=t?null:o<i?o:e;return e++,a}}();function _f(t,e){var n=e&&e.type;return"ordinal"===n?t:("time"!==n||j(t)||null==t||"-"===t||(t=+io(t)),null==t||""===t?NaN:+t)}var bf=yt({number:function(t){return parseFloat(t)},time:function(t){return+io(t)},trim:function(t){return X(t)?ut(t):t}});function wf(t){return bf.get(t)}var Sf={lt:function(t,e){return t<e},lte:function(t,e){return t<=e},gt:function(t,e){return t>e},gte:function(t,e){return t>=e}},Mf=function(){function t(t,e){if(!j(e)){var n="";0,yo(n)}this._opFn=Sf[t],this._rvalFloat=uo(e)}return t.prototype.evaluate=function(t){return j(t)?this._opFn(t,this._rvalFloat):this._opFn(uo(t),this._rvalFloat)},t}(),If=function(){function t(t,e){var n="desc"===t;this._resultLT=n?1:-1,null==e&&(e=n?"min":"max"),this._incomparable="min"===e?-1/0:1/0}return t.prototype.evaluate=function(t,e){var n=j(t)?t:uo(t),i=j(e)?e:uo(e),r=isNaN(n),o=isNaN(i);if(r&&(n=this._incomparable),o&&(i=this._incomparable),r&&o){var a=X(t),s=X(e);a&&(n=s?t:0),s&&(i=a?e:0)}return n<i?this._resultLT:n>i?-this._resultLT:0},t}(),Tf=function(){function t(t,e){this._rval=e,this._isEQ=t,this._rvalTypeof=typeof e,this._rvalFloat=uo(e)}return t.prototype.evaluate=function(t){var e=t===this._rval;if(!e){var n=typeof t;n===this._rvalTypeof||"number"!==n&&"number"!==this._rvalTypeof||(e=uo(t)===this._rvalFloat)}return this._isEQ?e:!e},t}();function Cf(t,e){return"eq"===t||"ne"===t?new Tf("eq"===t,e):_t(Sf,t)?new Mf(t,e):null}var Df=function(){function t(){}return t.prototype.getRawData=function(){throw new Error("not supported")},t.prototype.getRawDataItem=function(t){throw new Error("not supported")},t.prototype.cloneRawData=function(){},t.prototype.getDimensionInfo=function(t){},t.prototype.cloneAllDimensionInfo=function(){},t.prototype.count=function(){},t.prototype.retrieveValue=function(t,e){},t.prototype.retrieveValueFromItem=function(t,e){},t.prototype.convertValue=function(t,e){return _f(t,e)},t}();function Af(t){var e=t.sourceFormat;if(!Nf(e)){var n="";0,yo(n)}return t.data}function kf(t){var e=t.sourceFormat,n=t.data;if(!Nf(e)){var i="";0,yo(i)}if(e===Bp){for(var r=[],o=0,a=n.length;o<a;o++)r.push(n[o].slice());return r}if(e===Fp){for(r=[],o=0,a=n.length;o<a;o++)r.push(A({},n[o]));return r}}function Lf(t,e,n){if(null!=n)return j(n)||!isNaN(n)&&!_t(e,n)?t[n]:_t(e,n)?e[n]:void 0}function Pf(t){return T(t)}var Of=yt();function Rf(t,e,n,i){var r="";e.length||yo(r),q(t)||yo(r);var o=t.type,a=Of.get(o);a||yo(r);var s=z(e,(function(t){return function(t,e){var n=new Df,i=t.data,r=n.sourceFormat=t.sourceFormat,o=t.startIndex,a="";t.seriesLayoutBy!==Yp&&yo(a);var s=[],l={},u=t.dimensionsDefine;if(u)E(u,(function(t,e){var n=t.name,i={index:e,name:n,displayName:t.displayName};if(s.push(i),null!=n){var r="";_t(l,n)&&yo(r),l[n]=i}}));else for(var h=0;h<t.dimensionsDetectedCount;h++)s.push({index:h});var c=of(r,Yp);e.__isBuiltIn&&(n.getRawDataItem=function(t){return c(i,o,s,t)},n.getRawData=W(Af,null,t)),n.cloneRawData=W(kf,null,t);var p=lf(r,Yp);n.count=W(p,null,i,o,s);var d=cf(r);n.retrieveValue=function(t,e){var n=c(i,o,s,t);return f(n,e)};var f=n.retrieveValueFromItem=function(t,e){if(null!=t){var n=s[e];return n?d(t,e,n.name):void 0}};return n.getDimensionInfo=W(Lf,null,s,l),n.cloneAllDimensionInfo=W(Pf,null,s),n}(t,a)})),l=_o(a.transform({upstream:s[0],upstreamList:s,config:T(t.config)}));return z(l,(function(t,n){var i,r="";q(t)||yo(r),t.data||yo(r),Nf($d(t.data))||yo(r);var o=e[0];if(o&&0===n&&!t.dimensions){var a=o.startIndex;a&&(t.data=o.data.slice(0,a).concat(t.data)),i={seriesLayoutBy:Yp,sourceHeader:a,dimensions:o.metaRawOption.dimensions}}else i={seriesLayoutBy:Yp,sourceHeader:0,dimensions:t.dimensions};return qd(t.data,i,null)}))}function Nf(t){return t===Bp||t===Fp}var Ef,zf="undefined",Vf=typeof Uint32Array===zf?Array:Uint32Array,Bf=typeof Uint16Array===zf?Array:Uint16Array,Ff=typeof Int32Array===zf?Array:Int32Array,Gf=typeof Float64Array===zf?Array:Float64Array,Wf={float:Gf,int:Ff,ordinal:Array,number:Array,time:Gf};function Hf(t){return t>65535?Vf:Bf}function Yf(t,e,n,i,r){var o=Wf[n||"float"];if(r){var a=t[e],s=a&&a.length;if(s!==i){for(var l=new o(i),u=0;u<s;u++)l[u]=a[u];t[e]=l}}else t[e]=new o(i)}var Uf=function(){function t(){this._chunks=[],this._rawExtent=[],this._extent=[],this._count=0,this._rawCount=0,this._calcDimNameToIdx=yt()}return t.prototype.initData=function(t,e,n){this._provider=t,this._chunks=[],this._indices=null,this.getRawIndex=this._getRawIdxIdentity;var i=t.getSource(),r=this.defaultDimValueGetter=Ef[i.sourceFormat];this._dimValueGetter=n||r,this._rawExtent=[];tf(i);this._dimensions=z(e,(function(t){return{type:t.type,property:t.property}})),this._initDataFromProvider(0,t.count())},t.prototype.getProvider=function(){return this._provider},t.prototype.getSource=function(){return this._provider.getSource()},t.prototype.ensureCalculationDimension=function(t,e){var n=this._calcDimNameToIdx,i=this._dimensions,r=n.get(t);if(null!=r){if(i[r].type===e)return r}else r=i.length;return i[r]={type:e},n.set(t,r),this._chunks[r]=new Wf[e||"float"](this._rawCount),this._rawExtent[r]=[1/0,-1/0],r},t.prototype.collectOrdinalMeta=function(t,e){var n=this._chunks[t],i=this._dimensions[t],r=this._rawExtent,o=i.ordinalOffset||0,a=n.length;0===o&&(r[t]=[1/0,-1/0]);for(var s=r[t],l=o;l<a;l++){var u=n[l]=e.parseAndCollect(n[l]);isNaN(u)||(s[0]=Math.min(u,s[0]),s[1]=Math.max(u,s[1]))}i.ordinalMeta=e,i.ordinalOffset=a,i.type="ordinal"},t.prototype.getOrdinalMeta=function(t){return this._dimensions[t].ordinalMeta},t.prototype.getDimensionProperty=function(t){var e=this._dimensions[t];return e&&e.property},t.prototype.appendData=function(t){var e=this._provider,n=this.count();e.appendData(t);var i=e.count();return e.persistent||(i+=n),n<i&&this._initDataFromProvider(n,i,!0),[n,i]},t.prototype.appendValues=function(t,e){for(var n=this._chunks,i=this._dimensions,r=i.length,o=this._rawExtent,a=this.count(),s=a+Math.max(t.length,e||0),l=0;l<r;l++){Yf(n,l,(d=i[l]).type,s,!0)}for(var u=[],h=a;h<s;h++)for(var c=h-a,p=0;p<r;p++){var d=i[p],f=Ef.arrayRows.call(this,t[c]||u,d.property,c,p);n[p][h]=f;var g=o[p];f<g[0]&&(g[0]=f),f>g[1]&&(g[1]=f)}return this._rawCount=this._count=s,{start:a,end:s}},t.prototype._initDataFromProvider=function(t,e,n){for(var i=this._provider,r=this._chunks,o=this._dimensions,a=o.length,s=this._rawExtent,l=z(o,(function(t){return t.property})),u=0;u<a;u++){var h=o[u];s[u]||(s[u]=[1/0,-1/0]),Yf(r,u,h.type,e,n)}if(i.fillStorage)i.fillStorage(t,e,r,s);else for(var c=[],p=t;p<e;p++){c=i.getItem(p,c);for(var d=0;d<a;d++){var f=r[d],g=this._dimValueGetter(c,l[d],p,d);f[p]=g;var y=s[d];g<y[0]&&(y[0]=g),g>y[1]&&(y[1]=g)}}!i.persistent&&i.clean&&i.clean(),this._rawCount=this._count=e,this._extent=[]},t.prototype.count=function(){return this._count},t.prototype.get=function(t,e){if(!(e>=0&&e<this._count))return NaN;var n=this._chunks[t];return n?n[this.getRawIndex(e)]:NaN},t.prototype.getValues=function(t,e){var n=[],i=[];if(null==e){e=t,t=[];for(var r=0;r<this._dimensions.length;r++)i.push(r)}else i=t;r=0;for(var o=i.length;r<o;r++)n.push(this.get(i[r],e));return n},t.prototype.getByRawIndex=function(t,e){if(!(e>=0&&e<this._rawCount))return NaN;var n=this._chunks[t];return n?n[e]:NaN},t.prototype.getSum=function(t){var e=0;if(this._chunks[t])for(var n=0,i=this.count();n<i;n++){var r=this.get(t,n);isNaN(r)||(e+=r)}return e},t.prototype.getMedian=function(t){var e=[];this.each([t],(function(t){isNaN(t)||e.push(t)}));var n=e.sort((function(t,e){return t-e})),i=this.count();return 0===i?0:i%2==1?n[(i-1)/2]:(n[i/2]+n[i/2-1])/2},t.prototype.indexOfRawIndex=function(t){if(t>=this._rawCount||t<0)return-1;if(!this._indices)return t;var e=this._indices,n=e[t];if(null!=n&&n<this._count&&n===t)return t;for(var i=0,r=this._count-1;i<=r;){var o=(i+r)/2|0;if(e[o]<t)i=o+1;else{if(!(e[o]>t))return o;r=o-1}}return-1},t.prototype.indicesOfNearest=function(t,e,n){var i=this._chunks[t],r=[];if(!i)return r;null==n&&(n=1/0);for(var o=1/0,a=-1,s=0,l=0,u=this.count();l<u;l++){var h=e-i[this.getRawIndex(l)],c=Math.abs(h);c<=n&&((c<o||c===o&&h>=0&&a<0)&&(o=c,a=h,s=0),h===a&&(r[s++]=l))}return r.length=s,r},t.prototype.getIndices=function(){var t,e=this._indices;if(e){var n=e.constructor,i=this._count;if(n===Array){t=new n(i);for(var r=0;r<i;r++)t[r]=e[r]}else t=new n(e.buffer,0,i)}else{t=new(n=Hf(this._rawCount))(this.count());for(r=0;r<t.length;r++)t[r]=r}return t},t.prototype.filter=function(t,e){if(!this._count)return this;for(var n=this.clone(),i=n.count(),r=new(Hf(n._rawCount))(i),o=[],a=t.length,s=0,l=t[0],u=n._chunks,h=0;h<i;h++){var c=void 0,p=n.getRawIndex(h);if(0===a)c=e(h);else if(1===a){c=e(u[l][p],h)}else{for(var d=0;d<a;d++)o[d]=u[t[d]][p];o[d]=h,c=e.apply(null,o)}c&&(r[s++]=p)}return s<i&&(n._indices=r),n._count=s,n._extent=[],n._updateGetRawIdx(),n},t.prototype.selectRange=function(t){var e=this.clone(),n=e._count;if(!n)return this;var i=G(t),r=i.length;if(!r)return this;var o=e.count(),a=new(Hf(e._rawCount))(o),s=0,l=i[0],u=t[l][0],h=t[l][1],c=e._chunks,p=!1;if(!e._indices){var d=0;if(1===r){for(var f=c[i[0]],g=0;g<n;g++){((x=f[g])>=u&&x<=h||isNaN(x))&&(a[s++]=d),d++}p=!0}else if(2===r){f=c[i[0]];var y=c[i[1]],v=t[i[1]][0],m=t[i[1]][1];for(g=0;g<n;g++){var x=f[g],_=y[g];(x>=u&&x<=h||isNaN(x))&&(_>=v&&_<=m||isNaN(_))&&(a[s++]=d),d++}p=!0}}if(!p)if(1===r)for(g=0;g<o;g++){var b=e.getRawIndex(g);((x=c[i[0]][b])>=u&&x<=h||isNaN(x))&&(a[s++]=b)}else for(g=0;g<o;g++){for(var w=!0,S=(b=e.getRawIndex(g),0);S<r;S++){var M=i[S];((x=c[M][b])<t[M][0]||x>t[M][1])&&(w=!1)}w&&(a[s++]=e.getRawIndex(g))}return s<o&&(e._indices=a),e._count=s,e._extent=[],e._updateGetRawIdx(),e},t.prototype.map=function(t,e){var n=this.clone(t);return this._updateDims(n,t,e),n},t.prototype.modify=function(t,e){this._updateDims(this,t,e)},t.prototype._updateDims=function(t,e,n){for(var i=t._chunks,r=[],o=e.length,a=t.count(),s=[],l=t._rawExtent,u=0;u<e.length;u++)l[e[u]]=[1/0,-1/0];for(var h=0;h<a;h++){for(var c=t.getRawIndex(h),p=0;p<o;p++)s[p]=i[e[p]][c];s[o]=h;var d=n&&n.apply(null,s);if(null!=d){"object"!=typeof d&&(r[0]=d,d=r);for(u=0;u<d.length;u++){var f=e[u],g=d[u],y=l[f],v=i[f];v&&(v[c]=g),g<y[0]&&(y[0]=g),g>y[1]&&(y[1]=g)}}}},t.prototype.lttbDownSample=function(t,e){var n,i,r,o=this.clone([t],!0),a=o._chunks[t],s=this.count(),l=0,u=Math.floor(1/e),h=this.getRawIndex(0),c=new(Hf(this._rawCount))(Math.min(2*(Math.ceil(s/u)+2),s));c[l++]=h;for(var p=1;p<s-1;p+=u){for(var d=Math.min(p+u,s-1),f=Math.min(p+2*u,s),g=(f+d)/2,y=0,v=d;v<f;v++){var m=a[I=this.getRawIndex(v)];isNaN(m)||(y+=m)}y/=f-d;var x=p,_=Math.min(p+u,s),b=p-1,w=a[h];n=-1,r=x;var S=-1,M=0;for(v=x;v<_;v++){var I;m=a[I=this.getRawIndex(v)];isNaN(m)?(M++,S<0&&(S=I)):(i=Math.abs((b-g)*(m-w)-(b-v)*(y-w)))>n&&(n=i,r=I)}M>0&&M<_-x&&(c[l++]=Math.min(S,r),r=Math.max(S,r)),c[l++]=r,h=r}return c[l++]=this.getRawIndex(s-1),o._count=l,o._indices=c,o.getRawIndex=this._getRawIdx,o},t.prototype.downSample=function(t,e,n,i){for(var r=this.clone([t],!0),o=r._chunks,a=[],s=Math.floor(1/e),l=o[t],u=this.count(),h=r._rawExtent[t]=[1/0,-1/0],c=new(Hf(this._rawCount))(Math.ceil(u/s)),p=0,d=0;d<u;d+=s){s>u-d&&(s=u-d,a.length=s);for(var f=0;f<s;f++){var g=this.getRawIndex(d+f);a[f]=l[g]}var y=n(a),v=this.getRawIndex(Math.min(d+i(a,y)||0,u-1));l[v]=y,y<h[0]&&(h[0]=y),y>h[1]&&(h[1]=y),c[p++]=v}return r._count=p,r._indices=c,r._updateGetRawIdx(),r},t.prototype.each=function(t,e){if(this._count)for(var n=t.length,i=this._chunks,r=0,o=this.count();r<o;r++){var a=this.getRawIndex(r);switch(n){case 0:e(r);break;case 1:e(i[t[0]][a],r);break;case 2:e(i[t[0]][a],i[t[1]][a],r);break;default:for(var s=0,l=[];s<n;s++)l[s]=i[t[s]][a];l[s]=r,e.apply(null,l)}}},t.prototype.getDataExtent=function(t){var e=this._chunks[t],n=[1/0,-1/0];if(!e)return n;var i,r=this.count();if(!this._indices)return this._rawExtent[t].slice();if(i=this._extent[t])return i.slice();for(var o=(i=n)[0],a=i[1],s=0;s<r;s++){var l=e[this.getRawIndex(s)];l<o&&(o=l),l>a&&(a=l)}return i=[o,a],this._extent[t]=i,i},t.prototype.getRawDataItem=function(t){var e=this.getRawIndex(t);if(this._provider.persistent)return this._provider.getItem(e);for(var n=[],i=this._chunks,r=0;r<i.length;r++)n.push(i[r][e]);return n},t.prototype.clone=function(e,n){var i,r,o=new t,a=this._chunks,s=e&&V(e,(function(t,e){return t[e]=!0,t}),{});if(s)for(var l=0;l<a.length;l++)o._chunks[l]=s[l]?(i=a[l],r=void 0,(r=i.constructor)===Array?i.slice():new r(i)):a[l];else o._chunks=a;return this._copyCommonProps(o),n||(o._indices=this._cloneIndices()),o._updateGetRawIdx(),o},t.prototype._copyCommonProps=function(t){t._count=this._count,t._rawCount=this._rawCount,t._provider=this._provider,t._dimensions=this._dimensions,t._extent=T(this._extent),t._rawExtent=T(this._rawExtent)},t.prototype._cloneIndices=function(){if(this._indices){var t=this._indices.constructor,e=void 0;if(t===Array){var n=this._indices.length;e=new t(n);for(var i=0;i<n;i++)e[i]=this._indices[i]}else e=new t(this._indices);return e}return null},t.prototype._getRawIdxIdentity=function(t){return t},t.prototype._getRawIdx=function(t){return t<this._count&&t>=0?this._indices[t]:-1},t.prototype._updateGetRawIdx=function(){this.getRawIndex=this._indices?this._getRawIdx:this._getRawIdxIdentity},t.internalField=function(){function t(t,e,n,i){return _f(t[i],this._dimensions[i])}Ef={arrayRows:t,objectRows:function(t,e,n,i){return _f(t[e],this._dimensions[i])},keyedColumns:t,original:function(t,e,n,i){var r=t&&(null==t.value?t:t.value);return _f(r instanceof Array?r[i]:r,this._dimensions[i])},typedArray:function(t,e,n,i){return t[i]}}}(),t}(),Xf=function(){function t(t){this._sourceList=[],this._storeList=[],this._upstreamSignList=[],this._versionSignBase=0,this._dirty=!0,this._sourceHost=t}return t.prototype.dirty=function(){this._setLocalSource([],[]),this._storeList=[],this._dirty=!0},t.prototype._setLocalSource=function(t,e){this._sourceList=t,this._upstreamSignList=e,this._versionSignBase++,this._versionSignBase>9e10&&(this._versionSignBase=0)},t.prototype._getVersionSign=function(){return this._sourceHost.uid+"_"+this._versionSignBase},t.prototype.prepareSource=function(){this._isDirty()&&(this._createSource(),this._dirty=!1)},t.prototype._createSource=function(){this._setLocalSource([],[]);var t,e,n=this._sourceHost,i=this._getUpstreamSourceManagers(),r=!!i.length;if(jf(n)){var o=n,a=void 0,s=void 0,l=void 0;if(r){var u=i[0];u.prepareSource(),a=(l=u.getSource()).data,s=l.sourceFormat,e=[u._getVersionSign()]}else s=$(a=o.get("data",!0))?Wp:Vp,e=[];var h=this._getSourceMetaRawOption()||{},c=l&&l.metaRawOption||{},p=rt(h.seriesLayoutBy,c.seriesLayoutBy)||null,d=rt(h.sourceHeader,c.sourceHeader),f=rt(h.dimensions,c.dimensions);t=p!==c.seriesLayoutBy||!!d!=!!c.sourceHeader||f?[qd(a,{seriesLayoutBy:p,sourceHeader:d,dimensions:f},s)]:[]}else{var g=n;if(r){var y=this._applyTransform(i);t=y.sourceList,e=y.upstreamSignList}else{t=[qd(g.get("source",!0),this._getSourceMetaRawOption(),null)],e=[]}}this._setLocalSource(t,e)},t.prototype._applyTransform=function(t){var e,n=this._sourceHost,i=n.get("transform",!0),r=n.get("fromTransformResult",!0);if(null!=r){var o="";1!==t.length&&qf(o)}var a,s=[],l=[];return E(t,(function(t){t.prepareSource();var e=t.getSource(r||0),n="";null==r||e||qf(n),s.push(e),l.push(t._getVersionSign())})),i?e=function(t,e,n){var i=_o(t),r=i.length,o="";r||yo(o);for(var a=0,s=r;a<s;a++)e=Rf(i[a],e),a!==s-1&&(e.length=Math.max(e.length,1));return e}(i,s,n.componentIndex):null!=r&&(e=[(a=s[0],new Zd({data:a.data,sourceFormat:a.sourceFormat,seriesLayoutBy:a.seriesLayoutBy,dimensionsDefine:T(a.dimensionsDefine),startIndex:a.startIndex,dimensionsDetectedCount:a.dimensionsDetectedCount}))]),{sourceList:e,upstreamSignList:l}},t.prototype._isDirty=function(){if(this._dirty)return!0;for(var t=this._getUpstreamSourceManagers(),e=0;e<t.length;e++){var n=t[e];if(n._isDirty()||this._upstreamSignList[e]!==n._getVersionSign())return!0}},t.prototype.getSource=function(t){t=t||0;var e=this._sourceList[t];if(!e){var n=this._getUpstreamSourceManagers();return n[0]&&n[0].getSource(t)}return e},t.prototype.getSharedDataStore=function(t){var e=t.makeStoreSchema();return this._innerGetDataStore(e.dimensions,t.source,e.hash)},t.prototype._innerGetDataStore=function(t,e,n){var i=this._storeList,r=i[0];r||(r=i[0]={});var o=r[n];if(!o){var a=this._getUpstreamSourceManagers()[0];jf(this._sourceHost)&&a?o=a._innerGetDataStore(t,e,n):(o=new Uf).initData(new ef(e,t.length),t),r[n]=o}return o},t.prototype._getUpstreamSourceManagers=function(){var t=this._sourceHost;if(jf(t)){var e=Jp(t);return e?[e.getSourceManager()]:[]}return z(function(t){return t.get("transform",!0)||t.get("fromTransformResult",!0)?Vo(t.ecModel,"dataset",{index:t.get("fromDatasetIndex",!0),id:t.get("fromDatasetId",!0)},Eo).models:[]}(t),(function(t){return t.getSourceManager()}))},t.prototype._getSourceMetaRawOption=function(){var t,e,n,i=this._sourceHost;if(jf(i))t=i.get("seriesLayoutBy",!0),e=i.get("sourceHeader",!0),n=i.get("dimensions",!0);else if(!this._getUpstreamSourceManagers().length){var r=i;t=r.get("seriesLayoutBy",!0),e=r.get("sourceHeader",!0),n=r.get("dimensions",!0)}return{seriesLayoutBy:t,sourceHeader:e,dimensions:n}},t}();function Zf(t){t.option.transform&&ct(t.option.transform)}function jf(t){return"series"===t.mainType}function qf(t){throw new Error(t)}function Kf(t,e){var n=t.color||"#6e7079",i=t.fontSize||12,r=t.fontWeight||"400",o=t.color||"#464646",a=t.fontSize||14,s=t.fontWeight||"900";return"html"===e?{nameStyle:"font-size:"+ie(i+"")+"px;color:"+ie(n)+";font-weight:"+ie(r+""),valueStyle:"font-size:"+ie(a+"")+"px;color:"+ie(o)+";font-weight:"+ie(s+"")}:{nameStyle:{fontSize:i,fill:n,fontWeight:r},valueStyle:{fontSize:a,fill:o,fontWeight:s}}}var $f=[0,10,20,30],Jf=["","\n","\n\n","\n\n\n"];function Qf(t,e){return e.type=t,e}function tg(t){return"section"===t.type}function eg(t){return tg(t)?ig:rg}function ng(t){if(tg(t)){var e=0,n=t.blocks.length,i=n>1||n>0&&!t.noHeader;return E(t.blocks,(function(t){var n=ng(t);n>=e&&(e=n+ +(i&&(!n||tg(t)&&!t.noHeader)))})),e}return 0}function ig(t,e,n,i){var r,o=e.noHeader,a=(r=ng(e),{html:$f[r],richText:Jf[r]}),s=[],l=e.blocks||[];lt(!l||Y(l)),l=l||[];var u=t.orderMode;if(e.sortBlocks&&u){l=l.slice();var h={valueAsc:"asc",valueDesc:"desc"};if(_t(h,u)){var c=new If(h[u],null);l.sort((function(t,e){return c.evaluate(t.sortParam,e.sortParam)}))}else"seriesDesc"===u&&l.reverse()}E(l,(function(n,r){var o=e.valueFormatter,l=eg(n)(o?A(A({},t),{valueFormatter:o}):t,n,r>0?a.html:0,i);null!=l&&s.push(l)}));var p="richText"===t.renderMode?s.join(a.richText):ag(s.join(""),o?n:a.html);if(o)return p;var d=fp(e.header,"ordinal",t.useUTC),f=Kf(i,t.renderMode).nameStyle;return"richText"===t.renderMode?sg(t,d,f)+a.richText+p:ag('<div style="'+f+";"+'line-height:1;">'+ie(d)+"</div>"+p,n)}function rg(t,e,n,i){var r=t.renderMode,o=e.noName,a=e.noValue,s=!e.markerType,l=e.name,u=t.useUTC,h=e.valueFormatter||t.valueFormatter||function(t){return z(t=Y(t)?t:[t],(function(t,e){return fp(t,Y(d)?d[e]:d,u)}))};if(!o||!a){var c=s?"":t.markupStyleCreator.makeTooltipMarker(e.markerType,e.markerColor||"#333",r),p=o?"":fp(l,"ordinal",u),d=e.valueType,f=a?[]:h(e.value),g=!s||!o,y=!s&&o,v=Kf(i,r),m=v.nameStyle,x=v.valueStyle;return"richText"===r?(s?"":c)+(o?"":sg(t,p,m))+(a?"":function(t,e,n,i,r){var o=[r],a=i?10:20;return n&&o.push({padding:[0,0,0,a],align:"right"}),t.markupStyleCreator.wrapRichTextStyle(Y(e)?e.join("  "):e,o)}(t,f,g,y,x)):ag((s?"":c)+(o?"":function(t,e,n){return'<span style="'+n+";"+(e?"margin-left:2px":"")+'">'+ie(t)+"</span>"}(p,!s,m))+(a?"":function(t,e,n,i){var r=n?"10px":"20px",o=e?"float:right;margin-left:"+r:"";return t=Y(t)?t:[t],'<span style="'+o+";"+i+'">'+z(t,(function(t){return ie(t)})).join("&nbsp;&nbsp;")+"</span>"}(f,g,y,x)),n)}}function og(t,e,n,i,r,o){if(t)return eg(t)({useUTC:r,renderMode:n,orderMode:i,markupStyleCreator:e,valueFormatter:t.valueFormatter},t,0,o)}function ag(t,e){return'<div style="'+("margin: "+e+"px 0 0")+";"+'line-height:1;">'+t+'<div style="clear:both"></div></div>'}function sg(t,e,n){return t.markupStyleCreator.wrapRichTextStyle(e,n)}function lg(t,e){return xp(t.getData().getItemVisual(e,"style")[t.visualDrawType])}function ug(t,e){var n=t.get("padding");return null!=n?n:"richText"===e?[8,10]:10}var hg=function(){function t(){this.richTextStyles={},this._nextStyleNameId=co()}return t.prototype._generateStyleName=function(){return"__EC_aUTo_"+this._nextStyleNameId++},t.prototype.makeTooltipMarker=function(t,e,n){var i="richText"===n?this._generateStyleName():null,r=mp({color:e,type:t,renderMode:n,markerId:i});return X(r)?r:(this.richTextStyles[i]=r.style,r.content)},t.prototype.wrapRichTextStyle=function(t,e){var n={};Y(e)?E(e,(function(t){return A(n,t)})):A(n,e);var i=this._generateStyleName();return this.richTextStyles[i]=n,"{"+i+"|"+t+"}"},t}();function cg(t){var e,n,i,r,o=t.series,a=t.dataIndex,s=t.multipleSeries,l=o.getData(),u=l.mapDimensionsAll("defaultedTooltip"),h=u.length,c=o.getRawValue(a),p=Y(c),d=lg(o,a);if(h>1||p&&!h){var f=function(t,e,n,i,r){var o=e.getData(),a=V(t,(function(t,e,n){var i=o.getDimensionInfo(n);return t||i&&!1!==i.tooltip&&null!=i.displayName}),!1),s=[],l=[],u=[];function h(t,e){var n=o.getDimensionInfo(e);n&&!1!==n.otherDims.tooltip&&(a?u.push(Qf("nameValue",{markerType:"subItem",markerColor:r,name:n.displayName,value:t,valueType:n.type})):(s.push(t),l.push(n.type)))}return i.length?E(i,(function(t){h(df(o,n,t),t)})):E(t,h),{inlineValues:s,inlineValueTypes:l,blocks:u}}(c,o,a,u,d);e=f.inlineValues,n=f.inlineValueTypes,i=f.blocks,r=f.inlineValues[0]}else if(h){var g=l.getDimensionInfo(u[0]);r=e=df(l,a,u[0]),n=g.type}else r=e=p?c[0]:c;var y=Ao(o),v=y&&o.name||"",m=l.getName(a),x=s?v:m;return Qf("section",{header:v,noHeader:s||!y,sortParam:r,blocks:[Qf("nameValue",{markerType:"item",markerColor:d,name:x,noName:!ut(x),value:e,valueType:n})].concat(i||[])})}var pg=Po();function dg(t,e){return t.getName(e)||t.getId(e)}var fg=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e._selectedDataIndicesMap={},e}return n(e,t),e.prototype.init=function(t,e,n){this.seriesIndex=this.componentIndex,this.dataTask=vf({count:yg,reset:vg}),this.dataTask.context={model:this},this.mergeDefaultAndTheme(t,n),(pg(this).sourceManager=new Xf(this)).prepareSource();var i=this.getInitialData(t,n);xg(i,this),this.dataTask.context.data=i,pg(this).dataBeforeProcessed=i,gg(this),this._initSelectedMapFromData(i)},e.prototype.mergeDefaultAndTheme=function(t,e){var n=Dp(this),i=n?kp(t):{},r=this.subType;Op.hasClass(r)&&(r+="Series"),C(t,e.getTheme().get(this.subType)),C(t,this.getDefaultOption()),bo(t,"label",["show"]),this.fillDataTextStyle(t.data),n&&Ap(t,i,n)},e.prototype.mergeOption=function(t,e){t=C(this.option,t,!0),this.fillDataTextStyle(t.data);var n=Dp(this);n&&Ap(this.option,t,n);var i=pg(this).sourceManager;i.dirty(),i.prepareSource();var r=this.getInitialData(t,e);xg(r,this),this.dataTask.dirty(),this.dataTask.context.data=r,pg(this).dataBeforeProcessed=r,gg(this),this._initSelectedMapFromData(r)},e.prototype.fillDataTextStyle=function(t){if(t&&!$(t))for(var e=["show"],n=0;n<t.length;n++)t[n]&&t[n].label&&bo(t[n],"label",e)},e.prototype.getInitialData=function(t,e){},e.prototype.appendData=function(t){this.getRawData().appendData(t.data)},e.prototype.getData=function(t){var e=bg(this);if(e){var n=e.context.data;return null==t?n:n.getLinkedData(t)}return pg(this).data},e.prototype.getAllData=function(){var t=this.getData();return t&&t.getLinkedDataAll?t.getLinkedDataAll():[{data:t}]},e.prototype.setData=function(t){var e=bg(this);if(e){var n=e.context;n.outputData=t,e!==this.dataTask&&(n.data=t)}pg(this).data=t},e.prototype.getEncode=function(){var t=this.get("encode",!0);if(t)return yt(t)},e.prototype.getSourceManager=function(){return pg(this).sourceManager},e.prototype.getSource=function(){return this.getSourceManager().getSource()},e.prototype.getRawData=function(){return pg(this).dataBeforeProcessed},e.prototype.getColorBy=function(){return this.get("colorBy")||"series"},e.prototype.isColorBySeries=function(){return"series"===this.getColorBy()},e.prototype.getBaseAxis=function(){var t=this.coordinateSystem;return t&&t.getBaseAxis&&t.getBaseAxis()},e.prototype.formatTooltip=function(t,e,n){return cg({series:this,dataIndex:t,multipleSeries:e})},e.prototype.isAnimationEnabled=function(){var t=this.ecModel;if(r.node&&(!t||!t.ssr))return!1;var e=this.getShallow("animation");return e&&this.getData().count()>this.getShallow("animationThreshold")&&(e=!1),!!e},e.prototype.restoreData=function(){this.dataTask.dirty()},e.prototype.getColorFromPalette=function(t,e,n){var i=this.ecModel,r=sd.prototype.getColorFromPalette.call(this,t,e,n);return r||(r=i.getColorFromPalette(t,e,n)),r},e.prototype.coordDimToDataDim=function(t){return this.getRawData().mapDimensionsAll(t)},e.prototype.getProgressive=function(){return this.get("progressive")},e.prototype.getProgressiveThreshold=function(){return this.get("progressiveThreshold")},e.prototype.select=function(t,e){this._innerSelect(this.getData(e),t)},e.prototype.unselect=function(t,e){var n=this.option.selectedMap;if(n){var i=this.option.selectedMode,r=this.getData(e);if("series"===i||"all"===n)return this.option.selectedMap={},void(this._selectedDataIndicesMap={});for(var o=0;o<t.length;o++){var a=dg(r,t[o]);n[a]=!1,this._selectedDataIndicesMap[a]=-1}}},e.prototype.toggleSelect=function(t,e){for(var n=[],i=0;i<t.length;i++)n[0]=t[i],this.isSelected(t[i],e)?this.unselect(n,e):this.select(n,e)},e.prototype.getSelectedDataIndices=function(){if("all"===this.option.selectedMap)return[].slice.call(this.getData().getIndices());for(var t=this._selectedDataIndicesMap,e=G(t),n=[],i=0;i<e.length;i++){var r=t[e[i]];r>=0&&n.push(r)}return n},e.prototype.isSelected=function(t,e){var n=this.option.selectedMap;if(!n)return!1;var i=this.getData(e);return("all"===n||n[dg(i,t)])&&!i.getItemModel(t).get(["select","disabled"])},e.prototype.isUniversalTransitionEnabled=function(){if(this.__universalTransitionEnabled)return!0;var t=this.option.universalTransition;return!!t&&(!0===t||t&&t.enabled)},e.prototype._innerSelect=function(t,e){var n,i,r=this.option,o=r.selectedMode,a=e.length;if(o&&a)if("series"===o)r.selectedMap="all";else if("multiple"===o){q(r.selectedMap)||(r.selectedMap={});for(var s=r.selectedMap,l=0;l<a;l++){var u=e[l];s[c=dg(t,u)]=!0,this._selectedDataIndicesMap[c]=t.getRawIndex(u)}}else if("single"===o||!0===o){var h=e[a-1],c=dg(t,h);r.selectedMap=((n={})[c]=!0,n),this._selectedDataIndicesMap=((i={})[c]=t.getRawIndex(h),i)}},e.prototype._initSelectedMapFromData=function(t){if(!this.option.selectedMap){var e=[];t.hasItemOption&&t.each((function(n){var i=t.getRawDataItem(n);i&&i.selected&&e.push(n)})),e.length>0&&this._innerSelect(t,e)}},e.registerClass=function(t){return Op.registerClass(t)},e.protoInitialize=function(){var t=e.prototype;t.type="series.__base__",t.seriesIndex=0,t.ignoreStyleOnData=!1,t.hasSymbolVisual=!1,t.defaultSymbol="circle",t.visualStyleAccessPath="itemStyle",t.visualDrawType="fill"}(),e}(Op);function gg(t){var e=t.name;Ao(t)||(t.name=function(t){var e=t.getRawData(),n=e.mapDimensionsAll("seriesName"),i=[];return E(n,(function(t){var n=e.getDimensionInfo(t);n.displayName&&i.push(n.displayName)})),i.join(" ")}(t)||e)}function yg(t){return t.model.getRawData().count()}function vg(t){var e=t.model;return e.setData(e.getRawData().cloneShallow()),mg}function mg(t,e){e.outputData&&t.end>e.outputData.count()&&e.model.getRawData().cloneShallow(e.outputData)}function xg(t,e){E(vt(t.CHANGABLE_METHODS,t.DOWNSAMPLE_METHODS),(function(n){t.wrapMethod(n,H(_g,e))}))}function _g(t,e){var n=bg(t);return n&&n.setOutputEnd((e||this).count()),e}function bg(t){var e=(t.ecModel||{}).scheduler,n=e&&e.getPipeline(t.uid);if(n){var i=n.currentTask;if(i){var r=i.agentStubMap;r&&(i=r.get(t.uid))}return i}}R(fg,gf),R(fg,sd),Xo(fg,Op);var wg=function(){function t(){this.group=new Er,this.uid=Ic("viewComponent")}return t.prototype.init=function(t,e){},t.prototype.render=function(t,e,n,i){},t.prototype.dispose=function(t,e){},t.prototype.updateView=function(t,e,n,i){},t.prototype.updateLayout=function(t,e,n,i){},t.prototype.updateVisual=function(t,e,n,i){},t.prototype.toggleBlurSeries=function(t,e,n){},t.prototype.eachRendered=function(t){var e=this.group;e&&e.traverse(t)},t}();function Sg(){var t=Po();return function(e){var n=t(e),i=e.pipelineContext,r=!!n.large,o=!!n.progressiveRender,a=n.large=!(!i||!i.large),s=n.progressiveRender=!(!i||!i.progressiveRender);return!(r===a&&o===s)&&"reset"}}Uo(wg),Ko(wg);var Mg=Po(),Ig=Sg(),Tg=function(){function t(){this.group=new Er,this.uid=Ic("viewChart"),this.renderTask=vf({plan:Ag,reset:kg}),this.renderTask.context={view:this}}return t.prototype.init=function(t,e){},t.prototype.render=function(t,e,n,i){0},t.prototype.highlight=function(t,e,n,i){var r=t.getData(i&&i.dataType);r&&Dg(r,i,"emphasis")},t.prototype.downplay=function(t,e,n,i){var r=t.getData(i&&i.dataType);r&&Dg(r,i,"normal")},t.prototype.remove=function(t,e){this.group.removeAll()},t.prototype.dispose=function(t,e){},t.prototype.updateView=function(t,e,n,i){this.render(t,e,n,i)},t.prototype.updateLayout=function(t,e,n,i){this.render(t,e,n,i)},t.prototype.updateVisual=function(t,e,n,i){this.render(t,e,n,i)},t.prototype.eachRendered=function(t){jh(this.group,t)},t.markUpdateMethod=function(t,e){Mg(t).updateMethod=e},t.protoInitialize=void(t.prototype.type="chart"),t}();function Cg(t,e,n){t&&ql(t)&&("emphasis"===e?Al:kl)(t,n)}function Dg(t,e,n){var i=Lo(t,e),r=e&&null!=e.highlightKey?function(t){var e=el[t];return null==e&&tl<=32&&(e=el[t]=tl++),e}(e.highlightKey):null;null!=i?E(_o(i),(function(e){Cg(t.getItemGraphicEl(e),n,r)})):t.eachItemGraphicEl((function(t){Cg(t,n,r)}))}function Ag(t){return Ig(t.model)}function kg(t){var e=t.model,n=t.ecModel,i=t.api,r=t.payload,o=e.pipelineContext.progressiveRender,a=t.view,s=r&&Mg(r).updateMethod,l=o?"incrementalPrepareRender":s&&a[s]?s:"render";return"render"!==l&&a[l](e,n,i,r),Lg[l]}Uo(Tg),Ko(Tg);var Lg={incrementalPrepareRender:{progress:function(t,e){e.view.incrementalRender(t,e.model,e.ecModel,e.api,e.payload)}},render:{forceFirstProgress:!0,progress:function(t,e){e.view.render(e.model,e.ecModel,e.api,e.payload)}}},Pg="\0__throttleOriginMethod",Og="\0__throttleRate",Rg="\0__throttleType";function Ng(t,e,n){var i,r,o,a,s,l=0,u=0,h=null;function c(){u=(new Date).getTime(),h=null,t.apply(o,a||[])}e=e||0;var p=function(){for(var t=[],p=0;p<arguments.length;p++)t[p]=arguments[p];i=(new Date).getTime(),o=this,a=t;var d=s||e,f=s||n;s=null,r=i-(f?l:u)-d,clearTimeout(h),f?h=setTimeout(c,d):r>=0?c():h=setTimeout(c,-r),l=i};return p.clear=function(){h&&(clearTimeout(h),h=null)},p.debounceNextCall=function(t){s=t},p}function Eg(t,e,n,i){var r=t[e];if(r){var o=r[Pg]||r,a=r[Rg];if(r[Og]!==n||a!==i){if(null==n||!i)return t[e]=o;(r=t[e]=Ng(o,n,"debounce"===i))[Pg]=o,r[Rg]=i,r[Og]=n}return r}}function zg(t,e){var n=t[e];n&&n[Pg]&&(n.clear&&n.clear(),t[e]=n[Pg])}var Vg=Po(),Bg={itemStyle:$o(_c,!0),lineStyle:$o(vc,!0)},Fg={lineStyle:"stroke",itemStyle:"fill"};function Gg(t,e){var n=t.visualStyleMapper||Bg[e];return n||(console.warn("Unknown style type '"+e+"'."),Bg.itemStyle)}function Wg(t,e){var n=t.visualDrawType||Fg[e];return n||(console.warn("Unknown style type '"+e+"'."),"fill")}var Hg={createOnAllSeries:!0,performRawSeries:!0,reset:function(t,e){var n=t.getData(),i=t.visualStyleAccessPath||"itemStyle",r=t.getModel(i),o=Gg(t,i)(r),a=r.getShallow("decal");a&&(n.setVisual("decal",a),a.dirty=!0);var s=Wg(t,i),l=o[s],u=U(l)?l:null,h="auto"===o.fill||"auto"===o.stroke;if(!o[s]||u||h){var c=t.getColorFromPalette(t.name,null,e.getSeriesCount());o[s]||(o[s]=c,n.setVisual("colorFromPalette",!0)),o.fill="auto"===o.fill||U(o.fill)?c:o.fill,o.stroke="auto"===o.stroke||U(o.stroke)?c:o.stroke}if(n.setVisual("style",o),n.setVisual("drawType",s),!e.isSeriesFiltered(t)&&u)return n.setVisual("colorFromPalette",!1),{dataEach:function(e,n){var i=t.getDataParams(n),r=A({},o);r[s]=u(i),e.setItemVisual(n,"style",r)}}}},Yg=new Sc,Ug={createOnAllSeries:!0,performRawSeries:!0,reset:function(t,e){if(!t.ignoreStyleOnData&&!e.isSeriesFiltered(t)){var n=t.getData(),i=t.visualStyleAccessPath||"itemStyle",r=Gg(t,i),o=n.getVisual("drawType");return{dataEach:n.hasItemOption?function(t,e){var n=t.getRawDataItem(e);if(n&&n[i]){Yg.option=n[i];var a=r(Yg);A(t.ensureUniqueItemVisual(e,"style"),a),Yg.option.decal&&(t.setItemVisual(e,"decal",Yg.option.decal),Yg.option.decal.dirty=!0),o in a&&t.setItemVisual(e,"colorFromPalette",!1)}}:null}}}},Xg={performRawSeries:!0,overallReset:function(t){var e=yt();t.eachSeries((function(t){var n=t.getColorBy();if(!t.isColorBySeries()){var i=t.type+"-"+n,r=e.get(i);r||(r={},e.set(i,r)),Vg(t).scope=r}})),t.eachSeries((function(e){if(!e.isColorBySeries()&&!t.isSeriesFiltered(e)){var n=e.getRawData(),i={},r=e.getData(),o=Vg(e).scope,a=e.visualStyleAccessPath||"itemStyle",s=Wg(e,a);r.each((function(t){var e=r.getRawIndex(t);i[e]=t})),n.each((function(t){var a=i[t];if(r.getItemVisual(a,"colorFromPalette")){var l=r.ensureUniqueItemVisual(a,"style"),u=n.getName(t)||t+"",h=n.count();l[s]=e.getColorFromPalette(u,o,h)}}))}}))}},Zg=Math.PI;var jg=function(){function t(t,e,n,i){this._stageTaskMap=yt(),this.ecInstance=t,this.api=e,n=this._dataProcessorHandlers=n.slice(),i=this._visualHandlers=i.slice(),this._allHandlers=n.concat(i)}return t.prototype.restoreData=function(t,e){t.restoreData(e),this._stageTaskMap.each((function(t){var e=t.overallTask;e&&e.dirty()}))},t.prototype.getPerformArgs=function(t,e){if(t.__pipeline){var n=this._pipelineMap.get(t.__pipeline.id),i=n.context,r=!e&&n.progressiveEnabled&&(!i||i.progressiveRender)&&t.__idxInPipeline>n.blockIndex?n.step:null,o=i&&i.modDataCount;return{step:r,modBy:null!=o?Math.ceil(o/r):null,modDataCount:o}}},t.prototype.getPipeline=function(t){return this._pipelineMap.get(t)},t.prototype.updateStreamModes=function(t,e){var n=this._pipelineMap.get(t.uid),i=t.getData().count(),r=n.progressiveEnabled&&e.incrementalPrepareRender&&i>=n.threshold,o=t.get("large")&&i>=t.get("largeThreshold"),a="mod"===t.get("progressiveChunkMode")?i:null;t.pipelineContext=n.context={progressiveRender:r,modDataCount:a,large:o}},t.prototype.restorePipelines=function(t){var e=this,n=e._pipelineMap=yt();t.eachSeries((function(t){var i=t.getProgressive(),r=t.uid;n.set(r,{id:r,head:null,tail:null,threshold:t.getProgressiveThreshold(),progressiveEnabled:i&&!(t.preventIncremental&&t.preventIncremental()),blockIndex:-1,step:Math.round(i||700),count:0}),e._pipe(t,t.dataTask)}))},t.prototype.prepareStageTasks=function(){var t=this._stageTaskMap,e=this.api.getModel(),n=this.api;E(this._allHandlers,(function(i){var r=t.get(i.uid)||t.set(i.uid,{}),o="";lt(!(i.reset&&i.overallReset),o),i.reset&&this._createSeriesStageTask(i,r,e,n),i.overallReset&&this._createOverallStageTask(i,r,e,n)}),this)},t.prototype.prepareView=function(t,e,n,i){var r=t.renderTask,o=r.context;o.model=e,o.ecModel=n,o.api=i,r.__block=!t.incrementalPrepareRender,this._pipe(e,r)},t.prototype.performDataProcessorTasks=function(t,e){this._performStageTasks(this._dataProcessorHandlers,t,e,{block:!0})},t.prototype.performVisualTasks=function(t,e,n){this._performStageTasks(this._visualHandlers,t,e,n)},t.prototype._performStageTasks=function(t,e,n,i){i=i||{};var r=!1,o=this;function a(t,e){return t.setDirty&&(!t.dirtyMap||t.dirtyMap.get(e.__pipeline.id))}E(t,(function(t,s){if(!i.visualType||i.visualType===t.visualType){var l=o._stageTaskMap.get(t.uid),u=l.seriesTaskMap,h=l.overallTask;if(h){var c,p=h.agentStubMap;p.each((function(t){a(i,t)&&(t.dirty(),c=!0)})),c&&h.dirty(),o.updatePayload(h,n);var d=o.getPerformArgs(h,i.block);p.each((function(t){t.perform(d)})),h.perform(d)&&(r=!0)}else u&&u.each((function(s,l){a(i,s)&&s.dirty();var u=o.getPerformArgs(s,i.block);u.skip=!t.performRawSeries&&e.isSeriesFiltered(s.context.model),o.updatePayload(s,n),s.perform(u)&&(r=!0)}))}})),this.unfinished=r||this.unfinished},t.prototype.performSeriesTasks=function(t){var e;t.eachSeries((function(t){e=t.dataTask.perform()||e})),this.unfinished=e||this.unfinished},t.prototype.plan=function(){this._pipelineMap.each((function(t){var e=t.tail;do{if(e.__block){t.blockIndex=e.__idxInPipeline;break}e=e.getUpstream()}while(e)}))},t.prototype.updatePayload=function(t,e){"remain"!==e&&(t.context.payload=e)},t.prototype._createSeriesStageTask=function(t,e,n,i){var r=this,o=e.seriesTaskMap,a=e.seriesTaskMap=yt(),s=t.seriesType,l=t.getTargetSeries;function u(e){var s=e.uid,l=a.set(s,o&&o.get(s)||vf({plan:Qg,reset:ty,count:iy}));l.context={model:e,ecModel:n,api:i,useClearVisual:t.isVisual&&!t.isLayout,plan:t.plan,reset:t.reset,scheduler:r},r._pipe(e,l)}t.createOnAllSeries?n.eachRawSeries(u):s?n.eachRawSeriesByType(s,u):l&&l(n,i).each(u)},t.prototype._createOverallStageTask=function(t,e,n,i){var r=this,o=e.overallTask=e.overallTask||vf({reset:qg});o.context={ecModel:n,api:i,overallReset:t.overallReset,scheduler:r};var a=o.agentStubMap,s=o.agentStubMap=yt(),l=t.seriesType,u=t.getTargetSeries,h=!0,c=!1,p="";function d(t){var e=t.uid,n=s.set(e,a&&a.get(e)||(c=!0,vf({reset:Kg,onDirty:Jg})));n.context={model:t,overallProgress:h},n.agent=o,n.__block=h,r._pipe(t,n)}lt(!t.createOnAllSeries,p),l?n.eachRawSeriesByType(l,d):u?u(n,i).each(d):(h=!1,E(n.getSeries(),d)),c&&o.dirty()},t.prototype._pipe=function(t,e){var n=t.uid,i=this._pipelineMap.get(n);!i.head&&(i.head=e),i.tail&&i.tail.pipe(e),i.tail=e,e.__idxInPipeline=i.count++,e.__pipeline=i},t.wrapStageHandler=function(t,e){return U(t)&&(t={overallReset:t,seriesType:ry(t)}),t.uid=Ic("stageHandler"),e&&(t.visualType=e),t},t}();function qg(t){t.overallReset(t.ecModel,t.api,t.payload)}function Kg(t){return t.overallProgress&&$g}function $g(){this.agent.dirty(),this.getDownstream().dirty()}function Jg(){this.agent&&this.agent.dirty()}function Qg(t){return t.plan?t.plan(t.model,t.ecModel,t.api,t.payload):null}function ty(t){t.useClearVisual&&t.data.clearAllVisual();var e=t.resetDefines=_o(t.reset(t.model,t.ecModel,t.api,t.payload));return e.length>1?z(e,(function(t,e){return ny(e)})):ey}var ey=ny(0);function ny(t){return function(e,n){var i=n.data,r=n.resetDefines[t];if(r&&r.dataEach)for(var o=e.start;o<e.end;o++)r.dataEach(i,o);else r&&r.progress&&r.progress(e,i)}}function iy(t){return t.data.count()}function ry(t){oy=null;try{t(ay,sy)}catch(t){}return oy}var oy,ay={},sy={};function ly(t,e){for(var n in e.prototype)t[n]=bt}ly(ay,hd),ly(sy,gd),ay.eachSeriesByType=ay.eachRawSeriesByType=function(t){oy=t},ay.eachComponent=function(t){"series"===t.mainType&&t.subType&&(oy=t.subType)};var uy=["#37A2DA","#32C5E9","#67E0E3","#9FE6B8","#FFDB5C","#ff9f7f","#fb7293","#E062AE","#E690D1","#e7bcf3","#9d96f5","#8378EA","#96BFFF"],hy={color:uy,colorLayer:[["#37A2DA","#ffd85c","#fd7b5f"],["#37A2DA","#67E0E3","#FFDB5C","#ff9f7f","#E062AE","#9d96f5"],["#37A2DA","#32C5E9","#9FE6B8","#FFDB5C","#ff9f7f","#fb7293","#e7bcf3","#8378EA","#96BFFF"],uy]},cy="#B9B8CE",py="#100C2A",dy=function(){return{axisLine:{lineStyle:{color:cy}},splitLine:{lineStyle:{color:"#484753"}},splitArea:{areaStyle:{color:["rgba(255,255,255,0.02)","rgba(255,255,255,0.05)"]}},minorSplitLine:{lineStyle:{color:"#20203B"}}}},fy=["#4992ff","#7cffb2","#fddd60","#ff6e76","#58d9f9","#05c091","#ff8a45","#8d48e3","#dd79ff"],gy={darkMode:!0,color:fy,backgroundColor:py,axisPointer:{lineStyle:{color:"#817f91"},crossStyle:{color:"#817f91"},label:{color:"#fff"}},legend:{textStyle:{color:cy}},textStyle:{color:cy},title:{textStyle:{color:"#EEF1FA"},subtextStyle:{color:"#B9B8CE"}},toolbox:{iconStyle:{borderColor:cy}},dataZoom:{borderColor:"#71708A",textStyle:{color:cy},brushStyle:{color:"rgba(135,163,206,0.3)"},handleStyle:{color:"#353450",borderColor:"#C5CBE3"},moveHandleStyle:{color:"#B0B6C3",opacity:.3},fillerColor:"rgba(135,163,206,0.2)",emphasis:{handleStyle:{borderColor:"#91B7F2",color:"#4D587D"},moveHandleStyle:{color:"#636D9A",opacity:.7}},dataBackground:{lineStyle:{color:"#71708A",width:1},areaStyle:{color:"#71708A"}},selectedDataBackground:{lineStyle:{color:"#87A3CE"},areaStyle:{color:"#87A3CE"}}},visualMap:{textStyle:{color:cy}},timeline:{lineStyle:{color:cy},label:{color:cy},controlStyle:{color:cy,borderColor:cy}},calendar:{itemStyle:{color:py},dayLabel:{color:cy},monthLabel:{color:cy},yearLabel:{color:cy}},timeAxis:dy(),logAxis:dy(),valueAxis:dy(),categoryAxis:dy(),line:{symbol:"circle"},graph:{color:fy},gauge:{title:{color:cy},axisLine:{lineStyle:{color:[[1,"rgba(207,212,219,0.2)"]]}},axisLabel:{color:cy},detail:{color:"#EEF1FA"}},candlestick:{itemStyle:{color:"#f64e56",color0:"#54ea92",borderColor:"#f64e56",borderColor0:"#54ea92"}}};gy.categoryAxis.splitLine.show=!1;var yy=function(){function t(){}return t.prototype.normalizeQuery=function(t){var e={},n={},i={};if(X(t)){var r=Yo(t);e.mainType=r.main||null,e.subType=r.sub||null}else{var o=["Index","Name","Id"],a={name:1,dataIndex:1,dataType:1};E(t,(function(t,r){for(var s=!1,l=0;l<o.length;l++){var u=o[l],h=r.lastIndexOf(u);if(h>0&&h===r.length-u.length){var c=r.slice(0,h);"data"!==c&&(e.mainType=c,e[u.toLowerCase()]=t,s=!0)}}a.hasOwnProperty(r)&&(n[r]=t,s=!0),s||(i[r]=t)}))}return{cptQuery:e,dataQuery:n,otherQuery:i}},t.prototype.filter=function(t,e){var n=this.eventInfo;if(!n)return!0;var i=n.targetEl,r=n.packedEvent,o=n.model,a=n.view;if(!o||!a)return!0;var s=e.cptQuery,l=e.dataQuery;return u(s,o,"mainType")&&u(s,o,"subType")&&u(s,o,"index","componentIndex")&&u(s,o,"name")&&u(s,o,"id")&&u(l,r,"name")&&u(l,r,"dataIndex")&&u(l,r,"dataType")&&(!a.filterForExposedEvent||a.filterForExposedEvent(t,e.otherQuery,i,r));function u(t,e,n,i){return null==t[n]||e[i||n]===t[n]}},t.prototype.afterTrigger=function(){this.eventInfo=null},t}(),vy=["symbol","symbolSize","symbolRotate","symbolOffset"],my=vy.concat(["symbolKeepAspect"]),xy={createOnAllSeries:!0,performRawSeries:!0,reset:function(t,e){var n=t.getData();if(t.legendIcon&&n.setVisual("legendIcon",t.legendIcon),t.hasSymbolVisual){for(var i={},r={},o=!1,a=0;a<vy.length;a++){var s=vy[a],l=t.get(s);U(l)?(o=!0,r[s]=l):i[s]=l}if(i.symbol=i.symbol||t.defaultSymbol,n.setVisual(A({legendIcon:t.legendIcon||i.symbol,symbolKeepAspect:t.get("symbolKeepAspect")},i)),!e.isSeriesFiltered(t)){var u=G(r);return{dataEach:o?function(e,n){for(var i=t.getRawValue(n),o=t.getDataParams(n),a=0;a<u.length;a++){var s=u[a];e.setItemVisual(n,s,r[s](i,o))}}:null}}}}},_y={createOnAllSeries:!0,performRawSeries:!0,reset:function(t,e){if(t.hasSymbolVisual&&!e.isSeriesFiltered(t))return{dataEach:t.getData().hasItemOption?function(t,e){for(var n=t.getItemModel(e),i=0;i<my.length;i++){var r=my[i],o=n.getShallow(r,!0);null!=o&&t.setItemVisual(e,r,o)}}:null}}};function by(t,e,n){switch(n){case"color":return t.getItemVisual(e,"style")[t.getVisual("drawType")];case"opacity":return t.getItemVisual(e,"style").opacity;case"symbol":case"symbolSize":case"liftZ":return t.getItemVisual(e,n)}}function wy(t,e){switch(e){case"color":return t.getVisual("style")[t.getVisual("drawType")];case"opacity":return t.getVisual("style").opacity;case"symbol":case"symbolSize":case"liftZ":return t.getVisual(e)}}function Sy(t,e,n,i){switch(n){case"color":t.ensureUniqueItemVisual(e,"style")[t.getVisual("drawType")]=i,t.setItemVisual(e,"colorFromPalette",!1);break;case"opacity":t.ensureUniqueItemVisual(e,"style").opacity=i;break;case"symbol":case"symbolSize":case"liftZ":t.setItemVisual(e,n,i)}}function My(t,e){function n(e,n){var i=[];return e.eachComponent({mainType:"series",subType:t,query:n},(function(t){i.push(t.seriesIndex)})),i}E([[t+"ToggleSelect","toggleSelect"],[t+"Select","select"],[t+"UnSelect","unselect"]],(function(t){e(t[0],(function(e,i,r){e=A({},e),r.dispatchAction(A(e,{type:t[1],seriesIndex:n(i,e)}))}))}))}function Iy(t,e,n,i,r){var o=t+e;n.isSilent(o)||i.eachComponent({mainType:"series",subType:"pie"},(function(t){for(var e=t.seriesIndex,i=t.option.selectedMap,a=r.selected,s=0;s<a.length;s++)if(a[s].seriesIndex===e){var l=t.getData(),u=Lo(l,r.fromActionPayload);n.trigger(o,{type:o,seriesId:t.id,name:Y(u)?l.getName(u[0]):l.getName(u),selected:X(i)?i:A({},i)})}}))}function Ty(t,e,n){for(var i;t&&(!e(t)||(i=t,!n));)t=t.__hostTarget||t.parent;return i}var Cy=Math.round(9*Math.random()),Dy="function"==typeof Object.defineProperty,Ay=function(){function t(){this._id="__ec_inner_"+Cy++}return t.prototype.get=function(t){return this._guard(t)[this._id]},t.prototype.set=function(t,e){var n=this._guard(t);return Dy?Object.defineProperty(n,this._id,{value:e,enumerable:!1,configurable:!0}):n[this._id]=e,this},t.prototype.delete=function(t){return!!this.has(t)&&(delete this._guard(t)[this._id],!0)},t.prototype.has=function(t){return!!this._guard(t)[this._id]},t.prototype._guard=function(t){if(t!==Object(t))throw TypeError("Value of WeakMap is not a non-null object.");return t},t}(),ky=Ms.extend({type:"triangle",shape:{cx:0,cy:0,width:0,height:0},buildPath:function(t,e){var n=e.cx,i=e.cy,r=e.width/2,o=e.height/2;t.moveTo(n,i-o),t.lineTo(n+r,i+o),t.lineTo(n-r,i+o),t.closePath()}}),Ly=Ms.extend({type:"diamond",shape:{cx:0,cy:0,width:0,height:0},buildPath:function(t,e){var n=e.cx,i=e.cy,r=e.width/2,o=e.height/2;t.moveTo(n,i-o),t.lineTo(n+r,i),t.lineTo(n,i+o),t.lineTo(n-r,i),t.closePath()}}),Py=Ms.extend({type:"pin",shape:{x:0,y:0,width:0,height:0},buildPath:function(t,e){var n=e.x,i=e.y,r=e.width/5*3,o=Math.max(r,e.height),a=r/2,s=a*a/(o-a),l=i-o+a+s,u=Math.asin(s/a),h=Math.cos(u)*a,c=Math.sin(u),p=Math.cos(u),d=.6*a,f=.7*a;t.moveTo(n-h,l+s),t.arc(n,l,a,Math.PI-u,2*Math.PI+u),t.bezierCurveTo(n+h-c*d,l+s+p*d,n,i-f,n,i),t.bezierCurveTo(n,i-f,n-h+c*d,l+s+p*d,n-h,l+s),t.closePath()}}),Oy=Ms.extend({type:"arrow",shape:{x:0,y:0,width:0,height:0},buildPath:function(t,e){var n=e.height,i=e.width,r=e.x,o=e.y,a=i/3*2;t.moveTo(r,o),t.lineTo(r+a,o+n),t.lineTo(r,o+n/4*3),t.lineTo(r-a,o+n),t.lineTo(r,o),t.closePath()}}),Ry={line:function(t,e,n,i,r){r.x1=t,r.y1=e+i/2,r.x2=t+n,r.y2=e+i/2},rect:function(t,e,n,i,r){r.x=t,r.y=e,r.width=n,r.height=i},roundRect:function(t,e,n,i,r){r.x=t,r.y=e,r.width=n,r.height=i,r.r=Math.min(n,i)/4},square:function(t,e,n,i,r){var o=Math.min(n,i);r.x=t,r.y=e,r.width=o,r.height=o},circle:function(t,e,n,i,r){r.cx=t+n/2,r.cy=e+i/2,r.r=Math.min(n,i)/2},diamond:function(t,e,n,i,r){r.cx=t+n/2,r.cy=e+i/2,r.width=n,r.height=i},pin:function(t,e,n,i,r){r.x=t+n/2,r.y=e+i/2,r.width=n,r.height=i},arrow:function(t,e,n,i,r){r.x=t+n/2,r.y=e+i/2,r.width=n,r.height=i},triangle:function(t,e,n,i,r){r.cx=t+n/2,r.cy=e+i/2,r.width=n,r.height=i}},Ny={};E({line:Xu,rect:Es,roundRect:Es,square:Es,circle:xu,diamond:Ly,pin:Py,arrow:Oy,triangle:ky},(function(t,e){Ny[e]=new t}));var Ey=Ms.extend({type:"symbol",shape:{symbolType:"",x:0,y:0,width:0,height:0},calculateTextPosition:function(t,e,n){var i=Ir(t,e,n),r=this.shape;return r&&"pin"===r.symbolType&&"inside"===e.position&&(i.y=n.y+.4*n.height),i},buildPath:function(t,e,n){var i=e.symbolType;if("none"!==i){var r=Ny[i];r||(r=Ny[i="rect"]),Ry[i](e.x,e.y,e.width,e.height,r.shape),r.buildPath(t,r.shape,n)}}});function zy(t,e){if("image"!==this.type){var n=this.style;this.__isEmptyBrush?(n.stroke=t,n.fill=e||"#fff",n.lineWidth=2):"line"===this.shape.symbolType?n.stroke=t:n.fill=t,this.markRedraw()}}function Vy(t,e,n,i,r,o,a){var s,l=0===t.indexOf("empty");return l&&(t=t.substr(5,1).toLowerCase()+t.substr(6)),(s=0===t.indexOf("image://")?Ah(t.slice(8),new Ee(e,n,i,r),a?"center":"cover"):0===t.indexOf("path://")?Dh(t.slice(7),{},new Ee(e,n,i,r),a?"center":"cover"):new Ey({shape:{symbolType:t,x:e,y:n,width:i,height:r}})).__isEmptyBrush=l,s.setColor=zy,o&&s.setColor(o),s}function By(t){return Y(t)||(t=[+t,+t]),[t[0]||0,t[1]||0]}function Fy(t,e){if(null!=t)return Y(t)||(t=[t,t]),[Ur(t[0],e[0])||0,Ur(rt(t[1],t[0]),e[1])||0]}function Gy(t){return isFinite(t)}function Wy(t,e,n){for(var i="radial"===e.type?function(t,e,n){var i=n.width,r=n.height,o=Math.min(i,r),a=null==e.x?.5:e.x,s=null==e.y?.5:e.y,l=null==e.r?.5:e.r;return e.global||(a=a*i+n.x,s=s*r+n.y,l*=o),a=Gy(a)?a:.5,s=Gy(s)?s:.5,l=l>=0&&Gy(l)?l:.5,t.createRadialGradient(a,s,0,a,s,l)}(t,e,n):function(t,e,n){var i=null==e.x?0:e.x,r=null==e.x2?1:e.x2,o=null==e.y?0:e.y,a=null==e.y2?0:e.y2;return e.global||(i=i*n.width+n.x,r=r*n.width+n.x,o=o*n.height+n.y,a=a*n.height+n.y),i=Gy(i)?i:0,r=Gy(r)?r:1,o=Gy(o)?o:0,a=Gy(a)?a:0,t.createLinearGradient(i,o,r,a)}(t,e,n),r=e.colorStops,o=0;o<r.length;o++)i.addColorStop(r[o].offset,r[o].color);return i}function Hy(t){return parseInt(t,10)}function Yy(t,e,n){var i=["width","height"][e],r=["clientWidth","clientHeight"][e],o=["paddingLeft","paddingTop"][e],a=["paddingRight","paddingBottom"][e];if(null!=n[i]&&"auto"!==n[i])return parseFloat(n[i]);var s=document.defaultView.getComputedStyle(t);return(t[r]||Hy(s[i])||Hy(t.style[i]))-(Hy(s[o])||0)-(Hy(s[a])||0)|0}function Uy(t){var e,n,i=t.style,r=i.lineDash&&i.lineWidth>0&&(e=i.lineDash,n=i.lineWidth,e&&"solid"!==e&&n>0?"dashed"===e?[4*n,2*n]:"dotted"===e?[n]:j(e)?[e]:Y(e)?e:null:null),o=i.lineDashOffset;if(r){var a=i.strokeNoScale&&t.getLineScale?t.getLineScale():1;a&&1!==a&&(r=z(r,(function(t){return t/a})),o/=a)}return[r,o]}var Xy=new rs(!0);function Zy(t){var e=t.stroke;return!(null==e||"none"===e||!(t.lineWidth>0))}function jy(t){return"string"==typeof t&&"none"!==t}function qy(t){var e=t.fill;return null!=e&&"none"!==e}function Ky(t,e){if(null!=e.fillOpacity&&1!==e.fillOpacity){var n=t.globalAlpha;t.globalAlpha=e.fillOpacity*e.opacity,t.fill(),t.globalAlpha=n}else t.fill()}function $y(t,e){if(null!=e.strokeOpacity&&1!==e.strokeOpacity){var n=t.globalAlpha;t.globalAlpha=e.strokeOpacity*e.opacity,t.stroke(),t.globalAlpha=n}else t.stroke()}function Jy(t,e,n){var i=na(e.image,e.__image,n);if(ra(i)){var r=t.createPattern(i,e.repeat||"repeat");if("function"==typeof DOMMatrix&&r&&r.setTransform){var o=new DOMMatrix;o.translateSelf(e.x||0,e.y||0),o.rotateSelf(0,0,(e.rotation||0)*wt),o.scaleSelf(e.scaleX||1,e.scaleY||1),r.setTransform(o)}return r}}var Qy=["shadowBlur","shadowOffsetX","shadowOffsetY"],tv=[["lineCap","butt"],["lineJoin","miter"],["miterLimit",10]];function ev(t,e,n,i,r){var o=!1;if(!i&&e===(n=n||{}))return!1;if(i||e.opacity!==n.opacity){rv(t,r),o=!0;var a=Math.max(Math.min(e.opacity,1),0);t.globalAlpha=isNaN(a)?ma.opacity:a}(i||e.blend!==n.blend)&&(o||(rv(t,r),o=!0),t.globalCompositeOperation=e.blend||ma.blend);for(var s=0;s<Qy.length;s++){var l=Qy[s];(i||e[l]!==n[l])&&(o||(rv(t,r),o=!0),t[l]=t.dpr*(e[l]||0))}return(i||e.shadowColor!==n.shadowColor)&&(o||(rv(t,r),o=!0),t.shadowColor=e.shadowColor||ma.shadowColor),o}function nv(t,e,n,i,r){var o=ov(e,r.inHover),a=i?null:n&&ov(n,r.inHover)||{};if(o===a)return!1;var s=ev(t,o,a,i,r);if((i||o.fill!==a.fill)&&(s||(rv(t,r),s=!0),jy(o.fill)&&(t.fillStyle=o.fill)),(i||o.stroke!==a.stroke)&&(s||(rv(t,r),s=!0),jy(o.stroke)&&(t.strokeStyle=o.stroke)),(i||o.opacity!==a.opacity)&&(s||(rv(t,r),s=!0),t.globalAlpha=null==o.opacity?1:o.opacity),e.hasStroke()){var l=o.lineWidth/(o.strokeNoScale&&e.getLineScale?e.getLineScale():1);t.lineWidth!==l&&(s||(rv(t,r),s=!0),t.lineWidth=l)}for(var u=0;u<tv.length;u++){var h=tv[u],c=h[0];(i||o[c]!==a[c])&&(s||(rv(t,r),s=!0),t[c]=o[c]||h[1])}return s}function iv(t,e){var n=e.transform,i=t.dpr||1;n?t.setTransform(i*n[0],i*n[1],i*n[2],i*n[3],i*n[4],i*n[5]):t.setTransform(i,0,0,i,0,0)}function rv(t,e){e.batchFill&&t.fill(),e.batchStroke&&t.stroke(),e.batchFill="",e.batchStroke=""}function ov(t,e){return e&&t.__hoverStyle||t.style}function av(t,e){sv(t,e,{inHover:!1,viewWidth:0,viewHeight:0},!0)}function sv(t,e,n,i){var r=e.transform;if(!e.shouldBePainted(n.viewWidth,n.viewHeight,!1,!1))return e.__dirty&=-2,void(e.__isRendered=!1);var o=e.__clipPaths,s=n.prevElClipPaths,l=!1,u=!1;if(s&&!function(t,e){if(t===e||!t&&!e)return!1;if(!t||!e||t.length!==e.length)return!0;for(var n=0;n<t.length;n++)if(t[n]!==e[n])return!0;return!1}(o,s)||(s&&s.length&&(rv(t,n),t.restore(),u=l=!0,n.prevElClipPaths=null,n.allClipped=!1,n.prevEl=null),o&&o.length&&(rv(t,n),t.save(),function(t,e,n){for(var i=!1,r=0;r<t.length;r++){var o=t[r];i=i||o.isZeroArea(),iv(e,o),e.beginPath(),o.buildPath(e,o.shape),e.clip()}n.allClipped=i}(o,t,n),l=!0),n.prevElClipPaths=o),n.allClipped)e.__isRendered=!1;else{e.beforeBrush&&e.beforeBrush(),e.innerBeforeBrush();var h=n.prevEl;h||(u=l=!0);var c,p,d=e instanceof Ms&&e.autoBatch&&function(t){var e=qy(t),n=Zy(t);return!(t.lineDash||!(+e^+n)||e&&"string"!=typeof t.fill||n&&"string"!=typeof t.stroke||t.strokePercent<1||t.strokeOpacity<1||t.fillOpacity<1)}(e.style);l||(c=r,p=h.transform,c&&p?c[0]!==p[0]||c[1]!==p[1]||c[2]!==p[2]||c[3]!==p[3]||c[4]!==p[4]||c[5]!==p[5]:c||p)?(rv(t,n),iv(t,e)):d||rv(t,n);var f=ov(e,n.inHover);e instanceof Ms?(1!==n.lastDrawType&&(u=!0,n.lastDrawType=1),nv(t,e,h,u,n),d&&(n.batchFill||n.batchStroke)||t.beginPath(),function(t,e,n,i){var r,o=Zy(n),a=qy(n),s=n.strokePercent,l=s<1,u=!e.path;e.silent&&!l||!u||e.createPathProxy();var h=e.path||Xy,c=e.__dirty;if(!i){var p=n.fill,d=n.stroke,f=a&&!!p.colorStops,g=o&&!!d.colorStops,y=a&&!!p.image,v=o&&!!d.image,m=void 0,x=void 0,_=void 0,b=void 0,w=void 0;(f||g)&&(w=e.getBoundingRect()),f&&(m=c?Wy(t,p,w):e.__canvasFillGradient,e.__canvasFillGradient=m),g&&(x=c?Wy(t,d,w):e.__canvasStrokeGradient,e.__canvasStrokeGradient=x),y&&(_=c||!e.__canvasFillPattern?Jy(t,p,e):e.__canvasFillPattern,e.__canvasFillPattern=_),v&&(b=c||!e.__canvasStrokePattern?Jy(t,d,e):e.__canvasStrokePattern,e.__canvasStrokePattern=_),f?t.fillStyle=m:y&&(_?t.fillStyle=_:a=!1),g?t.strokeStyle=x:v&&(b?t.strokeStyle=b:o=!1)}var S,M,I=e.getGlobalScale();h.setScale(I[0],I[1],e.segmentIgnoreThreshold),t.setLineDash&&n.lineDash&&(S=(r=Uy(e))[0],M=r[1]);var T=!0;(u||4&c)&&(h.setDPR(t.dpr),l?h.setContext(null):(h.setContext(t),T=!1),h.reset(),e.buildPath(h,e.shape,i),h.toStatic(),e.pathUpdated()),T&&h.rebuildPath(t,l?s:1),S&&(t.setLineDash(S),t.lineDashOffset=M),i||(n.strokeFirst?(o&&$y(t,n),a&&Ky(t,n)):(a&&Ky(t,n),o&&$y(t,n))),S&&t.setLineDash([])}(t,e,f,d),d&&(n.batchFill=f.fill||"",n.batchStroke=f.stroke||"")):e instanceof Ts?(3!==n.lastDrawType&&(u=!0,n.lastDrawType=3),nv(t,e,h,u,n),function(t,e,n){var i,r=n.text;if(null!=r&&(r+=""),r){t.font=n.font||a,t.textAlign=n.textAlign,t.textBaseline=n.textBaseline;var o=void 0,s=void 0;t.setLineDash&&n.lineDash&&(o=(i=Uy(e))[0],s=i[1]),o&&(t.setLineDash(o),t.lineDashOffset=s),n.strokeFirst?(Zy(n)&&t.strokeText(r,n.x,n.y),qy(n)&&t.fillText(r,n.x,n.y)):(qy(n)&&t.fillText(r,n.x,n.y),Zy(n)&&t.strokeText(r,n.x,n.y)),o&&t.setLineDash([])}}(t,e,f)):e instanceof As?(2!==n.lastDrawType&&(u=!0,n.lastDrawType=2),function(t,e,n,i,r){ev(t,ov(e,r.inHover),n&&ov(n,r.inHover),i,r)}(t,e,h,u,n),function(t,e,n){var i=e.__image=na(n.image,e.__image,e,e.onload);if(i&&ra(i)){var r=n.x||0,o=n.y||0,a=e.getWidth(),s=e.getHeight(),l=i.width/i.height;if(null==a&&null!=s?a=s*l:null==s&&null!=a?s=a/l:null==a&&null==s&&(a=i.width,s=i.height),n.sWidth&&n.sHeight){var u=n.sx||0,h=n.sy||0;t.drawImage(i,u,h,n.sWidth,n.sHeight,r,o,a,s)}else if(n.sx&&n.sy){var c=a-(u=n.sx),p=s-(h=n.sy);t.drawImage(i,u,h,c,p,r,o,a,s)}else t.drawImage(i,r,o,a,s)}}(t,e,f)):e.getTemporalDisplayables&&(4!==n.lastDrawType&&(u=!0,n.lastDrawType=4),function(t,e,n){var i=e.getDisplayables(),r=e.getTemporalDisplayables();t.save();var o,a,s={prevElClipPaths:null,prevEl:null,allClipped:!1,viewWidth:n.viewWidth,viewHeight:n.viewHeight,inHover:n.inHover};for(o=e.getCursor(),a=i.length;o<a;o++){(h=i[o]).beforeBrush&&h.beforeBrush(),h.innerBeforeBrush(),sv(t,h,s,o===a-1),h.innerAfterBrush(),h.afterBrush&&h.afterBrush(),s.prevEl=h}for(var l=0,u=r.length;l<u;l++){var h;(h=r[l]).beforeBrush&&h.beforeBrush(),h.innerBeforeBrush(),sv(t,h,s,l===u-1),h.innerAfterBrush(),h.afterBrush&&h.afterBrush(),s.prevEl=h}e.clearTemporalDisplayables(),e.notClear=!0,t.restore()}(t,e,n)),d&&i&&rv(t,n),e.innerAfterBrush(),e.afterBrush&&e.afterBrush(),n.prevEl=e,e.__dirty=0,e.__isRendered=!0}}var lv=new Ay,uv=new Nn(100),hv=["symbol","symbolSize","symbolKeepAspect","color","backgroundColor","dashArrayX","dashArrayY","maxTileWidth","maxTileHeight"];function cv(t,e){if("none"===t)return null;var n=e.getDevicePixelRatio(),i=e.getZr(),r="svg"===i.painter.type;t.dirty&&lv.delete(t);var o=lv.get(t);if(o)return o;var a=k(t,{symbol:"rect",symbolSize:1,symbolKeepAspect:!0,color:"rgba(0, 0, 0, 0.2)",backgroundColor:null,dashArrayX:5,dashArrayY:5,rotation:0,maxTileWidth:512,maxTileHeight:512});"none"===a.backgroundColor&&(a.backgroundColor=null);var s={repeat:"repeat"};return function(t){for(var e,o=[n],s=!0,l=0;l<hv.length;++l){var u=a[hv[l]];if(null!=u&&!Y(u)&&!X(u)&&!j(u)&&"boolean"!=typeof u){s=!1;break}o.push(u)}if(s){e=o.join(",")+(r?"-svg":"");var c=uv.get(e);c&&(r?t.svgElement=c:t.image=c)}var p,d=dv(a.dashArrayX),f=function(t){if(!t||"object"==typeof t&&0===t.length)return[0,0];if(j(t)){var e=Math.ceil(t);return[e,e]}var n=z(t,(function(t){return Math.ceil(t)}));return t.length%2?n.concat(n):n}(a.dashArrayY),g=pv(a.symbol),y=(b=d,z(b,(function(t){return fv(t)}))),v=fv(f),m=!r&&h.createCanvas(),x=r&&{tag:"g",attrs:{},key:"dcl",children:[]},_=function(){for(var t=1,e=0,n=y.length;e<n;++e)t=fo(t,y[e]);var i=1;for(e=0,n=g.length;e<n;++e)i=fo(i,g[e].length);t*=i;var r=v*y.length*g.length;return{width:Math.max(1,Math.min(t,a.maxTileWidth)),height:Math.max(1,Math.min(r,a.maxTileHeight))}}();var b;m&&(m.width=_.width*n,m.height=_.height*n,p=m.getContext("2d"));(function(){p&&(p.clearRect(0,0,m.width,m.height),a.backgroundColor&&(p.fillStyle=a.backgroundColor,p.fillRect(0,0,m.width,m.height)));for(var t=0,e=0;e<f.length;++e)t+=f[e];if(t<=0)return;var o=-v,s=0,l=0,u=0;for(;o<_.height;){if(s%2==0){for(var h=l/2%g.length,c=0,y=0,b=0;c<2*_.width;){var w=0;for(e=0;e<d[u].length;++e)w+=d[u][e];if(w<=0)break;if(y%2==0){var S=.5*(1-a.symbolSize),M=c+d[u][y]*S,I=o+f[s]*S,T=d[u][y]*a.symbolSize,C=f[s]*a.symbolSize,D=b/2%g[h].length;A(M,I,T,C,g[h][D])}c+=d[u][y],++b,++y===d[u].length&&(y=0)}++u===d.length&&(u=0)}o+=f[s],++l,++s===f.length&&(s=0)}function A(t,e,o,s,l){var u=r?1:n,h=Vy(l,t*u,e*u,o*u,s*u,a.color,a.symbolKeepAspect);if(r){var c=i.painter.renderOneToVNode(h);c&&x.children.push(c)}else av(p,h)}})(),s&&uv.put(e,m||x);t.image=m,t.svgElement=x,t.svgWidth=_.width,t.svgHeight=_.height}(s),s.rotation=a.rotation,s.scaleX=s.scaleY=r?1:1/n,lv.set(t,s),t.dirty=!1,s}function pv(t){if(!t||0===t.length)return[["rect"]];if(X(t))return[[t]];for(var e=!0,n=0;n<t.length;++n)if(!X(t[n])){e=!1;break}if(e)return pv([t]);var i=[];for(n=0;n<t.length;++n)X(t[n])?i.push([t[n]]):i.push(t[n]);return i}function dv(t){if(!t||0===t.length)return[[0,0]];if(j(t))return[[r=Math.ceil(t),r]];for(var e=!0,n=0;n<t.length;++n)if(!j(t[n])){e=!1;break}if(e)return dv([t]);var i=[];for(n=0;n<t.length;++n)if(j(t[n])){var r=Math.ceil(t[n]);i.push([r,r])}else{(r=z(t[n],(function(t){return Math.ceil(t)}))).length%2==1?i.push(r.concat(r)):i.push(r)}return i}function fv(t){for(var e=0,n=0;n<t.length;++n)e+=t[n];return t.length%2==1?2*e:e}var gv=new jt,yv={};function vv(t){return yv[t]}var mv=2e3,xv=4500,_v={PROCESSOR:{FILTER:1e3,SERIES_FILTER:800,STATISTIC:5e3},VISUAL:{LAYOUT:1e3,PROGRESSIVE_LAYOUT:1100,GLOBAL:mv,CHART:3e3,POST_CHART_LAYOUT:4600,COMPONENT:4e3,BRUSH:5e3,CHART_ITEM:xv,ARIA:6e3,DECAL:7e3}},bv=/^[a-zA-Z0-9_]+$/,wv="__connectUpdateStatus";function Sv(t){return function(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];if(!this.isDisposed())return Iv(this,t,e);qv(this.id)}}function Mv(t){return function(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];return Iv(this,t,e)}}function Iv(t,e,n){return n[0]=n[0]&&n[0].toLowerCase(),jt.prototype[e].apply(t,n)}var Tv,Cv,Dv,Av,kv,Lv,Pv,Ov,Rv,Nv,Ev,zv,Vv,Bv,Fv,Gv,Wv,Hv,Yv=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e}(jt),Uv=Yv.prototype;Uv.on=Mv("on"),Uv.off=Mv("off");var Xv=function(t){function e(e,n,i){var r=t.call(this,new yy)||this;r._chartsViews=[],r._chartsMap={},r._componentsViews=[],r._componentsMap={},r._pendingActions=[],i=i||{},X(n)&&(n=em[n]),r._dom=e;var o="canvas",a="auto",s=!1,l=r._zr=Fr(e,{renderer:i.renderer||o,devicePixelRatio:i.devicePixelRatio,width:i.width,height:i.height,ssr:i.ssr,useDirtyRect:rt(i.useDirtyRect,s),useCoarsePointer:rt(i.useCoarsePointer,a),pointerSize:i.pointerSize});r._ssr=i.ssr,r._throttledZrFlush=Ng(W(l.flush,l),17),(n=T(n))&&Fd(n,!0),r._theme=n,r._locale=function(t){if(X(t)){var e=kc[t.toUpperCase()]||{};return t===Cc||t===Dc?T(e):C(T(e),T(kc.EN),!1)}return C(T(t),T(kc.EN),!1)}(i.locale||Pc),r._coordSysMgr=new vd;var u=r._api=Fv(r);function h(t,e){return t.__prio-e.__prio}return Je(tm,h),Je(Jv,h),r._scheduler=new jg(r,u,Jv,tm),r._messageCenter=new Yv,r._initEvents(),r.resize=W(r.resize,r),l.animation.on("frame",r._onframe,r),Nv(l,r),Ev(l,r),ct(r),r}return n(e,t),e.prototype._onframe=function(){if(!this._disposed){Hv(this);var t=this._scheduler;if(this.__pendingUpdate){var e=this.__pendingUpdate.silent;this.__flagInMainProcess=!0;try{Tv(this),Av.update.call(this,null,this.__pendingUpdate.updateParams)}catch(t){throw this.__flagInMainProcess=!1,this.__pendingUpdate=null,t}this._zr.flush(),this.__flagInMainProcess=!1,this.__pendingUpdate=null,Ov.call(this,e),Rv.call(this,e)}else if(t.unfinished){var n=1,i=this._model,r=this._api;t.unfinished=!1;do{var o=+new Date;t.performSeriesTasks(i),t.performDataProcessorTasks(i),Lv(this,i),t.performVisualTasks(i),Bv(this,this._model,r,"remain",{}),n-=+new Date-o}while(n>0&&t.unfinished);t.unfinished||this._zr.flush()}}},e.prototype.getDom=function(){return this._dom},e.prototype.getId=function(){return this.id},e.prototype.getZr=function(){return this._zr},e.prototype.isSSR=function(){return this._ssr},e.prototype.setOption=function(t,e,n){if(!this.__flagInMainProcess)if(this._disposed)qv(this.id);else{var i,r,o;if(q(e)&&(n=e.lazyUpdate,i=e.silent,r=e.replaceMerge,o=e.transition,e=e.notMerge),this.__flagInMainProcess=!0,!this._model||e){var a=new xd(this._api),s=this._theme,l=this._model=new hd;l.scheduler=this._scheduler,l.ssr=this._ssr,l.init(null,null,null,s,this._locale,a)}this._model.setOption(t,{replaceMerge:r},Qv);var u={seriesTransition:o,optionChanged:!0};if(n)this.__pendingUpdate={silent:i,updateParams:u},this.__flagInMainProcess=!1,this.getZr().wakeUp();else{try{Tv(this),Av.update.call(this,null,u)}catch(t){throw this.__pendingUpdate=null,this.__flagInMainProcess=!1,t}this._ssr||this._zr.flush(),this.__pendingUpdate=null,this.__flagInMainProcess=!1,Ov.call(this,i),Rv.call(this,i)}}},e.prototype.setTheme=function(){go()},e.prototype.getModel=function(){return this._model},e.prototype.getOption=function(){return this._model&&this._model.getOption()},e.prototype.getWidth=function(){return this._zr.getWidth()},e.prototype.getHeight=function(){return this._zr.getHeight()},e.prototype.getDevicePixelRatio=function(){return this._zr.painter.dpr||r.hasGlobalWindow&&window.devicePixelRatio||1},e.prototype.getRenderedCanvas=function(t){return this.renderToCanvas(t)},e.prototype.renderToCanvas=function(t){t=t||{};var e=this._zr.painter;return e.getRenderedCanvas({backgroundColor:t.backgroundColor||this._model.get("backgroundColor"),pixelRatio:t.pixelRatio||this.getDevicePixelRatio()})},e.prototype.renderToSVGString=function(t){t=t||{};var e=this._zr.painter;return e.renderToString({useViewBox:t.useViewBox})},e.prototype.getSvgDataURL=function(){if(r.svgSupported){var t=this._zr;return E(t.storage.getDisplayList(),(function(t){t.stopAnimation(null,!0)})),t.painter.toDataURL()}},e.prototype.getDataURL=function(t){if(!this._disposed){var e=(t=t||{}).excludeComponents,n=this._model,i=[],r=this;E(e,(function(t){n.eachComponent({mainType:t},(function(t){var e=r._componentsMap[t.__viewId];e.group.ignore||(i.push(e),e.group.ignore=!0)}))}));var o="svg"===this._zr.painter.getType()?this.getSvgDataURL():this.renderToCanvas(t).toDataURL("image/"+(t&&t.type||"png"));return E(i,(function(t){t.group.ignore=!1})),o}qv(this.id)},e.prototype.getConnectedDataURL=function(t){if(!this._disposed){var e="svg"===t.type,n=this.group,i=Math.min,r=Math.max,o=1/0;if(rm[n]){var a=o,s=o,l=-1/0,u=-1/0,c=[],p=t&&t.pixelRatio||this.getDevicePixelRatio();E(im,(function(o,h){if(o.group===n){var p=e?o.getZr().painter.getSvgDom().innerHTML:o.renderToCanvas(T(t)),d=o.getDom().getBoundingClientRect();a=i(d.left,a),s=i(d.top,s),l=r(d.right,l),u=r(d.bottom,u),c.push({dom:p,left:d.left,top:d.top})}}));var d=(l*=p)-(a*=p),f=(u*=p)-(s*=p),g=h.createCanvas(),y=Fr(g,{renderer:e?"svg":"canvas"});if(y.resize({width:d,height:f}),e){var v="";return E(c,(function(t){var e=t.left-a,n=t.top-s;v+='<g transform="translate('+e+","+n+')">'+t.dom+"</g>"})),y.painter.getSvgRoot().innerHTML=v,t.connectedBackgroundColor&&y.painter.setBackgroundColor(t.connectedBackgroundColor),y.refreshImmediately(),y.painter.toDataURL()}return t.connectedBackgroundColor&&y.add(new Es({shape:{x:0,y:0,width:d,height:f},style:{fill:t.connectedBackgroundColor}})),E(c,(function(t){var e=new As({style:{x:t.left*p-a,y:t.top*p-s,image:t.dom}});y.add(e)})),y.refreshImmediately(),g.toDataURL("image/"+(t&&t.type||"png"))}return this.getDataURL(t)}qv(this.id)},e.prototype.convertToPixel=function(t,e){return kv(this,"convertToPixel",t,e)},e.prototype.convertFromPixel=function(t,e){return kv(this,"convertFromPixel",t,e)},e.prototype.containPixel=function(t,e){var n;if(!this._disposed)return E(Ro(this._model,t),(function(t,i){i.indexOf("Models")>=0&&E(t,(function(t){var r=t.coordinateSystem;if(r&&r.containPoint)n=n||!!r.containPoint(e);else if("seriesModels"===i){var o=this._chartsMap[t.__viewId];o&&o.containPoint&&(n=n||o.containPoint(e,t))}else 0}),this)}),this),!!n;qv(this.id)},e.prototype.getVisual=function(t,e){var n=Ro(this._model,t,{defaultMainType:"series"}),i=n.seriesModel;var r=i.getData(),o=n.hasOwnProperty("dataIndexInside")?n.dataIndexInside:n.hasOwnProperty("dataIndex")?r.indexOfRawIndex(n.dataIndex):null;return null!=o?by(r,o,e):wy(r,e)},e.prototype.getViewOfComponentModel=function(t){return this._componentsMap[t.__viewId]},e.prototype.getViewOfSeriesModel=function(t){return this._chartsMap[t.__viewId]},e.prototype._initEvents=function(){var t,e,n,i=this;E(jv,(function(t){var e=function(e){var n,r=i.getModel(),o=e.target,a="globalout"===t;if(a?n={}:o&&Ty(o,(function(t){var e=Js(t);if(e&&null!=e.dataIndex){var i=e.dataModel||r.getSeriesByIndex(e.seriesIndex);return n=i&&i.getDataParams(e.dataIndex,e.dataType)||{},!0}if(e.eventData)return n=A({},e.eventData),!0}),!0),n){var s=n.componentType,l=n.componentIndex;"markLine"!==s&&"markPoint"!==s&&"markArea"!==s||(s="series",l=n.seriesIndex);var u=s&&null!=l&&r.getComponent(s,l),h=u&&i["series"===u.mainType?"_chartsMap":"_componentsMap"][u.__viewId];0,n.event=e,n.type=t,i._$eventProcessor.eventInfo={targetEl:o,packedEvent:n,model:u,view:h},i.trigger(t,n)}};e.zrEventfulCallAtLast=!0,i._zr.on(t,e,i)})),E($v,(function(t,e){i._messageCenter.on(e,(function(t){this.trigger(e,t)}),i)})),E(["selectchanged"],(function(t){i._messageCenter.on(t,(function(e){this.trigger(t,e)}),i)})),t=this._messageCenter,e=this,n=this._api,t.on("selectchanged",(function(t){var i=n.getModel();t.isFromClick?(Iy("map","selectchanged",e,i,t),Iy("pie","selectchanged",e,i,t)):"select"===t.fromAction?(Iy("map","selected",e,i,t),Iy("pie","selected",e,i,t)):"unselect"===t.fromAction&&(Iy("map","unselected",e,i,t),Iy("pie","unselected",e,i,t))}))},e.prototype.isDisposed=function(){return this._disposed},e.prototype.clear=function(){this._disposed?qv(this.id):this.setOption({series:[]},!0)},e.prototype.dispose=function(){if(this._disposed)qv(this.id);else{this._disposed=!0,this.getDom()&&Bo(this.getDom(),sm,"");var t=this,e=t._api,n=t._model;E(t._componentsViews,(function(t){t.dispose(n,e)})),E(t._chartsViews,(function(t){t.dispose(n,e)})),t._zr.dispose(),t._dom=t._model=t._chartsMap=t._componentsMap=t._chartsViews=t._componentsViews=t._scheduler=t._api=t._zr=t._throttledZrFlush=t._theme=t._coordSysMgr=t._messageCenter=null,delete im[t.id]}},e.prototype.resize=function(t){if(!this.__flagInMainProcess)if(this._disposed)qv(this.id);else{this._zr.resize(t);var e=this._model;if(this._loadingFX&&this._loadingFX.resize(),e){var n=e.resetOption("media"),i=t&&t.silent;this.__pendingUpdate&&(null==i&&(i=this.__pendingUpdate.silent),n=!0,this.__pendingUpdate=null),this.__flagInMainProcess=!0;try{n&&Tv(this),Av.update.call(this,{type:"resize",animation:A({duration:0},t&&t.animation)})}catch(t){throw this.__flagInMainProcess=!1,t}this.__flagInMainProcess=!1,Ov.call(this,i),Rv.call(this,i)}}},e.prototype.showLoading=function(t,e){if(this._disposed)qv(this.id);else if(q(t)&&(e=t,t=""),t=t||"default",this.hideLoading(),nm[t]){var n=nm[t](this._api,e),i=this._zr;this._loadingFX=n,i.add(n)}},e.prototype.hideLoading=function(){this._disposed?qv(this.id):(this._loadingFX&&this._zr.remove(this._loadingFX),this._loadingFX=null)},e.prototype.makeActionFromEvent=function(t){var e=A({},t);return e.type=$v[t.type],e},e.prototype.dispatchAction=function(t,e){if(this._disposed)qv(this.id);else if(q(e)||(e={silent:!!e}),Kv[t.type]&&this._model)if(this.__flagInMainProcess)this._pendingActions.push(t);else{var n=e.silent;Pv.call(this,t,n);var i=e.flush;i?this._zr.flush():!1!==i&&r.browser.weChat&&this._throttledZrFlush(),Ov.call(this,n),Rv.call(this,n)}},e.prototype.updateLabelLayout=function(){gv.trigger("series:layoutlabels",this._model,this._api,{updatedSeries:[]})},e.prototype.appendData=function(t){if(this._disposed)qv(this.id);else{var e=t.seriesIndex,n=this.getModel().getSeriesByIndex(e);0,n.appendData(t),this._scheduler.unfinished=!0,this.getZr().wakeUp()}},e.internalField=function(){function t(t){t.clearColorPalette(),t.eachSeries((function(t){t.clearColorPalette()}))}function e(t){for(var e=[],n=t.currentStates,i=0;i<n.length;i++){var r=n[i];"emphasis"!==r&&"blur"!==r&&"select"!==r&&e.push(r)}t.selected&&t.states.select&&e.push("select"),2===t.hoverState&&t.states.emphasis?e.push("emphasis"):1===t.hoverState&&t.states.blur&&e.push("blur"),t.useStates(e)}function i(t,e){if(!t.preventAutoZ){var n=t.get("z")||0,i=t.get("zlevel")||0;e.eachRendered((function(t){return o(t,n,i,-1/0),!0}))}}function o(t,e,n,i){var r=t.getTextContent(),a=t.getTextGuideLine();if(t.isGroup)for(var s=t.childrenRef(),l=0;l<s.length;l++)i=Math.max(o(s[l],e,n,i),i);else t.z=e,t.zlevel=n,i=Math.max(t.z2,i);if(r&&(r.z=e,r.zlevel=n,isFinite(i)&&(r.z2=i+2)),a){var u=t.textGuideLineConfig;a.z=e,a.zlevel=n,isFinite(i)&&(a.z2=i+(u&&u.showAbove?1:-1))}return i}function a(t,e){e.eachRendered((function(t){if(!gh(t)){var e=t.getTextContent(),n=t.getTextGuideLine();t.stateTransition&&(t.stateTransition=null),e&&e.stateTransition&&(e.stateTransition=null),n&&n.stateTransition&&(n.stateTransition=null),t.hasState()?(t.prevStates=t.currentStates,t.clearStates()):t.prevStates&&(t.prevStates=null)}}))}function s(t,n){var i=t.getModel("stateAnimation"),r=t.isAnimationEnabled(),o=i.get("duration"),a=o>0?{duration:o,delay:i.get("delay"),easing:i.get("easing")}:null;n.eachRendered((function(t){if(t.states&&t.states.emphasis){if(gh(t))return;if(t instanceof Ms&&function(t){var e=nl(t);e.normalFill=t.style.fill,e.normalStroke=t.style.stroke;var n=t.states.select||{};e.selectFill=n.style&&n.style.fill||null,e.selectStroke=n.style&&n.style.stroke||null}(t),t.__dirty){var n=t.prevStates;n&&t.useStates(n)}if(r){t.stateTransition=a;var i=t.getTextContent(),o=t.getTextGuideLine();i&&(i.stateTransition=a),o&&(o.stateTransition=a)}t.__dirty&&e(t)}}))}Tv=function(t){var e=t._scheduler;e.restorePipelines(t._model),e.prepareStageTasks(),Cv(t,!0),Cv(t,!1),e.plan()},Cv=function(t,e){for(var n=t._model,i=t._scheduler,r=e?t._componentsViews:t._chartsViews,o=e?t._componentsMap:t._chartsMap,a=t._zr,s=t._api,l=0;l<r.length;l++)r[l].__alive=!1;function u(t){var l=t.__requireNewView;t.__requireNewView=!1;var u="_ec_"+t.id+"_"+t.type,h=!l&&o[u];if(!h){var c=Yo(t.type),p=e?wg.getClass(c.main,c.sub):Tg.getClass(c.sub);0,(h=new p).init(n,s),o[u]=h,r.push(h),a.add(h.group)}t.__viewId=h.__id=u,h.__alive=!0,h.__model=t,h.group.__ecComponentInfo={mainType:t.mainType,index:t.componentIndex},!e&&i.prepareView(h,t,n,s)}e?n.eachComponent((function(t,e){"series"!==t&&u(e)})):n.eachSeries(u);for(l=0;l<r.length;){var h=r[l];h.__alive?l++:(!e&&h.renderTask.dispose(),a.remove(h.group),h.dispose(n,s),r.splice(l,1),o[h.__id]===h&&delete o[h.__id],h.__id=h.group.__ecComponentInfo=null)}},Dv=function(t,e,n,i,r){var o=t._model;if(o.setUpdatePayload(n),i){var a={};a[i+"Id"]=n[i+"Id"],a[i+"Index"]=n[i+"Index"],a[i+"Name"]=n[i+"Name"];var s={mainType:i,query:a};r&&(s.subType=r);var l,u=n.excludeSeriesId;null!=u&&(l=yt(),E(_o(u),(function(t){var e=Do(t,null);null!=e&&l.set(e,!0)}))),o&&o.eachComponent(s,(function(e){if(!(l&&null!=l.get(e.id)))if($l(n))if(e instanceof fg)n.type!==sl||n.notBlur||e.get(["emphasis","disabled"])||function(t,e,n){var i=t.seriesIndex,r=t.getData(e.dataType);if(r){var o=Lo(r,e);o=(Y(o)?o[0]:o)||0;var a=r.getItemGraphicEl(o);if(!a)for(var s=r.count(),l=0;!a&&l<s;)a=r.getItemGraphicEl(l++);if(a){var u=Js(a);zl(i,u.focus,u.blurScope,n)}else{var h=t.get(["emphasis","focus"]),c=t.get(["emphasis","blurScope"]);null!=h&&zl(i,h,c,n)}}}(e,n,t._api);else{var i=Bl(e.mainType,e.componentIndex,n.name,t._api),r=i.focusSelf,o=i.dispatchers;n.type===sl&&r&&!n.notBlur&&Vl(e.mainType,e.componentIndex,t._api),o&&E(o,(function(t){n.type===sl?Al(t):kl(t)}))}else Kl(n)&&e instanceof fg&&(!function(t,e,n){if(Kl(e)){var i=e.dataType,r=Lo(t.getData(i),e);Y(r)||(r=[r]),t[e.type===cl?"toggleSelect":e.type===ul?"select":"unselect"](r,i)}}(e,n,t._api),Fl(e),Wv(t))}),t),o&&o.eachComponent(s,(function(e){l&&null!=l.get(e.id)||h(t["series"===i?"_chartsMap":"_componentsMap"][e.__viewId])}),t)}else E([].concat(t._componentsViews).concat(t._chartsViews),h);function h(i){i&&i.__alive&&i[e]&&i[e](i.__model,o,t._api,n)}},Av={prepareAndUpdate:function(t){Tv(this),Av.update.call(this,t,{optionChanged:null!=t.newOption})},update:function(e,n){var i=this._model,r=this._api,o=this._zr,a=this._coordSysMgr,s=this._scheduler;if(i){i.setUpdatePayload(e),s.restoreData(i,e),s.performSeriesTasks(i),a.create(i,r),s.performDataProcessorTasks(i,e),Lv(this,i),a.update(i,r),t(i),s.performVisualTasks(i,e),zv(this,i,r,e,n);var l=i.get("backgroundColor")||"transparent",u=i.get("darkMode");o.setBackgroundColor(l),null!=u&&"auto"!==u&&o.setDarkMode(u),gv.trigger("afterupdate",i,r)}},updateTransform:function(e){var n=this,i=this._model,r=this._api;if(i){i.setUpdatePayload(e);var o=[];i.eachComponent((function(t,a){if("series"!==t){var s=n.getViewOfComponentModel(a);if(s&&s.__alive)if(s.updateTransform){var l=s.updateTransform(a,i,r,e);l&&l.update&&o.push(s)}else o.push(s)}}));var a=yt();i.eachSeries((function(t){var o=n._chartsMap[t.__viewId];if(o.updateTransform){var s=o.updateTransform(t,i,r,e);s&&s.update&&a.set(t.uid,1)}else a.set(t.uid,1)})),t(i),this._scheduler.performVisualTasks(i,e,{setDirty:!0,dirtyMap:a}),Bv(this,i,r,e,{},a),gv.trigger("afterupdate",i,r)}},updateView:function(e){var n=this._model;n&&(n.setUpdatePayload(e),Tg.markUpdateMethod(e,"updateView"),t(n),this._scheduler.performVisualTasks(n,e,{setDirty:!0}),zv(this,n,this._api,e,{}),gv.trigger("afterupdate",n,this._api))},updateVisual:function(e){var n=this,i=this._model;i&&(i.setUpdatePayload(e),i.eachSeries((function(t){t.getData().clearAllVisual()})),Tg.markUpdateMethod(e,"updateVisual"),t(i),this._scheduler.performVisualTasks(i,e,{visualType:"visual",setDirty:!0}),i.eachComponent((function(t,r){if("series"!==t){var o=n.getViewOfComponentModel(r);o&&o.__alive&&o.updateVisual(r,i,n._api,e)}})),i.eachSeries((function(t){n._chartsMap[t.__viewId].updateVisual(t,i,n._api,e)})),gv.trigger("afterupdate",i,this._api))},updateLayout:function(t){Av.update.call(this,t)}},kv=function(t,e,n,i){if(t._disposed)qv(t.id);else{for(var r,o=t._model,a=t._coordSysMgr.getCoordinateSystems(),s=Ro(o,n),l=0;l<a.length;l++){var u=a[l];if(u[e]&&null!=(r=u[e](o,s,i)))return r}0}},Lv=function(t,e){var n=t._chartsMap,i=t._scheduler;e.eachSeries((function(t){i.updateStreamModes(t,n[t.__viewId])}))},Pv=function(t,e){var n=this,i=this.getModel(),r=t.type,o=t.escapeConnect,a=Kv[r],s=a.actionInfo,l=(s.update||"update").split(":"),u=l.pop(),h=null!=l[0]&&Yo(l[0]);this.__flagInMainProcess=!0;var c=[t],p=!1;t.batch&&(p=!0,c=z(t.batch,(function(e){return(e=k(A({},e),t)).batch=null,e})));var d,f=[],g=Kl(t),y=$l(t);if(y&&El(this._api),E(c,(function(e){if((d=(d=a.action(e,n._model,n._api))||A({},e)).type=s.event||d.type,f.push(d),y){var i=No(t),r=i.queryOptionMap,o=i.mainTypeSpecified?r.keys()[0]:"series";Dv(n,u,e,o),Wv(n)}else g?(Dv(n,u,e,"series"),Wv(n)):h&&Dv(n,u,e,h.main,h.sub)})),"none"!==u&&!y&&!g&&!h)try{this.__pendingUpdate?(Tv(this),Av.update.call(this,t),this.__pendingUpdate=null):Av[u].call(this,t)}catch(t){throw this.__flagInMainProcess=!1,t}if(d=p?{type:s.event||r,escapeConnect:o,batch:f}:f[0],this.__flagInMainProcess=!1,!e){var v=this._messageCenter;if(v.trigger(d.type,d),g){var m={type:"selectchanged",escapeConnect:o,selected:Gl(i),isFromClick:t.isFromClick||!1,fromAction:t.type,fromActionPayload:t};v.trigger(m.type,m)}}},Ov=function(t){for(var e=this._pendingActions;e.length;){var n=e.shift();Pv.call(this,n,t)}},Rv=function(t){!t&&this.trigger("updated")},Nv=function(t,e){t.on("rendered",(function(n){e.trigger("rendered",n),!t.animation.isFinished()||e.__pendingUpdate||e._scheduler.unfinished||e._pendingActions.length||e.trigger("finished")}))},Ev=function(t,e){t.on("mouseover",(function(t){var n=Ty(t.target,ql);n&&(!function(t,e,n){var i=Js(t),r=Bl(i.componentMainType,i.componentIndex,i.componentHighDownName,n),o=r.dispatchers,a=r.focusSelf;o?(a&&Vl(i.componentMainType,i.componentIndex,n),E(o,(function(t){return Cl(t,e)}))):(zl(i.seriesIndex,i.focus,i.blurScope,n),"self"===i.focus&&Vl(i.componentMainType,i.componentIndex,n),Cl(t,e))}(n,t,e._api),Wv(e))})).on("mouseout",(function(t){var n=Ty(t.target,ql);n&&(!function(t,e,n){El(n);var i=Js(t),r=Bl(i.componentMainType,i.componentIndex,i.componentHighDownName,n).dispatchers;r?E(r,(function(t){return Dl(t,e)})):Dl(t,e)}(n,t,e._api),Wv(e))})).on("click",(function(t){var n=Ty(t.target,(function(t){return null!=Js(t).dataIndex}),!0);if(n){var i=n.selected?"unselect":"select",r=Js(n);e._api.dispatchAction({type:i,dataType:r.dataType,dataIndexInside:r.dataIndex,seriesIndex:r.seriesIndex,isFromClick:!0})}}))},zv=function(t,e,n,i,r){!function(t){var e=[],n=[],i=!1;if(t.eachComponent((function(t,r){var o=r.get("zlevel")||0,a=r.get("z")||0,s=r.getZLevelKey();i=i||!!s,("series"===t?n:e).push({zlevel:o,z:a,idx:r.componentIndex,type:t,key:s})})),i){var r,o,a=e.concat(n);Je(a,(function(t,e){return t.zlevel===e.zlevel?t.z-e.z:t.zlevel-e.zlevel})),E(a,(function(e){var n=t.getComponent(e.type,e.idx),i=e.zlevel,a=e.key;null!=r&&(i=Math.max(r,i)),a?(i===r&&a!==o&&i++,o=a):o&&(i===r&&i++,o=""),r=i,n.setZLevel(i)}))}}(e),Vv(t,e,n,i,r),E(t._chartsViews,(function(t){t.__alive=!1})),Bv(t,e,n,i,r),E(t._chartsViews,(function(t){t.__alive||t.remove(e,n)}))},Vv=function(t,e,n,r,o,l){E(l||t._componentsViews,(function(t){var o=t.__model;a(o,t),t.render(o,e,n,r),i(o,t),s(o,t)}))},Bv=function(t,e,n,o,l,u){var h=t._scheduler;l=A(l||{},{updatedSeries:e.getSeries()}),gv.trigger("series:beforeupdate",e,n,l);var c=!1;e.eachSeries((function(e){var n=t._chartsMap[e.__viewId];n.__alive=!0;var i=n.renderTask;h.updatePayload(i,o),a(e,n),u&&u.get(e.uid)&&i.dirty(),i.perform(h.getPerformArgs(i))&&(c=!0),n.group.silent=!!e.get("silent"),function(t,e){var n=t.get("blendMode")||null;e.eachRendered((function(t){t.isGroup||(t.style.blend=n)}))}(e,n),Fl(e)})),h.unfinished=c||h.unfinished,gv.trigger("series:layoutlabels",e,n,l),gv.trigger("series:transition",e,n,l),e.eachSeries((function(e){var n=t._chartsMap[e.__viewId];i(e,n),s(e,n)})),function(t,e){var n=t._zr.storage,i=0;n.traverse((function(t){t.isGroup||i++})),i>e.get("hoverLayerThreshold")&&!r.node&&!r.worker&&e.eachSeries((function(e){if(!e.preventUsingHoverLayer){var n=t._chartsMap[e.__viewId];n.__alive&&n.eachRendered((function(t){t.states.emphasis&&(t.states.emphasis.hoverLayer=!0)}))}}))}(t,e),gv.trigger("series:afterupdate",e,n,l)},Wv=function(t){t.__needsUpdateStatus=!0,t.getZr().wakeUp()},Hv=function(t){t.__needsUpdateStatus&&(t.getZr().storage.traverse((function(t){gh(t)||e(t)})),t.__needsUpdateStatus=!1)},Fv=function(t){return new(function(e){function i(){return null!==e&&e.apply(this,arguments)||this}return n(i,e),i.prototype.getCoordinateSystems=function(){return t._coordSysMgr.getCoordinateSystems()},i.prototype.getComponentByElement=function(e){for(;e;){var n=e.__ecComponentInfo;if(null!=n)return t._model.getComponent(n.mainType,n.index);e=e.parent}},i.prototype.enterEmphasis=function(e,n){Al(e,n),Wv(t)},i.prototype.leaveEmphasis=function(e,n){kl(e,n),Wv(t)},i.prototype.enterBlur=function(e){Ll(e),Wv(t)},i.prototype.leaveBlur=function(e){Pl(e),Wv(t)},i.prototype.enterSelect=function(e){Ol(e),Wv(t)},i.prototype.leaveSelect=function(e){Rl(e),Wv(t)},i.prototype.getModel=function(){return t.getModel()},i.prototype.getViewOfComponentModel=function(e){return t.getViewOfComponentModel(e)},i.prototype.getViewOfSeriesModel=function(e){return t.getViewOfSeriesModel(e)},i}(gd))(t)},Gv=function(t){function e(t,e){for(var n=0;n<t.length;n++){t[n][wv]=e}}E($v,(function(n,i){t._messageCenter.on(i,(function(n){if(rm[t.group]&&0!==t[wv]){if(n&&n.escapeConnect)return;var i=t.makeActionFromEvent(n),r=[];E(im,(function(e){e!==t&&e.group===t.group&&r.push(e)})),e(r,0),E(r,(function(t){1!==t[wv]&&t.dispatchAction(i)})),e(r,2)}}))}))}}(),e}(jt),Zv=Xv.prototype;Zv.on=Sv("on"),Zv.off=Sv("off"),Zv.one=function(t,e,n){var i=this;go(),this.on.call(this,t,(function n(){for(var r=[],o=0;o<arguments.length;o++)r[o]=arguments[o];e&&e.apply&&e.apply(this,r),i.off(t,n)}),n)};var jv=["click","dblclick","mouseover","mouseout","mousemove","mousedown","mouseup","globalout","contextmenu"];function qv(t){0}var Kv={},$v={},Jv=[],Qv=[],tm=[],em={},nm={},im={},rm={},om=+new Date-0,am=+new Date-0,sm="_echarts_instance_";function lm(t){rm[t]=!1}var um=lm;function hm(t){return im[function(t,e){return t.getAttribute?t.getAttribute(e):t[e]}(t,sm)]}function cm(t,e){em[t]=e}function pm(t){P(Qv,t)<0&&Qv.push(t)}function dm(t,e){wm(Jv,t,e,2e3)}function fm(t){ym("afterinit",t)}function gm(t){ym("afterupdate",t)}function ym(t,e){gv.on(t,e)}function vm(t,e,n){U(e)&&(n=e,e="");var i=q(t)?t.type:[t,t={event:e}][0];t.event=(t.event||i).toLowerCase(),e=t.event,$v[e]||(lt(bv.test(i)&&bv.test(e)),Kv[i]||(Kv[i]={action:n,actionInfo:t}),$v[e]=i)}function mm(t,e){vd.register(t,e)}function xm(t,e){wm(tm,t,e,1e3,"layout")}function _m(t,e){wm(tm,t,e,3e3,"visual")}var bm=[];function wm(t,e,n,i,r){if((U(e)||q(e))&&(n=e,e=i),!(P(bm,n)>=0)){bm.push(n);var o=jg.wrapStageHandler(n,r);o.__prio=e,o.__raw=n,t.push(o)}}function Sm(t,e){nm[t]=e}function Mm(t,e,n){var i=vv("registerMap");i&&i(t,e,n)}var Im=function(t){var e=(t=T(t)).type,n="";e||yo(n);var i=e.split(":");2!==i.length&&yo(n);var r=!1;"echarts"===i[0]&&(e=i[1],r=!0),t.__isBuiltIn=r,Of.set(e,t)};_m(mv,Hg),_m(xv,Ug),_m(xv,Xg),_m(mv,xy),_m(xv,_y),_m(7e3,(function(t,e){t.eachRawSeries((function(n){if(!t.isSeriesFiltered(n)){var i=n.getData();i.hasItemVisual()&&i.each((function(t){var n=i.getItemVisual(t,"decal");n&&(i.ensureUniqueItemVisual(t,"style").decal=cv(n,e))}));var r=i.getVisual("decal");if(r)i.getVisual("style").decal=cv(r,e)}}))})),pm(Fd),dm(900,(function(t){var e=yt();t.eachSeries((function(t){var n=t.get("stack");if(n){var i=e.get(n)||e.set(n,[]),r=t.getData(),o={stackResultDimension:r.getCalculationInfo("stackResultDimension"),stackedOverDimension:r.getCalculationInfo("stackedOverDimension"),stackedDimension:r.getCalculationInfo("stackedDimension"),stackedByDimension:r.getCalculationInfo("stackedByDimension"),isStackedByIndex:r.getCalculationInfo("isStackedByIndex"),data:r,seriesModel:t};if(!o.stackedDimension||!o.isStackedByIndex&&!o.stackedByDimension)return;i.length&&r.setCalculationInfo("stackedOnSeries",i[i.length-1].seriesModel),i.push(o)}})),e.each(Gd)})),Sm("default",(function(t,e){k(e=e||{},{text:"loading",textColor:"#000",fontSize:12,fontWeight:"normal",fontStyle:"normal",fontFamily:"sans-serif",maskColor:"rgba(255, 255, 255, 0.8)",showSpinner:!0,color:"#5470c6",spinnerRadius:10,lineWidth:5,zlevel:0});var n=new Er,i=new Es({style:{fill:e.maskColor},zlevel:e.zlevel,z:1e4});n.add(i);var r,o=new Bs({style:{text:e.text,fill:e.textColor,fontSize:e.fontSize,fontWeight:e.fontWeight,fontStyle:e.fontStyle,fontFamily:e.fontFamily},zlevel:e.zlevel,z:10001}),a=new Es({style:{fill:"none"},textContent:o,textConfig:{position:"right",distance:10},zlevel:e.zlevel,z:10001});return n.add(a),e.showSpinner&&((r=new Ju({shape:{startAngle:-Zg/2,endAngle:-Zg/2+.1,r:e.spinnerRadius},style:{stroke:e.color,lineCap:"round",lineWidth:e.lineWidth},zlevel:e.zlevel,z:10001})).animateShape(!0).when(1e3,{endAngle:3*Zg/2}).start("circularInOut"),r.animateShape(!0).when(1e3,{startAngle:3*Zg/2}).delay(300).start("circularInOut"),n.add(r)),n.resize=function(){var n=o.getBoundingRect().width,s=e.showSpinner?e.spinnerRadius:0,l=(t.getWidth()-2*s-(e.showSpinner&&n?10:0)-n)/2-(e.showSpinner&&n?0:5+n/2)+(e.showSpinner?0:n/2)+(n?0:s),u=t.getHeight()/2;e.showSpinner&&r.setShape({cx:l,cy:u}),a.setShape({x:l-s,y:u-s,width:2*s,height:2*s}),i.setShape({x:0,y:0,width:t.getWidth(),height:t.getHeight()})},n.resize(),n})),vm({type:sl,event:sl,update:sl},bt),vm({type:ll,event:ll,update:ll},bt),vm({type:ul,event:ul,update:ul},bt),vm({type:hl,event:hl,update:hl},bt),vm({type:cl,event:cl,update:cl},bt),cm("light",hy),cm("dark",gy);var Tm=[],Cm={registerPreprocessor:pm,registerProcessor:dm,registerPostInit:fm,registerPostUpdate:gm,registerUpdateLifecycle:ym,registerAction:vm,registerCoordinateSystem:mm,registerLayout:xm,registerVisual:_m,registerTransform:Im,registerLoading:Sm,registerMap:Mm,registerImpl:function(t,e){yv[t]=e},PRIORITY:_v,ComponentModel:Op,ComponentView:wg,SeriesModel:fg,ChartView:Tg,registerComponentModel:function(t){Op.registerClass(t)},registerComponentView:function(t){wg.registerClass(t)},registerSeriesModel:function(t){fg.registerClass(t)},registerChartView:function(t){Tg.registerClass(t)},registerSubTypeDefaulter:function(t,e){Op.registerSubTypeDefaulter(t,e)},registerPainter:function(t,e){Gr(t,e)}};function Dm(t){Y(t)?E(t,(function(t){Dm(t)})):P(Tm,t)>=0||(Tm.push(t),U(t)&&(t={install:t}),t.install(Cm))}function Am(t){return null==t?0:t.length||1}function km(t){return t}var Lm=function(){function t(t,e,n,i,r,o){this._old=t,this._new=e,this._oldKeyGetter=n||km,this._newKeyGetter=i||km,this.context=r,this._diffModeMultiple="multiple"===o}return t.prototype.add=function(t){return this._add=t,this},t.prototype.update=function(t){return this._update=t,this},t.prototype.updateManyToOne=function(t){return this._updateManyToOne=t,this},t.prototype.updateOneToMany=function(t){return this._updateOneToMany=t,this},t.prototype.updateManyToMany=function(t){return this._updateManyToMany=t,this},t.prototype.remove=function(t){return this._remove=t,this},t.prototype.execute=function(){this[this._diffModeMultiple?"_executeMultiple":"_executeOneToOne"]()},t.prototype._executeOneToOne=function(){var t=this._old,e=this._new,n={},i=new Array(t.length),r=new Array(e.length);this._initIndexMap(t,null,i,"_oldKeyGetter"),this._initIndexMap(e,n,r,"_newKeyGetter");for(var o=0;o<t.length;o++){var a=i[o],s=n[a],l=Am(s);if(l>1){var u=s.shift();1===s.length&&(n[a]=s[0]),this._update&&this._update(u,o)}else 1===l?(n[a]=null,this._update&&this._update(s,o)):this._remove&&this._remove(o)}this._performRestAdd(r,n)},t.prototype._executeMultiple=function(){var t=this._old,e=this._new,n={},i={},r=[],o=[];this._initIndexMap(t,n,r,"_oldKeyGetter"),this._initIndexMap(e,i,o,"_newKeyGetter");for(var a=0;a<r.length;a++){var s=r[a],l=n[s],u=i[s],h=Am(l),c=Am(u);if(h>1&&1===c)this._updateManyToOne&&this._updateManyToOne(u,l),i[s]=null;else if(1===h&&c>1)this._updateOneToMany&&this._updateOneToMany(u,l),i[s]=null;else if(1===h&&1===c)this._update&&this._update(u,l),i[s]=null;else if(h>1&&c>1)this._updateManyToMany&&this._updateManyToMany(u,l),i[s]=null;else if(h>1)for(var p=0;p<h;p++)this._remove&&this._remove(l[p]);else this._remove&&this._remove(l)}this._performRestAdd(o,i)},t.prototype._performRestAdd=function(t,e){for(var n=0;n<t.length;n++){var i=t[n],r=e[i],o=Am(r);if(o>1)for(var a=0;a<o;a++)this._add&&this._add(r[a]);else 1===o&&this._add&&this._add(r);e[i]=null}},t.prototype._initIndexMap=function(t,e,n,i){for(var r=this._diffModeMultiple,o=0;o<t.length;o++){var a="_ec_"+this[i](t[o],o);if(r||(n[o]=a),e){var s=e[a],l=Am(s);0===l?(e[a]=o,r&&n.push(a)):1===l?e[a]=[s,o]:s.push(o)}}},t}(),Pm=function(){function t(t,e){this._encode=t,this._schema=e}return t.prototype.get=function(){return{fullDimensions:this._getFullDimensionNames(),encode:this._encode}},t.prototype._getFullDimensionNames=function(){return this._cachedDimNames||(this._cachedDimNames=this._schema?this._schema.makeOutputDimensionNames():[]),this._cachedDimNames},t}();function Om(t,e){return t.hasOwnProperty(e)||(t[e]=[]),t[e]}function Rm(t){return"category"===t?"ordinal":"time"===t?"time":"float"}var Nm=function(t){this.otherDims={},null!=t&&A(this,t)},Em=Po(),zm={float:"f",int:"i",ordinal:"o",number:"n",time:"t"},Vm=function(){function t(t){this.dimensions=t.dimensions,this._dimOmitted=t.dimensionOmitted,this.source=t.source,this._fullDimCount=t.fullDimensionCount,this._updateDimOmitted(t.dimensionOmitted)}return t.prototype.isDimensionOmitted=function(){return this._dimOmitted},t.prototype._updateDimOmitted=function(t){this._dimOmitted=t,t&&(this._dimNameMap||(this._dimNameMap=Gm(this.source)))},t.prototype.getSourceDimensionIndex=function(t){return rt(this._dimNameMap.get(t),-1)},t.prototype.getSourceDimension=function(t){var e=this.source.dimensionsDefine;if(e)return e[t]},t.prototype.makeStoreSchema=function(){for(var t=this._fullDimCount,e=tf(this.source),n=!Wm(t),i="",r=[],o=0,a=0;o<t;o++){var s=void 0,l=void 0,u=void 0,h=this.dimensions[a];if(h&&h.storeDimIndex===o)s=e?h.name:null,l=h.type,u=h.ordinalMeta,a++;else{var c=this.getSourceDimension(o);c&&(s=e?c.name:null,l=c.type)}r.push({property:s,type:l,ordinalMeta:u}),!e||null==s||h&&h.isCalculationCoord||(i+=n?s.replace(/\`/g,"`1").replace(/\$/g,"`2"):s),i+="$",i+=zm[l]||"f",u&&(i+=u.uid),i+="$"}var p=this.source;return{dimensions:r,hash:[p.seriesLayoutBy,p.startIndex,i].join("$$")}},t.prototype.makeOutputDimensionNames=function(){for(var t=[],e=0,n=0;e<this._fullDimCount;e++){var i=void 0,r=this.dimensions[n];if(r&&r.storeDimIndex===e)r.isCalculationCoord||(i=r.name),n++;else{var o=this.getSourceDimension(e);o&&(i=o.name)}t.push(i)}return t},t.prototype.appendCalculationDimension=function(t){this.dimensions.push(t),t.isCalculationCoord=!0,this._fullDimCount++,this._updateDimOmitted(!0)},t}();function Bm(t){return t instanceof Vm}function Fm(t){for(var e=yt(),n=0;n<(t||[]).length;n++){var i=t[n],r=q(i)?i.name:i;null!=r&&null==e.get(r)&&e.set(r,n)}return e}function Gm(t){var e=Em(t);return e.dimNameMap||(e.dimNameMap=Fm(t.dimensionsDefine))}function Wm(t){return t>30}var Hm,Ym,Um,Xm,Zm,jm,qm,Km=q,$m=z,Jm="undefined"==typeof Int32Array?Array:Int32Array,Qm=["hasItemOption","_nameList","_idList","_invertedIndicesMap","_dimSummary","userOutput","_rawData","_dimValueGetter","_nameDimIdx","_idDimIdx","_nameRepeatCount"],tx=["_approximateExtent"],ex=function(){function t(t,e){var n;this.type="list",this._dimOmitted=!1,this._nameList=[],this._idList=[],this._visual={},this._layout={},this._itemVisuals=[],this._itemLayouts=[],this._graphicEls=[],this._approximateExtent={},this._calculationInfo={},this.hasItemOption=!1,this.TRANSFERABLE_METHODS=["cloneShallow","downSample","lttbDownSample","map"],this.CHANGABLE_METHODS=["filterSelf","selectRange"],this.DOWNSAMPLE_METHODS=["downSample","lttbDownSample"];var i=!1;Bm(t)?(n=t.dimensions,this._dimOmitted=t.isDimensionOmitted(),this._schema=t):(i=!0,n=t),n=n||["x","y"];for(var r={},o=[],a={},s=!1,l={},u=0;u<n.length;u++){var h=n[u],c=X(h)?new Nm({name:h}):h instanceof Nm?h:new Nm(h),p=c.name;c.type=c.type||"float",c.coordDim||(c.coordDim=p,c.coordDimIndex=0);var d=c.otherDims=c.otherDims||{};o.push(p),r[p]=c,null!=l[p]&&(s=!0),c.createInvertedIndices&&(a[p]=[]),0===d.itemName&&(this._nameDimIdx=u),0===d.itemId&&(this._idDimIdx=u),i&&(c.storeDimIndex=u)}if(this.dimensions=o,this._dimInfos=r,this._initGetDimensionInfo(s),this.hostModel=e,this._invertedIndicesMap=a,this._dimOmitted){var f=this._dimIdxToName=yt();E(o,(function(t){f.set(r[t].storeDimIndex,t)}))}}return t.prototype.getDimension=function(t){var e=this._recognizeDimIndex(t);if(null==e)return t;if(e=t,!this._dimOmitted)return this.dimensions[e];var n=this._dimIdxToName.get(e);if(null!=n)return n;var i=this._schema.getSourceDimension(e);return i?i.name:void 0},t.prototype.getDimensionIndex=function(t){var e=this._recognizeDimIndex(t);if(null!=e)return e;if(null==t)return-1;var n=this._getDimInfo(t);return n?n.storeDimIndex:this._dimOmitted?this._schema.getSourceDimensionIndex(t):-1},t.prototype._recognizeDimIndex=function(t){if(j(t)||null!=t&&!isNaN(t)&&!this._getDimInfo(t)&&(!this._dimOmitted||this._schema.getSourceDimensionIndex(t)<0))return+t},t.prototype._getStoreDimIndex=function(t){var e=this.getDimensionIndex(t);return e},t.prototype.getDimensionInfo=function(t){return this._getDimInfo(this.getDimension(t))},t.prototype._initGetDimensionInfo=function(t){var e=this._dimInfos;this._getDimInfo=t?function(t){return e.hasOwnProperty(t)?e[t]:void 0}:function(t){return e[t]}},t.prototype.getDimensionsOnCoord=function(){return this._dimSummary.dataDimsOnCoord.slice()},t.prototype.mapDimension=function(t,e){var n=this._dimSummary;if(null==e)return n.encodeFirstDimNotExtra[t];var i=n.encode[t];return i?i[e]:null},t.prototype.mapDimensionsAll=function(t){return(this._dimSummary.encode[t]||[]).slice()},t.prototype.getStore=function(){return this._store},t.prototype.initData=function(t,e,n){var i,r=this;if(t instanceof Uf&&(i=t),!i){var o=this.dimensions,a=jd(t)||N(t)?new ef(t,o.length):t;i=new Uf;var s=$m(o,(function(t){return{type:r._dimInfos[t].type,property:t}}));i.initData(a,s,n)}this._store=i,this._nameList=(e||[]).slice(),this._idList=[],this._nameRepeatCount={},this._doInit(0,i.count()),this._dimSummary=function(t,e){var n={},i=n.encode={},r=yt(),o=[],a=[],s={};E(t.dimensions,(function(e){var n,l=t.getDimensionInfo(e),u=l.coordDim;if(u){var h=l.coordDimIndex;Om(i,u)[h]=e,l.isExtraCoord||(r.set(u,1),"ordinal"!==(n=l.type)&&"time"!==n&&(o[0]=e),Om(s,u)[h]=t.getDimensionIndex(l.name)),l.defaultTooltip&&a.push(e)}zp.each((function(t,e){var n=Om(i,e),r=l.otherDims[e];null!=r&&!1!==r&&(n[r]=l.name)}))}));var l=[],u={};r.each((function(t,e){var n=i[e];u[e]=n[0],l=l.concat(n)})),n.dataDimsOnCoord=l,n.dataDimIndicesOnCoord=z(l,(function(e){return t.getDimensionInfo(e).storeDimIndex})),n.encodeFirstDimNotExtra=u;var h=i.label;h&&h.length&&(o=h.slice());var c=i.tooltip;return c&&c.length?a=c.slice():a.length||(a=o.slice()),i.defaultedLabel=o,i.defaultedTooltip=a,n.userOutput=new Pm(s,e),n}(this,this._schema),this.userOutput=this._dimSummary.userOutput},t.prototype.appendData=function(t){var e=this._store.appendData(t);this._doInit(e[0],e[1])},t.prototype.appendValues=function(t,e){var n=this._store.appendValues(t,e.length),i=n.start,r=n.end,o=this._shouldMakeIdFromName();if(this._updateOrdinalMeta(),e)for(var a=i;a<r;a++){var s=a-i;this._nameList[a]=e[s],o&&qm(this,a)}},t.prototype._updateOrdinalMeta=function(){for(var t=this._store,e=this.dimensions,n=0;n<e.length;n++){var i=this._dimInfos[e[n]];i.ordinalMeta&&t.collectOrdinalMeta(i.storeDimIndex,i.ordinalMeta)}},t.prototype._shouldMakeIdFromName=function(){var t=this._store.getProvider();return null==this._idDimIdx&&t.getSource().sourceFormat!==Wp&&!t.fillStorage},t.prototype._doInit=function(t,e){if(!(t>=e)){var n=this._store.getProvider();this._updateOrdinalMeta();var i=this._nameList,r=this._idList;if(n.getSource().sourceFormat===Vp&&!n.pure)for(var o=[],a=t;a<e;a++){var s=n.getItem(a,o);if(!this.hasItemOption&&Mo(s)&&(this.hasItemOption=!0),s){var l=s.name;null==i[a]&&null!=l&&(i[a]=Do(l,null));var u=s.id;null==r[a]&&null!=u&&(r[a]=Do(u,null))}}if(this._shouldMakeIdFromName())for(a=t;a<e;a++)qm(this,a);Hm(this)}},t.prototype.getApproximateExtent=function(t){return this._approximateExtent[t]||this._store.getDataExtent(this._getStoreDimIndex(t))},t.prototype.setApproximateExtent=function(t,e){e=this.getDimension(e),this._approximateExtent[e]=t.slice()},t.prototype.getCalculationInfo=function(t){return this._calculationInfo[t]},t.prototype.setCalculationInfo=function(t,e){Km(t)?A(this._calculationInfo,t):this._calculationInfo[t]=e},t.prototype.getName=function(t){var e=this.getRawIndex(t),n=this._nameList[e];return null==n&&null!=this._nameDimIdx&&(n=Um(this,this._nameDimIdx,e)),null==n&&(n=""),n},t.prototype._getCategory=function(t,e){var n=this._store.get(t,e),i=this._store.getOrdinalMeta(t);return i?i.categories[n]:n},t.prototype.getId=function(t){return Ym(this,this.getRawIndex(t))},t.prototype.count=function(){return this._store.count()},t.prototype.get=function(t,e){var n=this._store,i=this._dimInfos[t];if(i)return n.get(i.storeDimIndex,e)},t.prototype.getByRawIndex=function(t,e){var n=this._store,i=this._dimInfos[t];if(i)return n.getByRawIndex(i.storeDimIndex,e)},t.prototype.getIndices=function(){return this._store.getIndices()},t.prototype.getDataExtent=function(t){return this._store.getDataExtent(this._getStoreDimIndex(t))},t.prototype.getSum=function(t){return this._store.getSum(this._getStoreDimIndex(t))},t.prototype.getMedian=function(t){return this._store.getMedian(this._getStoreDimIndex(t))},t.prototype.getValues=function(t,e){var n=this,i=this._store;return Y(t)?i.getValues($m(t,(function(t){return n._getStoreDimIndex(t)})),e):i.getValues(t)},t.prototype.hasValue=function(t){for(var e=this._dimSummary.dataDimIndicesOnCoord,n=0,i=e.length;n<i;n++)if(isNaN(this._store.get(e[n],t)))return!1;return!0},t.prototype.indexOfName=function(t){for(var e=0,n=this._store.count();e<n;e++)if(this.getName(e)===t)return e;return-1},t.prototype.getRawIndex=function(t){return this._store.getRawIndex(t)},t.prototype.indexOfRawIndex=function(t){return this._store.indexOfRawIndex(t)},t.prototype.rawIndexOf=function(t,e){var n=t&&this._invertedIndicesMap[t];var i=n[e];return null==i||isNaN(i)?-1:i},t.prototype.indicesOfNearest=function(t,e,n){return this._store.indicesOfNearest(this._getStoreDimIndex(t),e,n)},t.prototype.each=function(t,e,n){U(t)&&(n=e,e=t,t=[]);var i=n||this,r=$m(Xm(t),this._getStoreDimIndex,this);this._store.each(r,i?W(e,i):e)},t.prototype.filterSelf=function(t,e,n){U(t)&&(n=e,e=t,t=[]);var i=n||this,r=$m(Xm(t),this._getStoreDimIndex,this);return this._store=this._store.filter(r,i?W(e,i):e),this},t.prototype.selectRange=function(t){var e=this,n={};return E(G(t),(function(i){var r=e._getStoreDimIndex(i);n[r]=t[i]})),this._store=this._store.selectRange(n),this},t.prototype.mapArray=function(t,e,n){U(t)&&(n=e,e=t,t=[]),n=n||this;var i=[];return this.each(t,(function(){i.push(e&&e.apply(this,arguments))}),n),i},t.prototype.map=function(t,e,n,i){var r=n||i||this,o=$m(Xm(t),this._getStoreDimIndex,this),a=jm(this);return a._store=this._store.map(o,r?W(e,r):e),a},t.prototype.modify=function(t,e,n,i){var r=n||i||this;var o=$m(Xm(t),this._getStoreDimIndex,this);this._store.modify(o,r?W(e,r):e)},t.prototype.downSample=function(t,e,n,i){var r=jm(this);return r._store=this._store.downSample(this._getStoreDimIndex(t),e,n,i),r},t.prototype.lttbDownSample=function(t,e){var n=jm(this);return n._store=this._store.lttbDownSample(this._getStoreDimIndex(t),e),n},t.prototype.getRawDataItem=function(t){return this._store.getRawDataItem(t)},t.prototype.getItemModel=function(t){var e=this.hostModel,n=this.getRawDataItem(t);return new Sc(n,e,e&&e.ecModel)},t.prototype.diff=function(t){var e=this;return new Lm(t?t.getStore().getIndices():[],this.getStore().getIndices(),(function(e){return Ym(t,e)}),(function(t){return Ym(e,t)}))},t.prototype.getVisual=function(t){var e=this._visual;return e&&e[t]},t.prototype.setVisual=function(t,e){this._visual=this._visual||{},Km(t)?A(this._visual,t):this._visual[t]=e},t.prototype.getItemVisual=function(t,e){var n=this._itemVisuals[t],i=n&&n[e];return null==i?this.getVisual(e):i},t.prototype.hasItemVisual=function(){return this._itemVisuals.length>0},t.prototype.ensureUniqueItemVisual=function(t,e){var n=this._itemVisuals,i=n[t];i||(i=n[t]={});var r=i[e];return null==r&&(Y(r=this.getVisual(e))?r=r.slice():Km(r)&&(r=A({},r)),i[e]=r),r},t.prototype.setItemVisual=function(t,e,n){var i=this._itemVisuals[t]||{};this._itemVisuals[t]=i,Km(e)?A(i,e):i[e]=n},t.prototype.clearAllVisual=function(){this._visual={},this._itemVisuals=[]},t.prototype.setLayout=function(t,e){Km(t)?A(this._layout,t):this._layout[t]=e},t.prototype.getLayout=function(t){return this._layout[t]},t.prototype.getItemLayout=function(t){return this._itemLayouts[t]},t.prototype.setItemLayout=function(t,e,n){this._itemLayouts[t]=n?A(this._itemLayouts[t]||{},e):e},t.prototype.clearItemLayouts=function(){this._itemLayouts.length=0},t.prototype.setItemGraphicEl=function(t,e){var n=this.hostModel&&this.hostModel.seriesIndex;Qs(n,this.dataType,t,e),this._graphicEls[t]=e},t.prototype.getItemGraphicEl=function(t){return this._graphicEls[t]},t.prototype.eachItemGraphicEl=function(t,e){E(this._graphicEls,(function(n,i){n&&t&&t.call(e,n,i)}))},t.prototype.cloneShallow=function(e){return e||(e=new t(this._schema?this._schema:$m(this.dimensions,this._getDimInfo,this),this.hostModel)),Zm(e,this),e._store=this._store,e},t.prototype.wrapMethod=function(t,e){var n=this[t];U(n)&&(this.__wrappedMethods=this.__wrappedMethods||[],this.__wrappedMethods.push(t),this[t]=function(){var t=n.apply(this,arguments);return e.apply(this,[t].concat(at(arguments)))})},t.internalField=(Hm=function(t){var e=t._invertedIndicesMap;E(e,(function(n,i){var r=t._dimInfos[i],o=r.ordinalMeta,a=t._store;if(o){n=e[i]=new Jm(o.categories.length);for(var s=0;s<n.length;s++)n[s]=-1;for(s=0;s<a.count();s++)n[a.get(r.storeDimIndex,s)]=s}}))},Um=function(t,e,n){return Do(t._getCategory(e,n),null)},Ym=function(t,e){var n=t._idList[e];return null==n&&null!=t._idDimIdx&&(n=Um(t,t._idDimIdx,e)),null==n&&(n="e\0\0"+e),n},Xm=function(t){return Y(t)||(t=null!=t?[t]:[]),t},jm=function(e){var n=new t(e._schema?e._schema:$m(e.dimensions,e._getDimInfo,e),e.hostModel);return Zm(n,e),n},Zm=function(t,e){E(Qm.concat(e.__wrappedMethods||[]),(function(n){e.hasOwnProperty(n)&&(t[n]=e[n])})),t.__wrappedMethods=e.__wrappedMethods,E(tx,(function(n){t[n]=T(e[n])})),t._calculationInfo=A({},e._calculationInfo)},void(qm=function(t,e){var n=t._nameList,i=t._idList,r=t._nameDimIdx,o=t._idDimIdx,a=n[e],s=i[e];if(null==a&&null!=r&&(n[e]=a=Um(t,r,e)),null==s&&null!=o&&(i[e]=s=Um(t,o,e)),null==s&&null!=a){var l=t._nameRepeatCount,u=l[a]=(l[a]||0)+1;s=a,u>1&&(s+="__ec__"+u),i[e]=s}})),t}();function nx(t,e){jd(t)||(t=Kd(t));var n=(e=e||{}).coordDimensions||[],i=e.dimensionsDefine||t.dimensionsDefine||[],r=yt(),o=[],a=function(t,e,n,i){var r=Math.max(t.dimensionsDetectedCount||1,e.length,n.length,i||0);return E(e,(function(t){var e;q(t)&&(e=t.dimsDef)&&(r=Math.max(r,e.length))})),r}(t,n,i,e.dimensionsCount),s=e.canOmitUnusedDimensions&&Wm(a),l=i===t.dimensionsDefine,u=l?Gm(t):Fm(i),h=e.encodeDefine;!h&&e.encodeDefaulter&&(h=e.encodeDefaulter(t,a));for(var c=yt(h),p=new Ff(a),d=0;d<p.length;d++)p[d]=-1;function f(t){var e=p[t];if(e<0){var n=i[t],r=q(n)?n:{name:n},a=new Nm,s=r.name;null!=s&&null!=u.get(s)&&(a.name=a.displayName=s),null!=r.type&&(a.type=r.type),null!=r.displayName&&(a.displayName=r.displayName);var l=o.length;return p[t]=l,a.storeDimIndex=t,o.push(a),a}return o[e]}if(!s)for(d=0;d<a;d++)f(d);c.each((function(t,e){var n=_o(t).slice();if(1===n.length&&!X(n[0])&&n[0]<0)c.set(e,!1);else{var i=c.set(e,[]);E(n,(function(t,n){var r=X(t)?u.get(t):t;null!=r&&r<a&&(i[n]=r,y(f(r),e,n))}))}}));var g=0;function y(t,e,n){null!=zp.get(e)?t.otherDims[e]=n:(t.coordDim=e,t.coordDimIndex=n,r.set(e,!0))}E(n,(function(t){var e,n,i,r;if(X(t))e=t,r={};else{e=(r=t).name;var o=r.ordinalMeta;r.ordinalMeta=null,(r=A({},r)).ordinalMeta=o,n=r.dimsDef,i=r.otherDims,r.name=r.coordDim=r.coordDimIndex=r.dimsDef=r.otherDims=null}var s=c.get(e);if(!1!==s){if(!(s=_o(s)).length)for(var u=0;u<(n&&n.length||1);u++){for(;g<a&&null!=f(g).coordDim;)g++;g<a&&s.push(g++)}E(s,(function(t,o){var a=f(t);if(l&&null!=r.type&&(a.type=r.type),y(k(a,r),e,o),null==a.name&&n){var s=n[o];!q(s)&&(s={name:s}),a.name=a.displayName=s.name,a.defaultTooltip=s.defaultTooltip}i&&k(a.otherDims,i)}))}}));var v=e.generateCoord,m=e.generateCoordCount,x=null!=m;m=v?m||1:0;var _=v||"value";function b(t){null==t.name&&(t.name=t.coordDim)}if(s)E(o,(function(t){b(t)})),o.sort((function(t,e){return t.storeDimIndex-e.storeDimIndex}));else for(var w=0;w<a;w++){var S=f(w);null==S.coordDim&&(S.coordDim=ix(_,r,x),S.coordDimIndex=0,(!v||m<=0)&&(S.isExtraCoord=!0),m--),b(S),null!=S.type||Qp(t,w)!==Xp&&(!S.isExtraCoord||null==S.otherDims.itemName&&null==S.otherDims.seriesName)||(S.type="ordinal")}return function(t){for(var e=yt(),n=0;n<t.length;n++){var i=t[n],r=i.name,o=e.get(r)||0;o>0&&(i.name=r+(o-1)),o++,e.set(r,o)}}(o),new Vm({source:t,dimensions:o,fullDimensionCount:a,dimensionOmitted:s})}function ix(t,e,n){if(n||e.hasKey(t)){for(var i=0;e.hasKey(t+i);)i++;t+=i}return e.set(t,!0),t}var rx=function(t){this.coordSysDims=[],this.axisMap=yt(),this.categoryAxisMap=yt(),this.coordSysName=t};var ox={cartesian2d:function(t,e,n,i){var r=t.getReferringComponents("xAxis",Eo).models[0],o=t.getReferringComponents("yAxis",Eo).models[0];e.coordSysDims=["x","y"],n.set("x",r),n.set("y",o),ax(r)&&(i.set("x",r),e.firstCategoryDimIndex=0),ax(o)&&(i.set("y",o),null==e.firstCategoryDimIndex&&(e.firstCategoryDimIndex=1))},singleAxis:function(t,e,n,i){var r=t.getReferringComponents("singleAxis",Eo).models[0];e.coordSysDims=["single"],n.set("single",r),ax(r)&&(i.set("single",r),e.firstCategoryDimIndex=0)},polar:function(t,e,n,i){var r=t.getReferringComponents("polar",Eo).models[0],o=r.findAxisModel("radiusAxis"),a=r.findAxisModel("angleAxis");e.coordSysDims=["radius","angle"],n.set("radius",o),n.set("angle",a),ax(o)&&(i.set("radius",o),e.firstCategoryDimIndex=0),ax(a)&&(i.set("angle",a),null==e.firstCategoryDimIndex&&(e.firstCategoryDimIndex=1))},geo:function(t,e,n,i){e.coordSysDims=["lng","lat"]},parallel:function(t,e,n,i){var r=t.ecModel,o=r.getComponent("parallel",t.get("parallelIndex")),a=e.coordSysDims=o.dimensions.slice();E(o.parallelAxisIndex,(function(t,o){var s=r.getComponent("parallelAxis",t),l=a[o];n.set(l,s),ax(s)&&(i.set(l,s),null==e.firstCategoryDimIndex&&(e.firstCategoryDimIndex=o))}))}};function ax(t){return"category"===t.get("type")}function sx(t,e,n){var i,r,o,a=(n=n||{}).byIndex,s=n.stackedCoordDimension;!function(t){return!Bm(t.schema)}(e)?(r=e.schema,i=r.dimensions,o=e.store):i=e;var l,u,h,c,p=!(!t||!t.get("stack"));if(E(i,(function(t,e){X(t)&&(i[e]=t={name:t}),p&&!t.isExtraCoord&&(a||l||!t.ordinalMeta||(l=t),u||"ordinal"===t.type||"time"===t.type||s&&s!==t.coordDim||(u=t))})),!u||a||l||(a=!0),u){h="__\0ecstackresult_"+t.id,c="__\0ecstackedover_"+t.id,l&&(l.createInvertedIndices=!0);var d=u.coordDim,f=u.type,g=0;E(i,(function(t){t.coordDim===d&&g++}));var y={name:h,coordDim:d,coordDimIndex:g,type:f,isExtraCoord:!0,isCalculationCoord:!0,storeDimIndex:i.length},v={name:c,coordDim:c,coordDimIndex:g+1,type:f,isExtraCoord:!0,isCalculationCoord:!0,storeDimIndex:i.length+1};r?(o&&(y.storeDimIndex=o.ensureCalculationDimension(c,f),v.storeDimIndex=o.ensureCalculationDimension(h,f)),r.appendCalculationDimension(y),r.appendCalculationDimension(v)):(i.push(y),i.push(v))}return{stackedDimension:u&&u.name,stackedByDimension:l&&l.name,isStackedByIndex:a,stackedOverDimension:c,stackResultDimension:h}}function lx(t,e){return!!e&&e===t.getCalculationInfo("stackedDimension")}function ux(t,e){return lx(t,e)?t.getCalculationInfo("stackResultDimension"):e}function hx(t,e,n){n=n||{};var i,r=e.getSourceManager(),o=!1;t?(o=!0,i=Kd(t)):o=(i=r.getSource()).sourceFormat===Vp;var a=function(t){var e=t.get("coordinateSystem"),n=new rx(e),i=ox[e];if(i)return i(t,n,n.axisMap,n.categoryAxisMap),n}(e),s=function(t,e){var n,i=t.get("coordinateSystem"),r=vd.get(i);return e&&e.coordSysDims&&(n=z(e.coordSysDims,(function(t){var n={name:t},i=e.axisMap.get(t);if(i){var r=i.get("type");n.type=Rm(r)}return n}))),n||(n=r&&(r.getDimensionsInfo?r.getDimensionsInfo():r.dimensions.slice())||["x","y"]),n}(e,a),l=n.useEncodeDefaulter,u=U(l)?l:l?H(Kp,s,e):null,h=nx(i,{coordDimensions:s,generateCoord:n.generateCoord,encodeDefine:e.getEncode(),encodeDefaulter:u,canOmitUnusedDimensions:!o}),c=function(t,e,n){var i,r;return n&&E(t,(function(t,o){var a=t.coordDim,s=n.categoryAxisMap.get(a);s&&(null==i&&(i=o),t.ordinalMeta=s.getOrdinalMeta(),e&&(t.createInvertedIndices=!0)),null!=t.otherDims.itemName&&(r=!0)})),r||null==i||(t[i].otherDims.itemName=0),i}(h.dimensions,n.createInvertedIndices,a),p=o?null:r.getSharedDataStore(h),d=sx(e,{schema:h,store:p}),f=new ex(h,e);f.setCalculationInfo(d);var g=null!=c&&function(t){if(t.sourceFormat===Vp){var e=function(t){var e=0;for(;e<t.length&&null==t[e];)e++;return t[e]}(t.data||[]);return!Y(So(e))}}(i)?function(t,e,n,i){return i===c?n:this.defaultDimValueGetter(t,e,n,i)}:null;return f.hasItemOption=!1,f.initData(o?i:p,null,g),f}var cx=function(){function t(t){this._setting=t||{},this._extent=[1/0,-1/0]}return t.prototype.getSetting=function(t){return this._setting[t]},t.prototype.unionExtent=function(t){var e=this._extent;t[0]<e[0]&&(e[0]=t[0]),t[1]>e[1]&&(e[1]=t[1])},t.prototype.unionExtentFromData=function(t,e){this.unionExtent(t.getApproximateExtent(e))},t.prototype.getExtent=function(){return this._extent.slice()},t.prototype.setExtent=function(t,e){var n=this._extent;isNaN(t)||(n[0]=t),isNaN(e)||(n[1]=e)},t.prototype.isInExtentRange=function(t){return this._extent[0]<=t&&this._extent[1]>=t},t.prototype.isBlank=function(){return this._isBlank},t.prototype.setBlank=function(t){this._isBlank=t},t}();Ko(cx);var px=0,dx=function(){function t(t){this.categories=t.categories||[],this._needCollect=t.needCollect,this._deduplication=t.deduplication,this.uid=++px}return t.createByAxisModel=function(e){var n=e.option,i=n.data,r=i&&z(i,fx);return new t({categories:r,needCollect:!r,deduplication:!1!==n.dedplication})},t.prototype.getOrdinal=function(t){return this._getOrCreateMap().get(t)},t.prototype.parseAndCollect=function(t){var e,n=this._needCollect;if(!X(t)&&!n)return t;if(n&&!this._deduplication)return e=this.categories.length,this.categories[e]=t,e;var i=this._getOrCreateMap();return null==(e=i.get(t))&&(n?(e=this.categories.length,this.categories[e]=t,i.set(t,e)):e=NaN),e},t.prototype._getOrCreateMap=function(){return this._map||(this._map=yt(this.categories))},t}();function fx(t){return q(t)&&null!=t.value?t.value:t+""}function gx(t){return"interval"===t.type||"log"===t.type}function yx(t,e,n,i){var r={},o=t[1]-t[0],a=r.interval=ao(o/e,!0);null!=n&&a<n&&(a=r.interval=n),null!=i&&a>i&&(a=r.interval=i);var s=r.intervalPrecision=mx(a);return function(t,e){!isFinite(t[0])&&(t[0]=e[0]),!isFinite(t[1])&&(t[1]=e[1]),xx(t,0,e),xx(t,1,e),t[0]>t[1]&&(t[0]=t[1])}(r.niceTickExtent=[Xr(Math.ceil(t[0]/a)*a,s),Xr(Math.floor(t[1]/a)*a,s)],t),r}function vx(t){var e=Math.pow(10,oo(t)),n=t/e;return n?2===n?n=3:3===n?n=5:n*=2:n=1,Xr(n*e)}function mx(t){return jr(t)+2}function xx(t,e,n){t[e]=Math.max(Math.min(t[e],n[1]),n[0])}function _x(t,e){return t>=e[0]&&t<=e[1]}function bx(t,e){return e[1]===e[0]?.5:(t-e[0])/(e[1]-e[0])}function Sx(t,e){return t*(e[1]-e[0])+e[0]}var Mx=function(t){function e(e){var n=t.call(this,e)||this;n.type="ordinal";var i=n.getSetting("ordinalMeta");return i||(i=new dx({})),Y(i)&&(i=new dx({categories:z(i,(function(t){return q(t)?t.value:t}))})),n._ordinalMeta=i,n._extent=n.getSetting("extent")||[0,i.categories.length-1],n}return n(e,t),e.prototype.parse=function(t){return null==t?NaN:X(t)?this._ordinalMeta.getOrdinal(t):Math.round(t)},e.prototype.contain=function(t){return _x(t=this.parse(t),this._extent)&&null!=this._ordinalMeta.categories[t]},e.prototype.normalize=function(t){return bx(t=this._getTickNumber(this.parse(t)),this._extent)},e.prototype.scale=function(t){return t=Math.round(Sx(t,this._extent)),this.getRawOrdinalNumber(t)},e.prototype.getTicks=function(){for(var t=[],e=this._extent,n=e[0];n<=e[1];)t.push({value:n}),n++;return t},e.prototype.getMinorTicks=function(t){},e.prototype.setSortInfo=function(t){if(null!=t){for(var e=t.ordinalNumbers,n=this._ordinalNumbersByTick=[],i=this._ticksByOrdinalNumber=[],r=0,o=this._ordinalMeta.categories.length,a=Math.min(o,e.length);r<a;++r){var s=e[r];n[r]=s,i[s]=r}for(var l=0;r<o;++r){for(;null!=i[l];)l++;n.push(l),i[l]=r}}else this._ordinalNumbersByTick=this._ticksByOrdinalNumber=null},e.prototype._getTickNumber=function(t){var e=this._ticksByOrdinalNumber;return e&&t>=0&&t<e.length?e[t]:t},e.prototype.getRawOrdinalNumber=function(t){var e=this._ordinalNumbersByTick;return e&&t>=0&&t<e.length?e[t]:t},e.prototype.getLabel=function(t){if(!this.isBlank()){var e=this.getRawOrdinalNumber(t.value),n=this._ordinalMeta.categories[e];return null==n?"":n+""}},e.prototype.count=function(){return this._extent[1]-this._extent[0]+1},e.prototype.unionExtentFromData=function(t,e){this.unionExtent(t.getApproximateExtent(e))},e.prototype.isInExtentRange=function(t){return t=this._getTickNumber(t),this._extent[0]<=t&&this._extent[1]>=t},e.prototype.getOrdinalMeta=function(){return this._ordinalMeta},e.prototype.calcNiceTicks=function(){},e.prototype.calcNiceExtent=function(){},e.type="ordinal",e}(cx);cx.registerClass(Mx);var Ix=Xr,Tx=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="interval",e._interval=0,e._intervalPrecision=2,e}return n(e,t),e.prototype.parse=function(t){return t},e.prototype.contain=function(t){return _x(t,this._extent)},e.prototype.normalize=function(t){return bx(t,this._extent)},e.prototype.scale=function(t){return Sx(t,this._extent)},e.prototype.setExtent=function(t,e){var n=this._extent;isNaN(t)||(n[0]=parseFloat(t)),isNaN(e)||(n[1]=parseFloat(e))},e.prototype.unionExtent=function(t){var e=this._extent;t[0]<e[0]&&(e[0]=t[0]),t[1]>e[1]&&(e[1]=t[1]),this.setExtent(e[0],e[1])},e.prototype.getInterval=function(){return this._interval},e.prototype.setInterval=function(t){this._interval=t,this._niceExtent=this._extent.slice(),this._intervalPrecision=mx(t)},e.prototype.getTicks=function(t){var e=this._interval,n=this._extent,i=this._niceExtent,r=this._intervalPrecision,o=[];if(!e)return o;n[0]<i[0]&&(t?o.push({value:Ix(i[0]-e,r)}):o.push({value:n[0]}));for(var a=i[0];a<=i[1]&&(o.push({value:a}),(a=Ix(a+e,r))!==o[o.length-1].value);)if(o.length>1e4)return[];var s=o.length?o[o.length-1].value:i[1];return n[1]>s&&(t?o.push({value:Ix(s+e,r)}):o.push({value:n[1]})),o},e.prototype.getMinorTicks=function(t){for(var e=this.getTicks(!0),n=[],i=this.getExtent(),r=1;r<e.length;r++){for(var o=e[r],a=e[r-1],s=0,l=[],u=(o.value-a.value)/t;s<t-1;){var h=Ix(a.value+(s+1)*u);h>i[0]&&h<i[1]&&l.push(h),s++}n.push(l)}return n},e.prototype.getLabel=function(t,e){if(null==t)return"";var n=e&&e.precision;return null==n?n=jr(t.value)||0:"auto"===n&&(n=this._intervalPrecision),cp(Ix(t.value,n,!0))},e.prototype.calcNiceTicks=function(t,e,n){t=t||5;var i=this._extent,r=i[1]-i[0];if(isFinite(r)){r<0&&(r=-r,i.reverse());var o=yx(i,t,e,n);this._intervalPrecision=o.intervalPrecision,this._interval=o.interval,this._niceExtent=o.niceTickExtent}},e.prototype.calcNiceExtent=function(t){var e=this._extent;if(e[0]===e[1])if(0!==e[0]){var n=Math.abs(e[0]);t.fixMax||(e[1]+=n/2),e[0]-=n/2}else e[1]=1;var i=e[1]-e[0];isFinite(i)||(e[0]=0,e[1]=1),this.calcNiceTicks(t.splitNumber,t.minInterval,t.maxInterval);var r=this._interval;t.fixMin||(e[0]=Ix(Math.floor(e[0]/r)*r)),t.fixMax||(e[1]=Ix(Math.ceil(e[1]/r)*r))},e.prototype.setNiceExtent=function(t,e){this._niceExtent=[t,e]},e.type="interval",e}(cx);cx.registerClass(Tx);var Cx="undefined"!=typeof Float32Array,Dx=Cx?Float32Array:Array;function Ax(t){return Y(t)?Cx?new Float32Array(t):t:new Dx(t)}var kx="__ec_stack_";function Lx(t){return t.get("stack")||kx+t.seriesIndex}function Px(t){return t.dim+t.index}function Ox(t,e){var n=[];return e.eachSeriesByType(t,(function(t){Vx(t)&&n.push(t)})),n}function Rx(t){var e=function(t){var e={};E(t,(function(t){var n=t.coordinateSystem.getBaseAxis();if("time"===n.type||"value"===n.type)for(var i=t.getData(),r=n.dim+"_"+n.index,o=i.getDimensionIndex(i.mapDimension(n.dim)),a=i.getStore(),s=0,l=a.count();s<l;++s){var u=a.get(o,s);e[r]?e[r].push(u):e[r]=[u]}}));var n={};for(var i in e)if(e.hasOwnProperty(i)){var r=e[i];if(r){r.sort((function(t,e){return t-e}));for(var o=null,a=1;a<r.length;++a){var s=r[a]-r[a-1];s>0&&(o=null===o?s:Math.min(o,s))}n[i]=o}}return n}(t),n=[];return E(t,(function(t){var i,r=t.coordinateSystem.getBaseAxis(),o=r.getExtent();if("category"===r.type)i=r.getBandWidth();else if("value"===r.type||"time"===r.type){var a=r.dim+"_"+r.index,s=e[a],l=Math.abs(o[1]-o[0]),u=r.scale.getExtent(),h=Math.abs(u[1]-u[0]);i=s?l/h*s:l}else{var c=t.getData();i=Math.abs(o[1]-o[0])/c.count()}var p=Ur(t.get("barWidth"),i),d=Ur(t.get("barMaxWidth"),i),f=Ur(t.get("barMinWidth")||(Bx(t)?.5:1),i),g=t.get("barGap"),y=t.get("barCategoryGap");n.push({bandWidth:i,barWidth:p,barMaxWidth:d,barMinWidth:f,barGap:g,barCategoryGap:y,axisKey:Px(r),stackId:Lx(t)})})),Nx(n)}function Nx(t){var e={};E(t,(function(t,n){var i=t.axisKey,r=t.bandWidth,o=e[i]||{bandWidth:r,remainedWidth:r,autoWidthCount:0,categoryGap:null,gap:"20%",stacks:{}},a=o.stacks;e[i]=o;var s=t.stackId;a[s]||o.autoWidthCount++,a[s]=a[s]||{width:0,maxWidth:0};var l=t.barWidth;l&&!a[s].width&&(a[s].width=l,l=Math.min(o.remainedWidth,l),o.remainedWidth-=l);var u=t.barMaxWidth;u&&(a[s].maxWidth=u);var h=t.barMinWidth;h&&(a[s].minWidth=h);var c=t.barGap;null!=c&&(o.gap=c);var p=t.barCategoryGap;null!=p&&(o.categoryGap=p)}));var n={};return E(e,(function(t,e){n[e]={};var i=t.stacks,r=t.bandWidth,o=t.categoryGap;if(null==o){var a=G(i).length;o=Math.max(35-4*a,15)+"%"}var s=Ur(o,r),l=Ur(t.gap,1),u=t.remainedWidth,h=t.autoWidthCount,c=(u-s)/(h+(h-1)*l);c=Math.max(c,0),E(i,(function(t){var e=t.maxWidth,n=t.minWidth;if(t.width){i=t.width;e&&(i=Math.min(i,e)),n&&(i=Math.max(i,n)),t.width=i,u-=i+l*i,h--}else{var i=c;e&&e<i&&(i=Math.min(e,u)),n&&n>i&&(i=n),i!==c&&(t.width=i,u-=i+l*i,h--)}})),c=(u-s)/(h+(h-1)*l),c=Math.max(c,0);var p,d=0;E(i,(function(t,e){t.width||(t.width=c),p=t,d+=t.width*(1+l)})),p&&(d-=p.width*l);var f=-d/2;E(i,(function(t,i){n[e][i]=n[e][i]||{bandWidth:r,offset:f,width:t.width},f+=t.width*(1+l)}))})),n}function Ex(t,e){var n=Ox(t,e),i=Rx(n);E(n,(function(t){var e=t.getData(),n=t.coordinateSystem.getBaseAxis(),r=Lx(t),o=i[Px(n)][r],a=o.offset,s=o.width;e.setLayout({bandWidth:o.bandWidth,offset:a,size:s})}))}function zx(t){return{seriesType:t,plan:Sg(),reset:function(t){if(Vx(t)){var e=t.getData(),n=t.coordinateSystem,i=n.getBaseAxis(),r=n.getOtherAxis(i),o=e.getDimensionIndex(e.mapDimension(r.dim)),a=e.getDimensionIndex(e.mapDimension(i.dim)),s=t.get("showBackground",!0),l=e.mapDimension(r.dim),u=e.getCalculationInfo("stackResultDimension"),h=lx(e,l)&&!!e.getCalculationInfo("stackedOnSeries"),c=r.isHorizontal(),p=function(t,e){return e.toGlobalCoord(e.dataToCoord("log"===e.type?1:0))}(0,r),d=Bx(t),f=t.get("barMinHeight")||0,g=u&&e.getDimensionIndex(u),y=e.getLayout("size"),v=e.getLayout("offset");return{progress:function(t,e){for(var i,r=t.count,l=d&&Ax(3*r),u=d&&s&&Ax(3*r),m=d&&Ax(r),x=n.master.getRect(),_=c?x.width:x.height,b=e.getStore(),w=0;null!=(i=t.next());){var S=b.get(h?g:o,i),M=b.get(a,i),I=p,T=void 0;h&&(T=+S-b.get(o,i));var C=void 0,D=void 0,A=void 0,k=void 0;if(c){var L=n.dataToPoint([S,M]);if(h)I=n.dataToPoint([T,M])[0];C=I,D=L[1]+v,A=L[0]-I,k=y,Math.abs(A)<f&&(A=(A<0?-1:1)*f)}else{L=n.dataToPoint([M,S]);if(h)I=n.dataToPoint([M,T])[1];C=L[0]+v,D=I,A=y,k=L[1]-I,Math.abs(k)<f&&(k=(k<=0?-1:1)*f)}d?(l[w]=C,l[w+1]=D,l[w+2]=c?A:k,u&&(u[w]=c?x.x:C,u[w+1]=c?D:x.y,u[w+2]=_),m[i]=i):e.setItemLayout(i,{x:C,y:D,width:A,height:k}),w+=3}d&&e.setLayout({largePoints:l,largeDataIndices:m,largeBackgroundPoints:u,valueAxisHorizontal:c})}}}}}}function Vx(t){return t.coordinateSystem&&"cartesian2d"===t.coordinateSystem.type}function Bx(t){return t.pipelineContext&&t.pipelineContext.large}var Fx=function(t){function e(e){var n=t.call(this,e)||this;return n.type="time",n}return n(e,t),e.prototype.getLabel=function(t){var e=this.getSetting("useUTC");return jc(t.value,Wc[function(t){switch(t){case"year":case"month":return"day";case"millisecond":return"millisecond";default:return"second"}}(Xc(this._minLevelUnit))]||Wc.second,e,this.getSetting("locale"))},e.prototype.getFormattedLabel=function(t,e,n){var i=this.getSetting("useUTC");return function(t,e,n,i,r){var o=null;if(X(n))o=n;else if(U(n))o=n(t.value,e,{level:t.level});else{var a=A({},Fc);if(t.level>0)for(var s=0;s<Hc.length;++s)a[Hc[s]]="{primary|"+a[Hc[s]]+"}";var l=n?!1===n.inherit?n:k(n,a):a,u=qc(t.value,r);if(l[u])o=l[u];else if(l.inherit){for(s=Yc.indexOf(u)-1;s>=0;--s)if(l[u]){o=l[u];break}o=o||a.none}if(Y(o)){var h=null==t.level?0:t.level>=0?t.level:o.length+t.level;o=o[h=Math.min(h,o.length-1)]}}return jc(new Date(t.value),o,r,i)}(t,e,n,this.getSetting("locale"),i)},e.prototype.getTicks=function(){var t=this._interval,e=this._extent,n=[];if(!t)return n;n.push({value:e[0],level:0});var i=this.getSetting("useUTC"),r=function(t,e,n,i){var r=1e4,o=Yc,a=0;function s(t,e,n,r,o,a,s){for(var l=new Date(e),u=e,h=l[r]();u<n&&u<=i[1];)s.push({value:u}),h+=t,l[o](h),u=l.getTime();s.push({value:u,notAdd:!0})}function l(t,r,o){var a=[],l=!r.length;if(!function(t,e,n,i){var r=io(e),o=io(n),a=function(t){return Kc(r,t,i)===Kc(o,t,i)},s=function(){return a("year")},l=function(){return s()&&a("month")},u=function(){return l()&&a("day")},h=function(){return u()&&a("hour")},c=function(){return h()&&a("minute")},p=function(){return c()&&a("second")},d=function(){return p()&&a("millisecond")};switch(t){case"year":return s();case"month":return l();case"day":return u();case"hour":return h();case"minute":return c();case"second":return p();case"millisecond":return d()}}(Xc(t),i[0],i[1],n)){l&&(r=[{value:Zx(new Date(i[0]),t,n)},{value:i[1]}]);for(var u=0;u<r.length-1;u++){var h=r[u].value,c=r[u+1].value;if(h!==c){var p=void 0,d=void 0,f=void 0,g=!1;switch(t){case"year":p=Math.max(1,Math.round(e/Vc/365)),d=$c(n),f=rp(n);break;case"half-year":case"quarter":case"month":p=Hx(e),d=Jc(n),f=op(n);break;case"week":case"half-week":case"day":p=Wx(e),d=Qc(n),f=ap(n),g=!0;break;case"half-day":case"quarter-day":case"hour":p=Yx(e),d=tp(n),f=sp(n);break;case"minute":p=Ux(e,!0),d=ep(n),f=lp(n);break;case"second":p=Ux(e,!1),d=np(n),f=up(n);break;case"millisecond":p=Xx(e),d=ip(n),f=hp(n)}s(p,h,c,d,f,g,a),"year"===t&&o.length>1&&0===u&&o.unshift({value:o[0].value-p})}}for(u=0;u<a.length;u++)o.push(a[u]);return a}}for(var u=[],h=[],c=0,p=0,d=0;d<o.length&&a++<r;++d){var f=Xc(o[d]);if(Zc(o[d]))if(l(o[d],u[u.length-1]||[],h),f!==(o[d+1]?Xc(o[d+1]):null)){if(h.length){p=c,h.sort((function(t,e){return t.value-e.value}));for(var g=[],y=0;y<h.length;++y){var v=h[y].value;0!==y&&h[y-1].value===v||(g.push(h[y]),v>=i[0]&&v<=i[1]&&c++)}var m=(i[1]-i[0])/e;if(c>1.5*m&&p>m/1.5)break;if(u.push(g),c>m||t===o[d])break}h=[]}}0;var x=B(z(u,(function(t){return B(t,(function(t){return t.value>=i[0]&&t.value<=i[1]&&!t.notAdd}))})),(function(t){return t.length>0})),_=[],b=x.length-1;for(d=0;d<x.length;++d)for(var w=x[d],S=0;S<w.length;++S)_.push({value:w[S].value,level:b-d});_.sort((function(t,e){return t.value-e.value}));var M=[];for(d=0;d<_.length;++d)0!==d&&_[d].value===_[d-1].value||M.push(_[d]);return M}(this._minLevelUnit,this._approxInterval,i,e);return(n=n.concat(r)).push({value:e[1],level:0}),n},e.prototype.calcNiceExtent=function(t){var e=this._extent;if(e[0]===e[1]&&(e[0]-=Vc,e[1]+=Vc),e[1]===-1/0&&e[0]===1/0){var n=new Date;e[1]=+new Date(n.getFullYear(),n.getMonth(),n.getDate()),e[0]=e[1]-Vc}this.calcNiceTicks(t.splitNumber,t.minInterval,t.maxInterval)},e.prototype.calcNiceTicks=function(t,e,n){t=t||10;var i=this._extent,r=i[1]-i[0];this._approxInterval=r/t,null!=e&&this._approxInterval<e&&(this._approxInterval=e),null!=n&&this._approxInterval>n&&(this._approxInterval=n);var o=Gx.length,a=Math.min(function(t,e,n,i){for(;n<i;){var r=n+i>>>1;t[r][1]<e?n=r+1:i=r}return n}(Gx,this._approxInterval,0,o),o-1);this._interval=Gx[a][1],this._minLevelUnit=Gx[Math.max(a-1,0)][0]},e.prototype.parse=function(t){return j(t)?t:+io(t)},e.prototype.contain=function(t){return _x(this.parse(t),this._extent)},e.prototype.normalize=function(t){return bx(this.parse(t),this._extent)},e.prototype.scale=function(t){return Sx(t,this._extent)},e.type="time",e}(Tx),Gx=[["second",Nc],["minute",Ec],["hour",zc],["quarter-day",216e5],["half-day",432e5],["day",10368e4],["half-week",3024e5],["week",6048e5],["month",26784e5],["quarter",8208e6],["half-year",Bc/2],["year",Bc]];function Wx(t,e){return(t/=Vc)>16?16:t>7.5?7:t>3.5?4:t>1.5?2:1}function Hx(t){return(t/=2592e6)>6?6:t>3?3:t>2?2:1}function Yx(t){return(t/=zc)>12?12:t>6?6:t>3.5?4:t>2?2:1}function Ux(t,e){return(t/=e?Ec:Nc)>30?30:t>20?20:t>15?15:t>10?10:t>5?5:t>2?2:1}function Xx(t){return ao(t,!0)}function Zx(t,e,n){var i=new Date(t);switch(Xc(e)){case"year":case"month":i[op(n)](0);case"day":i[ap(n)](1);case"hour":i[sp(n)](0);case"minute":i[lp(n)](0);case"second":i[up(n)](0),i[hp(n)](0)}return i.getTime()}cx.registerClass(Fx);var jx=cx.prototype,qx=Tx.prototype,Kx=Xr,$x=Math.floor,Jx=Math.ceil,Qx=Math.pow,t_=Math.log,e_=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="log",e.base=10,e._originalScale=new Tx,e._interval=0,e}return n(e,t),e.prototype.getTicks=function(t){var e=this._originalScale,n=this._extent,i=e.getExtent();return z(qx.getTicks.call(this,t),(function(t){var e=t.value,r=Xr(Qx(this.base,e));return r=e===n[0]&&this._fixMin?i_(r,i[0]):r,{value:r=e===n[1]&&this._fixMax?i_(r,i[1]):r}}),this)},e.prototype.setExtent=function(t,e){var n=t_(this.base);t=t_(Math.max(0,t))/n,e=t_(Math.max(0,e))/n,qx.setExtent.call(this,t,e)},e.prototype.getExtent=function(){var t=this.base,e=jx.getExtent.call(this);e[0]=Qx(t,e[0]),e[1]=Qx(t,e[1]);var n=this._originalScale.getExtent();return this._fixMin&&(e[0]=i_(e[0],n[0])),this._fixMax&&(e[1]=i_(e[1],n[1])),e},e.prototype.unionExtent=function(t){this._originalScale.unionExtent(t);var e=this.base;t[0]=t_(t[0])/t_(e),t[1]=t_(t[1])/t_(e),jx.unionExtent.call(this,t)},e.prototype.unionExtentFromData=function(t,e){this.unionExtent(t.getApproximateExtent(e))},e.prototype.calcNiceTicks=function(t){t=t||10;var e=this._extent,n=e[1]-e[0];if(!(n===1/0||n<=0)){var i=ro(n);for(t/n*i<=.5&&(i*=10);!isNaN(i)&&Math.abs(i)<1&&Math.abs(i)>0;)i*=10;var r=[Xr(Jx(e[0]/i)*i),Xr($x(e[1]/i)*i)];this._interval=i,this._niceExtent=r}},e.prototype.calcNiceExtent=function(t){qx.calcNiceExtent.call(this,t),this._fixMin=t.fixMin,this._fixMax=t.fixMax},e.prototype.parse=function(t){return t},e.prototype.contain=function(t){return _x(t=t_(t)/t_(this.base),this._extent)},e.prototype.normalize=function(t){return bx(t=t_(t)/t_(this.base),this._extent)},e.prototype.scale=function(t){return t=Sx(t,this._extent),Qx(this.base,t)},e.type="log",e}(cx),n_=e_.prototype;function i_(t,e){return Kx(t,jr(e))}n_.getMinorTicks=qx.getMinorTicks,n_.getLabel=qx.getLabel,cx.registerClass(e_);var r_=function(){function t(t,e,n){this._prepareParams(t,e,n)}return t.prototype._prepareParams=function(t,e,n){n[1]<n[0]&&(n=[NaN,NaN]),this._dataMin=n[0],this._dataMax=n[1];var i=this._isOrdinal="ordinal"===t.type;this._needCrossZero="interval"===t.type&&e.getNeedCrossZero&&e.getNeedCrossZero();var r=this._modelMinRaw=e.get("min",!0);U(r)?this._modelMinNum=l_(t,r({min:n[0],max:n[1]})):"dataMin"!==r&&(this._modelMinNum=l_(t,r));var o=this._modelMaxRaw=e.get("max",!0);if(U(o)?this._modelMaxNum=l_(t,o({min:n[0],max:n[1]})):"dataMax"!==o&&(this._modelMaxNum=l_(t,o)),i)this._axisDataLen=e.getCategories().length;else{var a=e.get("boundaryGap"),s=Y(a)?a:[a||0,a||0];"boolean"==typeof s[0]||"boolean"==typeof s[1]?this._boundaryGapInner=[0,0]:this._boundaryGapInner=[Mr(s[0],1),Mr(s[1],1)]}},t.prototype.calculate=function(){var t=this._isOrdinal,e=this._dataMin,n=this._dataMax,i=this._axisDataLen,r=this._boundaryGapInner,o=t?null:n-e||Math.abs(e),a="dataMin"===this._modelMinRaw?e:this._modelMinNum,s="dataMax"===this._modelMaxRaw?n:this._modelMaxNum,l=null!=a,u=null!=s;null==a&&(a=t?i?0:NaN:e-r[0]*o),null==s&&(s=t?i?i-1:NaN:n+r[1]*o),(null==a||!isFinite(a))&&(a=NaN),(null==s||!isFinite(s))&&(s=NaN);var h=nt(a)||nt(s)||t&&!i;this._needCrossZero&&(a>0&&s>0&&!l&&(a=0),a<0&&s<0&&!u&&(s=0));var c=this._determinedMin,p=this._determinedMax;return null!=c&&(a=c,l=!0),null!=p&&(s=p,u=!0),{min:a,max:s,minFixed:l,maxFixed:u,isBlank:h}},t.prototype.modifyDataMinMax=function(t,e){this[a_[t]]=e},t.prototype.setDeterminedMinMax=function(t,e){var n=o_[t];this[n]=e},t.prototype.freeze=function(){this.frozen=!0},t}(),o_={min:"_determinedMin",max:"_determinedMax"},a_={min:"_dataMin",max:"_dataMax"};function s_(t,e,n){var i=t.rawExtentInfo;return i||(i=new r_(t,e,n),t.rawExtentInfo=i,i)}function l_(t,e){return null==e?null:nt(e)?NaN:t.parse(e)}function u_(t,e){var n=t.type,i=s_(t,e,t.getExtent()).calculate();t.setBlank(i.isBlank);var r=i.min,o=i.max,a=e.ecModel;if(a&&"time"===n){var s=Ox("bar",a),l=!1;if(E(s,(function(t){l=l||t.getBaseAxis()===e.axis})),l){var u=Rx(s),h=function(t,e,n,i){var r=n.axis.getExtent(),o=r[1]-r[0],a=function(t,e,n){if(t&&e){var i=t[Px(e)];return null!=i&&null!=n?i[Lx(n)]:i}}(i,n.axis);if(void 0===a)return{min:t,max:e};var s=1/0;E(a,(function(t){s=Math.min(t.offset,s)}));var l=-1/0;E(a,(function(t){l=Math.max(t.offset+t.width,l)})),s=Math.abs(s),l=Math.abs(l);var u=s+l,h=e-t,c=h/(1-(s+l)/o)-h;return{min:t-=c*(s/u),max:e+=c*(l/u)}}(r,o,e,u);r=h.min,o=h.max}}return{extent:[r,o],fixMin:i.minFixed,fixMax:i.maxFixed}}function h_(t,e){var n=e,i=u_(t,n),r=i.extent,o=n.get("splitNumber");t instanceof e_&&(t.base=n.get("logBase"));var a=t.type,s=n.get("interval"),l="interval"===a||"time"===a;t.setExtent(r[0],r[1]),t.calcNiceExtent({splitNumber:o,fixMin:i.fixMin,fixMax:i.fixMax,minInterval:l?n.get("minInterval"):null,maxInterval:l?n.get("maxInterval"):null}),null!=s&&t.setInterval&&t.setInterval(s)}function c_(t,e){if(e=e||t.get("type"))switch(e){case"category":return new Mx({ordinalMeta:t.getOrdinalMeta?t.getOrdinalMeta():t.getCategories(),extent:[1/0,-1/0]});case"time":return new Fx({locale:t.ecModel.getLocaleModel(),useUTC:t.ecModel.get("useUTC")});default:return new(cx.getClass(e)||Tx)}}function p_(t){var e,n,i=t.getLabelModel().get("formatter"),r="category"===t.type?t.scale.getExtent()[0]:null;return"time"===t.scale.type?(n=i,function(e,i){return t.scale.getFormattedLabel(e,i,n)}):X(i)?function(e){return function(n){var i=t.scale.getLabel(n);return e.replace("{value}",null!=i?i:"")}}(i):U(i)?(e=i,function(n,i){return null!=r&&(i=n.value-r),e(d_(t,n),i,null!=n.level?{level:n.level}:null)}):function(e){return t.scale.getLabel(e)}}function d_(t,e){return"category"===t.type?t.scale.getLabel(e):e.value}function f_(t,e){var n=e*Math.PI/180,i=t.width,r=t.height,o=i*Math.abs(Math.cos(n))+Math.abs(r*Math.sin(n)),a=i*Math.abs(Math.sin(n))+Math.abs(r*Math.cos(n));return new Ee(t.x,t.y,o,a)}function g_(t){var e=t.get("interval");return null==e?"auto":e}function y_(t){return"category"===t.type&&0===g_(t.getLabelModel())}function v_(t,e){var n={};return E(t.mapDimensionsAll(e),(function(e){n[ux(t,e)]=!0})),G(n)}var m_=function(){function t(){}return t.prototype.getNeedCrossZero=function(){return!this.option.scale},t.prototype.getCoordSysModel=function(){},t}();var x_={isDimensionStacked:lx,enableDataStack:sx,getStackedDimension:ux};var __=Object.freeze({__proto__:null,createList:function(t){return hx(null,t)},getLayoutRect:Tp,dataStack:x_,createScale:function(t,e){var n=e;e instanceof Sc||(n=new Sc(e));var i=c_(n);return i.setExtent(t[0],t[1]),h_(i,n),i},mixinAxisModelCommonMethods:function(t){R(t,m_)},getECData:Js,createTextStyle:function(t,e){return ec(t,null,null,"normal"!==(e=e||{}).state)},createDimensions:function(t,e){return nx(t,e).dimensions},createSymbol:Vy,enableHoverEmphasis:Wl});function b_(t,e){return Math.abs(t-e)<1e-8}function w_(t,e,n){var i=0,r=t[0];if(!r)return!1;for(var o=1;o<t.length;o++){var a=t[o];i+=ps(r[0],r[1],a[0],a[1],e,n),r=a}var s=t[0];return b_(r[0],s[0])&&b_(r[1],s[1])||(i+=ps(r[0],r[1],s[0],s[1],e,n)),0!==i}var S_=[];function M_(t,e){for(var n=0;n<t.length;n++)Wt(t[n],t[n],e)}function I_(t,e,n,i){for(var r=0;r<t.length;r++){var o=t[r];i&&(o=i.project(o)),o&&isFinite(o[0])&&isFinite(o[1])&&(Ht(e,e,o),Yt(n,n,o))}}var T_=function(){function t(t){this.name=t}return t.prototype.setCenter=function(t){this._center=t},t.prototype.getCenter=function(){var t=this._center;return t||(t=this._center=this.calcCenter()),t},t}(),C_=function(t,e){this.type="polygon",this.exterior=t,this.interiors=e},D_=function(t){this.type="linestring",this.points=t},A_=function(t){function e(e,n,i){var r=t.call(this,e)||this;return r.type="geoJSON",r.geometries=n,r._center=i&&[i[0],i[1]],r}return n(e,t),e.prototype.calcCenter=function(){for(var t,e=this.geometries,n=0,i=0;i<e.length;i++){var r=e[i],o=r.exterior,a=o&&o.length;a>n&&(t=r,n=a)}if(t)return function(t){for(var e=0,n=0,i=0,r=t.length,o=t[r-1][0],a=t[r-1][1],s=0;s<r;s++){var l=t[s][0],u=t[s][1],h=o*u-l*a;e+=h,n+=(o+l)*h,i+=(a+u)*h,o=l,a=u}return e?[n/e/3,i/e/3,e]:[t[0][0]||0,t[0][1]||0]}(t.exterior);var s=this.getBoundingRect();return[s.x+s.width/2,s.y+s.height/2]},e.prototype.getBoundingRect=function(t){var e=this._rect;if(e&&!t)return e;var n=[1/0,1/0],i=[-1/0,-1/0];return E(this.geometries,(function(e){"polygon"===e.type?I_(e.exterior,n,i,t):E(e.points,(function(e){I_(e,n,i,t)}))})),isFinite(n[0])&&isFinite(n[1])&&isFinite(i[0])&&isFinite(i[1])||(n[0]=n[1]=i[0]=i[1]=0),e=new Ee(n[0],n[1],i[0]-n[0],i[1]-n[1]),t||(this._rect=e),e},e.prototype.contain=function(t){var e=this.getBoundingRect(),n=this.geometries;if(!e.contain(t[0],t[1]))return!1;t:for(var i=0,r=n.length;i<r;i++){var o=n[i];if("polygon"===o.type){var a=o.exterior,s=o.interiors;if(w_(a,t[0],t[1])){for(var l=0;l<(s?s.length:0);l++)if(w_(s[l],t[0],t[1]))continue t;return!0}}}return!1},e.prototype.transformTo=function(t,e,n,i){var r=this.getBoundingRect(),o=r.width/r.height;n?i||(i=n/o):n=o*i;for(var a=new Ee(t,e,n,i),s=r.calculateTransform(a),l=this.geometries,u=0;u<l.length;u++){var h=l[u];"polygon"===h.type?(M_(h.exterior,s),E(h.interiors,(function(t){M_(t,s)}))):E(h.points,(function(t){M_(t,s)}))}(r=this._rect).copy(a),this._center=[r.x+r.width/2,r.y+r.height/2]},e.prototype.cloneShallow=function(t){null==t&&(t=this.name);var n=new e(t,this.geometries,this._center);return n._rect=this._rect,n.transformTo=null,n},e}(T_),k_=function(t){function e(e,n){var i=t.call(this,e)||this;return i.type="geoSVG",i._elOnlyForCalculate=n,i}return n(e,t),e.prototype.calcCenter=function(){for(var t=this._elOnlyForCalculate,e=t.getBoundingRect(),n=[e.x+e.width/2,e.y+e.height/2],i=me(S_),r=t;r&&!r.isGeoSVGGraphicRoot;)_e(i,r.getLocalTransform(),i),r=r.parent;return Me(i,i),Wt(n,n,i),n},e}(T_);function L_(t,e,n){for(var i=0;i<t.length;i++)t[i]=P_(t[i],e[i],n)}function P_(t,e,n){for(var i=[],r=e[0],o=e[1],a=0;a<t.length;a+=2){var s=t.charCodeAt(a)-64,l=t.charCodeAt(a+1)-64;s=s>>1^-(1&s),l=l>>1^-(1&l),r=s+=r,o=l+=o,i.push([s/n,l/n])}return i}function O_(t,e){return z(B((t=function(t){if(!t.UTF8Encoding)return t;var e=t,n=e.UTF8Scale;return null==n&&(n=1024),E(e.features,(function(t){var e=t.geometry,i=e.encodeOffsets,r=e.coordinates;if(i)switch(e.type){case"LineString":e.coordinates=P_(r,i,n);break;case"Polygon":case"MultiLineString":L_(r,i,n);break;case"MultiPolygon":E(r,(function(t,e){return L_(t,i[e],n)}))}})),e.UTF8Encoding=!1,e}(t)).features,(function(t){return t.geometry&&t.properties&&t.geometry.coordinates.length>0})),(function(t){var n=t.properties,i=t.geometry,r=[];switch(i.type){case"Polygon":var o=i.coordinates;r.push(new C_(o[0],o.slice(1)));break;case"MultiPolygon":E(i.coordinates,(function(t){t[0]&&r.push(new C_(t[0],t.slice(1)))}));break;case"LineString":r.push(new D_([i.coordinates]));break;case"MultiLineString":r.push(new D_(i.coordinates))}var a=new A_(n[e||"name"],r,n.cp);return a.properties=n,a}))}var R_=Object.freeze({__proto__:null,linearMap:Yr,round:Xr,asc:Zr,getPrecision:jr,getPrecisionSafe:qr,getPixelPrecision:Kr,getPercentWithPrecision:function(t,e,n){return t[e]&&$r(t,n)[e]||0},MAX_SAFE_INTEGER:Qr,remRadian:to,isRadianAroundZero:eo,parseDate:io,quantity:ro,quantityExponent:oo,nice:ao,quantile:so,reformIntervals:lo,isNumeric:ho,numericToNumber:uo}),N_=Object.freeze({__proto__:null,parse:io,format:jc}),E_=Object.freeze({__proto__:null,extendShape:Sh,extendPath:Ih,makePath:Dh,makeImage:Ah,mergePath:Lh,resizePath:Ph,createIcon:Wh,updateProps:dh,initProps:fh,getTransform:Nh,clipPointsByRect:Fh,clipRectByRect:Gh,registerShape:Th,getShapeClass:Ch,Group:Er,Image:As,Text:Bs,Circle:xu,Ellipse:bu,Sector:Eu,Ring:Vu,Polygon:Gu,Polyline:Hu,Rect:Es,Line:Xu,BezierCurve:Ku,Arc:Ju,IncrementalDisplayable:uh,CompoundPath:Qu,LinearGradient:eh,RadialGradient:nh,BoundingRect:Ee}),z_=Object.freeze({__proto__:null,addCommas:cp,toCamelCase:pp,normalizeCssArray:dp,encodeHTML:ie,formatTpl:vp,getTooltipMarker:mp,formatTime:function(t,e,n){"week"!==t&&"month"!==t&&"quarter"!==t&&"half-year"!==t&&"year"!==t||(t="MM-dd\nyyyy");var i=io(e),r=n?"getUTC":"get",o=i[r+"FullYear"](),a=i[r+"Month"]()+1,s=i[r+"Date"](),l=i[r+"Hours"](),u=i[r+"Minutes"](),h=i[r+"Seconds"](),c=i[r+"Milliseconds"]();return t=t.replace("MM",Uc(a,2)).replace("M",a).replace("yyyy",o).replace("yy",Uc(o%100+"",2)).replace("dd",Uc(s,2)).replace("d",s).replace("hh",Uc(l,2)).replace("h",l).replace("mm",Uc(u,2)).replace("m",u).replace("ss",Uc(h,2)).replace("s",h).replace("SSS",Uc(c,3))},capitalFirst:function(t){return t?t.charAt(0).toUpperCase()+t.substr(1):t},truncateText:aa,getTextRect:function(t,e,n,i,r,o,a,s){return new Bs({style:{text:t,font:e,align:n,verticalAlign:i,padding:r,rich:o,overflow:a?"truncate":null,lineHeight:s}}).getBoundingRect()}}),V_=Object.freeze({__proto__:null,map:z,each:E,indexOf:P,inherits:O,reduce:V,filter:B,bind:W,curry:H,isArray:Y,isString:X,isObject:q,isFunction:U,extend:A,defaults:k,clone:T,merge:C}),B_=Po();function F_(t){return"category"===t.type?function(t){var e=t.getLabelModel(),n=W_(t,e);return!e.get("show")||t.scale.isBlank()?{labels:[],labelCategoryInterval:n.labelCategoryInterval}:n}(t):function(t){var e=t.scale.getTicks(),n=p_(t);return{labels:z(e,(function(e,i){return{level:e.level,formattedLabel:n(e,i),rawLabel:t.scale.getLabel(e),tickValue:e.value}}))}}(t)}function G_(t,e){return"category"===t.type?function(t,e){var n,i,r=H_(t,"ticks"),o=g_(e),a=Y_(r,o);if(a)return a;e.get("show")&&!t.scale.isBlank()||(n=[]);if(U(o))n=Z_(t,o,!0);else if("auto"===o){var s=W_(t,t.getLabelModel());i=s.labelCategoryInterval,n=z(s.labels,(function(t){return t.tickValue}))}else n=X_(t,i=o,!0);return U_(r,o,{ticks:n,tickCategoryInterval:i})}(t,e):{ticks:z(t.scale.getTicks(),(function(t){return t.value}))}}function W_(t,e){var n,i,r=H_(t,"labels"),o=g_(e),a=Y_(r,o);return a||(U(o)?n=Z_(t,o):(i="auto"===o?function(t){var e=B_(t).autoInterval;return null!=e?e:B_(t).autoInterval=t.calculateCategoryInterval()}(t):o,n=X_(t,i)),U_(r,o,{labels:n,labelCategoryInterval:i}))}function H_(t,e){return B_(t)[e]||(B_(t)[e]=[])}function Y_(t,e){for(var n=0;n<t.length;n++)if(t[n].key===e)return t[n].value}function U_(t,e,n){return t.push({key:e,value:n}),n}function X_(t,e,n){var i=p_(t),r=t.scale,o=r.getExtent(),a=t.getLabelModel(),s=[],l=Math.max((e||0)+1,1),u=o[0],h=r.count();0!==u&&l>1&&h/l>2&&(u=Math.round(Math.ceil(u/l)*l));var c=y_(t),p=a.get("showMinLabel")||c,d=a.get("showMaxLabel")||c;p&&u!==o[0]&&g(o[0]);for(var f=u;f<=o[1];f+=l)g(f);function g(t){var e={value:t};s.push(n?t:{formattedLabel:i(e),rawLabel:r.getLabel(e),tickValue:t})}return d&&f-l!==o[1]&&g(o[1]),s}function Z_(t,e,n){var i=t.scale,r=p_(t),o=[];return E(i.getTicks(),(function(t){var a=i.getLabel(t),s=t.value;e(t.value,a)&&o.push(n?s:{formattedLabel:r(t),rawLabel:a,tickValue:s})})),o}var j_=[0,1],q_=function(){function t(t,e,n){this.onBand=!1,this.inverse=!1,this.dim=t,this.scale=e,this._extent=n||[0,0]}return t.prototype.contain=function(t){var e=this._extent,n=Math.min(e[0],e[1]),i=Math.max(e[0],e[1]);return t>=n&&t<=i},t.prototype.containData=function(t){return this.scale.contain(t)},t.prototype.getExtent=function(){return this._extent.slice()},t.prototype.getPixelPrecision=function(t){return Kr(t||this.scale.getExtent(),this._extent)},t.prototype.setExtent=function(t,e){var n=this._extent;n[0]=t,n[1]=e},t.prototype.dataToCoord=function(t,e){var n=this._extent,i=this.scale;return t=i.normalize(t),this.onBand&&"ordinal"===i.type&&K_(n=n.slice(),i.count()),Yr(t,j_,n,e)},t.prototype.coordToData=function(t,e){var n=this._extent,i=this.scale;this.onBand&&"ordinal"===i.type&&K_(n=n.slice(),i.count());var r=Yr(t,n,j_,e);return this.scale.scale(r)},t.prototype.pointToData=function(t,e){},t.prototype.getTicksCoords=function(t){var e=(t=t||{}).tickModel||this.getTickModel(),n=z(G_(this,e).ticks,(function(t){return{coord:this.dataToCoord("ordinal"===this.scale.type?this.scale.getRawOrdinalNumber(t):t),tickValue:t}}),this);return function(t,e,n,i){var r=e.length;if(!t.onBand||n||!r)return;var o,a,s=t.getExtent();if(1===r)e[0].coord=s[0],o=e[1]={coord:s[0]};else{var l=e[r-1].tickValue-e[0].tickValue,u=(e[r-1].coord-e[0].coord)/l;E(e,(function(t){t.coord-=u/2})),a=1+t.scale.getExtent()[1]-e[r-1].tickValue,o={coord:e[r-1].coord+u*a},e.push(o)}var h=s[0]>s[1];c(e[0].coord,s[0])&&(i?e[0].coord=s[0]:e.shift());i&&c(s[0],e[0].coord)&&e.unshift({coord:s[0]});c(s[1],o.coord)&&(i?o.coord=s[1]:e.pop());i&&c(o.coord,s[1])&&e.push({coord:s[1]});function c(t,e){return t=Xr(t),e=Xr(e),h?t>e:t<e}}(this,n,e.get("alignWithLabel"),t.clamp),n},t.prototype.getMinorTicksCoords=function(){if("ordinal"===this.scale.type)return[];var t=this.model.getModel("minorTick").get("splitNumber");return t>0&&t<100||(t=5),z(this.scale.getMinorTicks(t),(function(t){return z(t,(function(t){return{coord:this.dataToCoord(t),tickValue:t}}),this)}),this)},t.prototype.getViewLabels=function(){return F_(this).labels},t.prototype.getLabelModel=function(){return this.model.getModel("axisLabel")},t.prototype.getTickModel=function(){return this.model.getModel("axisTick")},t.prototype.getBandWidth=function(){var t=this._extent,e=this.scale.getExtent(),n=e[1]-e[0]+(this.onBand?1:0);0===n&&(n=1);var i=Math.abs(t[1]-t[0]);return Math.abs(i)/n},t.prototype.calculateCategoryInterval=function(){return function(t){var e=function(t){var e=t.getLabelModel();return{axisRotate:t.getRotate?t.getRotate():t.isHorizontal&&!t.isHorizontal()?90:0,labelRotate:e.get("rotate")||0,font:e.getFont()}}(t),n=p_(t),i=(e.axisRotate-e.labelRotate)/180*Math.PI,r=t.scale,o=r.getExtent(),a=r.count();if(o[1]-o[0]<1)return 0;var s=1;a>40&&(s=Math.max(1,Math.floor(a/40)));for(var l=o[0],u=t.dataToCoord(l+1)-t.dataToCoord(l),h=Math.abs(u*Math.cos(i)),c=Math.abs(u*Math.sin(i)),p=0,d=0;l<=o[1];l+=s){var f,g,y=_r(n({value:l}),e.font,"center","top");f=1.3*y.width,g=1.3*y.height,p=Math.max(p,f,7),d=Math.max(d,g,7)}var v=p/h,m=d/c;isNaN(v)&&(v=1/0),isNaN(m)&&(m=1/0);var x=Math.max(0,Math.floor(Math.min(v,m))),_=B_(t.model),b=t.getExtent(),w=_.lastAutoInterval,S=_.lastTickCount;return null!=w&&null!=S&&Math.abs(w-x)<=1&&Math.abs(S-a)<=1&&w>x&&_.axisExtent0===b[0]&&_.axisExtent1===b[1]?x=w:(_.lastTickCount=a,_.lastAutoInterval=x,_.axisExtent0=b[0],_.axisExtent1=b[1]),x}(this)},t}();function K_(t,e){var n=(t[1]-t[0])/e/2;t[0]+=n,t[1]-=n}var $_=2*Math.PI,J_=rs.CMD,Q_=["top","right","bottom","left"];function tb(t,e,n,i,r){var o=n.width,a=n.height;switch(t){case"top":i.set(n.x+o/2,n.y-e),r.set(0,-1);break;case"bottom":i.set(n.x+o/2,n.y+a+e),r.set(0,1);break;case"left":i.set(n.x-e,n.y+a/2),r.set(-1,0);break;case"right":i.set(n.x+o+e,n.y+a/2),r.set(1,0)}}function eb(t,e,n,i,r,o,a,s,l){a-=t,s-=e;var u=Math.sqrt(a*a+s*s),h=(a/=u)*n+t,c=(s/=u)*n+e;if(Math.abs(i-r)%$_<1e-4)return l[0]=h,l[1]=c,u-n;if(o){var p=i;i=us(r),r=us(p)}else i=us(i),r=us(r);i>r&&(r+=$_);var d=Math.atan2(s,a);if(d<0&&(d+=$_),d>=i&&d<=r||d+$_>=i&&d+$_<=r)return l[0]=h,l[1]=c,u-n;var f=n*Math.cos(i)+t,g=n*Math.sin(i)+e,y=n*Math.cos(r)+t,v=n*Math.sin(r)+e,m=(f-a)*(f-a)+(g-s)*(g-s),x=(y-a)*(y-a)+(v-s)*(v-s);return m<x?(l[0]=f,l[1]=g,Math.sqrt(m)):(l[0]=y,l[1]=v,Math.sqrt(x))}function nb(t,e,n,i,r,o,a,s){var l=r-t,u=o-e,h=n-t,c=i-e,p=Math.sqrt(h*h+c*c),d=(l*(h/=p)+u*(c/=p))/p;s&&(d=Math.min(Math.max(d,0),1)),d*=p;var f=a[0]=t+d*h,g=a[1]=e+d*c;return Math.sqrt((f-r)*(f-r)+(g-o)*(g-o))}function ib(t,e,n,i,r,o,a){n<0&&(t+=n,n=-n),i<0&&(e+=i,i=-i);var s=t+n,l=e+i,u=a[0]=Math.min(Math.max(r,t),s),h=a[1]=Math.min(Math.max(o,e),l);return Math.sqrt((u-r)*(u-r)+(h-o)*(h-o))}var rb=[];function ob(t,e,n){var i=ib(e.x,e.y,e.width,e.height,t.x,t.y,rb);return n.set(rb[0],rb[1]),i}function ab(t,e,n){for(var i,r,o=0,a=0,s=0,l=0,u=1/0,h=e.data,c=t.x,p=t.y,d=0;d<h.length;){var f=h[d++];1===d&&(s=o=h[d],l=a=h[d+1]);var g=u;switch(f){case J_.M:o=s=h[d++],a=l=h[d++];break;case J_.L:g=nb(o,a,h[d],h[d+1],c,p,rb,!0),o=h[d++],a=h[d++];break;case J_.C:g=wn(o,a,h[d++],h[d++],h[d++],h[d++],h[d],h[d+1],c,p,rb),o=h[d++],a=h[d++];break;case J_.Q:g=Dn(o,a,h[d++],h[d++],h[d],h[d+1],c,p,rb),o=h[d++],a=h[d++];break;case J_.A:var y=h[d++],v=h[d++],m=h[d++],x=h[d++],_=h[d++],b=h[d++];d+=1;var w=!!(1-h[d++]);i=Math.cos(_)*m+y,r=Math.sin(_)*x+v,d<=1&&(s=i,l=r),g=eb(y,v,x,_,_+b,w,(c-y)*x/m+y,p,rb),o=Math.cos(_+b)*m+y,a=Math.sin(_+b)*x+v;break;case J_.R:g=ib(s=o=h[d++],l=a=h[d++],h[d++],h[d++],c,p,rb);break;case J_.Z:g=nb(o,a,s,l,c,p,rb,!0),o=s,a=l}g<u&&(u=g,n.set(rb[0],rb[1]))}return u}var sb=new Ce,lb=new Ce,ub=new Ce,hb=new Ce,cb=new Ce;function pb(t,e){if(t){var n=t.getTextGuideLine(),i=t.getTextContent();if(i&&n){var r=t.textGuideLineConfig||{},o=[[0,0],[0,0],[0,0]],a=r.candidates||Q_,s=i.getBoundingRect().clone();s.applyTransform(i.getComputedTransform());var l=1/0,u=r.anchor,h=t.getComputedTransform(),c=h&&Me([],h),p=e.get("length2")||0;u&&ub.copy(u);for(var d=0;d<a.length;d++){tb(a[d],0,s,sb,hb),Ce.scaleAndAdd(lb,sb,hb,p),lb.transform(c);var f=t.getBoundingRect(),g=u?u.distance(lb):t instanceof Ms?ab(lb,t.path,ub):ob(lb,f,ub);g<l&&(l=g,lb.transform(h),ub.transform(h),ub.toArray(o[0]),lb.toArray(o[1]),sb.toArray(o[2]))}gb(o,e.get("minTurnAngle")),n.setShape({points:o})}}}var db=[],fb=new Ce;function gb(t,e){if(e<=180&&e>0){e=e/180*Math.PI,sb.fromArray(t[0]),lb.fromArray(t[1]),ub.fromArray(t[2]),Ce.sub(hb,sb,lb),Ce.sub(cb,ub,lb);var n=hb.len(),i=cb.len();if(!(n<.001||i<.001)){hb.scale(1/n),cb.scale(1/i);var r=hb.dot(cb);if(Math.cos(e)<r){var o=nb(lb.x,lb.y,ub.x,ub.y,sb.x,sb.y,db,!1);fb.fromArray(db),fb.scaleAndAdd(cb,o/Math.tan(Math.PI-e));var a=ub.x!==lb.x?(fb.x-lb.x)/(ub.x-lb.x):(fb.y-lb.y)/(ub.y-lb.y);if(isNaN(a))return;a<0?Ce.copy(fb,lb):a>1&&Ce.copy(fb,ub),fb.toArray(t[1])}}}}function yb(t,e,n){if(n<=180&&n>0){n=n/180*Math.PI,sb.fromArray(t[0]),lb.fromArray(t[1]),ub.fromArray(t[2]),Ce.sub(hb,lb,sb),Ce.sub(cb,ub,lb);var i=hb.len(),r=cb.len();if(!(i<.001||r<.001))if(hb.scale(1/i),cb.scale(1/r),hb.dot(e)<Math.cos(n)){var o=nb(lb.x,lb.y,ub.x,ub.y,sb.x,sb.y,db,!1);fb.fromArray(db);var a=Math.PI/2,s=a+Math.acos(cb.dot(e))-n;if(s>=a)Ce.copy(fb,ub);else{fb.scaleAndAdd(cb,o/Math.tan(Math.PI/2-s));var l=ub.x!==lb.x?(fb.x-lb.x)/(ub.x-lb.x):(fb.y-lb.y)/(ub.y-lb.y);if(isNaN(l))return;l<0?Ce.copy(fb,lb):l>1&&Ce.copy(fb,ub)}fb.toArray(t[1])}}}function vb(t,e,n,i){var r="normal"===n,o=r?t:t.ensureState(n);o.ignore=e;var a=i.get("smooth");a&&!0===a&&(a=.3),o.shape=o.shape||{},a>0&&(o.shape.smooth=a);var s=i.getModel("lineStyle").getLineStyle();r?t.useStyle(s):o.style=s}function mb(t,e){var n=e.smooth,i=e.points;if(i)if(t.moveTo(i[0][0],i[0][1]),n>0&&i.length>=3){var r=Vt(i[0],i[1]),o=Vt(i[1],i[2]);if(!r||!o)return t.lineTo(i[1][0],i[1][1]),void t.lineTo(i[2][0],i[2][1]);var a=Math.min(r,o)*n,s=Gt([],i[1],i[0],a/r),l=Gt([],i[1],i[2],a/o),u=Gt([],s,l,.5);t.bezierCurveTo(s[0],s[1],s[0],s[1],u[0],u[1]),t.bezierCurveTo(l[0],l[1],l[0],l[1],i[2][0],i[2][1])}else for(var h=1;h<i.length;h++)t.lineTo(i[h][0],i[h][1])}function xb(t,e,n){var i=t.getTextGuideLine(),r=t.getTextContent();if(r){for(var o=e.normal,a=o.get("show"),s=r.ignore,l=0;l<ol.length;l++){var u=ol[l],h=e[u],c="normal"===u;if(h){var p=h.get("show");if((c?s:rt(r.states[u]&&r.states[u].ignore,s))||!rt(p,a)){var d=c?i:i&&i.states[u];d&&(d.ignore=!0);continue}i||(i=new Hu,t.setTextGuideLine(i),c||!s&&a||vb(i,!0,"normal",e.normal),t.stateProxy&&(i.stateProxy=t.stateProxy)),vb(i,!1,u,h)}}if(i){k(i.style,n),i.style.fill=null;var f=o.get("showAbove");(t.textGuideLineConfig=t.textGuideLineConfig||{}).showAbove=f||!1,i.buildPath=mb}}else i&&t.removeTextGuideLine()}function _b(t,e){e=e||"labelLine";for(var n={normal:t.getModel(e)},i=0;i<rl.length;i++){var r=rl[i];n[r]=t.getModel([r,e])}return n}function bb(t){for(var e=[],n=0;n<t.length;n++){var i=t[n];if(!i.defaultAttr.ignore){var r=i.label,o=r.getComputedTransform(),a=r.getBoundingRect(),s=!o||o[1]<1e-5&&o[2]<1e-5,l=r.style.margin||0,u=a.clone();u.applyTransform(o),u.x-=l/2,u.y-=l/2,u.width+=l,u.height+=l;var h=s?new sh(a,o):null;e.push({label:r,labelLine:i.labelLine,rect:u,localRect:a,obb:h,priority:i.priority,defaultAttr:i.defaultAttr,layoutOption:i.computedLayoutOption,axisAligned:s,transform:o})}}return e}function wb(t,e,n,i,r,o){var a=t.length;if(!(a<2)){t.sort((function(t,n){return t.rect[e]-n.rect[e]}));for(var s,l=0,u=!1,h=0,c=0;c<a;c++){var p=t[c],d=p.rect;(s=d[e]-l)<0&&(d[e]-=s,p.label[e]-=s,u=!0),h+=Math.max(-s,0),l=d[e]+d[n]}h>0&&o&&_(-h/a,0,a);var f,g,y=t[0],v=t[a-1];return m(),f<0&&b(-f,.8),g<0&&b(g,.8),m(),x(f,g,1),x(g,f,-1),m(),f<0&&w(-f),g<0&&w(g),u}function m(){f=y.rect[e]-i,g=r-v.rect[e]-v.rect[n]}function x(t,e,n){if(t<0){var i=Math.min(e,-t);if(i>0){_(i*n,0,a);var r=i+t;r<0&&b(-r*n,1)}else b(-t*n,1)}}function _(n,i,r){0!==n&&(u=!0);for(var o=i;o<r;o++){var a=t[o];a.rect[e]+=n,a.label[e]+=n}}function b(i,r){for(var o=[],s=0,l=1;l<a;l++){var u=t[l-1].rect,h=Math.max(t[l].rect[e]-u[e]-u[n],0);o.push(h),s+=h}if(s){var c=Math.min(Math.abs(i)/s,r);if(i>0)for(l=0;l<a-1;l++){_(o[l]*c,0,l+1)}else for(l=a-1;l>0;l--){_(-(o[l-1]*c),l,a)}}}function w(t){var e=t<0?-1:1;t=Math.abs(t);for(var n=Math.ceil(t/(a-1)),i=0;i<a-1;i++)if(e>0?_(n,0,i+1):_(-n,a-i-1,a),(t-=n)<=0)return}}function Sb(t,e,n,i){return wb(t,"y","height",e,n,i)}function Mb(t){var e=[];t.sort((function(t,e){return e.priority-t.priority}));var n=new Ee(0,0,0,0);function i(t){if(!t.ignore){var e=t.ensureState("emphasis");null==e.ignore&&(e.ignore=!1)}t.ignore=!0}for(var r=0;r<t.length;r++){var o=t[r],a=o.axisAligned,s=o.localRect,l=o.transform,u=o.label,h=o.labelLine;n.copy(o.rect),n.width-=.1,n.height-=.1,n.x+=.05,n.y+=.05;for(var c=o.obb,p=!1,d=0;d<e.length;d++){var f=e[d];if(n.intersect(f.rect)){if(a&&f.axisAligned){p=!0;break}if(f.obb||(f.obb=new sh(f.localRect,f.transform)),c||(c=new sh(s,l)),c.intersect(f.obb)){p=!0;break}}}p?(i(u),h&&i(h)):(u.attr("ignore",o.defaultAttr.ignore),h&&h.attr("ignore",o.defaultAttr.labelGuideIgnore),e.push(o))}}function Ib(t){if(t){for(var e=[],n=0;n<t.length;n++)e.push(t[n].slice());return e}}function Tb(t,e){var n=t.label,i=e&&e.getTextGuideLine();return{dataIndex:t.dataIndex,dataType:t.dataType,seriesIndex:t.seriesModel.seriesIndex,text:t.label.style.text,rect:t.hostRect,labelRect:t.rect,align:n.style.align,verticalAlign:n.style.verticalAlign,labelLinePoints:Ib(i&&i.shape.points)}}var Cb=["align","verticalAlign","width","height","fontSize"],Db=new fr,Ab=Po(),kb=Po();function Lb(t,e,n){for(var i=0;i<n.length;i++){var r=n[i];null!=e[r]&&(t[r]=e[r])}}var Pb=["x","y","rotation"],Ob=function(){function t(){this._labelList=[],this._chartViewList=[]}return t.prototype.clearLabels=function(){this._labelList=[],this._chartViewList=[]},t.prototype._addLabel=function(t,e,n,i,r){var o=i.style,a=i.__hostTarget.textConfig||{},s=i.getComputedTransform(),l=i.getBoundingRect().plain();Ee.applyTransform(l,l,s),s?Db.setLocalTransform(s):(Db.x=Db.y=Db.rotation=Db.originX=Db.originY=0,Db.scaleX=Db.scaleY=1);var u,h=i.__hostTarget;if(h){u=h.getBoundingRect().plain();var c=h.getComputedTransform();Ee.applyTransform(u,u,c)}var p=u&&h.getTextGuideLine();this._labelList.push({label:i,labelLine:p,seriesModel:n,dataIndex:t,dataType:e,layoutOption:r,computedLayoutOption:null,rect:l,hostRect:u,priority:u?u.width*u.height:0,defaultAttr:{ignore:i.ignore,labelGuideIgnore:p&&p.ignore,x:Db.x,y:Db.y,scaleX:Db.scaleX,scaleY:Db.scaleY,rotation:Db.rotation,style:{x:o.x,y:o.y,align:o.align,verticalAlign:o.verticalAlign,width:o.width,height:o.height,fontSize:o.fontSize},cursor:i.cursor,attachedPos:a.position,attachedRot:a.rotation}})},t.prototype.addLabelsOfSeries=function(t){var e=this;this._chartViewList.push(t);var n=t.__model,i=n.get("labelLayout");(U(i)||G(i).length)&&t.group.traverse((function(t){if(t.ignore)return!0;var r=t.getTextContent(),o=Js(t);r&&!r.disableLabelLayout&&e._addLabel(o.dataIndex,o.dataType,n,r,i)}))},t.prototype.updateLayoutConfig=function(t){var e=t.getWidth(),n=t.getHeight();function i(t,e){return function(){pb(t,e)}}for(var r=0;r<this._labelList.length;r++){var o=this._labelList[r],a=o.label,s=a.__hostTarget,l=o.defaultAttr,u=void 0;u=(u=U(o.layoutOption)?o.layoutOption(Tb(o,s)):o.layoutOption)||{},o.computedLayoutOption=u;var h=Math.PI/180;s&&s.setTextConfig({local:!1,position:null!=u.x||null!=u.y?null:l.attachedPos,rotation:null!=u.rotate?u.rotate*h:l.attachedRot,offset:[u.dx||0,u.dy||0]});var c=!1;if(null!=u.x?(a.x=Ur(u.x,e),a.setStyle("x",0),c=!0):(a.x=l.x,a.setStyle("x",l.style.x)),null!=u.y?(a.y=Ur(u.y,n),a.setStyle("y",0),c=!0):(a.y=l.y,a.setStyle("y",l.style.y)),u.labelLinePoints){var p=s.getTextGuideLine();p&&(p.setShape({points:u.labelLinePoints}),c=!1)}Ab(a).needsUpdateLabelLine=c,a.rotation=null!=u.rotate?u.rotate*h:l.rotation,a.scaleX=l.scaleX,a.scaleY=l.scaleY;for(var d=0;d<Cb.length;d++){var f=Cb[d];a.setStyle(f,null!=u[f]?u[f]:l.style[f])}if(u.draggable){if(a.draggable=!0,a.cursor="move",s){var g=o.seriesModel;if(null!=o.dataIndex)g=o.seriesModel.getData(o.dataType).getItemModel(o.dataIndex);a.on("drag",i(s,g.getModel("labelLine")))}}else a.off("drag"),a.cursor=l.cursor}},t.prototype.layout=function(t){var e,n=t.getWidth(),i=t.getHeight(),r=bb(this._labelList),o=B(r,(function(t){return"shiftX"===t.layoutOption.moveOverlap})),a=B(r,(function(t){return"shiftY"===t.layoutOption.moveOverlap}));wb(o,"x","width",0,n,e),Sb(a,0,i),Mb(B(r,(function(t){return t.layoutOption.hideOverlap})))},t.prototype.processLabelsOverall=function(){var t=this;E(this._chartViewList,(function(e){var n=e.__model,i=e.ignoreLabelLineUpdate,r=n.isAnimationEnabled();e.group.traverse((function(e){if(e.ignore&&!e.forceLabelAnimation)return!0;var o=!i,a=e.getTextContent();!o&&a&&(o=Ab(a).needsUpdateLabelLine),o&&t._updateLabelLine(e,n),r&&t._animateLabels(e,n)}))}))},t.prototype._updateLabelLine=function(t,e){var n=t.getTextContent(),i=Js(t),r=i.dataIndex;if(n&&null!=r){var o=e.getData(i.dataType),a=o.getItemModel(r),s={},l=o.getItemVisual(r,"style"),u=o.getVisual("drawType");s.stroke=l[u];var h=a.getModel("labelLine");xb(t,_b(a),s),pb(t,h)}},t.prototype._animateLabels=function(t,e){var n=t.getTextContent(),i=t.getTextGuideLine();if(n&&(t.forceLabelAnimation||!n.ignore&&!n.invisible&&!t.disableLabelAnimation&&!gh(t))){var r=(d=Ab(n)).oldLayout,o=Js(t),a=o.dataIndex,s={x:n.x,y:n.y,rotation:n.rotation},l=e.getData(o.dataType);if(r){n.attr(r);var u=t.prevStates;u&&(P(u,"select")>=0&&n.attr(d.oldLayoutSelect),P(u,"emphasis")>=0&&n.attr(d.oldLayoutEmphasis)),dh(n,s,e,a)}else if(n.attr(s),!lc(n).valueAnimation){var h=rt(n.style.opacity,1);n.style.opacity=0,fh(n,{style:{opacity:h}},e,a)}if(d.oldLayout=s,n.states.select){var c=d.oldLayoutSelect={};Lb(c,s,Pb),Lb(c,n.states.select,Pb)}if(n.states.emphasis){var p=d.oldLayoutEmphasis={};Lb(p,s,Pb),Lb(p,n.states.emphasis,Pb)}hc(n,a,l,e,e)}if(i&&!i.ignore&&!i.invisible){r=(d=kb(i)).oldLayout;var d,f={points:i.shape.points};r?(i.attr({shape:r}),dh(i,{shape:f},e)):(i.setShape(f),i.style.strokePercent=0,fh(i,{style:{strokePercent:1}},e)),d.oldLayout=f}},t}(),Rb=Po();var Nb=Math.sin,Eb=Math.cos,zb=Math.PI,Vb=2*Math.PI,Bb=180/zb,Fb=function(){function t(){}return t.prototype.reset=function(t){this._start=!0,this._d=[],this._str="",this._p=Math.pow(10,t||4)},t.prototype.moveTo=function(t,e){this._add("M",t,e)},t.prototype.lineTo=function(t,e){this._add("L",t,e)},t.prototype.bezierCurveTo=function(t,e,n,i,r,o){this._add("C",t,e,n,i,r,o)},t.prototype.quadraticCurveTo=function(t,e,n,i){this._add("Q",t,e,n,i)},t.prototype.arc=function(t,e,n,i,r,o){this.ellipse(t,e,n,n,0,i,r,o)},t.prototype.ellipse=function(t,e,n,i,r,o,a,s){var l=a-o,u=!s,h=Math.abs(l),c=ui(h-Vb)||(u?l>=Vb:-l>=Vb),p=l>0?l%Vb:l%Vb+Vb,d=!1;d=!!c||!ui(h)&&p>=zb==!!u;var f=t+n*Eb(o),g=e+i*Nb(o);this._start&&this._add("M",f,g);var y=Math.round(r*Bb);if(c){var v=1/this._p,m=(u?1:-1)*(Vb-v);this._add("A",n,i,y,1,+u,t+n*Eb(o+m),e+i*Nb(o+m)),v>.01&&this._add("A",n,i,y,0,+u,f,g)}else{var x=t+n*Eb(a),_=e+i*Nb(a);this._add("A",n,i,y,+d,+u,x,_)}},t.prototype.rect=function(t,e,n,i){this._add("M",t,e),this._add("l",n,0),this._add("l",0,i),this._add("l",-n,0),this._add("Z")},t.prototype.closePath=function(){this._d.length>0&&this._add("Z")},t.prototype._add=function(t,e,n,i,r,o,a,s,l){for(var u=[],h=this._p,c=1;c<arguments.length;c++){var p=arguments[c];if(isNaN(p))return void(this._invalid=!0);u.push(Math.round(p*h)/h)}this._d.push(t+u.join(" ")),this._start="Z"===t},t.prototype.generateStr=function(){this._str=this._invalid?"":this._d.join(""),this._d=[]},t.prototype.getStr=function(){return this._str},t}(),Gb="none",Wb=Math.round;var Hb=["lineCap","miterLimit","lineJoin"],Yb=z(Hb,(function(t){return"stroke-"+t.toLowerCase()}));function Ub(t,e,n,i){var r=null==e.opacity?1:e.opacity;if(n instanceof As)t("opacity",r);else{if(function(t){var e=t.fill;return null!=e&&e!==Gb}(e)){var o=si(e.fill);t("fill",o.color);var a=null!=e.fillOpacity?e.fillOpacity*o.opacity*r:o.opacity*r;(i||a<1)&&t("fill-opacity",a)}else t("fill",Gb);if(function(t){var e=t.stroke;return null!=e&&e!==Gb}(e)){var s=si(e.stroke);t("stroke",s.color);var l=e.strokeNoScale?n.getLineScale():1,u=l?(e.lineWidth||0)/l:0,h=null!=e.strokeOpacity?e.strokeOpacity*s.opacity*r:s.opacity*r,c=e.strokeFirst;if((i||1!==u)&&t("stroke-width",u),(i||c)&&t("paint-order",c?"stroke":"fill"),(i||h<1)&&t("stroke-opacity",h),e.lineDash){var p=Uy(n),d=p[0],f=p[1];d&&(f=Wb(f||0),t("stroke-dasharray",d.join(",")),(f||i)&&t("stroke-dashoffset",f))}else i&&t("stroke-dasharray",Gb);for(var g=0;g<Hb.length;g++){var y=Hb[g];if(i||e[y]!==bs[y]){var v=e[y]||bs[y];v&&t(Yb[g],v)}}}else i&&t("stroke",Gb)}}var Xb="http://www.w3.org/2000/svg",Zb="http://www.w3.org/1999/xlink";function jb(t){return document.createElementNS(Xb,t)}function qb(t,e,n,i,r){return{tag:t,attrs:n||{},children:i,text:r,key:e}}function Kb(t,e){var n=(e=e||{}).newline?"\n":"";return function t(e){var i=e.children,r=e.tag;return function(t,e){var n=[];if(e)for(var i in e){var r=e[i],o=i;!1!==r&&(!0!==r&&null!=r&&(o+='="'+r+'"'),n.push(o))}return"<"+t+" "+n.join(" ")+">"}(r,e.attrs)+ie(e.text)+(i?""+n+z(i,(function(e){return t(e)})).join(n)+n:"")+("</"+r+">")}(t)}function $b(t){return{zrId:t,shadowCache:{},patternCache:{},gradientCache:{},clipPathCache:{},defs:{},cssNodes:{},cssAnims:{},cssClassIdx:0,cssAnimIdx:0,shadowIdx:0,gradientIdx:0,patternIdx:0,clipPathIdx:0}}function Jb(t,e,n,i){return qb("svg","root",{width:t,height:e,xmlns:Xb,"xmlns:xlink":Zb,version:"1.1",baseProfile:"full",viewBox:!!i&&"0 0 "+t+" "+e},n)}var Qb={cubicIn:"0.32,0,0.67,0",cubicOut:"0.33,1,0.68,1",cubicInOut:"0.65,0,0.35,1",quadraticIn:"0.11,0,0.5,0",quadraticOut:"0.5,1,0.89,1",quadraticInOut:"0.45,0,0.55,1",quarticIn:"0.5,0,0.75,0",quarticOut:"0.25,1,0.5,1",quarticInOut:"0.76,0,0.24,1",quinticIn:"0.64,0,0.78,0",quinticOut:"0.22,1,0.36,1",quinticInOut:"0.83,0,0.17,1",sinusoidalIn:"0.12,0,0.39,0",sinusoidalOut:"0.61,1,0.88,1",sinusoidalInOut:"0.37,0,0.63,1",exponentialIn:"0.7,0,0.84,0",exponentialOut:"0.16,1,0.3,1",exponentialInOut:"0.87,0,0.13,1",circularIn:"0.55,0,1,0.45",circularOut:"0,0.55,0.45,1",circularInOut:"0.85,0,0.15,1"},tw="transform-origin";function ew(t,e,n){var i=A({},t.shape);A(i,e),t.buildPath(n,i);var r=new Fb;return r.reset(xi(t)),n.rebuildPath(r,1),r.generateStr(),r.getStr()}function nw(t,e){var n=e.originX,i=e.originY;(n||i)&&(t[tw]=n+"px "+i+"px")}var iw={fill:"fill",opacity:"opacity",lineWidth:"stroke-width",lineDashOffset:"stroke-dashoffset"};function rw(t,e){var n=e.zrId+"-ani-"+e.cssAnimIdx++;return e.cssAnims[n]=t,n}function ow(t){return X(t)?Qb[t]?"cubic-bezier("+Qb[t]+")":Ln(t)?t:"":""}function aw(t,e,n,i){var r=t.animators,o=r.length,a=[];if(t instanceof Qu){var s=function(t,e,n){var i,r,o=t.shape.paths,a={};if(E(o,(function(t){var e=$b(n.zrId);e.animation=!0,aw(t,{},e,!0);var o=e.cssAnims,s=e.cssNodes,l=G(o),u=l.length;if(u){var h=o[r=l[u-1]];for(var c in h){var p=h[c];a[c]=a[c]||{d:""},a[c].d+=p.d||""}for(var d in s){var f=s[d].animation;f.indexOf(r)>=0&&(i=f)}}})),i){e.d=!1;var s=rw(a,n);return i.replace(r,s)}}(t,e,n);if(s)a.push(s);else if(!o)return}else if(!o)return;for(var l={},u=0;u<o;u++){var h=r[u],c=[h.getMaxTime()/1e3+"s"],p=ow(h.getClip().easing),d=h.getDelay();p?c.push(p):c.push("linear"),d&&c.push(d/1e3+"s"),h.getLoop()&&c.push("infinite");var f=c.join(" ");l[f]=l[f]||[f,[]],l[f][1].push(h)}function g(r){var o,a=r[1],s=a.length,l={},u={},h={};function c(t,e,n){for(var i=t.getTracks(),r=t.getMaxTime(),o=0;o<i.length;o++){var a=i[o];if(a.needsAnimate()){var s=a.keyframes,l=a.propName;if(n&&(l=n(l)),l)for(var u=0;u<s.length;u++){var h=s[u],c=Math.round(h.time/r*100)+"%",p=ow(h.easing),d=h.rawValue;(X(d)||j(d))&&(e[c]=e[c]||{},e[c][l]=h.rawValue,p&&(e[c]["animation-timing-function"]=p))}}}}for(var p=0;p<s;p++){(w=(b=a[p]).targetName)?"shape"===w&&c(b,u):!i&&c(b,l)}for(var d in l){var f={};yr(f,t),A(f,l[d]);var g=_i(f),y=l[d]["animation-timing-function"];h[d]=g?{transform:g}:{},nw(h[d],f),y&&(h[d]["animation-timing-function"]=y)}var v=!0;for(var d in u){h[d]=h[d]||{};var m=!o;y=u[d]["animation-timing-function"];m&&(o=new rs);var x=o.len();o.reset(),h[d].d=ew(t,u[d],o);var _=o.len();if(!m&&x!==_){v=!1;break}y&&(h[d]["animation-timing-function"]=y)}if(!v)for(var d in h)delete h[d].d;if(!i)for(p=0;p<s;p++){var b,w;"style"===(w=(b=a[p]).targetName)&&c(b,h,(function(t){return iw[t]}))}var S,M=G(h),I=!0;for(p=1;p<M.length;p++){var T=M[p-1],C=M[p];if(h[T][tw]!==h[C][tw]){I=!1;break}S=h[T][tw]}if(I&&S){for(var d in h)h[d][tw]&&delete h[d][tw];e[tw]=S}if(B(M,(function(t){return G(h[t]).length>0})).length)return rw(h,n)+" "+r[0]+" both"}for(var y in l){(s=g(l[y]))&&a.push(s)}if(a.length){var v=n.zrId+"-cls-"+n.cssClassIdx++;n.cssNodes["."+v]={animation:a.join(",")},e.class=v}}var sw=Math.round;function lw(t){return t&&X(t.src)}function uw(t){return t&&U(t.toDataURL)}function hw(t,e,n,i){Ub((function(r,o){var a="fill"===r||"stroke"===r;a&&vi(o)?_w(e,t,r,i):a&&fi(o)?bw(n,t,r,i):t[r]=o}),e,n,!1),function(t,e,n){var i=t.style;if(function(t){return t&&(t.shadowBlur||t.shadowOffsetX||t.shadowOffsetY)}(i)){var r=function(t){var e=t.style,n=t.getGlobalScale();return[e.shadowColor,(e.shadowBlur||0).toFixed(2),(e.shadowOffsetX||0).toFixed(2),(e.shadowOffsetY||0).toFixed(2),n[0],n[1]].join(",")}(t),o=n.shadowCache,a=o[r];if(!a){var s=t.getGlobalScale(),l=s[0],u=s[1];if(!l||!u)return;var h=i.shadowOffsetX||0,c=i.shadowOffsetY||0,p=i.shadowBlur,d=si(i.shadowColor),f=d.opacity,g=d.color,y=p/2/l+" "+p/2/u;a=n.zrId+"-s"+n.shadowIdx++,n.defs[a]=qb("filter",a,{id:a,x:"-100%",y:"-100%",width:"300%",height:"300%"},[qb("feDropShadow","",{dx:h/l,dy:c/u,stdDeviation:y,"flood-color":g,"flood-opacity":f})]),o[r]=a}e.filter=mi(a)}}(n,t,i)}function cw(t){return ui(t[0]-1)&&ui(t[1])&&ui(t[2])&&ui(t[3]-1)}function pw(t,e,n){if(e&&(!function(t){return ui(t[4])&&ui(t[5])}(e)||!cw(e))){var i=n?10:1e4;t.transform=cw(e)?"translate("+sw(e[4]*i)/i+" "+sw(e[5]*i)/i+")":function(t){return"matrix("+hi(t[0])+","+hi(t[1])+","+hi(t[2])+","+hi(t[3])+","+ci(t[4])+","+ci(t[5])+")"}(e)}}function dw(t,e,n){for(var i=t.points,r=[],o=0;o<i.length;o++)r.push(sw(i[o][0]*n)/n),r.push(sw(i[o][1]*n)/n);e.points=r.join(" ")}function fw(t){return!t.smooth}var gw,yw,vw={circle:[(gw=["cx","cy","r"],yw=z(gw,(function(t){return"string"==typeof t?[t,t]:t})),function(t,e,n){for(var i=0;i<yw.length;i++){var r=yw[i],o=t[r[0]];null!=o&&(e[r[1]]=sw(o*n)/n)}})],polyline:[dw,fw],polygon:[dw,fw]};function mw(t,e){var n=t.style,i=t.shape,r=vw[t.type],o={},a=e.animation,s="path",l=t.style.strokePercent,u=e.compress&&xi(t)||4;if(!r||e.willUpdate||r[1]&&!r[1](i)||a&&function(t){for(var e=t.animators,n=0;n<e.length;n++)if("shape"===e[n].targetName)return!0;return!1}(t)||l<1){var h=!t.path||t.shapeChanged();t.path||t.createPathProxy();var c=t.path;h&&(c.beginPath(),t.buildPath(c,t.shape),t.pathUpdated());var p=c.getVersion(),d=t,f=d.__svgPathBuilder;d.__svgPathVersion===p&&f&&l===d.__svgPathStrokePercent||(f||(f=d.__svgPathBuilder=new Fb),f.reset(u),c.rebuildPath(f,l),f.generateStr(),d.__svgPathVersion=p,d.__svgPathStrokePercent=l),o.d=f.getStr()}else{s=t.type;var g=Math.pow(10,u);r[0](i,o,g)}return pw(o,t.transform),hw(o,n,t,e),e.animation&&aw(t,o,e),qb(s,t.id+"",o)}function xw(t,e){return t instanceof Ms?mw(t,e):t instanceof As?function(t,e){var n=t.style,i=n.image;if(i&&!X(i)&&(lw(i)?i=i.src:uw(i)&&(i=i.toDataURL())),i){var r=n.x||0,o=n.y||0,a={href:i,width:n.width,height:n.height};return r&&(a.x=r),o&&(a.y=o),pw(a,t.transform),hw(a,n,t,e),e.animation&&aw(t,a,e),qb("image",t.id+"",a)}}(t,e):t instanceof Ts?function(t,e){var n=t.style,i=n.text;if(null!=i&&(i+=""),i&&!isNaN(n.x)&&!isNaN(n.y)){var r=n.font||a,s=n.x||0,l=function(t,e,n){return"top"===n?t+=e/2:"bottom"===n&&(t-=e/2),t}(n.y||0,Sr(r),n.textBaseline),u={"dominant-baseline":"central","text-anchor":pi[n.textAlign]||n.textAlign};if(Us(n)){var h="",c=n.fontStyle,p=Hs(n.fontSize);if(!parseFloat(p))return;var d=n.fontFamily||o,f=n.fontWeight;h+="font-size:"+p+";font-family:"+d+";",c&&"normal"!==c&&(h+="font-style:"+c+";"),f&&"normal"!==f&&(h+="font-weight:"+f+";"),u.style=h}else u.style="font: "+r;return i.match(/\s/)&&(u["xml:space"]="preserve"),s&&(u.x=s),l&&(u.y=l),pw(u,t.transform),hw(u,n,t,e),e.animation&&aw(t,u,e),qb("text",t.id+"",u,void 0,i)}}(t,e):void 0}function _w(t,e,n,i){var r,o=t[n],a={gradientUnits:o.global?"userSpaceOnUse":"objectBoundingBox"};if(gi(o))r="linearGradient",a.x1=o.x,a.y1=o.y,a.x2=o.x2,a.y2=o.y2;else{if(!yi(o))return void 0;r="radialGradient",a.cx=rt(o.x,.5),a.cy=rt(o.y,.5),a.r=rt(o.r,.5)}for(var s=o.colorStops,l=[],u=0,h=s.length;u<h;++u){var c=100*ci(s[u].offset)+"%",p=si(s[u].color),d=p.color,f=p.opacity,g={offset:c};g["stop-color"]=d,f<1&&(g["stop-opacity"]=f),l.push(qb("stop",u+"",g))}var y=Kb(qb(r,"",a,l)),v=i.gradientCache,m=v[y];m||(m=i.zrId+"-g"+i.gradientIdx++,v[y]=m,a.id=m,i.defs[m]=qb(r,m,a,l)),e[n]=mi(m)}function bw(t,e,n,i){var r,o=t.style[n],a=t.getBoundingRect(),s={},l=o.repeat,u="no-repeat"===l,h="repeat-x"===l,c="repeat-y"===l;if(di(o)){var p=o.imageWidth,d=o.imageHeight,f=void 0,g=o.image;if(X(g)?f=g:lw(g)?f=g.src:uw(g)&&(f=g.toDataURL()),"undefined"==typeof Image){var y="Image width/height must been given explictly in svg-ssr renderer.";lt(p,y),lt(d,y)}else if(null==p||null==d){var v=function(t,e){if(t){var n=t.elm,i=p||e.width,r=d||e.height;"pattern"===t.tag&&(h?(r=1,i/=a.width):c&&(i=1,r/=a.height)),t.attrs.width=i,t.attrs.height=r,n&&(n.setAttribute("width",i),n.setAttribute("height",r))}},m=na(f,null,t,(function(t){u||v(w,t),v(r,t)}));m&&m.width&&m.height&&(p=p||m.width,d=d||m.height)}r=qb("image","img",{href:f,width:p,height:d}),s.width=p,s.height=d}else o.svgElement&&(r=T(o.svgElement),s.width=o.svgWidth,s.height=o.svgHeight);if(r){var x,_;u?x=_=1:h?(_=1,x=s.width/a.width):c?(x=1,_=s.height/a.height):s.patternUnits="userSpaceOnUse",null==x||isNaN(x)||(s.width=x),null==_||isNaN(_)||(s.height=_);var b=_i(o);b&&(s.patternTransform=b);var w=qb("pattern","",s,[r]),S=Kb(w),M=i.patternCache,I=M[S];I||(I=i.zrId+"-p"+i.patternIdx++,M[S]=I,s.id=I,w=i.defs[I]=qb("pattern",I,s,[r])),e[n]=mi(I)}}function ww(t,e,n){var i=n.clipPathCache,r=n.defs,o=i[t.id];if(!o){var a={id:o=n.zrId+"-c"+n.clipPathIdx++};i[t.id]=o,r[o]=qb("clipPath",o,a,[mw(t,n)])}e["clip-path"]=mi(o)}function Sw(t){return document.createTextNode(t)}function Mw(t,e,n){t.insertBefore(e,n)}function Iw(t,e){t.removeChild(e)}function Tw(t,e){t.appendChild(e)}function Cw(t){return t.parentNode}function Dw(t){return t.nextSibling}function Aw(t,e){t.textContent=e}var kw=qb("","");function Lw(t){return void 0===t}function Pw(t){return void 0!==t}function Ow(t,e,n){for(var i={},r=e;r<=n;++r){var o=t[r].key;void 0!==o&&(i[o]=r)}return i}function Rw(t,e){var n=t.key===e.key;return t.tag===e.tag&&n}function Nw(t){var e,n=t.children,i=t.tag;if(Pw(i)){var r=t.elm=jb(i);if(Vw(kw,t),Y(n))for(e=0;e<n.length;++e){var o=n[e];null!=o&&Tw(r,Nw(o))}else Pw(t.text)&&!q(t.text)&&Tw(r,Sw(t.text))}else t.elm=Sw(t.text);return t.elm}function Ew(t,e,n,i,r){for(;i<=r;++i){var o=n[i];null!=o&&Mw(t,Nw(o),e)}}function zw(t,e,n,i){for(;n<=i;++n){var r=e[n];if(null!=r)if(Pw(r.tag))Iw(Cw(r.elm),r.elm);else Iw(t,r.elm)}}function Vw(t,e){var n,i=e.elm,r=t&&t.attrs||{},o=e.attrs||{};if(r!==o){for(n in o){var a=o[n];r[n]!==a&&(!0===a?i.setAttribute(n,""):!1===a?i.removeAttribute(n):120!==n.charCodeAt(0)?i.setAttribute(n,a):"xmlns:xlink"===n||"xmlns"===n?i.setAttributeNS("http://www.w3.org/2000/xmlns/",n,a):58===n.charCodeAt(3)?i.setAttributeNS("http://www.w3.org/XML/1998/namespace",n,a):58===n.charCodeAt(5)?i.setAttributeNS(Zb,n,a):i.setAttribute(n,a))}for(n in r)n in o||i.removeAttribute(n)}}function Bw(t,e){var n=e.elm=t.elm,i=t.children,r=e.children;t!==e&&(Vw(t,e),Lw(e.text)?Pw(i)&&Pw(r)?i!==r&&function(t,e,n){for(var i,r,o,a=0,s=0,l=e.length-1,u=e[0],h=e[l],c=n.length-1,p=n[0],d=n[c];a<=l&&s<=c;)null==u?u=e[++a]:null==h?h=e[--l]:null==p?p=n[++s]:null==d?d=n[--c]:Rw(u,p)?(Bw(u,p),u=e[++a],p=n[++s]):Rw(h,d)?(Bw(h,d),h=e[--l],d=n[--c]):Rw(u,d)?(Bw(u,d),Mw(t,u.elm,Dw(h.elm)),u=e[++a],d=n[--c]):Rw(h,p)?(Bw(h,p),Mw(t,h.elm,u.elm),h=e[--l],p=n[++s]):(Lw(i)&&(i=Ow(e,a,l)),Lw(r=i[p.key])||(o=e[r]).tag!==p.tag?Mw(t,Nw(p),u.elm):(Bw(o,p),e[r]=void 0,Mw(t,o.elm,u.elm)),p=n[++s]);(a<=l||s<=c)&&(a>l?Ew(t,null==n[c+1]?null:n[c+1].elm,n,s,c):zw(t,e,a,l))}(n,i,r):Pw(r)?(Pw(t.text)&&Aw(n,""),Ew(n,null,r,0,r.length-1)):Pw(i)?zw(n,i,0,i.length-1):Pw(t.text)&&Aw(n,""):t.text!==e.text&&(Pw(i)&&zw(n,i,0,i.length-1),Aw(n,e.text)))}var Fw=0,Gw=function(){function t(t,e,n){if(this.type="svg",this.refreshHover=Ww("refreshHover"),this.configLayer=Ww("configLayer"),this.storage=e,this._opts=n=A({},n),this.root=t,this._id="zr"+Fw++,this._oldVNode=Jb(n.width,n.height),t&&!n.ssr){var i=this._viewport=document.createElement("div");i.style.cssText="position:relative;overflow:hidden";var r=this._svgDom=this._oldVNode.elm=jb("svg");Vw(null,this._oldVNode),i.appendChild(r),t.appendChild(i)}this.resize(n.width,n.height)}return t.prototype.getType=function(){return this.type},t.prototype.getViewportRoot=function(){return this._viewport},t.prototype.getViewportRootOffset=function(){var t=this.getViewportRoot();if(t)return{offsetLeft:t.offsetLeft||0,offsetTop:t.offsetTop||0}},t.prototype.getSvgDom=function(){return this._svgDom},t.prototype.refresh=function(){if(this.root){var t=this.renderToVNode({willUpdate:!0});t.attrs.style="position:absolute;left:0;top:0;user-select:none",function(t,e){if(Rw(t,e))Bw(t,e);else{var n=t.elm,i=Cw(n);Nw(e),null!==i&&(Mw(i,e.elm,Dw(n)),zw(i,[t],0,0))}}(this._oldVNode,t),this._oldVNode=t}},t.prototype.renderOneToVNode=function(t){return xw(t,$b(this._id))},t.prototype.renderToVNode=function(t){t=t||{};var e=this.storage.getDisplayList(!0),n=this._width,i=this._height,r=$b(this._id);r.animation=t.animation,r.willUpdate=t.willUpdate,r.compress=t.compress;var o=[],a=this._bgVNode=function(t,e,n,i){var r;if(n&&"none"!==n)if(r=qb("rect","bg",{width:t,height:e,x:"0",y:"0",id:"0"}),vi(n))_w({fill:n},r.attrs,"fill",i);else if(fi(n))bw({style:{fill:n},dirty:bt,getBoundingRect:function(){return{width:t,height:e}}},r.attrs,"fill",i);else{var o=si(n),a=o.color,s=o.opacity;r.attrs.fill=a,s<1&&(r.attrs["fill-opacity"]=s)}return r}(n,i,this._backgroundColor,r);a&&o.push(a);var s=t.compress?null:this._mainVNode=qb("g","main",{},[]);this._paintList(e,r,s?s.children:o),s&&o.push(s);var l=z(G(r.defs),(function(t){return r.defs[t]}));if(l.length&&o.push(qb("defs","defs",{},l)),t.animation){var u=function(t,e,n){var i=(n=n||{}).newline?"\n":"",r=" {"+i,o=i+"}",a=z(G(t),(function(e){return e+r+z(G(t[e]),(function(n){return n+":"+t[e][n]+";"})).join(i)+o})).join(i),s=z(G(e),(function(t){return"@keyframes "+t+r+z(G(e[t]),(function(n){return n+r+z(G(e[t][n]),(function(i){var r=e[t][n][i];return"d"===i&&(r='path("'+r+'")'),i+":"+r+";"})).join(i)+o})).join(i)+o})).join(i);return a||s?["<![CDATA[",a,s,"]]>"].join(i):""}(r.cssNodes,r.cssAnims,{newline:!0});if(u){var h=qb("style","stl",{},[],u);o.push(h)}}return Jb(n,i,o,t.useViewBox)},t.prototype.renderToString=function(t){return t=t||{},Kb(this.renderToVNode({animation:rt(t.cssAnimation,!0),willUpdate:!1,compress:!0,useViewBox:rt(t.useViewBox,!0)}),{newline:!0})},t.prototype.setBackgroundColor=function(t){this._backgroundColor=t},t.prototype.getSvgRoot=function(){return this._mainVNode&&this._mainVNode.elm},t.prototype._paintList=function(t,e,n){for(var i,r,o=t.length,a=[],s=0,l=0,u=0;u<o;u++){var h=t[u];if(!h.invisible){var c=h.__clipPaths,p=c&&c.length||0,d=r&&r.length||0,f=void 0;for(f=Math.max(p-1,d-1);f>=0&&(!c||!r||c[f]!==r[f]);f--);for(var g=d-1;g>f;g--)i=a[--s-1];for(var y=f+1;y<p;y++){var v={};ww(c[y],v,e);var m=qb("g","clip-g-"+l++,v,[]);(i?i.children:n).push(m),a[s++]=m,i=m}r=c;var x=xw(h,e);x&&(i?i.children:n).push(x)}}},t.prototype.resize=function(t,e){var n=this._opts,i=this.root,r=this._viewport;if(null!=t&&(n.width=t),null!=e&&(n.height=e),i&&r&&(r.style.display="none",t=Yy(i,0,n),e=Yy(i,1,n),r.style.display=""),this._width!==t||this._height!==e){if(this._width=t,this._height=e,r){var o=r.style;o.width=t+"px",o.height=e+"px"}if(fi(this._backgroundColor))this.refresh();else{var a=this._svgDom;a&&(a.setAttribute("width",t),a.setAttribute("height",e));var s=this._bgVNode&&this._bgVNode.elm;s&&(s.setAttribute("width",t),s.setAttribute("height",e))}}},t.prototype.getWidth=function(){return this._width},t.prototype.getHeight=function(){return this._height},t.prototype.dispose=function(){this.root&&(this.root.innerHTML=""),this._svgDom=this._viewport=this.storage=this._oldVNode=this._bgVNode=this._mainVNode=null},t.prototype.clear=function(){this._svgDom&&(this._svgDom.innerHTML=null),this._oldVNode=null},t.prototype.toDataURL=function(t){var e=this.renderToString(),n="data:image/svg+xml;";return t?(e=bi(e))&&n+"base64,"+e:n+"charset=UTF-8,"+encodeURIComponent(e)},t}();function Ww(t){return function(){0}}function Hw(t,e,n){var i=h.createCanvas(),r=e.getWidth(),o=e.getHeight(),a=i.style;return a&&(a.position="absolute",a.left="0",a.top="0",a.width=r+"px",a.height=o+"px",i.setAttribute("data-zr-dom-id",t)),i.width=r*n,i.height=o*n,i}var Yw=function(t){function e(e,n,i){var r,o=t.call(this)||this;o.motionBlur=!1,o.lastFrameAlpha=.7,o.dpr=1,o.virtual=!1,o.config={},o.incremental=!1,o.zlevel=0,o.maxRepaintRectCount=5,o.__dirty=!0,o.__firstTimePaint=!0,o.__used=!1,o.__drawIndex=0,o.__startIndex=0,o.__endIndex=0,o.__prevStartIndex=null,o.__prevEndIndex=null,i=i||rr,"string"==typeof e?r=Hw(e,n,i):q(e)&&(e=(r=e).id),o.id=e,o.dom=r;var a=r.style;return a&&(xt(r),r.onselectstart=function(){return!1},a.padding="0",a.margin="0",a.borderWidth="0"),o.painter=n,o.dpr=i,o}return n(e,t),e.prototype.getElementCount=function(){return this.__endIndex-this.__startIndex},e.prototype.afterBrush=function(){this.__prevStartIndex=this.__startIndex,this.__prevEndIndex=this.__endIndex},e.prototype.initContext=function(){this.ctx=this.dom.getContext("2d"),this.ctx.dpr=this.dpr},e.prototype.setUnpainted=function(){this.__firstTimePaint=!0},e.prototype.createBackBuffer=function(){var t=this.dpr;this.domBack=Hw("back-"+this.id,this.painter,t),this.ctxBack=this.domBack.getContext("2d"),1!==t&&this.ctxBack.scale(t,t)},e.prototype.createRepaintRects=function(t,e,n,i){if(this.__firstTimePaint)return this.__firstTimePaint=!1,null;var r,o=[],a=this.maxRepaintRectCount,s=!1,l=new Ee(0,0,0,0);function u(t){if(t.isFinite()&&!t.isZero())if(0===o.length){(e=new Ee(0,0,0,0)).copy(t),o.push(e)}else{for(var e,n=!1,i=1/0,r=0,u=0;u<o.length;++u){var h=o[u];if(h.intersect(t)){var c=new Ee(0,0,0,0);c.copy(h),c.union(t),o[u]=c,n=!0;break}if(s){l.copy(t),l.union(h);var p=t.width*t.height,d=h.width*h.height,f=l.width*l.height-p-d;f<i&&(i=f,r=u)}}if(s&&(o[r].union(t),n=!0),!n)(e=new Ee(0,0,0,0)).copy(t),o.push(e);s||(s=o.length>=a)}}for(var h=this.__startIndex;h<this.__endIndex;++h){if(d=t[h]){var c=d.shouldBePainted(n,i,!0,!0);(f=d.__isRendered&&(1&d.__dirty||!c)?d.getPrevPaintRect():null)&&u(f);var p=c&&(1&d.__dirty||!d.__isRendered)?d.getPaintRect():null;p&&u(p)}}for(h=this.__prevStartIndex;h<this.__prevEndIndex;++h){var d,f;c=(d=e[h]).shouldBePainted(n,i,!0,!0);if(d&&(!c||!d.__zr)&&d.__isRendered)(f=d.getPrevPaintRect())&&u(f)}do{r=!1;for(h=0;h<o.length;)if(o[h].isZero())o.splice(h,1);else{for(var g=h+1;g<o.length;)o[h].intersect(o[g])?(r=!0,o[h].union(o[g]),o.splice(g,1)):g++;h++}}while(r);return this._paintRects=o,o},e.prototype.debugGetPaintRects=function(){return(this._paintRects||[]).slice()},e.prototype.resize=function(t,e){var n=this.dpr,i=this.dom,r=i.style,o=this.domBack;r&&(r.width=t+"px",r.height=e+"px"),i.width=t*n,i.height=e*n,o&&(o.width=t*n,o.height=e*n,1!==n&&this.ctxBack.scale(n,n))},e.prototype.clear=function(t,e,n){var i=this.dom,r=this.ctx,o=i.width,a=i.height;e=e||this.clearColor;var s=this.motionBlur&&!t,l=this.lastFrameAlpha,u=this.dpr,h=this;s&&(this.domBack||this.createBackBuffer(),this.ctxBack.globalCompositeOperation="copy",this.ctxBack.drawImage(i,0,0,o/u,a/u));var c=this.domBack;function p(t,n,i,o){if(r.clearRect(t,n,i,o),e&&"transparent"!==e){var a=void 0;if(Q(e))a=(e.global||e.__width===i&&e.__height===o)&&e.__canvasGradient||Wy(r,e,{x:0,y:0,width:i,height:o}),e.__canvasGradient=a,e.__width=i,e.__height=o;else tt(e)&&(e.scaleX=e.scaleX||u,e.scaleY=e.scaleY||u,a=Jy(r,e,{dirty:function(){h.setUnpainted(),h.__painter.refresh()}}));r.save(),r.fillStyle=a||e,r.fillRect(t,n,i,o),r.restore()}s&&(r.save(),r.globalAlpha=l,r.drawImage(c,t,n,i,o),r.restore())}!n||s?p(0,0,o,a):n.length&&E(n,(function(t){p(t.x*u,t.y*u,t.width*u,t.height*u)}))},e}(jt),Uw=1e5,Xw=314159,Zw=.01;var jw=function(){function t(t,e,n,i){this.type="canvas",this._zlevelList=[],this._prevDisplayList=[],this._layers={},this._layerConfig={},this._needsManuallyCompositing=!1,this.type="canvas";var r=!t.nodeName||"CANVAS"===t.nodeName.toUpperCase();this._opts=n=A({},n||{}),this.dpr=n.devicePixelRatio||rr,this._singleCanvas=r,this.root=t,t.style&&(xt(t),t.innerHTML=""),this.storage=e;var o=this._zlevelList;this._prevDisplayList=[];var a=this._layers;if(r){var s=t,l=s.width,u=s.height;null!=n.width&&(l=n.width),null!=n.height&&(u=n.height),this.dpr=n.devicePixelRatio||1,s.width=l*this.dpr,s.height=u*this.dpr,this._width=l,this._height=u;var h=new Yw(s,this,this.dpr);h.__builtin__=!0,h.initContext(),a[314159]=h,h.zlevel=Xw,o.push(Xw),this._domRoot=t}else{this._width=Yy(t,0,n),this._height=Yy(t,1,n);var c=this._domRoot=function(t,e){var n=document.createElement("div");return n.style.cssText=["position:relative","width:"+t+"px","height:"+e+"px","padding:0","margin:0","border-width:0"].join(";")+";",n}(this._width,this._height);t.appendChild(c)}}return t.prototype.getType=function(){return"canvas"},t.prototype.isSingleCanvas=function(){return this._singleCanvas},t.prototype.getViewportRoot=function(){return this._domRoot},t.prototype.getViewportRootOffset=function(){var t=this.getViewportRoot();if(t)return{offsetLeft:t.offsetLeft||0,offsetTop:t.offsetTop||0}},t.prototype.refresh=function(t){var e=this.storage.getDisplayList(!0),n=this._prevDisplayList,i=this._zlevelList;this._redrawId=Math.random(),this._paintList(e,n,t,this._redrawId);for(var r=0;r<i.length;r++){var o=i[r],a=this._layers[o];if(!a.__builtin__&&a.refresh){var s=0===r?this._backgroundColor:null;a.refresh(s)}}return this._opts.useDirtyRect&&(this._prevDisplayList=e.slice()),this},t.prototype.refreshHover=function(){this._paintHoverList(this.storage.getDisplayList(!1))},t.prototype._paintHoverList=function(t){var e=t.length,n=this._hoverlayer;if(n&&n.clear(),e){for(var i,r={inHover:!0,viewWidth:this._width,viewHeight:this._height},o=0;o<e;o++){var a=t[o];a.__inHover&&(n||(n=this._hoverlayer=this.getLayer(Uw)),i||(i=n.ctx).save(),sv(i,a,r,o===e-1))}i&&i.restore()}},t.prototype.getHoverLayer=function(){return this.getLayer(Uw)},t.prototype.paintOne=function(t,e){av(t,e)},t.prototype._paintList=function(t,e,n,i){if(this._redrawId===i){n=n||!1,this._updateLayerStatus(t);var r=this._doPaintList(t,e,n),o=r.finished,a=r.needsRefreshHover;if(this._needsManuallyCompositing&&this._compositeManually(),a&&this._paintHoverList(t),o)this.eachLayer((function(t){t.afterBrush&&t.afterBrush()}));else{var s=this;rn((function(){s._paintList(t,e,n,i)}))}}},t.prototype._compositeManually=function(){var t=this.getLayer(Xw).ctx,e=this._domRoot.width,n=this._domRoot.height;t.clearRect(0,0,e,n),this.eachBuiltinLayer((function(i){i.virtual&&t.drawImage(i.dom,0,0,e,n)}))},t.prototype._doPaintList=function(t,e,n){for(var i=this,o=[],a=this._opts.useDirtyRect,s=0;s<this._zlevelList.length;s++){var l=this._zlevelList[s],u=this._layers[l];u.__builtin__&&u!==this._hoverlayer&&(u.__dirty||n)&&o.push(u)}for(var h=!0,c=!1,p=function(r){var s,l=o[r],u=l.ctx,p=a&&l.createRepaintRects(t,e,d._width,d._height),f=n?l.__startIndex:l.__drawIndex,g=!n&&l.incremental&&Date.now,y=g&&Date.now(),v=l.zlevel===d._zlevelList[0]?d._backgroundColor:null;if(l.__startIndex===l.__endIndex)l.clear(!1,v,p);else if(f===l.__startIndex){var m=t[f];m.incremental&&m.notClear&&!n||l.clear(!1,v,p)}-1===f&&(console.error("For some unknown reason. drawIndex is -1"),f=l.__startIndex);var x=function(e){var n={inHover:!1,allClipped:!1,prevEl:null,viewWidth:i._width,viewHeight:i._height};for(s=f;s<l.__endIndex;s++){var r=t[s];if(r.__inHover&&(c=!0),i._doPaintEl(r,l,a,e,n,s===l.__endIndex-1),g)if(Date.now()-y>15)break}n.prevElClipPaths&&u.restore()};if(p)if(0===p.length)s=l.__endIndex;else for(var _=d.dpr,b=0;b<p.length;++b){var w=p[b];u.save(),u.beginPath(),u.rect(w.x*_,w.y*_,w.width*_,w.height*_),u.clip(),x(w),u.restore()}else u.save(),x(),u.restore();l.__drawIndex=s,l.__drawIndex<l.__endIndex&&(h=!1)},d=this,f=0;f<o.length;f++)p(f);return r.wxa&&E(this._layers,(function(t){t&&t.ctx&&t.ctx.draw&&t.ctx.draw()})),{finished:h,needsRefreshHover:c}},t.prototype._doPaintEl=function(t,e,n,i,r,o){var a=e.ctx;if(n){var s=t.getPaintRect();(!i||s&&s.intersect(i))&&(sv(a,t,r,o),t.setPrevPaintRect(s))}else sv(a,t,r,o)},t.prototype.getLayer=function(t,e){this._singleCanvas&&!this._needsManuallyCompositing&&(t=Xw);var n=this._layers[t];return n||((n=new Yw("zr_"+t,this,this.dpr)).zlevel=t,n.__builtin__=!0,this._layerConfig[t]?C(n,this._layerConfig[t],!0):this._layerConfig[t-Zw]&&C(n,this._layerConfig[t-Zw],!0),e&&(n.virtual=e),this.insertLayer(t,n),n.initContext()),n},t.prototype.insertLayer=function(t,e){var n=this._layers,i=this._zlevelList,r=i.length,o=this._domRoot,a=null,s=-1;if(!n[t]&&function(t){return!!t&&(!!t.__builtin__||"function"==typeof t.resize&&"function"==typeof t.refresh)}(e)){if(r>0&&t>i[0]){for(s=0;s<r-1&&!(i[s]<t&&i[s+1]>t);s++);a=n[i[s]]}if(i.splice(s+1,0,t),n[t]=e,!e.virtual)if(a){var l=a.dom;l.nextSibling?o.insertBefore(e.dom,l.nextSibling):o.appendChild(e.dom)}else o.firstChild?o.insertBefore(e.dom,o.firstChild):o.appendChild(e.dom);e.__painter=this}},t.prototype.eachLayer=function(t,e){for(var n=this._zlevelList,i=0;i<n.length;i++){var r=n[i];t.call(e,this._layers[r],r)}},t.prototype.eachBuiltinLayer=function(t,e){for(var n=this._zlevelList,i=0;i<n.length;i++){var r=n[i],o=this._layers[r];o.__builtin__&&t.call(e,o,r)}},t.prototype.eachOtherLayer=function(t,e){for(var n=this._zlevelList,i=0;i<n.length;i++){var r=n[i],o=this._layers[r];o.__builtin__||t.call(e,o,r)}},t.prototype.getLayers=function(){return this._layers},t.prototype._updateLayerStatus=function(t){function e(t){o&&(o.__endIndex!==t&&(o.__dirty=!0),o.__endIndex=t)}if(this.eachBuiltinLayer((function(t,e){t.__dirty=t.__used=!1})),this._singleCanvas)for(var n=1;n<t.length;n++){if((s=t[n]).zlevel!==t[n-1].zlevel||s.incremental){this._needsManuallyCompositing=!0;break}}var i,r,o=null,a=0;for(r=0;r<t.length;r++){var s,l=(s=t[r]).zlevel,u=void 0;i!==l&&(i=l,a=0),s.incremental?((u=this.getLayer(l+.001,this._needsManuallyCompositing)).incremental=!0,a=1):u=this.getLayer(l+(a>0?Zw:0),this._needsManuallyCompositing),u.__builtin__||I("ZLevel "+l+" has been used by unkown layer "+u.id),u!==o&&(u.__used=!0,u.__startIndex!==r&&(u.__dirty=!0),u.__startIndex=r,u.incremental?u.__drawIndex=-1:u.__drawIndex=r,e(r),o=u),1&s.__dirty&&!s.__inHover&&(u.__dirty=!0,u.incremental&&u.__drawIndex<0&&(u.__drawIndex=r))}e(r),this.eachBuiltinLayer((function(t,e){!t.__used&&t.getElementCount()>0&&(t.__dirty=!0,t.__startIndex=t.__endIndex=t.__drawIndex=0),t.__dirty&&t.__drawIndex<0&&(t.__drawIndex=t.__startIndex)}))},t.prototype.clear=function(){return this.eachBuiltinLayer(this._clearLayer),this},t.prototype._clearLayer=function(t){t.clear()},t.prototype.setBackgroundColor=function(t){this._backgroundColor=t,E(this._layers,(function(t){t.setUnpainted()}))},t.prototype.configLayer=function(t,e){if(e){var n=this._layerConfig;n[t]?C(n[t],e,!0):n[t]=e;for(var i=0;i<this._zlevelList.length;i++){var r=this._zlevelList[i];if(r===t||r===t+Zw)C(this._layers[r],n[t],!0)}}},t.prototype.delLayer=function(t){var e=this._layers,n=this._zlevelList,i=e[t];i&&(i.dom.parentNode.removeChild(i.dom),delete e[t],n.splice(P(n,t),1))},t.prototype.resize=function(t,e){if(this._domRoot.style){var n=this._domRoot;n.style.display="none";var i=this._opts,r=this.root;if(null!=t&&(i.width=t),null!=e&&(i.height=e),t=Yy(r,0,i),e=Yy(r,1,i),n.style.display="",this._width!==t||e!==this._height){for(var o in n.style.width=t+"px",n.style.height=e+"px",this._layers)this._layers.hasOwnProperty(o)&&this._layers[o].resize(t,e);this.refresh(!0)}this._width=t,this._height=e}else{if(null==t||null==e)return;this._width=t,this._height=e,this.getLayer(Xw).resize(t,e)}return this},t.prototype.clearLayer=function(t){var e=this._layers[t];e&&e.clear()},t.prototype.dispose=function(){this.root.innerHTML="",this.root=this.storage=this._domRoot=this._layers=null},t.prototype.getRenderedCanvas=function(t){if(t=t||{},this._singleCanvas&&!this._compositeManually)return this._layers[314159].dom;var e=new Yw("image",this,t.pixelRatio||this.dpr);e.initContext(),e.clear(!1,t.backgroundColor||this._backgroundColor);var n=e.ctx;if(t.pixelRatio<=this.dpr){this.refresh();var i=e.dom.width,r=e.dom.height;this.eachLayer((function(t){t.__builtin__?n.drawImage(t.dom,0,0,i,r):t.renderToCanvas&&(n.save(),t.renderToCanvas(n),n.restore())}))}else for(var o={inHover:!1,viewWidth:this._width,viewHeight:this._height},a=this.storage.getDisplayList(!0),s=0,l=a.length;s<l;s++){var u=a[s];sv(n,u,o,s===l-1)}return e.dom},t.prototype.getWidth=function(){return this._width},t.prototype.getHeight=function(){return this._height},t}();var qw=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.hasSymbolVisual=!0,n}return n(e,t),e.prototype.getInitialData=function(t){return hx(null,this,{useEncodeDefaulter:!0})},e.prototype.getLegendIcon=function(t){var e=new Er,n=Vy("line",0,t.itemHeight/2,t.itemWidth,0,t.lineStyle.stroke,!1);e.add(n),n.setStyle(t.lineStyle);var i=this.getData().getVisual("symbol"),r=this.getData().getVisual("symbolRotate"),o="none"===i?"circle":i,a=.8*t.itemHeight,s=Vy(o,(t.itemWidth-a)/2,(t.itemHeight-a)/2,a,a,t.itemStyle.fill);e.add(s),s.setStyle(t.itemStyle);var l="inherit"===t.iconRotate?r:t.iconRotate||0;return s.rotation=l*Math.PI/180,s.setOrigin([t.itemWidth/2,t.itemHeight/2]),o.indexOf("empty")>-1&&(s.style.stroke=s.style.fill,s.style.fill="#fff",s.style.lineWidth=2),e},e.type="series.line",e.dependencies=["grid","polar"],e.defaultOption={z:3,coordinateSystem:"cartesian2d",legendHoverLink:!0,clip:!0,label:{position:"top"},endLabel:{show:!1,valueAnimation:!0,distance:8},lineStyle:{width:2,type:"solid"},emphasis:{scale:!0},step:!1,smooth:!1,smoothMonotone:null,symbol:"emptyCircle",symbolSize:4,symbolRotate:null,showSymbol:!0,showAllSymbol:"auto",connectNulls:!1,sampling:"none",animationEasing:"linear",progressive:0,hoverLayerThreshold:1/0,universalTransition:{divideShape:"clone"},triggerLineEvent:!1},e}(fg);function Kw(t,e){var n=t.mapDimensionsAll("defaultedLabel"),i=n.length;if(1===i){var r=df(t,e,n[0]);return null!=r?r+"":null}if(i){for(var o=[],a=0;a<n.length;a++)o.push(df(t,e,n[a]));return o.join(" ")}}function $w(t,e){var n=t.mapDimensionsAll("defaultedLabel");if(!Y(e))return e+"";for(var i=[],r=0;r<n.length;r++){var o=t.getDimensionIndex(n[r]);o>=0&&i.push(e[o])}return i.join(" ")}var Jw=function(t){function e(e,n,i,r){var o=t.call(this)||this;return o.updateData(e,n,i,r),o}return n(e,t),e.prototype._createSymbol=function(t,e,n,i,r){this.removeAll();var o=Vy(t,-1,-1,2,2,null,r);o.attr({z2:100,culling:!0,scaleX:i[0]/2,scaleY:i[1]/2}),o.drift=Qw,this._symbolType=t,this.add(o)},e.prototype.stopSymbolAnimation=function(t){this.childAt(0).stopAnimation(null,t)},e.prototype.getSymbolType=function(){return this._symbolType},e.prototype.getSymbolPath=function(){return this.childAt(0)},e.prototype.highlight=function(){Al(this.childAt(0))},e.prototype.downplay=function(){kl(this.childAt(0))},e.prototype.setZ=function(t,e){var n=this.childAt(0);n.zlevel=t,n.z=e},e.prototype.setDraggable=function(t,e){var n=this.childAt(0);n.draggable=t,n.cursor=!e&&t?"move":n.cursor},e.prototype.updateData=function(t,n,i,r){this.silent=!1;var o=t.getItemVisual(n,"symbol")||"circle",a=t.hostModel,s=e.getSymbolSize(t,n),l=o!==this._symbolType,u=r&&r.disableAnimation;if(l){var h=t.getItemVisual(n,"symbolKeepAspect");this._createSymbol(o,t,n,s,h)}else{(p=this.childAt(0)).silent=!1;var c={scaleX:s[0]/2,scaleY:s[1]/2};u?p.attr(c):dh(p,c,a,n),xh(p)}if(this._updateCommon(t,n,s,i,r),l){var p=this.childAt(0);if(!u){c={scaleX:this._sizeX,scaleY:this._sizeY,style:{opacity:p.style.opacity}};p.scaleX=p.scaleY=0,p.style.opacity=0,fh(p,c,a,n)}}u&&this.childAt(0).stopAnimation("leave")},e.prototype._updateCommon=function(t,e,n,i,r){var o,a,s,l,u,h,c,p,d,f=this.childAt(0),g=t.hostModel;if(i&&(o=i.emphasisItemStyle,a=i.blurItemStyle,s=i.selectItemStyle,l=i.focus,u=i.blurScope,c=i.labelStatesModels,p=i.hoverScale,d=i.cursorStyle,h=i.emphasisDisabled),!i||t.hasItemOption){var y=i&&i.itemModel?i.itemModel:t.getItemModel(e),v=y.getModel("emphasis");o=v.getModel("itemStyle").getItemStyle(),s=y.getModel(["select","itemStyle"]).getItemStyle(),a=y.getModel(["blur","itemStyle"]).getItemStyle(),l=v.get("focus"),u=v.get("blurScope"),h=v.get("disabled"),c=tc(y),p=v.getShallow("scale"),d=y.getShallow("cursor")}var m=t.getItemVisual(e,"symbolRotate");f.attr("rotation",(m||0)*Math.PI/180||0);var x=Fy(t.getItemVisual(e,"symbolOffset"),n);x&&(f.x=x[0],f.y=x[1]),d&&f.attr("cursor",d);var _=t.getItemVisual(e,"style"),b=_.fill;if(f instanceof As){var w=f.style;f.useStyle(A({image:w.image,x:w.x,y:w.y,width:w.width,height:w.height},_))}else f.__isEmptyBrush?f.useStyle(A({},_)):f.useStyle(_),f.style.decal=null,f.setColor(b,r&&r.symbolInnerColor),f.style.strokeNoScale=!0;var S=t.getItemVisual(e,"liftZ"),M=this._z2;null!=S?null==M&&(this._z2=f.z2,f.z2+=S):null!=M&&(f.z2=M,this._z2=null);var I=r&&r.useNameLabel;Qh(f,c,{labelFetcher:g,labelDataIndex:e,defaultText:function(e){return I?t.getName(e):Kw(t,e)},inheritColor:b,defaultOpacity:_.opacity}),this._sizeX=n[0]/2,this._sizeY=n[1]/2;var T=f.ensureState("emphasis");T.style=o,f.ensureState("select").style=s,f.ensureState("blur").style=a;var C=null==p||!0===p?Math.max(1.1,3/this._sizeY):isFinite(p)&&p>0?+p:1;T.scaleX=this._sizeX*C,T.scaleY=this._sizeY*C,this.setSymbolScale(1),Hl(this,l,u,h)},e.prototype.setSymbolScale=function(t){this.scaleX=this.scaleY=t},e.prototype.fadeOut=function(t,e,n){var i=this.childAt(0),r=Js(this).dataIndex,o=n&&n.animation;if(this.silent=i.silent=!0,n&&n.fadeLabel){var a=i.getTextContent();a&&yh(a,{style:{opacity:0}},e,{dataIndex:r,removeOpt:o,cb:function(){i.removeTextContent()}})}else i.removeTextContent();yh(i,{style:{opacity:0},scaleX:0,scaleY:0},e,{dataIndex:r,cb:t,removeOpt:o})},e.getSymbolSize=function(t,e){return By(t.getItemVisual(e,"symbolSize"))},e}(Er);function Qw(t,e){this.parent.drift(t,e)}function tS(t,e,n,i){return e&&!isNaN(e[0])&&!isNaN(e[1])&&!(i.isIgnore&&i.isIgnore(n))&&!(i.clipShape&&!i.clipShape.contain(e[0],e[1]))&&"none"!==t.getItemVisual(n,"symbol")}function eS(t){return null==t||q(t)||(t={isIgnore:t}),t||{}}function nS(t){var e=t.hostModel,n=e.getModel("emphasis");return{emphasisItemStyle:n.getModel("itemStyle").getItemStyle(),blurItemStyle:e.getModel(["blur","itemStyle"]).getItemStyle(),selectItemStyle:e.getModel(["select","itemStyle"]).getItemStyle(),focus:n.get("focus"),blurScope:n.get("blurScope"),emphasisDisabled:n.get("disabled"),hoverScale:n.get("scale"),labelStatesModels:tc(e),cursorStyle:e.get("cursor")}}var iS=function(){function t(t){this.group=new Er,this._SymbolCtor=t||Jw}return t.prototype.updateData=function(t,e){this._progressiveEls=null,e=eS(e);var n=this.group,i=t.hostModel,r=this._data,o=this._SymbolCtor,a=e.disableAnimation,s=nS(t),l={disableAnimation:a},u=e.getSymbolPoint||function(e){return t.getItemLayout(e)};r||n.removeAll(),t.diff(r).add((function(i){var r=u(i);if(tS(t,r,i,e)){var a=new o(t,i,s,l);a.setPosition(r),t.setItemGraphicEl(i,a),n.add(a)}})).update((function(h,c){var p=r.getItemGraphicEl(c),d=u(h);if(tS(t,d,h,e)){var f=t.getItemVisual(h,"symbol")||"circle",g=p&&p.getSymbolType&&p.getSymbolType();if(!p||g&&g!==f)n.remove(p),(p=new o(t,h,s,l)).setPosition(d);else{p.updateData(t,h,s,l);var y={x:d[0],y:d[1]};a?p.attr(y):dh(p,y,i)}n.add(p),t.setItemGraphicEl(h,p)}else n.remove(p)})).remove((function(t){var e=r.getItemGraphicEl(t);e&&e.fadeOut((function(){n.remove(e)}),i)})).execute(),this._getSymbolPoint=u,this._data=t},t.prototype.updateLayout=function(){var t=this,e=this._data;e&&e.eachItemGraphicEl((function(e,n){var i=t._getSymbolPoint(n);e.setPosition(i),e.markRedraw()}))},t.prototype.incrementalPrepareUpdate=function(t){this._seriesScope=nS(t),this._data=null,this.group.removeAll()},t.prototype.incrementalUpdate=function(t,e,n){function i(t){t.isGroup||(t.incremental=!0,t.ensureState("emphasis").hoverLayer=!0)}this._progressiveEls=[],n=eS(n);for(var r=t.start;r<t.end;r++){var o=e.getItemLayout(r);if(tS(e,o,r,n)){var a=new this._SymbolCtor(e,r,this._seriesScope);a.traverse(i),a.setPosition(o),this.group.add(a),e.setItemGraphicEl(r,a),this._progressiveEls.push(a)}}},t.prototype.eachRendered=function(t){jh(this._progressiveEls||this.group,t)},t.prototype.remove=function(t){var e=this.group,n=this._data;n&&t?n.eachItemGraphicEl((function(t){t.fadeOut((function(){e.remove(t)}),n.hostModel)})):e.removeAll()},t}();function rS(t,e,n){var i=t.getBaseAxis(),r=t.getOtherAxis(i),o=function(t,e){var n=0,i=t.scale.getExtent();"start"===e?n=i[0]:"end"===e?n=i[1]:j(e)&&!isNaN(e)?n=e:i[0]>0?n=i[0]:i[1]<0&&(n=i[1]);return n}(r,n),a=i.dim,s=r.dim,l=e.mapDimension(s),u=e.mapDimension(a),h="x"===s||"radius"===s?1:0,c=z(t.dimensions,(function(t){return e.mapDimension(t)})),p=!1,d=e.getCalculationInfo("stackResultDimension");return lx(e,c[0])&&(p=!0,c[0]=d),lx(e,c[1])&&(p=!0,c[1]=d),{dataDimsForPoint:c,valueStart:o,valueAxisDim:s,baseAxisDim:a,stacked:!!p,valueDim:l,baseDim:u,baseDataOffset:h,stackedOverDimension:e.getCalculationInfo("stackedOverDimension")}}function oS(t,e,n,i){var r=NaN;t.stacked&&(r=n.get(n.getCalculationInfo("stackedOverDimension"),i)),isNaN(r)&&(r=t.valueStart);var o=t.baseDataOffset,a=[];return a[o]=n.get(t.baseDim,i),a[1-o]=r,e.dataToPoint(a)}var aS=Math.min,sS=Math.max;function lS(t,e){return isNaN(t)||isNaN(e)}function uS(t,e,n,i,r,o,a,s,l){for(var u,h,c,p,d,f,g=n,y=0;y<i;y++){var v=e[2*g],m=e[2*g+1];if(g>=r||g<0)break;if(lS(v,m)){if(l){g+=o;continue}break}if(g===n)t[o>0?"moveTo":"lineTo"](v,m),c=v,p=m;else{var x=v-u,_=m-h;if(x*x+_*_<.5){g+=o;continue}if(a>0){for(var b=g+o,w=e[2*b],S=e[2*b+1];w===v&&S===m&&y<i;)y++,g+=o,w=e[2*(b+=o)],S=e[2*b+1],x=(v=e[2*g])-u,_=(m=e[2*g+1])-h;var M=y+1;if(l)for(;lS(w,S)&&M<i;)M++,w=e[2*(b+=o)],S=e[2*b+1];var I=.5,T=0,C=0,D=void 0,A=void 0;if(M>=i||lS(w,S))d=v,f=m;else{T=w-u,C=S-h;var k=v-u,L=w-v,P=m-h,O=S-m,R=void 0,N=void 0;if("x"===s){var E=T>0?1:-1;d=v-E*(R=Math.abs(k))*a,f=m,D=v+E*(N=Math.abs(L))*a,A=m}else if("y"===s){var z=C>0?1:-1;d=v,f=m-z*(R=Math.abs(P))*a,D=v,A=m+z*(N=Math.abs(O))*a}else R=Math.sqrt(k*k+P*P),d=v-T*a*(1-(I=(N=Math.sqrt(L*L+O*O))/(N+R))),f=m-C*a*(1-I),A=m+C*a*I,D=aS(D=v+T*a*I,sS(w,v)),A=aS(A,sS(S,m)),D=sS(D,aS(w,v)),f=m-(C=(A=sS(A,aS(S,m)))-m)*R/N,d=aS(d=v-(T=D-v)*R/N,sS(u,v)),f=aS(f,sS(h,m)),D=v+(T=v-(d=sS(d,aS(u,v))))*N/R,A=m+(C=m-(f=sS(f,aS(h,m))))*N/R}t.bezierCurveTo(c,p,d,f,v,m),c=D,p=A}else t.lineTo(v,m)}u=v,h=m,g+=o}return y}var hS=function(){this.smooth=0,this.smoothConstraint=!0},cS=function(t){function e(e){var n=t.call(this,e)||this;return n.type="ec-polyline",n}return n(e,t),e.prototype.getDefaultStyle=function(){return{stroke:"#000",fill:null}},e.prototype.getDefaultShape=function(){return new hS},e.prototype.buildPath=function(t,e){var n=e.points,i=0,r=n.length/2;if(e.connectNulls){for(;r>0&&lS(n[2*r-2],n[2*r-1]);r--);for(;i<r&&lS(n[2*i],n[2*i+1]);i++);}for(;i<r;)i+=uS(t,n,i,r,r,1,e.smooth,e.smoothMonotone,e.connectNulls)+1},e.prototype.getPointOn=function(t,e){this.path||(this.createPathProxy(),this.buildPath(this.path,this.shape));for(var n,i,r=this.path.data,o=rs.CMD,a="x"===e,s=[],l=0;l<r.length;){var u=void 0,h=void 0,c=void 0,p=void 0,d=void 0,f=void 0,g=void 0;switch(r[l++]){case o.M:n=r[l++],i=r[l++];break;case o.L:if(u=r[l++],h=r[l++],(g=a?(t-n)/(u-n):(t-i)/(h-i))<=1&&g>=0){var y=a?(h-i)*g+i:(u-n)*g+n;return a?[t,y]:[y,t]}n=u,i=h;break;case o.C:u=r[l++],h=r[l++],c=r[l++],p=r[l++],d=r[l++],f=r[l++];var v=a?xn(n,u,c,d,t,s):xn(i,h,p,f,t,s);if(v>0)for(var m=0;m<v;m++){var x=s[m];if(x<=1&&x>=0){y=a?vn(i,h,p,f,x):vn(n,u,c,d,x);return a?[t,y]:[y,t]}}n=d,i=f}}},e}(Ms),pS=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e}(hS),dS=function(t){function e(e){var n=t.call(this,e)||this;return n.type="ec-polygon",n}return n(e,t),e.prototype.getDefaultShape=function(){return new pS},e.prototype.buildPath=function(t,e){var n=e.points,i=e.stackedOnPoints,r=0,o=n.length/2,a=e.smoothMonotone;if(e.connectNulls){for(;o>0&&lS(n[2*o-2],n[2*o-1]);o--);for(;r<o&&lS(n[2*r],n[2*r+1]);r++);}for(;r<o;){var s=uS(t,n,r,o,o,1,e.smooth,a,e.connectNulls);uS(t,i,r+s-1,s,o,-1,e.stackedOnSmooth,a,e.connectNulls),r+=s+1,t.closePath()}},e}(Ms);function fS(t,e,n,i,r){var o=t.getArea(),a=o.x,s=o.y,l=o.width,u=o.height,h=n.get(["lineStyle","width"])||2;a-=h/2,s-=h/2,l+=h,u+=h,a=Math.floor(a),l=Math.round(l);var c=new Es({shape:{x:a,y:s,width:l,height:u}});if(e){var p=t.getBaseAxis(),d=p.isHorizontal(),f=p.inverse;d?(f&&(c.shape.x+=l),c.shape.width=0):(f||(c.shape.y+=u),c.shape.height=0);var g=U(r)?function(t){r(t,c)}:null;fh(c,{shape:{width:l,height:u,x:a,y:s}},n,null,i,g)}return c}function gS(t,e,n){var i=t.getArea(),r=Xr(i.r0,1),o=Xr(i.r,1),a=new Eu({shape:{cx:Xr(t.cx,1),cy:Xr(t.cy,1),r0:r,r:o,startAngle:i.startAngle,endAngle:i.endAngle,clockwise:i.clockwise}});e&&("angle"===t.getBaseAxis().dim?a.shape.endAngle=i.startAngle:a.shape.r=r,fh(a,{shape:{endAngle:i.endAngle,r:o}},n));return a}function yS(t,e,n,i,r){return t?"polar"===t.type?gS(t,e,n):"cartesian2d"===t.type?fS(t,e,n,i,r):null:null}function vS(t,e){return t.type===e}function mS(t,e){if(t.length===e.length){for(var n=0;n<t.length;n++)if(t[n]!==e[n])return;return!0}}function xS(t){for(var e=1/0,n=1/0,i=-1/0,r=-1/0,o=0;o<t.length;){var a=t[o++],s=t[o++];isNaN(a)||(e=Math.min(a,e),i=Math.max(a,i)),isNaN(s)||(n=Math.min(s,n),r=Math.max(s,r))}return[[e,n],[i,r]]}function _S(t,e){var n=xS(t),i=n[0],r=n[1],o=xS(e),a=o[0],s=o[1];return Math.max(Math.abs(i[0]-a[0]),Math.abs(i[1]-a[1]),Math.abs(r[0]-s[0]),Math.abs(r[1]-s[1]))}function bS(t){return j(t)?t:t?.5:0}function wS(t,e,n,i){var r=e.getBaseAxis(),o="x"===r.dim||"radius"===r.dim?0:1,a=[],s=0,l=[],u=[],h=[],c=[];if(i){for(s=0;s<t.length;s+=2)isNaN(t[s])||isNaN(t[s+1])||c.push(t[s],t[s+1]);t=c}for(s=0;s<t.length-2;s+=2)switch(h[0]=t[s+2],h[1]=t[s+3],u[0]=t[s],u[1]=t[s+1],a.push(u[0],u[1]),n){case"end":l[o]=h[o],l[1-o]=u[1-o],a.push(l[0],l[1]);break;case"middle":var p=(u[o]+h[o])/2,d=[];l[o]=d[o]=p,l[1-o]=u[1-o],d[1-o]=h[1-o],a.push(l[0],l[1]),a.push(d[0],d[1]);break;default:l[o]=u[o],l[1-o]=h[1-o],a.push(l[0],l[1])}return a.push(t[s++],t[s++]),a}function SS(t,e,n){var i=t.getVisual("visualMeta");if(i&&i.length&&t.count()&&"cartesian2d"===e.type){for(var r,o,a=i.length-1;a>=0;a--){var s=t.getDimensionInfo(i[a].dimension);if("x"===(r=s&&s.coordDim)||"y"===r){o=i[a];break}}if(o){var l=e.getAxis(r),u=z(o.stops,(function(t){return{coord:l.toGlobalCoord(l.dataToCoord(t.value)),color:t.color}})),h=u.length,c=o.outerColors.slice();h&&u[0].coord>u[h-1].coord&&(u.reverse(),c.reverse());var p=function(t,e){var n,i,r=[],o=t.length;function a(t,e,n){var i=t.coord;return{coord:n,color:Qn((n-i)/(e.coord-i),[t.color,e.color])}}for(var s=0;s<o;s++){var l=t[s],u=l.coord;if(u<0)n=l;else{if(u>e){i?r.push(a(i,l,e)):n&&r.push(a(n,l,0),a(n,l,e));break}n&&(r.push(a(n,l,0)),n=null),r.push(l),i=l}}return r}(u,"x"===r?n.getWidth():n.getHeight()),d=p.length;if(!d&&h)return u[0].coord<0?c[1]?c[1]:u[h-1].color:c[0]?c[0]:u[0].color;var f=p[0].coord-10,g=p[d-1].coord+10,y=g-f;if(y<.001)return"transparent";E(p,(function(t){t.offset=(t.coord-f)/y})),p.push({offset:d?p[d-1].offset:.5,color:c[1]||"transparent"}),p.unshift({offset:d?p[0].offset:.5,color:c[0]||"transparent"});var v=new eh(0,0,0,0,p,!0);return v[r]=f,v[r+"2"]=g,v}}}function MS(t,e,n){var i=t.get("showAllSymbol"),r="auto"===i;if(!i||r){var o=n.getAxesByScale("ordinal")[0];if(o&&(!r||!function(t,e){var n=t.getExtent(),i=Math.abs(n[1]-n[0])/t.scale.count();isNaN(i)&&(i=0);for(var r=e.count(),o=Math.max(1,Math.round(r/5)),a=0;a<r;a+=o)if(1.5*Jw.getSymbolSize(e,a)[t.isHorizontal()?1:0]>i)return!1;return!0}(o,e))){var a=e.mapDimension(o.dim),s={};return E(o.getViewLabels(),(function(t){var e=o.scale.getRawOrdinalNumber(t.tickValue);s[e]=1})),function(t){return!s.hasOwnProperty(e.get(a,t))}}}}function IS(t,e){return[t[2*e],t[2*e+1]]}function TS(t){if(t.get(["endLabel","show"]))return!0;for(var e=0;e<rl.length;e++)if(t.get([rl[e],"endLabel","show"]))return!0;return!1}function CS(t,e,n,i){if(vS(e,"cartesian2d")){var r=i.getModel("endLabel"),o=r.get("valueAnimation"),a=i.getData(),s={lastFrameIndex:0},l=TS(i)?function(n,i){t._endLabelOnDuring(n,i,a,s,o,r,e)}:null,u=e.getBaseAxis().isHorizontal(),h=fS(e,n,i,(function(){var e=t._endLabel;e&&n&&null!=s.originalX&&e.attr({x:s.originalX,y:s.originalY})}),l);if(!i.get("clip",!0)){var c=h.shape,p=Math.max(c.width,c.height);u?(c.y-=p,c.height+=2*p):(c.x-=p,c.width+=2*p)}return l&&l(1,h),h}return gS(e,n,i)}var DS=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.prototype.init=function(){var t=new Er,e=new iS;this.group.add(e.group),this._symbolDraw=e,this._lineGroup=t},e.prototype.render=function(t,e,n){var i=this,r=t.coordinateSystem,o=this.group,a=t.getData(),s=t.getModel("lineStyle"),l=t.getModel("areaStyle"),u=a.getLayout("points")||[],h="polar"===r.type,c=this._coordSys,p=this._symbolDraw,d=this._polyline,f=this._polygon,g=this._lineGroup,y=t.get("animation"),v=!l.isEmpty(),m=l.get("origin"),x=rS(r,a,m),_=v&&function(t,e,n){if(!n.valueDim)return[];for(var i=e.count(),r=Ax(2*i),o=0;o<i;o++){var a=oS(n,t,e,o);r[2*o]=a[0],r[2*o+1]=a[1]}return r}(r,a,x),b=t.get("showSymbol"),w=t.get("connectNulls"),S=b&&!h&&MS(t,a,r),M=this._data;M&&M.eachItemGraphicEl((function(t,e){t.__temp&&(o.remove(t),M.setItemGraphicEl(e,null))})),b||p.remove(),o.add(g);var I,T=!h&&t.get("step");r&&r.getArea&&t.get("clip",!0)&&(null!=(I=r.getArea()).width?(I.x-=.1,I.y-=.1,I.width+=.2,I.height+=.2):I.r0&&(I.r0-=.5,I.r+=.5)),this._clipShapeForSymbol=I;var C=SS(a,r,n)||a.getVisual("style")[a.getVisual("drawType")];if(d&&c.type===r.type&&T===this._step){v&&!f?f=this._newPolygon(u,_):f&&!v&&(g.remove(f),f=this._polygon=null),h||this._initOrUpdateEndLabel(t,r,xp(C));var D=g.getClipPath();if(D)fh(D,{shape:CS(this,r,!1,t).shape},t);else g.setClipPath(CS(this,r,!0,t));b&&p.updateData(a,{isIgnore:S,clipShape:I,disableAnimation:!0,getSymbolPoint:function(t){return[u[2*t],u[2*t+1]]}}),mS(this._stackedOnPoints,_)&&mS(this._points,u)||(y?this._doUpdateAnimation(a,_,r,n,T,m,w):(T&&(u=wS(u,r,T,w),_&&(_=wS(_,r,T,w))),d.setShape({points:u}),f&&f.setShape({points:u,stackedOnPoints:_})))}else b&&p.updateData(a,{isIgnore:S,clipShape:I,disableAnimation:!0,getSymbolPoint:function(t){return[u[2*t],u[2*t+1]]}}),y&&this._initSymbolLabelAnimation(a,r,I),T&&(u=wS(u,r,T,w),_&&(_=wS(_,r,T,w))),d=this._newPolyline(u),v?f=this._newPolygon(u,_):f&&(g.remove(f),f=this._polygon=null),h||this._initOrUpdateEndLabel(t,r,xp(C)),g.setClipPath(CS(this,r,!0,t));var A=t.getModel("emphasis"),L=A.get("focus"),P=A.get("blurScope"),O=A.get("disabled");(d.useStyle(k(s.getLineStyle(),{fill:"none",stroke:C,lineJoin:"bevel"})),Zl(d,t,"lineStyle"),d.style.lineWidth>0&&"bolder"===t.get(["emphasis","lineStyle","width"]))&&(d.getState("emphasis").style.lineWidth=+d.style.lineWidth+1);Js(d).seriesIndex=t.seriesIndex,Hl(d,L,P,O);var R=bS(t.get("smooth")),N=t.get("smoothMonotone");if(d.setShape({smooth:R,smoothMonotone:N,connectNulls:w}),f){var E=a.getCalculationInfo("stackedOnSeries"),z=0;f.useStyle(k(l.getAreaStyle(),{fill:C,opacity:.7,lineJoin:"bevel",decal:a.getVisual("style").decal})),E&&(z=bS(E.get("smooth"))),f.setShape({smooth:R,stackedOnSmooth:z,smoothMonotone:N,connectNulls:w}),Zl(f,t,"areaStyle"),Js(f).seriesIndex=t.seriesIndex,Hl(f,L,P,O)}var V=function(t){i._changePolyState(t)};a.eachItemGraphicEl((function(t){t&&(t.onHoverStateChange=V)})),this._polyline.onHoverStateChange=V,this._data=a,this._coordSys=r,this._stackedOnPoints=_,this._points=u,this._step=T,this._valueOrigin=m,t.get("triggerLineEvent")&&(this.packEventData(t,d),f&&this.packEventData(t,f))},e.prototype.packEventData=function(t,e){Js(e).eventData={componentType:"series",componentSubType:"line",componentIndex:t.componentIndex,seriesIndex:t.seriesIndex,seriesName:t.name,seriesType:"line"}},e.prototype.highlight=function(t,e,n,i){var r=t.getData(),o=Lo(r,i);if(this._changePolyState("emphasis"),!(o instanceof Array)&&null!=o&&o>=0){var a=r.getLayout("points"),s=r.getItemGraphicEl(o);if(!s){var l=a[2*o],u=a[2*o+1];if(isNaN(l)||isNaN(u))return;if(this._clipShapeForSymbol&&!this._clipShapeForSymbol.contain(l,u))return;var h=t.get("zlevel")||0,c=t.get("z")||0;(s=new Jw(r,o)).x=l,s.y=u,s.setZ(h,c);var p=s.getSymbolPath().getTextContent();p&&(p.zlevel=h,p.z=c,p.z2=this._polyline.z2+1),s.__temp=!0,r.setItemGraphicEl(o,s),s.stopSymbolAnimation(!0),this.group.add(s)}s.highlight()}else Tg.prototype.highlight.call(this,t,e,n,i)},e.prototype.downplay=function(t,e,n,i){var r=t.getData(),o=Lo(r,i);if(this._changePolyState("normal"),null!=o&&o>=0){var a=r.getItemGraphicEl(o);a&&(a.__temp?(r.setItemGraphicEl(o,null),this.group.remove(a)):a.downplay())}else Tg.prototype.downplay.call(this,t,e,n,i)},e.prototype._changePolyState=function(t){var e=this._polygon;Ml(this._polyline,t),e&&Ml(e,t)},e.prototype._newPolyline=function(t){var e=this._polyline;return e&&this._lineGroup.remove(e),e=new cS({shape:{points:t},segmentIgnoreThreshold:2,z2:10}),this._lineGroup.add(e),this._polyline=e,e},e.prototype._newPolygon=function(t,e){var n=this._polygon;return n&&this._lineGroup.remove(n),n=new dS({shape:{points:t,stackedOnPoints:e},segmentIgnoreThreshold:2}),this._lineGroup.add(n),this._polygon=n,n},e.prototype._initSymbolLabelAnimation=function(t,e,n){var i,r,o=e.getBaseAxis(),a=o.inverse;"cartesian2d"===e.type?(i=o.isHorizontal(),r=!1):"polar"===e.type&&(i="angle"===o.dim,r=!0);var s=t.hostModel,l=s.get("animationDuration");U(l)&&(l=l(null));var u=s.get("animationDelay")||0,h=U(u)?u(null):u;t.eachItemGraphicEl((function(t,o){var s=t;if(s){var c=[t.x,t.y],p=void 0,d=void 0,f=void 0;if(n)if(r){var g=n,y=e.pointToCoord(c);i?(p=g.startAngle,d=g.endAngle,f=-y[1]/180*Math.PI):(p=g.r0,d=g.r,f=y[0])}else{var v=n;i?(p=v.x,d=v.x+v.width,f=t.x):(p=v.y+v.height,d=v.y,f=t.y)}var m=d===p?0:(f-p)/(d-p);a&&(m=1-m);var x=U(u)?u(o):l*m+h,_=s.getSymbolPath(),b=_.getTextContent();s.attr({scaleX:0,scaleY:0}),s.animateTo({scaleX:1,scaleY:1},{duration:200,setToFinal:!0,delay:x}),b&&b.animateFrom({style:{opacity:0}},{duration:300,delay:x}),_.disableLabelAnimation=!0}}))},e.prototype._initOrUpdateEndLabel=function(t,e,n){var i=t.getModel("endLabel");if(TS(t)){var r=t.getData(),o=this._polyline,a=r.getLayout("points");if(!a)return o.removeTextContent(),void(this._endLabel=null);var s=this._endLabel;s||((s=this._endLabel=new Bs({z2:200})).ignoreClip=!0,o.setTextContent(this._endLabel),o.disableLabelAnimation=!0);var l=function(t){for(var e,n,i=t.length/2;i>0&&(e=t[2*i-2],n=t[2*i-1],isNaN(e)||isNaN(n));i--);return i-1}(a);l>=0&&(Qh(o,tc(t,"endLabel"),{inheritColor:n,labelFetcher:t,labelDataIndex:l,defaultText:function(t,e,n){return null!=n?$w(r,n):Kw(r,t)},enableTextSetter:!0},function(t,e){var n=e.getBaseAxis(),i=n.isHorizontal(),r=n.inverse,o=i?r?"right":"left":"center",a=i?"middle":r?"top":"bottom";return{normal:{align:t.get("align")||o,verticalAlign:t.get("verticalAlign")||a}}}(i,e)),o.textConfig.position=null)}else this._endLabel&&(this._polyline.removeTextContent(),this._endLabel=null)},e.prototype._endLabelOnDuring=function(t,e,n,i,r,o,a){var s=this._endLabel,l=this._polyline;if(s){t<1&&null==i.originalX&&(i.originalX=s.x,i.originalY=s.y);var u=n.getLayout("points"),h=n.hostModel,c=h.get("connectNulls"),p=o.get("precision"),d=o.get("distance")||0,f=a.getBaseAxis(),g=f.isHorizontal(),y=f.inverse,v=e.shape,m=y?g?v.x:v.y+v.height:g?v.x+v.width:v.y,x=(g?d:0)*(y?-1:1),_=(g?0:-d)*(y?-1:1),b=g?"x":"y",w=function(t,e,n){for(var i,r,o=t.length/2,a="x"===n?0:1,s=0,l=-1,u=0;u<o;u++)if(r=t[2*u+a],!isNaN(r)&&!isNaN(t[2*u+1-a]))if(0!==u){if(i<=e&&r>=e||i>=e&&r<=e){l=u;break}s=u,i=r}else i=r;return{range:[s,l],t:(e-i)/(r-i)}}(u,m,b),S=w.range,M=S[1]-S[0],I=void 0;if(M>=1){if(M>1&&!c){var T=IS(u,S[0]);s.attr({x:T[0]+x,y:T[1]+_}),r&&(I=h.getRawValue(S[0]))}else{(T=l.getPointOn(m,b))&&s.attr({x:T[0]+x,y:T[1]+_});var C=h.getRawValue(S[0]),D=h.getRawValue(S[1]);r&&(I=Go(n,p,C,D,w.t))}i.lastFrameIndex=S[0]}else{var A=1===t||i.lastFrameIndex>0?S[0]:0;T=IS(u,A);r&&(I=h.getRawValue(A)),s.attr({x:T[0]+x,y:T[1]+_})}r&&lc(s).setLabelText(I)}},e.prototype._doUpdateAnimation=function(t,e,n,i,r,o,a){var s=this._polyline,l=this._polygon,u=t.hostModel,h=function(t,e,n,i,r,o,a,s){for(var l=function(t,e){var n=[];return e.diff(t).add((function(t){n.push({cmd:"+",idx:t})})).update((function(t,e){n.push({cmd:"=",idx:e,idx1:t})})).remove((function(t){n.push({cmd:"-",idx:t})})).execute(),n}(t,e),u=[],h=[],c=[],p=[],d=[],f=[],g=[],y=rS(r,e,a),v=t.getLayout("points")||[],m=e.getLayout("points")||[],x=0;x<l.length;x++){var _=l[x],b=!0,w=void 0,S=void 0;switch(_.cmd){case"=":w=2*_.idx,S=2*_.idx1;var M=v[w],I=v[w+1],T=m[S],C=m[S+1];(isNaN(M)||isNaN(I))&&(M=T,I=C),u.push(M,I),h.push(T,C),c.push(n[w],n[w+1]),p.push(i[S],i[S+1]),g.push(e.getRawIndex(_.idx1));break;case"+":var D=_.idx,A=y.dataDimsForPoint,k=r.dataToPoint([e.get(A[0],D),e.get(A[1],D)]);S=2*D,u.push(k[0],k[1]),h.push(m[S],m[S+1]);var L=oS(y,r,e,D);c.push(L[0],L[1]),p.push(i[S],i[S+1]),g.push(e.getRawIndex(D));break;case"-":b=!1}b&&(d.push(_),f.push(f.length))}f.sort((function(t,e){return g[t]-g[e]}));var P=u.length,O=Ax(P),R=Ax(P),N=Ax(P),E=Ax(P),z=[];for(x=0;x<f.length;x++){var V=f[x],B=2*x,F=2*V;O[B]=u[F],O[B+1]=u[F+1],R[B]=h[F],R[B+1]=h[F+1],N[B]=c[F],N[B+1]=c[F+1],E[B]=p[F],E[B+1]=p[F+1],z[x]=d[V]}return{current:O,next:R,stackedOnCurrent:N,stackedOnNext:E,status:z}}(this._data,t,this._stackedOnPoints,e,this._coordSys,0,this._valueOrigin),c=h.current,p=h.stackedOnCurrent,d=h.next,f=h.stackedOnNext;if(r&&(c=wS(h.current,n,r,a),p=wS(h.stackedOnCurrent,n,r,a),d=wS(h.next,n,r,a),f=wS(h.stackedOnNext,n,r,a)),_S(c,d)>3e3||l&&_S(p,f)>3e3)return s.stopAnimation(),s.setShape({points:d}),void(l&&(l.stopAnimation(),l.setShape({points:d,stackedOnPoints:f})));s.shape.__points=h.current,s.shape.points=c;var g={shape:{points:d}};h.current!==c&&(g.shape.__points=h.next),s.stopAnimation(),dh(s,g,u),l&&(l.setShape({points:c,stackedOnPoints:p}),l.stopAnimation(),dh(l,{shape:{stackedOnPoints:f}},u),s.shape.points!==l.shape.points&&(l.shape.points=s.shape.points));for(var y=[],v=h.status,m=0;m<v.length;m++){if("="===v[m].cmd){var x=t.getItemGraphicEl(v[m].idx1);x&&y.push({el:x,ptIdx:m})}}s.animators&&s.animators.length&&s.animators[0].during((function(){l&&l.dirtyShape();for(var t=s.shape.__points,e=0;e<y.length;e++){var n=y[e].el,i=2*y[e].ptIdx;n.x=t[i],n.y=t[i+1],n.markRedraw()}}))},e.prototype.remove=function(t){var e=this.group,n=this._data;this._lineGroup.removeAll(),this._symbolDraw.remove(!0),n&&n.eachItemGraphicEl((function(t,i){t.__temp&&(e.remove(t),n.setItemGraphicEl(i,null))})),this._polyline=this._polygon=this._coordSys=this._points=this._stackedOnPoints=this._endLabel=this._data=null},e.type="line",e}(Tg);function AS(t,e){return{seriesType:t,plan:Sg(),reset:function(t){var n=t.getData(),i=t.coordinateSystem,r=t.pipelineContext,o=e||r.large;if(i){var a=z(i.dimensions,(function(t){return n.mapDimension(t)})).slice(0,2),s=a.length,l=n.getCalculationInfo("stackResultDimension");lx(n,a[0])&&(a[0]=l),lx(n,a[1])&&(a[1]=l);var u=n.getStore(),h=n.getDimensionIndex(a[0]),c=n.getDimensionIndex(a[1]);return s&&{progress:function(t,e){for(var n=t.end-t.start,r=o&&Ax(n*s),a=[],l=[],p=t.start,d=0;p<t.end;p++){var f=void 0;if(1===s){var g=u.get(h,p);f=i.dataToPoint(g,null,l)}else a[0]=u.get(h,p),a[1]=u.get(c,p),f=i.dataToPoint(a,null,l);o?(r[d++]=f[0],r[d++]=f[1]):e.setItemLayout(p,f.slice())}o&&e.setLayout("points",r)}}}}}}var kS={average:function(t){for(var e=0,n=0,i=0;i<t.length;i++)isNaN(t[i])||(e+=t[i],n++);return 0===n?NaN:e/n},sum:function(t){for(var e=0,n=0;n<t.length;n++)e+=t[n]||0;return e},max:function(t){for(var e=-1/0,n=0;n<t.length;n++)t[n]>e&&(e=t[n]);return isFinite(e)?e:NaN},min:function(t){for(var e=1/0,n=0;n<t.length;n++)t[n]<e&&(e=t[n]);return isFinite(e)?e:NaN},nearest:function(t){return t[0]}},LS=function(t){return Math.round(t.length/2)};function PS(t){return{seriesType:t,reset:function(t,e,n){var i=t.getData(),r=t.get("sampling"),o=t.coordinateSystem,a=i.count();if(a>10&&"cartesian2d"===o.type&&r){var s=o.getBaseAxis(),l=o.getOtherAxis(s),u=s.getExtent(),h=n.getDevicePixelRatio(),c=Math.abs(u[1]-u[0])*(h||1),p=Math.round(a/c);if(isFinite(p)&&p>1){"lttb"===r&&t.setData(i.lttbDownSample(i.mapDimension(l.dim),1/p));var d=void 0;X(r)?d=kS[r]:U(r)&&(d=r),d&&t.setData(i.downSample(i.mapDimension(l.dim),1/p,d,LS))}}}}}var OS=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.getInitialData=function(t,e){return hx(null,this,{useEncodeDefaulter:!0})},e.prototype.getMarkerPosition=function(t,e,n){var i=this.coordinateSystem;if(i&&i.clampData){var r=i.dataToPoint(i.clampData(t));if(n)E(i.getAxes(),(function(n,o){if("category"===n.type){var a=n.getTicksCoords(),s=i.clampData(t)[o];!e||"x1"!==e[o]&&"y1"!==e[o]||(s+=1),s>a.length-1&&(s=a.length-1),s<0&&(s=0),a[s]&&(r[o]=n.toGlobalCoord(a[s].coord))}}));else{var o=this.getData(),a=o.getLayout("offset"),s=o.getLayout("size"),l=i.getBaseAxis().isHorizontal()?0:1;r[l]+=a+s/2}return r}return[NaN,NaN]},e.type="series.__base_bar__",e.defaultOption={z:2,coordinateSystem:"cartesian2d",legendHoverLink:!0,barMinHeight:0,barMinAngle:0,large:!1,largeThreshold:400,progressive:3e3,progressiveChunkMode:"mod"},e}(fg);fg.registerClass(OS);var RS=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.getInitialData=function(){return hx(null,this,{useEncodeDefaulter:!0,createInvertedIndices:!!this.get("realtimeSort",!0)||null})},e.prototype.getProgressive=function(){return!!this.get("large")&&this.get("progressive")},e.prototype.getProgressiveThreshold=function(){var t=this.get("progressiveThreshold"),e=this.get("largeThreshold");return e>t&&(t=e),t},e.prototype.brushSelector=function(t,e,n){return n.rect(e.getItemLayout(t))},e.type="series.bar",e.dependencies=["grid","polar"],e.defaultOption=Tc(OS.defaultOption,{clip:!0,roundCap:!1,showBackground:!1,backgroundStyle:{color:"rgba(180, 180, 180, 0.2)",borderColor:null,borderWidth:0,borderType:"solid",borderRadius:0,shadowBlur:0,shadowColor:null,shadowOffsetX:0,shadowOffsetY:0,opacity:1},select:{itemStyle:{borderColor:"#212121"}},realtimeSort:!1}),e}(OS),NS=function(){this.cx=0,this.cy=0,this.r0=0,this.r=0,this.startAngle=0,this.endAngle=2*Math.PI,this.clockwise=!0},ES=function(t){function e(e){var n=t.call(this,e)||this;return n.type="sausage",n}return n(e,t),e.prototype.getDefaultShape=function(){return new NS},e.prototype.buildPath=function(t,e){var n=e.cx,i=e.cy,r=Math.max(e.r0||0,0),o=Math.max(e.r,0),a=.5*(o-r),s=r+a,l=e.startAngle,u=e.endAngle,h=e.clockwise,c=2*Math.PI,p=h?u-l<c:l-u<c;p||(l=u-(h?c:-c));var d=Math.cos(l),f=Math.sin(l),g=Math.cos(u),y=Math.sin(u);p?(t.moveTo(d*r+n,f*r+i),t.arc(d*s+n,f*s+i,a,-Math.PI+l,l,!h)):t.moveTo(d*o+n,f*o+i),t.arc(n,i,o,l,u,!h),t.arc(g*s+n,y*s+i,a,u-2*Math.PI,u-Math.PI,!h),0!==r&&t.arc(n,i,r,u,l,h)},e}(Ms);function zS(t,e,n){return e*Math.sin(t)*(n?-1:1)}function VS(t,e,n){return e*Math.cos(t)*(n?1:-1)}var BS=Math.max,FS=Math.min;var GS=function(t){function e(){var n=t.call(this)||this;return n.type=e.type,n._isFirstFrame=!0,n}return n(e,t),e.prototype.render=function(t,e,n,i){this._model=t,this._removeOnRenderedListener(n),this._updateDrawMode(t);var r=t.get("coordinateSystem");("cartesian2d"===r||"polar"===r)&&(this._progressiveEls=null,this._isLargeDraw?this._renderLarge(t,e,n):this._renderNormal(t,e,n,i))},e.prototype.incrementalPrepareRender=function(t){this._clear(),this._updateDrawMode(t),this._updateLargeClip(t)},e.prototype.incrementalRender=function(t,e){this._progressiveEls=[],this._incrementalRenderLarge(t,e)},e.prototype.eachRendered=function(t){jh(this._progressiveEls||this.group,t)},e.prototype._updateDrawMode=function(t){var e=t.pipelineContext.large;null!=this._isLargeDraw&&e===this._isLargeDraw||(this._isLargeDraw=e,this._clear())},e.prototype._renderNormal=function(t,e,n,i){var r,o=this.group,a=t.getData(),s=this._data,l=t.coordinateSystem,u=l.getBaseAxis();"cartesian2d"===l.type?r=u.isHorizontal():"polar"===l.type&&(r="angle"===u.dim);var h=t.isAnimationEnabled()?t:null,c=function(t,e){var n=t.get("realtimeSort",!0),i=e.getBaseAxis();0;if(n&&"category"===i.type&&"cartesian2d"===e.type)return{baseAxis:i,otherAxis:e.getOtherAxis(i)}}(t,l);c&&this._enableRealtimeSort(c,a,n);var p=t.get("clip",!0)||c,d=function(t,e){var n=t.getArea&&t.getArea();if(vS(t,"cartesian2d")){var i=t.getBaseAxis();if("category"!==i.type||!i.onBand){var r=e.getLayout("bandWidth");i.isHorizontal()?(n.x-=r,n.width+=2*r):(n.y-=r,n.height+=2*r)}}return n}(l,a);o.removeClipPath();var f=t.get("roundCap",!0),g=t.get("showBackground",!0),y=t.getModel("backgroundStyle"),v=y.get("borderRadius")||0,m=[],x=this._backgroundEls,_=i&&i.isInitSort,b=i&&"changeAxisOrder"===i.type;function w(t){var e=qS[l.type](a,t),n=function(t,e,n){return new("polar"===t.type?Eu:Es)({shape:nM(e,n,t),silent:!0,z2:0})}(l,r,e);return n.useStyle(y.getItemStyle()),"cartesian2d"===l.type&&n.setShape("r",v),m[t]=n,n}a.diff(s).add((function(e){var n=a.getItemModel(e),i=qS[l.type](a,e,n);if(g&&w(e),a.hasValue(e)&&jS[l.type](i)){var s=!1;p&&(s=WS[l.type](d,i));var y=HS[l.type](t,a,e,i,r,h,u.model,!1,f);c&&(y.forceLabelAnimation=!0),$S(y,a,e,n,i,t,r,"polar"===l.type),_?y.attr({shape:i}):c?YS(c,h,y,i,e,r,!1,!1):fh(y,{shape:i},t,e),a.setItemGraphicEl(e,y),o.add(y),y.ignore=s}})).update((function(e,n){var i=a.getItemModel(e),S=qS[l.type](a,e,i);if(g){var M=void 0;0===x.length?M=w(n):((M=x[n]).useStyle(y.getItemStyle()),"cartesian2d"===l.type&&M.setShape("r",v),m[e]=M);var I=qS[l.type](a,e);dh(M,{shape:nM(r,I,l)},h,e)}var T=s.getItemGraphicEl(n);if(a.hasValue(e)&&jS[l.type](S)){var C=!1;if(p&&(C=WS[l.type](d,S))&&o.remove(T),T?xh(T):T=HS[l.type](t,a,e,S,r,h,u.model,!!T,f),c&&(T.forceLabelAnimation=!0),b){var D=T.getTextContent();if(D){var A=lc(D);null!=A.prevValue&&(A.prevValue=A.value)}}else $S(T,a,e,i,S,t,r,"polar"===l.type);_?T.attr({shape:S}):c?YS(c,h,T,S,e,r,!0,b):dh(T,{shape:S},t,e,null),a.setItemGraphicEl(e,T),T.ignore=C,o.add(T)}else o.remove(T)})).remove((function(e){var n=s.getItemGraphicEl(e);n&&mh(n,t,e)})).execute();var S=this._backgroundGroup||(this._backgroundGroup=new Er);S.removeAll();for(var M=0;M<m.length;++M)S.add(m[M]);o.add(S),this._backgroundEls=m,this._data=a},e.prototype._renderLarge=function(t,e,n){this._clear(),tM(t,this.group),this._updateLargeClip(t)},e.prototype._incrementalRenderLarge=function(t,e){this._removeBackground(),tM(e,this.group,this._progressiveEls,!0)},e.prototype._updateLargeClip=function(t){var e=t.get("clip",!0)&&yS(t.coordinateSystem,!1,t),n=this.group;e?n.setClipPath(e):n.removeClipPath()},e.prototype._enableRealtimeSort=function(t,e,n){var i=this;if(e.count()){var r=t.baseAxis;if(this._isFirstFrame)this._dispatchInitSort(e,t,n),this._isFirstFrame=!1;else{var o=function(t){var n=e.getItemGraphicEl(t),i=n&&n.shape;return i&&Math.abs(r.isHorizontal()?i.height:i.width)||0};this._onRendered=function(){i._updateSortWithinSameData(e,o,r,n)},n.getZr().on("rendered",this._onRendered)}}},e.prototype._dataSort=function(t,e,n){var i=[];return t.each(t.mapDimension(e.dim),(function(t,e){var r=n(e);r=null==r?NaN:r,i.push({dataIndex:e,mappedValue:r,ordinalNumber:t})})),i.sort((function(t,e){return e.mappedValue-t.mappedValue})),{ordinalNumbers:z(i,(function(t){return t.ordinalNumber}))}},e.prototype._isOrderChangedWithinSameData=function(t,e,n){for(var i=n.scale,r=t.mapDimension(n.dim),o=Number.MAX_VALUE,a=0,s=i.getOrdinalMeta().categories.length;a<s;++a){var l=t.rawIndexOf(r,i.getRawOrdinalNumber(a)),u=l<0?Number.MIN_VALUE:e(t.indexOfRawIndex(l));if(u>o)return!0;o=u}return!1},e.prototype._isOrderDifferentInView=function(t,e){for(var n=e.scale,i=n.getExtent(),r=Math.max(0,i[0]),o=Math.min(i[1],n.getOrdinalMeta().categories.length-1);r<=o;++r)if(t.ordinalNumbers[r]!==n.getRawOrdinalNumber(r))return!0},e.prototype._updateSortWithinSameData=function(t,e,n,i){if(this._isOrderChangedWithinSameData(t,e,n)){var r=this._dataSort(t,n,e);this._isOrderDifferentInView(r,n)&&(this._removeOnRenderedListener(i),i.dispatchAction({type:"changeAxisOrder",componentType:n.dim+"Axis",axisId:n.index,sortInfo:r}))}},e.prototype._dispatchInitSort=function(t,e,n){var i=e.baseAxis,r=this._dataSort(t,i,(function(n){return t.get(t.mapDimension(e.otherAxis.dim),n)}));n.dispatchAction({type:"changeAxisOrder",componentType:i.dim+"Axis",isInitSort:!0,axisId:i.index,sortInfo:r})},e.prototype.remove=function(t,e){this._clear(this._model),this._removeOnRenderedListener(e)},e.prototype.dispose=function(t,e){this._removeOnRenderedListener(e)},e.prototype._removeOnRenderedListener=function(t){this._onRendered&&(t.getZr().off("rendered",this._onRendered),this._onRendered=null)},e.prototype._clear=function(t){var e=this.group,n=this._data;t&&t.isAnimationEnabled()&&n&&!this._isLargeDraw?(this._removeBackground(),this._backgroundEls=[],n.eachItemGraphicEl((function(e){mh(e,t,Js(e).dataIndex)}))):e.removeAll(),this._data=null,this._isFirstFrame=!0},e.prototype._removeBackground=function(){this.group.remove(this._backgroundGroup),this._backgroundGroup=null},e.type="bar",e}(Tg),WS={cartesian2d:function(t,e){var n=e.width<0?-1:1,i=e.height<0?-1:1;n<0&&(e.x+=e.width,e.width=-e.width),i<0&&(e.y+=e.height,e.height=-e.height);var r=t.x+t.width,o=t.y+t.height,a=BS(e.x,t.x),s=FS(e.x+e.width,r),l=BS(e.y,t.y),u=FS(e.y+e.height,o),h=s<a,c=u<l;return e.x=h&&a>r?s:a,e.y=c&&l>o?u:l,e.width=h?0:s-a,e.height=c?0:u-l,n<0&&(e.x+=e.width,e.width=-e.width),i<0&&(e.y+=e.height,e.height=-e.height),h||c},polar:function(t,e){var n=e.r0<=e.r?1:-1;if(n<0){var i=e.r;e.r=e.r0,e.r0=i}var r=FS(e.r,t.r),o=BS(e.r0,t.r0);e.r=r,e.r0=o;var a=r-o<0;if(n<0){i=e.r;e.r=e.r0,e.r0=i}return a}},HS={cartesian2d:function(t,e,n,i,r,o,a,s,l){var u=new Es({shape:A({},i),z2:1});(u.__dataIndex=n,u.name="item",o)&&(u.shape[r?"height":"width"]=0);return u},polar:function(t,e,n,i,r,o,a,s,l){var u=!r&&l?ES:Eu,h=new u({shape:i,z2:1});h.name="item";var c,p,d=KS(r);if(h.calculateTextPosition=(c=d,p=({isRoundCap:u===ES}||{}).isRoundCap,function(t,e,n){var i=e.position;if(!i||i instanceof Array)return Ir(t,e,n);var r=c(i),o=null!=e.distance?e.distance:5,a=this.shape,s=a.cx,l=a.cy,u=a.r,h=a.r0,d=(u+h)/2,f=a.startAngle,g=a.endAngle,y=(f+g)/2,v=p?Math.abs(u-h)/2:0,m=Math.cos,x=Math.sin,_=s+u*m(f),b=l+u*x(f),w="left",S="top";switch(r){case"startArc":_=s+(h-o)*m(y),b=l+(h-o)*x(y),w="center",S="top";break;case"insideStartArc":_=s+(h+o)*m(y),b=l+(h+o)*x(y),w="center",S="bottom";break;case"startAngle":_=s+d*m(f)+zS(f,o+v,!1),b=l+d*x(f)+VS(f,o+v,!1),w="right",S="middle";break;case"insideStartAngle":_=s+d*m(f)+zS(f,-o+v,!1),b=l+d*x(f)+VS(f,-o+v,!1),w="left",S="middle";break;case"middle":_=s+d*m(y),b=l+d*x(y),w="center",S="middle";break;case"endArc":_=s+(u+o)*m(y),b=l+(u+o)*x(y),w="center",S="bottom";break;case"insideEndArc":_=s+(u-o)*m(y),b=l+(u-o)*x(y),w="center",S="top";break;case"endAngle":_=s+d*m(g)+zS(g,o+v,!0),b=l+d*x(g)+VS(g,o+v,!0),w="left",S="middle";break;case"insideEndAngle":_=s+d*m(g)+zS(g,-o+v,!0),b=l+d*x(g)+VS(g,-o+v,!0),w="right",S="middle";break;default:return Ir(t,e,n)}return(t=t||{}).x=_,t.y=b,t.align=w,t.verticalAlign=S,t}),o){var f=r?"r":"endAngle",g={};h.shape[f]=r?0:i.startAngle,g[f]=i[f],(s?dh:fh)(h,{shape:g},o)}return h}};function YS(t,e,n,i,r,o,a,s){var l,u;o?(u={x:i.x,width:i.width},l={y:i.y,height:i.height}):(u={y:i.y,height:i.height},l={x:i.x,width:i.width}),s||(a?dh:fh)(n,{shape:l},e,r,null),(a?dh:fh)(n,{shape:u},e?t.baseAxis.model:null,r)}function US(t,e){for(var n=0;n<e.length;n++)if(!isFinite(t[e[n]]))return!0;return!1}var XS=["x","y","width","height"],ZS=["cx","cy","r","startAngle","endAngle"],jS={cartesian2d:function(t){return!US(t,XS)},polar:function(t){return!US(t,ZS)}},qS={cartesian2d:function(t,e,n){var i=t.getItemLayout(e),r=n?function(t,e){var n=t.get(["itemStyle","borderColor"]);if(!n||"none"===n)return 0;var i=t.get(["itemStyle","borderWidth"])||0,r=isNaN(e.width)?Number.MAX_VALUE:Math.abs(e.width),o=isNaN(e.height)?Number.MAX_VALUE:Math.abs(e.height);return Math.min(i,r,o)}(n,i):0,o=i.width>0?1:-1,a=i.height>0?1:-1;return{x:i.x+o*r/2,y:i.y+a*r/2,width:i.width-o*r,height:i.height-a*r}},polar:function(t,e,n){var i=t.getItemLayout(e);return{cx:i.cx,cy:i.cy,r0:i.r0,r:i.r,startAngle:i.startAngle,endAngle:i.endAngle,clockwise:i.clockwise}}};function KS(t){return function(t){var e=t?"Arc":"Angle";return function(t){switch(t){case"start":case"insideStart":case"end":case"insideEnd":return t+e;default:return t}}}(t)}function $S(t,e,n,i,r,o,a,s){var l=e.getItemVisual(n,"style");s||t.setShape("r",i.get(["itemStyle","borderRadius"])||0),t.useStyle(l);var u=i.getShallow("cursor");u&&t.attr("cursor",u);var h=s?a?r.r>=r.r0?"endArc":"startArc":r.endAngle>=r.startAngle?"endAngle":"startAngle":a?r.height>=0?"bottom":"top":r.width>=0?"right":"left",c=tc(i);Qh(t,c,{labelFetcher:o,labelDataIndex:n,defaultText:Kw(o.getData(),n),inheritColor:l.fill,defaultOpacity:l.opacity,defaultOutsidePosition:h});var p=t.getTextContent();if(s&&p){var d=i.get(["label","position"]);t.textConfig.inside="middle"===d||null,function(t,e,n,i){if(j(i))t.setTextConfig({rotation:i});else if(Y(e))t.setTextConfig({rotation:0});else{var r,o=t.shape,a=o.clockwise?o.startAngle:o.endAngle,s=o.clockwise?o.endAngle:o.startAngle,l=(a+s)/2,u=n(e);switch(u){case"startArc":case"insideStartArc":case"middle":case"insideEndArc":case"endArc":r=l;break;case"startAngle":case"insideStartAngle":r=a;break;case"endAngle":case"insideEndAngle":r=s;break;default:return void t.setTextConfig({rotation:0})}var h=1.5*Math.PI-r;"middle"===u&&h>Math.PI/2&&h<1.5*Math.PI&&(h-=Math.PI),t.setTextConfig({rotation:h})}}(t,"outside"===d?h:d,KS(a),i.get(["label","rotate"]))}uc(p,c,o.getRawValue(n),(function(t){return $w(e,t)}));var f=i.getModel(["emphasis"]);Hl(t,f.get("focus"),f.get("blurScope"),f.get("disabled")),Zl(t,i),function(t){return null!=t.startAngle&&null!=t.endAngle&&t.startAngle===t.endAngle}(r)&&(t.style.fill="none",t.style.stroke="none",E(t.states,(function(t){t.style&&(t.style.fill=t.style.stroke="none")})))}var JS=function(){},QS=function(t){function e(e){var n=t.call(this,e)||this;return n.type="largeBar",n}return n(e,t),e.prototype.getDefaultShape=function(){return new JS},e.prototype.buildPath=function(t,e){for(var n=e.points,i=this.baseDimIdx,r=1-this.baseDimIdx,o=[],a=[],s=this.barWidth,l=0;l<n.length;l+=3)a[i]=s,a[r]=n[l+2],o[i]=n[l+i],o[r]=n[l+r],t.rect(o[0],o[1],a[0],a[1])},e}(Ms);function tM(t,e,n,i){var r=t.getData(),o=r.getLayout("valueAxisHorizontal")?1:0,a=r.getLayout("largeDataIndices"),s=r.getLayout("size"),l=t.getModel("backgroundStyle"),u=r.getLayout("largeBackgroundPoints");if(u){var h=new QS({shape:{points:u},incremental:!!i,silent:!0,z2:0});h.baseDimIdx=o,h.largeDataIndices=a,h.barWidth=s,h.useStyle(l.getItemStyle()),e.add(h),n&&n.push(h)}var c=new QS({shape:{points:r.getLayout("largePoints")},incremental:!!i,ignoreCoarsePointer:!0,z2:1});c.baseDimIdx=o,c.largeDataIndices=a,c.barWidth=s,e.add(c),c.useStyle(r.getVisual("style")),Js(c).seriesIndex=t.seriesIndex,t.get("silent")||(c.on("mousedown",eM),c.on("mousemove",eM)),n&&n.push(c)}var eM=Ng((function(t){var e=function(t,e,n){for(var i=t.baseDimIdx,r=1-i,o=t.shape.points,a=t.largeDataIndices,s=[],l=[],u=t.barWidth,h=0,c=o.length/3;h<c;h++){var p=3*h;if(l[i]=u,l[r]=o[p+2],s[i]=o[p+i],s[r]=o[p+r],l[r]<0&&(s[r]+=l[r],l[r]=-l[r]),e>=s[0]&&e<=s[0]+l[0]&&n>=s[1]&&n<=s[1]+l[1])return a[h]}return-1}(this,t.offsetX,t.offsetY);Js(this).dataIndex=e>=0?e:null}),30,!1);function nM(t,e,n){if(vS(n,"cartesian2d")){var i=e,r=n.getArea();return{x:t?i.x:r.x,y:t?r.y:i.y,width:t?i.width:r.width,height:t?r.height:i.height}}var o=e;return{cx:(r=n.getArea()).cx,cy:r.cy,r0:t?r.r0:o.r0,r:t?r.r:o.r,startAngle:t?o.startAngle:0,endAngle:t?o.endAngle:2*Math.PI}}var iM=2*Math.PI,rM=Math.PI/180;function oM(t,e){return Tp(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()})}function aM(t,e){var n=oM(t,e),i=t.get("center"),r=t.get("radius");Y(r)||(r=[0,r]);var o,a,s=Ur(n.width,e.getWidth()),l=Ur(n.height,e.getHeight()),u=Math.min(s,l),h=Ur(r[0],u/2),c=Ur(r[1],u/2),p=t.coordinateSystem;if(p){var d=p.dataToPoint(i);o=d[0]||0,a=d[1]||0}else Y(i)||(i=[i,i]),o=Ur(i[0],s)+n.x,a=Ur(i[1],l)+n.y;return{cx:o,cy:a,r0:h,r:c}}function sM(t,e,n){e.eachSeriesByType(t,(function(t){var e=t.getData(),i=e.mapDimension("value"),r=oM(t,n),o=aM(t,n),a=o.cx,s=o.cy,l=o.r,u=o.r0,h=-t.get("startAngle")*rM,c=t.get("minAngle")*rM,p=0;e.each(i,(function(t){!isNaN(t)&&p++}));var d=e.getSum(i),f=Math.PI/(d||p)*2,g=t.get("clockwise"),y=t.get("roseType"),v=t.get("stillShowZeroSum"),m=e.getDataExtent(i);m[0]=0;var x=iM,_=0,b=h,w=g?1:-1;if(e.setLayout({viewRect:r,r:l}),e.each(i,(function(t,n){var i;if(isNaN(t))e.setItemLayout(n,{angle:NaN,startAngle:NaN,endAngle:NaN,clockwise:g,cx:a,cy:s,r0:u,r:y?NaN:l});else{(i="area"!==y?0===d&&v?f:t*f:iM/p)<c?(i=c,x-=c):_+=t;var r=b+w*i;e.setItemLayout(n,{angle:i,startAngle:b,endAngle:r,clockwise:g,cx:a,cy:s,r0:u,r:y?Yr(t,m,[u,l]):l}),b=r}})),x<iM&&p)if(x<=.001){var S=iM/p;e.each(i,(function(t,n){if(!isNaN(t)){var i=e.getItemLayout(n);i.angle=S,i.startAngle=h+w*n*S,i.endAngle=h+w*(n+1)*S}}))}else f=x/_,b=h,e.each(i,(function(t,n){if(!isNaN(t)){var i=e.getItemLayout(n),r=i.angle===c?c:t*f;i.startAngle=b,i.endAngle=b+w*r,b+=w*r}}))}))}function lM(t){return{seriesType:t,reset:function(t,e){var n=e.findComponents({mainType:"legend"});if(n&&n.length){var i=t.getData();i.filterSelf((function(t){for(var e=i.getName(t),r=0;r<n.length;r++)if(!n[r].isSelected(e))return!1;return!0}))}}}}var uM=Math.PI/180;function hM(t,e,n,i,r,o,a,s,l,u){if(!(t.length<2)){for(var h=t.length,c=0;c<h;c++)if("outer"===t[c].position&&"labelLine"===t[c].labelAlignTo){var p=t[c].label.x-u;t[c].linePoints[1][0]+=p,t[c].label.x=u}Sb(t,l,l+a)&&function(t){for(var o={list:[],maxY:0},a={list:[],maxY:0},s=0;s<t.length;s++)if("none"===t[s].labelAlignTo){var l=t[s],u=l.label.y>n?a:o,h=Math.abs(l.label.y-n);if(h>=u.maxY){var c=l.label.x-e-l.len2*r,p=i+l.len,f=Math.abs(c)<p?Math.sqrt(h*h/(1-c*c/p/p)):p;u.rB=f,u.maxY=h}u.list.push(l)}d(o),d(a)}(t)}function d(t){for(var o=t.rB,a=o*o,s=0;s<t.list.length;s++){var l=t.list[s],u=Math.abs(l.label.y-n),h=i+l.len,c=h*h,p=Math.sqrt((1-Math.abs(u*u/a))*c),d=e+(p+l.len2)*r,f=d-l.label.x;cM(l,l.targetTextWidth-f*r,!0),l.label.x=d}}}function cM(t,e,n){if(void 0===n&&(n=!1),null==t.labelStyleWidth){var i=t.label,r=i.style,o=t.rect,a=r.backgroundColor,s=r.padding,l=s?s[1]+s[3]:0,u=r.overflow,h=o.width+(a?0:l);if(e<h||n){var c=o.height;if(u&&u.match("break")){i.setStyle("backgroundColor",null),i.setStyle("width",e-l);var p=i.getBoundingRect();i.setStyle("width",Math.ceil(p.width)),i.setStyle("backgroundColor",a)}else{var d=e-l,f=e<h?d:n?d>t.unconstrainedWidth?null:d:null;i.setStyle("width",f)}var g=i.getBoundingRect();o.width=g.width;var y=(i.style.margin||0)+2.1;o.height=g.height+y,o.y-=(o.height-c)/2}}}function pM(t){return"center"===t.position}function dM(t){var e,n,i=t.getData(),r=[],o=!1,a=(t.get("minShowLabelAngle")||0)*uM,s=i.getLayout("viewRect"),l=i.getLayout("r"),u=s.width,h=s.x,c=s.y,p=s.height;function d(t){t.ignore=!0}i.each((function(t){var s=i.getItemGraphicEl(t),c=s.shape,p=s.getTextContent(),f=s.getTextGuideLine(),g=i.getItemModel(t),y=g.getModel("label"),v=y.get("position")||g.get(["emphasis","label","position"]),m=y.get("distanceToLabelLine"),x=y.get("alignTo"),_=Ur(y.get("edgeDistance"),u),b=y.get("bleedMargin"),w=g.getModel("labelLine"),S=w.get("length");S=Ur(S,u);var M=w.get("length2");if(M=Ur(M,u),Math.abs(c.endAngle-c.startAngle)<a)return E(p.states,d),p.ignore=!0,void(f&&(E(f.states,d),f.ignore=!0));if(function(t){if(!t.ignore)return!0;for(var e in t.states)if(!1===t.states[e].ignore)return!0;return!1}(p)){var I,T,C,D,A=(c.startAngle+c.endAngle)/2,k=Math.cos(A),L=Math.sin(A);e=c.cx,n=c.cy;var P="inside"===v||"inner"===v;if("center"===v)I=c.cx,T=c.cy,D="center";else{var O=(P?(c.r+c.r0)/2*k:c.r*k)+e,R=(P?(c.r+c.r0)/2*L:c.r*L)+n;if(I=O+3*k,T=R+3*L,!P){var N=O+k*(S+l-c.r),z=R+L*(S+l-c.r),V=N+(k<0?-1:1)*M;I="edge"===x?k<0?h+_:h+u-_:V+(k<0?-m:m),T=z,C=[[O,R],[N,z],[V,z]]}D=P?"center":"edge"===x?k>0?"right":"left":k>0?"left":"right"}var B=Math.PI,F=0,G=y.get("rotate");if(j(G))F=G*(B/180);else if("center"===v)F=0;else if("radial"===G||!0===G){F=k<0?-A+B:-A}else if("tangential"===G&&"outside"!==v&&"outer"!==v){var W=Math.atan2(k,L);W<0&&(W=2*B+W),L>0&&(W=B+W),F=W-B}if(o=!!F,p.x=I,p.y=T,p.rotation=F,p.setStyle({verticalAlign:"middle"}),P){p.setStyle({align:D});var H=p.states.select;H&&(H.x+=p.x,H.y+=p.y)}else{var Y=p.getBoundingRect().clone();Y.applyTransform(p.getComputedTransform());var U=(p.style.margin||0)+2.1;Y.y-=U/2,Y.height+=U,r.push({label:p,labelLine:f,position:v,len:S,len2:M,minTurnAngle:w.get("minTurnAngle"),maxSurfaceAngle:w.get("maxSurfaceAngle"),surfaceNormal:new Ce(k,L),linePoints:C,textAlign:D,labelDistance:m,labelAlignTo:x,edgeDistance:_,bleedMargin:b,rect:Y,unconstrainedWidth:Y.width,labelStyleWidth:p.style.width})}s.setTextConfig({inside:P})}})),!o&&t.get("avoidLabelOverlap")&&function(t,e,n,i,r,o,a,s){for(var l=[],u=[],h=Number.MAX_VALUE,c=-Number.MAX_VALUE,p=0;p<t.length;p++){var d=t[p].label;pM(t[p])||(d.x<e?(h=Math.min(h,d.x),l.push(t[p])):(c=Math.max(c,d.x),u.push(t[p])))}for(p=0;p<t.length;p++)if(!pM(y=t[p])&&y.linePoints){if(null!=y.labelStyleWidth)continue;d=y.label;var f=y.linePoints,g=void 0;g="edge"===y.labelAlignTo?d.x<e?f[2][0]-y.labelDistance-a-y.edgeDistance:a+r-y.edgeDistance-f[2][0]-y.labelDistance:"labelLine"===y.labelAlignTo?d.x<e?h-a-y.bleedMargin:a+r-c-y.bleedMargin:d.x<e?d.x-a-y.bleedMargin:a+r-d.x-y.bleedMargin,y.targetTextWidth=g,cM(y,g)}for(hM(u,e,n,i,1,0,o,0,s,c),hM(l,e,n,i,-1,0,o,0,s,h),p=0;p<t.length;p++){var y;if(!pM(y=t[p])&&y.linePoints){d=y.label,f=y.linePoints;var v="edge"===y.labelAlignTo,m=d.style.padding,x=m?m[1]+m[3]:0,_=d.style.backgroundColor?0:x,b=y.rect.width+_,w=f[1][0]-f[2][0];v?d.x<e?f[2][0]=a+y.edgeDistance+b+y.labelDistance:f[2][0]=a+r-y.edgeDistance-b-y.labelDistance:(d.x<e?f[2][0]=d.x+y.labelDistance:f[2][0]=d.x-y.labelDistance,f[1][0]=f[2][0]+w),f[1][1]=f[2][1]=d.y}}}(r,e,n,l,u,p,h,c);for(var f=0;f<r.length;f++){var g=r[f],y=g.label,v=g.labelLine,m=isNaN(y.x)||isNaN(y.y);if(y){y.setStyle({align:g.textAlign}),m&&(E(y.states,d),y.ignore=!0);var x=y.states.select;x&&(x.x+=y.x,x.y+=y.y)}if(v){var _=g.linePoints;m||!_?(E(v.states,d),v.ignore=!0):(gb(_,g.minTurnAngle),yb(_,g.surfaceNormal,g.maxSurfaceAngle),v.setShape({points:_}),y.__hostTarget.textGuideLineConfig={anchor:new Ce(_[0][0],_[0][1])})}}}function fM(t,e,n){var i=t.get("borderRadius");if(null==i)return n?{cornerRadius:0}:null;Y(i)||(i=[i,i,i,i]);var r=Math.abs(e.r||0-e.r0||0);return{cornerRadius:z(i,(function(t){return Mr(t,r)}))}}var gM=function(t){function e(e,n,i){var r=t.call(this)||this;r.z2=2;var o=new Bs;return r.setTextContent(o),r.updateData(e,n,i,!0),r}return n(e,t),e.prototype.updateData=function(t,e,n,i){var r=this,o=t.hostModel,a=t.getItemModel(e),s=a.getModel("emphasis"),l=t.getItemLayout(e),u=A(fM(a.getModel("itemStyle"),l,!0),l);if(isNaN(u.startAngle))r.setShape(u);else{if(i){r.setShape(u);var h=o.getShallow("animationType");o.ecModel.ssr?(fh(r,{scaleX:0,scaleY:0},o,{dataIndex:e,isFrom:!0}),r.originX=u.cx,r.originY=u.cy):"scale"===h?(r.shape.r=l.r0,fh(r,{shape:{r:l.r}},o,e)):null!=n?(r.setShape({startAngle:n,endAngle:n}),fh(r,{shape:{startAngle:l.startAngle,endAngle:l.endAngle}},o,e)):(r.shape.endAngle=l.startAngle,dh(r,{shape:{endAngle:l.endAngle}},o,e))}else xh(r),dh(r,{shape:u},o,e);r.useStyle(t.getItemVisual(e,"style")),Zl(r,a);var c=(l.startAngle+l.endAngle)/2,p=o.get("selectedOffset"),d=Math.cos(c)*p,f=Math.sin(c)*p,g=a.getShallow("cursor");g&&r.attr("cursor",g),this._updateLabel(o,t,e),r.ensureState("emphasis").shape=A({r:l.r+(s.get("scale")&&s.get("scaleSize")||0)},fM(s.getModel("itemStyle"),l)),A(r.ensureState("select"),{x:d,y:f,shape:fM(a.getModel(["select","itemStyle"]),l)}),A(r.ensureState("blur"),{shape:fM(a.getModel(["blur","itemStyle"]),l)});var y=r.getTextGuideLine(),v=r.getTextContent();y&&A(y.ensureState("select"),{x:d,y:f}),A(v.ensureState("select"),{x:d,y:f}),Hl(this,s.get("focus"),s.get("blurScope"),s.get("disabled"))}},e.prototype._updateLabel=function(t,e,n){var i=this,r=e.getItemModel(n),o=r.getModel("labelLine"),a=e.getItemVisual(n,"style"),s=a&&a.fill,l=a&&a.opacity;Qh(i,tc(r),{labelFetcher:e.hostModel,labelDataIndex:n,inheritColor:s,defaultOpacity:l,defaultText:t.getFormattedLabel(n,"normal")||e.getName(n)});var u=i.getTextContent();i.setTextConfig({position:null,rotation:null}),u.attr({z2:10});var h=t.get(["label","position"]);if("outside"!==h&&"outer"!==h)i.removeTextGuideLine();else{var c=this.getTextGuideLine();c||(c=new Hu,this.setTextGuideLine(c)),xb(this,_b(r),{stroke:s,opacity:ot(o.get(["lineStyle","opacity"]),l,1)})}},e}(Eu),yM=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.ignoreLabelLineUpdate=!0,e}return n(e,t),e.prototype.render=function(t,e,n,i){var r,o=t.getData(),a=this._data,s=this.group;if(!a&&o.count()>0){for(var l=o.getItemLayout(0),u=1;isNaN(l&&l.startAngle)&&u<o.count();++u)l=o.getItemLayout(u);l&&(r=l.startAngle)}if(this._emptyCircleSector&&s.remove(this._emptyCircleSector),0===o.count()&&t.get("showEmptyCircle")){var h=new Eu({shape:aM(t,n)});h.useStyle(t.getModel("emptyCircleStyle").getItemStyle()),this._emptyCircleSector=h,s.add(h)}o.diff(a).add((function(t){var e=new gM(o,t,r);o.setItemGraphicEl(t,e),s.add(e)})).update((function(t,e){var n=a.getItemGraphicEl(e);n.updateData(o,t,r),n.off("click"),s.add(n),o.setItemGraphicEl(t,n)})).remove((function(e){mh(a.getItemGraphicEl(e),t,e)})).execute(),dM(t),"expansion"!==t.get("animationTypeUpdate")&&(this._data=o)},e.prototype.dispose=function(){},e.prototype.containPoint=function(t,e){var n=e.getData().getItemLayout(0);if(n){var i=t[0]-n.cx,r=t[1]-n.cy,o=Math.sqrt(i*i+r*r);return o<=n.r&&o>=n.r0}},e.type="pie",e}(Tg);function vM(t,e,n){e=Y(e)&&{coordDimensions:e}||A({encodeDefine:t.getEncode()},e);var i=t.getSource(),r=nx(i,e).dimensions,o=new ex(r,t);return o.initData(i,n),o}var mM=function(){function t(t,e){this._getDataWithEncodedVisual=t,this._getRawData=e}return t.prototype.getAllNames=function(){var t=this._getRawData();return t.mapArray(t.getName)},t.prototype.containName=function(t){return this._getRawData().indexOfName(t)>=0},t.prototype.indexOfName=function(t){return this._getDataWithEncodedVisual().indexOfName(t)},t.prototype.getItemVisual=function(t,e){return this._getDataWithEncodedVisual().getItemVisual(t,e)},t}(),xM=Po(),_M=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.prototype.init=function(e){t.prototype.init.apply(this,arguments),this.legendVisualProvider=new mM(W(this.getData,this),W(this.getRawData,this)),this._defaultLabelLine(e)},e.prototype.mergeOption=function(){t.prototype.mergeOption.apply(this,arguments)},e.prototype.getInitialData=function(){return vM(this,{coordDimensions:["value"],encodeDefaulter:H($p,this)})},e.prototype.getDataParams=function(e){var n=this.getData(),i=xM(n),r=i.seats;if(!r){var o=[];n.each(n.mapDimension("value"),(function(t){o.push(t)})),r=i.seats=$r(o,n.hostModel.get("percentPrecision"))}var a=t.prototype.getDataParams.call(this,e);return a.percent=r[e]||0,a.$vars.push("percent"),a},e.prototype._defaultLabelLine=function(t){bo(t,"labelLine",["show"]);var e=t.labelLine,n=t.emphasis.labelLine;e.show=e.show&&t.label.show,n.show=n.show&&t.emphasis.label.show},e.type="series.pie",e.defaultOption={z:2,legendHoverLink:!0,colorBy:"data",center:["50%","50%"],radius:[0,"75%"],clockwise:!0,startAngle:90,minAngle:0,minShowLabelAngle:0,selectedOffset:10,percentPrecision:2,stillShowZeroSum:!0,left:0,top:0,right:0,bottom:0,width:null,height:null,label:{rotate:0,show:!0,overflow:"truncate",position:"outer",alignTo:"none",edgeDistance:"25%",bleedMargin:10,distanceToLabelLine:5},labelLine:{show:!0,length:15,length2:15,smooth:!1,minTurnAngle:90,maxSurfaceAngle:90,lineStyle:{width:1,type:"solid"}},itemStyle:{borderWidth:1,borderJoin:"round"},showEmptyCircle:!0,emptyCircleStyle:{color:"lightgray",opacity:1},labelLayout:{hideOverlap:!0},emphasis:{scale:!0,scaleSize:5},avoidLabelOverlap:!0,animationType:"expansion",animationDuration:1e3,animationTypeUpdate:"transition",animationEasingUpdate:"cubicInOut",animationDurationUpdate:500,animationEasing:"cubicInOut"},e}(fg);var bM=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.hasSymbolVisual=!0,n}return n(e,t),e.prototype.getInitialData=function(t,e){return hx(null,this,{useEncodeDefaulter:!0})},e.prototype.getProgressive=function(){var t=this.option.progressive;return null==t?this.option.large?5e3:this.get("progressive"):t},e.prototype.getProgressiveThreshold=function(){var t=this.option.progressiveThreshold;return null==t?this.option.large?1e4:this.get("progressiveThreshold"):t},e.prototype.brushSelector=function(t,e,n){return n.point(e.getItemLayout(t))},e.prototype.getZLevelKey=function(){return this.getData().count()>this.getProgressiveThreshold()?this.id:""},e.type="series.scatter",e.dependencies=["grid","polar","geo","singleAxis","calendar"],e.defaultOption={coordinateSystem:"cartesian2d",z:2,legendHoverLink:!0,symbolSize:10,large:!1,largeThreshold:2e3,itemStyle:{opacity:.8},emphasis:{scale:!0},clip:!0,select:{itemStyle:{borderColor:"#212121"}},universalTransition:{divideShape:"clone"}},e}(fg),wM=function(){},SM=function(t){function e(e){var n=t.call(this,e)||this;return n._off=0,n.hoverDataIdx=-1,n}return n(e,t),e.prototype.getDefaultShape=function(){return new wM},e.prototype.reset=function(){this.notClear=!1,this._off=0},e.prototype.buildPath=function(t,e){var n,i=e.points,r=e.size,o=this.symbolProxy,a=o.shape,s=t.getContext?t.getContext():t,l=s&&r[0]<4,u=this.softClipShape;if(l)this._ctx=s;else{for(this._ctx=null,n=this._off;n<i.length;){var h=i[n++],c=i[n++];isNaN(h)||isNaN(c)||(u&&!u.contain(h,c)||(a.x=h-r[0]/2,a.y=c-r[1]/2,a.width=r[0],a.height=r[1],o.buildPath(t,a,!0)))}this.incremental&&(this._off=n,this.notClear=!0)}},e.prototype.afterBrush=function(){var t,e=this.shape,n=e.points,i=e.size,r=this._ctx,o=this.softClipShape;if(r){for(t=this._off;t<n.length;){var a=n[t++],s=n[t++];isNaN(a)||isNaN(s)||(o&&!o.contain(a,s)||r.fillRect(a-i[0]/2,s-i[1]/2,i[0],i[1]))}this.incremental&&(this._off=t,this.notClear=!0)}},e.prototype.findDataIndex=function(t,e){for(var n=this.shape,i=n.points,r=n.size,o=Math.max(r[0],4),a=Math.max(r[1],4),s=i.length/2-1;s>=0;s--){var l=2*s,u=i[l]-o/2,h=i[l+1]-a/2;if(t>=u&&e>=h&&t<=u+o&&e<=h+a)return s}return-1},e.prototype.contain=function(t,e){var n=this.transformCoordToLocal(t,e),i=this.getBoundingRect();return t=n[0],e=n[1],i.contain(t,e)?(this.hoverDataIdx=this.findDataIndex(t,e))>=0:(this.hoverDataIdx=-1,!1)},e.prototype.getBoundingRect=function(){var t=this._rect;if(!t){for(var e=this.shape,n=e.points,i=e.size,r=i[0],o=i[1],a=1/0,s=1/0,l=-1/0,u=-1/0,h=0;h<n.length;){var c=n[h++],p=n[h++];a=Math.min(c,a),l=Math.max(c,l),s=Math.min(p,s),u=Math.max(p,u)}t=this._rect=new Ee(a-r/2,s-o/2,l-a+r,u-s+o)}return t},e}(Ms),MM=function(){function t(){this.group=new Er}return t.prototype.updateData=function(t,e){this._clear();var n=this._create();n.setShape({points:t.getLayout("points")}),this._setCommon(n,t,e)},t.prototype.updateLayout=function(t){var e=t.getLayout("points");this.group.eachChild((function(t){if(null!=t.startIndex){var n=2*(t.endIndex-t.startIndex),i=4*t.startIndex*2;e=new Float32Array(e.buffer,i,n)}t.setShape("points",e),t.reset()}))},t.prototype.incrementalPrepareUpdate=function(t){this._clear()},t.prototype.incrementalUpdate=function(t,e,n){var i=this._newAdded[0],r=e.getLayout("points"),o=i&&i.shape.points;if(o&&o.length<2e4){var a=o.length,s=new Float32Array(a+r.length);s.set(o),s.set(r,a),i.endIndex=t.end,i.setShape({points:s})}else{this._newAdded=[];var l=this._create();l.startIndex=t.start,l.endIndex=t.end,l.incremental=!0,l.setShape({points:r}),this._setCommon(l,e,n)}},t.prototype.eachRendered=function(t){this._newAdded[0]&&t(this._newAdded[0])},t.prototype._create=function(){var t=new SM({cursor:"default"});return t.ignoreCoarsePointer=!0,this.group.add(t),this._newAdded.push(t),t},t.prototype._setCommon=function(t,e,n){var i=e.hostModel;n=n||{};var r=e.getVisual("symbolSize");t.setShape("size",r instanceof Array?r:[r,r]),t.softClipShape=n.clipShape||null,t.symbolProxy=Vy(e.getVisual("symbol"),0,0,0,0),t.setColor=t.symbolProxy.setColor;var o=t.shape.size[0]<4;t.useStyle(i.getModel("itemStyle").getItemStyle(o?["color","shadowBlur","shadowColor"]:["color"]));var a=e.getVisual("style"),s=a&&a.fill;s&&t.setColor(s);var l=Js(t);l.seriesIndex=i.seriesIndex,t.on("mousemove",(function(e){l.dataIndex=null;var n=t.hoverDataIdx;n>=0&&(l.dataIndex=n+(t.startIndex||0))}))},t.prototype.remove=function(){this._clear()},t.prototype._clear=function(){this._newAdded=[],this.group.removeAll()},t}(),IM=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.render=function(t,e,n){var i=t.getData();this._updateSymbolDraw(i,t).updateData(i,{clipShape:this._getClipShape(t)}),this._finished=!0},e.prototype.incrementalPrepareRender=function(t,e,n){var i=t.getData();this._updateSymbolDraw(i,t).incrementalPrepareUpdate(i),this._finished=!1},e.prototype.incrementalRender=function(t,e,n){this._symbolDraw.incrementalUpdate(t,e.getData(),{clipShape:this._getClipShape(e)}),this._finished=t.end===e.getData().count()},e.prototype.updateTransform=function(t,e,n){var i=t.getData();if(this.group.dirty(),!this._finished||i.count()>1e4)return{update:!0};var r=AS("").reset(t,e,n);r.progress&&r.progress({start:0,end:i.count(),count:i.count()},i),this._symbolDraw.updateLayout(i)},e.prototype.eachRendered=function(t){this._symbolDraw&&this._symbolDraw.eachRendered(t)},e.prototype._getClipShape=function(t){var e=t.coordinateSystem,n=e&&e.getArea&&e.getArea();return t.get("clip",!0)?n:null},e.prototype._updateSymbolDraw=function(t,e){var n=this._symbolDraw,i=e.pipelineContext.large;return n&&i===this._isLargeDraw||(n&&n.remove(),n=this._symbolDraw=i?new MM:new iS,this._isLargeDraw=i,this.group.removeAll()),this.group.add(n.group),n},e.prototype.remove=function(t,e){this._symbolDraw&&this._symbolDraw.remove(!0),this._symbolDraw=null},e.prototype.dispose=function(){},e.type="scatter",e}(Tg),TM=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.type="grid",e.dependencies=["xAxis","yAxis"],e.layoutMode="box",e.defaultOption={show:!1,z:0,left:"10%",top:60,right:"10%",bottom:70,containLabel:!1,backgroundColor:"rgba(0,0,0,0)",borderWidth:1,borderColor:"#ccc"},e}(Op),CM=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.prototype.getCoordSysModel=function(){return this.getReferringComponents("grid",Eo).models[0]},e.type="cartesian2dAxis",e}(Op);R(CM,m_);var DM={show:!0,z:0,inverse:!1,name:"",nameLocation:"end",nameRotate:null,nameTruncate:{maxWidth:null,ellipsis:"...",placeholder:"."},nameTextStyle:{},nameGap:15,silent:!1,triggerEvent:!1,tooltip:{show:!1},axisPointer:{},axisLine:{show:!0,onZero:!0,onZeroAxisIndex:null,lineStyle:{color:"#6E7079",width:1,type:"solid"},symbol:["none","none"],symbolSize:[10,15]},axisTick:{show:!0,inside:!1,length:5,lineStyle:{width:1}},axisLabel:{show:!0,inside:!1,rotate:0,showMinLabel:null,showMaxLabel:null,margin:8,fontSize:12},splitLine:{show:!0,lineStyle:{color:["#E0E6F1"],width:1,type:"solid"}},splitArea:{show:!1,areaStyle:{color:["rgba(250,250,250,0.2)","rgba(210,219,238,0.2)"]}}},AM=C({boundaryGap:!0,deduplication:null,splitLine:{show:!1},axisTick:{alignWithLabel:!1,interval:"auto"},axisLabel:{interval:"auto"}},DM),kM=C({boundaryGap:[0,0],axisLine:{show:"auto"},axisTick:{show:"auto"},splitNumber:5,minorTick:{show:!1,splitNumber:5,length:3,lineStyle:{}},minorSplitLine:{show:!1,lineStyle:{color:"#F4F7FD",width:1}}},DM),LM={category:AM,value:kM,time:C({splitNumber:6,axisLabel:{showMinLabel:!1,showMaxLabel:!1,rich:{primary:{fontWeight:"bold"}}},splitLine:{show:!1}},kM),log:k({logBase:10},kM)},PM={value:1,category:1,time:1,log:1};function OM(t,e,i,r){E(PM,(function(o,a){var s=C(C({},LM[a],!0),r,!0),l=function(t){function i(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e+"Axis."+a,n}return n(i,t),i.prototype.mergeDefaultAndTheme=function(t,e){var n=Dp(this),i=n?kp(t):{};C(t,e.getTheme().get(a+"Axis")),C(t,this.getDefaultOption()),t.type=RM(t),n&&Ap(t,i,n)},i.prototype.optionUpdated=function(){"category"===this.option.type&&(this.__ordinalMeta=dx.createByAxisModel(this))},i.prototype.getCategories=function(t){var e=this.option;if("category"===e.type)return t?e.data:this.__ordinalMeta.categories},i.prototype.getOrdinalMeta=function(){return this.__ordinalMeta},i.type=e+"Axis."+a,i.defaultOption=s,i}(i);t.registerComponentModel(l)})),t.registerSubTypeDefaulter(e+"Axis",RM)}function RM(t){return t.type||(t.data?"category":"value")}var NM=function(){function t(t){this.type="cartesian",this._dimList=[],this._axes={},this.name=t||""}return t.prototype.getAxis=function(t){return this._axes[t]},t.prototype.getAxes=function(){return z(this._dimList,(function(t){return this._axes[t]}),this)},t.prototype.getAxesByScale=function(t){return t=t.toLowerCase(),B(this.getAxes(),(function(e){return e.scale.type===t}))},t.prototype.addAxis=function(t){var e=t.dim;this._axes[e]=t,this._dimList.push(e)},t}(),EM=["x","y"];function zM(t){return"interval"===t.type||"time"===t.type}var VM=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="cartesian2d",e.dimensions=EM,e}return n(e,t),e.prototype.calcAffineTransform=function(){this._transform=this._invTransform=null;var t=this.getAxis("x").scale,e=this.getAxis("y").scale;if(zM(t)&&zM(e)){var n=t.getExtent(),i=e.getExtent(),r=this.dataToPoint([n[0],i[0]]),o=this.dataToPoint([n[1],i[1]]),a=n[1]-n[0],s=i[1]-i[0];if(a&&s){var l=(o[0]-r[0])/a,u=(o[1]-r[1])/s,h=r[0]-n[0]*l,c=r[1]-i[0]*u,p=this._transform=[l,0,0,u,h,c];this._invTransform=Me([],p)}}},e.prototype.getBaseAxis=function(){return this.getAxesByScale("ordinal")[0]||this.getAxesByScale("time")[0]||this.getAxis("x")},e.prototype.containPoint=function(t){var e=this.getAxis("x"),n=this.getAxis("y");return e.contain(e.toLocalCoord(t[0]))&&n.contain(n.toLocalCoord(t[1]))},e.prototype.containData=function(t){return this.getAxis("x").containData(t[0])&&this.getAxis("y").containData(t[1])},e.prototype.containZone=function(t,e){var n=this.dataToPoint(t),i=this.dataToPoint(e),r=this.getArea(),o=new Ee(n[0],n[1],i[0]-n[0],i[1]-n[1]);return r.intersect(o)},e.prototype.dataToPoint=function(t,e,n){n=n||[];var i=t[0],r=t[1];if(this._transform&&null!=i&&isFinite(i)&&null!=r&&isFinite(r))return Wt(n,t,this._transform);var o=this.getAxis("x"),a=this.getAxis("y");return n[0]=o.toGlobalCoord(o.dataToCoord(i,e)),n[1]=a.toGlobalCoord(a.dataToCoord(r,e)),n},e.prototype.clampData=function(t,e){var n=this.getAxis("x").scale,i=this.getAxis("y").scale,r=n.getExtent(),o=i.getExtent(),a=n.parse(t[0]),s=i.parse(t[1]);return(e=e||[])[0]=Math.min(Math.max(Math.min(r[0],r[1]),a),Math.max(r[0],r[1])),e[1]=Math.min(Math.max(Math.min(o[0],o[1]),s),Math.max(o[0],o[1])),e},e.prototype.pointToData=function(t,e){var n=[];if(this._invTransform)return Wt(n,t,this._invTransform);var i=this.getAxis("x"),r=this.getAxis("y");return n[0]=i.coordToData(i.toLocalCoord(t[0]),e),n[1]=r.coordToData(r.toLocalCoord(t[1]),e),n},e.prototype.getOtherAxis=function(t){return this.getAxis("x"===t.dim?"y":"x")},e.prototype.getArea=function(){var t=this.getAxis("x").getGlobalExtent(),e=this.getAxis("y").getGlobalExtent(),n=Math.min(t[0],t[1]),i=Math.min(e[0],e[1]),r=Math.max(t[0],t[1])-n,o=Math.max(e[0],e[1])-i;return new Ee(n,i,r,o)},e}(NM),BM=function(t){function e(e,n,i,r,o){var a=t.call(this,e,n,i)||this;return a.index=0,a.type=r||"value",a.position=o||"bottom",a}return n(e,t),e.prototype.isHorizontal=function(){var t=this.position;return"top"===t||"bottom"===t},e.prototype.getGlobalExtent=function(t){var e=this.getExtent();return e[0]=this.toGlobalCoord(e[0]),e[1]=this.toGlobalCoord(e[1]),t&&e[0]>e[1]&&e.reverse(),e},e.prototype.pointToData=function(t,e){return this.coordToData(this.toLocalCoord(t["x"===this.dim?0:1]),e)},e.prototype.setCategorySortInfo=function(t){if("category"!==this.type)return!1;this.model.option.categorySortInfo=t,this.scale.setSortInfo(t)},e}(q_);function FM(t,e,n){n=n||{};var i=t.coordinateSystem,r=e.axis,o={},a=r.getAxesOnZeroOf()[0],s=r.position,l=a?"onZero":s,u=r.dim,h=i.getRect(),c=[h.x,h.x+h.width,h.y,h.y+h.height],p={left:0,right:1,top:0,bottom:1,onZero:2},d=e.get("offset")||0,f="x"===u?[c[2]-d,c[3]+d]:[c[0]-d,c[1]+d];if(a){var g=a.toGlobalCoord(a.dataToCoord(0));f[p.onZero]=Math.max(Math.min(g,f[1]),f[0])}o.position=["y"===u?f[p[l]]:c[0],"x"===u?f[p[l]]:c[3]],o.rotation=Math.PI/2*("x"===u?0:1);o.labelDirection=o.tickDirection=o.nameDirection={top:-1,bottom:1,left:-1,right:1}[s],o.labelOffset=a?f[p[s]]-f[p.onZero]:0,e.get(["axisTick","inside"])&&(o.tickDirection=-o.tickDirection),it(n.labelInside,e.get(["axisLabel","inside"]))&&(o.labelDirection=-o.labelDirection);var y=e.get(["axisLabel","rotate"]);return o.labelRotate="top"===l?-y:y,o.z2=1,o}function GM(t){return"cartesian2d"===t.get("coordinateSystem")}function WM(t){var e={xAxisModel:null,yAxisModel:null};return E(e,(function(n,i){var r=i.replace(/Model$/,""),o=t.getReferringComponents(r,Eo).models[0];e[i]=o})),e}var HM=Math.log;function YM(t,e,n){var i=Tx.prototype,r=i.getTicks.call(n),o=i.getTicks.call(n,!0),a=r.length-1,s=i.getInterval.call(n),l=u_(t,e),u=l.extent,h=l.fixMin,c=l.fixMax;if("log"===t.type){var p=HM(t.base);u=[HM(u[0])/p,HM(u[1])/p]}t.setExtent(u[0],u[1]),t.calcNiceExtent({splitNumber:a,fixMin:h,fixMax:c});var d=i.getExtent.call(t);h&&(u[0]=d[0]),c&&(u[1]=d[1]);var f=i.getInterval.call(t),g=u[0],y=u[1];if(h&&c)f=(y-g)/a;else if(h)for(y=u[0]+f*a;y<u[1]&&isFinite(y)&&isFinite(u[1]);)f=vx(f),y=u[0]+f*a;else if(c)for(g=u[1]-f*a;g>u[0]&&isFinite(g)&&isFinite(u[0]);)f=vx(f),g=u[1]-f*a;else{t.getTicks().length-1>a&&(f=vx(f));var v=f*a;(g=Xr((y=Math.ceil(u[1]/f)*f)-v))<0&&u[0]>=0?(g=0,y=Xr(v)):y>0&&u[1]<=0&&(y=0,g=-Xr(v))}var m=(r[0].value-o[0].value)/s,x=(r[a].value-o[a].value)/s;i.setExtent.call(t,g+f*m,y+f*x),i.setInterval.call(t,f),(m||x)&&i.setNiceExtent.call(t,g+f,y-f)}var UM=function(){function t(t,e,n){this.type="grid",this._coordsMap={},this._coordsList=[],this._axesMap={},this._axesList=[],this.axisPointerEnabled=!0,this.dimensions=EM,this._initCartesian(t,e,n),this.model=t}return t.prototype.getRect=function(){return this._rect},t.prototype.update=function(t,e){var n=this._axesMap;function i(t){var e,n=G(t),i=n.length;if(i){for(var r=[],o=i-1;o>=0;o--){var a=t[+n[o]],s=a.model,l=a.scale;gx(l)&&s.get("alignTicks")&&null==s.get("interval")?r.push(a):(h_(l,s),gx(l)&&(e=a))}r.length&&(e||h_((e=r.pop()).scale,e.model),E(r,(function(t){YM(t.scale,t.model,e.scale)})))}}this._updateScale(t,this.model),i(n.x),i(n.y);var r={};E(n.x,(function(t){ZM(n,"y",t,r)})),E(n.y,(function(t){ZM(n,"x",t,r)})),this.resize(this.model,e)},t.prototype.resize=function(t,e,n){var i=t.getBoxLayoutParams(),r=!n&&t.get("containLabel"),o=Tp(i,{width:e.getWidth(),height:e.getHeight()});this._rect=o;var a=this._axesList;function s(){E(a,(function(t){var e=t.isHorizontal(),n=e?[0,o.width]:[0,o.height],i=t.inverse?1:0;t.setExtent(n[i],n[1-i]),function(t,e){var n=t.getExtent(),i=n[0]+n[1];t.toGlobalCoord="x"===t.dim?function(t){return t+e}:function(t){return i-t+e},t.toLocalCoord="x"===t.dim?function(t){return t-e}:function(t){return i-t+e}}(t,e?o.x:o.y)}))}s(),r&&(E(a,(function(t){if(!t.model.get(["axisLabel","inside"])){var e=function(t){var e=t.model,n=t.scale;if(e.get(["axisLabel","show"])&&!n.isBlank()){var i,r,o=n.getExtent();r=n instanceof Mx?n.count():(i=n.getTicks()).length;var a,s=t.getLabelModel(),l=p_(t),u=1;r>40&&(u=Math.ceil(r/40));for(var h=0;h<r;h+=u){var c=l(i?i[h]:{value:o[0]+h},h),p=f_(s.getTextRect(c),s.get("rotate")||0);a?a.union(p):a=p}return a}}(t);if(e){var n=t.isHorizontal()?"height":"width",i=t.model.get(["axisLabel","margin"]);o[n]-=e[n]+i,"top"===t.position?o.y+=e.height+i:"left"===t.position&&(o.x+=e.width+i)}}})),s()),E(this._coordsList,(function(t){t.calcAffineTransform()}))},t.prototype.getAxis=function(t,e){var n=this._axesMap[t];if(null!=n)return n[e||0]},t.prototype.getAxes=function(){return this._axesList.slice()},t.prototype.getCartesian=function(t,e){if(null!=t&&null!=e){var n="x"+t+"y"+e;return this._coordsMap[n]}q(t)&&(e=t.yAxisIndex,t=t.xAxisIndex);for(var i=0,r=this._coordsList;i<r.length;i++)if(r[i].getAxis("x").index===t||r[i].getAxis("y").index===e)return r[i]},t.prototype.getCartesians=function(){return this._coordsList.slice()},t.prototype.convertToPixel=function(t,e,n){var i=this._findConvertTarget(e);return i.cartesian?i.cartesian.dataToPoint(n):i.axis?i.axis.toGlobalCoord(i.axis.dataToCoord(n)):null},t.prototype.convertFromPixel=function(t,e,n){var i=this._findConvertTarget(e);return i.cartesian?i.cartesian.pointToData(n):i.axis?i.axis.coordToData(i.axis.toLocalCoord(n)):null},t.prototype._findConvertTarget=function(t){var e,n,i=t.seriesModel,r=t.xAxisModel||i&&i.getReferringComponents("xAxis",Eo).models[0],o=t.yAxisModel||i&&i.getReferringComponents("yAxis",Eo).models[0],a=t.gridModel,s=this._coordsList;if(i)P(s,e=i.coordinateSystem)<0&&(e=null);else if(r&&o)e=this.getCartesian(r.componentIndex,o.componentIndex);else if(r)n=this.getAxis("x",r.componentIndex);else if(o)n=this.getAxis("y",o.componentIndex);else if(a){a.coordinateSystem===this&&(e=this._coordsList[0])}return{cartesian:e,axis:n}},t.prototype.containPoint=function(t){var e=this._coordsList[0];if(e)return e.containPoint(t)},t.prototype._initCartesian=function(t,e,n){var i=this,r=this,o={left:!1,right:!1,top:!1,bottom:!1},a={x:{},y:{}},s={x:0,y:0};if(e.eachComponent("xAxis",l("x"),this),e.eachComponent("yAxis",l("y"),this),!s.x||!s.y)return this._axesMap={},void(this._axesList=[]);function l(e){return function(n,i){if(XM(n,t)){var l=n.get("position");"x"===e?"top"!==l&&"bottom"!==l&&(l=o.bottom?"top":"bottom"):"left"!==l&&"right"!==l&&(l=o.left?"right":"left"),o[l]=!0;var u=new BM(e,c_(n),[0,0],n.get("type"),l),h="category"===u.type;u.onBand=h&&n.get("boundaryGap"),u.inverse=n.get("inverse"),n.axis=u,u.model=n,u.grid=r,u.index=i,r._axesList.push(u),a[e][i]=u,s[e]++}}}this._axesMap=a,E(a.x,(function(e,n){E(a.y,(function(r,o){var a="x"+n+"y"+o,s=new VM(a);s.master=i,s.model=t,i._coordsMap[a]=s,i._coordsList.push(s),s.addAxis(e),s.addAxis(r)}))}))},t.prototype._updateScale=function(t,e){function n(t,e){E(v_(t,e.dim),(function(n){e.scale.unionExtentFromData(t,n)}))}E(this._axesList,(function(t){if(t.scale.setExtent(1/0,-1/0),"category"===t.type){var e=t.model.get("categorySortInfo");t.scale.setSortInfo(e)}})),t.eachSeries((function(t){if(GM(t)){var i=WM(t),r=i.xAxisModel,o=i.yAxisModel;if(!XM(r,e)||!XM(o,e))return;var a=this.getCartesian(r.componentIndex,o.componentIndex),s=t.getData(),l=a.getAxis("x"),u=a.getAxis("y");n(s,l),n(s,u)}}),this)},t.prototype.getTooltipAxes=function(t){var e=[],n=[];return E(this.getCartesians(),(function(i){var r=null!=t&&"auto"!==t?i.getAxis(t):i.getBaseAxis(),o=i.getOtherAxis(r);P(e,r)<0&&e.push(r),P(n,o)<0&&n.push(o)})),{baseAxes:e,otherAxes:n}},t.create=function(e,n){var i=[];return e.eachComponent("grid",(function(r,o){var a=new t(r,e,n);a.name="grid_"+o,a.resize(r,n,!0),r.coordinateSystem=a,i.push(a)})),e.eachSeries((function(t){if(GM(t)){var e=WM(t),n=e.xAxisModel,i=e.yAxisModel,r=n.getCoordSysModel();0;var o=r.coordinateSystem;t.coordinateSystem=o.getCartesian(n.componentIndex,i.componentIndex)}})),i},t.dimensions=EM,t}();function XM(t,e){return t.getCoordSysModel()===e}function ZM(t,e,n,i){n.getAxesOnZeroOf=function(){return r?[r]:[]};var r,o=t[e],a=n.model,s=a.get(["axisLine","onZero"]),l=a.get(["axisLine","onZeroAxisIndex"]);if(s){if(null!=l)jM(o[l])&&(r=o[l]);else for(var u in o)if(o.hasOwnProperty(u)&&jM(o[u])&&!i[h(o[u])]){r=o[u];break}r&&(i[h(r)]=!0)}function h(t){return t.dim+"_"+t.index}}function jM(t){return t&&"category"!==t.type&&"time"!==t.type&&function(t){var e=t.scale.getExtent(),n=e[0],i=e[1];return!(n>0&&i>0||n<0&&i<0)}(t)}var qM=Math.PI,KM=function(){function t(t,e){this.group=new Er,this.opt=e,this.axisModel=t,k(e,{labelOffset:0,nameDirection:1,tickDirection:1,labelDirection:1,silent:!0,handleAutoShown:function(){return!0}});var n=new Er({x:e.position[0],y:e.position[1],rotation:e.rotation});n.updateTransform(),this._transformGroup=n}return t.prototype.hasBuilder=function(t){return!!$M[t]},t.prototype.add=function(t){$M[t](this.opt,this.axisModel,this.group,this._transformGroup)},t.prototype.getGroup=function(){return this.group},t.innerTextLayout=function(t,e,n){var i,r,o=to(e-t);return eo(o)?(r=n>0?"top":"bottom",i="center"):eo(o-qM)?(r=n>0?"bottom":"top",i="center"):(r="middle",i=o>0&&o<qM?n>0?"right":"left":n>0?"left":"right"),{rotation:o,textAlign:i,textVerticalAlign:r}},t.makeAxisEventDataBase=function(t){var e={componentType:t.mainType,componentIndex:t.componentIndex};return e[t.mainType+"Index"]=t.componentIndex,e},t.isLabelSilent=function(t){var e=t.get("tooltip");return t.get("silent")||!(t.get("triggerEvent")||e&&e.show)},t}(),$M={axisLine:function(t,e,n,i){var r=e.get(["axisLine","show"]);if("auto"===r&&t.handleAutoShown&&(r=t.handleAutoShown("axisLine")),r){var o=e.axis.getExtent(),a=i.transform,s=[o[0],0],l=[o[1],0],u=s[0]>l[0];a&&(Wt(s,s,a),Wt(l,l,a));var h=A({lineCap:"round"},e.getModel(["axisLine","lineStyle"]).getLineStyle()),c=new Xu({shape:{x1:s[0],y1:s[1],x2:l[0],y2:l[1]},style:h,strokeContainThreshold:t.strokeContainThreshold||5,silent:!0,z2:1});Oh(c.shape,c.style.lineWidth),c.anid="line",n.add(c);var p=e.get(["axisLine","symbol"]);if(null!=p){var d=e.get(["axisLine","symbolSize"]);X(p)&&(p=[p,p]),(X(d)||j(d))&&(d=[d,d]);var f=Fy(e.get(["axisLine","symbolOffset"])||0,d),g=d[0],y=d[1];E([{rotate:t.rotation+Math.PI/2,offset:f[0],r:0},{rotate:t.rotation-Math.PI/2,offset:f[1],r:Math.sqrt((s[0]-l[0])*(s[0]-l[0])+(s[1]-l[1])*(s[1]-l[1]))}],(function(e,i){if("none"!==p[i]&&null!=p[i]){var r=Vy(p[i],-g/2,-y/2,g,y,h.stroke,!0),o=e.r+e.offset,a=u?l:s;r.attr({rotation:e.rotate,x:a[0]+o*Math.cos(t.rotation),y:a[1]-o*Math.sin(t.rotation),silent:!0,z2:11}),n.add(r)}}))}}},axisTickLabel:function(t,e,n,i){var r=function(t,e,n,i){var r=n.axis,o=n.getModel("axisTick"),a=o.get("show");"auto"===a&&i.handleAutoShown&&(a=i.handleAutoShown("axisTick"));if(!a||r.scale.isBlank())return;for(var s=o.getModel("lineStyle"),l=i.tickDirection*o.get("length"),u=eI(r.getTicksCoords(),e.transform,l,k(s.getLineStyle(),{stroke:n.get(["axisLine","lineStyle","color"])}),"ticks"),h=0;h<u.length;h++)t.add(u[h]);return u}(n,i,e,t),o=function(t,e,n,i){var r=n.axis;if(!it(i.axisLabelShow,n.get(["axisLabel","show"]))||r.scale.isBlank())return;var o=n.getModel("axisLabel"),a=o.get("margin"),s=r.getViewLabels(),l=(it(i.labelRotate,o.get("rotate"))||0)*qM/180,u=KM.innerTextLayout(i.rotation,l,i.labelDirection),h=n.getCategories&&n.getCategories(!0),c=[],p=KM.isLabelSilent(n),d=n.get("triggerEvent");return E(s,(function(s,l){var f="ordinal"===r.scale.type?r.scale.getRawOrdinalNumber(s.tickValue):s.tickValue,g=s.formattedLabel,y=s.rawLabel,v=o;if(h&&h[f]){var m=h[f];q(m)&&m.textStyle&&(v=new Sc(m.textStyle,o,n.ecModel))}var x=v.getTextColor()||n.get(["axisLine","lineStyle","color"]),_=r.dataToCoord(f),b=new Bs({x:_,y:i.labelOffset+i.labelDirection*a,rotation:u.rotation,silent:p,z2:10+(s.level||0),style:ec(v,{text:g,align:v.getShallow("align",!0)||u.textAlign,verticalAlign:v.getShallow("verticalAlign",!0)||v.getShallow("baseline",!0)||u.textVerticalAlign,fill:U(x)?x("category"===r.type?y:"value"===r.type?f+"":f,l):x})});if(b.anid="label_"+f,d){var w=KM.makeAxisEventDataBase(n);w.targetType="axisLabel",w.value=y,w.tickIndex=l,"category"===r.type&&(w.dataIndex=f),Js(b).eventData=w}e.add(b),b.updateTransform(),c.push(b),t.add(b),b.decomposeTransform()})),c}(n,i,e,t);(function(t,e,n){if(y_(t.axis))return;var i=t.get(["axisLabel","showMinLabel"]),r=t.get(["axisLabel","showMaxLabel"]);n=n||[];var o=(e=e||[])[0],a=e[1],s=e[e.length-1],l=e[e.length-2],u=n[0],h=n[1],c=n[n.length-1],p=n[n.length-2];!1===i?(JM(o),JM(u)):QM(o,a)&&(i?(JM(a),JM(h)):(JM(o),JM(u)));!1===r?(JM(s),JM(c)):QM(l,s)&&(r?(JM(l),JM(p)):(JM(s),JM(c)))}(e,o,r),function(t,e,n,i){var r=n.axis,o=n.getModel("minorTick");if(!o.get("show")||r.scale.isBlank())return;var a=r.getMinorTicksCoords();if(!a.length)return;for(var s=o.getModel("lineStyle"),l=i*o.get("length"),u=k(s.getLineStyle(),k(n.getModel("axisTick").getLineStyle(),{stroke:n.get(["axisLine","lineStyle","color"])})),h=0;h<a.length;h++)for(var c=eI(a[h],e.transform,l,u,"minorticks_"+h),p=0;p<c.length;p++)t.add(c[p])}(n,i,e,t.tickDirection),e.get(["axisLabel","hideOverlap"]))&&Mb(bb(z(o,(function(t){return{label:t,priority:t.z2,defaultAttr:{ignore:t.ignore}}}))))},axisName:function(t,e,n,i){var r=it(t.axisName,e.get("name"));if(r){var o,a,s=e.get("nameLocation"),l=t.nameDirection,u=e.getModel("nameTextStyle"),h=e.get("nameGap")||0,c=e.axis.getExtent(),p=c[0]>c[1]?-1:1,d=["start"===s?c[0]-p*h:"end"===s?c[1]+p*h:(c[0]+c[1])/2,tI(s)?t.labelOffset+l*h:0],f=e.get("nameRotate");null!=f&&(f=f*qM/180),tI(s)?o=KM.innerTextLayout(t.rotation,null!=f?f:t.rotation,l):(o=function(t,e,n,i){var r,o,a=to(n-t),s=i[0]>i[1],l="start"===e&&!s||"start"!==e&&s;eo(a-qM/2)?(o=l?"bottom":"top",r="center"):eo(a-1.5*qM)?(o=l?"top":"bottom",r="center"):(o="middle",r=a<1.5*qM&&a>qM/2?l?"left":"right":l?"right":"left");return{rotation:a,textAlign:r,textVerticalAlign:o}}(t.rotation,s,f||0,c),null!=(a=t.axisNameAvailableWidth)&&(a=Math.abs(a/Math.sin(o.rotation)),!isFinite(a)&&(a=null)));var g=u.getFont(),y=e.get("nameTruncate",!0)||{},v=y.ellipsis,m=it(t.nameTruncateMaxWidth,y.maxWidth,a),x=new Bs({x:d[0],y:d[1],rotation:o.rotation,silent:KM.isLabelSilent(e),style:ec(u,{text:r,font:g,overflow:"truncate",width:m,ellipsis:v,fill:u.getTextColor()||e.get(["axisLine","lineStyle","color"]),align:u.get("align")||o.textAlign,verticalAlign:u.get("verticalAlign")||o.textVerticalAlign}),z2:1});if(Xh({el:x,componentModel:e,itemName:r}),x.__fullText=r,x.anid="name",e.get("triggerEvent")){var _=KM.makeAxisEventDataBase(e);_.targetType="axisName",_.name=r,Js(x).eventData=_}i.add(x),x.updateTransform(),n.add(x),x.decomposeTransform()}}};function JM(t){t&&(t.ignore=!0)}function QM(t,e){var n=t&&t.getBoundingRect().clone(),i=e&&e.getBoundingRect().clone();if(n&&i){var r=me([]);return we(r,r,-t.rotation),n.applyTransform(_e([],r,t.getLocalTransform())),i.applyTransform(_e([],r,e.getLocalTransform())),n.intersect(i)}}function tI(t){return"middle"===t||"center"===t}function eI(t,e,n,i,r){for(var o=[],a=[],s=[],l=0;l<t.length;l++){var u=t[l].coord;a[0]=u,a[1]=0,s[0]=u,s[1]=n,e&&(Wt(a,a,e),Wt(s,s,e));var h=new Xu({shape:{x1:a[0],y1:a[1],x2:s[0],y2:s[1]},style:i,z2:2,autoBatch:!0,silent:!0});Oh(h.shape,h.style.lineWidth),h.anid=r+"_"+t[l].tickValue,o.push(h)}return o}function nI(t,e){var n={axesInfo:{},seriesInvolved:!1,coordSysAxesInfo:{},coordSysMap:{}};return function(t,e,n){var i=e.getComponent("tooltip"),r=e.getComponent("axisPointer"),o=r.get("link",!0)||[],a=[];E(n.getCoordinateSystems(),(function(n){if(n.axisPointerEnabled){var s=sI(n.model),l=t.coordSysAxesInfo[s]={};t.coordSysMap[s]=n;var u=n.model.getModel("tooltip",i);if(E(n.getAxes(),H(d,!1,null)),n.getTooltipAxes&&i&&u.get("show")){var h="axis"===u.get("trigger"),c="cross"===u.get(["axisPointer","type"]),p=n.getTooltipAxes(u.get(["axisPointer","axis"]));(h||c)&&E(p.baseAxes,H(d,!c||"cross",h)),c&&E(p.otherAxes,H(d,"cross",!1))}}function d(i,s,h){var c=h.model.getModel("axisPointer",r),p=c.get("show");if(p&&("auto"!==p||i||aI(c))){null==s&&(s=c.get("triggerTooltip")),c=i?function(t,e,n,i,r,o){var a=e.getModel("axisPointer"),s={};E(["type","snap","lineStyle","shadowStyle","label","animation","animationDurationUpdate","animationEasingUpdate","z"],(function(t){s[t]=T(a.get(t))})),s.snap="category"!==t.type&&!!o,"cross"===a.get("type")&&(s.type="line");var l=s.label||(s.label={});if(null==l.show&&(l.show=!1),"cross"===r){var u=a.get(["label","show"]);if(l.show=null==u||u,!o){var h=s.lineStyle=a.get("crossStyle");h&&k(l,h.textStyle)}}return t.model.getModel("axisPointer",new Sc(s,n,i))}(h,u,r,e,i,s):c;var d=c.get("snap"),f=sI(h.model),g=s||d||"category"===h.type,y=t.axesInfo[f]={key:f,axis:h,coordSys:n,axisPointerModel:c,triggerTooltip:s,involveSeries:g,snap:d,useHandle:aI(c),seriesModels:[],linkGroup:null};l[f]=y,t.seriesInvolved=t.seriesInvolved||g;var v=function(t,e){for(var n=e.model,i=e.dim,r=0;r<t.length;r++){var o=t[r]||{};if(iI(o[i+"AxisId"],n.id)||iI(o[i+"AxisIndex"],n.componentIndex)||iI(o[i+"AxisName"],n.name))return r}}(o,h);if(null!=v){var m=a[v]||(a[v]={axesInfo:{}});m.axesInfo[f]=y,m.mapper=o[v].mapper,y.linkGroup=m}}}}))}(n,t,e),n.seriesInvolved&&function(t,e){e.eachSeries((function(e){var n=e.coordinateSystem,i=e.get(["tooltip","trigger"],!0),r=e.get(["tooltip","show"],!0);n&&"none"!==i&&!1!==i&&"item"!==i&&!1!==r&&!1!==e.get(["axisPointer","show"],!0)&&E(t.coordSysAxesInfo[sI(n.model)],(function(t){var i=t.axis;n.getAxis(i.dim)===i&&(t.seriesModels.push(e),null==t.seriesDataCount&&(t.seriesDataCount=0),t.seriesDataCount+=e.getData().count())}))}))}(n,t),n}function iI(t,e){return"all"===t||Y(t)&&P(t,e)>=0||t===e}function rI(t){var e=oI(t);if(e){var n=e.axisPointerModel,i=e.axis.scale,r=n.option,o=n.get("status"),a=n.get("value");null!=a&&(a=i.parse(a));var s=aI(n);null==o&&(r.status=s?"show":"hide");var l=i.getExtent().slice();l[0]>l[1]&&l.reverse(),(null==a||a>l[1])&&(a=l[1]),a<l[0]&&(a=l[0]),r.value=a,s&&(r.status=e.axis.scale.isBlank()?"hide":"show")}}function oI(t){var e=(t.ecModel.getComponent("axisPointer")||{}).coordSysAxesInfo;return e&&e.axesInfo[sI(t)]}function aI(t){return!!t.get(["handle","show"])}function sI(t){return t.type+"||"+t.id}var lI={},uI=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.render=function(e,n,i,r){this.axisPointerClass&&rI(e),t.prototype.render.apply(this,arguments),this._doUpdateAxisPointerClass(e,i,!0)},e.prototype.updateAxisPointer=function(t,e,n,i){this._doUpdateAxisPointerClass(t,n,!1)},e.prototype.remove=function(t,e){var n=this._axisPointer;n&&n.remove(e)},e.prototype.dispose=function(e,n){this._disposeAxisPointer(n),t.prototype.dispose.apply(this,arguments)},e.prototype._doUpdateAxisPointerClass=function(t,n,i){var r=e.getAxisPointerClass(this.axisPointerClass);if(r){var o=function(t){var e=oI(t);return e&&e.axisPointerModel}(t);o?(this._axisPointer||(this._axisPointer=new r)).render(t,o,n,i):this._disposeAxisPointer(n)}},e.prototype._disposeAxisPointer=function(t){this._axisPointer&&this._axisPointer.dispose(t),this._axisPointer=null},e.registerAxisPointerClass=function(t,e){lI[t]=e},e.getAxisPointerClass=function(t){return t&&lI[t]},e.type="axis",e}(wg),hI=Po();function cI(t,e,n,i){var r=n.axis;if(!r.scale.isBlank()){var o=n.getModel("splitArea"),a=o.getModel("areaStyle"),s=a.get("color"),l=i.coordinateSystem.getRect(),u=r.getTicksCoords({tickModel:o,clamp:!0});if(u.length){var h=s.length,c=hI(t).splitAreaColors,p=yt(),d=0;if(c)for(var f=0;f<u.length;f++){var g=c.get(u[f].tickValue);if(null!=g){d=(g+(h-1)*f)%h;break}}var y=r.toGlobalCoord(u[0].coord),v=a.getAreaStyle();s=Y(s)?s:[s];for(f=1;f<u.length;f++){var m=r.toGlobalCoord(u[f].coord),x=void 0,_=void 0,b=void 0,w=void 0;r.isHorizontal()?(x=y,_=l.y,b=m-x,w=l.height,y=x+b):(x=l.x,_=y,b=l.width,y=_+(w=m-_));var S=u[f-1].tickValue;null!=S&&p.set(S,d),e.add(new Es({anid:null!=S?"area_"+S:null,shape:{x:x,y:_,width:b,height:w},style:k({fill:s[d]},v),autoBatch:!0,silent:!0})),d=(d+1)%h}hI(t).splitAreaColors=p}}}function pI(t){hI(t).splitAreaColors=null}var dI=["axisLine","axisTickLabel","axisName"],fI=["splitArea","splitLine","minorSplitLine"],gI=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.axisPointerClass="CartesianAxisPointer",n}return n(e,t),e.prototype.render=function(e,n,i,r){this.group.removeAll();var o=this._axisGroup;if(this._axisGroup=new Er,this.group.add(this._axisGroup),e.get("show")){var a=e.getCoordSysModel(),s=FM(a,e),l=new KM(e,A({handleAutoShown:function(t){for(var n=a.coordinateSystem.getCartesians(),i=0;i<n.length;i++)if(gx(n[i].getOtherAxis(e.axis).scale))return!0;return!1}},s));E(dI,l.add,l),this._axisGroup.add(l.getGroup()),E(fI,(function(t){e.get([t,"show"])&&yI[t](this,this._axisGroup,e,a)}),this),r&&"changeAxisOrder"===r.type&&r.isInitSort||Bh(o,this._axisGroup,e),t.prototype.render.call(this,e,n,i,r)}},e.prototype.remove=function(){pI(this)},e.type="cartesianAxis",e}(uI),yI={splitLine:function(t,e,n,i){var r=n.axis;if(!r.scale.isBlank()){var o=n.getModel("splitLine"),a=o.getModel("lineStyle"),s=a.get("color");s=Y(s)?s:[s];for(var l=i.coordinateSystem.getRect(),u=r.isHorizontal(),h=0,c=r.getTicksCoords({tickModel:o}),p=[],d=[],f=a.getLineStyle(),g=0;g<c.length;g++){var y=r.toGlobalCoord(c[g].coord);u?(p[0]=y,p[1]=l.y,d[0]=y,d[1]=l.y+l.height):(p[0]=l.x,p[1]=y,d[0]=l.x+l.width,d[1]=y);var v=h++%s.length,m=c[g].tickValue,x=new Xu({anid:null!=m?"line_"+c[g].tickValue:null,autoBatch:!0,shape:{x1:p[0],y1:p[1],x2:d[0],y2:d[1]},style:k({stroke:s[v]},f),silent:!0});Oh(x.shape,f.lineWidth),e.add(x)}}},minorSplitLine:function(t,e,n,i){var r=n.axis,o=n.getModel("minorSplitLine").getModel("lineStyle"),a=i.coordinateSystem.getRect(),s=r.isHorizontal(),l=r.getMinorTicksCoords();if(l.length)for(var u=[],h=[],c=o.getLineStyle(),p=0;p<l.length;p++)for(var d=0;d<l[p].length;d++){var f=r.toGlobalCoord(l[p][d].coord);s?(u[0]=f,u[1]=a.y,h[0]=f,h[1]=a.y+a.height):(u[0]=a.x,u[1]=f,h[0]=a.x+a.width,h[1]=f);var g=new Xu({anid:"minor_line_"+l[p][d].tickValue,autoBatch:!0,shape:{x1:u[0],y1:u[1],x2:h[0],y2:h[1]},style:c,silent:!0});Oh(g.shape,c.lineWidth),e.add(g)}},splitArea:function(t,e,n,i){cI(t,e,n,i)}},vI=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.type="xAxis",e}(gI),mI=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type=vI.type,e}return n(e,t),e.type="yAxis",e}(gI),xI=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="grid",e}return n(e,t),e.prototype.render=function(t,e){this.group.removeAll(),t.get("show")&&this.group.add(new Es({shape:t.coordinateSystem.getRect(),style:k({fill:t.get("backgroundColor")},t.getItemStyle()),silent:!0,z2:-1}))},e.type="grid",e}(wg),_I={offset:0};function bI(t){t.registerComponentView(xI),t.registerComponentModel(TM),t.registerCoordinateSystem("cartesian2d",UM),OM(t,"x",CM,_I),OM(t,"y",CM,_I),t.registerComponentView(vI),t.registerComponentView(mI),t.registerPreprocessor((function(t){t.xAxis&&t.yAxis&&!t.grid&&(t.grid={})}))}function wI(t){t.eachSeriesByType("radar",(function(t){var e=t.getData(),n=[],i=t.coordinateSystem;if(i){var r=i.getIndicatorAxes();E(r,(function(t,o){e.each(e.mapDimension(r[o].dim),(function(t,e){n[e]=n[e]||[];var r=i.dataToPoint(t,o);n[e][o]=SI(r)?r:MI(i)}))})),e.each((function(t){var r=F(n[t],(function(t){return SI(t)}))||MI(i);n[t].push(r.slice()),e.setItemLayout(t,n[t])}))}}))}function SI(t){return!isNaN(t[0])&&!isNaN(t[1])}function MI(t){return[t.cx,t.cy]}function II(t){var e=t.polar;if(e){Y(e)||(e=[e]);var n=[];E(e,(function(e,i){e.indicator?(e.type&&!e.shape&&(e.shape=e.type),t.radar=t.radar||[],Y(t.radar)||(t.radar=[t.radar]),t.radar.push(e)):n.push(e)})),t.polar=n}E(t.series,(function(t){t&&"radar"===t.type&&t.polarIndex&&(t.radarIndex=t.polarIndex)}))}var TI=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.render=function(t,e,n){var i=t.coordinateSystem,r=this.group,o=t.getData(),a=this._data;function s(t,e){var n=t.getItemVisual(e,"symbol")||"circle";if("none"!==n){var i=By(t.getItemVisual(e,"symbolSize")),r=Vy(n,-1,-1,2,2),o=t.getItemVisual(e,"symbolRotate")||0;return r.attr({style:{strokeNoScale:!0},z2:100,scaleX:i[0]/2,scaleY:i[1]/2,rotation:o*Math.PI/180||0}),r}}function l(e,n,i,r,o,a){i.removeAll();for(var l=0;l<n.length-1;l++){var u=s(r,o);u&&(u.__dimIdx=l,e[l]?(u.setPosition(e[l]),qh[a?"initProps":"updateProps"](u,{x:n[l][0],y:n[l][1]},t,o)):u.setPosition(n[l]),i.add(u))}}function u(t){return z(t,(function(t){return[i.cx,i.cy]}))}o.diff(a).add((function(e){var n=o.getItemLayout(e);if(n){var i=new Gu,r=new Hu,a={shape:{points:n}};i.shape.points=u(n),r.shape.points=u(n),fh(i,a,t,e),fh(r,a,t,e);var s=new Er,h=new Er;s.add(r),s.add(i),s.add(h),l(r.shape.points,n,h,o,e,!0),o.setItemGraphicEl(e,s)}})).update((function(e,n){var i=a.getItemGraphicEl(n),r=i.childAt(0),s=i.childAt(1),u=i.childAt(2),h={shape:{points:o.getItemLayout(e)}};h.shape.points&&(l(r.shape.points,h.shape.points,u,o,e,!1),xh(s),xh(r),dh(r,h,t),dh(s,h,t),o.setItemGraphicEl(e,i))})).remove((function(t){r.remove(a.getItemGraphicEl(t))})).execute(),o.eachItemGraphicEl((function(t,e){var n=o.getItemModel(e),i=t.childAt(0),a=t.childAt(1),s=t.childAt(2),l=o.getItemVisual(e,"style"),u=l.fill;r.add(t),i.useStyle(k(n.getModel("lineStyle").getLineStyle(),{fill:"none",stroke:u})),Zl(i,n,"lineStyle"),Zl(a,n,"areaStyle");var h=n.getModel("areaStyle"),c=h.isEmpty()&&h.parentModel.isEmpty();a.ignore=c,E(["emphasis","select","blur"],(function(t){var e=n.getModel([t,"areaStyle"]),i=e.isEmpty()&&e.parentModel.isEmpty();a.ensureState(t).ignore=i&&c})),a.useStyle(k(h.getAreaStyle(),{fill:u,opacity:.7,decal:l.decal}));var p=n.getModel("emphasis"),d=p.getModel("itemStyle").getItemStyle();s.eachChild((function(t){if(t instanceof As){var i=t.style;t.useStyle(A({image:i.image,x:i.x,y:i.y,width:i.width,height:i.height},l))}else t.useStyle(l),t.setColor(u),t.style.strokeNoScale=!0;t.ensureState("emphasis").style=T(d);var r=o.getStore().get(o.getDimensionIndex(t.__dimIdx),e);(null==r||isNaN(r))&&(r=""),Qh(t,tc(n),{labelFetcher:o.hostModel,labelDataIndex:e,labelDimIndex:t.__dimIdx,defaultText:r,inheritColor:u,defaultOpacity:l.opacity})})),Hl(t,p.get("focus"),p.get("blurScope"),p.get("disabled"))})),this._data=o},e.prototype.remove=function(){this.group.removeAll(),this._data=null},e.type="radar",e}(Tg),CI=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.hasSymbolVisual=!0,n}return n(e,t),e.prototype.init=function(e){t.prototype.init.apply(this,arguments),this.legendVisualProvider=new mM(W(this.getData,this),W(this.getRawData,this))},e.prototype.getInitialData=function(t,e){return vM(this,{generateCoord:"indicator_",generateCoordCount:1/0})},e.prototype.formatTooltip=function(t,e,n){var i=this.getData(),r=this.coordinateSystem.getIndicatorAxes(),o=this.getData().getName(t),a=""===o?this.name:o,s=lg(this,t);return Qf("section",{header:a,sortBlocks:!0,blocks:z(r,(function(e){var n=i.get(i.mapDimension(e.dim),t);return Qf("nameValue",{markerType:"subItem",markerColor:s,name:e.name,value:n,sortParam:n})}))})},e.prototype.getTooltipPosition=function(t){if(null!=t)for(var e=this.getData(),n=this.coordinateSystem,i=e.getValues(z(n.dimensions,(function(t){return e.mapDimension(t)})),t),r=0,o=i.length;r<o;r++)if(!isNaN(i[r])){var a=n.getIndicatorAxes();return n.coordToPoint(a[r].dataToCoord(i[r]),r)}},e.type="series.radar",e.dependencies=["radar"],e.defaultOption={z:2,colorBy:"data",coordinateSystem:"radar",legendHoverLink:!0,radarIndex:0,lineStyle:{width:2,type:"solid",join:"round"},label:{position:"top"},symbolSize:8},e}(fg),DI=LM.value;function AI(t,e){return k({show:e},t)}var kI=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.optionUpdated=function(){var t=this.get("boundaryGap"),e=this.get("splitNumber"),n=this.get("scale"),i=this.get("axisLine"),r=this.get("axisTick"),o=this.get("axisLabel"),a=this.get("axisName"),s=this.get(["axisName","show"]),l=this.get(["axisName","formatter"]),u=this.get("axisNameGap"),h=this.get("triggerEvent"),c=z(this.get("indicator")||[],(function(c){null!=c.max&&c.max>0&&!c.min?c.min=0:null!=c.min&&c.min<0&&!c.max&&(c.max=0);var p=a;null!=c.color&&(p=k({color:c.color},a));var d=C(T(c),{boundaryGap:t,splitNumber:e,scale:n,axisLine:i,axisTick:r,axisLabel:o,name:c.text,showName:s,nameLocation:"end",nameGap:u,nameTextStyle:p,triggerEvent:h},!1);if(X(l)){var f=d.name;d.name=l.replace("{value}",null!=f?f:"")}else U(l)&&(d.name=l(d.name,d));var g=new Sc(d,null,this.ecModel);return R(g,m_.prototype),g.mainType="radar",g.componentIndex=this.componentIndex,g}),this);this._indicatorModels=c},e.prototype.getIndicatorModels=function(){return this._indicatorModels},e.type="radar",e.defaultOption={z:0,center:["50%","50%"],radius:"75%",startAngle:90,axisName:{show:!0},boundaryGap:[0,0],splitNumber:5,axisNameGap:15,scale:!1,shape:"polygon",axisLine:C({lineStyle:{color:"#bbb"}},DI.axisLine),axisLabel:AI(DI.axisLabel,!1),axisTick:AI(DI.axisTick,!1),splitLine:AI(DI.splitLine,!0),splitArea:AI(DI.splitArea,!0),indicator:[]},e}(Op),LI=["axisLine","axisTickLabel","axisName"],PI=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.render=function(t,e,n){this.group.removeAll(),this._buildAxes(t),this._buildSplitLineAndArea(t)},e.prototype._buildAxes=function(t){var e=t.coordinateSystem;E(z(e.getIndicatorAxes(),(function(t){var n=t.model.get("showName")?t.name:"";return new KM(t.model,{axisName:n,position:[e.cx,e.cy],rotation:t.angle,labelDirection:-1,tickDirection:-1,nameDirection:1})})),(function(t){E(LI,t.add,t),this.group.add(t.getGroup())}),this)},e.prototype._buildSplitLineAndArea=function(t){var e=t.coordinateSystem,n=e.getIndicatorAxes();if(n.length){var i=t.get("shape"),r=t.getModel("splitLine"),o=t.getModel("splitArea"),a=r.getModel("lineStyle"),s=o.getModel("areaStyle"),l=r.get("show"),u=o.get("show"),h=a.get("color"),c=s.get("color"),p=Y(h)?h:[h],d=Y(c)?c:[c],f=[],g=[];if("circle"===i)for(var y=n[0].getTicksCoords(),v=e.cx,m=e.cy,x=0;x<y.length;x++){if(l)f[C(f,p,x)].push(new xu({shape:{cx:v,cy:m,r:y[x].coord}}));if(u&&x<y.length-1)g[C(g,d,x)].push(new Vu({shape:{cx:v,cy:m,r0:y[x].coord,r:y[x+1].coord}}))}else{var _,b=z(n,(function(t,n){var i=t.getTicksCoords();return _=null==_?i.length-1:Math.min(i.length-1,_),z(i,(function(t){return e.coordToPoint(t.coord,n)}))})),w=[];for(x=0;x<=_;x++){for(var S=[],M=0;M<n.length;M++)S.push(b[M][x]);if(S[0]&&S.push(S[0].slice()),l)f[C(f,p,x)].push(new Hu({shape:{points:S}}));if(u&&w)g[C(g,d,x-1)].push(new Gu({shape:{points:S.concat(w)}}));w=S.slice().reverse()}}var I=a.getLineStyle(),T=s.getAreaStyle();E(g,(function(t,e){this.group.add(Lh(t,{style:k({stroke:"none",fill:d[e%d.length]},T),silent:!0}))}),this),E(f,(function(t,e){this.group.add(Lh(t,{style:k({fill:"none",stroke:p[e%p.length]},I),silent:!0}))}),this)}function C(t,e,n){var i=n%e.length;return t[i]=t[i]||[],i}},e.type="radar",e}(wg),OI=function(t){function e(e,n,i){var r=t.call(this,e,n,i)||this;return r.type="value",r.angle=0,r.name="",r}return n(e,t),e}(q_),RI=function(){function t(t,e,n){this.dimensions=[],this._model=t,this._indicatorAxes=z(t.getIndicatorModels(),(function(t,e){var n="indicator_"+e,i=new OI(n,new Tx);return i.name=t.get("name"),i.model=t,t.axis=i,this.dimensions.push(n),i}),this),this.resize(t,n)}return t.prototype.getIndicatorAxes=function(){return this._indicatorAxes},t.prototype.dataToPoint=function(t,e){var n=this._indicatorAxes[e];return this.coordToPoint(n.dataToCoord(t),e)},t.prototype.coordToPoint=function(t,e){var n=this._indicatorAxes[e].angle;return[this.cx+t*Math.cos(n),this.cy-t*Math.sin(n)]},t.prototype.pointToData=function(t){var e=t[0]-this.cx,n=t[1]-this.cy,i=Math.sqrt(e*e+n*n);e/=i,n/=i;for(var r,o=Math.atan2(-n,e),a=1/0,s=-1,l=0;l<this._indicatorAxes.length;l++){var u=this._indicatorAxes[l],h=Math.abs(o-u.angle);h<a&&(r=u,s=l,a=h)}return[s,+(r&&r.coordToData(i))]},t.prototype.resize=function(t,e){var n=t.get("center"),i=e.getWidth(),r=e.getHeight(),o=Math.min(i,r)/2;this.cx=Ur(n[0],i),this.cy=Ur(n[1],r),this.startAngle=t.get("startAngle")*Math.PI/180;var a=t.get("radius");(X(a)||j(a))&&(a=[0,a]),this.r0=Ur(a[0],o),this.r=Ur(a[1],o),E(this._indicatorAxes,(function(t,e){t.setExtent(this.r0,this.r);var n=this.startAngle+e*Math.PI*2/this._indicatorAxes.length;n=Math.atan2(Math.sin(n),Math.cos(n)),t.angle=n}),this)},t.prototype.update=function(t,e){var n=this._indicatorAxes,i=this._model;E(n,(function(t){t.scale.setExtent(1/0,-1/0)})),t.eachSeriesByType("radar",(function(e,r){if("radar"===e.get("coordinateSystem")&&t.getComponent("radar",e.get("radarIndex"))===i){var o=e.getData();E(n,(function(t){t.scale.unionExtentFromData(o,o.mapDimension(t.dim))}))}}),this);var r=i.get("splitNumber"),o=new Tx;o.setExtent(0,r),o.setInterval(1),E(n,(function(t,e){YM(t.scale,t.model,o)}))},t.prototype.convertToPixel=function(t,e,n){return console.warn("Not implemented."),null},t.prototype.convertFromPixel=function(t,e,n){return console.warn("Not implemented."),null},t.prototype.containPoint=function(t){return console.warn("Not implemented."),!1},t.create=function(e,n){var i=[];return e.eachComponent("radar",(function(r){var o=new t(r,e,n);i.push(o),r.coordinateSystem=o})),e.eachSeriesByType("radar",(function(t){"radar"===t.get("coordinateSystem")&&(t.coordinateSystem=i[t.get("radarIndex")||0])})),i},t.dimensions=[],t}();function NI(t){t.registerCoordinateSystem("radar",RI),t.registerComponentModel(kI),t.registerComponentView(PI),t.registerVisual({seriesType:"radar",reset:function(t){var e=t.getData();e.each((function(t){e.setItemVisual(t,"legendIcon","roundRect")})),e.setVisual("legendIcon","roundRect")}})}var EI="\0_ec_interaction_mutex";function zI(t,e){return!!VI(t)[e]}function VI(t){return t[EI]||(t[EI]={})}vm({type:"takeGlobalCursor",event:"globalCursorTaken",update:"update"},bt);var BI=function(t){function e(e){var n=t.call(this)||this;n._zr=e;var i=W(n._mousedownHandler,n),r=W(n._mousemoveHandler,n),o=W(n._mouseupHandler,n),a=W(n._mousewheelHandler,n),s=W(n._pinchHandler,n);return n.enable=function(t,n){this.disable(),this._opt=k(T(n)||{},{zoomOnMouseWheel:!0,moveOnMouseMove:!0,moveOnMouseWheel:!1,preventDefaultMouseMove:!0}),null==t&&(t=!0),!0!==t&&"move"!==t&&"pan"!==t||(e.on("mousedown",i),e.on("mousemove",r),e.on("mouseup",o)),!0!==t&&"scale"!==t&&"zoom"!==t||(e.on("mousewheel",a),e.on("pinch",s))},n.disable=function(){e.off("mousedown",i),e.off("mousemove",r),e.off("mouseup",o),e.off("mousewheel",a),e.off("pinch",s)},n}return n(e,t),e.prototype.isDragging=function(){return this._dragging},e.prototype.isPinching=function(){return this._pinching},e.prototype.setPointerChecker=function(t){this.pointerChecker=t},e.prototype.dispose=function(){this.disable()},e.prototype._mousedownHandler=function(t){if(!de(t)){for(var e=t.target;e;){if(e.draggable)return;e=e.__hostTarget||e.parent}var n=t.offsetX,i=t.offsetY;this.pointerChecker&&this.pointerChecker(t,n,i)&&(this._x=n,this._y=i,this._dragging=!0)}},e.prototype._mousemoveHandler=function(t){if(this._dragging&&WI("moveOnMouseMove",t,this._opt)&&"pinch"!==t.gestureEvent&&!zI(this._zr,"globalPan")){var e=t.offsetX,n=t.offsetY,i=this._x,r=this._y,o=e-i,a=n-r;this._x=e,this._y=n,this._opt.preventDefaultMouseMove&&pe(t.event),GI(this,"pan","moveOnMouseMove",t,{dx:o,dy:a,oldX:i,oldY:r,newX:e,newY:n,isAvailableBehavior:null})}},e.prototype._mouseupHandler=function(t){de(t)||(this._dragging=!1)},e.prototype._mousewheelHandler=function(t){var e=WI("zoomOnMouseWheel",t,this._opt),n=WI("moveOnMouseWheel",t,this._opt),i=t.wheelDelta,r=Math.abs(i),o=t.offsetX,a=t.offsetY;if(0!==i&&(e||n)){if(e){var s=r>3?1.4:r>1?1.2:1.1;FI(this,"zoom","zoomOnMouseWheel",t,{scale:i>0?s:1/s,originX:o,originY:a,isAvailableBehavior:null})}if(n){var l=Math.abs(i);FI(this,"scrollMove","moveOnMouseWheel",t,{scrollDelta:(i>0?1:-1)*(l>3?.4:l>1?.15:.05),originX:o,originY:a,isAvailableBehavior:null})}}},e.prototype._pinchHandler=function(t){zI(this._zr,"globalPan")||FI(this,"zoom",null,t,{scale:t.pinchScale>1?1.1:1/1.1,originX:t.pinchX,originY:t.pinchY,isAvailableBehavior:null})},e}(jt);function FI(t,e,n,i,r){t.pointerChecker&&t.pointerChecker(i,r.originX,r.originY)&&(pe(i.event),GI(t,e,n,i,r))}function GI(t,e,n,i,r){r.isAvailableBehavior=W(WI,null,n,i),t.trigger(e,r)}function WI(t,e,n){var i=n[t];return!t||i&&(!X(i)||e.event[i+"Key"])}function HI(t,e,n){var i=t.target;i.x+=e,i.y+=n,i.dirty()}function YI(t,e,n,i){var r=t.target,o=t.zoomLimit,a=t.zoom=t.zoom||1;if(a*=e,o){var s=o.min||0,l=o.max||1/0;a=Math.max(Math.min(l,a),s)}var u=a/t.zoom;t.zoom=a,r.x-=(n-r.x)*(u-1),r.y-=(i-r.y)*(u-1),r.scaleX*=u,r.scaleY*=u,r.dirty()}var UI,XI={axisPointer:1,tooltip:1,brush:1};function ZI(t,e,n){var i=e.getComponentByElement(t.topTarget),r=i&&i.coordinateSystem;return i&&i!==n&&!XI.hasOwnProperty(i.mainType)&&r&&r.model!==n}function jI(t){X(t)&&(t=(new DOMParser).parseFromString(t,"text/xml"));var e=t;for(9===e.nodeType&&(e=e.firstChild);"svg"!==e.nodeName.toLowerCase()||1!==e.nodeType;)e=e.nextSibling;return e}var qI={fill:"fill",stroke:"stroke","stroke-width":"lineWidth",opacity:"opacity","fill-opacity":"fillOpacity","stroke-opacity":"strokeOpacity","stroke-dasharray":"lineDash","stroke-dashoffset":"lineDashOffset","stroke-linecap":"lineCap","stroke-linejoin":"lineJoin","stroke-miterlimit":"miterLimit","font-family":"fontFamily","font-size":"fontSize","font-style":"fontStyle","font-weight":"fontWeight","text-anchor":"textAlign",visibility:"visibility",display:"display"},KI=G(qI),$I={"alignment-baseline":"textBaseline","stop-color":"stopColor"},JI=G($I),QI=function(){function t(){this._defs={},this._root=null}return t.prototype.parse=function(t,e){e=e||{};var n=jI(t);this._defsUsePending=[];var i=new Er;this._root=i;var r=[],o=n.getAttribute("viewBox")||"",a=parseFloat(n.getAttribute("width")||e.width),s=parseFloat(n.getAttribute("height")||e.height);isNaN(a)&&(a=null),isNaN(s)&&(s=null),oT(n,i,null,!0,!1);for(var l,u,h=n.firstChild;h;)this._parseNode(h,i,r,null,!1,!1),h=h.nextSibling;if(function(t,e){for(var n=0;n<e.length;n++){var i=e[n];i[0].style[i[1]]=t[i[2]]}}(this._defs,this._defsUsePending),this._defsUsePending=[],o){var c=uT(o);c.length>=4&&(l={x:parseFloat(c[0]||0),y:parseFloat(c[1]||0),width:parseFloat(c[2]),height:parseFloat(c[3])})}if(l&&null!=a&&null!=s&&(u=fT(l,{x:0,y:0,width:a,height:s}),!e.ignoreViewBox)){var p=i;(i=new Er).add(p),p.scaleX=p.scaleY=u.scale,p.x=u.x,p.y=u.y}return e.ignoreRootClip||null==a||null==s||i.setClipPath(new Es({shape:{x:0,y:0,width:a,height:s}})),{root:i,width:a,height:s,viewBoxRect:l,viewBoxTransform:u,named:r}},t.prototype._parseNode=function(t,e,n,i,r,o){var a,s=t.nodeName.toLowerCase(),l=i;if("defs"===s&&(r=!0),"text"===s&&(o=!0),"defs"===s||"switch"===s)a=e;else{if(!r){var u=UI[s];if(u&&_t(UI,s)){a=u.call(this,t,e);var h=t.getAttribute("name");if(h){var c={name:h,namedFrom:null,svgNodeTagLower:s,el:a};n.push(c),"g"===s&&(l=c)}else i&&n.push({name:i.name,namedFrom:i,svgNodeTagLower:s,el:a});e.add(a)}}var p=tT[s];if(p&&_t(tT,s)){var d=p.call(this,t),f=t.getAttribute("id");f&&(this._defs[f]=d)}}if(a&&a.isGroup)for(var g=t.firstChild;g;)1===g.nodeType?this._parseNode(g,a,n,l,r,o):3===g.nodeType&&o&&this._parseText(g,a),g=g.nextSibling},t.prototype._parseText=function(t,e){var n=new Ts({style:{text:t.textContent},silent:!0,x:this._textX||0,y:this._textY||0});iT(e,n),oT(t,n,this._defsUsePending,!1,!1),function(t,e){var n=e.__selfStyle;if(n){var i=n.textBaseline,r=i;i&&"auto"!==i?"baseline"===i?r="alphabetic":"before-edge"===i||"text-before-edge"===i?r="top":"after-edge"===i||"text-after-edge"===i?r="bottom":"central"!==i&&"mathematical"!==i||(r="middle"):r="alphabetic",t.style.textBaseline=r}var o=e.__inheritedStyle;if(o){var a=o.textAlign,s=a;a&&("middle"===a&&(s="center"),t.style.textAlign=s)}}(n,e);var i=n.style,r=i.fontSize;r&&r<9&&(i.fontSize=9,n.scaleX*=r/9,n.scaleY*=r/9);var o=(i.fontSize||i.fontFamily)&&[i.fontStyle,i.fontWeight,(i.fontSize||12)+"px",i.fontFamily||"sans-serif"].join(" ");i.font=o;var a=n.getBoundingRect();return this._textX+=a.width,e.add(n),n},t.internalField=void(UI={g:function(t,e){var n=new Er;return iT(e,n),oT(t,n,this._defsUsePending,!1,!1),n},rect:function(t,e){var n=new Es;return iT(e,n),oT(t,n,this._defsUsePending,!1,!1),n.setShape({x:parseFloat(t.getAttribute("x")||"0"),y:parseFloat(t.getAttribute("y")||"0"),width:parseFloat(t.getAttribute("width")||"0"),height:parseFloat(t.getAttribute("height")||"0")}),n.silent=!0,n},circle:function(t,e){var n=new xu;return iT(e,n),oT(t,n,this._defsUsePending,!1,!1),n.setShape({cx:parseFloat(t.getAttribute("cx")||"0"),cy:parseFloat(t.getAttribute("cy")||"0"),r:parseFloat(t.getAttribute("r")||"0")}),n.silent=!0,n},line:function(t,e){var n=new Xu;return iT(e,n),oT(t,n,this._defsUsePending,!1,!1),n.setShape({x1:parseFloat(t.getAttribute("x1")||"0"),y1:parseFloat(t.getAttribute("y1")||"0"),x2:parseFloat(t.getAttribute("x2")||"0"),y2:parseFloat(t.getAttribute("y2")||"0")}),n.silent=!0,n},ellipse:function(t,e){var n=new bu;return iT(e,n),oT(t,n,this._defsUsePending,!1,!1),n.setShape({cx:parseFloat(t.getAttribute("cx")||"0"),cy:parseFloat(t.getAttribute("cy")||"0"),rx:parseFloat(t.getAttribute("rx")||"0"),ry:parseFloat(t.getAttribute("ry")||"0")}),n.silent=!0,n},polygon:function(t,e){var n,i=t.getAttribute("points");i&&(n=rT(i));var r=new Gu({shape:{points:n||[]},silent:!0});return iT(e,r),oT(t,r,this._defsUsePending,!1,!1),r},polyline:function(t,e){var n,i=t.getAttribute("points");i&&(n=rT(i));var r=new Hu({shape:{points:n||[]},silent:!0});return iT(e,r),oT(t,r,this._defsUsePending,!1,!1),r},image:function(t,e){var n=new As;return iT(e,n),oT(t,n,this._defsUsePending,!1,!1),n.setStyle({image:t.getAttribute("xlink:href")||t.getAttribute("href"),x:+t.getAttribute("x"),y:+t.getAttribute("y"),width:+t.getAttribute("width"),height:+t.getAttribute("height")}),n.silent=!0,n},text:function(t,e){var n=t.getAttribute("x")||"0",i=t.getAttribute("y")||"0",r=t.getAttribute("dx")||"0",o=t.getAttribute("dy")||"0";this._textX=parseFloat(n)+parseFloat(r),this._textY=parseFloat(i)+parseFloat(o);var a=new Er;return iT(e,a),oT(t,a,this._defsUsePending,!1,!0),a},tspan:function(t,e){var n=t.getAttribute("x"),i=t.getAttribute("y");null!=n&&(this._textX=parseFloat(n)),null!=i&&(this._textY=parseFloat(i));var r=t.getAttribute("dx")||"0",o=t.getAttribute("dy")||"0",a=new Er;return iT(e,a),oT(t,a,this._defsUsePending,!1,!0),this._textX+=parseFloat(r),this._textY+=parseFloat(o),a},path:function(t,e){var n=yu(t.getAttribute("d")||"");return iT(e,n),oT(t,n,this._defsUsePending,!1,!1),n.silent=!0,n}}),t}(),tT={lineargradient:function(t){var e=parseInt(t.getAttribute("x1")||"0",10),n=parseInt(t.getAttribute("y1")||"0",10),i=parseInt(t.getAttribute("x2")||"10",10),r=parseInt(t.getAttribute("y2")||"0",10),o=new eh(e,n,i,r);return eT(t,o),nT(t,o),o},radialgradient:function(t){var e=parseInt(t.getAttribute("cx")||"0",10),n=parseInt(t.getAttribute("cy")||"0",10),i=parseInt(t.getAttribute("r")||"0",10),r=new nh(e,n,i);return eT(t,r),nT(t,r),r}};function eT(t,e){"userSpaceOnUse"===t.getAttribute("gradientUnits")&&(e.global=!0)}function nT(t,e){for(var n=t.firstChild;n;){if(1===n.nodeType&&"stop"===n.nodeName.toLocaleLowerCase()){var i=n.getAttribute("offset"),r=void 0;r=i&&i.indexOf("%")>0?parseInt(i,10)/100:i?parseFloat(i):0;var o={};dT(n,o,o);var a=o.stopColor||n.getAttribute("stop-color")||"#000000";e.colorStops.push({offset:r,color:a})}n=n.nextSibling}}function iT(t,e){t&&t.__inheritedStyle&&(e.__inheritedStyle||(e.__inheritedStyle={}),k(e.__inheritedStyle,t.__inheritedStyle))}function rT(t){for(var e=uT(t),n=[],i=0;i<e.length;i+=2){var r=parseFloat(e[i]),o=parseFloat(e[i+1]);n.push([r,o])}return n}function oT(t,e,n,i,r){var o=e,a=o.__inheritedStyle=o.__inheritedStyle||{},s={};1===t.nodeType&&(function(t,e){var n=t.getAttribute("transform");if(n){n=n.replace(/,/g," ");var i=[],r=null;n.replace(hT,(function(t,e,n){return i.push(e,n),""}));for(var o=i.length-1;o>0;o-=2){var a=i[o],s=i[o-1],l=uT(a);switch(r=r||[1,0,0,1,0,0],s){case"translate":be(r,r,[parseFloat(l[0]),parseFloat(l[1]||"0")]);break;case"scale":Se(r,r,[parseFloat(l[0]),parseFloat(l[1]||l[0])]);break;case"rotate":we(r,r,-parseFloat(l[0])*cT);break;case"skewX":_e(r,[1,0,Math.tan(parseFloat(l[0])*cT),1,0,0],r);break;case"skewY":_e(r,[1,Math.tan(parseFloat(l[0])*cT),0,1,0,0],r);break;case"matrix":r[0]=parseFloat(l[0]),r[1]=parseFloat(l[1]),r[2]=parseFloat(l[2]),r[3]=parseFloat(l[3]),r[4]=parseFloat(l[4]),r[5]=parseFloat(l[5])}}e.setLocalTransform(r)}}(t,e),dT(t,a,s),i||function(t,e,n){for(var i=0;i<KI.length;i++){var r=KI[i];null!=(o=t.getAttribute(r))&&(e[qI[r]]=o)}for(i=0;i<JI.length;i++){var o;r=JI[i];null!=(o=t.getAttribute(r))&&(n[$I[r]]=o)}}(t,a,s)),o.style=o.style||{},null!=a.fill&&(o.style.fill=sT(o,"fill",a.fill,n)),null!=a.stroke&&(o.style.stroke=sT(o,"stroke",a.stroke,n)),E(["lineWidth","opacity","fillOpacity","strokeOpacity","miterLimit","fontSize"],(function(t){null!=a[t]&&(o.style[t]=parseFloat(a[t]))})),E(["lineDashOffset","lineCap","lineJoin","fontWeight","fontFamily","fontStyle","textAlign"],(function(t){null!=a[t]&&(o.style[t]=a[t])})),r&&(o.__selfStyle=s),a.lineDash&&(o.style.lineDash=z(uT(a.lineDash),(function(t){return parseFloat(t)}))),"hidden"!==a.visibility&&"collapse"!==a.visibility||(o.invisible=!0),"none"===a.display&&(o.ignore=!0)}var aT=/^url\(\s*#(.*?)\)/;function sT(t,e,n,i){var r=n&&n.match(aT);if(!r)return"none"===n&&(n=null),n;var o=ut(r[1]);i.push([t,e,o])}var lT=/-?([0-9]*\.)?[0-9]+([eE]-?[0-9]+)?/g;function uT(t){return t.match(lT)||[]}var hT=/(translate|scale|rotate|skewX|skewY|matrix)\(([\-\s0-9\.eE,]*)\)/g,cT=Math.PI/180;var pT=/([^\s:;]+)\s*:\s*([^:;]+)/g;function dT(t,e,n){var i,r=t.getAttribute("style");if(r)for(pT.lastIndex=0;null!=(i=pT.exec(r));){var o=i[1],a=_t(qI,o)?qI[o]:null;a&&(e[a]=i[2]);var s=_t($I,o)?$I[o]:null;s&&(n[s]=i[2])}}function fT(t,e){var n=e.width/t.width,i=e.height/t.height,r=Math.min(n,i);return{scale:r,x:-(t.x+t.width/2)*r+(e.x+e.width/2),y:-(t.y+t.height/2)*r+(e.y+e.height/2)}}var gT=yt(["rect","circle","line","ellipse","polygon","polyline","path","text","tspan","g"]),yT=function(){function t(t,e){this.type="geoSVG",this._usedGraphicMap=yt(),this._freedGraphics=[],this._mapName=t,this._parsedXML=jI(e)}return t.prototype.load=function(){var t=this._firstGraphic;if(!t){t=this._firstGraphic=this._buildGraphic(this._parsedXML),this._freedGraphics.push(t),this._boundingRect=this._firstGraphic.boundingRect.clone();var e=function(t){var e=[],n=yt();return E(t,(function(t){if(null==t.namedFrom){var i=new k_(t.name,t.el);e.push(i),n.set(t.name,i)}})),{regions:e,regionsMap:n}}(t.named),n=e.regions,i=e.regionsMap;this._regions=n,this._regionsMap=i}return{boundingRect:this._boundingRect,regions:this._regions,regionsMap:this._regionsMap}},t.prototype._buildGraphic=function(t){var e,n,i,r;try{lt(null!=(n=(e=t&&(i=t,r={ignoreViewBox:!0,ignoreRootClip:!0},(new QI).parse(i,r))||{}).root))}catch(t){throw new Error("Invalid svg format\n"+t.message)}var o=new Er;o.add(n),o.isGeoSVGGraphicRoot=!0;var a=e.width,s=e.height,l=e.viewBoxRect,u=this._boundingRect;if(!u){var h=void 0,c=void 0,p=void 0,d=void 0;if(null!=a?(h=0,p=a):l&&(h=l.x,p=l.width),null!=s?(c=0,d=s):l&&(c=l.y,d=l.height),null==h||null==c){var f=n.getBoundingRect();null==h&&(h=f.x,p=f.width),null==c&&(c=f.y,d=f.height)}u=this._boundingRect=new Ee(h,c,p,d)}if(l){var g=fT(l,u);n.scaleX=n.scaleY=g.scale,n.x=g.x,n.y=g.y}o.setClipPath(new Es({shape:u.plain()}));var y=[];return E(e.named,(function(t){var e;null!=gT.get(t.svgNodeTagLower)&&(y.push(t),(e=t.el).silent=!1,e.isGroup&&e.traverse((function(t){t.silent=!1})))})),{root:o,boundingRect:u,named:y}},t.prototype.useGraphic=function(t){var e=this._usedGraphicMap,n=e.get(t);return n||(n=this._freedGraphics.pop()||this._buildGraphic(this._parsedXML),e.set(t,n),n)},t.prototype.freeGraphic=function(t){var e=this._usedGraphicMap,n=e.get(t);n&&(e.removeKey(t),this._freedGraphics.push(n))},t}();for(var vT=[126,25],mT="南海诸岛",xT=[[[0,3.5],[7,11.2],[15,11.9],[30,7],[42,.7],[52,.7],[56,7.7],[59,.7],[64,.7],[64,0],[5,0],[0,3.5]],[[13,16.1],[19,14.7],[16,21.7],[11,23.1],[13,16.1]],[[12,32.2],[14,38.5],[15,38.5],[13,32.2],[12,32.2]],[[16,47.6],[12,53.2],[13,53.2],[18,47.6],[16,47.6]],[[6,64.4],[8,70],[9,70],[8,64.4],[6,64.4]],[[23,82.6],[29,79.8],[30,79.8],[25,82.6],[23,82.6]],[[37,70.7],[43,62.3],[44,62.3],[39,70.7],[37,70.7]],[[48,51.1],[51,45.5],[53,45.5],[50,51.1],[48,51.1]],[[51,35],[51,28.7],[53,28.7],[53,35],[51,35]],[[52,22.4],[55,17.5],[56,17.5],[53,22.4],[52,22.4]],[[58,12.6],[62,7],[63,7],[60,12.6],[58,12.6]],[[0,3.5],[0,93.1],[64,93.1],[64,0],[63,0],[63,92.4],[1,92.4],[1,3.5],[0,3.5]]],_T=0;_T<xT.length;_T++)for(var bT=0;bT<xT[_T].length;bT++)xT[_T][bT][0]/=10.5,xT[_T][bT][1]/=-14,xT[_T][bT][0]+=vT[0],xT[_T][bT][1]+=vT[1];var wT={"南海诸岛":[32,80],"广东":[0,-10],"香港":[10,5],"澳门":[-10,10],"天津":[5,5]};var ST=[[[123.45165252685547,25.73527164402261],[123.49731445312499,25.73527164402261],[123.49731445312499,25.750734064600884],[123.45165252685547,25.750734064600884],[123.45165252685547,25.73527164402261]]];var MT=function(){function t(t,e,n){var i;this.type="geoJSON",this._parsedMap=yt(),this._mapName=t,this._specialAreas=n,this._geoJSON=X(i=e)?"undefined"!=typeof JSON&&JSON.parse?JSON.parse(i):new Function("return ("+i+");")():i}return t.prototype.load=function(t,e){e=e||"name";var n=this._parsedMap.get(e);if(!n){var i=this._parseToRegions(e);n=this._parsedMap.set(e,{regions:i,boundingRect:IT(i)})}var r=yt(),o=[];return E(n.regions,(function(e){var n=e.name;t&&_t(t,n)&&(e=e.cloneShallow(n=t[n])),o.push(e),r.set(n,e)})),{regions:o,boundingRect:n.boundingRect||new Ee(0,0,0,0),regionsMap:r}},t.prototype._parseToRegions=function(t){var e,n=this._mapName,i=this._geoJSON;try{e=i?O_(i,t):[]}catch(t){throw new Error("Invalid geoJson format\n"+t.message)}return function(t,e){if("china"===t){for(var n=0;n<e.length;n++)if(e[n].name===mT)return;e.push(new A_(mT,z(xT,(function(t){return{type:"polygon",exterior:t}})),vT))}}(n,e),E(e,(function(t){var e=t.name;!function(t,e){if("china"===t){var n=wT[e.name];if(n){var i=e.getCenter();i[0]+=n[0]/10.5,i[1]+=-n[1]/14,e.setCenter(i)}}}(n,t),function(t,e){"china"===t&&"台湾"===e.name&&e.geometries.push({type:"polygon",exterior:ST[0]})}(n,t);var i=this._specialAreas&&this._specialAreas[e];i&&t.transformTo(i.left,i.top,i.width,i.height)}),this),e},t.prototype.getMapForUser=function(){return{geoJson:this._geoJSON,geoJSON:this._geoJSON,specialAreas:this._specialAreas}},t}();function IT(t){for(var e,n=0;n<t.length;n++){var i=t[n].getBoundingRect();(e=e||i.clone()).union(i)}return e}var TT=yt(),CT=function(t,e,n){if(e.svg){var i=new yT(t,e.svg);TT.set(t,i)}else{var r=e.geoJson||e.geoJSON;r&&!e.features?n=e.specialAreas:r=e;i=new MT(t,r,n);TT.set(t,i)}},DT=function(t){return TT.get(t)},AT=function(t){var e=TT.get(t);return e&&"geoJSON"===e.type&&e.getMapForUser()},kT=function(t,e,n){var i=TT.get(t);if(i)return i.load(e,n)},LT=["rect","circle","line","ellipse","polygon","polyline","path"],PT=yt(LT),OT=yt(LT.concat(["g"])),RT=yt(LT.concat(["g"])),NT=Po();function ET(t){var e=t.getItemStyle(),n=t.get("areaColor");return null!=n&&(e.fill=n),e}function zT(t){var e=t.style;e&&(e.stroke=e.stroke||e.fill,e.fill=null)}var VT=function(){function t(t){var e=new Er;this.uid=Ic("ec_map_draw"),this._controller=new BI(t.getZr()),this._controllerHost={target:e},this.group=e,e.add(this._regionsGroup=new Er),e.add(this._svgGroup=new Er)}return t.prototype.draw=function(t,e,n,i,r){var o="geo"===t.mainType,a=t.getData&&t.getData();o&&e.eachComponent({mainType:"series",subType:"map"},(function(e){a||e.getHostGeoModel()!==t||(a=e.getData())}));var s=t.coordinateSystem,l=this._regionsGroup,u=this.group,h=s.getTransformInfo(),c=h.raw,p=h.roam;!l.childAt(0)||r?(u.x=p.x,u.y=p.y,u.scaleX=p.scaleX,u.scaleY=p.scaleY,u.dirty()):dh(u,p,t);var d=a&&a.getVisual("visualMeta")&&a.getVisual("visualMeta").length>0,f={api:n,geo:s,mapOrGeoModel:t,data:a,isVisualEncodedByVisualMap:d,isGeo:o,transformInfoRaw:c};"geoJSON"===s.resourceType?this._buildGeoJSON(f):"geoSVG"===s.resourceType&&this._buildSVG(f),this._updateController(t,e,n),this._updateMapSelectHandler(t,l,n,i)},t.prototype._buildGeoJSON=function(t){var e=this._regionsGroupByName=yt(),n=yt(),i=this._regionsGroup,r=t.transformInfoRaw,o=t.mapOrGeoModel,a=t.data,s=t.geo.projection,l=s&&s.stream;function u(t,e){return e&&(t=e(t)),t&&[t[0]*r.scaleX+r.x,t[1]*r.scaleY+r.y]}function h(t){for(var e=[],n=!l&&s&&s.project,i=0;i<t.length;++i){var r=u(t[i],n);r&&e.push(r)}return e}function c(t){return{shape:{points:h(t)}}}i.removeAll(),E(t.geo.regions,(function(r){var h=r.name,p=e.get(h),d=n.get(h)||{},f=d.dataIdx,g=d.regionModel;p||(p=e.set(h,new Er),i.add(p),f=a?a.indexOfName(h):null,g=t.isGeo?o.getRegionModel(h):a?a.getItemModel(f):null,n.set(h,{dataIdx:f,regionModel:g}));var y=[],v=[];E(r.geometries,(function(t){if("polygon"===t.type){var e=[t.exterior].concat(t.interiors||[]);l&&(e=YT(e,l)),E(e,(function(t){y.push(new Gu(c(t)))}))}else{var n=t.points;l&&(n=YT(n,l,!0)),E(n,(function(t){v.push(new Hu(c(t)))}))}}));var m=u(r.getCenter(),s&&s.project);function x(e,n){if(e.length){var i=new Qu({culling:!0,segmentIgnoreThreshold:1,shape:{paths:e}});p.add(i),BT(t,i,f,g),FT(t,i,h,g,o,f,m),n&&(zT(i),E(i.states,zT))}}x(y),x(v,!0)})),e.each((function(e,i){var r=n.get(i),a=r.dataIdx,s=r.regionModel;GT(t,e,i,s,o,a),WT(t,e,i,s,o),HT(t,e,i,s,o)}),this)},t.prototype._buildSVG=function(t){var e=t.geo.map,n=t.transformInfoRaw;this._svgGroup.x=n.x,this._svgGroup.y=n.y,this._svgGroup.scaleX=n.scaleX,this._svgGroup.scaleY=n.scaleY,this._svgResourceChanged(e)&&(this._freeSVG(),this._useSVG(e));var i=this._svgDispatcherMap=yt(),r=!1;E(this._svgGraphicRecord.named,(function(e){var n=e.name,o=t.mapOrGeoModel,a=t.data,s=e.svgNodeTagLower,l=e.el,u=a?a.indexOfName(n):null,h=o.getRegionModel(n);(null!=PT.get(s)&&l instanceof wa&&BT(t,l,u,h),l instanceof wa&&(l.culling=!0),l.z2EmphasisLift=0,e.namedFrom)||(null!=RT.get(s)&&FT(t,l,n,h,o,u,null),GT(t,l,n,h,o,u),WT(t,l,n,h,o),null!=OT.get(s)&&("self"===HT(t,l,n,h,o)&&(r=!0),(i.get(n)||i.set(n,[])).push(l)))}),this),this._enableBlurEntireSVG(r,t)},t.prototype._enableBlurEntireSVG=function(t,e){if(t&&e.isGeo){var n=e.mapOrGeoModel.getModel(["blur","itemStyle"]).getItemStyle().opacity;this._svgGraphicRecord.root.traverse((function(t){if(!t.isGroup){Tl(t);var e=t.ensureState("blur").style||{};null==e.opacity&&null!=n&&(e.opacity=n),t.ensureState("emphasis")}}))}},t.prototype.remove=function(){this._regionsGroup.removeAll(),this._regionsGroupByName=null,this._svgGroup.removeAll(),this._freeSVG(),this._controller.dispose(),this._controllerHost=null},t.prototype.findHighDownDispatchers=function(t,e){if(null==t)return[];var n=e.coordinateSystem;if("geoJSON"===n.resourceType){var i=this._regionsGroupByName;if(i){var r=i.get(t);return r?[r]:[]}}else if("geoSVG"===n.resourceType)return this._svgDispatcherMap&&this._svgDispatcherMap.get(t)||[]},t.prototype._svgResourceChanged=function(t){return this._svgMapName!==t},t.prototype._useSVG=function(t){var e=DT(t);if(e&&"geoSVG"===e.type){var n=e.useGraphic(this.uid);this._svgGroup.add(n.root),this._svgGraphicRecord=n,this._svgMapName=t}},t.prototype._freeSVG=function(){var t=this._svgMapName;if(null!=t){var e=DT(t);e&&"geoSVG"===e.type&&e.freeGraphic(this.uid),this._svgGraphicRecord=null,this._svgDispatcherMap=null,this._svgGroup.removeAll(),this._svgMapName=null}},t.prototype._updateController=function(t,e,n){var i=t.coordinateSystem,r=this._controller,o=this._controllerHost;o.zoomLimit=t.get("scaleLimit"),o.zoom=i.getZoom(),r.enable(t.get("roam")||!1);var a=t.mainType;function s(){var e={type:"geoRoam",componentType:a};return e[a+"Id"]=t.id,e}r.off("pan").on("pan",(function(t){this._mouseDownFlag=!1,HI(o,t.dx,t.dy),n.dispatchAction(A(s(),{dx:t.dx,dy:t.dy,animation:{duration:0}}))}),this),r.off("zoom").on("zoom",(function(t){this._mouseDownFlag=!1,YI(o,t.scale,t.originX,t.originY),n.dispatchAction(A(s(),{zoom:t.scale,originX:t.originX,originY:t.originY,animation:{duration:0}}))}),this),r.setPointerChecker((function(e,r,o){return i.containPoint([r,o])&&!ZI(e,n,t)}))},t.prototype.resetForLabelLayout=function(){this.group.traverse((function(t){var e=t.getTextContent();e&&(e.ignore=NT(e).ignore)}))},t.prototype._updateMapSelectHandler=function(t,e,n,i){var r=this;e.off("mousedown"),e.off("click"),t.get("selectedMode")&&(e.on("mousedown",(function(){r._mouseDownFlag=!0})),e.on("click",(function(t){r._mouseDownFlag&&(r._mouseDownFlag=!1)})))},t}();function BT(t,e,n,i){var r=i.getModel("itemStyle"),o=i.getModel(["emphasis","itemStyle"]),a=i.getModel(["blur","itemStyle"]),s=i.getModel(["select","itemStyle"]),l=ET(r),u=ET(o),h=ET(s),c=ET(a),p=t.data;if(p){var d=p.getItemVisual(n,"style"),f=p.getItemVisual(n,"decal");t.isVisualEncodedByVisualMap&&d.fill&&(l.fill=d.fill),f&&(l.decal=cv(f,t.api))}e.setStyle(l),e.style.strokeNoScale=!0,e.ensureState("emphasis").style=u,e.ensureState("select").style=h,e.ensureState("blur").style=c,Tl(e)}function FT(t,e,n,i,r,o,a){var s=t.data,l=t.isGeo,u=s&&isNaN(s.get(s.mapDimension("value"),o)),h=s&&s.getItemLayout(o);if(l||u||h&&h.showLabel){var c=l?n:o,p=void 0;(!s||o>=0)&&(p=r);var d=a?{normal:{align:"center",verticalAlign:"middle"}}:null;Qh(e,tc(i),{labelFetcher:p,labelDataIndex:c,defaultText:n},d);var f=e.getTextContent();if(f&&(NT(f).ignore=f.ignore,e.textConfig&&a)){var g=e.getBoundingRect().clone();e.textConfig.layoutRect=g,e.textConfig.position=[(a[0]-g.x)/g.width*100+"%",(a[1]-g.y)/g.height*100+"%"]}e.disableLabelAnimation=!0}else e.removeTextContent(),e.removeTextConfig(),e.disableLabelAnimation=null}function GT(t,e,n,i,r,o){t.data?t.data.setItemGraphicEl(o,e):Js(e).eventData={componentType:"geo",componentIndex:r.componentIndex,geoIndex:r.componentIndex,name:n,region:i&&i.option||{}}}function WT(t,e,n,i,r){t.data||Xh({el:e,componentModel:r,itemName:n,itemTooltipOption:i.get("tooltip")})}function HT(t,e,n,i,r){e.highDownSilentOnTouch=!!r.get("selectedMode");var o=i.getModel("emphasis"),a=o.get("focus");return Hl(e,a,o.get("blurScope"),o.get("disabled")),t.isGeo&&function(t,e,n){var i=Js(t);i.componentMainType=e.mainType,i.componentIndex=e.componentIndex,i.componentHighDownName=n}(e,r,n),a}function YT(t,e,n){var i,r=[];function o(){i=[]}function a(){i.length&&(r.push(i),i=[])}var s=e({polygonStart:o,polygonEnd:a,lineStart:o,lineEnd:a,point:function(t,e){isFinite(t)&&isFinite(e)&&i.push([t,e])},sphere:function(){}});return!n&&s.polygonStart(),E(t,(function(t){s.lineStart();for(var e=0;e<t.length;e++)s.point(t[e][0],t[e][1]);s.lineEnd()})),!n&&s.polygonEnd(),r}var UT=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.render=function(t,e,n,i){if(!i||"mapToggleSelect"!==i.type||i.from!==this.uid){var r=this.group;if(r.removeAll(),!t.getHostGeoModel()){if(this._mapDraw&&i&&"geoRoam"===i.type&&this._mapDraw.resetForLabelLayout(),i&&"geoRoam"===i.type&&"series"===i.componentType&&i.seriesId===t.id)(o=this._mapDraw)&&r.add(o.group);else if(t.needsDrawMap){var o=this._mapDraw||new VT(n);r.add(o.group),o.draw(t,e,n,this,i),this._mapDraw=o}else this._mapDraw&&this._mapDraw.remove(),this._mapDraw=null;t.get("showLegendSymbol")&&e.getComponent("legend")&&this._renderSymbols(t,e,n)}}},e.prototype.remove=function(){this._mapDraw&&this._mapDraw.remove(),this._mapDraw=null,this.group.removeAll()},e.prototype.dispose=function(){this._mapDraw&&this._mapDraw.remove(),this._mapDraw=null},e.prototype._renderSymbols=function(t,e,n){var i=t.originalData,r=this.group;i.each(i.mapDimension("value"),(function(e,n){if(!isNaN(e)){var o=i.getItemLayout(n);if(o&&o.point){var a=o.point,s=o.offset,l=new xu({style:{fill:t.getData().getVisual("style").fill},shape:{cx:a[0]+9*s,cy:a[1],r:3},silent:!0,z2:8+(s?0:11)});if(!s){var u=t.mainSeries.getData(),h=i.getName(n),c=u.indexOfName(h),p=i.getItemModel(n),d=p.getModel("label"),f=u.getItemGraphicEl(c);Qh(l,tc(p),{labelFetcher:{getFormattedLabel:function(e,n){return t.getFormattedLabel(c,n)}},defaultText:h}),l.disableLabelAnimation=!0,d.get("position")||l.setTextConfig({position:"bottom"}),f.onHoverStateChange=function(t){Ml(l,t)}}r.add(l)}}}))},e.type="map",e}(Tg),XT=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.needsDrawMap=!1,n.seriesGroup=[],n.getTooltipPosition=function(t){if(null!=t){var e=this.getData().getName(t),n=this.coordinateSystem,i=n.getRegion(e);return i&&n.dataToPoint(i.getCenter())}},n}return n(e,t),e.prototype.getInitialData=function(t){for(var e=vM(this,{coordDimensions:["value"],encodeDefaulter:H($p,this)}),n=yt(),i=[],r=0,o=e.count();r<o;r++){var a=e.getName(r);n.set(a,!0)}return E(kT(this.getMapType(),this.option.nameMap,this.option.nameProperty).regions,(function(t){var e=t.name;n.get(e)||i.push(e)})),e.appendValues([],i),e},e.prototype.getHostGeoModel=function(){var t=this.option.geoIndex;return null!=t?this.ecModel.getComponent("geo",t):null},e.prototype.getMapType=function(){return(this.getHostGeoModel()||this).option.map},e.prototype.getRawValue=function(t){var e=this.getData();return e.get(e.mapDimension("value"),t)},e.prototype.getRegionModel=function(t){var e=this.getData();return e.getItemModel(e.indexOfName(t))},e.prototype.formatTooltip=function(t,e,n){for(var i=this.getData(),r=this.getRawValue(t),o=i.getName(t),a=this.seriesGroup,s=[],l=0;l<a.length;l++){var u=a[l].originalData.indexOfName(o),h=i.mapDimension("value");isNaN(a[l].originalData.get(h,u))||s.push(a[l].name)}return Qf("section",{header:s.join(", "),noHeader:!s.length,blocks:[Qf("nameValue",{name:o,value:r})]})},e.prototype.setZoom=function(t){this.option.zoom=t},e.prototype.setCenter=function(t){this.option.center=t},e.prototype.getLegendIcon=function(t){var e=t.icon||"roundRect",n=Vy(e,0,0,t.itemWidth,t.itemHeight,t.itemStyle.fill);return n.setStyle(t.itemStyle),n.style.stroke="none",e.indexOf("empty")>-1&&(n.style.stroke=n.style.fill,n.style.fill="#fff",n.style.lineWidth=2),n},e.type="series.map",e.dependencies=["geo"],e.layoutMode="box",e.defaultOption={z:2,coordinateSystem:"geo",map:"",left:"center",top:"center",aspectScale:null,showLegendSymbol:!0,boundingCoords:null,center:null,zoom:1,scaleLimit:null,selectedMode:!0,label:{show:!1,color:"#000"},itemStyle:{borderWidth:.5,borderColor:"#444",areaColor:"#eee"},emphasis:{label:{show:!0,color:"rgb(100,0,0)"},itemStyle:{areaColor:"rgba(255,215,0,0.8)"}},select:{label:{show:!0,color:"rgb(100,0,0)"},itemStyle:{color:"rgba(255,215,0,0.8)"}},nameProperty:"name"},e}(fg);function ZT(t){var e={};t.eachSeriesByType("map",(function(t){var n=t.getHostGeoModel(),i=n?"o"+n.id:"i"+t.getMapType();(e[i]=e[i]||[]).push(t)})),E(e,(function(t,e){for(var n,i,r,o=(n=z(t,(function(t){return t.getData()})),i=t[0].get("mapValueCalculation"),r={},E(n,(function(t){t.each(t.mapDimension("value"),(function(e,n){var i="ec-"+t.getName(n);r[i]=r[i]||[],isNaN(e)||r[i].push(e)}))})),n[0].map(n[0].mapDimension("value"),(function(t,e){for(var o="ec-"+n[0].getName(e),a=0,s=1/0,l=-1/0,u=r[o].length,h=0;h<u;h++)s=Math.min(s,r[o][h]),l=Math.max(l,r[o][h]),a+=r[o][h];return 0===u?NaN:"min"===i?s:"max"===i?l:"average"===i?a/u:a}))),a=0;a<t.length;a++)t[a].originalData=t[a].getData();for(a=0;a<t.length;a++)t[a].seriesGroup=t,t[a].needsDrawMap=0===a&&!t[a].getHostGeoModel(),t[a].setData(o.cloneShallow()),t[a].mainSeries=t[0]}))}function jT(t){var e={};t.eachSeriesByType("map",(function(n){var i=n.getMapType();if(!n.getHostGeoModel()&&!e[i]){var r={};E(n.seriesGroup,(function(e){var n=e.coordinateSystem,i=e.originalData;e.get("showLegendSymbol")&&t.getComponent("legend")&&i.each(i.mapDimension("value"),(function(t,e){var o=i.getName(e),a=n.getRegion(o);if(a&&!isNaN(t)){var s=r[o]||0,l=n.dataToPoint(a.getCenter());r[o]=s+1,i.setItemLayout(e,{point:l,offset:s})}}))}));var o=n.getData();o.each((function(t){var e=o.getName(t),n=o.getItemLayout(t)||{};n.showLabel=!r[e],o.setItemLayout(t,n)})),e[i]=!0}}))}var qT=Wt,KT=function(t){function e(e){var n=t.call(this)||this;return n.type="view",n.dimensions=["x","y"],n._roamTransformable=new fr,n._rawTransformable=new fr,n.name=e,n}return n(e,t),e.prototype.setBoundingRect=function(t,e,n,i){return this._rect=new Ee(t,e,n,i),this._rect},e.prototype.getBoundingRect=function(){return this._rect},e.prototype.setViewRect=function(t,e,n,i){this._transformTo(t,e,n,i),this._viewRect=new Ee(t,e,n,i)},e.prototype._transformTo=function(t,e,n,i){var r=this.getBoundingRect(),o=this._rawTransformable;o.transform=r.calculateTransform(new Ee(t,e,n,i));var a=o.parent;o.parent=null,o.decomposeTransform(),o.parent=a,this._updateTransform()},e.prototype.setCenter=function(t,e){t&&(this._center=[Ur(t[0],e.getWidth()),Ur(t[1],e.getHeight())],this._updateCenterAndZoom())},e.prototype.setZoom=function(t){t=t||1;var e=this.zoomLimit;e&&(null!=e.max&&(t=Math.min(e.max,t)),null!=e.min&&(t=Math.max(e.min,t))),this._zoom=t,this._updateCenterAndZoom()},e.prototype.getDefaultCenter=function(){var t=this.getBoundingRect();return[t.x+t.width/2,t.y+t.height/2]},e.prototype.getCenter=function(){return this._center||this.getDefaultCenter()},e.prototype.getZoom=function(){return this._zoom||1},e.prototype.getRoamTransform=function(){return this._roamTransformable.getLocalTransform()},e.prototype._updateCenterAndZoom=function(){var t=this._rawTransformable.getLocalTransform(),e=this._roamTransformable,n=this.getDefaultCenter(),i=this.getCenter(),r=this.getZoom();i=Wt([],i,t),n=Wt([],n,t),e.originX=i[0],e.originY=i[1],e.x=n[0]-i[0],e.y=n[1]-i[1],e.scaleX=e.scaleY=r,this._updateTransform()},e.prototype._updateTransform=function(){var t=this._roamTransformable,e=this._rawTransformable;e.parent=t,t.updateTransform(),e.updateTransform(),xe(this.transform||(this.transform=[]),e.transform||[1,0,0,1,0,0]),this._rawTransform=e.getLocalTransform(),this.invTransform=this.invTransform||[],Me(this.invTransform,this.transform),this.decomposeTransform()},e.prototype.getTransformInfo=function(){var t=this._rawTransformable,e=this._roamTransformable,n=new fr;return n.transform=e.transform,n.decomposeTransform(),{roam:{x:n.x,y:n.y,scaleX:n.scaleX,scaleY:n.scaleY},raw:{x:t.x,y:t.y,scaleX:t.scaleX,scaleY:t.scaleY}}},e.prototype.getViewRect=function(){return this._viewRect},e.prototype.getViewRectAfterRoam=function(){var t=this.getBoundingRect().clone();return t.applyTransform(this.transform),t},e.prototype.dataToPoint=function(t,e,n){var i=e?this._rawTransform:this.transform;return n=n||[],i?qT(n,t,i):It(n,t)},e.prototype.pointToData=function(t){var e=this.invTransform;return e?qT([],t,e):[t[0],t[1]]},e.prototype.convertToPixel=function(t,e,n){var i=$T(e);return i===this?i.dataToPoint(n):null},e.prototype.convertFromPixel=function(t,e,n){var i=$T(e);return i===this?i.pointToData(n):null},e.prototype.containPoint=function(t){return this.getViewRectAfterRoam().contain(t[0],t[1])},e.dimensions=["x","y"],e}(fr);function $T(t){var e=t.seriesModel;return e?e.coordinateSystem:null}var JT={geoJSON:{aspectScale:.75,invertLongitute:!0},geoSVG:{aspectScale:1,invertLongitute:!1}},QT=["lng","lat"],tC=function(t){function e(e,n,i){var r=t.call(this,e)||this;r.dimensions=QT,r.type="geo",r._nameCoordMap=yt(),r.map=n;var o,a=i.projection,s=kT(n,i.nameMap,i.nameProperty),l=DT(n),u=(r.resourceType=l?l.type:null,r.regions=s.regions),h=JT[l.type];if(r._regionsMap=s.regionsMap,r.regions=s.regions,r.projection=a,a)for(var c=0;c<u.length;c++){var p=u[c].getBoundingRect(a);(o=o||p.clone()).union(p)}else o=s.boundingRect;return r.setBoundingRect(o.x,o.y,o.width,o.height),r.aspectScale=a?1:rt(i.aspectScale,h.aspectScale),r._invertLongitute=!a&&h.invertLongitute,r}return n(e,t),e.prototype._transformTo=function(t,e,n,i){var r=this.getBoundingRect(),o=this._invertLongitute;r=r.clone(),o&&(r.y=-r.y-r.height);var a=this._rawTransformable;a.transform=r.calculateTransform(new Ee(t,e,n,i));var s=a.parent;a.parent=null,a.decomposeTransform(),a.parent=s,o&&(a.scaleY=-a.scaleY),this._updateTransform()},e.prototype.getRegion=function(t){return this._regionsMap.get(t)},e.prototype.getRegionByCoord=function(t){for(var e=this.regions,n=0;n<e.length;n++){var i=e[n];if("geoJSON"===i.type&&i.contain(t))return e[n]}},e.prototype.addGeoCoord=function(t,e){this._nameCoordMap.set(t,e)},e.prototype.getGeoCoord=function(t){var e=this._regionsMap.get(t);return this._nameCoordMap.get(t)||e&&e.getCenter()},e.prototype.dataToPoint=function(t,e,n){if(X(t)&&(t=this.getGeoCoord(t)),t){var i=this.projection;return i&&(t=i.project(t)),t&&this.projectedToPoint(t,e,n)}},e.prototype.pointToData=function(t){var e=this.projection;return e&&(t=e.unproject(t)),t&&this.pointToProjected(t)},e.prototype.pointToProjected=function(e){return t.prototype.pointToData.call(this,e)},e.prototype.projectedToPoint=function(e,n,i){return t.prototype.dataToPoint.call(this,e,n,i)},e.prototype.convertToPixel=function(t,e,n){var i=eC(e);return i===this?i.dataToPoint(n):null},e.prototype.convertFromPixel=function(t,e,n){var i=eC(e);return i===this?i.pointToData(n):null},e}(KT);function eC(t){var e=t.geoModel,n=t.seriesModel;return e?e.coordinateSystem:n?n.coordinateSystem||(n.getReferringComponents("geo",Eo).models[0]||{}).coordinateSystem:null}function nC(t,e){var n=t.get("boundingCoords");if(null!=n){var i=n[0],r=n[1];if(isFinite(i[0])&&isFinite(i[1])&&isFinite(r[0])&&isFinite(r[1])){var o=this.projection;if(o){var a=i[0],s=i[1],l=r[0],u=r[1];i=[1/0,1/0],r=[-1/0,-1/0];var h=function(t,e,n,a){for(var s=n-t,l=a-e,u=0;u<=100;u++){var h=u/100,c=o.project([t+s*h,e+l*h]);Ht(i,i,c),Yt(r,r,c)}};h(a,s,l,s),h(l,s,l,u),h(l,u,a,u),h(a,u,l,s)}this.setBoundingRect(i[0],i[1],r[0]-i[0],r[1]-i[1])}else 0}var c,p,d,f=this.getBoundingRect(),g=t.get("layoutCenter"),y=t.get("layoutSize"),v=e.getWidth(),m=e.getHeight(),x=f.width/f.height*this.aspectScale,_=!1;if(g&&y&&(c=[Ur(g[0],v),Ur(g[1],m)],p=Ur(y,Math.min(v,m)),isNaN(c[0])||isNaN(c[1])||isNaN(p)||(_=!0)),_)d={},x>1?(d.width=p,d.height=p/x):(d.height=p,d.width=p*x),d.y=c[1]-d.height/2,d.x=c[0]-d.width/2;else{var b=t.getBoxLayoutParams();b.aspect=x,d=Tp(b,{width:v,height:m})}this.setViewRect(d.x,d.y,d.width,d.height),this.setCenter(t.get("center"),e),this.setZoom(t.get("zoom"))}R(tC,KT);var iC=function(){function t(){this.dimensions=QT}return t.prototype.create=function(t,e){var n=[];function i(t){return{nameProperty:t.get("nameProperty"),aspectScale:t.get("aspectScale"),projection:t.get("projection")}}t.eachComponent("geo",(function(t,r){var o=t.get("map"),a=new tC(o+r,o,A({nameMap:t.get("nameMap")},i(t)));a.zoomLimit=t.get("scaleLimit"),n.push(a),t.coordinateSystem=a,a.model=t,a.resize=nC,a.resize(t,e)})),t.eachSeries((function(t){if("geo"===t.get("coordinateSystem")){var e=t.get("geoIndex")||0;t.coordinateSystem=n[e]}}));var r={};return t.eachSeriesByType("map",(function(t){if(!t.getHostGeoModel()){var e=t.getMapType();r[e]=r[e]||[],r[e].push(t)}})),E(r,(function(t,r){var o=z(t,(function(t){return t.get("nameMap")})),a=new tC(r,r,A({nameMap:D(o)},i(t[0])));a.zoomLimit=it.apply(null,z(t,(function(t){return t.get("scaleLimit")}))),n.push(a),a.resize=nC,a.resize(t[0],e),E(t,(function(t){t.coordinateSystem=a,function(t,e){E(e.get("geoCoord"),(function(e,n){t.addGeoCoord(n,e)}))}(a,t)}))})),n},t.prototype.getFilledRegions=function(t,e,n,i){for(var r=(t||[]).slice(),o=yt(),a=0;a<r.length;a++)o.set(r[a].name,r[a]);return E(kT(e,n,i).regions,(function(t){var e=t.name;!o.get(e)&&r.push({name:e})})),r},t}(),rC=new iC,oC=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.init=function(t,e,n){var i=DT(t.map);if(i&&"geoJSON"===i.type){var r=t.itemStyle=t.itemStyle||{};"color"in r||(r.color="#eee")}this.mergeDefaultAndTheme(t,n),bo(t,"label",["show"])},e.prototype.optionUpdated=function(){var t=this,e=this.option;e.regions=rC.getFilledRegions(e.regions,e.map,e.nameMap,e.nameProperty);var n={};this._optionModelMap=V(e.regions||[],(function(e,i){var r=i.name;return r&&(e.set(r,new Sc(i,t,t.ecModel)),i.selected&&(n[r]=!0)),e}),yt()),e.selectedMap||(e.selectedMap=n)},e.prototype.getRegionModel=function(t){return this._optionModelMap.get(t)||new Sc(null,this,this.ecModel)},e.prototype.getFormattedLabel=function(t,e){var n=this.getRegionModel(t),i="normal"===e?n.get(["label","formatter"]):n.get(["emphasis","label","formatter"]),r={name:t};return U(i)?(r.status=e,i(r)):X(i)?i.replace("{a}",null!=t?t:""):void 0},e.prototype.setZoom=function(t){this.option.zoom=t},e.prototype.setCenter=function(t){this.option.center=t},e.prototype.select=function(t){var e=this.option,n=e.selectedMode;n&&("multiple"!==n&&(e.selectedMap=null),(e.selectedMap||(e.selectedMap={}))[t]=!0)},e.prototype.unSelect=function(t){var e=this.option.selectedMap;e&&(e[t]=!1)},e.prototype.toggleSelected=function(t){this[this.isSelected(t)?"unSelect":"select"](t)},e.prototype.isSelected=function(t){var e=this.option.selectedMap;return!(!e||!e[t])},e.type="geo",e.layoutMode="box",e.defaultOption={z:0,show:!0,left:"center",top:"center",aspectScale:null,silent:!1,map:"",boundingCoords:null,center:null,zoom:1,scaleLimit:null,label:{show:!1,color:"#000"},itemStyle:{borderWidth:.5,borderColor:"#444"},emphasis:{label:{show:!0,color:"rgb(100,0,0)"},itemStyle:{color:"rgba(255,215,0,0.8)"}},select:{label:{show:!0,color:"rgb(100,0,0)"},itemStyle:{color:"rgba(255,215,0,0.8)"}},regions:[]},e}(Op);function aC(t,e){return t.pointToProjected?t.pointToProjected(e):t.pointToData(e)}function sC(t,e,n,i){var r=t.getZoom(),o=t.getCenter(),a=e.zoom,s=t.projectedToPoint?t.projectedToPoint(o):t.dataToPoint(o);if(null!=e.dx&&null!=e.dy&&(s[0]-=e.dx,s[1]-=e.dy,t.setCenter(aC(t,s),i)),null!=a){if(n){var l=n.min||0,u=n.max||1/0;a=Math.max(Math.min(r*a,u),l)/r}t.scaleX*=a,t.scaleY*=a;var h=(e.originX-t.x)*(a-1),c=(e.originY-t.y)*(a-1);t.x-=h,t.y-=c,t.updateTransform(),t.setCenter(aC(t,s),i),t.setZoom(a*r)}return{center:t.getCenter(),zoom:t.getZoom()}}var lC=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.focusBlurEnabled=!0,n}return n(e,t),e.prototype.init=function(t,e){this._api=e},e.prototype.render=function(t,e,n,i){if(this._model=t,!t.get("show"))return this._mapDraw&&this._mapDraw.remove(),void(this._mapDraw=null);this._mapDraw||(this._mapDraw=new VT(n));var r=this._mapDraw;r.draw(t,e,n,this,i),r.group.on("click",this._handleRegionClick,this),r.group.silent=t.get("silent"),this.group.add(r.group),this.updateSelectStatus(t,e,n)},e.prototype._handleRegionClick=function(t){var e;Ty(t.target,(function(t){return null!=(e=Js(t).eventData)}),!0),e&&this._api.dispatchAction({type:"geoToggleSelect",geoId:this._model.id,name:e.name})},e.prototype.updateSelectStatus=function(t,e,n){var i=this;this._mapDraw.group.traverse((function(t){var e=Js(t).eventData;if(e)return i._model.isSelected(e.name)?n.enterSelect(t):n.leaveSelect(t),!0}))},e.prototype.findHighDownDispatchers=function(t){return this._mapDraw&&this._mapDraw.findHighDownDispatchers(t,this._model)},e.prototype.dispose=function(){this._mapDraw&&this._mapDraw.remove()},e.type="geo",e}(wg);function uC(t,e,n){CT(t,e,n)}function hC(t){function e(e,n){n.update="geo:updateSelectStatus",t.registerAction(n,(function(t,n){var i={},r=[];return n.eachComponent({mainType:"geo",query:t},(function(n){n[e](t.name),E(n.coordinateSystem.regions,(function(t){i[t.name]=n.isSelected(t.name)||!1}));var o=[];E(i,(function(t,e){i[e]&&o.push(e)})),r.push({geoIndex:n.componentIndex,name:o})})),{selected:i,allSelected:r,name:t.name}}))}t.registerCoordinateSystem("geo",rC),t.registerComponentModel(oC),t.registerComponentView(lC),t.registerImpl("registerMap",uC),t.registerImpl("getMap",(function(t){return AT(t)})),e("toggleSelected",{type:"geoToggleSelect",event:"geoselectchanged"}),e("select",{type:"geoSelect",event:"geoselected"}),e("unSelect",{type:"geoUnSelect",event:"geounselected"}),t.registerAction({type:"geoRoam",event:"geoRoam",update:"updateTransform"},(function(t,e,n){var i=t.componentType||"series";e.eachComponent({mainType:i,query:t},(function(e){var r=e.coordinateSystem;if("geo"===r.type){var o=sC(r,t,e.get("scaleLimit"),n);e.setCenter&&e.setCenter(o.center),e.setZoom&&e.setZoom(o.zoom),"series"===i&&E(e.seriesGroup,(function(t){t.setCenter(o.center),t.setZoom(o.zoom)}))}}))}))}function cC(t,e){var n=t.isExpand?t.children:[],i=t.parentNode.children,r=t.hierNode.i?i[t.hierNode.i-1]:null;if(n.length){!function(t){var e=t.children,n=e.length,i=0,r=0;for(;--n>=0;){var o=e[n];o.hierNode.prelim+=i,o.hierNode.modifier+=i,r+=o.hierNode.change,i+=o.hierNode.shift+r}}(t);var o=(n[0].hierNode.prelim+n[n.length-1].hierNode.prelim)/2;r?(t.hierNode.prelim=r.hierNode.prelim+e(t,r),t.hierNode.modifier=t.hierNode.prelim-o):t.hierNode.prelim=o}else r&&(t.hierNode.prelim=r.hierNode.prelim+e(t,r));t.parentNode.hierNode.defaultAncestor=function(t,e,n,i){if(e){for(var r=t,o=t,a=o.parentNode.children[0],s=e,l=r.hierNode.modifier,u=o.hierNode.modifier,h=a.hierNode.modifier,c=s.hierNode.modifier;s=gC(s),o=yC(o),s&&o;){r=gC(r),a=yC(a),r.hierNode.ancestor=t;var p=s.hierNode.prelim+c-o.hierNode.prelim-u+i(s,o);p>0&&(mC(vC(s,t,n),t,p),u+=p,l+=p),c+=s.hierNode.modifier,u+=o.hierNode.modifier,l+=r.hierNode.modifier,h+=a.hierNode.modifier}s&&!gC(r)&&(r.hierNode.thread=s,r.hierNode.modifier+=c-l),o&&!yC(a)&&(a.hierNode.thread=o,a.hierNode.modifier+=u-h,n=t)}return n}(t,r,t.parentNode.hierNode.defaultAncestor||i[0],e)}function pC(t){var e=t.hierNode.prelim+t.parentNode.hierNode.modifier;t.setLayout({x:e},!0),t.hierNode.modifier+=t.parentNode.hierNode.modifier}function dC(t){return arguments.length?t:xC}function fC(t,e){return t-=Math.PI/2,{x:e*Math.cos(t),y:e*Math.sin(t)}}function gC(t){var e=t.children;return e.length&&t.isExpand?e[e.length-1]:t.hierNode.thread}function yC(t){var e=t.children;return e.length&&t.isExpand?e[0]:t.hierNode.thread}function vC(t,e,n){return t.hierNode.ancestor.parentNode===e.parentNode?t.hierNode.ancestor:n}function mC(t,e,n){var i=n/(e.hierNode.i-t.hierNode.i);e.hierNode.change-=i,e.hierNode.shift+=n,e.hierNode.modifier+=n,e.hierNode.prelim+=n,t.hierNode.change+=i}function xC(t,e){return t.parentNode===e.parentNode?1:2}var _C=function(){this.parentPoint=[],this.childPoints=[]},bC=function(t){function e(e){return t.call(this,e)||this}return n(e,t),e.prototype.getDefaultStyle=function(){return{stroke:"#000",fill:null}},e.prototype.getDefaultShape=function(){return new _C},e.prototype.buildPath=function(t,e){var n=e.childPoints,i=n.length,r=e.parentPoint,o=n[0],a=n[i-1];if(1===i)return t.moveTo(r[0],r[1]),void t.lineTo(o[0],o[1]);var s=e.orient,l="TB"===s||"BT"===s?0:1,u=1-l,h=Ur(e.forkPosition,1),c=[];c[l]=r[l],c[u]=r[u]+(a[u]-r[u])*h,t.moveTo(r[0],r[1]),t.lineTo(c[0],c[1]),t.moveTo(o[0],o[1]),c[l]=o[l],t.lineTo(c[0],c[1]),c[l]=a[l],t.lineTo(c[0],c[1]),t.lineTo(a[0],a[1]);for(var p=1;p<i-1;p++){var d=n[p];t.moveTo(d[0],d[1]),c[l]=d[l],t.lineTo(c[0],c[1])}},e}(Ms),wC=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n._mainGroup=new Er,n}return n(e,t),e.prototype.init=function(t,e){this._controller=new BI(e.getZr()),this._controllerHost={target:this.group},this.group.add(this._mainGroup)},e.prototype.render=function(t,e,n){var i=t.getData(),r=t.layoutInfo,o=this._mainGroup;"radial"===t.get("layout")?(o.x=r.x+r.width/2,o.y=r.y+r.height/2):(o.x=r.x,o.y=r.y),this._updateViewCoordSys(t,n),this._updateController(t,e,n);var a=this._data;i.diff(a).add((function(e){SC(i,e)&&MC(i,e,null,o,t)})).update((function(e,n){var r=a.getItemGraphicEl(n);SC(i,e)?MC(i,e,r,o,t):r&&CC(a,n,r,o,t)})).remove((function(e){var n=a.getItemGraphicEl(e);n&&CC(a,e,n,o,t)})).execute(),this._nodeScaleRatio=t.get("nodeScaleRatio"),this._updateNodeAndLinkScale(t),!0===t.get("expandAndCollapse")&&i.eachItemGraphicEl((function(e,i){e.off("click").on("click",(function(){n.dispatchAction({type:"treeExpandAndCollapse",seriesId:t.id,dataIndex:i})}))})),this._data=i},e.prototype._updateViewCoordSys=function(t,e){var n=t.getData(),i=[];n.each((function(t){var e=n.getItemLayout(t);!e||isNaN(e.x)||isNaN(e.y)||i.push([+e.x,+e.y])}));var r=[],o=[];Oa(i,r,o);var a=this._min,s=this._max;o[0]-r[0]==0&&(r[0]=a?a[0]:r[0]-1,o[0]=s?s[0]:o[0]+1),o[1]-r[1]==0&&(r[1]=a?a[1]:r[1]-1,o[1]=s?s[1]:o[1]+1);var l=t.coordinateSystem=new KT;l.zoomLimit=t.get("scaleLimit"),l.setBoundingRect(r[0],r[1],o[0]-r[0],o[1]-r[1]),l.setCenter(t.get("center"),e),l.setZoom(t.get("zoom")),this.group.attr({x:l.x,y:l.y,scaleX:l.scaleX,scaleY:l.scaleY}),this._min=r,this._max=o},e.prototype._updateController=function(t,e,n){var i=this,r=this._controller,o=this._controllerHost,a=this.group;r.setPointerChecker((function(e,i,r){var o=a.getBoundingRect();return o.applyTransform(a.transform),o.contain(i,r)&&!ZI(e,n,t)})),r.enable(t.get("roam")),o.zoomLimit=t.get("scaleLimit"),o.zoom=t.coordinateSystem.getZoom(),r.off("pan").off("zoom").on("pan",(function(e){HI(o,e.dx,e.dy),n.dispatchAction({seriesId:t.id,type:"treeRoam",dx:e.dx,dy:e.dy})})).on("zoom",(function(e){YI(o,e.scale,e.originX,e.originY),n.dispatchAction({seriesId:t.id,type:"treeRoam",zoom:e.scale,originX:e.originX,originY:e.originY}),i._updateNodeAndLinkScale(t),n.updateLabelLayout()}))},e.prototype._updateNodeAndLinkScale=function(t){var e=t.getData(),n=this._getNodeGlobalScale(t);e.eachItemGraphicEl((function(t,e){t.setSymbolScale(n)}))},e.prototype._getNodeGlobalScale=function(t){var e=t.coordinateSystem;if("view"!==e.type)return 1;var n=this._nodeScaleRatio,i=e.scaleX||1;return((e.getZoom()-1)*n+1)/i},e.prototype.dispose=function(){this._controller&&this._controller.dispose(),this._controllerHost=null},e.prototype.remove=function(){this._mainGroup.removeAll(),this._data=null},e.type="tree",e}(Tg);function SC(t,e){var n=t.getItemLayout(e);return n&&!isNaN(n.x)&&!isNaN(n.y)}function MC(t,e,n,i,r){var o=!n,a=t.tree.getNodeByDataIndex(e),s=a.getModel(),l=a.getVisual("style").fill,u=!1===a.isExpand&&0!==a.children.length?l:"#fff",h=t.tree.root,c=a.parentNode===h?a:a.parentNode||a,p=t.getItemGraphicEl(c.dataIndex),d=c.getLayout(),f=p?{x:p.__oldX,y:p.__oldY,rawX:p.__radialOldRawX,rawY:p.__radialOldRawY}:d,g=a.getLayout();o?((n=new Jw(t,e,null,{symbolInnerColor:u,useNameLabel:!0})).x=f.x,n.y=f.y):n.updateData(t,e,null,{symbolInnerColor:u,useNameLabel:!0}),n.__radialOldRawX=n.__radialRawX,n.__radialOldRawY=n.__radialRawY,n.__radialRawX=g.rawX,n.__radialRawY=g.rawY,i.add(n),t.setItemGraphicEl(e,n),n.__oldX=n.x,n.__oldY=n.y,dh(n,{x:g.x,y:g.y},r);var y=n.getSymbolPath();if("radial"===r.get("layout")){var v=h.children[0],m=v.getLayout(),x=v.children.length,_=void 0,b=void 0;if(g.x===m.x&&!0===a.isExpand&&v.children.length){var w={x:(v.children[0].getLayout().x+v.children[x-1].getLayout().x)/2,y:(v.children[0].getLayout().y+v.children[x-1].getLayout().y)/2};(_=Math.atan2(w.y-m.y,w.x-m.x))<0&&(_=2*Math.PI+_),(b=w.x<m.x)&&(_-=Math.PI)}else(_=Math.atan2(g.y-m.y,g.x-m.x))<0&&(_=2*Math.PI+_),0===a.children.length||0!==a.children.length&&!1===a.isExpand?(b=g.x<m.x)&&(_-=Math.PI):(b=g.x>m.x)||(_-=Math.PI);var S=b?"left":"right",M=s.getModel("label"),I=M.get("rotate"),T=I*(Math.PI/180),C=y.getTextContent();C&&(y.setTextConfig({position:M.get("position")||S,rotation:null==I?-_:T,origin:"center"}),C.setStyle("verticalAlign","middle"))}var D=s.get(["emphasis","focus"]),A="relative"===D?vt(a.getAncestorsIndices(),a.getDescendantIndices()):"ancestor"===D?a.getAncestorsIndices():"descendant"===D?a.getDescendantIndices():null;A&&(Js(n).focus=A),function(t,e,n,i,r,o,a,s){var l=e.getModel(),u=t.get("edgeShape"),h=t.get("layout"),c=t.getOrient(),p=t.get(["lineStyle","curveness"]),d=t.get("edgeForkPosition"),f=l.getModel("lineStyle").getLineStyle(),g=i.__edge;if("curve"===u)e.parentNode&&e.parentNode!==n&&(g||(g=i.__edge=new Ku({shape:DC(h,c,p,r,r)})),dh(g,{shape:DC(h,c,p,o,a)},t));else if("polyline"===u)if("orthogonal"===h){if(e!==n&&e.children&&0!==e.children.length&&!0===e.isExpand){for(var y=e.children,v=[],m=0;m<y.length;m++){var x=y[m].getLayout();v.push([x.x,x.y])}g||(g=i.__edge=new bC({shape:{parentPoint:[a.x,a.y],childPoints:[[a.x,a.y]],orient:c,forkPosition:d}})),dh(g,{shape:{parentPoint:[a.x,a.y],childPoints:v}},t)}}else 0;g&&("polyline"!==u||e.isExpand)&&(g.useStyle(k({strokeNoScale:!0,fill:null},f)),Zl(g,l,"lineStyle"),Tl(g),s.add(g))}(r,a,h,n,f,d,g,i),n.__edge&&(n.onHoverStateChange=function(e){if("blur"!==e){var i=a.parentNode&&t.getItemGraphicEl(a.parentNode.dataIndex);i&&1===i.hoverState||Ml(n.__edge,e)}})}function IC(t,e,n,i,r){var o=TC(e.tree.root,t),a=o.source,s=o.sourceLayout,l=e.getItemGraphicEl(t.dataIndex);if(l){var u=e.getItemGraphicEl(a.dataIndex).__edge,h=l.__edge||(!1===a.isExpand||1===a.children.length?u:void 0),c=i.get("edgeShape"),p=i.get("layout"),d=i.get("orient"),f=i.get(["lineStyle","curveness"]);h&&("curve"===c?yh(h,{shape:DC(p,d,f,s,s),style:{opacity:0}},i,{cb:function(){n.remove(h)},removeOpt:r}):"polyline"===c&&"orthogonal"===i.get("layout")&&yh(h,{shape:{parentPoint:[s.x,s.y],childPoints:[[s.x,s.y]]},style:{opacity:0}},i,{cb:function(){n.remove(h)},removeOpt:r}))}}function TC(t,e){for(var n,i=e.parentNode===t?e:e.parentNode||e;null==(n=i.getLayout());)i=i.parentNode===t?i:i.parentNode||i;return{source:i,sourceLayout:n}}function CC(t,e,n,i,r){var o=t.tree.getNodeByDataIndex(e),a=TC(t.tree.root,o).sourceLayout,s={duration:r.get("animationDurationUpdate"),easing:r.get("animationEasingUpdate")};yh(n,{x:a.x+1,y:a.y+1},r,{cb:function(){i.remove(n),t.setItemGraphicEl(e,null)},removeOpt:s}),n.fadeOut(null,t.hostModel,{fadeLabel:!0,animation:s}),o.children.forEach((function(e){IC(e,t,i,r,s)})),IC(o,t,i,r,s)}function DC(t,e,n,i,r){var o,a,s,l,u,h,c,p;if("radial"===t){u=i.rawX,c=i.rawY,h=r.rawX,p=r.rawY;var d=fC(u,c),f=fC(u,c+(p-c)*n),g=fC(h,p+(c-p)*n),y=fC(h,p);return{x1:d.x||0,y1:d.y||0,x2:y.x||0,y2:y.y||0,cpx1:f.x||0,cpy1:f.y||0,cpx2:g.x||0,cpy2:g.y||0}}return u=i.x,c=i.y,h=r.x,p=r.y,"LR"!==e&&"RL"!==e||(o=u+(h-u)*n,a=c,s=h+(u-h)*n,l=p),"TB"!==e&&"BT"!==e||(o=u,a=c+(p-c)*n,s=h,l=p+(c-p)*n),{x1:u,y1:c,x2:h,y2:p,cpx1:o,cpy1:a,cpx2:s,cpy2:l}}var AC=Po();function kC(t){var e=t.mainData,n=t.datas;n||(n={main:e},t.datasAttr={main:"data"}),t.datas=t.mainData=null,EC(e,n,t),E(n,(function(n){E(e.TRANSFERABLE_METHODS,(function(e){n.wrapMethod(e,H(LC,t))}))})),e.wrapMethod("cloneShallow",H(OC,t)),E(e.CHANGABLE_METHODS,(function(n){e.wrapMethod(n,H(PC,t))})),lt(n[e.dataType]===e)}function LC(t,e){if(AC(i=this).mainData===i){var n=A({},AC(this).datas);n[this.dataType]=e,EC(e,n,t)}else zC(e,this.dataType,AC(this).mainData,t);var i;return e}function PC(t,e){return t.struct&&t.struct.update(),e}function OC(t,e){return E(AC(e).datas,(function(n,i){n!==e&&zC(n.cloneShallow(),i,e,t)})),e}function RC(t){var e=AC(this).mainData;return null==t||null==e?e:AC(e).datas[t]}function NC(){var t=AC(this).mainData;return null==t?[{data:t}]:z(G(AC(t).datas),(function(e){return{type:e,data:AC(t).datas[e]}}))}function EC(t,e,n){AC(t).datas={},E(e,(function(e,i){zC(e,i,t,n)}))}function zC(t,e,n,i){AC(n).datas[e]=t,AC(t).mainData=n,t.dataType=e,i.struct&&(t[i.structAttr]=i.struct,i.struct[i.datasAttr[e]]=t),t.getLinkedData=RC,t.getLinkedDataAll=NC}var VC=function(){function t(t,e){this.depth=0,this.height=0,this.dataIndex=-1,this.children=[],this.viewChildren=[],this.isExpand=!1,this.name=t||"",this.hostTree=e}return t.prototype.isRemoved=function(){return this.dataIndex<0},t.prototype.eachNode=function(t,e,n){U(t)&&(n=e,e=t,t=null),X(t=t||{})&&(t={order:t});var i,r=t.order||"preorder",o=this[t.attr||"children"];"preorder"===r&&(i=e.call(n,this));for(var a=0;!i&&a<o.length;a++)o[a].eachNode(t,e,n);"postorder"===r&&e.call(n,this)},t.prototype.updateDepthAndHeight=function(t){var e=0;this.depth=t;for(var n=0;n<this.children.length;n++){var i=this.children[n];i.updateDepthAndHeight(t+1),i.height>e&&(e=i.height)}this.height=e+1},t.prototype.getNodeById=function(t){if(this.getId()===t)return this;for(var e=0,n=this.children,i=n.length;e<i;e++){var r=n[e].getNodeById(t);if(r)return r}},t.prototype.contains=function(t){if(t===this)return!0;for(var e=0,n=this.children,i=n.length;e<i;e++){var r=n[e].contains(t);if(r)return r}},t.prototype.getAncestors=function(t){for(var e=[],n=t?this:this.parentNode;n;)e.push(n),n=n.parentNode;return e.reverse(),e},t.prototype.getAncestorsIndices=function(){for(var t=[],e=this;e;)t.push(e.dataIndex),e=e.parentNode;return t.reverse(),t},t.prototype.getDescendantIndices=function(){var t=[];return this.eachNode((function(e){t.push(e.dataIndex)})),t},t.prototype.getValue=function(t){var e=this.hostTree.data;return e.getStore().get(e.getDimensionIndex(t||"value"),this.dataIndex)},t.prototype.setLayout=function(t,e){this.dataIndex>=0&&this.hostTree.data.setItemLayout(this.dataIndex,t,e)},t.prototype.getLayout=function(){return this.hostTree.data.getItemLayout(this.dataIndex)},t.prototype.getModel=function(t){if(!(this.dataIndex<0))return this.hostTree.data.getItemModel(this.dataIndex).getModel(t)},t.prototype.getLevelModel=function(){return(this.hostTree.levelModels||[])[this.depth]},t.prototype.setVisual=function(t,e){this.dataIndex>=0&&this.hostTree.data.setItemVisual(this.dataIndex,t,e)},t.prototype.getVisual=function(t){return this.hostTree.data.getItemVisual(this.dataIndex,t)},t.prototype.getRawIndex=function(){return this.hostTree.data.getRawIndex(this.dataIndex)},t.prototype.getId=function(){return this.hostTree.data.getId(this.dataIndex)},t.prototype.getChildIndex=function(){if(this.parentNode){for(var t=this.parentNode.children,e=0;e<t.length;++e)if(t[e]===this)return e;return-1}return-1},t.prototype.isAncestorOf=function(t){for(var e=t.parentNode;e;){if(e===this)return!0;e=e.parentNode}return!1},t.prototype.isDescendantOf=function(t){return t!==this&&t.isAncestorOf(this)},t}(),BC=function(){function t(t){this.type="tree",this._nodes=[],this.hostModel=t}return t.prototype.eachNode=function(t,e,n){this.root.eachNode(t,e,n)},t.prototype.getNodeByDataIndex=function(t){var e=this.data.getRawIndex(t);return this._nodes[e]},t.prototype.getNodeById=function(t){return this.root.getNodeById(t)},t.prototype.update=function(){for(var t=this.data,e=this._nodes,n=0,i=e.length;n<i;n++)e[n].dataIndex=-1;for(n=0,i=t.count();n<i;n++)e[t.getRawIndex(n)].dataIndex=n},t.prototype.clearLayouts=function(){this.data.clearItemLayouts()},t.createTree=function(e,n,i){var r=new t(n),o=[],a=1;!function t(e,n){var i=e.value;a=Math.max(a,Y(i)?i.length:1),o.push(e);var s=new VC(Do(e.name,""),r);n?function(t,e){var n=e.children;if(t.parentNode===e)return;n.push(t),t.parentNode=e}(s,n):r.root=s,r._nodes.push(s);var l=e.children;if(l)for(var u=0;u<l.length;u++)t(l[u],s)}(e),r.root.updateDepthAndHeight(0);var s=nx(o,{coordDimensions:["value"],dimensionsCount:a}).dimensions,l=new ex(s,n);return l.initData(o),i&&i(l),kC({mainData:l,struct:r,structAttr:"tree"}),r.update(),r},t}();function FC(t,e,n){if(t&&P(e,t.type)>=0){var i=n.getData().tree.root,r=t.targetNode;if(X(r)&&(r=i.getNodeById(r)),r&&i.contains(r))return{node:r};var o=t.targetNodeId;if(null!=o&&(r=i.getNodeById(o)))return{node:r}}}function GC(t){for(var e=[];t;)(t=t.parentNode)&&e.push(t);return e.reverse()}function WC(t,e){return P(GC(t),e)>=0}function HC(t,e){for(var n=[];t;){var i=t.dataIndex;n.push({name:t.name,dataIndex:i,value:e.getRawValue(i)}),t=t.parentNode}return n.reverse(),n}var YC=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.hasSymbolVisual=!0,e.ignoreStyleOnData=!0,e}return n(e,t),e.prototype.getInitialData=function(t){var e={name:t.name,children:t.data},n=t.leaves||{},i=new Sc(n,this,this.ecModel),r=BC.createTree(e,this,(function(t){t.wrapMethod("getItemModel",(function(t,e){var n=r.getNodeByDataIndex(e);return n&&n.children.length&&n.isExpand||(t.parentModel=i),t}))}));var o=0;r.eachNode("preorder",(function(t){t.depth>o&&(o=t.depth)}));var a=t.expandAndCollapse&&t.initialTreeDepth>=0?t.initialTreeDepth:o;return r.root.eachNode("preorder",(function(t){var e=t.hostTree.data.getRawDataItem(t.dataIndex);t.isExpand=e&&null!=e.collapsed?!e.collapsed:t.depth<=a})),r.data},e.prototype.getOrient=function(){var t=this.get("orient");return"horizontal"===t?t="LR":"vertical"===t&&(t="TB"),t},e.prototype.setZoom=function(t){this.option.zoom=t},e.prototype.setCenter=function(t){this.option.center=t},e.prototype.formatTooltip=function(t,e,n){for(var i=this.getData().tree,r=i.root.children[0],o=i.getNodeByDataIndex(t),a=o.getValue(),s=o.name;o&&o!==r;)s=o.parentNode.name+"."+s,o=o.parentNode;return Qf("nameValue",{name:s,value:a,noValue:isNaN(a)||null==a})},e.prototype.getDataParams=function(e){var n=t.prototype.getDataParams.apply(this,arguments),i=this.getData().tree.getNodeByDataIndex(e);return n.treeAncestors=HC(i,this),n.collapsed=!i.isExpand,n},e.type="series.tree",e.layoutMode="box",e.defaultOption={z:2,coordinateSystem:"view",left:"12%",top:"12%",right:"12%",bottom:"12%",layout:"orthogonal",edgeShape:"curve",edgeForkPosition:"50%",roam:!1,nodeScaleRatio:.4,center:null,zoom:1,orient:"LR",symbol:"emptyCircle",symbolSize:7,expandAndCollapse:!0,initialTreeDepth:2,lineStyle:{color:"#ccc",width:1.5,curveness:.5},itemStyle:{color:"lightsteelblue",borderWidth:1.5},label:{show:!0},animationEasing:"linear",animationDuration:700,animationDurationUpdate:500},e}(fg);function UC(t,e){for(var n,i=[t];n=i.pop();)if(e(n),n.isExpand){var r=n.children;if(r.length)for(var o=r.length-1;o>=0;o--)i.push(r[o])}}function XC(t,e){t.eachSeriesByType("tree",(function(t){!function(t,e){var n=function(t,e){return Tp(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()})}(t,e);t.layoutInfo=n;var i=t.get("layout"),r=0,o=0,a=null;"radial"===i?(r=2*Math.PI,o=Math.min(n.height,n.width)/2,a=dC((function(t,e){return(t.parentNode===e.parentNode?1:2)/t.depth}))):(r=n.width,o=n.height,a=dC());var s=t.getData().tree.root,l=s.children[0];if(l){!function(t){var e=t;e.hierNode={defaultAncestor:null,ancestor:e,prelim:0,modifier:0,change:0,shift:0,i:0,thread:null};for(var n,i,r=[e];n=r.pop();)if(i=n.children,n.isExpand&&i.length)for(var o=i.length-1;o>=0;o--){var a=i[o];a.hierNode={defaultAncestor:null,ancestor:a,prelim:0,modifier:0,change:0,shift:0,i:o,thread:null},r.push(a)}}(s),function(t,e,n){for(var i,r=[t],o=[];i=r.pop();)if(o.push(i),i.isExpand){var a=i.children;if(a.length)for(var s=0;s<a.length;s++)r.push(a[s])}for(;i=o.pop();)e(i,n)}(l,cC,a),s.hierNode.modifier=-l.hierNode.prelim,UC(l,pC);var u=l,h=l,c=l;UC(l,(function(t){var e=t.getLayout().x;e<u.getLayout().x&&(u=t),e>h.getLayout().x&&(h=t),t.depth>c.depth&&(c=t)}));var p=u===h?1:a(u,h)/2,d=p-u.getLayout().x,f=0,g=0,y=0,v=0;if("radial"===i)f=r/(h.getLayout().x+p+d),g=o/(c.depth-1||1),UC(l,(function(t){y=(t.getLayout().x+d)*f,v=(t.depth-1)*g;var e=fC(y,v);t.setLayout({x:e.x,y:e.y,rawX:y,rawY:v},!0)}));else{var m=t.getOrient();"RL"===m||"LR"===m?(g=o/(h.getLayout().x+p+d),f=r/(c.depth-1||1),UC(l,(function(t){v=(t.getLayout().x+d)*g,y="LR"===m?(t.depth-1)*f:r-(t.depth-1)*f,t.setLayout({x:y,y:v},!0)}))):"TB"!==m&&"BT"!==m||(f=r/(h.getLayout().x+p+d),g=o/(c.depth-1||1),UC(l,(function(t){y=(t.getLayout().x+d)*f,v="TB"===m?(t.depth-1)*g:o-(t.depth-1)*g,t.setLayout({x:y,y:v},!0)})))}}}(t,e)}))}function ZC(t){t.eachSeriesByType("tree",(function(t){var e=t.getData();e.tree.eachNode((function(t){var n=t.getModel().getModel("itemStyle").getItemStyle();A(e.ensureUniqueItemVisual(t.dataIndex,"style"),n)}))}))}var jC=["treemapZoomToNode","treemapRender","treemapMove"];function qC(t){var e=t.getData().tree,n={};e.eachNode((function(e){for(var i=e;i&&i.depth>1;)i=i.parentNode;var r=ld(t.ecModel,i.name||i.dataIndex+"",n);e.setVisual("decal",r)}))}var KC=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.preventUsingHoverLayer=!0,n}return n(e,t),e.prototype.getInitialData=function(t,e){var n={name:t.name,children:t.data};$C(n);var i=t.levels||[],r=this.designatedVisualItemStyle={},o=new Sc({itemStyle:r},this,e);i=t.levels=function(t,e){var n,i,r=_o(e.get("color")),o=_o(e.get(["aria","decal","decals"]));if(!r)return;E(t=t||[],(function(t){var e=new Sc(t),r=e.get("color"),o=e.get("decal");(e.get(["itemStyle","color"])||r&&"none"!==r)&&(n=!0),(e.get(["itemStyle","decal"])||o&&"none"!==o)&&(i=!0)}));var a=t[0]||(t[0]={});n||(a.color=r.slice());!i&&o&&(a.decal=o.slice());return t}(i,e);var a=z(i||[],(function(t){return new Sc(t,o,e)}),this),s=BC.createTree(n,this,(function(t){t.wrapMethod("getItemModel",(function(t,e){var n=s.getNodeByDataIndex(e),i=n?a[n.depth]:null;return t.parentModel=i||o,t}))}));return s.data},e.prototype.optionUpdated=function(){this.resetViewRoot()},e.prototype.formatTooltip=function(t,e,n){var i=this.getData(),r=this.getRawValue(t);return Qf("nameValue",{name:i.getName(t),value:r})},e.prototype.getDataParams=function(e){var n=t.prototype.getDataParams.apply(this,arguments),i=this.getData().tree.getNodeByDataIndex(e);return n.treeAncestors=HC(i,this),n.treePathInfo=n.treeAncestors,n},e.prototype.setLayoutInfo=function(t){this.layoutInfo=this.layoutInfo||{},A(this.layoutInfo,t)},e.prototype.mapIdToIndex=function(t){var e=this._idIndexMap;e||(e=this._idIndexMap=yt(),this._idIndexMapCount=0);var n=e.get(t);return null==n&&e.set(t,n=this._idIndexMapCount++),n},e.prototype.getViewRoot=function(){return this._viewRoot},e.prototype.resetViewRoot=function(t){t?this._viewRoot=t:t=this._viewRoot;var e=this.getRawData().tree.root;t&&(t===e||e.contains(t))||(this._viewRoot=e)},e.prototype.enableAriaDecal=function(){qC(this)},e.type="series.treemap",e.layoutMode="box",e.defaultOption={progressive:0,left:"center",top:"middle",width:"80%",height:"80%",sort:!0,clipWindow:"origin",squareRatio:.5*(1+Math.sqrt(5)),leafDepth:null,drillDownIcon:"▶",zoomToNodeRatio:.1024,roam:!0,nodeClick:"zoomToNode",animation:!0,animationDurationUpdate:900,animationEasing:"quinticInOut",breadcrumb:{show:!0,height:22,left:"center",top:"bottom",emptyItemWidth:25,itemStyle:{color:"rgba(0,0,0,0.7)",textStyle:{color:"#fff"}},emphasis:{itemStyle:{color:"rgba(0,0,0,0.9)"}}},label:{show:!0,distance:0,padding:5,position:"inside",color:"#fff",overflow:"truncate"},upperLabel:{show:!1,position:[0,"50%"],height:20,overflow:"truncate",verticalAlign:"middle"},itemStyle:{color:null,colorAlpha:null,colorSaturation:null,borderWidth:0,gapWidth:0,borderColor:"#fff",borderColorSaturation:null},emphasis:{upperLabel:{show:!0,position:[0,"50%"],overflow:"truncate",verticalAlign:"middle"}},visualDimension:0,visualMin:null,visualMax:null,color:[],colorAlpha:null,colorSaturation:null,colorMappingBy:"index",visibleMin:10,childrenVisibleMin:null,levels:[]},e}(fg);function $C(t){var e=0;E(t.children,(function(t){$C(t);var n=t.value;Y(n)&&(n=n[0]),e+=n}));var n=t.value;Y(n)&&(n=n[0]),(null==n||isNaN(n))&&(n=e),n<0&&(n=0),Y(t.value)?t.value[0]=n:t.value=n}var JC=function(){function t(t){this.group=new Er,t.add(this.group)}return t.prototype.render=function(t,e,n,i){var r=t.getModel("breadcrumb"),o=this.group;if(o.removeAll(),r.get("show")&&n){var a=r.getModel("itemStyle"),s=r.getModel("emphasis"),l=a.getModel("textStyle"),u=s.getModel(["itemStyle","textStyle"]),h={pos:{left:r.get("left"),right:r.get("right"),top:r.get("top"),bottom:r.get("bottom")},box:{width:e.getWidth(),height:e.getHeight()},emptyItemWidth:r.get("emptyItemWidth"),totalWidth:0,renderList:[]};this._prepare(n,h,l),this._renderContent(t,h,a,s,l,u,i),Cp(o,h.pos,h.box)}},t.prototype._prepare=function(t,e,n){for(var i=t;i;i=i.parentNode){var r=Do(i.getModel().get("name"),""),o=n.getTextRect(r),a=Math.max(o.width+16,e.emptyItemWidth);e.totalWidth+=a+8,e.renderList.push({node:i,text:r,width:a})}},t.prototype._renderContent=function(t,e,n,i,r,o,a){for(var s,l,u,h,c,p,d,f,g,y=0,v=e.emptyItemWidth,m=t.get(["breadcrumb","height"]),x=(s=e.pos,l=e.box,h=l.width,c=l.height,p=Ur(s.left,h),d=Ur(s.top,c),f=Ur(s.right,h),g=Ur(s.bottom,c),(isNaN(p)||isNaN(parseFloat(s.left)))&&(p=0),(isNaN(f)||isNaN(parseFloat(s.right)))&&(f=h),(isNaN(d)||isNaN(parseFloat(s.top)))&&(d=0),(isNaN(g)||isNaN(parseFloat(s.bottom)))&&(g=c),u=dp(u||0),{width:Math.max(f-p-u[1]-u[3],0),height:Math.max(g-d-u[0]-u[2],0)}),_=e.totalWidth,b=e.renderList,w=i.getModel("itemStyle").getItemStyle(),S=b.length-1;S>=0;S--){var M=b[S],I=M.node,T=M.width,C=M.text;_>x.width&&(_-=T-v,T=v,C=null);var D=new Gu({shape:{points:QC(y,0,T,m,S===b.length-1,0===S)},style:k(n.getItemStyle(),{lineJoin:"bevel"}),textContent:new Bs({style:ec(r,{text:C})}),textConfig:{position:"inside"},z2:1e5,onclick:H(a,I)});D.disableLabelAnimation=!0,D.getTextContent().ensureState("emphasis").style=ec(o,{text:C}),D.ensureState("emphasis").style=w,Hl(D,i.get("focus"),i.get("blurScope"),i.get("disabled")),this.group.add(D),tD(D,t,I),y+=T+8}},t.prototype.remove=function(){this.group.removeAll()},t}();function QC(t,e,n,i,r,o){var a=[[r?t:t-5,e],[t+n,e],[t+n,e+i],[r?t:t-5,e+i]];return!o&&a.splice(2,0,[t+n+5,e+i/2]),!r&&a.push([t,e+i/2]),a}function tD(t,e,n){Js(t).eventData={componentType:"series",componentSubType:"treemap",componentIndex:e.componentIndex,seriesIndex:e.seriesIndex,seriesName:e.name,seriesType:"treemap",selfType:"breadcrumb",nodeData:{dataIndex:n&&n.dataIndex,name:n&&n.name},treePathInfo:n&&HC(n,e)}}var eD=function(){function t(){this._storage=[],this._elExistsMap={}}return t.prototype.add=function(t,e,n,i,r){return!this._elExistsMap[t.id]&&(this._elExistsMap[t.id]=!0,this._storage.push({el:t,target:e,duration:n,delay:i,easing:r}),!0)},t.prototype.finished=function(t){return this._finishedCallback=t,this},t.prototype.start=function(){for(var t=this,e=this._storage.length,n=function(){--e<=0&&(t._storage.length=0,t._elExistsMap={},t._finishedCallback&&t._finishedCallback())},i=0,r=this._storage.length;i<r;i++){var o=this._storage[i];o.el.animateTo(o.target,{duration:o.duration,delay:o.delay,easing:o.easing,setToFinal:!0,done:n,aborted:n})}return this},t}();var nD=Er,iD=Es,rD="label",oD="upperLabel",aD=$o([["fill","color"],["stroke","strokeColor"],["lineWidth","strokeWidth"],["shadowBlur"],["shadowOffsetX"],["shadowOffsetY"],["shadowColor"]]),sD=function(t){var e=aD(t);return e.stroke=e.fill=e.lineWidth=null,e},lD=Po(),uD=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n._state="ready",n._storage={nodeGroup:[],background:[],content:[]},n}return n(e,t),e.prototype.render=function(t,e,n,i){if(!(P(e.findComponents({mainType:"series",subType:"treemap",query:i}),t)<0)){this.seriesModel=t,this.api=n,this.ecModel=e;var r=FC(i,["treemapZoomToNode","treemapRootToNode"],t),o=i&&i.type,a=t.layoutInfo,s=!this._oldTree,l=this._storage,u="treemapRootToNode"===o&&r&&l?{rootNodeGroup:l.nodeGroup[r.node.getRawIndex()],direction:i.direction}:null,h=this._giveContainerGroup(a),c=t.get("animation"),p=this._doRender(h,t,u);!c||s||o&&"treemapZoomToNode"!==o&&"treemapRootToNode"!==o?p.renderFinally():this._doAnimation(h,p,t,u),this._resetController(n),this._renderBreadcrumb(t,n,r)}},e.prototype._giveContainerGroup=function(t){var e=this._containerGroup;return e||(e=this._containerGroup=new nD,this._initEvents(e),this.group.add(e)),e.x=t.x,e.y=t.y,e},e.prototype._doRender=function(t,e,n){var i=e.getData().tree,r=this._oldTree,o={nodeGroup:[],background:[],content:[]},a={nodeGroup:[],background:[],content:[]},s=this._storage,l=[];function u(t,i,r,u){return function(t,e,n,i,r,o,a,s,l,u){if(!a)return;var h=a.getLayout(),c=t.getData(),p=a.getModel();if(c.setItemGraphicEl(a.dataIndex,null),!h||!h.isInView)return;var d=h.width,f=h.height,g=h.borderWidth,y=h.invisible,v=a.getRawIndex(),m=s&&s.getRawIndex(),x=a.viewChildren,_=h.upperHeight,b=x&&x.length,w=p.getModel("itemStyle"),S=p.getModel(["emphasis","itemStyle"]),M=p.getModel(["blur","itemStyle"]),I=p.getModel(["select","itemStyle"]),T=w.get("borderRadius")||0,C=G("nodeGroup",nD);if(!C)return;if(l.add(C),C.x=h.x||0,C.y=h.y||0,C.markRedraw(),lD(C).nodeWidth=d,lD(C).nodeHeight=f,h.isAboveViewRoot)return C;var D=G("background",iD,u,20);D&&E(C,D,b&&h.upperLabelHeight);var k=p.getModel("emphasis"),L=k.get("focus"),P=k.get("blurScope"),O=k.get("disabled"),R="ancestor"===L?a.getAncestorsIndices():"descendant"===L?a.getDescendantIndices():L;if(b)ql(C)&&jl(C,!1),D&&(jl(D,!O),c.setItemGraphicEl(a.dataIndex,D),Yl(D,R,P));else{var N=G("content",iD,u,30);N&&z(C,N),D.disableMorphing=!0,D&&ql(D)&&jl(D,!1),jl(C,!O),c.setItemGraphicEl(a.dataIndex,C),Yl(C,R,P)}return C;function E(e,n,i){var r=Js(n);if(r.dataIndex=a.dataIndex,r.seriesIndex=t.seriesIndex,n.setShape({x:0,y:0,width:d,height:f,r:T}),y)V(n);else{n.invisible=!1;var o=a.getVisual("style"),s=o.stroke,l=sD(w);l.fill=s;var u=aD(S);u.fill=S.get("borderColor");var h=aD(M);h.fill=M.get("borderColor");var c=aD(I);if(c.fill=I.get("borderColor"),i){var p=d-2*g;B(n,s,o.opacity,{x:g,y:0,width:p,height:_})}else n.removeTextContent();n.setStyle(l),n.ensureState("emphasis").style=u,n.ensureState("blur").style=h,n.ensureState("select").style=c,Tl(n)}e.add(n)}function z(e,n){var i=Js(n);i.dataIndex=a.dataIndex,i.seriesIndex=t.seriesIndex;var r=Math.max(d-2*g,0),o=Math.max(f-2*g,0);if(n.culling=!0,n.setShape({x:g,y:g,width:r,height:o,r:T}),y)V(n);else{n.invisible=!1;var s=a.getVisual("style"),l=s.fill,u=sD(w);u.fill=l,u.decal=s.decal;var h=aD(S),c=aD(M),p=aD(I);B(n,l,s.opacity,null),n.setStyle(u),n.ensureState("emphasis").style=h,n.ensureState("blur").style=c,n.ensureState("select").style=p,Tl(n)}e.add(n)}function V(t){!t.invisible&&o.push(t)}function B(e,n,i,r){var o=p.getModel(r?oD:rD),s=Do(p.get("name"),null),l=o.getShallow("show");Qh(e,tc(p,r?oD:rD),{defaultText:l?s:null,inheritColor:n,defaultOpacity:i,labelFetcher:t,labelDataIndex:a.dataIndex});var u=e.getTextContent();if(u){var c=u.style,d=st(c.padding||0);r&&(e.setTextConfig({layoutRect:r}),u.disableLabelLayout=!0),u.beforeUpdate=function(){var t=Math.max((r?r.width:e.shape.width)-d[1]-d[3],0),n=Math.max((r?r.height:e.shape.height)-d[0]-d[2],0);c.width===t&&c.height===n||u.setStyle({width:t,height:n})},c.truncateMinChar=2,c.lineOverflow="truncate",F(c,r,h);var f=u.getState("emphasis");F(f?f.style:null,r,h)}}function F(e,n,i){var r=e?e.text:null;if(!n&&i.isLeafRoot&&null!=r){var o=t.get("drillDownIcon",!0);e.text=o?o+" "+r:r}}function G(t,i,o,a){var s=null!=m&&n[t][m],l=r[t];return s?(n[t][m]=null,W(l,s)):y||((s=new i)instanceof wa&&(s.z2=function(t,e){return 100*t+e}(o,a)),H(l,s)),e[t][v]=s}function W(t,e){var n=t[v]={};e instanceof nD?(n.oldX=e.x,n.oldY=e.y):n.oldShape=A({},e.shape)}function H(t,e){var n=t[v]={},o=a.parentNode,s=e instanceof Er;if(o&&(!i||"drillDown"===i.direction)){var l=0,u=0,h=r.background[o.getRawIndex()];!i&&h&&h.oldShape&&(l=h.oldShape.width,u=h.oldShape.height),s?(n.oldX=0,n.oldY=u):n.oldShape={x:l,y:u,width:0,height:0}}n.fadein=!s}}(e,a,s,n,o,l,t,i,r,u)}!function t(e,n,i,r,o){r?(n=e,E(e,(function(t,e){!t.isRemoved()&&s(e,e)}))):new Lm(n,e,a,a).add(s).update(s).remove(H(s,null)).execute();function a(t){return t.getId()}function s(a,s){var l=null!=a?e[a]:null,h=null!=s?n[s]:null,c=u(l,h,i,o);c&&t(l&&l.viewChildren||[],h&&h.viewChildren||[],c,r,o+1)}}(i.root?[i.root]:[],r&&r.root?[r.root]:[],t,i===r||!r,0);var h=function(t){var e={nodeGroup:[],background:[],content:[]};return t&&E(t,(function(t,n){var i=e[n];E(t,(function(t){t&&(i.push(t),lD(t).willDelete=!0)}))})),e}(s);return this._oldTree=i,this._storage=a,{lastsForAnimation:o,willDeleteEls:h,renderFinally:function(){E(h,(function(t){E(t,(function(t){t.parent&&t.parent.remove(t)}))})),E(l,(function(t){t.invisible=!0,t.dirty()}))}}},e.prototype._doAnimation=function(t,e,n,i){var r=n.get("animationDurationUpdate"),o=n.get("animationEasing"),a=(U(r)?0:r)||0,s=(U(o)?null:o)||"cubicOut",l=new eD;E(e.willDeleteEls,(function(t,e){E(t,(function(t,n){if(!t.invisible){var r,o=t.parent,u=lD(o);if(i&&"drillDown"===i.direction)r=o===i.rootNodeGroup?{shape:{x:0,y:0,width:u.nodeWidth,height:u.nodeHeight},style:{opacity:0}}:{style:{opacity:0}};else{var h=0,c=0;u.willDelete||(h=u.nodeWidth/2,c=u.nodeHeight/2),r="nodeGroup"===e?{x:h,y:c,style:{opacity:0}}:{shape:{x:h,y:c,width:0,height:0},style:{opacity:0}}}r&&l.add(t,r,a,0,s)}}))})),E(this._storage,(function(t,n){E(t,(function(t,i){var r=e.lastsForAnimation[n][i],o={};r&&(t instanceof Er?null!=r.oldX&&(o.x=t.x,o.y=t.y,t.x=r.oldX,t.y=r.oldY):(r.oldShape&&(o.shape=A({},t.shape),t.setShape(r.oldShape)),r.fadein?(t.setStyle("opacity",0),o.style={opacity:1}):1!==t.style.opacity&&(o.style={opacity:1})),l.add(t,o,a,0,s))}))}),this),this._state="animating",l.finished(W((function(){this._state="ready",e.renderFinally()}),this)).start()},e.prototype._resetController=function(t){var e=this._controller;e||((e=this._controller=new BI(t.getZr())).enable(this.seriesModel.get("roam")),e.on("pan",W(this._onPan,this)),e.on("zoom",W(this._onZoom,this)));var n=new Ee(0,0,t.getWidth(),t.getHeight());e.setPointerChecker((function(t,e,i){return n.contain(e,i)}))},e.prototype._clearController=function(){var t=this._controller;t&&(t.dispose(),t=null)},e.prototype._onPan=function(t){if("animating"!==this._state&&(Math.abs(t.dx)>3||Math.abs(t.dy)>3)){var e=this.seriesModel.getData().tree.root;if(!e)return;var n=e.getLayout();if(!n)return;this.api.dispatchAction({type:"treemapMove",from:this.uid,seriesId:this.seriesModel.id,rootRect:{x:n.x+t.dx,y:n.y+t.dy,width:n.width,height:n.height}})}},e.prototype._onZoom=function(t){var e=t.originX,n=t.originY;if("animating"!==this._state){var i=this.seriesModel.getData().tree.root;if(!i)return;var r=i.getLayout();if(!r)return;var o=new Ee(r.x,r.y,r.width,r.height),a=this.seriesModel.layoutInfo,s=[1,0,0,1,0,0];be(s,s,[-(e-=a.x),-(n-=a.y)]),Se(s,s,[t.scale,t.scale]),be(s,s,[e,n]),o.applyTransform(s),this.api.dispatchAction({type:"treemapRender",from:this.uid,seriesId:this.seriesModel.id,rootRect:{x:o.x,y:o.y,width:o.width,height:o.height}})}},e.prototype._initEvents=function(t){var e=this;t.on("click",(function(t){if("ready"===e._state){var n=e.seriesModel.get("nodeClick",!0);if(n){var i=e.findTarget(t.offsetX,t.offsetY);if(i){var r=i.node;if(r.getLayout().isLeafRoot)e._rootToNode(i);else if("zoomToNode"===n)e._zoomToNode(i);else if("link"===n){var o=r.hostTree.data.getItemModel(r.dataIndex),a=o.get("link",!0),s=o.get("target",!0)||"blank";a&&_p(a,s)}}}}}),this)},e.prototype._renderBreadcrumb=function(t,e,n){var i=this;n||(n=null!=t.get("leafDepth",!0)?{node:t.getViewRoot()}:this.findTarget(e.getWidth()/2,e.getHeight()/2))||(n={node:t.getData().tree.root}),(this._breadcrumb||(this._breadcrumb=new JC(this.group))).render(t,e,n.node,(function(e){"animating"!==i._state&&(WC(t.getViewRoot(),e)?i._rootToNode({node:e}):i._zoomToNode({node:e}))}))},e.prototype.remove=function(){this._clearController(),this._containerGroup&&this._containerGroup.removeAll(),this._storage={nodeGroup:[],background:[],content:[]},this._state="ready",this._breadcrumb&&this._breadcrumb.remove()},e.prototype.dispose=function(){this._clearController()},e.prototype._zoomToNode=function(t){this.api.dispatchAction({type:"treemapZoomToNode",from:this.uid,seriesId:this.seriesModel.id,targetNode:t.node})},e.prototype._rootToNode=function(t){this.api.dispatchAction({type:"treemapRootToNode",from:this.uid,seriesId:this.seriesModel.id,targetNode:t.node})},e.prototype.findTarget=function(t,e){var n;return this.seriesModel.getViewRoot().eachNode({attr:"viewChildren",order:"preorder"},(function(i){var r=this._storage.background[i.getRawIndex()];if(r){var o=r.transformCoordToLocal(t,e),a=r.shape;if(!(a.x<=o[0]&&o[0]<=a.x+a.width&&a.y<=o[1]&&o[1]<=a.y+a.height))return!1;n={node:i,offsetX:o[0],offsetY:o[1]}}}),this),n},e.type="treemap",e}(Tg);var hD=E,cD=q,pD=-1,dD=function(){function t(e){var n=e.mappingMethod,i=e.type,r=this.option=T(e);this.type=i,this.mappingMethod=n,this._normalizeData=SD[n];var o=t.visualHandlers[i];this.applyVisual=o.applyVisual,this.getColorMapper=o.getColorMapper,this._normalizedToVisual=o._normalizedToVisual[n],"piecewise"===n?(fD(r),function(t){var e=t.pieceList;t.hasSpecialVisual=!1,E(e,(function(e,n){e.originIndex=n,null!=e.visual&&(t.hasSpecialVisual=!0)}))}(r)):"category"===n?r.categories?function(t){var e=t.categories,n=t.categoryMap={},i=t.visual;if(hD(e,(function(t,e){n[t]=e})),!Y(i)){var r=[];q(i)?hD(i,(function(t,e){var i=n[e];r[null!=i?i:pD]=t})):r[-1]=i,i=wD(t,r)}for(var o=e.length-1;o>=0;o--)null==i[o]&&(delete n[e[o]],e.pop())}(r):fD(r,!0):(lt("linear"!==n||r.dataExtent),fD(r))}return t.prototype.mapValueToVisual=function(t){var e=this._normalizeData(t);return this._normalizedToVisual(e,t)},t.prototype.getNormalizer=function(){return W(this._normalizeData,this)},t.listVisualTypes=function(){return G(t.visualHandlers)},t.isValidType=function(e){return t.visualHandlers.hasOwnProperty(e)},t.eachVisual=function(t,e,n){q(t)?E(t,e,n):e.call(n,t)},t.mapVisual=function(e,n,i){var r,o=Y(e)?[]:q(e)?{}:(r=!0,null);return t.eachVisual(e,(function(t,e){var a=n.call(i,t,e);r?o=a:o[e]=a})),o},t.retrieveVisuals=function(e){var n,i={};return e&&hD(t.visualHandlers,(function(t,r){e.hasOwnProperty(r)&&(i[r]=e[r],n=!0)})),n?i:null},t.prepareVisualTypes=function(t){if(Y(t))t=t.slice();else{if(!cD(t))return[];var e=[];hD(t,(function(t,n){e.push(n)})),t=e}return t.sort((function(t,e){return"color"===e&&"color"!==t&&0===t.indexOf("color")?1:-1})),t},t.dependsOn=function(t,e){return"color"===e?!(!t||0!==t.indexOf(e)):t===e},t.findPieceIndex=function(t,e,n){for(var i,r=1/0,o=0,a=e.length;o<a;o++){var s=e[o].value;if(null!=s){if(s===t||X(s)&&s===t+"")return o;n&&c(s,o)}}for(o=0,a=e.length;o<a;o++){var l=e[o],u=l.interval,h=l.close;if(u){if(u[0]===-1/0){if(MD(h[1],t,u[1]))return o}else if(u[1]===1/0){if(MD(h[0],u[0],t))return o}else if(MD(h[0],u[0],t)&&MD(h[1],t,u[1]))return o;n&&c(u[0],o),n&&c(u[1],o)}}if(n)return t===1/0?e.length-1:t===-1/0?0:i;function c(e,n){var o=Math.abs(e-t);o<r&&(r=o,i=n)}},t.visualHandlers={color:{applyVisual:vD("color"),getColorMapper:function(){var t=this.option;return W("category"===t.mappingMethod?function(t,e){return!e&&(t=this._normalizeData(t)),mD.call(this,t)}:function(e,n,i){var r=!!i;return!n&&(e=this._normalizeData(e)),i=$n(e,t.parsedVisual,i),r?i:ii(i,"rgba")},this)},_normalizedToVisual:{linear:function(t){return ii($n(t,this.option.parsedVisual),"rgba")},category:mD,piecewise:function(t,e){var n=bD.call(this,e);return null==n&&(n=ii($n(t,this.option.parsedVisual),"rgba")),n},fixed:xD}},colorHue:gD((function(t,e){return ei(t,e)})),colorSaturation:gD((function(t,e){return ei(t,null,e)})),colorLightness:gD((function(t,e){return ei(t,null,null,e)})),colorAlpha:gD((function(t,e){return ni(t,e)})),decal:{applyVisual:vD("decal"),_normalizedToVisual:{linear:null,category:mD,piecewise:null,fixed:null}},opacity:{applyVisual:vD("opacity"),_normalizedToVisual:_D([0,1])},liftZ:{applyVisual:vD("liftZ"),_normalizedToVisual:{linear:xD,category:xD,piecewise:xD,fixed:xD}},symbol:{applyVisual:function(t,e,n){n("symbol",this.mapValueToVisual(t))},_normalizedToVisual:{linear:yD,category:mD,piecewise:function(t,e){var n=bD.call(this,e);return null==n&&(n=yD.call(this,t)),n},fixed:xD}},symbolSize:{applyVisual:vD("symbolSize"),_normalizedToVisual:_D([0,1])}},t}();function fD(t,e){var n=t.visual,i=[];q(n)?hD(n,(function(t){i.push(t)})):null!=n&&i.push(n);e||1!==i.length||{color:1,symbol:1}.hasOwnProperty(t.type)||(i[1]=i[0]),wD(t,i)}function gD(t){return{applyVisual:function(e,n,i){var r=this.mapValueToVisual(e);i("color",t(n("color"),r))},_normalizedToVisual:_D([0,1])}}function yD(t){var e=this.option.visual;return e[Math.round(Yr(t,[0,1],[0,e.length-1],!0))]||{}}function vD(t){return function(e,n,i){i(t,this.mapValueToVisual(e))}}function mD(t){var e=this.option.visual;return e[this.option.loop&&t!==pD?t%e.length:t]}function xD(){return this.option.visual[0]}function _D(t){return{linear:function(e){return Yr(e,t,this.option.visual,!0)},category:mD,piecewise:function(e,n){var i=bD.call(this,n);return null==i&&(i=Yr(e,t,this.option.visual,!0)),i},fixed:xD}}function bD(t){var e=this.option,n=e.pieceList;if(e.hasSpecialVisual){var i=n[dD.findPieceIndex(t,n)];if(i&&i.visual)return i.visual[this.type]}}function wD(t,e){return t.visual=e,"color"===t.type&&(t.parsedVisual=z(e,(function(t){var e=jn(t);return e||[0,0,0,1]}))),e}var SD={linear:function(t){return Yr(t,this.option.dataExtent,[0,1],!0)},piecewise:function(t){var e=this.option.pieceList,n=dD.findPieceIndex(t,e,!0);if(null!=n)return Yr(n,[0,e.length-1],[0,1],!0)},category:function(t){var e=this.option.categories?this.option.categoryMap[t]:t;return null==e?pD:e},fixed:bt};function MD(t,e,n){return t?e<=n:e<n}var ID=Po(),TD={seriesType:"treemap",reset:function(t){var e=t.getData().tree.root;e.isRemoved()||CD(e,{},t.getViewRoot().getAncestors(),t)}};function CD(t,e,n,i){var r=t.getModel(),o=t.getLayout(),a=t.hostTree.data;if(o&&!o.invisible&&o.isInView){var s,l=r.getModel("itemStyle"),u=function(t,e,n){var i=A({},e),r=n.designatedVisualItemStyle;return E(["color","colorAlpha","colorSaturation"],(function(n){r[n]=e[n];var o=t.get(n);r[n]=null,null!=o&&(i[n]=o)})),i}(l,e,i),h=a.ensureUniqueItemVisual(t.dataIndex,"style"),c=l.get("borderColor"),p=l.get("borderColorSaturation");null!=p&&(c=function(t,e){return null!=e?ei(e,null,null,t):null}(p,s=DD(u))),h.stroke=c;var d=t.viewChildren;if(d&&d.length){var f=function(t,e,n,i,r,o){if(!o||!o.length)return;var a=kD(e,"color")||null!=r.color&&"none"!==r.color&&(kD(e,"colorAlpha")||kD(e,"colorSaturation"));if(!a)return;var s=e.get("visualMin"),l=e.get("visualMax"),u=n.dataExtent.slice();null!=s&&s<u[0]&&(u[0]=s),null!=l&&l>u[1]&&(u[1]=l);var h=e.get("colorMappingBy"),c={type:a.name,dataExtent:u,visual:a.range};"color"!==c.type||"index"!==h&&"id"!==h?c.mappingMethod="linear":(c.mappingMethod="category",c.loop=!0);var p=new dD(c);return ID(p).drColorMappingBy=h,p}(0,r,o,0,u,d);E(d,(function(t,e){if(t.depth>=n.length||t===n[t.depth]){var o=function(t,e,n,i,r,o){var a=A({},e);if(r){var s=r.type,l="color"===s&&ID(r).drColorMappingBy,u="index"===l?i:"id"===l?o.mapIdToIndex(n.getId()):n.getValue(t.get("visualDimension"));a[s]=r.mapValueToVisual(u)}return a}(r,u,t,e,f,i);CD(t,o,n,i)}}))}else s=DD(u),h.fill=s}}function DD(t){var e=AD(t,"color");if(e){var n=AD(t,"colorAlpha"),i=AD(t,"colorSaturation");return i&&(e=ei(e,null,null,i)),n&&(e=ni(e,n)),e}}function AD(t,e){var n=t[e];if(null!=n&&"none"!==n)return n}function kD(t,e){var n=t.get(e);return Y(n)&&n.length?{name:e,range:n}:null}var LD=Math.max,PD=Math.min,OD=it,RD=E,ND=["itemStyle","borderWidth"],ED=["itemStyle","gapWidth"],zD=["upperLabel","show"],VD=["upperLabel","height"],BD={seriesType:"treemap",reset:function(t,e,n,i){var r=n.getWidth(),o=n.getHeight(),a=t.option,s=Tp(t.getBoxLayoutParams(),{width:n.getWidth(),height:n.getHeight()}),l=a.size||[],u=Ur(OD(s.width,l[0]),r),h=Ur(OD(s.height,l[1]),o),c=i&&i.type,p=FC(i,["treemapZoomToNode","treemapRootToNode"],t),d="treemapRender"===c||"treemapMove"===c?i.rootRect:null,f=t.getViewRoot(),g=GC(f);if("treemapMove"!==c){var y="treemapZoomToNode"===c?function(t,e,n,i,r){var o,a=(e||{}).node,s=[i,r];if(!a||a===n)return s;var l=i*r,u=l*t.option.zoomToNodeRatio;for(;o=a.parentNode;){for(var h=0,c=o.children,p=0,d=c.length;p<d;p++)h+=c[p].getValue();var f=a.getValue();if(0===f)return s;u*=h/f;var g=o.getModel(),y=g.get(ND);(u+=4*y*y+(3*y+Math.max(y,YD(g)))*Math.pow(u,.5))>Qr&&(u=Qr),a=o}u<l&&(u=l);var v=Math.pow(u/l,.5);return[i*v,r*v]}(t,p,f,u,h):d?[d.width,d.height]:[u,h],v=a.sort;v&&"asc"!==v&&"desc"!==v&&(v="desc");var m={squareRatio:a.squareRatio,sort:v,leafDepth:a.leafDepth};f.hostTree.clearLayouts();var x={x:0,y:0,width:y[0],height:y[1],area:y[0]*y[1]};f.setLayout(x),FD(f,m,!1,0),x=f.getLayout(),RD(g,(function(t,e){var n=(g[e+1]||f).getValue();t.setLayout(A({dataExtent:[n,n],borderWidth:0,upperHeight:0},x))}))}var _=t.getData().tree.root;_.setLayout(function(t,e,n){if(e)return{x:e.x,y:e.y};var i={x:0,y:0};if(!n)return i;var r=n.node,o=r.getLayout();if(!o)return i;var a=[o.width/2,o.height/2],s=r;for(;s;){var l=s.getLayout();a[0]+=l.x,a[1]+=l.y,s=s.parentNode}return{x:t.width/2-a[0],y:t.height/2-a[1]}}(s,d,p),!0),t.setLayoutInfo(s),HD(_,new Ee(-s.x,-s.y,r,o),g,f,0)}};function FD(t,e,n,i){var r,o;if(!t.isRemoved()){var a=t.getLayout();r=a.width,o=a.height;var s=t.getModel(),l=s.get(ND),u=s.get(ED)/2,h=YD(s),c=Math.max(l,h),p=l-u,d=c-u;t.setLayout({borderWidth:l,upperHeight:c,upperLabelHeight:h},!0);var f=(r=LD(r-2*p,0))*(o=LD(o-p-d,0)),g=function(t,e,n,i,r,o){var a=t.children||[],s=i.sort;"asc"!==s&&"desc"!==s&&(s=null);var l=null!=i.leafDepth&&i.leafDepth<=o;if(r&&!l)return t.viewChildren=[];a=B(a,(function(t){return!t.isRemoved()})),function(t,e){e&&t.sort((function(t,n){var i="asc"===e?t.getValue()-n.getValue():n.getValue()-t.getValue();return 0===i?"asc"===e?t.dataIndex-n.dataIndex:n.dataIndex-t.dataIndex:i}))}(a,s);var u=function(t,e,n){for(var i=0,r=0,o=e.length;r<o;r++)i+=e[r].getValue();var a,s=t.get("visualDimension");e&&e.length?"value"===s&&n?(a=[e[e.length-1].getValue(),e[0].getValue()],"asc"===n&&a.reverse()):(a=[1/0,-1/0],RD(e,(function(t){var e=t.getValue(s);e<a[0]&&(a[0]=e),e>a[1]&&(a[1]=e)}))):a=[NaN,NaN];return{sum:i,dataExtent:a}}(e,a,s);if(0===u.sum)return t.viewChildren=[];if(u.sum=function(t,e,n,i,r){if(!i)return n;for(var o=t.get("visibleMin"),a=r.length,s=a,l=a-1;l>=0;l--){var u=r["asc"===i?a-l-1:l].getValue();u/n*e<o&&(s=l,n-=u)}return"asc"===i?r.splice(0,a-s):r.splice(s,a-s),n}(e,n,u.sum,s,a),0===u.sum)return t.viewChildren=[];for(var h=0,c=a.length;h<c;h++){var p=a[h].getValue()/u.sum*n;a[h].setLayout({area:p})}l&&(a.length&&t.setLayout({isLeafRoot:!0},!0),a.length=0);return t.viewChildren=a,t.setLayout({dataExtent:u.dataExtent},!0),a}(t,s,f,e,n,i);if(g.length){var y={x:p,y:d,width:r,height:o},v=PD(r,o),m=1/0,x=[];x.area=0;for(var _=0,b=g.length;_<b;){var w=g[_];x.push(w),x.area+=w.getLayout().area;var S=GD(x,v,e.squareRatio);S<=m?(_++,m=S):(x.area-=x.pop().getLayout().area,WD(x,v,y,u,!1),v=PD(y.width,y.height),x.length=x.area=0,m=1/0)}if(x.length&&WD(x,v,y,u,!0),!n){var M=s.get("childrenVisibleMin");null!=M&&f<M&&(n=!0)}for(_=0,b=g.length;_<b;_++)FD(g[_],e,n,i+1)}}}function GD(t,e,n){for(var i=0,r=1/0,o=0,a=void 0,s=t.length;o<s;o++)(a=t[o].getLayout().area)&&(a<r&&(r=a),a>i&&(i=a));var l=t.area*t.area,u=e*e*n;return l?LD(u*i/l,l/(u*r)):1/0}function WD(t,e,n,i,r){var o=e===n.width?0:1,a=1-o,s=["x","y"],l=["width","height"],u=n[s[o]],h=e?t.area/e:0;(r||h>n[l[a]])&&(h=n[l[a]]);for(var c=0,p=t.length;c<p;c++){var d=t[c],f={},g=h?d.getLayout().area/h:0,y=f[l[a]]=LD(h-2*i,0),v=n[s[o]]+n[l[o]]-u,m=c===p-1||v<g?v:g,x=f[l[o]]=LD(m-2*i,0);f[s[a]]=n[s[a]]+PD(i,y/2),f[s[o]]=u+PD(i,x/2),u+=m,d.setLayout(f,!0)}n[s[a]]+=h,n[l[a]]-=h}function HD(t,e,n,i,r){var o=t.getLayout(),a=n[r],s=a&&a===t;if(!(a&&!s||r===n.length&&t!==i)){t.setLayout({isInView:!0,invisible:!s&&!e.intersect(o),isAboveViewRoot:s},!0);var l=new Ee(e.x-o.x,e.y-o.y,e.width,e.height);RD(t.viewChildren||[],(function(t){HD(t,l,n,i,r+1)}))}}function YD(t){return t.get(zD)?t.get(VD):0}function UD(t){var e=t.findComponents({mainType:"legend"});e&&e.length&&t.eachSeriesByType("graph",(function(t){var n=t.getCategoriesData(),i=t.getGraph().data,r=n.mapArray(n.getName);i.filterSelf((function(t){var n=i.getItemModel(t).getShallow("category");if(null!=n){j(n)&&(n=r[n]);for(var o=0;o<e.length;o++)if(!e[o].isSelected(n))return!1}return!0}))}))}function XD(t){var e={};t.eachSeriesByType("graph",(function(t){var n=t.getCategoriesData(),i=t.getData(),r={};n.each((function(i){var o=n.getName(i);r["ec-"+o]=i;var a=n.getItemModel(i),s=a.getModel("itemStyle").getItemStyle();s.fill||(s.fill=t.getColorFromPalette(o,e)),n.setItemVisual(i,"style",s);for(var l=["symbol","symbolSize","symbolKeepAspect"],u=0;u<l.length;u++){var h=a.getShallow(l[u],!0);null!=h&&n.setItemVisual(i,l[u],h)}})),n.count()&&i.each((function(t){var e=i.getItemModel(t).getShallow("category");if(null!=e){X(e)&&(e=r["ec-"+e]);var o=n.getItemVisual(e,"style");A(i.ensureUniqueItemVisual(t,"style"),o);for(var a=["symbol","symbolSize","symbolKeepAspect"],s=0;s<a.length;s++)i.setItemVisual(t,a[s],n.getItemVisual(e,a[s]))}}))}))}function ZD(t){return t instanceof Array||(t=[t,t]),t}function jD(t){t.eachSeriesByType("graph",(function(t){var e=t.getGraph(),n=t.getEdgeData(),i=ZD(t.get("edgeSymbol")),r=ZD(t.get("edgeSymbolSize"));n.setVisual("fromSymbol",i&&i[0]),n.setVisual("toSymbol",i&&i[1]),n.setVisual("fromSymbolSize",r&&r[0]),n.setVisual("toSymbolSize",r&&r[1]),n.setVisual("style",t.getModel("lineStyle").getLineStyle()),n.each((function(t){var i=n.getItemModel(t),r=e.getEdgeByIndex(t),o=ZD(i.getShallow("symbol",!0)),a=ZD(i.getShallow("symbolSize",!0)),s=i.getModel("lineStyle").getLineStyle(),l=n.ensureUniqueItemVisual(t,"style");switch(A(l,s),l.stroke){case"source":var u=r.node1.getVisual("style");l.stroke=u&&u.fill;break;case"target":u=r.node2.getVisual("style");l.stroke=u&&u.fill}o[0]&&r.setVisual("fromSymbol",o[0]),o[1]&&r.setVisual("toSymbol",o[1]),a[0]&&r.setVisual("fromSymbolSize",a[0]),a[1]&&r.setVisual("toSymbolSize",a[1])}))}))}var qD="--\x3e",KD=function(t){return t.get("autoCurveness")||null},$D=function(t,e){var n=KD(t),i=20,r=[];if(j(n))i=n;else if(Y(n))return void(t.__curvenessList=n);e>i&&(i=e);var o=i%2?i+2:i+3;r=[];for(var a=0;a<o;a++)r.push((a%2?a+1:a)/10*(a%2?-1:1));t.__curvenessList=r},JD=function(t,e,n){var i=[t.id,t.dataIndex].join("."),r=[e.id,e.dataIndex].join(".");return[n.uid,i,r].join(qD)},QD=function(t){var e=t.split(qD);return[e[0],e[2],e[1]].join(qD)},tA=function(t,e){var n=e.__edgeMap;return n[t]?n[t].length:0};function eA(t,e,n,i){var r=KD(e),o=Y(r);if(!r)return null;var a=function(t,e){var n=JD(t.node1,t.node2,e);return e.__edgeMap[n]}(t,e);if(!a)return null;for(var s=-1,l=0;l<a.length;l++)if(a[l]===n){s=l;break}var u=function(t,e){return tA(JD(t.node1,t.node2,e),e)+tA(JD(t.node2,t.node1,e),e)}(t,e);$D(e,u),t.lineStyle=t.lineStyle||{};var h=JD(t.node1,t.node2,e),c=e.__curvenessList,p=o||u%2?0:1;if(a.isForward)return c[p+s];var d=QD(h),f=tA(d,e),g=c[s+f+p];return i?o?r&&0===r[0]?(f+p)%2?g:-g:((f%2?0:1)+p)%2?g:-g:(f+p)%2?g:-g:c[s+f+p]}function nA(t){var e=t.coordinateSystem;if(!e||"view"===e.type){var n=t.getGraph();n.eachNode((function(t){var e=t.getModel();t.setLayout([+e.get("x"),+e.get("y")])})),iA(n,t)}}function iA(t,e){t.eachEdge((function(t,n){var i=ot(t.getModel().get(["lineStyle","curveness"]),-eA(t,e,n,!0),0),r=Tt(t.node1.getLayout()),o=Tt(t.node2.getLayout()),a=[r,o];+i&&a.push([(r[0]+o[0])/2-(r[1]-o[1])*i,(r[1]+o[1])/2-(o[0]-r[0])*i]),t.setLayout(a)}))}function rA(t,e){t.eachSeriesByType("graph",(function(t){var e=t.get("layout"),n=t.coordinateSystem;if(n&&"view"!==n.type){var i=t.getData(),r=[];E(n.dimensions,(function(t){r=r.concat(i.mapDimensionsAll(t))}));for(var o=0;o<i.count();o++){for(var a=[],s=!1,l=0;l<r.length;l++){var u=i.get(r[l],o);isNaN(u)||(s=!0),a.push(u)}s?i.setItemLayout(o,n.dataToPoint(a)):i.setItemLayout(o,[NaN,NaN])}iA(i.graph,t)}else e&&"none"!==e||nA(t)}))}function oA(t){var e=t.coordinateSystem;if("view"!==e.type)return 1;var n=t.option.nodeScaleRatio,i=e.scaleX;return((e.getZoom()-1)*n+1)/i}function aA(t){var e=t.getVisual("symbolSize");return e instanceof Array&&(e=(e[0]+e[1])/2),+e}var sA=Math.PI,lA=[];function uA(t,e,n,i){var r=t.coordinateSystem;if(!r||"view"===r.type){var o=r.getBoundingRect(),a=t.getData(),s=a.graph,l=o.width/2+o.x,u=o.height/2+o.y,h=Math.min(o.width,o.height)/2,c=a.count();if(a.setLayout({cx:l,cy:u}),c){if(n){var p=r.pointToData(i),d=p[0],f=p[1],g=[d-l,f-u];Et(g,g),Nt(g,g,h),n.setLayout([l+g[0],u+g[1]],!0),cA(n,t.get(["circular","rotateLabel"]),l,u)}hA[e](t,s,a,h,l,u,c),s.eachEdge((function(e,n){var i,r=ot(e.getModel().get(["lineStyle","curveness"]),eA(e,t,n),0),o=Tt(e.node1.getLayout()),a=Tt(e.node2.getLayout()),s=(o[0]+a[0])/2,h=(o[1]+a[1])/2;+r&&(i=[l*(r*=3)+s*(1-r),u*r+h*(1-r)]),e.setLayout([o,a,i])}))}}}var hA={value:function(t,e,n,i,r,o,a){var s=0,l=n.getSum("value"),u=2*Math.PI/(l||a);e.eachNode((function(t){var e=t.getValue("value"),n=u*(l?e:1)/2;s+=n,t.setLayout([i*Math.cos(s)+r,i*Math.sin(s)+o]),s+=n}))},symbolSize:function(t,e,n,i,r,o,a){var s=0;lA.length=a;var l=oA(t);e.eachNode((function(t){var e=aA(t);isNaN(e)&&(e=2),e<0&&(e=0),e*=l;var n=Math.asin(e/2/i);isNaN(n)&&(n=sA/2),lA[t.dataIndex]=n,s+=2*n}));var u=(2*sA-s)/a/2,h=0;e.eachNode((function(t){var e=u+lA[t.dataIndex];h+=e,(!t.getLayout()||!t.getLayout().fixed)&&t.setLayout([i*Math.cos(h)+r,i*Math.sin(h)+o]),h+=e}))}};function cA(t,e,n,i){var r=t.getGraphicEl();if(r){var o=t.getModel().get(["label","rotate"])||0,a=r.getSymbolPath();if(e){var s=t.getLayout(),l=Math.atan2(s[1]-i,s[0]-n);l<0&&(l=2*Math.PI+l);var u=s[0]<n;u&&(l-=Math.PI);var h=u?"left":"right";a.setTextConfig({rotation:-l,position:h,origin:"center"});var c=a.ensureState("emphasis");A(c.textConfig||(c.textConfig={}),{position:h})}else a.setTextConfig({rotation:o*=Math.PI/180})}}function pA(t){t.eachSeriesByType("graph",(function(t){"circular"===t.get("layout")&&uA(t,"symbolSize")}))}var dA=At;function fA(t){t.eachSeriesByType("graph",(function(t){var e=t.coordinateSystem;if(!e||"view"===e.type)if("force"===t.get("layout")){var n=t.preservedPoints||{},i=t.getGraph(),r=i.data,o=i.edgeData,a=t.getModel("force"),s=a.get("initLayout");t.preservedPoints?r.each((function(t){var e=r.getId(t);r.setItemLayout(t,n[e]||[NaN,NaN])})):s&&"none"!==s?"circular"===s&&uA(t,"value"):nA(t);var l=r.getDataExtent("value"),u=o.getDataExtent("value"),h=a.get("repulsion"),c=a.get("edgeLength"),p=Y(h)?h:[h,h],d=Y(c)?c:[c,c];d=[d[1],d[0]];var f=r.mapArray("value",(function(t,e){var n=r.getItemLayout(e),i=Yr(t,l,p);return isNaN(i)&&(i=(p[0]+p[1])/2),{w:i,rep:i,fixed:r.getItemModel(e).get("fixed"),p:!n||isNaN(n[0])||isNaN(n[1])?null:n}})),g=o.mapArray("value",(function(e,n){var r=i.getEdgeByIndex(n),o=Yr(e,u,d);isNaN(o)&&(o=(d[0]+d[1])/2);var a=r.getModel(),s=ot(r.getModel().get(["lineStyle","curveness"]),-eA(r,t,n,!0),0);return{n1:f[r.node1.dataIndex],n2:f[r.node2.dataIndex],d:o,curveness:s,ignoreForceLayout:a.get("ignoreForceLayout")}})),y=e.getBoundingRect(),v=function(t,e,n){for(var i=t,r=e,o=n.rect,a=o.width,s=o.height,l=[o.x+a/2,o.y+s/2],u=null==n.gravity?.1:n.gravity,h=0;h<i.length;h++){var c=i[h];c.p||(c.p=Mt(a*(Math.random()-.5)+l[0],s*(Math.random()-.5)+l[1])),c.pp=Tt(c.p),c.edges=null}var p,d,f=null==n.friction?.6:n.friction,g=f;return{warmUp:function(){g=.8*f},setFixed:function(t){i[t].fixed=!0},setUnfixed:function(t){i[t].fixed=!1},beforeStep:function(t){p=t},afterStep:function(t){d=t},step:function(t){p&&p(i,r);for(var e=[],n=i.length,o=0;o<r.length;o++){var a=r[o];if(!a.ignoreForceLayout){var s=a.n1;kt(e,(y=a.n2).p,s.p);var h=Lt(e)-a.d,c=y.w/(s.w+y.w);isNaN(c)&&(c=0),Et(e,e),!s.fixed&&dA(s.p,s.p,e,c*h*g),!y.fixed&&dA(y.p,y.p,e,-(1-c)*h*g)}}for(o=0;o<n;o++)(x=i[o]).fixed||(kt(e,l,x.p),dA(x.p,x.p,e,u*g));for(o=0;o<n;o++){s=i[o];for(var f=o+1;f<n;f++){var y;kt(e,(y=i[f]).p,s.p),0===(h=Lt(e))&&(Ct(e,Math.random()-.5,Math.random()-.5),h=1);var v=(s.rep+y.rep)/h/h;!s.fixed&&dA(s.pp,s.pp,e,v),!y.fixed&&dA(y.pp,y.pp,e,-v)}}var m=[];for(o=0;o<n;o++){var x;(x=i[o]).fixed||(kt(m,x.p,x.pp),dA(x.p,x.p,m,g),It(x.pp,x.p))}var _=(g*=.992)<.01;d&&d(i,r,_),t&&t(_)}}}(f,g,{rect:y,gravity:a.get("gravity"),friction:a.get("friction")});v.beforeStep((function(t,e){for(var n=0,r=t.length;n<r;n++)t[n].fixed&&It(t[n].p,i.getNodeByIndex(n).getLayout())})),v.afterStep((function(t,e,o){for(var a=0,s=t.length;a<s;a++)t[a].fixed||i.getNodeByIndex(a).setLayout(t[a].p),n[r.getId(a)]=t[a].p;for(a=0,s=e.length;a<s;a++){var l=e[a],u=i.getEdgeByIndex(a),h=l.n1.p,c=l.n2.p,p=u.getLayout();(p=p?p.slice():[])[0]=p[0]||[],p[1]=p[1]||[],It(p[0],h),It(p[1],c),+l.curveness&&(p[2]=[(h[0]+c[0])/2-(h[1]-c[1])*l.curveness,(h[1]+c[1])/2-(c[0]-h[0])*l.curveness]),u.setLayout(p)}})),t.forceLayout=v,t.preservedPoints=n,v.step()}else t.forceLayout=null}))}function gA(t,e){var n=[];return t.eachSeriesByType("graph",(function(t){var i=t.get("coordinateSystem");if(!i||"view"===i){var r=t.getData(),o=[],a=[];Oa(r.mapArray((function(t){var e=r.getItemModel(t);return[+e.get("x"),+e.get("y")]})),o,a),a[0]-o[0]==0&&(a[0]+=1,o[0]-=1),a[1]-o[1]==0&&(a[1]+=1,o[1]-=1);var s=(a[0]-o[0])/(a[1]-o[1]),l=function(t,e,n){return Tp(A(t.getBoxLayoutParams(),{aspect:n}),{width:e.getWidth(),height:e.getHeight()})}(t,e,s);isNaN(s)&&(o=[l.x,l.y],a=[l.x+l.width,l.y+l.height]);var u=a[0]-o[0],h=a[1]-o[1],c=l.width,p=l.height,d=t.coordinateSystem=new KT;d.zoomLimit=t.get("scaleLimit"),d.setBoundingRect(o[0],o[1],u,h),d.setViewRect(l.x,l.y,c,p),d.setCenter(t.get("center"),e),d.setZoom(t.get("zoom")),n.push(d)}})),n}var yA=Xu.prototype,vA=Ku.prototype,mA=function(){this.x1=0,this.y1=0,this.x2=0,this.y2=0,this.percent=1};!function(t){function e(){return null!==t&&t.apply(this,arguments)||this}n(e,t)}(mA);function xA(t){return isNaN(+t.cpx1)||isNaN(+t.cpy1)}var _A=function(t){function e(e){var n=t.call(this,e)||this;return n.type="ec-line",n}return n(e,t),e.prototype.getDefaultStyle=function(){return{stroke:"#000",fill:null}},e.prototype.getDefaultShape=function(){return new mA},e.prototype.buildPath=function(t,e){xA(e)?yA.buildPath.call(this,t,e):vA.buildPath.call(this,t,e)},e.prototype.pointAt=function(t){return xA(this.shape)?yA.pointAt.call(this,t):vA.pointAt.call(this,t)},e.prototype.tangentAt=function(t){var e=this.shape,n=xA(e)?[e.x2-e.x1,e.y2-e.y1]:vA.tangentAt.call(this,t);return Et(n,n)},e}(Ms),bA=["fromSymbol","toSymbol"];function wA(t){return"_"+t+"Type"}function SA(t,e,n){var i=e.getItemVisual(n,t);if(i&&"none"!==i){var r=e.getItemVisual(n,t+"Size"),o=e.getItemVisual(n,t+"Rotate"),a=e.getItemVisual(n,t+"Offset"),s=e.getItemVisual(n,t+"KeepAspect"),l=By(r),u=Fy(a||0,l),h=Vy(i,-l[0]/2+u[0],-l[1]/2+u[1],l[0],l[1],null,s);return h.__specifiedRotation=null==o||isNaN(o)?void 0:+o*Math.PI/180||0,h.name=t,h}}function MA(t,e){t.x1=e[0][0],t.y1=e[0][1],t.x2=e[1][0],t.y2=e[1][1],t.percent=1;var n=e[2];n?(t.cpx1=n[0],t.cpy1=n[1]):(t.cpx1=NaN,t.cpy1=NaN)}var IA=function(t){function e(e,n,i){var r=t.call(this)||this;return r._createLine(e,n,i),r}return n(e,t),e.prototype._createLine=function(t,e,n){var i=t.hostModel,r=function(t){var e=new _A({name:"line",subPixelOptimize:!0});return MA(e.shape,t),e}(t.getItemLayout(e));r.shape.percent=0,fh(r,{shape:{percent:1}},i,e),this.add(r),E(bA,(function(n){var i=SA(n,t,e);this.add(i),this[wA(n)]=t.getItemVisual(e,n)}),this),this._updateCommonStl(t,e,n)},e.prototype.updateData=function(t,e,n){var i=t.hostModel,r=this.childOfName("line"),o=t.getItemLayout(e),a={shape:{}};MA(a.shape,o),dh(r,a,i,e),E(bA,(function(n){var i=t.getItemVisual(e,n),r=wA(n);if(this[r]!==i){this.remove(this.childOfName(n));var o=SA(n,t,e);this.add(o)}this[r]=i}),this),this._updateCommonStl(t,e,n)},e.prototype.getLinePath=function(){return this.childAt(0)},e.prototype._updateCommonStl=function(t,e,n){var i=t.hostModel,r=this.childOfName("line"),o=n&&n.emphasisLineStyle,a=n&&n.blurLineStyle,s=n&&n.selectLineStyle,l=n&&n.labelStatesModels,u=n&&n.emphasisDisabled,h=n&&n.focus,c=n&&n.blurScope;if(!n||t.hasItemOption){var p=t.getItemModel(e),d=p.getModel("emphasis");o=d.getModel("lineStyle").getLineStyle(),a=p.getModel(["blur","lineStyle"]).getLineStyle(),s=p.getModel(["select","lineStyle"]).getLineStyle(),u=d.get("disabled"),h=d.get("focus"),c=d.get("blurScope"),l=tc(p)}var f=t.getItemVisual(e,"style"),g=f.stroke;r.useStyle(f),r.style.fill=null,r.style.strokeNoScale=!0,r.ensureState("emphasis").style=o,r.ensureState("blur").style=a,r.ensureState("select").style=s,E(bA,(function(t){var e=this.childOfName(t);if(e){e.setColor(g),e.style.opacity=f.opacity;for(var n=0;n<rl.length;n++){var i=rl[n],o=r.getState(i);if(o){var a=o.style||{},s=e.ensureState(i),l=s.style||(s.style={});null!=a.stroke&&(l[e.__isEmptyBrush?"stroke":"fill"]=a.stroke),null!=a.opacity&&(l.opacity=a.opacity)}}e.markRedraw()}}),this);var y=i.getRawValue(e);Qh(this,l,{labelDataIndex:e,labelFetcher:{getFormattedLabel:function(e,n){return i.getFormattedLabel(e,n,t.dataType)}},inheritColor:g||"#000",defaultOpacity:f.opacity,defaultText:(null==y?t.getName(e):isFinite(y)?Xr(y):y)+""});var v=this.getTextContent();if(v){var m=l.normal;v.__align=v.style.align,v.__verticalAlign=v.style.verticalAlign,v.__position=m.get("position")||"middle";var x=m.get("distance");Y(x)||(x=[x,x]),v.__labelDistance=x}this.setTextConfig({position:null,local:!0,inside:!1}),Hl(this,h,c,u)},e.prototype.highlight=function(){Al(this)},e.prototype.downplay=function(){kl(this)},e.prototype.updateLayout=function(t,e){this.setLinePoints(t.getItemLayout(e))},e.prototype.setLinePoints=function(t){var e=this.childOfName("line");MA(e.shape,t),e.dirty()},e.prototype.beforeUpdate=function(){var t=this,e=t.childOfName("fromSymbol"),n=t.childOfName("toSymbol"),i=t.getTextContent();if(e||n||i&&!i.ignore){for(var r=1,o=this.parent;o;)o.scaleX&&(r/=o.scaleX),o=o.parent;var a=t.childOfName("line");if(this.__dirty||a.__dirty){var s=a.shape.percent,l=a.pointAt(0),u=a.pointAt(s),h=kt([],u,l);if(Et(h,h),e&&(e.setPosition(l),S(e,0),e.scaleX=e.scaleY=r*s,e.markRedraw()),n&&(n.setPosition(u),S(n,1),n.scaleX=n.scaleY=r*s,n.markRedraw()),i&&!i.ignore){i.x=i.y=0,i.originX=i.originY=0;var c=void 0,p=void 0,d=i.__labelDistance,f=d[0]*r,g=d[1]*r,y=s/2,v=a.tangentAt(y),m=[v[1],-v[0]],x=a.pointAt(y);m[1]>0&&(m[0]=-m[0],m[1]=-m[1]);var _=v[0]<0?-1:1;if("start"!==i.__position&&"end"!==i.__position){var b=-Math.atan2(v[1],v[0]);u[0]<l[0]&&(b=Math.PI+b),i.rotation=b}var w=void 0;switch(i.__position){case"insideStartTop":case"insideMiddleTop":case"insideEndTop":case"middle":w=-g,p="bottom";break;case"insideStartBottom":case"insideMiddleBottom":case"insideEndBottom":w=g,p="top";break;default:w=0,p="middle"}switch(i.__position){case"end":i.x=h[0]*f+u[0],i.y=h[1]*g+u[1],c=h[0]>.8?"left":h[0]<-.8?"right":"center",p=h[1]>.8?"top":h[1]<-.8?"bottom":"middle";break;case"start":i.x=-h[0]*f+l[0],i.y=-h[1]*g+l[1],c=h[0]>.8?"right":h[0]<-.8?"left":"center",p=h[1]>.8?"bottom":h[1]<-.8?"top":"middle";break;case"insideStartTop":case"insideStart":case"insideStartBottom":i.x=f*_+l[0],i.y=l[1]+w,c=v[0]<0?"right":"left",i.originX=-f*_,i.originY=-w;break;case"insideMiddleTop":case"insideMiddle":case"insideMiddleBottom":case"middle":i.x=x[0],i.y=x[1]+w,c="center",i.originY=-w;break;case"insideEndTop":case"insideEnd":case"insideEndBottom":i.x=-f*_+u[0],i.y=u[1]+w,c=v[0]>=0?"right":"left",i.originX=f*_,i.originY=-w}i.scaleX=i.scaleY=r,i.setStyle({verticalAlign:i.__verticalAlign||p,align:i.__align||c})}}}function S(t,e){var n=t.__specifiedRotation;if(null==n){var i=a.tangentAt(e);t.attr("rotation",(1===e?-1:1)*Math.PI/2-Math.atan2(i[1],i[0]))}else t.attr("rotation",n)}},e}(Er),TA=function(){function t(t){this.group=new Er,this._LineCtor=t||IA}return t.prototype.updateData=function(t){var e=this;this._progressiveEls=null;var n=this,i=n.group,r=n._lineData;n._lineData=t,r||i.removeAll();var o=CA(t);t.diff(r).add((function(n){e._doAdd(t,n,o)})).update((function(n,i){e._doUpdate(r,t,i,n,o)})).remove((function(t){i.remove(r.getItemGraphicEl(t))})).execute()},t.prototype.updateLayout=function(){var t=this._lineData;t&&t.eachItemGraphicEl((function(e,n){e.updateLayout(t,n)}),this)},t.prototype.incrementalPrepareUpdate=function(t){this._seriesScope=CA(t),this._lineData=null,this.group.removeAll()},t.prototype.incrementalUpdate=function(t,e){function n(t){t.isGroup||function(t){return t.animators&&t.animators.length>0}(t)||(t.incremental=!0,t.ensureState("emphasis").hoverLayer=!0)}this._progressiveEls=[];for(var i=t.start;i<t.end;i++){if(AA(e.getItemLayout(i))){var r=new this._LineCtor(e,i,this._seriesScope);r.traverse(n),this.group.add(r),e.setItemGraphicEl(i,r),this._progressiveEls.push(r)}}},t.prototype.remove=function(){this.group.removeAll()},t.prototype.eachRendered=function(t){jh(this._progressiveEls||this.group,t)},t.prototype._doAdd=function(t,e,n){if(AA(t.getItemLayout(e))){var i=new this._LineCtor(t,e,n);t.setItemGraphicEl(e,i),this.group.add(i)}},t.prototype._doUpdate=function(t,e,n,i,r){var o=t.getItemGraphicEl(n);AA(e.getItemLayout(i))?(o?o.updateData(e,i,r):o=new this._LineCtor(e,i,r),e.setItemGraphicEl(i,o),this.group.add(o)):this.group.remove(o)},t}();function CA(t){var e=t.hostModel,n=e.getModel("emphasis");return{lineStyle:e.getModel("lineStyle").getLineStyle(),emphasisLineStyle:n.getModel(["lineStyle"]).getLineStyle(),blurLineStyle:e.getModel(["blur","lineStyle"]).getLineStyle(),selectLineStyle:e.getModel(["select","lineStyle"]).getLineStyle(),emphasisDisabled:n.get("disabled"),blurScope:n.get("blurScope"),focus:n.get("focus"),labelStatesModels:tc(e)}}function DA(t){return isNaN(t[0])||isNaN(t[1])}function AA(t){return t&&!DA(t[0])&&!DA(t[1])}var kA=[],LA=[],PA=[],OA=Mn,RA=Ft,NA=Math.abs;function EA(t,e,n){for(var i,r=t[0],o=t[1],a=t[2],s=1/0,l=n*n,u=.1,h=.1;h<=.9;h+=.1){kA[0]=OA(r[0],o[0],a[0],h),kA[1]=OA(r[1],o[1],a[1],h),(d=NA(RA(kA,e)-l))<s&&(s=d,i=h)}for(var c=0;c<32;c++){var p=i+u;LA[0]=OA(r[0],o[0],a[0],i),LA[1]=OA(r[1],o[1],a[1],i),PA[0]=OA(r[0],o[0],a[0],p),PA[1]=OA(r[1],o[1],a[1],p);var d=RA(LA,e)-l;if(NA(d)<.01)break;var f=RA(PA,e)-l;u/=2,d<0?f>=0?i+=u:i-=u:f>=0?i-=u:i+=u}return i}function zA(t,e){var n=[],i=Cn,r=[[],[],[]],o=[[],[]],a=[];e/=2,t.eachEdge((function(t,s){var l=t.getLayout(),u=t.getVisual("fromSymbol"),h=t.getVisual("toSymbol");l.__original||(l.__original=[Tt(l[0]),Tt(l[1])],l[2]&&l.__original.push(Tt(l[2])));var c=l.__original;if(null!=l[2]){if(It(r[0],c[0]),It(r[1],c[2]),It(r[2],c[1]),u&&"none"!==u){var p=aA(t.node1),d=EA(r,c[0],p*e);i(r[0][0],r[1][0],r[2][0],d,n),r[0][0]=n[3],r[1][0]=n[4],i(r[0][1],r[1][1],r[2][1],d,n),r[0][1]=n[3],r[1][1]=n[4]}if(h&&"none"!==h){p=aA(t.node2),d=EA(r,c[1],p*e);i(r[0][0],r[1][0],r[2][0],d,n),r[1][0]=n[1],r[2][0]=n[2],i(r[0][1],r[1][1],r[2][1],d,n),r[1][1]=n[1],r[2][1]=n[2]}It(l[0],r[0]),It(l[1],r[2]),It(l[2],r[1])}else{if(It(o[0],c[0]),It(o[1],c[1]),kt(a,o[1],o[0]),Et(a,a),u&&"none"!==u){p=aA(t.node1);At(o[0],o[0],a,p*e)}if(h&&"none"!==h){p=aA(t.node2);At(o[1],o[1],a,-p*e)}It(l[0],o[0]),It(l[1],o[1])}}))}function VA(t){return"view"===t.type}var BA=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.init=function(t,e){var n=new iS,i=new TA,r=this.group;this._controller=new BI(e.getZr()),this._controllerHost={target:r},r.add(n.group),r.add(i.group),this._symbolDraw=n,this._lineDraw=i,this._firstRender=!0},e.prototype.render=function(t,e,n){var i=this,r=t.coordinateSystem;this._model=t;var o=this._symbolDraw,a=this._lineDraw,s=this.group;if(VA(r)){var l={x:r.x,y:r.y,scaleX:r.scaleX,scaleY:r.scaleY};this._firstRender?s.attr(l):dh(s,l,t)}zA(t.getGraph(),oA(t));var u=t.getData();o.updateData(u);var h=t.getEdgeData();a.updateData(h),this._updateNodeAndLinkScale(),this._updateController(t,e,n),clearTimeout(this._layoutTimeout);var c=t.forceLayout,p=t.get(["force","layoutAnimation"]);c&&this._startForceLayoutIteration(c,p);var d=t.get("layout");u.graph.eachNode((function(e){var n=e.dataIndex,r=e.getGraphicEl(),o=e.getModel();if(r){r.off("drag").off("dragend");var a=o.get("draggable");a&&r.on("drag",(function(o){switch(d){case"force":c.warmUp(),!i._layouting&&i._startForceLayoutIteration(c,p),c.setFixed(n),u.setItemLayout(n,[r.x,r.y]);break;case"circular":u.setItemLayout(n,[r.x,r.y]),e.setLayout({fixed:!0},!0),uA(t,"symbolSize",e,[o.offsetX,o.offsetY]),i.updateLayout(t);break;default:u.setItemLayout(n,[r.x,r.y]),iA(t.getGraph(),t),i.updateLayout(t)}})).on("dragend",(function(){c&&c.setUnfixed(n)})),r.setDraggable(a,!!o.get("cursor")),"adjacency"===o.get(["emphasis","focus"])&&(Js(r).focus=e.getAdjacentDataIndices())}})),u.graph.eachEdge((function(t){var e=t.getGraphicEl(),n=t.getModel().get(["emphasis","focus"]);e&&"adjacency"===n&&(Js(e).focus={edge:[t.dataIndex],node:[t.node1.dataIndex,t.node2.dataIndex]})}));var f="circular"===t.get("layout")&&t.get(["circular","rotateLabel"]),g=u.getLayout("cx"),y=u.getLayout("cy");u.graph.eachNode((function(t){cA(t,f,g,y)})),this._firstRender=!1},e.prototype.dispose=function(){this._controller&&this._controller.dispose(),this._controllerHost=null},e.prototype._startForceLayoutIteration=function(t,e){var n=this;!function i(){t.step((function(t){n.updateLayout(n._model),(n._layouting=!t)&&(e?n._layoutTimeout=setTimeout(i,16):i())}))}()},e.prototype._updateController=function(t,e,n){var i=this,r=this._controller,o=this._controllerHost,a=this.group;r.setPointerChecker((function(e,i,r){var o=a.getBoundingRect();return o.applyTransform(a.transform),o.contain(i,r)&&!ZI(e,n,t)})),VA(t.coordinateSystem)?(r.enable(t.get("roam")),o.zoomLimit=t.get("scaleLimit"),o.zoom=t.coordinateSystem.getZoom(),r.off("pan").off("zoom").on("pan",(function(e){HI(o,e.dx,e.dy),n.dispatchAction({seriesId:t.id,type:"graphRoam",dx:e.dx,dy:e.dy})})).on("zoom",(function(e){YI(o,e.scale,e.originX,e.originY),n.dispatchAction({seriesId:t.id,type:"graphRoam",zoom:e.scale,originX:e.originX,originY:e.originY}),i._updateNodeAndLinkScale(),zA(t.getGraph(),oA(t)),i._lineDraw.updateLayout(),n.updateLabelLayout()}))):r.disable()},e.prototype._updateNodeAndLinkScale=function(){var t=this._model,e=t.getData(),n=oA(t);e.eachItemGraphicEl((function(t,e){t&&t.setSymbolScale(n)}))},e.prototype.updateLayout=function(t){zA(t.getGraph(),oA(t)),this._symbolDraw.updateLayout(),this._lineDraw.updateLayout()},e.prototype.remove=function(t,e){this._symbolDraw&&this._symbolDraw.remove(),this._lineDraw&&this._lineDraw.remove()},e.type="graph",e}(Tg);function FA(t){return"_EC_"+t}var GA=function(){function t(t){this.type="graph",this.nodes=[],this.edges=[],this._nodesMap={},this._edgesMap={},this._directed=t||!1}return t.prototype.isDirected=function(){return this._directed},t.prototype.addNode=function(t,e){t=null==t?""+e:""+t;var n=this._nodesMap;if(!n[FA(t)]){var i=new WA(t,e);return i.hostGraph=this,this.nodes.push(i),n[FA(t)]=i,i}},t.prototype.getNodeByIndex=function(t){var e=this.data.getRawIndex(t);return this.nodes[e]},t.prototype.getNodeById=function(t){return this._nodesMap[FA(t)]},t.prototype.addEdge=function(t,e,n){var i=this._nodesMap,r=this._edgesMap;if(j(t)&&(t=this.nodes[t]),j(e)&&(e=this.nodes[e]),t instanceof WA||(t=i[FA(t)]),e instanceof WA||(e=i[FA(e)]),t&&e){var o=t.id+"-"+e.id,a=new HA(t,e,n);return a.hostGraph=this,this._directed&&(t.outEdges.push(a),e.inEdges.push(a)),t.edges.push(a),t!==e&&e.edges.push(a),this.edges.push(a),r[o]=a,a}},t.prototype.getEdgeByIndex=function(t){var e=this.edgeData.getRawIndex(t);return this.edges[e]},t.prototype.getEdge=function(t,e){t instanceof WA&&(t=t.id),e instanceof WA&&(e=e.id);var n=this._edgesMap;return this._directed?n[t+"-"+e]:n[t+"-"+e]||n[e+"-"+t]},t.prototype.eachNode=function(t,e){for(var n=this.nodes,i=n.length,r=0;r<i;r++)n[r].dataIndex>=0&&t.call(e,n[r],r)},t.prototype.eachEdge=function(t,e){for(var n=this.edges,i=n.length,r=0;r<i;r++)n[r].dataIndex>=0&&n[r].node1.dataIndex>=0&&n[r].node2.dataIndex>=0&&t.call(e,n[r],r)},t.prototype.breadthFirstTraverse=function(t,e,n,i){if(e instanceof WA||(e=this._nodesMap[FA(e)]),e){for(var r="out"===n?"outEdges":"in"===n?"inEdges":"edges",o=0;o<this.nodes.length;o++)this.nodes[o].__visited=!1;if(!t.call(i,e,null))for(var a=[e];a.length;){var s=a.shift(),l=s[r];for(o=0;o<l.length;o++){var u=l[o],h=u.node1===s?u.node2:u.node1;if(!h.__visited){if(t.call(i,h,s))return;a.push(h),h.__visited=!0}}}}},t.prototype.update=function(){for(var t=this.data,e=this.edgeData,n=this.nodes,i=this.edges,r=0,o=n.length;r<o;r++)n[r].dataIndex=-1;for(r=0,o=t.count();r<o;r++)n[t.getRawIndex(r)].dataIndex=r;e.filterSelf((function(t){var n=i[e.getRawIndex(t)];return n.node1.dataIndex>=0&&n.node2.dataIndex>=0}));for(r=0,o=i.length;r<o;r++)i[r].dataIndex=-1;for(r=0,o=e.count();r<o;r++)i[e.getRawIndex(r)].dataIndex=r},t.prototype.clone=function(){for(var e=new t(this._directed),n=this.nodes,i=this.edges,r=0;r<n.length;r++)e.addNode(n[r].id,n[r].dataIndex);for(r=0;r<i.length;r++){var o=i[r];e.addEdge(o.node1.id,o.node2.id,o.dataIndex)}return e},t}(),WA=function(){function t(t,e){this.inEdges=[],this.outEdges=[],this.edges=[],this.dataIndex=-1,this.id=null==t?"":t,this.dataIndex=null==e?-1:e}return t.prototype.degree=function(){return this.edges.length},t.prototype.inDegree=function(){return this.inEdges.length},t.prototype.outDegree=function(){return this.outEdges.length},t.prototype.getModel=function(t){if(!(this.dataIndex<0))return this.hostGraph.data.getItemModel(this.dataIndex).getModel(t)},t.prototype.getAdjacentDataIndices=function(){for(var t={edge:[],node:[]},e=0;e<this.edges.length;e++){var n=this.edges[e];n.dataIndex<0||(t.edge.push(n.dataIndex),t.node.push(n.node1.dataIndex,n.node2.dataIndex))}return t},t}(),HA=function(){function t(t,e,n){this.dataIndex=-1,this.node1=t,this.node2=e,this.dataIndex=null==n?-1:n}return t.prototype.getModel=function(t){if(!(this.dataIndex<0))return this.hostGraph.edgeData.getItemModel(this.dataIndex).getModel(t)},t.prototype.getAdjacentDataIndices=function(){return{edge:[this.dataIndex],node:[this.node1.dataIndex,this.node2.dataIndex]}},t}();function YA(t,e){return{getValue:function(n){var i=this[t][e];return i.getStore().get(i.getDimensionIndex(n||"value"),this.dataIndex)},setVisual:function(n,i){this.dataIndex>=0&&this[t][e].setItemVisual(this.dataIndex,n,i)},getVisual:function(n){return this[t][e].getItemVisual(this.dataIndex,n)},setLayout:function(n,i){this.dataIndex>=0&&this[t][e].setItemLayout(this.dataIndex,n,i)},getLayout:function(){return this[t][e].getItemLayout(this.dataIndex)},getGraphicEl:function(){return this[t][e].getItemGraphicEl(this.dataIndex)},getRawIndex:function(){return this[t][e].getRawIndex(this.dataIndex)}}}function UA(t,e,n,i,r){for(var o=new GA(i),a=0;a<t.length;a++)o.addNode(it(t[a].id,t[a].name,a),a);var s=[],l=[],u=0;for(a=0;a<e.length;a++){var h=e[a],c=h.source,p=h.target;o.addEdge(c,p,u)&&(l.push(h),s.push(it(Do(h.id,null),c+" > "+p)),u++)}var d,f=n.get("coordinateSystem");if("cartesian2d"===f||"polar"===f)d=hx(t,n);else{var g=vd.get(f),y=g&&g.dimensions||[];P(y,"value")<0&&y.concat(["value"]);var v=nx(t,{coordDimensions:y,encodeDefine:n.getEncode()}).dimensions;(d=new ex(v,n)).initData(t)}var m=new ex(["value"],n);return m.initData(l,s),r&&r(d,m),kC({mainData:d,struct:o,structAttr:"graph",datas:{node:d,edge:m},datasAttr:{node:"data",edge:"edgeData"}}),o.update(),o}R(WA,YA("hostGraph","data")),R(HA,YA("hostGraph","edgeData"));var XA=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.hasSymbolVisual=!0,n}return n(e,t),e.prototype.init=function(e){t.prototype.init.apply(this,arguments);var n=this;function i(){return n._categoriesData}this.legendVisualProvider=new mM(i,i),this.fillDataTextStyle(e.edges||e.links),this._updateCategoriesData()},e.prototype.mergeOption=function(e){t.prototype.mergeOption.apply(this,arguments),this.fillDataTextStyle(e.edges||e.links),this._updateCategoriesData()},e.prototype.mergeDefaultAndTheme=function(e){t.prototype.mergeDefaultAndTheme.apply(this,arguments),bo(e,"edgeLabel",["show"])},e.prototype.getInitialData=function(t,e){var n,i=t.edges||t.links||[],r=t.data||t.nodes||[],o=this;if(r&&i){KD(n=this)&&(n.__curvenessList=[],n.__edgeMap={},$D(n));var a=UA(r,i,this,!0,(function(t,e){t.wrapMethod("getItemModel",(function(t){var e=o._categoriesModels[t.getShallow("category")];return e&&(e.parentModel=t.parentModel,t.parentModel=e),t}));var n=Sc.prototype.getModel;function i(t,e){var i=n.call(this,t,e);return i.resolveParentPath=r,i}function r(t){if(t&&("label"===t[0]||"label"===t[1])){var e=t.slice();return"label"===t[0]?e[0]="edgeLabel":"label"===t[1]&&(e[1]="edgeLabel"),e}return t}e.wrapMethod("getItemModel",(function(t){return t.resolveParentPath=r,t.getModel=i,t}))}));return E(a.edges,(function(t){!function(t,e,n,i){if(KD(n)){var r=JD(t,e,n),o=n.__edgeMap,a=o[QD(r)];o[r]&&!a?o[r].isForward=!0:a&&o[r]&&(a.isForward=!0,o[r].isForward=!1),o[r]=o[r]||[],o[r].push(i)}}(t.node1,t.node2,this,t.dataIndex)}),this),a.data}},e.prototype.getGraph=function(){return this.getData().graph},e.prototype.getEdgeData=function(){return this.getGraph().edgeData},e.prototype.getCategoriesData=function(){return this._categoriesData},e.prototype.formatTooltip=function(t,e,n){if("edge"===n){var i=this.getData(),r=this.getDataParams(t,n),o=i.graph.getEdgeByIndex(t),a=i.getName(o.node1.dataIndex),s=i.getName(o.node2.dataIndex),l=[];return null!=a&&l.push(a),null!=s&&l.push(s),Qf("nameValue",{name:l.join(" > "),value:r.value,noValue:null==r.value})}return cg({series:this,dataIndex:t,multipleSeries:e})},e.prototype._updateCategoriesData=function(){var t=z(this.option.categories||[],(function(t){return null!=t.value?t:A({value:0},t)})),e=new ex(["value"],this);e.initData(t),this._categoriesData=e,this._categoriesModels=e.mapArray((function(t){return e.getItemModel(t)}))},e.prototype.setZoom=function(t){this.option.zoom=t},e.prototype.setCenter=function(t){this.option.center=t},e.prototype.isAnimationEnabled=function(){return t.prototype.isAnimationEnabled.call(this)&&!("force"===this.get("layout")&&this.get(["force","layoutAnimation"]))},e.type="series.graph",e.dependencies=["grid","polar","geo","singleAxis","calendar"],e.defaultOption={z:2,coordinateSystem:"view",legendHoverLink:!0,layout:null,circular:{rotateLabel:!1},force:{initLayout:null,repulsion:[0,50],gravity:.1,friction:.6,edgeLength:30,layoutAnimation:!0},left:"center",top:"center",symbol:"circle",symbolSize:10,edgeSymbol:["none","none"],edgeSymbolSize:10,edgeLabel:{position:"middle",distance:5},draggable:!1,roam:!1,center:null,zoom:1,nodeScaleRatio:.6,label:{show:!1,formatter:"{b}"},itemStyle:{},lineStyle:{color:"#aaa",width:1,opacity:.5},emphasis:{scale:!0,label:{show:!0}},select:{itemStyle:{borderColor:"#212121"}}},e}(fg),ZA={type:"graphRoam",event:"graphRoam",update:"none"};var jA=function(){this.angle=0,this.width=10,this.r=10,this.x=0,this.y=0},qA=function(t){function e(e){var n=t.call(this,e)||this;return n.type="pointer",n}return n(e,t),e.prototype.getDefaultShape=function(){return new jA},e.prototype.buildPath=function(t,e){var n=Math.cos,i=Math.sin,r=e.r,o=e.width,a=e.angle,s=e.x-n(a)*o*(o>=r/3?1:2),l=e.y-i(a)*o*(o>=r/3?1:2);a=e.angle-Math.PI/2,t.moveTo(s,l),t.lineTo(e.x+n(a)*o,e.y+i(a)*o),t.lineTo(e.x+n(e.angle)*r,e.y+i(e.angle)*r),t.lineTo(e.x-n(a)*o,e.y-i(a)*o),t.lineTo(s,l)},e}(Ms);function KA(t,e){var n=null==t?"":t+"";return e&&(X(e)?n=e.replace("{value}",n):U(e)&&(n=e(t))),n}var $A=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.render=function(t,e,n){this.group.removeAll();var i=t.get(["axisLine","lineStyle","color"]),r=function(t,e){var n=t.get("center"),i=e.getWidth(),r=e.getHeight(),o=Math.min(i,r);return{cx:Ur(n[0],e.getWidth()),cy:Ur(n[1],e.getHeight()),r:Ur(t.get("radius"),o/2)}}(t,n);this._renderMain(t,e,n,i,r),this._data=t.getData()},e.prototype.dispose=function(){},e.prototype._renderMain=function(t,e,n,i,r){var o=this.group,a=t.get("clockwise"),s=-t.get("startAngle")/180*Math.PI,l=-t.get("endAngle")/180*Math.PI,u=t.getModel("axisLine"),h=u.get("roundCap")?ES:Eu,c=u.get("show"),p=u.getModel("lineStyle"),d=p.get("width"),f=[s,l];is(f,!a);for(var g=(l=f[1])-(s=f[0]),y=s,v=[],m=0;c&&m<i.length;m++){var x=new h({shape:{startAngle:y,endAngle:l=s+g*Math.min(Math.max(i[m][0],0),1),cx:r.cx,cy:r.cy,clockwise:a,r0:r.r-d,r:r.r},silent:!0});x.setStyle({fill:i[m][1]}),x.setStyle(p.getLineStyle(["color","width"])),v.push(x),y=l}v.reverse(),E(v,(function(t){return o.add(t)}));var _=function(t){if(t<=0)return i[0][1];var e;for(e=0;e<i.length;e++)if(i[e][0]>=t&&(0===e?0:i[e-1][0])<t)return i[e][1];return i[e-1][1]};this._renderTicks(t,e,n,_,r,s,l,a,d),this._renderTitleAndDetail(t,e,n,_,r),this._renderAnchor(t,r),this._renderPointer(t,e,n,_,r,s,l,a,d)},e.prototype._renderTicks=function(t,e,n,i,r,o,a,s,l){for(var u,h,c=this.group,p=r.cx,d=r.cy,f=r.r,g=+t.get("min"),y=+t.get("max"),v=t.getModel("splitLine"),m=t.getModel("axisTick"),x=t.getModel("axisLabel"),_=t.get("splitNumber"),b=m.get("splitNumber"),w=Ur(v.get("length"),f),S=Ur(m.get("length"),f),M=o,I=(a-o)/_,T=I/b,C=v.getModel("lineStyle").getLineStyle(),D=m.getModel("lineStyle").getLineStyle(),A=v.get("distance"),k=0;k<=_;k++){if(u=Math.cos(M),h=Math.sin(M),v.get("show")){var L=new Xu({shape:{x1:u*(f-(P=A?A+l:l))+p,y1:h*(f-P)+d,x2:u*(f-w-P)+p,y2:h*(f-w-P)+d},style:C,silent:!0});"auto"===C.stroke&&L.setStyle({stroke:i(k/_)}),c.add(L)}if(x.get("show")){var P=x.get("distance")+A,O=KA(Xr(k/_*(y-g)+g),x.get("formatter")),R=i(k/_),N=u*(f-w-P)+p,E=h*(f-w-P)+d,z=x.get("rotate"),V=0;"radial"===z?(V=-M+2*Math.PI)>Math.PI/2&&(V+=Math.PI):"tangential"===z?V=-M-Math.PI/2:j(z)&&(V=z*Math.PI/180),0===V?c.add(new Bs({style:ec(x,{text:O,x:N,y:E,verticalAlign:h<-.8?"top":h>.8?"bottom":"middle",align:u<-.4?"left":u>.4?"right":"center"},{inheritColor:R}),silent:!0})):c.add(new Bs({style:ec(x,{text:O,x:N,y:E,verticalAlign:"middle",align:"center"},{inheritColor:R}),silent:!0,originX:N,originY:E,rotation:V}))}if(m.get("show")&&k!==_){P=(P=m.get("distance"))?P+l:l;for(var B=0;B<=b;B++){u=Math.cos(M),h=Math.sin(M);var F=new Xu({shape:{x1:u*(f-P)+p,y1:h*(f-P)+d,x2:u*(f-S-P)+p,y2:h*(f-S-P)+d},silent:!0,style:D});"auto"===D.stroke&&F.setStyle({stroke:i((k+B/b)/_)}),c.add(F),M+=T}M-=T}else M+=I}},e.prototype._renderPointer=function(t,e,n,i,r,o,a,s,l){var u=this.group,h=this._data,c=this._progressEls,p=[],d=t.get(["pointer","show"]),f=t.getModel("progress"),g=f.get("show"),y=t.getData(),v=y.mapDimension("value"),m=+t.get("min"),x=+t.get("max"),_=[m,x],b=[o,a];function w(e,n){var i,o=y.getItemModel(e).getModel("pointer"),a=Ur(o.get("width"),r.r),s=Ur(o.get("length"),r.r),l=t.get(["pointer","icon"]),u=o.get("offsetCenter"),h=Ur(u[0],r.r),c=Ur(u[1],r.r),p=o.get("keepAspect");return(i=l?Vy(l,h-a/2,c-s,a,s,null,p):new qA({shape:{angle:-Math.PI/2,width:a,r:s,x:h,y:c}})).rotation=-(n+Math.PI/2),i.x=r.cx,i.y=r.cy,i}function S(t,e){var n=f.get("roundCap")?ES:Eu,i=f.get("overlap"),a=i?f.get("width"):l/y.count(),u=i?r.r-a:r.r-(t+1)*a,h=i?r.r:r.r-t*a,c=new n({shape:{startAngle:o,endAngle:e,cx:r.cx,cy:r.cy,clockwise:s,r0:u,r:h}});return i&&(c.z2=x-y.get(v,t)%x),c}(g||d)&&(y.diff(h).add((function(e){var n=y.get(v,e);if(d){var i=w(e,o);fh(i,{rotation:-((isNaN(+n)?b[0]:Yr(n,_,b,!0))+Math.PI/2)},t),u.add(i),y.setItemGraphicEl(e,i)}if(g){var r=S(e,o),a=f.get("clip");fh(r,{shape:{endAngle:Yr(n,_,b,a)}},t),u.add(r),Qs(t.seriesIndex,y.dataType,e,r),p[e]=r}})).update((function(e,n){var i=y.get(v,e);if(d){var r=h.getItemGraphicEl(n),a=r?r.rotation:o,s=w(e,a);s.rotation=a,dh(s,{rotation:-((isNaN(+i)?b[0]:Yr(i,_,b,!0))+Math.PI/2)},t),u.add(s),y.setItemGraphicEl(e,s)}if(g){var l=c[n],m=S(e,l?l.shape.endAngle:o),x=f.get("clip");dh(m,{shape:{endAngle:Yr(i,_,b,x)}},t),u.add(m),Qs(t.seriesIndex,y.dataType,e,m),p[e]=m}})).execute(),y.each((function(t){var e=y.getItemModel(t),n=e.getModel("emphasis"),r=n.get("focus"),o=n.get("blurScope"),a=n.get("disabled");if(d){var s=y.getItemGraphicEl(t),l=y.getItemVisual(t,"style"),u=l.fill;if(s instanceof As){var h=s.style;s.useStyle(A({image:h.image,x:h.x,y:h.y,width:h.width,height:h.height},l))}else s.useStyle(l),"pointer"!==s.type&&s.setColor(u);s.setStyle(e.getModel(["pointer","itemStyle"]).getItemStyle()),"auto"===s.style.fill&&s.setStyle("fill",i(Yr(y.get(v,t),_,[0,1],!0))),s.z2EmphasisLift=0,Zl(s,e),Hl(s,r,o,a)}if(g){var c=p[t];c.useStyle(y.getItemVisual(t,"style")),c.setStyle(e.getModel(["progress","itemStyle"]).getItemStyle()),c.z2EmphasisLift=0,Zl(c,e),Hl(c,r,o,a)}})),this._progressEls=p)},e.prototype._renderAnchor=function(t,e){var n=t.getModel("anchor");if(n.get("show")){var i=n.get("size"),r=n.get("icon"),o=n.get("offsetCenter"),a=n.get("keepAspect"),s=Vy(r,e.cx-i/2+Ur(o[0],e.r),e.cy-i/2+Ur(o[1],e.r),i,i,null,a);s.z2=n.get("showAbove")?1:0,s.setStyle(n.getModel("itemStyle").getItemStyle()),this.group.add(s)}},e.prototype._renderTitleAndDetail=function(t,e,n,i,r){var o=this,a=t.getData(),s=a.mapDimension("value"),l=+t.get("min"),u=+t.get("max"),h=new Er,c=[],p=[],d=t.isAnimationEnabled(),f=t.get(["pointer","showAbove"]);a.diff(this._data).add((function(t){c[t]=new Bs({silent:!0}),p[t]=new Bs({silent:!0})})).update((function(t,e){c[t]=o._titleEls[e],p[t]=o._detailEls[e]})).execute(),a.each((function(e){var n=a.getItemModel(e),o=a.get(s,e),g=new Er,y=i(Yr(o,[l,u],[0,1],!0)),v=n.getModel("title");if(v.get("show")){var m=v.get("offsetCenter"),x=r.cx+Ur(m[0],r.r),_=r.cy+Ur(m[1],r.r);(D=c[e]).attr({z2:f?0:2,style:ec(v,{x:x,y:_,text:a.getName(e),align:"center",verticalAlign:"middle"},{inheritColor:y})}),g.add(D)}var b=n.getModel("detail");if(b.get("show")){var w=b.get("offsetCenter"),S=r.cx+Ur(w[0],r.r),M=r.cy+Ur(w[1],r.r),I=Ur(b.get("width"),r.r),T=Ur(b.get("height"),r.r),C=t.get(["progress","show"])?a.getItemVisual(e,"style").fill:y,D=p[e],A=b.get("formatter");D.attr({z2:f?0:2,style:ec(b,{x:S,y:M,text:KA(o,A),width:isNaN(I)?null:I,height:isNaN(T)?null:T,align:"center",verticalAlign:"middle"},{inheritColor:C})}),uc(D,{normal:b},o,(function(t){return KA(t,A)})),d&&hc(D,e,a,t,{getFormattedLabel:function(t,e,n,i,r,a){return KA(a?a.interpolatedValue:o,A)}}),g.add(D)}h.add(g)})),this.group.add(h),this._titleEls=c,this._detailEls=p},e.type="gauge",e}(Tg),JA=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.visualStyleAccessPath="itemStyle",n}return n(e,t),e.prototype.getInitialData=function(t,e){return vM(this,["value"])},e.type="series.gauge",e.defaultOption={z:2,colorBy:"data",center:["50%","50%"],legendHoverLink:!0,radius:"75%",startAngle:225,endAngle:-45,clockwise:!0,min:0,max:100,splitNumber:10,axisLine:{show:!0,roundCap:!1,lineStyle:{color:[[1,"#E6EBF8"]],width:10}},progress:{show:!1,overlap:!0,width:10,roundCap:!1,clip:!0},splitLine:{show:!0,length:10,distance:10,lineStyle:{color:"#63677A",width:3,type:"solid"}},axisTick:{show:!0,splitNumber:5,length:6,distance:10,lineStyle:{color:"#63677A",width:1,type:"solid"}},axisLabel:{show:!0,distance:15,color:"#464646",fontSize:12,rotate:0},pointer:{icon:null,offsetCenter:[0,0],show:!0,showAbove:!0,length:"60%",width:6,keepAspect:!1},anchor:{show:!1,showAbove:!1,size:6,icon:"circle",offsetCenter:[0,0],keepAspect:!1,itemStyle:{color:"#fff",borderWidth:0,borderColor:"#5470c6"}},title:{show:!0,offsetCenter:[0,"20%"],color:"#464646",fontSize:16,valueAnimation:!1},detail:{show:!0,backgroundColor:"rgba(0,0,0,0)",borderWidth:0,borderColor:"#ccc",width:100,height:null,padding:[5,10],offsetCenter:[0,"40%"],color:"#464646",fontSize:30,fontWeight:"bold",lineHeight:30,valueAnimation:!1}},e}(fg);var QA=["itemStyle","opacity"],tk=function(t){function e(e,n){var i=t.call(this)||this,r=i,o=new Hu,a=new Bs;return r.setTextContent(a),i.setTextGuideLine(o),i.updateData(e,n,!0),i}return n(e,t),e.prototype.updateData=function(t,e,n){var i=this,r=t.hostModel,o=t.getItemModel(e),a=t.getItemLayout(e),s=o.getModel("emphasis"),l=o.get(QA);l=null==l?1:l,n||xh(i),i.useStyle(t.getItemVisual(e,"style")),i.style.lineJoin="round",n?(i.setShape({points:a.points}),i.style.opacity=0,fh(i,{style:{opacity:l}},r,e)):dh(i,{style:{opacity:l},shape:{points:a.points}},r,e),Zl(i,o),this._updateLabel(t,e),Hl(this,s.get("focus"),s.get("blurScope"),s.get("disabled"))},e.prototype._updateLabel=function(t,e){var n=this,i=this.getTextGuideLine(),r=n.getTextContent(),o=t.hostModel,a=t.getItemModel(e),s=t.getItemLayout(e).label,l=t.getItemVisual(e,"style"),u=l.fill;Qh(r,tc(a),{labelFetcher:t.hostModel,labelDataIndex:e,defaultOpacity:l.opacity,defaultText:t.getName(e)},{normal:{align:s.textAlign,verticalAlign:s.verticalAlign}}),n.setTextConfig({local:!0,inside:!!s.inside,insideStroke:u,outsideFill:u});var h=s.linePoints;i.setShape({points:h}),n.textGuideLineConfig={anchor:h?new Ce(h[0][0],h[0][1]):null},dh(r,{style:{x:s.x,y:s.y}},o,e),r.attr({rotation:s.rotation,originX:s.x,originY:s.y,z2:10}),xb(n,_b(a),{stroke:u})},e}(Gu),ek=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.ignoreLabelLineUpdate=!0,n}return n(e,t),e.prototype.render=function(t,e,n){var i=t.getData(),r=this._data,o=this.group;i.diff(r).add((function(t){var e=new tk(i,t);i.setItemGraphicEl(t,e),o.add(e)})).update((function(t,e){var n=r.getItemGraphicEl(e);n.updateData(i,t),o.add(n),i.setItemGraphicEl(t,n)})).remove((function(e){mh(r.getItemGraphicEl(e),t,e)})).execute(),this._data=i},e.prototype.remove=function(){this.group.removeAll(),this._data=null},e.prototype.dispose=function(){},e.type="funnel",e}(Tg),nk=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.init=function(e){t.prototype.init.apply(this,arguments),this.legendVisualProvider=new mM(W(this.getData,this),W(this.getRawData,this)),this._defaultLabelLine(e)},e.prototype.getInitialData=function(t,e){return vM(this,{coordDimensions:["value"],encodeDefaulter:H($p,this)})},e.prototype._defaultLabelLine=function(t){bo(t,"labelLine",["show"]);var e=t.labelLine,n=t.emphasis.labelLine;e.show=e.show&&t.label.show,n.show=n.show&&t.emphasis.label.show},e.prototype.getDataParams=function(e){var n=this.getData(),i=t.prototype.getDataParams.call(this,e),r=n.mapDimension("value"),o=n.getSum(r);return i.percent=o?+(n.get(r,e)/o*100).toFixed(2):0,i.$vars.push("percent"),i},e.type="series.funnel",e.defaultOption={z:2,legendHoverLink:!0,colorBy:"data",left:80,top:60,right:80,bottom:60,minSize:"0%",maxSize:"100%",sort:"descending",orient:"vertical",gap:0,funnelAlign:"center",label:{show:!0,position:"outer"},labelLine:{show:!0,length:20,lineStyle:{width:1}},itemStyle:{borderColor:"#fff",borderWidth:1},emphasis:{label:{show:!0}},select:{itemStyle:{borderColor:"#212121"}}},e}(fg);function ik(t,e){t.eachSeriesByType("funnel",(function(t){var n=t.getData(),i=n.mapDimension("value"),r=t.get("sort"),o=function(t,e){return Tp(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()})}(t,e),a=t.get("orient"),s=o.width,l=o.height,u=function(t,e){for(var n=t.mapDimension("value"),i=t.mapArray(n,(function(t){return t})),r=[],o="ascending"===e,a=0,s=t.count();a<s;a++)r[a]=a;return U(e)?r.sort(e):"none"!==e&&r.sort((function(t,e){return o?i[t]-i[e]:i[e]-i[t]})),r}(n,r),h=o.x,c=o.y,p="horizontal"===a?[Ur(t.get("minSize"),l),Ur(t.get("maxSize"),l)]:[Ur(t.get("minSize"),s),Ur(t.get("maxSize"),s)],d=n.getDataExtent(i),f=t.get("min"),g=t.get("max");null==f&&(f=Math.min(d[0],0)),null==g&&(g=d[1]);var y=t.get("funnelAlign"),v=t.get("gap"),m=(("horizontal"===a?s:l)-v*(n.count()-1))/n.count(),x=function(t,e){if("horizontal"===a){var r=Yr(n.get(i,t)||0,[f,g],p,!0),o=void 0;switch(y){case"top":o=c;break;case"center":o=c+(l-r)/2;break;case"bottom":o=c+(l-r)}return[[e,o],[e,o+r]]}var u,d=Yr(n.get(i,t)||0,[f,g],p,!0);switch(y){case"left":u=h;break;case"center":u=h+(s-d)/2;break;case"right":u=h+s-d}return[[u,e],[u+d,e]]};"ascending"===r&&(m=-m,v=-v,"horizontal"===a?h+=s:c+=l,u=u.reverse());for(var _=0;_<u.length;_++){var b=u[_],w=u[_+1],S=n.getItemModel(b);if("horizontal"===a){var M=S.get(["itemStyle","width"]);null==M?M=m:(M=Ur(M,s),"ascending"===r&&(M=-M));var I=x(b,h),T=x(w,h+M);h+=M+v,n.setItemLayout(b,{points:I.concat(T.slice().reverse())})}else{var C=S.get(["itemStyle","height"]);null==C?C=m:(C=Ur(C,l),"ascending"===r&&(C=-C));I=x(b,c),T=x(w,c+C);c+=C+v,n.setItemLayout(b,{points:I.concat(T.slice().reverse())})}}!function(t){var e=t.hostModel.get("orient");t.each((function(n){var i,r,o,a,s=t.getItemModel(n),l=s.getModel("label").get("position"),u=s.getModel("labelLine"),h=t.getItemLayout(n),c=h.points,p="inner"===l||"inside"===l||"center"===l||"insideLeft"===l||"insideRight"===l;if(p)"insideLeft"===l?(r=(c[0][0]+c[3][0])/2+5,o=(c[0][1]+c[3][1])/2,i="left"):"insideRight"===l?(r=(c[1][0]+c[2][0])/2-5,o=(c[1][1]+c[2][1])/2,i="right"):(r=(c[0][0]+c[1][0]+c[2][0]+c[3][0])/4,o=(c[0][1]+c[1][1]+c[2][1]+c[3][1])/4,i="center"),a=[[r,o],[r,o]];else{var d=void 0,f=void 0,g=void 0,y=void 0,v=u.get("length");"left"===l?(d=(c[3][0]+c[0][0])/2,f=(c[3][1]+c[0][1])/2,r=(g=d-v)-5,i="right"):"right"===l?(d=(c[1][0]+c[2][0])/2,f=(c[1][1]+c[2][1])/2,r=(g=d+v)+5,i="left"):"top"===l?(d=(c[3][0]+c[0][0])/2,o=(y=(f=(c[3][1]+c[0][1])/2)-v)-5,i="center"):"bottom"===l?(d=(c[1][0]+c[2][0])/2,o=(y=(f=(c[1][1]+c[2][1])/2)+v)+5,i="center"):"rightTop"===l?(d="horizontal"===e?c[3][0]:c[1][0],f="horizontal"===e?c[3][1]:c[1][1],"horizontal"===e?(o=(y=f-v)-5,i="center"):(r=(g=d+v)+5,i="top")):"rightBottom"===l?(d=c[2][0],f=c[2][1],"horizontal"===e?(o=(y=f+v)+5,i="center"):(r=(g=d+v)+5,i="bottom")):"leftTop"===l?(d=c[0][0],f="horizontal"===e?c[0][1]:c[1][1],"horizontal"===e?(o=(y=f-v)-5,i="center"):(r=(g=d-v)-5,i="right")):"leftBottom"===l?(d="horizontal"===e?c[1][0]:c[3][0],f="horizontal"===e?c[1][1]:c[2][1],"horizontal"===e?(o=(y=f+v)+5,i="center"):(r=(g=d-v)-5,i="right")):(d=(c[1][0]+c[2][0])/2,f=(c[1][1]+c[2][1])/2,"horizontal"===e?(o=(y=f+v)+5,i="center"):(r=(g=d+v)+5,i="left")),"horizontal"===e?r=g=d:o=y=f,a=[[d,f],[g,y]]}h.label={linePoints:a,x:r,y:o,verticalAlign:"middle",textAlign:i,inside:p}}))}(n)}))}var rk=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n._dataGroup=new Er,n._initialized=!1,n}return n(e,t),e.prototype.init=function(){this.group.add(this._dataGroup)},e.prototype.render=function(t,e,n,i){this._progressiveEls=null;var r=this._dataGroup,o=t.getData(),a=this._data,s=t.coordinateSystem,l=s.dimensions,u=sk(t);if(o.diff(a).add((function(t){lk(ak(o,r,t,l,s),o,t,u)})).update((function(e,n){var i=a.getItemGraphicEl(n),r=ok(o,e,l,s);o.setItemGraphicEl(e,i),dh(i,{shape:{points:r}},t,e),xh(i),lk(i,o,e,u)})).remove((function(t){var e=a.getItemGraphicEl(t);r.remove(e)})).execute(),!this._initialized){this._initialized=!0;var h=function(t,e,n){var i=t.model,r=t.getRect(),o=new Es({shape:{x:r.x,y:r.y,width:r.width,height:r.height}}),a="horizontal"===i.get("layout")?"width":"height";return o.setShape(a,0),fh(o,{shape:{width:r.width,height:r.height}},e,n),o}(s,t,(function(){setTimeout((function(){r.removeClipPath()}))}));r.setClipPath(h)}this._data=o},e.prototype.incrementalPrepareRender=function(t,e,n){this._initialized=!0,this._data=null,this._dataGroup.removeAll()},e.prototype.incrementalRender=function(t,e,n){for(var i=e.getData(),r=e.coordinateSystem,o=r.dimensions,a=sk(e),s=this._progressiveEls=[],l=t.start;l<t.end;l++){var u=ak(i,this._dataGroup,l,o,r);u.incremental=!0,lk(u,i,l,a),s.push(u)}},e.prototype.remove=function(){this._dataGroup&&this._dataGroup.removeAll(),this._data=null},e.type="parallel",e}(Tg);function ok(t,e,n,i){for(var r,o=[],a=0;a<n.length;a++){var s=n[a],l=t.get(t.mapDimension(s),e);r=l,("category"===i.getAxis(s).type?null==r:null==r||isNaN(r))||o.push(i.dataToPoint(l,s))}return o}function ak(t,e,n,i,r){var o=ok(t,n,i,r),a=new Hu({shape:{points:o},z2:10});return e.add(a),t.setItemGraphicEl(n,a),a}function sk(t){var e=t.get("smooth",!0);return!0===e&&(e=.3),nt(e=uo(e))&&(e=0),{smooth:e}}function lk(t,e,n,i){t.useStyle(e.getItemVisual(n,"style")),t.style.fill=null,t.setShape("smooth",i.smooth);var r=e.getItemModel(n),o=r.getModel("emphasis");Zl(t,r,"lineStyle"),Hl(t,o.get("focus"),o.get("blurScope"),o.get("disabled"))}var uk=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.visualStyleAccessPath="lineStyle",n.visualDrawType="stroke",n}return n(e,t),e.prototype.getInitialData=function(t,e){return hx(null,this,{useEncodeDefaulter:W(hk,null,this)})},e.prototype.getRawIndicesByActiveState=function(t){var e=this.coordinateSystem,n=this.getData(),i=[];return e.eachActiveState(n,(function(e,r){t===e&&i.push(n.getRawIndex(r))})),i},e.type="series.parallel",e.dependencies=["parallel"],e.defaultOption={z:2,coordinateSystem:"parallel",parallelIndex:0,label:{show:!1},inactiveOpacity:.05,activeOpacity:1,lineStyle:{width:1,opacity:.45,type:"solid"},emphasis:{label:{show:!1}},progressive:500,smooth:!1,animationEasing:"linear"},e}(fg);function hk(t){var e=t.ecModel.getComponent("parallel",t.get("parallelIndex"));if(e){var n={};return E(e.dimensions,(function(t){var e=+t.replace("dim","");n[t]=e})),n}}var ck=["lineStyle","opacity"],pk={seriesType:"parallel",reset:function(t,e){var n=t.coordinateSystem,i={normal:t.get(["lineStyle","opacity"]),active:t.get("activeOpacity"),inactive:t.get("inactiveOpacity")};return{progress:function(t,e){n.eachActiveState(e,(function(t,n){var r=i[t];if("normal"===t&&e.hasItemOption){var o=e.getItemModel(n).get(ck,!0);null!=o&&(r=o)}e.ensureUniqueItemVisual(n,"style").opacity=r}),t.start,t.end)}}}};function dk(t){!function(t){if(t.parallel)return;var e=!1;E(t.series,(function(t){t&&"parallel"===t.type&&(e=!0)})),e&&(t.parallel=[{}])}(t),function(t){E(_o(t.parallelAxis),(function(e){if(q(e)){var n=e.parallelIndex||0,i=_o(t.parallel)[n];i&&i.parallelAxisDefault&&C(e,i.parallelAxisDefault,!1)}}))}(t)}var fk=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.render=function(t,e,n){this._model=t,this._api=n,this._handlers||(this._handlers={},E(gk,(function(t,e){n.getZr().on(e,this._handlers[e]=W(t,this))}),this)),Eg(this,"_throttledDispatchExpand",t.get("axisExpandRate"),"fixRate")},e.prototype.dispose=function(t,e){zg(this,"_throttledDispatchExpand"),E(this._handlers,(function(t,n){e.getZr().off(n,t)})),this._handlers=null},e.prototype._throttledDispatchExpand=function(t){this._dispatchExpand(t)},e.prototype._dispatchExpand=function(t){t&&this._api.dispatchAction(A({type:"parallelAxisExpand"},t))},e.type="parallel",e}(wg),gk={mousedown:function(t){yk(this,"click")&&(this._mouseDownPoint=[t.offsetX,t.offsetY])},mouseup:function(t){var e=this._mouseDownPoint;if(yk(this,"click")&&e){var n=[t.offsetX,t.offsetY];if(Math.pow(e[0]-n[0],2)+Math.pow(e[1]-n[1],2)>5)return;var i=this._model.coordinateSystem.getSlidedAxisExpandWindow([t.offsetX,t.offsetY]);"none"!==i.behavior&&this._dispatchExpand({axisExpandWindow:i.axisExpandWindow})}this._mouseDownPoint=null},mousemove:function(t){if(!this._mouseDownPoint&&yk(this,"mousemove")){var e=this._model,n=e.coordinateSystem.getSlidedAxisExpandWindow([t.offsetX,t.offsetY]),i=n.behavior;"jump"===i&&this._throttledDispatchExpand.debounceNextCall(e.get("axisExpandDebounce")),this._throttledDispatchExpand("none"===i?null:{axisExpandWindow:n.axisExpandWindow,animation:"jump"===i?null:{duration:0}})}}};function yk(t,e){var n=t._model;return n.get("axisExpandable")&&n.get("axisExpandTriggerOn")===e}var vk=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.init=function(){t.prototype.init.apply(this,arguments),this.mergeOption({})},e.prototype.mergeOption=function(t){var e=this.option;t&&C(e,t,!0),this._initDimensions()},e.prototype.contains=function(t,e){var n=t.get("parallelIndex");return null!=n&&e.getComponent("parallel",n)===this},e.prototype.setAxisExpand=function(t){E(["axisExpandable","axisExpandCenter","axisExpandCount","axisExpandWidth","axisExpandWindow"],(function(e){t.hasOwnProperty(e)&&(this.option[e]=t[e])}),this)},e.prototype._initDimensions=function(){var t=this.dimensions=[],e=this.parallelAxisIndex=[];E(B(this.ecModel.queryComponents({mainType:"parallelAxis"}),(function(t){return(t.get("parallelIndex")||0)===this.componentIndex}),this),(function(n){t.push("dim"+n.get("dim")),e.push(n.componentIndex)}))},e.type="parallel",e.dependencies=["parallelAxis"],e.layoutMode="box",e.defaultOption={z:0,left:80,top:60,right:80,bottom:60,layout:"horizontal",axisExpandable:!1,axisExpandCenter:null,axisExpandCount:0,axisExpandWidth:50,axisExpandRate:17,axisExpandDebounce:50,axisExpandSlideTriggerArea:[-.15,.05,.4],axisExpandTriggerOn:"click",parallelAxisDefault:null},e}(Op),mk=function(t){function e(e,n,i,r,o){var a=t.call(this,e,n,i)||this;return a.type=r||"value",a.axisIndex=o,a}return n(e,t),e.prototype.isHorizontal=function(){return"horizontal"!==this.coordinateSystem.getModel().get("layout")},e}(q_);function xk(t,e,n,i,r,o){t=t||0;var a=n[1]-n[0];if(null!=r&&(r=bk(r,[0,a])),null!=o&&(o=Math.max(o,null!=r?r:0)),"all"===i){var s=Math.abs(e[1]-e[0]);s=bk(s,[0,a]),r=o=bk(s,[r,o]),i=0}e[0]=bk(e[0],n),e[1]=bk(e[1],n);var l=_k(e,i);e[i]+=t;var u,h=r||0,c=n.slice();return l.sign<0?c[0]+=h:c[1]-=h,e[i]=bk(e[i],c),u=_k(e,i),null!=r&&(u.sign!==l.sign||u.span<r)&&(e[1-i]=e[i]+l.sign*r),u=_k(e,i),null!=o&&u.span>o&&(e[1-i]=e[i]+u.sign*o),e}function _k(t,e){var n=t[e]-t[1-e];return{span:Math.abs(n),sign:n>0?-1:n<0?1:e?-1:1}}function bk(t,e){return Math.min(null!=e[1]?e[1]:1/0,Math.max(null!=e[0]?e[0]:-1/0,t))}var wk=E,Sk=Math.min,Mk=Math.max,Ik=Math.floor,Tk=Math.ceil,Ck=Xr,Dk=Math.PI,Ak=function(){function t(t,e,n){this.type="parallel",this._axesMap=yt(),this._axesLayout={},this.dimensions=t.dimensions,this._model=t,this._init(t,e,n)}return t.prototype._init=function(t,e,n){var i=t.dimensions,r=t.parallelAxisIndex;wk(i,(function(t,n){var i=r[n],o=e.getComponent("parallelAxis",i),a=this._axesMap.set(t,new mk(t,c_(o),[0,0],o.get("type"),i)),s="category"===a.type;a.onBand=s&&o.get("boundaryGap"),a.inverse=o.get("inverse"),o.axis=a,a.model=o,a.coordinateSystem=o.coordinateSystem=this}),this)},t.prototype.update=function(t,e){this._updateAxesFromSeries(this._model,t)},t.prototype.containPoint=function(t){var e=this._makeLayoutInfo(),n=e.axisBase,i=e.layoutBase,r=e.pixelDimIndex,o=t[1-r],a=t[r];return o>=n&&o<=n+e.axisLength&&a>=i&&a<=i+e.layoutLength},t.prototype.getModel=function(){return this._model},t.prototype._updateAxesFromSeries=function(t,e){e.eachSeries((function(n){if(t.contains(n,e)){var i=n.getData();wk(this.dimensions,(function(t){var e=this._axesMap.get(t);e.scale.unionExtentFromData(i,i.mapDimension(t)),h_(e.scale,e.model)}),this)}}),this)},t.prototype.resize=function(t,e){this._rect=Tp(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()}),this._layoutAxes()},t.prototype.getRect=function(){return this._rect},t.prototype._makeLayoutInfo=function(){var t,e=this._model,n=this._rect,i=["x","y"],r=["width","height"],o=e.get("layout"),a="horizontal"===o?0:1,s=n[r[a]],l=[0,s],u=this.dimensions.length,h=kk(e.get("axisExpandWidth"),l),c=kk(e.get("axisExpandCount")||0,[0,u]),p=e.get("axisExpandable")&&u>3&&u>c&&c>1&&h>0&&s>0,d=e.get("axisExpandWindow");d?(t=kk(d[1]-d[0],l),d[1]=d[0]+t):(t=kk(h*(c-1),l),(d=[h*(e.get("axisExpandCenter")||Ik(u/2))-t/2])[1]=d[0]+t);var f=(s-t)/(u-c);f<3&&(f=0);var g=[Ik(Ck(d[0]/h,1))+1,Tk(Ck(d[1]/h,1))-1],y=f/h*d[0];return{layout:o,pixelDimIndex:a,layoutBase:n[i[a]],layoutLength:s,axisBase:n[i[1-a]],axisLength:n[r[1-a]],axisExpandable:p,axisExpandWidth:h,axisCollapseWidth:f,axisExpandWindow:d,axisCount:u,winInnerIndices:g,axisExpandWindow0Pos:y}},t.prototype._layoutAxes=function(){var t=this._rect,e=this._axesMap,n=this.dimensions,i=this._makeLayoutInfo(),r=i.layout;e.each((function(t){var e=[0,i.axisLength],n=t.inverse?1:0;t.setExtent(e[n],e[1-n])})),wk(n,(function(e,n){var o=(i.axisExpandable?Pk:Lk)(n,i),a={horizontal:{x:o.position,y:i.axisLength},vertical:{x:0,y:o.position}},s={horizontal:Dk/2,vertical:0},l=[a[r].x+t.x,a[r].y+t.y],u=s[r],h=[1,0,0,1,0,0];we(h,h,u),be(h,h,l),this._axesLayout[e]={position:l,rotation:u,transform:h,axisNameAvailableWidth:o.axisNameAvailableWidth,axisLabelShow:o.axisLabelShow,nameTruncateMaxWidth:o.nameTruncateMaxWidth,tickDirection:1,labelDirection:1}}),this)},t.prototype.getAxis=function(t){return this._axesMap.get(t)},t.prototype.dataToPoint=function(t,e){return this.axisCoordToPoint(this._axesMap.get(e).dataToCoord(t),e)},t.prototype.eachActiveState=function(t,e,n,i){null==n&&(n=0),null==i&&(i=t.count());var r=this._axesMap,o=this.dimensions,a=[],s=[];E(o,(function(e){a.push(t.mapDimension(e)),s.push(r.get(e).model)}));for(var l=this.hasAxisBrushed(),u=n;u<i;u++){var h=void 0;if(l){h="active";for(var c=t.getValues(a,u),p=0,d=o.length;p<d;p++){if("inactive"===s[p].getActiveState(c[p])){h="inactive";break}}}else h="normal";e(h,u)}},t.prototype.hasAxisBrushed=function(){for(var t=this.dimensions,e=this._axesMap,n=!1,i=0,r=t.length;i<r;i++)"normal"!==e.get(t[i]).model.getActiveState()&&(n=!0);return n},t.prototype.axisCoordToPoint=function(t,e){return Eh([t,0],this._axesLayout[e].transform)},t.prototype.getAxisLayout=function(t){return T(this._axesLayout[t])},t.prototype.getSlidedAxisExpandWindow=function(t){var e=this._makeLayoutInfo(),n=e.pixelDimIndex,i=e.axisExpandWindow.slice(),r=i[1]-i[0],o=[0,e.axisExpandWidth*(e.axisCount-1)];if(!this.containPoint(t))return{behavior:"none",axisExpandWindow:i};var a,s=t[n]-e.layoutBase-e.axisExpandWindow0Pos,l="slide",u=e.axisCollapseWidth,h=this._model.get("axisExpandSlideTriggerArea"),c=null!=h[0];if(u)c&&u&&s<r*h[0]?(l="jump",a=s-r*h[2]):c&&u&&s>r*(1-h[0])?(l="jump",a=s-r*(1-h[2])):(a=s-r*h[1])>=0&&(a=s-r*(1-h[1]))<=0&&(a=0),(a*=e.axisExpandWidth/u)?xk(a,i,o,"all"):l="none";else{var p=i[1]-i[0];(i=[Mk(0,o[1]*s/p-p/2)])[1]=Sk(o[1],i[0]+p),i[0]=i[1]-p}return{axisExpandWindow:i,behavior:l}},t}();function kk(t,e){return Sk(Mk(t,e[0]),e[1])}function Lk(t,e){var n=e.layoutLength/(e.axisCount-1);return{position:n*t,axisNameAvailableWidth:n,axisLabelShow:!0}}function Pk(t,e){var n,i,r=e.layoutLength,o=e.axisExpandWidth,a=e.axisCount,s=e.axisCollapseWidth,l=e.winInnerIndices,u=s,h=!1;return t<l[0]?(n=t*s,i=s):t<=l[1]?(n=e.axisExpandWindow0Pos+t*o-e.axisExpandWindow[0],u=o,h=!0):(n=r-(a-1-t)*s,i=s),{position:n,axisNameAvailableWidth:u,axisLabelShow:h,nameTruncateMaxWidth:i}}var Ok={create:function(t,e){var n=[];return t.eachComponent("parallel",(function(i,r){var o=new Ak(i,t,e);o.name="parallel_"+r,o.resize(i,e),i.coordinateSystem=o,o.model=i,n.push(o)})),t.eachSeries((function(t){if("parallel"===t.get("coordinateSystem")){var e=t.getReferringComponents("parallel",Eo).models[0];t.coordinateSystem=e.coordinateSystem}})),n}},Rk=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.activeIntervals=[],n}return n(e,t),e.prototype.getAreaSelectStyle=function(){return $o([["fill","color"],["lineWidth","borderWidth"],["stroke","borderColor"],["width","width"],["opacity","opacity"]])(this.getModel("areaSelectStyle"))},e.prototype.setActiveIntervals=function(t){var e=this.activeIntervals=T(t);if(e)for(var n=e.length-1;n>=0;n--)Zr(e[n])},e.prototype.getActiveState=function(t){var e=this.activeIntervals;if(!e.length)return"normal";if(null==t||isNaN(+t))return"inactive";if(1===e.length){var n=e[0];if(n[0]<=t&&t<=n[1])return"active"}else for(var i=0,r=e.length;i<r;i++)if(e[i][0]<=t&&t<=e[i][1])return"active";return"inactive"},e}(Op);R(Rk,m_);var Nk=!0,Ek=Math.min,zk=Math.max,Vk=Math.pow,Bk="globalPan",Fk={w:[0,0],e:[0,1],n:[1,0],s:[1,1]},Gk={w:"ew",e:"ew",n:"ns",s:"ns",ne:"nesw",sw:"nesw",nw:"nwse",se:"nwse"},Wk={brushStyle:{lineWidth:2,stroke:"rgba(210,219,238,0.3)",fill:"#D2DBEE"},transformable:!0,brushMode:"single",removeOnClick:!1},Hk=0,Yk=function(t){function e(e){var n=t.call(this)||this;return n._track=[],n._covers=[],n._handlers={},n._zr=e,n.group=new Er,n._uid="brushController_"+Hk++,E(vL,(function(t,e){this._handlers[e]=W(t,this)}),n),n}return n(e,t),e.prototype.enableBrush=function(t){return this._brushType&&this._doDisableBrush(),t.brushType&&this._doEnableBrush(t),this},e.prototype._doEnableBrush=function(t){var e=this._zr;this._enableGlobalPan||function(t,e,n){VI(t)[e]=n}(e,Bk,this._uid),E(this._handlers,(function(t,n){e.on(n,t)})),this._brushType=t.brushType,this._brushOption=C(T(Wk),t,!0)},e.prototype._doDisableBrush=function(){var t=this._zr;!function(t,e,n){var i=VI(t);i[e]===n&&(i[e]=null)}(t,Bk,this._uid),E(this._handlers,(function(e,n){t.off(n,e)})),this._brushType=this._brushOption=null},e.prototype.setPanels=function(t){if(t&&t.length){var e=this._panels={};E(t,(function(t){e[t.panelId]=T(t)}))}else this._panels=null;return this},e.prototype.mount=function(t){t=t||{},this._enableGlobalPan=t.enableGlobalPan;var e=this.group;return this._zr.add(e),e.attr({x:t.x||0,y:t.y||0,rotation:t.rotation||0,scaleX:t.scaleX||1,scaleY:t.scaleY||1}),this._transform=e.getLocalTransform(),this},e.prototype.updateCovers=function(t){t=z(t,(function(t){return C(T(Wk),t,!0)}));var e=this._covers,n=this._covers=[],i=this,r=this._creatingCover;return new Lm(e,t,(function(t,e){return o(t.__brushOption,e)}),o).add(a).update(a).remove((function(t){e[t]!==r&&i.group.remove(e[t])})).execute(),this;function o(t,e){return(null!=t.id?t.id:"\0-brush-index-"+e)+"-"+t.brushType}function a(o,a){var s=t[o];if(null!=a&&e[a]===r)n[o]=e[a];else{var l=n[o]=null!=a?(e[a].__brushOption=s,e[a]):Xk(i,Uk(i,s));qk(i,l)}}},e.prototype.unmount=function(){return this.enableBrush(!1),Qk(this),this._zr.remove(this.group),this},e.prototype.dispose=function(){this.unmount(),this.off()},e}(jt);function Uk(t,e){var n=xL[e.brushType].createCover(t,e);return n.__brushOption=e,jk(n,e),t.group.add(n),n}function Xk(t,e){var n=Kk(e);return n.endCreating&&(n.endCreating(t,e),jk(e,e.__brushOption)),e}function Zk(t,e){var n=e.__brushOption;Kk(e).updateCoverShape(t,e,n.range,n)}function jk(t,e){var n=e.z;null==n&&(n=1e4),t.traverse((function(t){t.z=n,t.z2=n}))}function qk(t,e){Kk(e).updateCommon(t,e),Zk(t,e)}function Kk(t){return xL[t.__brushOption.brushType]}function $k(t,e,n){var i,r=t._panels;if(!r)return Nk;var o=t._transform;return E(r,(function(t){t.isTargetByCursor(e,n,o)&&(i=t)})),i}function Jk(t,e){var n=t._panels;if(!n)return Nk;var i=e.__brushOption.panelId;return null!=i?n[i]:Nk}function Qk(t){var e=t._covers,n=e.length;return E(e,(function(e){t.group.remove(e)}),t),e.length=0,!!n}function tL(t,e){var n=z(t._covers,(function(t){var e=t.__brushOption,n=T(e.range);return{brushType:e.brushType,panelId:e.panelId,range:n}}));t.trigger("brush",{areas:n,isEnd:!!e.isEnd,removeOnClick:!!e.removeOnClick})}function eL(t){var e=t.length-1;return e<0&&(e=0),[t[0],t[e]]}function nL(t,e,n,i){var r=new Er;return r.add(new Es({name:"main",style:aL(n),silent:!0,draggable:!0,cursor:"move",drift:H(uL,t,e,r,["n","s","w","e"]),ondragend:H(tL,e,{isEnd:!0})})),E(i,(function(n){r.add(new Es({name:n.join(""),style:{opacity:0},draggable:!0,silent:!0,invisible:!0,drift:H(uL,t,e,r,n),ondragend:H(tL,e,{isEnd:!0})}))})),r}function iL(t,e,n,i){var r=i.brushStyle.lineWidth||0,o=zk(r,6),a=n[0][0],s=n[1][0],l=a-r/2,u=s-r/2,h=n[0][1],c=n[1][1],p=h-o+r/2,d=c-o+r/2,f=h-a,g=c-s,y=f+r,v=g+r;oL(t,e,"main",a,s,f,g),i.transformable&&(oL(t,e,"w",l,u,o,v),oL(t,e,"e",p,u,o,v),oL(t,e,"n",l,u,y,o),oL(t,e,"s",l,d,y,o),oL(t,e,"nw",l,u,o,o),oL(t,e,"ne",p,u,o,o),oL(t,e,"sw",l,d,o,o),oL(t,e,"se",p,d,o,o))}function rL(t,e){var n=e.__brushOption,i=n.transformable,r=e.childAt(0);r.useStyle(aL(n)),r.attr({silent:!i,cursor:i?"move":"default"}),E([["w"],["e"],["n"],["s"],["s","e"],["s","w"],["n","e"],["n","w"]],(function(n){var r=e.childOfName(n.join("")),o=1===n.length?lL(t,n[0]):function(t,e){var n=[lL(t,e[0]),lL(t,e[1])];return("e"===n[0]||"w"===n[0])&&n.reverse(),n.join("")}(t,n);r&&r.attr({silent:!i,invisible:!i,cursor:i?Gk[o]+"-resize":null})}))}function oL(t,e,n,i,r,o,a){var s=e.childOfName(n);s&&s.setShape(function(t){var e=Ek(t[0][0],t[1][0]),n=Ek(t[0][1],t[1][1]),i=zk(t[0][0],t[1][0]),r=zk(t[0][1],t[1][1]);return{x:e,y:n,width:i-e,height:r-n}}(pL(t,e,[[i,r],[i+o,r+a]])))}function aL(t){return k({strokeNoScale:!0},t.brushStyle)}function sL(t,e,n,i){var r=[Ek(t,n),Ek(e,i)],o=[zk(t,n),zk(e,i)];return[[r[0],o[0]],[r[1],o[1]]]}function lL(t,e){var n=zh({w:"left",e:"right",n:"top",s:"bottom"}[e],function(t){return Nh(t.group)}(t));return{left:"w",right:"e",top:"n",bottom:"s"}[n]}function uL(t,e,n,i,r,o){var a=n.__brushOption,s=t.toRectRange(a.range),l=cL(e,r,o);E(i,(function(t){var e=Fk[t];s[e[0]][e[1]]+=l[e[0]]})),a.range=t.fromRectRange(sL(s[0][0],s[1][0],s[0][1],s[1][1])),qk(e,n),tL(e,{isEnd:!1})}function hL(t,e,n,i){var r=e.__brushOption.range,o=cL(t,n,i);E(r,(function(t){t[0]+=o[0],t[1]+=o[1]})),qk(t,e),tL(t,{isEnd:!1})}function cL(t,e,n){var i=t.group,r=i.transformCoordToLocal(e,n),o=i.transformCoordToLocal(0,0);return[r[0]-o[0],r[1]-o[1]]}function pL(t,e,n){var i=Jk(t,e);return i&&i!==Nk?i.clipPath(n,t._transform):T(n)}function dL(t){var e=t.event;e.preventDefault&&e.preventDefault()}function fL(t,e,n){return t.childOfName("main").contain(e,n)}function gL(t,e,n,i){var r,o=t._creatingCover,a=t._creatingPanel,s=t._brushOption;if(t._track.push(n.slice()),function(t){var e=t._track;if(!e.length)return!1;var n=e[e.length-1],i=e[0],r=n[0]-i[0],o=n[1]-i[1];return Vk(r*r+o*o,.5)>6}(t)||o){if(a&&!o){"single"===s.brushMode&&Qk(t);var l=T(s);l.brushType=yL(l.brushType,a),l.panelId=a===Nk?null:a.panelId,o=t._creatingCover=Uk(t,l),t._covers.push(o)}if(o){var u=xL[yL(t._brushType,a)];o.__brushOption.range=u.getCreatingRange(pL(t,o,t._track)),i&&(Xk(t,o),u.updateCommon(t,o)),Zk(t,o),r={isEnd:i}}}else i&&"single"===s.brushMode&&s.removeOnClick&&$k(t,e,n)&&Qk(t)&&(r={isEnd:i,removeOnClick:!0});return r}function yL(t,e){return"auto"===t?e.defaultBrushType:t}var vL={mousedown:function(t){if(this._dragging)mL(this,t);else if(!t.target||!t.target.draggable){dL(t);var e=this.group.transformCoordToLocal(t.offsetX,t.offsetY);this._creatingCover=null,(this._creatingPanel=$k(this,t,e))&&(this._dragging=!0,this._track=[e.slice()])}},mousemove:function(t){var e=t.offsetX,n=t.offsetY,i=this.group.transformCoordToLocal(e,n);if(function(t,e,n){if(t._brushType&&!function(t,e,n){var i=t._zr;return e<0||e>i.getWidth()||n<0||n>i.getHeight()}(t,e.offsetX,e.offsetY)){var i=t._zr,r=t._covers,o=$k(t,e,n);if(!t._dragging)for(var a=0;a<r.length;a++){var s=r[a].__brushOption;if(o&&(o===Nk||s.panelId===o.panelId)&&xL[s.brushType].contain(r[a],n[0],n[1]))return}o&&i.setCursorStyle("crosshair")}}(this,t,i),this._dragging){dL(t);var r=gL(this,t,i,!1);r&&tL(this,r)}},mouseup:function(t){mL(this,t)}};function mL(t,e){if(t._dragging){dL(e);var n=e.offsetX,i=e.offsetY,r=t.group.transformCoordToLocal(n,i),o=gL(t,e,r,!0);t._dragging=!1,t._track=[],t._creatingCover=null,o&&tL(t,o)}}var xL={lineX:_L(0),lineY:_L(1),rect:{createCover:function(t,e){function n(t){return t}return nL({toRectRange:n,fromRectRange:n},t,e,[["w"],["e"],["n"],["s"],["s","e"],["s","w"],["n","e"],["n","w"]])},getCreatingRange:function(t){var e=eL(t);return sL(e[1][0],e[1][1],e[0][0],e[0][1])},updateCoverShape:function(t,e,n,i){iL(t,e,n,i)},updateCommon:rL,contain:fL},polygon:{createCover:function(t,e){var n=new Er;return n.add(new Hu({name:"main",style:aL(e),silent:!0})),n},getCreatingRange:function(t){return t},endCreating:function(t,e){e.remove(e.childAt(0)),e.add(new Gu({name:"main",draggable:!0,drift:H(hL,t,e),ondragend:H(tL,t,{isEnd:!0})}))},updateCoverShape:function(t,e,n,i){e.childAt(0).setShape({points:pL(t,e,n)})},updateCommon:rL,contain:fL}};function _L(t){return{createCover:function(e,n){return nL({toRectRange:function(e){var n=[e,[0,100]];return t&&n.reverse(),n},fromRectRange:function(e){return e[t]}},e,n,[[["w"],["e"]],[["n"],["s"]]][t])},getCreatingRange:function(e){var n=eL(e);return[Ek(n[0][t],n[1][t]),zk(n[0][t],n[1][t])]},updateCoverShape:function(e,n,i,r){var o,a=Jk(e,n);if(a!==Nk&&a.getLinearBrushOtherExtent)o=a.getLinearBrushOtherExtent(t);else{var s=e._zr;o=[0,[s.getWidth(),s.getHeight()][1-t]]}var l=[i,o];t&&l.reverse(),iL(e,n,l,r)},updateCommon:rL,contain:fL}}function bL(t){return t=ML(t),function(e){return Fh(e,t)}}function wL(t,e){return t=ML(t),function(n){var i=null!=e?e:n,r=i?t.width:t.height,o=i?t.x:t.y;return[o,o+(r||0)]}}function SL(t,e,n){var i=ML(t);return function(t,r){return i.contain(r[0],r[1])&&!ZI(t,e,n)}}function ML(t){return Ee.create(t)}var IL=["axisLine","axisTickLabel","axisName"],TL=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.init=function(e,n){t.prototype.init.apply(this,arguments),(this._brushController=new Yk(n.getZr())).on("brush",W(this._onBrush,this))},e.prototype.render=function(t,e,n,i){if(!function(t,e,n){return n&&"axisAreaSelect"===n.type&&e.findComponents({mainType:"parallelAxis",query:n})[0]===t}(t,e,i)){this.axisModel=t,this.api=n,this.group.removeAll();var r=this._axisGroup;if(this._axisGroup=new Er,this.group.add(this._axisGroup),t.get("show")){var o=function(t,e){return e.getComponent("parallel",t.get("parallelIndex"))}(t,e),a=o.coordinateSystem,s=t.getAreaSelectStyle(),l=s.width,u=t.axis.dim,h=A({strokeContainThreshold:l},a.getAxisLayout(u)),c=new KM(t,h);E(IL,c.add,c),this._axisGroup.add(c.getGroup()),this._refreshBrushController(h,s,t,o,l,n),Bh(r,this._axisGroup,t)}}},e.prototype._refreshBrushController=function(t,e,n,i,r,o){var a=n.axis.getExtent(),s=a[1]-a[0],l=Math.min(30,.1*Math.abs(s)),u=Ee.create({x:a[0],y:-r/2,width:s,height:r});u.x-=l,u.width+=2*l,this._brushController.mount({enableGlobalPan:!0,rotation:t.rotation,x:t.position[0],y:t.position[1]}).setPanels([{panelId:"pl",clipPath:bL(u),isTargetByCursor:SL(u,o,i),getLinearBrushOtherExtent:wL(u,0)}]).enableBrush({brushType:"lineX",brushStyle:e,removeOnClick:!0}).updateCovers(function(t){var e=t.axis;return z(t.activeIntervals,(function(t){return{brushType:"lineX",panelId:"pl",range:[e.dataToCoord(t[0],!0),e.dataToCoord(t[1],!0)]}}))}(n))},e.prototype._onBrush=function(t){var e=t.areas,n=this.axisModel,i=n.axis,r=z(e,(function(t){return[i.coordToData(t.range[0],!0),i.coordToData(t.range[1],!0)]}));(!n.option.realtime===t.isEnd||t.removeOnClick)&&this.api.dispatchAction({type:"axisAreaSelect",parallelAxisId:n.id,intervals:r})},e.prototype.dispose=function(){this._brushController.dispose()},e.type="parallelAxis",e}(wg);var CL={type:"axisAreaSelect",event:"axisAreaSelected"};var DL={type:"value",areaSelectStyle:{width:20,borderWidth:1,borderColor:"rgba(160,197,232)",color:"rgba(160,197,232)",opacity:.3},realtime:!0,z:10};function AL(t){t.registerComponentView(fk),t.registerComponentModel(vk),t.registerCoordinateSystem("parallel",Ok),t.registerPreprocessor(dk),t.registerComponentModel(Rk),t.registerComponentView(TL),OM(t,"parallel",Rk,DL),function(t){t.registerAction(CL,(function(t,e){e.eachComponent({mainType:"parallelAxis",query:t},(function(e){e.axis.model.setActiveIntervals(t.intervals)}))})),t.registerAction("parallelAxisExpand",(function(t,e){e.eachComponent({mainType:"parallel",query:t},(function(e){e.setAxisExpand(t)}))}))}(t)}var kL=function(){this.x1=0,this.y1=0,this.x2=0,this.y2=0,this.cpx1=0,this.cpy1=0,this.cpx2=0,this.cpy2=0,this.extent=0},LL=function(t){function e(e){return t.call(this,e)||this}return n(e,t),e.prototype.getDefaultShape=function(){return new kL},e.prototype.buildPath=function(t,e){var n=e.extent;t.moveTo(e.x1,e.y1),t.bezierCurveTo(e.cpx1,e.cpy1,e.cpx2,e.cpy2,e.x2,e.y2),"vertical"===e.orient?(t.lineTo(e.x2+n,e.y2),t.bezierCurveTo(e.cpx2+n,e.cpy2,e.cpx1+n,e.cpy1,e.x1+n,e.y1)):(t.lineTo(e.x2,e.y2+n),t.bezierCurveTo(e.cpx2,e.cpy2+n,e.cpx1,e.cpy1+n,e.x1,e.y1+n)),t.closePath()},e.prototype.highlight=function(){Al(this)},e.prototype.downplay=function(){kl(this)},e}(Ms),PL=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n._focusAdjacencyDisabled=!1,n}return n(e,t),e.prototype.render=function(t,e,n){var i=this,r=t.getGraph(),o=this.group,a=t.layoutInfo,s=a.width,l=a.height,u=t.getData(),h=t.getData("edge"),c=t.get("orient");this._model=t,o.removeAll(),o.x=a.x,o.y=a.y,r.eachEdge((function(e){var n=new LL,i=Js(n);i.dataIndex=e.dataIndex,i.seriesIndex=t.seriesIndex,i.dataType="edge";var r,a,u,p,d,f,g,y,v=e.getModel(),m=v.getModel("lineStyle"),x=m.get("curveness"),_=e.node1.getLayout(),b=e.node1.getModel(),w=b.get("localX"),S=b.get("localY"),M=e.node2.getLayout(),I=e.node2.getModel(),T=I.get("localX"),C=I.get("localY"),D=e.getLayout();switch(n.shape.extent=Math.max(1,D.dy),n.shape.orient=c,"vertical"===c?(r=(null!=w?w*s:_.x)+D.sy,a=(null!=S?S*l:_.y)+_.dy,u=(null!=T?T*s:M.x)+D.ty,d=r,f=a*(1-x)+(p=null!=C?C*l:M.y)*x,g=u,y=a*x+p*(1-x)):(r=(null!=w?w*s:_.x)+_.dx,a=(null!=S?S*l:_.y)+D.sy,d=r*(1-x)+(u=null!=T?T*s:M.x)*x,f=a,g=r*x+u*(1-x),y=p=(null!=C?C*l:M.y)+D.ty),n.setShape({x1:r,y1:a,x2:u,y2:p,cpx1:d,cpy1:f,cpx2:g,cpy2:y}),n.useStyle(m.getItemStyle()),n.style.fill){case"source":n.style.fill=e.node1.getVisual("color"),n.style.decal=e.node1.getVisual("style").decal;break;case"target":n.style.fill=e.node2.getVisual("color"),n.style.decal=e.node2.getVisual("style").decal;break;case"gradient":var A=e.node1.getVisual("color"),k=e.node2.getVisual("color");X(A)&&X(k)&&(n.style.fill=new eh(0,0,+("horizontal"===c),+("vertical"===c),[{color:A,offset:0},{color:k,offset:1}]))}Qh(n,tc(v,"edgeLabel"),{labelFetcher:t,labelDataIndex:e.dataIndex,defaultText:""+v.get("value")}),n.setTextConfig({position:"inside"});var L=v.getModel("emphasis");Zl(n,v,"lineStyle",(function(t){return t.getItemStyle()})),o.add(n),h.setItemGraphicEl(e.dataIndex,n);var P=L.get("focus");Hl(n,"adjacency"===P?e.getAdjacentDataIndices():P,L.get("blurScope"),L.get("disabled")),Js(n).dataType="edge"})),r.eachNode((function(e){var n=e.getLayout(),i=e.getModel(),r=i.get("localX"),a=i.get("localY"),h=i.getModel("emphasis"),c=new Es({shape:{x:null!=r?r*s:n.x,y:null!=a?a*l:n.y,width:n.dx,height:n.dy},style:i.getModel("itemStyle").getItemStyle(),z2:10});Qh(c,tc(i),{labelFetcher:t,labelDataIndex:e.dataIndex,defaultText:e.id}),c.disableLabelAnimation=!0,c.setStyle("fill",e.getVisual("color")),c.setStyle("decal",e.getVisual("style").decal),Zl(c,i),o.add(c),u.setItemGraphicEl(e.dataIndex,c),Js(c).dataType="node";var p=h.get("focus");Hl(c,"adjacency"===p?e.getAdjacentDataIndices():p,h.get("blurScope"),h.get("disabled"))})),u.eachItemGraphicEl((function(e,r){u.getItemModel(r).get("draggable")&&(e.drift=function(e,o){i._focusAdjacencyDisabled=!0,this.shape.x+=e,this.shape.y+=o,this.dirty(),n.dispatchAction({type:"dragNode",seriesId:t.id,dataIndex:u.getRawIndex(r),localX:this.shape.x/s,localY:this.shape.y/l})},e.ondragend=function(){i._focusAdjacencyDisabled=!1},e.draggable=!0,e.cursor="move")})),!this._data&&t.isAnimationEnabled()&&o.setClipPath(function(t,e,n){var i=new Es({shape:{x:t.x-10,y:t.y-10,width:0,height:t.height+20}});return fh(i,{shape:{width:t.width+20}},e,n),i}(o.getBoundingRect(),t,(function(){o.removeClipPath()}))),this._data=t.getData()},e.prototype.dispose=function(){},e.type="sankey",e}(Tg);var OL=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.getInitialData=function(t,e){var n=t.edges||t.links,i=t.data||t.nodes,r=t.levels;this.levelModels=[];for(var o=this.levelModels,a=0;a<r.length;a++)null!=r[a].depth&&r[a].depth>=0&&(o[r[a].depth]=new Sc(r[a],this,e));if(i&&n){var s=UA(i,n,this,!0,(function(t,e){t.wrapMethod("getItemModel",(function(t,e){var n=t.parentModel,i=n.getData().getItemLayout(e);if(i){var r=i.depth,o=n.levelModels[r];o&&(t.parentModel=o)}return t})),e.wrapMethod("getItemModel",(function(t,e){var n=t.parentModel,i=n.getGraph().getEdgeByIndex(e).node1.getLayout();if(i){var r=i.depth,o=n.levelModels[r];o&&(t.parentModel=o)}return t}))}));return s.data}},e.prototype.setNodePosition=function(t,e){var n=(this.option.data||this.option.nodes)[t];n.localX=e[0],n.localY=e[1]},e.prototype.getGraph=function(){return this.getData().graph},e.prototype.getEdgeData=function(){return this.getGraph().edgeData},e.prototype.formatTooltip=function(t,e,n){function i(t){return isNaN(t)||null==t}if("edge"===n){var r=this.getDataParams(t,n),o=r.data,a=r.value;return Qf("nameValue",{name:o.source+" -- "+o.target,value:a,noValue:i(a)})}var s=this.getGraph().getNodeByIndex(t).getLayout().value,l=this.getDataParams(t,n).data.name;return Qf("nameValue",{name:null!=l?l+"":null,value:s,noValue:i(s)})},e.prototype.optionUpdated=function(){},e.prototype.getDataParams=function(e,n){var i=t.prototype.getDataParams.call(this,e,n);if(null==i.value&&"node"===n){var r=this.getGraph().getNodeByIndex(e).getLayout().value;i.value=r}return i},e.type="series.sankey",e.defaultOption={z:2,coordinateSystem:"view",left:"5%",top:"5%",right:"20%",bottom:"5%",orient:"horizontal",nodeWidth:20,nodeGap:8,draggable:!0,layoutIterations:32,label:{show:!0,position:"right",fontSize:12},edgeLabel:{show:!1,fontSize:12},levels:[],nodeAlign:"justify",lineStyle:{color:"#314656",opacity:.2,curveness:.5},emphasis:{label:{show:!0},lineStyle:{opacity:.5}},select:{itemStyle:{borderColor:"#212121"}},animationEasing:"linear",animationDuration:1e3},e}(fg);function RL(t,e){t.eachSeriesByType("sankey",(function(t){var n=t.get("nodeWidth"),i=t.get("nodeGap"),r=function(t,e){return Tp(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()})}(t,e);t.layoutInfo=r;var o=r.width,a=r.height,s=t.getGraph(),l=s.nodes,u=s.edges;!function(t){E(t,(function(t){var e=YL(t.outEdges,HL),n=YL(t.inEdges,HL),i=t.getValue()||0,r=Math.max(e,n,i);t.setLayout({value:r},!0)}))}(l),function(t,e,n,i,r,o,a,s,l){(function(t,e,n,i,r,o,a){for(var s=[],l=[],u=[],h=[],c=0,p=0;p<e.length;p++)s[p]=1;for(p=0;p<t.length;p++)l[p]=t[p].inEdges.length,0===l[p]&&u.push(t[p]);var d=-1;for(;u.length;){for(var f=0;f<u.length;f++){var g=u[f],y=g.hostGraph.data.getRawDataItem(g.dataIndex),v=null!=y.depth&&y.depth>=0;v&&y.depth>d&&(d=y.depth),g.setLayout({depth:v?y.depth:c},!0),"vertical"===o?g.setLayout({dy:n},!0):g.setLayout({dx:n},!0);for(var m=0;m<g.outEdges.length;m++){var x=g.outEdges[m];s[e.indexOf(x)]=0;var _=x.node2;0==--l[t.indexOf(_)]&&h.indexOf(_)<0&&h.push(_)}}++c,u=h,h=[]}for(p=0;p<s.length;p++)if(1===s[p])throw new Error("Sankey is a DAG, the original data has cycle!");var b=d>c-1?d:c-1;a&&"left"!==a&&function(t,e,n,i){if("right"===e){for(var r=[],o=t,a=0;o.length;){for(var s=0;s<o.length;s++){var l=o[s];l.setLayout({skNodeHeight:a},!0);for(var u=0;u<l.inEdges.length;u++){var h=l.inEdges[u];r.indexOf(h.node1)<0&&r.push(h.node1)}}o=r,r=[],++a}E(t,(function(t){NL(t)||t.setLayout({depth:Math.max(0,i-t.getLayout().skNodeHeight)},!0)}))}else"justify"===e&&function(t,e){E(t,(function(t){NL(t)||t.outEdges.length||t.setLayout({depth:e},!0)}))}(t,i)}(t,a,0,b);!function(t,e,n){E(t,(function(t){var i=t.getLayout().depth*e;"vertical"===n?t.setLayout({y:i},!0):t.setLayout({x:i},!0)}))}(t,"vertical"===o?(r-n)/b:(i-n)/b,o)})(t,e,n,r,o,s,l),function(t,e,n,i,r,o,a){var s=function(t,e){var n=[],i="vertical"===e?"y":"x",r=Fo(t,(function(t){return t.getLayout()[i]}));return r.keys.sort((function(t,e){return t-e})),E(r.keys,(function(t){n.push(r.buckets.get(t))})),n}(t,a);(function(t,e,n,i,r,o){var a=1/0;E(t,(function(t){var e=t.length,s=0;E(t,(function(t){s+=t.getLayout().value}));var l="vertical"===o?(i-(e-1)*r)/s:(n-(e-1)*r)/s;l<a&&(a=l)})),E(t,(function(t){E(t,(function(t,e){var n=t.getLayout().value*a;"vertical"===o?(t.setLayout({x:e},!0),t.setLayout({dx:n},!0)):(t.setLayout({y:e},!0),t.setLayout({dy:n},!0))}))})),E(e,(function(t){var e=+t.getValue()*a;t.setLayout({dy:e},!0)}))})(s,e,n,i,r,a),EL(s,r,n,i,a);for(var l=1;o>0;o--)zL(s,l*=.99,a),EL(s,r,n,i,a),UL(s,l,a),EL(s,r,n,i,a)}(t,e,o,r,i,a,s),function(t,e){var n="vertical"===e?"x":"y";E(t,(function(t){t.outEdges.sort((function(t,e){return t.node2.getLayout()[n]-e.node2.getLayout()[n]})),t.inEdges.sort((function(t,e){return t.node1.getLayout()[n]-e.node1.getLayout()[n]}))})),E(t,(function(t){var e=0,n=0;E(t.outEdges,(function(t){t.setLayout({sy:e},!0),e+=t.getLayout().dy})),E(t.inEdges,(function(t){t.setLayout({ty:n},!0),n+=t.getLayout().dy}))}))}(t,s)}(l,u,n,i,o,a,0!==B(l,(function(t){return 0===t.getLayout().value})).length?0:t.get("layoutIterations"),t.get("orient"),t.get("nodeAlign"))}))}function NL(t){var e=t.hostGraph.data.getRawDataItem(t.dataIndex);return null!=e.depth&&e.depth>=0}function EL(t,e,n,i,r){var o="vertical"===r?"x":"y";E(t,(function(t){var a,s,l;t.sort((function(t,e){return t.getLayout()[o]-e.getLayout()[o]}));for(var u=0,h=t.length,c="vertical"===r?"dx":"dy",p=0;p<h;p++)(l=u-(s=t[p]).getLayout()[o])>0&&(a=s.getLayout()[o]+l,"vertical"===r?s.setLayout({x:a},!0):s.setLayout({y:a},!0)),u=s.getLayout()[o]+s.getLayout()[c]+e;if((l=u-e-("vertical"===r?i:n))>0){a=s.getLayout()[o]-l,"vertical"===r?s.setLayout({x:a},!0):s.setLayout({y:a},!0),u=a;for(p=h-2;p>=0;--p)(l=(s=t[p]).getLayout()[o]+s.getLayout()[c]+e-u)>0&&(a=s.getLayout()[o]-l,"vertical"===r?s.setLayout({x:a},!0):s.setLayout({y:a},!0)),u=s.getLayout()[o]}}))}function zL(t,e,n){E(t.slice().reverse(),(function(t){E(t,(function(t){if(t.outEdges.length){var i=YL(t.outEdges,VL,n)/YL(t.outEdges,HL);if(isNaN(i)){var r=t.outEdges.length;i=r?YL(t.outEdges,BL,n)/r:0}if("vertical"===n){var o=t.getLayout().x+(i-WL(t,n))*e;t.setLayout({x:o},!0)}else{var a=t.getLayout().y+(i-WL(t,n))*e;t.setLayout({y:a},!0)}}}))}))}function VL(t,e){return WL(t.node2,e)*t.getValue()}function BL(t,e){return WL(t.node2,e)}function FL(t,e){return WL(t.node1,e)*t.getValue()}function GL(t,e){return WL(t.node1,e)}function WL(t,e){return"vertical"===e?t.getLayout().x+t.getLayout().dx/2:t.getLayout().y+t.getLayout().dy/2}function HL(t){return t.getValue()}function YL(t,e,n){for(var i=0,r=t.length,o=-1;++o<r;){var a=+e(t[o],n);isNaN(a)||(i+=a)}return i}function UL(t,e,n){E(t,(function(t){E(t,(function(t){if(t.inEdges.length){var i=YL(t.inEdges,FL,n)/YL(t.inEdges,HL);if(isNaN(i)){var r=t.inEdges.length;i=r?YL(t.inEdges,GL,n)/r:0}if("vertical"===n){var o=t.getLayout().x+(i-WL(t,n))*e;t.setLayout({x:o},!0)}else{var a=t.getLayout().y+(i-WL(t,n))*e;t.setLayout({y:a},!0)}}}))}))}function XL(t){t.eachSeriesByType("sankey",(function(t){var e=t.getGraph(),n=e.nodes,i=e.edges;if(n.length){var r=1/0,o=-1/0;E(n,(function(t){var e=t.getLayout().value;e<r&&(r=e),e>o&&(o=e)})),E(n,(function(e){var n=new dD({type:"color",mappingMethod:"linear",dataExtent:[r,o],visual:t.get("color")}).mapValueToVisual(e.getLayout().value),i=e.getModel().get(["itemStyle","color"]);null!=i?(e.setVisual("color",i),e.setVisual("style",{fill:i})):(e.setVisual("color",n),e.setVisual("style",{fill:n}))}))}i.length&&E(i,(function(t){var e=t.getModel().get("lineStyle");t.setVisual("style",e)}))}))}var ZL=function(){function t(){}return t.prototype.getInitialData=function(t,e){var n,i,r=e.getComponent("xAxis",this.get("xAxisIndex")),o=e.getComponent("yAxis",this.get("yAxisIndex")),a=r.get("type"),s=o.get("type");"category"===a?(t.layout="horizontal",n=r.getOrdinalMeta(),i=!0):"category"===s?(t.layout="vertical",n=o.getOrdinalMeta(),i=!0):t.layout=t.layout||"horizontal";var l=["x","y"],u="horizontal"===t.layout?0:1,h=this._baseAxisDim=l[u],c=l[1-u],p=[r,o],d=p[u].get("type"),f=p[1-u].get("type"),g=t.data;if(g&&i){var y=[];E(g,(function(t,e){var n;Y(t)?(n=t.slice(),t.unshift(e)):Y(t.value)?((n=A({},t)).value=n.value.slice(),t.value.unshift(e)):n=t,y.push(n)})),t.data=y}var v=this.defaultValueDimensions,m=[{name:h,type:Rm(d),ordinalMeta:n,otherDims:{tooltip:!1,itemName:0},dimsDef:["base"]},{name:c,type:Rm(f),dimsDef:v.slice()}];return vM(this,{coordDimensions:m,dimensionsCount:v.length+1,encodeDefaulter:H(Kp,m,this)})},t.prototype.getBaseAxis=function(){var t=this._baseAxisDim;return this.ecModel.getComponent(t+"Axis",this.get(t+"AxisIndex")).axis},t}(),jL=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.defaultValueDimensions=[{name:"min",defaultTooltip:!0},{name:"Q1",defaultTooltip:!0},{name:"median",defaultTooltip:!0},{name:"Q3",defaultTooltip:!0},{name:"max",defaultTooltip:!0}],n.visualDrawType="stroke",n}return n(e,t),e.type="series.boxplot",e.dependencies=["xAxis","yAxis","grid"],e.defaultOption={z:2,coordinateSystem:"cartesian2d",legendHoverLink:!0,layout:null,boxWidth:[7,50],itemStyle:{color:"#fff",borderWidth:1},emphasis:{scale:!0,itemStyle:{borderWidth:2,shadowBlur:5,shadowOffsetX:1,shadowOffsetY:1,shadowColor:"rgba(0,0,0,0.2)"}},animationDuration:800},e}(fg);R(jL,ZL,!0);var qL=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.render=function(t,e,n){var i=t.getData(),r=this.group,o=this._data;this._data||r.removeAll();var a="horizontal"===t.get("layout")?1:0;i.diff(o).add((function(t){if(i.hasValue(t)){var e=JL(i.getItemLayout(t),i,t,a,!0);i.setItemGraphicEl(t,e),r.add(e)}})).update((function(t,e){var n=o.getItemGraphicEl(e);if(i.hasValue(t)){var s=i.getItemLayout(t);n?(xh(n),QL(s,n,i,t)):n=JL(s,i,t,a),r.add(n),i.setItemGraphicEl(t,n)}else r.remove(n)})).remove((function(t){var e=o.getItemGraphicEl(t);e&&r.remove(e)})).execute(),this._data=i},e.prototype.remove=function(t){var e=this.group,n=this._data;this._data=null,n&&n.eachItemGraphicEl((function(t){t&&e.remove(t)}))},e.type="boxplot",e}(Tg),KL=function(){},$L=function(t){function e(e){var n=t.call(this,e)||this;return n.type="boxplotBoxPath",n}return n(e,t),e.prototype.getDefaultShape=function(){return new KL},e.prototype.buildPath=function(t,e){var n=e.points,i=0;for(t.moveTo(n[i][0],n[i][1]),i++;i<4;i++)t.lineTo(n[i][0],n[i][1]);for(t.closePath();i<n.length;i++)t.moveTo(n[i][0],n[i][1]),i++,t.lineTo(n[i][0],n[i][1])},e}(Ms);function JL(t,e,n,i,r){var o=t.ends,a=new $L({shape:{points:r?tP(o,i,t):o}});return QL(t,a,e,n,r),a}function QL(t,e,n,i,r){var o=n.hostModel;(0,qh[r?"initProps":"updateProps"])(e,{shape:{points:t.ends}},o,i),e.useStyle(n.getItemVisual(i,"style")),e.style.strokeNoScale=!0,e.z2=100;var a=n.getItemModel(i),s=a.getModel("emphasis");Zl(e,a),Hl(e,s.get("focus"),s.get("blurScope"),s.get("disabled"))}function tP(t,e,n){return z(t,(function(t){return(t=t.slice())[e]=n.initBaseline,t}))}var eP=E;function nP(t){var e=function(t){var e=[],n=[];return t.eachSeriesByType("boxplot",(function(t){var i=t.getBaseAxis(),r=P(n,i);r<0&&(r=n.length,n[r]=i,e[r]={axis:i,seriesModels:[]}),e[r].seriesModels.push(t)})),e}(t);eP(e,(function(t){var e=t.seriesModels;e.length&&(!function(t){var e,n=t.axis,i=t.seriesModels,r=i.length,o=t.boxWidthList=[],a=t.boxOffsetList=[],s=[];if("category"===n.type)e=n.getBandWidth();else{var l=0;eP(i,(function(t){l=Math.max(l,t.getData().count())}));var u=n.getExtent();e=Math.abs(u[1]-u[0])/l}eP(i,(function(t){var n=t.get("boxWidth");Y(n)||(n=[n,n]),s.push([Ur(n[0],e)||0,Ur(n[1],e)||0])}));var h=.8*e-2,c=h/r*.3,p=(h-c*(r-1))/r,d=p/2-h/2;eP(i,(function(t,e){a.push(d),d+=c+p,o.push(Math.min(Math.max(p,s[e][0]),s[e][1]))}))}(t),eP(e,(function(e,n){!function(t,e,n){var i=t.coordinateSystem,r=t.getData(),o=n/2,a="horizontal"===t.get("layout")?0:1,s=1-a,l=["x","y"],u=r.mapDimension(l[a]),h=r.mapDimensionsAll(l[s]);if(null==u||h.length<5)return;for(var c=0;c<r.count();c++){var p=r.get(u,c),d=x(p,h[2],c),f=x(p,h[0],c),g=x(p,h[1],c),y=x(p,h[3],c),v=x(p,h[4],c),m=[];_(m,g,!1),_(m,y,!0),m.push(f,g,v,y),b(m,f),b(m,v),b(m,d),r.setItemLayout(c,{initBaseline:d[s],ends:m})}function x(t,n,o){var l,u=r.get(n,o),h=[];return h[a]=t,h[s]=u,isNaN(t)||isNaN(u)?l=[NaN,NaN]:(l=i.dataToPoint(h))[a]+=e,l}function _(t,e,n){var i=e.slice(),r=e.slice();i[a]+=o,r[a]-=o,n?t.push(i,r):t.push(r,i)}function b(t,e){var n=e.slice(),i=e.slice();n[a]-=o,i[a]+=o,t.push(n,i)}}(e,t.boxOffsetList[n],t.boxWidthList[n])})))}))}var iP={type:"echarts:boxplot",transform:function(t){var e=t.upstream;if(e.sourceFormat!==Bp){var n="";0,yo(n)}var i=function(t,e){for(var n=[],i=[],r=(e=e||{}).boundIQR,o="none"===r||0===r,a=0;a<t.length;a++){var s=Zr(t[a].slice()),l=so(s,.25),u=so(s,.5),h=so(s,.75),c=s[0],p=s[s.length-1],d=(null==r?1.5:r)*(h-l),f=o?c:Math.max(c,l-d),g=o?p:Math.min(p,h+d),y=e.itemNameFormatter,v=U(y)?y({value:a}):X(y)?y.replace("{value}",a+""):a+"";n.push([v,f,l,u,h,g]);for(var m=0;m<s.length;m++){var x=s[m];if(x<f||x>g){var _=[v,x];i.push(_)}}}return{boxData:n,outliers:i}}(e.getRawData(),t.config);return[{dimensions:["ItemName","Low","Q1","Q2","Q3","High"],data:i.boxData},{data:i.outliers}]}};var rP=["color","borderColor"],oP=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.render=function(t,e,n){this.group.removeClipPath(),this._progressiveEls=null,this._updateDrawMode(t),this._isLargeDraw?this._renderLarge(t):this._renderNormal(t)},e.prototype.incrementalPrepareRender=function(t,e,n){this._clear(),this._updateDrawMode(t)},e.prototype.incrementalRender=function(t,e,n,i){this._progressiveEls=[],this._isLargeDraw?this._incrementalRenderLarge(t,e):this._incrementalRenderNormal(t,e)},e.prototype.eachRendered=function(t){jh(this._progressiveEls||this.group,t)},e.prototype._updateDrawMode=function(t){var e=t.pipelineContext.large;null!=this._isLargeDraw&&e===this._isLargeDraw||(this._isLargeDraw=e,this._clear())},e.prototype._renderNormal=function(t){var e=t.getData(),n=this._data,i=this.group,r=e.getLayout("isSimpleBox"),o=t.get("clip",!0),a=t.coordinateSystem,s=a.getArea&&a.getArea();this._data||i.removeAll(),e.diff(n).add((function(n){if(e.hasValue(n)){var a=e.getItemLayout(n);if(o&&uP(s,a))return;var l=lP(a,n,!0);fh(l,{shape:{points:a.ends}},t,n),hP(l,e,n,r),i.add(l),e.setItemGraphicEl(n,l)}})).update((function(a,l){var u=n.getItemGraphicEl(l);if(e.hasValue(a)){var h=e.getItemLayout(a);o&&uP(s,h)?i.remove(u):(u?(dh(u,{shape:{points:h.ends}},t,a),xh(u)):u=lP(h),hP(u,e,a,r),i.add(u),e.setItemGraphicEl(a,u))}else i.remove(u)})).remove((function(t){var e=n.getItemGraphicEl(t);e&&i.remove(e)})).execute(),this._data=e},e.prototype._renderLarge=function(t){this._clear(),fP(t,this.group);var e=t.get("clip",!0)?yS(t.coordinateSystem,!1,t):null;e?this.group.setClipPath(e):this.group.removeClipPath()},e.prototype._incrementalRenderNormal=function(t,e){for(var n,i=e.getData(),r=i.getLayout("isSimpleBox");null!=(n=t.next());){var o=lP(i.getItemLayout(n));hP(o,i,n,r),o.incremental=!0,this.group.add(o),this._progressiveEls.push(o)}},e.prototype._incrementalRenderLarge=function(t,e){fP(e,this.group,this._progressiveEls,!0)},e.prototype.remove=function(t){this._clear()},e.prototype._clear=function(){this.group.removeAll(),this._data=null},e.type="candlestick",e}(Tg),aP=function(){},sP=function(t){function e(e){var n=t.call(this,e)||this;return n.type="normalCandlestickBox",n}return n(e,t),e.prototype.getDefaultShape=function(){return new aP},e.prototype.buildPath=function(t,e){var n=e.points;this.__simpleBox?(t.moveTo(n[4][0],n[4][1]),t.lineTo(n[6][0],n[6][1])):(t.moveTo(n[0][0],n[0][1]),t.lineTo(n[1][0],n[1][1]),t.lineTo(n[2][0],n[2][1]),t.lineTo(n[3][0],n[3][1]),t.closePath(),t.moveTo(n[4][0],n[4][1]),t.lineTo(n[5][0],n[5][1]),t.moveTo(n[6][0],n[6][1]),t.lineTo(n[7][0],n[7][1]))},e}(Ms);function lP(t,e,n){var i=t.ends;return new sP({shape:{points:n?cP(i,t):i},z2:100})}function uP(t,e){for(var n=!0,i=0;i<e.ends.length;i++)if(t.contain(e.ends[i][0],e.ends[i][1])){n=!1;break}return n}function hP(t,e,n,i){var r=e.getItemModel(n);t.useStyle(e.getItemVisual(n,"style")),t.style.strokeNoScale=!0,t.__simpleBox=i,Zl(t,r)}function cP(t,e){return z(t,(function(t){return(t=t.slice())[1]=e.initBaseline,t}))}var pP=function(){},dP=function(t){function e(e){var n=t.call(this,e)||this;return n.type="largeCandlestickBox",n}return n(e,t),e.prototype.getDefaultShape=function(){return new pP},e.prototype.buildPath=function(t,e){for(var n=e.points,i=0;i<n.length;)if(this.__sign===n[i++]){var r=n[i++];t.moveTo(r,n[i++]),t.lineTo(r,n[i++])}else i+=3},e}(Ms);function fP(t,e,n,i){var r=t.getData().getLayout("largePoints"),o=new dP({shape:{points:r},__sign:1,ignoreCoarsePointer:!0});e.add(o);var a=new dP({shape:{points:r},__sign:-1,ignoreCoarsePointer:!0});e.add(a);var s=new dP({shape:{points:r},__sign:0,ignoreCoarsePointer:!0});e.add(s),gP(1,o,t),gP(-1,a,t),gP(0,s,t),i&&(o.incremental=!0,a.incremental=!0),n&&n.push(o,a)}function gP(t,e,n,i){var r=n.get(["itemStyle",t>0?"borderColor":"borderColor0"])||n.get(["itemStyle",t>0?"color":"color0"]);0===t&&(r=n.get(["itemStyle","borderColorDoji"]));var o=n.getModel("itemStyle").getItemStyle(rP);e.useStyle(o),e.style.fill=null,e.style.stroke=r}var yP=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.defaultValueDimensions=[{name:"open",defaultTooltip:!0},{name:"close",defaultTooltip:!0},{name:"lowest",defaultTooltip:!0},{name:"highest",defaultTooltip:!0}],n}return n(e,t),e.prototype.getShadowDim=function(){return"open"},e.prototype.brushSelector=function(t,e,n){var i=e.getItemLayout(t);return i&&n.rect(i.brushRect)},e.type="series.candlestick",e.dependencies=["xAxis","yAxis","grid"],e.defaultOption={z:2,coordinateSystem:"cartesian2d",legendHoverLink:!0,layout:null,clip:!0,itemStyle:{color:"#eb5454",color0:"#47b262",borderColor:"#eb5454",borderColor0:"#47b262",borderColorDoji:null,borderWidth:1},emphasis:{scale:!0,itemStyle:{borderWidth:2}},barMaxWidth:null,barMinWidth:null,barWidth:null,large:!0,largeThreshold:600,progressive:3e3,progressiveThreshold:1e4,progressiveChunkMode:"mod",animationEasing:"linear",animationDuration:300},e}(fg);function vP(t){t&&Y(t.series)&&E(t.series,(function(t){q(t)&&"k"===t.type&&(t.type="candlestick")}))}R(yP,ZL,!0);var mP=["itemStyle","borderColor"],xP=["itemStyle","borderColor0"],_P=["itemStyle","borderColorDoji"],bP=["itemStyle","color"],wP=["itemStyle","color0"],SP={seriesType:"candlestick",plan:Sg(),performRawSeries:!0,reset:function(t,e){function n(t,e){return e.get(t>0?bP:wP)}function i(t,e){return e.get(0===t?_P:t>0?mP:xP)}if(!e.isSeriesFiltered(t))return!t.pipelineContext.large&&{progress:function(t,e){for(var r;null!=(r=t.next());){var o=e.getItemModel(r),a=e.getItemLayout(r).sign,s=o.getItemStyle();s.fill=n(a,o),s.stroke=i(a,o)||s.fill,A(e.ensureUniqueItemVisual(r,"style"),s)}}}}},MP={seriesType:"candlestick",plan:Sg(),reset:function(t){var e=t.coordinateSystem,n=t.getData(),i=function(t,e){var n,i=t.getBaseAxis(),r="category"===i.type?i.getBandWidth():(n=i.getExtent(),Math.abs(n[1]-n[0])/e.count()),o=Ur(rt(t.get("barMaxWidth"),r),r),a=Ur(rt(t.get("barMinWidth"),1),r),s=t.get("barWidth");return null!=s?Ur(s,r):Math.max(Math.min(r/2,o),a)}(t,n),r=["x","y"],o=n.getDimensionIndex(n.mapDimension(r[0])),a=z(n.mapDimensionsAll(r[1]),n.getDimensionIndex,n),s=a[0],l=a[1],u=a[2],h=a[3];if(n.setLayout({candleWidth:i,isSimpleBox:i<=1.3}),!(o<0||a.length<4))return{progress:t.pipelineContext.large?function(n,i){var r,a,c=Ax(4*n.count),p=0,d=[],f=[],g=i.getStore(),y=!!t.get(["itemStyle","borderColorDoji"]);for(;null!=(a=n.next());){var v=g.get(o,a),m=g.get(s,a),x=g.get(l,a),_=g.get(u,a),b=g.get(h,a);isNaN(v)||isNaN(_)||isNaN(b)?(c[p++]=NaN,p+=3):(c[p++]=IP(g,a,m,x,l,y),d[0]=v,d[1]=_,r=e.dataToPoint(d,null,f),c[p++]=r?r[0]:NaN,c[p++]=r?r[1]:NaN,d[1]=b,r=e.dataToPoint(d,null,f),c[p++]=r?r[1]:NaN)}i.setLayout("largePoints",c)}:function(t,n){var r,a=n.getStore();for(;null!=(r=t.next());){var c=a.get(o,r),p=a.get(s,r),d=a.get(l,r),f=a.get(u,r),g=a.get(h,r),y=Math.min(p,d),v=Math.max(p,d),m=M(y,c),x=M(v,c),_=M(f,c),b=M(g,c),w=[];I(w,x,0),I(w,m,1),w.push(C(b),C(x),C(_),C(m));var S=!!n.getItemModel(r).get(["itemStyle","borderColorDoji"]);n.setItemLayout(r,{sign:IP(a,r,p,d,l,S),initBaseline:p>d?x[1]:m[1],ends:w,brushRect:T(f,g,c)})}function M(t,n){var i=[];return i[0]=n,i[1]=t,isNaN(n)||isNaN(t)?[NaN,NaN]:e.dataToPoint(i)}function I(t,e,n){var r=e.slice(),o=e.slice();r[0]=Rh(r[0]+i/2,1,!1),o[0]=Rh(o[0]-i/2,1,!0),n?t.push(r,o):t.push(o,r)}function T(t,e,n){var r=M(t,n),o=M(e,n);return r[0]-=i/2,o[0]-=i/2,{x:r[0],y:r[1],width:i,height:o[1]-r[1]}}function C(t){return t[0]=Rh(t[0],1),t}}}}};function IP(t,e,n,i,r,o){return n>i?-1:n<i?1:o?0:e>0?t.get(r,e-1)<=i?1:-1:1}function TP(t,e){var n=e.rippleEffectColor||e.color;t.eachChild((function(t){t.attr({z:e.z,zlevel:e.zlevel,style:{stroke:"stroke"===e.brushType?n:null,fill:"fill"===e.brushType?n:null}})}))}var CP=function(t){function e(e,n){var i=t.call(this)||this,r=new Jw(e,n),o=new Er;return i.add(r),i.add(o),i.updateData(e,n),i}return n(e,t),e.prototype.stopEffectAnimation=function(){this.childAt(1).removeAll()},e.prototype.startEffectAnimation=function(t){for(var e=t.symbolType,n=t.color,i=t.rippleNumber,r=this.childAt(1),o=0;o<i;o++){var a=Vy(e,-1,-1,2,2,n);a.attr({style:{strokeNoScale:!0},z2:99,silent:!0,scaleX:.5,scaleY:.5});var s=-o/i*t.period+t.effectOffset;a.animate("",!0).when(t.period,{scaleX:t.rippleScale/2,scaleY:t.rippleScale/2}).delay(s).start(),a.animateStyle(!0).when(t.period,{opacity:0}).delay(s).start(),r.add(a)}TP(r,t)},e.prototype.updateEffectAnimation=function(t){for(var e=this._effectCfg,n=this.childAt(1),i=["symbolType","period","rippleScale","rippleNumber"],r=0;r<i.length;r++){var o=i[r];if(e[o]!==t[o])return this.stopEffectAnimation(),void this.startEffectAnimation(t)}TP(n,t)},e.prototype.highlight=function(){Al(this)},e.prototype.downplay=function(){kl(this)},e.prototype.getSymbolType=function(){var t=this.childAt(0);return t&&t.getSymbolType()},e.prototype.updateData=function(t,e){var n=this,i=t.hostModel;this.childAt(0).updateData(t,e);var r=this.childAt(1),o=t.getItemModel(e),a=t.getItemVisual(e,"symbol"),s=By(t.getItemVisual(e,"symbolSize")),l=t.getItemVisual(e,"style"),u=l&&l.fill,h=o.getModel("emphasis");r.setScale(s),r.traverse((function(t){t.setStyle("fill",u)}));var c=Fy(t.getItemVisual(e,"symbolOffset"),s);c&&(r.x=c[0],r.y=c[1]);var p=t.getItemVisual(e,"symbolRotate");r.rotation=(p||0)*Math.PI/180||0;var d={};d.showEffectOn=i.get("showEffectOn"),d.rippleScale=o.get(["rippleEffect","scale"]),d.brushType=o.get(["rippleEffect","brushType"]),d.period=1e3*o.get(["rippleEffect","period"]),d.effectOffset=e/t.count(),d.z=i.getShallow("z")||0,d.zlevel=i.getShallow("zlevel")||0,d.symbolType=a,d.color=u,d.rippleEffectColor=o.get(["rippleEffect","color"]),d.rippleNumber=o.get(["rippleEffect","number"]),"render"===d.showEffectOn?(this._effectCfg?this.updateEffectAnimation(d):this.startEffectAnimation(d),this._effectCfg=d):(this._effectCfg=null,this.stopEffectAnimation(),this.onHoverStateChange=function(t){"emphasis"===t?"render"!==d.showEffectOn&&n.startEffectAnimation(d):"normal"===t&&"render"!==d.showEffectOn&&n.stopEffectAnimation()}),this._effectCfg=d,Hl(this,h.get("focus"),h.get("blurScope"),h.get("disabled"))},e.prototype.fadeOut=function(t){t&&t()},e}(Er),DP=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.init=function(){this._symbolDraw=new iS(CP)},e.prototype.render=function(t,e,n){var i=t.getData(),r=this._symbolDraw;r.updateData(i,{clipShape:this._getClipShape(t)}),this.group.add(r.group)},e.prototype._getClipShape=function(t){var e=t.coordinateSystem,n=e&&e.getArea&&e.getArea();return t.get("clip",!0)?n:null},e.prototype.updateTransform=function(t,e,n){var i=t.getData();this.group.dirty();var r=AS("").reset(t,e,n);r.progress&&r.progress({start:0,end:i.count(),count:i.count()},i),this._symbolDraw.updateLayout()},e.prototype._updateGroupTransform=function(t){var e=t.coordinateSystem;e&&e.getRoamTransform&&(this.group.transform=Ie(e.getRoamTransform()),this.group.decomposeTransform())},e.prototype.remove=function(t,e){this._symbolDraw&&this._symbolDraw.remove(!0)},e.type="effectScatter",e}(Tg),AP=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.hasSymbolVisual=!0,n}return n(e,t),e.prototype.getInitialData=function(t,e){return hx(null,this,{useEncodeDefaulter:!0})},e.prototype.brushSelector=function(t,e,n){return n.point(e.getItemLayout(t))},e.type="series.effectScatter",e.dependencies=["grid","polar"],e.defaultOption={coordinateSystem:"cartesian2d",z:2,legendHoverLink:!0,effectType:"ripple",progressive:0,showEffectOn:"render",clip:!0,rippleEffect:{period:4,scale:2.5,brushType:"fill",number:3},universalTransition:{divideShape:"clone"},symbolSize:10},e}(fg);var kP=function(t){function e(e,n,i){var r=t.call(this)||this;return r.add(r.createLine(e,n,i)),r._updateEffectSymbol(e,n),r}return n(e,t),e.prototype.createLine=function(t,e,n){return new IA(t,e,n)},e.prototype._updateEffectSymbol=function(t,e){var n=t.getItemModel(e).getModel("effect"),i=n.get("symbolSize"),r=n.get("symbol");Y(i)||(i=[i,i]);var o=t.getItemVisual(e,"style"),a=n.get("color")||o&&o.stroke,s=this.childAt(1);this._symbolType!==r&&(this.remove(s),(s=Vy(r,-.5,-.5,1,1,a)).z2=100,s.culling=!0,this.add(s)),s&&(s.setStyle("shadowColor",a),s.setStyle(n.getItemStyle(["color"])),s.scaleX=i[0],s.scaleY=i[1],s.setColor(a),this._symbolType=r,this._symbolScale=i,this._updateEffectAnimation(t,n,e))},e.prototype._updateEffectAnimation=function(t,e,n){var i=this.childAt(1);if(i){var r=t.getItemLayout(n),o=1e3*e.get("period"),a=e.get("loop"),s=e.get("roundTrip"),l=e.get("constantSpeed"),u=it(e.get("delay"),(function(e){return e/t.count()*o/3}));if(i.ignore=!0,this._updateAnimationPoints(i,r),l>0&&(o=this._getLineLength(i)/l*1e3),o!==this._period||a!==this._loop||s!==this._roundTrip){i.stopAnimation();var h=void 0;h=U(u)?u(n):u,i.__t>0&&(h=-o*i.__t),this._animateSymbol(i,o,h,a,s)}this._period=o,this._loop=a,this._roundTrip=s}},e.prototype._animateSymbol=function(t,e,n,i,r){if(e>0){t.__t=0;var o=this,a=t.animate("",i).when(r?2*e:e,{__t:r?2:1}).delay(n).during((function(){o._updateSymbolPosition(t)}));i||a.done((function(){o.remove(t)})),a.start()}},e.prototype._getLineLength=function(t){return Vt(t.__p1,t.__cp1)+Vt(t.__cp1,t.__p2)},e.prototype._updateAnimationPoints=function(t,e){t.__p1=e[0],t.__p2=e[1],t.__cp1=e[2]||[(e[0][0]+e[1][0])/2,(e[0][1]+e[1][1])/2]},e.prototype.updateData=function(t,e,n){this.childAt(0).updateData(t,e,n),this._updateEffectSymbol(t,e)},e.prototype._updateSymbolPosition=function(t){var e=t.__p1,n=t.__p2,i=t.__cp1,r=t.__t<1?t.__t:2-t.__t,o=[t.x,t.y],a=o.slice(),s=Mn,l=In;o[0]=s(e[0],i[0],n[0],r),o[1]=s(e[1],i[1],n[1],r);var u=t.__t<1?l(e[0],i[0],n[0],r):l(n[0],i[0],e[0],1-r),h=t.__t<1?l(e[1],i[1],n[1],r):l(n[1],i[1],e[1],1-r);t.rotation=-Math.atan2(h,u)-Math.PI/2,"line"!==this._symbolType&&"rect"!==this._symbolType&&"roundRect"!==this._symbolType||(void 0!==t.__lastT&&t.__lastT<t.__t?(t.scaleY=1.05*Vt(a,o),1===r&&(o[0]=a[0]+(o[0]-a[0])/2,o[1]=a[1]+(o[1]-a[1])/2)):1===t.__lastT?t.scaleY=2*Vt(e,o):t.scaleY=this._symbolScale[1]),t.__lastT=t.__t,t.ignore=!1,t.x=o[0],t.y=o[1]},e.prototype.updateLayout=function(t,e){this.childAt(0).updateLayout(t,e);var n=t.getItemModel(e).getModel("effect");this._updateEffectAnimation(t,n,e)},e}(Er),LP=function(t){function e(e,n,i){var r=t.call(this)||this;return r._createPolyline(e,n,i),r}return n(e,t),e.prototype._createPolyline=function(t,e,n){var i=t.getItemLayout(e),r=new Hu({shape:{points:i}});this.add(r),this._updateCommonStl(t,e,n)},e.prototype.updateData=function(t,e,n){var i=t.hostModel;dh(this.childAt(0),{shape:{points:t.getItemLayout(e)}},i,e),this._updateCommonStl(t,e,n)},e.prototype._updateCommonStl=function(t,e,n){var i=this.childAt(0),r=t.getItemModel(e),o=n&&n.emphasisLineStyle,a=n&&n.focus,s=n&&n.blurScope,l=n&&n.emphasisDisabled;if(!n||t.hasItemOption){var u=r.getModel("emphasis");o=u.getModel("lineStyle").getLineStyle(),l=u.get("disabled"),a=u.get("focus"),s=u.get("blurScope")}i.useStyle(t.getItemVisual(e,"style")),i.style.fill=null,i.style.strokeNoScale=!0,i.ensureState("emphasis").style=o,Hl(this,a,s,l)},e.prototype.updateLayout=function(t,e){this.childAt(0).setShape("points",t.getItemLayout(e))},e}(Er),PP=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e._lastFrame=0,e._lastFramePercent=0,e}return n(e,t),e.prototype.createLine=function(t,e,n){return new LP(t,e,n)},e.prototype._updateAnimationPoints=function(t,e){this._points=e;for(var n=[0],i=0,r=1;r<e.length;r++){var o=e[r-1],a=e[r];i+=Vt(o,a),n.push(i)}if(0!==i){for(r=0;r<n.length;r++)n[r]/=i;this._offsets=n,this._length=i}else this._length=0},e.prototype._getLineLength=function(){return this._length},e.prototype._updateSymbolPosition=function(t){var e=t.__t<1?t.__t:2-t.__t,n=this._points,i=this._offsets,r=n.length;if(i){var o,a=this._lastFrame;if(e<this._lastFramePercent){for(o=Math.min(a+1,r-1);o>=0&&!(i[o]<=e);o--);o=Math.min(o,r-2)}else{for(o=a;o<r&&!(i[o]>e);o++);o=Math.min(o-1,r-2)}var s=(e-i[o])/(i[o+1]-i[o]),l=n[o],u=n[o+1];t.x=l[0]*(1-s)+s*u[0],t.y=l[1]*(1-s)+s*u[1];var h=t.__t<1?u[0]-l[0]:l[0]-u[0],c=t.__t<1?u[1]-l[1]:l[1]-u[1];t.rotation=-Math.atan2(c,h)-Math.PI/2,this._lastFrame=o,this._lastFramePercent=e,t.ignore=!1}},e}(kP),OP=function(){this.polyline=!1,this.curveness=0,this.segs=[]},RP=function(t){function e(e){var n=t.call(this,e)||this;return n._off=0,n.hoverDataIdx=-1,n}return n(e,t),e.prototype.reset=function(){this.notClear=!1,this._off=0},e.prototype.getDefaultStyle=function(){return{stroke:"#000",fill:null}},e.prototype.getDefaultShape=function(){return new OP},e.prototype.buildPath=function(t,e){var n,i=e.segs,r=e.curveness;if(e.polyline)for(n=this._off;n<i.length;){var o=i[n++];if(o>0){t.moveTo(i[n++],i[n++]);for(var a=1;a<o;a++)t.lineTo(i[n++],i[n++])}}else for(n=this._off;n<i.length;){var s=i[n++],l=i[n++],u=i[n++],h=i[n++];if(t.moveTo(s,l),r>0){var c=(s+u)/2-(l-h)*r,p=(l+h)/2-(u-s)*r;t.quadraticCurveTo(c,p,u,h)}else t.lineTo(u,h)}this.incremental&&(this._off=n,this.notClear=!0)},e.prototype.findDataIndex=function(t,e){var n=this.shape,i=n.segs,r=n.curveness,o=this.style.lineWidth;if(n.polyline)for(var a=0,s=0;s<i.length;){var l=i[s++];if(l>0)for(var u=i[s++],h=i[s++],c=1;c<l;c++){if(os(u,h,p=i[s++],d=i[s++],o,t,e))return a}a++}else for(a=0,s=0;s<i.length;){u=i[s++],h=i[s++];var p=i[s++],d=i[s++];if(r>0){if(ss(u,h,(u+p)/2-(h-d)*r,(h+d)/2-(p-u)*r,p,d,o,t,e))return a}else if(os(u,h,p,d,o,t,e))return a;a++}return-1},e.prototype.contain=function(t,e){var n=this.transformCoordToLocal(t,e),i=this.getBoundingRect();return t=n[0],e=n[1],i.contain(t,e)?(this.hoverDataIdx=this.findDataIndex(t,e))>=0:(this.hoverDataIdx=-1,!1)},e.prototype.getBoundingRect=function(){var t=this._rect;if(!t){for(var e=this.shape.segs,n=1/0,i=1/0,r=-1/0,o=-1/0,a=0;a<e.length;){var s=e[a++],l=e[a++];n=Math.min(s,n),r=Math.max(s,r),i=Math.min(l,i),o=Math.max(l,o)}t=this._rect=new Ee(n,i,r,o)}return t},e}(Ms),NP=function(){function t(){this.group=new Er}return t.prototype.updateData=function(t){this._clear();var e=this._create();e.setShape({segs:t.getLayout("linesPoints")}),this._setCommon(e,t)},t.prototype.incrementalPrepareUpdate=function(t){this.group.removeAll(),this._clear()},t.prototype.incrementalUpdate=function(t,e){var n=this._newAdded[0],i=e.getLayout("linesPoints"),r=n&&n.shape.segs;if(r&&r.length<2e4){var o=r.length,a=new Float32Array(o+i.length);a.set(r),a.set(i,o),n.setShape({segs:a})}else{this._newAdded=[];var s=this._create();s.incremental=!0,s.setShape({segs:i}),this._setCommon(s,e),s.__startIndex=t.start}},t.prototype.remove=function(){this._clear()},t.prototype.eachRendered=function(t){this._newAdded[0]&&t(this._newAdded[0])},t.prototype._create=function(){var t=new RP({cursor:"default",ignoreCoarsePointer:!0});return this._newAdded.push(t),this.group.add(t),t},t.prototype._setCommon=function(t,e,n){var i=e.hostModel;t.setShape({polyline:i.get("polyline"),curveness:i.get(["lineStyle","curveness"])}),t.useStyle(i.getModel("lineStyle").getLineStyle()),t.style.strokeNoScale=!0;var r=e.getVisual("style");r&&r.stroke&&t.setStyle("stroke",r.stroke),t.setStyle("fill",null);var o=Js(t);o.seriesIndex=i.seriesIndex,t.on("mousemove",(function(e){o.dataIndex=null;var n=t.hoverDataIdx;n>0&&(o.dataIndex=n+t.__startIndex)}))},t.prototype._clear=function(){this._newAdded=[],this.group.removeAll()},t}(),EP={seriesType:"lines",plan:Sg(),reset:function(t){var e=t.coordinateSystem;if(e){var n=t.get("polyline"),i=t.pipelineContext.large;return{progress:function(r,o){var a=[];if(i){var s=void 0,l=r.end-r.start;if(n){for(var u=0,h=r.start;h<r.end;h++)u+=t.getLineCoordsCount(h);s=new Float32Array(l+2*u)}else s=new Float32Array(4*l);var c=0,p=[];for(h=r.start;h<r.end;h++){var d=t.getLineCoords(h,a);n&&(s[c++]=d);for(var f=0;f<d;f++)p=e.dataToPoint(a[f],!1,p),s[c++]=p[0],s[c++]=p[1]}o.setLayout("linesPoints",s)}else for(h=r.start;h<r.end;h++){var g=o.getItemModel(h),y=(d=t.getLineCoords(h,a),[]);if(n)for(var v=0;v<d;v++)y.push(e.dataToPoint(a[v]));else{y[0]=e.dataToPoint(a[0]),y[1]=e.dataToPoint(a[1]);var m=g.get(["lineStyle","curveness"]);+m&&(y[2]=[(y[0][0]+y[1][0])/2-(y[0][1]-y[1][1])*m,(y[0][1]+y[1][1])/2-(y[1][0]-y[0][0])*m])}o.setItemLayout(h,y)}}}}}},zP=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.render=function(t,e,n){var i=t.getData(),r=this._updateLineDraw(i,t),o=t.get("zlevel"),a=t.get(["effect","trailLength"]),s=n.getZr(),l="svg"===s.painter.getType();l||s.painter.getLayer(o).clear(!0),null==this._lastZlevel||l||s.configLayer(this._lastZlevel,{motionBlur:!1}),this._showEffect(t)&&a>0&&(l||s.configLayer(o,{motionBlur:!0,lastFrameAlpha:Math.max(Math.min(a/10+.9,1),0)})),r.updateData(i);var u=t.get("clip",!0)&&yS(t.coordinateSystem,!1,t);u?this.group.setClipPath(u):this.group.removeClipPath(),this._lastZlevel=o,this._finished=!0},e.prototype.incrementalPrepareRender=function(t,e,n){var i=t.getData();this._updateLineDraw(i,t).incrementalPrepareUpdate(i),this._clearLayer(n),this._finished=!1},e.prototype.incrementalRender=function(t,e,n){this._lineDraw.incrementalUpdate(t,e.getData()),this._finished=t.end===e.getData().count()},e.prototype.eachRendered=function(t){this._lineDraw&&this._lineDraw.eachRendered(t)},e.prototype.updateTransform=function(t,e,n){var i=t.getData(),r=t.pipelineContext;if(!this._finished||r.large||r.progressiveRender)return{update:!0};var o=EP.reset(t,e,n);o.progress&&o.progress({start:0,end:i.count(),count:i.count()},i),this._lineDraw.updateLayout(),this._clearLayer(n)},e.prototype._updateLineDraw=function(t,e){var n=this._lineDraw,i=this._showEffect(e),r=!!e.get("polyline"),o=e.pipelineContext.large;return n&&i===this._hasEffet&&r===this._isPolyline&&o===this._isLargeDraw||(n&&n.remove(),n=this._lineDraw=o?new NP:new TA(r?i?PP:LP:i?kP:IA),this._hasEffet=i,this._isPolyline=r,this._isLargeDraw=o),this.group.add(n.group),n},e.prototype._showEffect=function(t){return!!t.get(["effect","show"])},e.prototype._clearLayer=function(t){var e=t.getZr();"svg"===e.painter.getType()||null==this._lastZlevel||e.painter.getLayer(this._lastZlevel).clear(!0)},e.prototype.remove=function(t,e){this._lineDraw&&this._lineDraw.remove(),this._lineDraw=null,this._clearLayer(e)},e.prototype.dispose=function(t,e){this.remove(t,e)},e.type="lines",e}(Tg),VP="undefined"==typeof Uint32Array?Array:Uint32Array,BP="undefined"==typeof Float64Array?Array:Float64Array;function FP(t){var e=t.data;e&&e[0]&&e[0][0]&&e[0][0].coord&&(t.data=z(e,(function(t){var e={coords:[t[0].coord,t[1].coord]};return t[0].name&&(e.fromName=t[0].name),t[1].name&&(e.toName=t[1].name),D([e,t[0],t[1]])})))}var GP=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.visualStyleAccessPath="lineStyle",n.visualDrawType="stroke",n}return n(e,t),e.prototype.init=function(e){e.data=e.data||[],FP(e);var n=this._processFlatCoordsArray(e.data);this._flatCoords=n.flatCoords,this._flatCoordsOffset=n.flatCoordsOffset,n.flatCoords&&(e.data=new Float32Array(n.count)),t.prototype.init.apply(this,arguments)},e.prototype.mergeOption=function(e){if(FP(e),e.data){var n=this._processFlatCoordsArray(e.data);this._flatCoords=n.flatCoords,this._flatCoordsOffset=n.flatCoordsOffset,n.flatCoords&&(e.data=new Float32Array(n.count))}t.prototype.mergeOption.apply(this,arguments)},e.prototype.appendData=function(t){var e=this._processFlatCoordsArray(t.data);e.flatCoords&&(this._flatCoords?(this._flatCoords=vt(this._flatCoords,e.flatCoords),this._flatCoordsOffset=vt(this._flatCoordsOffset,e.flatCoordsOffset)):(this._flatCoords=e.flatCoords,this._flatCoordsOffset=e.flatCoordsOffset),t.data=new Float32Array(e.count)),this.getRawData().appendData(t.data)},e.prototype._getCoordsFromItemModel=function(t){var e=this.getData().getItemModel(t),n=e.option instanceof Array?e.option:e.getShallow("coords");return n},e.prototype.getLineCoordsCount=function(t){return this._flatCoordsOffset?this._flatCoordsOffset[2*t+1]:this._getCoordsFromItemModel(t).length},e.prototype.getLineCoords=function(t,e){if(this._flatCoordsOffset){for(var n=this._flatCoordsOffset[2*t],i=this._flatCoordsOffset[2*t+1],r=0;r<i;r++)e[r]=e[r]||[],e[r][0]=this._flatCoords[n+2*r],e[r][1]=this._flatCoords[n+2*r+1];return i}var o=this._getCoordsFromItemModel(t);for(r=0;r<o.length;r++)e[r]=e[r]||[],e[r][0]=o[r][0],e[r][1]=o[r][1];return o.length},e.prototype._processFlatCoordsArray=function(t){var e=0;if(this._flatCoords&&(e=this._flatCoords.length),j(t[0])){for(var n=t.length,i=new VP(n),r=new BP(n),o=0,a=0,s=0,l=0;l<n;){s++;var u=t[l++];i[a++]=o+e,i[a++]=u;for(var h=0;h<u;h++){var c=t[l++],p=t[l++];r[o++]=c,r[o++]=p}}return{flatCoordsOffset:new Uint32Array(i.buffer,0,a),flatCoords:r,count:s}}return{flatCoordsOffset:null,flatCoords:null,count:t.length}},e.prototype.getInitialData=function(t,e){var n=new ex(["value"],this);return n.hasItemOption=!1,n.initData(t.data,[],(function(t,e,i,r){if(t instanceof Array)return NaN;n.hasItemOption=!0;var o=t.value;return null!=o?o instanceof Array?o[r]:o:void 0})),n},e.prototype.formatTooltip=function(t,e,n){var i=this.getData().getItemModel(t),r=i.get("name");if(r)return r;var o=i.get("fromName"),a=i.get("toName"),s=[];return null!=o&&s.push(o),null!=a&&s.push(a),Qf("nameValue",{name:s.join(" > ")})},e.prototype.preventIncremental=function(){return!!this.get(["effect","show"])},e.prototype.getProgressive=function(){var t=this.option.progressive;return null==t?this.option.large?1e4:this.get("progressive"):t},e.prototype.getProgressiveThreshold=function(){var t=this.option.progressiveThreshold;return null==t?this.option.large?2e4:this.get("progressiveThreshold"):t},e.prototype.getZLevelKey=function(){var t=this.getModel("effect"),e=t.get("trailLength");return this.getData().count()>this.getProgressiveThreshold()?this.id:t.get("show")&&e>0?e+"":""},e.type="series.lines",e.dependencies=["grid","polar","geo","calendar"],e.defaultOption={coordinateSystem:"geo",z:2,legendHoverLink:!0,xAxisIndex:0,yAxisIndex:0,symbol:["none","none"],symbolSize:[10,10],geoIndex:0,effect:{show:!1,period:4,constantSpeed:0,symbol:"circle",symbolSize:3,loop:!0,trailLength:.2},large:!1,largeThreshold:2e3,polyline:!1,clip:!0,label:{show:!1,position:"end"},lineStyle:{opacity:.5}},e}(fg);function WP(t){return t instanceof Array||(t=[t,t]),t}var HP={seriesType:"lines",reset:function(t){var e=WP(t.get("symbol")),n=WP(t.get("symbolSize")),i=t.getData();return i.setVisual("fromSymbol",e&&e[0]),i.setVisual("toSymbol",e&&e[1]),i.setVisual("fromSymbolSize",n&&n[0]),i.setVisual("toSymbolSize",n&&n[1]),{dataEach:i.hasItemOption?function(t,e){var n=t.getItemModel(e),i=WP(n.getShallow("symbol",!0)),r=WP(n.getShallow("symbolSize",!0));i[0]&&t.setItemVisual(e,"fromSymbol",i[0]),i[1]&&t.setItemVisual(e,"toSymbol",i[1]),r[0]&&t.setItemVisual(e,"fromSymbolSize",r[0]),r[1]&&t.setItemVisual(e,"toSymbolSize",r[1])}:null}}};var YP=function(){function t(){this.blurSize=30,this.pointSize=20,this.maxOpacity=1,this.minOpacity=0,this._gradientPixels={inRange:null,outOfRange:null};var t=h.createCanvas();this.canvas=t}return t.prototype.update=function(t,e,n,i,r,o){var a=this._getBrush(),s=this._getGradient(r,"inRange"),l=this._getGradient(r,"outOfRange"),u=this.pointSize+this.blurSize,h=this.canvas,c=h.getContext("2d"),p=t.length;h.width=e,h.height=n;for(var d=0;d<p;++d){var f=t[d],g=f[0],y=f[1],v=i(f[2]);c.globalAlpha=v,c.drawImage(a,g-u,y-u)}if(!h.width||!h.height)return h;for(var m=c.getImageData(0,0,h.width,h.height),x=m.data,_=0,b=x.length,w=this.minOpacity,S=this.maxOpacity-w;_<b;){v=x[_+3]/256;var M=4*Math.floor(255*v);if(v>0){var I=o(v)?s:l;v>0&&(v=v*S+w),x[_++]=I[M],x[_++]=I[M+1],x[_++]=I[M+2],x[_++]=I[M+3]*v*256}else _+=4}return c.putImageData(m,0,0),h},t.prototype._getBrush=function(){var t=this._brushCanvas||(this._brushCanvas=h.createCanvas()),e=this.pointSize+this.blurSize,n=2*e;t.width=n,t.height=n;var i=t.getContext("2d");return i.clearRect(0,0,n,n),i.shadowOffsetX=n,i.shadowBlur=this.blurSize,i.shadowColor="#000",i.beginPath(),i.arc(-e,e,this.pointSize,0,2*Math.PI,!0),i.closePath(),i.fill(),t},t.prototype._getGradient=function(t,e){for(var n=this._gradientPixels,i=n[e]||(n[e]=new Uint8ClampedArray(1024)),r=[0,0,0,0],o=0,a=0;a<256;a++)t[e](a/255,!0,r),i[o++]=r[0],i[o++]=r[1],i[o++]=r[2],i[o++]=r[3];return i},t}();function UP(t){var e=t.dimensions;return"lng"===e[0]&&"lat"===e[1]}var XP=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.render=function(t,e,n){var i;e.eachComponent("visualMap",(function(e){e.eachTargetSeries((function(n){n===t&&(i=e)}))})),this._progressiveEls=null,this.group.removeAll();var r=t.coordinateSystem;"cartesian2d"===r.type||"calendar"===r.type?this._renderOnCartesianAndCalendar(t,n,0,t.getData().count()):UP(r)&&this._renderOnGeo(r,t,i,n)},e.prototype.incrementalPrepareRender=function(t,e,n){this.group.removeAll()},e.prototype.incrementalRender=function(t,e,n,i){var r=e.coordinateSystem;r&&(UP(r)?this.render(e,n,i):(this._progressiveEls=[],this._renderOnCartesianAndCalendar(e,i,t.start,t.end,!0)))},e.prototype.eachRendered=function(t){jh(this._progressiveEls||this.group,t)},e.prototype._renderOnCartesianAndCalendar=function(t,e,n,i,r){var o,a,s,l,u=t.coordinateSystem,h=vS(u,"cartesian2d");if(h){var c=u.getAxis("x"),p=u.getAxis("y");0,o=c.getBandWidth()+.5,a=p.getBandWidth()+.5,s=c.scale.getExtent(),l=p.scale.getExtent()}for(var d=this.group,f=t.getData(),g=t.getModel(["emphasis","itemStyle"]).getItemStyle(),y=t.getModel(["blur","itemStyle"]).getItemStyle(),v=t.getModel(["select","itemStyle"]).getItemStyle(),m=t.get(["itemStyle","borderRadius"]),x=tc(t),_=t.getModel("emphasis"),b=_.get("focus"),w=_.get("blurScope"),S=_.get("disabled"),M=h?[f.mapDimension("x"),f.mapDimension("y"),f.mapDimension("value")]:[f.mapDimension("time"),f.mapDimension("value")],I=n;I<i;I++){var T=void 0,C=f.getItemVisual(I,"style");if(h){var D=f.get(M[0],I),A=f.get(M[1],I);if(isNaN(f.get(M[2],I))||isNaN(D)||isNaN(A)||D<s[0]||D>s[1]||A<l[0]||A>l[1])continue;var k=u.dataToPoint([D,A]);T=new Es({shape:{x:k[0]-o/2,y:k[1]-a/2,width:o,height:a},style:C})}else{if(isNaN(f.get(M[1],I)))continue;T=new Es({z2:1,shape:u.dataToRect([f.get(M[0],I)]).contentShape,style:C})}if(f.hasItemOption){var L=f.getItemModel(I),P=L.getModel("emphasis");g=P.getModel("itemStyle").getItemStyle(),y=L.getModel(["blur","itemStyle"]).getItemStyle(),v=L.getModel(["select","itemStyle"]).getItemStyle(),m=L.get(["itemStyle","borderRadius"]),b=P.get("focus"),w=P.get("blurScope"),S=P.get("disabled"),x=tc(L)}T.shape.r=m;var O=t.getRawValue(I),R="-";O&&null!=O[2]&&(R=O[2]+""),Qh(T,x,{labelFetcher:t,labelDataIndex:I,defaultOpacity:C.opacity,defaultText:R}),T.ensureState("emphasis").style=g,T.ensureState("blur").style=y,T.ensureState("select").style=v,Hl(T,b,w,S),T.incremental=r,r&&(T.states.emphasis.hoverLayer=!0),d.add(T),f.setItemGraphicEl(I,T),this._progressiveEls&&this._progressiveEls.push(T)}},e.prototype._renderOnGeo=function(t,e,n,i){var r=n.targetVisuals.inRange,o=n.targetVisuals.outOfRange,a=e.getData(),s=this._hmLayer||this._hmLayer||new YP;s.blurSize=e.get("blurSize"),s.pointSize=e.get("pointSize"),s.minOpacity=e.get("minOpacity"),s.maxOpacity=e.get("maxOpacity");var l=t.getViewRect().clone(),u=t.getRoamTransform();l.applyTransform(u);var h=Math.max(l.x,0),c=Math.max(l.y,0),p=Math.min(l.width+l.x,i.getWidth()),d=Math.min(l.height+l.y,i.getHeight()),f=p-h,g=d-c,y=[a.mapDimension("lng"),a.mapDimension("lat"),a.mapDimension("value")],v=a.mapArray(y,(function(e,n,i){var r=t.dataToPoint([e,n]);return r[0]-=h,r[1]-=c,r.push(i),r})),m=n.getExtent(),x="visualMap.continuous"===n.type?function(t,e){var n=t[1]-t[0];return e=[(e[0]-t[0])/n,(e[1]-t[0])/n],function(t){return t>=e[0]&&t<=e[1]}}(m,n.option.range):function(t,e,n){var i=t[1]-t[0],r=(e=z(e,(function(e){return{interval:[(e.interval[0]-t[0])/i,(e.interval[1]-t[0])/i]}}))).length,o=0;return function(t){var i;for(i=o;i<r;i++)if((a=e[i].interval)[0]<=t&&t<=a[1]){o=i;break}if(i===r)for(i=o-1;i>=0;i--){var a;if((a=e[i].interval)[0]<=t&&t<=a[1]){o=i;break}}return i>=0&&i<r&&n[i]}}(m,n.getPieceList(),n.option.selected);s.update(v,f,g,r.color.getNormalizer(),{inRange:r.color.getColorMapper(),outOfRange:o.color.getColorMapper()},x);var _=new As({style:{width:f,height:g,x:h,y:c,image:s.canvas},silent:!0});this.group.add(_)},e.type="heatmap",e}(Tg),ZP=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.getInitialData=function(t,e){return hx(null,this,{generateCoord:"value"})},e.prototype.preventIncremental=function(){var t=vd.get(this.get("coordinateSystem"));if(t&&t.dimensions)return"lng"===t.dimensions[0]&&"lat"===t.dimensions[1]},e.type="series.heatmap",e.dependencies=["grid","geo","calendar"],e.defaultOption={coordinateSystem:"cartesian2d",z:2,geoIndex:0,blurSize:30,pointSize:20,maxOpacity:1,minOpacity:0,select:{itemStyle:{borderColor:"#212121"}}},e}(fg);var jP=["itemStyle","borderWidth"],qP=[{xy:"x",wh:"width",index:0,posDesc:["left","right"]},{xy:"y",wh:"height",index:1,posDesc:["top","bottom"]}],KP=new xu,$P=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.render=function(t,e,n){var i=this.group,r=t.getData(),o=this._data,a=t.coordinateSystem,s=a.getBaseAxis().isHorizontal(),l=a.master.getRect(),u={ecSize:{width:n.getWidth(),height:n.getHeight()},seriesModel:t,coordSys:a,coordSysExtent:[[l.x,l.x+l.width],[l.y,l.y+l.height]],isHorizontal:s,valueDim:qP[+s],categoryDim:qP[1-+s]};return r.diff(o).add((function(t){if(r.hasValue(t)){var e=oO(r,t),n=JP(r,t,e,u),o=lO(r,u,n);r.setItemGraphicEl(t,o),i.add(o),dO(o,u,n)}})).update((function(t,e){var n=o.getItemGraphicEl(e);if(r.hasValue(t)){var a=oO(r,t),s=JP(r,t,a,u),l=hO(r,s);n&&l!==n.__pictorialShapeStr&&(i.remove(n),r.setItemGraphicEl(t,null),n=null),n?function(t,e,n){var i=n.animationModel,r=n.dataIndex;dh(t.__pictorialBundle,{x:n.bundlePosition[0],y:n.bundlePosition[1]},i,r),n.symbolRepeat?eO(t,e,n,!0):nO(t,e,n,!0);iO(t,n,!0),rO(t,e,n,!0)}(n,u,s):n=lO(r,u,s,!0),r.setItemGraphicEl(t,n),n.__pictorialSymbolMeta=s,i.add(n),dO(n,u,s)}else i.remove(n)})).remove((function(t){var e=o.getItemGraphicEl(t);e&&uO(o,t,e.__pictorialSymbolMeta.animationModel,e)})).execute(),this._data=r,this.group},e.prototype.remove=function(t,e){var n=this.group,i=this._data;t.get("animation")?i&&i.eachItemGraphicEl((function(e){uO(i,Js(e).dataIndex,t,e)})):n.removeAll()},e.type="pictorialBar",e}(Tg);function JP(t,e,n,i){var r=t.getItemLayout(e),o=n.get("symbolRepeat"),a=n.get("symbolClip"),s=n.get("symbolPosition")||"start",l=(n.get("symbolRotate")||0)*Math.PI/180||0,u=n.get("symbolPatternSize")||2,h=n.isAnimationEnabled(),c={dataIndex:e,layout:r,itemModel:n,symbolType:t.getItemVisual(e,"symbol")||"circle",style:t.getItemVisual(e,"style"),symbolClip:a,symbolRepeat:o,symbolRepeatDirection:n.get("symbolRepeatDirection"),symbolPatternSize:u,rotation:l,animationModel:h?n:null,hoverScale:h&&n.get(["emphasis","scale"]),z2:n.getShallow("z",!0)||0};!function(t,e,n,i,r){var o,a=i.valueDim,s=t.get("symbolBoundingData"),l=i.coordSys.getOtherAxis(i.coordSys.getBaseAxis()),u=l.toGlobalCoord(l.dataToCoord(0)),h=1-+(n[a.wh]<=0);if(Y(s)){var c=[QP(l,s[0])-u,QP(l,s[1])-u];c[1]<c[0]&&c.reverse(),o=c[h]}else o=null!=s?QP(l,s)-u:e?i.coordSysExtent[a.index][h]-u:n[a.wh];r.boundingLength=o,e&&(r.repeatCutLength=n[a.wh]);r.pxSign=o>0?1:-1}(n,o,r,i,c),function(t,e,n,i,r,o,a,s,l,u){var h,c=l.valueDim,p=l.categoryDim,d=Math.abs(n[p.wh]),f=t.getItemVisual(e,"symbolSize");h=Y(f)?f.slice():null==f?["100%","100%"]:[f,f];h[p.index]=Ur(h[p.index],d),h[c.index]=Ur(h[c.index],i?d:Math.abs(o)),u.symbolSize=h,(u.symbolScale=[h[0]/s,h[1]/s])[c.index]*=(l.isHorizontal?-1:1)*a}(t,e,r,o,0,c.boundingLength,c.pxSign,u,i,c),function(t,e,n,i,r){var o=t.get(jP)||0;o&&(KP.attr({scaleX:e[0],scaleY:e[1],rotation:n}),KP.updateTransform(),o/=KP.getLineScale(),o*=e[i.valueDim.index]);r.valueLineWidth=o||0}(n,c.symbolScale,l,i,c);var p=c.symbolSize,d=Fy(n.get("symbolOffset"),p);return function(t,e,n,i,r,o,a,s,l,u,h,c){var p=h.categoryDim,d=h.valueDim,f=c.pxSign,g=Math.max(e[d.index]+s,0),y=g;if(i){var v=Math.abs(l),m=it(t.get("symbolMargin"),"15%")+"",x=!1;m.lastIndexOf("!")===m.length-1&&(x=!0,m=m.slice(0,m.length-1));var _=Ur(m,e[d.index]),b=Math.max(g+2*_,0),w=x?0:2*_,S=ho(i),M=S?i:fO((v+w)/b);b=g+2*(_=(v-M*g)/2/(x?M:Math.max(M-1,1))),w=x?0:2*_,S||"fixed"===i||(M=u?fO((Math.abs(u)+w)/b):0),y=M*b-w,c.repeatTimes=M,c.symbolMargin=_}var I=f*(y/2),T=c.pathPosition=[];T[p.index]=n[p.wh]/2,T[d.index]="start"===a?I:"end"===a?l-I:l/2,o&&(T[0]+=o[0],T[1]+=o[1]);var C=c.bundlePosition=[];C[p.index]=n[p.xy],C[d.index]=n[d.xy];var D=c.barRectShape=A({},n);D[d.wh]=f*Math.max(Math.abs(n[d.wh]),Math.abs(T[d.index]+I)),D[p.wh]=n[p.wh];var k=c.clipShape={};k[p.xy]=-n[p.xy],k[p.wh]=h.ecSize[p.wh],k[d.xy]=0,k[d.wh]=n[d.wh]}(n,p,r,o,0,d,s,c.valueLineWidth,c.boundingLength,c.repeatCutLength,i,c),c}function QP(t,e){return t.toGlobalCoord(t.dataToCoord(t.scale.parse(e)))}function tO(t){var e=t.symbolPatternSize,n=Vy(t.symbolType,-e/2,-e/2,e,e);return n.attr({culling:!0}),"image"!==n.type&&n.setStyle({strokeNoScale:!0}),n}function eO(t,e,n,i){var r=t.__pictorialBundle,o=n.symbolSize,a=n.valueLineWidth,s=n.pathPosition,l=e.valueDim,u=n.repeatTimes||0,h=0,c=o[e.valueDim.index]+a+2*n.symbolMargin;for(cO(t,(function(t){t.__pictorialAnimationIndex=h,t.__pictorialRepeatTimes=u,h<u?pO(t,null,f(h),n,i):pO(t,null,{scaleX:0,scaleY:0},n,i,(function(){r.remove(t)})),h++}));h<u;h++){var p=tO(n);p.__pictorialAnimationIndex=h,p.__pictorialRepeatTimes=u,r.add(p);var d=f(h);pO(p,{x:d.x,y:d.y,scaleX:0,scaleY:0},{scaleX:d.scaleX,scaleY:d.scaleY,rotation:d.rotation},n,i)}function f(t){var e=s.slice(),i=n.pxSign,r=t;return("start"===n.symbolRepeatDirection?i>0:i<0)&&(r=u-1-t),e[l.index]=c*(r-u/2+.5)+s[l.index],{x:e[0],y:e[1],scaleX:n.symbolScale[0],scaleY:n.symbolScale[1],rotation:n.rotation}}}function nO(t,e,n,i){var r=t.__pictorialBundle,o=t.__pictorialMainPath;o?pO(o,null,{x:n.pathPosition[0],y:n.pathPosition[1],scaleX:n.symbolScale[0],scaleY:n.symbolScale[1],rotation:n.rotation},n,i):(o=t.__pictorialMainPath=tO(n),r.add(o),pO(o,{x:n.pathPosition[0],y:n.pathPosition[1],scaleX:0,scaleY:0,rotation:n.rotation},{scaleX:n.symbolScale[0],scaleY:n.symbolScale[1]},n,i))}function iO(t,e,n){var i=A({},e.barRectShape),r=t.__pictorialBarRect;r?pO(r,null,{shape:i},e,n):((r=t.__pictorialBarRect=new Es({z2:2,shape:i,silent:!0,style:{stroke:"transparent",fill:"transparent",lineWidth:0}})).disableMorphing=!0,t.add(r))}function rO(t,e,n,i){if(n.symbolClip){var r=t.__pictorialClipPath,o=A({},n.clipShape),a=e.valueDim,s=n.animationModel,l=n.dataIndex;if(r)dh(r,{shape:o},s,l);else{o[a.wh]=0,r=new Es({shape:o}),t.__pictorialBundle.setClipPath(r),t.__pictorialClipPath=r;var u={};u[a.wh]=n.clipShape[a.wh],qh[i?"updateProps":"initProps"](r,{shape:u},s,l)}}}function oO(t,e){var n=t.getItemModel(e);return n.getAnimationDelayParams=aO,n.isAnimationEnabled=sO,n}function aO(t){return{index:t.__pictorialAnimationIndex,count:t.__pictorialRepeatTimes}}function sO(){return this.parentModel.isAnimationEnabled()&&!!this.getShallow("animation")}function lO(t,e,n,i){var r=new Er,o=new Er;return r.add(o),r.__pictorialBundle=o,o.x=n.bundlePosition[0],o.y=n.bundlePosition[1],n.symbolRepeat?eO(r,e,n):nO(r,0,n),iO(r,n,i),rO(r,e,n,i),r.__pictorialShapeStr=hO(t,n),r.__pictorialSymbolMeta=n,r}function uO(t,e,n,i){var r=i.__pictorialBarRect;r&&r.removeTextContent();var o=[];cO(i,(function(t){o.push(t)})),i.__pictorialMainPath&&o.push(i.__pictorialMainPath),i.__pictorialClipPath&&(n=null),E(o,(function(t){yh(t,{scaleX:0,scaleY:0},n,e,(function(){i.parent&&i.parent.remove(i)}))})),t.setItemGraphicEl(e,null)}function hO(t,e){return[t.getItemVisual(e.dataIndex,"symbol")||"none",!!e.symbolRepeat,!!e.symbolClip].join(":")}function cO(t,e,n){E(t.__pictorialBundle.children(),(function(i){i!==t.__pictorialBarRect&&e.call(n,i)}))}function pO(t,e,n,i,r,o){e&&t.attr(e),i.symbolClip&&!r?n&&t.attr(n):n&&qh[r?"updateProps":"initProps"](t,n,i.animationModel,i.dataIndex,o)}function dO(t,e,n){var i=n.dataIndex,r=n.itemModel,o=r.getModel("emphasis"),a=o.getModel("itemStyle").getItemStyle(),s=r.getModel(["blur","itemStyle"]).getItemStyle(),l=r.getModel(["select","itemStyle"]).getItemStyle(),u=r.getShallow("cursor"),h=o.get("focus"),c=o.get("blurScope"),p=o.get("scale");cO(t,(function(t){if(t instanceof As){var e=t.style;t.useStyle(A({image:e.image,x:e.x,y:e.y,width:e.width,height:e.height},n.style))}else t.useStyle(n.style);var i=t.ensureState("emphasis");i.style=a,p&&(i.scaleX=1.1*t.scaleX,i.scaleY=1.1*t.scaleY),t.ensureState("blur").style=s,t.ensureState("select").style=l,u&&(t.cursor=u),t.z2=n.z2}));var d=e.valueDim.posDesc[+(n.boundingLength>0)];Qh(t.__pictorialBarRect,tc(r),{labelFetcher:e.seriesModel,labelDataIndex:i,defaultText:Kw(e.seriesModel.getData(),i),inheritColor:n.style.fill,defaultOpacity:n.style.opacity,defaultOutsidePosition:d}),Hl(t,h,c,o.get("disabled"))}function fO(t){var e=Math.round(t);return Math.abs(t-e)<1e-4?e:Math.ceil(t)}var gO=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.hasSymbolVisual=!0,n.defaultSymbol="roundRect",n}return n(e,t),e.prototype.getInitialData=function(e){return e.stack=null,t.prototype.getInitialData.apply(this,arguments)},e.type="series.pictorialBar",e.dependencies=["grid"],e.defaultOption=Tc(OS.defaultOption,{symbol:"circle",symbolSize:null,symbolRotate:null,symbolPosition:null,symbolOffset:null,symbolMargin:null,symbolRepeat:!1,symbolRepeatDirection:"end",symbolClip:!1,symbolBoundingData:null,symbolPatternSize:400,barGap:"-100%",progressive:0,emphasis:{scale:!1},select:{itemStyle:{borderColor:"#212121"}}}),e}(OS);var yO=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n._layers=[],n}return n(e,t),e.prototype.render=function(t,e,n){var i=t.getData(),r=this,o=this.group,a=t.getLayerSeries(),s=i.getLayout("layoutInfo"),l=s.rect,u=s.boundaryGap;function h(t){return t.name}o.x=0,o.y=l.y+u[0];var c=new Lm(this._layersSeries||[],a,h,h),p=[];function d(e,n,s){var l=r._layers;if("remove"!==e){for(var u,h,c=[],d=[],f=a[n].indices,g=0;g<f.length;g++){var y=i.getItemLayout(f[g]),v=y.x,m=y.y0,x=y.y;c.push(v,m),d.push(v,m+x),u=i.getItemVisual(f[g],"style")}var _=i.getItemLayout(f[0]),b=t.getModel("label").get("margin"),w=t.getModel("emphasis");if("add"===e){var S=p[n]=new Er;h=new dS({shape:{points:c,stackedOnPoints:d,smooth:.4,stackedOnSmooth:.4,smoothConstraint:!1},z2:0}),S.add(h),o.add(S),t.isAnimationEnabled()&&h.setClipPath(function(t,e,n){var i=new Es({shape:{x:t.x-10,y:t.y-10,width:0,height:t.height+20}});return fh(i,{shape:{x:t.x-50,width:t.width+100,height:t.height+20}},e,n),i}(h.getBoundingRect(),t,(function(){h.removeClipPath()})))}else{S=l[s];h=S.childAt(0),o.add(S),p[n]=S,dh(h,{shape:{points:c,stackedOnPoints:d}},t),xh(h)}Qh(h,tc(t),{labelDataIndex:f[g-1],defaultText:i.getName(f[g-1]),inheritColor:u.fill},{normal:{verticalAlign:"middle"}}),h.setTextConfig({position:null,local:!0});var M=h.getTextContent();M&&(M.x=_.x-b,M.y=_.y0+_.y/2),h.useStyle(u),i.setItemGraphicEl(n,h),Zl(h,t),Hl(h,w.get("focus"),w.get("blurScope"),w.get("disabled"))}else o.remove(l[n])}c.add(W(d,this,"add")).update(W(d,this,"update")).remove(W(d,this,"remove")).execute(),this._layersSeries=a,this._layers=p},e.type="themeRiver",e}(Tg);var vO=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.init=function(e){t.prototype.init.apply(this,arguments),this.legendVisualProvider=new mM(W(this.getData,this),W(this.getRawData,this))},e.prototype.fixData=function(t){var e=t.length,n={},i=Fo(t,(function(t){return n.hasOwnProperty(t[0]+"")||(n[t[0]+""]=-1),t[2]})),r=[];i.buckets.each((function(t,e){r.push({name:e,dataList:t})}));for(var o=r.length,a=0;a<o;++a){for(var s=r[a].name,l=0;l<r[a].dataList.length;++l){var u=r[a].dataList[l][0]+"";n[u]=a}for(var u in n)n.hasOwnProperty(u)&&n[u]!==a&&(n[u]=a,t[e]=[u,0,s],e++)}return t},e.prototype.getInitialData=function(t,e){for(var n=this.getReferringComponents("singleAxis",Eo).models[0].get("type"),i=B(t.data,(function(t){return void 0!==t[2]})),r=this.fixData(i||[]),o=[],a=this.nameMap=yt(),s=0,l=0;l<r.length;++l)o.push(r[l][2]),a.get(r[l][2])||(a.set(r[l][2],s),s++);var u=nx(r,{coordDimensions:["single"],dimensionsDefine:[{name:"time",type:Rm(n)},{name:"value",type:"float"},{name:"name",type:"ordinal"}],encodeDefine:{single:0,value:1,itemName:2}}).dimensions,h=new ex(u,this);return h.initData(r),h},e.prototype.getLayerSeries=function(){for(var t=this.getData(),e=t.count(),n=[],i=0;i<e;++i)n[i]=i;var r=t.mapDimension("single"),o=Fo(n,(function(e){return t.get("name",e)})),a=[];return o.buckets.each((function(e,n){e.sort((function(e,n){return t.get(r,e)-t.get(r,n)})),a.push({name:n,indices:e})})),a},e.prototype.getAxisTooltipData=function(t,e,n){Y(t)||(t=t?[t]:[]);for(var i,r=this.getData(),o=this.getLayerSeries(),a=[],s=o.length,l=0;l<s;++l){for(var u=Number.MAX_VALUE,h=-1,c=o[l].indices.length,p=0;p<c;++p){var d=r.get(t[0],o[l].indices[p]),f=Math.abs(d-e);f<=u&&(i=d,u=f,h=o[l].indices[p])}a.push(h)}return{dataIndices:a,nestestValue:i}},e.prototype.formatTooltip=function(t,e,n){var i=this.getData();return Qf("nameValue",{name:i.getName(t),value:i.get(i.mapDimension("value"),t)})},e.type="series.themeRiver",e.dependencies=["singleAxis"],e.defaultOption={z:2,colorBy:"data",coordinateSystem:"singleAxis",boundaryGap:["10%","10%"],singleAxisIndex:0,animationEasing:"linear",label:{margin:4,show:!0,position:"left",fontSize:11},emphasis:{label:{show:!0}}},e}(fg);function mO(t,e){t.eachSeriesByType("themeRiver",(function(t){var e=t.getData(),n=t.coordinateSystem,i={},r=n.getRect();i.rect=r;var o=t.get("boundaryGap"),a=n.getAxis();(i.boundaryGap=o,"horizontal"===a.orient)?(o[0]=Ur(o[0],r.height),o[1]=Ur(o[1],r.height),xO(e,t,r.height-o[0]-o[1])):(o[0]=Ur(o[0],r.width),o[1]=Ur(o[1],r.width),xO(e,t,r.width-o[0]-o[1]));e.setLayout("layoutInfo",i)}))}function xO(t,e,n){if(t.count())for(var i,r=e.coordinateSystem,o=e.getLayerSeries(),a=t.mapDimension("single"),s=t.mapDimension("value"),l=z(o,(function(e){return z(e.indices,(function(e){var n=r.dataToPoint(t.get(a,e));return n[1]=t.get(s,e),n}))})),u=function(t){for(var e=t.length,n=t[0].length,i=[],r=[],o=0,a=0;a<n;++a){for(var s=0,l=0;l<e;++l)s+=t[l][a][1];s>o&&(o=s),i.push(s)}for(var u=0;u<n;++u)r[u]=(o-i[u])/2;o=0;for(var h=0;h<n;++h){var c=i[h]+r[h];c>o&&(o=c)}return{y0:r,max:o}}(l),h=u.y0,c=n/u.max,p=o.length,d=o[0].indices.length,f=0;f<d;++f){i=h[f]*c,t.setItemLayout(o[0].indices[f],{layerIndex:0,x:l[0][f][0],y0:i,y:l[0][f][1]*c});for(var g=1;g<p;++g)i+=l[g-1][f][1]*c,t.setItemLayout(o[g].indices[f],{layerIndex:g,x:l[g][f][0],y0:i,y:l[g][f][1]*c})}}var _O=function(t){function e(e,n,i,r){var o=t.call(this)||this;o.z2=2,o.textConfig={inside:!0},Js(o).seriesIndex=n.seriesIndex;var a=new Bs({z2:4,silent:e.getModel().get(["label","silent"])});return o.setTextContent(a),o.updateData(!0,e,n,i,r),o}return n(e,t),e.prototype.updateData=function(t,e,n,i,r){this.node=e,e.piece=this,n=n||this._seriesModel,i=i||this._ecModel;var o=this;Js(o).dataIndex=e.dataIndex;var a=e.getModel(),s=a.getModel("emphasis"),l=e.getLayout(),u=A({},l);u.label=null;var h=e.getVisual("style");h.lineJoin="bevel";var c=e.getVisual("decal");c&&(h.decal=cv(c,r));var p=fM(a.getModel("itemStyle"),u,!0);A(u,p),E(rl,(function(t){var e=o.ensureState(t),n=a.getModel([t,"itemStyle"]);e.style=n.getItemStyle();var i=fM(n,u);i&&(e.shape=i)})),t?(o.setShape(u),o.shape.r=l.r0,dh(o,{shape:{r:l.r}},n,e.dataIndex)):(dh(o,{shape:u},n),xh(o)),o.useStyle(h),this._updateLabel(n);var d=a.getShallow("cursor");d&&o.attr("cursor",d),this._seriesModel=n||this._seriesModel,this._ecModel=i||this._ecModel;var f=s.get("focus");Hl(this,"ancestor"===f?e.getAncestorsIndices():"descendant"===f?e.getDescendantIndices():f,s.get("blurScope"),s.get("disabled"))},e.prototype._updateLabel=function(t){var e=this,n=this.node.getModel(),i=n.getModel("label"),r=this.node.getLayout(),o=r.endAngle-r.startAngle,a=(r.startAngle+r.endAngle)/2,s=Math.cos(a),l=Math.sin(a),u=this,h=u.getTextContent(),c=this.node.dataIndex,p=i.get("minAngle")/180*Math.PI,d=i.get("show")&&!(null!=p&&Math.abs(o)<p);function f(t,e){var n=t.get(e);return null==n?i.get(e):n}h.ignore=!d,E(ol,(function(i){var p="normal"===i?n.getModel("label"):n.getModel([i,"label"]),d="normal"===i,g=d?h:h.ensureState(i),y=t.getFormattedLabel(c,i);d&&(y=y||e.node.name),g.style=ec(p,{},null,"normal"!==i,!0),y&&(g.style.text=y);var v=p.get("show");null==v||d||(g.ignore=!v);var m,x=f(p,"position"),_=d?u:u.states[i],b=_.style.fill;_.textConfig={outsideFill:"inherit"===p.get("color")?b:null,inside:"outside"!==x};var w=f(p,"distance")||0,S=f(p,"align");"outside"===x?(m=r.r+w,S=a>Math.PI/2?"right":"left"):S&&"center"!==S?"left"===S?(m=r.r0+w,a>Math.PI/2&&(S="right")):"right"===S&&(m=r.r-w,a>Math.PI/2&&(S="left")):(m=o===2*Math.PI&&0===r.r0?0:(r.r+r.r0)/2,S="center"),g.style.align=S,g.style.verticalAlign=f(p,"verticalAlign")||"middle",g.x=m*s+r.cx,g.y=m*l+r.cy;var M=f(p,"rotate"),I=0;"radial"===M?(I=-a)<-Math.PI/2&&(I+=Math.PI):"tangential"===M?(I=Math.PI/2-a)>Math.PI/2?I-=Math.PI:I<-Math.PI/2&&(I+=Math.PI):j(M)&&(I=M*Math.PI/180),g.rotation=I})),h.dirtyStyle()},e}(Eu),bO="sunburstRootToNode",wO="sunburstHighlight";var SO=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.render=function(t,e,n,i){var r=this;this.seriesModel=t,this.api=n,this.ecModel=e;var o=t.getData(),a=o.tree.root,s=t.getViewRoot(),l=this.group,u=t.get("renderLabelForZeroData"),h=[];s.eachNode((function(t){h.push(t)}));var c=this._oldChildren||[];!function(i,r){if(0===i.length&&0===r.length)return;function s(t){return t.getId()}function h(s,h){!function(i,r){u||!i||i.getValue()||(i=null);if(i!==a&&r!==a)if(r&&r.piece)i?(r.piece.updateData(!1,i,t,e,n),o.setItemGraphicEl(i.dataIndex,r.piece)):function(t){if(!t)return;t.piece&&(l.remove(t.piece),t.piece=null)}(r);else if(i){var s=new _O(i,t,e,n);l.add(s),o.setItemGraphicEl(i.dataIndex,s)}}(null==s?null:i[s],null==h?null:r[h])}new Lm(r,i,s,s).add(h).update(h).remove(H(h,null)).execute()}(h,c),function(i,o){o.depth>0?(r.virtualPiece?r.virtualPiece.updateData(!1,i,t,e,n):(r.virtualPiece=new _O(i,t,e,n),l.add(r.virtualPiece)),o.piece.off("click"),r.virtualPiece.on("click",(function(t){r._rootToNode(o.parentNode)}))):r.virtualPiece&&(l.remove(r.virtualPiece),r.virtualPiece=null)}(a,s),this._initEvents(),this._oldChildren=h},e.prototype._initEvents=function(){var t=this;this.group.off("click"),this.group.on("click",(function(e){var n=!1;t.seriesModel.getViewRoot().eachNode((function(i){if(!n&&i.piece&&i.piece===e.target){var r=i.getModel().get("nodeClick");if("rootToNode"===r)t._rootToNode(i);else if("link"===r){var o=i.getModel(),a=o.get("link");if(a)_p(a,o.get("target",!0)||"_blank")}n=!0}}))}))},e.prototype._rootToNode=function(t){t!==this.seriesModel.getViewRoot()&&this.api.dispatchAction({type:bO,from:this.uid,seriesId:this.seriesModel.id,targetNode:t})},e.prototype.containPoint=function(t,e){var n=e.getData().getItemLayout(0);if(n){var i=t[0]-n.cx,r=t[1]-n.cy,o=Math.sqrt(i*i+r*r);return o<=n.r&&o>=n.r0}},e.type="sunburst",e}(Tg),MO=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.ignoreStyleOnData=!0,n}return n(e,t),e.prototype.getInitialData=function(t,e){var n={name:t.name,children:t.data};IO(n);var i=this._levelModels=z(t.levels||[],(function(t){return new Sc(t,this,e)}),this),r=BC.createTree(n,this,(function(t){t.wrapMethod("getItemModel",(function(t,e){var n=r.getNodeByDataIndex(e),o=i[n.depth];return o&&(t.parentModel=o),t}))}));return r.data},e.prototype.optionUpdated=function(){this.resetViewRoot()},e.prototype.getDataParams=function(e){var n=t.prototype.getDataParams.apply(this,arguments),i=this.getData().tree.getNodeByDataIndex(e);return n.treePathInfo=HC(i,this),n},e.prototype.getLevelModel=function(t){return this._levelModels&&this._levelModels[t.depth]},e.prototype.getViewRoot=function(){return this._viewRoot},e.prototype.resetViewRoot=function(t){t?this._viewRoot=t:t=this._viewRoot;var e=this.getRawData().tree.root;t&&(t===e||e.contains(t))||(this._viewRoot=e)},e.prototype.enableAriaDecal=function(){qC(this)},e.type="series.sunburst",e.defaultOption={z:2,center:["50%","50%"],radius:[0,"75%"],clockwise:!0,startAngle:90,minAngle:0,stillShowZeroSum:!0,nodeClick:"rootToNode",renderLabelForZeroData:!1,label:{rotate:"radial",show:!0,opacity:1,align:"center",position:"inside",distance:5,silent:!0},itemStyle:{borderWidth:1,borderColor:"white",borderType:"solid",shadowBlur:0,shadowColor:"rgba(0, 0, 0, 0.2)",shadowOffsetX:0,shadowOffsetY:0,opacity:1},emphasis:{focus:"descendant"},blur:{itemStyle:{opacity:.2},label:{opacity:.1}},animationType:"expansion",animationDuration:1e3,animationDurationUpdate:500,data:[],sort:"desc"},e}(fg);function IO(t){var e=0;E(t.children,(function(t){IO(t);var n=t.value;Y(n)&&(n=n[0]),e+=n}));var n=t.value;Y(n)&&(n=n[0]),(null==n||isNaN(n))&&(n=e),n<0&&(n=0),Y(t.value)?t.value[0]=n:t.value=n}var TO=Math.PI/180;function CO(t,e,n){e.eachSeriesByType(t,(function(t){var e=t.get("center"),i=t.get("radius");Y(i)||(i=[0,i]),Y(e)||(e=[e,e]);var r=n.getWidth(),o=n.getHeight(),a=Math.min(r,o),s=Ur(e[0],r),l=Ur(e[1],o),u=Ur(i[0],a/2),h=Ur(i[1],a/2),c=-t.get("startAngle")*TO,p=t.get("minAngle")*TO,d=t.getData().tree.root,f=t.getViewRoot(),g=f.depth,y=t.get("sort");null!=y&&DO(f,y);var v=0;E(f.children,(function(t){!isNaN(t.getValue())&&v++}));var m=f.getValue(),x=Math.PI/(m||v)*2,_=f.depth>0,b=f.height-(_?-1:1),w=(h-u)/(b||1),S=t.get("clockwise"),M=t.get("stillShowZeroSum"),I=S?1:-1,T=function(e,n){if(e){var i=n;if(e!==d){var r=e.getValue(),o=0===m&&M?x:r*x;o<p&&(o=p),i=n+I*o;var h=e.depth-g-(_?-1:1),c=u+w*h,f=u+w*(h+1),y=t.getLevelModel(e);if(y){var v=y.get("r0",!0),b=y.get("r",!0),C=y.get("radius",!0);null!=C&&(v=C[0],b=C[1]),null!=v&&(c=Ur(v,a/2)),null!=b&&(f=Ur(b,a/2))}e.setLayout({angle:o,startAngle:n,endAngle:i,clockwise:S,cx:s,cy:l,r0:c,r:f})}if(e.children&&e.children.length){var D=0;E(e.children,(function(t){D+=T(t,n+D)}))}return i-n}};if(_){var C=u,D=u+w,A=2*Math.PI;d.setLayout({angle:A,startAngle:c,endAngle:c+A,clockwise:S,cx:s,cy:l,r0:C,r:D})}T(f,c)}))}function DO(t,e){var n=t.children||[];t.children=function(t,e){if(U(e)){var n=z(t,(function(t,e){var n=t.getValue();return{params:{depth:t.depth,height:t.height,dataIndex:t.dataIndex,getValue:function(){return n}},index:e}}));return n.sort((function(t,n){return e(t.params,n.params)})),z(n,(function(e){return t[e.index]}))}var i="asc"===e;return t.sort((function(t,e){var n=(t.getValue()-e.getValue())*(i?1:-1);return 0===n?(t.dataIndex-e.dataIndex)*(i?-1:1):n}))}(n,e),n.length&&E(t.children,(function(t){DO(t,e)}))}function AO(t){var e={};t.eachSeriesByType("sunburst",(function(t){var n=t.getData(),i=n.tree;i.eachNode((function(r){var o=r.getModel().getModel("itemStyle").getItemStyle();o.fill||(o.fill=function(t,n,i){for(var r=t;r&&r.depth>1;)r=r.parentNode;var o=n.getColorFromPalette(r.name||r.dataIndex+"",e);return t.depth>1&&X(o)&&(o=Kn(o,(t.depth-1)/(i-1)*.5)),o}(r,t,i.root.height)),A(n.ensureUniqueItemVisual(r.dataIndex,"style"),o)}))}))}var kO={color:"fill",borderColor:"stroke"},LO={symbol:1,symbolSize:1,symbolKeepAspect:1,legendIcon:1,visualMeta:1,liftZ:1,decal:1},PO=Po(),OO=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.optionUpdated=function(){this.currentZLevel=this.get("zlevel",!0),this.currentZ=this.get("z",!0)},e.prototype.getInitialData=function(t,e){return hx(null,this)},e.prototype.getDataParams=function(e,n,i){var r=t.prototype.getDataParams.call(this,e,n);return i&&(r.info=PO(i).info),r},e.type="series.custom",e.dependencies=["grid","polar","geo","singleAxis","calendar"],e.defaultOption={coordinateSystem:"cartesian2d",z:2,legendHoverLink:!0,clip:!1},e}(fg);function RO(t,e){return e=e||[0,0],z(["x","y"],(function(n,i){var r=this.getAxis(n),o=e[i],a=t[i]/2;return"category"===r.type?r.getBandWidth():Math.abs(r.dataToCoord(o-a)-r.dataToCoord(o+a))}),this)}function NO(t,e){return e=e||[0,0],z([0,1],(function(n){var i=e[n],r=t[n]/2,o=[],a=[];return o[n]=i-r,a[n]=i+r,o[1-n]=a[1-n]=e[1-n],Math.abs(this.dataToPoint(o)[n]-this.dataToPoint(a)[n])}),this)}function EO(t,e){var n=this.getAxis(),i=e instanceof Array?e[0]:e,r=(t instanceof Array?t[0]:t)/2;return"category"===n.type?n.getBandWidth():Math.abs(n.dataToCoord(i-r)-n.dataToCoord(i+r))}function zO(t,e){return e=e||[0,0],z(["Radius","Angle"],(function(n,i){var r=this["get"+n+"Axis"](),o=e[i],a=t[i]/2,s="category"===r.type?r.getBandWidth():Math.abs(r.dataToCoord(o-a)-r.dataToCoord(o+a));return"Angle"===n&&(s=s*Math.PI/180),s}),this)}function VO(t,e,n,i){return t&&(t.legacy||!1!==t.legacy&&!n&&!i&&"tspan"!==e&&("text"===e||_t(t,"text")))}function BO(t,e,n){var i,r,o,a=t;if("text"===e)o=a;else{o={},_t(a,"text")&&(o.text=a.text),_t(a,"rich")&&(o.rich=a.rich),_t(a,"textFill")&&(o.fill=a.textFill),_t(a,"textStroke")&&(o.stroke=a.textStroke),_t(a,"fontFamily")&&(o.fontFamily=a.fontFamily),_t(a,"fontSize")&&(o.fontSize=a.fontSize),_t(a,"fontStyle")&&(o.fontStyle=a.fontStyle),_t(a,"fontWeight")&&(o.fontWeight=a.fontWeight),r={type:"text",style:o,silent:!0},i={};var s=_t(a,"textPosition");n?i.position=s?a.textPosition:"inside":s&&(i.position=a.textPosition),_t(a,"textPosition")&&(i.position=a.textPosition),_t(a,"textOffset")&&(i.offset=a.textOffset),_t(a,"textRotation")&&(i.rotation=a.textRotation),_t(a,"textDistance")&&(i.distance=a.textDistance)}return FO(o,t),E(o.rich,(function(t){FO(t,t)})),{textConfig:i,textContent:r}}function FO(t,e){e&&(e.font=e.textFont||e.font,_t(e,"textStrokeWidth")&&(t.lineWidth=e.textStrokeWidth),_t(e,"textAlign")&&(t.align=e.textAlign),_t(e,"textVerticalAlign")&&(t.verticalAlign=e.textVerticalAlign),_t(e,"textLineHeight")&&(t.lineHeight=e.textLineHeight),_t(e,"textWidth")&&(t.width=e.textWidth),_t(e,"textHeight")&&(t.height=e.textHeight),_t(e,"textBackgroundColor")&&(t.backgroundColor=e.textBackgroundColor),_t(e,"textPadding")&&(t.padding=e.textPadding),_t(e,"textBorderColor")&&(t.borderColor=e.textBorderColor),_t(e,"textBorderWidth")&&(t.borderWidth=e.textBorderWidth),_t(e,"textBorderRadius")&&(t.borderRadius=e.textBorderRadius),_t(e,"textBoxShadowColor")&&(t.shadowColor=e.textBoxShadowColor),_t(e,"textBoxShadowBlur")&&(t.shadowBlur=e.textBoxShadowBlur),_t(e,"textBoxShadowOffsetX")&&(t.shadowOffsetX=e.textBoxShadowOffsetX),_t(e,"textBoxShadowOffsetY")&&(t.shadowOffsetY=e.textBoxShadowOffsetY))}function GO(t,e,n){var i=t;i.textPosition=i.textPosition||n.position||"inside",null!=n.offset&&(i.textOffset=n.offset),null!=n.rotation&&(i.textRotation=n.rotation),null!=n.distance&&(i.textDistance=n.distance);var r=i.textPosition.indexOf("inside")>=0,o=t.fill||"#000";WO(i,e);var a=null==i.textFill;return r?a&&(i.textFill=n.insideFill||"#fff",!i.textStroke&&n.insideStroke&&(i.textStroke=n.insideStroke),!i.textStroke&&(i.textStroke=o),null==i.textStrokeWidth&&(i.textStrokeWidth=2)):(a&&(i.textFill=t.fill||n.outsideFill||"#000"),!i.textStroke&&n.outsideStroke&&(i.textStroke=n.outsideStroke)),i.text=e.text,i.rich=e.rich,E(e.rich,(function(t){WO(t,t)})),i}function WO(t,e){e&&(_t(e,"fill")&&(t.textFill=e.fill),_t(e,"stroke")&&(t.textStroke=e.fill),_t(e,"lineWidth")&&(t.textStrokeWidth=e.lineWidth),_t(e,"font")&&(t.font=e.font),_t(e,"fontStyle")&&(t.fontStyle=e.fontStyle),_t(e,"fontWeight")&&(t.fontWeight=e.fontWeight),_t(e,"fontSize")&&(t.fontSize=e.fontSize),_t(e,"fontFamily")&&(t.fontFamily=e.fontFamily),_t(e,"align")&&(t.textAlign=e.align),_t(e,"verticalAlign")&&(t.textVerticalAlign=e.verticalAlign),_t(e,"lineHeight")&&(t.textLineHeight=e.lineHeight),_t(e,"width")&&(t.textWidth=e.width),_t(e,"height")&&(t.textHeight=e.height),_t(e,"backgroundColor")&&(t.textBackgroundColor=e.backgroundColor),_t(e,"padding")&&(t.textPadding=e.padding),_t(e,"borderColor")&&(t.textBorderColor=e.borderColor),_t(e,"borderWidth")&&(t.textBorderWidth=e.borderWidth),_t(e,"borderRadius")&&(t.textBorderRadius=e.borderRadius),_t(e,"shadowColor")&&(t.textBoxShadowColor=e.shadowColor),_t(e,"shadowBlur")&&(t.textBoxShadowBlur=e.shadowBlur),_t(e,"shadowOffsetX")&&(t.textBoxShadowOffsetX=e.shadowOffsetX),_t(e,"shadowOffsetY")&&(t.textBoxShadowOffsetY=e.shadowOffsetY),_t(e,"textShadowColor")&&(t.textShadowColor=e.textShadowColor),_t(e,"textShadowBlur")&&(t.textShadowBlur=e.textShadowBlur),_t(e,"textShadowOffsetX")&&(t.textShadowOffsetX=e.textShadowOffsetX),_t(e,"textShadowOffsetY")&&(t.textShadowOffsetY=e.textShadowOffsetY))}var HO={position:["x","y"],scale:["scaleX","scaleY"],origin:["originX","originY"]},YO=G(HO),UO=(V(gr,(function(t,e){return t[e]=1,t}),{}),gr.join(", "),["","style","shape","extra"]),XO=Po();function ZO(t,e,n,i,r){var o=t+"Animation",a=ch(t,i,r)||{},s=XO(e).userDuring;return a.duration>0&&(a.during=s?W(tR,{el:e,userDuring:s}):null,a.setToFinal=!0,a.scope=t),A(a,n[o]),a}function jO(t,e,n,i){var r=(i=i||{}).dataIndex,o=i.isInit,a=i.clearStyle,s=n.isAnimationEnabled(),l=XO(t),u=e.style;l.userDuring=e.during;var h={},c={};if(function(t,e,n){for(var i=0;i<YO.length;i++){var r=YO[i],o=HO[r],a=e[r];a&&(n[o[0]]=a[0],n[o[1]]=a[1])}for(i=0;i<gr.length;i++){var s=gr[i];null!=e[s]&&(n[s]=e[s])}}(0,e,c),nR("shape",e,c),nR("extra",e,c),!o&&s&&(function(t,e,n){for(var i=e.transition,r=$O(i)?gr:_o(i||[]),o=0;o<r.length;o++){var a=r[o];if("style"!==a&&"shape"!==a&&"extra"!==a){var s=t[a];0,n[a]=s}}}(t,e,h),eR("shape",t,e,h),eR("extra",t,e,h),function(t,e,n,i){if(!n)return;var r,o=t.style;if(o){var a=n.transition,s=e.transition;if(a&&!$O(a)){var l=_o(a);!r&&(r=i.style={});for(var u=0;u<l.length;u++){var h=o[f=l[u]];r[f]=h}}else if(t.getAnimationStyleProps&&($O(s)||$O(a)||P(s,"style")>=0)){var c=t.getAnimationStyleProps(),p=c?c.style:null;if(p){!r&&(r=i.style={});var d=G(n);for(u=0;u<d.length;u++){var f;if(p[f=d[u]]){h=o[f];r[f]=h}}}}}}(t,e,u,h)),c.style=u,function(t,e,n){var i=e.style;if(!t.isGroup&&i){if(n){t.useStyle({});for(var r=t.animators,o=0;o<r.length;o++){var a=r[o];"style"===a.targetName&&a.changeTarget(t.style)}}t.setStyle(i)}e&&(e.style=null,e&&t.attr(e),e.style=i)}(t,c,a),function(t,e){_t(e,"silent")&&(t.silent=e.silent),_t(e,"ignore")&&(t.ignore=e.ignore),t instanceof wa&&_t(e,"invisible")&&(t.invisible=e.invisible);t instanceof Ms&&_t(e,"autoBatch")&&(t.autoBatch=e.autoBatch)}(t,e),s)if(o){var p={};E(UO,(function(t){var n=t?e[t]:e;n&&n.enterFrom&&(t&&(p[t]=p[t]||{}),A(t?p[t]:p,n.enterFrom))}));var d=ZO("enter",t,e,n,r);d.duration>0&&t.animateFrom(p,d)}else!function(t,e,n,i,r){if(r){var o=ZO("update",t,e,i,n);o.duration>0&&t.animateFrom(r,o)}}(t,e,r||0,n,h);qO(t,e),u?t.dirty():t.markRedraw()}function qO(t,e){for(var n=XO(t).leaveToProps,i=0;i<UO.length;i++){var r=UO[i],o=r?e[r]:e;o&&o.leaveTo&&(n||(n=XO(t).leaveToProps={}),r&&(n[r]=n[r]||{}),A(r?n[r]:n,o.leaveTo))}}function KO(t,e,n,i){if(t){var r=t.parent,o=XO(t).leaveToProps;if(o){var a=ZO("update",t,e,n,0);a.done=function(){r.remove(t),i&&i()},t.animateTo(o,a)}else r.remove(t),i&&i()}}function $O(t){return"all"===t}var JO={},QO={setTransform:function(t,e){return JO.el[t]=e,this},getTransform:function(t){return JO.el[t]},setShape:function(t,e){var n=JO.el;return(n.shape||(n.shape={}))[t]=e,n.dirtyShape&&n.dirtyShape(),this},getShape:function(t){var e=JO.el.shape;if(e)return e[t]},setStyle:function(t,e){var n=JO.el,i=n.style;return i&&(i[t]=e,n.dirtyStyle&&n.dirtyStyle()),this},getStyle:function(t){var e=JO.el.style;if(e)return e[t]},setExtra:function(t,e){return(JO.el.extra||(JO.el.extra={}))[t]=e,this},getExtra:function(t){var e=JO.el.extra;if(e)return e[t]}};function tR(){var t=this,e=t.el;if(e){var n=XO(e).userDuring,i=t.userDuring;n===i?(JO.el=e,i(QO)):t.el=t.userDuring=null}}function eR(t,e,n,i){var r=n[t];if(r){var o,a=e[t];if(a){var s=n.transition,l=r.transition;if(l)if(!o&&(o=i[t]={}),$O(l))A(o,a);else for(var u=_o(l),h=0;h<u.length;h++){var c=a[d=u[h]];o[d]=c}else if($O(s)||P(s,t)>=0){!o&&(o=i[t]={});var p=G(a);for(h=0;h<p.length;h++){var d;c=a[d=p[h]];iR(r[d],c)&&(o[d]=c)}}}}}function nR(t,e,n){var i=e[t];if(i)for(var r=n[t]={},o=G(i),a=0;a<o.length;a++){var s=o[a];r[s]=Ai(i[s])}}function iR(t,e){return N(t)?t!==e:null!=t&&isFinite(t)}var rR=Po(),oR=["percent","easing","shape","style","extra"];function aR(t){t.stopAnimation("keyframe"),t.attr(rR(t))}function sR(t,e,n){if(n.isAnimationEnabled()&&e)if(Y(e))E(e,(function(e){sR(t,e,n)}));else{var i=e.keyframes,r=e.duration;if(n&&null==r){var o=ch("enter",n,0);r=o&&o.duration}if(i&&r){var a=rR(t);E(UO,(function(n){if(!n||t[n]){var o;i.sort((function(t,e){return t.percent-e.percent})),E(i,(function(i){var s=t.animators,l=n?i[n]:i;if(l){var u=G(l);if(n||(u=B(u,(function(t){return P(oR,t)<0}))),u.length){o||((o=t.animate(n,e.loop,!0)).scope="keyframe");for(var h=0;h<s.length;h++)s[h]!==o&&s[h].targetName===o.targetName&&s[h].stopTracks(u);n&&(a[n]=a[n]||{});var c=n?a[n]:a;E(u,(function(e){c[e]=((n?t[n]:t)||{})[e]})),o.whenWithKeys(r*i.percent,l,u,i.easing)}}})),o&&o.delay(e.delay||0).duration(r).start(e.easing)}}))}}}var lR="emphasis",uR="normal",hR="blur",cR="select",pR=[uR,lR,hR,cR],dR={normal:["itemStyle"],emphasis:[lR,"itemStyle"],blur:[hR,"itemStyle"],select:[cR,"itemStyle"]},fR={normal:["label"],emphasis:[lR,"label"],blur:[hR,"label"],select:[cR,"label"]},gR=["x","y"],yR={normal:{},emphasis:{},blur:{},select:{}},vR={cartesian2d:function(t){var e=t.master.getRect();return{coordSys:{type:"cartesian2d",x:e.x,y:e.y,width:e.width,height:e.height},api:{coord:function(e){return t.dataToPoint(e)},size:W(RO,t)}}},geo:function(t){var e=t.getBoundingRect();return{coordSys:{type:"geo",x:e.x,y:e.y,width:e.width,height:e.height,zoom:t.getZoom()},api:{coord:function(e){return t.dataToPoint(e)},size:W(NO,t)}}},single:function(t){var e=t.getRect();return{coordSys:{type:"singleAxis",x:e.x,y:e.y,width:e.width,height:e.height},api:{coord:function(e){return t.dataToPoint(e)},size:W(EO,t)}}},polar:function(t){var e=t.getRadiusAxis(),n=t.getAngleAxis(),i=e.getExtent();return i[0]>i[1]&&i.reverse(),{coordSys:{type:"polar",cx:t.cx,cy:t.cy,r:i[1],r0:i[0]},api:{coord:function(i){var r=e.dataToRadius(i[0]),o=n.dataToAngle(i[1]),a=t.coordToPoint([r,o]);return a.push(r,o*Math.PI/180),a},size:W(zO,t)}}},calendar:function(t){var e=t.getRect(),n=t.getRangeInfo();return{coordSys:{type:"calendar",x:e.x,y:e.y,width:e.width,height:e.height,cellWidth:t.getCellWidth(),cellHeight:t.getCellHeight(),rangeInfo:{start:n.start,end:n.end,weeks:n.weeks,dayCount:n.allDay}},api:{coord:function(e,n){return t.dataToPoint(e,n)}}}}};function mR(t){return t instanceof Ms}function xR(t){return t instanceof wa}var _R=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.render=function(t,e,n,i){this._progressiveEls=null;var r=this._data,o=t.getData(),a=this.group,s=IR(t,o,e,n);r||a.removeAll(),o.diff(r).add((function(e){CR(n,null,e,s(e,i),t,a,o)})).remove((function(e){var n=r.getItemGraphicEl(e);n&&KO(n,PO(n).option,t)})).update((function(e,l){var u=r.getItemGraphicEl(l);CR(n,u,e,s(e,i),t,a,o)})).execute();var l=t.get("clip",!0)?yS(t.coordinateSystem,!1,t):null;l?a.setClipPath(l):a.removeClipPath(),this._data=o},e.prototype.incrementalPrepareRender=function(t,e,n){this.group.removeAll(),this._data=null},e.prototype.incrementalRender=function(t,e,n,i,r){var o=e.getData(),a=IR(e,o,n,i),s=this._progressiveEls=[];function l(t){t.isGroup||(t.incremental=!0,t.ensureState("emphasis").hoverLayer=!0)}for(var u=t.start;u<t.end;u++){var h=CR(null,null,u,a(u,r),e,this.group,o);h&&(h.traverse(l),s.push(h))}},e.prototype.eachRendered=function(t){jh(this._progressiveEls||this.group,t)},e.prototype.filterForExposedEvent=function(t,e,n,i){var r=e.element;if(null==r||n.name===r)return!0;for(;(n=n.__hostTarget||n.parent)&&n!==this.group;)if(n.name===r)return!0;return!1},e.type="custom",e}(Tg);function bR(t){var e,n=t.type;if("path"===n){var i=t.shape,r=null!=i.width&&null!=i.height?{x:i.x||0,y:i.y||0,width:i.width,height:i.height}:null,o=zR(i);e=Dh(o,null,r,i.layout||"center"),PO(e).customPathData=o}else if("image"===n)e=new As({}),PO(e).customImagePath=t.style.image;else if("text"===n)e=new Bs({});else if("group"===n)e=new Er;else{if("compoundPath"===n)throw new Error('"compoundPath" is not supported yet.');var a=Ch(n);if(!a){var s="";0,yo(s)}e=new a}return PO(e).customGraphicType=n,e.name=t.name,e.z2EmphasisLift=1,e.z2SelectLift=1,e}function wR(t,e,n,i,r,o,a){aR(e);var s=r&&r.normal.cfg;s&&e.setTextConfig(s),i&&null==i.transition&&(i.transition=gR);var l=i&&i.style;if(l){if("text"===e.type){var u=l;_t(u,"textFill")&&(u.fill=u.textFill),_t(u,"textStroke")&&(u.stroke=u.textStroke)}var h=void 0,c=mR(e)?l.decal:null;t&&c&&(c.dirty=!0,h=cv(c,t)),l.__decalPattern=h}xR(e)&&(l&&(h=l.__decalPattern)&&(l.decal=h));jO(e,i,o,{dataIndex:n,isInit:a,clearStyle:!0}),sR(e,i.keyframeAnimation,o)}function SR(t,e,n,i,r){var o=e.isGroup?null:e,a=r&&r[t].cfg;if(o){var s=o.ensureState(t);if(!1===i){var l=o.getState(t);l&&(l.style=null)}else s.style=i||null;a&&(s.textConfig=a),Tl(o)}}function MR(t,e,n){var i=n===uR,r=i?e:LR(e,n),o=r?r.z2:null;null!=o&&((i?t:t.ensureState(n)).z2=o||0)}function IR(t,e,n,i){var r=t.get("renderItem"),o=t.coordinateSystem,a={};o&&(a=o.prepareCustoms?o.prepareCustoms(o):vR[o.type](o));for(var s,l,u=k({getWidth:i.getWidth,getHeight:i.getHeight,getZr:i.getZr,getDevicePixelRatio:i.getDevicePixelRatio,value:function(t,n){return null==n&&(n=s),e.getStore().get(e.getDimensionIndex(t||0),n)},style:function(n,i){0;null==i&&(i=s);var r=e.getItemVisual(i,"style"),o=r&&r.fill,a=r&&r.opacity,l=m(i,uR).getItemStyle();null!=o&&(l.fill=o),null!=a&&(l.opacity=a);var u={inheritColor:X(o)?o:"#000"},h=x(i,uR),c=ec(h,null,u,!1,!0);c.text=h.getShallow("show")?rt(t.getFormattedLabel(i,uR),Kw(e,i)):null;var p=nc(h,u,!1);return b(n,l),l=GO(l,c,p),n&&_(l,n),l.legacy=!0,l},ordinalRawValue:function(t,n){null==n&&(n=s),t=t||0;var i=e.getDimensionInfo(t);if(!i){var r=e.getDimensionIndex(t);return r>=0?e.getStore().get(r,n):void 0}var o=e.get(i.name,n),a=i&&i.ordinalMeta;return a?a.categories[o]:o},styleEmphasis:function(n,i){0;null==i&&(i=s);var r=m(i,lR).getItemStyle(),o=x(i,lR),a=ec(o,null,null,!0,!0);a.text=o.getShallow("show")?ot(t.getFormattedLabel(i,lR),t.getFormattedLabel(i,uR),Kw(e,i)):null;var l=nc(o,null,!0);return b(n,r),r=GO(r,a,l),n&&_(r,n),r.legacy=!0,r},visual:function(t,n){if(null==n&&(n=s),_t(kO,t)){var i=e.getItemVisual(n,"style");return i?i[kO[t]]:null}if(_t(LO,t))return e.getItemVisual(n,t)},barLayout:function(t){if("cartesian2d"===o.type){return function(t){var e=[],n=t.axis,i="axis0";if("category"===n.type){for(var r=n.getBandWidth(),o=0;o<t.count;o++)e.push(k({bandWidth:r,axisKey:i,stackId:kx+o},t));var a=Nx(e),s=[];for(o=0;o<t.count;o++){var l=a.axis0[kx+o];l.offsetCenter=l.offset+l.width/2,s.push(l)}return s}}(k({axis:o.getBaseAxis()},t))}},currentSeriesIndices:function(){return n.getCurrentSeriesIndices()},font:function(t){return sc(t,n)}},a.api||{}),h={context:{},seriesId:t.id,seriesName:t.name,seriesIndex:t.seriesIndex,coordSys:a.coordSys,dataInsideLength:e.count(),encode:TR(t.getData())},c={},p={},d={},f={},g=0;g<pR.length;g++){var y=pR[g];d[y]=t.getModel(dR[y]),f[y]=t.getModel(fR[y])}function v(t){return t===s?l||(l=e.getItemModel(t)):e.getItemModel(t)}function m(t,n){return e.hasItemOption?t===s?c[n]||(c[n]=v(t).getModel(dR[n])):v(t).getModel(dR[n]):d[n]}function x(t,n){return e.hasItemOption?t===s?p[n]||(p[n]=v(t).getModel(fR[n])):v(t).getModel(fR[n]):f[n]}return function(t,n){return s=t,l=null,c={},p={},r&&r(k({dataIndexInside:t,dataIndex:e.getRawIndex(t),actionType:n?n.type:null},h),u)};function _(t,e){for(var n in e)_t(e,n)&&(t[n]=e[n])}function b(t,e){t&&(t.textFill&&(e.textFill=t.textFill),t.textPosition&&(e.textPosition=t.textPosition))}}function TR(t){var e={};return E(t.dimensions,(function(n){var i=t.getDimensionInfo(n);if(!i.isExtraCoord){var r=i.coordDim;(e[r]=e[r]||[])[i.coordDimIndex]=t.getDimensionIndex(n)}})),e}function CR(t,e,n,i,r,o,a){if(i){var s=DR(t,e,n,i,r,o);return s&&a.setItemGraphicEl(n,s),s&&Hl(s,i.focus,i.blurScope,i.emphasisDisabled),s}o.remove(e)}function DR(t,e,n,i,r,o){var a=-1,s=e;e&&AR(e,i,r)&&(a=P(o.childrenRef(),e),e=null);var l,u,h=!e,c=e;c?c.clearStates():(c=bR(i),s&&(l=s,(u=c).copyTransform(l),xR(u)&&xR(l)&&(u.setStyle(l.style),u.z=l.z,u.z2=l.z2,u.zlevel=l.zlevel,u.invisible=l.invisible,u.ignore=l.ignore,mR(u)&&mR(l)&&u.setShape(l.shape)))),!1===i.morph?c.disableMorphing=!0:c.disableMorphing&&(c.disableMorphing=!1),yR.normal.cfg=yR.normal.conOpt=yR.emphasis.cfg=yR.emphasis.conOpt=yR.blur.cfg=yR.blur.conOpt=yR.select.cfg=yR.select.conOpt=null,yR.isLegacy=!1,function(t,e,n,i,r,o){if(t.isGroup)return;kR(n,null,o),kR(n,lR,o);var a=o.normal.conOpt,s=o.emphasis.conOpt,l=o.blur.conOpt,u=o.select.conOpt;if(null!=a||null!=s||null!=u||null!=l){var h=t.getTextContent();if(!1===a)h&&t.removeTextContent();else{a=o.normal.conOpt=a||{type:"text"},h?h.clearStates():(h=bR(a),t.setTextContent(h)),wR(null,h,e,a,null,i,r);for(var c=a&&a.style,p=0;p<pR.length;p++){var d=pR[p];if(d!==uR){var f=o[d].conOpt;SR(d,h,0,PR(a,f,d),null)}}c?h.dirty():h.markRedraw()}}}(c,n,i,r,h,yR),function(t,e,n,i,r){var o=n.clipPath;if(!1===o)t&&t.getClipPath()&&t.removeClipPath();else if(o){var a=t.getClipPath();a&&AR(a,o,i)&&(a=null),a||(a=bR(o),t.setClipPath(a)),wR(null,a,e,o,null,i,r)}}(c,n,i,r,h),wR(t,c,n,i,yR,r,h),_t(i,"info")&&(PO(c).info=i.info);for(var p=0;p<pR.length;p++){var d=pR[p];if(d!==uR){var f=LR(i,d);SR(d,c,0,PR(i,f,d),yR)}}return function(t,e,n){if(!t.isGroup){var i=t,r=n.currentZ,o=n.currentZLevel;i.z=r,i.zlevel=o;var a=e.z2;null!=a&&(i.z2=a||0);for(var s=0;s<pR.length;s++)MR(i,e,pR[s])}}(c,i,r),"group"===i.type&&function(t,e,n,i,r){var o=i.children,a=o?o.length:0,s=i.$mergeChildren,l="byName"===s||i.diffChildrenByName,u=!1===s;if(!a&&!l&&!u)return;if(l)return h={api:t,oldChildren:e.children()||[],newChildren:o||[],dataIndex:n,seriesModel:r,group:e},void new Lm(h.oldChildren,h.newChildren,RR,RR,h).add(NR).update(NR).remove(ER).execute();var h;u&&e.removeAll();for(var c=0;c<a;c++){var p=o[c],d=e.childAt(c);p?(null==p.ignore&&(p.ignore=!1),DR(t,d,n,p,r,e)):d.ignore=!0}for(var f=e.childCount()-1;f>=c;f--){var g=e.childAt(f);OR(e,g,r)}}(t,c,n,i,r),a>=0?o.replaceAt(c,a):o.add(c),c}function AR(t,e,n){var i,r=PO(t),o=e.type,a=e.shape,s=e.style;return n.isUniversalTransitionEnabled()||null!=o&&o!==r.customGraphicType||"path"===o&&((i=a)&&(_t(i,"pathData")||_t(i,"d")))&&zR(a)!==r.customPathData||"image"===o&&_t(s,"image")&&s.image!==r.customImagePath}function kR(t,e,n){var i=e?LR(t,e):t,r=e?PR(t,i,lR):t.style,o=t.type,a=i?i.textConfig:null,s=t.textContent,l=s?e?LR(s,e):s:null;if(r&&(n.isLegacy||VO(r,o,!!a,!!l))){n.isLegacy=!0;var u=BO(r,o,!e);!a&&u.textConfig&&(a=u.textConfig),!l&&u.textContent&&(l=u.textContent)}if(!e&&l){var h=l;!h.type&&(h.type="text")}var c=e?n[e]:n.normal;c.cfg=a,c.conOpt=l}function LR(t,e){return e?t?t[e]:null:t}function PR(t,e,n){var i=e&&e.style;return null==i&&n===lR&&t&&(i=t.styleEmphasis),i}function OR(t,e,n){e&&KO(e,PO(t).option,n)}function RR(t,e){var n=t&&t.name;return null!=n?n:"e\0\0"+e}function NR(t,e){var n=this.context,i=null!=t?n.newChildren[t]:null,r=null!=e?n.oldChildren[e]:null;DR(n.api,r,n.dataIndex,i,n.seriesModel,n.group)}function ER(t){var e=this.context,n=e.oldChildren[t];n&&KO(n,PO(n).option,e.seriesModel)}function zR(t){return t&&(t.pathData||t.d)}var VR=Po(),BR=T,FR=W,GR=function(){function t(){this._dragging=!1,this.animationThreshold=15}return t.prototype.render=function(t,e,n,i){var r=e.get("value"),o=e.get("status");if(this._axisModel=t,this._axisPointerModel=e,this._api=n,i||this._lastValue!==r||this._lastStatus!==o){this._lastValue=r,this._lastStatus=o;var a=this._group,s=this._handle;if(!o||"hide"===o)return a&&a.hide(),void(s&&s.hide());a&&a.show(),s&&s.show();var l={};this.makeElOption(l,r,t,e,n);var u=l.graphicKey;u!==this._lastGraphicKey&&this.clear(n),this._lastGraphicKey=u;var h=this._moveAnimation=this.determineAnimation(t,e);if(a){var c=H(WR,e,h);this.updatePointerEl(a,l,c),this.updateLabelEl(a,l,c,e)}else a=this._group=new Er,this.createPointerEl(a,l,t,e),this.createLabelEl(a,l,t,e),n.getZr().add(a);XR(a,e,!0),this._renderHandle(r)}},t.prototype.remove=function(t){this.clear(t)},t.prototype.dispose=function(t){this.clear(t)},t.prototype.determineAnimation=function(t,e){var n=e.get("animation"),i=t.axis,r="category"===i.type,o=e.get("snap");if(!o&&!r)return!1;if("auto"===n||null==n){var a=this.animationThreshold;if(r&&i.getBandWidth()>a)return!0;if(o){var s=oI(t).seriesDataCount,l=i.getExtent();return Math.abs(l[0]-l[1])/s>a}return!1}return!0===n},t.prototype.makeElOption=function(t,e,n,i,r){},t.prototype.createPointerEl=function(t,e,n,i){var r=e.pointer;if(r){var o=VR(t).pointerEl=new qh[r.type](BR(e.pointer));t.add(o)}},t.prototype.createLabelEl=function(t,e,n,i){if(e.label){var r=VR(t).labelEl=new Bs(BR(e.label));t.add(r),YR(r,i)}},t.prototype.updatePointerEl=function(t,e,n){var i=VR(t).pointerEl;i&&e.pointer&&(i.setStyle(e.pointer.style),n(i,{shape:e.pointer.shape}))},t.prototype.updateLabelEl=function(t,e,n,i){var r=VR(t).labelEl;r&&(r.setStyle(e.label.style),n(r,{x:e.label.x,y:e.label.y}),YR(r,i))},t.prototype._renderHandle=function(t){if(!this._dragging&&this.updateHandleTransform){var e,n=this._axisPointerModel,i=this._api.getZr(),r=this._handle,o=n.getModel("handle"),a=n.get("status");if(!o.get("show")||!a||"hide"===a)return r&&i.remove(r),void(this._handle=null);this._handle||(e=!0,r=this._handle=Wh(o.get("icon"),{cursor:"move",draggable:!0,onmousemove:function(t){pe(t.event)},onmousedown:FR(this._onHandleDragMove,this,0,0),drift:FR(this._onHandleDragMove,this),ondragend:FR(this._onHandleDragEnd,this)}),i.add(r)),XR(r,n,!1),r.setStyle(o.getItemStyle(null,["color","borderColor","borderWidth","opacity","shadowColor","shadowBlur","shadowOffsetX","shadowOffsetY"]));var s=o.get("size");Y(s)||(s=[s,s]),r.scaleX=s[0]/2,r.scaleY=s[1]/2,Eg(this,"_doDispatchAxisPointer",o.get("throttle")||0,"fixRate"),this._moveHandleToValue(t,e)}},t.prototype._moveHandleToValue=function(t,e){WR(this._axisPointerModel,!e&&this._moveAnimation,this._handle,UR(this.getHandleTransform(t,this._axisModel,this._axisPointerModel)))},t.prototype._onHandleDragMove=function(t,e){var n=this._handle;if(n){this._dragging=!0;var i=this.updateHandleTransform(UR(n),[t,e],this._axisModel,this._axisPointerModel);this._payloadInfo=i,n.stopAnimation(),n.attr(UR(i)),VR(n).lastProp=null,this._doDispatchAxisPointer()}},t.prototype._doDispatchAxisPointer=function(){if(this._handle){var t=this._payloadInfo,e=this._axisModel;this._api.dispatchAction({type:"updateAxisPointer",x:t.cursorPoint[0],y:t.cursorPoint[1],tooltipOption:t.tooltipOption,axesInfo:[{axisDim:e.axis.dim,axisIndex:e.componentIndex}]})}},t.prototype._onHandleDragEnd=function(){if(this._dragging=!1,this._handle){var t=this._axisPointerModel.get("value");this._moveHandleToValue(t),this._api.dispatchAction({type:"hideTip"})}},t.prototype.clear=function(t){this._lastValue=null,this._lastStatus=null;var e=t.getZr(),n=this._group,i=this._handle;e&&n&&(this._lastGraphicKey=null,n&&e.remove(n),i&&e.remove(i),this._group=null,this._handle=null,this._payloadInfo=null),zg(this,"_doDispatchAxisPointer")},t.prototype.doClear=function(){},t.prototype.buildLabel=function(t,e,n){return{x:t[n=n||0],y:t[1-n],width:e[n],height:e[1-n]}},t}();function WR(t,e,n,i){HR(VR(n).lastProp,i)||(VR(n).lastProp=i,e?dh(n,i,t):(n.stopAnimation(),n.attr(i)))}function HR(t,e){if(q(t)&&q(e)){var n=!0;return E(e,(function(e,i){n=n&&HR(t[i],e)})),!!n}return t===e}function YR(t,e){t[e.get(["label","show"])?"show":"hide"]()}function UR(t){return{x:t.x||0,y:t.y||0,rotation:t.rotation||0}}function XR(t,e,n){var i=e.get("z"),r=e.get("zlevel");t&&t.traverse((function(t){"group"!==t.type&&(null!=i&&(t.z=i),null!=r&&(t.zlevel=r),t.silent=n)}))}function ZR(t){var e,n=t.get("type"),i=t.getModel(n+"Style");return"line"===n?(e=i.getLineStyle()).fill=null:"shadow"===n&&((e=i.getAreaStyle()).stroke=null),e}function jR(t,e,n,i,r){var o=qR(n.get("value"),e.axis,e.ecModel,n.get("seriesDataIndices"),{precision:n.get(["label","precision"]),formatter:n.get(["label","formatter"])}),a=n.getModel("label"),s=dp(a.get("padding")||0),l=a.getFont(),u=_r(o,l),h=r.position,c=u.width+s[1]+s[3],p=u.height+s[0]+s[2],d=r.align;"right"===d&&(h[0]-=c),"center"===d&&(h[0]-=c/2);var f=r.verticalAlign;"bottom"===f&&(h[1]-=p),"middle"===f&&(h[1]-=p/2),function(t,e,n,i){var r=i.getWidth(),o=i.getHeight();t[0]=Math.min(t[0]+e,r)-e,t[1]=Math.min(t[1]+n,o)-n,t[0]=Math.max(t[0],0),t[1]=Math.max(t[1],0)}(h,c,p,i);var g=a.get("backgroundColor");g&&"auto"!==g||(g=e.get(["axisLine","lineStyle","color"])),t.label={x:h[0],y:h[1],style:ec(a,{text:o,font:l,fill:a.getTextColor(),padding:s,backgroundColor:g}),z2:10}}function qR(t,e,n,i,r){t=e.scale.parse(t);var o=e.scale.getLabel({value:t},{precision:r.precision}),a=r.formatter;if(a){var s={value:d_(e,{value:t}),axisDimension:e.dim,axisIndex:e.index,seriesData:[]};E(i,(function(t){var e=n.getSeriesByIndex(t.seriesIndex),i=t.dataIndexInside,r=e&&e.getDataParams(i);r&&s.seriesData.push(r)})),X(a)?o=a.replace("{value}",o):U(a)&&(o=a(s))}return o}function KR(t,e,n){var i=[1,0,0,1,0,0];return we(i,i,n.rotation),be(i,i,n.position),Eh([t.dataToCoord(e),(n.labelOffset||0)+(n.labelDirection||1)*(n.labelMargin||0)],i)}function $R(t,e,n,i,r,o){var a=KM.innerTextLayout(n.rotation,0,n.labelDirection);n.labelMargin=r.get(["label","margin"]),jR(e,i,r,o,{position:KR(i.axis,t,n),align:a.textAlign,verticalAlign:a.textVerticalAlign})}function JR(t,e,n){return{x1:t[n=n||0],y1:t[1-n],x2:e[n],y2:e[1-n]}}function QR(t,e,n){return{x:t[n=n||0],y:t[1-n],width:e[n],height:e[1-n]}}function tN(t,e,n,i,r,o){return{cx:t,cy:e,r0:n,r:i,startAngle:r,endAngle:o,clockwise:!0}}var eN=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.prototype.makeElOption=function(t,e,n,i,r){var o=n.axis,a=o.grid,s=i.get("type"),l=nN(a,o).getOtherAxis(o).getGlobalExtent(),u=o.toGlobalCoord(o.dataToCoord(e,!0));if(s&&"none"!==s){var h=ZR(i),c=iN[s](o,u,l);c.style=h,t.graphicKey=c.type,t.pointer=c}$R(e,t,FM(a.model,n),n,i,r)},e.prototype.getHandleTransform=function(t,e,n){var i=FM(e.axis.grid.model,e,{labelInside:!1});i.labelMargin=n.get(["handle","margin"]);var r=KR(e.axis,t,i);return{x:r[0],y:r[1],rotation:i.rotation+(i.labelDirection<0?Math.PI:0)}},e.prototype.updateHandleTransform=function(t,e,n,i){var r=n.axis,o=r.grid,a=r.getGlobalExtent(!0),s=nN(o,r).getOtherAxis(r).getGlobalExtent(),l="x"===r.dim?0:1,u=[t.x,t.y];u[l]+=e[l],u[l]=Math.min(a[1],u[l]),u[l]=Math.max(a[0],u[l]);var h=(s[1]+s[0])/2,c=[h,h];c[l]=u[l];return{x:u[0],y:u[1],rotation:t.rotation,cursorPoint:c,tooltipOption:[{verticalAlign:"middle"},{align:"center"}][l]}},e}(GR);function nN(t,e){var n={};return n[e.dim+"AxisIndex"]=e.index,t.getCartesian(n)}var iN={line:function(t,e,n){return{type:"Line",subPixelOptimize:!0,shape:JR([e,n[0]],[e,n[1]],rN(t))}},shadow:function(t,e,n){var i=Math.max(1,t.getBandWidth()),r=n[1]-n[0];return{type:"Rect",shape:QR([e-i/2,n[0]],[i,r],rN(t))}}};function rN(t){return"x"===t.dim?0:1}var oN=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.type="axisPointer",e.defaultOption={show:"auto",z:50,type:"line",snap:!1,triggerTooltip:!0,value:null,status:null,link:[],animation:null,animationDurationUpdate:200,lineStyle:{color:"#B9BEC9",width:1,type:"dashed"},shadowStyle:{color:"rgba(210,219,238,0.2)"},label:{show:!0,formatter:null,precision:"auto",margin:3,color:"#fff",padding:[5,7,5,7],backgroundColor:"auto",borderColor:null,borderWidth:0,borderRadius:3},handle:{show:!1,icon:"M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4h1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7v-1.2h6.6z M13.3,22H6.7v-1.2h6.6z M13.3,19.6H6.7v-1.2h6.6z",size:45,margin:50,color:"#333",shadowBlur:3,shadowColor:"#aaa",shadowOffsetX:0,shadowOffsetY:2,throttle:40}},e}(Op),aN=Po(),sN=E;function lN(t,e,n){if(!r.node){var i=e.getZr();aN(i).records||(aN(i).records={}),function(t,e){if(aN(t).initialized)return;function n(n,i){t.on(n,(function(n){var r=function(t){var e={showTip:[],hideTip:[]},n=function(i){var r=e[i.type];r?r.push(i):(i.dispatchAction=n,t.dispatchAction(i))};return{dispatchAction:n,pendings:e}}(e);sN(aN(t).records,(function(t){t&&i(t,n,r.dispatchAction)})),function(t,e){var n,i=t.showTip.length,r=t.hideTip.length;i?n=t.showTip[i-1]:r&&(n=t.hideTip[r-1]);n&&(n.dispatchAction=null,e.dispatchAction(n))}(r.pendings,e)}))}aN(t).initialized=!0,n("click",H(hN,"click")),n("mousemove",H(hN,"mousemove")),n("globalout",uN)}(i,e),(aN(i).records[t]||(aN(i).records[t]={})).handler=n}}function uN(t,e,n){t.handler("leave",null,n)}function hN(t,e,n,i){e.handler(t,n,i)}function cN(t,e){if(!r.node){var n=e.getZr();(aN(n).records||{})[t]&&(aN(n).records[t]=null)}}var pN=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.render=function(t,e,n){var i=e.getComponent("tooltip"),r=t.get("triggerOn")||i&&i.get("triggerOn")||"mousemove|click";lN("axisPointer",n,(function(t,e,n){"none"!==r&&("leave"===t||r.indexOf(t)>=0)&&n({type:"updateAxisPointer",currTrigger:t,x:e&&e.offsetX,y:e&&e.offsetY})}))},e.prototype.remove=function(t,e){cN("axisPointer",e)},e.prototype.dispose=function(t,e){cN("axisPointer",e)},e.type="axisPointer",e}(wg);function dN(t,e){var n,i=[],r=t.seriesIndex;if(null==r||!(n=e.getSeriesByIndex(r)))return{point:[]};var o=n.getData(),a=Lo(o,t);if(null==a||a<0||Y(a))return{point:[]};var s=o.getItemGraphicEl(a),l=n.coordinateSystem;if(n.getTooltipPosition)i=n.getTooltipPosition(a)||[];else if(l&&l.dataToPoint)if(t.isStacked){var u=l.getBaseAxis(),h=l.getOtherAxis(u).dim,c=u.dim,p="x"===h||"radius"===h?1:0,d=o.mapDimension(c),f=[];f[p]=o.get(d,a),f[1-p]=o.get(o.getCalculationInfo("stackResultDimension"),a),i=l.dataToPoint(f)||[]}else i=l.dataToPoint(o.getValues(z(l.dimensions,(function(t){return o.mapDimension(t)})),a))||[];else if(s){var g=s.getBoundingRect().clone();g.applyTransform(s.transform),i=[g.x+g.width/2,g.y+g.height/2]}return{point:i,el:s}}var fN=Po();function gN(t,e,n){var i=t.currTrigger,r=[t.x,t.y],o=t,a=t.dispatchAction||W(n.dispatchAction,n),s=e.getComponent("axisPointer").coordSysAxesInfo;if(s){_N(r)&&(r=dN({seriesIndex:o.seriesIndex,dataIndex:o.dataIndex},e).point);var l=_N(r),u=o.axesInfo,h=s.axesInfo,c="leave"===i||_N(r),p={},d={},f={list:[],map:{}},g={showPointer:H(vN,d),showTooltip:H(mN,f)};E(s.coordSysMap,(function(t,e){var n=l||t.containPoint(r);E(s.coordSysAxesInfo[e],(function(t,e){var i=t.axis,o=function(t,e){for(var n=0;n<(t||[]).length;n++){var i=t[n];if(e.axis.dim===i.axisDim&&e.axis.model.componentIndex===i.axisIndex)return i}}(u,t);if(!c&&n&&(!u||o)){var a=o&&o.value;null!=a||l||(a=i.pointToData(r)),null!=a&&yN(t,a,g,!1,p)}}))}));var y={};return E(h,(function(t,e){var n=t.linkGroup;n&&!d[e]&&E(n.axesInfo,(function(e,i){var r=d[i];if(e!==t&&r){var o=r.value;n.mapper&&(o=t.axis.scale.parse(n.mapper(o,xN(e),xN(t)))),y[t.key]=o}}))})),E(y,(function(t,e){yN(h[e],t,g,!0,p)})),function(t,e,n){var i=n.axesInfo=[];E(e,(function(e,n){var r=e.axisPointerModel.option,o=t[n];o?(!e.useHandle&&(r.status="show"),r.value=o.value,r.seriesDataIndices=(o.payloadBatch||[]).slice()):!e.useHandle&&(r.status="hide"),"show"===r.status&&i.push({axisDim:e.axis.dim,axisIndex:e.axis.model.componentIndex,value:r.value})}))}(d,h,p),function(t,e,n,i){if(_N(e)||!t.list.length)return void i({type:"hideTip"});var r=((t.list[0].dataByAxis[0]||{}).seriesDataIndices||[])[0]||{};i({type:"showTip",escapeConnect:!0,x:e[0],y:e[1],tooltipOption:n.tooltipOption,position:n.position,dataIndexInside:r.dataIndexInside,dataIndex:r.dataIndex,seriesIndex:r.seriesIndex,dataByCoordSys:t.list})}(f,r,t,a),function(t,e,n){var i=n.getZr(),r="axisPointerLastHighlights",o=fN(i)[r]||{},a=fN(i)[r]={};E(t,(function(t,e){var n=t.axisPointerModel.option;"show"===n.status&&E(n.seriesDataIndices,(function(t){var e=t.seriesIndex+" | "+t.dataIndex;a[e]=t}))}));var s=[],l=[];E(o,(function(t,e){!a[e]&&l.push(t)})),E(a,(function(t,e){!o[e]&&s.push(t)})),l.length&&n.dispatchAction({type:"downplay",escapeConnect:!0,notBlur:!0,batch:l}),s.length&&n.dispatchAction({type:"highlight",escapeConnect:!0,notBlur:!0,batch:s})}(h,0,n),p}}function yN(t,e,n,i,r){var o=t.axis;if(!o.scale.isBlank()&&o.containData(e))if(t.involveSeries){var a=function(t,e){var n=e.axis,i=n.dim,r=t,o=[],a=Number.MAX_VALUE,s=-1;return E(e.seriesModels,(function(e,l){var u,h,c=e.getData().mapDimensionsAll(i);if(e.getAxisTooltipData){var p=e.getAxisTooltipData(c,t,n);h=p.dataIndices,u=p.nestestValue}else{if(!(h=e.getData().indicesOfNearest(c[0],t,"category"===n.type?.5:null)).length)return;u=e.getData().get(c[0],h[0])}if(null!=u&&isFinite(u)){var d=t-u,f=Math.abs(d);f<=a&&((f<a||d>=0&&s<0)&&(a=f,s=d,r=u,o.length=0),E(h,(function(t){o.push({seriesIndex:e.seriesIndex,dataIndexInside:t,dataIndex:e.getData().getRawIndex(t)})})))}})),{payloadBatch:o,snapToValue:r}}(e,t),s=a.payloadBatch,l=a.snapToValue;s[0]&&null==r.seriesIndex&&A(r,s[0]),!i&&t.snap&&o.containData(l)&&null!=l&&(e=l),n.showPointer(t,e,s),n.showTooltip(t,a,l)}else n.showPointer(t,e)}function vN(t,e,n,i){t[e.key]={value:n,payloadBatch:i}}function mN(t,e,n,i){var r=n.payloadBatch,o=e.axis,a=o.model,s=e.axisPointerModel;if(e.triggerTooltip&&r.length){var l=e.coordSys.model,u=sI(l),h=t.map[u];h||(h=t.map[u]={coordSysId:l.id,coordSysIndex:l.componentIndex,coordSysType:l.type,coordSysMainType:l.mainType,dataByAxis:[]},t.list.push(h)),h.dataByAxis.push({axisDim:o.dim,axisIndex:a.componentIndex,axisType:a.type,axisId:a.id,value:i,valueLabelOpt:{precision:s.get(["label","precision"]),formatter:s.get(["label","formatter"])},seriesDataIndices:r.slice()})}}function xN(t){var e=t.axis.model,n={},i=n.axisDim=t.axis.dim;return n.axisIndex=n[i+"AxisIndex"]=e.componentIndex,n.axisName=n[i+"AxisName"]=e.name,n.axisId=n[i+"AxisId"]=e.id,n}function _N(t){return!t||null==t[0]||isNaN(t[0])||null==t[1]||isNaN(t[1])}function bN(t){uI.registerAxisPointerClass("CartesianAxisPointer",eN),t.registerComponentModel(oN),t.registerComponentView(pN),t.registerPreprocessor((function(t){if(t){(!t.axisPointer||0===t.axisPointer.length)&&(t.axisPointer={});var e=t.axisPointer.link;e&&!Y(e)&&(t.axisPointer.link=[e])}})),t.registerProcessor(t.PRIORITY.PROCESSOR.STATISTIC,(function(t,e){t.getComponent("axisPointer").coordSysAxesInfo=nI(t,e)})),t.registerAction({type:"updateAxisPointer",event:"updateAxisPointer",update:":updateAxisPointer"},gN)}var wN=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.prototype.makeElOption=function(t,e,n,i,r){var o=n.axis;"angle"===o.dim&&(this.animationThreshold=Math.PI/18);var a=o.polar,s=a.getOtherAxis(o).getExtent(),l=o.dataToCoord(e),u=i.get("type");if(u&&"none"!==u){var h=ZR(i),c=SN[u](o,a,l,s);c.style=h,t.graphicKey=c.type,t.pointer=c}var p=function(t,e,n,i,r){var o=e.axis,a=o.dataToCoord(t),s=i.getAngleAxis().getExtent()[0];s=s/180*Math.PI;var l,u,h,c=i.getRadiusAxis().getExtent();if("radius"===o.dim){var p=[1,0,0,1,0,0];we(p,p,s),be(p,p,[i.cx,i.cy]),l=Eh([a,-r],p);var d=e.getModel("axisLabel").get("rotate")||0,f=KM.innerTextLayout(s,d*Math.PI/180,-1);u=f.textAlign,h=f.textVerticalAlign}else{var g=c[1];l=i.coordToPoint([g+r,a]);var y=i.cx,v=i.cy;u=Math.abs(l[0]-y)/g<.3?"center":l[0]>y?"left":"right",h=Math.abs(l[1]-v)/g<.3?"middle":l[1]>v?"top":"bottom"}return{position:l,align:u,verticalAlign:h}}(e,n,0,a,i.get(["label","margin"]));jR(t,n,i,r,p)},e}(GR);var SN={line:function(t,e,n,i){return"angle"===t.dim?{type:"Line",shape:JR(e.coordToPoint([i[0],n]),e.coordToPoint([i[1],n]))}:{type:"Circle",shape:{cx:e.cx,cy:e.cy,r:n}}},shadow:function(t,e,n,i){var r=Math.max(1,t.getBandWidth()),o=Math.PI/180;return"angle"===t.dim?{type:"Sector",shape:tN(e.cx,e.cy,i[0],i[1],(-n-r/2)*o,(r/2-n)*o)}:{type:"Sector",shape:tN(e.cx,e.cy,n-r/2,n+r/2,0,2*Math.PI)}}},MN=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.findAxisModel=function(t){var e;return this.ecModel.eachComponent(t,(function(t){t.getCoordSysModel()===this&&(e=t)}),this),e},e.type="polar",e.dependencies=["radiusAxis","angleAxis"],e.defaultOption={z:0,center:["50%","50%"],radius:"80%"},e}(Op),IN=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.prototype.getCoordSysModel=function(){return this.getReferringComponents("polar",Eo).models[0]},e.type="polarAxis",e}(Op);R(IN,m_);var TN=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.type="angleAxis",e}(IN),CN=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.type="radiusAxis",e}(IN),DN=function(t){function e(e,n){return t.call(this,"radius",e,n)||this}return n(e,t),e.prototype.pointToData=function(t,e){return this.polar.pointToData(t,e)["radius"===this.dim?0:1]},e}(q_);DN.prototype.dataToRadius=q_.prototype.dataToCoord,DN.prototype.radiusToData=q_.prototype.coordToData;var AN=Po(),kN=function(t){function e(e,n){return t.call(this,"angle",e,n||[0,360])||this}return n(e,t),e.prototype.pointToData=function(t,e){return this.polar.pointToData(t,e)["radius"===this.dim?0:1]},e.prototype.calculateCategoryInterval=function(){var t=this,e=t.getLabelModel(),n=t.scale,i=n.getExtent(),r=n.count();if(i[1]-i[0]<1)return 0;var o=i[0],a=t.dataToCoord(o+1)-t.dataToCoord(o),s=Math.abs(a),l=_r(null==o?"":o+"",e.getFont(),"center","top"),u=Math.max(l.height,7)/s;isNaN(u)&&(u=1/0);var h=Math.max(0,Math.floor(u)),c=AN(t.model),p=c.lastAutoInterval,d=c.lastTickCount;return null!=p&&null!=d&&Math.abs(p-h)<=1&&Math.abs(d-r)<=1&&p>h?h=p:(c.lastTickCount=r,c.lastAutoInterval=h),h},e}(q_);kN.prototype.dataToAngle=q_.prototype.dataToCoord,kN.prototype.angleToData=q_.prototype.coordToData;var LN=["radius","angle"],PN=function(){function t(t){this.dimensions=LN,this.type="polar",this.cx=0,this.cy=0,this._radiusAxis=new DN,this._angleAxis=new kN,this.axisPointerEnabled=!0,this.name=t||"",this._radiusAxis.polar=this._angleAxis.polar=this}return t.prototype.containPoint=function(t){var e=this.pointToCoord(t);return this._radiusAxis.contain(e[0])&&this._angleAxis.contain(e[1])},t.prototype.containData=function(t){return this._radiusAxis.containData(t[0])&&this._angleAxis.containData(t[1])},t.prototype.getAxis=function(t){return this["_"+t+"Axis"]},t.prototype.getAxes=function(){return[this._radiusAxis,this._angleAxis]},t.prototype.getAxesByScale=function(t){var e=[],n=this._angleAxis,i=this._radiusAxis;return n.scale.type===t&&e.push(n),i.scale.type===t&&e.push(i),e},t.prototype.getAngleAxis=function(){return this._angleAxis},t.prototype.getRadiusAxis=function(){return this._radiusAxis},t.prototype.getOtherAxis=function(t){var e=this._angleAxis;return t===e?this._radiusAxis:e},t.prototype.getBaseAxis=function(){return this.getAxesByScale("ordinal")[0]||this.getAxesByScale("time")[0]||this.getAngleAxis()},t.prototype.getTooltipAxes=function(t){var e=null!=t&&"auto"!==t?this.getAxis(t):this.getBaseAxis();return{baseAxes:[e],otherAxes:[this.getOtherAxis(e)]}},t.prototype.dataToPoint=function(t,e){return this.coordToPoint([this._radiusAxis.dataToRadius(t[0],e),this._angleAxis.dataToAngle(t[1],e)])},t.prototype.pointToData=function(t,e){var n=this.pointToCoord(t);return[this._radiusAxis.radiusToData(n[0],e),this._angleAxis.angleToData(n[1],e)]},t.prototype.pointToCoord=function(t){var e=t[0]-this.cx,n=t[1]-this.cy,i=this.getAngleAxis(),r=i.getExtent(),o=Math.min(r[0],r[1]),a=Math.max(r[0],r[1]);i.inverse?o=a-360:a=o+360;var s=Math.sqrt(e*e+n*n);e/=s,n/=s;for(var l=Math.atan2(-n,e)/Math.PI*180,u=l<o?1:-1;l<o||l>a;)l+=360*u;return[s,l]},t.prototype.coordToPoint=function(t){var e=t[0],n=t[1]/180*Math.PI;return[Math.cos(n)*e+this.cx,-Math.sin(n)*e+this.cy]},t.prototype.getArea=function(){var t=this.getAngleAxis(),e=this.getRadiusAxis().getExtent().slice();e[0]>e[1]&&e.reverse();var n=t.getExtent(),i=Math.PI/180;return{cx:this.cx,cy:this.cy,r0:e[0],r:e[1],startAngle:-n[0]*i,endAngle:-n[1]*i,clockwise:t.inverse,contain:function(t,e){var n=t-this.cx,i=e-this.cy,r=n*n+i*i-1e-4,o=this.r,a=this.r0;return r<=o*o&&r>=a*a}}},t.prototype.convertToPixel=function(t,e,n){return ON(e)===this?this.dataToPoint(n):null},t.prototype.convertFromPixel=function(t,e,n){return ON(e)===this?this.pointToData(n):null},t}();function ON(t){var e=t.seriesModel,n=t.polarModel;return n&&n.coordinateSystem||e&&e.coordinateSystem}function RN(t,e){var n=this,i=n.getAngleAxis(),r=n.getRadiusAxis();if(i.scale.setExtent(1/0,-1/0),r.scale.setExtent(1/0,-1/0),t.eachSeries((function(t){if(t.coordinateSystem===n){var e=t.getData();E(v_(e,"radius"),(function(t){r.scale.unionExtentFromData(e,t)})),E(v_(e,"angle"),(function(t){i.scale.unionExtentFromData(e,t)}))}})),h_(i.scale,i.model),h_(r.scale,r.model),"category"===i.type&&!i.onBand){var o=i.getExtent(),a=360/i.scale.count();i.inverse?o[1]+=a:o[1]-=a,i.setExtent(o[0],o[1])}}function NN(t,e){if(t.type=e.get("type"),t.scale=c_(e),t.onBand=e.get("boundaryGap")&&"category"===t.type,t.inverse=e.get("inverse"),function(t){return"angleAxis"===t.mainType}(e)){t.inverse=t.inverse!==e.get("clockwise");var n=e.get("startAngle");t.setExtent(n,n+(t.inverse?-360:360))}e.axis=t,t.model=e}var EN={dimensions:LN,create:function(t,e){var n=[];return t.eachComponent("polar",(function(t,i){var r=new PN(i+"");r.update=RN;var o=r.getRadiusAxis(),a=r.getAngleAxis(),s=t.findAxisModel("radiusAxis"),l=t.findAxisModel("angleAxis");NN(o,s),NN(a,l),function(t,e,n){var i=e.get("center"),r=n.getWidth(),o=n.getHeight();t.cx=Ur(i[0],r),t.cy=Ur(i[1],o);var a=t.getRadiusAxis(),s=Math.min(r,o)/2,l=e.get("radius");null==l?l=[0,"100%"]:Y(l)||(l=[0,l]);var u=[Ur(l[0],s),Ur(l[1],s)];a.inverse?a.setExtent(u[1],u[0]):a.setExtent(u[0],u[1])}(r,t,e),n.push(r),t.coordinateSystem=r,r.model=t})),t.eachSeries((function(t){if("polar"===t.get("coordinateSystem")){var e=t.getReferringComponents("polar",Eo).models[0];0,t.coordinateSystem=e.coordinateSystem}})),n}},zN=["axisLine","axisLabel","axisTick","minorTick","splitLine","minorSplitLine","splitArea"];function VN(t,e,n){e[1]>e[0]&&(e=e.slice().reverse());var i=t.coordToPoint([e[0],n]),r=t.coordToPoint([e[1],n]);return{x1:i[0],y1:i[1],x2:r[0],y2:r[1]}}function BN(t){return t.getRadiusAxis().inverse?0:1}function FN(t){var e=t[0],n=t[t.length-1];e&&n&&Math.abs(Math.abs(e.coord-n.coord)-360)<1e-4&&t.pop()}var GN=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.axisPointerClass="PolarAxisPointer",n}return n(e,t),e.prototype.render=function(t,e){if(this.group.removeAll(),t.get("show")){var n=t.axis,i=n.polar,r=i.getRadiusAxis().getExtent(),o=n.getTicksCoords(),a=n.getMinorTicksCoords(),s=z(n.getViewLabels(),(function(t){t=T(t);var e=n.scale,i="ordinal"===e.type?e.getRawOrdinalNumber(t.tickValue):t.tickValue;return t.coord=n.dataToCoord(i),t}));FN(s),FN(o),E(zN,(function(e){!t.get([e,"show"])||n.scale.isBlank()&&"axisLine"!==e||WN[e](this.group,t,i,o,a,r,s)}),this)}},e.type="angleAxis",e}(uI),WN={axisLine:function(t,e,n,i,r,o){var a,s=e.getModel(["axisLine","lineStyle"]),l=BN(n),u=l?0:1;(a=0===o[u]?new xu({shape:{cx:n.cx,cy:n.cy,r:o[l]},style:s.getLineStyle(),z2:1,silent:!0}):new Vu({shape:{cx:n.cx,cy:n.cy,r:o[l],r0:o[u]},style:s.getLineStyle(),z2:1,silent:!0})).style.fill=null,t.add(a)},axisTick:function(t,e,n,i,r,o){var a=e.getModel("axisTick"),s=(a.get("inside")?-1:1)*a.get("length"),l=o[BN(n)],u=z(i,(function(t){return new Xu({shape:VN(n,[l,l+s],t.coord)})}));t.add(Lh(u,{style:k(a.getModel("lineStyle").getLineStyle(),{stroke:e.get(["axisLine","lineStyle","color"])})}))},minorTick:function(t,e,n,i,r,o){if(r.length){for(var a=e.getModel("axisTick"),s=e.getModel("minorTick"),l=(a.get("inside")?-1:1)*s.get("length"),u=o[BN(n)],h=[],c=0;c<r.length;c++)for(var p=0;p<r[c].length;p++)h.push(new Xu({shape:VN(n,[u,u+l],r[c][p].coord)}));t.add(Lh(h,{style:k(s.getModel("lineStyle").getLineStyle(),k(a.getLineStyle(),{stroke:e.get(["axisLine","lineStyle","color"])}))}))}},axisLabel:function(t,e,n,i,r,o,a){var s=e.getCategories(!0),l=e.getModel("axisLabel"),u=l.get("margin"),h=e.get("triggerEvent");E(a,(function(i,r){var a=l,c=i.tickValue,p=o[BN(n)],d=n.coordToPoint([p+u,i.coord]),f=n.cx,g=n.cy,y=Math.abs(d[0]-f)/p<.3?"center":d[0]>f?"left":"right",v=Math.abs(d[1]-g)/p<.3?"middle":d[1]>g?"top":"bottom";if(s&&s[c]){var m=s[c];q(m)&&m.textStyle&&(a=new Sc(m.textStyle,l,l.ecModel))}var x=new Bs({silent:KM.isLabelSilent(e),style:ec(a,{x:d[0],y:d[1],fill:a.getTextColor()||e.get(["axisLine","lineStyle","color"]),text:i.formattedLabel,align:y,verticalAlign:v})});if(t.add(x),h){var _=KM.makeAxisEventDataBase(e);_.targetType="axisLabel",_.value=i.rawLabel,Js(x).eventData=_}}),this)},splitLine:function(t,e,n,i,r,o){var a=e.getModel("splitLine").getModel("lineStyle"),s=a.get("color"),l=0;s=s instanceof Array?s:[s];for(var u=[],h=0;h<i.length;h++){var c=l++%s.length;u[c]=u[c]||[],u[c].push(new Xu({shape:VN(n,o,i[h].coord)}))}for(h=0;h<u.length;h++)t.add(Lh(u[h],{style:k({stroke:s[h%s.length]},a.getLineStyle()),silent:!0,z:e.get("z")}))},minorSplitLine:function(t,e,n,i,r,o){if(r.length){for(var a=e.getModel("minorSplitLine").getModel("lineStyle"),s=[],l=0;l<r.length;l++)for(var u=0;u<r[l].length;u++)s.push(new Xu({shape:VN(n,o,r[l][u].coord)}));t.add(Lh(s,{style:a.getLineStyle(),silent:!0,z:e.get("z")}))}},splitArea:function(t,e,n,i,r,o){if(i.length){var a=e.getModel("splitArea").getModel("areaStyle"),s=a.get("color"),l=0;s=s instanceof Array?s:[s];for(var u=[],h=Math.PI/180,c=-i[0].coord*h,p=Math.min(o[0],o[1]),d=Math.max(o[0],o[1]),f=e.get("clockwise"),g=1,y=i.length;g<=y;g++){var v=g===y?i[0].coord:i[g].coord,m=l++%s.length;u[m]=u[m]||[],u[m].push(new Eu({shape:{cx:n.cx,cy:n.cy,r0:p,r:d,startAngle:c,endAngle:-v*h,clockwise:f},silent:!0})),c=-v*h}for(g=0;g<u.length;g++)t.add(Lh(u[g],{style:k({fill:s[g%s.length]},a.getAreaStyle()),silent:!0}))}}},HN=["axisLine","axisTickLabel","axisName"],YN=["splitLine","splitArea","minorSplitLine"],UN=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.axisPointerClass="PolarAxisPointer",n}return n(e,t),e.prototype.render=function(t,e){if(this.group.removeAll(),t.get("show")){var n=this._axisGroup,i=this._axisGroup=new Er;this.group.add(i);var r=t.axis,o=r.polar,a=o.getAngleAxis(),s=r.getTicksCoords(),l=r.getMinorTicksCoords(),u=a.getExtent()[0],h=r.getExtent(),c=function(t,e,n){return{position:[t.cx,t.cy],rotation:n/180*Math.PI,labelDirection:-1,tickDirection:-1,nameDirection:1,labelRotate:e.getModel("axisLabel").get("rotate"),z2:1}}(o,t,u),p=new KM(t,c);E(HN,p.add,p),i.add(p.getGroup()),Bh(n,i,t),E(YN,(function(e){t.get([e,"show"])&&!r.scale.isBlank()&&XN[e](this.group,t,o,u,h,s,l)}),this)}},e.type="radiusAxis",e}(uI),XN={splitLine:function(t,e,n,i,r,o){var a=e.getModel("splitLine").getModel("lineStyle"),s=a.get("color"),l=0;s=s instanceof Array?s:[s];for(var u=[],h=0;h<o.length;h++){var c=l++%s.length;u[c]=u[c]||[],u[c].push(new xu({shape:{cx:n.cx,cy:n.cy,r:Math.max(o[h].coord,0)}}))}for(h=0;h<u.length;h++)t.add(Lh(u[h],{style:k({stroke:s[h%s.length],fill:null},a.getLineStyle()),silent:!0}))},minorSplitLine:function(t,e,n,i,r,o,a){if(a.length){for(var s=e.getModel("minorSplitLine").getModel("lineStyle"),l=[],u=0;u<a.length;u++)for(var h=0;h<a[u].length;h++)l.push(new xu({shape:{cx:n.cx,cy:n.cy,r:a[u][h].coord}}));t.add(Lh(l,{style:k({fill:null},s.getLineStyle()),silent:!0}))}},splitArea:function(t,e,n,i,r,o){if(o.length){var a=e.getModel("splitArea").getModel("areaStyle"),s=a.get("color"),l=0;s=s instanceof Array?s:[s];for(var u=[],h=o[0].coord,c=1;c<o.length;c++){var p=l++%s.length;u[p]=u[p]||[],u[p].push(new Eu({shape:{cx:n.cx,cy:n.cy,r0:h,r:o[c].coord,startAngle:0,endAngle:2*Math.PI},silent:!0})),h=o[c].coord}for(c=0;c<u.length;c++)t.add(Lh(u[c],{style:k({fill:s[c%s.length]},a.getAreaStyle()),silent:!0}))}}};function ZN(t){return t.get("stack")||"__ec_stack_"+t.seriesIndex}function jN(t,e){return e.dim+t.model.componentIndex}function qN(t,e,n){var i={},r=function(t){var e={};E(t,(function(t,n){var i=t.getData(),r=t.coordinateSystem,o=r.getBaseAxis(),a=jN(r,o),s=o.getExtent(),l="category"===o.type?o.getBandWidth():Math.abs(s[1]-s[0])/i.count(),u=e[a]||{bandWidth:l,remainedWidth:l,autoWidthCount:0,categoryGap:"20%",gap:"30%",stacks:{}},h=u.stacks;e[a]=u;var c=ZN(t);h[c]||u.autoWidthCount++,h[c]=h[c]||{width:0,maxWidth:0};var p=Ur(t.get("barWidth"),l),d=Ur(t.get("barMaxWidth"),l),f=t.get("barGap"),g=t.get("barCategoryGap");p&&!h[c].width&&(p=Math.min(u.remainedWidth,p),h[c].width=p,u.remainedWidth-=p),d&&(h[c].maxWidth=d),null!=f&&(u.gap=f),null!=g&&(u.categoryGap=g)}));var n={};return E(e,(function(t,e){n[e]={};var i=t.stacks,r=t.bandWidth,o=Ur(t.categoryGap,r),a=Ur(t.gap,1),s=t.remainedWidth,l=t.autoWidthCount,u=(s-o)/(l+(l-1)*a);u=Math.max(u,0),E(i,(function(t,e){var n=t.maxWidth;n&&n<u&&(n=Math.min(n,s),t.width&&(n=Math.min(n,t.width)),s-=n,t.width=n,l--)})),u=(s-o)/(l+(l-1)*a),u=Math.max(u,0);var h,c=0;E(i,(function(t,e){t.width||(t.width=u),h=t,c+=t.width*(1+a)})),h&&(c-=h.width*a);var p=-c/2;E(i,(function(t,i){n[e][i]=n[e][i]||{offset:p,width:t.width},p+=t.width*(1+a)}))})),n}(B(e.getSeriesByType(t),(function(t){return!e.isSeriesFiltered(t)&&t.coordinateSystem&&"polar"===t.coordinateSystem.type})));e.eachSeriesByType(t,(function(t){if("polar"===t.coordinateSystem.type){var e=t.getData(),n=t.coordinateSystem,o=n.getBaseAxis(),a=jN(n,o),s=ZN(t),l=r[a][s],u=l.offset,h=l.width,c=n.getOtherAxis(o),p=t.coordinateSystem.cx,d=t.coordinateSystem.cy,f=t.get("barMinHeight")||0,g=t.get("barMinAngle")||0;i[s]=i[s]||[];for(var y=e.mapDimension(c.dim),v=e.mapDimension(o.dim),m=lx(e,y),x="radius"!==o.dim||!t.get("roundCap",!0),_=c.dataToCoord(0),b=0,w=e.count();b<w;b++){var S=e.get(y,b),M=e.get(v,b),I=S>=0?"p":"n",T=_;m&&(i[s][M]||(i[s][M]={p:_,n:_}),T=i[s][M][I]);var C=void 0,D=void 0,A=void 0,k=void 0;if("radius"===c.dim){var L=c.dataToCoord(S)-_,P=o.dataToCoord(M);Math.abs(L)<f&&(L=(L<0?-1:1)*f),C=T,D=T+L,k=(A=P-u)-h,m&&(i[s][M][I]=D)}else{var O=c.dataToCoord(S,x)-_,R=o.dataToCoord(M);Math.abs(O)<g&&(O=(O<0?-1:1)*g),D=(C=R+u)+h,A=T,k=T+O,m&&(i[s][M][I]=k)}e.setItemLayout(b,{cx:p,cy:d,r0:C,r:D,startAngle:-A*Math.PI/180,endAngle:-k*Math.PI/180,clockwise:A>=k})}}}))}var KN={startAngle:90,clockwise:!0,splitNumber:12,axisLabel:{rotate:0}},$N={splitNumber:5},JN=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.type="polar",e}(wg);function QN(t,e){e=e||{};var n=t.coordinateSystem,i=t.axis,r={},o=i.position,a=i.orient,s=n.getRect(),l=[s.x,s.x+s.width,s.y,s.y+s.height],u={horizontal:{top:l[2],bottom:l[3]},vertical:{left:l[0],right:l[1]}};r.position=["vertical"===a?u.vertical[o]:l[0],"horizontal"===a?u.horizontal[o]:l[3]];r.rotation=Math.PI/2*{horizontal:0,vertical:1}[a];r.labelDirection=r.tickDirection=r.nameDirection={top:-1,bottom:1,right:1,left:-1}[o],t.get(["axisTick","inside"])&&(r.tickDirection=-r.tickDirection),it(e.labelInside,t.get(["axisLabel","inside"]))&&(r.labelDirection=-r.labelDirection);var h=e.rotate;return null==h&&(h=t.get(["axisLabel","rotate"])),r.labelRotation="top"===o?-h:h,r.z2=1,r}var tE=["axisLine","axisTickLabel","axisName"],eE=["splitArea","splitLine"],nE=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.axisPointerClass="SingleAxisPointer",n}return n(e,t),e.prototype.render=function(e,n,i,r){var o=this.group;o.removeAll();var a=this._axisGroup;this._axisGroup=new Er;var s=QN(e),l=new KM(e,s);E(tE,l.add,l),o.add(this._axisGroup),o.add(l.getGroup()),E(eE,(function(t){e.get([t,"show"])&&iE[t](this,this.group,this._axisGroup,e)}),this),Bh(a,this._axisGroup,e),t.prototype.render.call(this,e,n,i,r)},e.prototype.remove=function(){pI(this)},e.type="singleAxis",e}(uI),iE={splitLine:function(t,e,n,i){var r=i.axis;if(!r.scale.isBlank()){var o=i.getModel("splitLine"),a=o.getModel("lineStyle"),s=a.get("color");s=s instanceof Array?s:[s];for(var l=a.get("width"),u=i.coordinateSystem.getRect(),h=r.isHorizontal(),c=[],p=0,d=r.getTicksCoords({tickModel:o}),f=[],g=[],y=0;y<d.length;++y){var v=r.toGlobalCoord(d[y].coord);h?(f[0]=v,f[1]=u.y,g[0]=v,g[1]=u.y+u.height):(f[0]=u.x,f[1]=v,g[0]=u.x+u.width,g[1]=v);var m=new Xu({shape:{x1:f[0],y1:f[1],x2:g[0],y2:g[1]},silent:!0});Oh(m.shape,l);var x=p++%s.length;c[x]=c[x]||[],c[x].push(m)}var _=a.getLineStyle(["color"]);for(y=0;y<c.length;++y)e.add(Lh(c[y],{style:k({stroke:s[y%s.length]},_),silent:!0}))}},splitArea:function(t,e,n,i){cI(t,n,i,i)}},rE=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.getCoordSysModel=function(){return this},e.type="singleAxis",e.layoutMode="box",e.defaultOption={left:"5%",top:"5%",right:"5%",bottom:"5%",type:"value",position:"bottom",orient:"horizontal",axisLine:{show:!0,lineStyle:{width:1,type:"solid"}},tooltip:{show:!0},axisTick:{show:!0,length:6,lineStyle:{width:1}},axisLabel:{show:!0,interval:"auto"},splitLine:{show:!0,lineStyle:{type:"dashed",opacity:.2}}},e}(Op);R(rE,m_.prototype);var oE=function(t){function e(e,n,i,r,o){var a=t.call(this,e,n,i)||this;return a.type=r||"value",a.position=o||"bottom",a}return n(e,t),e.prototype.isHorizontal=function(){var t=this.position;return"top"===t||"bottom"===t},e.prototype.pointToData=function(t,e){return this.coordinateSystem.pointToData(t)[0]},e}(q_),aE=["single"],sE=function(){function t(t,e,n){this.type="single",this.dimension="single",this.dimensions=aE,this.axisPointerEnabled=!0,this.model=t,this._init(t,e,n)}return t.prototype._init=function(t,e,n){var i=this.dimension,r=new oE(i,c_(t),[0,0],t.get("type"),t.get("position")),o="category"===r.type;r.onBand=o&&t.get("boundaryGap"),r.inverse=t.get("inverse"),r.orient=t.get("orient"),t.axis=r,r.model=t,r.coordinateSystem=this,this._axis=r},t.prototype.update=function(t,e){t.eachSeries((function(t){if(t.coordinateSystem===this){var e=t.getData();E(e.mapDimensionsAll(this.dimension),(function(t){this._axis.scale.unionExtentFromData(e,t)}),this),h_(this._axis.scale,this._axis.model)}}),this)},t.prototype.resize=function(t,e){this._rect=Tp({left:t.get("left"),top:t.get("top"),right:t.get("right"),bottom:t.get("bottom"),width:t.get("width"),height:t.get("height")},{width:e.getWidth(),height:e.getHeight()}),this._adjustAxis()},t.prototype.getRect=function(){return this._rect},t.prototype._adjustAxis=function(){var t=this._rect,e=this._axis,n=e.isHorizontal(),i=n?[0,t.width]:[0,t.height],r=e.inverse?1:0;e.setExtent(i[r],i[1-r]),this._updateAxisTransform(e,n?t.x:t.y)},t.prototype._updateAxisTransform=function(t,e){var n=t.getExtent(),i=n[0]+n[1],r=t.isHorizontal();t.toGlobalCoord=r?function(t){return t+e}:function(t){return i-t+e},t.toLocalCoord=r?function(t){return t-e}:function(t){return i-t+e}},t.prototype.getAxis=function(){return this._axis},t.prototype.getBaseAxis=function(){return this._axis},t.prototype.getAxes=function(){return[this._axis]},t.prototype.getTooltipAxes=function(){return{baseAxes:[this.getAxis()],otherAxes:[]}},t.prototype.containPoint=function(t){var e=this.getRect(),n=this.getAxis();return"horizontal"===n.orient?n.contain(n.toLocalCoord(t[0]))&&t[1]>=e.y&&t[1]<=e.y+e.height:n.contain(n.toLocalCoord(t[1]))&&t[0]>=e.y&&t[0]<=e.y+e.height},t.prototype.pointToData=function(t){var e=this.getAxis();return[e.coordToData(e.toLocalCoord(t["horizontal"===e.orient?0:1]))]},t.prototype.dataToPoint=function(t){var e=this.getAxis(),n=this.getRect(),i=[],r="horizontal"===e.orient?0:1;return t instanceof Array&&(t=t[0]),i[r]=e.toGlobalCoord(e.dataToCoord(+t)),i[1-r]=0===r?n.y+n.height/2:n.x+n.width/2,i},t.prototype.convertToPixel=function(t,e,n){return lE(e)===this?this.dataToPoint(n):null},t.prototype.convertFromPixel=function(t,e,n){return lE(e)===this?this.pointToData(n):null},t}();function lE(t){var e=t.seriesModel,n=t.singleAxisModel;return n&&n.coordinateSystem||e&&e.coordinateSystem}var uE={create:function(t,e){var n=[];return t.eachComponent("singleAxis",(function(i,r){var o=new sE(i,t,e);o.name="single_"+r,o.resize(i,e),i.coordinateSystem=o,n.push(o)})),t.eachSeries((function(t){if("singleAxis"===t.get("coordinateSystem")){var e=t.getReferringComponents("singleAxis",Eo).models[0];t.coordinateSystem=e&&e.coordinateSystem}})),n},dimensions:aE},hE=["x","y"],cE=["width","height"],pE=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.prototype.makeElOption=function(t,e,n,i,r){var o=n.axis,a=o.coordinateSystem,s=gE(a,1-fE(o)),l=a.dataToPoint(e)[0],u=i.get("type");if(u&&"none"!==u){var h=ZR(i),c=dE[u](o,l,s);c.style=h,t.graphicKey=c.type,t.pointer=c}$R(e,t,QN(n),n,i,r)},e.prototype.getHandleTransform=function(t,e,n){var i=QN(e,{labelInside:!1});i.labelMargin=n.get(["handle","margin"]);var r=KR(e.axis,t,i);return{x:r[0],y:r[1],rotation:i.rotation+(i.labelDirection<0?Math.PI:0)}},e.prototype.updateHandleTransform=function(t,e,n,i){var r=n.axis,o=r.coordinateSystem,a=fE(r),s=gE(o,a),l=[t.x,t.y];l[a]+=e[a],l[a]=Math.min(s[1],l[a]),l[a]=Math.max(s[0],l[a]);var u=gE(o,1-a),h=(u[1]+u[0])/2,c=[h,h];return c[a]=l[a],{x:l[0],y:l[1],rotation:t.rotation,cursorPoint:c,tooltipOption:{verticalAlign:"middle"}}},e}(GR),dE={line:function(t,e,n){return{type:"Line",subPixelOptimize:!0,shape:JR([e,n[0]],[e,n[1]],fE(t))}},shadow:function(t,e,n){var i=t.getBandWidth(),r=n[1]-n[0];return{type:"Rect",shape:QR([e-i/2,n[0]],[i,r],fE(t))}}};function fE(t){return t.isHorizontal()?0:1}function gE(t,e){var n=t.getRect();return[n[hE[e]],n[hE[e]]+n[cE[e]]]}var yE=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.type="single",e}(wg);var vE=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.init=function(e,n,i){var r=kp(e);t.prototype.init.apply(this,arguments),mE(e,r)},e.prototype.mergeOption=function(e){t.prototype.mergeOption.apply(this,arguments),mE(this.option,e)},e.prototype.getCellSize=function(){return this.option.cellSize},e.type="calendar",e.defaultOption={z:2,left:80,top:60,cellSize:20,orient:"horizontal",splitLine:{show:!0,lineStyle:{color:"#000",width:1,type:"solid"}},itemStyle:{color:"#fff",borderWidth:1,borderColor:"#ccc"},dayLabel:{show:!0,firstDay:0,position:"start",margin:"50%",color:"#000"},monthLabel:{show:!0,position:"start",margin:5,align:"center",formatter:null,color:"#000"},yearLabel:{show:!0,position:null,margin:30,formatter:null,color:"#ccc",fontFamily:"sans-serif",fontWeight:"bolder",fontSize:20}},e}(Op);function mE(t,e){var n,i=t.cellSize;1===(n=Y(i)?i:t.cellSize=[i,i]).length&&(n[1]=n[0]);var r=z([0,1],(function(t){return function(t,e){return null!=t[Sp[e][0]]||null!=t[Sp[e][1]]&&null!=t[Sp[e][2]]}(e,t)&&(n[t]="auto"),null!=n[t]&&"auto"!==n[t]}));Ap(t,e,{type:"box",ignoreSize:r})}var xE=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.render=function(t,e,n){var i=this.group;i.removeAll();var r=t.coordinateSystem,o=r.getRangeInfo(),a=r.getOrient(),s=e.getLocaleModel();this._renderDayRect(t,o,i),this._renderLines(t,o,a,i),this._renderYearText(t,o,a,i),this._renderMonthText(t,s,a,i),this._renderWeekText(t,s,o,a,i)},e.prototype._renderDayRect=function(t,e,n){for(var i=t.coordinateSystem,r=t.getModel("itemStyle").getItemStyle(),o=i.getCellWidth(),a=i.getCellHeight(),s=e.start.time;s<=e.end.time;s=i.getNextNDay(s,1).time){var l=i.dataToRect([s],!1).tl,u=new Es({shape:{x:l[0],y:l[1],width:o,height:a},cursor:"default",style:r});n.add(u)}},e.prototype._renderLines=function(t,e,n,i){var r=this,o=t.coordinateSystem,a=t.getModel(["splitLine","lineStyle"]).getLineStyle(),s=t.get(["splitLine","show"]),l=a.lineWidth;this._tlpoints=[],this._blpoints=[],this._firstDayOfMonth=[],this._firstDayPoints=[];for(var u=e.start,h=0;u.time<=e.end.time;h++){p(u.formatedDate),0===h&&(u=o.getDateInfo(e.start.y+"-"+e.start.m));var c=u.date;c.setMonth(c.getMonth()+1),u=o.getDateInfo(c)}function p(e){r._firstDayOfMonth.push(o.getDateInfo(e)),r._firstDayPoints.push(o.dataToRect([e],!1).tl);var l=r._getLinePointsOfOneWeek(t,e,n);r._tlpoints.push(l[0]),r._blpoints.push(l[l.length-1]),s&&r._drawSplitline(l,a,i)}p(o.getNextNDay(e.end.time,1).formatedDate),s&&this._drawSplitline(r._getEdgesPoints(r._tlpoints,l,n),a,i),s&&this._drawSplitline(r._getEdgesPoints(r._blpoints,l,n),a,i)},e.prototype._getEdgesPoints=function(t,e,n){var i=[t[0].slice(),t[t.length-1].slice()],r="horizontal"===n?0:1;return i[0][r]=i[0][r]-e/2,i[1][r]=i[1][r]+e/2,i},e.prototype._drawSplitline=function(t,e,n){var i=new Hu({z2:20,shape:{points:t},style:e});n.add(i)},e.prototype._getLinePointsOfOneWeek=function(t,e,n){for(var i=t.coordinateSystem,r=i.getDateInfo(e),o=[],a=0;a<7;a++){var s=i.getNextNDay(r.time,a),l=i.dataToRect([s.time],!1);o[2*s.day]=l.tl,o[2*s.day+1]=l["horizontal"===n?"bl":"tr"]}return o},e.prototype._formatterLabel=function(t,e){return X(t)&&t?(n=t,E(e,(function(t,e){n=n.replace("{"+e+"}",i?ie(t):t)})),n):U(t)?t(e):e.nameMap;var n,i},e.prototype._yearTextPositionControl=function(t,e,n,i,r){var o=e[0],a=e[1],s=["center","bottom"];"bottom"===i?(a+=r,s=["center","top"]):"left"===i?o-=r:"right"===i?(o+=r,s=["center","top"]):a-=r;var l=0;return"left"!==i&&"right"!==i||(l=Math.PI/2),{rotation:l,x:o,y:a,style:{align:s[0],verticalAlign:s[1]}}},e.prototype._renderYearText=function(t,e,n,i){var r=t.getModel("yearLabel");if(r.get("show")){var o=r.get("margin"),a=r.get("position");a||(a="horizontal"!==n?"top":"left");var s=[this._tlpoints[this._tlpoints.length-1],this._blpoints[0]],l=(s[0][0]+s[1][0])/2,u=(s[0][1]+s[1][1])/2,h="horizontal"===n?0:1,c={top:[l,s[h][1]],bottom:[l,s[1-h][1]],left:[s[1-h][0],u],right:[s[h][0],u]},p=e.start.y;+e.end.y>+e.start.y&&(p=p+"-"+e.end.y);var d=r.get("formatter"),f={start:e.start.y,end:e.end.y,nameMap:p},g=this._formatterLabel(d,f),y=new Bs({z2:30,style:ec(r,{text:g})});y.attr(this._yearTextPositionControl(y,c[a],n,a,o)),i.add(y)}},e.prototype._monthTextPositionControl=function(t,e,n,i,r){var o="left",a="top",s=t[0],l=t[1];return"horizontal"===n?(l+=r,e&&(o="center"),"start"===i&&(a="bottom")):(s+=r,e&&(a="middle"),"start"===i&&(o="right")),{x:s,y:l,align:o,verticalAlign:a}},e.prototype._renderMonthText=function(t,e,n,i){var r=t.getModel("monthLabel");if(r.get("show")){var o=r.get("nameMap"),a=r.get("margin"),s=r.get("position"),l=r.get("align"),u=[this._tlpoints,this._blpoints];o&&!X(o)||(o&&(e=Rc(o)||e),o=e.get(["time","monthAbbr"])||[]);var h="start"===s?0:1,c="horizontal"===n?0:1;a="start"===s?-a:a;for(var p="center"===l,d=0;d<u[h].length-1;d++){var f=u[h][d].slice(),g=this._firstDayOfMonth[d];if(p){var y=this._firstDayPoints[d];f[c]=(y[c]+u[0][d+1][c])/2}var v=r.get("formatter"),m=o[+g.m-1],x={yyyy:g.y,yy:(g.y+"").slice(2),MM:g.m,M:+g.m,nameMap:m},_=this._formatterLabel(v,x),b=new Bs({z2:30,style:A(ec(r,{text:_}),this._monthTextPositionControl(f,p,n,s,a))});i.add(b)}}},e.prototype._weekTextPositionControl=function(t,e,n,i,r){var o="center",a="middle",s=t[0],l=t[1],u="start"===n;return"horizontal"===e?(s=s+i+(u?1:-1)*r[0]/2,o=u?"right":"left"):(l=l+i+(u?1:-1)*r[1]/2,a=u?"bottom":"top"),{x:s,y:l,align:o,verticalAlign:a}},e.prototype._renderWeekText=function(t,e,n,i,r){var o=t.getModel("dayLabel");if(o.get("show")){var a=t.coordinateSystem,s=o.get("position"),l=o.get("nameMap"),u=o.get("margin"),h=a.getFirstDayOfWeek();if(!l||X(l))l&&(e=Rc(l)||e),l=e.get(["time","dayOfWeekShort"])||z(e.get(["time","dayOfWeekAbbr"]),(function(t){return t[0]}));var c=a.getNextNDay(n.end.time,7-n.lweek).time,p=[a.getCellWidth(),a.getCellHeight()];u=Ur(u,Math.min(p[1],p[0])),"start"===s&&(c=a.getNextNDay(n.start.time,-(7+n.fweek)).time,u=-u);for(var d=0;d<7;d++){var f,g=a.getNextNDay(c,d),y=a.dataToRect([g.time],!1).center;f=Math.abs((d+h)%7);var v=new Bs({z2:30,style:A(ec(o,{text:l[f]}),this._weekTextPositionControl(y,i,s,u,p))});r.add(v)}}},e.type="calendar",e}(wg),_E=864e5,bE=function(){function t(e,n,i){this.type="calendar",this.dimensions=t.dimensions,this.getDimensionsInfo=t.getDimensionsInfo,this._model=e}return t.getDimensionsInfo=function(){return[{name:"time",type:"time"},"value"]},t.prototype.getRangeInfo=function(){return this._rangeInfo},t.prototype.getModel=function(){return this._model},t.prototype.getRect=function(){return this._rect},t.prototype.getCellWidth=function(){return this._sw},t.prototype.getCellHeight=function(){return this._sh},t.prototype.getOrient=function(){return this._orient},t.prototype.getFirstDayOfWeek=function(){return this._firstDayOfWeek},t.prototype.getDateInfo=function(t){var e=(t=io(t)).getFullYear(),n=t.getMonth()+1,i=n<10?"0"+n:""+n,r=t.getDate(),o=r<10?"0"+r:""+r,a=t.getDay();return{y:e+"",m:i,d:o,day:a=Math.abs((a+7-this.getFirstDayOfWeek())%7),time:t.getTime(),formatedDate:e+"-"+i+"-"+o,date:t}},t.prototype.getNextNDay=function(t,e){return 0===(e=e||0)||(t=new Date(this.getDateInfo(t).time)).setDate(t.getDate()+e),this.getDateInfo(t)},t.prototype.update=function(t,e){this._firstDayOfWeek=+this._model.getModel("dayLabel").get("firstDay"),this._orient=this._model.get("orient"),this._lineWidth=this._model.getModel("itemStyle").getItemStyle().lineWidth||0,this._rangeInfo=this._getRangeInfo(this._initRangeOption());var n=this._rangeInfo.weeks||1,i=["width","height"],r=this._model.getCellSize().slice(),o=this._model.getBoxLayoutParams(),a="horizontal"===this._orient?[n,7]:[7,n];E([0,1],(function(t){u(r,t)&&(o[i[t]]=r[t]*a[t])}));var s={width:e.getWidth(),height:e.getHeight()},l=this._rect=Tp(o,s);function u(t,e){return null!=t[e]&&"auto"!==t[e]}E([0,1],(function(t){u(r,t)||(r[t]=l[i[t]]/a[t])})),this._sw=r[0],this._sh=r[1]},t.prototype.dataToPoint=function(t,e){Y(t)&&(t=t[0]),null==e&&(e=!0);var n=this.getDateInfo(t),i=this._rangeInfo,r=n.formatedDate;if(e&&!(n.time>=i.start.time&&n.time<i.end.time+_E))return[NaN,NaN];var o=n.day,a=this._getRangeInfo([i.start.time,r]).nthWeek;return"vertical"===this._orient?[this._rect.x+o*this._sw+this._sw/2,this._rect.y+a*this._sh+this._sh/2]:[this._rect.x+a*this._sw+this._sw/2,this._rect.y+o*this._sh+this._sh/2]},t.prototype.pointToData=function(t){var e=this.pointToDate(t);return e&&e.time},t.prototype.dataToRect=function(t,e){var n=this.dataToPoint(t,e);return{contentShape:{x:n[0]-(this._sw-this._lineWidth)/2,y:n[1]-(this._sh-this._lineWidth)/2,width:this._sw-this._lineWidth,height:this._sh-this._lineWidth},center:n,tl:[n[0]-this._sw/2,n[1]-this._sh/2],tr:[n[0]+this._sw/2,n[1]-this._sh/2],br:[n[0]+this._sw/2,n[1]+this._sh/2],bl:[n[0]-this._sw/2,n[1]+this._sh/2]}},t.prototype.pointToDate=function(t){var e=Math.floor((t[0]-this._rect.x)/this._sw)+1,n=Math.floor((t[1]-this._rect.y)/this._sh)+1,i=this._rangeInfo.range;return"vertical"===this._orient?this._getDateByWeeksAndDay(n,e-1,i):this._getDateByWeeksAndDay(e,n-1,i)},t.prototype.convertToPixel=function(t,e,n){var i=wE(e);return i===this?i.dataToPoint(n):null},t.prototype.convertFromPixel=function(t,e,n){var i=wE(e);return i===this?i.pointToData(n):null},t.prototype.containPoint=function(t){return console.warn("Not implemented."),!1},t.prototype._initRangeOption=function(){var t,e=this._model.get("range");if(Y(e)&&1===e.length&&(e=e[0]),Y(e))t=e;else{var n=e.toString();if(/^\d{4}$/.test(n)&&(t=[n+"-01-01",n+"-12-31"]),/^\d{4}[\/|-]\d{1,2}$/.test(n)){var i=this.getDateInfo(n),r=i.date;r.setMonth(r.getMonth()+1);var o=this.getNextNDay(r,-1);t=[i.formatedDate,o.formatedDate]}/^\d{4}[\/|-]\d{1,2}[\/|-]\d{1,2}$/.test(n)&&(t=[n,n])}if(!t)return e;var a=this._getRangeInfo(t);return a.start.time>a.end.time&&t.reverse(),t},t.prototype._getRangeInfo=function(t){var e,n=[this.getDateInfo(t[0]),this.getDateInfo(t[1])];n[0].time>n[1].time&&(e=!0,n.reverse());var i=Math.floor(n[1].time/_E)-Math.floor(n[0].time/_E)+1,r=new Date(n[0].time),o=r.getDate(),a=n[1].date.getDate();r.setDate(o+i-1);var s=r.getDate();if(s!==a)for(var l=r.getTime()-n[1].time>0?1:-1;(s=r.getDate())!==a&&(r.getTime()-n[1].time)*l>0;)i-=l,r.setDate(s-l);var u=Math.floor((i+n[0].day+6)/7),h=e?1-u:u-1;return e&&n.reverse(),{range:[n[0].formatedDate,n[1].formatedDate],start:n[0],end:n[1],allDay:i,weeks:u,nthWeek:h,fweek:n[0].day,lweek:n[1].day}},t.prototype._getDateByWeeksAndDay=function(t,e,n){var i=this._getRangeInfo(n);if(t>i.weeks||0===t&&e<i.fweek||t===i.weeks&&e>i.lweek)return null;var r=7*(t-1)-i.fweek+e,o=new Date(i.start.time);return o.setDate(+i.start.d+r),this.getDateInfo(o)},t.create=function(e,n){var i=[];return e.eachComponent("calendar",(function(r){var o=new t(r,e,n);i.push(o),r.coordinateSystem=o})),e.eachSeries((function(t){"calendar"===t.get("coordinateSystem")&&(t.coordinateSystem=i[t.get("calendarIndex")||0])})),i},t.dimensions=["time","value"],t}();function wE(t){var e=t.calendarModel,n=t.seriesModel;return e?e.coordinateSystem:n?n.coordinateSystem:null}function SE(t,e){var n;return E(e,(function(e){null!=t[e]&&"auto"!==t[e]&&(n=!0)})),n}var ME=["transition","enterFrom","leaveTo"],IE=ME.concat(["enterAnimation","updateAnimation","leaveAnimation"]);function TE(t,e,n){if(n&&(!t[n]&&e[n]&&(t[n]={}),t=t[n],e=e[n]),t&&e)for(var i=n?ME:IE,r=0;r<i.length;r++){var o=i[r];null==t[o]&&null!=e[o]&&(t[o]=e[o])}}var CE=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.preventAutoZ=!0,n}return n(e,t),e.prototype.mergeOption=function(e,n){var i=this.option.elements;this.option.elements=null,t.prototype.mergeOption.call(this,e,n),this.option.elements=i},e.prototype.optionUpdated=function(t,e){var n=this.option,i=(e?n:t).elements,r=n.elements=e?[]:n.elements,o=[];this._flatten(i,o,null);var a=Io(r,o,"normalMerge"),s=this._elOptionsToUpdate=[];E(a,(function(t,e){var n=t.newOption;n&&(s.push(n),function(t,e){var n=t.existing;if(e.id=t.keyInfo.id,!e.type&&n&&(e.type=n.type),null==e.parentId){var i=e.parentOption;i?e.parentId=i.id:n&&(e.parentId=n.parentId)}e.parentOption=null}(t,n),function(t,e,n){var i=A({},n),r=t[e],o=n.$action||"merge";"merge"===o?r?(C(r,i,!0),Ap(r,i,{ignoreSize:!0}),Lp(n,r),TE(n,r),TE(n,r,"shape"),TE(n,r,"style"),TE(n,r,"extra"),n.clipPath=r.clipPath):t[e]=i:"replace"===o?t[e]=i:"remove"===o&&r&&(t[e]=null)}(r,e,n),function(t,e){if(t&&(t.hv=e.hv=[SE(e,["left","right"]),SE(e,["top","bottom"])],"group"===t.type)){var n=t,i=e;null==n.width&&(n.width=i.width=0),null==n.height&&(n.height=i.height=0)}}(r[e],n))}),this),n.elements=B(r,(function(t){return t&&delete t.$action,null!=t}))},e.prototype._flatten=function(t,e,n){E(t,(function(t){if(t){n&&(t.parentOption=n),e.push(t);var i=t.children;i&&i.length&&this._flatten(i,e,t),delete t.children}}),this)},e.prototype.useElOptionsToUpdate=function(){var t=this._elOptionsToUpdate;return this._elOptionsToUpdate=null,t},e.type="graphic",e.defaultOption={elements:[]},e}(Op),DE={path:null,compoundPath:null,group:Er,image:As,text:Bs},AE=Po(),kE=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.init=function(){this._elMap=yt()},e.prototype.render=function(t,e,n){t!==this._lastGraphicModel&&this._clear(),this._lastGraphicModel=t,this._updateElements(t),this._relocate(t,n)},e.prototype._updateElements=function(t){var e=t.useElOptionsToUpdate();if(e){var n=this._elMap,i=this.group,r=t.get("z"),o=t.get("zlevel");E(e,(function(e){var a=Do(e.id,null),s=null!=a?n.get(a):null,l=Do(e.parentId,null),u=null!=l?n.get(l):i,h=e.type,c=e.style;"text"===h&&c&&e.hv&&e.hv[1]&&(c.textVerticalAlign=c.textBaseline=c.verticalAlign=c.align=null);var p=e.textContent,d=e.textConfig;if(c&&VO(c,h,!!d,!!p)){var f=BO(c,h,!0);!d&&f.textConfig&&(d=e.textConfig=f.textConfig),!p&&f.textContent&&(p=f.textContent)}var g=function(t){return t=A({},t),E(["id","parentId","$action","hv","bounding","textContent","clipPath"].concat(wp),(function(e){delete t[e]})),t}(e);var y=e.$action||"merge",v="merge"===y,m="replace"===y;if(v){var x=s;(T=!s)?x=PE(a,u,e.type,n):(x&&(AE(x).isNew=!1),aR(x)),x&&(jO(x,g,t,{isInit:T}),RE(x,e,r,o))}else if(m){OE(s,e,n,t);var _=PE(a,u,e.type,n);_&&(jO(_,g,t,{isInit:!0}),RE(_,e,r,o))}else"remove"===y&&(qO(s,e),OE(s,e,n,t));var b=n.get(a);if(b&&p)if(v){var w=b.getTextContent();w?w.attr(p):b.setTextContent(new Bs(p))}else m&&b.setTextContent(new Bs(p));if(b){var S=e.clipPath;if(S){var M=S.type,I=void 0,T=!1;if(v){var C=b.getClipPath();I=(T=!C||AE(C).type!==M)?LE(M):C}else m&&(T=!0,I=LE(M));b.setClipPath(I),jO(I,S,t,{isInit:T}),sR(I,S.keyframeAnimation,t)}var D=AE(b);b.setTextConfig(d),D.option=e,function(t,e,n){var i=Js(t).eventData;t.silent||t.ignore||i||(i=Js(t).eventData={componentType:"graphic",componentIndex:e.componentIndex,name:t.name});i&&(i.info=n.info)}(b,t,e),Xh({el:b,componentModel:t,itemName:b.name,itemTooltipOption:e.tooltip}),sR(b,e.keyframeAnimation,t)}}))}},e.prototype._relocate=function(t,e){for(var n=t.option.elements,i=this.group,r=this._elMap,o=e.getWidth(),a=e.getHeight(),s=["x","y"],l=0;l<n.length;l++){if((f=null!=(d=Do((p=n[l]).id,null))?r.get(d):null)&&f.isGroup){var u=(g=f.parent)===i,h=AE(f),c=AE(g);h.width=Ur(h.option.width,u?o:c.width)||0,h.height=Ur(h.option.height,u?a:c.height)||0}}for(l=n.length-1;l>=0;l--){var p,d,f;if(f=null!=(d=Do((p=n[l]).id,null))?r.get(d):null){var g=f.parent,y=(c=AE(g),{}),v=Cp(f,p,g===i?{width:o,height:a}:{width:c.width,height:c.height},null,{hv:p.hv,boundingMode:p.bounding},y);if(!AE(f).isNew&&v){for(var m=p.transition,x={},_=0;_<s.length;_++){var b=s[_],w=y[b];m&&($O(m)||P(m,b)>=0)?x[b]=w:f[b]=w}dh(f,x,t,0)}else f.attr(y)}}},e.prototype._clear=function(){var t=this,e=this._elMap;e.each((function(n){OE(n,AE(n).option,e,t._lastGraphicModel)})),this._elMap=yt()},e.prototype.dispose=function(){this._clear()},e.type="graphic",e}(wg);function LE(t){var e=_t(DE,t)?DE[t]:Ch(t);var n=new e({});return AE(n).type=t,n}function PE(t,e,n,i){var r=LE(n);return e.add(r),i.set(t,r),AE(r).id=t,AE(r).isNew=!0,r}function OE(t,e,n,i){t&&t.parent&&("group"===t.type&&t.traverse((function(t){OE(t,e,n,i)})),KO(t,e,i),n.removeKey(AE(t).id))}function RE(t,e,n,i){t.isGroup||E([["cursor",wa.prototype.cursor],["zlevel",i||0],["z",n||0],["z2",0]],(function(n){var i=n[0];_t(e,i)?t[i]=rt(e[i],n[1]):null==t[i]&&(t[i]=n[1])})),E(G(e),(function(n){if(0===n.indexOf("on")){var i=e[n];t[n]=U(i)?i:null}})),_t(e,"draggable")&&(t.draggable=e.draggable),null!=e.name&&(t.name=e.name),null!=e.id&&(t.id=e.id)}var NE=["x","y","radius","angle","single"],EE=["cartesian2d","polar","singleAxis"];function zE(t){return t+"Axis"}function VE(t,e){var n,i=yt(),r=[],o=yt();t.eachComponent({mainType:"dataZoom",query:e},(function(t){o.get(t.uid)||s(t)}));do{n=!1,t.eachComponent("dataZoom",a)}while(n);function a(t){!o.get(t.uid)&&function(t){var e=!1;return t.eachTargetAxis((function(t,n){var r=i.get(t);r&&r[n]&&(e=!0)})),e}(t)&&(s(t),n=!0)}function s(t){o.set(t.uid,!0),r.push(t),t.eachTargetAxis((function(t,e){(i.get(t)||i.set(t,[]))[e]=!0}))}return r}function BE(t){var e=t.ecModel,n={infoList:[],infoMap:yt()};return t.eachTargetAxis((function(t,i){var r=e.getComponent(zE(t),i);if(r){var o=r.getCoordSysModel();if(o){var a=o.uid,s=n.infoMap.get(a);s||(s={model:o,axisModels:[]},n.infoList.push(s),n.infoMap.set(a,s)),s.axisModels.push(r)}}})),n}var FE=function(){function t(){this.indexList=[],this.indexMap=[]}return t.prototype.add=function(t){this.indexMap[t]||(this.indexList.push(t),this.indexMap[t]=!0)},t}(),GE=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n._autoThrottle=!0,n._noTarget=!0,n._rangePropMode=["percent","percent"],n}return n(e,t),e.prototype.init=function(t,e,n){var i=WE(t);this.settledOption=i,this.mergeDefaultAndTheme(t,n),this._doInit(i)},e.prototype.mergeOption=function(t){var e=WE(t);C(this.option,t,!0),C(this.settledOption,e,!0),this._doInit(e)},e.prototype._doInit=function(t){var e=this.option;this._setDefaultThrottle(t),this._updateRangeUse(t);var n=this.settledOption;E([["start","startValue"],["end","endValue"]],(function(t,i){"value"===this._rangePropMode[i]&&(e[t[0]]=n[t[0]]=null)}),this),this._resetTarget()},e.prototype._resetTarget=function(){var t=this.get("orient",!0),e=this._targetAxisInfoMap=yt();this._fillSpecifiedTargetAxis(e)?this._orient=t||this._makeAutoOrientByTargetAxis():(this._orient=t||"horizontal",this._fillAutoTargetAxisByOrient(e,this._orient)),this._noTarget=!0,e.each((function(t){t.indexList.length&&(this._noTarget=!1)}),this)},e.prototype._fillSpecifiedTargetAxis=function(t){var e=!1;return E(NE,(function(n){var i=this.getReferringComponents(zE(n),zo);if(i.specified){e=!0;var r=new FE;E(i.models,(function(t){r.add(t.componentIndex)})),t.set(n,r)}}),this),e},e.prototype._fillAutoTargetAxisByOrient=function(t,e){var n=this.ecModel,i=!0;if(i){var r="vertical"===e?"y":"x";o(n.findComponents({mainType:r+"Axis"}),r)}i&&o(n.findComponents({mainType:"singleAxis",filter:function(t){return t.get("orient",!0)===e}}),"single");function o(e,n){var r=e[0];if(r){var o=new FE;if(o.add(r.componentIndex),t.set(n,o),i=!1,"x"===n||"y"===n){var a=r.getReferringComponents("grid",Eo).models[0];a&&E(e,(function(t){r.componentIndex!==t.componentIndex&&a===t.getReferringComponents("grid",Eo).models[0]&&o.add(t.componentIndex)}))}}}i&&E(NE,(function(e){if(i){var r=n.findComponents({mainType:zE(e),filter:function(t){return"category"===t.get("type",!0)}});if(r[0]){var o=new FE;o.add(r[0].componentIndex),t.set(e,o),i=!1}}}),this)},e.prototype._makeAutoOrientByTargetAxis=function(){var t;return this.eachTargetAxis((function(e){!t&&(t=e)}),this),"y"===t?"vertical":"horizontal"},e.prototype._setDefaultThrottle=function(t){if(t.hasOwnProperty("throttle")&&(this._autoThrottle=!1),this._autoThrottle){var e=this.ecModel.option;this.option.throttle=e.animation&&e.animationDurationUpdate>0?100:20}},e.prototype._updateRangeUse=function(t){var e=this._rangePropMode,n=this.get("rangeMode");E([["start","startValue"],["end","endValue"]],(function(i,r){var o=null!=t[i[0]],a=null!=t[i[1]];o&&!a?e[r]="percent":!o&&a?e[r]="value":n?e[r]=n[r]:o&&(e[r]="percent")}))},e.prototype.noTarget=function(){return this._noTarget},e.prototype.getFirstTargetAxisModel=function(){var t;return this.eachTargetAxis((function(e,n){null==t&&(t=this.ecModel.getComponent(zE(e),n))}),this),t},e.prototype.eachTargetAxis=function(t,e){this._targetAxisInfoMap.each((function(n,i){E(n.indexList,(function(n){t.call(e,i,n)}))}))},e.prototype.getAxisProxy=function(t,e){var n=this.getAxisModel(t,e);if(n)return n.__dzAxisProxy},e.prototype.getAxisModel=function(t,e){var n=this._targetAxisInfoMap.get(t);if(n&&n.indexMap[e])return this.ecModel.getComponent(zE(t),e)},e.prototype.setRawRange=function(t){var e=this.option,n=this.settledOption;E([["start","startValue"],["end","endValue"]],(function(i){null==t[i[0]]&&null==t[i[1]]||(e[i[0]]=n[i[0]]=t[i[0]],e[i[1]]=n[i[1]]=t[i[1]])}),this),this._updateRangeUse(t)},e.prototype.setCalculatedRange=function(t){var e=this.option;E(["start","startValue","end","endValue"],(function(n){e[n]=t[n]}))},e.prototype.getPercentRange=function(){var t=this.findRepresentativeAxisProxy();if(t)return t.getDataPercentWindow()},e.prototype.getValueRange=function(t,e){if(null!=t||null!=e)return this.getAxisProxy(t,e).getDataValueWindow();var n=this.findRepresentativeAxisProxy();return n?n.getDataValueWindow():void 0},e.prototype.findRepresentativeAxisProxy=function(t){if(t)return t.__dzAxisProxy;for(var e,n=this._targetAxisInfoMap.keys(),i=0;i<n.length;i++)for(var r=n[i],o=this._targetAxisInfoMap.get(r),a=0;a<o.indexList.length;a++){var s=this.getAxisProxy(r,o.indexList[a]);if(s.hostedBy(this))return s;e||(e=s)}return e},e.prototype.getRangePropMode=function(){return this._rangePropMode.slice()},e.prototype.getOrient=function(){return this._orient},e.type="dataZoom",e.dependencies=["xAxis","yAxis","radiusAxis","angleAxis","singleAxis","series","toolbox"],e.defaultOption={z:4,filterMode:"filter",start:0,end:100},e}(Op);function WE(t){var e={};return E(["start","end","startValue","endValue","throttle"],(function(n){t.hasOwnProperty(n)&&(e[n]=t[n])})),e}var HE=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.type="dataZoom.select",e}(GE),YE=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.render=function(t,e,n,i){this.dataZoomModel=t,this.ecModel=e,this.api=n},e.type="dataZoom",e}(wg),UE=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.type="dataZoom.select",e}(YE),XE=E,ZE=Zr,jE=function(){function t(t,e,n,i){this._dimName=t,this._axisIndex=e,this.ecModel=i,this._dataZoomModel=n}return t.prototype.hostedBy=function(t){return this._dataZoomModel===t},t.prototype.getDataValueWindow=function(){return this._valueWindow.slice()},t.prototype.getDataPercentWindow=function(){return this._percentWindow.slice()},t.prototype.getTargetSeriesModels=function(){var t=[];return this.ecModel.eachSeries((function(e){if(function(t){var e=t.get("coordinateSystem");return P(EE,e)>=0}(e)){var n=zE(this._dimName),i=e.getReferringComponents(n,Eo).models[0];i&&this._axisIndex===i.componentIndex&&t.push(e)}}),this),t},t.prototype.getAxisModel=function(){return this.ecModel.getComponent(this._dimName+"Axis",this._axisIndex)},t.prototype.getMinMaxSpan=function(){return T(this._minMaxSpan)},t.prototype.calculateDataWindow=function(t){var e,n=this._dataExtent,i=this.getAxisModel().axis.scale,r=this._dataZoomModel.getRangePropMode(),o=[0,100],a=[],s=[];XE(["start","end"],(function(l,u){var h=t[l],c=t[l+"Value"];"percent"===r[u]?(null==h&&(h=o[u]),c=i.parse(Yr(h,o,n))):(e=!0,h=Yr(c=null==c?n[u]:i.parse(c),n,o)),s[u]=null==c||isNaN(c)?n[u]:c,a[u]=null==h||isNaN(h)?o[u]:h})),ZE(s),ZE(a);var l=this._minMaxSpan;function u(t,e,n,r,o){var a=o?"Span":"ValueSpan";xk(0,t,n,"all",l["min"+a],l["max"+a]);for(var s=0;s<2;s++)e[s]=Yr(t[s],n,r,!0),o&&(e[s]=i.parse(e[s]))}return e?u(s,a,n,o,!1):u(a,s,o,n,!0),{valueWindow:s,percentWindow:a}},t.prototype.reset=function(t){if(t===this._dataZoomModel){var e=this.getTargetSeriesModels();this._dataExtent=function(t,e,n){var i=[1/0,-1/0];XE(n,(function(t){!function(t,e,n){e&&E(v_(e,n),(function(n){var i=e.getApproximateExtent(n);i[0]<t[0]&&(t[0]=i[0]),i[1]>t[1]&&(t[1]=i[1])}))}(i,t.getData(),e)}));var r=t.getAxisModel(),o=s_(r.axis.scale,r,i).calculate();return[o.min,o.max]}(this,this._dimName,e),this._updateMinMaxSpan();var n=this.calculateDataWindow(t.settledOption);this._valueWindow=n.valueWindow,this._percentWindow=n.percentWindow,this._setAxisModel()}},t.prototype.filterData=function(t,e){if(t===this._dataZoomModel){var n=this._dimName,i=this.getTargetSeriesModels(),r=t.get("filterMode"),o=this._valueWindow;"none"!==r&&XE(i,(function(t){var e=t.getData(),i=e.mapDimensionsAll(n);if(i.length){if("weakFilter"===r){var a=e.getStore(),s=z(i,(function(t){return e.getDimensionIndex(t)}),e);e.filterSelf((function(t){for(var e,n,r,l=0;l<i.length;l++){var u=a.get(s[l],t),h=!isNaN(u),c=u<o[0],p=u>o[1];if(h&&!c&&!p)return!0;h&&(r=!0),c&&(e=!0),p&&(n=!0)}return r&&e&&n}))}else XE(i,(function(n){if("empty"===r)t.setData(e=e.map(n,(function(t){return function(t){return t>=o[0]&&t<=o[1]}(t)?t:NaN})));else{var i={};i[n]=o,e.selectRange(i)}}));XE(i,(function(t){e.setApproximateExtent(o,t)}))}}))}},t.prototype._updateMinMaxSpan=function(){var t=this._minMaxSpan={},e=this._dataZoomModel,n=this._dataExtent;XE(["min","max"],(function(i){var r=e.get(i+"Span"),o=e.get(i+"ValueSpan");null!=o&&(o=this.getAxisModel().axis.scale.parse(o)),null!=o?r=Yr(n[0]+o,n,[0,100],!0):null!=r&&(o=Yr(r,[0,100],n,!0)-n[0]),t[i+"Span"]=r,t[i+"ValueSpan"]=o}),this)},t.prototype._setAxisModel=function(){var t=this.getAxisModel(),e=this._percentWindow,n=this._valueWindow;if(e){var i=Kr(n,[0,500]);i=Math.min(i,20);var r=t.axis.scale.rawExtentInfo;0!==e[0]&&r.setDeterminedMinMax("min",+n[0].toFixed(i)),100!==e[1]&&r.setDeterminedMinMax("max",+n[1].toFixed(i)),r.freeze()}},t}();var qE={getTargetSeries:function(t){function e(e){t.eachComponent("dataZoom",(function(n){n.eachTargetAxis((function(i,r){var o=t.getComponent(zE(i),r);e(i,r,o,n)}))}))}e((function(t,e,n,i){n.__dzAxisProxy=null}));var n=[];e((function(e,i,r,o){r.__dzAxisProxy||(r.__dzAxisProxy=new jE(e,i,o,t),n.push(r.__dzAxisProxy))}));var i=yt();return E(n,(function(t){E(t.getTargetSeriesModels(),(function(t){i.set(t.uid,t)}))})),i},overallReset:function(t,e){t.eachComponent("dataZoom",(function(t){t.eachTargetAxis((function(e,n){t.getAxisProxy(e,n).reset(t)})),t.eachTargetAxis((function(n,i){t.getAxisProxy(n,i).filterData(t,e)}))})),t.eachComponent("dataZoom",(function(t){var e=t.findRepresentativeAxisProxy();if(e){var n=e.getDataPercentWindow(),i=e.getDataValueWindow();t.setCalculatedRange({start:n[0],end:n[1],startValue:i[0],endValue:i[1]})}}))}};var KE=!1;function $E(t){KE||(KE=!0,t.registerProcessor(t.PRIORITY.PROCESSOR.FILTER,qE),function(t){t.registerAction("dataZoom",(function(t,e){E(VE(e,t),(function(e){e.setRawRange({start:t.start,end:t.end,startValue:t.startValue,endValue:t.endValue})}))}))}(t),t.registerSubTypeDefaulter("dataZoom",(function(){return"slider"})))}function JE(t){t.registerComponentModel(HE),t.registerComponentView(UE),$E(t)}var QE=function(){},tz={};function ez(t,e){tz[t]=e}function nz(t){return tz[t]}var iz=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.optionUpdated=function(){t.prototype.optionUpdated.apply(this,arguments);var e=this.ecModel;E(this.option.feature,(function(t,n){var i=nz(n);i&&(i.getDefaultOption&&(i.defaultOption=i.getDefaultOption(e)),C(t,i.defaultOption))}))},e.type="toolbox",e.layoutMode={type:"box",ignoreSize:!0},e.defaultOption={show:!0,z:6,orient:"horizontal",left:"right",top:"top",backgroundColor:"transparent",borderColor:"#ccc",borderRadius:0,borderWidth:0,padding:5,itemSize:15,itemGap:8,showTitle:!0,iconStyle:{borderColor:"#666",color:"none"},emphasis:{iconStyle:{borderColor:"#3E98C5"}},tooltip:{show:!1,position:"bottom"}},e}(Op);function rz(t,e){var n=dp(e.get("padding")),i=e.getItemStyle(["color","opacity"]);return i.fill=e.get("backgroundColor"),t=new Es({shape:{x:t.x-n[3],y:t.y-n[0],width:t.width+n[1]+n[3],height:t.height+n[0]+n[2],r:e.get("borderRadius")},style:i,silent:!0,z2:-1})}var oz=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.prototype.render=function(t,e,n,i){var r=this.group;if(r.removeAll(),t.get("show")){var o=+t.get("itemSize"),a="vertical"===t.get("orient"),s=t.get("feature")||{},l=this._features||(this._features={}),u=[];E(s,(function(t,e){u.push(e)})),new Lm(this._featureNames||[],u).add(h).update(h).remove(H(h,null)).execute(),this._featureNames=u,function(t,e,n){var i=e.getBoxLayoutParams(),r=e.get("padding"),o={width:n.getWidth(),height:n.getHeight()},a=Tp(i,o,r);Ip(e.get("orient"),t,e.get("itemGap"),a.width,a.height),Cp(t,i,o,r)}(r,t,n),r.add(rz(r.getBoundingRect(),t)),a||r.eachChild((function(t){var e=t.__title,i=t.ensureState("emphasis"),a=i.textConfig||(i.textConfig={}),s=t.getTextContent(),l=s&&s.ensureState("emphasis");if(l&&!U(l)&&e){var u=l.style||(l.style={}),h=_r(e,Bs.makeFont(u)),c=t.x+r.x,p=!1;t.y+r.y+o+h.height>n.getHeight()&&(a.position="top",p=!0);var d=p?-5-h.height:o+10;c+h.width/2>n.getWidth()?(a.position=["100%",d],u.align="right"):c-h.width/2<0&&(a.position=[0,d],u.align="left")}}))}function h(h,c){var p,d=u[h],f=u[c],g=s[d],y=new Sc(g,t,t.ecModel);if(i&&null!=i.newTitle&&i.featureName===d&&(g.title=i.newTitle),d&&!f){if(function(t){return 0===t.indexOf("my")}(d))p={onclick:y.option.onclick,featureName:d};else{var v=nz(d);if(!v)return;p=new v}l[d]=p}else if(!(p=l[f]))return;p.uid=Ic("toolbox-feature"),p.model=y,p.ecModel=e,p.api=n;var m=p instanceof QE;d||!f?!y.get("show")||m&&p.unusable?m&&p.remove&&p.remove(e,n):(!function(i,s,l){var u,h,c=i.getModel("iconStyle"),p=i.getModel(["emphasis","iconStyle"]),d=s instanceof QE&&s.getIcons?s.getIcons():i.get("icon"),f=i.get("title")||{};X(d)?(u={})[l]=d:u=d;X(f)?(h={})[l]=f:h=f;var g=i.iconPaths={};E(u,(function(l,u){var d=Wh(l,{},{x:-o/2,y:-o/2,width:o,height:o});d.setStyle(c.getItemStyle()),d.ensureState("emphasis").style=p.getItemStyle();var f=new Bs({style:{text:h[u],align:p.get("textAlign"),borderRadius:p.get("textBorderRadius"),padding:p.get("textPadding"),fill:null},ignore:!0});d.setTextContent(f),Xh({el:d,componentModel:t,itemName:u,formatterParamsExtra:{title:h[u]}}),d.__title=h[u],d.on("mouseover",(function(){var e=p.getItemStyle(),i=a?null==t.get("right")&&"right"!==t.get("left")?"right":"left":null==t.get("bottom")&&"bottom"!==t.get("top")?"bottom":"top";f.setStyle({fill:p.get("textFill")||e.fill||e.stroke||"#000",backgroundColor:p.get("textBackgroundColor")}),d.setTextConfig({position:p.get("textPosition")||i}),f.ignore=!t.get("showTitle"),n.enterEmphasis(this)})).on("mouseout",(function(){"emphasis"!==i.get(["iconStatus",u])&&n.leaveEmphasis(this),f.hide()})),("emphasis"===i.get(["iconStatus",u])?Al:kl)(d),r.add(d),d.on("click",W(s.onclick,s,e,n,u)),g[u]=d}))}(y,p,d),y.setIconStatus=function(t,e){var n=this.option,i=this.iconPaths;n.iconStatus=n.iconStatus||{},n.iconStatus[t]=e,i[t]&&("emphasis"===e?Al:kl)(i[t])},p instanceof QE&&p.render&&p.render(y,e,n,i)):m&&p.dispose&&p.dispose(e,n)}},e.prototype.updateView=function(t,e,n,i){E(this._features,(function(t){t instanceof QE&&t.updateView&&t.updateView(t.model,e,n,i)}))},e.prototype.remove=function(t,e){E(this._features,(function(n){n instanceof QE&&n.remove&&n.remove(t,e)})),this.group.removeAll()},e.prototype.dispose=function(t,e){E(this._features,(function(n){n instanceof QE&&n.dispose&&n.dispose(t,e)}))},e.type="toolbox",e}(wg);var az=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.prototype.onclick=function(t,e){var n=this.model,i=n.get("name")||t.get("title.0.text")||"echarts",o="svg"===e.getZr().painter.getType(),a=o?"svg":n.get("type",!0)||"png",s=e.getConnectedDataURL({type:a,backgroundColor:n.get("backgroundColor",!0)||t.get("backgroundColor")||"#fff",connectedBackgroundColor:n.get("connectedBackgroundColor"),excludeComponents:n.get("excludeComponents"),pixelRatio:n.get("pixelRatio")}),l=r.browser;if(U(MouseEvent)&&(l.newEdge||!l.ie&&!l.edge)){var u=document.createElement("a");u.download=i+"."+a,u.target="_blank",u.href=s;var h=new MouseEvent("click",{view:document.defaultView,bubbles:!0,cancelable:!1});u.dispatchEvent(h)}else if(window.navigator.msSaveOrOpenBlob||o){var c=s.split(","),p=c[0].indexOf("base64")>-1,d=o?decodeURIComponent(c[1]):c[1];p&&(d=window.atob(d));var f=i+"."+a;if(window.navigator.msSaveOrOpenBlob){for(var g=d.length,y=new Uint8Array(g);g--;)y[g]=d.charCodeAt(g);var v=new Blob([y]);window.navigator.msSaveOrOpenBlob(v,f)}else{var m=document.createElement("iframe");document.body.appendChild(m);var x=m.contentWindow,_=x.document;_.open("image/svg+xml","replace"),_.write(d),_.close(),x.focus(),_.execCommand("SaveAs",!0,f),document.body.removeChild(m)}}else{var b=n.get("lang"),w='<body style="margin:0;"><img src="'+s+'" style="max-width:100%;" title="'+(b&&b[0]||"")+'" /></body>',S=window.open();S.document.write(w),S.document.title=i}},e.getDefaultOption=function(t){return{show:!0,icon:"M4.7,22.9L29.3,45.5L54.7,23.4M4.6,43.6L4.6,58L53.8,58L53.8,43.6M29.2,45.1L29.2,0",title:t.getLocaleModel().get(["toolbox","saveAsImage","title"]),type:"png",connectedBackgroundColor:"#fff",name:"",excludeComponents:["toolbox"],lang:t.getLocaleModel().get(["toolbox","saveAsImage","lang"])}},e}(QE),sz="__ec_magicType_stack__",lz=[["line","bar"],["stack"]],uz=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.prototype.getIcons=function(){var t=this.model,e=t.get("icon"),n={};return E(t.get("type"),(function(t){e[t]&&(n[t]=e[t])})),n},e.getDefaultOption=function(t){return{show:!0,type:[],icon:{line:"M4.1,28.9h7.1l9.3-22l7.4,38l9.7-19.7l3,12.8h14.9M4.1,58h51.4",bar:"M6.7,22.9h10V48h-10V22.9zM24.9,13h10v35h-10V13zM43.2,2h10v46h-10V2zM3.1,58h53.7",stack:"M8.2,38.4l-8.4,4.1l30.6,15.3L60,42.5l-8.1-4.1l-21.5,11L8.2,38.4z M51.9,30l-8.1,4.2l-13.4,6.9l-13.9-6.9L8.2,30l-8.4,4.2l8.4,4.2l22.2,11l21.5-11l8.1-4.2L51.9,30z M51.9,21.7l-8.1,4.2L35.7,30l-5.3,2.8L24.9,30l-8.4-4.1l-8.3-4.2l-8.4,4.2L8.2,30l8.3,4.2l13.9,6.9l13.4-6.9l8.1-4.2l8.1-4.1L51.9,21.7zM30.4,2.2L-0.2,17.5l8.4,4.1l8.3,4.2l8.4,4.2l5.5,2.7l5.3-2.7l8.1-4.2l8.1-4.2l8.1-4.1L30.4,2.2z"},title:t.getLocaleModel().get(["toolbox","magicType","title"]),option:{},seriesIndex:{}}},e.prototype.onclick=function(t,e,n){var i=this.model,r=i.get(["seriesIndex",n]);if(hz[n]){var o,a={series:[]};E(lz,(function(t){P(t,n)>=0&&E(t,(function(t){i.setIconStatus(t,"normal")}))})),i.setIconStatus(n,"emphasis"),t.eachComponent({mainType:"series",query:null==r?null:{seriesIndex:r}},(function(t){var e=t.subType,r=t.id,o=hz[n](e,r,t,i);o&&(k(o,t.option),a.series.push(o));var s=t.coordinateSystem;if(s&&"cartesian2d"===s.type&&("line"===n||"bar"===n)){var l=s.getAxesByScale("ordinal")[0];if(l){var u=l.dim+"Axis",h=t.getReferringComponents(u,Eo).models[0].componentIndex;a[u]=a[u]||[];for(var c=0;c<=h;c++)a[u][h]=a[u][h]||{};a[u][h].boundaryGap="bar"===n}}}));var s=n;"stack"===n&&(o=C({stack:i.option.title.tiled,tiled:i.option.title.stack},i.option.title),"emphasis"!==i.get(["iconStatus",n])&&(s="tiled")),e.dispatchAction({type:"changeMagicType",currentType:s,newOption:a,newTitle:o,featureName:"magicType"})}},e}(QE),hz={line:function(t,e,n,i){if("bar"===t)return C({id:e,type:"line",data:n.get("data"),stack:n.get("stack"),markPoint:n.get("markPoint"),markLine:n.get("markLine")},i.get(["option","line"])||{},!0)},bar:function(t,e,n,i){if("line"===t)return C({id:e,type:"bar",data:n.get("data"),stack:n.get("stack"),markPoint:n.get("markPoint"),markLine:n.get("markLine")},i.get(["option","bar"])||{},!0)},stack:function(t,e,n,i){var r=n.get("stack")===sz;if("line"===t||"bar"===t)return i.setIconStatus("stack",r?"normal":"emphasis"),C({id:e,stack:r?"":sz},i.get(["option","stack"])||{},!0)}};vm({type:"changeMagicType",event:"magicTypeChanged",update:"prepareAndUpdate"},(function(t,e){e.mergeOption(t.newOption)}));var cz=new Array(60).join("-"),pz="\t";function dz(t){return t.replace(/^\s\s*/,"").replace(/\s\s*$/,"")}var fz=new RegExp("[\t]+","g");function gz(t,e){var n=t.split(new RegExp("\n*"+cz+"\n*","g")),i={series:[]};return E(n,(function(t,n){if(function(t){if(t.slice(0,t.indexOf("\n")).indexOf(pz)>=0)return!0}(t)){var r=function(t){for(var e=t.split(/\n+/g),n=[],i=z(dz(e.shift()).split(fz),(function(t){return{name:t,data:[]}})),r=0;r<e.length;r++){var o=dz(e[r]).split(fz);n.push(o.shift());for(var a=0;a<o.length;a++)i[a]&&(i[a].data[r]=o[a])}return{series:i,categories:n}}(t),o=e[n],a=o.axisDim+"Axis";o&&(i[a]=i[a]||[],i[a][o.axisIndex]={data:r.categories},i.series=i.series.concat(r.series))}else{r=function(t){for(var e=t.split(/\n+/g),n=dz(e.shift()),i=[],r=0;r<e.length;r++){var o=dz(e[r]);if(o){var a=o.split(fz),s="",l=void 0,u=!1;isNaN(a[0])?(u=!0,s=a[0],a=a.slice(1),i[r]={name:s,value:[]},l=i[r].value):l=i[r]=[];for(var h=0;h<a.length;h++)l.push(+a[h]);1===l.length&&(u?i[r].value=l[0]:i[r]=l[0])}}return{name:n,data:i}}(t);i.series.push(r)}})),i}var yz=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.prototype.onclick=function(t,e){setTimeout((function(){e.dispatchAction({type:"hideTip"})}));var n=e.getDom(),i=this.model;this._dom&&n.removeChild(this._dom);var r=document.createElement("div");r.style.cssText="position:absolute;top:0;bottom:0;left:0;right:0;padding:5px",r.style.backgroundColor=i.get("backgroundColor")||"#fff";var o=document.createElement("h4"),a=i.get("lang")||[];o.innerHTML=a[0]||i.get("title"),o.style.cssText="margin:10px 20px",o.style.color=i.get("textColor");var s=document.createElement("div"),l=document.createElement("textarea");s.style.cssText="overflow:auto";var u=i.get("optionToContent"),h=i.get("contentToOption"),c=function(t){var e,n,i,r=function(t){var e={},n=[],i=[];return t.eachRawSeries((function(t){var r=t.coordinateSystem;if(!r||"cartesian2d"!==r.type&&"polar"!==r.type)n.push(t);else{var o=r.getBaseAxis();if("category"===o.type){var a=o.dim+"_"+o.index;e[a]||(e[a]={categoryAxis:o,valueAxis:r.getOtherAxis(o),series:[]},i.push({axisDim:o.dim,axisIndex:o.index})),e[a].series.push(t)}else n.push(t)}})),{seriesGroupByCategoryAxis:e,other:n,meta:i}}(t);return{value:B([(n=r.seriesGroupByCategoryAxis,i=[],E(n,(function(t,e){var n=t.categoryAxis,r=t.valueAxis.dim,o=[" "].concat(z(t.series,(function(t){return t.name}))),a=[n.model.getCategories()];E(t.series,(function(t){var e=t.getRawData();a.push(t.getRawData().mapArray(e.mapDimension(r),(function(t){return t})))}));for(var s=[o.join(pz)],l=0;l<a[0].length;l++){for(var u=[],h=0;h<a.length;h++)u.push(a[h][l]);s.push(u.join(pz))}i.push(s.join("\n"))})),i.join("\n\n"+cz+"\n\n")),(e=r.other,z(e,(function(t){var e=t.getRawData(),n=[t.name],i=[];return e.each(e.dimensions,(function(){for(var t=arguments.length,r=arguments[t-1],o=e.getName(r),a=0;a<t-1;a++)i[a]=arguments[a];n.push((o?o+pz:"")+i.join(pz))})),n.join("\n")})).join("\n\n"+cz+"\n\n"))],(function(t){return!!t.replace(/[\n\t\s]/g,"")})).join("\n\n"+cz+"\n\n"),meta:r.meta}}(t);if(U(u)){var p=u(e.getOption());X(p)?s.innerHTML=p:J(p)&&s.appendChild(p)}else{l.readOnly=i.get("readOnly");var d=l.style;d.cssText="display:block;width:100%;height:100%;font-family:monospace;font-size:14px;line-height:1.6rem;resize:none;box-sizing:border-box;outline:none",d.color=i.get("textColor"),d.borderColor=i.get("textareaBorderColor"),d.backgroundColor=i.get("textareaColor"),l.value=c.value,s.appendChild(l)}var f=c.meta,g=document.createElement("div");g.style.cssText="position:absolute;bottom:5px;left:0;right:0";var y="float:right;margin-right:20px;border:none;cursor:pointer;padding:2px 5px;font-size:12px;border-radius:3px",v=document.createElement("div"),m=document.createElement("div");y+=";background-color:"+i.get("buttonColor"),y+=";color:"+i.get("buttonTextColor");var x=this;function _(){n.removeChild(r),x._dom=null}ce(v,"click",_),ce(m,"click",(function(){if(null==h&&null!=u||null!=h&&null==u)_();else{var t;try{t=U(h)?h(s,e.getOption()):gz(l.value,f)}catch(t){throw _(),new Error("Data view format error "+t)}t&&e.dispatchAction({type:"changeDataView",newOption:t}),_()}})),v.innerHTML=a[1],m.innerHTML=a[2],m.style.cssText=v.style.cssText=y,!i.get("readOnly")&&g.appendChild(m),g.appendChild(v),r.appendChild(o),r.appendChild(s),r.appendChild(g),s.style.height=n.clientHeight-80+"px",n.appendChild(r),this._dom=r},e.prototype.remove=function(t,e){this._dom&&e.getDom().removeChild(this._dom)},e.prototype.dispose=function(t,e){this.remove(t,e)},e.getDefaultOption=function(t){return{show:!0,readOnly:!1,optionToContent:null,contentToOption:null,icon:"M17.5,17.3H33 M17.5,17.3H33 M45.4,29.5h-28 M11.5,2v56H51V14.8L38.4,2H11.5z M38.4,2.2v12.7H51 M45.4,41.7h-28",title:t.getLocaleModel().get(["toolbox","dataView","title"]),lang:t.getLocaleModel().get(["toolbox","dataView","lang"]),backgroundColor:"#fff",textColor:"#000",textareaColor:"#fff",textareaBorderColor:"#333",buttonColor:"#c23531",buttonTextColor:"#fff"}},e}(QE);function vz(t,e){return z(t,(function(t,n){var i=e&&e[n];if(q(i)&&!Y(i)){q(t)&&!Y(t)||(t={value:t});var r=null!=i.name&&null==t.name;return t=k(t,i),r&&delete t.name,t}return t}))}vm({type:"changeDataView",event:"dataViewChanged",update:"prepareAndUpdate"},(function(t,e){var n=[];E(t.newOption.series,(function(t){var i=e.getSeriesByName(t.name)[0];if(i){var r=i.get("data");n.push({name:t.name,data:vz(t.data,r)})}else n.push(A({type:"scatter"},t))})),e.mergeOption(k({series:n},t.newOption))}));var mz=E,xz=Po();function _z(t){var e=xz(t);return e.snapshots||(e.snapshots=[{}]),e.snapshots}var bz=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.prototype.onclick=function(t,e){!function(t){xz(t).snapshots=null}(t),e.dispatchAction({type:"restore",from:this.uid})},e.getDefaultOption=function(t){return{show:!0,icon:"M3.8,33.4 M47,18.9h9.8V8.7 M56.3,20.1 C52.1,9,40.5,0.6,26.8,2.1C12.6,3.7,1.6,16.2,2.1,30.6 M13,41.1H3.1v10.2 M3.7,39.9c4.2,11.1,15.8,19.5,29.5,18 c14.2-1.6,25.2-14.1,24.7-28.5",title:t.getLocaleModel().get(["toolbox","restore","title"])}},e}(QE);vm({type:"restore",event:"restore",update:"prepareAndUpdate"},(function(t,e){e.resetOption("recreate")}));var wz=["grid","xAxis","yAxis","geo","graph","polar","radiusAxis","angleAxis","bmap"],Sz=function(){function t(t,e,n){var i=this;this._targetInfoList=[];var r=Iz(e,t);E(Tz,(function(t,e){(!n||!n.include||P(n.include,e)>=0)&&t(r,i._targetInfoList)}))}return t.prototype.setOutputRanges=function(t,e){return this.matchOutputRanges(t,e,(function(t,e,n){if((t.coordRanges||(t.coordRanges=[])).push(e),!t.coordRange){t.coordRange=e;var i=Az[t.brushType](0,n,e);t.__rangeOffset={offset:Lz[t.brushType](i.values,t.range,[1,1]),xyMinMax:i.xyMinMax}}})),t},t.prototype.matchOutputRanges=function(t,e,n){E(t,(function(t){var i=this.findTargetInfo(t,e);i&&!0!==i&&E(i.coordSyses,(function(i){var r=Az[t.brushType](1,i,t.range,!0);n(t,r.values,i,e)}))}),this)},t.prototype.setInputRanges=function(t,e){E(t,(function(t){var n,i,r,o,a,s=this.findTargetInfo(t,e);if(t.range=t.range||[],s&&!0!==s){t.panelId=s.panelId;var l=Az[t.brushType](0,s.coordSys,t.coordRange),u=t.__rangeOffset;t.range=u?Lz[t.brushType](l.values,u.offset,(n=l.xyMinMax,i=u.xyMinMax,r=Oz(n),o=Oz(i),a=[r[0]/o[0],r[1]/o[1]],isNaN(a[0])&&(a[0]=1),isNaN(a[1])&&(a[1]=1),a)):l.values}}),this)},t.prototype.makePanelOpts=function(t,e){return z(this._targetInfoList,(function(n){var i=n.getPanelRect();return{panelId:n.panelId,defaultBrushType:e?e(n):null,clipPath:bL(i),isTargetByCursor:SL(i,t,n.coordSysModel),getLinearBrushOtherExtent:wL(i)}}))},t.prototype.controlSeries=function(t,e,n){var i=this.findTargetInfo(t,n);return!0===i||i&&P(i.coordSyses,e.coordinateSystem)>=0},t.prototype.findTargetInfo=function(t,e){for(var n=this._targetInfoList,i=Iz(e,t),r=0;r<n.length;r++){var o=n[r],a=t.panelId;if(a){if(o.panelId===a)return o}else for(var s=0;s<Cz.length;s++)if(Cz[s](i,o))return o}return!0},t}();function Mz(t){return t[0]>t[1]&&t.reverse(),t}function Iz(t,e){return Ro(t,e,{includeMainTypes:wz})}var Tz={grid:function(t,e){var n=t.xAxisModels,i=t.yAxisModels,r=t.gridModels,o=yt(),a={},s={};(n||i||r)&&(E(n,(function(t){var e=t.axis.grid.model;o.set(e.id,e),a[e.id]=!0})),E(i,(function(t){var e=t.axis.grid.model;o.set(e.id,e),s[e.id]=!0})),E(r,(function(t){o.set(t.id,t),a[t.id]=!0,s[t.id]=!0})),o.each((function(t){var r=t.coordinateSystem,o=[];E(r.getCartesians(),(function(t,e){(P(n,t.getAxis("x").model)>=0||P(i,t.getAxis("y").model)>=0)&&o.push(t)})),e.push({panelId:"grid--"+t.id,gridModel:t,coordSysModel:t,coordSys:o[0],coordSyses:o,getPanelRect:Dz.grid,xAxisDeclared:a[t.id],yAxisDeclared:s[t.id]})})))},geo:function(t,e){E(t.geoModels,(function(t){var n=t.coordinateSystem;e.push({panelId:"geo--"+t.id,geoModel:t,coordSysModel:t,coordSys:n,coordSyses:[n],getPanelRect:Dz.geo})}))}},Cz=[function(t,e){var n=t.xAxisModel,i=t.yAxisModel,r=t.gridModel;return!r&&n&&(r=n.axis.grid.model),!r&&i&&(r=i.axis.grid.model),r&&r===e.gridModel},function(t,e){var n=t.geoModel;return n&&n===e.geoModel}],Dz={grid:function(){return this.coordSys.master.getRect().clone()},geo:function(){var t=this.coordSys,e=t.getBoundingRect().clone();return e.applyTransform(Nh(t)),e}},Az={lineX:H(kz,0),lineY:H(kz,1),rect:function(t,e,n,i){var r=t?e.pointToData([n[0][0],n[1][0]],i):e.dataToPoint([n[0][0],n[1][0]],i),o=t?e.pointToData([n[0][1],n[1][1]],i):e.dataToPoint([n[0][1],n[1][1]],i),a=[Mz([r[0],o[0]]),Mz([r[1],o[1]])];return{values:a,xyMinMax:a}},polygon:function(t,e,n,i){var r=[[1/0,-1/0],[1/0,-1/0]];return{values:z(n,(function(n){var o=t?e.pointToData(n,i):e.dataToPoint(n,i);return r[0][0]=Math.min(r[0][0],o[0]),r[1][0]=Math.min(r[1][0],o[1]),r[0][1]=Math.max(r[0][1],o[0]),r[1][1]=Math.max(r[1][1],o[1]),o})),xyMinMax:r}}};function kz(t,e,n,i){var r=n.getAxis(["x","y"][t]),o=Mz(z([0,1],(function(t){return e?r.coordToData(r.toLocalCoord(i[t]),!0):r.toGlobalCoord(r.dataToCoord(i[t]))}))),a=[];return a[t]=o,a[1-t]=[NaN,NaN],{values:o,xyMinMax:a}}var Lz={lineX:H(Pz,0),lineY:H(Pz,1),rect:function(t,e,n){return[[t[0][0]-n[0]*e[0][0],t[0][1]-n[0]*e[0][1]],[t[1][0]-n[1]*e[1][0],t[1][1]-n[1]*e[1][1]]]},polygon:function(t,e,n){return z(t,(function(t,i){return[t[0]-n[0]*e[i][0],t[1]-n[1]*e[i][1]]}))}};function Pz(t,e,n,i){return[e[0]-i[t]*n[0],e[1]-i[t]*n[1]]}function Oz(t){return t?[t[0][1]-t[0][0],t[1][1]-t[1][0]]:[NaN,NaN]}var Rz,Nz,Ez=E,zz=xo+"toolbox-dataZoom_",Vz=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.prototype.render=function(t,e,n,i){this._brushController||(this._brushController=new Yk(n.getZr()),this._brushController.on("brush",W(this._onBrush,this)).mount()),function(t,e,n,i,r){var o=n._isZoomActive;i&&"takeGlobalCursor"===i.type&&(o="dataZoomSelect"===i.key&&i.dataZoomSelectActive);n._isZoomActive=o,t.setIconStatus("zoom",o?"emphasis":"normal");var a=new Sz(Fz(t),e,{include:["grid"]}).makePanelOpts(r,(function(t){return t.xAxisDeclared&&!t.yAxisDeclared?"lineX":!t.xAxisDeclared&&t.yAxisDeclared?"lineY":"rect"}));n._brushController.setPanels(a).enableBrush(!(!o||!a.length)&&{brushType:"auto",brushStyle:t.getModel("brushStyle").getItemStyle()})}(t,e,this,i,n),function(t,e){t.setIconStatus("back",function(t){return _z(t).length}(e)>1?"emphasis":"normal")}(t,e)},e.prototype.onclick=function(t,e,n){Bz[n].call(this)},e.prototype.remove=function(t,e){this._brushController&&this._brushController.unmount()},e.prototype.dispose=function(t,e){this._brushController&&this._brushController.dispose()},e.prototype._onBrush=function(t){var e=t.areas;if(t.isEnd&&e.length){var n={},i=this.ecModel;this._brushController.updateCovers([]),new Sz(Fz(this.model),i,{include:["grid"]}).matchOutputRanges(e,i,(function(t,e,n){if("cartesian2d"===n.type){var i=t.brushType;"rect"===i?(r("x",n,e[0]),r("y",n,e[1])):r({lineX:"x",lineY:"y"}[i],n,e)}})),function(t,e){var n=_z(t);mz(e,(function(e,i){for(var r=n.length-1;r>=0&&!n[r][i];r--);if(r<0){var o=t.queryComponents({mainType:"dataZoom",subType:"select",id:i})[0];if(o){var a=o.getPercentRange();n[0][i]={dataZoomId:i,start:a[0],end:a[1]}}}})),n.push(e)}(i,n),this._dispatchZoomAction(n)}function r(t,e,r){var o=e.getAxis(t),a=o.model,s=function(t,e,n){var i;return n.eachComponent({mainType:"dataZoom",subType:"select"},(function(n){n.getAxisModel(t,e.componentIndex)&&(i=n)})),i}(t,a,i),l=s.findRepresentativeAxisProxy(a).getMinMaxSpan();null==l.minValueSpan&&null==l.maxValueSpan||(r=xk(0,r.slice(),o.scale.getExtent(),0,l.minValueSpan,l.maxValueSpan)),s&&(n[s.id]={dataZoomId:s.id,startValue:r[0],endValue:r[1]})}},e.prototype._dispatchZoomAction=function(t){var e=[];Ez(t,(function(t,n){e.push(T(t))})),e.length&&this.api.dispatchAction({type:"dataZoom",from:this.uid,batch:e})},e.getDefaultOption=function(t){return{show:!0,filterMode:"filter",icon:{zoom:"M0,13.5h26.9 M13.5,26.9V0 M32.1,13.5H58V58H13.5 V32.1",back:"M22,1.4L9.9,13.5l12.3,12.3 M10.3,13.5H54.9v44.6 H10.3v-26"},title:t.getLocaleModel().get(["toolbox","dataZoom","title"]),brushStyle:{borderWidth:0,color:"rgba(210,219,238,0.2)"}}},e}(QE),Bz={zoom:function(){var t=!this._isZoomActive;this.api.dispatchAction({type:"takeGlobalCursor",key:"dataZoomSelect",dataZoomSelectActive:t})},back:function(){this._dispatchZoomAction(function(t){var e=_z(t),n=e[e.length-1];e.length>1&&e.pop();var i={};return mz(n,(function(t,n){for(var r=e.length-1;r>=0;r--)if(t=e[r][n]){i[n]=t;break}})),i}(this.ecModel))}};function Fz(t){var e={xAxisIndex:t.get("xAxisIndex",!0),yAxisIndex:t.get("yAxisIndex",!0),xAxisId:t.get("xAxisId",!0),yAxisId:t.get("yAxisId",!0)};return null==e.xAxisIndex&&null==e.xAxisId&&(e.xAxisIndex="all"),null==e.yAxisIndex&&null==e.yAxisId&&(e.yAxisIndex="all"),e}Rz="dataZoom",Nz=function(t){var e=t.getComponent("toolbox",0),n=["feature","dataZoom"];if(e&&null!=e.get(n)){var i=e.getModel(n),r=[],o=Ro(t,Fz(i));return Ez(o.xAxisModels,(function(t){return a(t,"xAxis","xAxisIndex")})),Ez(o.yAxisModels,(function(t){return a(t,"yAxis","yAxisIndex")})),r}function a(t,e,n){var o=t.componentIndex,a={type:"select",$fromToolbox:!0,filterMode:i.get("filterMode",!0)||"filter",id:zz+e+o};a[n]=o,r.push(a)}},lt(null==ed.get(Rz)&&Nz),ed.set(Rz,Nz);var Gz=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.type="tooltip",e.dependencies=["axisPointer"],e.defaultOption={z:60,show:!0,showContent:!0,trigger:"item",triggerOn:"mousemove|click",alwaysShowContent:!1,displayMode:"single",renderMode:"auto",confine:null,showDelay:0,hideDelay:100,transitionDuration:.4,enterable:!1,backgroundColor:"#fff",shadowBlur:10,shadowColor:"rgba(0, 0, 0, .2)",shadowOffsetX:1,shadowOffsetY:2,borderRadius:4,borderWidth:1,padding:null,extraCssText:"",axisPointer:{type:"line",axis:"auto",animation:"auto",animationDurationUpdate:200,animationEasingUpdate:"exponentialOut",crossStyle:{color:"#999",width:1,type:"dashed",textStyle:{}}},textStyle:{color:"#666",fontSize:14}},e}(Op);function Wz(t){var e=t.get("confine");return null!=e?!!e:"richText"===t.get("renderMode")}function Hz(t){if(r.domSupported)for(var e=document.documentElement.style,n=0,i=t.length;n<i;n++)if(t[n]in e)return t[n]}var Yz=Hz(["transform","webkitTransform","OTransform","MozTransform","msTransform"]);function Uz(t,e){if(!t)return e;e=pp(e,!0);var n=t.indexOf(e);return(t=-1===n?e:"-"+t.slice(0,n)+"-"+e).toLowerCase()}var Xz=Uz(Hz(["webkitTransition","transition","OTransition","MozTransition","msTransition"]),"transition"),Zz=Uz(Yz,"transform"),jz="position:absolute;display:block;border-style:solid;white-space:nowrap;z-index:9999999;"+(r.transform3dSupported?"will-change:transform;":"");function qz(t,e,n){var i=t.toFixed(0)+"px",o=e.toFixed(0)+"px";if(!r.transformSupported)return n?"top:"+o+";left:"+i+";":[["top",o],["left",i]];var a=r.transform3dSupported,s="translate"+(a?"3d":"")+"("+i+","+o+(a?",0":"")+")";return n?"top:0;left:0;"+Zz+":"+s+";":[["top",0],["left",0],[Yz,s]]}function Kz(t,e,n){var i=[],o=t.get("transitionDuration"),a=t.get("backgroundColor"),s=t.get("shadowBlur"),l=t.get("shadowColor"),u=t.get("shadowOffsetX"),h=t.get("shadowOffsetY"),c=t.getModel("textStyle"),p=ug(t,"html"),d=u+"px "+h+"px "+s+"px "+l;return i.push("box-shadow:"+d),e&&o&&i.push(function(t,e){var n="cubic-bezier(0.23,1,0.32,1)",i=" "+t/2+"s "+n,o="opacity"+i+",visibility"+i;return e||(i=" "+t+"s "+n,o+=r.transformSupported?","+Zz+i:",left"+i+",top"+i),Xz+":"+o}(o,n)),a&&i.push("background-color:"+a),E(["width","color","radius"],(function(e){var n="border-"+e,r=pp(n),o=t.get(r);null!=o&&i.push(n+":"+o+("color"===e?"":"px"))})),i.push(function(t){var e=[],n=t.get("fontSize"),i=t.getTextColor();i&&e.push("color:"+i),e.push("font:"+t.getFont()),n&&e.push("line-height:"+Math.round(3*n/2)+"px");var r=t.get("textShadowColor"),o=t.get("textShadowBlur")||0,a=t.get("textShadowOffsetX")||0,s=t.get("textShadowOffsetY")||0;return r&&o&&e.push("text-shadow:"+a+"px "+s+"px "+o+"px "+r),E(["decoration","align"],(function(n){var i=t.get(n);i&&e.push("text-"+n+":"+i)})),e.join(";")}(c)),null!=p&&i.push("padding:"+dp(p).join("px ")+"px"),i.join(";")+";"}function $z(t,e,n,i,r){var o=e&&e.painter;if(n){var a=o&&o.getViewportRoot();a&&function(t,e,n,i,r){Qt(Jt,e,i,r,!0)&&Qt(t,n,Jt[0],Jt[1])}(t,a,document.body,i,r)}else{t[0]=i,t[1]=r;var s=o&&o.getViewportRootOffset();s&&(t[0]+=s.offsetLeft,t[1]+=s.offsetTop)}t[2]=t[0]/e.getWidth(),t[3]=t[1]/e.getHeight()}var Jz=function(){function t(t,e,n){if(this._show=!1,this._styleCoord=[0,0,0,0],this._enterable=!0,this._firstShow=!0,this._longHide=!0,r.wxa)return null;var i=document.createElement("div");i.domBelongToZr=!0,this.el=i;var o=this._zr=e.getZr(),a=this._appendToBody=n&&n.appendToBody;$z(this._styleCoord,o,a,e.getWidth()/2,e.getHeight()/2),a?document.body.appendChild(i):t.appendChild(i),this._container=t;var s=this;i.onmouseenter=function(){s._enterable&&(clearTimeout(s._hideTimeout),s._show=!0),s._inContent=!0},i.onmousemove=function(t){if(t=t||window.event,!s._enterable){var e=o.handler;he(o.painter.getViewportRoot(),t,!0),e.dispatch("mousemove",t)}},i.onmouseleave=function(){s._inContent=!1,s._enterable&&s._show&&s.hideLater(s._hideDelay)}}return t.prototype.update=function(t){var e,n,i,r=this._container,o=(n="position",(i=(e=r).currentStyle||document.defaultView&&document.defaultView.getComputedStyle(e))?n?i[n]:i:null),a=r.style;"absolute"!==a.position&&"absolute"!==o&&(a.position="relative"),t.get("alwaysShowContent")&&this._moveIfResized(),this.el.className=t.get("className")||""},t.prototype.show=function(t,e){clearTimeout(this._hideTimeout),clearTimeout(this._longHideTimeout);var n=this.el,i=n.style,r=this._styleCoord;n.innerHTML?i.cssText=jz+Kz(t,!this._firstShow,this._longHide)+qz(r[0],r[1],!0)+"border-color:"+xp(e)+";"+(t.get("extraCssText")||"")+";pointer-events:"+(this._enterable?"auto":"none"):i.display="none",this._show=!0,this._firstShow=!1,this._longHide=!1},t.prototype.setContent=function(t,e,n,i,r){var o=this.el;if(null!=t){var a="";if(X(r)&&"item"===n.get("trigger")&&!Wz(n)&&(a=function(t,e,n){if(!X(n)||"inside"===n)return"";var i=t.get("backgroundColor"),r=t.get("borderWidth");e=xp(e);var o,a,s="left"===(o=n)?"right":"right"===o?"left":"top"===o?"bottom":"top",l=Math.max(1.5*Math.round(r),6),u="",h=Zz+":";P(["left","right"],s)>-1?(u+="top:50%",h+="translateY(-50%) rotate("+(a="left"===s?-225:-45)+"deg)"):(u+="left:50%",h+="translateX(-50%) rotate("+(a="top"===s?225:45)+"deg)");var c=a*Math.PI/180,p=l+r,d=p*Math.abs(Math.cos(c))+p*Math.abs(Math.sin(c)),f=e+" solid "+r+"px;";return'<div style="'+["position:absolute;width:"+l+"px;height:"+l+"px;z-index:-1;",(u+=";"+s+":-"+Math.round(100*((d-Math.SQRT2*r)/2+Math.SQRT2*r-(d-p)/2))/100+"px")+";"+h+";","border-bottom:"+f,"border-right:"+f,"background-color:"+i+";"].join("")+'"></div>'}(n,i,r)),X(t))o.innerHTML=t+a;else if(t){o.innerHTML="",Y(t)||(t=[t]);for(var s=0;s<t.length;s++)J(t[s])&&t[s].parentNode!==o&&o.appendChild(t[s]);if(a&&o.childNodes.length){var l=document.createElement("div");l.innerHTML=a,o.appendChild(l)}}}else o.innerHTML=""},t.prototype.setEnterable=function(t){this._enterable=t},t.prototype.getSize=function(){var t=this.el;return[t.offsetWidth,t.offsetHeight]},t.prototype.moveTo=function(t,e){var n=this._styleCoord;if($z(n,this._zr,this._appendToBody,t,e),null!=n[0]&&null!=n[1]){var i=this.el.style;E(qz(n[0],n[1]),(function(t){i[t[0]]=t[1]}))}},t.prototype._moveIfResized=function(){var t=this._styleCoord[2],e=this._styleCoord[3];this.moveTo(t*this._zr.getWidth(),e*this._zr.getHeight())},t.prototype.hide=function(){var t=this,e=this.el.style;e.visibility="hidden",e.opacity="0",r.transform3dSupported&&(e.willChange=""),this._show=!1,this._longHideTimeout=setTimeout((function(){return t._longHide=!0}),500)},t.prototype.hideLater=function(t){!this._show||this._inContent&&this._enterable||(t?(this._hideDelay=t,this._show=!1,this._hideTimeout=setTimeout(W(this.hide,this),t)):this.hide())},t.prototype.isShow=function(){return this._show},t.prototype.dispose=function(){this.el.parentNode.removeChild(this.el)},t}(),Qz=function(){function t(t){this._show=!1,this._styleCoord=[0,0,0,0],this._enterable=!0,this._zr=t.getZr(),nV(this._styleCoord,this._zr,t.getWidth()/2,t.getHeight()/2)}return t.prototype.update=function(t){t.get("alwaysShowContent")&&this._moveIfResized()},t.prototype.show=function(){this._hideTimeout&&clearTimeout(this._hideTimeout),this.el.show(),this._show=!0},t.prototype.setContent=function(t,e,n,i,r){var o=this;q(t)&&yo(""),this.el&&this._zr.remove(this.el);var a=n.getModel("textStyle");this.el=new Bs({style:{rich:e.richTextStyles,text:t,lineHeight:22,borderWidth:1,borderColor:i,textShadowColor:a.get("textShadowColor"),fill:n.get(["textStyle","color"]),padding:ug(n,"richText"),verticalAlign:"top",align:"left"},z:n.get("z")}),E(["backgroundColor","borderRadius","shadowColor","shadowBlur","shadowOffsetX","shadowOffsetY"],(function(t){o.el.style[t]=n.get(t)})),E(["textShadowBlur","textShadowOffsetX","textShadowOffsetY"],(function(t){o.el.style[t]=a.get(t)||0})),this._zr.add(this.el);var s=this;this.el.on("mouseover",(function(){s._enterable&&(clearTimeout(s._hideTimeout),s._show=!0),s._inContent=!0})),this.el.on("mouseout",(function(){s._enterable&&s._show&&s.hideLater(s._hideDelay),s._inContent=!1}))},t.prototype.setEnterable=function(t){this._enterable=t},t.prototype.getSize=function(){var t=this.el,e=this.el.getBoundingRect(),n=eV(t.style);return[e.width+n.left+n.right,e.height+n.top+n.bottom]},t.prototype.moveTo=function(t,e){var n=this.el;if(n){var i=this._styleCoord;nV(i,this._zr,t,e),t=i[0],e=i[1];var r=n.style,o=tV(r.borderWidth||0),a=eV(r);n.x=t+o+a.left,n.y=e+o+a.top,n.markRedraw()}},t.prototype._moveIfResized=function(){var t=this._styleCoord[2],e=this._styleCoord[3];this.moveTo(t*this._zr.getWidth(),e*this._zr.getHeight())},t.prototype.hide=function(){this.el&&this.el.hide(),this._show=!1},t.prototype.hideLater=function(t){!this._show||this._inContent&&this._enterable||(t?(this._hideDelay=t,this._show=!1,this._hideTimeout=setTimeout(W(this.hide,this),t)):this.hide())},t.prototype.isShow=function(){return this._show},t.prototype.dispose=function(){this._zr.remove(this.el)},t}();function tV(t){return Math.max(0,t)}function eV(t){var e=tV(t.shadowBlur||0),n=tV(t.shadowOffsetX||0),i=tV(t.shadowOffsetY||0);return{left:tV(e-n),right:tV(e+n),top:tV(e-i),bottom:tV(e+i)}}function nV(t,e,n,i){t[0]=n,t[1]=i,t[2]=t[0]/e.getWidth(),t[3]=t[1]/e.getHeight()}var iV=new Es({shape:{x:-1,y:-1,width:2,height:2}}),rV=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.init=function(t,e){if(!r.node&&e.getDom()){var n,i=t.getComponent("tooltip"),o=this._renderMode="auto"===(n=i.get("renderMode"))?r.domSupported?"html":"richText":n||"html";this._tooltipContent="richText"===o?new Qz(e):new Jz(e.getDom(),e,{appendToBody:i.get("appendToBody",!0)})}},e.prototype.render=function(t,e,n){if(!r.node&&n.getDom()){this.group.removeAll(),this._tooltipModel=t,this._ecModel=e,this._api=n,this._alwaysShowContent=t.get("alwaysShowContent");var i=this._tooltipContent;i.update(t),i.setEnterable(t.get("enterable")),this._initGlobalListener(),this._keepShow(),"richText"!==this._renderMode&&t.get("transitionDuration")?Eg(this,"_updatePosition",50,"fixRate"):zg(this,"_updatePosition")}},e.prototype._initGlobalListener=function(){var t=this._tooltipModel.get("triggerOn");lN("itemTooltip",this._api,W((function(e,n,i){"none"!==t&&(t.indexOf(e)>=0?this._tryShow(n,i):"leave"===e&&this._hide(i))}),this))},e.prototype._keepShow=function(){var t=this._tooltipModel,e=this._ecModel,n=this._api,i=t.get("triggerOn");if(null!=this._lastX&&null!=this._lastY&&"none"!==i&&"click"!==i){var r=this;clearTimeout(this._refreshUpdateTimeout),this._refreshUpdateTimeout=setTimeout((function(){!n.isDisposed()&&r.manuallyShowTip(t,e,n,{x:r._lastX,y:r._lastY,dataByCoordSys:r._lastDataByCoordSys})}))}},e.prototype.manuallyShowTip=function(t,e,n,i){if(i.from!==this.uid&&!r.node&&n.getDom()){var o=aV(i,n);this._ticket="";var a=i.dataByCoordSys,s=function(t,e,n){var i=No(t).queryOptionMap,r=i.keys()[0];if(!r||"series"===r)return;var o,a=Vo(e,r,i.get(r),{useDefault:!1,enableAll:!1,enableNone:!1}).models[0];if(!a)return;if(n.getViewOfComponentModel(a).group.traverse((function(e){var n=Js(e).tooltipConfig;if(n&&n.name===t.name)return o=e,!0})),o)return{componentMainType:r,componentIndex:a.componentIndex,el:o}}(i,e,n);if(s){var l=s.el.getBoundingRect().clone();l.applyTransform(s.el.transform),this._tryShow({offsetX:l.x+l.width/2,offsetY:l.y+l.height/2,target:s.el,position:i.position,positionDefault:"bottom"},o)}else if(i.tooltip&&null!=i.x&&null!=i.y){var u=iV;u.x=i.x,u.y=i.y,u.update(),Js(u).tooltipConfig={name:null,option:i.tooltip},this._tryShow({offsetX:i.x,offsetY:i.y,target:u},o)}else if(a)this._tryShow({offsetX:i.x,offsetY:i.y,position:i.position,dataByCoordSys:a,tooltipOption:i.tooltipOption},o);else if(null!=i.seriesIndex){if(this._manuallyAxisShowTip(t,e,n,i))return;var h=dN(i,e),c=h.point[0],p=h.point[1];null!=c&&null!=p&&this._tryShow({offsetX:c,offsetY:p,target:h.el,position:i.position,positionDefault:"bottom"},o)}else null!=i.x&&null!=i.y&&(n.dispatchAction({type:"updateAxisPointer",x:i.x,y:i.y}),this._tryShow({offsetX:i.x,offsetY:i.y,position:i.position,target:n.getZr().findHover(i.x,i.y).target},o))}},e.prototype.manuallyHideTip=function(t,e,n,i){var r=this._tooltipContent;!this._alwaysShowContent&&this._tooltipModel&&r.hideLater(this._tooltipModel.get("hideDelay")),this._lastX=this._lastY=this._lastDataByCoordSys=null,i.from!==this.uid&&this._hide(aV(i,n))},e.prototype._manuallyAxisShowTip=function(t,e,n,i){var r=i.seriesIndex,o=i.dataIndex,a=e.getComponent("axisPointer").coordSysAxesInfo;if(null!=r&&null!=o&&null!=a){var s=e.getSeriesByIndex(r);if(s)if("axis"===oV([s.getData().getItemModel(o),s,(s.coordinateSystem||{}).model],this._tooltipModel).get("trigger"))return n.dispatchAction({type:"updateAxisPointer",seriesIndex:r,dataIndex:o,position:i.position}),!0}},e.prototype._tryShow=function(t,e){var n=t.target;if(this._tooltipModel){this._lastX=t.offsetX,this._lastY=t.offsetY;var i=t.dataByCoordSys;if(i&&i.length)this._showAxisTooltip(i,t);else if(n){var r,o;this._lastDataByCoordSys=null,Ty(n,(function(t){return null!=Js(t).dataIndex?(r=t,!0):null!=Js(t).tooltipConfig?(o=t,!0):void 0}),!0),r?this._showSeriesItemTooltip(t,r,e):o?this._showComponentItemTooltip(t,o,e):this._hide(e)}else this._lastDataByCoordSys=null,this._hide(e)}},e.prototype._showOrMove=function(t,e){var n=t.get("showDelay");e=W(e,this),clearTimeout(this._showTimout),n>0?this._showTimout=setTimeout(e,n):e()},e.prototype._showAxisTooltip=function(t,e){var n=this._ecModel,i=this._tooltipModel,r=[e.offsetX,e.offsetY],o=oV([e.tooltipOption],i),a=this._renderMode,s=[],l=Qf("section",{blocks:[],noHeader:!0}),u=[],h=new hg;E(t,(function(t){E(t.dataByAxis,(function(t){var e=n.getComponent(t.axisDim+"Axis",t.axisIndex),r=t.value;if(e&&null!=r){var o=qR(r,e.axis,n,t.seriesDataIndices,t.valueLabelOpt),c=Qf("section",{header:o,noHeader:!ut(o),sortBlocks:!0,blocks:[]});l.blocks.push(c),E(t.seriesDataIndices,(function(l){var p=n.getSeriesByIndex(l.seriesIndex),d=l.dataIndexInside,f=p.getDataParams(d);if(!(f.dataIndex<0)){f.axisDim=t.axisDim,f.axisIndex=t.axisIndex,f.axisType=t.axisType,f.axisId=t.axisId,f.axisValue=d_(e.axis,{value:r}),f.axisValueLabel=o,f.marker=h.makeTooltipMarker("item",xp(f.color),a);var g=yf(p.formatTooltip(d,!0,null)),y=g.frag;if(y){var v=oV([p],i).get("valueFormatter");c.blocks.push(v?A({valueFormatter:v},y):y)}g.text&&u.push(g.text),s.push(f)}}))}}))})),l.blocks.reverse(),u.reverse();var c=e.position,p=o.get("order"),d=og(l,h,a,p,n.get("useUTC"),o.get("textStyle"));d&&u.unshift(d);var f="richText"===a?"\n\n":"<br/>",g=u.join(f);this._showOrMove(o,(function(){this._updateContentNotChangedOnAxis(t,s)?this._updatePosition(o,c,r[0],r[1],this._tooltipContent,s):this._showTooltipContent(o,g,s,Math.random()+"",r[0],r[1],c,null,h)}))},e.prototype._showSeriesItemTooltip=function(t,e,n){var i=this._ecModel,r=Js(e),o=r.seriesIndex,a=i.getSeriesByIndex(o),s=r.dataModel||a,l=r.dataIndex,u=r.dataType,h=s.getData(u),c=this._renderMode,p=t.positionDefault,d=oV([h.getItemModel(l),s,a&&(a.coordinateSystem||{}).model],this._tooltipModel,p?{position:p}:null),f=d.get("trigger");if(null==f||"item"===f){var g=s.getDataParams(l,u),y=new hg;g.marker=y.makeTooltipMarker("item",xp(g.color),c);var v=yf(s.formatTooltip(l,!1,u)),m=d.get("order"),x=d.get("valueFormatter"),_=v.frag,b=_?og(x?A({valueFormatter:x},_):_,y,c,m,i.get("useUTC"),d.get("textStyle")):v.text,w="item_"+s.name+"_"+l;this._showOrMove(d,(function(){this._showTooltipContent(d,b,g,w,t.offsetX,t.offsetY,t.position,t.target,y)})),n({type:"showTip",dataIndexInside:l,dataIndex:h.getRawIndex(l),seriesIndex:o,from:this.uid})}},e.prototype._showComponentItemTooltip=function(t,e,n){var i=Js(e),r=i.tooltipConfig.option||{};if(X(r)){r={content:r,formatter:r}}var o=[r],a=this._ecModel.getComponent(i.componentMainType,i.componentIndex);a&&o.push(a),o.push({formatter:r.content});var s=t.positionDefault,l=oV(o,this._tooltipModel,s?{position:s}:null),u=l.get("content"),h=Math.random()+"",c=new hg;this._showOrMove(l,(function(){var n=T(l.get("formatterParams")||{});this._showTooltipContent(l,u,n,h,t.offsetX,t.offsetY,t.position,e,c)})),n({type:"showTip",from:this.uid})},e.prototype._showTooltipContent=function(t,e,n,i,r,o,a,s,l){if(this._ticket="",t.get("showContent")&&t.get("show")){var u=this._tooltipContent;u.setEnterable(t.get("enterable"));var h=t.get("formatter");a=a||t.get("position");var c=e,p=this._getNearestPoint([r,o],n,t.get("trigger"),t.get("borderColor")).color;if(h)if(X(h)){var d=t.ecModel.get("useUTC"),f=Y(n)?n[0]:n;c=h,f&&f.axisType&&f.axisType.indexOf("time")>=0&&(c=jc(f.axisValue,c,d)),c=vp(c,n,!0)}else if(U(h)){var g=W((function(e,i){e===this._ticket&&(u.setContent(i,l,t,p,a),this._updatePosition(t,a,r,o,u,n,s))}),this);this._ticket=i,c=h(n,i,g)}else c=h;u.setContent(c,l,t,p,a),u.show(t,p),this._updatePosition(t,a,r,o,u,n,s)}},e.prototype._getNearestPoint=function(t,e,n,i){return"axis"===n||Y(e)?{color:i||("html"===this._renderMode?"#fff":"none")}:Y(e)?void 0:{color:i||e.color||e.borderColor}},e.prototype._updatePosition=function(t,e,n,i,r,o,a){var s=this._api.getWidth(),l=this._api.getHeight();e=e||t.get("position");var u=r.getSize(),h=t.get("align"),c=t.get("verticalAlign"),p=a&&a.getBoundingRect().clone();if(a&&p.applyTransform(a.transform),U(e)&&(e=e([n,i],o,r.el,p,{viewSize:[s,l],contentSize:u.slice()})),Y(e))n=Ur(e[0],s),i=Ur(e[1],l);else if(q(e)){var d=e;d.width=u[0],d.height=u[1];var f=Tp(d,{width:s,height:l});n=f.x,i=f.y,h=null,c=null}else if(X(e)&&a){var g=function(t,e,n,i){var r=n[0],o=n[1],a=Math.ceil(Math.SQRT2*i)+8,s=0,l=0,u=e.width,h=e.height;switch(t){case"inside":s=e.x+u/2-r/2,l=e.y+h/2-o/2;break;case"top":s=e.x+u/2-r/2,l=e.y-o-a;break;case"bottom":s=e.x+u/2-r/2,l=e.y+h+a;break;case"left":s=e.x-r-a,l=e.y+h/2-o/2;break;case"right":s=e.x+u+a,l=e.y+h/2-o/2}return[s,l]}(e,p,u,t.get("borderWidth"));n=g[0],i=g[1]}else{g=function(t,e,n,i,r,o,a){var s=n.getSize(),l=s[0],u=s[1];null!=o&&(t+l+o+2>i?t-=l+o:t+=o);null!=a&&(e+u+a>r?e-=u+a:e+=a);return[t,e]}(n,i,r,s,l,h?null:20,c?null:20);n=g[0],i=g[1]}if(h&&(n-=sV(h)?u[0]/2:"right"===h?u[0]:0),c&&(i-=sV(c)?u[1]/2:"bottom"===c?u[1]:0),Wz(t)){g=function(t,e,n,i,r){var o=n.getSize(),a=o[0],s=o[1];return t=Math.min(t+a,i)-a,e=Math.min(e+s,r)-s,t=Math.max(t,0),e=Math.max(e,0),[t,e]}(n,i,r,s,l);n=g[0],i=g[1]}r.moveTo(n,i)},e.prototype._updateContentNotChangedOnAxis=function(t,e){var n=this._lastDataByCoordSys,i=this._cbParamsList,r=!!n&&n.length===t.length;return r&&E(n,(function(n,o){var a=n.dataByAxis||[],s=(t[o]||{}).dataByAxis||[];(r=r&&a.length===s.length)&&E(a,(function(t,n){var o=s[n]||{},a=t.seriesDataIndices||[],l=o.seriesDataIndices||[];(r=r&&t.value===o.value&&t.axisType===o.axisType&&t.axisId===o.axisId&&a.length===l.length)&&E(a,(function(t,e){var n=l[e];r=r&&t.seriesIndex===n.seriesIndex&&t.dataIndex===n.dataIndex})),i&&E(t.seriesDataIndices,(function(t){var n=t.seriesIndex,o=e[n],a=i[n];o&&a&&a.data!==o.data&&(r=!1)}))}))})),this._lastDataByCoordSys=t,this._cbParamsList=e,!!r},e.prototype._hide=function(t){this._lastDataByCoordSys=null,t({type:"hideTip",from:this.uid})},e.prototype.dispose=function(t,e){!r.node&&e.getDom()&&(zg(this,"_updatePosition"),this._tooltipContent.dispose(),cN("itemTooltip",e))},e.type="tooltip",e}(wg);function oV(t,e,n){var i,r=e.ecModel;n?(i=new Sc(n,r,r),i=new Sc(e.option,i,r)):i=e;for(var o=t.length-1;o>=0;o--){var a=t[o];a&&(a instanceof Sc&&(a=a.get("tooltip",!0)),X(a)&&(a={formatter:a}),a&&(i=new Sc(a,i,r)))}return i}function aV(t,e){return t.dispatchAction||W(e.dispatchAction,e)}function sV(t){return"center"===t||"middle"===t}var lV=["rect","polygon","keep","clear"];function uV(t,e){var n=_o(t?t.brush:[]);if(n.length){var i=[];E(n,(function(t){var e=t.hasOwnProperty("toolbox")?t.toolbox:[];e instanceof Array&&(i=i.concat(e))}));var r=t&&t.toolbox;Y(r)&&(r=r[0]),r||(r={feature:{}},t.toolbox=[r]);var o=r.feature||(r.feature={}),a=o.brush||(o.brush={}),s=a.type||(a.type=[]);s.push.apply(s,i),function(t){var e={};E(t,(function(t){e[t]=1})),t.length=0,E(e,(function(e,n){t.push(n)}))}(s),e&&!s.length&&s.push.apply(s,lV)}}var hV=E;function cV(t){if(t)for(var e in t)if(t.hasOwnProperty(e))return!0}function pV(t,e,n){var i={};return hV(e,(function(e){var r,o=i[e]=((r=function(){}).prototype.__hidden=r.prototype,new r);hV(t[e],(function(t,i){if(dD.isValidType(i)){var r={type:i,visual:t};n&&n(r,e),o[i]=new dD(r),"opacity"===i&&((r=T(r)).type="colorAlpha",o.__hidden.__alphaForOpacity=new dD(r))}}))})),i}function dV(t,e,n){var i;E(n,(function(t){e.hasOwnProperty(t)&&cV(e[t])&&(i=!0)})),i&&E(n,(function(n){e.hasOwnProperty(n)&&cV(e[n])?t[n]=T(e[n]):delete t[n]}))}var fV={lineX:gV(0),lineY:gV(1),rect:{point:function(t,e,n){return t&&n.boundingRect.contain(t[0],t[1])},rect:function(t,e,n){return t&&n.boundingRect.intersect(t)}},polygon:{point:function(t,e,n){return t&&n.boundingRect.contain(t[0],t[1])&&w_(n.range,t[0],t[1])},rect:function(t,e,n){var i=n.range;if(!t||i.length<=1)return!1;var r=t.x,o=t.y,a=t.width,s=t.height,l=i[0];return!!(w_(i,r,o)||w_(i,r+a,o)||w_(i,r,o+s)||w_(i,r+a,o+s)||Ee.create(t).contain(l[0],l[1])||Hh(r,o,r+a,o,i)||Hh(r,o,r,o+s,i)||Hh(r+a,o,r+a,o+s,i)||Hh(r,o+s,r+a,o+s,i))||void 0}}};function gV(t){var e=["x","y"],n=["width","height"];return{point:function(e,n,i){if(e){var r=i.range;return yV(e[t],r)}},rect:function(i,r,o){if(i){var a=o.range,s=[i[e[t]],i[e[t]]+i[n[t]]];return s[1]<s[0]&&s.reverse(),yV(s[0],a)||yV(s[1],a)||yV(a[0],s)||yV(a[1],s)}}}}function yV(t,e){return e[0]<=t&&t<=e[1]}var vV=["inBrush","outOfBrush"],mV="__ecBrushSelect",xV="__ecInBrushSelectEvent";function _V(t){t.eachComponent({mainType:"brush"},(function(e){(e.brushTargetManager=new Sz(e.option,t)).setInputRanges(e.areas,t)}))}function bV(t,e,n){var i,r,o=[];t.eachComponent({mainType:"brush"},(function(t){n&&"takeGlobalCursor"===n.type&&t.setBrushOption("brush"===n.key?n.brushOption:{brushType:!1})})),_V(t),t.eachComponent({mainType:"brush"},(function(e,n){var a={brushId:e.id,brushIndex:n,brushName:e.name,areas:T(e.areas),selected:[]};o.push(a);var s=e.option,l=s.brushLink,u=[],h=[],c=[],p=!1;n||(i=s.throttleType,r=s.throttleDelay);var d=z(e.areas,(function(t){var e=MV[t.brushType],n=k({boundingRect:e?e(t):void 0},t);return n.selectors=function(t){var e=t.brushType,n={point:function(i){return fV[e].point(i,n,t)},rect:function(i){return fV[e].rect(i,n,t)}};return n}(n),n})),f=pV(e.option,vV,(function(t){t.mappingMethod="fixed"}));function g(t){return"all"===l||!!u[t]}function y(t){return!!t.length}Y(l)&&E(l,(function(t){u[t]=1})),t.eachSeries((function(n,i){var r=c[i]=[];"parallel"===n.subType?function(t,e){var n=t.coordinateSystem;p=p||n.hasAxisBrushed(),g(e)&&n.eachActiveState(t.getData(),(function(t,e){"active"===t&&(h[e]=1)}))}(n,i):function(n,i,r){if(!n.brushSelector||function(t,e){var n=t.option.seriesIndex;return null!=n&&"all"!==n&&(Y(n)?P(n,e)<0:e!==n)}(e,i))return;if(E(d,(function(i){e.brushTargetManager.controlSeries(i,n,t)&&r.push(i),p=p||y(r)})),g(i)&&y(r)){var o=n.getData();o.each((function(t){SV(n,r,o,t)&&(h[t]=1)}))}}(n,i,r)})),t.eachSeries((function(t,e){var n={seriesId:t.id,seriesIndex:e,seriesName:t.name,dataIndex:[]};a.selected.push(n);var i=c[e],r=t.getData(),o=g(e)?function(t){return h[t]?(n.dataIndex.push(r.getRawIndex(t)),"inBrush"):"outOfBrush"}:function(e){return SV(t,i,r,e)?(n.dataIndex.push(r.getRawIndex(e)),"inBrush"):"outOfBrush"};(g(e)?p:y(i))&&function(t,e,n,i,r,o){var a,s={};function l(t){return by(n,a,t)}function u(t,e){Sy(n,a,t,e)}function h(t,h){a=null==o?t:h;var c=n.getRawDataItem(a);if(!c||!1!==c.visualMap)for(var p=i.call(r,t),d=e[p],f=s[p],g=0,y=f.length;g<y;g++){var v=f[g];d[v]&&d[v].applyVisual(t,l,u)}}E(t,(function(t){var n=dD.prepareVisualTypes(e[t]);s[t]=n})),null==o?n.each(h):n.each([o],h)}(vV,f,r,o)}))})),function(t,e,n,i,r){if(!r)return;var o=t.getZr();if(o[xV])return;o.__ecBrushSelect||(o.__ecBrushSelect=wV);Eg(o,mV,n,e)(t,i)}(e,i,r,o,n)}function wV(t,e){if(!t.isDisposed()){var n=t.getZr();n[xV]=!0,t.dispatchAction({type:"brushSelect",batch:e}),n[xV]=!1}}function SV(t,e,n,i){for(var r=0,o=e.length;r<o;r++){var a=e[r];if(t.brushSelector(i,n,a.selectors,a))return!0}}var MV={rect:function(t){return IV(t.range)},polygon:function(t){for(var e,n=t.range,i=0,r=n.length;i<r;i++){e=e||[[1/0,-1/0],[1/0,-1/0]];var o=n[i];o[0]<e[0][0]&&(e[0][0]=o[0]),o[0]>e[0][1]&&(e[0][1]=o[0]),o[1]<e[1][0]&&(e[1][0]=o[1]),o[1]>e[1][1]&&(e[1][1]=o[1])}return e&&IV(e)}};function IV(t){return new Ee(t[0][0],t[1][0],t[0][1]-t[0][0],t[1][1]-t[1][0])}var TV=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.init=function(t,e){this.ecModel=t,this.api=e,this.model,(this._brushController=new Yk(e.getZr())).on("brush",W(this._onBrush,this)).mount()},e.prototype.render=function(t,e,n,i){this.model=t,this._updateController(t,e,n,i)},e.prototype.updateTransform=function(t,e,n,i){_V(e),this._updateController(t,e,n,i)},e.prototype.updateVisual=function(t,e,n,i){this.updateTransform(t,e,n,i)},e.prototype.updateView=function(t,e,n,i){this._updateController(t,e,n,i)},e.prototype._updateController=function(t,e,n,i){(!i||i.$from!==t.id)&&this._brushController.setPanels(t.brushTargetManager.makePanelOpts(n)).enableBrush(t.brushOption).updateCovers(t.areas.slice())},e.prototype.dispose=function(){this._brushController.dispose()},e.prototype._onBrush=function(t){var e=this.model.id,n=this.model.brushTargetManager.setOutputRanges(t.areas,this.ecModel);(!t.isEnd||t.removeOnClick)&&this.api.dispatchAction({type:"brush",brushId:e,areas:T(n),$from:e}),t.isEnd&&this.api.dispatchAction({type:"brushEnd",brushId:e,areas:T(n),$from:e})},e.type="brush",e}(wg),CV=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.areas=[],n.brushOption={},n}return n(e,t),e.prototype.optionUpdated=function(t,e){var n=this.option;!e&&dV(n,t,["inBrush","outOfBrush"]);var i=n.inBrush=n.inBrush||{};n.outOfBrush=n.outOfBrush||{color:"#ddd"},i.hasOwnProperty("liftZ")||(i.liftZ=5)},e.prototype.setAreas=function(t){t&&(this.areas=z(t,(function(t){return DV(this.option,t)}),this))},e.prototype.setBrushOption=function(t){this.brushOption=DV(this.option,t),this.brushType=this.brushOption.brushType},e.type="brush",e.dependencies=["geo","grid","xAxis","yAxis","parallel","series"],e.defaultOption={seriesIndex:"all",brushType:"rect",brushMode:"single",transformable:!0,brushStyle:{borderWidth:1,color:"rgba(210,219,238,0.3)",borderColor:"#D2DBEE"},throttleType:"fixRate",throttleDelay:0,removeOnClick:!0,z:1e4},e}(Op);function DV(t,e){return C({brushType:t.brushType,brushMode:t.brushMode,transformable:t.transformable,brushStyle:new Sc(t.brushStyle).getItemStyle(),removeOnClick:t.removeOnClick,z:t.z},e,!0)}var AV=["rect","polygon","lineX","lineY","keep","clear"],kV=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return n(e,t),e.prototype.render=function(t,e,n){var i,r,o;e.eachComponent({mainType:"brush"},(function(t){i=t.brushType,r=t.brushOption.brushMode||"single",o=o||!!t.areas.length})),this._brushType=i,this._brushMode=r,E(t.get("type",!0),(function(e){t.setIconStatus(e,("keep"===e?"multiple"===r:"clear"===e?o:e===i)?"emphasis":"normal")}))},e.prototype.updateView=function(t,e,n){this.render(t,e,n)},e.prototype.getIcons=function(){var t=this.model,e=t.get("icon",!0),n={};return E(t.get("type",!0),(function(t){e[t]&&(n[t]=e[t])})),n},e.prototype.onclick=function(t,e,n){var i=this._brushType,r=this._brushMode;"clear"===n?(e.dispatchAction({type:"axisAreaSelect",intervals:[]}),e.dispatchAction({type:"brush",command:"clear",areas:[]})):e.dispatchAction({type:"takeGlobalCursor",key:"brush",brushOption:{brushType:"keep"===n?i:i!==n&&n,brushMode:"keep"===n?"multiple"===r?"single":"multiple":r}})},e.getDefaultOption=function(t){return{show:!0,type:AV.slice(),icon:{rect:"M7.3,34.7 M0.4,10V-0.2h9.8 M89.6,10V-0.2h-9.8 M0.4,60v10.2h9.8 M89.6,60v10.2h-9.8 M12.3,22.4V10.5h13.1 M33.6,10.5h7.8 M49.1,10.5h7.8 M77.5,22.4V10.5h-13 M12.3,31.1v8.2 M77.7,31.1v8.2 M12.3,47.6v11.9h13.1 M33.6,59.5h7.6 M49.1,59.5 h7.7 M77.5,47.6v11.9h-13",polygon:"M55.2,34.9c1.7,0,3.1,1.4,3.1,3.1s-1.4,3.1-3.1,3.1 s-3.1-1.4-3.1-3.1S53.5,34.9,55.2,34.9z M50.4,51c1.7,0,3.1,1.4,3.1,3.1c0,1.7-1.4,3.1-3.1,3.1c-1.7,0-3.1-1.4-3.1-3.1 C47.3,52.4,48.7,51,50.4,51z M55.6,37.1l1.5-7.8 M60.1,13.5l1.6-8.7l-7.8,4 M59,19l-1,5.3 M24,16.1l6.4,4.9l6.4-3.3 M48.5,11.6 l-5.9,3.1 M19.1,12.8L9.7,5.1l1.1,7.7 M13.4,29.8l1,7.3l6.6,1.6 M11.6,18.4l1,6.1 M32.8,41.9 M26.6,40.4 M27.3,40.2l6.1,1.6 M49.9,52.1l-5.6-7.6l-4.9-1.2",lineX:"M15.2,30 M19.7,15.6V1.9H29 M34.8,1.9H40.4 M55.3,15.6V1.9H45.9 M19.7,44.4V58.1H29 M34.8,58.1H40.4 M55.3,44.4 V58.1H45.9 M12.5,20.3l-9.4,9.6l9.6,9.8 M3.1,29.9h16.5 M62.5,20.3l9.4,9.6L62.3,39.7 M71.9,29.9H55.4",lineY:"M38.8,7.7 M52.7,12h13.2v9 M65.9,26.6V32 M52.7,46.3h13.2v-9 M24.9,12H11.8v9 M11.8,26.6V32 M24.9,46.3H11.8v-9 M48.2,5.1l-9.3-9l-9.4,9.2 M38.9-3.9V12 M48.2,53.3l-9.3,9l-9.4-9.2 M38.9,62.3V46.4",keep:"M4,10.5V1h10.3 M20.7,1h6.1 M33,1h6.1 M55.4,10.5V1H45.2 M4,17.3v6.6 M55.6,17.3v6.6 M4,30.5V40h10.3 M20.7,40 h6.1 M33,40h6.1 M55.4,30.5V40H45.2 M21,18.9h62.9v48.6H21V18.9z",clear:"M22,14.7l30.9,31 M52.9,14.7L22,45.7 M4.7,16.8V4.2h13.1 M26,4.2h7.8 M41.6,4.2h7.8 M70.3,16.8V4.2H57.2 M4.7,25.9v8.6 M70.3,25.9v8.6 M4.7,43.2v12.6h13.1 M26,55.8h7.8 M41.6,55.8h7.8 M70.3,43.2v12.6H57.2"},title:t.getLocaleModel().get(["toolbox","brush","title"])}},e}(QE);var LV=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.layoutMode={type:"box",ignoreSize:!0},n}return n(e,t),e.type="title",e.defaultOption={z:6,show:!0,text:"",target:"blank",subtext:"",subtarget:"blank",left:0,top:0,backgroundColor:"rgba(0,0,0,0)",borderColor:"#ccc",borderWidth:0,padding:5,itemGap:10,textStyle:{fontSize:18,fontWeight:"bold",color:"#464646"},subtextStyle:{fontSize:12,color:"#6E7079"}},e}(Op),PV=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.render=function(t,e,n){if(this.group.removeAll(),t.get("show")){var i=this.group,r=t.getModel("textStyle"),o=t.getModel("subtextStyle"),a=t.get("textAlign"),s=rt(t.get("textBaseline"),t.get("textVerticalAlign")),l=new Bs({style:ec(r,{text:t.get("text"),fill:r.getTextColor()},{disableBox:!0}),z2:10}),u=l.getBoundingRect(),h=t.get("subtext"),c=new Bs({style:ec(o,{text:h,fill:o.getTextColor(),y:u.height+t.get("itemGap"),verticalAlign:"top"},{disableBox:!0}),z2:10}),p=t.get("link"),d=t.get("sublink"),f=t.get("triggerEvent",!0);l.silent=!p&&!f,c.silent=!d&&!f,p&&l.on("click",(function(){_p(p,"_"+t.get("target"))})),d&&c.on("click",(function(){_p(d,"_"+t.get("subtarget"))})),Js(l).eventData=Js(c).eventData=f?{componentType:"title",componentIndex:t.componentIndex}:null,i.add(l),h&&i.add(c);var g=i.getBoundingRect(),y=t.getBoxLayoutParams();y.width=g.width,y.height=g.height;var v=Tp(y,{width:n.getWidth(),height:n.getHeight()},t.get("padding"));a||("middle"===(a=t.get("left")||t.get("right"))&&(a="center"),"right"===a?v.x+=v.width:"center"===a&&(v.x+=v.width/2)),s||("center"===(s=t.get("top")||t.get("bottom"))&&(s="middle"),"bottom"===s?v.y+=v.height:"middle"===s&&(v.y+=v.height/2),s=s||"top"),i.x=v.x,i.y=v.y,i.markRedraw();var m={align:a,verticalAlign:s};l.setStyle(m),c.setStyle(m),g=i.getBoundingRect();var x=v.margin,_=t.getItemStyle(["color","opacity"]);_.fill=t.get("backgroundColor");var b=new Es({shape:{x:g.x-x[3],y:g.y-x[0],width:g.width+x[1]+x[3],height:g.height+x[0]+x[2],r:t.get("borderRadius")},style:_,subPixelOptimize:!0,silent:!0});i.add(b)}},e.type="title",e}(wg);var OV=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.layoutMode="box",n}return n(e,t),e.prototype.init=function(t,e,n){this.mergeDefaultAndTheme(t,n),this._initData()},e.prototype.mergeOption=function(e){t.prototype.mergeOption.apply(this,arguments),this._initData()},e.prototype.setCurrentIndex=function(t){null==t&&(t=this.option.currentIndex);var e=this._data.count();this.option.loop?t=(t%e+e)%e:(t>=e&&(t=e-1),t<0&&(t=0)),this.option.currentIndex=t},e.prototype.getCurrentIndex=function(){return this.option.currentIndex},e.prototype.isIndexMax=function(){return this.getCurrentIndex()>=this._data.count()-1},e.prototype.setPlayState=function(t){this.option.autoPlay=!!t},e.prototype.getPlayState=function(){return!!this.option.autoPlay},e.prototype._initData=function(){var t,e=this.option,n=e.data||[],i=e.axisType,r=this._names=[];"category"===i?(t=[],E(n,(function(e,n){var i,o=Do(So(e),"");q(e)?(i=T(e)).value=n:i=n,t.push(i),r.push(o)}))):t=n;var o={category:"ordinal",time:"time",value:"number"}[i]||"number";(this._data=new ex([{name:"value",type:o}],this)).initData(t,r)},e.prototype.getData=function(){return this._data},e.prototype.getCategories=function(){if("category"===this.get("axisType"))return this._names.slice()},e.type="timeline",e.defaultOption={z:4,show:!0,axisType:"time",realtime:!0,left:"20%",top:null,right:"20%",bottom:0,width:null,height:40,padding:5,controlPosition:"left",autoPlay:!1,rewind:!1,loop:!0,playInterval:2e3,currentIndex:0,itemStyle:{},label:{color:"#000"},data:[]},e}(Op),RV=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.type="timeline.slider",e.defaultOption=Tc(OV.defaultOption,{backgroundColor:"rgba(0,0,0,0)",borderColor:"#ccc",borderWidth:0,orient:"horizontal",inverse:!1,tooltip:{trigger:"item"},symbol:"circle",symbolSize:12,lineStyle:{show:!0,width:2,color:"#DAE1F5"},label:{position:"auto",show:!0,interval:"auto",rotate:0,color:"#A4B1D7"},itemStyle:{color:"#A4B1D7",borderWidth:1},checkpointStyle:{symbol:"circle",symbolSize:15,color:"#316bf3",borderColor:"#fff",borderWidth:2,shadowBlur:2,shadowOffsetX:1,shadowOffsetY:1,shadowColor:"rgba(0, 0, 0, 0.3)",animation:!0,animationDuration:300,animationEasing:"quinticInOut"},controlStyle:{show:!0,showPlayBtn:!0,showPrevBtn:!0,showNextBtn:!0,itemSize:24,itemGap:12,position:"left",playIcon:"path://M31.6,53C17.5,53,6,41.5,6,27.4S17.5,1.8,31.6,1.8C45.7,1.8,57.2,13.3,57.2,27.4S45.7,53,31.6,53z M31.6,3.3 C18.4,3.3,7.5,14.1,7.5,27.4c0,13.3,10.8,24.1,24.1,24.1C44.9,51.5,55.7,40.7,55.7,27.4C55.7,14.1,44.9,3.3,31.6,3.3z M24.9,21.3 c0-2.2,1.6-3.1,3.5-2l10.5,6.1c1.899,1.1,1.899,2.9,0,4l-10.5,6.1c-1.9,1.1-3.5,0.2-3.5-2V21.3z",stopIcon:"path://M30.9,53.2C16.8,53.2,5.3,41.7,5.3,27.6S16.8,2,30.9,2C45,2,56.4,13.5,56.4,27.6S45,53.2,30.9,53.2z M30.9,3.5C17.6,3.5,6.8,14.4,6.8,27.6c0,13.3,10.8,24.1,24.101,24.1C44.2,51.7,55,40.9,55,27.6C54.9,14.4,44.1,3.5,30.9,3.5z M36.9,35.8c0,0.601-0.4,1-0.9,1h-1.3c-0.5,0-0.9-0.399-0.9-1V19.5c0-0.6,0.4-1,0.9-1H36c0.5,0,0.9,0.4,0.9,1V35.8z M27.8,35.8 c0,0.601-0.4,1-0.9,1h-1.3c-0.5,0-0.9-0.399-0.9-1V19.5c0-0.6,0.4-1,0.9-1H27c0.5,0,0.9,0.4,0.9,1L27.8,35.8L27.8,35.8z",nextIcon:"M2,18.5A1.52,1.52,0,0,1,.92,18a1.49,1.49,0,0,1,0-2.12L7.81,9.36,1,3.11A1.5,1.5,0,1,1,3,.89l8,7.34a1.48,1.48,0,0,1,.49,1.09,1.51,1.51,0,0,1-.46,1.1L3,18.08A1.5,1.5,0,0,1,2,18.5Z",prevIcon:"M10,.5A1.52,1.52,0,0,1,11.08,1a1.49,1.49,0,0,1,0,2.12L4.19,9.64,11,15.89a1.5,1.5,0,1,1-2,2.22L1,10.77A1.48,1.48,0,0,1,.5,9.68,1.51,1.51,0,0,1,1,8.58L9,.92A1.5,1.5,0,0,1,10,.5Z",prevBtnSize:18,nextBtnSize:18,color:"#A4B1D7",borderColor:"#A4B1D7",borderWidth:1},emphasis:{label:{show:!0,color:"#6f778d"},itemStyle:{color:"#316BF3"},controlStyle:{color:"#316BF3",borderColor:"#316BF3",borderWidth:2}},progress:{lineStyle:{color:"#316BF3"},itemStyle:{color:"#316BF3"},label:{color:"#6f778d"}},data:[]}),e}(OV);R(RV,gf.prototype);var NV=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.type="timeline",e}(wg),EV=function(t){function e(e,n,i,r){var o=t.call(this,e,n,i)||this;return o.type=r||"value",o}return n(e,t),e.prototype.getLabelModel=function(){return this.model.getModel("label")},e.prototype.isHorizontal=function(){return"horizontal"===this.model.get("orient")},e}(q_),zV=Math.PI,VV=Po(),BV=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.init=function(t,e){this.api=e},e.prototype.render=function(t,e,n){if(this.model=t,this.api=n,this.ecModel=e,this.group.removeAll(),t.get("show",!0)){var i=this._layout(t,n),r=this._createGroup("_mainGroup"),o=this._createGroup("_labelGroup"),a=this._axis=this._createAxis(i,t);t.formatTooltip=function(t){return Qf("nameValue",{noName:!0,value:a.scale.getLabel({value:t})})},E(["AxisLine","AxisTick","Control","CurrentPointer"],(function(e){this["_render"+e](i,r,a,t)}),this),this._renderAxisLabel(i,o,a,t),this._position(i,t)}this._doPlayStop(),this._updateTicksStatus()},e.prototype.remove=function(){this._clearTimer(),this.group.removeAll()},e.prototype.dispose=function(){this._clearTimer()},e.prototype._layout=function(t,e){var n,i,r,o,a=t.get(["label","position"]),s=t.get("orient"),l=function(t,e){return Tp(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()},t.get("padding"))}(t,e),u={horizontal:"center",vertical:(n=null==a||"auto"===a?"horizontal"===s?l.y+l.height/2<e.getHeight()/2?"-":"+":l.x+l.width/2<e.getWidth()/2?"+":"-":X(a)?{horizontal:{top:"-",bottom:"+"},vertical:{left:"-",right:"+"}}[s][a]:a)>=0||"+"===n?"left":"right"},h={horizontal:n>=0||"+"===n?"top":"bottom",vertical:"middle"},c={horizontal:0,vertical:zV/2},p="vertical"===s?l.height:l.width,d=t.getModel("controlStyle"),f=d.get("show",!0),g=f?d.get("itemSize"):0,y=f?d.get("itemGap"):0,v=g+y,m=t.get(["label","rotate"])||0;m=m*zV/180;var x=d.get("position",!0),_=f&&d.get("showPlayBtn",!0),b=f&&d.get("showPrevBtn",!0),w=f&&d.get("showNextBtn",!0),S=0,M=p;"left"===x||"bottom"===x?(_&&(i=[0,0],S+=v),b&&(r=[S,0],S+=v),w&&(o=[M-g,0],M-=v)):(_&&(i=[M-g,0],M-=v),b&&(r=[0,0],S+=v),w&&(o=[M-g,0],M-=v));var I=[S,M];return t.get("inverse")&&I.reverse(),{viewRect:l,mainLength:p,orient:s,rotation:c[s],labelRotation:m,labelPosOpt:n,labelAlign:t.get(["label","align"])||u[s],labelBaseline:t.get(["label","verticalAlign"])||t.get(["label","baseline"])||h[s],playPosition:i,prevBtnPosition:r,nextBtnPosition:o,axisExtent:I,controlSize:g,controlGap:y}},e.prototype._position=function(t,e){var n=this._mainGroup,i=this._labelGroup,r=t.viewRect;if("vertical"===t.orient){var o=[1,0,0,1,0,0],a=r.x,s=r.y+r.height;be(o,o,[-a,-s]),we(o,o,-zV/2),be(o,o,[a,s]),(r=r.clone()).applyTransform(o)}var l=y(r),u=y(n.getBoundingRect()),h=y(i.getBoundingRect()),c=[n.x,n.y],p=[i.x,i.y];p[0]=c[0]=l[0][0];var d,f=t.labelPosOpt;null==f||X(f)?(v(c,u,l,1,d="+"===f?0:1),v(p,h,l,1,1-d)):(v(c,u,l,1,d=f>=0?0:1),p[1]=c[1]+f);function g(t){t.originX=l[0][0]-t.x,t.originY=l[1][0]-t.y}function y(t){return[[t.x,t.x+t.width],[t.y,t.y+t.height]]}function v(t,e,n,i,r){t[i]+=n[i][r]-e[i][r]}n.setPosition(c),i.setPosition(p),n.rotation=i.rotation=t.rotation,g(n),g(i)},e.prototype._createAxis=function(t,e){var n=e.getData(),i=e.get("axisType"),r=function(t,e){if(e=e||t.get("type"))switch(e){case"category":return new Mx({ordinalMeta:t.getCategories(),extent:[1/0,-1/0]});case"time":return new Fx({locale:t.ecModel.getLocaleModel(),useUTC:t.ecModel.get("useUTC")});default:return new Tx}}(e,i);r.getTicks=function(){return n.mapArray(["value"],(function(t){return{value:t}}))};var o=n.getDataExtent("value");r.setExtent(o[0],o[1]),r.calcNiceTicks();var a=new EV("value",r,t.axisExtent,i);return a.model=e,a},e.prototype._createGroup=function(t){var e=this[t]=new Er;return this.group.add(e),e},e.prototype._renderAxisLine=function(t,e,n,i){var r=n.getExtent();if(i.get(["lineStyle","show"])){var o=new Xu({shape:{x1:r[0],y1:0,x2:r[1],y2:0},style:A({lineCap:"round"},i.getModel("lineStyle").getLineStyle()),silent:!0,z2:1});e.add(o);var a=this._progressLine=new Xu({shape:{x1:r[0],x2:this._currentPointer?this._currentPointer.x:r[0],y1:0,y2:0},style:k({lineCap:"round",lineWidth:o.style.lineWidth},i.getModel(["progress","lineStyle"]).getLineStyle()),silent:!0,z2:1});e.add(a)}},e.prototype._renderAxisTick=function(t,e,n,i){var r=this,o=i.getData(),a=n.scale.getTicks();this._tickSymbols=[],E(a,(function(t){var a=n.dataToCoord(t.value),s=o.getItemModel(t.value),l=s.getModel("itemStyle"),u=s.getModel(["emphasis","itemStyle"]),h=s.getModel(["progress","itemStyle"]),c={x:a,y:0,onclick:W(r._changeTimeline,r,t.value)},p=FV(s,l,e,c);p.ensureState("emphasis").style=u.getItemStyle(),p.ensureState("progress").style=h.getItemStyle(),Wl(p);var d=Js(p);s.get("tooltip")?(d.dataIndex=t.value,d.dataModel=i):d.dataIndex=d.dataModel=null,r._tickSymbols.push(p)}))},e.prototype._renderAxisLabel=function(t,e,n,i){var r=this;if(n.getLabelModel().get("show")){var o=i.getData(),a=n.getViewLabels();this._tickLabels=[],E(a,(function(i){var a=i.tickValue,s=o.getItemModel(a),l=s.getModel("label"),u=s.getModel(["emphasis","label"]),h=s.getModel(["progress","label"]),c=n.dataToCoord(i.tickValue),p=new Bs({x:c,y:0,rotation:t.labelRotation-t.rotation,onclick:W(r._changeTimeline,r,a),silent:!1,style:ec(l,{text:i.formattedLabel,align:t.labelAlign,verticalAlign:t.labelBaseline})});p.ensureState("emphasis").style=ec(u),p.ensureState("progress").style=ec(h),e.add(p),Wl(p),VV(p).dataIndex=a,r._tickLabels.push(p)}))}},e.prototype._renderControl=function(t,e,n,i){var r=t.controlSize,o=t.rotation,a=i.getModel("controlStyle").getItemStyle(),s=i.getModel(["emphasis","controlStyle"]).getItemStyle(),l=i.getPlayState(),u=i.get("inverse",!0);function h(t,n,l,u){if(t){var h=Mr(rt(i.get(["controlStyle",n+"BtnSize"]),r),r),c=function(t,e,n,i){var r=i.style,o=Wh(t.get(["controlStyle",e]),i||{},new Ee(n[0],n[1],n[2],n[3]));r&&o.setStyle(r);return o}(i,n+"Icon",[0,-h/2,h,h],{x:t[0],y:t[1],originX:r/2,originY:0,rotation:u?-o:0,rectHover:!0,style:a,onclick:l});c.ensureState("emphasis").style=s,e.add(c),Wl(c)}}h(t.nextBtnPosition,"next",W(this._changeTimeline,this,u?"-":"+")),h(t.prevBtnPosition,"prev",W(this._changeTimeline,this,u?"+":"-")),h(t.playPosition,l?"stop":"play",W(this._handlePlayClick,this,!l),!0)},e.prototype._renderCurrentPointer=function(t,e,n,i){var r=i.getData(),o=i.getCurrentIndex(),a=r.getItemModel(o).getModel("checkpointStyle"),s=this,l={onCreate:function(t){t.draggable=!0,t.drift=W(s._handlePointerDrag,s),t.ondragend=W(s._handlePointerDragend,s),GV(t,s._progressLine,o,n,i,!0)},onUpdate:function(t){GV(t,s._progressLine,o,n,i)}};this._currentPointer=FV(a,a,this._mainGroup,{},this._currentPointer,l)},e.prototype._handlePlayClick=function(t){this._clearTimer(),this.api.dispatchAction({type:"timelinePlayChange",playState:t,from:this.uid})},e.prototype._handlePointerDrag=function(t,e,n){this._clearTimer(),this._pointerChangeTimeline([n.offsetX,n.offsetY])},e.prototype._handlePointerDragend=function(t){this._pointerChangeTimeline([t.offsetX,t.offsetY],!0)},e.prototype._pointerChangeTimeline=function(t,e){var n=this._toAxisCoord(t)[0],i=Zr(this._axis.getExtent().slice());n>i[1]&&(n=i[1]),n<i[0]&&(n=i[0]),this._currentPointer.x=n,this._currentPointer.markRedraw();var r=this._progressLine;r&&(r.shape.x2=n,r.dirty());var o=this._findNearestTick(n),a=this.model;(e||o!==a.getCurrentIndex()&&a.get("realtime"))&&this._changeTimeline(o)},e.prototype._doPlayStop=function(){var t=this;this._clearTimer(),this.model.getPlayState()&&(this._timer=setTimeout((function(){var e=t.model;t._changeTimeline(e.getCurrentIndex()+(e.get("rewind",!0)?-1:1))}),this.model.get("playInterval")))},e.prototype._toAxisCoord=function(t){return Eh(t,this._mainGroup.getLocalTransform(),!0)},e.prototype._findNearestTick=function(t){var e,n=this.model.getData(),i=1/0,r=this._axis;return n.each(["value"],(function(n,o){var a=r.dataToCoord(n),s=Math.abs(a-t);s<i&&(i=s,e=o)})),e},e.prototype._clearTimer=function(){this._timer&&(clearTimeout(this._timer),this._timer=null)},e.prototype._changeTimeline=function(t){var e=this.model.getCurrentIndex();"+"===t?t=e+1:"-"===t&&(t=e-1),this.api.dispatchAction({type:"timelineChange",currentIndex:t,from:this.uid})},e.prototype._updateTicksStatus=function(){var t=this.model.getCurrentIndex(),e=this._tickSymbols,n=this._tickLabels;if(e)for(var i=0;i<e.length;i++)e&&e[i]&&e[i].toggleState("progress",i<t);if(n)for(i=0;i<n.length;i++)n&&n[i]&&n[i].toggleState("progress",VV(n[i]).dataIndex<=t)},e.type="timeline.slider",e}(NV);function FV(t,e,n,i,r,o){var a=e.get("color");r?(r.setColor(a),n.add(r),o&&o.onUpdate(r)):((r=Vy(t.get("symbol"),-1,-1,2,2,a)).setStyle("strokeNoScale",!0),n.add(r),o&&o.onCreate(r));var s=e.getItemStyle(["color"]);r.setStyle(s),i=C({rectHover:!0,z2:100},i,!0);var l=By(t.get("symbolSize"));i.scaleX=l[0]/2,i.scaleY=l[1]/2;var u=Fy(t.get("symbolOffset"),l);u&&(i.x=(i.x||0)+u[0],i.y=(i.y||0)+u[1]);var h=t.get("symbolRotate");return i.rotation=(h||0)*Math.PI/180||0,r.attr(i),r.updateTransform(),r}function GV(t,e,n,i,r,o){if(!t.dragging){var a=r.getModel("checkpointStyle"),s=i.dataToCoord(r.getData().get("value",n));if(o||!a.get("animation",!0))t.attr({x:s,y:0}),e&&e.attr({shape:{x2:s}});else{var l={duration:a.get("animationDuration",!0),easing:a.get("animationEasing",!0)};t.stopAnimation(null,!0),t.animateTo({x:s,y:0},l),e&&e.animateTo({shape:{x2:s}},l)}}}function WV(t){var e=t&&t.timeline;Y(e)||(e=e?[e]:[]),E(e,(function(t){t&&function(t){var e=t.type,n={number:"value",time:"time"};n[e]&&(t.axisType=n[e],delete t.type);if(HV(t),YV(t,"controlPosition")){var i=t.controlStyle||(t.controlStyle={});YV(i,"position")||(i.position=t.controlPosition),"none"!==i.position||YV(i,"show")||(i.show=!1,delete i.position),delete t.controlPosition}E(t.data||[],(function(t){q(t)&&!Y(t)&&(!YV(t,"value")&&YV(t,"name")&&(t.value=t.name),HV(t))}))}(t)}))}function HV(t){var e=t.itemStyle||(t.itemStyle={}),n=e.emphasis||(e.emphasis={}),i=t.label||t.label||{},r=i.normal||(i.normal={}),o={normal:1,emphasis:1};E(i,(function(t,e){o[e]||YV(r,e)||(r[e]=t)})),n.label&&!YV(i,"emphasis")&&(i.emphasis=n.label,delete n.label)}function YV(t,e){return t.hasOwnProperty(e)}function UV(t,e){if(!t)return!1;for(var n=Y(t)?t:[t],i=0;i<n.length;i++)if(n[i]&&n[i][e])return!0;return!1}function XV(t){bo(t,"label",["show"])}var ZV=Po(),jV=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.createdBySelf=!1,n}return n(e,t),e.prototype.init=function(t,e,n){this.mergeDefaultAndTheme(t,n),this._mergeOption(t,n,!1,!0)},e.prototype.isAnimationEnabled=function(){if(r.node)return!1;var t=this.__hostSeries;return this.getShallow("animation")&&t&&t.isAnimationEnabled()},e.prototype.mergeOption=function(t,e){this._mergeOption(t,e,!1,!1)},e.prototype._mergeOption=function(t,e,n,i){var r=this.mainType;n||e.eachSeries((function(t){var n=t.get(this.mainType,!0),o=ZV(t)[r];n&&n.data?(o?o._mergeOption(n,e,!0):(i&&XV(n),E(n.data,(function(t){t instanceof Array?(XV(t[0]),XV(t[1])):XV(t)})),A(o=this.createMarkerModelFromSeries(n,this,e),{mainType:this.mainType,seriesIndex:t.seriesIndex,name:t.name,createdBySelf:!0}),o.__hostSeries=t),ZV(t)[r]=o):ZV(t)[r]=null}),this)},e.prototype.formatTooltip=function(t,e,n){var i=this.getData(),r=this.getRawValue(t),o=i.getName(t);return Qf("section",{header:this.name,blocks:[Qf("nameValue",{name:o,value:r,noName:!o,noValue:null==r})]})},e.prototype.getData=function(){return this._data},e.prototype.setData=function(t){this._data=t},e.getMarkerModelFromSeries=function(t,e){return ZV(t)[e]},e.type="marker",e.dependencies=["series","grid","polar","geo"],e}(Op);R(jV,gf.prototype);var qV=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.createMarkerModelFromSeries=function(t,n,i){return new e(t,n,i)},e.type="markPoint",e.defaultOption={z:5,symbol:"pin",symbolSize:50,tooltip:{trigger:"item"},label:{show:!0,position:"inside"},itemStyle:{borderWidth:2},emphasis:{label:{show:!0}}},e}(jV);function KV(t){return!(isNaN(parseFloat(t.x))&&isNaN(parseFloat(t.y)))}function $V(t,e,n,i,r,o){var a=[],s=lx(e,i)?e.getCalculationInfo("stackResultDimension"):i,l=iB(e,s,t),u=e.indicesOfNearest(s,l)[0];a[r]=e.get(n,u),a[o]=e.get(s,u);var h=e.get(i,u),c=jr(e.get(i,u));return(c=Math.min(c,20))>=0&&(a[o]=+a[o].toFixed(c)),[a,h]}var JV={min:H($V,"min"),max:H($V,"max"),average:H($V,"average"),median:H($V,"median")};function QV(t,e){if(e){var n=t.getData(),i=t.coordinateSystem,r=i.dimensions;if(!function(t){return!isNaN(parseFloat(t.x))&&!isNaN(parseFloat(t.y))}(e)&&!Y(e.coord)&&i){var o=tB(e,n,i,t);if((e=T(e)).type&&JV[e.type]&&o.baseAxis&&o.valueAxis){var a=P(r,o.baseAxis.dim),s=P(r,o.valueAxis.dim),l=JV[e.type](n,o.baseDataDim,o.valueDataDim,a,s);e.coord=l[0],e.value=l[1]}else e.coord=[null!=e.xAxis?e.xAxis:e.radiusAxis,null!=e.yAxis?e.yAxis:e.angleAxis]}if(null==e.coord)e.coord=[];else for(var u=e.coord,h=0;h<2;h++)JV[u[h]]&&(u[h]=iB(n,n.mapDimension(r[h]),u[h]));return e}}function tB(t,e,n,i){var r={};return null!=t.valueIndex||null!=t.valueDim?(r.valueDataDim=null!=t.valueIndex?e.getDimension(t.valueIndex):t.valueDim,r.valueAxis=n.getAxis(function(t,e){var n=t.getData().getDimensionInfo(e);return n&&n.coordDim}(i,r.valueDataDim)),r.baseAxis=n.getOtherAxis(r.valueAxis),r.baseDataDim=e.mapDimension(r.baseAxis.dim)):(r.baseAxis=i.getBaseAxis(),r.valueAxis=n.getOtherAxis(r.baseAxis),r.baseDataDim=e.mapDimension(r.baseAxis.dim),r.valueDataDim=e.mapDimension(r.valueAxis.dim)),r}function eB(t,e){return!(t&&t.containData&&e.coord&&!KV(e))||t.containData(e.coord)}function nB(t,e){return t?function(t,n,i,r){return _f(r<2?t.coord&&t.coord[r]:t.value,e[r])}:function(t,n,i,r){return _f(t.value,e[r])}}function iB(t,e,n){if("average"===n){var i=0,r=0;return t.each(e,(function(t,e){isNaN(t)||(i+=t,r++)})),i/r}return"median"===n?t.getMedian(e):t.getDataExtent(e)["max"===n?1:0]}var rB=Po(),oB=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.init=function(){this.markerGroupMap=yt()},e.prototype.render=function(t,e,n){var i=this,r=this.markerGroupMap;r.each((function(t){rB(t).keep=!1})),e.eachSeries((function(t){var r=jV.getMarkerModelFromSeries(t,i.type);r&&i.renderSeries(t,r,e,n)})),r.each((function(t){!rB(t).keep&&i.group.remove(t.group)}))},e.prototype.markKeep=function(t){rB(t).keep=!0},e.prototype.toggleBlurSeries=function(t,e){var n=this;E(t,(function(t){var i=jV.getMarkerModelFromSeries(t,n.type);i&&i.getData().eachItemGraphicEl((function(t){t&&(e?Ll(t):Pl(t))}))}))},e.type="marker",e}(wg);function aB(t,e,n){var i=e.coordinateSystem;t.each((function(r){var o,a=t.getItemModel(r),s=Ur(a.get("x"),n.getWidth()),l=Ur(a.get("y"),n.getHeight());if(isNaN(s)||isNaN(l)){if(e.getMarkerPosition)o=e.getMarkerPosition(t.getValues(t.dimensions,r));else if(i){var u=t.get(i.dimensions[0],r),h=t.get(i.dimensions[1],r);o=i.dataToPoint([u,h])}}else o=[s,l];isNaN(s)||(o[0]=s),isNaN(l)||(o[1]=l),t.setItemLayout(r,o)}))}var sB=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.updateTransform=function(t,e,n){e.eachSeries((function(t){var e=jV.getMarkerModelFromSeries(t,"markPoint");e&&(aB(e.getData(),t,n),this.markerGroupMap.get(t.id).updateLayout())}),this)},e.prototype.renderSeries=function(t,e,n,i){var r=t.coordinateSystem,o=t.id,a=t.getData(),s=this.markerGroupMap,l=s.get(o)||s.set(o,new iS),u=function(t,e,n){var i;i=t?z(t&&t.dimensions,(function(t){return A(A({},e.getData().getDimensionInfo(e.getData().mapDimension(t))||{}),{name:t,ordinalMeta:null})})):[{name:"value",type:"float"}];var r=new ex(i,n),o=z(n.get("data"),H(QV,e));t&&(o=B(o,H(eB,t)));var a=nB(!!t,i);return r.initData(o,null,a),r}(r,t,e);e.setData(u),aB(e.getData(),t,i),u.each((function(t){var n=u.getItemModel(t),i=n.getShallow("symbol"),r=n.getShallow("symbolSize"),o=n.getShallow("symbolRotate"),s=n.getShallow("symbolOffset"),l=n.getShallow("symbolKeepAspect");if(U(i)||U(r)||U(o)||U(s)){var h=e.getRawValue(t),c=e.getDataParams(t);U(i)&&(i=i(h,c)),U(r)&&(r=r(h,c)),U(o)&&(o=o(h,c)),U(s)&&(s=s(h,c))}var p=n.getModel("itemStyle").getItemStyle(),d=wy(a,"color");p.fill||(p.fill=d),u.setItemVisual(t,{symbol:i,symbolSize:r,symbolRotate:o,symbolOffset:s,symbolKeepAspect:l,style:p})})),l.updateData(u),this.group.add(l.group),u.eachItemGraphicEl((function(t){t.traverse((function(t){Js(t).dataModel=e}))})),this.markKeep(l),l.group.silent=e.get("silent")||t.get("silent")},e.type="markPoint",e}(oB);var lB=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.createMarkerModelFromSeries=function(t,n,i){return new e(t,n,i)},e.type="markLine",e.defaultOption={z:5,symbol:["circle","arrow"],symbolSize:[8,16],symbolOffset:0,precision:2,tooltip:{trigger:"item"},label:{show:!0,position:"end",distance:5},lineStyle:{type:"dashed"},emphasis:{label:{show:!0},lineStyle:{width:3}},animationEasing:"linear"},e}(jV),uB=Po(),hB=function(t,e,n,i){var r,o=t.getData();if(Y(i))r=i;else{var a=i.type;if("min"===a||"max"===a||"average"===a||"median"===a||null!=i.xAxis||null!=i.yAxis){var s=void 0,l=void 0;if(null!=i.yAxis||null!=i.xAxis)s=e.getAxis(null!=i.yAxis?"y":"x"),l=it(i.yAxis,i.xAxis);else{var u=tB(i,o,e,t);s=u.valueAxis,l=iB(o,ux(o,u.valueDataDim),a)}var h="x"===s.dim?0:1,c=1-h,p=T(i),d={coord:[]};p.type=null,p.coord=[],p.coord[c]=-1/0,d.coord[c]=1/0;var f=n.get("precision");f>=0&&j(l)&&(l=+l.toFixed(Math.min(f,20))),p.coord[h]=d.coord[h]=l,r=[p,d,{type:a,valueIndex:i.valueIndex,value:l}]}else r=[]}var g=[QV(t,r[0]),QV(t,r[1]),A({},r[2])];return g[2].type=g[2].type||null,C(g[2],g[0]),C(g[2],g[1]),g};function cB(t){return!isNaN(t)&&!isFinite(t)}function pB(t,e,n,i){var r=1-t,o=i.dimensions[t];return cB(e[r])&&cB(n[r])&&e[t]===n[t]&&i.getAxis(o).containData(e[t])}function dB(t,e){if("cartesian2d"===t.type){var n=e[0].coord,i=e[1].coord;if(n&&i&&(pB(1,n,i,t)||pB(0,n,i,t)))return!0}return eB(t,e[0])&&eB(t,e[1])}function fB(t,e,n,i,r){var o,a=i.coordinateSystem,s=t.getItemModel(e),l=Ur(s.get("x"),r.getWidth()),u=Ur(s.get("y"),r.getHeight());if(isNaN(l)||isNaN(u)){if(i.getMarkerPosition)o=i.getMarkerPosition(t.getValues(t.dimensions,e));else{var h=a.dimensions,c=t.get(h[0],e),p=t.get(h[1],e);o=a.dataToPoint([c,p])}if(vS(a,"cartesian2d")){var d=a.getAxis("x"),f=a.getAxis("y");h=a.dimensions;cB(t.get(h[0],e))?o[0]=d.toGlobalCoord(d.getExtent()[n?0:1]):cB(t.get(h[1],e))&&(o[1]=f.toGlobalCoord(f.getExtent()[n?0:1]))}isNaN(l)||(o[0]=l),isNaN(u)||(o[1]=u)}else o=[l,u];t.setItemLayout(e,o)}var gB=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.updateTransform=function(t,e,n){e.eachSeries((function(t){var e=jV.getMarkerModelFromSeries(t,"markLine");if(e){var i=e.getData(),r=uB(e).from,o=uB(e).to;r.each((function(e){fB(r,e,!0,t,n),fB(o,e,!1,t,n)})),i.each((function(t){i.setItemLayout(t,[r.getItemLayout(t),o.getItemLayout(t)])})),this.markerGroupMap.get(t.id).updateLayout()}}),this)},e.prototype.renderSeries=function(t,e,n,i){var r=t.coordinateSystem,o=t.id,a=t.getData(),s=this.markerGroupMap,l=s.get(o)||s.set(o,new TA);this.group.add(l.group);var u=function(t,e,n){var i;i=t?z(t&&t.dimensions,(function(t){return A(A({},e.getData().getDimensionInfo(e.getData().mapDimension(t))||{}),{name:t,ordinalMeta:null})})):[{name:"value",type:"float"}];var r=new ex(i,n),o=new ex(i,n),a=new ex([],n),s=z(n.get("data"),H(hB,e,t,n));t&&(s=B(s,H(dB,t)));var l=nB(!!t,i);return r.initData(z(s,(function(t){return t[0]})),null,l),o.initData(z(s,(function(t){return t[1]})),null,l),a.initData(z(s,(function(t){return t[2]}))),a.hasItemOption=!0,{from:r,to:o,line:a}}(r,t,e),h=u.from,c=u.to,p=u.line;uB(e).from=h,uB(e).to=c,e.setData(p);var d=e.get("symbol"),f=e.get("symbolSize"),g=e.get("symbolRotate"),y=e.get("symbolOffset");function v(e,n,r){var o=e.getItemModel(n);fB(e,n,r,t,i);var s=o.getModel("itemStyle").getItemStyle();null==s.fill&&(s.fill=wy(a,"color")),e.setItemVisual(n,{symbolKeepAspect:o.get("symbolKeepAspect"),symbolOffset:rt(o.get("symbolOffset",!0),y[r?0:1]),symbolRotate:rt(o.get("symbolRotate",!0),g[r?0:1]),symbolSize:rt(o.get("symbolSize"),f[r?0:1]),symbol:rt(o.get("symbol",!0),d[r?0:1]),style:s})}Y(d)||(d=[d,d]),Y(f)||(f=[f,f]),Y(g)||(g=[g,g]),Y(y)||(y=[y,y]),u.from.each((function(t){v(h,t,!0),v(c,t,!1)})),p.each((function(t){var e=p.getItemModel(t).getModel("lineStyle").getLineStyle();p.setItemLayout(t,[h.getItemLayout(t),c.getItemLayout(t)]),null==e.stroke&&(e.stroke=h.getItemVisual(t,"style").fill),p.setItemVisual(t,{fromSymbolKeepAspect:h.getItemVisual(t,"symbolKeepAspect"),fromSymbolOffset:h.getItemVisual(t,"symbolOffset"),fromSymbolRotate:h.getItemVisual(t,"symbolRotate"),fromSymbolSize:h.getItemVisual(t,"symbolSize"),fromSymbol:h.getItemVisual(t,"symbol"),toSymbolKeepAspect:c.getItemVisual(t,"symbolKeepAspect"),toSymbolOffset:c.getItemVisual(t,"symbolOffset"),toSymbolRotate:c.getItemVisual(t,"symbolRotate"),toSymbolSize:c.getItemVisual(t,"symbolSize"),toSymbol:c.getItemVisual(t,"symbol"),style:e})})),l.updateData(p),u.line.eachItemGraphicEl((function(t){Js(t).dataModel=e,t.traverse((function(t){Js(t).dataModel=e}))})),this.markKeep(l),l.group.silent=e.get("silent")||t.get("silent")},e.type="markLine",e}(oB);var yB=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.createMarkerModelFromSeries=function(t,n,i){return new e(t,n,i)},e.type="markArea",e.defaultOption={z:1,tooltip:{trigger:"item"},animation:!1,label:{show:!0,position:"top"},itemStyle:{borderWidth:0},emphasis:{label:{show:!0,position:"top"}}},e}(jV),vB=Po(),mB=function(t,e,n,i){var r=i[0],o=i[1];if(r&&o){var a=QV(t,r),s=QV(t,o),l=a.coord,u=s.coord;l[0]=it(l[0],-1/0),l[1]=it(l[1],-1/0),u[0]=it(u[0],1/0),u[1]=it(u[1],1/0);var h=D([{},a,s]);return h.coord=[a.coord,s.coord],h.x0=a.x,h.y0=a.y,h.x1=s.x,h.y1=s.y,h}};function xB(t){return!isNaN(t)&&!isFinite(t)}function _B(t,e,n,i){var r=1-t;return xB(e[r])&&xB(n[r])}function bB(t,e){var n=e.coord[0],i=e.coord[1],r={coord:n,x:e.x0,y:e.y0},o={coord:i,x:e.x1,y:e.y1};return vS(t,"cartesian2d")?!(!n||!i||!_B(1,n,i)&&!_B(0,n,i))||function(t,e,n){return!(t&&t.containZone&&e.coord&&n.coord&&!KV(e)&&!KV(n))||t.containZone(e.coord,n.coord)}(t,r,o):eB(t,r)||eB(t,o)}function wB(t,e,n,i,r){var o,a=i.coordinateSystem,s=t.getItemModel(e),l=Ur(s.get(n[0]),r.getWidth()),u=Ur(s.get(n[1]),r.getHeight());if(isNaN(l)||isNaN(u)){if(i.getMarkerPosition){var h=t.getValues(["x0","y0"],e),c=t.getValues(["x1","y1"],e),p=a.clampData(h),d=a.clampData(c),f=[];"x0"===n[0]?f[0]=p[0]>d[0]?c[0]:h[0]:f[0]=p[0]>d[0]?h[0]:c[0],"y0"===n[1]?f[1]=p[1]>d[1]?c[1]:h[1]:f[1]=p[1]>d[1]?h[1]:c[1],o=i.getMarkerPosition(f,n,!0)}else{var g=[m=t.get(n[0],e),x=t.get(n[1],e)];a.clampData&&a.clampData(g,g),o=a.dataToPoint(g,!0)}if(vS(a,"cartesian2d")){var y=a.getAxis("x"),v=a.getAxis("y"),m=t.get(n[0],e),x=t.get(n[1],e);xB(m)?o[0]=y.toGlobalCoord(y.getExtent()["x0"===n[0]?0:1]):xB(x)&&(o[1]=v.toGlobalCoord(v.getExtent()["y0"===n[1]?0:1]))}isNaN(l)||(o[0]=l),isNaN(u)||(o[1]=u)}else o=[l,u];return o}var SB=[["x0","y0"],["x1","y0"],["x1","y1"],["x0","y1"]],MB=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.updateTransform=function(t,e,n){e.eachSeries((function(t){var e=jV.getMarkerModelFromSeries(t,"markArea");if(e){var i=e.getData();i.each((function(e){var r=z(SB,(function(r){return wB(i,e,r,t,n)}));i.setItemLayout(e,r),i.getItemGraphicEl(e).setShape("points",r)}))}}),this)},e.prototype.renderSeries=function(t,e,n,i){var r=t.coordinateSystem,o=t.id,a=t.getData(),s=this.markerGroupMap,l=s.get(o)||s.set(o,{group:new Er});this.group.add(l.group),this.markKeep(l);var u=function(t,e,n){var i,r,o=["x0","y0","x1","y1"];if(t){var a=z(t&&t.dimensions,(function(t){var n=e.getData();return A(A({},n.getDimensionInfo(n.mapDimension(t))||{}),{name:t,ordinalMeta:null})}));r=z(o,(function(t,e){return{name:t,type:a[e%2].type}})),i=new ex(r,n)}else i=new ex(r=[{name:"value",type:"float"}],n);var s=z(n.get("data"),H(mB,e,t,n));t&&(s=B(s,H(bB,t)));var l=t?function(t,e,n,i){return _f(t.coord[Math.floor(i/2)][i%2],r[i])}:function(t,e,n,i){return _f(t.value,r[i])};return i.initData(s,null,l),i.hasItemOption=!0,i}(r,t,e);e.setData(u),u.each((function(e){var n=z(SB,(function(n){return wB(u,e,n,t,i)})),o=r.getAxis("x").scale,s=r.getAxis("y").scale,l=o.getExtent(),h=s.getExtent(),c=[o.parse(u.get("x0",e)),o.parse(u.get("x1",e))],p=[s.parse(u.get("y0",e)),s.parse(u.get("y1",e))];Zr(c),Zr(p);var d=!!(l[0]>c[1]||l[1]<c[0]||h[0]>p[1]||h[1]<p[0]);u.setItemLayout(e,{points:n,allClipped:d});var f=u.getItemModel(e).getModel("itemStyle").getItemStyle(),g=wy(a,"color");f.fill||(f.fill=g,X(f.fill)&&(f.fill=ni(f.fill,.4))),f.stroke||(f.stroke=g),u.setItemVisual(e,"style",f)})),u.diff(vB(l).data).add((function(t){var e=u.getItemLayout(t);if(!e.allClipped){var n=new Gu({shape:{points:e.points}});u.setItemGraphicEl(t,n),l.group.add(n)}})).update((function(t,n){var i=vB(l).data.getItemGraphicEl(n),r=u.getItemLayout(t);r.allClipped?i&&l.group.remove(i):(i?dh(i,{shape:{points:r.points}},e,t):i=new Gu({shape:{points:r.points}}),u.setItemGraphicEl(t,i),l.group.add(i))})).remove((function(t){var e=vB(l).data.getItemGraphicEl(t);l.group.remove(e)})).execute(),u.eachItemGraphicEl((function(t,n){var i=u.getItemModel(n),r=u.getItemVisual(n,"style");t.useStyle(u.getItemVisual(n,"style")),Qh(t,tc(i),{labelFetcher:e,labelDataIndex:n,defaultText:u.getName(n)||"",inheritColor:X(r.fill)?ni(r.fill,1):"#000"}),Zl(t,i),Hl(t,null,null,i.get(["emphasis","disabled"])),Js(t).dataModel=e})),vB(l).data=u,l.group.silent=e.get("silent")||t.get("silent")},e.type="markArea",e}(oB);var IB=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.layoutMode={type:"box",ignoreSize:!0},n}return n(e,t),e.prototype.init=function(t,e,n){this.mergeDefaultAndTheme(t,n),t.selected=t.selected||{},this._updateSelector(t)},e.prototype.mergeOption=function(e,n){t.prototype.mergeOption.call(this,e,n),this._updateSelector(e)},e.prototype._updateSelector=function(t){var e=t.selector,n=this.ecModel;!0===e&&(e=t.selector=["all","inverse"]),Y(e)&&E(e,(function(t,i){X(t)&&(t={type:t}),e[i]=C(t,function(t,e){return"all"===e?{type:"all",title:t.getLocaleModel().get(["legend","selector","all"])}:"inverse"===e?{type:"inverse",title:t.getLocaleModel().get(["legend","selector","inverse"])}:void 0}(n,t.type))}))},e.prototype.optionUpdated=function(){this._updateData(this.ecModel);var t=this._data;if(t[0]&&"single"===this.get("selectedMode")){for(var e=!1,n=0;n<t.length;n++){var i=t[n].get("name");if(this.isSelected(i)){this.select(i),e=!0;break}}!e&&this.select(t[0].get("name"))}},e.prototype._updateData=function(t){var e=[],n=[];t.eachRawSeries((function(i){var r,o=i.name;if(n.push(o),i.legendVisualProvider){var a=i.legendVisualProvider.getAllNames();t.isSeriesFiltered(i)||(n=n.concat(a)),a.length?e=e.concat(a):r=!0}else r=!0;r&&Ao(i)&&e.push(i.name)})),this._availableNames=n;var i=this.get("data")||e,r=yt(),o=z(i,(function(t){return(X(t)||j(t))&&(t={name:t}),r.get(t.name)?null:(r.set(t.name,!0),new Sc(t,this,this.ecModel))}),this);this._data=B(o,(function(t){return!!t}))},e.prototype.getData=function(){return this._data},e.prototype.select=function(t){var e=this.option.selected;"single"===this.get("selectedMode")&&E(this._data,(function(t){e[t.get("name")]=!1}));e[t]=!0},e.prototype.unSelect=function(t){"single"!==this.get("selectedMode")&&(this.option.selected[t]=!1)},e.prototype.toggleSelected=function(t){var e=this.option.selected;e.hasOwnProperty(t)||(e[t]=!0),this[e[t]?"unSelect":"select"](t)},e.prototype.allSelect=function(){var t=this._data,e=this.option.selected;E(t,(function(t){e[t.get("name",!0)]=!0}))},e.prototype.inverseSelect=function(){var t=this._data,e=this.option.selected;E(t,(function(t){var n=t.get("name",!0);e.hasOwnProperty(n)||(e[n]=!0),e[n]=!e[n]}))},e.prototype.isSelected=function(t){var e=this.option.selected;return!(e.hasOwnProperty(t)&&!e[t])&&P(this._availableNames,t)>=0},e.prototype.getOrient=function(){return"vertical"===this.get("orient")?{index:1,name:"vertical"}:{index:0,name:"horizontal"}},e.type="legend.plain",e.dependencies=["series"],e.defaultOption={z:4,show:!0,orient:"horizontal",left:"center",top:0,align:"auto",backgroundColor:"rgba(0,0,0,0)",borderColor:"#ccc",borderRadius:0,borderWidth:0,padding:5,itemGap:10,itemWidth:25,itemHeight:14,symbolRotate:"inherit",symbolKeepAspect:!0,inactiveColor:"#ccc",inactiveBorderColor:"#ccc",inactiveBorderWidth:"auto",itemStyle:{color:"inherit",opacity:"inherit",borderColor:"inherit",borderWidth:"auto",borderCap:"inherit",borderJoin:"inherit",borderDashOffset:"inherit",borderMiterLimit:"inherit"},lineStyle:{width:"auto",color:"inherit",inactiveColor:"#ccc",inactiveWidth:2,opacity:"inherit",type:"inherit",cap:"inherit",join:"inherit",dashOffset:"inherit",miterLimit:"inherit"},textStyle:{color:"#333"},selectedMode:!0,selector:!1,selectorLabel:{show:!0,borderRadius:10,padding:[3,5,3,5],fontSize:12,fontFamily:"sans-serif",color:"#666",borderWidth:1,borderColor:"#666"},emphasis:{selectorLabel:{show:!0,color:"#eee",backgroundColor:"#666"}},selectorPosition:"auto",selectorItemGap:7,selectorButtonGap:10,tooltip:{show:!1}},e}(Op),TB=H,CB=E,DB=Er,AB=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.newlineDisabled=!1,n}return n(e,t),e.prototype.init=function(){this.group.add(this._contentGroup=new DB),this.group.add(this._selectorGroup=new DB),this._isFirstRender=!0},e.prototype.getContentGroup=function(){return this._contentGroup},e.prototype.getSelectorGroup=function(){return this._selectorGroup},e.prototype.render=function(t,e,n){var i=this._isFirstRender;if(this._isFirstRender=!1,this.resetInner(),t.get("show",!0)){var r=t.get("align"),o=t.get("orient");r&&"auto"!==r||(r="right"===t.get("left")&&"vertical"===o?"right":"left");var a=t.get("selector",!0),s=t.get("selectorPosition",!0);!a||s&&"auto"!==s||(s="horizontal"===o?"end":"start"),this.renderInner(r,t,e,n,a,o,s);var l=t.getBoxLayoutParams(),u={width:n.getWidth(),height:n.getHeight()},h=t.get("padding"),c=Tp(l,u,h),p=this.layoutInner(t,r,c,i,a,s),d=Tp(k({width:p.width,height:p.height},l),u,h);this.group.x=d.x-p.x,this.group.y=d.y-p.y,this.group.markRedraw(),this.group.add(this._backgroundEl=rz(p,t))}},e.prototype.resetInner=function(){this.getContentGroup().removeAll(),this._backgroundEl&&this.group.remove(this._backgroundEl),this.getSelectorGroup().removeAll()},e.prototype.renderInner=function(t,e,n,i,r,o,a){var s=this.getContentGroup(),l=yt(),u=e.get("selectedMode"),h=[];n.eachRawSeries((function(t){!t.get("legendHoverLink")&&h.push(t.id)})),CB(e.getData(),(function(r,o){var a=r.get("name");if(!this.newlineDisabled&&(""===a||"\n"===a)){var c=new DB;return c.newline=!0,void s.add(c)}var p=n.getSeriesByName(a)[0];if(!l.get(a)){if(p){var d=p.getData(),f=d.getVisual("legendLineStyle")||{},g=d.getVisual("legendIcon"),y=d.getVisual("style");this._createItem(p,a,o,r,e,t,f,y,g,u,i).on("click",TB(kB,a,null,i,h)).on("mouseover",TB(PB,p.name,null,i,h)).on("mouseout",TB(OB,p.name,null,i,h)),l.set(a,!0)}else n.eachRawSeries((function(n){if(!l.get(a)&&n.legendVisualProvider){var s=n.legendVisualProvider;if(!s.containName(a))return;var c=s.indexOfName(a),p=s.getItemVisual(c,"style"),d=s.getItemVisual(c,"legendIcon"),f=jn(p.fill);f&&0===f[3]&&(f[3]=.2,p=A(A({},p),{fill:ii(f,"rgba")})),this._createItem(n,a,o,r,e,t,{},p,d,u,i).on("click",TB(kB,null,a,i,h)).on("mouseover",TB(PB,null,a,i,h)).on("mouseout",TB(OB,null,a,i,h)),l.set(a,!0)}}),this);0}}),this),r&&this._createSelector(r,e,i,o,a)},e.prototype._createSelector=function(t,e,n,i,r){var o=this.getSelectorGroup();CB(t,(function(t){var i=t.type,r=new Bs({style:{x:0,y:0,align:"center",verticalAlign:"middle"},onclick:function(){n.dispatchAction({type:"all"===i?"legendAllSelect":"legendInverseSelect"})}});o.add(r),Qh(r,{normal:e.getModel("selectorLabel"),emphasis:e.getModel(["emphasis","selectorLabel"])},{defaultText:t.title}),Wl(r)}))},e.prototype._createItem=function(t,e,n,i,r,o,a,s,l,u,h){var c=t.visualDrawType,p=r.get("itemWidth"),d=r.get("itemHeight"),f=r.isSelected(e),g=i.get("symbolRotate"),y=i.get("symbolKeepAspect"),v=i.get("icon"),m=function(t,e,n,i,r,o,a){function s(t,e){"auto"===t.lineWidth&&(t.lineWidth=e.lineWidth>0?2:0),CB(t,(function(n,i){"inherit"===t[i]&&(t[i]=e[i])}))}var l=e.getModel("itemStyle"),u=l.getItemStyle(),h=0===t.lastIndexOf("empty",0)?"fill":"stroke",c=l.getShallow("decal");u.decal=c&&"inherit"!==c?cv(c,a):i.decal,"inherit"===u.fill&&(u.fill=i[r]);"inherit"===u.stroke&&(u.stroke=i[h]);"inherit"===u.opacity&&(u.opacity=("fill"===r?i:n).opacity);s(u,i);var p=e.getModel("lineStyle"),d=p.getLineStyle();if(s(d,n),"auto"===u.fill&&(u.fill=i.fill),"auto"===u.stroke&&(u.stroke=i.fill),"auto"===d.stroke&&(d.stroke=i.fill),!o){var f=e.get("inactiveBorderWidth"),g=u[h];u.lineWidth="auto"===f?i.lineWidth>0&&g?2:0:u.lineWidth,u.fill=e.get("inactiveColor"),u.stroke=e.get("inactiveBorderColor"),d.stroke=p.get("inactiveColor"),d.lineWidth=p.get("inactiveWidth")}return{itemStyle:u,lineStyle:d}}(l=v||l||"roundRect",i,a,s,c,f,h),x=new DB,_=i.getModel("textStyle");if(!U(t.getLegendIcon)||v&&"inherit"!==v){var b="inherit"===v&&t.getData().getVisual("symbol")?"inherit"===g?t.getData().getVisual("symbolRotate"):g:0;x.add(function(t){var e=t.icon||"roundRect",n=Vy(e,0,0,t.itemWidth,t.itemHeight,t.itemStyle.fill,t.symbolKeepAspect);n.setStyle(t.itemStyle),n.rotation=(t.iconRotate||0)*Math.PI/180,n.setOrigin([t.itemWidth/2,t.itemHeight/2]),e.indexOf("empty")>-1&&(n.style.stroke=n.style.fill,n.style.fill="#fff",n.style.lineWidth=2);return n}({itemWidth:p,itemHeight:d,icon:l,iconRotate:b,itemStyle:m.itemStyle,lineStyle:m.lineStyle,symbolKeepAspect:y}))}else x.add(t.getLegendIcon({itemWidth:p,itemHeight:d,icon:l,iconRotate:g,itemStyle:m.itemStyle,lineStyle:m.lineStyle,symbolKeepAspect:y}));var w="left"===o?p+5:-5,S=o,M=r.get("formatter"),I=e;X(M)&&M?I=M.replace("{name}",null!=e?e:""):U(M)&&(I=M(e));var T=i.get("inactiveColor");x.add(new Bs({style:ec(_,{text:I,x:w,y:d/2,fill:f?_.getTextColor():T,align:S,verticalAlign:"middle"})}));var C=new Es({shape:x.getBoundingRect(),invisible:!0}),D=i.getModel("tooltip");return D.get("show")&&Xh({el:C,componentModel:r,itemName:e,itemTooltipOption:D.option}),x.add(C),x.eachChild((function(t){t.silent=!0})),C.silent=!u,this.getContentGroup().add(x),Wl(x),x.__legendDataIndex=n,x},e.prototype.layoutInner=function(t,e,n,i,r,o){var a=this.getContentGroup(),s=this.getSelectorGroup();Ip(t.get("orient"),a,t.get("itemGap"),n.width,n.height);var l=a.getBoundingRect(),u=[-l.x,-l.y];if(s.markRedraw(),a.markRedraw(),r){Ip("horizontal",s,t.get("selectorItemGap",!0));var h=s.getBoundingRect(),c=[-h.x,-h.y],p=t.get("selectorButtonGap",!0),d=t.getOrient().index,f=0===d?"width":"height",g=0===d?"height":"width",y=0===d?"y":"x";"end"===o?c[d]+=l[f]+p:u[d]+=h[f]+p,c[1-d]+=l[g]/2-h[g]/2,s.x=c[0],s.y=c[1],a.x=u[0],a.y=u[1];var v={x:0,y:0};return v[f]=l[f]+p+h[f],v[g]=Math.max(l[g],h[g]),v[y]=Math.min(0,h[y]+c[1-d]),v}return a.x=u[0],a.y=u[1],this.group.getBoundingRect()},e.prototype.remove=function(){this.getContentGroup().removeAll(),this._isFirstRender=!0},e.type="legend.plain",e}(wg);function kB(t,e,n,i){OB(t,e,n,i),n.dispatchAction({type:"legendToggleSelect",name:null!=t?t:e}),PB(t,e,n,i)}function LB(t){for(var e,n=t.getZr().storage.getDisplayList(),i=0,r=n.length;i<r&&!(e=n[i].states.emphasis);)i++;return e&&e.hoverLayer}function PB(t,e,n,i){LB(n)||n.dispatchAction({type:"highlight",seriesName:t,name:e,excludeSeriesId:i})}function OB(t,e,n,i){LB(n)||n.dispatchAction({type:"downplay",seriesName:t,name:e,excludeSeriesId:i})}function RB(t){var e=t.findComponents({mainType:"legend"});e&&e.length&&t.filterSeries((function(t){for(var n=0;n<e.length;n++)if(!e[n].isSelected(t.name))return!1;return!0}))}function NB(t,e,n){var i,r={},o="toggleSelected"===t;return n.eachComponent("legend",(function(n){o&&null!=i?n[i?"select":"unSelect"](e.name):"allSelect"===t||"inverseSelect"===t?n[t]():(n[t](e.name),i=n.isSelected(e.name)),E(n.getData(),(function(t){var e=t.get("name");if("\n"!==e&&""!==e){var i=n.isSelected(e);r.hasOwnProperty(e)?r[e]=r[e]&&i:r[e]=i}}))})),"allSelect"===t||"inverseSelect"===t?{selected:r}:{name:e.name,selected:r}}function EB(t){t.registerComponentModel(IB),t.registerComponentView(AB),t.registerProcessor(t.PRIORITY.PROCESSOR.SERIES_FILTER,RB),t.registerSubTypeDefaulter("legend",(function(){return"plain"})),function(t){t.registerAction("legendToggleSelect","legendselectchanged",H(NB,"toggleSelected")),t.registerAction("legendAllSelect","legendselectall",H(NB,"allSelect")),t.registerAction("legendInverseSelect","legendinverseselect",H(NB,"inverseSelect")),t.registerAction("legendSelect","legendselected",H(NB,"select")),t.registerAction("legendUnSelect","legendunselected",H(NB,"unSelect"))}(t)}var zB=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.setScrollDataIndex=function(t){this.option.scrollDataIndex=t},e.prototype.init=function(e,n,i){var r=kp(e);t.prototype.init.call(this,e,n,i),VB(this,e,r)},e.prototype.mergeOption=function(e,n){t.prototype.mergeOption.call(this,e,n),VB(this,this.option,e)},e.type="legend.scroll",e.defaultOption=Tc(IB.defaultOption,{scrollDataIndex:0,pageButtonItemGap:5,pageButtonGap:null,pageButtonPosition:"end",pageFormatter:"{current}/{total}",pageIcons:{horizontal:["M0,0L12,-10L12,10z","M0,0L-12,-10L-12,10z"],vertical:["M0,0L20,0L10,-20z","M0,0L20,0L10,20z"]},pageIconColor:"#2f4554",pageIconInactiveColor:"#aaa",pageIconSize:15,pageTextStyle:{color:"#333"},animationDurationUpdate:800}),e}(IB);function VB(t,e,n){var i=[1,1];i[t.getOrient().index]=0,Ap(e,n,{type:"box",ignoreSize:!!i})}var BB=Er,FB=["width","height"],GB=["x","y"],WB=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.newlineDisabled=!0,n._currentIndex=0,n}return n(e,t),e.prototype.init=function(){t.prototype.init.call(this),this.group.add(this._containerGroup=new BB),this._containerGroup.add(this.getContentGroup()),this.group.add(this._controllerGroup=new BB)},e.prototype.resetInner=function(){t.prototype.resetInner.call(this),this._controllerGroup.removeAll(),this._containerGroup.removeClipPath(),this._containerGroup.__rectSize=null},e.prototype.renderInner=function(e,n,i,r,o,a,s){var l=this;t.prototype.renderInner.call(this,e,n,i,r,o,a,s);var u=this._controllerGroup,h=n.get("pageIconSize",!0),c=Y(h)?h:[h,h];d("pagePrev",0);var p=n.getModel("pageTextStyle");function d(t,e){var i=t+"DataIndex",o=Wh(n.get("pageIcons",!0)[n.getOrient().name][e],{onclick:W(l._pageGo,l,i,n,r)},{x:-c[0]/2,y:-c[1]/2,width:c[0],height:c[1]});o.name=t,u.add(o)}u.add(new Bs({name:"pageText",style:{text:"xx/xx",fill:p.getTextColor(),font:p.getFont(),verticalAlign:"middle",align:"center"},silent:!0})),d("pageNext",1)},e.prototype.layoutInner=function(t,e,n,i,r,o){var a=this.getSelectorGroup(),s=t.getOrient().index,l=FB[s],u=GB[s],h=FB[1-s],c=GB[1-s];r&&Ip("horizontal",a,t.get("selectorItemGap",!0));var p=t.get("selectorButtonGap",!0),d=a.getBoundingRect(),f=[-d.x,-d.y],g=T(n);r&&(g[l]=n[l]-d[l]-p);var y=this._layoutContentAndController(t,i,g,s,l,h,c,u);if(r){if("end"===o)f[s]+=y[l]+p;else{var v=d[l]+p;f[s]-=v,y[u]-=v}y[l]+=d[l]+p,f[1-s]+=y[c]+y[h]/2-d[h]/2,y[h]=Math.max(y[h],d[h]),y[c]=Math.min(y[c],d[c]+f[1-s]),a.x=f[0],a.y=f[1],a.markRedraw()}return y},e.prototype._layoutContentAndController=function(t,e,n,i,r,o,a,s){var l=this.getContentGroup(),u=this._containerGroup,h=this._controllerGroup;Ip(t.get("orient"),l,t.get("itemGap"),i?n.width:null,i?null:n.height),Ip("horizontal",h,t.get("pageButtonItemGap",!0));var c=l.getBoundingRect(),p=h.getBoundingRect(),d=this._showController=c[r]>n[r],f=[-c.x,-c.y];e||(f[i]=l[s]);var g=[0,0],y=[-p.x,-p.y],v=rt(t.get("pageButtonGap",!0),t.get("itemGap",!0));d&&("end"===t.get("pageButtonPosition",!0)?y[i]+=n[r]-p[r]:g[i]+=p[r]+v);y[1-i]+=c[o]/2-p[o]/2,l.setPosition(f),u.setPosition(g),h.setPosition(y);var m={x:0,y:0};if(m[r]=d?n[r]:c[r],m[o]=Math.max(c[o],p[o]),m[a]=Math.min(0,p[a]+y[1-i]),u.__rectSize=n[r],d){var x={x:0,y:0};x[r]=Math.max(n[r]-p[r]-v,0),x[o]=m[o],u.setClipPath(new Es({shape:x})),u.__rectSize=x[r]}else h.eachChild((function(t){t.attr({invisible:!0,silent:!0})}));var _=this._getPageInfo(t);return null!=_.pageIndex&&dh(l,{x:_.contentPosition[0],y:_.contentPosition[1]},d?t:null),this._updatePageInfoView(t,_),m},e.prototype._pageGo=function(t,e,n){var i=this._getPageInfo(e)[t];null!=i&&n.dispatchAction({type:"legendScroll",scrollDataIndex:i,legendId:e.id})},e.prototype._updatePageInfoView=function(t,e){var n=this._controllerGroup;E(["pagePrev","pageNext"],(function(i){var r=null!=e[i+"DataIndex"],o=n.childOfName(i);o&&(o.setStyle("fill",r?t.get("pageIconColor",!0):t.get("pageIconInactiveColor",!0)),o.cursor=r?"pointer":"default")}));var i=n.childOfName("pageText"),r=t.get("pageFormatter"),o=e.pageIndex,a=null!=o?o+1:0,s=e.pageCount;i&&r&&i.setStyle("text",X(r)?r.replace("{current}",null==a?"":a+"").replace("{total}",null==s?"":s+""):r({current:a,total:s}))},e.prototype._getPageInfo=function(t){var e=t.get("scrollDataIndex",!0),n=this.getContentGroup(),i=this._containerGroup.__rectSize,r=t.getOrient().index,o=FB[r],a=GB[r],s=this._findTargetItemIndex(e),l=n.children(),u=l[s],h=l.length,c=h?1:0,p={contentPosition:[n.x,n.y],pageCount:c,pageIndex:c-1,pagePrevDataIndex:null,pageNextDataIndex:null};if(!u)return p;var d=m(u);p.contentPosition[r]=-d.s;for(var f=s+1,g=d,y=d,v=null;f<=h;++f)(!(v=m(l[f]))&&y.e>g.s+i||v&&!x(v,g.s))&&(g=y.i>g.i?y:v)&&(null==p.pageNextDataIndex&&(p.pageNextDataIndex=g.i),++p.pageCount),y=v;for(f=s-1,g=d,y=d,v=null;f>=-1;--f)(v=m(l[f]))&&x(y,v.s)||!(g.i<y.i)||(y=g,null==p.pagePrevDataIndex&&(p.pagePrevDataIndex=g.i),++p.pageCount,++p.pageIndex),g=v;return p;function m(t){if(t){var e=t.getBoundingRect(),n=e[a]+t[a];return{s:n,e:n+e[o],i:t.__legendDataIndex}}}function x(t,e){return t.e>=e&&t.s<=e+i}},e.prototype._findTargetItemIndex=function(t){return this._showController?(this.getContentGroup().eachChild((function(i,r){var o=i.__legendDataIndex;null==n&&null!=o&&(n=r),o===t&&(e=r)})),null!=e?e:n):0;var e,n},e.type="legend.scroll",e}(AB);function HB(t){Dm(EB),t.registerComponentModel(zB),t.registerComponentView(WB),function(t){t.registerAction("legendScroll","legendscroll",(function(t,e){var n=t.scrollDataIndex;null!=n&&e.eachComponent({mainType:"legend",subType:"scroll",query:t},(function(t){t.setScrollDataIndex(n)}))}))}(t)}var YB=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.type="dataZoom.inside",e.defaultOption=Tc(GE.defaultOption,{disabled:!1,zoomLock:!1,zoomOnMouseWheel:!0,moveOnMouseMove:!0,moveOnMouseWheel:!1,preventDefaultMouseMove:!0}),e}(GE),UB=Po();function XB(t,e,n){UB(t).coordSysRecordMap.each((function(t){var i=t.dataZoomInfoMap.get(e.uid);i&&(i.getRange=n)}))}function ZB(t,e){if(e){t.removeKey(e.model.uid);var n=e.controller;n&&n.dispose()}}function jB(t,e){t.isDisposed()||t.dispatchAction({type:"dataZoom",animation:{easing:"cubicOut",duration:100},batch:e})}function qB(t,e,n,i){return t.coordinateSystem.containPoint([n,i])}function KB(t){t.registerProcessor(t.PRIORITY.PROCESSOR.FILTER,(function(t,e){var n=UB(e),i=n.coordSysRecordMap||(n.coordSysRecordMap=yt());i.each((function(t){t.dataZoomInfoMap=null})),t.eachComponent({mainType:"dataZoom",subType:"inside"},(function(t){E(BE(t).infoList,(function(n){var r=n.model.uid,o=i.get(r)||i.set(r,function(t,e){var n={model:e,containsPoint:H(qB,e),dispatchAction:H(jB,t),dataZoomInfoMap:null,controller:null},i=n.controller=new BI(t.getZr());return E(["pan","zoom","scrollMove"],(function(t){i.on(t,(function(e){var i=[];n.dataZoomInfoMap.each((function(r){if(e.isAvailableBehavior(r.model.option)){var o=(r.getRange||{})[t],a=o&&o(r.dzReferCoordSysInfo,n.model.mainType,n.controller,e);!r.model.get("disabled",!0)&&a&&i.push({dataZoomId:r.model.id,start:a[0],end:a[1]})}})),i.length&&n.dispatchAction(i)}))})),n}(e,n.model));(o.dataZoomInfoMap||(o.dataZoomInfoMap=yt())).set(t.uid,{dzReferCoordSysInfo:n,model:t,getRange:null})}))})),i.each((function(t){var e,n=t.controller,r=t.dataZoomInfoMap;if(r){var o=r.keys()[0];null!=o&&(e=r.get(o))}if(e){var a=function(t){var e,n="type_",i={type_true:2,type_move:1,type_false:0,type_undefined:-1},r=!0;return t.each((function(t){var o=t.model,a=!o.get("disabled",!0)&&(!o.get("zoomLock",!0)||"move");i[n+a]>i[n+e]&&(e=a),r=r&&o.get("preventDefaultMouseMove",!0)})),{controlType:e,opt:{zoomOnMouseWheel:!0,moveOnMouseMove:!0,moveOnMouseWheel:!0,preventDefaultMouseMove:!!r}}}(r);n.enable(a.controlType,a.opt),n.setPointerChecker(t.containsPoint),Eg(t,"dispatchAction",e.model.get("throttle",!0),"fixRate")}else ZB(i,t)}))}))}var $B=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="dataZoom.inside",e}return n(e,t),e.prototype.render=function(e,n,i){t.prototype.render.apply(this,arguments),e.noTarget()?this._clear():(this.range=e.getPercentRange(),XB(i,e,{pan:W(JB.pan,this),zoom:W(JB.zoom,this),scrollMove:W(JB.scrollMove,this)}))},e.prototype.dispose=function(){this._clear(),t.prototype.dispose.apply(this,arguments)},e.prototype._clear=function(){!function(t,e){for(var n=UB(t).coordSysRecordMap,i=n.keys(),r=0;r<i.length;r++){var o=i[r],a=n.get(o),s=a.dataZoomInfoMap;if(s){var l=e.uid;s.get(l)&&(s.removeKey(l),s.keys().length||ZB(n,a))}}}(this.api,this.dataZoomModel),this.range=null},e.type="dataZoom.inside",e}(YE),JB={zoom:function(t,e,n,i){var r=this.range,o=r.slice(),a=t.axisModels[0];if(a){var s=tF[e](null,[i.originX,i.originY],a,n,t),l=(s.signal>0?s.pixelStart+s.pixelLength-s.pixel:s.pixel-s.pixelStart)/s.pixelLength*(o[1]-o[0])+o[0],u=Math.max(1/i.scale,0);o[0]=(o[0]-l)*u+l,o[1]=(o[1]-l)*u+l;var h=this.dataZoomModel.findRepresentativeAxisProxy().getMinMaxSpan();return xk(0,o,[0,100],0,h.minSpan,h.maxSpan),this.range=o,r[0]!==o[0]||r[1]!==o[1]?o:void 0}},pan:QB((function(t,e,n,i,r,o){var a=tF[i]([o.oldX,o.oldY],[o.newX,o.newY],e,r,n);return a.signal*(t[1]-t[0])*a.pixel/a.pixelLength})),scrollMove:QB((function(t,e,n,i,r,o){return tF[i]([0,0],[o.scrollDelta,o.scrollDelta],e,r,n).signal*(t[1]-t[0])*o.scrollDelta}))};function QB(t){return function(e,n,i,r){var o=this.range,a=o.slice(),s=e.axisModels[0];if(s)return xk(t(a,s,e,n,i,r),a,[0,100],"all"),this.range=a,o[0]!==a[0]||o[1]!==a[1]?a:void 0}}var tF={grid:function(t,e,n,i,r){var o=n.axis,a={},s=r.model.coordinateSystem.getRect();return t=t||[0,0],"x"===o.dim?(a.pixel=e[0]-t[0],a.pixelLength=s.width,a.pixelStart=s.x,a.signal=o.inverse?1:-1):(a.pixel=e[1]-t[1],a.pixelLength=s.height,a.pixelStart=s.y,a.signal=o.inverse?-1:1),a},polar:function(t,e,n,i,r){var o=n.axis,a={},s=r.model.coordinateSystem,l=s.getRadiusAxis().getExtent(),u=s.getAngleAxis().getExtent();return t=t?s.pointToCoord(t):[0,0],e=s.pointToCoord(e),"radiusAxis"===n.mainType?(a.pixel=e[0]-t[0],a.pixelLength=l[1]-l[0],a.pixelStart=l[0],a.signal=o.inverse?1:-1):(a.pixel=e[1]-t[1],a.pixelLength=u[1]-u[0],a.pixelStart=u[0],a.signal=o.inverse?-1:1),a},singleAxis:function(t,e,n,i,r){var o=n.axis,a=r.model.coordinateSystem.getRect(),s={};return t=t||[0,0],"horizontal"===o.orient?(s.pixel=e[0]-t[0],s.pixelLength=a.width,s.pixelStart=a.x,s.signal=o.inverse?1:-1):(s.pixel=e[1]-t[1],s.pixelLength=a.height,s.pixelStart=a.y,s.signal=o.inverse?-1:1),s}};function eF(t){$E(t),t.registerComponentModel(YB),t.registerComponentView($B),KB(t)}var nF=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.type="dataZoom.slider",e.layoutMode="box",e.defaultOption=Tc(GE.defaultOption,{show:!0,right:"ph",top:"ph",width:"ph",height:"ph",left:null,bottom:null,borderColor:"#d2dbee",borderRadius:3,backgroundColor:"rgba(47,69,84,0)",dataBackground:{lineStyle:{color:"#d2dbee",width:.5},areaStyle:{color:"#d2dbee",opacity:.2}},selectedDataBackground:{lineStyle:{color:"#8fb0f7",width:.5},areaStyle:{color:"#8fb0f7",opacity:.2}},fillerColor:"rgba(135,175,274,0.2)",handleIcon:"path://M-9.35,34.56V42m0-40V9.5m-2,0h4a2,2,0,0,1,2,2v21a2,2,0,0,1-2,2h-4a2,2,0,0,1-2-2v-21A2,2,0,0,1-11.35,9.5Z",handleSize:"100%",handleStyle:{color:"#fff",borderColor:"#ACB8D1"},moveHandleSize:7,moveHandleIcon:"path://M-320.9-50L-320.9-50c18.1,0,27.1,9,27.1,27.1V85.7c0,18.1-9,27.1-27.1,27.1l0,0c-18.1,0-27.1-9-27.1-27.1V-22.9C-348-41-339-50-320.9-50z M-212.3-50L-212.3-50c18.1,0,27.1,9,27.1,27.1V85.7c0,18.1-9,27.1-27.1,27.1l0,0c-18.1,0-27.1-9-27.1-27.1V-22.9C-239.4-41-230.4-50-212.3-50z M-103.7-50L-103.7-50c18.1,0,27.1,9,27.1,27.1V85.7c0,18.1-9,27.1-27.1,27.1l0,0c-18.1,0-27.1-9-27.1-27.1V-22.9C-130.9-41-121.8-50-103.7-50z",moveHandleStyle:{color:"#D2DBEE",opacity:.7},showDetail:!0,showDataShadow:"auto",realtime:!0,zoomLock:!1,textStyle:{color:"#6E7079"},brushSelect:!0,brushStyle:{color:"rgba(135,175,274,0.15)"},emphasis:{handleStyle:{borderColor:"#8FB0F7"},moveHandleStyle:{color:"#8FB0F7"}}}),e}(GE),iF=Es,rF="horizontal",oF="vertical",aF=["line","bar","candlestick","scatter"],sF={easing:"cubicOut",duration:100,delay:0},lF=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n._displayables={},n}return n(e,t),e.prototype.init=function(t,e){this.api=e,this._onBrush=W(this._onBrush,this),this._onBrushEnd=W(this._onBrushEnd,this)},e.prototype.render=function(e,n,i,r){if(t.prototype.render.apply(this,arguments),Eg(this,"_dispatchZoomAction",e.get("throttle"),"fixRate"),this._orient=e.getOrient(),!1!==e.get("show")){if(e.noTarget())return this._clear(),void this.group.removeAll();r&&"dataZoom"===r.type&&r.from===this.uid||this._buildView(),this._updateView()}else this.group.removeAll()},e.prototype.dispose=function(){this._clear(),t.prototype.dispose.apply(this,arguments)},e.prototype._clear=function(){zg(this,"_dispatchZoomAction");var t=this.api.getZr();t.off("mousemove",this._onBrush),t.off("mouseup",this._onBrushEnd)},e.prototype._buildView=function(){var t=this.group;t.removeAll(),this._brushing=!1,this._displayables.brushRect=null,this._resetLocation(),this._resetInterval();var e=this._displayables.sliderGroup=new Er;this._renderBackground(),this._renderHandle(),this._renderDataShadow(),t.add(e),this._positionGroup()},e.prototype._resetLocation=function(){var t=this.dataZoomModel,e=this.api,n=t.get("brushSelect")?7:0,i=this._findCoordRect(),r={width:e.getWidth(),height:e.getHeight()},o=this._orient===rF?{right:r.width-i.x-i.width,top:r.height-30-7-n,width:i.width,height:30}:{right:7,top:i.y,width:30,height:i.height},a=kp(t.option);E(["right","top","width","height"],(function(t){"ph"===a[t]&&(a[t]=o[t])}));var s=Tp(a,r);this._location={x:s.x,y:s.y},this._size=[s.width,s.height],this._orient===oF&&this._size.reverse()},e.prototype._positionGroup=function(){var t=this.group,e=this._location,n=this._orient,i=this.dataZoomModel.getFirstTargetAxisModel(),r=i&&i.get("inverse"),o=this._displayables.sliderGroup,a=(this._dataShadowInfo||{}).otherAxisInverse;o.attr(n!==rF||r?n===rF&&r?{scaleY:a?1:-1,scaleX:-1}:n!==oF||r?{scaleY:a?-1:1,scaleX:-1,rotation:Math.PI/2}:{scaleY:a?-1:1,scaleX:1,rotation:Math.PI/2}:{scaleY:a?1:-1,scaleX:1});var s=t.getBoundingRect([o]);t.x=e.x-s.x,t.y=e.y-s.y,t.markRedraw()},e.prototype._getViewExtent=function(){return[0,this._size[0]]},e.prototype._renderBackground=function(){var t=this.dataZoomModel,e=this._size,n=this._displayables.sliderGroup,i=t.get("brushSelect");n.add(new iF({silent:!0,shape:{x:0,y:0,width:e[0],height:e[1]},style:{fill:t.get("backgroundColor")},z2:-40}));var r=new iF({shape:{x:0,y:0,width:e[0],height:e[1]},style:{fill:"transparent"},z2:0,onclick:W(this._onClickPanel,this)}),o=this.api.getZr();i?(r.on("mousedown",this._onBrushStart,this),r.cursor="crosshair",o.on("mousemove",this._onBrush),o.on("mouseup",this._onBrushEnd)):(o.off("mousemove",this._onBrush),o.off("mouseup",this._onBrushEnd)),n.add(r)},e.prototype._renderDataShadow=function(){var t=this._dataShadowInfo=this._prepareDataShadowInfo();if(this._displayables.dataShadowSegs=[],t){var e=this._size,n=this._shadowSize||[],i=t.series,r=i.getRawData(),o=i.getShadowDim&&i.getShadowDim(),a=o&&r.getDimensionInfo(o)?i.getShadowDim():t.otherDim;if(null!=a){var s=this._shadowPolygonPts,l=this._shadowPolylinePts;if(r!==this._shadowData||a!==this._shadowDim||e[0]!==n[0]||e[1]!==n[1]){var u=r.getDataExtent(a),h=.3*(u[1]-u[0]);u=[u[0]-h,u[1]+h];var c,p=[0,e[1]],d=[0,e[0]],f=[[e[0],0],[0,0]],g=[],y=d[1]/(r.count()-1),v=0,m=Math.round(r.count()/e[0]);r.each([a],(function(t,e){if(m>0&&e%m)v+=y;else{var n=null==t||isNaN(t)||""===t,i=n?0:Yr(t,u,p,!0);n&&!c&&e?(f.push([f[f.length-1][0],0]),g.push([g[g.length-1][0],0])):!n&&c&&(f.push([v,0]),g.push([v,0])),f.push([v,i]),g.push([v,i]),v+=y,c=n}})),s=this._shadowPolygonPts=f,l=this._shadowPolylinePts=g}this._shadowData=r,this._shadowDim=a,this._shadowSize=[e[0],e[1]];for(var x=this.dataZoomModel,_=0;_<3;_++){var b=w(1===_);this._displayables.sliderGroup.add(b),this._displayables.dataShadowSegs.push(b)}}}function w(t){var e=x.getModel(t?"selectedDataBackground":"dataBackground"),n=new Er,i=new Gu({shape:{points:s},segmentIgnoreThreshold:1,style:e.getModel("areaStyle").getAreaStyle(),silent:!0,z2:-20}),r=new Hu({shape:{points:l},segmentIgnoreThreshold:1,style:e.getModel("lineStyle").getLineStyle(),silent:!0,z2:-19});return n.add(i),n.add(r),n}},e.prototype._prepareDataShadowInfo=function(){var t=this.dataZoomModel,e=t.get("showDataShadow");if(!1!==e){var n,i=this.ecModel;return t.eachTargetAxis((function(r,o){E(t.getAxisProxy(r,o).getTargetSeriesModels(),(function(t){if(!(n||!0!==e&&P(aF,t.get("type"))<0)){var a,s=i.getComponent(zE(r),o).axis,l={x:"y",y:"x",radius:"angle",angle:"radius"}[r],u=t.coordinateSystem;null!=l&&u.getOtherAxis&&(a=u.getOtherAxis(s).inverse),l=t.getData().mapDimension(l),n={thisAxis:s,series:t,thisDim:r,otherDim:l,otherAxisInverse:a}}}),this)}),this),n}},e.prototype._renderHandle=function(){var t=this.group,e=this._displayables,n=e.handles=[null,null],i=e.handleLabels=[null,null],r=this._displayables.sliderGroup,o=this._size,a=this.dataZoomModel,s=this.api,l=a.get("borderRadius")||0,u=a.get("brushSelect"),h=e.filler=new iF({silent:u,style:{fill:a.get("fillerColor")},textConfig:{position:"inside"}});r.add(h),r.add(new iF({silent:!0,subPixelOptimize:!0,shape:{x:0,y:0,width:o[0],height:o[1],r:l},style:{stroke:a.get("dataBackgroundColor")||a.get("borderColor"),lineWidth:1,fill:"rgba(0,0,0,0)"}})),E([0,1],(function(e){var o=a.get("handleIcon");!Ny[o]&&o.indexOf("path://")<0&&o.indexOf("image://")<0&&(o="path://"+o);var s=Vy(o,-1,0,2,2,null,!0);s.attr({cursor:uF(this._orient),draggable:!0,drift:W(this._onDragMove,this,e),ondragend:W(this._onDragEnd,this),onmouseover:W(this._showDataInfo,this,!0),onmouseout:W(this._showDataInfo,this,!1),z2:5});var l=s.getBoundingRect(),u=a.get("handleSize");this._handleHeight=Ur(u,this._size[1]),this._handleWidth=l.width/l.height*this._handleHeight,s.setStyle(a.getModel("handleStyle").getItemStyle()),s.style.strokeNoScale=!0,s.rectHover=!0,s.ensureState("emphasis").style=a.getModel(["emphasis","handleStyle"]).getItemStyle(),Wl(s);var h=a.get("handleColor");null!=h&&(s.style.fill=h),r.add(n[e]=s);var c=a.getModel("textStyle");t.add(i[e]=new Bs({silent:!0,invisible:!0,style:ec(c,{x:0,y:0,text:"",verticalAlign:"middle",align:"center",fill:c.getTextColor(),font:c.getFont()}),z2:10}))}),this);var c=h;if(u){var p=Ur(a.get("moveHandleSize"),o[1]),d=e.moveHandle=new Es({style:a.getModel("moveHandleStyle").getItemStyle(),silent:!0,shape:{r:[0,0,2,2],y:o[1]-.5,height:p}}),f=.8*p,g=e.moveHandleIcon=Vy(a.get("moveHandleIcon"),-f/2,-f/2,f,f,"#fff",!0);g.silent=!0,g.y=o[1]+p/2-.5,d.ensureState("emphasis").style=a.getModel(["emphasis","moveHandleStyle"]).getItemStyle();var y=Math.min(o[1]/2,Math.max(p,10));(c=e.moveZone=new Es({invisible:!0,shape:{y:o[1]-y,height:p+y}})).on("mouseover",(function(){s.enterEmphasis(d)})).on("mouseout",(function(){s.leaveEmphasis(d)})),r.add(d),r.add(g),r.add(c)}c.attr({draggable:!0,cursor:uF(this._orient),drift:W(this._onDragMove,this,"all"),ondragstart:W(this._showDataInfo,this,!0),ondragend:W(this._onDragEnd,this),onmouseover:W(this._showDataInfo,this,!0),onmouseout:W(this._showDataInfo,this,!1)})},e.prototype._resetInterval=function(){var t=this._range=this.dataZoomModel.getPercentRange(),e=this._getViewExtent();this._handleEnds=[Yr(t[0],[0,100],e,!0),Yr(t[1],[0,100],e,!0)]},e.prototype._updateInterval=function(t,e){var n=this.dataZoomModel,i=this._handleEnds,r=this._getViewExtent(),o=n.findRepresentativeAxisProxy().getMinMaxSpan(),a=[0,100];xk(e,i,r,n.get("zoomLock")?"all":t,null!=o.minSpan?Yr(o.minSpan,a,r,!0):null,null!=o.maxSpan?Yr(o.maxSpan,a,r,!0):null);var s=this._range,l=this._range=Zr([Yr(i[0],r,a,!0),Yr(i[1],r,a,!0)]);return!s||s[0]!==l[0]||s[1]!==l[1]},e.prototype._updateView=function(t){var e=this._displayables,n=this._handleEnds,i=Zr(n.slice()),r=this._size;E([0,1],(function(t){var i=e.handles[t],o=this._handleHeight;i.attr({scaleX:o/2,scaleY:o/2,x:n[t]+(t?-1:1),y:r[1]/2-o/2})}),this),e.filler.setShape({x:i[0],y:0,width:i[1]-i[0],height:r[1]});var o={x:i[0],width:i[1]-i[0]};e.moveHandle&&(e.moveHandle.setShape(o),e.moveZone.setShape(o),e.moveZone.getBoundingRect(),e.moveHandleIcon&&e.moveHandleIcon.attr("x",o.x+o.width/2));for(var a=e.dataShadowSegs,s=[0,i[0],i[1],r[0]],l=0;l<a.length;l++){var u=a[l],h=u.getClipPath();h||(h=new Es,u.setClipPath(h)),h.setShape({x:s[l],y:0,width:s[l+1]-s[l],height:r[1]})}this._updateDataInfo(t)},e.prototype._updateDataInfo=function(t){var e=this.dataZoomModel,n=this._displayables,i=n.handleLabels,r=this._orient,o=["",""];if(e.get("showDetail")){var a=e.findRepresentativeAxisProxy();if(a){var s=a.getAxisModel().axis,l=this._range,u=t?a.calculateDataWindow({start:l[0],end:l[1]}).valueWindow:a.getDataValueWindow();o=[this._formatLabel(u[0],s),this._formatLabel(u[1],s)]}}var h=Zr(this._handleEnds.slice());function c(t){var e=Nh(n.handles[t].parent,this.group),a=zh(0===t?"right":"left",e),s=this._handleWidth/2+5,l=Eh([h[t]+(0===t?-s:s),this._size[1]/2],e);i[t].setStyle({x:l[0],y:l[1],verticalAlign:r===rF?"middle":a,align:r===rF?a:"center",text:o[t]})}c.call(this,0),c.call(this,1)},e.prototype._formatLabel=function(t,e){var n=this.dataZoomModel,i=n.get("labelFormatter"),r=n.get("labelPrecision");null!=r&&"auto"!==r||(r=e.getPixelPrecision());var o=null==t||isNaN(t)?"":"category"===e.type||"time"===e.type?e.scale.getLabel({value:Math.round(t)}):t.toFixed(Math.min(r,20));return U(i)?i(t,o):X(i)?i.replace("{value}",o):o},e.prototype._showDataInfo=function(t){t=this._dragging||t;var e=this._displayables,n=e.handleLabels;n[0].attr("invisible",!t),n[1].attr("invisible",!t),e.moveHandle&&this.api[t?"enterEmphasis":"leaveEmphasis"](e.moveHandle,1)},e.prototype._onDragMove=function(t,e,n,i){this._dragging=!0,pe(i.event);var r=Eh([e,n],this._displayables.sliderGroup.getLocalTransform(),!0),o=this._updateInterval(t,r[0]),a=this.dataZoomModel.get("realtime");this._updateView(!a),o&&a&&this._dispatchZoomAction(!0)},e.prototype._onDragEnd=function(){this._dragging=!1,this._showDataInfo(!1),!this.dataZoomModel.get("realtime")&&this._dispatchZoomAction(!1)},e.prototype._onClickPanel=function(t){var e=this._size,n=this._displayables.sliderGroup.transformCoordToLocal(t.offsetX,t.offsetY);if(!(n[0]<0||n[0]>e[0]||n[1]<0||n[1]>e[1])){var i=this._handleEnds,r=(i[0]+i[1])/2,o=this._updateInterval("all",n[0]-r);this._updateView(),o&&this._dispatchZoomAction(!1)}},e.prototype._onBrushStart=function(t){var e=t.offsetX,n=t.offsetY;this._brushStart=new Ce(e,n),this._brushing=!0,this._brushStartTime=+new Date},e.prototype._onBrushEnd=function(t){if(this._brushing){var e=this._displayables.brushRect;if(this._brushing=!1,e){e.attr("ignore",!0);var n=e.shape;if(!(+new Date-this._brushStartTime<200&&Math.abs(n.width)<5)){var i=this._getViewExtent(),r=[0,100];this._range=Zr([Yr(n.x,i,r,!0),Yr(n.x+n.width,i,r,!0)]),this._handleEnds=[n.x,n.x+n.width],this._updateView(),this._dispatchZoomAction(!1)}}}},e.prototype._onBrush=function(t){this._brushing&&(pe(t.event),this._updateBrushRect(t.offsetX,t.offsetY))},e.prototype._updateBrushRect=function(t,e){var n=this._displayables,i=this.dataZoomModel,r=n.brushRect;r||(r=n.brushRect=new iF({silent:!0,style:i.getModel("brushStyle").getItemStyle()}),n.sliderGroup.add(r)),r.attr("ignore",!1);var o=this._brushStart,a=this._displayables.sliderGroup,s=a.transformCoordToLocal(t,e),l=a.transformCoordToLocal(o.x,o.y),u=this._size;s[0]=Math.max(Math.min(u[0],s[0]),0),r.setShape({x:l[0],y:0,width:s[0]-l[0],height:u[1]})},e.prototype._dispatchZoomAction=function(t){var e=this._range;this.api.dispatchAction({type:"dataZoom",from:this.uid,dataZoomId:this.dataZoomModel.id,animation:t?sF:null,start:e[0],end:e[1]})},e.prototype._findCoordRect=function(){var t,e=BE(this.dataZoomModel).infoList;if(!t&&e.length){var n=e[0].model.coordinateSystem;t=n.getRect&&n.getRect()}if(!t){var i=this.api.getWidth(),r=this.api.getHeight();t={x:.2*i,y:.2*r,width:.6*i,height:.6*r}}return t},e.type="dataZoom.slider",e}(YE);function uF(t){return"vertical"===t?"ns-resize":"ew-resize"}function hF(t){t.registerComponentModel(nF),t.registerComponentView(lF),$E(t)}var cF=function(t,e,n){var i=T((pF[t]||{})[e]);return n&&Y(i)?i[i.length-1]:i},pF={color:{active:["#006edd","#e0ffff"],inactive:["rgba(0,0,0,0)"]},colorHue:{active:[0,360],inactive:[0,0]},colorSaturation:{active:[.3,1],inactive:[0,0]},colorLightness:{active:[.9,.5],inactive:[0,0]},colorAlpha:{active:[.3,1],inactive:[0,0]},opacity:{active:[.3,1],inactive:[0,0]},symbol:{active:["circle","roundRect","diamond"],inactive:["none"]},symbolSize:{active:[10,50],inactive:[0,0]}},dF=dD.mapVisual,fF=dD.eachVisual,gF=Y,yF=E,vF=Zr,mF=Yr,xF=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.stateList=["inRange","outOfRange"],n.replacableOptionKeys=["inRange","outOfRange","target","controller","color"],n.layoutMode={type:"box",ignoreSize:!0},n.dataBound=[-1/0,1/0],n.targetVisuals={},n.controllerVisuals={},n}return n(e,t),e.prototype.init=function(t,e,n){this.mergeDefaultAndTheme(t,n)},e.prototype.optionUpdated=function(t,e){var n=this.option;!e&&dV(n,t,this.replacableOptionKeys),this.textStyleModel=this.getModel("textStyle"),this.resetItemSize(),this.completeVisualOption()},e.prototype.resetVisual=function(t){var e=this.stateList;t=W(t,this),this.controllerVisuals=pV(this.option.controller,e,t),this.targetVisuals=pV(this.option.target,e,t)},e.prototype.getItemSymbol=function(){return null},e.prototype.getTargetSeriesIndices=function(){var t=this.option.seriesIndex,e=[];return null==t||"all"===t?this.ecModel.eachSeries((function(t,n){e.push(n)})):e=_o(t),e},e.prototype.eachTargetSeries=function(t,e){E(this.getTargetSeriesIndices(),(function(n){var i=this.ecModel.getSeriesByIndex(n);i&&t.call(e,i)}),this)},e.prototype.isTargetSeries=function(t){var e=!1;return this.eachTargetSeries((function(n){n===t&&(e=!0)})),e},e.prototype.formatValueText=function(t,e,n){var i,r=this.option,o=r.precision,a=this.dataBound,s=r.formatter;n=n||["<",">"],Y(t)&&(t=t.slice(),i=!0);var l=e?t:i?[u(t[0]),u(t[1])]:u(t);return X(s)?s.replace("{value}",i?l[0]:l).replace("{value2}",i?l[1]:l):U(s)?i?s(t[0],t[1]):s(t):i?t[0]===a[0]?n[0]+" "+l[1]:t[1]===a[1]?n[1]+" "+l[0]:l[0]+" - "+l[1]:l;function u(t){return t===a[0]?"min":t===a[1]?"max":(+t).toFixed(Math.min(o,20))}},e.prototype.resetExtent=function(){var t=this.option,e=vF([t.min,t.max]);this._dataExtent=e},e.prototype.getDataDimensionIndex=function(t){var e=this.option.dimension;if(null!=e)return t.getDimensionIndex(e);for(var n=t.dimensions,i=n.length-1;i>=0;i--){var r=n[i],o=t.getDimensionInfo(r);if(!o.isCalculationCoord)return o.storeDimIndex}},e.prototype.getExtent=function(){return this._dataExtent.slice()},e.prototype.completeVisualOption=function(){var t=this.ecModel,e=this.option,n={inRange:e.inRange,outOfRange:e.outOfRange},i=e.target||(e.target={}),r=e.controller||(e.controller={});C(i,n),C(r,n);var o=this.isCategory();function a(n){gF(e.color)&&!n.inRange&&(n.inRange={color:e.color.slice().reverse()}),n.inRange=n.inRange||{color:t.get("gradientColor")}}a.call(this,i),a.call(this,r),function(t,e,n){var i=t[e],r=t[n];i&&!r&&(r=t[n]={},yF(i,(function(t,e){if(dD.isValidType(e)){var n=cF(e,"inactive",o);null!=n&&(r[e]=n,"color"!==e||r.hasOwnProperty("opacity")||r.hasOwnProperty("colorAlpha")||(r.opacity=[0,0]))}})))}.call(this,i,"inRange","outOfRange"),function(t){var e=(t.inRange||{}).symbol||(t.outOfRange||{}).symbol,n=(t.inRange||{}).symbolSize||(t.outOfRange||{}).symbolSize,i=this.get("inactiveColor"),r=this.getItemSymbol()||"roundRect";yF(this.stateList,(function(a){var s=this.itemSize,l=t[a];l||(l=t[a]={color:o?i:[i]}),null==l.symbol&&(l.symbol=e&&T(e)||(o?r:[r])),null==l.symbolSize&&(l.symbolSize=n&&T(n)||(o?s[0]:[s[0],s[0]])),l.symbol=dF(l.symbol,(function(t){return"none"===t?r:t}));var u=l.symbolSize;if(null!=u){var h=-1/0;fF(u,(function(t){t>h&&(h=t)})),l.symbolSize=dF(u,(function(t){return mF(t,[0,h],[0,s[0]],!0)}))}}),this)}.call(this,r)},e.prototype.resetItemSize=function(){this.itemSize=[parseFloat(this.get("itemWidth")),parseFloat(this.get("itemHeight"))]},e.prototype.isCategory=function(){return!!this.option.categories},e.prototype.setSelected=function(t){},e.prototype.getSelected=function(){return null},e.prototype.getValueState=function(t){return null},e.prototype.getVisualMeta=function(t){return null},e.type="visualMap",e.dependencies=["series"],e.defaultOption={show:!0,z:4,seriesIndex:"all",min:0,max:200,left:0,right:null,top:null,bottom:0,itemWidth:null,itemHeight:null,inverse:!1,orient:"vertical",backgroundColor:"rgba(0,0,0,0)",borderColor:"#ccc",contentColor:"#5793f3",inactiveColor:"#aaa",borderWidth:0,padding:5,textGap:10,precision:0,textStyle:{color:"#333"}},e}(Op),_F=[20,140],bF=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.optionUpdated=function(e,n){t.prototype.optionUpdated.apply(this,arguments),this.resetExtent(),this.resetVisual((function(t){t.mappingMethod="linear",t.dataExtent=this.getExtent()})),this._resetRange()},e.prototype.resetItemSize=function(){t.prototype.resetItemSize.apply(this,arguments);var e=this.itemSize;(null==e[0]||isNaN(e[0]))&&(e[0]=_F[0]),(null==e[1]||isNaN(e[1]))&&(e[1]=_F[1])},e.prototype._resetRange=function(){var t=this.getExtent(),e=this.option.range;!e||e.auto?(t.auto=1,this.option.range=t):Y(e)&&(e[0]>e[1]&&e.reverse(),e[0]=Math.max(e[0],t[0]),e[1]=Math.min(e[1],t[1]))},e.prototype.completeVisualOption=function(){t.prototype.completeVisualOption.apply(this,arguments),E(this.stateList,(function(t){var e=this.option.controller[t].symbolSize;e&&e[0]!==e[1]&&(e[0]=e[1]/3)}),this)},e.prototype.setSelected=function(t){this.option.range=t.slice(),this._resetRange()},e.prototype.getSelected=function(){var t=this.getExtent(),e=Zr((this.get("range")||[]).slice());return e[0]>t[1]&&(e[0]=t[1]),e[1]>t[1]&&(e[1]=t[1]),e[0]<t[0]&&(e[0]=t[0]),e[1]<t[0]&&(e[1]=t[0]),e},e.prototype.getValueState=function(t){var e=this.option.range,n=this.getExtent();return(e[0]<=n[0]||e[0]<=t)&&(e[1]>=n[1]||t<=e[1])?"inRange":"outOfRange"},e.prototype.findTargetDataIndices=function(t){var e=[];return this.eachTargetSeries((function(n){var i=[],r=n.getData();r.each(this.getDataDimensionIndex(r),(function(e,n){t[0]<=e&&e<=t[1]&&i.push(n)}),this),e.push({seriesId:n.id,dataIndex:i})}),this),e},e.prototype.getVisualMeta=function(t){var e=wF(this,"outOfRange",this.getExtent()),n=wF(this,"inRange",this.option.range.slice()),i=[];function r(e,n){i.push({value:e,color:t(e,n)})}for(var o=0,a=0,s=n.length,l=e.length;a<l&&(!n.length||e[a]<=n[0]);a++)e[a]<n[o]&&r(e[a],"outOfRange");for(var u=1;o<s;o++,u=0)u&&i.length&&r(n[o],"outOfRange"),r(n[o],"inRange");for(u=1;a<l;a++)(!n.length||n[n.length-1]<e[a])&&(u&&(i.length&&r(i[i.length-1].value,"outOfRange"),u=0),r(e[a],"outOfRange"));var h=i.length;return{stops:i,outerColors:[h?i[0].color:"transparent",h?i[h-1].color:"transparent"]}},e.type="visualMap.continuous",e.defaultOption=Tc(xF.defaultOption,{align:"auto",calculable:!1,hoverLink:!0,realtime:!0,handleIcon:"path://M-11.39,9.77h0a3.5,3.5,0,0,1-3.5,3.5h-22a3.5,3.5,0,0,1-3.5-3.5h0a3.5,3.5,0,0,1,3.5-3.5h22A3.5,3.5,0,0,1-11.39,9.77Z",handleSize:"120%",handleStyle:{borderColor:"#fff",borderWidth:1},indicatorIcon:"circle",indicatorSize:"50%",indicatorStyle:{borderColor:"#fff",borderWidth:2,shadowBlur:2,shadowOffsetX:1,shadowOffsetY:1,shadowColor:"rgba(0,0,0,0.2)"}}),e}(xF);function wF(t,e,n){if(n[0]===n[1])return n.slice();for(var i=(n[1]-n[0])/200,r=n[0],o=[],a=0;a<=200&&r<n[1];a++)o.push(r),r+=i;return o.push(n[1]),o}var SF=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n.autoPositionValues={left:1,right:1,top:1,bottom:1},n}return n(e,t),e.prototype.init=function(t,e){this.ecModel=t,this.api=e},e.prototype.render=function(t,e,n,i){this.visualMapModel=t,!1!==t.get("show")?this.doRender(t,e,n,i):this.group.removeAll()},e.prototype.renderBackground=function(t){var e=this.visualMapModel,n=dp(e.get("padding")||0),i=t.getBoundingRect();t.add(new Es({z2:-1,silent:!0,shape:{x:i.x-n[3],y:i.y-n[0],width:i.width+n[3]+n[1],height:i.height+n[0]+n[2]},style:{fill:e.get("backgroundColor"),stroke:e.get("borderColor"),lineWidth:e.get("borderWidth")}}))},e.prototype.getControllerVisual=function(t,e,n){var i=(n=n||{}).forceState,r=this.visualMapModel,o={};if("color"===e){var a=r.get("contentColor");o.color=a}function s(t){return o[t]}function l(t,e){o[t]=e}var u=r.controllerVisuals[i||r.getValueState(t)];return E(dD.prepareVisualTypes(u),(function(i){var r=u[i];n.convertOpacityToAlpha&&"opacity"===i&&(i="colorAlpha",r=u.__alphaForOpacity),dD.dependsOn(i,e)&&r&&r.applyVisual(t,s,l)})),o[e]},e.prototype.positionGroup=function(t){var e=this.visualMapModel,n=this.api;Cp(t,e.getBoxLayoutParams(),{width:n.getWidth(),height:n.getHeight()})},e.prototype.doRender=function(t,e,n,i){},e.type="visualMap",e}(wg),MF=[["left","right","width"],["top","bottom","height"]];function IF(t,e,n){var i=t.option,r=i.align;if(null!=r&&"auto"!==r)return r;for(var o={width:e.getWidth(),height:e.getHeight()},a="horizontal"===i.orient?1:0,s=MF[a],l=[0,null,10],u={},h=0;h<3;h++)u[MF[1-a][h]]=l[h],u[s[h]]=2===h?n[0]:i[s[h]];var c=[["x","width",3],["y","height",0]][a],p=Tp(u,o,i.padding);return s[(p.margin[c[2]]||0)+p[c[0]]+.5*p[c[1]]<.5*o[c[1]]?0:1]}function TF(t,e){return E(t||[],(function(t){null!=t.dataIndex&&(t.dataIndexInside=t.dataIndex,t.dataIndex=null),t.highlightKey="visualMap"+(e?e.componentIndex:"")})),t}var CF=Yr,DF=E,AF=Math.min,kF=Math.max,LF=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n._shapes={},n._dataInterval=[],n._handleEnds=[],n._hoverLinkDataIndices=[],n}return n(e,t),e.prototype.doRender=function(t,e,n,i){this._api=n,i&&"selectDataRange"===i.type&&i.from===this.uid||this._buildView()},e.prototype._buildView=function(){this.group.removeAll();var t=this.visualMapModel,e=this.group;this._orient=t.get("orient"),this._useHandle=t.get("calculable"),this._resetInterval(),this._renderBar(e);var n=t.get("text");this._renderEndsText(e,n,0),this._renderEndsText(e,n,1),this._updateView(!0),this.renderBackground(e),this._updateView(),this._enableHoverLinkToSeries(),this._enableHoverLinkFromSeries(),this.positionGroup(e)},e.prototype._renderEndsText=function(t,e,n){if(e){var i=e[1-n];i=null!=i?i+"":"";var r=this.visualMapModel,o=r.get("textGap"),a=r.itemSize,s=this._shapes.mainGroup,l=this._applyTransform([a[0]/2,0===n?-o:a[1]+o],s),u=this._applyTransform(0===n?"bottom":"top",s),h=this._orient,c=this.visualMapModel.textStyleModel;this.group.add(new Bs({style:ec(c,{x:l[0],y:l[1],verticalAlign:"horizontal"===h?"middle":u,align:"horizontal"===h?u:"center",text:i})}))}},e.prototype._renderBar=function(t){var e=this.visualMapModel,n=this._shapes,i=e.itemSize,r=this._orient,o=this._useHandle,a=IF(e,this.api,i),s=n.mainGroup=this._createBarGroup(a),l=new Er;s.add(l),l.add(n.outOfRange=PF()),l.add(n.inRange=PF(null,o?RF(this._orient):null,W(this._dragHandle,this,"all",!1),W(this._dragHandle,this,"all",!0))),l.setClipPath(new Es({shape:{x:0,y:0,width:i[0],height:i[1],r:3}}));var u=e.textStyleModel.getTextRect("国"),h=kF(u.width,u.height);o&&(n.handleThumbs=[],n.handleLabels=[],n.handleLabelPoints=[],this._createHandle(e,s,0,i,h,r),this._createHandle(e,s,1,i,h,r)),this._createIndicator(e,s,i,h,r),t.add(s)},e.prototype._createHandle=function(t,e,n,i,r,o){var a=W(this._dragHandle,this,n,!1),s=W(this._dragHandle,this,n,!0),l=Mr(t.get("handleSize"),i[0]),u=Vy(t.get("handleIcon"),-l/2,-l/2,l,l,null,!0),h=RF(this._orient);u.attr({cursor:h,draggable:!0,drift:a,ondragend:s,onmousemove:function(t){pe(t.event)}}),u.x=i[0]/2,u.useStyle(t.getModel("handleStyle").getItemStyle()),u.setStyle({strokeNoScale:!0,strokeFirst:!0}),u.style.lineWidth*=2,u.ensureState("emphasis").style=t.getModel(["emphasis","handleStyle"]).getItemStyle(),jl(u,!0),e.add(u);var c=this.visualMapModel.textStyleModel,p=new Bs({cursor:h,draggable:!0,drift:a,onmousemove:function(t){pe(t.event)},ondragend:s,style:ec(c,{x:0,y:0,text:""})});p.ensureState("blur").style={opacity:.1},p.stateTransition={duration:200},this.group.add(p);var d=[l,0],f=this._shapes;f.handleThumbs[n]=u,f.handleLabelPoints[n]=d,f.handleLabels[n]=p},e.prototype._createIndicator=function(t,e,n,i,r){var o=Mr(t.get("indicatorSize"),n[0]),a=Vy(t.get("indicatorIcon"),-o/2,-o/2,o,o,null,!0);a.attr({cursor:"move",invisible:!0,silent:!0,x:n[0]/2});var s=t.getModel("indicatorStyle").getItemStyle();if(a instanceof As){var l=a.style;a.useStyle(A({image:l.image,x:l.x,y:l.y,width:l.width,height:l.height},s))}else a.useStyle(s);e.add(a);var u=this.visualMapModel.textStyleModel,h=new Bs({silent:!0,invisible:!0,style:ec(u,{x:0,y:0,text:""})});this.group.add(h);var c=[("horizontal"===r?i/2:6)+n[0]/2,0],p=this._shapes;p.indicator=a,p.indicatorLabel=h,p.indicatorLabelPoint=c,this._firstShowIndicator=!0},e.prototype._dragHandle=function(t,e,n,i){if(this._useHandle){if(this._dragging=!e,!e){var r=this._applyTransform([n,i],this._shapes.mainGroup,!0);this._updateInterval(t,r[1]),this._hideIndicator(),this._updateView()}e===!this.visualMapModel.get("realtime")&&this.api.dispatchAction({type:"selectDataRange",from:this.uid,visualMapId:this.visualMapModel.id,selected:this._dataInterval.slice()}),e?!this._hovering&&this._clearHoverLinkToSeries():OF(this.visualMapModel)&&this._doHoverLinkToSeries(this._handleEnds[t],!1)}},e.prototype._resetInterval=function(){var t=this.visualMapModel,e=this._dataInterval=t.getSelected(),n=t.getExtent(),i=[0,t.itemSize[1]];this._handleEnds=[CF(e[0],n,i,!0),CF(e[1],n,i,!0)]},e.prototype._updateInterval=function(t,e){e=e||0;var n=this.visualMapModel,i=this._handleEnds,r=[0,n.itemSize[1]];xk(e,i,r,t,0);var o=n.getExtent();this._dataInterval=[CF(i[0],r,o,!0),CF(i[1],r,o,!0)]},e.prototype._updateView=function(t){var e=this.visualMapModel,n=e.getExtent(),i=this._shapes,r=[0,e.itemSize[1]],o=t?r:this._handleEnds,a=this._createBarVisual(this._dataInterval,n,o,"inRange"),s=this._createBarVisual(n,n,r,"outOfRange");i.inRange.setStyle({fill:a.barColor}).setShape("points",a.barPoints),i.outOfRange.setStyle({fill:s.barColor}).setShape("points",s.barPoints),this._updateHandle(o,a)},e.prototype._createBarVisual=function(t,e,n,i){var r={forceState:i,convertOpacityToAlpha:!0},o=this._makeColorGradient(t,r),a=[this.getControllerVisual(t[0],"symbolSize",r),this.getControllerVisual(t[1],"symbolSize",r)],s=this._createBarPoints(n,a);return{barColor:new eh(0,0,0,1,o),barPoints:s,handlesColor:[o[0].color,o[o.length-1].color]}},e.prototype._makeColorGradient=function(t,e){var n=[],i=(t[1]-t[0])/100;n.push({color:this.getControllerVisual(t[0],"color",e),offset:0});for(var r=1;r<100;r++){var o=t[0]+i*r;if(o>t[1])break;n.push({color:this.getControllerVisual(o,"color",e),offset:r/100})}return n.push({color:this.getControllerVisual(t[1],"color",e),offset:1}),n},e.prototype._createBarPoints=function(t,e){var n=this.visualMapModel.itemSize;return[[n[0]-e[0],t[0]],[n[0],t[0]],[n[0],t[1]],[n[0]-e[1],t[1]]]},e.prototype._createBarGroup=function(t){var e=this._orient,n=this.visualMapModel.get("inverse");return new Er("horizontal"!==e||n?"horizontal"===e&&n?{scaleX:"bottom"===t?-1:1,rotation:-Math.PI/2}:"vertical"!==e||n?{scaleX:"left"===t?1:-1}:{scaleX:"left"===t?1:-1,scaleY:-1}:{scaleX:"bottom"===t?1:-1,rotation:Math.PI/2})},e.prototype._updateHandle=function(t,e){if(this._useHandle){var n=this._shapes,i=this.visualMapModel,r=n.handleThumbs,o=n.handleLabels,a=i.itemSize,s=i.getExtent();DF([0,1],(function(l){var u=r[l];u.setStyle("fill",e.handlesColor[l]),u.y=t[l];var h=CF(t[l],[0,a[1]],s,!0),c=this.getControllerVisual(h,"symbolSize");u.scaleX=u.scaleY=c/a[0],u.x=a[0]-c/2;var p=Eh(n.handleLabelPoints[l],Nh(u,this.group));o[l].setStyle({x:p[0],y:p[1],text:i.formatValueText(this._dataInterval[l]),verticalAlign:"middle",align:"vertical"===this._orient?this._applyTransform("left",n.mainGroup):"center"})}),this)}},e.prototype._showIndicator=function(t,e,n,i){var r=this.visualMapModel,o=r.getExtent(),a=r.itemSize,s=[0,a[1]],l=this._shapes,u=l.indicator;if(u){u.attr("invisible",!1);var h=this.getControllerVisual(t,"color",{convertOpacityToAlpha:!0}),c=this.getControllerVisual(t,"symbolSize"),p=CF(t,o,s,!0),d=a[0]-c/2,f={x:u.x,y:u.y};u.y=p,u.x=d;var g=Eh(l.indicatorLabelPoint,Nh(u,this.group)),y=l.indicatorLabel;y.attr("invisible",!1);var v=this._applyTransform("left",l.mainGroup),m="horizontal"===this._orient;y.setStyle({text:(n||"")+r.formatValueText(e),verticalAlign:m?v:"middle",align:m?"center":v});var x={x:d,y:p,style:{fill:h}},_={style:{x:g[0],y:g[1]}};if(r.ecModel.isAnimationEnabled()&&!this._firstShowIndicator){var b={duration:100,easing:"cubicInOut",additive:!0};u.x=f.x,u.y=f.y,u.animateTo(x,b),y.animateTo(_,b)}else u.attr(x),y.attr(_);this._firstShowIndicator=!1;var w=this._shapes.handleLabels;if(w)for(var S=0;S<w.length;S++)this._api.enterBlur(w[S])}},e.prototype._enableHoverLinkToSeries=function(){var t=this;this._shapes.mainGroup.on("mousemove",(function(e){if(t._hovering=!0,!t._dragging){var n=t.visualMapModel.itemSize,i=t._applyTransform([e.offsetX,e.offsetY],t._shapes.mainGroup,!0,!0);i[1]=AF(kF(0,i[1]),n[1]),t._doHoverLinkToSeries(i[1],0<=i[0]&&i[0]<=n[0])}})).on("mouseout",(function(){t._hovering=!1,!t._dragging&&t._clearHoverLinkToSeries()}))},e.prototype._enableHoverLinkFromSeries=function(){var t=this.api.getZr();this.visualMapModel.option.hoverLink?(t.on("mouseover",this._hoverLinkFromSeriesMouseOver,this),t.on("mouseout",this._hideIndicator,this)):this._clearHoverLinkFromSeries()},e.prototype._doHoverLinkToSeries=function(t,e){var n=this.visualMapModel,i=n.itemSize;if(n.option.hoverLink){var r=[0,i[1]],o=n.getExtent();t=AF(kF(r[0],t),r[1]);var a=function(t,e,n){var i=6,r=t.get("hoverLinkDataSize");r&&(i=CF(r,e,n,!0)/2);return i}(n,o,r),s=[t-a,t+a],l=CF(t,r,o,!0),u=[CF(s[0],r,o,!0),CF(s[1],r,o,!0)];s[0]<r[0]&&(u[0]=-1/0),s[1]>r[1]&&(u[1]=1/0),e&&(u[0]===-1/0?this._showIndicator(l,u[1],"< ",a):u[1]===1/0?this._showIndicator(l,u[0],"> ",a):this._showIndicator(l,l,"≈ ",a));var h=this._hoverLinkDataIndices,c=[];(e||OF(n))&&(c=this._hoverLinkDataIndices=n.findTargetDataIndices(u));var p=function(t,e){var n={},i={};return r(t||[],n),r(e||[],i,n),[o(n),o(i)];function r(t,e,n){for(var i=0,r=t.length;i<r;i++){var o=Do(t[i].seriesId,null);if(null==o)return;for(var a=_o(t[i].dataIndex),s=n&&n[o],l=0,u=a.length;l<u;l++){var h=a[l];s&&s[h]?s[h]=null:(e[o]||(e[o]={}))[h]=1}}}function o(t,e){var n=[];for(var i in t)if(t.hasOwnProperty(i)&&null!=t[i])if(e)n.push(+i);else{var r=o(t[i],!0);r.length&&n.push({seriesId:i,dataIndex:r})}return n}}(h,c);this._dispatchHighDown("downplay",TF(p[0],n)),this._dispatchHighDown("highlight",TF(p[1],n))}},e.prototype._hoverLinkFromSeriesMouseOver=function(t){var e;if(Ty(t.target,(function(t){var n=Js(t);if(null!=n.dataIndex)return e=n,!0}),!0),e){var n=this.ecModel.getSeriesByIndex(e.seriesIndex),i=this.visualMapModel;if(i.isTargetSeries(n)){var r=n.getData(e.dataType),o=r.getStore().get(i.getDataDimensionIndex(r),e.dataIndex);isNaN(o)||this._showIndicator(o,o)}}},e.prototype._hideIndicator=function(){var t=this._shapes;t.indicator&&t.indicator.attr("invisible",!0),t.indicatorLabel&&t.indicatorLabel.attr("invisible",!0);var e=this._shapes.handleLabels;if(e)for(var n=0;n<e.length;n++)this._api.leaveBlur(e[n])},e.prototype._clearHoverLinkToSeries=function(){this._hideIndicator();var t=this._hoverLinkDataIndices;this._dispatchHighDown("downplay",TF(t,this.visualMapModel)),t.length=0},e.prototype._clearHoverLinkFromSeries=function(){this._hideIndicator();var t=this.api.getZr();t.off("mouseover",this._hoverLinkFromSeriesMouseOver),t.off("mouseout",this._hideIndicator)},e.prototype._applyTransform=function(t,e,n,i){var r=Nh(e,i?null:this.group);return Y(t)?Eh(t,r,n):zh(t,r,n)},e.prototype._dispatchHighDown=function(t,e){e&&e.length&&this.api.dispatchAction({type:t,batch:e})},e.prototype.dispose=function(){this._clearHoverLinkFromSeries(),this._clearHoverLinkToSeries()},e.prototype.remove=function(){this._clearHoverLinkFromSeries(),this._clearHoverLinkToSeries()},e.type="visualMap.continuous",e}(SF);function PF(t,e,n,i){return new Gu({shape:{points:t},draggable:!!n,cursor:e,drift:n,onmousemove:function(t){pe(t.event)},ondragend:i})}function OF(t){var e=t.get("hoverLinkOnHandle");return!!(null==e?t.get("realtime"):e)}function RF(t){return"vertical"===t?"ns-resize":"ew-resize"}var NF={type:"selectDataRange",event:"dataRangeSelected",update:"update"},EF=function(t,e){e.eachComponent({mainType:"visualMap",query:t},(function(e){e.setSelected(t.selected)}))},zF=[{createOnAllSeries:!0,reset:function(t,e){var n=[];return e.eachComponent("visualMap",(function(e){var i,r,o,a,s,l=t.pipelineContext;!e.isTargetSeries(t)||l&&l.large||n.push((i=e.stateList,r=e.targetVisuals,o=W(e.getValueState,e),a=e.getDataDimensionIndex(t.getData()),s={},E(i,(function(t){var e=dD.prepareVisualTypes(r[t]);s[t]=e})),{progress:function(t,e){var n,i;function l(t){return by(e,i,t)}function u(t,n){Sy(e,i,t,n)}null!=a&&(n=e.getDimensionIndex(a));for(var h=e.getStore();null!=(i=t.next());){var c=e.getRawDataItem(i);if(!c||!1!==c.visualMap)for(var p=null!=a?h.get(n,i):i,d=o(p),f=r[d],g=s[d],y=0,v=g.length;y<v;y++){var m=g[y];f[m]&&f[m].applyVisual(p,l,u)}}}}))})),n}},{createOnAllSeries:!0,reset:function(t,e){var n=t.getData(),i=[];e.eachComponent("visualMap",(function(e){if(e.isTargetSeries(t)){var r=e.getVisualMeta(W(VF,null,t,e))||{stops:[],outerColors:[]},o=e.getDataDimensionIndex(n);o>=0&&(r.dimension=o,i.push(r))}})),t.getData().setVisual("visualMeta",i)}}];function VF(t,e,n,i){for(var r=e.targetVisuals[i],o=dD.prepareVisualTypes(r),a={color:wy(t.getData(),"color")},s=0,l=o.length;s<l;s++){var u=o[s],h=r["opacity"===u?"__alphaForOpacity":u];h&&h.applyVisual(n,c,p)}return a.color;function c(t){return a[t]}function p(t,e){a[t]=e}}var BF=E;function FF(t){var e=t&&t.visualMap;Y(e)||(e=e?[e]:[]),BF(e,(function(t){if(t){GF(t,"splitList")&&!GF(t,"pieces")&&(t.pieces=t.splitList,delete t.splitList);var e=t.pieces;e&&Y(e)&&BF(e,(function(t){q(t)&&(GF(t,"start")&&!GF(t,"min")&&(t.min=t.start),GF(t,"end")&&!GF(t,"max")&&(t.max=t.end))}))}}))}function GF(t,e){return t&&t.hasOwnProperty&&t.hasOwnProperty(e)}var WF=!1;function HF(t){WF||(WF=!0,t.registerSubTypeDefaulter("visualMap",(function(t){return t.categories||(t.pieces?t.pieces.length>0:t.splitNumber>0)&&!t.calculable?"piecewise":"continuous"})),t.registerAction(NF,EF),E(zF,(function(e){t.registerVisual(t.PRIORITY.VISUAL.COMPONENT,e)})),t.registerPreprocessor(FF))}function YF(t){t.registerComponentModel(bF),t.registerComponentView(LF),HF(t)}var UF=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n._pieceList=[],n}return n(e,t),e.prototype.optionUpdated=function(e,n){t.prototype.optionUpdated.apply(this,arguments),this.resetExtent();var i=this._mode=this._determineMode();this._pieceList=[],XF[this._mode].call(this,this._pieceList),this._resetSelected(e,n);var r=this.option.categories;this.resetVisual((function(t,e){"categories"===i?(t.mappingMethod="category",t.categories=T(r)):(t.dataExtent=this.getExtent(),t.mappingMethod="piecewise",t.pieceList=z(this._pieceList,(function(t){return t=T(t),"inRange"!==e&&(t.visual=null),t})))}))},e.prototype.completeVisualOption=function(){var e=this.option,n={},i=dD.listVisualTypes(),r=this.isCategory();function o(t,e,n){return t&&t[e]&&t[e].hasOwnProperty(n)}E(e.pieces,(function(t){E(i,(function(e){t.hasOwnProperty(e)&&(n[e]=1)}))})),E(n,(function(t,n){var i=!1;E(this.stateList,(function(t){i=i||o(e,t,n)||o(e.target,t,n)}),this),!i&&E(this.stateList,(function(t){(e[t]||(e[t]={}))[n]=cF(n,"inRange"===t?"active":"inactive",r)}))}),this),t.prototype.completeVisualOption.apply(this,arguments)},e.prototype._resetSelected=function(t,e){var n=this.option,i=this._pieceList,r=(e?n:t).selected||{};if(n.selected=r,E(i,(function(t,e){var n=this.getSelectedMapKey(t);r.hasOwnProperty(n)||(r[n]=!0)}),this),"single"===n.selectedMode){var o=!1;E(i,(function(t,e){var n=this.getSelectedMapKey(t);r[n]&&(o?r[n]=!1:o=!0)}),this)}},e.prototype.getItemSymbol=function(){return this.get("itemSymbol")},e.prototype.getSelectedMapKey=function(t){return"categories"===this._mode?t.value+"":t.index+""},e.prototype.getPieceList=function(){return this._pieceList},e.prototype._determineMode=function(){var t=this.option;return t.pieces&&t.pieces.length>0?"pieces":this.option.categories?"categories":"splitNumber"},e.prototype.setSelected=function(t){this.option.selected=T(t)},e.prototype.getValueState=function(t){var e=dD.findPieceIndex(t,this._pieceList);return null!=e&&this.option.selected[this.getSelectedMapKey(this._pieceList[e])]?"inRange":"outOfRange"},e.prototype.findTargetDataIndices=function(t){var e=[],n=this._pieceList;return this.eachTargetSeries((function(i){var r=[],o=i.getData();o.each(this.getDataDimensionIndex(o),(function(e,i){dD.findPieceIndex(e,n)===t&&r.push(i)}),this),e.push({seriesId:i.id,dataIndex:r})}),this),e},e.prototype.getRepresentValue=function(t){var e;if(this.isCategory())e=t.value;else if(null!=t.value)e=t.value;else{var n=t.interval||[];e=n[0]===-1/0&&n[1]===1/0?0:(n[0]+n[1])/2}return e},e.prototype.getVisualMeta=function(t){if(!this.isCategory()){var e=[],n=["",""],i=this,r=this._pieceList.slice();if(r.length){var o=r[0].interval[0];o!==-1/0&&r.unshift({interval:[-1/0,o]}),(o=r[r.length-1].interval[1])!==1/0&&r.push({interval:[o,1/0]})}else r.push({interval:[-1/0,1/0]});var a=-1/0;return E(r,(function(t){var e=t.interval;e&&(e[0]>a&&s([a,e[0]],"outOfRange"),s(e.slice()),a=e[1])}),this),{stops:e,outerColors:n}}function s(r,o){var a=i.getRepresentValue({interval:r});o||(o=i.getValueState(a));var s=t(a,o);r[0]===-1/0?n[0]=s:r[1]===1/0?n[1]=s:e.push({value:r[0],color:s},{value:r[1],color:s})}},e.type="visualMap.piecewise",e.defaultOption=Tc(xF.defaultOption,{selected:null,minOpen:!1,maxOpen:!1,align:"auto",itemWidth:20,itemHeight:14,itemSymbol:"roundRect",pieces:null,categories:null,splitNumber:5,selectedMode:"multiple",itemGap:10,hoverLink:!0}),e}(xF),XF={splitNumber:function(t){var e=this.option,n=Math.min(e.precision,20),i=this.getExtent(),r=e.splitNumber;r=Math.max(parseInt(r,10),1),e.splitNumber=r;for(var o=(i[1]-i[0])/r;+o.toFixed(n)!==o&&n<5;)n++;e.precision=n,o=+o.toFixed(n),e.minOpen&&t.push({interval:[-1/0,i[0]],close:[0,0]});for(var a=0,s=i[0];a<r;s+=o,a++){var l=a===r-1?i[1]:s+o;t.push({interval:[s,l],close:[1,1]})}e.maxOpen&&t.push({interval:[i[1],1/0],close:[0,0]}),lo(t),E(t,(function(t,e){t.index=e,t.text=this.formatValueText(t.interval)}),this)},categories:function(t){var e=this.option;E(e.categories,(function(e){t.push({text:this.formatValueText(e,!0),value:e})}),this),ZF(e,t)},pieces:function(t){var e=this.option;E(e.pieces,(function(e,n){q(e)||(e={value:e});var i={text:"",index:n};if(null!=e.label&&(i.text=e.label),e.hasOwnProperty("value")){var r=i.value=e.value;i.interval=[r,r],i.close=[1,1]}else{for(var o=i.interval=[],a=i.close=[0,0],s=[1,0,1],l=[-1/0,1/0],u=[],h=0;h<2;h++){for(var c=[["gte","gt","min"],["lte","lt","max"]][h],p=0;p<3&&null==o[h];p++)o[h]=e[c[p]],a[h]=s[p],u[h]=2===p;null==o[h]&&(o[h]=l[h])}u[0]&&o[1]===1/0&&(a[0]=0),u[1]&&o[0]===-1/0&&(a[1]=0),o[0]===o[1]&&a[0]&&a[1]&&(i.value=o[0])}i.visual=dD.retrieveVisuals(e),t.push(i)}),this),ZF(e,t),lo(t),E(t,(function(t){var e=t.close,n=[["<","≤"][e[1]],[">","≥"][e[0]]];t.text=t.text||this.formatValueText(null!=t.value?t.value:t.interval,!1,n)}),this)}};function ZF(t,e){var n=t.inverse;("vertical"===t.orient?!n:n)&&e.reverse()}var jF=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.type=e.type,n}return n(e,t),e.prototype.doRender=function(){var t=this.group;t.removeAll();var e=this.visualMapModel,n=e.get("textGap"),i=e.textStyleModel,r=i.getFont(),o=i.getTextColor(),a=this._getItemAlign(),s=e.itemSize,l=this._getViewData(),u=l.endsText,h=it(e.get("showLabel",!0),!u);u&&this._renderEndsText(t,u[0],s,h,a),E(l.viewPieceList,(function(i){var l=i.piece,u=new Er;u.onclick=W(this._onItemClick,this,l),this._enableHoverLink(u,i.indexInModelPieceList);var c=e.getRepresentValue(l);if(this._createItemSymbol(u,c,[0,0,s[0],s[1]]),h){var p=this.visualMapModel.getValueState(c);u.add(new Bs({style:{x:"right"===a?-n:s[0]+n,y:s[1]/2,text:l.text,verticalAlign:"middle",align:a,font:r,fill:o,opacity:"outOfRange"===p?.5:1}}))}t.add(u)}),this),u&&this._renderEndsText(t,u[1],s,h,a),Ip(e.get("orient"),t,e.get("itemGap")),this.renderBackground(t),this.positionGroup(t)},e.prototype._enableHoverLink=function(t,e){var n=this;t.on("mouseover",(function(){return i("highlight")})).on("mouseout",(function(){return i("downplay")}));var i=function(t){var i=n.visualMapModel;i.option.hoverLink&&n.api.dispatchAction({type:t,batch:TF(i.findTargetDataIndices(e),i)})}},e.prototype._getItemAlign=function(){var t=this.visualMapModel,e=t.option;if("vertical"===e.orient)return IF(t,this.api,t.itemSize);var n=e.align;return n&&"auto"!==n||(n="left"),n},e.prototype._renderEndsText=function(t,e,n,i,r){if(e){var o=new Er,a=this.visualMapModel.textStyleModel;o.add(new Bs({style:ec(a,{x:i?"right"===r?n[0]:0:n[0]/2,y:n[1]/2,verticalAlign:"middle",align:i?r:"center",text:e})})),t.add(o)}},e.prototype._getViewData=function(){var t=this.visualMapModel,e=z(t.getPieceList(),(function(t,e){return{piece:t,indexInModelPieceList:e}})),n=t.get("text"),i=t.get("orient"),r=t.get("inverse");return("horizontal"===i?r:!r)?e.reverse():n&&(n=n.slice().reverse()),{viewPieceList:e,endsText:n}},e.prototype._createItemSymbol=function(t,e,n){t.add(Vy(this.getControllerVisual(e,"symbol"),n[0],n[1],n[2],n[3],this.getControllerVisual(e,"color")))},e.prototype._onItemClick=function(t){var e=this.visualMapModel,n=e.option,i=n.selectedMode;if(i){var r=T(n.selected),o=e.getSelectedMapKey(t);"single"===i||!0===i?(r[o]=!0,E(r,(function(t,e){r[e]=e===o}))):r[o]=!r[o],this.api.dispatchAction({type:"selectDataRange",from:this.uid,visualMapId:this.visualMapModel.id,selected:r})}},e.type="visualMap.piecewise",e}(SF);function qF(t){t.registerComponentModel(UF),t.registerComponentView(jF),HF(t)}var KF={label:{enabled:!0},decal:{show:!1}},$F=Po(),JF={};function QF(t,e){var n=t.getModel("aria");if(n.get("enabled")){var i=T(KF);C(i.label,t.getLocaleModel().get("aria"),!1),C(n.option,i,!1),function(){if(n.getModel("decal").get("show")){var e=yt();t.eachSeries((function(t){if(!t.isColorBySeries()){var n=e.get(t.type);n||(n={},e.set(t.type,n)),$F(t).scope=n}})),t.eachRawSeries((function(e){if(!t.isSeriesFiltered(e))if(U(e.enableAriaDecal))e.enableAriaDecal();else{var n=e.getData();if(e.isColorBySeries()){var i=ld(e.ecModel,e.name,JF,t.getSeriesCount()),r=n.getVisual("decal");n.setVisual("decal",u(r,i))}else{var o=e.getRawData(),a={},s=$F(e).scope;n.each((function(t){var e=n.getRawIndex(t);a[e]=t}));var l=o.count();o.each((function(t){var i=a[t],r=o.getName(t)||t+"",h=ld(e.ecModel,r,s,l),c=n.getItemVisual(i,"decal");n.setItemVisual(i,"decal",u(c,h))}))}}function u(t,e){var n=t?A(A({},e),t):e;return n.dirty=!0,n}}))}}(),function(){var i=t.getLocaleModel().get("aria"),o=n.getModel("label");if(o.option=k(o.option,i),!o.get("enabled"))return;var a=e.getZr().dom;if(o.get("description"))return void a.setAttribute("aria-label",o.get("description"));var s,l=t.getSeriesCount(),u=o.get(["data","maxCount"])||10,h=o.get(["series","maxCount"])||10,c=Math.min(l,h);if(l<1)return;var p=function(){var e=t.get("title");e&&e.length&&(e=e[0]);return e&&e.text}();if(p){var d=o.get(["general","withTitle"]);s=r(d,{title:p})}else s=o.get(["general","withoutTitle"]);var f=[],g=l>1?o.get(["series","multiple","prefix"]):o.get(["series","single","prefix"]);s+=r(g,{seriesCount:l}),t.eachSeries((function(e,n){if(n<c){var i=void 0,a=e.get("name")?"withName":"withoutName";i=r(i=l>1?o.get(["series","multiple",a]):o.get(["series","single",a]),{seriesId:e.seriesIndex,seriesName:e.get("name"),seriesType:(x=e.subType,t.getLocaleModel().get(["series","typeNames"])[x]||"自定义图")});var s=e.getData();if(s.count()>u)i+=r(o.get(["data","partialData"]),{displayCnt:u});else i+=o.get(["data","allData"]);for(var h=o.get(["data","separator","middle"]),p=o.get(["data","separator","end"]),d=[],g=0;g<s.count();g++)if(g<u){var y=s.getName(g),v=s.getValues(g),m=o.get(["data",y?"withName":"withoutName"]);d.push(r(m,{name:y,value:v.join(h)}))}i+=d.join(h)+p,f.push(i)}var x}));var y=o.getModel(["series","multiple","separator"]),v=y.get("middle"),m=y.get("end");s+=f.join(v)+m,a.setAttribute("aria-label",s)}()}function r(t,e){if(!X(t))return t;var n=t;return E(e,(function(t,e){n=n.replace(new RegExp("\\{\\s*"+e+"\\s*\\}","g"),t)})),n}}function tG(t){if(t&&t.aria){var e=t.aria;null!=e.show&&(e.enabled=e.show),e.label=e.label||{},E(["description","general","series","data"],(function(t){null!=e[t]&&(e.label[t]=e[t])}))}}var eG={value:"eq","<":"lt","<=":"lte",">":"gt",">=":"gte","=":"eq","!=":"ne","<>":"ne"},nG=function(){function t(t){if(null==(this._condVal=X(t)?new RegExp(t):et(t)?t:null)){var e="";0,yo(e)}}return t.prototype.evaluate=function(t){var e=typeof t;return X(e)?this._condVal.test(t):!!j(e)&&this._condVal.test(t+"")},t}(),iG=function(){function t(){}return t.prototype.evaluate=function(){return this.value},t}(),rG=function(){function t(){}return t.prototype.evaluate=function(){for(var t=this.children,e=0;e<t.length;e++)if(!t[e].evaluate())return!1;return!0},t}(),oG=function(){function t(){}return t.prototype.evaluate=function(){for(var t=this.children,e=0;e<t.length;e++)if(t[e].evaluate())return!0;return!1},t}(),aG=function(){function t(){}return t.prototype.evaluate=function(){return!this.child.evaluate()},t}(),sG=function(){function t(){}return t.prototype.evaluate=function(){for(var t=!!this.valueParser,e=(0,this.getValue)(this.valueGetterParam),n=t?this.valueParser(e):null,i=0;i<this.subCondList.length;i++)if(!this.subCondList[i].evaluate(t?n:e))return!1;return!0},t}();function lG(t,e){if(!0===t||!1===t){var n=new iG;return n.value=t,n}var i="";return hG(t)||yo(i),t.and?uG("and",t,e):t.or?uG("or",t,e):t.not?function(t,e){var n=t.not,i="";0;hG(n)||yo(i);var r=new aG;r.child=lG(n,e),r.child||yo(i);return r}(t,e):function(t,e){for(var n="",i=e.prepareGetValue(t),r=[],o=G(t),a=t.parser,s=a?wf(a):null,l=0;l<o.length;l++){var u=o[l];if("parser"!==u&&!e.valueGetterAttrMap.get(u)){var h=_t(eG,u)?eG[u]:u,c=t[u],p=s?s(c):c,d=Cf(h,p)||"reg"===h&&new nG(p);d||yo(n),r.push(d)}}r.length||yo(n);var f=new sG;return f.valueGetterParam=i,f.valueParser=s,f.getValue=e.getValue,f.subCondList=r,f}(t,e)}function uG(t,e,n){var i=e[t],r="";Y(i)||yo(r),i.length||yo(r);var o="and"===t?new rG:new oG;return o.children=z(i,(function(t){return lG(t,n)})),o.children.length||yo(r),o}function hG(t){return q(t)&&!N(t)}var cG=function(){function t(t,e){this._cond=lG(t,e)}return t.prototype.evaluate=function(){return this._cond.evaluate()},t}();var pG={type:"echarts:filter",transform:function(t){for(var e,n,i,r=t.upstream,o=(n=t.config,i={valueGetterAttrMap:yt({dimension:!0}),prepareGetValue:function(t){var e="",n=t.dimension;_t(t,"dimension")||yo(e);var i=r.getDimensionInfo(n);return i||yo(e),{dimIdx:i.index}},getValue:function(t){return r.retrieveValueFromItem(e,t.dimIdx)}},new cG(n,i)),a=[],s=0,l=r.count();s<l;s++)e=r.getRawDataItem(s),o.evaluate()&&a.push(e);return{data:a}}};var dG={type:"echarts:sort",transform:function(t){var e=t.upstream,n=t.config,i="",r=_o(n);r.length||yo(i);var o=[];E(r,(function(t){var n=t.dimension,r=t.order,a=t.parser,s=t.incomparable;if(null==n&&yo(i),"asc"!==r&&"desc"!==r&&yo(i),s&&"min"!==s&&"max"!==s){var l="";0,yo(l)}if("asc"!==r&&"desc"!==r){var u="";0,yo(u)}var h=e.getDimensionInfo(n);h||yo(i);var c=a?wf(a):null;a&&!c&&yo(i),o.push({dimIdx:h.index,parser:c,comparator:new If(r,s)})}));var a=e.sourceFormat;a!==Bp&&a!==Fp&&yo(i);for(var s=[],l=0,u=e.count();l<u;l++)s.push(e.getRawDataItem(l));return s.sort((function(t,n){for(var i=0;i<o.length;i++){var r=o[i],a=e.retrieveValueFromItem(t,r.dimIdx),s=e.retrieveValueFromItem(n,r.dimIdx);r.parser&&(a=r.parser(a),s=r.parser(s));var l=r.comparator.evaluate(a,s);if(0!==l)return l}return 0})),{data:s}}};var fG=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="dataset",e}return n(e,t),e.prototype.init=function(e,n,i){t.prototype.init.call(this,e,n,i),this._sourceManager=new Xf(this),Zf(this)},e.prototype.mergeOption=function(e,n){t.prototype.mergeOption.call(this,e,n),Zf(this)},e.prototype.optionUpdated=function(){this._sourceManager.dirty()},e.prototype.getSourceManager=function(){return this._sourceManager},e.type="dataset",e.defaultOption={seriesLayoutBy:Yp},e}(Op),gG=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="dataset",e}return n(e,t),e.type="dataset",e}(wg);var yG=rs.CMD;function vG(t,e){return Math.abs(t-e)<1e-5}function mG(t){var e,n,i,r,o,a=t.data,s=t.len(),l=[],u=0,h=0,c=0,p=0;function d(t,n){e&&e.length>2&&l.push(e),e=[t,n]}function f(t,n,i,r){vG(t,i)&&vG(n,r)||e.push(t,n,i,r,i,r)}function g(t,n,i,r,o,a){var s=Math.abs(n-t),l=4*Math.tan(s/4)/3,u=n<t?-1:1,h=Math.cos(t),c=Math.sin(t),p=Math.cos(n),d=Math.sin(n),f=h*o+i,g=c*a+r,y=p*o+i,v=d*a+r,m=o*l*u,x=a*l*u;e.push(f-m*c,g+x*h,y+m*d,v-x*p,y,v)}for(var y=0;y<s;){var v=a[y++],m=1===y;switch(m&&(c=u=a[y],p=h=a[y+1],v!==yG.L&&v!==yG.C&&v!==yG.Q||(e=[c,p])),v){case yG.M:u=c=a[y++],h=p=a[y++],d(c,p);break;case yG.L:f(u,h,n=a[y++],i=a[y++]),u=n,h=i;break;case yG.C:e.push(a[y++],a[y++],a[y++],a[y++],u=a[y++],h=a[y++]);break;case yG.Q:n=a[y++],i=a[y++],r=a[y++],o=a[y++],e.push(u+2/3*(n-u),h+2/3*(i-h),r+2/3*(n-r),o+2/3*(i-o),r,o),u=r,h=o;break;case yG.A:var x=a[y++],_=a[y++],b=a[y++],w=a[y++],S=a[y++],M=a[y++]+S;y+=1;var I=!a[y++];n=Math.cos(S)*b+x,i=Math.sin(S)*w+_,m?d(c=n,p=i):f(u,h,n,i),u=Math.cos(M)*b+x,h=Math.sin(M)*w+_;for(var T=(I?-1:1)*Math.PI/2,C=S;I?C>M:C<M;C+=T){g(C,I?Math.max(C+T,M):Math.min(C+T,M),x,_,b,w)}break;case yG.R:c=u=a[y++],p=h=a[y++],n=c+a[y++],i=p+a[y++],d(n,p),f(n,p,n,i),f(n,i,c,i),f(c,i,c,p),f(c,p,n,p);break;case yG.Z:e&&f(u,h,c,p),u=c,h=p}}return e&&e.length>2&&l.push(e),l}function xG(t,e,n,i,r,o,a,s,l,u){if(vG(t,n)&&vG(e,i)&&vG(r,a)&&vG(o,s))l.push(a,s);else{var h=2/u,c=h*h,p=a-t,d=s-e,f=Math.sqrt(p*p+d*d);p/=f,d/=f;var g=n-t,y=i-e,v=r-a,m=o-s,x=g*g+y*y,_=v*v+m*m;if(x<c&&_<c)l.push(a,s);else{var b=p*g+d*y,w=-p*v-d*m;if(x-b*b<c&&b>=0&&_-w*w<c&&w>=0)l.push(a,s);else{var S=[],M=[];bn(t,n,r,a,.5,S),bn(e,i,o,s,.5,M),xG(S[0],M[0],S[1],M[1],S[2],M[2],S[3],M[3],l,u),xG(S[4],M[4],S[5],M[5],S[6],M[6],S[7],M[7],l,u)}}}}function _G(t,e,n){var i=t[e],r=t[1-e],o=Math.abs(i/r),a=Math.ceil(Math.sqrt(o*n)),s=Math.floor(n/a);0===s&&(s=1,a=n);for(var l=[],u=0;u<a;u++)l.push(s);var h=n-a*s;if(h>0)for(u=0;u<h;u++)l[u%a]+=1;return l}function bG(t,e,n){for(var i=t.r0,r=t.r,o=t.startAngle,a=t.endAngle,s=Math.abs(a-o),l=s*r,u=r-i,h=l>Math.abs(u),c=_G([l,u],h?0:1,e),p=(h?s:u)/c.length,d=0;d<c.length;d++)for(var f=(h?u:s)/c[d],g=0;g<c[d];g++){var y={};h?(y.startAngle=o+p*d,y.endAngle=o+p*(d+1),y.r0=i+f*g,y.r=i+f*(g+1)):(y.startAngle=o+f*g,y.endAngle=o+f*(g+1),y.r0=i+p*d,y.r=i+p*(d+1)),y.clockwise=t.clockwise,y.cx=t.cx,y.cy=t.cy,n.push(y)}}function wG(t,e,n,i){return t*i-n*e}function SG(t,e,n,i,r,o,a,s){var l=n-t,u=i-e,h=a-r,c=s-o,p=wG(h,c,l,u);if(Math.abs(p)<1e-6)return null;var d=wG(t-r,e-o,h,c)/p;return d<0||d>1?null:new Ce(d*l+t,d*u+e)}function MG(t,e,n){var i=new Ce;Ce.sub(i,n,e),i.normalize();var r=new Ce;return Ce.sub(r,t,e),r.dot(i)}function IG(t,e){var n=t[t.length-1];n&&n[0]===e[0]&&n[1]===e[1]||t.push(e)}function TG(t){var e=t.points,n=[],i=[];Oa(e,n,i);var r=new Ee(n[0],n[1],i[0]-n[0],i[1]-n[1]),o=r.width,a=r.height,s=r.x,l=r.y,u=new Ce,h=new Ce;return o>a?(u.x=h.x=s+o/2,u.y=l,h.y=l+a):(u.y=h.y=l+a/2,u.x=s,h.x=s+o),function(t,e,n){for(var i=t.length,r=[],o=0;o<i;o++){var a=t[o],s=t[(o+1)%i],l=SG(a[0],a[1],s[0],s[1],e.x,e.y,n.x,n.y);l&&r.push({projPt:MG(l,e,n),pt:l,idx:o})}if(r.length<2)return[{points:t},{points:t}];r.sort((function(t,e){return t.projPt-e.projPt}));var u=r[0],h=r[r.length-1];if(h.idx<u.idx){var c=u;u=h,h=c}var p=[u.pt.x,u.pt.y],d=[h.pt.x,h.pt.y],f=[p],g=[d];for(o=u.idx+1;o<=h.idx;o++)IG(f,t[o].slice());for(IG(f,d),IG(f,p),o=h.idx+1;o<=u.idx+i;o++)IG(g,t[o%i].slice());return IG(g,p),IG(g,d),[{points:f},{points:g}]}(e,u,h)}function CG(t,e,n,i){if(1===n)i.push(e);else{var r=Math.floor(n/2),o=t(e);CG(t,o[0],r,i),CG(t,o[1],n-r,i)}return i}function DG(t,e){e.setStyle(t.style),e.z=t.z,e.z2=t.z2,e.zlevel=t.zlevel}function AG(t,e){var n,i=[],r=t.shape;switch(t.type){case"rect":!function(t,e,n){for(var i=t.width,r=t.height,o=i>r,a=_G([i,r],o?0:1,e),s=o?"width":"height",l=o?"height":"width",u=o?"x":"y",h=o?"y":"x",c=t[s]/a.length,p=0;p<a.length;p++)for(var d=t[l]/a[p],f=0;f<a[p];f++){var g={};g[u]=p*c,g[h]=f*d,g[s]=c,g[l]=d,g.x+=t.x,g.y+=t.y,n.push(g)}}(r,e,i),n=Es;break;case"sector":bG(r,e,i),n=Eu;break;case"circle":bG({r0:0,r:r.r,startAngle:0,endAngle:2*Math.PI,cx:r.cx,cy:r.cy},e,i),n=Eu;break;default:var o=t.getComputedTransform(),a=o?Math.sqrt(Math.max(o[0]*o[0]+o[1]*o[1],o[2]*o[2]+o[3]*o[3])):1,s=z(function(t,e){var n=mG(t),i=[];e=e||1;for(var r=0;r<n.length;r++){var o=n[r],a=[],s=o[0],l=o[1];a.push(s,l);for(var u=2;u<o.length;){var h=o[u++],c=o[u++],p=o[u++],d=o[u++],f=o[u++],g=o[u++];xG(s,l,h,c,p,d,f,g,a,e),s=f,l=g}i.push(a)}return i}(t.getUpdatedPathProxy(),a),(function(t){return function(t){for(var e=[],n=0;n<t.length;)e.push([t[n++],t[n++]]);return e}(t)})),l=s.length;if(0===l)CG(TG,{points:s[0]},e,i);else if(l===e)for(var u=0;u<l;u++)i.push({points:s[u]});else{var h=0,c=z(s,(function(t){var e=[],n=[];Oa(t,e,n);var i=(n[1]-e[1])*(n[0]-e[0]);return h+=i,{poly:t,area:i}}));c.sort((function(t,e){return e.area-t.area}));var p=e;for(u=0;u<l;u++){var d=c[u];if(p<=0)break;var f=u===l-1?p:Math.ceil(d.area/h*e);f<0||(CG(TG,{points:d.poly},f,i),p-=f)}}n=Gu}if(!n)return function(t,e){for(var n=[],i=0;i<e;i++)n.push(vu(t));return n}(t,e);var g=[];for(u=0;u<i.length;u++){var y=new n;y.setShape(i[u]),DG(t,y),g.push(y)}return g}function kG(t,e){var n=t.length,i=e.length;if(n===i)return[t,e];for(var r=[],o=[],a=n<i?t:e,s=Math.min(n,i),l=Math.abs(i-n)/6,u=(s-2)/6,h=Math.ceil(l/u)+1,c=[a[0],a[1]],p=l,d=2;d<s;){var f=a[d-2],g=a[d-1],y=a[d++],v=a[d++],m=a[d++],x=a[d++],_=a[d++],b=a[d++];if(p<=0)c.push(y,v,m,x,_,b);else{for(var w=Math.min(p,h-1)+1,S=1;S<=w;S++){var M=S/w;bn(f,y,m,_,M,r),bn(g,v,x,b,M,o),f=r[3],g=o[3],c.push(r[1],o[1],r[2],o[2],f,g),y=r[5],v=o[5],m=r[6],x=o[6]}p-=w-1}}return a===t?[c,e]:[t,c]}function LG(t,e){for(var n=t.length,i=t[n-2],r=t[n-1],o=[],a=0;a<e.length;)o[a++]=i,o[a++]=r;return o}function PG(t){for(var e=0,n=0,i=0,r=t.length,o=0,a=r-2;o<r;a=o,o+=2){var s=t[a],l=t[a+1],u=t[o],h=t[o+1],c=s*h-u*l;e+=c,n+=(s+u)*c,i+=(l+h)*c}return 0===e?[t[0]||0,t[1]||0]:[n/e/3,i/e/3,e]}function OG(t,e,n,i){for(var r=(t.length-2)/6,o=1/0,a=0,s=t.length,l=s-2,u=0;u<r;u++){for(var h=6*u,c=0,p=0;p<s;p+=2){var d=0===p?h:(h+p-2)%l+2,f=t[d]-n[0],g=t[d+1]-n[1],y=e[p]-i[0]-f,v=e[p+1]-i[1]-g;c+=y*y+v*v}c<o&&(o=c,a=u)}return a}function RG(t){for(var e=[],n=t.length,i=0;i<n;i+=2)e[i]=t[n-i-2],e[i+1]=t[n-i-1];return e}function NG(t){return t.__isCombineMorphing}var EG="__mOriginal_";function zG(t,e,n){var i=EG+e,r=t[i]||t[e];t[i]||(t[i]=t[e]);var o=n.replace,a=n.after,s=n.before;t[e]=function(){var t,e=arguments;return s&&s.apply(this,e),t=o?o.apply(this,e):r.apply(this,e),a&&a.apply(this,e),t}}function VG(t,e){var n=EG+e;t[n]&&(t[e]=t[n],t[n]=null)}function BG(t,e){for(var n=0;n<t.length;n++)for(var i=t[n],r=0;r<i.length;){var o=i[r],a=i[r+1];i[r++]=e[0]*o+e[2]*a+e[4],i[r++]=e[1]*o+e[3]*a+e[5]}}function FG(t,e){var n=t.getUpdatedPathProxy(),i=e.getUpdatedPathProxy(),r=function(t,e){for(var n,i,r,o=[],a=[],s=0;s<Math.max(t.length,e.length);s++){var l=t[s],u=e[s],h=void 0,c=void 0;l?u?(i=h=(n=kG(l,u))[0],r=c=n[1]):(c=LG(r||l,l),h=l):(h=LG(i||u,u),c=u),o.push(h),a.push(c)}return[o,a]}(mG(n),mG(i)),o=r[0],a=r[1],s=t.getComputedTransform(),l=e.getComputedTransform();s&&BG(o,s),l&&BG(a,l),zG(e,"updateTransform",{replace:function(){this.transform=null}}),e.transform=null;var u=function(t,e,n,i){for(var r,o=[],a=0;a<t.length;a++){var s=t[a],l=e[a],u=PG(s),h=PG(l);null==r&&(r=u[2]<0!=h[2]<0);var c=[],p=[],d=0,f=1/0,g=[],y=s.length;r&&(s=RG(s));for(var v=6*OG(s,l,u,h),m=y-2,x=0;x<m;x+=2){var _=(v+x)%m+2;c[x+2]=s[_]-u[0],c[x+3]=s[_+1]-u[1]}if(c[0]=s[v]-u[0],c[1]=s[v+1]-u[1],n>0)for(var b=i/n,w=-i/2;w<=i/2;w+=b){var S=Math.sin(w),M=Math.cos(w),I=0;for(x=0;x<s.length;x+=2){var T=c[x],C=c[x+1],D=l[x]-h[0],A=l[x+1]-h[1],k=D*M-A*S,L=D*S+A*M;g[x]=k,g[x+1]=L;var P=k-T,O=L-C;I+=P*P+O*O}if(I<f){f=I,d=w;for(var R=0;R<g.length;R++)p[R]=g[R]}}else for(var N=0;N<y;N+=2)p[N]=l[N]-h[0],p[N+1]=l[N+1]-h[1];o.push({from:c,to:p,fromCp:u,toCp:h,rotation:-d})}return o}(o,a,10,Math.PI),h=[];zG(e,"buildPath",{replace:function(t){for(var n=e.__morphT,i=1-n,r=[],o=0;o<u.length;o++){var a=u[o],s=a.from,l=a.to,c=a.rotation*n,p=a.fromCp,d=a.toCp,f=Math.sin(c),g=Math.cos(c);Gt(r,p,d,n);for(var y=0;y<s.length;y+=2){var v=s[y],m=s[y+1],x=v*i+(S=l[y])*n,_=m*i+(M=l[y+1])*n;h[y]=x*g-_*f+r[0],h[y+1]=x*f+_*g+r[1]}var b=h[0],w=h[1];t.moveTo(b,w);for(y=2;y<s.length;){var S=h[y++],M=h[y++],I=h[y++],T=h[y++],C=h[y++],D=h[y++];b===S&&w===M&&I===C&&T===D?t.lineTo(C,D):t.bezierCurveTo(S,M,I,T,C,D),b=C,w=D}}}})}function GG(t,e,n){if(!t||!e)return e;var i=n.done,r=n.during;return FG(t,e),e.__morphT=0,e.animateTo({__morphT:1},k({during:function(t){e.dirtyShape(),r&&r(t)},done:function(){VG(e,"buildPath"),VG(e,"updateTransform"),e.__morphT=-1,e.createPathProxy(),e.dirtyShape(),i&&i()}},n)),e}function WG(t,e,n,i,r,o){t=r===n?0:Math.round(32767*(t-n)/(r-n)),e=o===i?0:Math.round(32767*(e-i)/(o-i));for(var a,s=0,l=32768;l>0;l/=2){var u=0,h=0;(t&l)>0&&(u=1),(e&l)>0&&(h=1),s+=l*l*(3*u^h),0===h&&(1===u&&(t=l-1-t,e=l-1-e),a=t,t=e,e=a)}return s}function HG(t){var e=1/0,n=1/0,i=-1/0,r=-1/0,o=z(t,(function(t){var o=t.getBoundingRect(),a=t.getComputedTransform(),s=o.x+o.width/2+(a?a[4]:0),l=o.y+o.height/2+(a?a[5]:0);return e=Math.min(s,e),n=Math.min(l,n),i=Math.max(s,i),r=Math.max(l,r),[s,l]}));return z(o,(function(o,a){return{cp:o,z:WG(o[0],o[1],e,n,i,r),path:t[a]}})).sort((function(t,e){return t.z-e.z})).map((function(t){return t.path}))}function YG(t){return AG(t.path,t.count)}function UG(t){return Y(t[0])}function XG(t,e){for(var n=[],i=t.length,r=0;r<i;r++)n.push({one:t[r],many:[]});for(r=0;r<e.length;r++){var o=e[r].length,a=void 0;for(a=0;a<o;a++)n[a%i].many.push(e[r][a])}var s=0;for(r=i-1;r>=0;r--)if(!n[r].many.length){var l=n[s].many;if(l.length<=1){if(!s)return n;s=0}o=l.length;var u=Math.ceil(o/2);n[r].many=l.slice(u,o),n[s].many=l.slice(0,u),s++}return n}var ZG={clone:function(t){for(var e=[],n=1-Math.pow(1-t.path.style.opacity,1/t.count),i=0;i<t.count;i++){var r=vu(t.path);r.setStyle("opacity",n),e.push(r)}return e},split:null};function jG(t,e,n,i,r,o){if(t.length&&e.length){var a=ch("update",i,r);if(a&&a.duration>0){var s,l,u=i.getModel("universalTransition").get("delay"),h=Object.assign({setToFinal:!0},a);UG(t)&&(s=t,l=e),UG(e)&&(s=e,l=t);for(var c=s?s===t:t.length>e.length,p=s?XG(l,s):XG(c?e:t,[c?t:e]),d=0,f=0;f<p.length;f++)d+=p[f].many.length;var g=0;for(f=0;f<p.length;f++)y(p[f],c,g,d),g+=p[f].many.length}}function y(t,e,i,r,a){var s=t.many,l=t.one;if(1!==s.length||a)for(var c=k({dividePath:ZG[n],individualDelay:u&&function(t,e,n,o){return u(t+i,r)}},h),p=e?function(t,e,n){var i=[];!function t(e){for(var n=0;n<e.length;n++){var r=e[n];NG(r)?t(r.childrenRef()):r instanceof Ms&&i.push(r)}}(t);var r=i.length;if(!r)return{fromIndividuals:[],toIndividuals:[],count:0};var o=(n.dividePath||YG)({path:e,count:r});if(o.length!==r)return console.error("Invalid morphing: unmatched splitted path"),{fromIndividuals:[],toIndividuals:[],count:0};i=HG(i),o=HG(o);for(var a=n.done,s=n.during,l=n.individualDelay,u=new fr,h=0;h<r;h++){var c=i[h],p=o[h];p.parent=e,p.copyTransform(u),l||FG(c,p)}function d(t){for(var e=0;e<o.length;e++)o[e].addSelfToZr(t)}function f(){e.__isCombineMorphing=!1,e.__morphT=-1,e.childrenRef=null,VG(e,"addSelfToZr"),VG(e,"removeSelfFromZr")}e.__isCombineMorphing=!0,e.childrenRef=function(){return o},zG(e,"addSelfToZr",{after:function(t){d(t)}}),zG(e,"removeSelfFromZr",{after:function(t){for(var e=0;e<o.length;e++)o[e].removeSelfFromZr(t)}});var g=o.length;if(l){var y=g,v=function(){0==--y&&(f(),a&&a())};for(h=0;h<g;h++){var m=l?k({delay:(n.delay||0)+l(h,g,i[h],o[h]),done:v},n):n;GG(i[h],o[h],m)}}else e.__morphT=0,e.animateTo({__morphT:1},k({during:function(t){for(var n=0;n<g;n++){var i=o[n];i.__morphT=e.__morphT,i.dirtyShape()}s&&s(t)},done:function(){f();for(var e=0;e<t.length;e++)VG(t[e],"updateTransform");a&&a()}},n));return e.__zr&&d(e.__zr),{fromIndividuals:i,toIndividuals:o,count:g}}(s,l,c):function(t,e,n){var i=e.length,r=[],o=n.dividePath||YG;if(NG(t)){!function t(e){for(var n=0;n<e.length;n++){var i=e[n];NG(i)?t(i.childrenRef()):i instanceof Ms&&r.push(i)}}(t.childrenRef());var a=r.length;if(a<i)for(var s=0,l=a;l<i;l++)r.push(vu(r[s++%a]));r.length=i}else{r=o({path:t,count:i});var u=t.getComputedTransform();for(l=0;l<r.length;l++)r[l].setLocalTransform(u);if(r.length!==i)return console.error("Invalid morphing: unmatched splitted path"),{fromIndividuals:[],toIndividuals:[],count:0}}r=HG(r),e=HG(e);var h=n.individualDelay;for(l=0;l<i;l++){var c=h?k({delay:(n.delay||0)+h(l,i,r[l],e[l])},n):n;GG(r[l],e[l],c)}return{fromIndividuals:r,toIndividuals:e,count:e.length}}(l,s,c),d=p.fromIndividuals,f=p.toIndividuals,g=d.length,v=0;v<g;v++){m=u?k({delay:u(v,g)},h):h;o(d[v],f[v],e?s[v]:t.one,e?t.one:s[v],m)}else{var m,x=e?s[0]:l,_=e?l:s[0];if(NG(x))y({many:[x],one:_},!0,i,r,!0);else GG(x,_,m=u?k({delay:u(i,r)},h):h),o(x,_,x,_,m)}}}function qG(t){if(!t)return[];if(Y(t)){for(var e=[],n=0;n<t.length;n++)e.push(qG(t[n]));return e}var i=[];return t.traverse((function(t){t instanceof Ms&&!t.disableMorphing&&!t.invisible&&!t.ignore&&i.push(t)})),i}var KG=Po();function $G(t){var e=[];return E(t,(function(t){var n=t.data;if(!(n.count()>1e4))for(var i=n.getIndices(),r=function(t){for(var e=t.dimensions,n=0;n<e.length;n++){var i=t.getDimensionInfo(e[n]);if(i&&0===i.otherDims.itemGroupId)return e[n]}}(n),o=0;o<i.length;o++)e.push({dataGroupId:t.dataGroupId,data:n,dim:t.dim||r,divide:t.divide,dataIndex:o})})),e}function JG(t,e,n){t.traverse((function(t){t instanceof Ms&&fh(t,{style:{opacity:0}},e,{dataIndex:n,isFrom:!0})}))}function QG(t){if(t.parent){var e=t.getComputedTransform();t.setLocalTransform(e),t.parent.remove(t)}}function tW(t){t.stopAnimation(),t.isGroup&&t.traverse((function(t){t.stopAnimation()}))}function eW(t,e,n){var i=ch("update",n,e);i&&t.traverse((function(t){if(t instanceof wa){var e=function(t){return hh(t).oldStyle}(t);e&&t.animateFrom({style:e},i)}}))}function nW(t,e,n){var i=$G(t),r=$G(e);function o(t,e,n,i,r){(n||t)&&e.animateFrom({style:n&&n!==t?A(A({},n.style),t.style):t.style},r)}function a(t){for(var e=0;e<t.length;e++)if(t[e].dim)return t[e].dim}var s=a(i),l=a(r),u=!1;function h(t,e){return function(n){var i=n.data,r=n.dataIndex;if(e)return i.getId(r);var o=n.dataGroupId,a=t?s||l:l||s,u=a&&i.getDimensionInfo(a),h=u&&u.ordinalMeta;if(u){var c=i.get(u.name,r);return h&&h.categories[c]||c+""}var p=i.getRawDataItem(r);return p&&p.groupId?p.groupId+"":o||i.getId(r)}}var c=function(t,e){var n=t.length;if(n!==e.length)return!1;for(var i=0;i<n;i++){var r=t[i],o=e[i];if(r.data.getId(r.dataIndex)!==o.data.getId(o.dataIndex))return!1}return!0}(i,r),p={};if(!c)for(var d=0;d<r.length;d++){var f=r[d],g=f.data.getItemGraphicEl(f.dataIndex);g&&(p[g.id]=!0)}function y(t,e){var n=i[e],a=r[t],s=a.data.hostModel,l=n.data.getItemGraphicEl(n.dataIndex),h=a.data.getItemGraphicEl(a.dataIndex);l!==h?l&&p[l.id]||h&&(tW(h),l?(tW(l),QG(l),u=!0,jG(qG(l),qG(h),a.divide,s,t,o)):JG(h,s,t)):h&&eW(h,a.dataIndex,s)}new Lm(i,r,h(!0,c),h(!1,c),null,"multiple").update(y).updateManyToOne((function(t,e){var n=r[t],a=n.data,s=a.hostModel,l=a.getItemGraphicEl(n.dataIndex),h=B(z(e,(function(t){return i[t].data.getItemGraphicEl(i[t].dataIndex)})),(function(t){return t&&t!==l&&!p[t.id]}));l&&(tW(l),h.length?(E(h,(function(t){tW(t),QG(t)})),u=!0,jG(qG(h),qG(l),n.divide,s,t,o)):JG(l,s,n.dataIndex))})).updateOneToMany((function(t,e){var n=i[e],a=n.data.getItemGraphicEl(n.dataIndex);if(!a||!p[a.id]){var s=B(z(t,(function(t){return r[t].data.getItemGraphicEl(r[t].dataIndex)})),(function(t){return t&&t!==a})),l=r[t[0]].data.hostModel;s.length&&(E(s,(function(t){return tW(t)})),a?(tW(a),QG(a),u=!0,jG(qG(a),qG(s),n.divide,l,t[0],o)):E(s,(function(e){return JG(e,l,t[0])})))}})).updateManyToMany((function(t,e){new Lm(e,t,(function(t){return i[t].data.getId(i[t].dataIndex)}),(function(t){return r[t].data.getId(r[t].dataIndex)})).update((function(n,i){y(t[n],e[i])})).execute()})).execute(),u&&E(e,(function(t){var e=t.data.hostModel,i=e&&n.getViewOfSeriesModel(e),r=ch("update",e,0);i&&e.isAnimationEnabled()&&r&&r.duration>0&&i.group.traverse((function(t){t instanceof Ms&&!t.animators.length&&t.animateFrom({style:{opacity:0}},r)}))}))}function iW(t){var e=t.getModel("universalTransition").get("seriesKey");return e||t.id}function rW(t){return Y(t)?t.sort().join(","):t}function oW(t){if(t.hostModel)return t.hostModel.getModel("universalTransition").get("divideShape")}function aW(t,e){for(var n=0;n<t.length;n++){if(null!=e.seriesIndex&&e.seriesIndex===t[n].seriesIndex||null!=e.seriesId&&e.seriesId===t[n].id)return n}}Dm([function(t){t.registerPainter("canvas",jw)}]),Dm([function(t){t.registerPainter("svg",Gw)}]),Dm([function(t){t.registerChartView(DS),t.registerSeriesModel(qw),t.registerLayout(AS("line",!0)),t.registerVisual({seriesType:"line",reset:function(t){var e=t.getData(),n=t.getModel("lineStyle").getLineStyle();n&&!n.stroke&&(n.stroke=e.getVisual("style").fill),e.setVisual("legendLineStyle",n)}}),t.registerProcessor(t.PRIORITY.PROCESSOR.STATISTIC,PS("line"))},function(t){t.registerChartView(GS),t.registerSeriesModel(RS),t.registerLayout(t.PRIORITY.VISUAL.LAYOUT,H(Ex,"bar")),t.registerLayout(t.PRIORITY.VISUAL.PROGRESSIVE_LAYOUT,zx("bar")),t.registerProcessor(t.PRIORITY.PROCESSOR.STATISTIC,PS("bar")),t.registerAction({type:"changeAxisOrder",event:"changeAxisOrder",update:"update"},(function(t,e){var n=t.componentType||"series";e.eachComponent({mainType:n,query:t},(function(e){t.sortInfo&&e.axis.setCategorySortInfo(t.sortInfo)}))}))},function(t){t.registerChartView(yM),t.registerSeriesModel(_M),My("pie",t.registerAction),t.registerLayout(H(sM,"pie")),t.registerProcessor(lM("pie")),t.registerProcessor(function(t){return{seriesType:t,reset:function(t,e){var n=t.getData();n.filterSelf((function(t){var e=n.mapDimension("value"),i=n.get(e,t);return!(j(i)&&!isNaN(i)&&i<0)}))}}}("pie"))},function(t){Dm(bI),t.registerSeriesModel(bM),t.registerChartView(IM),t.registerLayout(AS("scatter"))},function(t){Dm(NI),t.registerChartView(TI),t.registerSeriesModel(CI),t.registerLayout(wI),t.registerProcessor(lM("radar")),t.registerPreprocessor(II)},function(t){Dm(hC),t.registerChartView(UT),t.registerSeriesModel(XT),t.registerLayout(jT),t.registerProcessor(t.PRIORITY.PROCESSOR.STATISTIC,ZT),My("map",t.registerAction)},function(t){t.registerChartView(wC),t.registerSeriesModel(YC),t.registerLayout(XC),t.registerVisual(ZC),function(t){t.registerAction({type:"treeExpandAndCollapse",event:"treeExpandAndCollapse",update:"update"},(function(t,e){e.eachComponent({mainType:"series",subType:"tree",query:t},(function(e){var n=t.dataIndex,i=e.getData().tree.getNodeByDataIndex(n);i.isExpand=!i.isExpand}))})),t.registerAction({type:"treeRoam",event:"treeRoam",update:"none"},(function(t,e,n){e.eachComponent({mainType:"series",subType:"tree",query:t},(function(e){var i=sC(e.coordinateSystem,t,void 0,n);e.setCenter&&e.setCenter(i.center),e.setZoom&&e.setZoom(i.zoom)}))}))}(t)},function(t){t.registerSeriesModel(KC),t.registerChartView(uD),t.registerVisual(TD),t.registerLayout(BD),function(t){for(var e=0;e<jC.length;e++)t.registerAction({type:jC[e],update:"updateView"},bt);t.registerAction({type:"treemapRootToNode",update:"updateView"},(function(t,e){e.eachComponent({mainType:"series",subType:"treemap",query:t},(function(e,n){var i=FC(t,["treemapZoomToNode","treemapRootToNode"],e);if(i){var r=e.getViewRoot();r&&(t.direction=WC(r,i.node)?"rollUp":"drillDown"),e.resetViewRoot(i.node)}}))}))}(t)},function(t){t.registerChartView(BA),t.registerSeriesModel(XA),t.registerProcessor(UD),t.registerVisual(XD),t.registerVisual(jD),t.registerLayout(rA),t.registerLayout(t.PRIORITY.VISUAL.POST_CHART_LAYOUT,pA),t.registerLayout(fA),t.registerCoordinateSystem("graphView",{dimensions:KT.dimensions,create:gA}),t.registerAction({type:"focusNodeAdjacency",event:"focusNodeAdjacency",update:"series:focusNodeAdjacency"},bt),t.registerAction({type:"unfocusNodeAdjacency",event:"unfocusNodeAdjacency",update:"series:unfocusNodeAdjacency"},bt),t.registerAction(ZA,(function(t,e,n){e.eachComponent({mainType:"series",query:t},(function(e){var i=sC(e.coordinateSystem,t,void 0,n);e.setCenter&&e.setCenter(i.center),e.setZoom&&e.setZoom(i.zoom)}))}))},function(t){t.registerChartView($A),t.registerSeriesModel(JA)},function(t){t.registerChartView(ek),t.registerSeriesModel(nk),t.registerLayout(ik),t.registerProcessor(lM("funnel"))},function(t){Dm(AL),t.registerChartView(rk),t.registerSeriesModel(uk),t.registerVisual(t.PRIORITY.VISUAL.BRUSH,pk)},function(t){t.registerChartView(PL),t.registerSeriesModel(OL),t.registerLayout(RL),t.registerVisual(XL),t.registerAction({type:"dragNode",event:"dragnode",update:"update"},(function(t,e){e.eachComponent({mainType:"series",subType:"sankey",query:t},(function(e){e.setNodePosition(t.dataIndex,[t.localX,t.localY])}))}))},function(t){t.registerSeriesModel(jL),t.registerChartView(qL),t.registerLayout(nP),t.registerTransform(iP)},function(t){t.registerChartView(oP),t.registerSeriesModel(yP),t.registerPreprocessor(vP),t.registerVisual(SP),t.registerLayout(MP)},function(t){t.registerChartView(DP),t.registerSeriesModel(AP),t.registerLayout(AS("effectScatter"))},function(t){t.registerChartView(zP),t.registerSeriesModel(GP),t.registerLayout(EP),t.registerVisual(HP)},function(t){t.registerChartView(XP),t.registerSeriesModel(ZP)},function(t){t.registerChartView($P),t.registerSeriesModel(gO),t.registerLayout(t.PRIORITY.VISUAL.LAYOUT,H(Ex,"pictorialBar")),t.registerLayout(t.PRIORITY.VISUAL.PROGRESSIVE_LAYOUT,zx("pictorialBar"))},function(t){t.registerChartView(yO),t.registerSeriesModel(vO),t.registerLayout(mO),t.registerProcessor(lM("themeRiver"))},function(t){t.registerChartView(SO),t.registerSeriesModel(MO),t.registerLayout(H(CO,"sunburst")),t.registerProcessor(H(lM,"sunburst")),t.registerVisual(AO),function(t){t.registerAction({type:bO,update:"updateView"},(function(t,e){e.eachComponent({mainType:"series",subType:"sunburst",query:t},(function(e,n){var i=FC(t,[bO],e);if(i){var r=e.getViewRoot();r&&(t.direction=WC(r,i.node)?"rollUp":"drillDown"),e.resetViewRoot(i.node)}}))})),t.registerAction({type:wO,update:"none"},(function(t,e,n){t=A({},t),e.eachComponent({mainType:"series",subType:"sunburst",query:t},(function(e){var n=FC(t,[wO],e);n&&(t.dataIndex=n.node.dataIndex)})),n.dispatchAction(A(t,{type:"highlight"}))})),t.registerAction({type:"sunburstUnhighlight",update:"updateView"},(function(t,e,n){t=A({},t),n.dispatchAction(A(t,{type:"downplay"}))}))}(t)},function(t){t.registerChartView(_R),t.registerSeriesModel(OO)}]),Dm((function(t){Dm(bI),Dm(bN)})),Dm((function(t){Dm(bN),uI.registerAxisPointerClass("PolarAxisPointer",wN),t.registerCoordinateSystem("polar",EN),t.registerComponentModel(MN),t.registerComponentView(JN),OM(t,"angle",TN,KN),OM(t,"radius",CN,$N),t.registerComponentView(GN),t.registerComponentView(UN),t.registerLayout(H(qN,"bar"))})),Dm(hC),Dm((function(t){Dm(bN),uI.registerAxisPointerClass("SingleAxisPointer",pE),t.registerComponentView(yE),t.registerComponentView(nE),t.registerComponentModel(rE),OM(t,"single",rE,rE.defaultOption),t.registerCoordinateSystem("single",uE)})),Dm(AL),Dm((function(t){t.registerComponentModel(vE),t.registerComponentView(xE),t.registerCoordinateSystem("calendar",bE)})),Dm((function(t){t.registerComponentModel(CE),t.registerComponentView(kE),t.registerPreprocessor((function(t){var e=t.graphic;Y(e)?e[0]&&e[0].elements?t.graphic=[t.graphic[0]]:t.graphic=[{elements:e}]:e&&!e.elements&&(t.graphic=[{elements:[e]}])}))})),Dm((function(t){t.registerComponentModel(iz),t.registerComponentView(oz),ez("saveAsImage",az),ez("magicType",uz),ez("dataView",yz),ez("dataZoom",Vz),ez("restore",bz),Dm(JE)})),Dm((function(t){Dm(bN),t.registerComponentModel(Gz),t.registerComponentView(rV),t.registerAction({type:"showTip",event:"showTip",update:"tooltip:manuallyShowTip"},bt),t.registerAction({type:"hideTip",event:"hideTip",update:"tooltip:manuallyHideTip"},bt)})),Dm(bN),Dm((function(t){t.registerComponentView(TV),t.registerComponentModel(CV),t.registerPreprocessor(uV),t.registerVisual(t.PRIORITY.VISUAL.BRUSH,bV),t.registerAction({type:"brush",event:"brush",update:"updateVisual"},(function(t,e){e.eachComponent({mainType:"brush",query:t},(function(e){e.setAreas(t.areas)}))})),t.registerAction({type:"brushSelect",event:"brushSelected",update:"none"},bt),t.registerAction({type:"brushEnd",event:"brushEnd",update:"none"},bt),ez("brush",kV)})),Dm((function(t){t.registerComponentModel(LV),t.registerComponentView(PV)})),Dm((function(t){t.registerComponentModel(RV),t.registerComponentView(BV),t.registerSubTypeDefaulter("timeline",(function(){return"slider"})),function(t){t.registerAction({type:"timelineChange",event:"timelineChanged",update:"prepareAndUpdate"},(function(t,e,n){var i=e.getComponent("timeline");return i&&null!=t.currentIndex&&(i.setCurrentIndex(t.currentIndex),!i.get("loop",!0)&&i.isIndexMax()&&i.getPlayState()&&(i.setPlayState(!1),n.dispatchAction({type:"timelinePlayChange",playState:!1,from:t.from}))),e.resetOption("timeline",{replaceMerge:i.get("replaceMerge",!0)}),k({currentIndex:i.option.currentIndex},t)})),t.registerAction({type:"timelinePlayChange",event:"timelinePlayChanged",update:"update"},(function(t,e){var n=e.getComponent("timeline");n&&null!=t.playState&&n.setPlayState(t.playState)}))}(t),t.registerPreprocessor(WV)})),Dm((function(t){t.registerComponentModel(qV),t.registerComponentView(sB),t.registerPreprocessor((function(t){UV(t.series,"markPoint")&&(t.markPoint=t.markPoint||{})}))})),Dm((function(t){t.registerComponentModel(lB),t.registerComponentView(gB),t.registerPreprocessor((function(t){UV(t.series,"markLine")&&(t.markLine=t.markLine||{})}))})),Dm((function(t){t.registerComponentModel(yB),t.registerComponentView(MB),t.registerPreprocessor((function(t){UV(t.series,"markArea")&&(t.markArea=t.markArea||{})}))})),Dm((function(t){Dm(EB),Dm(HB)})),Dm((function(t){Dm(eF),Dm(hF)})),Dm(eF),Dm(hF),Dm((function(t){Dm(YF),Dm(qF)})),Dm(YF),Dm(qF),Dm((function(t){t.registerPreprocessor(tG),t.registerVisual(t.PRIORITY.VISUAL.ARIA,QF)})),Dm((function(t){t.registerTransform(pG),t.registerTransform(dG)})),Dm((function(t){t.registerComponentModel(fG),t.registerComponentView(gG)})),Dm((function(t){t.registerUpdateLifecycle("series:beforeupdate",(function(t,e,n){E(_o(n.seriesTransition),(function(t){E(_o(t.to),(function(t){for(var e=n.updatedSeries,i=0;i<e.length;i++)(null!=t.seriesIndex&&t.seriesIndex===e[i].seriesIndex||null!=t.seriesId&&t.seriesId===e[i].id)&&(e[i].__universalTransitionEnabled=!0)}))}))})),t.registerUpdateLifecycle("series:transition",(function(t,e,n){var i=KG(e);if(i.oldSeries&&n.updatedSeries&&n.optionChanged){var r=n.seriesTransition;if(r)E(_o(r),(function(t){!function(t,e,n,i){var r=[],o=[];E(_o(t.from),(function(t){var n=aW(e.oldSeries,t);n>=0&&r.push({dataGroupId:e.oldDataGroupIds[n],data:e.oldData[n],divide:oW(e.oldData[n]),dim:t.dimension})})),E(_o(t.to),(function(t){var i=aW(n.updatedSeries,t);if(i>=0){var r=n.updatedSeries[i].getData();o.push({dataGroupId:e.oldDataGroupIds[i],data:r,divide:oW(r),dim:t.dimension})}})),r.length>0&&o.length>0&&nW(r,o,i)}(t,i,n,e)}));else{var o=function(t,e){var n=yt(),i=yt(),r=yt();return E(t.oldSeries,(function(e,n){var o=t.oldDataGroupIds[n],a=t.oldData[n],s=iW(e),l=rW(s);i.set(l,{dataGroupId:o,data:a}),Y(s)&&E(s,(function(t){r.set(t,{key:l,dataGroupId:o,data:a})}))})),E(e.updatedSeries,(function(t){if(t.isUniversalTransitionEnabled()&&t.isAnimationEnabled()){var e=t.get("dataGroupId"),o=t.getData(),a=iW(t),s=rW(a),l=i.get(s);if(l)n.set(s,{oldSeries:[{dataGroupId:l.dataGroupId,divide:oW(l.data),data:l.data}],newSeries:[{dataGroupId:e,divide:oW(o),data:o}]});else if(Y(a)){var u=[];E(a,(function(t){var e=i.get(t);e.data&&u.push({dataGroupId:e.dataGroupId,divide:oW(e.data),data:e.data})})),u.length&&n.set(s,{oldSeries:u,newSeries:[{dataGroupId:e,data:o,divide:oW(o)}]})}else{var h=r.get(a);if(h){var c=n.get(h.key);c||(c={oldSeries:[{dataGroupId:h.dataGroupId,data:h.data,divide:oW(h.data)}],newSeries:[]},n.set(h.key,c)),c.newSeries.push({dataGroupId:e,data:o,divide:oW(o)})}}}})),n}(i,n);E(o.keys(),(function(t){var n=o.get(t);nW(n.oldSeries,n.newSeries,e)}))}E(n.updatedSeries,(function(t){t.__universalTransitionEnabled&&(t.__universalTransitionEnabled=!1)}))}for(var a=t.getSeries(),s=i.oldSeries=[],l=i.oldDataGroupIds=[],u=i.oldData=[],h=0;h<a.length;h++){var c=a[h].getData();c.count()<1e4&&(s.push(a[h]),l.push(a[h].get("dataGroupId")),u.push(c))}}))})),Dm((function(t){t.registerUpdateLifecycle("series:beforeupdate",(function(t,e,n){var i=Rb(e).labelManager;i||(i=Rb(e).labelManager=new Ob),i.clearLabels()})),t.registerUpdateLifecycle("series:layoutlabels",(function(t,e,n){var i=Rb(e).labelManager;n.updatedSeries.forEach((function(t){i.addLabelsOfSeries(e.getViewOfSeriesModel(t))})),i.updateLayoutConfig(e),i.layout(e),i.processLabelsOverall()}))})),t.Axis=q_,t.ChartView=Tg,t.ComponentModel=Op,t.ComponentView=wg,t.List=ex,t.Model=Sc,t.PRIORITY=_v,t.SeriesModel=fg,t.color=oi,t.connect=function(t){if(Y(t)){var e=t;t=null,E(e,(function(e){null!=e.group&&(t=e.group)})),t=t||"g_"+am++,E(e,(function(e){e.group=t}))}return rm[t]=!0,t},t.dataTool={},t.dependencies={zrender:"5.4.1"},t.disConnect=lm,t.disconnect=um,t.dispose=function(t){X(t)?t=im[t]:t instanceof Xv||(t=hm(t)),t instanceof Xv&&!t.isDisposed()&&t.dispose()},t.env=r,t.extendChartView=function(t){var e=Tg.extend(t);return Tg.registerClass(e),e},t.extendComponentModel=function(t){var e=Op.extend(t);return Op.registerClass(e),e},t.extendComponentView=function(t){var e=wg.extend(t);return wg.registerClass(e),e},t.extendSeriesModel=function(t){var e=fg.extend(t);return fg.registerClass(e),e},t.format=z_,t.getCoordinateSystemDimensions=function(t){var e=vd.get(t);if(e)return e.getDimensionsInfo?e.getDimensionsInfo():e.dimensions.slice()},t.getInstanceByDom=hm,t.getInstanceById=function(t){return im[t]},t.getMap=function(t){var e=vv("getMap");return e&&e(t)},t.graphic=E_,t.helper=__,t.init=function(t,e,n){var i=!(n&&n.ssr);if(i){0;var r=hm(t);if(r)return r;0}var o=new Xv(t,e,n);return o.id="ec_"+om++,im[o.id]=o,i&&Bo(t,sm,o.id),Gv(o),gv.trigger("afterinit",o),o},t.innerDrawElementOnCanvas=av,t.matrix=Te,t.number=R_,t.parseGeoJSON=O_,t.parseGeoJson=O_,t.registerAction=vm,t.registerCoordinateSystem=mm,t.registerLayout=xm,t.registerLoading=Sm,t.registerLocale=Oc,t.registerMap=Mm,t.registerPostInit=fm,t.registerPostUpdate=gm,t.registerPreprocessor=pm,t.registerProcessor=dm,t.registerTheme=cm,t.registerTransform=Im,t.registerUpdateLifecycle=ym,t.registerVisual=_m,t.setCanvasCreator=function(t){c({createCanvas:t})},t.setPlatformAPI=c,t.throttle=Ng,t.time=N_,t.use=Dm,t.util=V_,t.vector=Ut,t.version="5.4.1",t.zrUtil=St,t.zrender=Wr,Object.defineProperty(t,"__esModule",{value:!0})}));
diff --git a/route/static/js/jquery-1.10.2.min.js b/route/static/js/jquery-1.10.2.min.js
deleted file mode 100755
index ce1b6b6e0..000000000
--- a/route/static/js/jquery-1.10.2.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
-*/
-(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.2",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=st(),k=st(),E=st(),S=!1,A=function(e,t){return e===t?(S=!0,0):0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=mt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+yt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,n,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function lt(e){return e[b]=!0,e}function ut(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function ct(e,t){var n=e.split("|"),r=e.length;while(r--)o.attrHandle[n[r]]=t}function pt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function dt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return lt(function(t){return t=+t,lt(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.defaultView;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.attachEvent&&i!==i.top&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),r.getElementsByTagName=ut(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ut(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ut(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=K.test(n.querySelectorAll))&&(ut(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ut(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=K.test(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ut(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=K.test(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return pt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?pt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:lt,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=mt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?lt(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:lt(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?lt(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:lt(function(e){return function(t){return at(e,t).length>0}}),contains:lt(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:lt(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},o.pseudos.nth=o.pseudos.eq;for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=ft(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=dt(n);function gt(){}gt.prototype=o.filters=o.pseudos,o.setFilters=new gt;function mt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function yt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function vt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function bt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function wt(e,t,n,r,i,o){return r&&!r[b]&&(r=wt(r)),i&&!i[b]&&(i=wt(i,o)),lt(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||Nt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:xt(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=xt(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=xt(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function Tt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=vt(function(e){return e===t},s,!0),p=vt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[vt(bt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return wt(l>1&&bt(f),l>1&&yt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&Tt(e.slice(l,r)),i>r&&Tt(e=e.slice(r)),i>r&&yt(e))}f.push(n)}return bt(f)}function Ct(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=xt(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?lt(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=mt(e)),n=t.length;while(n--)o=Tt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Ct(i,r))}return o};function Nt(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function kt(e,t,n,i){var a,s,u,c,p,f=mt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&yt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}r.sortStable=b.split("").sort(A).join("")===b,r.detectDuplicates=S,p(),r.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(f.createElement("div"))}),ut(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||ct("type|href|height|width",function(e,n,r){return r?t:e.getAttribute(n,"type"===n.toLowerCase()?1:2)}),r.attributes&&ut(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||ct("value",function(e,n,r){return r||"input"!==e.nodeName.toLowerCase()?t:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||ct(B,function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.specified?i.value:e[n]===!0?n.toLowerCase():null}),x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!l||i&&!u||(t=t||[],t=[e,t.slice?t.slice():t],n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav></:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t
-}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,r=0,o=x(this),a=e.match(T)||[];while(t=a[r++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Ct=/^(?:checkbox|radio)$/i,Nt=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle);
-u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){nn(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=un(e,t),Pt.detach()),Gt[e]=n),n}function un(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,n){x.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(x.css(e,"display"))?x.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x.support.opacity||(x.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=x.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===x.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,n){return n?x.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,n){x.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?x(e).position()[n]+"px":r):t}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!x.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||x.css(e,"display"))},x.expr.filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(x.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Ct.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),x.param=function(e,n){var r,i=[],o=function(e,t){t=x.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,yn,vn=x.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Cn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Nn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=x.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=o.href}catch(Ln){yn=a.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(T)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(l){var u;return o[l]=!0,x.each(e[l]||[],function(e,l){var c=l(n,r,i);return"string"!=typeof c||a||o[c]?a?!(u=c):t:(n.dataTypes.unshift(c),s(c),!1)}),u}return s(n.dataTypes[0])||!o["*"]&&s("*")}function _n(e,n){var r,i,o=x.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,l=e.indexOf(" ");return l>=0&&(i=e.slice(l,e.length),e=e.slice(0,l)),x.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&x.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?x("<div>").append(x.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Cn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?_n(_n(e,x.ajaxSettings),t):_n(x.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,l,u,c,p=x.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?x(f):x.event,h=x.Deferred(),g=x.Callbacks("once memory"),m=p.statusCode||{},y={},v={},b=0,w="canceled",C={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return b||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>b)for(t in e)m[t]=[m[t],e[t]];else C.always(e[C.status]);return this},abort:function(e){var t=e||w;return u&&u.abort(t),k(0,t),this}};if(h.promise(C).complete=g.add,C.success=C.done,C.error=C.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=x.trim(p.dataType||"*").toLowerCase().match(T)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?"80":"443"))===(mn[3]||("http:"===mn[1]?"80":"443")))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=x.param(p.data,p.traditional)),qn(An,p,n,C),2===b)return C;l=p.global,l&&0===x.active++&&x.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Nn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(x.lastModified[o]&&C.setRequestHeader("If-Modified-Since",x.lastModified[o]),x.etag[o]&&C.setRequestHeader("If-None-Match",x.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&C.setRequestHeader("Content-Type",p.contentType),C.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)C.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,C,p)===!1||2===b))return C.abort();w="abort";for(i in{success:1,error:1,complete:1})C[i](p[i]);if(u=qn(jn,p,n,C)){C.readyState=1,l&&d.trigger("ajaxSend",[C,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){C.abort("timeout")},p.timeout));try{b=1,u.send(y,k)}catch(N){if(!(2>b))throw N;k(-1,N)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,N=n;2!==b&&(b=2,s&&clearTimeout(s),u=t,a=i||"",C.readyState=e>0?4:0,c=e>=200&&300>e||304===e,r&&(w=Mn(p,C,r)),w=On(p,w,C,c),c?(p.ifModified&&(T=C.getResponseHeader("Last-Modified"),T&&(x.lastModified[o]=T),T=C.getResponseHeader("etag"),T&&(x.etag[o]=T)),204===e||"HEAD"===p.type?N="nocontent":304===e?N="notmodified":(N=w.state,y=w.data,v=w.error,c=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),C.status=e,C.statusText=(n||N)+"",c?h.resolveWith(f,[y,N,C]):h.rejectWith(f,[C,N,v]),C.statusCode(m),m=t,l&&d.trigger(c?"ajaxSuccess":"ajaxError",[C,p,c?y:v]),g.fireWith(f,[C,N]),l&&(d.trigger("ajaxComplete",[C,p]),--x.active||x.event.trigger("ajaxStop")))}return C},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,n){return x.get(e,t,n,"script")}}),x.each(["get","post"],function(e,n){x[n]=function(e,r,i,o){return x.isFunction(r)&&(o=o||i,i=r,r=t),x.ajax({url:e,type:n,dataType:o,data:r,success:i})}});function Mn(e,n,r){var i,o,a,s,l=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in l)if(l[s]&&l[s].test(o)){u.unshift(s);break}if(u[0]in r)a=u[0];else{for(s in r){if(!u[0]||e.converters[s+" "+u[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==u[0]&&u.unshift(a),r[a]):t}function On(e,t,n,r){var i,o,a,s,l,u={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)u[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(a=u[l+" "+o]||u["* "+o],!a)for(i in u)if(s=i.split(" "),s[1]===o&&(a=u[l+" "+s[0]]||u["* "+s[0]])){a===!0?a=u[i]:u[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(p){return{state:"parsererror",error:a?p:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),x.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=a.head||x("head")[0]||a.documentElement;return{send:function(t,i){n=a.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Fn=[],Bn=/(=)\?(?=&|$)|\?\?/;x.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Fn.pop()||x.expando+"_"+vn++;return this[e]=!0,e}}),x.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,l=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return l||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=x.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,l?n[l]=n[l].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||x.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Fn.push(o)),s&&x.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}x.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=x.ajaxSettings.xhr(),x.support.cors=!!Rn&&"withCredentials"in Rn,Rn=x.support.ajax=!!Rn,Rn&&x.ajaxTransport(function(n){if(!n.crossDomain||x.support.cors){var r;return{send:function(i,o){var a,s,l=n.xhr();if(n.username?l.open(n.type,n.url,n.async,n.username,n.password):l.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)l[s]=n.xhrFields[s];n.mimeType&&l.overrideMimeType&&l.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)l.setRequestHeader(s,i[s])}catch(u){}l.send(n.hasContent&&n.data||null),r=function(e,i){var s,u,c,p;try{if(r&&(i||4===l.readyState))if(r=t,a&&(l.onreadystatechange=x.noop,$n&&delete Pn[a]),i)4!==l.readyState&&l.abort();else{p={},s=l.status,u=l.getAllResponseHeaders(),"string"==typeof l.responseText&&(p.text=l.responseText);try{c=l.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,u)},n.async?4===l.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},x(e).unload($n)),Pn[a]=r),l.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+w+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Yn.exec(t),o=i&&i[3]||(x.cssNumber[e]?"":"px"),a=(x.cssNumber[e]||"px"!==o&&+r)&&Yn.exec(x.css(n.elem,e)),s=1,l=20;if(a&&a[3]!==o){o=o||a[3],i=i||[],a=+r||1;do s=s||".5",a/=s,x.style(n.elem,e,a+o);while(s!==(s=n.cur()/r)&&1!==s&&--l)}return i&&(a=n.start=+a||+r||0,n.unit=o,n.end=i[1]?a+(i[1]+1)*i[2]:+i[2]),n}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=x.now()}function Zn(e,t,n){var r,i=(Qn[t]||[]).concat(Qn["*"]),o=0,a=i.length;for(;a>o;o++)if(r=i[o].call(n,t,e))return r}function er(e,t,n){var r,i,o=0,a=Gn.length,s=x.Deferred().always(function(){delete l.elem}),l=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,u.startTime+u.duration-t),r=n/u.duration||0,o=1-r,a=0,l=u.tweens.length;for(;l>a;a++)u.tweens[a].run(o);return s.notifyWith(e,[u,o,n]),1>o&&l?n:(s.resolveWith(e,[u]),!1)},u=s.promise({elem:e,props:x.extend({},t),opts:x.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=x.Tween(e,u.opts,t,n,u.opts.specialEasing[t]||u.opts.easing);return u.tweens.push(r),r},stop:function(t){var n=0,r=t?u.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)u.tweens[n].run(1);return t?s.resolveWith(e,[u,t]):s.rejectWith(e,[u,t]),this}}),c=u.props;for(tr(c,u.opts.specialEasing);a>o;o++)if(r=Gn[o].call(u,e,c,u.opts))return r;return x.map(c,Zn,u),x.isFunction(u.opts.start)&&u.opts.start.call(e,u),x.fx.timer(x.extend(l,{elem:e,anim:u,queue:u.opts.queue})),u.progress(u.opts.progress).done(u.opts.done,u.opts.complete).fail(u.opts.fail).always(u.opts.always)}function tr(e,t){var n,r,i,o,a;for(n in e)if(r=x.camelCase(n),i=t[r],o=e[n],x.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=x.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}x.Animation=x.extend(er,{tweener:function(e,t){x.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,l,u=this,c={},p=e.style,f=e.nodeType&&nn(e),d=x._data(e,"fxshow");n.queue||(s=x._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,l=s.empty.fire,s.empty.fire=function(){s.unqueued||l()}),s.unqueued++,u.always(function(){u.always(function(){s.unqueued--,x.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===x.css(e,"display")&&"none"===x.css(e,"float")&&(x.support.inlineBlockNeedsLayout&&"inline"!==ln(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",x.support.shrinkWrapBlocks||u.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],Vn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(f?"hide":"show"))continue;c[r]=d&&d[r]||x.style(e,r)}if(!x.isEmptyObject(c)){d?"hidden"in d&&(f=d.hidden):d=x._data(e,"fxshow",{}),o&&(d.hidden=!f),f?x(e).show():u.done(function(){x(e).hide()}),u.done(function(){var t;x._removeData(e,"fxshow");for(t in c)x.style(e,t,c[t])});for(r in c)a=Zn(f?d[r]:0,r,u),r in d||(d[r]=a.start,f&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}x.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(x.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?x.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=x.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[x.cssProps[e.prop]]||x.cssHooks[e.prop])?x.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.each(["toggle","show","hide"],function(e,t){var n=x.fn[t];x.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),x.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=x.isEmptyObject(e),o=x.speed(t,n,r),a=function(){var t=er(this,x.extend({},e),o);(i||x._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=x.timers,a=x._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&x.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=x._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=x.timers,a=r?r.length:0;for(n.finish=!0,x.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}x.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){x.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),x.speed=function(e,t,n){var r=e&&"object"==typeof e?x.extend({},e):{complete:n||!n&&t||x.isFunction(e)&&e,duration:e,easing:n&&t||t&&!x.isFunction(t)&&t};return r.duration=x.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in x.fx.speeds?x.fx.speeds[r.duration]:x.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){x.isFunction(r.old)&&r.old.call(this),r.queue&&x.dequeue(this,r.queue)},r},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},x.timers=[],x.fx=rr.prototype.init,x.fx.tick=function(){var e,n=x.timers,r=0;for(Xn=x.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||x.fx.stop(),Xn=t},x.fx.timer=function(e){e()&&x.timers.push(e)&&x.fx.start()},x.fx.interval=13,x.fx.start=function(){Un||(Un=setInterval(x.fx.tick,x.fx.interval))},x.fx.stop=function(){clearInterval(Un),Un=null},x.fx.speeds={slow:600,fast:200,_default:400},x.fx.step={},x.expr&&x.expr.filters&&(x.expr.filters.animated=function(e){return x.grep(x.timers,function(t){return e===t.elem}).length}),x.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){x.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,x.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},x.offset={setOffset:function(e,t,n){var r=x.css(e,"position");"static"===r&&(e.style.position="relative");var i=x(e),o=i.offset(),a=x.css(e,"top"),s=x.css(e,"left"),l=("absolute"===r||"fixed"===r)&&x.inArray("auto",[a,s])>-1,u={},c={},p,f;l?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),x.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(u.top=t.top-o.top+p),null!=t.left&&(u.left=t.left-o.left+f),"using"in t?t.using.call(e,u):i.css(u)}},x.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===x.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),x.nodeName(e[0],"html")||(n=e.offset()),n.top+=x.css(e[0],"borderTopWidth",!0),n.left+=x.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-x.css(r,"marginTop",!0),left:t.left-n.left-x.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||s;while(e&&!x.nodeName(e,"html")&&"static"===x.css(e,"position"))e=e.offsetParent;return e||s})}}),x.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);x.fn[e]=function(i){return x.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?x(a).scrollLeft():o,r?o:x(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return x.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}x.each({Height:"height",Width:"width"},function(e,n){x.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){x.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return x.access(this,function(n,r,i){var o;return x.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?x.css(n,r,s):x.style(n,r,i,s)},n,a?i:t,a,null)}})}),x.fn.size=function(){return this.length},x.fn.andSelf=x.fn.addBack,"object"==typeof module&&module&&"object"==typeof module.exports?module.exports=x:(e.jQuery=e.$=x,"function"==typeof define&&define.amd&&define("jquery",[],function(){return x}))})(window);
diff --git a/route/static/js/jquery-qrcode-0.18.0.min.js b/route/static/js/jquery-qrcode-0.18.0.min.js
deleted file mode 100755
index 25716447b..000000000
--- a/route/static/js/jquery-qrcode-0.18.0.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jquery-qrcode v0.18.0 - https://larsjung.de/jquery-qrcode/ */
-!function(t,r){"object"==typeof exports&&"object"==typeof module?module.exports=r():"function"==typeof define&&define.amd?define("jquery-qrcode",[],r):"object"==typeof exports?exports["jquery-qrcode"]=r():t["jquery-qrcode"]=r()}("undefined"!=typeof self?self:this,function(){return n={},o.m=e=[function(t,r,f){function p(t){return t&&"string"==typeof t.tagName&&"IMG"===t.tagName.toUpperCase()}function h(t,r,e,n,o){e=Math.max(1,e||1),n=Math.min(40,n||40);for(var i=e;i<=n;i+=1)try{return function(t,r,e,n){var o={},i=f(1);i.stringToBytes=i.stringToBytesFuncs["UTF-8"];var a=i(e,r);a.addData(t),a.make(),n=n||0;var u=a.getModuleCount(),s=u+2*n;return o.text=t,o.level=r,o.version=e,o.module_count=s,o.is_dark=function(t,r){return r-=n,0<=(t-=n)&&t<u&&0<=r&&r<u&&a.isDark(t,r)},o.add_blank=function(a,u,f,l){var c=o.is_dark,g=1/s;o.is_dark=function(t,r){var e=r*g,n=t*g,o=e+g,i=n+g;return c(t,r)&&(o<a||f<e||i<u||l<n)}},o}(t,r,i,o)}catch(t){}}function i(t,r,e){p(e.background)?r.drawImage(e.background,0,0,e.size,e.size):e.background&&(r.fillStyle=e.background,r.fillRect(e.left,e.top,e.size,e.size));var n,o,i,a,u,f,l,c,g,s,h,d,v=e.mode;1===v||2===v?function(t,r,e){var n=e.size,o="bold "+e.mSize*n+"px "+e.fontname,i=w("<canvas/>")[0].getContext("2d");i.font=o;var a=i.measureText(e.label).width,u=e.mSize,f=a/n,l=(1-f)*e.mPosX,c=(1-u)*e.mPosY,g=l+f,s=c+u;1===e.mode?t.add_blank(0,c-.01,n,s+.01):t.add_blank(l-.01,c-.01,.01+g,s+.01),r.fillStyle=e.fontcolor,r.font=o,r.fillText(e.label,l*n,c*n+.75*e.mSize*n)}(t,r,e):!p(e.image)||3!==v&&4!==v||(n=t,o=r,a=(i=e).size,u=i.image.naturalWidth||1,f=i.image.naturalHeight||1,l=i.mSize,g=(1-(c=l*u/f))*i.mPosX,s=(1-l)*i.mPosY,h=g+c,d=s+l,3===i.mode?n.add_blank(0,s-.01,a,d+.01):n.add_blank(g-.01,s-.01,.01+h,d+.01),o.drawImage(i.image,g*a,s*a,c*a,l*a))}function s(t,r,e,n,o,i,a,u){t.is_dark(a,u)&&r.r(n,o,i,i)}function d(t,r,e,n,o,i,a,u){var f,l,c,g,s,h,d,v,p,w,y,m,b,k,x,B,C,A,M,S=n+i,L=o+i,D=e.radius*i,T=a-1,z=a+1,P=u-1,j=u+1,I=t.is_dark,_=I(a,u),q=I(T,P),O=I(T,u),F=I(T,j),R=I(a,j),H=I(z,j),N=I(z,u),U=I(z,P),V=I(a,P);_?(w=r,y=n,m=o,b=S,k=L,x=D,C=!O&&!R,A=!N&&!R,M=!N&&!V,(B=!O&&!V)?w.m(y+x,m):w.m(y,m),C?w.l(b-x,m).a(b,m,b,k,x):w.l(b,m),A?w.l(b,k-x).a(b,k,y,k,x):w.l(b,k),M?w.l(y+x,k).a(y,k,y,m,x):w.l(y,k),B?w.l(y,m+x).a(y,m,b,m,x):w.l(y,m)):(f=r,l=n,c=o,g=S,s=L,h=D,d=O&&R&&F,v=N&&R&&H,p=N&&V&&U,O&&V&&q&&f.m(l+h,c).l(l,c).l(l,c+h).a(l,c,l+h,c,h),d&&f.m(g-h,c).l(g,c).l(g,c+h).a(g,c,g-h,c,h),v&&f.m(g-h,s).l(g,s).l(g,s-h).a(g,s,g-h,s,h),p&&f.m(l+h,s).l(l,s).l(l,s-h).a(l,s,l+h,s,h))}function n(t,r){var e=h(r.text,r.ecLevel,r.minVersion,r.maxVersion,r.quiet);if(!e)return null;var n=w(t).data("qrcode",e),o=n[0].getContext("2d");return i(e,o,r),function(t,e,r){var n=t.module_count,o=r.size/n,i=s;0<r.radius&&r.radius<=.5&&(i=d);var a={m:function(t,r){return e.moveTo(t,r),a},l:function(t,r){return e.lineTo(t,r),a},a:function(){return e.arcTo.apply(e,arguments),a},r:function(){return e.rect.apply(e,arguments),a}};e.beginPath();for(var u,f=0;f<n;f+=1)for(var l=0;l<n;l+=1){var c=r.left+l*o,g=r.top+f*o;i(t,a,r,c,g,o,f,l)}p(r.fill)?(e.strokeStyle="rgba(0,0,0,0.5)",e.lineWidth=2,e.stroke(),u=e.globalCompositeOperation,e.globalCompositeOperation="destination-out",e.fill(),e.globalCompositeOperation=u,e.clip(),e.drawImage(r.fill,0,0,r.size,r.size),e.restore()):(e.fillStyle=r.fill,e.fill())}(e,o,r),n}function e(t){var r=w("<canvas/>").attr("width",t.size).attr("height",t.size);return n(r,t)}function o(t){return"canvas"===t.render?e(t):"image"===t.render?(r=t,w("<img/>").attr("src",e(r)[0].toDataURL("image/png"))):function(t){var r=h(t.text,t.ecLevel,t.minVersion,t.maxVersion,t.quiet);if(!r)return null;var e=t.size,n=t.background,o=Math.floor,i=r.module_count,a=o(e/i),u=o(.5*(e-a*i)),f={position:"relative",left:0,top:0,padding:0,margin:0,width:e,height:e},l={position:"absolute",padding:0,margin:0,width:a,height:a,"background-color":t.fill},c=w("<div/>").data("qrcode",r).css(f);n&&c.css("background-color",n);for(var g=0;g<i;g+=1)for(var s=0;s<i;s+=1)r.is_dark(g,s)&&w("<div/>").css(l).css({left:u+s*a,top:u+g*a}).appendTo(c);return c}(t);var r}var w=window.jQuery,a={render:"canvas",minVersion:1,maxVersion:40,ecLevel:"L",left:0,top:0,size:200,fill:"#000",background:"#fff",text:"no text",radius:0,quiet:0,mode:0,mSize:.1,mPosX:.5,mPosY:.5,label:"no label",fontname:"sans",fontcolor:"#000",image:null};w.fn.qrcode=t.exports=function(t){var e=w.extend({},a,t);return this.each(function(t,r){"canvas"===r.nodeName.toLowerCase()?n(r,e):w(r).append(o(e))})}},function(t,r,e){var n,o,i,a=function(){function i(t,r){function a(t,r){c=function(t){for(var r=new Array(t),e=0;e<t;e+=1){r[e]=new Array(t);for(var n=0;n<t;n+=1)r[e][n]=null}return r}(g=4*u+17),e(0,0),e(g-7,0),e(0,g-7),i(),o(),d(t,r),7<=u&&s(t),null==n&&(n=p(u,f,l)),v(n,r)}var u=t,f=y[r],c=null,g=0,n=null,l=[],h={},e=function(t,r){for(var e=-1;e<=7;e+=1)if(!(t+e<=-1||g<=t+e))for(var n=-1;n<=7;n+=1)r+n<=-1||g<=r+n||(c[t+e][r+n]=0<=e&&e<=6&&(0==n||6==n)||0<=n&&n<=6&&(0==e||6==e)||2<=e&&e<=4&&2<=n&&n<=4)},o=function(){for(var t=8;t<g-8;t+=1)null==c[t][6]&&(c[t][6]=t%2==0);for(var r=8;r<g-8;r+=1)null==c[6][r]&&(c[6][r]=r%2==0)},i=function(){for(var t=m.getPatternPosition(u),r=0;r<t.length;r+=1)for(var e=0;e<t.length;e+=1){var n=t[r],o=t[e];if(null==c[n][o])for(var i=-2;i<=2;i+=1)for(var a=-2;a<=2;a+=1)c[n+i][o+a]=-2==i||2==i||-2==a||2==a||0==i&&0==a}},s=function(t){for(var r=m.getBCHTypeNumber(u),e=0;e<18;e+=1){var n=!t&&1==(r>>e&1);c[Math.floor(e/3)][e%3+g-8-3]=n}for(e=0;e<18;e+=1){n=!t&&1==(r>>e&1);c[e%3+g-8-3][Math.floor(e/3)]=n}},d=function(t,r){for(var e=f<<3|r,n=m.getBCHTypeInfo(e),o=0;o<15;o+=1){var i=!t&&1==(n>>o&1);o<6?c[o][8]=i:o<8?c[o+1][8]=i:c[g-15+o][8]=i}for(o=0;o<15;o+=1){i=!t&&1==(n>>o&1);o<8?c[8][g-o-1]=i:o<9?c[8][15-o-1+1]=i:c[8][15-o-1]=i}c[g-8][8]=!t},v=function(t,r){for(var e=-1,n=g-1,o=7,i=0,a=m.getMaskFunction(r),u=g-1;0<u;u-=2)for(6==u&&--u;;){for(var f,l=0;l<2;l+=1){null==c[n][u-l]&&(f=!1,i<t.length&&(f=1==(t[i]>>>o&1)),a(n,u-l)&&(f=!f),c[n][u-l]=f,-1==--o&&(i+=1,o=7))}if((n+=e)<0||g<=n){n-=e,e=-e;break}}},p=function(t,r,e){for(var n=A.getRSBlocks(t,r),o=M(),i=0;i<e.length;i+=1){var a=e[i];o.put(a.getMode(),4),o.put(a.getLength(),m.getLengthInBits(a.getMode(),t)),a.write(o)}for(var u=0,i=0;i<n.length;i+=1)u+=n[i].dataCount;if(o.getLengthInBits()>8*u)throw"code length overflow. ("+o.getLengthInBits()+">"+8*u+")";for(o.getLengthInBits()+4<=8*u&&o.put(0,4);o.getLengthInBits()%8!=0;)o.putBit(!1);for(;!(o.getLengthInBits()>=8*u||(o.put(236,8),o.getLengthInBits()>=8*u));)o.put(17,8);return function(t,r){for(var e=0,n=0,o=0,i=new Array(r.length),a=new Array(r.length),u=0;u<r.length;u+=1){var f=r[u].dataCount,l=r[u].totalCount-f,n=Math.max(n,f),o=Math.max(o,l);i[u]=new Array(f);for(var c=0;c<i[u].length;c+=1)i[u][c]=255&t.getBuffer()[c+e];e+=f;var g=m.getErrorCorrectPolynomial(l),s=b(i[u],g.getLength()-1).mod(g);a[u]=new Array(g.getLength()-1);for(c=0;c<a[u].length;c+=1){var h=c+s.getLength()-a[u].length;a[u][c]=0<=h?s.getAt(h):0}}for(var d=0,c=0;c<r.length;c+=1)d+=r[c].totalCount;for(var v=new Array(d),p=0,c=0;c<n;c+=1)for(u=0;u<r.length;u+=1)c<i[u].length&&(v[p]=i[u][c],p+=1);for(c=0;c<o;c+=1)for(u=0;u<r.length;u+=1)c<a[u].length&&(v[p]=a[u][c],p+=1);return v}(o,n)};h.addData=function(t,r){var e=null;switch(r=r||"Byte"){case"Numeric":e=S(t);break;case"Alphanumeric":e=L(t);break;case"Byte":e=D(t);break;case"Kanji":e=T(t);break;default:throw"mode:"+r}l.push(e),n=null},h.isDark=function(t,r){if(t<0||g<=t||r<0||g<=r)throw t+","+r;return c[t][r]},h.getModuleCount=function(){return g},h.make=function(){if(u<1){for(var t=1;t<40;t++){for(var r=A.getRSBlocks(t,f),e=M(),n=0;n<l.length;n++){var o=l[n];e.put(o.getMode(),4),e.put(o.getLength(),m.getLengthInBits(o.getMode(),t)),o.write(e)}for(var i=0,n=0;n<r.length;n++)i+=r[n].dataCount;if(e.getLengthInBits()<=8*i)break}u=t}a(!1,function(){for(var t=0,r=0,e=0;e<8;e+=1){a(!0,e);var n=m.getLostPoint(h);(0==e||n<t)&&(t=n,r=e)}return r}())},h.createTableTag=function(t,r){t=t||2;var e="";e+='<table style="',e+=" border-width: 0px; border-style: none;",e+=" border-collapse: collapse;",e+=" padding: 0px; margin: "+(r=void 0===r?4*t:r)+"px;",e+='">',e+="<tbody>";for(var n=0;n<h.getModuleCount();n+=1){e+="<tr>";for(var o=0;o<h.getModuleCount();o+=1)e+='<td style="',e+=" border-width: 0px; border-style: none;",e+=" border-collapse: collapse;",e+=" padding: 0px; margin: 0px;",e+=" width: "+t+"px;",e+=" height: "+t+"px;",e+=" background-color: ",e+=h.isDark(n,o)?"#000000":"#ffffff",e+=";",e+='"/>';e+="</tr>"}return e+="</tbody>",e+="</table>"},h.createSvgTag=function(t,r,e,n){var o={};"object"==typeof arguments[0]&&(t=(o=arguments[0]).cellSize,r=o.margin,e=o.alt,n=o.title),t=t||2,r=void 0===r?4*t:r,(e="string"==typeof e?{text:e}:e||{}).text=e.text||null,e.id=e.text?e.id||"qrcode-description":null,(n="string"==typeof n?{text:n}:n||{}).text=n.text||null,n.id=n.text?n.id||"qrcode-title":null;var i,a,u,f=h.getModuleCount()*t+2*r,l="",c="l"+t+",0 0,"+t+" -"+t+",0 0,-"+t+"z ";for(l+='<svg version="1.1" xmlns="http://www.w3.org/2000/svg"',l+=o.scalable?"":' width="'+f+'px" height="'+f+'px"',l+=' viewBox="0 0 '+f+" "+f+'" ',l+=' preserveAspectRatio="xMinYMin meet"',l+=n.text||e.text?' role="img" aria-labelledby="'+w([n.id,e.id].join(" ").trim())+'"':"",l+=">",l+=n.text?'<title id="'+w(n.id)+'">'+w(n.text)+"</title>":"",l+=e.text?'<description id="'+w(e.id)+'">'+w(e.text)+"</description>":"",l+='<rect width="100%" height="100%" fill="white" cx="0" cy="0"/>',l+='<path d="',a=0;a<h.getModuleCount();a+=1)for(u=a*t+r,i=0;i<h.getModuleCount();i+=1)h.isDark(a,i)&&(l+="M"+(i*t+r)+","+u+c);return l+='" stroke="transparent" fill="black"/>',l+="</svg>"},h.createDataURL=function(o,t){o=o||2,t=void 0===t?4*o:t;var r=h.getModuleCount()*o+2*t,i=t,a=r-t;return P(r,r,function(t,r){if(i<=t&&t<a&&i<=r&&r<a){var e=Math.floor((t-i)/o),n=Math.floor((r-i)/o);return h.isDark(n,e)?0:1}return 1})},h.createImgTag=function(t,r,e){t=t||2,r=void 0===r?4*t:r;var n=h.getModuleCount()*t+2*r,o="";return o+="<img",o+=' src="',o+=h.createDataURL(t,r),o+='"',o+=' width="',o+=n,o+='"',o+=' height="',o+=n,o+='"',e&&(o+=' alt="',o+=w(e),o+='"'),o+="/>"};var w=function(t){for(var r="",e=0;e<t.length;e+=1){var n=t.charAt(e);switch(n){case"<":r+="&lt;";break;case">":r+="&gt;";break;case"&":r+="&amp;";break;case'"':r+="&quot;";break;default:r+=n}}return r};return h.createASCII=function(t,r){if((t=t||1)<2)return function(t){t=void 0===t?2:t;for(var r,e,n,o,i=+h.getModuleCount()+2*t,a=t,u=i-t,f={"██":"█","█ ":"▀"," █":"▄","  ":" "},l={"██":"▀","█ ":"▀"," █":" ","  ":" "},c="",g=0;g<i;g+=2){for(e=Math.floor(g-a),n=Math.floor(g+1-a),r=0;r<i;r+=1)o="█",a<=r&&r<u&&a<=g&&g<u&&h.isDark(e,Math.floor(r-a))&&(o=" "),a<=r&&r<u&&a<=g+1&&g+1<u&&h.isDark(n,Math.floor(r-a))?o+=" ":o+="█",c+=t<1&&u<=g+1?l[o]:f[o];c+="\n"}return i%2&&0<t?c.substring(0,c.length-i-1)+Array(1+i).join("▀"):c.substring(0,c.length-1)}(r);--t,r=void 0===r?2*t:r;for(var e,n,o,i=h.getModuleCount()*t+2*r,a=r,u=i-r,f=Array(t+1).join("██"),l=Array(t+1).join("  "),c="",g="",s=0;s<i;s+=1){for(n=Math.floor((s-a)/t),g="",e=0;e<i;e+=1)o=1,a<=e&&e<u&&a<=s&&s<u&&h.isDark(n,Math.floor((e-a)/t))&&(o=0),g+=o?f:l;for(n=0;n<t;n+=1)c+=g+"\n"}return c.substring(0,c.length-1)},h.renderTo2dContext=function(t,r){r=r||2;for(var e=h.getModuleCount(),n=0;n<e;n++)for(var o=0;o<e;o++)t.fillStyle=h.isDark(n,o)?"black":"white",t.fillRect(n*r,o*r,r,r)},h}i.stringToBytes=(i.stringToBytesFuncs={default:function(t){for(var r=[],e=0;e<t.length;e+=1){var n=t.charCodeAt(e);r.push(255&n)}return r}}).default,i.createStringToBytes=function(u,f){var i=function(){function t(){var t=r.read();if(-1==t)throw"eof";return t}for(var r=z(u),e=0,n={};;){var o=r.read();if(-1==o)break;var i=t(),a=t()<<8|t();n[String.fromCharCode(o<<8|i)]=a,e+=1}if(e!=f)throw e+" != "+f;return n}(),a="?".charCodeAt(0);return function(t){for(var r=[],e=0;e<t.length;e+=1){var n,o=t.charCodeAt(e);o<128?r.push(o):"number"==typeof(n=i[t.charAt(e)])?(255&n)==n?r.push(n):(r.push(n>>>8),r.push(255&n)):r.push(a)}return r}};var r,t,a=1,u=2,o=4,f=8,y={L:1,M:0,Q:3,H:2},e=0,n=1,l=2,c=3,g=4,s=5,h=6,d=7,m=(r=[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],(t={}).getBCHTypeInfo=function(t){for(var r=t<<10;0<=v(r)-v(1335);)r^=1335<<v(r)-v(1335);return 21522^(t<<10|r)},t.getBCHTypeNumber=function(t){for(var r=t<<12;0<=v(r)-v(7973);)r^=7973<<v(r)-v(7973);return t<<12|r},t.getPatternPosition=function(t){return r[t-1]},t.getMaskFunction=function(t){switch(t){case e:return function(t,r){return(t+r)%2==0};case n:return function(t,r){return t%2==0};case l:return function(t,r){return r%3==0};case c:return function(t,r){return(t+r)%3==0};case g:return function(t,r){return(Math.floor(t/2)+Math.floor(r/3))%2==0};case s:return function(t,r){return t*r%2+t*r%3==0};case h:return function(t,r){return(t*r%2+t*r%3)%2==0};case d:return function(t,r){return(t*r%3+(t+r)%2)%2==0};default:throw"bad maskPattern:"+t}},t.getErrorCorrectPolynomial=function(t){for(var r=b([1],0),e=0;e<t;e+=1)r=r.multiply(b([1,p.gexp(e)],0));return r},t.getLengthInBits=function(t,r){if(1<=r&&r<10)switch(t){case a:return 10;case u:return 9;case o:case f:return 8;default:throw"mode:"+t}else if(r<27)switch(t){case a:return 12;case u:return 11;case o:return 16;case f:return 10;default:throw"mode:"+t}else{if(!(r<41))throw"type:"+r;switch(t){case a:return 14;case u:return 13;case o:return 16;case f:return 12;default:throw"mode:"+t}}},t.getLostPoint=function(t){for(var r=t.getModuleCount(),e=0,n=0;n<r;n+=1)for(var o=0;o<r;o+=1){for(var i=0,a=t.isDark(n,o),u=-1;u<=1;u+=1)if(!(n+u<0||r<=n+u))for(var f=-1;f<=1;f+=1)o+f<0||r<=o+f||0==u&&0==f||a==t.isDark(n+u,o+f)&&(i+=1);5<i&&(e+=3+i-5)}for(n=0;n<r-1;n+=1)for(o=0;o<r-1;o+=1){var l=0;t.isDark(n,o)&&(l+=1),t.isDark(n+1,o)&&(l+=1),t.isDark(n,o+1)&&(l+=1),t.isDark(n+1,o+1)&&(l+=1),0!=l&&4!=l||(e+=3)}for(n=0;n<r;n+=1)for(o=0;o<r-6;o+=1)t.isDark(n,o)&&!t.isDark(n,o+1)&&t.isDark(n,o+2)&&t.isDark(n,o+3)&&t.isDark(n,o+4)&&!t.isDark(n,o+5)&&t.isDark(n,o+6)&&(e+=40);for(o=0;o<r;o+=1)for(n=0;n<r-6;n+=1)t.isDark(n,o)&&!t.isDark(n+1,o)&&t.isDark(n+2,o)&&t.isDark(n+3,o)&&t.isDark(n+4,o)&&!t.isDark(n+5,o)&&t.isDark(n+6,o)&&(e+=40);for(var c=0,o=0;o<r;o+=1)for(n=0;n<r;n+=1)t.isDark(n,o)&&(c+=1);return e+=Math.abs(100*c/r/r-50)/5*10},t);function v(t){for(var r=0;0!=t;)r+=1,t>>>=1;return r}var p=function(){for(var r=new Array(256),e=new Array(256),t=0;t<8;t+=1)r[t]=1<<t;for(t=8;t<256;t+=1)r[t]=r[t-4]^r[t-5]^r[t-6]^r[t-8];for(t=0;t<255;t+=1)e[r[t]]=t;var n={glog:function(t){if(t<1)throw"glog("+t+")";return e[t]},gexp:function(t){for(;t<0;)t+=255;for(;256<=t;)t-=255;return r[t]}};return n}();function b(n,o){if(void 0===n.length)throw n.length+"/"+o;var r=function(){for(var t=0;t<n.length&&0==n[t];)t+=1;for(var r=new Array(n.length-t+o),e=0;e<n.length-t;e+=1)r[e]=n[e+t];return r}(),i={getAt:function(t){return r[t]},getLength:function(){return r.length},multiply:function(t){for(var r=new Array(i.getLength()+t.getLength()-1),e=0;e<i.getLength();e+=1)for(var n=0;n<t.getLength();n+=1)r[e+n]^=p.gexp(p.glog(i.getAt(e))+p.glog(t.getAt(n)));return b(r,0)},mod:function(t){if(i.getLength()-t.getLength()<0)return i;for(var r=p.glog(i.getAt(0))-p.glog(t.getAt(0)),e=new Array(i.getLength()),n=0;n<i.getLength();n+=1)e[n]=i.getAt(n);for(n=0;n<t.getLength();n+=1)e[n]^=p.gexp(p.glog(t.getAt(n))+r);return b(e,0).mod(t)}};return i}function w(){var e=[],o={writeByte:function(t){e.push(255&t)},writeShort:function(t){o.writeByte(t),o.writeByte(t>>>8)},writeBytes:function(t,r,e){r=r||0,e=e||t.length;for(var n=0;n<e;n+=1)o.writeByte(t[n+r])},writeString:function(t){for(var r=0;r<t.length;r+=1)o.writeByte(t.charCodeAt(r))},toByteArray:function(){return e},toString:function(){var t="";t+="[";for(var r=0;r<e.length;r+=1)0<r&&(t+=","),t+=e[r];return t+="]"}};return o}function k(){function e(t){a+=String.fromCharCode(r(63&t))}var n=0,o=0,i=0,a="",t={},r=function(t){if(!(t<0)){if(t<26)return 65+t;if(t<52)return t-26+97;if(t<62)return t-52+48;if(62==t)return 43;if(63==t)return 47}throw"n:"+t};return t.writeByte=function(t){for(n=n<<8|255&t,o+=8,i+=1;6<=o;)e(n>>>o-6),o-=6},t.flush=function(){if(0<o&&(e(n<<6-o),o=n=0),i%3!=0)for(var t=3-i%3,r=0;r<t;r+=1)a+="="},t.toString=function(){return a},t}function x(t,r){var n=t,o=r,d=new Array(t*r),e={setPixel:function(t,r,e){d[r*n+t]=e},write:function(t){t.writeString("GIF87a"),t.writeShort(n),t.writeShort(o),t.writeByte(128),t.writeByte(0),t.writeByte(0),t.writeByte(0),t.writeByte(0),t.writeByte(0),t.writeByte(255),t.writeByte(255),t.writeByte(255),t.writeString(","),t.writeShort(0),t.writeShort(0),t.writeShort(n),t.writeShort(o),t.writeByte(0);var r=i(2);t.writeByte(2);for(var e=0;255<r.length-e;)t.writeByte(255),t.writeBytes(r,e,255),e+=255;t.writeByte(r.length-e),t.writeBytes(r,e,r.length-e),t.writeByte(0),t.writeString(";")}},i=function(t){for(var r=1<<t,e=1+(1<<t),n=t+1,o=v(),i=0;i<r;i+=1)o.add(String.fromCharCode(i));o.add(String.fromCharCode(r)),o.add(String.fromCharCode(e));var a,u,f,l=w(),c=(a=l,f=u=0,{write:function(t,r){if(t>>>r!=0)throw"length over";for(;8<=u+r;)a.writeByte(255&(t<<u|f)),r-=8-u,t>>>=8-u,u=f=0;f|=t<<u,u+=r},flush:function(){0<u&&a.writeByte(f)}});c.write(r,n);var g=0,s=String.fromCharCode(d[g]);for(g+=1;g<d.length;){var h=String.fromCharCode(d[g]);g+=1,o.contains(s+h)?s+=h:(c.write(o.indexOf(s),n),o.size()<4095&&(o.size()==1<<n&&(n+=1),o.add(s+h)),s=h)}return c.write(o.indexOf(s),n),c.write(e,n),c.flush(),l.toByteArray()},v=function(){var r={},e=0,n={add:function(t){if(n.contains(t))throw"dup key:"+t;r[t]=e,e+=1},size:function(){return e},indexOf:function(t){return r[t]},contains:function(t){return void 0!==r[t]}};return n};return e}var B,C,A=(B=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12,7,37,13],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]],(C={}).getRSBlocks=function(t,r){var e=function(t,r){switch(r){case y.L:return B[4*(t-1)+0];case y.M:return B[4*(t-1)+1];case y.Q:return B[4*(t-1)+2];case y.H:return B[4*(t-1)+3];default:return}}(t,r);if(void 0===e)throw"bad rs block @ typeNumber:"+t+"/errorCorrectionLevel:"+r;for(var n,o,i=e.length/3,a=[],u=0;u<i;u+=1)for(var f=e[3*u+0],l=e[3*u+1],c=e[3*u+2],g=0;g<f;g+=1)a.push((n=c,o=void 0,(o={}).totalCount=l,o.dataCount=n,o));return a},C),M=function(){var e=[],n=0,o={getBuffer:function(){return e},getAt:function(t){var r=Math.floor(t/8);return 1==(e[r]>>>7-t%8&1)},put:function(t,r){for(var e=0;e<r;e+=1)o.putBit(1==(t>>>r-e-1&1))},getLengthInBits:function(){return n},putBit:function(t){var r=Math.floor(n/8);e.length<=r&&e.push(0),t&&(e[r]|=128>>>n%8),n+=1}};return o},S=function(t){var r=a,n=t,e={getMode:function(){return r},getLength:function(t){return n.length},write:function(t){for(var r=n,e=0;e+2<r.length;)t.put(o(r.substring(e,e+3)),10),e+=3;e<r.length&&(r.length-e==1?t.put(o(r.substring(e,e+1)),4):r.length-e==2&&t.put(o(r.substring(e,e+2)),7))}},o=function(t){for(var r=0,e=0;e<t.length;e+=1)r=10*r+i(t.charAt(e));return r},i=function(t){if("0"<=t&&t<="9")return t.charCodeAt(0)-"0".charCodeAt(0);throw"illegal char :"+t};return e},L=function(t){var r=u,n=t,e={getMode:function(){return r},getLength:function(t){return n.length},write:function(t){for(var r=n,e=0;e+1<r.length;)t.put(45*o(r.charAt(e))+o(r.charAt(e+1)),11),e+=2;e<r.length&&t.put(o(r.charAt(e)),6)}},o=function(t){if("0"<=t&&t<="9")return t.charCodeAt(0)-"0".charCodeAt(0);if("A"<=t&&t<="Z")return t.charCodeAt(0)-"A".charCodeAt(0)+10;switch(t){case" ":return 36;case"$":return 37;case"%":return 38;case"*":return 39;case"+":return 40;case"-":return 41;case".":return 42;case"/":return 43;case":":return 44;default:throw"illegal char :"+t}};return e},D=function(t){var r=o,e=i.stringToBytes(t),n={getMode:function(){return r},getLength:function(t){return e.length},write:function(t){for(var r=0;r<e.length;r+=1)t.put(e[r],8)}};return n},T=function(t){var r=f,e=i.stringToBytesFuncs.SJIS;if(!e)throw"sjis not supported.";!function(){var t=e("友");if(2!=t.length||38726!=(t[0]<<8|t[1]))throw"sjis not supported."}();var o=e(t),n={getMode:function(){return r},getLength:function(t){return~~(o.length/2)},write:function(t){for(var r=o,e=0;e+1<r.length;){var n=(255&r[e])<<8|255&r[e+1];if(33088<=n&&n<=40956)n-=33088;else{if(!(57408<=n&&n<=60351))throw"illegal char at "+(e+1)+"/"+n;n-=49472}n=192*(n>>>8&255)+(255&n),t.put(n,13),e+=2}if(e<r.length)throw"illegal char at "+(e+1)}};return n},z=function(t){var e=t,n=0,o=0,i=0,r={read:function(){for(;i<8;){if(n>=e.length){if(0==i)return-1;throw"unexpected end of file./"+i}var t=e.charAt(n);if(n+=1,"="==t)return i=0,-1;t.match(/^\s$/)||(o=o<<6|a(t.charCodeAt(0)),i+=6)}var r=o>>>i-8&255;return i-=8,r}},a=function(t){if(65<=t&&t<=90)return t-65;if(97<=t&&t<=122)return t-97+26;if(48<=t&&t<=57)return t-48+52;if(43==t)return 62;if(47==t)return 63;throw"c:"+t};return r},P=function(t,r,e){for(var n=x(t,r),o=0;o<r;o+=1)for(var i=0;i<t;i+=1)n.setPixel(i,o,e(i,o));var a=w();n.write(a);for(var u=k(),f=a.toByteArray(),l=0;l<f.length;l+=1)u.writeByte(f[l]);return u.flush(),"data:image/gif;base64,"+u};return i}();a.stringToBytesFuncs["UTF-8"]=function(t){return function(t){for(var r=[],e=0;e<t.length;e++){var n=t.charCodeAt(e);n<128?r.push(n):n<2048?r.push(192|n>>6,128|63&n):n<55296||57344<=n?r.push(224|n>>12,128|n>>6&63,128|63&n):(e++,n=65536+((1023&n)<<10|1023&t.charCodeAt(e)),r.push(240|n>>18,128|n>>12&63,128|n>>6&63,128|63&n))}return r}(t)},o=[],void 0===(i="function"==typeof(n=function(){return a})?n.apply(r,o):n)||(t.exports=i)}],o.c=n,o.d=function(t,r,e){o.o(t,r)||Object.defineProperty(t,r,{enumerable:!0,get:e})},o.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},o.t=function(r,t){if(1&t&&(r=o(r)),8&t)return r;if(4&t&&"object"==typeof r&&r&&r.__esModule)return r;var e=Object.create(null);if(o.r(e),Object.defineProperty(e,"default",{enumerable:!0,value:r}),2&t&&"string"!=typeof r)for(var n in r)o.d(e,n,function(t){return r[t]}.bind(null,n));return e},o.n=function(t){var r=t&&t.__esModule?function(){return t.default}:function(){return t};return o.d(r,"a",r),r},o.o=function(t,r){return Object.prototype.hasOwnProperty.call(t,r)},o.p="",o(o.s=0);function o(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,o),r.l=!0,r.exports}var e,n});
\ No newline at end of file
diff --git a/route/static/js/jquery-ui.min.js b/route/static/js/jquery-ui.min.js
deleted file mode 100755
index 117cb35e4..000000000
--- a/route/static/js/jquery-ui.min.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/*! jQuery UI - v1.12.1 - 2016-09-14
-* http://jqueryui.com
-* Includes: widget.js, position.js, data.js, disable-selection.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js, focusable.js, form-reset-mixin.js, jquery-1-7.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/draggable.js, widgets/droppable.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/resizable.js, widgets/selectable.js, widgets/selectmenu.js, widgets/slider.js, widgets/sortable.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js
-* Copyright jQuery Foundation and other contributors; Licensed MIT */
-
-(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(t){function e(t){for(var e=t.css("visibility");"inherit"===e;)t=t.parent(),e=t.css("visibility");return"hidden"!==e}function i(t){for(var e,i;t.length&&t[0]!==document;){if(e=t.css("position"),("absolute"===e||"relative"===e||"fixed"===e)&&(i=parseInt(t.css("zIndex"),10),!isNaN(i)&&0!==i))return i;t=t.parent()}return 0}function s(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},t.extend(this._defaults,this.regional[""]),this.regional.en=t.extend(!0,{},this.regional[""]),this.regional["en-US"]=t.extend(!0,{},this.regional.en),this.dpDiv=n(t("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function n(e){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return e.on("mouseout",i,function(){t(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).removeClass("ui-datepicker-next-hover")}).on("mouseover",i,o)}function o(){t.datepicker._isDisabledDatepicker(m.inline?m.dpDiv.parent()[0]:m.input[0])||(t(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),t(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).addClass("ui-datepicker-next-hover"))}function a(e,i){t.extend(e,i);for(var s in i)null==i[s]&&(e[s]=i[s]);return e}function r(t){return function(){var e=this.element.val();t.apply(this,arguments),this._refresh(),e!==this.element.val()&&this._trigger("change")}}t.ui=t.ui||{},t.ui.version="1.12.1";var h=0,l=Array.prototype.slice;t.cleanData=function(e){return function(i){var s,n,o;for(o=0;null!=(n=i[o]);o++)try{s=t._data(n,"events"),s&&s.remove&&t(n).triggerHandler("remove")}catch(a){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var n,o,a,r={},h=e.split(".")[0];e=e.split(".")[1];var l=h+"-"+e;return s||(s=i,i=t.Widget),t.isArray(s)&&(s=t.extend.apply(null,[{}].concat(s))),t.expr[":"][l.toLowerCase()]=function(e){return!!t.data(e,l)},t[h]=t[h]||{},n=t[h][e],o=t[h][e]=function(t,e){return this._createWidget?(arguments.length&&this._createWidget(t,e),void 0):new o(t,e)},t.extend(o,n,{version:s.version,_proto:t.extend({},s),_childConstructors:[]}),a=new i,a.options=t.widget.extend({},a.options),t.each(s,function(e,s){return t.isFunction(s)?(r[e]=function(){function t(){return i.prototype[e].apply(this,arguments)}function n(t){return i.prototype[e].apply(this,t)}return function(){var e,i=this._super,o=this._superApply;return this._super=t,this._superApply=n,e=s.apply(this,arguments),this._super=i,this._superApply=o,e}}(),void 0):(r[e]=s,void 0)}),o.prototype=t.widget.extend(a,{widgetEventPrefix:n?a.widgetEventPrefix||e:e},r,{constructor:o,namespace:h,widgetName:e,widgetFullName:l}),n?(t.each(n._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete n._childConstructors):i._childConstructors.push(o),t.widget.bridge(e,o),o},t.widget.extend=function(e){for(var i,s,n=l.call(arguments,1),o=0,a=n.length;a>o;o++)for(i in n[o])s=n[o][i],n[o].hasOwnProperty(i)&&void 0!==s&&(e[i]=t.isPlainObject(s)?t.isPlainObject(e[i])?t.widget.extend({},e[i],s):t.widget.extend({},s):s);return e},t.widget.bridge=function(e,i){var s=i.prototype.widgetFullName||e;t.fn[e]=function(n){var o="string"==typeof n,a=l.call(arguments,1),r=this;return o?this.length||"instance"!==n?this.each(function(){var i,o=t.data(this,s);return"instance"===n?(r=o,!1):o?t.isFunction(o[n])&&"_"!==n.charAt(0)?(i=o[n].apply(o,a),i!==o&&void 0!==i?(r=i&&i.jquery?r.pushStack(i.get()):i,!1):void 0):t.error("no such method '"+n+"' for "+e+" widget instance"):t.error("cannot call methods on "+e+" prior to initialization; "+"attempted to call method '"+n+"'")}):r=void 0:(a.length&&(n=t.widget.extend.apply(null,[n].concat(a))),this.each(function(){var e=t.data(this,s);e?(e.option(n||{}),e._init&&e._init()):t.data(this,s,new i(n,this))})),r}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(e,i){i=t(i||this.defaultElement||this)[0],this.element=t(i),this.uuid=h++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=t(),this.hoverable=t(),this.focusable=t(),this.classesElementLookup={},i!==this&&(t.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===i&&this.destroy()}}),this.document=t(i.style?i.ownerDocument:i.document||i),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){var e=this;this._destroy(),t.each(this.classesElementLookup,function(t,i){e._removeClass(i,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:t.noop,widget:function(){return this.element},option:function(e,i){var s,n,o,a=e;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof e)if(a={},s=e.split("."),e=s.shift(),s.length){for(n=a[e]=t.widget.extend({},this.options[e]),o=0;s.length-1>o;o++)n[s[o]]=n[s[o]]||{},n=n[s[o]];if(e=s.pop(),1===arguments.length)return void 0===n[e]?null:n[e];n[e]=i}else{if(1===arguments.length)return void 0===this.options[e]?null:this.options[e];a[e]=i}return this._setOptions(a),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(e){var i,s,n;for(i in e)n=this.classesElementLookup[i],e[i]!==this.options.classes[i]&&n&&n.length&&(s=t(n.get()),this._removeClass(n,i),s.addClass(this._classes({element:s,keys:i,classes:e,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(e){function i(i,o){var a,r;for(r=0;i.length>r;r++)a=n.classesElementLookup[i[r]]||t(),a=e.add?t(t.unique(a.get().concat(e.element.get()))):t(a.not(e.element).get()),n.classesElementLookup[i[r]]=a,s.push(i[r]),o&&e.classes[i[r]]&&s.push(e.classes[i[r]])}var s=[],n=this;return e=t.extend({element:this.element,classes:this.options.classes||{}},e),this._on(e.element,{remove:"_untrackClassesElement"}),e.keys&&i(e.keys.match(/\S+/g)||[],!0),e.extra&&i(e.extra.match(/\S+/g)||[]),s.join(" ")},_untrackClassesElement:function(e){var i=this;t.each(i.classesElementLookup,function(s,n){-1!==t.inArray(e.target,n)&&(i.classesElementLookup[s]=t(n.not(e.target).get()))})},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){s="boolean"==typeof s?s:i;var n="string"==typeof t||null===t,o={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s};return o.element.toggleClass(this._classes(o),s),this},_on:function(e,i,s){var n,o=this;"boolean"!=typeof e&&(s=i,i=e,e=!1),s?(i=n=t(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),t.each(s,function(s,a){function r(){return e||o.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof a?o[a]:a).apply(o,arguments):void 0}"string"!=typeof a&&(r.guid=a.guid=a.guid||r.guid||t.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+o.eventNamespace,c=h[2];c?n.on(l,c,r):i.on(l,r)})},_off:function(e,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.off(i).off(i),this.bindings=t(this.bindings.not(e).get()),this.focusable=t(this.focusable.not(e).get()),this.hoverable=t(this.hoverable.not(e).get())},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){this._addClass(t(e.currentTarget),null,"ui-state-hover")},mouseleave:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){this._addClass(t(e.currentTarget),null,"ui-state-focus")},focusout:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}}),t.widget,function(){function e(t,e,i){return[parseFloat(t[0])*(u.test(t[0])?e/100:1),parseFloat(t[1])*(u.test(t[1])?i/100:1)]}function i(e,i){return parseInt(t.css(e,i),10)||0}function s(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}var n,o=Math.max,a=Math.abs,r=/left|center|right/,h=/top|center|bottom/,l=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,u=/%$/,d=t.fn.position;t.position={scrollbarWidth:function(){if(void 0!==n)return n;var e,i,s=t("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),o=s.children()[0];return t("body").append(s),e=o.offsetWidth,s.css("overflow","scroll"),i=o.offsetWidth,e===i&&(i=s[0].clientWidth),s.remove(),n=e-i},getScrollInfo:function(e){var i=e.isWindow||e.isDocument?"":e.element.css("overflow-x"),s=e.isWindow||e.isDocument?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.width<e.element[0].scrollWidth,o="scroll"===s||"auto"===s&&e.height<e.element[0].scrollHeight;return{width:o?t.position.scrollbarWidth():0,height:n?t.position.scrollbarWidth():0}},getWithinInfo:function(e){var i=t(e||window),s=t.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType,o=!s&&!n;return{element:i,isWindow:s,isDocument:n,offset:o?t(e).offset():{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:i.outerWidth(),height:i.outerHeight()}}},t.fn.position=function(n){if(!n||!n.of)return d.apply(this,arguments);n=t.extend({},n);var u,p,f,g,m,_,v=t(n.of),b=t.position.getWithinInfo(n.within),y=t.position.getScrollInfo(b),w=(n.collision||"flip").split(" "),k={};return _=s(v),v[0].preventDefault&&(n.at="left top"),p=_.width,f=_.height,g=_.offset,m=t.extend({},g),t.each(["my","at"],function(){var t,e,i=(n[this]||"").split(" ");1===i.length&&(i=r.test(i[0])?i.concat(["center"]):h.test(i[0])?["center"].concat(i):["center","center"]),i[0]=r.test(i[0])?i[0]:"center",i[1]=h.test(i[1])?i[1]:"center",t=l.exec(i[0]),e=l.exec(i[1]),k[this]=[t?t[0]:0,e?e[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===w.length&&(w[1]=w[0]),"right"===n.at[0]?m.left+=p:"center"===n.at[0]&&(m.left+=p/2),"bottom"===n.at[1]?m.top+=f:"center"===n.at[1]&&(m.top+=f/2),u=e(k.at,p,f),m.left+=u[0],m.top+=u[1],this.each(function(){var s,r,h=t(this),l=h.outerWidth(),c=h.outerHeight(),d=i(this,"marginLeft"),_=i(this,"marginTop"),x=l+d+i(this,"marginRight")+y.width,C=c+_+i(this,"marginBottom")+y.height,D=t.extend({},m),I=e(k.my,h.outerWidth(),h.outerHeight());"right"===n.my[0]?D.left-=l:"center"===n.my[0]&&(D.left-=l/2),"bottom"===n.my[1]?D.top-=c:"center"===n.my[1]&&(D.top-=c/2),D.left+=I[0],D.top+=I[1],s={marginLeft:d,marginTop:_},t.each(["left","top"],function(e,i){t.ui.position[w[e]]&&t.ui.position[w[e]][i](D,{targetWidth:p,targetHeight:f,elemWidth:l,elemHeight:c,collisionPosition:s,collisionWidth:x,collisionHeight:C,offset:[u[0]+I[0],u[1]+I[1]],my:n.my,at:n.at,within:b,elem:h})}),n.using&&(r=function(t){var e=g.left-D.left,i=e+p-l,s=g.top-D.top,r=s+f-c,u={target:{element:v,left:g.left,top:g.top,width:p,height:f},element:{element:h,left:D.left,top:D.top,width:l,height:c},horizontal:0>i?"left":e>0?"right":"center",vertical:0>r?"top":s>0?"bottom":"middle"};l>p&&p>a(e+i)&&(u.horizontal="center"),c>f&&f>a(s+r)&&(u.vertical="middle"),u.important=o(a(e),a(i))>o(a(s),a(r))?"horizontal":"vertical",n.using.call(this,t,u)}),h.offset(t.extend(D,{using:r}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=t.left-e.collisionPosition.marginLeft,h=n-r,l=r+e.collisionWidth-a-n;e.collisionWidth>a?h>0&&0>=l?(i=t.left+h+e.collisionWidth-a-n,t.left+=h-i):t.left=l>0&&0>=h?n:h>l?n+a-e.collisionWidth:n:h>0?t.left+=h:l>0?t.left-=l:t.left=o(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,a=e.within.height,r=t.top-e.collisionPosition.marginTop,h=n-r,l=r+e.collisionHeight-a-n;e.collisionHeight>a?h>0&&0>=l?(i=t.top+h+e.collisionHeight-a-n,t.top+=h-i):t.top=l>0&&0>=h?n:h>l?n+a-e.collisionHeight:n:h>0?t.top+=h:l>0?t.top-=l:t.top=o(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,r=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=t.left-e.collisionPosition.marginLeft,c=l-h,u=l+e.collisionWidth-r-h,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-r-o,(0>i||a(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-h,(s>0||u>a(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,r=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=t.top-e.collisionPosition.marginTop,c=l-h,u=l+e.collisionHeight-r-h,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-r-o,(0>s||a(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-h,(i>0||u>a(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}}}(),t.ui.position,t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])}}),t.fn.extend({disableSelection:function(){var t="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.on(t+".ui-disableSelection",function(t){t.preventDefault()})}}(),enableSelection:function(){return this.off(".ui-disableSelection")}});var c="ui-effects-",u="ui-effects-style",d="ui-effects-animated",p=t;t.effects={effect:{}},function(t,e){function i(t,e,i){var s=u[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:0>t?0:t>s.max?s.max:t)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(t,o){var a,r=o.re.exec(i),h=r&&o.parse(r),l=o.space||"rgba";return h?(a=s[l](h),s[c[l].cache]=a[c[l].cache],n=s._rgba=a._rgba,!1):e}),n.length?("0,0,0,0"===n.join()&&t.extend(n,o.transparent),s):o[i]}function n(t,e,i){return i=(i+1)%1,1>6*i?t+6*(e-t)*i:1>2*i?e:2>3*i?t+6*(e-t)*(2/3-i):t}var o,a="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[t[1],t[2],t[3],t[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[2.55*t[1],2.55*t[2],2.55*t[3],t[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(t){return[parseInt(t[1],16),parseInt(t[2],16),parseInt(t[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(t){return[parseInt(t[1]+t[1],16),parseInt(t[2]+t[2],16),parseInt(t[3]+t[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(t){return[t[1],t[2]/100,t[3]/100,t[4]]}}],l=t.Color=function(e,i,s,n){return new t.Color.fn.parse(e,i,s,n)},c={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},u={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},d=l.support={},p=t("<p>")[0],f=t.each;p.style.cssText="background-color:rgba(1,1,1,.5)",d.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(c,function(t,e){e.cache="_"+t,e.props.alpha={idx:3,type:"percent",def:1}}),l.fn=t.extend(l.prototype,{parse:function(n,a,r,h){if(n===e)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=t(n).css(a),a=e);var u=this,d=t.type(n),p=this._rgba=[];return a!==e&&(n=[n,a,r,h],d="array"),"string"===d?this.parse(s(n)||o._default):"array"===d?(f(c.rgba.props,function(t,e){p[e.idx]=i(n[e.idx],e)}),this):"object"===d?(n instanceof l?f(c,function(t,e){n[e.cache]&&(u[e.cache]=n[e.cache].slice())}):f(c,function(e,s){var o=s.cache;f(s.props,function(t,e){if(!u[o]&&s.to){if("alpha"===t||null==n[t])return;u[o]=s.to(u._rgba)}u[o][e.idx]=i(n[t],e,!0)}),u[o]&&0>t.inArray(null,u[o].slice(0,3))&&(u[o][3]=1,s.from&&(u._rgba=s.from(u[o])))}),this):e},is:function(t){var i=l(t),s=!0,n=this;return f(c,function(t,o){var a,r=i[o.cache];return r&&(a=n[o.cache]||o.to&&o.to(n._rgba)||[],f(o.props,function(t,i){return null!=r[i.idx]?s=r[i.idx]===a[i.idx]:e})),s}),s},_space:function(){var t=[],e=this;return f(c,function(i,s){e[s.cache]&&t.push(i)}),t.pop()},transition:function(t,e){var s=l(t),n=s._space(),o=c[n],a=0===this.alpha()?l("transparent"):this,r=a[o.cache]||o.to(a._rgba),h=r.slice();return s=s[o.cache],f(o.props,function(t,n){var o=n.idx,a=r[o],l=s[o],c=u[n.type]||{};null!==l&&(null===a?h[o]=l:(c.mod&&(l-a>c.mod/2?a+=c.mod:a-l>c.mod/2&&(a-=c.mod)),h[o]=i((l-a)*e+a,n)))}),this[n](h)},blend:function(e){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(e)._rgba;return l(t.map(i,function(t,e){return(1-s)*n[e]+s*t}))},toRgbaString:function(){var e="rgba(",i=t.map(this._rgba,function(t,e){return null==t?e>2?1:0:t});return 1===i[3]&&(i.pop(),e="rgb("),e+i.join()+")"},toHslaString:function(){var e="hsla(",i=t.map(this.hsla(),function(t,e){return null==t&&(t=e>2?1:0),e&&3>e&&(t=Math.round(100*t)+"%"),t});return 1===i[3]&&(i.pop(),e="hsl("),e+i.join()+")"},toHexString:function(e){var i=this._rgba.slice(),s=i.pop();return e&&i.push(~~(255*s)),"#"+t.map(i,function(t){return t=(t||0).toString(16),1===t.length?"0"+t:t}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,c.hsla.to=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e,i,s=t[0]/255,n=t[1]/255,o=t[2]/255,a=t[3],r=Math.max(s,n,o),h=Math.min(s,n,o),l=r-h,c=r+h,u=.5*c;return e=h===r?0:s===r?60*(n-o)/l+360:n===r?60*(o-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=u?l/c:l/(2-c),[Math.round(e)%360,i,u,null==a?1:a]},c.hsla.from=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e=t[0]/360,i=t[1],s=t[2],o=t[3],a=.5>=s?s*(1+i):s+i-s*i,r=2*s-a;return[Math.round(255*n(r,a,e+1/3)),Math.round(255*n(r,a,e)),Math.round(255*n(r,a,e-1/3)),o]},f(c,function(s,n){var o=n.props,a=n.cache,h=n.to,c=n.from;l.fn[s]=function(s){if(h&&!this[a]&&(this[a]=h(this._rgba)),s===e)return this[a].slice();var n,r=t.type(s),u="array"===r||"object"===r?s:arguments,d=this[a].slice();return f(o,function(t,e){var s=u["object"===r?t:e.idx];null==s&&(s=d[e.idx]),d[e.idx]=i(s,e)}),c?(n=l(c(d)),n[a]=d,n):l(d)},f(o,function(e,i){l.fn[e]||(l.fn[e]=function(n){var o,a=t.type(n),h="alpha"===e?this._hsla?"hsla":"rgba":s,l=this[h](),c=l[i.idx];return"undefined"===a?c:("function"===a&&(n=n.call(this,c),a=t.type(n)),null==n&&i.empty?this:("string"===a&&(o=r.exec(n),o&&(n=c+parseFloat(o[2])*("+"===o[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(e){var i=e.split(" ");f(i,function(e,i){t.cssHooks[i]={set:function(e,n){var o,a,r="";if("transparent"!==n&&("string"!==t.type(n)||(o=s(n)))){if(n=l(o||n),!d.rgba&&1!==n._rgba[3]){for(a="backgroundColor"===i?e.parentNode:e;(""===r||"transparent"===r)&&a&&a.style;)try{r=t.css(a,"backgroundColor"),a=a.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{e.style[i]=n}catch(h){}}},t.fx.step[i]=function(e){e.colorInit||(e.start=l(e.elem,i),e.end=l(e.end),e.colorInit=!0),t.cssHooks[i].set(e.elem,e.start.transition(e.end,e.pos))}})},l.hook(a),t.cssHooks.borderColor={expand:function(t){var e={};return f(["Top","Right","Bottom","Left"],function(i,s){e["border"+s+"Color"]=t}),e}},o=t.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(p),function(){function e(e){var i,s,n=e.ownerDocument.defaultView?e.ownerDocument.defaultView.getComputedStyle(e,null):e.currentStyle,o={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(o[t.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(o[i]=n[i]);return o}function i(e,i){var s,o,a={};for(s in i)o=i[s],e[s]!==o&&(n[s]||(t.fx.step[s]||!isNaN(parseFloat(o)))&&(a[s]=o));return a}var s=["add","remove","toggle"],n={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};t.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(e,i){t.fx.step[i]=function(t){("none"!==t.end&&!t.setAttr||1===t.pos&&!t.setAttr)&&(p.style(t.elem,i,t.end),t.setAttr=!0)}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.effects.animateClass=function(n,o,a,r){var h=t.speed(o,a,r);return this.queue(function(){var o,a=t(this),r=a.attr("class")||"",l=h.children?a.find("*").addBack():a;l=l.map(function(){var i=t(this);return{el:i,start:e(this)}}),o=function(){t.each(s,function(t,e){n[e]&&a[e+"Class"](n[e])})},o(),l=l.map(function(){return this.end=e(this.el[0]),this.diff=i(this.start,this.end),this}),a.attr("class",r),l=l.map(function(){var e=this,i=t.Deferred(),s=t.extend({},h,{queue:!1,complete:function(){i.resolve(e)}});return this.el.animate(this.diff,s),i.promise()}),t.when.apply(t,l.get()).done(function(){o(),t.each(arguments,function(){var e=this.el;t.each(this.diff,function(t){e.css(t,"")})}),h.complete.call(a[0])})})},t.fn.extend({addClass:function(e){return function(i,s,n,o){return s?t.effects.animateClass.call(this,{add:i},s,n,o):e.apply(this,arguments)}}(t.fn.addClass),removeClass:function(e){return function(i,s,n,o){return arguments.length>1?t.effects.animateClass.call(this,{remove:i},s,n,o):e.apply(this,arguments)}}(t.fn.removeClass),toggleClass:function(e){return function(i,s,n,o,a){return"boolean"==typeof s||void 0===s?n?t.effects.animateClass.call(this,s?{add:i}:{remove:i},n,o,a):e.apply(this,arguments):t.effects.animateClass.call(this,{toggle:i},s,n,o)}}(t.fn.toggleClass),switchClass:function(e,i,s,n,o){return t.effects.animateClass.call(this,{add:i,remove:e},s,n,o)}})}(),function(){function e(e,i,s,n){return t.isPlainObject(e)&&(i=e,e=e.effect),e={effect:e},null==i&&(i={}),t.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||t.fx.speeds[i])&&(n=s,s=i,i={}),t.isFunction(s)&&(n=s,s=null),i&&t.extend(e,i),s=s||i.duration,e.duration=t.fx.off?0:"number"==typeof s?s:s in t.fx.speeds?t.fx.speeds[s]:t.fx.speeds._default,e.complete=n||i.complete,e}function i(e){return!e||"number"==typeof e||t.fx.speeds[e]?!0:"string"!=typeof e||t.effects.effect[e]?t.isFunction(e)?!0:"object"!=typeof e||e.effect?!1:!0:!0}function s(t,e){var i=e.outerWidth(),s=e.outerHeight(),n=/^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/,o=n.exec(t)||["",0,i,s,0];return{top:parseFloat(o[1])||0,right:"auto"===o[2]?i:parseFloat(o[2]),bottom:"auto"===o[3]?s:parseFloat(o[3]),left:parseFloat(o[4])||0}}t.expr&&t.expr.filters&&t.expr.filters.animated&&(t.expr.filters.animated=function(e){return function(i){return!!t(i).data(d)||e(i)}}(t.expr.filters.animated)),t.uiBackCompat!==!1&&t.extend(t.effects,{save:function(t,e){for(var i=0,s=e.length;s>i;i++)null!==e[i]&&t.data(c+e[i],t[0].style[e[i]])},restore:function(t,e){for(var i,s=0,n=e.length;n>s;s++)null!==e[s]&&(i=t.data(c+e[s]),t.css(e[s],i))},setMode:function(t,e){return"toggle"===e&&(e=t.is(":hidden")?"show":"hide"),e},createWrapper:function(e){if(e.parent().is(".ui-effects-wrapper"))return e.parent();var i={width:e.outerWidth(!0),height:e.outerHeight(!0),"float":e.css("float")},s=t("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:e.width(),height:e.height()},o=document.activeElement;try{o.id}catch(a){o=document.body}return e.wrap(s),(e[0]===o||t.contains(e[0],o))&&t(o).trigger("focus"),s=e.parent(),"static"===e.css("position")?(s.css({position:"relative"}),e.css({position:"relative"})):(t.extend(i,{position:e.css("position"),zIndex:e.css("z-index")}),t.each(["top","left","bottom","right"],function(t,s){i[s]=e.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),e.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),e.css(n),s.css(i).show()},removeWrapper:function(e){var i=document.activeElement;return e.parent().is(".ui-effects-wrapper")&&(e.parent().replaceWith(e),(e[0]===i||t.contains(e[0],i))&&t(i).trigger("focus")),e}}),t.extend(t.effects,{version:"1.12.1",define:function(e,i,s){return s||(s=i,i="effect"),t.effects.effect[e]=s,t.effects.effect[e].mode=i,s},scaledDimensions:function(t,e,i){if(0===e)return{height:0,width:0,outerHeight:0,outerWidth:0};var s="horizontal"!==i?(e||100)/100:1,n="vertical"!==i?(e||100)/100:1;return{height:t.height()*n,width:t.width()*s,outerHeight:t.outerHeight()*n,outerWidth:t.outerWidth()*s}},clipToBox:function(t){return{width:t.clip.right-t.clip.left,height:t.clip.bottom-t.clip.top,left:t.clip.left,top:t.clip.top}},unshift:function(t,e,i){var s=t.queue();e>1&&s.splice.apply(s,[1,0].concat(s.splice(e,i))),t.dequeue()},saveStyle:function(t){t.data(u,t[0].style.cssText)},restoreStyle:function(t){t[0].style.cssText=t.data(u)||"",t.removeData(u)},mode:function(t,e){var i=t.is(":hidden");return"toggle"===e&&(e=i?"show":"hide"),(i?"hide"===e:"show"===e)&&(e="none"),e},getBaseline:function(t,e){var i,s;switch(t[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=t[0]/e.height}switch(t[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=t[1]/e.width}return{x:s,y:i}},createPlaceholder:function(e){var i,s=e.css("position"),n=e.position();return e.css({marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()),/^(static|relative)/.test(s)&&(s="absolute",i=t("<"+e[0].nodeName+">").insertAfter(e).css({display:/^(inline|ruby)/.test(e.css("display"))?"inline-block":"block",visibility:"hidden",marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight"),"float":e.css("float")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).addClass("ui-effects-placeholder"),e.data(c+"placeholder",i)),e.css({position:s,left:n.left,top:n.top}),i},removePlaceholder:function(t){var e=c+"placeholder",i=t.data(e);i&&(i.remove(),t.removeData(e))},cleanUp:function(e){t.effects.restoreStyle(e),t.effects.removePlaceholder(e)},setTransition:function(e,i,s,n){return n=n||{},t.each(i,function(t,i){var o=e.cssUnit(i);o[0]>0&&(n[i]=o[0]*s+o[1])}),n}}),t.fn.extend({effect:function(){function i(e){function i(){r.removeData(d),t.effects.cleanUp(r),"hide"===s.mode&&r.hide(),a()}function a(){t.isFunction(h)&&h.call(r[0]),t.isFunction(e)&&e()}var r=t(this);s.mode=c.shift(),t.uiBackCompat===!1||o?"none"===s.mode?(r[l](),a()):n.call(r[0],s,i):(r.is(":hidden")?"hide"===l:"show"===l)?(r[l](),a()):n.call(r[0],s,a)}var s=e.apply(this,arguments),n=t.effects.effect[s.effect],o=n.mode,a=s.queue,r=a||"fx",h=s.complete,l=s.mode,c=[],u=function(e){var i=t(this),s=t.effects.mode(i,l)||o;i.data(d,!0),c.push(s),o&&("show"===s||s===o&&"hide"===s)&&i.show(),o&&"none"===s||t.effects.saveStyle(i),t.isFunction(e)&&e()};return t.fx.off||!n?l?this[l](s.duration,h):this.each(function(){h&&h.call(this)}):a===!1?this.each(u).each(i):this.queue(r,u).queue(r,i)},show:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="show",this.effect.call(this,n)
-}}(t.fn.show),hide:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="hide",this.effect.call(this,n)}}(t.fn.hide),toggle:function(t){return function(s){if(i(s)||"boolean"==typeof s)return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)}}(t.fn.toggle),cssUnit:function(e){var i=this.css(e),s=[];return t.each(["em","px","%","pt"],function(t,e){i.indexOf(e)>0&&(s=[parseFloat(i),e])}),s},cssClip:function(t){return t?this.css("clip","rect("+t.top+"px "+t.right+"px "+t.bottom+"px "+t.left+"px)"):s(this.css("clip"),this)},transfer:function(e,i){var s=t(this),n=t(e.to),o="fixed"===n.css("position"),a=t("body"),r=o?a.scrollTop():0,h=o?a.scrollLeft():0,l=n.offset(),c={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},u=s.offset(),d=t("<div class='ui-effects-transfer'></div>").appendTo("body").addClass(e.className).css({top:u.top-r,left:u.left-h,height:s.innerHeight(),width:s.innerWidth(),position:o?"fixed":"absolute"}).animate(c,e.duration,e.easing,function(){d.remove(),t.isFunction(i)&&i()})}}),t.fx.step.clip=function(e){e.clipInit||(e.start=t(e.elem).cssClip(),"string"==typeof e.end&&(e.end=s(e.end,e.elem)),e.clipInit=!0),t(e.elem).cssClip({top:e.pos*(e.end.top-e.start.top)+e.start.top,right:e.pos*(e.end.right-e.start.right)+e.start.right,bottom:e.pos*(e.end.bottom-e.start.bottom)+e.start.bottom,left:e.pos*(e.end.left-e.start.left)+e.start.left})}}(),function(){var e={};t.each(["Quad","Cubic","Quart","Quint","Expo"],function(t,i){e[i]=function(e){return Math.pow(e,t+2)}}),t.extend(e,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;((e=Math.pow(2,--i))-1)/11>t;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),t.each(e,function(e,i){t.easing["easeIn"+e]=i,t.easing["easeOut"+e]=function(t){return 1-i(1-t)},t.easing["easeInOut"+e]=function(t){return.5>t?i(2*t)/2:1-i(-2*t+2)/2}})}();var f=t.effects;t.effects.define("blind","hide",function(e,i){var s={up:["bottom","top"],vertical:["bottom","top"],down:["top","bottom"],left:["right","left"],horizontal:["right","left"],right:["left","right"]},n=t(this),o=e.direction||"up",a=n.cssClip(),r={clip:t.extend({},a)},h=t.effects.createPlaceholder(n);r.clip[s[o][0]]=r.clip[s[o][1]],"show"===e.mode&&(n.cssClip(r.clip),h&&h.css(t.effects.clipToBox(r)),r.clip=a),h&&h.animate(t.effects.clipToBox(r),e.duration,e.easing),n.animate(r,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("bounce",function(e,i){var s,n,o,a=t(this),r=e.mode,h="hide"===r,l="show"===r,c=e.direction||"up",u=e.distance,d=e.times||5,p=2*d+(l||h?1:0),f=e.duration/p,g=e.easing,m="up"===c||"down"===c?"top":"left",_="up"===c||"left"===c,v=0,b=a.queue().length;for(t.effects.createPlaceholder(a),o=a.css(m),u||(u=a["top"===m?"outerHeight":"outerWidth"]()/3),l&&(n={opacity:1},n[m]=o,a.css("opacity",0).css(m,_?2*-u:2*u).animate(n,f,g)),h&&(u/=Math.pow(2,d-1)),n={},n[m]=o;d>v;v++)s={},s[m]=(_?"-=":"+=")+u,a.animate(s,f,g).animate(n,f,g),u=h?2*u:u/2;h&&(s={opacity:0},s[m]=(_?"-=":"+=")+u,a.animate(s,f,g)),a.queue(i),t.effects.unshift(a,b,p+1)}),t.effects.define("clip","hide",function(e,i){var s,n={},o=t(this),a=e.direction||"vertical",r="both"===a,h=r||"horizontal"===a,l=r||"vertical"===a;s=o.cssClip(),n.clip={top:l?(s.bottom-s.top)/2:s.top,right:h?(s.right-s.left)/2:s.right,bottom:l?(s.bottom-s.top)/2:s.bottom,left:h?(s.right-s.left)/2:s.left},t.effects.createPlaceholder(o),"show"===e.mode&&(o.cssClip(n.clip),n.clip=s),o.animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("drop","hide",function(e,i){var s,n=t(this),o=e.mode,a="show"===o,r=e.direction||"left",h="up"===r||"down"===r?"top":"left",l="up"===r||"left"===r?"-=":"+=",c="+="===l?"-=":"+=",u={opacity:0};t.effects.createPlaceholder(n),s=e.distance||n["top"===h?"outerHeight":"outerWidth"](!0)/2,u[h]=l+s,a&&(n.css(u),u[h]=c+s,u.opacity=1),n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("explode","hide",function(e,i){function s(){b.push(this),b.length===u*d&&n()}function n(){p.css({visibility:"visible"}),t(b).remove(),i()}var o,a,r,h,l,c,u=e.pieces?Math.round(Math.sqrt(e.pieces)):3,d=u,p=t(this),f=e.mode,g="show"===f,m=p.show().css("visibility","hidden").offset(),_=Math.ceil(p.outerWidth()/d),v=Math.ceil(p.outerHeight()/u),b=[];for(o=0;u>o;o++)for(h=m.top+o*v,c=o-(u-1)/2,a=0;d>a;a++)r=m.left+a*_,l=a-(d-1)/2,p.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-a*_,top:-o*v}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:_,height:v,left:r+(g?l*_:0),top:h+(g?c*v:0),opacity:g?0:1}).animate({left:r+(g?0:l*_),top:h+(g?0:c*v),opacity:g?1:0},e.duration||500,e.easing,s)}),t.effects.define("fade","toggle",function(e,i){var s="show"===e.mode;t(this).css("opacity",s?0:1).animate({opacity:s?1:0},{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("fold","hide",function(e,i){var s=t(this),n=e.mode,o="show"===n,a="hide"===n,r=e.size||15,h=/([0-9]+)%/.exec(r),l=!!e.horizFirst,c=l?["right","bottom"]:["bottom","right"],u=e.duration/2,d=t.effects.createPlaceholder(s),p=s.cssClip(),f={clip:t.extend({},p)},g={clip:t.extend({},p)},m=[p[c[0]],p[c[1]]],_=s.queue().length;h&&(r=parseInt(h[1],10)/100*m[a?0:1]),f.clip[c[0]]=r,g.clip[c[0]]=r,g.clip[c[1]]=0,o&&(s.cssClip(g.clip),d&&d.css(t.effects.clipToBox(g)),g.clip=p),s.queue(function(i){d&&d.animate(t.effects.clipToBox(f),u,e.easing).animate(t.effects.clipToBox(g),u,e.easing),i()}).animate(f,u,e.easing).animate(g,u,e.easing).queue(i),t.effects.unshift(s,_,4)}),t.effects.define("highlight","show",function(e,i){var s=t(this),n={backgroundColor:s.css("backgroundColor")};"hide"===e.mode&&(n.opacity=0),t.effects.saveStyle(s),s.css({backgroundImage:"none",backgroundColor:e.color||"#ffff99"}).animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("size",function(e,i){var s,n,o,a=t(this),r=["fontSize"],h=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],l=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],c=e.mode,u="effect"!==c,d=e.scale||"both",p=e.origin||["middle","center"],f=a.css("position"),g=a.position(),m=t.effects.scaledDimensions(a),_=e.from||m,v=e.to||t.effects.scaledDimensions(a,0);t.effects.createPlaceholder(a),"show"===c&&(o=_,_=v,v=o),n={from:{y:_.height/m.height,x:_.width/m.width},to:{y:v.height/m.height,x:v.width/m.width}},("box"===d||"both"===d)&&(n.from.y!==n.to.y&&(_=t.effects.setTransition(a,h,n.from.y,_),v=t.effects.setTransition(a,h,n.to.y,v)),n.from.x!==n.to.x&&(_=t.effects.setTransition(a,l,n.from.x,_),v=t.effects.setTransition(a,l,n.to.x,v))),("content"===d||"both"===d)&&n.from.y!==n.to.y&&(_=t.effects.setTransition(a,r,n.from.y,_),v=t.effects.setTransition(a,r,n.to.y,v)),p&&(s=t.effects.getBaseline(p,m),_.top=(m.outerHeight-_.outerHeight)*s.y+g.top,_.left=(m.outerWidth-_.outerWidth)*s.x+g.left,v.top=(m.outerHeight-v.outerHeight)*s.y+g.top,v.left=(m.outerWidth-v.outerWidth)*s.x+g.left),a.css(_),("content"===d||"both"===d)&&(h=h.concat(["marginTop","marginBottom"]).concat(r),l=l.concat(["marginLeft","marginRight"]),a.find("*[width]").each(function(){var i=t(this),s=t.effects.scaledDimensions(i),o={height:s.height*n.from.y,width:s.width*n.from.x,outerHeight:s.outerHeight*n.from.y,outerWidth:s.outerWidth*n.from.x},a={height:s.height*n.to.y,width:s.width*n.to.x,outerHeight:s.height*n.to.y,outerWidth:s.width*n.to.x};n.from.y!==n.to.y&&(o=t.effects.setTransition(i,h,n.from.y,o),a=t.effects.setTransition(i,h,n.to.y,a)),n.from.x!==n.to.x&&(o=t.effects.setTransition(i,l,n.from.x,o),a=t.effects.setTransition(i,l,n.to.x,a)),u&&t.effects.saveStyle(i),i.css(o),i.animate(a,e.duration,e.easing,function(){u&&t.effects.restoreStyle(i)})})),a.animate(v,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){var e=a.offset();0===v.opacity&&a.css("opacity",_.opacity),u||(a.css("position","static"===f?"relative":f).offset(e),t.effects.saveStyle(a)),i()}})}),t.effects.define("scale",function(e,i){var s=t(this),n=e.mode,o=parseInt(e.percent,10)||(0===parseInt(e.percent,10)?0:"effect"!==n?0:100),a=t.extend(!0,{from:t.effects.scaledDimensions(s),to:t.effects.scaledDimensions(s,o,e.direction||"both"),origin:e.origin||["middle","center"]},e);e.fade&&(a.from.opacity=1,a.to.opacity=0),t.effects.effect.size.call(this,a,i)}),t.effects.define("puff","hide",function(e,i){var s=t.extend(!0,{},e,{fade:!0,percent:parseInt(e.percent,10)||150});t.effects.effect.scale.call(this,s,i)}),t.effects.define("pulsate","show",function(e,i){var s=t(this),n=e.mode,o="show"===n,a="hide"===n,r=o||a,h=2*(e.times||5)+(r?1:0),l=e.duration/h,c=0,u=1,d=s.queue().length;for((o||!s.is(":visible"))&&(s.css("opacity",0).show(),c=1);h>u;u++)s.animate({opacity:c},l,e.easing),c=1-c;s.animate({opacity:c},l,e.easing),s.queue(i),t.effects.unshift(s,d,h+1)}),t.effects.define("shake",function(e,i){var s=1,n=t(this),o=e.direction||"left",a=e.distance||20,r=e.times||3,h=2*r+1,l=Math.round(e.duration/h),c="up"===o||"down"===o?"top":"left",u="up"===o||"left"===o,d={},p={},f={},g=n.queue().length;for(t.effects.createPlaceholder(n),d[c]=(u?"-=":"+=")+a,p[c]=(u?"+=":"-=")+2*a,f[c]=(u?"-=":"+=")+2*a,n.animate(d,l,e.easing);r>s;s++)n.animate(p,l,e.easing).animate(f,l,e.easing);n.animate(p,l,e.easing).animate(d,l/2,e.easing).queue(i),t.effects.unshift(n,g,h+1)}),t.effects.define("slide","show",function(e,i){var s,n,o=t(this),a={up:["bottom","top"],down:["top","bottom"],left:["right","left"],right:["left","right"]},r=e.mode,h=e.direction||"left",l="up"===h||"down"===h?"top":"left",c="up"===h||"left"===h,u=e.distance||o["top"===l?"outerHeight":"outerWidth"](!0),d={};t.effects.createPlaceholder(o),s=o.cssClip(),n=o.position()[l],d[l]=(c?-1:1)*u+n,d.clip=o.cssClip(),d.clip[a[h][1]]=d.clip[a[h][0]],"show"===r&&(o.cssClip(d.clip),o.css(l,d[l]),d.clip=s,d[l]=n),o.animate(d,{queue:!1,duration:e.duration,easing:e.easing,complete:i})});var f;t.uiBackCompat!==!1&&(f=t.effects.define("transfer",function(e,i){t(this).transfer(e,i)})),t.ui.focusable=function(i,s){var n,o,a,r,h,l=i.nodeName.toLowerCase();return"area"===l?(n=i.parentNode,o=n.name,i.href&&o&&"map"===n.nodeName.toLowerCase()?(a=t("img[usemap='#"+o+"']"),a.length>0&&a.is(":visible")):!1):(/^(input|select|textarea|button|object)$/.test(l)?(r=!i.disabled,r&&(h=t(i).closest("fieldset")[0],h&&(r=!h.disabled))):r="a"===l?i.href||s:s,r&&t(i).is(":visible")&&e(t(i)))},t.extend(t.expr[":"],{focusable:function(e){return t.ui.focusable(e,null!=t.attr(e,"tabindex"))}}),t.ui.focusable,t.fn.form=function(){return"string"==typeof this[0].form?this.closest("form"):t(this[0].form)},t.ui.formResetMixin={_formResetHandler:function(){var e=t(this);setTimeout(function(){var i=e.data("ui-form-reset-instances");t.each(i,function(){this.refresh()})})},_bindFormResetHandler:function(){if(this.form=this.element.form(),this.form.length){var t=this.form.data("ui-form-reset-instances")||[];t.length||this.form.on("reset.ui-form-reset",this._formResetHandler),t.push(this),this.form.data("ui-form-reset-instances",t)}},_unbindFormResetHandler:function(){if(this.form.length){var e=this.form.data("ui-form-reset-instances");e.splice(t.inArray(this,e),1),e.length?this.form.data("ui-form-reset-instances",e):this.form.removeData("ui-form-reset-instances").off("reset.ui-form-reset")}}},"1.7"===t.fn.jquery.substring(0,3)&&(t.each(["Width","Height"],function(e,i){function s(e,i,s,o){return t.each(n,function(){i-=parseFloat(t.css(e,"padding"+this))||0,s&&(i-=parseFloat(t.css(e,"border"+this+"Width"))||0),o&&(i-=parseFloat(t.css(e,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],o=i.toLowerCase(),a={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+i]=function(e){return void 0===e?a["inner"+i].call(this):this.each(function(){t(this).css(o,s(this,e)+"px")})},t.fn["outer"+i]=function(e,n){return"number"!=typeof e?a["outer"+i].call(this,e):this.each(function(){t(this).css(o,s(this,e,!0,n)+"px")})}}),t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},t.ui.escapeSelector=function(){var t=/([!"#$%&'()*+,./:;<=>?@[\]^`{|}~])/g;return function(e){return e.replace(t,"\\$1")}}(),t.fn.labels=function(){var e,i,s,n,o;return this[0].labels&&this[0].labels.length?this.pushStack(this[0].labels):(n=this.eq(0).parents("label"),s=this.attr("id"),s&&(e=this.eq(0).parents().last(),o=e.add(e.length?e.siblings():this.siblings()),i="label[for='"+t.ui.escapeSelector(s)+"']",n=n.add(o.find(i).addBack(i))),this.pushStack(n))},t.fn.scrollParent=function(e){var i=this.css("position"),s="absolute"===i,n=e?/(auto|scroll|hidden)/:/(auto|scroll)/,o=this.parents().filter(function(){var e=t(this);return s&&"static"===e.css("position")?!1:n.test(e.css("overflow")+e.css("overflow-y")+e.css("overflow-x"))}).eq(0);return"fixed"!==i&&o.length?o:t(this[0].ownerDocument||document)},t.extend(t.expr[":"],{tabbable:function(e){var i=t.attr(e,"tabindex"),s=null!=i;return(!s||i>=0)&&t.ui.focusable(e,s)}}),t.fn.extend({uniqueId:function(){var t=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&t(this).removeAttr("id")})}}),t.widget("ui.accordion",{version:"1.12.1",options:{active:0,animate:{},classes:{"ui-accordion-header":"ui-corner-top","ui-accordion-header-collapsed":"ui-corner-all","ui-accordion-content":"ui-corner-bottom"},collapsible:!1,event:"click",header:"> li > :first-child, > :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var e=this.options;this.prevShow=this.prevHide=t(),this._addClass("ui-accordion","ui-widget ui-helper-reset"),this.element.attr("role","tablist"),e.collapsible||e.active!==!1&&null!=e.active||(e.active=0),this._processPanels(),0>e.active&&(e.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():t()}},_createIcons:function(){var e,i,s=this.options.icons;s&&(e=t("<span>"),this._addClass(e,"ui-accordion-header-icon","ui-icon "+s.header),e.prependTo(this.headers),i=this.active.children(".ui-accordion-header-icon"),this._removeClass(i,s.header)._addClass(i,null,s.activeHeader)._addClass(this.headers,"ui-accordion-icons"))},_destroyIcons:function(){this._removeClass(this.headers,"ui-accordion-icons"),this.headers.children(".ui-accordion-header-icon").remove()},_destroy:function(){var t;this.element.removeAttr("role"),this.headers.removeAttr("role aria-expanded aria-selected aria-controls tabIndex").removeUniqueId(),this._destroyIcons(),t=this.headers.next().css("display","").removeAttr("role aria-hidden aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&t.css("height","")},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):("event"===t&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(e)),this._super(t,e),"collapsible"!==t||e||this.options.active!==!1||this._activate(0),"icons"===t&&(this._destroyIcons(),e&&this._createIcons()),void 0)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t),this._toggleClass(this.headers.add(this.headers.next()),null,"ui-state-disabled",!!t)},_keydown:function(e){if(!e.altKey&&!e.ctrlKey){var i=t.ui.keyCode,s=this.headers.length,n=this.headers.index(e.target),o=!1;switch(e.keyCode){case i.RIGHT:case i.DOWN:o=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:o=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(e);break;case i.HOME:o=this.headers[0];break;case i.END:o=this.headers[s-1]}o&&(t(e.target).attr("tabIndex",-1),t(o).attr("tabIndex",0),t(o).trigger("focus"),e.preventDefault())}},_panelKeyDown:function(e){e.keyCode===t.ui.keyCode.UP&&e.ctrlKey&&t(e.currentTarget).prev().trigger("focus")},refresh:function(){var e=this.options;this._processPanels(),e.active===!1&&e.collapsible===!0||!this.headers.length?(e.active=!1,this.active=t()):e.active===!1?this._activate(0):this.active.length&&!t.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(e.active=!1,this.active=t()):this._activate(Math.max(0,e.active-1)):e.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var t=this.headers,e=this.panels;this.headers=this.element.find(this.options.header),this._addClass(this.headers,"ui-accordion-header ui-accordion-header-collapsed","ui-state-default"),this.panels=this.headers.next().filter(":not(.ui-accordion-content-active)").hide(),this._addClass(this.panels,"ui-accordion-content","ui-helper-reset ui-widget-content"),e&&(this._off(t.not(this.headers)),this._off(e.not(this.panels)))},_refresh:function(){var e,i=this.options,s=i.heightStyle,n=this.element.parent();this.active=this._findActive(i.active),this._addClass(this.active,"ui-accordion-header-active","ui-state-active")._removeClass(this.active,"ui-accordion-header-collapsed"),this._addClass(this.active.next(),"ui-accordion-content-active"),this.active.next().show(),this.headers.attr("role","tab").each(function(){var e=t(this),i=e.uniqueId().attr("id"),s=e.next(),n=s.uniqueId().attr("id");e.attr("aria-controls",n),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(i.event),"fill"===s?(e=n.height(),this.element.siblings(":visible").each(function(){var i=t(this),s=i.css("position");"absolute"!==s&&"fixed"!==s&&(e-=i.outerHeight(!0))}),this.headers.each(function(){e-=t(this).outerHeight(!0)}),this.headers.next().each(function(){t(this).height(Math.max(0,e-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===s&&(e=0,this.headers.next().each(function(){var i=t(this).is(":visible");i||t(this).show(),e=Math.max(e,t(this).css("height","").height()),i||t(this).hide()}).height(e))},_activate:function(e){var i=this._findActive(e)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return"number"==typeof e?this.headers.eq(e):t()},_setupEvents:function(e){var i={keydown:"_keydown"};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(e){var i,s,n=this.options,o=this.active,a=t(e.currentTarget),r=a[0]===o[0],h=r&&n.collapsible,l=h?t():a.next(),c=o.next(),u={oldHeader:o,oldPanel:c,newHeader:h?t():a,newPanel:l};e.preventDefault(),r&&!n.collapsible||this._trigger("beforeActivate",e,u)===!1||(n.active=h?!1:this.headers.index(a),this.active=r?t():a,this._toggle(u),this._removeClass(o,"ui-accordion-header-active","ui-state-active"),n.icons&&(i=o.children(".ui-accordion-header-icon"),this._removeClass(i,null,n.icons.activeHeader)._addClass(i,null,n.icons.header)),r||(this._removeClass(a,"ui-accordion-header-collapsed")._addClass(a,"ui-accordion-header-active","ui-state-active"),n.icons&&(s=a.children(".ui-accordion-header-icon"),this._removeClass(s,null,n.icons.header)._addClass(s,null,n.icons.activeHeader)),this._addClass(a.next(),"ui-accordion-content-active")))},_toggle:function(e){var i=e.newPanel,s=this.prevShow.length?this.prevShow:e.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,e):(s.hide(),i.show(),this._toggleComplete(e)),s.attr({"aria-hidden":"true"}),s.prev().attr({"aria-selected":"false","aria-expanded":"false"}),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===parseInt(t(this).attr("tabIndex"),10)}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(t,e,i){var s,n,o,a=this,r=0,h=t.css("box-sizing"),l=t.length&&(!e.length||t.index()<e.index()),c=this.options.animate||{},u=l&&c.down||c,d=function(){a._toggleComplete(i)};return"number"==typeof u&&(o=u),"string"==typeof u&&(n=u),n=n||u.easing||c.easing,o=o||u.duration||c.duration,e.length?t.length?(s=t.show().outerHeight(),e.animate(this.hideProps,{duration:o,easing:n,step:function(t,e){e.now=Math.round(t)}}),t.hide().animate(this.showProps,{duration:o,easing:n,complete:d,step:function(t,i){i.now=Math.round(t),"height"!==i.prop?"content-box"===h&&(r+=i.now):"content"!==a.options.heightStyle&&(i.now=Math.round(s-e.outerHeight()-r),r=0)}}),void 0):e.animate(this.hideProps,o,n,d):t.animate(this.showProps,o,n,d)},_toggleComplete:function(t){var e=t.oldPanel,i=e.prev();this._removeClass(e,"ui-accordion-content-active"),this._removeClass(i,"ui-accordion-header-active")._addClass(i,"ui-accordion-header-collapsed"),e.length&&(e.parent()[0].className=e.parent()[0].className),this._trigger("activate",null,t)}}),t.ui.safeActiveElement=function(t){var e;try{e=t.activeElement}catch(i){e=t.body}return e||(e=t.body),e.nodeName||(e=t.body),e},t.widget("ui.menu",{version:"1.12.1",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault()},"click .ui-menu-item":function(e){var i=t(e.target),s=t(t.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(e),e.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(e):!this.element.is(":focus")&&s.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(e){if(!this.previousFilter){var i=t(e.target).closest(".ui-menu-item"),s=t(e.currentTarget);i[0]===s[0]&&(this._removeClass(s.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(e,s))}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this.element.find(this.options.items).eq(0);e||this.focus(t,i)},blur:function(e){this._delay(function(){var i=!t.contains(this.element[0],t.ui.safeActiveElement(this.document[0]));i&&this.collapseAll(e)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t),this.mouseHandled=!1}})},_destroy:function(){var e=this.element.find(".ui-menu-item").removeAttr("role aria-disabled"),i=e.children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),i.children().each(function(){var e=t(this);e.data("ui-menu-submenu-caret")&&e.remove()})},_keydown:function(e){var i,s,n,o,a=!0;switch(e.keyCode){case t.ui.keyCode.PAGE_UP:this.previousPage(e);break;case t.ui.keyCode.PAGE_DOWN:this.nextPage(e);break;case t.ui.keyCode.HOME:this._move("first","first",e);break;case t.ui.keyCode.END:this._move("last","last",e);break;case t.ui.keyCode.UP:this.previous(e);break;case t.ui.keyCode.DOWN:this.next(e);break;case t.ui.keyCode.LEFT:this.collapse(e);break;case t.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(e);break;case t.ui.keyCode.ENTER:case t.ui.keyCode.SPACE:this._activate(e);break;case t.ui.keyCode.ESCAPE:this.collapse(e);break;default:a=!1,s=this.previousFilter||"",o=!1,n=e.keyCode>=96&&105>=e.keyCode?""+(e.keyCode-96):String.fromCharCode(e.keyCode),clearTimeout(this.filterTimer),n===s?o=!0:n=s+n,i=this._filterMenuItems(n),i=o&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(e.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(e,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}a&&e.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var e,i,s,n,o,a=this,r=this.options.icons.submenu,h=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),s=h.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var e=t(this),i=e.prev(),s=t("<span>").data("ui-menu-submenu-caret",!0);a._addClass(s,"ui-menu-icon","ui-icon "+r),i.attr("aria-haspopup","true").prepend(s),e.attr("aria-labelledby",i.attr("id"))}),this._addClass(s,"ui-menu","ui-widget ui-widget-content ui-front"),e=h.add(this.element),i=e.find(this.options.items),i.not(".ui-menu-item").each(function(){var e=t(this);a._isDivider(e)&&a._addClass(e,"ui-menu-divider","ui-widget-content")}),n=i.not(".ui-menu-item, .ui-menu-divider"),o=n.children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(n,"ui-menu-item")._addClass(o,"ui-menu-item-wrapper"),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!t.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){if("icons"===t){var i=this.element.find(".ui-menu-icon");this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)}this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t+""),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i,s,n;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),s=this.active.children(".ui-menu-item-wrapper"),this._addClass(s,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),n=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(n,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=e.children(".ui-menu"),i.length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(e){var i,s,n,o,a,r;this._hasScroll()&&(i=parseFloat(t.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(t.css(this.activeMenu[0],"paddingTop"))||0,n=e.offset().top-this.activeMenu.offset().top-i-s,o=this.activeMenu.scrollTop(),a=this.activeMenu.height(),r=e.outerHeight(),0>n?this.activeMenu.scrollTop(o+n):n+r>a&&this.activeMenu.scrollTop(o+n-a+r))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this._removeClass(this.active.children(".ui-menu-item-wrapper"),null,"ui-state-active"),this._trigger("blur",t,{item:this.active}),this.active=null)},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(e){var i=t.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(e.parents(".ui-menu")).hide().attr("aria-hidden","true"),e.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:t(e&&e.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(e),this._removeClass(s.find(".ui-state-active"),null,"ui-state-active"),this.activeMenu=s},this.delay)},_close:function(t){t||(t=this.active?this.active.parent():this.element),t.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false")},_closeOnDocumentClick:function(e){return!t(e.target).closest(".ui-menu").length},_isDivider:function(t){return!/[^\-\u2014\u2013\s]/.test(t.text())},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(t,e,i){var s;this.active&&(s="first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[t+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[e]()),this.focus(i,s)},nextPage:function(e){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=t(this),0>i.offset().top-s-n}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(e),void 0)},previousPage:function(e){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=t(this),i.offset().top-s+n>0}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items).first())),void 0):(this.next(e),void 0)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(e){this.active=this.active||t(e.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(e,!0),this._trigger("select",e,i)},_filterMenuItems:function(e){var i=e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),s=RegExp("^"+i,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return s.test(t.trim(t(this).children(".ui-menu-item-wrapper").text()))})}}),t.widget("ui.autocomplete",{version:"1.12.1",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var e,i,s,n=this.element[0].nodeName.toLowerCase(),o="textarea"===n,a="input"===n;
-this.isMultiLine=o||!a&&this._isContentEditable(this.element),this.valueMethod=this.element[o||a?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return e=!0,s=!0,i=!0,void 0;e=!1,s=!1,i=!1;var o=t.ui.keyCode;switch(n.keyCode){case o.PAGE_UP:e=!0,this._move("previousPage",n);break;case o.PAGE_DOWN:e=!0,this._move("nextPage",n);break;case o.UP:e=!0,this._keyEvent("previous",n);break;case o.DOWN:e=!0,this._keyEvent("next",n);break;case o.ENTER:this.menu.active&&(e=!0,n.preventDefault(),this.menu.select(n));break;case o.TAB:this.menu.active&&this.menu.select(n);break;case o.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(e)return e=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=t.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(t){return s?(s=!1,t.preventDefault(),void 0):(this._searchTimeout(t),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(t),this._change(t),void 0)}}),this._initSource(),this.menu=t("<ul>").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(e){e.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,this.element[0]!==t.ui.safeActiveElement(this.document[0])&&this.element.trigger("focus")})},menufocus:function(e,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,e.originalEvent&&/^mouse/.test(e.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){t(e.target).trigger(e.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",e,{item:n})&&e.originalEvent&&/^key/.test(e.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&t.trim(s).length&&(this.liveRegion.children().hide(),t("<div>").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,i){var s=i.item.data("ui-autocomplete-item"),n=this.previous;this.element[0]!==t.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=n,this._delay(function(){this.previous=n,this.selectedItem=s})),!1!==this._trigger("select",e,{item:s})&&this._value(s.value),this.term=this._value(),this.close(e),this.selectedItem=s}}),this.liveRegion=t("<div>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(e){var i=this.menu.element[0];return e.target===this.element[0]||e.target===i||t.contains(i,e.target)},_closeOnClickOutside:function(t){this._isEventTargetInWidget(t)||this.close()},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_initSource:function(){var e,i,s=this;t.isArray(this.options.source)?(e=this.options.source,this.source=function(i,s){s(t.ui.autocomplete.filter(e,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(e,n){s.xhr&&s.xhr.abort(),s.xhr=t.ajax({url:i,data:e,dataType:"json",success:function(t){n(t)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(t){clearTimeout(this.searching),this.searching=this._delay(function(){var e=this.term===this._value(),i=this.menu.element.is(":visible"),s=t.altKey||t.ctrlKey||t.metaKey||t.shiftKey;(!e||e&&!i&&!s)&&(this.selectedItem=null,this.search(null,t))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length<this.options.minLength?this.close(e):this._trigger("search",e)!==!1?this._search(t):void 0},_search:function(t){this.pending++,this._addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:t},this._response())},_response:function(){var e=++this.requestIndex;return t.proxy(function(t){e===this.requestIndex&&this.__response(t),this.pending--,this.pending||this._removeClass("ui-autocomplete-loading")},this)},__response:function(t){t&&(t=this._normalize(t)),this._trigger("response",null,{content:t}),!this.options.disabled&&t&&t.length&&!this.cancelSearch?(this._suggest(t),this._trigger("open")):this._close()},close:function(t){this.cancelSearch=!0,this._close(t)},_close:function(t){this._off(this.document,"mousedown"),this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",t))},_change:function(t){this.previous!==this._value()&&this._trigger("change",t,{item:this.selectedItem})},_normalize:function(e){return e.length&&e[0].label&&e[0].value?e:t.map(e,function(e){return"string"==typeof e?{label:e,value:e}:t.extend({},e,{label:e.label||e.value,value:e.value||e.label})})},_suggest:function(e){var i=this.menu.element.empty();this._renderMenu(i,e),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(t.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next(),this._on(this.document,{mousedown:"_closeOnClickOutside"})},_resizeMenu:function(){var t=this.menu.element;t.outerWidth(Math.max(t.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(e,i){var s=this;t.each(i,function(t,i){s._renderItemData(e,i)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-autocomplete-item",e)},_renderItem:function(e,i){return t("<li>").append(t("<div>").text(i.label)).appendTo(e)},_move:function(t,e){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[t](e),void 0):(this.search(null,e),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(t,e),e.preventDefault())},_isContentEditable:function(t){if(!t.length)return!1;var e=t.prop("contentEditable");return"inherit"===e?this._isContentEditable(t.parent()):"true"===e}}),t.extend(t.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(e,i){var s=RegExp(t.ui.autocomplete.escapeRegex(i),"i");return t.grep(e,function(t){return s.test(t.label||t.value||t)})}}),t.widget("ui.autocomplete",t.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(t>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(e){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=e&&e.length?this.options.messages.results(e.length):this.options.messages.noResults,this.liveRegion.children().hide(),t("<div>").text(i).appendTo(this.liveRegion))}}),t.ui.autocomplete;var g=/ui-corner-([a-z]){2,6}/g;t.widget("ui.controlgroup",{version:"1.12.1",defaultElement:"<div>",options:{direction:"horizontal",disabled:null,onlyVisible:!0,items:{button:"input[type=button], input[type=submit], input[type=reset], button, a",controlgroupLabel:".ui-controlgroup-label",checkboxradio:"input[type='checkbox'], input[type='radio']",selectmenu:"select",spinner:".ui-spinner-input"}},_create:function(){this._enhance()},_enhance:function(){this.element.attr("role","toolbar"),this.refresh()},_destroy:function(){this._callChildMethod("destroy"),this.childWidgets.removeData("ui-controlgroup-data"),this.element.removeAttr("role"),this.options.items.controlgroupLabel&&this.element.find(this.options.items.controlgroupLabel).find(".ui-controlgroup-label-contents").contents().unwrap()},_initWidgets:function(){var e=this,i=[];t.each(this.options.items,function(s,n){var o,a={};return n?"controlgroupLabel"===s?(o=e.element.find(n),o.each(function(){var e=t(this);e.children(".ui-controlgroup-label-contents").length||e.contents().wrapAll("<span class='ui-controlgroup-label-contents'></span>")}),e._addClass(o,null,"ui-widget ui-widget-content ui-state-default"),i=i.concat(o.get()),void 0):(t.fn[s]&&(a=e["_"+s+"Options"]?e["_"+s+"Options"]("middle"):{classes:{}},e.element.find(n).each(function(){var n=t(this),o=n[s]("instance"),r=t.widget.extend({},a);if("button"!==s||!n.parent(".ui-spinner").length){o||(o=n[s]()[s]("instance")),o&&(r.classes=e._resolveClassesValues(r.classes,o)),n[s](r);var h=n[s]("widget");t.data(h[0],"ui-controlgroup-data",o?o:n[s]("instance")),i.push(h[0])}})),void 0):void 0}),this.childWidgets=t(t.unique(i)),this._addClass(this.childWidgets,"ui-controlgroup-item")},_callChildMethod:function(e){this.childWidgets.each(function(){var i=t(this),s=i.data("ui-controlgroup-data");s&&s[e]&&s[e]()})},_updateCornerClass:function(t,e){var i="ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all",s=this._buildSimpleOptions(e,"label").classes.label;this._removeClass(t,null,i),this._addClass(t,null,s)},_buildSimpleOptions:function(t,e){var i="vertical"===this.options.direction,s={classes:{}};return s.classes[e]={middle:"",first:"ui-corner-"+(i?"top":"left"),last:"ui-corner-"+(i?"bottom":"right"),only:"ui-corner-all"}[t],s},_spinnerOptions:function(t){var e=this._buildSimpleOptions(t,"ui-spinner");return e.classes["ui-spinner-up"]="",e.classes["ui-spinner-down"]="",e},_buttonOptions:function(t){return this._buildSimpleOptions(t,"ui-button")},_checkboxradioOptions:function(t){return this._buildSimpleOptions(t,"ui-checkboxradio-label")},_selectmenuOptions:function(t){var e="vertical"===this.options.direction;return{width:e?"auto":!1,classes:{middle:{"ui-selectmenu-button-open":"","ui-selectmenu-button-closed":""},first:{"ui-selectmenu-button-open":"ui-corner-"+(e?"top":"tl"),"ui-selectmenu-button-closed":"ui-corner-"+(e?"top":"left")},last:{"ui-selectmenu-button-open":e?"":"ui-corner-tr","ui-selectmenu-button-closed":"ui-corner-"+(e?"bottom":"right")},only:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"}}[t]}},_resolveClassesValues:function(e,i){var s={};return t.each(e,function(n){var o=i.options.classes[n]||"";o=t.trim(o.replace(g,"")),s[n]=(o+" "+e[n]).replace(/\s+/g," ")}),s},_setOption:function(t,e){return"direction"===t&&this._removeClass("ui-controlgroup-"+this.options.direction),this._super(t,e),"disabled"===t?(this._callChildMethod(e?"disable":"enable"),void 0):(this.refresh(),void 0)},refresh:function(){var e,i=this;this._addClass("ui-controlgroup ui-controlgroup-"+this.options.direction),"horizontal"===this.options.direction&&this._addClass(null,"ui-helper-clearfix"),this._initWidgets(),e=this.childWidgets,this.options.onlyVisible&&(e=e.filter(":visible")),e.length&&(t.each(["first","last"],function(t,s){var n=e[s]().data("ui-controlgroup-data");if(n&&i["_"+n.widgetName+"Options"]){var o=i["_"+n.widgetName+"Options"](1===e.length?"only":s);o.classes=i._resolveClassesValues(o.classes,n),n.element[n.widgetName](o)}else i._updateCornerClass(e[s](),s)}),this._callChildMethod("refresh"))}}),t.widget("ui.checkboxradio",[t.ui.formResetMixin,{version:"1.12.1",options:{disabled:null,label:null,icon:!0,classes:{"ui-checkboxradio-label":"ui-corner-all","ui-checkboxradio-icon":"ui-corner-all"}},_getCreateOptions:function(){var e,i,s=this,n=this._super()||{};return this._readType(),i=this.element.labels(),this.label=t(i[i.length-1]),this.label.length||t.error("No label found for checkboxradio widget"),this.originalLabel="",this.label.contents().not(this.element[0]).each(function(){s.originalLabel+=3===this.nodeType?t(this).text():this.outerHTML}),this.originalLabel&&(n.label=this.originalLabel),e=this.element[0].disabled,null!=e&&(n.disabled=e),n},_create:function(){var t=this.element[0].checked;this._bindFormResetHandler(),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled),this._setOption("disabled",this.options.disabled),this._addClass("ui-checkboxradio","ui-helper-hidden-accessible"),this._addClass(this.label,"ui-checkboxradio-label","ui-button ui-widget"),"radio"===this.type&&this._addClass(this.label,"ui-checkboxradio-radio-label"),this.options.label&&this.options.label!==this.originalLabel?this._updateLabel():this.originalLabel&&(this.options.label=this.originalLabel),this._enhance(),t&&(this._addClass(this.label,"ui-checkboxradio-checked","ui-state-active"),this.icon&&this._addClass(this.icon,null,"ui-state-hover")),this._on({change:"_toggleClasses",focus:function(){this._addClass(this.label,null,"ui-state-focus ui-visual-focus")},blur:function(){this._removeClass(this.label,null,"ui-state-focus ui-visual-focus")}})},_readType:function(){var e=this.element[0].nodeName.toLowerCase();this.type=this.element[0].type,"input"===e&&/radio|checkbox/.test(this.type)||t.error("Can't create checkboxradio on element.nodeName="+e+" and element.type="+this.type)},_enhance:function(){this._updateIcon(this.element[0].checked)},widget:function(){return this.label},_getRadioGroup:function(){var e,i=this.element[0].name,s="input[name='"+t.ui.escapeSelector(i)+"']";return i?(e=this.form.length?t(this.form[0].elements).filter(s):t(s).filter(function(){return 0===t(this).form().length}),e.not(this.element)):t([])},_toggleClasses:function(){var e=this.element[0].checked;this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",e),this.options.icon&&"checkbox"===this.type&&this._toggleClass(this.icon,null,"ui-icon-check ui-state-checked",e)._toggleClass(this.icon,null,"ui-icon-blank",!e),"radio"===this.type&&this._getRadioGroup().each(function(){var e=t(this).checkboxradio("instance");e&&e._removeClass(e.label,"ui-checkboxradio-checked","ui-state-active")})},_destroy:function(){this._unbindFormResetHandler(),this.icon&&(this.icon.remove(),this.iconSpace.remove())},_setOption:function(t,e){return"label"!==t||e?(this._super(t,e),"disabled"===t?(this._toggleClass(this.label,null,"ui-state-disabled",e),this.element[0].disabled=e,void 0):(this.refresh(),void 0)):void 0},_updateIcon:function(e){var i="ui-icon ui-icon-background ";this.options.icon?(this.icon||(this.icon=t("<span>"),this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-checkboxradio-icon-space")),"checkbox"===this.type?(i+=e?"ui-icon-check ui-state-checked":"ui-icon-blank",this._removeClass(this.icon,null,e?"ui-icon-blank":"ui-icon-check")):i+="ui-icon-blank",this._addClass(this.icon,"ui-checkboxradio-icon",i),e||this._removeClass(this.icon,null,"ui-icon-check ui-state-checked"),this.icon.prependTo(this.label).after(this.iconSpace)):void 0!==this.icon&&(this.icon.remove(),this.iconSpace.remove(),delete this.icon)},_updateLabel:function(){var t=this.label.contents().not(this.element[0]);this.icon&&(t=t.not(this.icon[0])),this.iconSpace&&(t=t.not(this.iconSpace[0])),t.remove(),this.label.append(this.options.label)},refresh:function(){var t=this.element[0].checked,e=this.element[0].disabled;this._updateIcon(t),this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",t),null!==this.options.label&&this._updateLabel(),e!==this.options.disabled&&this._setOptions({disabled:e})}}]),t.ui.checkboxradio,t.widget("ui.button",{version:"1.12.1",defaultElement:"<button>",options:{classes:{"ui-button":"ui-corner-all"},disabled:null,icon:null,iconPosition:"beginning",label:null,showLabel:!0},_getCreateOptions:function(){var t,e=this._super()||{};return this.isInput=this.element.is("input"),t=this.element[0].disabled,null!=t&&(e.disabled=t),this.originalLabel=this.isInput?this.element.val():this.element.html(),this.originalLabel&&(e.label=this.originalLabel),e},_create:function(){!this.option.showLabel&!this.options.icon&&(this.options.showLabel=!0),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled||!1),this.hasTitle=!!this.element.attr("title"),this.options.label&&this.options.label!==this.originalLabel&&(this.isInput?this.element.val(this.options.label):this.element.html(this.options.label)),this._addClass("ui-button","ui-widget"),this._setOption("disabled",this.options.disabled),this._enhance(),this.element.is("a")&&this._on({keyup:function(e){e.keyCode===t.ui.keyCode.SPACE&&(e.preventDefault(),this.element[0].click?this.element[0].click():this.element.trigger("click"))}})},_enhance:function(){this.element.is("button")||this.element.attr("role","button"),this.options.icon&&(this._updateIcon("icon",this.options.icon),this._updateTooltip())},_updateTooltip:function(){this.title=this.element.attr("title"),this.options.showLabel||this.title||this.element.attr("title",this.options.label)},_updateIcon:function(e,i){var s="iconPosition"!==e,n=s?this.options.iconPosition:i,o="top"===n||"bottom"===n;this.icon?s&&this._removeClass(this.icon,null,this.options.icon):(this.icon=t("<span>"),this._addClass(this.icon,"ui-button-icon","ui-icon"),this.options.showLabel||this._addClass("ui-button-icon-only")),s&&this._addClass(this.icon,null,i),this._attachIcon(n),o?(this._addClass(this.icon,null,"ui-widget-icon-block"),this.iconSpace&&this.iconSpace.remove()):(this.iconSpace||(this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-button-icon-space")),this._removeClass(this.icon,null,"ui-wiget-icon-block"),this._attachIconSpace(n))},_destroy:function(){this.element.removeAttr("role"),this.icon&&this.icon.remove(),this.iconSpace&&this.iconSpace.remove(),this.hasTitle||this.element.removeAttr("title")},_attachIconSpace:function(t){this.icon[/^(?:end|bottom)/.test(t)?"before":"after"](this.iconSpace)},_attachIcon:function(t){this.element[/^(?:end|bottom)/.test(t)?"append":"prepend"](this.icon)},_setOptions:function(t){var e=void 0===t.showLabel?this.options.showLabel:t.showLabel,i=void 0===t.icon?this.options.icon:t.icon;e||i||(t.showLabel=!0),this._super(t)},_setOption:function(t,e){"icon"===t&&(e?this._updateIcon(t,e):this.icon&&(this.icon.remove(),this.iconSpace&&this.iconSpace.remove())),"iconPosition"===t&&this._updateIcon(t,e),"showLabel"===t&&(this._toggleClass("ui-button-icon-only",null,!e),this._updateTooltip()),"label"===t&&(this.isInput?this.element.val(e):(this.element.html(e),this.icon&&(this._attachIcon(this.options.iconPosition),this._attachIconSpace(this.options.iconPosition)))),this._super(t,e),"disabled"===t&&(this._toggleClass(null,"ui-state-disabled",e),this.element[0].disabled=e,e&&this.element.blur())},refresh:function(){var t=this.element.is("input, button")?this.element[0].disabled:this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOptions({disabled:t}),this._updateTooltip()}}),t.uiBackCompat!==!1&&(t.widget("ui.button",t.ui.button,{options:{text:!0,icons:{primary:null,secondary:null}},_create:function(){this.options.showLabel&&!this.options.text&&(this.options.showLabel=this.options.text),!this.options.showLabel&&this.options.text&&(this.options.text=this.options.showLabel),this.options.icon||!this.options.icons.primary&&!this.options.icons.secondary?this.options.icon&&(this.options.icons.primary=this.options.icon):this.options.icons.primary?this.options.icon=this.options.icons.primary:(this.options.icon=this.options.icons.secondary,this.options.iconPosition="end"),this._super()},_setOption:function(t,e){return"text"===t?(this._super("showLabel",e),void 0):("showLabel"===t&&(this.options.text=e),"icon"===t&&(this.options.icons.primary=e),"icons"===t&&(e.primary?(this._super("icon",e.primary),this._super("iconPosition","beginning")):e.secondary&&(this._super("icon",e.secondary),this._super("iconPosition","end"))),this._superApply(arguments),void 0)}}),t.fn.button=function(e){return function(){return!this.length||this.length&&"INPUT"!==this[0].tagName||this.length&&"INPUT"===this[0].tagName&&"checkbox"!==this.attr("type")&&"radio"!==this.attr("type")?e.apply(this,arguments):(t.ui.checkboxradio||t.error("Checkboxradio widget missing"),0===arguments.length?this.checkboxradio({icon:!1}):this.checkboxradio.apply(this,arguments))}}(t.fn.button),t.fn.buttonset=function(){return t.ui.controlgroup||t.error("Controlgroup widget missing"),"option"===arguments[0]&&"items"===arguments[1]&&arguments[2]?this.controlgroup.apply(this,[arguments[0],"items.button",arguments[2]]):"option"===arguments[0]&&"items"===arguments[1]?this.controlgroup.apply(this,[arguments[0],"items.button"]):("object"==typeof arguments[0]&&arguments[0].items&&(arguments[0].items={button:arguments[0].items}),this.controlgroup.apply(this,arguments))}),t.ui.button,t.extend(t.ui,{datepicker:{version:"1.12.1"}});var m;t.extend(s.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(t){return a(this._defaults,t||{}),this},_attachDatepicker:function(e,i){var s,n,o;s=e.nodeName.toLowerCase(),n="div"===s||"span"===s,e.id||(this.uuid+=1,e.id="dp"+this.uuid),o=this._newInst(t(e),n),o.settings=t.extend({},i||{}),"input"===s?this._connectDatepicker(e,o):n&&this._inlineDatepicker(e,o)},_newInst:function(e,i){var s=e[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:s,input:e,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:i,dpDiv:i?n(t("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(e,i){var s=t(e);i.append=t([]),i.trigger=t([]),s.hasClass(this.markerClassName)||(this._attachments(s,i),s.addClass(this.markerClassName).on("keydown",this._doKeyDown).on("keypress",this._doKeyPress).on("keyup",this._doKeyUp),this._autoSize(i),t.data(e,"datepicker",i),i.settings.disabled&&this._disableDatepicker(e))},_attachments:function(e,i){var s,n,o,a=this._get(i,"appendText"),r=this._get(i,"isRTL");i.append&&i.append.remove(),a&&(i.append=t("<span class='"+this._appendClass+"'>"+a+"</span>"),e[r?"before":"after"](i.append)),e.off("focus",this._showDatepicker),i.trigger&&i.trigger.remove(),s=this._get(i,"showOn"),("focus"===s||"both"===s)&&e.on("focus",this._showDatepicker),("button"===s||"both"===s)&&(n=this._get(i,"buttonText"),o=this._get(i,"buttonImage"),i.trigger=t(this._get(i,"buttonImageOnly")?t("<img/>").addClass(this._triggerClass).attr({src:o,alt:n,title:n}):t("<button type='button'></button>").addClass(this._triggerClass).html(o?t("<img/>").attr({src:o,alt:n,title:n}):n)),e[r?"before":"after"](i.trigger),i.trigger.on("click",function(){return t.datepicker._datepickerShowing&&t.datepicker._lastInput===e[0]?t.datepicker._hideDatepicker():t.datepicker._datepickerShowing&&t.datepicker._lastInput!==e[0]?(t.datepicker._hideDatepicker(),t.datepicker._showDatepicker(e[0])):t.datepicker._showDatepicker(e[0]),!1}))},_autoSize:function(t){if(this._get(t,"autoSize")&&!t.inline){var e,i,s,n,o=new Date(2009,11,20),a=this._get(t,"dateFormat");a.match(/[DM]/)&&(e=function(t){for(i=0,s=0,n=0;t.length>n;n++)t[n].length>i&&(i=t[n].length,s=n);return s},o.setMonth(e(this._get(t,a.match(/MM/)?"monthNames":"monthNamesShort"))),o.setDate(e(this._get(t,a.match(/DD/)?"dayNames":"dayNamesShort"))+20-o.getDay())),t.input.attr("size",this._formatDate(t,o).length)}},_inlineDatepicker:function(e,i){var s=t(e);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),t.data(e,"datepicker",i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(e),i.dpDiv.css("display","block"))},_dialogDatepicker:function(e,i,s,n,o){var r,h,l,c,u,d=this._dialogInst;return d||(this.uuid+=1,r="dp"+this.uuid,this._dialogInput=t("<input type='text' id='"+r+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.on("keydown",this._doKeyDown),t("body").append(this._dialogInput),d=this._dialogInst=this._newInst(this._dialogInput,!1),d.settings={},t.data(this._dialogInput[0],"datepicker",d)),a(d.settings,n||{}),i=i&&i.constructor===Date?this._formatDate(d,i):i,this._dialogInput.val(i),this._pos=o?o.length?o:[o.pageX,o.pageY]:null,this._pos||(h=document.documentElement.clientWidth,l=document.documentElement.clientHeight,c=document.documentElement.scrollLeft||document.body.scrollLeft,u=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[h/2-100+c,l/2-150+u]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),d.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),t.blockUI&&t.blockUI(this.dpDiv),t.data(this._dialogInput[0],"datepicker",d),this},_destroyDatepicker:function(e){var i,s=t(e),n=t.data(e,"datepicker");s.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),t.removeData(e,"datepicker"),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).off("focus",this._showDatepicker).off("keydown",this._doKeyDown).off("keypress",this._doKeyPress).off("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty(),m===n&&(m=null))},_enableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,"datepicker");n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!1,o.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}))},_disableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,"datepicker");n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!0,o.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}),this._disabledInputs[this._disabledInputs.length]=e)},_isDisabledDatepicker:function(t){if(!t)return!1;for(var e=0;this._disabledInputs.length>e;e++)if(this._disabledInputs[e]===t)return!0;return!1},_getInst:function(e){try{return t.data(e,"datepicker")}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(e,i,s){var n,o,r,h,l=this._getInst(e);return 2===arguments.length&&"string"==typeof i?"defaults"===i?t.extend({},t.datepicker._defaults):l?"all"===i?t.extend({},l.settings):this._get(l,i):null:(n=i||{},"string"==typeof i&&(n={},n[i]=s),l&&(this._curInst===l&&this._hideDatepicker(),o=this._getDateDatepicker(e,!0),r=this._getMinMaxDate(l,"min"),h=this._getMinMaxDate(l,"max"),a(l.settings,n),null!==r&&void 0!==n.dateFormat&&void 0===n.minDate&&(l.settings.minDate=this._formatDate(l,r)),null!==h&&void 0!==n.dateFormat&&void 0===n.maxDate&&(l.settings.maxDate=this._formatDate(l,h)),"disabled"in n&&(n.disabled?this._disableDatepicker(e):this._enableDatepicker(e)),this._attachments(t(e),l),this._autoSize(l),this._setDate(l,o),this._updateAlternate(l),this._updateDatepicker(l)),void 0)},_changeDatepicker:function(t,e,i){this._optionDatepicker(t,e,i)},_refreshDatepicker:function(t){var e=this._getInst(t);e&&this._updateDatepicker(e)},_setDateDatepicker:function(t,e){var i=this._getInst(t);i&&(this._setDate(i,e),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(t,e){var i=this._getInst(t);return i&&!i.inline&&this._setDateFromField(i,e),i?this._getDate(i):null},_doKeyDown:function(e){var i,s,n,o=t.datepicker._getInst(e.target),a=!0,r=o.dpDiv.is(".ui-datepicker-rtl");if(o._keyEvent=!0,t.datepicker._datepickerShowing)switch(e.keyCode){case 9:t.datepicker._hideDatepicker(),a=!1;break;case 13:return n=t("td."+t.datepicker._dayOverClass+":not(."+t.datepicker._currentClass+")",o.dpDiv),n[0]&&t.datepicker._selectDay(e.target,o.selectedMonth,o.selectedYear,n[0]),i=t.datepicker._get(o,"onSelect"),i?(s=t.datepicker._formatDate(o),i.apply(o.input?o.input[0]:null,[s,o])):t.datepicker._hideDatepicker(),!1;case 27:t.datepicker._hideDatepicker();break;case 33:t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 34:t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 35:(e.ctrlKey||e.metaKey)&&t.datepicker._clearDate(e.target),a=e.ctrlKey||e.metaKey;break;case 36:(e.ctrlKey||e.metaKey)&&t.datepicker._gotoToday(e.target),a=e.ctrlKey||e.metaKey;break;case 37:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?1:-1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 38:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,-7,"D"),a=e.ctrlKey||e.metaKey;break;case 39:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?-1:1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 40:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,7,"D"),a=e.ctrlKey||e.metaKey;break;default:a=!1}else 36===e.keyCode&&e.ctrlKey?t.datepicker._showDatepicker(this):a=!1;a&&(e.preventDefault(),e.stopPropagation())},_doKeyPress:function(e){var i,s,n=t.datepicker._getInst(e.target);return t.datepicker._get(n,"constrainInput")?(i=t.datepicker._possibleChars(t.datepicker._get(n,"dateFormat")),s=String.fromCharCode(null==e.charCode?e.keyCode:e.charCode),e.ctrlKey||e.metaKey||" ">s||!i||i.indexOf(s)>-1):void 0},_doKeyUp:function(e){var i,s=t.datepicker._getInst(e.target);if(s.input.val()!==s.lastVal)try{i=t.datepicker.parseDate(t.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,t.datepicker._getFormatConfig(s)),i&&(t.datepicker._setDateFromField(s),t.datepicker._updateAlternate(s),t.datepicker._updateDatepicker(s))}catch(n){}return!0},_showDatepicker:function(e){if(e=e.target||e,"input"!==e.nodeName.toLowerCase()&&(e=t("input",e.parentNode)[0]),!t.datepicker._isDisabledDatepicker(e)&&t.datepicker._lastInput!==e){var s,n,o,r,h,l,c;s=t.datepicker._getInst(e),t.datepicker._curInst&&t.datepicker._curInst!==s&&(t.datepicker._curInst.dpDiv.stop(!0,!0),s&&t.datepicker._datepickerShowing&&t.datepicker._hideDatepicker(t.datepicker._curInst.input[0])),n=t.datepicker._get(s,"beforeShow"),o=n?n.apply(e,[e,s]):{},o!==!1&&(a(s.settings,o),s.lastVal=null,t.datepicker._lastInput=e,t.datepicker._setDateFromField(s),t.datepicker._inDialog&&(e.value=""),t.datepicker._pos||(t.datepicker._pos=t.datepicker._findPos(e),t.datepicker._pos[1]+=e.offsetHeight),r=!1,t(e).parents().each(function(){return r|="fixed"===t(this).css("position"),!r}),h={left:t.datepicker._pos[0],top:t.datepicker._pos[1]},t.datepicker._pos=null,s.dpDiv.empty(),s.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),t.datepicker._updateDatepicker(s),h=t.datepicker._checkOffset(s,h,r),s.dpDiv.css({position:t.datepicker._inDialog&&t.blockUI?"static":r?"fixed":"absolute",display:"none",left:h.left+"px",top:h.top+"px"}),s.inline||(l=t.datepicker._get(s,"showAnim"),c=t.datepicker._get(s,"duration"),s.dpDiv.css("z-index",i(t(e))+1),t.datepicker._datepickerShowing=!0,t.effects&&t.effects.effect[l]?s.dpDiv.show(l,t.datepicker._get(s,"showOptions"),c):s.dpDiv[l||"show"](l?c:null),t.datepicker._shouldFocusInput(s)&&s.input.trigger("focus"),t.datepicker._curInst=s))
-}},_updateDatepicker:function(e){this.maxRows=4,m=e,e.dpDiv.empty().append(this._generateHTML(e)),this._attachHandlers(e);var i,s=this._getNumberOfMonths(e),n=s[1],a=17,r=e.dpDiv.find("."+this._dayOverClass+" a");r.length>0&&o.apply(r.get(0)),e.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&e.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),e.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),e.dpDiv[(this._get(e,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),e===t.datepicker._curInst&&t.datepicker._datepickerShowing&&t.datepicker._shouldFocusInput(e)&&e.input.trigger("focus"),e.yearshtml&&(i=e.yearshtml,setTimeout(function(){i===e.yearshtml&&e.yearshtml&&e.dpDiv.find("select.ui-datepicker-year:first").replaceWith(e.yearshtml),i=e.yearshtml=null},0))},_shouldFocusInput:function(t){return t.input&&t.input.is(":visible")&&!t.input.is(":disabled")&&!t.input.is(":focus")},_checkOffset:function(e,i,s){var n=e.dpDiv.outerWidth(),o=e.dpDiv.outerHeight(),a=e.input?e.input.outerWidth():0,r=e.input?e.input.outerHeight():0,h=document.documentElement.clientWidth+(s?0:t(document).scrollLeft()),l=document.documentElement.clientHeight+(s?0:t(document).scrollTop());return i.left-=this._get(e,"isRTL")?n-a:0,i.left-=s&&i.left===e.input.offset().left?t(document).scrollLeft():0,i.top-=s&&i.top===e.input.offset().top+r?t(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>h&&h>n?Math.abs(i.left+n-h):0),i.top-=Math.min(i.top,i.top+o>l&&l>o?Math.abs(o+r):0),i},_findPos:function(e){for(var i,s=this._getInst(e),n=this._get(s,"isRTL");e&&("hidden"===e.type||1!==e.nodeType||t.expr.filters.hidden(e));)e=e[n?"previousSibling":"nextSibling"];return i=t(e).offset(),[i.left,i.top]},_hideDatepicker:function(e){var i,s,n,o,a=this._curInst;!a||e&&a!==t.data(e,"datepicker")||this._datepickerShowing&&(i=this._get(a,"showAnim"),s=this._get(a,"duration"),n=function(){t.datepicker._tidyDialog(a)},t.effects&&(t.effects.effect[i]||t.effects[i])?a.dpDiv.hide(i,t.datepicker._get(a,"showOptions"),s,n):a.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,o=this._get(a,"onClose"),o&&o.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),t.blockUI&&(t.unblockUI(),t("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(t){t.dpDiv.removeClass(this._dialogClass).off(".ui-datepicker-calendar")},_checkExternalClick:function(e){if(t.datepicker._curInst){var i=t(e.target),s=t.datepicker._getInst(i[0]);(i[0].id!==t.datepicker._mainDivId&&0===i.parents("#"+t.datepicker._mainDivId).length&&!i.hasClass(t.datepicker.markerClassName)&&!i.closest("."+t.datepicker._triggerClass).length&&t.datepicker._datepickerShowing&&(!t.datepicker._inDialog||!t.blockUI)||i.hasClass(t.datepicker.markerClassName)&&t.datepicker._curInst!==s)&&t.datepicker._hideDatepicker()}},_adjustDate:function(e,i,s){var n=t(e),o=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(o,i+("M"===s?this._get(o,"showCurrentAtPos"):0),s),this._updateDatepicker(o))},_gotoToday:function(e){var i,s=t(e),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(e,i,s){var n=t(e),o=this._getInst(n[0]);o["selected"+("M"===s?"Month":"Year")]=o["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(o),this._adjustDate(n)},_selectDay:function(e,i,s,n){var o,a=t(e);t(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(a[0])||(o=this._getInst(a[0]),o.selectedDay=o.currentDay=t("a",n).html(),o.selectedMonth=o.currentMonth=i,o.selectedYear=o.currentYear=s,this._selectDate(e,this._formatDate(o,o.currentDay,o.currentMonth,o.currentYear)))},_clearDate:function(e){var i=t(e);this._selectDate(i,"")},_selectDate:function(e,i){var s,n=t(e),o=this._getInst(n[0]);i=null!=i?i:this._formatDate(o),o.input&&o.input.val(i),this._updateAlternate(o),s=this._get(o,"onSelect"),s?s.apply(o.input?o.input[0]:null,[i,o]):o.input&&o.input.trigger("change"),o.inline?this._updateDatepicker(o):(this._hideDatepicker(),this._lastInput=o.input[0],"object"!=typeof o.input[0]&&o.input.trigger("focus"),this._lastInput=null)},_updateAlternate:function(e){var i,s,n,o=this._get(e,"altField");o&&(i=this._get(e,"altFormat")||this._get(e,"dateFormat"),s=this._getDate(e),n=this.formatDate(i,s,this._getFormatConfig(e)),t(o).val(n))},noWeekends:function(t){var e=t.getDay();return[e>0&&6>e,""]},iso8601Week:function(t){var e,i=new Date(t.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),e=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((e-i)/864e5)/7)+1},parseDate:function(e,i,s){if(null==e||null==i)throw"Invalid arguments";if(i="object"==typeof i?""+i:i+"",""===i)return null;var n,o,a,r,h=0,l=(s?s.shortYearCutoff:null)||this._defaults.shortYearCutoff,c="string"!=typeof l?l:(new Date).getFullYear()%100+parseInt(l,10),u=(s?s.dayNamesShort:null)||this._defaults.dayNamesShort,d=(s?s.dayNames:null)||this._defaults.dayNames,p=(s?s.monthNamesShort:null)||this._defaults.monthNamesShort,f=(s?s.monthNames:null)||this._defaults.monthNames,g=-1,m=-1,_=-1,v=-1,b=!1,y=function(t){var i=e.length>n+1&&e.charAt(n+1)===t;return i&&n++,i},w=function(t){var e=y(t),s="@"===t?14:"!"===t?20:"y"===t&&e?4:"o"===t?3:2,n="y"===t?s:1,o=RegExp("^\\d{"+n+","+s+"}"),a=i.substring(h).match(o);if(!a)throw"Missing number at position "+h;return h+=a[0].length,parseInt(a[0],10)},k=function(e,s,n){var o=-1,a=t.map(y(e)?n:s,function(t,e){return[[e,t]]}).sort(function(t,e){return-(t[1].length-e[1].length)});if(t.each(a,function(t,e){var s=e[1];return i.substr(h,s.length).toLowerCase()===s.toLowerCase()?(o=e[0],h+=s.length,!1):void 0}),-1!==o)return o+1;throw"Unknown name at position "+h},x=function(){if(i.charAt(h)!==e.charAt(n))throw"Unexpected literal at position "+h;h++};for(n=0;e.length>n;n++)if(b)"'"!==e.charAt(n)||y("'")?x():b=!1;else switch(e.charAt(n)){case"d":_=w("d");break;case"D":k("D",u,d);break;case"o":v=w("o");break;case"m":m=w("m");break;case"M":m=k("M",p,f);break;case"y":g=w("y");break;case"@":r=new Date(w("@")),g=r.getFullYear(),m=r.getMonth()+1,_=r.getDate();break;case"!":r=new Date((w("!")-this._ticksTo1970)/1e4),g=r.getFullYear(),m=r.getMonth()+1,_=r.getDate();break;case"'":y("'")?x():b=!0;break;default:x()}if(i.length>h&&(a=i.substr(h),!/^\s+/.test(a)))throw"Extra/unparsed characters found in date: "+a;if(-1===g?g=(new Date).getFullYear():100>g&&(g+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c>=g?0:-100)),v>-1)for(m=1,_=v;;){if(o=this._getDaysInMonth(g,m-1),o>=_)break;m++,_-=o}if(r=this._daylightSavingAdjust(new Date(g,m-1,_)),r.getFullYear()!==g||r.getMonth()+1!==m||r.getDate()!==_)throw"Invalid date";return r},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(t,e,i){if(!e)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,o=(i?i.dayNames:null)||this._defaults.dayNames,a=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,h=function(e){var i=t.length>s+1&&t.charAt(s+1)===e;return i&&s++,i},l=function(t,e,i){var s=""+e;if(h(t))for(;i>s.length;)s="0"+s;return s},c=function(t,e,i,s){return h(t)?s[e]:i[e]},u="",d=!1;if(e)for(s=0;t.length>s;s++)if(d)"'"!==t.charAt(s)||h("'")?u+=t.charAt(s):d=!1;else switch(t.charAt(s)){case"d":u+=l("d",e.getDate(),2);break;case"D":u+=c("D",e.getDay(),n,o);break;case"o":u+=l("o",Math.round((new Date(e.getFullYear(),e.getMonth(),e.getDate()).getTime()-new Date(e.getFullYear(),0,0).getTime())/864e5),3);break;case"m":u+=l("m",e.getMonth()+1,2);break;case"M":u+=c("M",e.getMonth(),a,r);break;case"y":u+=h("y")?e.getFullYear():(10>e.getFullYear()%100?"0":"")+e.getFullYear()%100;break;case"@":u+=e.getTime();break;case"!":u+=1e4*e.getTime()+this._ticksTo1970;break;case"'":h("'")?u+="'":d=!0;break;default:u+=t.charAt(s)}return u},_possibleChars:function(t){var e,i="",s=!1,n=function(i){var s=t.length>e+1&&t.charAt(e+1)===i;return s&&e++,s};for(e=0;t.length>e;e++)if(s)"'"!==t.charAt(e)||n("'")?i+=t.charAt(e):s=!1;else switch(t.charAt(e)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=t.charAt(e)}return i},_get:function(t,e){return void 0!==t.settings[e]?t.settings[e]:this._defaults[e]},_setDateFromField:function(t,e){if(t.input.val()!==t.lastVal){var i=this._get(t,"dateFormat"),s=t.lastVal=t.input?t.input.val():null,n=this._getDefaultDate(t),o=n,a=this._getFormatConfig(t);try{o=this.parseDate(i,s,a)||n}catch(r){s=e?"":s}t.selectedDay=o.getDate(),t.drawMonth=t.selectedMonth=o.getMonth(),t.drawYear=t.selectedYear=o.getFullYear(),t.currentDay=s?o.getDate():0,t.currentMonth=s?o.getMonth():0,t.currentYear=s?o.getFullYear():0,this._adjustInstDate(t)}},_getDefaultDate:function(t){return this._restrictMinMax(t,this._determineDate(t,this._get(t,"defaultDate"),new Date))},_determineDate:function(e,i,s){var n=function(t){var e=new Date;return e.setDate(e.getDate()+t),e},o=function(i){try{return t.datepicker.parseDate(t.datepicker._get(e,"dateFormat"),i,t.datepicker._getFormatConfig(e))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?t.datepicker._getDate(e):null)||new Date,o=n.getFullYear(),a=n.getMonth(),r=n.getDate(),h=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,l=h.exec(i);l;){switch(l[2]||"d"){case"d":case"D":r+=parseInt(l[1],10);break;case"w":case"W":r+=7*parseInt(l[1],10);break;case"m":case"M":a+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a));break;case"y":case"Y":o+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a))}l=h.exec(i)}return new Date(o,a,r)},a=null==i||""===i?s:"string"==typeof i?o(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return a=a&&"Invalid Date"==""+a?s:a,a&&(a.setHours(0),a.setMinutes(0),a.setSeconds(0),a.setMilliseconds(0)),this._daylightSavingAdjust(a)},_daylightSavingAdjust:function(t){return t?(t.setHours(t.getHours()>12?t.getHours()+2:0),t):null},_setDate:function(t,e,i){var s=!e,n=t.selectedMonth,o=t.selectedYear,a=this._restrictMinMax(t,this._determineDate(t,e,new Date));t.selectedDay=t.currentDay=a.getDate(),t.drawMonth=t.selectedMonth=t.currentMonth=a.getMonth(),t.drawYear=t.selectedYear=t.currentYear=a.getFullYear(),n===t.selectedMonth&&o===t.selectedYear||i||this._notifyChange(t),this._adjustInstDate(t),t.input&&t.input.val(s?"":this._formatDate(t))},_getDate:function(t){var e=!t.currentYear||t.input&&""===t.input.val()?null:this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return e},_attachHandlers:function(e){var i=this._get(e,"stepMonths"),s="#"+e.id.replace(/\\\\/g,"\\");e.dpDiv.find("[data-handler]").map(function(){var e={prev:function(){t.datepicker._adjustDate(s,-i,"M")},next:function(){t.datepicker._adjustDate(s,+i,"M")},hide:function(){t.datepicker._hideDatepicker()},today:function(){t.datepicker._gotoToday(s)},selectDay:function(){return t.datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return t.datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return t.datepicker._selectMonthYear(s,this,"Y"),!1}};t(this).on(this.getAttribute("data-event"),e[this.getAttribute("data-handler")])})},_generateHTML:function(t){var e,i,s,n,o,a,r,h,l,c,u,d,p,f,g,m,_,v,b,y,w,k,x,C,D,I,T,P,M,S,H,z,O,A,N,W,E,F,L,R=new Date,B=this._daylightSavingAdjust(new Date(R.getFullYear(),R.getMonth(),R.getDate())),Y=this._get(t,"isRTL"),j=this._get(t,"showButtonPanel"),q=this._get(t,"hideIfNoPrevNext"),K=this._get(t,"navigationAsDateFormat"),U=this._getNumberOfMonths(t),V=this._get(t,"showCurrentAtPos"),$=this._get(t,"stepMonths"),X=1!==U[0]||1!==U[1],G=this._daylightSavingAdjust(t.currentDay?new Date(t.currentYear,t.currentMonth,t.currentDay):new Date(9999,9,9)),Q=this._getMinMaxDate(t,"min"),J=this._getMinMaxDate(t,"max"),Z=t.drawMonth-V,te=t.drawYear;if(0>Z&&(Z+=12,te--),J)for(e=this._daylightSavingAdjust(new Date(J.getFullYear(),J.getMonth()-U[0]*U[1]+1,J.getDate())),e=Q&&Q>e?Q:e;this._daylightSavingAdjust(new Date(te,Z,1))>e;)Z--,0>Z&&(Z=11,te--);for(t.drawMonth=Z,t.drawYear=te,i=this._get(t,"prevText"),i=K?this.formatDate(i,this._daylightSavingAdjust(new Date(te,Z-$,1)),this._getFormatConfig(t)):i,s=this._canAdjustMonth(t,-1,te,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>":q?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>",n=this._get(t,"nextText"),n=K?this.formatDate(n,this._daylightSavingAdjust(new Date(te,Z+$,1)),this._getFormatConfig(t)):n,o=this._canAdjustMonth(t,1,te,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>":q?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>",a=this._get(t,"currentText"),r=this._get(t,"gotoCurrent")&&t.currentDay?G:B,a=K?this.formatDate(a,r,this._getFormatConfig(t)):a,h=t.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(t,"closeText")+"</button>",l=j?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(Y?h:"")+(this._isInRange(t,r)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+a+"</button>":"")+(Y?"":h)+"</div>":"",c=parseInt(this._get(t,"firstDay"),10),c=isNaN(c)?0:c,u=this._get(t,"showWeek"),d=this._get(t,"dayNames"),p=this._get(t,"dayNamesMin"),f=this._get(t,"monthNames"),g=this._get(t,"monthNamesShort"),m=this._get(t,"beforeShowDay"),_=this._get(t,"showOtherMonths"),v=this._get(t,"selectOtherMonths"),b=this._getDefaultDate(t),y="",k=0;U[0]>k;k++){for(x="",this.maxRows=4,C=0;U[1]>C;C++){if(D=this._daylightSavingAdjust(new Date(te,Z,t.selectedDay)),I=" ui-corner-all",T="",X){if(T+="<div class='ui-datepicker-group",U[1]>1)switch(C){case 0:T+=" ui-datepicker-group-first",I=" ui-corner-"+(Y?"right":"left");break;case U[1]-1:T+=" ui-datepicker-group-last",I=" ui-corner-"+(Y?"left":"right");break;default:T+=" ui-datepicker-group-middle",I=""}T+="'>"}for(T+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+I+"'>"+(/all|left/.test(I)&&0===k?Y?o:s:"")+(/all|right/.test(I)&&0===k?Y?s:o:"")+this._generateMonthYearHeader(t,Z,te,Q,J,k>0||C>0,f,g)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",P=u?"<th class='ui-datepicker-week-col'>"+this._get(t,"weekHeader")+"</th>":"",w=0;7>w;w++)M=(w+c)%7,P+="<th scope='col'"+((w+c+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+d[M]+"'>"+p[M]+"</span></th>";for(T+=P+"</tr></thead><tbody>",S=this._getDaysInMonth(te,Z),te===t.selectedYear&&Z===t.selectedMonth&&(t.selectedDay=Math.min(t.selectedDay,S)),H=(this._getFirstDayOfMonth(te,Z)-c+7)%7,z=Math.ceil((H+S)/7),O=X?this.maxRows>z?this.maxRows:z:z,this.maxRows=O,A=this._daylightSavingAdjust(new Date(te,Z,1-H)),N=0;O>N;N++){for(T+="<tr>",W=u?"<td class='ui-datepicker-week-col'>"+this._get(t,"calculateWeek")(A)+"</td>":"",w=0;7>w;w++)E=m?m.apply(t.input?t.input[0]:null,[A]):[!0,""],F=A.getMonth()!==Z,L=F&&!v||!E[0]||Q&&Q>A||J&&A>J,W+="<td class='"+((w+c+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(A.getTime()===D.getTime()&&Z===t.selectedMonth&&t._keyEvent||b.getTime()===A.getTime()&&b.getTime()===D.getTime()?" "+this._dayOverClass:"")+(L?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!_?"":" "+E[1]+(A.getTime()===G.getTime()?" "+this._currentClass:"")+(A.getTime()===B.getTime()?" ui-datepicker-today":""))+"'"+(F&&!_||!E[2]?"":" title='"+E[2].replace(/'/g,"&#39;")+"'")+(L?"":" data-handler='selectDay' data-event='click' data-month='"+A.getMonth()+"' data-year='"+A.getFullYear()+"'")+">"+(F&&!_?"&#xa0;":L?"<span class='ui-state-default'>"+A.getDate()+"</span>":"<a class='ui-state-default"+(A.getTime()===B.getTime()?" ui-state-highlight":"")+(A.getTime()===G.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+"' href='#'>"+A.getDate()+"</a>")+"</td>",A.setDate(A.getDate()+1),A=this._daylightSavingAdjust(A);T+=W+"</tr>"}Z++,Z>11&&(Z=0,te++),T+="</tbody></table>"+(X?"</div>"+(U[0]>0&&C===U[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),x+=T}y+=x}return y+=l,t._keyEvent=!1,y},_generateMonthYearHeader:function(t,e,i,s,n,o,a,r){var h,l,c,u,d,p,f,g,m=this._get(t,"changeMonth"),_=this._get(t,"changeYear"),v=this._get(t,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",y="";if(o||!m)y+="<span class='ui-datepicker-month'>"+a[e]+"</span>";else{for(h=s&&s.getFullYear()===i,l=n&&n.getFullYear()===i,y+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",c=0;12>c;c++)(!h||c>=s.getMonth())&&(!l||n.getMonth()>=c)&&(y+="<option value='"+c+"'"+(c===e?" selected='selected'":"")+">"+r[c]+"</option>");y+="</select>"}if(v||(b+=y+(!o&&m&&_?"":"&#xa0;")),!t.yearshtml)if(t.yearshtml="",o||!_)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(u=this._get(t,"yearRange").split(":"),d=(new Date).getFullYear(),p=function(t){var e=t.match(/c[+\-].*/)?i+parseInt(t.substring(1),10):t.match(/[+\-].*/)?d+parseInt(t,10):parseInt(t,10);return isNaN(e)?d:e},f=p(u[0]),g=Math.max(f,p(u[1]||"")),f=s?Math.max(f,s.getFullYear()):f,g=n?Math.min(g,n.getFullYear()):g,t.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";g>=f;f++)t.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";t.yearshtml+="</select>",b+=t.yearshtml,t.yearshtml=null}return b+=this._get(t,"yearSuffix"),v&&(b+=(!o&&m&&_?"":"&#xa0;")+y),b+="</div>"},_adjustInstDate:function(t,e,i){var s=t.selectedYear+("Y"===i?e:0),n=t.selectedMonth+("M"===i?e:0),o=Math.min(t.selectedDay,this._getDaysInMonth(s,n))+("D"===i?e:0),a=this._restrictMinMax(t,this._daylightSavingAdjust(new Date(s,n,o)));t.selectedDay=a.getDate(),t.drawMonth=t.selectedMonth=a.getMonth(),t.drawYear=t.selectedYear=a.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(t)},_restrictMinMax:function(t,e){var i=this._getMinMaxDate(t,"min"),s=this._getMinMaxDate(t,"max"),n=i&&i>e?i:e;return s&&n>s?s:n},_notifyChange:function(t){var e=this._get(t,"onChangeMonthYear");e&&e.apply(t.input?t.input[0]:null,[t.selectedYear,t.selectedMonth+1,t])},_getNumberOfMonths:function(t){var e=this._get(t,"numberOfMonths");return null==e?[1,1]:"number"==typeof e?[1,e]:e},_getMinMaxDate:function(t,e){return this._determineDate(t,this._get(t,e+"Date"),null)},_getDaysInMonth:function(t,e){return 32-this._daylightSavingAdjust(new Date(t,e,32)).getDate()},_getFirstDayOfMonth:function(t,e){return new Date(t,e,1).getDay()},_canAdjustMonth:function(t,e,i,s){var n=this._getNumberOfMonths(t),o=this._daylightSavingAdjust(new Date(i,s+(0>e?e:n[0]*n[1]),1));return 0>e&&o.setDate(this._getDaysInMonth(o.getFullYear(),o.getMonth())),this._isInRange(t,o)},_isInRange:function(t,e){var i,s,n=this._getMinMaxDate(t,"min"),o=this._getMinMaxDate(t,"max"),a=null,r=null,h=this._get(t,"yearRange");return h&&(i=h.split(":"),s=(new Date).getFullYear(),a=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(a+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||e.getTime()>=n.getTime())&&(!o||e.getTime()<=o.getTime())&&(!a||e.getFullYear()>=a)&&(!r||r>=e.getFullYear())},_getFormatConfig:function(t){var e=this._get(t,"shortYearCutoff");return e="string"!=typeof e?e:(new Date).getFullYear()%100+parseInt(e,10),{shortYearCutoff:e,dayNamesShort:this._get(t,"dayNamesShort"),dayNames:this._get(t,"dayNames"),monthNamesShort:this._get(t,"monthNamesShort"),monthNames:this._get(t,"monthNames")}},_formatDate:function(t,e,i,s){e||(t.currentDay=t.selectedDay,t.currentMonth=t.selectedMonth,t.currentYear=t.selectedYear);var n=e?"object"==typeof e?e:this._daylightSavingAdjust(new Date(s,i,e)):this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return this.formatDate(this._get(t,"dateFormat"),n,this._getFormatConfig(t))}}),t.fn.datepicker=function(e){if(!this.length)return this;t.datepicker.initialized||(t(document).on("mousedown",t.datepicker._checkExternalClick),t.datepicker.initialized=!0),0===t("#"+t.datepicker._mainDivId).length&&t("body").append(t.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof e||"isDisabled"!==e&&"getDate"!==e&&"widget"!==e?"option"===e&&2===arguments.length&&"string"==typeof arguments[1]?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof e?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this].concat(i)):t.datepicker._attachDatepicker(this,e)}):t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i))},t.datepicker=new s,t.datepicker.initialized=!1,t.datepicker.uuid=(new Date).getTime(),t.datepicker.version="1.12.1",t.datepicker,t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());var _=!1;t(document).on("mouseup",function(){_=!1}),t.widget("ui.mouse",{version:"1.12.1",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.on("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).on("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(e){if(!_){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(e),this._mouseDownEvent=e;var i=this,s=1===e.which,n="string"==typeof this.options.cancel&&e.target.nodeName?t(e.target).closest(this.options.cancel).length:!1;return s&&!n&&this._mouseCapture(e)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(e)!==!1,!this._mouseStarted)?(e.preventDefault(),!0):(!0===t.data(e.target,this.widgetName+".preventClickEvent")&&t.removeData(e.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return i._mouseMove(t)},this._mouseUpDelegate=function(t){return i._mouseUp(t)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),e.preventDefault(),_=!0,!0)):!0}},_mouseMove:function(e){if(this._mouseMoved){if(t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button)return this._mouseUp(e);if(!e.which)if(e.originalEvent.altKey||e.originalEvent.ctrlKey||e.originalEvent.metaKey||e.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(e)}return(e.which||e.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,_=!1,e.preventDefault()},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),t.ui.plugin={add:function(e,i,s){var n,o=t.ui[e].prototype;for(n in s)o.plugins[n]=o.plugins[n]||[],o.plugins[n].push([i,s[n]])},call:function(t,e,i,s){var n,o=t.plugins[e];if(o&&(s||t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType))for(n=0;o.length>n;n++)t.options[o[n][0]]&&o[n][1].apply(t.element,i)}},t.ui.safeBlur=function(e){e&&"body"!==e.nodeName.toLowerCase()&&t(e).trigger("blur")},t.widget("ui.draggable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this._addClass("ui-draggable"),this._setHandleClassName(),this._mouseInit()},_setOption:function(t,e){this._super(t,e),"handle"===t&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(e){var i=this.options;return this.helper||i.disabled||t(e.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(e),this.handle?(this._blurActiveElement(e),this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(e){this.iframeBlocks=this.document.find(e).map(function(){var e=t(this);return t("<div>").css("position","absolute").appendTo(e.parent()).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(e){var i=t.ui.safeActiveElement(this.document[0]),s=t(e.target);s.closest(i).length||t.ui.safeBlur(i)},_mouseStart:function(e){var i=this.options;return this.helper=this._createHelper(e),this._addClass(this.helper,"ui-draggable-dragging"),this._cacheHelperProportions(),t.ui.ddmanager&&(t.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===t(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(e),this.originalPosition=this.position=this._generatePosition(e,!1),this.originalPageX=e.pageX,this.originalPageY=e.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",e)===!1?(this._clear(),!1):(this._cacheHelperProportions(),t.ui.ddmanager&&!i.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this._mouseDrag(e,!0),t.ui.ddmanager&&t.ui.ddmanager.dragStart(this,e),!0)},_refreshOffsets:function(t){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:t.pageX-this.offset.left,top:t.pageY-this.offset.top}},_mouseDrag:function(e,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(e,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",e,s)===!1)return this._mouseUp(new t.Event("mouseup",e)),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),!1},_mouseStop:function(e){var i=this,s=!1;return t.ui.ddmanager&&!this.options.dropBehaviour&&(s=t.ui.ddmanager.drop(this,e)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||t.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?t(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",e)!==!1&&i._clear()}):this._trigger("stop",e)!==!1&&this._clear(),!1},_mouseUp:function(e){return this._unblockFrames(),t.ui.ddmanager&&t.ui.ddmanager.dragStop(this,e),this.handleElement.is(e.target)&&this.element.trigger("focus"),t.ui.mouse.prototype._mouseUp.call(this,e)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp(new t.Event("mouseup",{target:this.element[0]})):this._clear(),this},_getHandle:function(e){return this.options.handle?!!t(e.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this._addClass(this.handleElement,"ui-draggable-handle")},_removeHandleClassName:function(){this._removeClass(this.handleElement,"ui-draggable-handle")},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper),n=s?t(i.helper.apply(this.element[0],[e])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_isRootNode:function(t){return/(html|body)/i.test(t.tagName)||t===this.document[0]},_getParentOffset:function(){var e=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var t=this.element.position(),e=this._isRootNode(this.scrollParent[0]);return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+(e?0:this.scrollParent.scrollTop()),left:t.left-(parseInt(this.helper.css("left"),10)||0)+(e?0:this.scrollParent.scrollLeft())}
-},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options,o=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[t(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,t(window).scrollLeft()+t(window).width()-this.helperProportions.width-this.margins.left,t(window).scrollTop()+(t(window).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,t(o).width()-this.helperProportions.width-this.margins.left,(t(o).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=t(n.containment),s=i[0],s&&(e=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(e?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)},_convertPositionTo:function(t,e){e||(e=this.position);var i="absolute"===t?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:e.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:e.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(t,e){var i,s,n,o,a=this.options,r=this._isRootNode(this.scrollParent[0]),h=t.pageX,l=t.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),e&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,t.pageX-this.offset.click.left<i[0]&&(h=i[0]+this.offset.click.left),t.pageY-this.offset.click.top<i[1]&&(l=i[1]+this.offset.click.top),t.pageX-this.offset.click.left>i[2]&&(h=i[2]+this.offset.click.left),t.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),a.grid&&(n=a.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/a.grid[1])*a.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-a.grid[1]:n+a.grid[1]:n,o=a.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/a.grid[0])*a.grid[0]:this.originalPageX,h=i?o-this.offset.click.left>=i[0]||o-this.offset.click.left>i[2]?o:o-this.offset.click.left>=i[0]?o-a.grid[0]:o+a.grid[0]:o),"y"===a.axis&&(h=this.originalPageX),"x"===a.axis&&(l=this.originalPageY)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}},_clear:function(){this._removeClass(this.helper,"ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(e,i,s){return s=s||this._uiHash(),t.ui.plugin.call(this,e,[i,s,this],!0),/^(drag|start|stop)/.test(e)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),t.Widget.prototype._trigger.call(this,e,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),t.ui.plugin.add("draggable","connectToSortable",{start:function(e,i,s){var n=t.extend({},i,{item:s.element});s.sortables=[],t(s.options.connectToSortable).each(function(){var i=t(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",e,n))})},stop:function(e,i,s){var n=t.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,t.each(s.sortables,function(){var t=this;t.isOver?(t.isOver=0,s.cancelHelperRemoval=!0,t.cancelHelperRemoval=!1,t._storedCSS={position:t.placeholder.css("position"),top:t.placeholder.css("top"),left:t.placeholder.css("left")},t._mouseStop(e),t.options.helper=t.options._helper):(t.cancelHelperRemoval=!0,t._trigger("deactivate",e,n))})},drag:function(e,i,s){t.each(s.sortables,function(){var n=!1,o=this;o.positionAbs=s.positionAbs,o.helperProportions=s.helperProportions,o.offset.click=s.offset.click,o._intersectsWith(o.containerCache)&&(n=!0,t.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==o&&this._intersectsWith(this.containerCache)&&t.contains(o.element[0],this.element[0])&&(n=!1),n})),n?(o.isOver||(o.isOver=1,s._parent=i.helper.parent(),o.currentItem=i.helper.appendTo(o.element).data("ui-sortable-item",!0),o.options._helper=o.options.helper,o.options.helper=function(){return i.helper[0]},e.target=o.currentItem[0],o._mouseCapture(e,!0),o._mouseStart(e,!0,!0),o.offset.click.top=s.offset.click.top,o.offset.click.left=s.offset.click.left,o.offset.parent.left-=s.offset.parent.left-o.offset.parent.left,o.offset.parent.top-=s.offset.parent.top-o.offset.parent.top,s._trigger("toSortable",e),s.dropped=o.element,t.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,o.fromOutside=s),o.currentItem&&(o._mouseDrag(e),i.position=o.position)):o.isOver&&(o.isOver=0,o.cancelHelperRemoval=!0,o.options._revert=o.options.revert,o.options.revert=!1,o._trigger("out",e,o._uiHash(o)),o._mouseStop(e,!0),o.options.revert=o.options._revert,o.options.helper=o.options._helper,o.placeholder&&o.placeholder.remove(),i.helper.appendTo(s._parent),s._refreshOffsets(e),i.position=s._generatePosition(e,!0),s._trigger("fromSortable",e),s.dropped=!1,t.each(s.sortables,function(){this.refreshPositions()}))})}}),t.ui.plugin.add("draggable","cursor",{start:function(e,i,s){var n=t("body"),o=s.options;n.css("cursor")&&(o._cursor=n.css("cursor")),n.css("cursor",o.cursor)},stop:function(e,i,s){var n=s.options;n._cursor&&t("body").css("cursor",n._cursor)}}),t.ui.plugin.add("draggable","opacity",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("opacity")&&(o._opacity=n.css("opacity")),n.css("opacity",o.opacity)},stop:function(e,i,s){var n=s.options;n._opacity&&t(i.helper).css("opacity",n._opacity)}}),t.ui.plugin.add("draggable","scroll",{start:function(t,e,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(e,i,s){var n=s.options,o=!1,a=s.scrollParentNotHidden[0],r=s.document[0];a!==r&&"HTML"!==a.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+a.offsetHeight-e.pageY<n.scrollSensitivity?a.scrollTop=o=a.scrollTop+n.scrollSpeed:e.pageY-s.overflowOffset.top<n.scrollSensitivity&&(a.scrollTop=o=a.scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+a.offsetWidth-e.pageX<n.scrollSensitivity?a.scrollLeft=o=a.scrollLeft+n.scrollSpeed:e.pageX-s.overflowOffset.left<n.scrollSensitivity&&(a.scrollLeft=o=a.scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(e.pageY-t(r).scrollTop()<n.scrollSensitivity?o=t(r).scrollTop(t(r).scrollTop()-n.scrollSpeed):t(window).height()-(e.pageY-t(r).scrollTop())<n.scrollSensitivity&&(o=t(r).scrollTop(t(r).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(e.pageX-t(r).scrollLeft()<n.scrollSensitivity?o=t(r).scrollLeft(t(r).scrollLeft()-n.scrollSpeed):t(window).width()-(e.pageX-t(r).scrollLeft())<n.scrollSensitivity&&(o=t(r).scrollLeft(t(r).scrollLeft()+n.scrollSpeed)))),o!==!1&&t.ui.ddmanager&&!n.dropBehaviour&&t.ui.ddmanager.prepareOffsets(s,e)}}),t.ui.plugin.add("draggable","snap",{start:function(e,i,s){var n=s.options;s.snapElements=[],t(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var e=t(this),i=e.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:e.outerWidth(),height:e.outerHeight(),top:i.top,left:i.left})})},drag:function(e,i,s){var n,o,a,r,h,l,c,u,d,p,f=s.options,g=f.snapTolerance,m=i.offset.left,_=m+s.helperProportions.width,v=i.offset.top,b=v+s.helperProportions.height;for(d=s.snapElements.length-1;d>=0;d--)h=s.snapElements[d].left-s.margins.left,l=h+s.snapElements[d].width,c=s.snapElements[d].top-s.margins.top,u=c+s.snapElements[d].height,h-g>_||m>l+g||c-g>b||v>u+g||!t.contains(s.snapElements[d].item.ownerDocument,s.snapElements[d].item)?(s.snapElements[d].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=!1):("inner"!==f.snapMode&&(n=g>=Math.abs(c-b),o=g>=Math.abs(u-v),a=g>=Math.abs(h-_),r=g>=Math.abs(l-m),n&&(i.position.top=s._convertPositionTo("relative",{top:c-s.helperProportions.height,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left)),p=n||o||a||r,"outer"!==f.snapMode&&(n=g>=Math.abs(c-v),o=g>=Math.abs(u-b),a=g>=Math.abs(h-m),r=g>=Math.abs(l-_),n&&(i.position.top=s._convertPositionTo("relative",{top:c,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left)),!s.snapElements[d].snapping&&(n||o||a||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=n||o||a||r||p)}}),t.ui.plugin.add("draggable","stack",{start:function(e,i,s){var n,o=s.options,a=t.makeArray(t(o.stack)).sort(function(e,i){return(parseInt(t(e).css("zIndex"),10)||0)-(parseInt(t(i).css("zIndex"),10)||0)});a.length&&(n=parseInt(t(a[0]).css("zIndex"),10)||0,t(a).each(function(e){t(this).css("zIndex",n+e)}),this.css("zIndex",n+a.length))}}),t.ui.plugin.add("draggable","zIndex",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("zIndex")&&(o._zIndex=n.css("zIndex")),n.css("zIndex",o.zIndex)},stop:function(e,i,s){var n=s.options;n._zIndex&&t(i.helper).css("zIndex",n._zIndex)}}),t.ui.draggable,t.widget("ui.resizable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,classes:{"ui-resizable-se":"ui-icon ui-icon-gripsmall-diagonal-se"},containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(t){return parseFloat(t)||0},_isNumber:function(t){return!isNaN(parseFloat(t))},_hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)},_create:function(){var e,i=this.options,s=this;this._addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!i.aspectRatio,aspectRatio:i.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:i.helper||i.ghost||i.animate?i.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(t("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,e={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(e),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(e),this._proportionallyResize()),this._setupHandles(),i.autoHide&&t(this.element).on("mouseenter",function(){i.disabled||(s._removeClass("ui-resizable-autohide"),s._handles.show())}).on("mouseleave",function(){i.disabled||s.resizing||(s._addClass("ui-resizable-autohide"),s._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeData("resizable").removeData("ui-resizable").off(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_setOption:function(t,e){switch(this._super(t,e),t){case"handles":this._removeHandles(),this._setupHandles();break;default:}},_setupHandles:function(){var e,i,s,n,o,a=this.options,r=this;if(this.handles=a.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=t(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),s=this.handles.split(","),this.handles={},i=0;s.length>i;i++)e=t.trim(s[i]),n="ui-resizable-"+e,o=t("<div>"),this._addClass(o,"ui-resizable-handle "+n),o.css({zIndex:a.zIndex}),this.handles[e]=".ui-resizable-"+e,this.element.append(o);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=t(this.handles[i]),this._on(this.handles[i],{mousedown:r._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){r.resizing||(this.className&&(o=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),r.axis=o&&o[1]?o[1]:"se")}),a.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._handles.remove()},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(e){var i,s,n,o=this.options,a=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),o.containment&&(i+=t(o.containment).scrollLeft()||0,s+=t(o.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:a.width(),height:a.height()},this.originalSize=this._helper?{width:a.outerWidth(),height:a.outerHeight()}:{width:a.width(),height:a.height()},this.sizeDiff={width:a.outerWidth()-a.width(),height:a.outerHeight()-a.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:e.pageX,top:e.pageY},this.aspectRatio="number"==typeof o.aspectRatio?o.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===n?this.axis+"-resize":n),this._addClass("ui-resizable-resizing"),this._propagate("start",e),!0},_mouseDrag:function(e){var i,s,n=this.originalMousePosition,o=this.axis,a=e.pageX-n.left||0,r=e.pageY-n.top||0,h=this._change[o];return this._updatePrevProperties(),h?(i=h.apply(this,[e,a,r]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",e,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,h,l=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseFloat(c.element.css("left"))+(c.position.left-c.originalPosition.left)||null,h=parseFloat(c.element.css("top"))+(c.position.top-c.originalPosition.top)||null,l.animate||this.element.css(t.extend(a,{top:h,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!l.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var t={};return this.position.top!==this.prevPosition.top&&(t.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(t.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(t.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(t.height=this.size.height+"px"),this.helper.css(t),t},_updateVirtualBoundaries:function(t){var e,i,s,n,o,a=this.options;o={minWidth:this._isNumber(a.minWidth)?a.minWidth:0,maxWidth:this._isNumber(a.maxWidth)?a.maxWidth:1/0,minHeight:this._isNumber(a.minHeight)?a.minHeight:0,maxHeight:this._isNumber(a.maxHeight)?a.maxHeight:1/0},(this._aspectRatio||t)&&(e=o.minHeight*this.aspectRatio,s=o.minWidth/this.aspectRatio,i=o.maxHeight*this.aspectRatio,n=o.maxWidth/this.aspectRatio,e>o.minWidth&&(o.minWidth=e),s>o.minHeight&&(o.minHeight=s),o.maxWidth>i&&(o.maxWidth=i),o.maxHeight>n&&(o.maxHeight=n)),this._vBoundaries=o},_updateCache:function(t){this.offset=this.helper.offset(),this._isNumber(t.left)&&(this.position.left=t.left),this._isNumber(t.top)&&(this.position.top=t.top),this._isNumber(t.height)&&(this.size.height=t.height),this._isNumber(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,i=this.size,s=this.axis;return this._isNumber(t.height)?t.width=t.height*this.aspectRatio:this._isNumber(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===s&&(t.left=e.left+(i.width-t.width),t.top=null),"nw"===s&&(t.top=e.top+(i.height-t.height),t.left=e.left+(i.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,i=this.axis,s=this._isNumber(t.width)&&e.maxWidth&&e.maxWidth<t.width,n=this._isNumber(t.height)&&e.maxHeight&&e.maxHeight<t.height,o=this._isNumber(t.width)&&e.minWidth&&e.minWidth>t.width,a=this._isNumber(t.height)&&e.minHeight&&e.minHeight>t.height,r=this.originalPosition.left+this.originalSize.width,h=this.originalPosition.top+this.originalSize.height,l=/sw|nw|w/.test(i),c=/nw|ne|n/.test(i);return o&&(t.width=e.minWidth),a&&(t.height=e.minHeight),s&&(t.width=e.maxWidth),n&&(t.height=e.maxHeight),o&&l&&(t.left=r-e.minWidth),s&&l&&(t.left=r-e.maxWidth),a&&c&&(t.top=h-e.minHeight),n&&c&&(t.top=h-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_getPaddingPlusBorderDimensions:function(t){for(var e=0,i=[],s=[t.css("borderTopWidth"),t.css("borderRightWidth"),t.css("borderBottomWidth"),t.css("borderLeftWidth")],n=[t.css("paddingTop"),t.css("paddingRight"),t.css("paddingBottom"),t.css("paddingLeft")];4>e;e++)i[e]=parseFloat(s[e])||0,i[e]+=parseFloat(n[e])||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var t,e=0,i=this.helper||this.element;this._proportionallyResizeElements.length>e;e++)t=this._proportionallyResizeElements[e],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(t)),t.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("<div style='overflow:hidden;'></div>"),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-a},l=parseFloat(i.element.css("left"))+(i.position.left-i.originalPosition.left)||null,c=parseFloat(i.element.css("top"))+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(h,c&&l?{top:c,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseFloat(i.element.css("width")),height:parseFloat(i.element.css("height")),top:parseFloat(i.element.css("top")),left:parseFloat(i.element.css("left"))};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var e,i,s,n,o,a,r,h=t(this).resizable("instance"),l=h.options,c=h.element,u=l.containment,d=u instanceof t?u.get(0):/parent/.test(u)?c.parent().get(0):u;d&&(h.containerElement=t(d),/document/.test(u)||u===document?(h.containerOffset={left:0,top:0},h.containerPosition={left:0,top:0},h.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(e=t(d),i=[],t(["Top","Right","Left","Bottom"]).each(function(t,s){i[t]=h._num(e.css("padding"+s))}),h.containerOffset=e.offset(),h.containerPosition=e.position(),h.containerSize={height:e.innerHeight()-i[3],width:e.innerWidth()-i[1]},s=h.containerOffset,n=h.containerSize.height,o=h.containerSize.width,a=h._hasScroll(d,"left")?d.scrollWidth:o,r=h._hasScroll(d)?d.scrollHeight:n,h.parentData={element:d,left:s.left,top:s.top,width:a,height:r}))},resize:function(e){var i,s,n,o,a=t(this).resizable("instance"),r=a.options,h=a.containerOffset,l=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement,p=!0;d[0]!==document&&/static/.test(d.css("position"))&&(u=h),l.left<(a._helper?h.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-h.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio,p=!1),a.position.left=r.helper?h.left:0),l.top<(a._helper?h.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-h.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio,p=!1),a.position.top=a._helper?h.top:0),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o?(a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top):(a.offset.left=a.element.offset().left,a.offset.top=a.element.offset().top),i=Math.abs(a.sizeDiff.width+(a._helper?a.offset.left-u.left:a.offset.left-h.left)),s=Math.abs(a.sizeDiff.height+(a._helper?a.offset.top-u.top:a.offset.top-h.top)),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio,p=!1)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio,p=!1)),p||(a.position.left=a.prevPosition.left,a.position.top=a.prevPosition.top,a.size.width=a.prevSize.width,a.size.height=a.prevSize.height)},stop:function(){var e=t(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),h=a.outerWidth()-e.sizeDiff.width,l=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).resizable("instance"),i=e.options;t(i.alsoResize).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseFloat(e.width()),height:parseFloat(e.height()),left:parseFloat(e.css("left")),top:parseFloat(e.css("top"))})})},resize:function(e,i){var s=t(this).resizable("instance"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0};t(n.alsoResize).each(function(){var e=t(this),s=t(this).data("ui-resizable-alsoresize"),n={},o=e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(o,function(t,e){var i=(s[e]||0)+(r[e]||0);i&&i>=0&&(n[e]=i||null)}),e.css(n)})},stop:function(){t(this).removeData("ui-resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).resizable("instance"),i=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:i.height,width:i.width,margin:0,left:0,top:0}),e._addClass(e.ghost,"ui-resizable-ghost"),t.uiBackCompat!==!1&&"string"==typeof e.options.ghost&&e.ghost.addClass(this.options.ghost),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).resizable("instance");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).resizable("instance");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e,i=t(this).resizable("instance"),s=i.options,n=i.size,o=i.originalSize,a=i.originalPosition,r=i.axis,h="number"==typeof s.grid?[s.grid,s.grid]:s.grid,l=h[0]||1,c=h[1]||1,u=Math.round((n.width-o.width)/l)*l,d=Math.round((n.height-o.height)/c)*c,p=o.width+u,f=o.height+d,g=s.maxWidth&&p>s.maxWidth,m=s.maxHeight&&f>s.maxHeight,_=s.minWidth&&s.minWidth>p,v=s.minHeight&&s.minHeight>f;s.grid=h,_&&(p+=l),v&&(f+=c),g&&(p-=l),m&&(f-=c),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=a.top-d):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=a.left-u):((0>=f-c||0>=p-l)&&(e=i._getPaddingPlusBorderDimensions(this)),f-c>0?(i.size.height=f,i.position.top=a.top-d):(f=c-e.height,i.size.height=f,i.position.top=a.top+o.height-f),p-l>0?(i.size.width=p,i.position.left=a.left-u):(p=l-e.width,i.size.width=p,i.position.left=a.left+o.width-p))}}),t.ui.resizable,t.widget("ui.dialog",{version:"1.12.1",options:{appendTo:"body",autoOpen:!0,buttons:[],classes:{"ui-dialog":"ui-corner-all","ui-dialog-titlebar":"ui-corner-all"},closeOnEscape:!0,closeText:"Close",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(e){var i=t(this).css(e).offset().top;0>i&&t(this).css("top",e.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),null==this.options.title&&null!=this.originalTitle&&(this.options.title=this.originalTitle),this.options.disabled&&(this.options.disabled=!1),this._createWrapper(),this.element.show().removeAttr("title").appendTo(this.uiDialog),this._addClass("ui-dialog-content","ui-widget-content"),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&t.fn.draggable&&this._makeDraggable(),this.options.resizable&&t.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var e=this.options.appendTo;return e&&(e.jquery||e.nodeType)?t(e):this.document.find(e||"body").eq(0)},_destroy:function(){var t,e=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().css(this.originalCss).detach(),this.uiDialog.remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),t=e.parent.children().eq(e.index),t.length&&t[0]!==this.element[0]?t.before(this.element):e.parent.append(this.element)},widget:function(){return this.uiDialog
-},disable:t.noop,enable:t.noop,close:function(e){var i=this;this._isOpen&&this._trigger("beforeClose",e)!==!1&&(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),this.opener.filter(":focusable").trigger("focus").length||t.ui.safeBlur(t.ui.safeActiveElement(this.document[0])),this._hide(this.uiDialog,this.options.hide,function(){i._trigger("close",e)}))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(e,i){var s=!1,n=this.uiDialog.siblings(".ui-front:visible").map(function(){return+t(this).css("z-index")}).get(),o=Math.max.apply(null,n);return o>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",o+1),s=!0),s&&!i&&this._trigger("focus",e),s},open:function(){var e=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),void 0):(this._isOpen=!0,this.opener=t(t.ui.safeActiveElement(this.document[0])),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){e._focusTabbable(),e._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"),void 0)},_focusTabbable:function(){var t=this._focusedElement;t||(t=this.element.find("[autofocus]")),t.length||(t=this.element.find(":tabbable")),t.length||(t=this.uiDialogButtonPane.find(":tabbable")),t.length||(t=this.uiDialogTitlebarClose.filter(":tabbable")),t.length||(t=this.uiDialog),t.eq(0).trigger("focus")},_keepFocus:function(e){function i(){var e=t.ui.safeActiveElement(this.document[0]),i=this.uiDialog[0]===e||t.contains(this.uiDialog[0],e);i||this._focusTabbable()}e.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=t("<div>").hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._addClass(this.uiDialog,"ui-dialog","ui-widget ui-widget-content ui-front"),this._on(this.uiDialog,{keydown:function(e){if(this.options.closeOnEscape&&!e.isDefaultPrevented()&&e.keyCode&&e.keyCode===t.ui.keyCode.ESCAPE)return e.preventDefault(),this.close(e),void 0;if(e.keyCode===t.ui.keyCode.TAB&&!e.isDefaultPrevented()){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");e.target!==n[0]&&e.target!==this.uiDialog[0]||e.shiftKey?e.target!==s[0]&&e.target!==this.uiDialog[0]||!e.shiftKey||(this._delay(function(){n.trigger("focus")}),e.preventDefault()):(this._delay(function(){s.trigger("focus")}),e.preventDefault())}},mousedown:function(t){this._moveToTop(t)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var e;this.uiDialogTitlebar=t("<div>"),this._addClass(this.uiDialogTitlebar,"ui-dialog-titlebar","ui-widget-header ui-helper-clearfix"),this._on(this.uiDialogTitlebar,{mousedown:function(e){t(e.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.trigger("focus")}}),this.uiDialogTitlebarClose=t("<button type='button'></button>").button({label:t("<a>").text(this.options.closeText).html(),icon:"ui-icon-closethick",showLabel:!1}).appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarClose,"ui-dialog-titlebar-close"),this._on(this.uiDialogTitlebarClose,{click:function(t){t.preventDefault(),this.close(t)}}),e=t("<span>").uniqueId().prependTo(this.uiDialogTitlebar),this._addClass(e,"ui-dialog-title"),this._title(e),this.uiDialogTitlebar.prependTo(this.uiDialog),this.uiDialog.attr({"aria-labelledby":e.attr("id")})},_title:function(t){this.options.title?t.text(this.options.title):t.html("&#160;")},_createButtonPane:function(){this.uiDialogButtonPane=t("<div>"),this._addClass(this.uiDialogButtonPane,"ui-dialog-buttonpane","ui-widget-content ui-helper-clearfix"),this.uiButtonSet=t("<div>").appendTo(this.uiDialogButtonPane),this._addClass(this.uiButtonSet,"ui-dialog-buttonset"),this._createButtons()},_createButtons:function(){var e=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),t.isEmptyObject(i)||t.isArray(i)&&!i.length?(this._removeClass(this.uiDialog,"ui-dialog-buttons"),void 0):(t.each(i,function(i,s){var n,o;s=t.isFunction(s)?{click:s,text:i}:s,s=t.extend({type:"button"},s),n=s.click,o={icon:s.icon,iconPosition:s.iconPosition,showLabel:s.showLabel,icons:s.icons,text:s.text},delete s.click,delete s.icon,delete s.iconPosition,delete s.showLabel,delete s.icons,"boolean"==typeof s.text&&delete s.text,t("<button></button>",s).button(o).appendTo(e.uiButtonSet).on("click",function(){n.apply(e.element[0],arguments)})}),this._addClass(this.uiDialog,"ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),void 0)},_makeDraggable:function(){function e(t){return{position:t.position,offset:t.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){i._addClass(t(this),"ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,e(n))},drag:function(t,s){i._trigger("drag",t,e(s))},stop:function(n,o){var a=o.offset.left-i.document.scrollLeft(),r=o.offset.top-i.document.scrollTop();s.position={my:"left top",at:"left"+(a>=0?"+":"")+a+" "+"top"+(r>=0?"+":"")+r,of:i.window},i._removeClass(t(this),"ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,e(o))}})},_makeResizable:function(){function e(t){return{originalPosition:t.originalPosition,originalSize:t.originalSize,position:t.position,size:t.size}}var i=this,s=this.options,n=s.resizable,o=this.uiDialog.css("position"),a="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:a,start:function(s,n){i._addClass(t(this),"ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,e(n))},resize:function(t,s){i._trigger("resize",t,e(s))},stop:function(n,o){var a=i.uiDialog.offset(),r=a.left-i.document.scrollLeft(),h=a.top-i.document.scrollTop();s.height=i.uiDialog.height(),s.width=i.uiDialog.width(),s.position={my:"left top",at:"left"+(r>=0?"+":"")+r+" "+"top"+(h>=0?"+":"")+h,of:i.window},i._removeClass(t(this),"ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,e(o))}}).css("position",o)},_trackFocus:function(){this._on(this.widget(),{focusin:function(e){this._makeFocusTarget(),this._focusedElement=t(e.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var e=this._trackingInstances(),i=t.inArray(this,e);-1!==i&&e.splice(i,1)},_trackingInstances:function(){var t=this.document.data("ui-dialog-instances");return t||(t=[],this.document.data("ui-dialog-instances",t)),t},_minHeight:function(){var t=this.options;return"auto"===t.height?t.minHeight:Math.min(t.minHeight,t.height)},_position:function(){var t=this.uiDialog.is(":visible");t||this.uiDialog.show(),this.uiDialog.position(this.options.position),t||this.uiDialog.hide()},_setOptions:function(e){var i=this,s=!1,n={};t.each(e,function(t,e){i._setOption(t,e),t in i.sizeRelatedOptions&&(s=!0),t in i.resizableRelatedOptions&&(n[t]=e)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(e,i){var s,n,o=this.uiDialog;"disabled"!==e&&(this._super(e,i),"appendTo"===e&&this.uiDialog.appendTo(this._appendTo()),"buttons"===e&&this._createButtons(),"closeText"===e&&this.uiDialogTitlebarClose.button({label:t("<a>").text(""+this.options.closeText).html()}),"draggable"===e&&(s=o.is(":data(ui-draggable)"),s&&!i&&o.draggable("destroy"),!s&&i&&this._makeDraggable()),"position"===e&&this._position(),"resizable"===e&&(n=o.is(":data(ui-resizable)"),n&&!i&&o.resizable("destroy"),n&&"string"==typeof i&&o.resizable("option","handles",i),n||i===!1||this._makeResizable()),"title"===e&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var t,e,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),t=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),e=Math.max(0,s.minHeight-t),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-t):"none","auto"===s.height?this.element.css({minHeight:e,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-t)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var e=t(this);return t("<div>").css({position:"absolute",width:e.outerWidth(),height:e.outerHeight()}).appendTo(e.parent()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(e){return t(e.target).closest(".ui-dialog").length?!0:!!t(e.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var e=!0;this._delay(function(){e=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(t){e||this._allowInteraction(t)||(t.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=t("<div>").appendTo(this._appendTo()),this._addClass(this.overlay,null,"ui-widget-overlay ui-front"),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var t=this.document.data("ui-dialog-overlays")-1;t?this.document.data("ui-dialog-overlays",t):(this._off(this.document,"focusin"),this.document.removeData("ui-dialog-overlays")),this.overlay.remove(),this.overlay=null}}}),t.uiBackCompat!==!1&&t.widget("ui.dialog",t.ui.dialog,{options:{dialogClass:""},_createWrapper:function(){this._super(),this.uiDialog.addClass(this.options.dialogClass)},_setOption:function(t,e){"dialogClass"===t&&this.uiDialog.removeClass(this.options.dialogClass).addClass(e),this._superApply(arguments)}}),t.ui.dialog,t.widget("ui.droppable",{version:"1.12.1",widgetEventPrefix:"drop",options:{accept:"*",addClasses:!0,greedy:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var e,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=t.isFunction(s)?s:function(t){return t.is(s)},this.proportions=function(){return arguments.length?(e=arguments[0],void 0):e?e:e={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this._addClass("ui-droppable")},_addToManager:function(e){t.ui.ddmanager.droppables[e]=t.ui.ddmanager.droppables[e]||[],t.ui.ddmanager.droppables[e].push(this)},_splice:function(t){for(var e=0;t.length>e;e++)t[e]===this&&t.splice(e,1)},_destroy:function(){var e=t.ui.ddmanager.droppables[this.options.scope];this._splice(e)},_setOption:function(e,i){if("accept"===e)this.accept=t.isFunction(i)?i:function(t){return t.is(i)};else if("scope"===e){var s=t.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(e,i)},_activate:function(e){var i=t.ui.ddmanager.current;this._addActiveClass(),i&&this._trigger("activate",e,this.ui(i))},_deactivate:function(e){var i=t.ui.ddmanager.current;this._removeActiveClass(),i&&this._trigger("deactivate",e,this.ui(i))},_over:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._addHoverClass(),this._trigger("over",e,this.ui(i)))},_out:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._removeHoverClass(),this._trigger("out",e,this.ui(i)))},_drop:function(e,i){var s=i||t.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var i=t(this).droppable("instance");return i.options.greedy&&!i.options.disabled&&i.options.scope===s.options.scope&&i.accept.call(i.element[0],s.currentItem||s.element)&&v(s,t.extend(i,{offset:i.element.offset()}),i.options.tolerance,e)?(n=!0,!1):void 0}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this._removeActiveClass(),this._removeHoverClass(),this._trigger("drop",e,this.ui(s)),this.element):!1):!1},ui:function(t){return{draggable:t.currentItem||t.element,helper:t.helper,position:t.position,offset:t.positionAbs}},_addHoverClass:function(){this._addClass("ui-droppable-hover")},_removeHoverClass:function(){this._removeClass("ui-droppable-hover")},_addActiveClass:function(){this._addClass("ui-droppable-active")},_removeActiveClass:function(){this._removeClass("ui-droppable-active")}});var v=t.ui.intersect=function(){function t(t,e,i){return t>=e&&e+i>t}return function(e,i,s,n){if(!i.offset)return!1;var o=(e.positionAbs||e.position.absolute).left+e.margins.left,a=(e.positionAbs||e.position.absolute).top+e.margins.top,r=o+e.helperProportions.width,h=a+e.helperProportions.height,l=i.offset.left,c=i.offset.top,u=l+i.proportions().width,d=c+i.proportions().height;switch(s){case"fit":return o>=l&&u>=r&&a>=c&&d>=h;case"intersect":return o+e.helperProportions.width/2>l&&u>r-e.helperProportions.width/2&&a+e.helperProportions.height/2>c&&d>h-e.helperProportions.height/2;case"pointer":return t(n.pageY,c,i.proportions().height)&&t(n.pageX,l,i.proportions().width);case"touch":return(a>=c&&d>=a||h>=c&&d>=h||c>a&&h>d)&&(o>=l&&u>=o||r>=l&&u>=r||l>o&&r>u);default:return!1}}}();t.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,i){var s,n,o=t.ui.ddmanager.droppables[e.options.scope]||[],a=i?i.type:null,r=(e.currentItem||e.element).find(":data(ui-droppable)").addBack();t:for(s=0;o.length>s;s++)if(!(o[s].options.disabled||e&&!o[s].accept.call(o[s].element[0],e.currentItem||e.element))){for(n=0;r.length>n;n++)if(r[n]===o[s].element[0]){o[s].proportions().height=0;continue t}o[s].visible="none"!==o[s].element.css("display"),o[s].visible&&("mousedown"===a&&o[s]._activate.call(o[s],i),o[s].offset=o[s].element.offset(),o[s].proportions({width:o[s].element[0].offsetWidth,height:o[s].element[0].offsetHeight}))}},drop:function(e,i){var s=!1;return t.each((t.ui.ddmanager.droppables[e.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&v(e,this,this.options.tolerance,i)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],e.currentItem||e.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(e,i){e.element.parentsUntil("body").on("scroll.droppable",function(){e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)})},drag:function(e,i){e.options.refreshPositions&&t.ui.ddmanager.prepareOffsets(e,i),t.each(t.ui.ddmanager.droppables[e.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,o,a=v(e,this,this.options.tolerance,i),r=!a&&this.isover?"isout":a&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,o=this.element.parents(":data(ui-droppable)").filter(function(){return t(this).droppable("instance").options.scope===n}),o.length&&(s=t(o[0]).droppable("instance"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(e,i){e.element.parentsUntil("body").off("scroll.droppable"),e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)}},t.uiBackCompat!==!1&&t.widget("ui.droppable",t.ui.droppable,{options:{hoverClass:!1,activeClass:!1},_addActiveClass:function(){this._super(),this.options.activeClass&&this.element.addClass(this.options.activeClass)},_removeActiveClass:function(){this._super(),this.options.activeClass&&this.element.removeClass(this.options.activeClass)},_addHoverClass:function(){this._super(),this.options.hoverClass&&this.element.addClass(this.options.hoverClass)},_removeHoverClass:function(){this._super(),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass)}}),t.ui.droppable,t.widget("ui.progressbar",{version:"1.12.1",options:{classes:{"ui-progressbar":"ui-corner-all","ui-progressbar-value":"ui-corner-left","ui-progressbar-complete":"ui-corner-right"},max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.attr({role:"progressbar","aria-valuemin":this.min}),this._addClass("ui-progressbar","ui-widget ui-widget-content"),this.valueDiv=t("<div>").appendTo(this.element),this._addClass(this.valueDiv,"ui-progressbar-value","ui-widget-header"),this._refreshValue()},_destroy:function(){this.element.removeAttr("role aria-valuemin aria-valuemax aria-valuenow"),this.valueDiv.remove()},value:function(t){return void 0===t?this.options.value:(this.options.value=this._constrainedValue(t),this._refreshValue(),void 0)},_constrainedValue:function(t){return void 0===t&&(t=this.options.value),this.indeterminate=t===!1,"number"!=typeof t&&(t=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,t))},_setOptions:function(t){var e=t.value;delete t.value,this._super(t),this.options.value=this._constrainedValue(e),this._refreshValue()},_setOption:function(t,e){"max"===t&&(e=Math.max(this.min,e)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var e=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||e>this.min).width(i.toFixed(0)+"%"),this._toggleClass(this.valueDiv,"ui-progressbar-complete",null,e===this.options.max)._toggleClass("ui-progressbar-indeterminate",null,this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=t("<div>").appendTo(this.valueDiv),this._addClass(this.overlayDiv,"ui-progressbar-overlay"))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":e}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==e&&(this.oldValue=e,this._trigger("change")),e===this.options.max&&this._trigger("complete")}}),t.widget("ui.selectable",t.ui.mouse,{version:"1.12.1",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var e=this;this._addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){e.elementPos=t(e.element[0]).offset(),e.selectees=t(e.options.filter,e.element[0]),e._addClass(e.selectees,"ui-selectee"),e.selectees.each(function(){var i=t(this),s=i.offset(),n={left:s.left-e.elementPos.left,top:s.top-e.elementPos.top};t.data(this,"selectable-item",{element:this,$element:i,left:n.left,top:n.top,right:n.left+i.outerWidth(),bottom:n.top+i.outerHeight(),startselected:!1,selected:i.hasClass("ui-selected"),selecting:i.hasClass("ui-selecting"),unselecting:i.hasClass("ui-unselecting")})})},this.refresh(),this._mouseInit(),this.helper=t("<div>"),this._addClass(this.helper,"ui-selectable-helper")},_destroy:function(){this.selectees.removeData("selectable-item"),this._mouseDestroy()},_mouseStart:function(e){var i=this,s=this.options;this.opos=[e.pageX,e.pageY],this.elementPos=t(this.element[0]).offset(),this.options.disabled||(this.selectees=t(s.filter,this.element[0]),this._trigger("start",e),t(s.appendTo).append(this.helper),this.helper.css({left:e.pageX,top:e.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=t.data(this,"selectable-item");s.startselected=!0,e.metaKey||e.ctrlKey||(i._removeClass(s.$element,"ui-selected"),s.selected=!1,i._addClass(s.$element,"ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",e,{unselecting:s.element}))}),t(e.target).parents().addBack().each(function(){var s,n=t.data(this,"selectable-item");return n?(s=!e.metaKey&&!e.ctrlKey||!n.$element.hasClass("ui-selected"),i._removeClass(n.$element,s?"ui-unselecting":"ui-selected")._addClass(n.$element,s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",e,{selecting:n.element}):i._trigger("unselecting",e,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(e){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,o=this.opos[0],a=this.opos[1],r=e.pageX,h=e.pageY;return o>r&&(i=r,r=o,o=i),a>h&&(i=h,h=a,a=i),this.helper.css({left:o,top:a,width:r-o,height:h-a}),this.selectees.each(function(){var i=t.data(this,"selectable-item"),l=!1,c={};i&&i.element!==s.element[0]&&(c.left=i.left+s.elementPos.left,c.right=i.right+s.elementPos.left,c.top=i.top+s.elementPos.top,c.bottom=i.bottom+s.elementPos.top,"touch"===n.tolerance?l=!(c.left>r||o>c.right||c.top>h||a>c.bottom):"fit"===n.tolerance&&(l=c.left>o&&r>c.right&&c.top>a&&h>c.bottom),l?(i.selected&&(s._removeClass(i.$element,"ui-selected"),i.selected=!1),i.unselecting&&(s._removeClass(i.$element,"ui-unselecting"),i.unselecting=!1),i.selecting||(s._addClass(i.$element,"ui-selecting"),i.selecting=!0,s._trigger("selecting",e,{selecting:i.element}))):(i.selecting&&((e.metaKey||e.ctrlKey)&&i.startselected?(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,s._addClass(i.$element,"ui-selected"),i.selected=!0):(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,i.startselected&&(s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",e,{unselecting:i.element}))),i.selected&&(e.metaKey||e.ctrlKey||i.startselected||(s._removeClass(i.$element,"ui-selected"),i.selected=!1,s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",e,{unselecting:i.element})))))}),!1}},_mouseStop:function(e){var i=this;return this.dragged=!1,t(".ui-unselecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",e,{unselected:s.element})}),t(".ui-selecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-selecting")._addClass(s.$element,"ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",e,{selected:s.element})}),this._trigger("stop",e),this.helper.remove(),!1}}),t.widget("ui.selectmenu",[t.ui.formResetMixin,{version:"1.12.1",defaultElement:"<select>",options:{appendTo:null,classes:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"},disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:!1,change:null,close:null,focus:null,open:null,select:null},_create:function(){var e=this.element.uniqueId().attr("id");this.ids={element:e,button:e+"-button",menu:e+"-menu"},this._drawButton(),this._drawMenu(),this._bindFormResetHandler(),this._rendered=!1,this.menuItems=t()},_drawButton:function(){var e,i=this,s=this._parseOption(this.element.find("option:selected"),this.element[0].selectedIndex);this.labels=this.element.labels().attr("for",this.ids.button),this._on(this.labels,{click:function(t){this.button.focus(),t.preventDefault()}}),this.element.hide(),this.button=t("<span>",{tabindex:this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true",title:this.element.attr("title")}).insertAfter(this.element),this._addClass(this.button,"ui-selectmenu-button ui-selectmenu-button-closed","ui-button ui-widget"),e=t("<span>").appendTo(this.button),this._addClass(e,"ui-selectmenu-icon","ui-icon "+this.options.icons.button),this.buttonItem=this._renderButtonItem(s).appendTo(this.button),this.options.width!==!1&&this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){i._rendered||i._refreshMenu()})},_drawMenu:function(){var e=this;this.menu=t("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=t("<div>").append(this.menu),this._addClass(this.menuWrap,"ui-selectmenu-menu","ui-front"),this.menuWrap.appendTo(this._appendTo()),this.menuInstance=this.menu.menu({classes:{"ui-menu":"ui-corner-bottom"},role:"listbox",select:function(t,i){t.preventDefault(),e._setSelection(),e._select(i.item.data("ui-selectmenu-item"),t)},focus:function(t,i){var s=i.item.data("ui-selectmenu-item");null!=e.focusIndex&&s.index!==e.focusIndex&&(e._trigger("focus",t,{item:s}),e.isOpen||e._select(s,t)),e.focusIndex=s.index,e.button.attr("aria-activedescendant",e.menuItems.eq(s.index).attr("id"))}}).menu("instance"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(this._getSelectedItem().data("ui-selectmenu-item")||{})),null===this.options.width&&this._resizeButton()},_refreshMenu:function(){var t,e=this.element.find("option");this.menu.empty(),this._parseOptions(e),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup").find(".ui-menu-item-wrapper"),this._rendered=!0,e.length&&(t=this._getSelectedItem(),this.menuInstance.focus(null,t),this._setAria(t.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(t){this.options.disabled||(this._rendered?(this._removeClass(this.menu.find(".ui-state-active"),null,"ui-state-active"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.menuItems.length&&(this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",t)))},_position:function(){this.menuWrap.position(t.extend({of:this.button},this.options.position))},close:function(t){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",t))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderButtonItem:function(e){var i=t("<span>");return this._setText(i,e.label),this._addClass(i,"ui-selectmenu-text"),i},_renderMenu:function(e,i){var s=this,n="";t.each(i,function(i,o){var a;o.optgroup!==n&&(a=t("<li>",{text:o.optgroup}),s._addClass(a,"ui-selectmenu-optgroup","ui-menu-divider"+(o.element.parent("optgroup").prop("disabled")?" ui-state-disabled":"")),a.appendTo(e),n=o.optgroup),s._renderItemData(e,o)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-selectmenu-item",e)},_renderItem:function(e,i){var s=t("<li>"),n=t("<div>",{title:i.element.attr("title")});return i.disabled&&this._addClass(s,null,"ui-state-disabled"),this._setText(n,i.label),s.append(n).appendTo(e)},_setText:function(t,e){e?t.text(e):t.html("&#160;")},_move:function(t,e){var i,s,n=".ui-menu-item";this.isOpen?i=this.menuItems.eq(this.focusIndex).parent("li"):(i=this.menuItems.eq(this.element[0].selectedIndex).parent("li"),n+=":not(.ui-state-disabled)"),s="first"===t||"last"===t?i["first"===t?"prevAll":"nextAll"](n).eq(-1):i[t+"All"](n).eq(0),s.length&&this.menuInstance.focus(e,s)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex).parent("li")},_toggle:function(t){this[this.isOpen?"close":"open"](t)},_setSelection:function(){var t;this.range&&(window.getSelection?(t=window.getSelection(),t.removeAllRanges(),t.addRange(this.range)):this.range.select(),this.button.focus())},_documentClick:{mousedown:function(e){this.isOpen&&(t(e.target).closest(".ui-selectmenu-menu, #"+t.ui.escapeSelector(this.ids.button)).length||this.close(e))}},_buttonEvents:{mousedown:function(){var t;window.getSelection?(t=window.getSelection(),t.rangeCount&&(this.range=t.getRangeAt(0))):this.range=document.selection.createRange()},click:function(t){this._setSelection(),this._toggle(t)},keydown:function(e){var i=!0;switch(e.keyCode){case t.ui.keyCode.TAB:case t.ui.keyCode.ESCAPE:this.close(e),i=!1;break;case t.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(e);break;case t.ui.keyCode.UP:e.altKey?this._toggle(e):this._move("prev",e);break;case t.ui.keyCode.DOWN:e.altKey?this._toggle(e):this._move("next",e);break;case t.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(e):this._toggle(e);break;case t.ui.keyCode.LEFT:this._move("prev",e);break;case t.ui.keyCode.RIGHT:this._move("next",e);break;case t.ui.keyCode.HOME:case t.ui.keyCode.PAGE_UP:this._move("first",e);break;case t.ui.keyCode.END:case t.ui.keyCode.PAGE_DOWN:this._move("last",e);break;default:this.menu.trigger(e),i=!1}i&&e.preventDefault()}},_selectFocusedItem:function(t){var e=this.menuItems.eq(this.focusIndex).parent("li");e.hasClass("ui-state-disabled")||this._select(e.data("ui-selectmenu-item"),t)},_select:function(t,e){var i=this.element[0].selectedIndex;this.element[0].selectedIndex=t.index,this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(t)),this._setAria(t),this._trigger("select",e,{item:t}),t.index!==i&&this._trigger("change",e,{item:t}),this.close(e)},_setAria:function(t){var e=this.menuItems.eq(t.index).attr("id");this.button.attr({"aria-labelledby":e,"aria-activedescendant":e}),this.menu.attr("aria-activedescendant",e)},_setOption:function(t,e){if("icons"===t){var i=this.button.find("span.ui-icon");this._removeClass(i,null,this.options.icons.button)._addClass(i,null,e.button)}this._super(t,e),"appendTo"===t&&this.menuWrap.appendTo(this._appendTo()),"width"===t&&this._resizeButton()},_setOptionDisabled:function(t){this._super(t),this.menuInstance.option("disabled",t),this.button.attr("aria-disabled",t),this._toggleClass(this.button,null,"ui-state-disabled",t),this.element.prop("disabled",t),t?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_toggleAttr:function(){this.button.attr("aria-expanded",this.isOpen),this._removeClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"closed":"open"))._addClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"open":"closed"))._toggleClass(this.menuWrap,"ui-selectmenu-open",null,this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var t=this.options.width;return t===!1?(this.button.css("width",""),void 0):(null===t&&(t=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(t),void 0)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){var t=this._super();return t.disabled=this.element.prop("disabled"),t},_parseOptions:function(e){var i=this,s=[];e.each(function(e,n){s.push(i._parseOption(t(n),e))}),this.items=s},_parseOption:function(t,e){var i=t.parent("optgroup");return{element:t,index:e,value:t.val(),label:t.text(),optgroup:i.attr("label")||"",disabled:i.prop("disabled")||t.prop("disabled")}},_destroy:function(){this._unbindFormResetHandler(),this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.labels.attr("for",this.ids.element)}}]),t.widget("ui.slider",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"slide",options:{animate:!1,classes:{"ui-slider":"ui-corner-all","ui-slider-handle":"ui-corner-all","ui-slider-range":"ui-corner-all ui-widget-header"},distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this._addClass("ui-slider ui-slider-"+this.orientation,"ui-widget ui-widget-content"),this._refresh(),this._animateOff=!1
-},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var e,i,s=this.options,n=this.element.find(".ui-slider-handle"),o="<span tabindex='0'></span>",a=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),e=n.length;i>e;e++)a.push(o);this.handles=n.add(t(a.join("")).appendTo(this.element)),this._addClass(this.handles,"ui-slider-handle","ui-state-default"),this.handle=this.handles.eq(0),this.handles.each(function(e){t(this).data("ui-slider-handle-index",e).attr("tabIndex",0)})},_createRange:function(){var e=this.options;e.range?(e.range===!0&&(e.values?e.values.length&&2!==e.values.length?e.values=[e.values[0],e.values[0]]:t.isArray(e.values)&&(e.values=e.values.slice(0)):e.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?(this._removeClass(this.range,"ui-slider-range-min ui-slider-range-max"),this.range.css({left:"",bottom:""})):(this.range=t("<div>").appendTo(this.element),this._addClass(this.range,"ui-slider-range")),("min"===e.range||"max"===e.range)&&this._addClass(this.range,"ui-slider-range-"+e.range)):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this._mouseDestroy()},_mouseCapture:function(e){var i,s,n,o,a,r,h,l,c=this,u=this.options;return u.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:e.pageX,y:e.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(e){var i=Math.abs(s-c.values(e));(n>i||n===i&&(e===c._lastChangedValue||c.values(e)===u.min))&&(n=i,o=t(this),a=e)}),r=this._start(e,a),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=a,this._addClass(o,null,"ui-state-active"),o.trigger("focus"),h=o.offset(),l=!t(e.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:e.pageX-h.left-o.width()/2,top:e.pageY-h.top-o.height()/2-(parseInt(o.css("borderTopWidth"),10)||0)-(parseInt(o.css("borderBottomWidth"),10)||0)+(parseInt(o.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(e,a,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(t){var e={x:t.pageX,y:t.pageY},i=this._normValueFromMouse(e);return this._slide(t,this._handleIndex,i),!1},_mouseStop:function(t){return this._removeClass(this.handles,null,"ui-state-active"),this._mouseSliding=!1,this._stop(t,this._handleIndex),this._change(t,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(t){var e,i,s,n,o;return"horizontal"===this.orientation?(e=this.elementSize.width,i=t.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(e=this.elementSize.height,i=t.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/e,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),o=this._valueMin()+s*n,this._trimAlignValue(o)},_uiHash:function(t,e,i){var s={handle:this.handles[t],handleIndex:t,value:void 0!==e?e:this.value()};return this._hasMultipleValues()&&(s.value=void 0!==e?e:this.values(t),s.values=i||this.values()),s},_hasMultipleValues:function(){return this.options.values&&this.options.values.length},_start:function(t,e){return this._trigger("start",t,this._uiHash(e))},_slide:function(t,e,i){var s,n,o=this.value(),a=this.values();this._hasMultipleValues()&&(n=this.values(e?0:1),o=this.values(e),2===this.options.values.length&&this.options.range===!0&&(i=0===e?Math.min(n,i):Math.max(n,i)),a[e]=i),i!==o&&(s=this._trigger("slide",t,this._uiHash(e,i,a)),s!==!1&&(this._hasMultipleValues()?this.values(e,i):this.value(i)))},_stop:function(t,e){this._trigger("stop",t,this._uiHash(e))},_change:function(t,e){this._keySliding||this._mouseSliding||(this._lastChangedValue=e,this._trigger("change",t,this._uiHash(e)))},value:function(t){return arguments.length?(this.options.value=this._trimAlignValue(t),this._refreshValue(),this._change(null,0),void 0):this._value()},values:function(e,i){var s,n,o;if(arguments.length>1)return this.options.values[e]=this._trimAlignValue(i),this._refreshValue(),this._change(null,e),void 0;if(!arguments.length)return this._values();if(!t.isArray(arguments[0]))return this._hasMultipleValues()?this._values(e):this.value();for(s=this.options.values,n=arguments[0],o=0;s.length>o;o+=1)s[o]=this._trimAlignValue(n[o]),this._change(null,o);this._refreshValue()},_setOption:function(e,i){var s,n=0;switch("range"===e&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),t.isArray(this.options.values)&&(n=this.options.values.length),this._super(e,i),e){case"orientation":this._detectOrientation(),this._removeClass("ui-slider-horizontal ui-slider-vertical")._addClass("ui-slider-"+this.orientation),this._refreshValue(),this.options.range&&this._refreshRange(i),this.handles.css("horizontal"===i?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=n-1;s>=0;s--)this._change(null,s);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_setOptionDisabled:function(t){this._super(t),this._toggleClass(null,"ui-state-disabled",!!t)},_value:function(){var t=this.options.value;return t=this._trimAlignValue(t)},_values:function(t){var e,i,s;if(arguments.length)return e=this.options.values[t],e=this._trimAlignValue(e);if(this._hasMultipleValues()){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(t){if(this._valueMin()>=t)return this._valueMin();if(t>=this._valueMax())return this._valueMax();var e=this.options.step>0?this.options.step:1,i=(t-this._valueMin())%e,s=t-i;return 2*Math.abs(i)>=e&&(s+=i>0?e:-e),parseFloat(s.toFixed(5))},_calculateNewMax:function(){var t=this.options.max,e=this._valueMin(),i=this.options.step,s=Math.round((t-e)/i)*i;t=s+e,t>this.options.max&&(t-=i),this.max=parseFloat(t.toFixed(this._precision()))},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshRange:function(t){"vertical"===t&&this.range.css({width:"",left:""}),"horizontal"===t&&this.range.css({height:"",bottom:""})},_refreshValue:function(){var e,i,s,n,o,a=this.options.range,r=this.options,h=this,l=this._animateOff?!1:r.animate,c={};this._hasMultipleValues()?this.handles.each(function(s){i=100*((h.values(s)-h._valueMin())/(h._valueMax()-h._valueMin())),c["horizontal"===h.orientation?"left":"bottom"]=i+"%",t(this).stop(1,1)[l?"animate":"css"](c,r.animate),h.options.range===!0&&("horizontal"===h.orientation?(0===s&&h.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({width:i-e+"%"},{queue:!1,duration:r.animate})):(0===s&&h.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({height:i-e+"%"},{queue:!1,duration:r.animate}))),e=i}):(s=this.value(),n=this._valueMin(),o=this._valueMax(),i=o!==n?100*((s-n)/(o-n)):0,c["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](c,r.animate),"min"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},r.animate),"max"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:100-i+"%"},r.animate),"min"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},r.animate),"max"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:100-i+"%"},r.animate))},_handleEvents:{keydown:function(e){var i,s,n,o,a=t(e.target).data("ui-slider-handle-index");switch(e.keyCode){case t.ui.keyCode.HOME:case t.ui.keyCode.END:case t.ui.keyCode.PAGE_UP:case t.ui.keyCode.PAGE_DOWN:case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(e.preventDefault(),!this._keySliding&&(this._keySliding=!0,this._addClass(t(e.target),null,"ui-state-active"),i=this._start(e,a),i===!1))return}switch(o=this.options.step,s=n=this._hasMultipleValues()?this.values(a):this.value(),e.keyCode){case t.ui.keyCode.HOME:n=this._valueMin();break;case t.ui.keyCode.END:n=this._valueMax();break;case t.ui.keyCode.PAGE_UP:n=this._trimAlignValue(s+(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.PAGE_DOWN:n=this._trimAlignValue(s-(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:if(s===this._valueMax())return;n=this._trimAlignValue(s+o);break;case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(s===this._valueMin())return;n=this._trimAlignValue(s-o)}this._slide(e,a,n)},keyup:function(e){var i=t(e.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(e,i),this._change(e,i),this._removeClass(t(e.target),null,"ui-state-active"))}}}),t.widget("ui.sortable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(t,e,i){return t>=e&&e+i>t},_isFloating:function(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))},_create:function(){this.containerCache={},this._addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(t,e){this._super(t,e),"handle"===t&&this._setHandleClassName()},_setHandleClassName:function(){var e=this;this._removeClass(this.element.find(".ui-sortable-handle"),"ui-sortable-handle"),t.each(this.items,function(){e._addClass(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item,"ui-sortable-handle")})},_destroy:function(){this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):void 0}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("<style>*{ cursor: "+a.cursor+" !important; }</style>").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this._addClass(this.helper,"ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY<a.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+a.scrollSpeed:e.pageY-this.overflowOffset.top<a.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-a.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-e.pageX<a.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+a.scrollSpeed:e.pageX-this.overflowOffset.left<a.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-a.scrollSpeed)):(e.pageY-this.document.scrollTop()<a.scrollSensitivity?r=this.document.scrollTop(this.document.scrollTop()-a.scrollSpeed):this.window.height()-(e.pageY-this.document.scrollTop())<a.scrollSensitivity&&(r=this.document.scrollTop(this.document.scrollTop()+a.scrollSpeed)),e.pageX-this.document.scrollLeft()<a.scrollSensitivity?r=this.document.scrollLeft(this.document.scrollLeft()-a.scrollSpeed):this.window.width()-(e.pageX-this.document.scrollLeft())<a.scrollSensitivity&&(r=this.document.scrollLeft(this.document.scrollLeft()+a.scrollSpeed))),r!==!1&&t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp(new t.Event("mouseup",{target:null})),"original"===this.options.helper?(this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,h=r+t.height,l=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+l>r&&h>s+l,d="y"===this.options.axis||e+c>o&&a>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var e,i,s="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top,t.height),n="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left,t.width),o=s&&n;return o?(e=this._getDragVerticalDirection(),i=this._getDragHorizontalDirection(),this.floating?"right"===i||"down"===e?2:1:e&&("down"===e?2:1)):!1},_intersectsWithSides:function(t){var e=this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&e||"up"===s&&!e)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){function i(){r.push(this)}var s,n,o,a,r=[],h=[],l=this._connectWith();if(l&&e)for(s=l.length-1;s>=0;s--)for(o=t(l[s],this.document[0]),n=o.length-1;n>=0;n--)a=t.data(o[n],this.widgetFullName),a&&a!==this&&!a.options.disabled&&h.push([t.isFunction(a.options.items)?a.options.items.call(a.element):t(a.options.items,a.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),a]);for(h.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=h.length-1;s>=0;s--)h[s][0].each(i);return t(r)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,h,l,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i],this.document[0]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,l=r.length;l>s;s++)h=t(r[s]),h.data(this.widgetName+"-item",a),c.push({item:h,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.floating=this.items.length?"x"===this.options.axis||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]);return e._addClass(n,"ui-sortable-placeholder",i||e.currentItem[0].className)._removeClass(n,"ui-sortable-helper"),"tbody"===s?e._createTrPlaceholder(e.currentItem.find("tr").eq(0),t("<tr>",e.document[0]).appendTo(n)):"tr"===s?e._createTrPlaceholder(e.currentItem,n):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_createTrPlaceholder:function(e,i){var s=this;e.children().each(function(){t("<td>&#160;</td>",s.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(i)})},_contactContainers:function(e){var i,s,n,o,a,r,h,l,c,u,d=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!t.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(d&&t.contains(this.containers[i].element[0],d.element[0]))continue;d=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",e,this._uiHash(this)),this.containers[i].containerCache.over=0);if(d)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,o=null,c=d.floating||this._isFloating(this.currentItem),a=c?"left":"top",r=c?"width":"height",u=c?"pageX":"pageY",s=this.items.length-1;s>=0;s--)t.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(h=this.items[s].item.offset()[a],l=!1,e[u]-h>this.items[s][r]/2&&(l=!0),n>Math.abs(e[u]-h)&&(n=Math.abs(e[u]-h),o=this.items[s],this.direction=l?"up":"down"));if(!o&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;o?this._rearrange(e,o,null,!0):this._rearrange(e,null,this.containers[p].element,!0),this._trigger("change",e,this._uiHash()),this.containers[p]._trigger("change",e,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===n.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===n.containment?this.document.height()||document.body.parentNode.scrollHeight:this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.left<this.containment[0]&&(o=this.containment[0]+this.offset.click.left),e.pageY-this.offset.click.top<this.containment[1]&&(a=this.containment[1]+this.offset.click.top),e.pageX-this.offset.click.left>this.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;
-this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){function i(t,e,i){return function(s){i._trigger(t,s,e._uiHash(e))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&n.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||n.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(n.push(function(t){this._trigger("remove",t,this._uiHash())}),n.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)e||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!e){for(s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}}),t.widget("ui.spinner",{version:"1.12.1",defaultElement:"<input>",widgetEventPrefix:"spin",options:{classes:{"ui-spinner":"ui-corner-all","ui-spinner-down":"ui-corner-br","ui-spinner-up":"ui-corner-tr"},culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var e=this._super(),i=this.element;return t.each(["min","max","step"],function(t,s){var n=i.attr(s);null!=n&&n.length&&(e[s]=n)}),e},_events:{keydown:function(t){this._start(t)&&this._keydown(t)&&t.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",t),void 0)},mousewheel:function(t,e){if(e){if(!this.spinning&&!this._start(t))return!1;this._spin((e>0?1:-1)*this.options.step,t),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(t)},100),t.preventDefault()}},"mousedown .ui-spinner-button":function(e){function i(){var e=this.element[0]===t.ui.safeActiveElement(this.document[0]);e||(this.element.trigger("focus"),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===t.ui.safeActiveElement(this.document[0])?this.previous:this.element.val(),e.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(e)!==!1&&this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(e){return t(e.currentTarget).hasClass("ui-state-active")?this._start(e)===!1?!1:(this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap("<span>").parent().append("<a></a><a></a>")},_draw:function(){this._enhance(),this._addClass(this.uiSpinner,"ui-spinner","ui-widget ui-widget-content"),this._addClass("ui-spinner-input"),this.element.attr("role","spinbutton"),this.buttons=this.uiSpinner.children("a").attr("tabIndex",-1).attr("aria-hidden",!0).button({classes:{"ui-button":""}}),this._removeClass(this.buttons,"ui-corner-all"),this._addClass(this.buttons.first(),"ui-spinner-button ui-spinner-up"),this._addClass(this.buttons.last(),"ui-spinner-button ui-spinner-down"),this.buttons.first().button({icon:this.options.icons.up,showLabel:!1}),this.buttons.last().button({icon:this.options.icons.down,showLabel:!1}),this.buttons.height()>Math.ceil(.5*this.uiSpinner.height())&&this.uiSpinner.height()>0&&this.uiSpinner.height(this.uiSpinner.height())},_keydown:function(e){var i=this.options,s=t.ui.keyCode;switch(e.keyCode){case s.UP:return this._repeat(null,1,e),!0;case s.DOWN:return this._repeat(null,-1,e),!0;case s.PAGE_UP:return this._repeat(null,i.page,e),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,e),!0}return!1},_start:function(t){return this.spinning||this._trigger("start",t)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(t,e,i){t=t||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,e,i)},t),this._spin(e*this.options.step,i)},_spin:function(t,e){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+t*this._increment(this.counter)),this.spinning&&this._trigger("spin",e,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(e){var i=this.options.incremental;return i?t.isFunction(i)?i(e):Math.floor(e*e*e/5e4-e*e/500+17*e/200+1):1},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_adjustValue:function(t){var e,i,s=this.options;return e=null!==s.min?s.min:0,i=t-e,i=Math.round(i/s.step)*s.step,t=e+i,t=parseFloat(t.toFixed(this._precision())),null!==s.max&&t>s.max?s.max:null!==s.min&&s.min>t?s.min:t},_stop:function(t){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",t))},_setOption:function(t,e){var i,s,n;return"culture"===t||"numberFormat"===t?(i=this._parse(this.element.val()),this.options[t]=e,this.element.val(this._format(i)),void 0):(("max"===t||"min"===t||"step"===t)&&"string"==typeof e&&(e=this._parse(e)),"icons"===t&&(s=this.buttons.first().find(".ui-icon"),this._removeClass(s,null,this.options.icons.up),this._addClass(s,null,e.up),n=this.buttons.last().find(".ui-icon"),this._removeClass(n,null,this.options.icons.down),this._addClass(n,null,e.down)),this._super(t,e),void 0)},_setOptionDisabled:function(t){this._super(t),this._toggleClass(this.uiSpinner,null,"ui-state-disabled",!!t),this.element.prop("disabled",!!t),this.buttons.button(t?"disable":"enable")},_setOptions:r(function(t){this._super(t)}),_parse:function(t){return"string"==typeof t&&""!==t&&(t=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(t,10,this.options.culture):+t),""===t||isNaN(t)?null:t},_format:function(t){return""===t?"":window.Globalize&&this.options.numberFormat?Globalize.format(t,this.options.numberFormat,this.options.culture):t},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var t=this.value();return null===t?!1:t===this._adjustValue(t)},_value:function(t,e){var i;""!==t&&(i=this._parse(t),null!==i&&(e||(i=this._adjustValue(i)),t=this._format(i))),this.element.val(t),this._refresh()},_destroy:function(){this.element.prop("disabled",!1).removeAttr("autocomplete role aria-valuemin aria-valuemax aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:r(function(t){this._stepUp(t)}),_stepUp:function(t){this._start()&&(this._spin((t||1)*this.options.step),this._stop())},stepDown:r(function(t){this._stepDown(t)}),_stepDown:function(t){this._start()&&(this._spin((t||1)*-this.options.step),this._stop())},pageUp:r(function(t){this._stepUp((t||1)*this.options.page)}),pageDown:r(function(t){this._stepDown((t||1)*this.options.page)}),value:function(t){return arguments.length?(r(this._value).call(this,t),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}}),t.uiBackCompat!==!1&&t.widget("ui.spinner",t.ui.spinner,{_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml())},_uiSpinnerHtml:function(){return"<span>"},_buttonHtml:function(){return"<a></a><a></a>"}}),t.ui.spinner,t.widget("ui.tabs",{version:"1.12.1",delay:300,options:{active:null,classes:{"ui-tabs":"ui-corner-all","ui-tabs-nav":"ui-corner-all","ui-tabs-panel":"ui-corner-bottom","ui-tabs-tab":"ui-corner-top"},collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var t=/#.*$/;return function(e){var i,s;i=e.href.replace(t,""),s=location.href.replace(t,"");try{i=decodeURIComponent(i)}catch(n){}try{s=decodeURIComponent(s)}catch(n){}return e.hash.length>1&&i===s}}(),_create:function(){var e=this,i=this.options;this.running=!1,this._addClass("ui-tabs","ui-widget ui-widget-content"),this._toggleClass("ui-tabs-collapsible",null,i.collapsible),this._processTabs(),i.active=this._initialActive(),t.isArray(i.disabled)&&(i.disabled=t.unique(i.disabled.concat(t.map(this.tabs.filter(".ui-state-disabled"),function(t){return e.tabs.index(t)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):t(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var e=this.options.active,i=this.options.collapsible,s=location.hash.substring(1);return null===e&&(s&&this.tabs.each(function(i,n){return t(n).attr("aria-controls")===s?(e=i,!1):void 0}),null===e&&(e=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===e||-1===e)&&(e=this.tabs.length?0:!1)),e!==!1&&(e=this.tabs.index(this.tabs.eq(e)),-1===e&&(e=i?!1:0)),!i&&e===!1&&this.anchors.length&&(e=0),e},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):t()}},_tabKeydown:function(e){var i=t(t.ui.safeActiveElement(this.document[0])).closest("li"),s=this.tabs.index(i),n=!0;if(!this._handlePageNav(e)){switch(e.keyCode){case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:s++;break;case t.ui.keyCode.UP:case t.ui.keyCode.LEFT:n=!1,s--;break;case t.ui.keyCode.END:s=this.anchors.length-1;break;case t.ui.keyCode.HOME:s=0;break;case t.ui.keyCode.SPACE:return e.preventDefault(),clearTimeout(this.activating),this._activate(s),void 0;case t.ui.keyCode.ENTER:return e.preventDefault(),clearTimeout(this.activating),this._activate(s===this.options.active?!1:s),void 0;default:return}e.preventDefault(),clearTimeout(this.activating),s=this._focusNextTab(s,n),e.ctrlKey||e.metaKey||(i.attr("aria-selected","false"),this.tabs.eq(s).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",s)},this.delay))}},_panelKeydown:function(e){this._handlePageNav(e)||e.ctrlKey&&e.keyCode===t.ui.keyCode.UP&&(e.preventDefault(),this.active.trigger("focus"))},_handlePageNav:function(e){return e.altKey&&e.keyCode===t.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):e.altKey&&e.keyCode===t.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(e,i){function s(){return e>n&&(e=0),0>e&&(e=n),e}for(var n=this.tabs.length-1;-1!==t.inArray(s(),this.options.disabled);)e=i?e+1:e-1;return e},_focusNextTab:function(t,e){return t=this._findNextTab(t,e),this.tabs.eq(t).trigger("focus"),t},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):(this._super(t,e),"collapsible"===t&&(this._toggleClass("ui-tabs-collapsible",null,e),e||this.options.active!==!1||this._activate(0)),"event"===t&&this._setupEvents(e),"heightStyle"===t&&this._setupHeightStyle(e),void 0)},_sanitizeSelector:function(t){return t?t.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var e=this.options,i=this.tablist.children(":has(a[href])");e.disabled=t.map(i.filter(".ui-state-disabled"),function(t){return i.index(t)}),this._processTabs(),e.active!==!1&&this.anchors.length?this.active.length&&!t.contains(this.tablist[0],this.active[0])?this.tabs.length===e.disabled.length?(e.active=!1,this.active=t()):this._activate(this._findNextTab(Math.max(0,e.active-1),!1)):e.active=this.tabs.index(this.active):(e.active=!1,this.active=t()),this._refresh()},_refresh:function(){this._setOptionDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._addClass(this.active,"ui-tabs-active","ui-state-active"),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var e=this,i=this.tabs,s=this.anchors,n=this.panels;this.tablist=this._getList().attr("role","tablist"),this._addClass(this.tablist,"ui-tabs-nav","ui-helper-reset ui-helper-clearfix ui-widget-header"),this.tablist.on("mousedown"+this.eventNamespace,"> li",function(e){t(this).is(".ui-state-disabled")&&e.preventDefault()}).on("focus"+this.eventNamespace,".ui-tabs-anchor",function(){t(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").attr({role:"tab",tabIndex:-1}),this._addClass(this.tabs,"ui-tabs-tab","ui-state-default"),this.anchors=this.tabs.map(function(){return t("a",this)[0]}).attr({role:"presentation",tabIndex:-1}),this._addClass(this.anchors,"ui-tabs-anchor"),this.panels=t(),this.anchors.each(function(i,s){var n,o,a,r=t(s).uniqueId().attr("id"),h=t(s).closest("li"),l=h.attr("aria-controls");e._isLocal(s)?(n=s.hash,a=n.substring(1),o=e.element.find(e._sanitizeSelector(n))):(a=h.attr("aria-controls")||t({}).uniqueId()[0].id,n="#"+a,o=e.element.find(n),o.length||(o=e._createPanel(a),o.insertAfter(e.panels[i-1]||e.tablist)),o.attr("aria-live","polite")),o.length&&(e.panels=e.panels.add(o)),l&&h.data("ui-tabs-aria-controls",l),h.attr({"aria-controls":a,"aria-labelledby":r}),o.attr("aria-labelledby",r)}),this.panels.attr("role","tabpanel"),this._addClass(this.panels,"ui-tabs-panel","ui-widget-content"),i&&(this._off(i.not(this.tabs)),this._off(s.not(this.anchors)),this._off(n.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol, ul").eq(0)},_createPanel:function(e){return t("<div>").attr("id",e).data("ui-tabs-destroy",!0)},_setOptionDisabled:function(e){var i,s,n;for(t.isArray(e)&&(e.length?e.length===this.anchors.length&&(e=!0):e=!1),n=0;s=this.tabs[n];n++)i=t(s),e===!0||-1!==t.inArray(n,e)?(i.attr("aria-disabled","true"),this._addClass(i,null,"ui-state-disabled")):(i.removeAttr("aria-disabled"),this._removeClass(i,null,"ui-state-disabled"));this.options.disabled=e,this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,e===!0)},_setupEvents:function(e){var i={};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(t){t.preventDefault()}}),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(e){var i,s=this.element.parent();"fill"===e?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=t(this).outerHeight(!0)}),this.panels.each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.panels.each(function(){i=Math.max(i,t(this).height("").height())}).height(i))},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n.closest("li"),a=o[0]===s[0],r=a&&i.collapsible,h=r?t():this._getPanelForTab(o),l=s.length?this._getPanelForTab(s):t(),c={oldTab:s,oldPanel:l,newTab:r?t():o,newPanel:h};e.preventDefault(),o.hasClass("ui-state-disabled")||o.hasClass("ui-tabs-loading")||this.running||a&&!i.collapsible||this._trigger("beforeActivate",e,c)===!1||(i.active=r?!1:this.tabs.index(o),this.active=a?t():o,this.xhr&&this.xhr.abort(),l.length||h.length||t.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(o),e),this._toggle(e,c))},_toggle:function(e,i){function s(){o.running=!1,o._trigger("activate",e,i)}function n(){o._addClass(i.newTab.closest("li"),"ui-tabs-active","ui-state-active"),a.length&&o.options.show?o._show(a,o.options.show,s):(a.show(),s())}var o=this,a=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){o._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),n()}):(this._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),r.hide(),n()),r.attr("aria-hidden","true"),i.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),a.length&&r.length?i.oldTab.attr("tabIndex",-1):a.length&&this.tabs.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),a.attr("aria-hidden","false"),i.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(e){var i,s=this._findActive(e);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return e===!1?t():this.tabs.eq(e)},_getIndex:function(e){return"string"==typeof e&&(e=this.anchors.index(this.anchors.filter("[href$='"+t.ui.escapeSelector(e)+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.tablist.removeAttr("role").off(this.eventNamespace),this.anchors.removeAttr("role tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){t.data(this,"ui-tabs-destroy")?t(this).remove():t(this).removeAttr("role tabIndex aria-live aria-busy aria-selected aria-labelledby aria-hidden aria-expanded")}),this.tabs.each(function(){var e=t(this),i=e.data("ui-tabs-aria-controls");i?e.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):e.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(e){var i=this.options.disabled;i!==!1&&(void 0===e?i=!1:(e=this._getIndex(e),i=t.isArray(i)?t.map(i,function(t){return t!==e?t:null}):t.map(this.tabs,function(t,i){return i!==e?i:null})),this._setOptionDisabled(i))},disable:function(e){var i=this.options.disabled;if(i!==!0){if(void 0===e)i=!0;else{if(e=this._getIndex(e),-1!==t.inArray(e,i))return;i=t.isArray(i)?t.merge([e],i).sort():[e]}this._setOptionDisabled(i)}},load:function(e,i){e=this._getIndex(e);var s=this,n=this.tabs.eq(e),o=n.find(".ui-tabs-anchor"),a=this._getPanelForTab(n),r={tab:n,panel:a},h=function(t,e){"abort"===e&&s.panels.stop(!1,!0),s._removeClass(n,"ui-tabs-loading"),a.removeAttr("aria-busy"),t===s.xhr&&delete s.xhr};this._isLocal(o[0])||(this.xhr=t.ajax(this._ajaxSettings(o,i,r)),this.xhr&&"canceled"!==this.xhr.statusText&&(this._addClass(n,"ui-tabs-loading"),a.attr("aria-busy","true"),this.xhr.done(function(t,e,n){setTimeout(function(){a.html(t),s._trigger("load",i,r),h(n,e)},1)}).fail(function(t,e){setTimeout(function(){h(t,e)},1)})))},_ajaxSettings:function(e,i,s){var n=this;return{url:e.attr("href").replace(/#.*$/,""),beforeSend:function(e,o){return n._trigger("beforeLoad",i,t.extend({jqXHR:e,ajaxSettings:o},s))}}},_getPanelForTab:function(e){var i=t(e).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}}),t.uiBackCompat!==!1&&t.widget("ui.tabs",t.ui.tabs,{_processTabs:function(){this._superApply(arguments),this._addClass(this.tabs,"ui-tab")}}),t.ui.tabs,t.widget("ui.tooltip",{version:"1.12.1",options:{classes:{"ui-tooltip":"ui-corner-all ui-widget-shadow"},content:function(){var e=t(this).attr("title")||"";return t("<a>").text(e).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,track:!1,close:null,open:null},_addDescribedBy:function(e,i){var s=(e.attr("aria-describedby")||"").split(/\s+/);s.push(i),e.data("ui-tooltip-id",i).attr("aria-describedby",t.trim(s.join(" ")))},_removeDescribedBy:function(e){var i=e.data("ui-tooltip-id"),s=(e.attr("aria-describedby")||"").split(/\s+/),n=t.inArray(i,s);-1!==n&&s.splice(n,1),e.removeData("ui-tooltip-id"),s=t.trim(s.join(" ")),s?e.attr("aria-describedby",s):e.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.liveRegion=t("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this.disabledTitles=t([])},_setOption:function(e,i){var s=this;this._super(e,i),"content"===e&&t.each(this.tooltips,function(t,e){s._updateContent(e.element)})},_setOptionDisabled:function(t){this[t?"_disable":"_enable"]()},_disable:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s.element[0],e.close(n,!0)}),this.disabledTitles=this.disabledTitles.add(this.element.find(this.options.items).addBack().filter(function(){var e=t(this);return e.is("[title]")?e.data("ui-tooltip-title",e.attr("title")).removeAttr("title"):void 0}))},_enable:function(){this.disabledTitles.each(function(){var e=t(this);e.data("ui-tooltip-title")&&e.attr("title",e.data("ui-tooltip-title"))}),this.disabledTitles=t([])},open:function(e){var i=this,s=t(e?e.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),e&&"mouseover"===e.type&&s.parents().each(function(){var e,s=t(this);s.data("ui-tooltip-open")&&(e=t.Event("blur"),e.target=e.currentTarget=this,i.close(e,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._registerCloseHandlers(e,s),this._updateContent(s,e))},_updateContent:function(t,e){var i,s=this.options.content,n=this,o=e?e.type:null;return"string"==typeof s||s.nodeType||s.jquery?this._open(e,t,s):(i=s.call(t[0],function(i){n._delay(function(){t.data("ui-tooltip-open")&&(e&&(e.type=o),this._open(e,t,i))})}),i&&this._open(e,t,i),void 0)},_open:function(e,i,s){function n(t){l.of=t,a.is(":hidden")||a.position(l)}var o,a,r,h,l=t.extend({},this.options.position);if(s){if(o=this._find(i))return o.tooltip.find(".ui-tooltip-content").html(s),void 0;i.is("[title]")&&(e&&"mouseover"===e.type?i.attr("title",""):i.removeAttr("title")),o=this._tooltip(i),a=o.tooltip,this._addDescribedBy(i,a.attr("id")),a.find(".ui-tooltip-content").html(s),this.liveRegion.children().hide(),h=t("<div>").html(a.find(".ui-tooltip-content").html()),h.removeAttr("name").find("[name]").removeAttr("name"),h.removeAttr("id").find("[id]").removeAttr("id"),h.appendTo(this.liveRegion),this.options.track&&e&&/^mouse/.test(e.type)?(this._on(this.document,{mousemove:n}),n(e)):a.position(t.extend({of:i},this.options.position)),a.hide(),this._show(a,this.options.show),this.options.track&&this.options.show&&this.options.show.delay&&(r=this.delayedShow=setInterval(function(){a.is(":visible")&&(n(l.of),clearInterval(r))},t.fx.interval)),this._trigger("open",e,{tooltip:a})}},_registerCloseHandlers:function(e,i){var s={keyup:function(e){if(e.keyCode===t.ui.keyCode.ESCAPE){var s=t.Event(e);s.currentTarget=i[0],this.close(s,!0)}}};i[0]!==this.element[0]&&(s.remove=function(){this._removeTooltip(this._find(i).tooltip)}),e&&"mouseover"!==e.type||(s.mouseleave="close"),e&&"focusin"!==e.type||(s.focusout="close"),this._on(!0,i,s)},close:function(e){var i,s=this,n=t(e?e.currentTarget:this.element),o=this._find(n);return o?(i=o.tooltip,o.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&!n.attr("title")&&n.attr("title",n.data("ui-tooltip-title")),this._removeDescribedBy(n),o.hiding=!0,i.stop(!0),this._hide(i,this.options.hide,function(){s._removeTooltip(t(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),e&&"mouseleave"===e.type&&t.each(this.parents,function(e,i){t(i.element).attr("title",i.title),delete s.parents[e]}),o.closing=!0,this._trigger("close",e,{tooltip:i}),o.hiding||(o.closing=!1)),void 0):(n.removeData("ui-tooltip-open"),void 0)},_tooltip:function(e){var i=t("<div>").attr("role","tooltip"),s=t("<div>").appendTo(i),n=i.uniqueId().attr("id");return this._addClass(s,"ui-tooltip-content"),this._addClass(i,"ui-tooltip","ui-widget ui-widget-content"),i.appendTo(this._appendTo(e)),this.tooltips[n]={element:e,tooltip:i}},_find:function(t){var e=t.data("ui-tooltip-id");return e?this.tooltips[e]:null},_removeTooltip:function(t){t.remove(),delete this.tooltips[t.attr("id")]},_appendTo:function(t){var e=t.closest(".ui-front, dialog");return e.length||(e=this.document[0].body),e},_destroy:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur"),o=s.element;n.target=n.currentTarget=o[0],e.close(n,!0),t("#"+i).remove(),o.data("ui-tooltip-title")&&(o.attr("title")||o.attr("title",o.data("ui-tooltip-title")),o.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}}),t.uiBackCompat!==!1&&t.widget("ui.tooltip",t.ui.tooltip,{options:{tooltipClass:null},_tooltip:function(){var t=this._superApply(arguments);return this.options.tooltipClass&&t.tooltip.addClass(this.options.tooltipClass),t}}),t.ui.tooltip});
\ No newline at end of file
diff --git a/route/static/js/jquery.contextify.min.js b/route/static/js/jquery.contextify.min.js
deleted file mode 100755
index 7cc68d13e..000000000
--- a/route/static/js/jquery.contextify.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
-* jQuery Contextify v1.0.7 (http://contextify.js.org)
-* Copyright (c) 2016 Adam Bouqdib
-* Licensed under GPL-2.0 (http://abemedia.co.uk/license) 
-*/
-(function(factory){if(typeof define==="function"&&define.amd){define(["jquery"],factory)}else{factory(jQuery,window)}}(function($,window){var pluginName="contextify",defaults={items:[],action:"contextmenu",menuId:"contextify-menu",menuClass:"dropdown-menu",headerClass:"dropdown-header",dividerClass:"divider",before:false},contextifyId=0;function Plugin(element,options){this.element=element;this.options=$.extend({},defaults,options);this._defaults=defaults;this._name=pluginName;this.init()}Plugin.prototype.init=function(){var options=$.extend({},this.options,$(this.element).data()),that=$(this);options.id=contextifyId;$(this.element).attr("data-contextify-id",options.id).on("contextmenu",function(e){e.preventDefault();if(typeof(options.before)==="function"){options.before(this,options)}var menu=$('<ul class="'+options.menuClass+'" role="menu" id="'+options.menuId+'" data-contextify-id="'+options.id+'"/>');menu.data(options);var l=options.items.length;var i;for(i=0;i<l;i++){var item=options.items[i];var el=$("<li/>");if(item.divider){el.addClass(options.dividerClass)}else{if(item.header){el.addClass(options.headerClass);el.html(item.header)}else{el.append("<a/>");var a=el.find("a");if(item.href){a.attr("href",item.href)}if(item.onclick){a.on("click",options,item.onclick);a.css("cursor","pointer")}if(item.data){for(var data in item.data){menu.attr("data-"+data,item.data[data])}a.data(item.data)}a.html(item.text)}}menu.append(el)}var currentMenu=$("#"+options.menuId);if(currentMenu.length>0){if(currentMenu!==menu){currentMenu.replaceWith(menu)}}else{$("body").append(menu)}var clientTop=$(window).scrollTop()+e.clientY,x=(menu.width()+e.clientX<$(window).width())?e.clientX:e.clientX-menu.width(),y=(menu.height()+e.clientY<$(window).height())?clientTop:clientTop-menu.height();menu.css("top",y).css("left",x).css("position","fixed").show();$(document).one("click",function(e){$("#"+options.menuId).hide();e.preventDefault()})}).one("click",function(e){$("#"+options.menuId).hide();e.preventDefault()});contextifyId++};Plugin.prototype.destroy=function(){var el=$(this.element),options=$.extend({},this.options,el.data()),menu=$("#"+options.menuId);el.removeAttr("data-contextify-id").off("contextmenu").parents().off("mouseup",function(){menu.hide()});menu.remove()};$.fn[pluginName]=function(options){return this.each(function(){if($.data(this,"plugin_"+pluginName)&&Object.prototype.toString.call(options)==="[object String]"){$.data(this,"plugin_"+pluginName)[options]()}else{if(!$.data(this,"plugin_"+pluginName)){$.data(this,"plugin_"+pluginName,new Plugin(this,options))}}})}}));
\ No newline at end of file
diff --git a/route/static/js/jquery.contextify.min.js.map b/route/static/js/jquery.contextify.min.js.map
deleted file mode 100755
index b669dedeb..000000000
--- a/route/static/js/jquery.contextify.min.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["jquery.contextify.js"],"names":["factory","define","amd","jQuery","window","$","Plugin","element","options","this","extend","defaults","_defaults","_name","pluginName","init","items","action","menuId","menuClass","headerClass","dividerClass","before","contextifyId","$window","prototype","data","id","attr","on","e","preventDefault","menu","i","l","length","item","el","divider","addClass","header","html","append","a","find","href","onclick","css","text","currentMenu","replaceWith","windowWidth","width","windowHeight","height","menuWidth","outerWidth","menuHeight","outerHeight","x","clientX","y","clientY","show","parents","hide","destroy","removeAttr","off","remove","fn","each","Object","toString","call"],"mappings":"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","file":"jquery.contextify.min.js"}
\ No newline at end of file
diff --git a/route/static/js/jquery.cookie-1.4.1.min.js b/route/static/js/jquery.cookie-1.4.1.min.js
deleted file mode 100644
index c0f19d8a3..000000000
--- a/route/static/js/jquery.cookie-1.4.1.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jquery.cookie v1.4.1 | MIT */
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?a(require("jquery")):a(jQuery)}(function(a){function b(a){return h.raw?a:encodeURIComponent(a)}function c(a){return h.raw?a:decodeURIComponent(a)}function d(a){return b(h.json?JSON.stringify(a):String(a))}function e(a){0===a.indexOf('"')&&(a=a.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,"\\"));try{return a=decodeURIComponent(a.replace(g," ")),h.json?JSON.parse(a):a}catch(b){}}function f(b,c){var d=h.raw?b:e(b);return a.isFunction(c)?c(d):d}var g=/\+/g,h=a.cookie=function(e,g,i){if(void 0!==g&&!a.isFunction(g)){if(i=a.extend({},h.defaults,i),"number"==typeof i.expires){var j=i.expires,k=i.expires=new Date;k.setTime(+k+864e5*j)}return document.cookie=[b(e),"=",d(g),i.expires?"; expires="+i.expires.toUTCString():"",i.path?"; path="+i.path:"",i.domain?"; domain="+i.domain:"",i.secure?"; secure":""].join("")}for(var l=e?void 0:{},m=document.cookie?document.cookie.split("; "):[],n=0,o=m.length;o>n;n++){var p=m[n].split("="),q=c(p.shift()),r=p.join("=");if(e&&e===q){l=f(r,g);break}e||void 0===(r=f(r))||(l[q]=r)}return l};h.defaults={},a.removeCookie=function(b,c){return void 0===a.cookie(b)?!1:(a.cookie(b,"",a.extend({},c,{expires:-1})),!a.cookie(b))}});
\ No newline at end of file
diff --git a/route/static/js/jquery.dragsort-0.5.2.min.js b/route/static/js/jquery.dragsort-0.5.2.min.js
deleted file mode 100755
index 799bf443c..000000000
--- a/route/static/js/jquery.dragsort-0.5.2.min.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// jQuery List DragSort v0.5.2
-// License: http://dragsort.codeplex.com/license
-(function(e){e.fn.dragsort=function(t){if(t=="destroy"){e(this.selector).trigger("dragsort-uninit");return}var n=e.extend({},e.fn.dragsort.defaults,t);var r=[];var i=null,s=null;this.each(function(t,o){if(e(o).is("table")&&e(o).children().size()==1&&e(o).children().is("tbody"))o=e(o).children().get(0);var u={draggedItem:null,placeHolderItem:null,pos:null,offset:null,offsetLimit:null,scroll:null,container:o,init:function(){n.tagName=e(this.container).children().size()==0?"li":e(this.container).children().get(0).tagName.toLowerCase();if(n.itemSelector=="")n.itemSelector=n.tagName;if(n.dragSelector=="")n.dragSelector=n.tagName;if(n.placeHolderTemplate=="")n.placeHolderTemplate="<"+n.tagName+">&nbsp;</"+n.tagName+">";e(this.container).attr("data-listidx",t).mousedown(this.grabItem).bind("dragsort-uninit",this.uninit);this.styleDragHandlers(true)},uninit:function(){var t=r[e(this).attr("data-listidx")];e(t.container).unbind("mousedown",t.grabItem).unbind("dragsort-uninit");t.styleDragHandlers(false)},getItems:function(){return e(this.container).children(n.itemSelector)},styleDragHandlers:function(t){this.getItems().map(function(){return e(this).is(n.dragSelector)?this:e(this).find(n.dragSelector).get()}).css("cursor",t?"pointer":"")},grabItem:function(t){var i=r[e(this).attr("data-listidx")];var s=e(t.target).closest("[data-listidx] > "+n.tagName).get(0);var o=i.getItems().filter(function(){return this==s}).size()>0;if(t.which!=1||e(t.target).is(n.dragSelectorExclude)||e(t.target).closest(n.dragSelectorExclude).size()>0||!o)return;t.preventDefault();var u=t.target;while(!e(u).is(n.dragSelector)){if(u==this)return;u=u.parentNode}e(u).attr("data-cursor",e(u).css("cursor"));e(u).css("cursor","move");var a=this;var f=function(){i.dragStart.call(a,t);e(i.container).unbind("mousemove",f)};e(i.container).mousemove(f).mouseup(function(){e(i.container).unbind("mousemove",f);e(u).css("cursor",e(u).attr("data-cursor"))})},dragStart:function(t){if(i!=null&&i.draggedItem!=null)i.dropItem();i=r[e(this).attr("data-listidx")];i.draggedItem=e(t.target).closest("[data-listidx] > "+n.tagName);i.draggedItem.attr("data-origpos",e(this).attr("data-listidx")+"-"+e(i.container).children().index(i.draggedItem));var s=parseInt(i.draggedItem.css("marginTop"));var o=parseInt(i.draggedItem.css("marginLeft"));i.offset=i.draggedItem.offset();i.offset.top=t.pageY-i.offset.top+(isNaN(s)?0:s)-1;i.offset.left=t.pageX-i.offset.left+(isNaN(o)?0:o)-1;if(!n.dragBetween){var u=e(i.container).outerHeight()==0?Math.max(1,Math.round(.5+i.getItems().size()*i.draggedItem.outerWidth()/e(i.container).outerWidth()))*i.draggedItem.outerHeight():e(i.container).outerHeight();i.offsetLimit=e(i.container).offset();i.offsetLimit.right=i.offsetLimit.left+e(i.container).outerWidth()-i.draggedItem.outerWidth();i.offsetLimit.bottom=i.offsetLimit.top+u-i.draggedItem.outerHeight()}var a=i.draggedItem.height();var f=i.draggedItem.width();if(n.tagName=="tr"){i.draggedItem.children().each(function(){e(this).width(e(this).width())});i.placeHolderItem=i.draggedItem.clone().attr("data-placeholder",true);i.draggedItem.after(i.placeHolderItem);i.placeHolderItem.children().each(function(){e(this).css({borderWidth:0,width:e(this).width()+1,height:e(this).height()+1}).html("&nbsp;")})}else{i.draggedItem.after(n.placeHolderTemplate);i.placeHolderItem=i.draggedItem.next().css({height:a+1,width:f+1}).attr("data-placeholder",true)}if(n.tagName=="td"){var l=i.draggedItem.closest("table").get(0);e("<table id='"+l.id+"' style='border-width: 0px;' class='dragSortItem "+l.className+"'><tr></tr></table>").appendTo("body").children().append(i.draggedItem)}var c=i.draggedItem.attr("style");i.draggedItem.attr("data-origstyle",c?c:"");i.draggedItem.css({position:"absolute",opacity:.8,"z-index":999,height:a,width:f});i.scroll={moveX:0,moveY:0,maxX:e(document).width()-e(window).width(),maxY:e(document).height()-e(window).height()};i.scroll.scrollY=window.setInterval(function(){if(n.scrollContainer!=window){e(n.scrollContainer).scrollTop(e(n.scrollContainer).scrollTop()+i.scroll.moveY);return}var t=e(n.scrollContainer).scrollTop();if(i.scroll.moveY>0&&t<i.scroll.maxY||i.scroll.moveY<0&&t>0){e(n.scrollContainer).scrollTop(t+i.scroll.moveY);i.draggedItem.css("top",i.draggedItem.offset().top+i.scroll.moveY+1)}},10);i.scroll.scrollX=window.setInterval(function(){if(n.scrollContainer!=window){e(n.scrollContainer).scrollLeft(e(n.scrollContainer).scrollLeft()+i.scroll.moveX);return}var t=e(n.scrollContainer).scrollLeft();if(i.scroll.moveX>0&&t<i.scroll.maxX||i.scroll.moveX<0&&t>0){e(n.scrollContainer).scrollLeft(t+i.scroll.moveX);i.draggedItem.css("left",i.draggedItem.offset().left+i.scroll.moveX+1)}},10);e(r).each(function(e,t){t.createDropTargets();t.buildPositionTable()});i.setPos(t.pageX,t.pageY);e(document).bind("mousemove",i.swapItems);e(document).bind("mouseup",i.dropItem);if(n.scrollContainer!=window)e(window).bind("wheel",i.wheel)},setPos:function(t,r){var s=r-this.offset.top;var o=t-this.offset.left;if(!n.dragBetween){s=Math.min(this.offsetLimit.bottom,Math.max(s,this.offsetLimit.top));o=Math.min(this.offsetLimit.right,Math.max(o,this.offsetLimit.left))}var u=this.draggedItem.offsetParent().not("body").offset();if(u!=null){s-=u.top;o-=u.left}if(n.scrollContainer==window){r-=e(window).scrollTop();t-=e(window).scrollLeft();r=Math.max(0,r-e(window).height()+5)+Math.min(0,r-5);t=Math.max(0,t-e(window).width()+5)+Math.min(0,t-5)}else{var a=e(n.scrollContainer);var f=a.offset();r=Math.max(0,r-a.height()-f.top)+Math.min(0,r-f.top);t=Math.max(0,t-a.width()-f.left)+Math.min(0,t-f.left)}i.scroll.moveX=t==0?0:t*n.scrollSpeed/Math.abs(t);i.scroll.moveY=r==0?0:r*n.scrollSpeed/Math.abs(r);this.draggedItem.css({top:s,left:o})},wheel:function(t){if(i&&n.scrollContainer!=window){var r=e(n.scrollContainer);var s=r.offset();t=t.originalEvent;if(t.clientX>s.left&&t.clientX<s.left+r.width()&&t.clientY>s.top&&t.clientY<s.top+r.height()){var o=(t.deltaMode==0?1:10)*t.deltaY;r.scrollTop(r.scrollTop()+o);t.preventDefault()}}},buildPositionTable:function(){var t=[];this.getItems().not([i.draggedItem[0],i.placeHolderItem[0]]).each(function(n){var r=e(this).offset();r.right=r.left+e(this).outerWidth();r.bottom=r.top+e(this).outerHeight();r.elm=this;t[n]=r});this.pos=t},dropItem:function(){if(i.draggedItem==null)return;var t=i.draggedItem.attr("data-origstyle");i.draggedItem.attr("style",t);if(t=="")i.draggedItem.removeAttr("style");i.draggedItem.removeAttr("data-origstyle");i.styleDragHandlers(true);i.placeHolderItem.before(i.draggedItem);i.placeHolderItem.remove();e("[data-droptarget], .dragSortItem").remove();window.clearInterval(i.scroll.scrollY);window.clearInterval(i.scroll.scrollX);if(i.draggedItem.attr("data-origpos")!=e(r).index(i)+"-"+e(i.container).children().index(i.draggedItem))if(n.dragEnd.apply(i.draggedItem)==false){var s=i.draggedItem.attr("data-origpos").split("-");var o=e(r[s[0]].container).children().not(i.draggedItem).eq(s[1]);if(o.size()>0)o.before(i.draggedItem);else if(s[1]==0)e(r[s[0]].container).prepend(i.draggedItem);else e(r[s[0]].container).append(i.draggedItem)}i.draggedItem.removeAttr("data-origpos");i.draggedItem=null;e(document).unbind("mousemove",i.swapItems);e(document).unbind("mouseup",i.dropItem);if(n.scrollContainer!=window)e(window).unbind("wheel",i.wheel);return false},swapItems:function(t){if(i.draggedItem==null)return false;i.setPos(t.pageX,t.pageY);var o=i.findPos(t.pageX,t.pageY);var u=i;for(var a=0;o==-1&&n.dragBetween&&a<r.length;a++){o=r[a].findPos(t.pageX,t.pageY);u=r[a]}if(o==-1)return false;var f=function(){return e(u.container).children().not(u.draggedItem)};var l=f().not(n.itemSelector).each(function(e){this.idx=f().index(this)});if(s==null||s.top>i.draggedItem.offset().top||s.left>i.draggedItem.offset().left)e(u.pos[o].elm).before(i.placeHolderItem);else e(u.pos[o].elm).after(i.placeHolderItem);l.each(function(){var t=f().eq(this.idx).get(0);if(this!=t&&f().index(this)<this.idx)e(this).insertAfter(t);else if(this!=t)e(this).insertBefore(t)});e(r).each(function(e,t){t.createDropTargets();t.buildPositionTable()});s=i.draggedItem.offset();return false},findPos:function(e,t){for(var n=0;n<this.pos.length;n++){if(this.pos[n].left<e&&this.pos[n].right>e&&this.pos[n].top<t&&this.pos[n].bottom>t)return n}return-1},createDropTargets:function(){if(!n.dragBetween)return;e(r).each(function(){var t=e(this.container).find("[data-placeholder]");var r=e(this.container).find("[data-droptarget]");if(t.size()>0&&r.size()>0)r.remove();else if(t.size()==0&&r.size()==0){if(n.tagName=="td")e(n.placeHolderTemplate).attr("data-droptarget",true).appendTo(this.container);else e(this.container).append(i.placeHolderItem.removeAttr("data-placeholder").clone().attr("data-droptarget",true));i.placeHolderItem.attr("data-placeholder",true)}})}};u.init();r.push(u)});return this};e.fn.dragsort.defaults={itemSelector:"",dragSelector:"",dragSelectorExclude:"input, textarea",dragEnd:function(){},dragBetween:false,placeHolderTemplate:"",scrollContainer:window,scrollSpeed:5}})(jQuery)
diff --git a/route/static/js/jquery.fly.min.js b/route/static/js/jquery.fly.min.js
deleted file mode 100755
index 462b79e66..000000000
--- a/route/static/js/jquery.fly.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! fly - v1.0.0 - 2015-03-23
-* https://github.com/amibug/fly
-* Copyright (c) 2015 wuyuedong; Licensed MIT */
-!function(a){a.fly=function(b,c){var d={version:"1.0.0",autoPlay:!0,vertex_Rtop:20,speed:1.2,start:{},end:{},onEnd:a.noop},e=this,f=a(b);e.init=function(a){this.setOptions(a),!!this.settings.autoPlay&&this.play()},e.setOptions=function(b){this.settings=a.extend(!0,{},d,b);var c=this.settings,e=c.start,g=c.end;f.css({marginTop:"0px",marginLeft:"0px",position:"fixed"}).appendTo("body"),null!=g.width&&null!=g.height&&a.extend(!0,e,{width:f.width(),height:f.height()});var h=Math.min(e.top,g.top)-Math.abs(e.left-g.left)/3;h<c.vertex_Rtop&&(h=Math.min(c.vertex_Rtop,Math.min(e.top,g.top)));var i=Math.sqrt(Math.pow(e.top-g.top,2)+Math.pow(e.left-g.left,2)),j=Math.ceil(Math.min(Math.max(Math.log(i)/.05-75,30),100)/c.speed),k=e.top==h?0:-Math.sqrt((g.top-h)/(e.top-h)),l=(k*e.left-g.left)/(k-1),m=g.left==l?0:(g.top-h)/Math.pow(g.left-l,2);a.extend(!0,c,{count:-1,steps:j,vertex_left:l,vertex_top:h,curvature:m})},e.play=function(){this.move()},e.move=function(){var b=this.settings,c=b.start,d=b.count,e=b.steps,g=b.end,h=c.left+(g.left-c.left)*d/e,i=0==b.curvature?c.top+(g.top-c.top)*d/e:b.curvature*Math.pow(h-b.vertex_left,2)+b.vertex_top;if(null!=g.width&&null!=g.height){var j=e/2,k=g.width-(g.width-c.width)*Math.cos(j>d?0:(d-j)/(e-j)*Math.PI/2),l=g.height-(g.height-c.height)*Math.cos(j>d?0:(d-j)/(e-j)*Math.PI/2);f.css({width:k+"px",height:l+"px","font-size":Math.min(k,l)+"px"})}f.css({left:h+"px",top:i+"px"}),b.count++;var m=window.requestAnimationFrame(a.proxy(this.move,this));d==e&&(window.cancelAnimationFrame(m),b.onEnd.apply(this))},e.destroy=function(){f.remove()},e.init(c)},a.fn.fly=function(b){return this.each(function(){void 0==a(this).data("fly")&&a(this).data("fly",new a.fly(this,b))})}}(jQuery);
\ No newline at end of file
diff --git a/route/static/js/requestAnimationFrame.js b/route/static/js/requestAnimationFrame.js
deleted file mode 100755
index 5f980c40b..000000000
--- a/route/static/js/requestAnimationFrame.js
+++ /dev/null
@@ -1,27 +0,0 @@
-(function () {
-  var lastTime = 0;
-  var vendors = ['webkit', 'moz'];
-  for (var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
-    window.requestAnimationFrame = window[vendors[x] + 'RequestAnimationFrame'];
-    window.cancelAnimationFrame =
-      window[vendors[x] + 'CancelAnimationFrame'] || window[vendors[x] + 'CancelRequestAnimationFrame'];
-  }
-
-  if (!window.requestAnimationFrame){
-    window.requestAnimationFrame = function (callback, element) {
-      var currTime = new Date().getTime();
-      var timeToCall = Math.max(0, 16 - (currTime - lastTime));
-      var id = window.setTimeout(function () {
-          callback(currTime + timeToCall);
-        },
-        timeToCall);
-      lastTime = currTime + timeToCall;
-      return id;
-    };
-  }
-  if (!window.cancelAnimationFrame){
-    window.cancelAnimationFrame = function (id) {
-      clearTimeout(id);
-    };
-  }
-}());
\ No newline at end of file
diff --git a/route/static/js/socket.io.min.js b/route/static/js/socket.io.min.js
deleted file mode 100644
index 6a23ad684..000000000
--- a/route/static/js/socket.io.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Socket.IO v4.5.0
- * (c) 2014-2022 Guillermo Rauch
- * Released under the MIT License.
- */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).io=e()}(this,(function(){"use strict";function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}function e(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function n(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function r(t,e,r){return e&&n(t.prototype,e),r&&n(t,r),t}function i(){return i=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t},i.apply(this,arguments)}function o(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&a(t,e)}function s(t){return s=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)},s(t)}function a(t,e){return a=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t},a(t,e)}function c(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}function u(t,e,n){return u=c()?Reflect.construct:function(t,e,n){var r=[null];r.push.apply(r,e);var i=new(Function.bind.apply(t,r));return n&&a(i,n.prototype),i},u.apply(null,arguments)}function h(t){var e="function"==typeof Map?new Map:void 0;return h=function(t){if(null===t||(n=t,-1===Function.toString.call(n).indexOf("[native code]")))return t;var n;if("function"!=typeof t)throw new TypeError("Super expression must either be null or a function");if(void 0!==e){if(e.has(t))return e.get(t);e.set(t,r)}function r(){return u(t,arguments,s(this).constructor)}return r.prototype=Object.create(t.prototype,{constructor:{value:r,enumerable:!1,writable:!0,configurable:!0}}),a(r,t)},h(t)}function f(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}function l(t,e){if(e&&("object"==typeof e||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return f(t)}function p(t){var e=c();return function(){var n,r=s(t);if(e){var i=s(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return l(this,n)}}function d(t,e,n){return d="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=s(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}},d(t,e,n||t)}function y(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}function v(t,e){var n="undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(!n){if(Array.isArray(t)||(n=function(t,e){if(t){if("string"==typeof t)return y(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);return"Object"===n&&t.constructor&&(n=t.constructor.name),"Map"===n||"Set"===n?Array.from(t):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?y(t,e):void 0}}(t))||e&&t&&"number"==typeof t.length){n&&(t=n);var r=0,i=function(){};return{s:i,n:function(){return r>=t.length?{done:!0}:{done:!1,value:t[r++]}},e:function(t){throw t},f:i}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,s=!0,a=!1;return{s:function(){n=n.call(t)},n:function(){var t=n.next();return s=t.done,t},e:function(t){a=!0,o=t},f:function(){try{s||null==n.return||n.return()}finally{if(a)throw o}}}}var g=Object.create(null);g.open="0",g.close="1",g.ping="2",g.pong="3",g.message="4",g.upgrade="5",g.noop="6";var m=Object.create(null);Object.keys(g).forEach((function(t){m[g[t]]=t}));for(var k={type:"error",data:"parser error"},b="function"==typeof Blob||"undefined"!=typeof Blob&&"[object BlobConstructor]"===Object.prototype.toString.call(Blob),w="function"==typeof ArrayBuffer,_=function(t,e,n){var r,i=t.type,o=t.data;return b&&o instanceof Blob?e?n(o):A(o,n):w&&(o instanceof ArrayBuffer||(r=o,"function"==typeof ArrayBuffer.isView?ArrayBuffer.isView(r):r&&r.buffer instanceof ArrayBuffer))?e?n(o):A(new Blob([o]),n):n(g[i]+(o||""))},A=function(t,e){var n=new FileReader;return n.onload=function(){var t=n.result.split(",")[1];e("b"+t)},n.readAsDataURL(t)},E="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",O="undefined"==typeof Uint8Array?[]:new Uint8Array(256),R=0;R<E.length;R++)O[E.charCodeAt(R)]=R;var T="function"==typeof ArrayBuffer,C=function(t,e){if("string"!=typeof t)return{type:"message",data:S(t,e)};var n=t.charAt(0);return"b"===n?{type:"message",data:B(t.substring(1),e)}:m[n]?t.length>1?{type:m[n],data:t.substring(1)}:{type:m[n]}:k},B=function(t,e){if(T){var n=function(t){var e,n,r,i,o,s=.75*t.length,a=t.length,c=0;"="===t[t.length-1]&&(s--,"="===t[t.length-2]&&s--);var u=new ArrayBuffer(s),h=new Uint8Array(u);for(e=0;e<a;e+=4)n=O[t.charCodeAt(e)],r=O[t.charCodeAt(e+1)],i=O[t.charCodeAt(e+2)],o=O[t.charCodeAt(e+3)],h[c++]=n<<2|r>>4,h[c++]=(15&r)<<4|i>>2,h[c++]=(3&i)<<6|63&o;return u}(t);return S(n,e)}return{base64:!0,data:t}},S=function(t,e){return"blob"===e&&t instanceof ArrayBuffer?new Blob([t]):t},N=String.fromCharCode(30);function x(t){if(t)return function(t){for(var e in x.prototype)t[e]=x.prototype[e];return t}(t)}x.prototype.on=x.prototype.addEventListener=function(t,e){return this._callbacks=this._callbacks||{},(this._callbacks["$"+t]=this._callbacks["$"+t]||[]).push(e),this},x.prototype.once=function(t,e){function n(){this.off(t,n),e.apply(this,arguments)}return n.fn=e,this.on(t,n),this},x.prototype.off=x.prototype.removeListener=x.prototype.removeAllListeners=x.prototype.removeEventListener=function(t,e){if(this._callbacks=this._callbacks||{},0==arguments.length)return this._callbacks={},this;var n,r=this._callbacks["$"+t];if(!r)return this;if(1==arguments.length)return delete this._callbacks["$"+t],this;for(var i=0;i<r.length;i++)if((n=r[i])===e||n.fn===e){r.splice(i,1);break}return 0===r.length&&delete this._callbacks["$"+t],this},x.prototype.emit=function(t){this._callbacks=this._callbacks||{};for(var e=new Array(arguments.length-1),n=this._callbacks["$"+t],r=1;r<arguments.length;r++)e[r-1]=arguments[r];if(n){r=0;for(var i=(n=n.slice(0)).length;r<i;++r)n[r].apply(this,e)}return this},x.prototype.emitReserved=x.prototype.emit,x.prototype.listeners=function(t){return this._callbacks=this._callbacks||{},this._callbacks["$"+t]||[]},x.prototype.hasListeners=function(t){return!!this.listeners(t).length};var L="undefined"!=typeof self?self:"undefined"!=typeof window?window:Function("return this")();function P(t){for(var e=arguments.length,n=new Array(e>1?e-1:0),r=1;r<e;r++)n[r-1]=arguments[r];return n.reduce((function(e,n){return t.hasOwnProperty(n)&&(e[n]=t[n]),e}),{})}var j=setTimeout,q=clearTimeout;function I(t,e){e.useNativeTimers?(t.setTimeoutFn=j.bind(L),t.clearTimeoutFn=q.bind(L)):(t.setTimeoutFn=setTimeout.bind(L),t.clearTimeoutFn=clearTimeout.bind(L))}var D,F=function(t){o(r,t);var n=p(r);function r(t,i,o){var s;return e(this,r),(s=n.call(this,t)).description=i,s.context=o,s.type="TransportError",s}return r}(h(Error)),M=function(t){o(i,t);var n=p(i);function i(t){var r;return e(this,i),(r=n.call(this)).writable=!1,I(f(r),t),r.opts=t,r.query=t.query,r.readyState="",r.socket=t.socket,r}return r(i,[{key:"onError",value:function(t,e,n){return d(s(i.prototype),"emitReserved",this).call(this,"error",new F(t,e,n)),this}},{key:"open",value:function(){return"closed"!==this.readyState&&""!==this.readyState||(this.readyState="opening",this.doOpen()),this}},{key:"close",value:function(){return"opening"!==this.readyState&&"open"!==this.readyState||(this.doClose(),this.onClose()),this}},{key:"send",value:function(t){"open"===this.readyState&&this.write(t)}},{key:"onOpen",value:function(){this.readyState="open",this.writable=!0,d(s(i.prototype),"emitReserved",this).call(this,"open")}},{key:"onData",value:function(t){var e=C(t,this.socket.binaryType);this.onPacket(e)}},{key:"onPacket",value:function(t){d(s(i.prototype),"emitReserved",this).call(this,"packet",t)}},{key:"onClose",value:function(t){this.readyState="closed",d(s(i.prototype),"emitReserved",this).call(this,"close",t)}}]),i}(x),U="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_".split(""),V={},H=0,K=0;function Y(t){var e="";do{e=U[t%64]+e,t=Math.floor(t/64)}while(t>0);return e}function z(){var t=Y(+new Date);return t!==D?(H=0,D=t):t+"."+Y(H++)}for(;K<64;K++)V[U[K]]=K;function W(t){var e="";for(var n in t)t.hasOwnProperty(n)&&(e.length&&(e+="&"),e+=encodeURIComponent(n)+"="+encodeURIComponent(t[n]));return e}function $(t){for(var e={},n=t.split("&"),r=0,i=n.length;r<i;r++){var o=n[r].split("=");e[decodeURIComponent(o[0])]=decodeURIComponent(o[1])}return e}var J=!1;try{J="undefined"!=typeof XMLHttpRequest&&"withCredentials"in new XMLHttpRequest}catch(t){}var X=J;function G(t){var e=t.xdomain;try{if("undefined"!=typeof XMLHttpRequest&&(!e||X))return new XMLHttpRequest}catch(t){}if(!e)try{return new(L[["Active"].concat("Object").join("X")])("Microsoft.XMLHTTP")}catch(t){}}function Q(){}var Z=null!=new G({xdomain:!1}).responseType,tt=function(t){o(s,t);var n=p(s);function s(t){var r;if(e(this,s),(r=n.call(this,t)).polling=!1,"undefined"!=typeof location){var i="https:"===location.protocol,o=location.port;o||(o=i?"443":"80"),r.xd="undefined"!=typeof location&&t.hostname!==location.hostname||o!==t.port,r.xs=t.secure!==i}var a=t&&t.forceBase64;return r.supportsBinary=Z&&!a,r}return r(s,[{key:"name",get:function(){return"polling"}},{key:"doOpen",value:function(){this.poll()}},{key:"pause",value:function(t){var e=this;this.readyState="pausing";var n=function(){e.readyState="paused",t()};if(this.polling||!this.writable){var r=0;this.polling&&(r++,this.once("pollComplete",(function(){--r||n()}))),this.writable||(r++,this.once("drain",(function(){--r||n()})))}else n()}},{key:"poll",value:function(){this.polling=!0,this.doPoll(),this.emitReserved("poll")}},{key:"onData",value:function(t){var e=this;(function(t,e){for(var n=t.split(N),r=[],i=0;i<n.length;i++){var o=C(n[i],e);if(r.push(o),"error"===o.type)break}return r})(t,this.socket.binaryType).forEach((function(t){if("opening"===e.readyState&&"open"===t.type&&e.onOpen(),"close"===t.type)return e.onClose({description:"transport closed by the server"}),!1;e.onPacket(t)})),"closed"!==this.readyState&&(this.polling=!1,this.emitReserved("pollComplete"),"open"===this.readyState&&this.poll())}},{key:"doClose",value:function(){var t=this,e=function(){t.write([{type:"close"}])};"open"===this.readyState?e():this.once("open",e)}},{key:"write",value:function(t){var e=this;this.writable=!1,function(t,e){var n=t.length,r=new Array(n),i=0;t.forEach((function(t,o){_(t,!1,(function(t){r[o]=t,++i===n&&e(r.join(N))}))}))}(t,(function(t){e.doWrite(t,(function(){e.writable=!0,e.emitReserved("drain")}))}))}},{key:"uri",value:function(){var t=this.query||{},e=this.opts.secure?"https":"http",n="";!1!==this.opts.timestampRequests&&(t[this.opts.timestampParam]=z()),this.supportsBinary||t.sid||(t.b64=1),this.opts.port&&("https"===e&&443!==Number(this.opts.port)||"http"===e&&80!==Number(this.opts.port))&&(n=":"+this.opts.port);var r=W(t);return e+"://"+(-1!==this.opts.hostname.indexOf(":")?"["+this.opts.hostname+"]":this.opts.hostname)+n+this.opts.path+(r.length?"?"+r:"")}},{key:"request",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return i(t,{xd:this.xd,xs:this.xs},this.opts),new et(this.uri(),t)}},{key:"doWrite",value:function(t,e){var n=this,r=this.request({method:"POST",data:t});r.on("success",e),r.on("error",(function(t,e){n.onError("xhr post error",t,e)}))}},{key:"doPoll",value:function(){var t=this,e=this.request();e.on("data",this.onData.bind(this)),e.on("error",(function(e,n){t.onError("xhr poll error",e,n)})),this.pollXhr=e}}]),s}(M),et=function(t){o(i,t);var n=p(i);function i(t,r){var o;return e(this,i),I(f(o=n.call(this)),r),o.opts=r,o.method=r.method||"GET",o.uri=t,o.async=!1!==r.async,o.data=void 0!==r.data?r.data:null,o.create(),o}return r(i,[{key:"create",value:function(){var t=this,e=P(this.opts,"agent","pfx","key","passphrase","cert","ca","ciphers","rejectUnauthorized","autoUnref");e.xdomain=!!this.opts.xd,e.xscheme=!!this.opts.xs;var n=this.xhr=new G(e);try{n.open(this.method,this.uri,this.async);try{if(this.opts.extraHeaders)for(var r in n.setDisableHeaderCheck&&n.setDisableHeaderCheck(!0),this.opts.extraHeaders)this.opts.extraHeaders.hasOwnProperty(r)&&n.setRequestHeader(r,this.opts.extraHeaders[r])}catch(t){}if("POST"===this.method)try{n.setRequestHeader("Content-type","text/plain;charset=UTF-8")}catch(t){}try{n.setRequestHeader("Accept","*/*")}catch(t){}"withCredentials"in n&&(n.withCredentials=this.opts.withCredentials),this.opts.requestTimeout&&(n.timeout=this.opts.requestTimeout),n.onreadystatechange=function(){4===n.readyState&&(200===n.status||1223===n.status?t.onLoad():t.setTimeoutFn((function(){t.onError("number"==typeof n.status?n.status:0)}),0))},n.send(this.data)}catch(e){return void this.setTimeoutFn((function(){t.onError(e)}),0)}"undefined"!=typeof document&&(this.index=i.requestsCount++,i.requests[this.index]=this)}},{key:"onError",value:function(t){this.emitReserved("error",t,this.xhr),this.cleanup(!0)}},{key:"cleanup",value:function(t){if(void 0!==this.xhr&&null!==this.xhr){if(this.xhr.onreadystatechange=Q,t)try{this.xhr.abort()}catch(t){}"undefined"!=typeof document&&delete i.requests[this.index],this.xhr=null}}},{key:"onLoad",value:function(){var t=this.xhr.responseText;null!==t&&(this.emitReserved("data",t),this.emitReserved("success"),this.cleanup())}},{key:"abort",value:function(){this.cleanup()}}]),i}(x);if(et.requestsCount=0,et.requests={},"undefined"!=typeof document)if("function"==typeof attachEvent)attachEvent("onunload",nt);else if("function"==typeof addEventListener){addEventListener("onpagehide"in L?"pagehide":"unload",nt,!1)}function nt(){for(var t in et.requests)et.requests.hasOwnProperty(t)&&et.requests[t].abort()}var rt="function"==typeof Promise&&"function"==typeof Promise.resolve?function(t){return Promise.resolve().then(t)}:function(t,e){return e(t,0)},it=L.WebSocket||L.MozWebSocket,ot="undefined"!=typeof navigator&&"string"==typeof navigator.product&&"reactnative"===navigator.product.toLowerCase(),st=function(t){o(i,t);var n=p(i);function i(t){var r;return e(this,i),(r=n.call(this,t)).supportsBinary=!t.forceBase64,r}return r(i,[{key:"name",get:function(){return"websocket"}},{key:"doOpen",value:function(){if(this.check()){var t=this.uri(),e=this.opts.protocols,n=ot?{}:P(this.opts,"agent","perMessageDeflate","pfx","key","passphrase","cert","ca","ciphers","rejectUnauthorized","localAddress","protocolVersion","origin","maxPayload","family","checkServerIdentity");this.opts.extraHeaders&&(n.headers=this.opts.extraHeaders);try{this.ws=ot?new it(t,e,n):e?new it(t,e):new it(t)}catch(t){return this.emitReserved("error",t)}this.ws.binaryType=this.socket.binaryType||"arraybuffer",this.addEventListeners()}}},{key:"addEventListeners",value:function(){var t=this;this.ws.onopen=function(){t.opts.autoUnref&&t.ws._socket.unref(),t.onOpen()},this.ws.onclose=function(e){return t.onClose({description:"websocket connection closed",context:e})},this.ws.onmessage=function(e){return t.onData(e.data)},this.ws.onerror=function(e){return t.onError("websocket error",e)}}},{key:"write",value:function(t){var e=this;this.writable=!1;for(var n=function(n){var r=t[n],i=n===t.length-1;_(r,e.supportsBinary,(function(t){try{e.ws.send(t)}catch(t){}i&&rt((function(){e.writable=!0,e.emitReserved("drain")}),e.setTimeoutFn)}))},r=0;r<t.length;r++)n(r)}},{key:"doClose",value:function(){void 0!==this.ws&&(this.ws.close(),this.ws=null)}},{key:"uri",value:function(){var t=this.query||{},e=this.opts.secure?"wss":"ws",n="";this.opts.port&&("wss"===e&&443!==Number(this.opts.port)||"ws"===e&&80!==Number(this.opts.port))&&(n=":"+this.opts.port),this.opts.timestampRequests&&(t[this.opts.timestampParam]=z()),this.supportsBinary||(t.b64=1);var r=W(t);return e+"://"+(-1!==this.opts.hostname.indexOf(":")?"["+this.opts.hostname+"]":this.opts.hostname)+n+this.opts.path+(r.length?"?"+r:"")}},{key:"check",value:function(){return!(!it||"__initialize"in it&&this.name===i.prototype.name)}}]),i}(M),at={websocket:st,polling:tt},ct=/^(?:(?![^:@]+:[^:@\/]*@)(http|https|ws|wss):\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?((?:[a-f0-9]{0,4}:){2,7}[a-f0-9]{0,4}|[^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/,ut=["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"];function ht(t){var e=t,n=t.indexOf("["),r=t.indexOf("]");-1!=n&&-1!=r&&(t=t.substring(0,n)+t.substring(n,r).replace(/:/g,";")+t.substring(r,t.length));for(var i,o,s=ct.exec(t||""),a={},c=14;c--;)a[ut[c]]=s[c]||"";return-1!=n&&-1!=r&&(a.source=e,a.host=a.host.substring(1,a.host.length-1).replace(/;/g,":"),a.authority=a.authority.replace("[","").replace("]","").replace(/;/g,":"),a.ipv6uri=!0),a.pathNames=function(t,e){var n=/\/{2,9}/g,r=e.replace(n,"/").split("/");"/"!=e.substr(0,1)&&0!==e.length||r.splice(0,1);"/"==e.substr(e.length-1,1)&&r.splice(r.length-1,1);return r}(0,a.path),a.queryKey=(i=a.query,o={},i.replace(/(?:^|&)([^&=]*)=?([^&]*)/g,(function(t,e,n){e&&(o[e]=n)})),o),a}var ft=function(n){o(a,n);var s=p(a);function a(n){var r,o=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return e(this,a),r=s.call(this),n&&"object"===t(n)&&(o=n,n=null),n?(n=ht(n),o.hostname=n.host,o.secure="https"===n.protocol||"wss"===n.protocol,o.port=n.port,n.query&&(o.query=n.query)):o.host&&(o.hostname=ht(o.host).host),I(f(r),o),r.secure=null!=o.secure?o.secure:"undefined"!=typeof location&&"https:"===location.protocol,o.hostname&&!o.port&&(o.port=r.secure?"443":"80"),r.hostname=o.hostname||("undefined"!=typeof location?location.hostname:"localhost"),r.port=o.port||("undefined"!=typeof location&&location.port?location.port:r.secure?"443":"80"),r.transports=o.transports||["polling","websocket"],r.readyState="",r.writeBuffer=[],r.prevBufferLen=0,r.opts=i({path:"/engine.io",agent:!1,withCredentials:!1,upgrade:!0,timestampParam:"t",rememberUpgrade:!1,rejectUnauthorized:!0,perMessageDeflate:{threshold:1024},transportOptions:{},closeOnBeforeunload:!0},o),r.opts.path=r.opts.path.replace(/\/$/,"")+"/","string"==typeof r.opts.query&&(r.opts.query=$(r.opts.query)),r.id=null,r.upgrades=null,r.pingInterval=null,r.pingTimeout=null,r.pingTimeoutTimer=null,"function"==typeof addEventListener&&(r.opts.closeOnBeforeunload&&addEventListener("beforeunload",(function(){r.transport&&(r.transport.removeAllListeners(),r.transport.close())}),!1),"localhost"!==r.hostname&&(r.offlineEventListener=function(){r.onClose("transport close",{description:"network connection lost"})},addEventListener("offline",r.offlineEventListener,!1))),r.open(),r}return r(a,[{key:"createTransport",value:function(t){var e=i({},this.opts.query);e.EIO=4,e.transport=t,this.id&&(e.sid=this.id);var n=i({},this.opts.transportOptions[t],this.opts,{query:e,socket:this,hostname:this.hostname,secure:this.secure,port:this.port});return new at[t](n)}},{key:"open",value:function(){var t,e=this;if(this.opts.rememberUpgrade&&a.priorWebsocketSuccess&&-1!==this.transports.indexOf("websocket"))t="websocket";else{if(0===this.transports.length)return void this.setTimeoutFn((function(){e.emitReserved("error","No transports available")}),0);t=this.transports[0]}this.readyState="opening";try{t=this.createTransport(t)}catch(t){return this.transports.shift(),void this.open()}t.open(),this.setTransport(t)}},{key:"setTransport",value:function(t){var e=this;this.transport&&this.transport.removeAllListeners(),this.transport=t,t.on("drain",this.onDrain.bind(this)).on("packet",this.onPacket.bind(this)).on("error",this.onError.bind(this)).on("close",(function(t){return e.onClose("transport close",t)}))}},{key:"probe",value:function(t){var e=this,n=this.createTransport(t),r=!1;a.priorWebsocketSuccess=!1;var i=function(){r||(n.send([{type:"ping",data:"probe"}]),n.once("packet",(function(t){if(!r)if("pong"===t.type&&"probe"===t.data){if(e.upgrading=!0,e.emitReserved("upgrading",n),!n)return;a.priorWebsocketSuccess="websocket"===n.name,e.transport.pause((function(){r||"closed"!==e.readyState&&(f(),e.setTransport(n),n.send([{type:"upgrade"}]),e.emitReserved("upgrade",n),n=null,e.upgrading=!1,e.flush())}))}else{var i=new Error("probe error");i.transport=n.name,e.emitReserved("upgradeError",i)}})))};function o(){r||(r=!0,f(),n.close(),n=null)}var s=function(t){var r=new Error("probe error: "+t);r.transport=n.name,o(),e.emitReserved("upgradeError",r)};function c(){s("transport closed")}function u(){s("socket closed")}function h(t){n&&t.name!==n.name&&o()}var f=function(){n.removeListener("open",i),n.removeListener("error",s),n.removeListener("close",c),e.off("close",u),e.off("upgrading",h)};n.once("open",i),n.once("error",s),n.once("close",c),this.once("close",u),this.once("upgrading",h),n.open()}},{key:"onOpen",value:function(){if(this.readyState="open",a.priorWebsocketSuccess="websocket"===this.transport.name,this.emitReserved("open"),this.flush(),"open"===this.readyState&&this.opts.upgrade&&this.transport.pause)for(var t=0,e=this.upgrades.length;t<e;t++)this.probe(this.upgrades[t])}},{key:"onPacket",value:function(t){if("opening"===this.readyState||"open"===this.readyState||"closing"===this.readyState)switch(this.emitReserved("packet",t),this.emitReserved("heartbeat"),t.type){case"open":this.onHandshake(JSON.parse(t.data));break;case"ping":this.resetPingTimeout(),this.sendPacket("pong"),this.emitReserved("ping"),this.emitReserved("pong");break;case"error":var e=new Error("server error");e.code=t.data,this.onError(e);break;case"message":this.emitReserved("data",t.data),this.emitReserved("message",t.data)}}},{key:"onHandshake",value:function(t){this.emitReserved("handshake",t),this.id=t.sid,this.transport.query.sid=t.sid,this.upgrades=this.filterUpgrades(t.upgrades),this.pingInterval=t.pingInterval,this.pingTimeout=t.pingTimeout,this.maxPayload=t.maxPayload,this.onOpen(),"closed"!==this.readyState&&this.resetPingTimeout()}},{key:"resetPingTimeout",value:function(){var t=this;this.clearTimeoutFn(this.pingTimeoutTimer),this.pingTimeoutTimer=this.setTimeoutFn((function(){t.onClose("ping timeout")}),this.pingInterval+this.pingTimeout),this.opts.autoUnref&&this.pingTimeoutTimer.unref()}},{key:"onDrain",value:function(){this.writeBuffer.splice(0,this.prevBufferLen),this.prevBufferLen=0,0===this.writeBuffer.length?this.emitReserved("drain"):this.flush()}},{key:"flush",value:function(){if("closed"!==this.readyState&&this.transport.writable&&!this.upgrading&&this.writeBuffer.length){var t=this.getWritablePackets();this.transport.send(t),this.prevBufferLen=t.length,this.emitReserved("flush")}}},{key:"getWritablePackets",value:function(){if(!(this.maxPayload&&"polling"===this.transport.name&&this.writeBuffer.length>1))return this.writeBuffer;for(var t,e=1,n=0;n<this.writeBuffer.length;n++){var r=this.writeBuffer[n].data;if(r&&(e+="string"==typeof(t=r)?function(t){for(var e=0,n=0,r=0,i=t.length;r<i;r++)(e=t.charCodeAt(r))<128?n+=1:e<2048?n+=2:e<55296||e>=57344?n+=3:(r++,n+=4);return n}(t):Math.ceil(1.33*(t.byteLength||t.size))),n>0&&e>this.maxPayload)return this.writeBuffer.slice(0,n);e+=2}return this.writeBuffer}},{key:"write",value:function(t,e,n){return this.sendPacket("message",t,e,n),this}},{key:"send",value:function(t,e,n){return this.sendPacket("message",t,e,n),this}},{key:"sendPacket",value:function(t,e,n,r){if("function"==typeof e&&(r=e,e=void 0),"function"==typeof n&&(r=n,n=null),"closing"!==this.readyState&&"closed"!==this.readyState){(n=n||{}).compress=!1!==n.compress;var i={type:t,data:e,options:n};this.emitReserved("packetCreate",i),this.writeBuffer.push(i),r&&this.once("flush",r),this.flush()}}},{key:"close",value:function(){var t=this,e=function(){t.onClose("forced close"),t.transport.close()},n=function n(){t.off("upgrade",n),t.off("upgradeError",n),e()},r=function(){t.once("upgrade",n),t.once("upgradeError",n)};return"opening"!==this.readyState&&"open"!==this.readyState||(this.readyState="closing",this.writeBuffer.length?this.once("drain",(function(){t.upgrading?r():e()})):this.upgrading?r():e()),this}},{key:"onError",value:function(t){a.priorWebsocketSuccess=!1,this.emitReserved("error",t),this.onClose("transport error",t)}},{key:"onClose",value:function(t,e){"opening"!==this.readyState&&"open"!==this.readyState&&"closing"!==this.readyState||(this.clearTimeoutFn(this.pingTimeoutTimer),this.transport.removeAllListeners("close"),this.transport.close(),this.transport.removeAllListeners(),"function"==typeof removeEventListener&&removeEventListener("offline",this.offlineEventListener,!1),this.readyState="closed",this.id=null,this.emitReserved("close",t,e),this.writeBuffer=[],this.prevBufferLen=0)}},{key:"filterUpgrades",value:function(t){for(var e=[],n=0,r=t.length;n<r;n++)~this.transports.indexOf(t[n])&&e.push(t[n]);return e}}]),a}(x);ft.protocol=4;var lt="function"==typeof ArrayBuffer,pt=Object.prototype.toString,dt="function"==typeof Blob||"undefined"!=typeof Blob&&"[object BlobConstructor]"===pt.call(Blob),yt="function"==typeof File||"undefined"!=typeof File&&"[object FileConstructor]"===pt.call(File);function vt(t){return lt&&(t instanceof ArrayBuffer||function(t){return"function"==typeof ArrayBuffer.isView?ArrayBuffer.isView(t):t.buffer instanceof ArrayBuffer}(t))||dt&&t instanceof Blob||yt&&t instanceof File}function gt(e,n){if(!e||"object"!==t(e))return!1;if(Array.isArray(e)){for(var r=0,i=e.length;r<i;r++)if(gt(e[r]))return!0;return!1}if(vt(e))return!0;if(e.toJSON&&"function"==typeof e.toJSON&&1===arguments.length)return gt(e.toJSON(),!0);for(var o in e)if(Object.prototype.hasOwnProperty.call(e,o)&&gt(e[o]))return!0;return!1}function mt(t){var e=[],n=t.data,r=t;return r.data=kt(n,e),r.attachments=e.length,{packet:r,buffers:e}}function kt(e,n){if(!e)return e;if(vt(e)){var r={_placeholder:!0,num:n.length};return n.push(e),r}if(Array.isArray(e)){for(var i=new Array(e.length),o=0;o<e.length;o++)i[o]=kt(e[o],n);return i}if("object"===t(e)&&!(e instanceof Date)){var s={};for(var a in e)Object.prototype.hasOwnProperty.call(e,a)&&(s[a]=kt(e[a],n));return s}return e}function bt(t,e){return t.data=wt(t.data,e),t.attachments=void 0,t}function wt(e,n){if(!e)return e;if(e&&e._placeholder)return n[e.num];if(Array.isArray(e))for(var r=0;r<e.length;r++)e[r]=wt(e[r],n);else if("object"===t(e))for(var i in e)Object.prototype.hasOwnProperty.call(e,i)&&(e[i]=wt(e[i],n));return e}var _t;!function(t){t[t.CONNECT=0]="CONNECT",t[t.DISCONNECT=1]="DISCONNECT",t[t.EVENT=2]="EVENT",t[t.ACK=3]="ACK",t[t.CONNECT_ERROR=4]="CONNECT_ERROR",t[t.BINARY_EVENT=5]="BINARY_EVENT",t[t.BINARY_ACK=6]="BINARY_ACK"}(_t||(_t={}));var At=function(){function t(n){e(this,t),this.replacer=n}return r(t,[{key:"encode",value:function(t){return t.type!==_t.EVENT&&t.type!==_t.ACK||!gt(t)?[this.encodeAsString(t)]:(t.type=t.type===_t.EVENT?_t.BINARY_EVENT:_t.BINARY_ACK,this.encodeAsBinary(t))}},{key:"encodeAsString",value:function(t){var e=""+t.type;return t.type!==_t.BINARY_EVENT&&t.type!==_t.BINARY_ACK||(e+=t.attachments+"-"),t.nsp&&"/"!==t.nsp&&(e+=t.nsp+","),null!=t.id&&(e+=t.id),null!=t.data&&(e+=JSON.stringify(t.data,this.replacer)),e}},{key:"encodeAsBinary",value:function(t){var e=mt(t),n=this.encodeAsString(e.packet),r=e.buffers;return r.unshift(n),r}}]),t}(),Et=function(n){o(a,n);var i=p(a);function a(t){var n;return e(this,a),(n=i.call(this)).reviver=t,n}return r(a,[{key:"add",value:function(t){var e;if("string"==typeof t)(e=this.decodeString(t)).type===_t.BINARY_EVENT||e.type===_t.BINARY_ACK?(this.reconstructor=new Ot(e),0===e.attachments&&d(s(a.prototype),"emitReserved",this).call(this,"decoded",e)):d(s(a.prototype),"emitReserved",this).call(this,"decoded",e);else{if(!vt(t)&&!t.base64)throw new Error("Unknown type: "+t);if(!this.reconstructor)throw new Error("got binary data when not reconstructing a packet");(e=this.reconstructor.takeBinaryData(t))&&(this.reconstructor=null,d(s(a.prototype),"emitReserved",this).call(this,"decoded",e))}}},{key:"decodeString",value:function(t){var e=0,n={type:Number(t.charAt(0))};if(void 0===_t[n.type])throw new Error("unknown packet type "+n.type);if(n.type===_t.BINARY_EVENT||n.type===_t.BINARY_ACK){for(var r=e+1;"-"!==t.charAt(++e)&&e!=t.length;);var i=t.substring(r,e);if(i!=Number(i)||"-"!==t.charAt(e))throw new Error("Illegal attachments");n.attachments=Number(i)}if("/"===t.charAt(e+1)){for(var o=e+1;++e;){if(","===t.charAt(e))break;if(e===t.length)break}n.nsp=t.substring(o,e)}else n.nsp="/";var s=t.charAt(e+1);if(""!==s&&Number(s)==s){for(var c=e+1;++e;){var u=t.charAt(e);if(null==u||Number(u)!=u){--e;break}if(e===t.length)break}n.id=Number(t.substring(c,e+1))}if(t.charAt(++e)){var h=this.tryParse(t.substr(e));if(!a.isPayloadValid(n.type,h))throw new Error("invalid payload");n.data=h}return n}},{key:"tryParse",value:function(t){try{return JSON.parse(t,this.reviver)}catch(t){return!1}}},{key:"destroy",value:function(){this.reconstructor&&this.reconstructor.finishedReconstruction()}}],[{key:"isPayloadValid",value:function(e,n){switch(e){case _t.CONNECT:return"object"===t(n);case _t.DISCONNECT:return void 0===n;case _t.CONNECT_ERROR:return"string"==typeof n||"object"===t(n);case _t.EVENT:case _t.BINARY_EVENT:return Array.isArray(n)&&n.length>0;case _t.ACK:case _t.BINARY_ACK:return Array.isArray(n)}}}]),a}(x),Ot=function(){function t(n){e(this,t),this.packet=n,this.buffers=[],this.reconPack=n}return r(t,[{key:"takeBinaryData",value:function(t){if(this.buffers.push(t),this.buffers.length===this.reconPack.attachments){var e=bt(this.reconPack,this.buffers);return this.finishedReconstruction(),e}return null}},{key:"finishedReconstruction",value:function(){this.reconPack=null,this.buffers=[]}}]),t}(),Rt=Object.freeze({__proto__:null,protocol:5,get PacketType(){return _t},Encoder:At,Decoder:Et});function Tt(t,e,n){return t.on(e,n),function(){t.off(e,n)}}var Ct=Object.freeze({connect:1,connect_error:1,disconnect:1,disconnecting:1,newListener:1,removeListener:1}),Bt=function(t){o(i,t);var n=p(i);function i(t,r,o){var s;return e(this,i),(s=n.call(this)).connected=!1,s.receiveBuffer=[],s.sendBuffer=[],s.ids=0,s.acks={},s.flags={},s.io=t,s.nsp=r,o&&o.auth&&(s.auth=o.auth),s.io._autoConnect&&s.open(),s}return r(i,[{key:"disconnected",get:function(){return!this.connected}},{key:"subEvents",value:function(){if(!this.subs){var t=this.io;this.subs=[Tt(t,"open",this.onopen.bind(this)),Tt(t,"packet",this.onpacket.bind(this)),Tt(t,"error",this.onerror.bind(this)),Tt(t,"close",this.onclose.bind(this))]}}},{key:"active",get:function(){return!!this.subs}},{key:"connect",value:function(){return this.connected||(this.subEvents(),this.io._reconnecting||this.io.open(),"open"===this.io._readyState&&this.onopen()),this}},{key:"open",value:function(){return this.connect()}},{key:"send",value:function(){for(var t=arguments.length,e=new Array(t),n=0;n<t;n++)e[n]=arguments[n];return e.unshift("message"),this.emit.apply(this,e),this}},{key:"emit",value:function(t){if(Ct.hasOwnProperty(t))throw new Error('"'+t+'" is a reserved event name');for(var e=arguments.length,n=new Array(e>1?e-1:0),r=1;r<e;r++)n[r-1]=arguments[r];n.unshift(t);var i={type:_t.EVENT,data:n,options:{}};if(i.options.compress=!1!==this.flags.compress,"function"==typeof n[n.length-1]){var o=this.ids++,s=n.pop();this._registerAckCallback(o,s),i.id=o}var a=this.io.engine&&this.io.engine.transport&&this.io.engine.transport.writable,c=this.flags.volatile&&(!a||!this.connected);return c||(this.connected?(this.notifyOutgoingListeners(i),this.packet(i)):this.sendBuffer.push(i)),this.flags={},this}},{key:"_registerAckCallback",value:function(t,e){var n=this,r=this.flags.timeout;if(void 0!==r){var i=this.io.setTimeoutFn((function(){delete n.acks[t];for(var r=0;r<n.sendBuffer.length;r++)n.sendBuffer[r].id===t&&n.sendBuffer.splice(r,1);e.call(n,new Error("operation has timed out"))}),r);this.acks[t]=function(){n.io.clearTimeoutFn(i);for(var t=arguments.length,r=new Array(t),o=0;o<t;o++)r[o]=arguments[o];e.apply(n,[null].concat(r))}}else this.acks[t]=e}},{key:"packet",value:function(t){t.nsp=this.nsp,this.io._packet(t)}},{key:"onopen",value:function(){var t=this;"function"==typeof this.auth?this.auth((function(e){t.packet({type:_t.CONNECT,data:e})})):this.packet({type:_t.CONNECT,data:this.auth})}},{key:"onerror",value:function(t){this.connected||this.emitReserved("connect_error",t)}},{key:"onclose",value:function(t,e){this.connected=!1,delete this.id,this.emitReserved("disconnect",t,e)}},{key:"onpacket",value:function(t){if(t.nsp===this.nsp)switch(t.type){case _t.CONNECT:if(t.data&&t.data.sid){var e=t.data.sid;this.onconnect(e)}else this.emitReserved("connect_error",new Error("It seems you are trying to reach a Socket.IO server in v2.x with a v3.x client, but they are not compatible (more information here: https://socket.io/docs/v3/migrating-from-2-x-to-3-0/)"));break;case _t.EVENT:case _t.BINARY_EVENT:this.onevent(t);break;case _t.ACK:case _t.BINARY_ACK:this.onack(t);break;case _t.DISCONNECT:this.ondisconnect();break;case _t.CONNECT_ERROR:this.destroy();var n=new Error(t.data.message);n.data=t.data.data,this.emitReserved("connect_error",n)}}},{key:"onevent",value:function(t){var e=t.data||[];null!=t.id&&e.push(this.ack(t.id)),this.connected?this.emitEvent(e):this.receiveBuffer.push(Object.freeze(e))}},{key:"emitEvent",value:function(t){if(this._anyListeners&&this._anyListeners.length){var e,n=v(this._anyListeners.slice());try{for(n.s();!(e=n.n()).done;){e.value.apply(this,t)}}catch(t){n.e(t)}finally{n.f()}}d(s(i.prototype),"emit",this).apply(this,t)}},{key:"ack",value:function(t){var e=this,n=!1;return function(){if(!n){n=!0;for(var r=arguments.length,i=new Array(r),o=0;o<r;o++)i[o]=arguments[o];e.packet({type:_t.ACK,id:t,data:i})}}}},{key:"onack",value:function(t){var e=this.acks[t.id];"function"==typeof e&&(e.apply(this,t.data),delete this.acks[t.id])}},{key:"onconnect",value:function(t){this.id=t,this.connected=!0,this.emitBuffered(),this.emitReserved("connect")}},{key:"emitBuffered",value:function(){var t=this;this.receiveBuffer.forEach((function(e){return t.emitEvent(e)})),this.receiveBuffer=[],this.sendBuffer.forEach((function(e){t.notifyOutgoingListeners(e),t.packet(e)})),this.sendBuffer=[]}},{key:"ondisconnect",value:function(){this.destroy(),this.onclose("io server disconnect")}},{key:"destroy",value:function(){this.subs&&(this.subs.forEach((function(t){return t()})),this.subs=void 0),this.io._destroy(this)}},{key:"disconnect",value:function(){return this.connected&&this.packet({type:_t.DISCONNECT}),this.destroy(),this.connected&&this.onclose("io client disconnect"),this}},{key:"close",value:function(){return this.disconnect()}},{key:"compress",value:function(t){return this.flags.compress=t,this}},{key:"volatile",get:function(){return this.flags.volatile=!0,this}},{key:"timeout",value:function(t){return this.flags.timeout=t,this}},{key:"onAny",value:function(t){return this._anyListeners=this._anyListeners||[],this._anyListeners.push(t),this}},{key:"prependAny",value:function(t){return this._anyListeners=this._anyListeners||[],this._anyListeners.unshift(t),this}},{key:"offAny",value:function(t){if(!this._anyListeners)return this;if(t){for(var e=this._anyListeners,n=0;n<e.length;n++)if(t===e[n])return e.splice(n,1),this}else this._anyListeners=[];return this}},{key:"listenersAny",value:function(){return this._anyListeners||[]}},{key:"onAnyOutgoing",value:function(t){return this._anyOutgoingListeners=this._anyOutgoingListeners||[],this._anyOutgoingListeners.push(t),this}},{key:"prependAnyOutgoing",value:function(t){return this._anyOutgoingListeners=this._anyOutgoingListeners||[],this._anyOutgoingListeners.unshift(t),this}},{key:"offAnyOutgoing",value:function(t){if(!this._anyOutgoingListeners)return this;if(t){for(var e=this._anyOutgoingListeners,n=0;n<e.length;n++)if(t===e[n])return e.splice(n,1),this}else this._anyOutgoingListeners=[];return this}},{key:"listenersAnyOutgoing",value:function(){return this._anyOutgoingListeners||[]}},{key:"notifyOutgoingListeners",value:function(t){if(this._anyOutgoingListeners&&this._anyOutgoingListeners.length){var e,n=v(this._anyOutgoingListeners.slice());try{for(n.s();!(e=n.n()).done;){e.value.apply(this,t.data)}}catch(t){n.e(t)}finally{n.f()}}}}]),i}(x);function St(t){t=t||{},this.ms=t.min||100,this.max=t.max||1e4,this.factor=t.factor||2,this.jitter=t.jitter>0&&t.jitter<=1?t.jitter:0,this.attempts=0}St.prototype.duration=function(){var t=this.ms*Math.pow(this.factor,this.attempts++);if(this.jitter){var e=Math.random(),n=Math.floor(e*this.jitter*t);t=0==(1&Math.floor(10*e))?t-n:t+n}return 0|Math.min(t,this.max)},St.prototype.reset=function(){this.attempts=0},St.prototype.setMin=function(t){this.ms=t},St.prototype.setMax=function(t){this.max=t},St.prototype.setJitter=function(t){this.jitter=t};var Nt=function(n){o(s,n);var i=p(s);function s(n,r){var o,a;e(this,s),(o=i.call(this)).nsps={},o.subs=[],n&&"object"===t(n)&&(r=n,n=void 0),(r=r||{}).path=r.path||"/socket.io",o.opts=r,I(f(o),r),o.reconnection(!1!==r.reconnection),o.reconnectionAttempts(r.reconnectionAttempts||1/0),o.reconnectionDelay(r.reconnectionDelay||1e3),o.reconnectionDelayMax(r.reconnectionDelayMax||5e3),o.randomizationFactor(null!==(a=r.randomizationFactor)&&void 0!==a?a:.5),o.backoff=new St({min:o.reconnectionDelay(),max:o.reconnectionDelayMax(),jitter:o.randomizationFactor()}),o.timeout(null==r.timeout?2e4:r.timeout),o._readyState="closed",o.uri=n;var c=r.parser||Rt;return o.encoder=new c.Encoder,o.decoder=new c.Decoder,o._autoConnect=!1!==r.autoConnect,o._autoConnect&&o.open(),o}return r(s,[{key:"reconnection",value:function(t){return arguments.length?(this._reconnection=!!t,this):this._reconnection}},{key:"reconnectionAttempts",value:function(t){return void 0===t?this._reconnectionAttempts:(this._reconnectionAttempts=t,this)}},{key:"reconnectionDelay",value:function(t){var e;return void 0===t?this._reconnectionDelay:(this._reconnectionDelay=t,null===(e=this.backoff)||void 0===e||e.setMin(t),this)}},{key:"randomizationFactor",value:function(t){var e;return void 0===t?this._randomizationFactor:(this._randomizationFactor=t,null===(e=this.backoff)||void 0===e||e.setJitter(t),this)}},{key:"reconnectionDelayMax",value:function(t){var e;return void 0===t?this._reconnectionDelayMax:(this._reconnectionDelayMax=t,null===(e=this.backoff)||void 0===e||e.setMax(t),this)}},{key:"timeout",value:function(t){return arguments.length?(this._timeout=t,this):this._timeout}},{key:"maybeReconnectOnOpen",value:function(){!this._reconnecting&&this._reconnection&&0===this.backoff.attempts&&this.reconnect()}},{key:"open",value:function(t){var e=this;if(~this._readyState.indexOf("open"))return this;this.engine=new ft(this.uri,this.opts);var n=this.engine,r=this;this._readyState="opening",this.skipReconnect=!1;var i=Tt(n,"open",(function(){r.onopen(),t&&t()})),o=Tt(n,"error",(function(n){r.cleanup(),r._readyState="closed",e.emitReserved("error",n),t?t(n):r.maybeReconnectOnOpen()}));if(!1!==this._timeout){var s=this._timeout;0===s&&i();var a=this.setTimeoutFn((function(){i(),n.close(),n.emit("error",new Error("timeout"))}),s);this.opts.autoUnref&&a.unref(),this.subs.push((function(){clearTimeout(a)}))}return this.subs.push(i),this.subs.push(o),this}},{key:"connect",value:function(t){return this.open(t)}},{key:"onopen",value:function(){this.cleanup(),this._readyState="open",this.emitReserved("open");var t=this.engine;this.subs.push(Tt(t,"ping",this.onping.bind(this)),Tt(t,"data",this.ondata.bind(this)),Tt(t,"error",this.onerror.bind(this)),Tt(t,"close",this.onclose.bind(this)),Tt(this.decoder,"decoded",this.ondecoded.bind(this)))}},{key:"onping",value:function(){this.emitReserved("ping")}},{key:"ondata",value:function(t){this.decoder.add(t)}},{key:"ondecoded",value:function(t){this.emitReserved("packet",t)}},{key:"onerror",value:function(t){this.emitReserved("error",t)}},{key:"socket",value:function(t,e){var n=this.nsps[t];return n||(n=new Bt(this,t,e),this.nsps[t]=n),n}},{key:"_destroy",value:function(t){for(var e=0,n=Object.keys(this.nsps);e<n.length;e++){var r=n[e];if(this.nsps[r].active)return}this._close()}},{key:"_packet",value:function(t){for(var e=this.encoder.encode(t),n=0;n<e.length;n++)this.engine.write(e[n],t.options)}},{key:"cleanup",value:function(){this.subs.forEach((function(t){return t()})),this.subs.length=0,this.decoder.destroy()}},{key:"_close",value:function(){this.skipReconnect=!0,this._reconnecting=!1,this.onclose("forced close"),this.engine&&this.engine.close()}},{key:"disconnect",value:function(){return this._close()}},{key:"onclose",value:function(t,e){this.cleanup(),this.backoff.reset(),this._readyState="closed",this.emitReserved("close",t,e),this._reconnection&&!this.skipReconnect&&this.reconnect()}},{key:"reconnect",value:function(){var t=this;if(this._reconnecting||this.skipReconnect)return this;var e=this;if(this.backoff.attempts>=this._reconnectionAttempts)this.backoff.reset(),this.emitReserved("reconnect_failed"),this._reconnecting=!1;else{var n=this.backoff.duration();this._reconnecting=!0;var r=this.setTimeoutFn((function(){e.skipReconnect||(t.emitReserved("reconnect_attempt",e.backoff.attempts),e.skipReconnect||e.open((function(n){n?(e._reconnecting=!1,e.reconnect(),t.emitReserved("reconnect_error",n)):e.onreconnect()})))}),n);this.opts.autoUnref&&r.unref(),this.subs.push((function(){clearTimeout(r)}))}}},{key:"onreconnect",value:function(){var t=this.backoff.attempts;this._reconnecting=!1,this.backoff.reset(),this.emitReserved("reconnect",t)}}]),s}(x),xt={};function Lt(e,n){"object"===t(e)&&(n=e,e=void 0);var r,i=function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",n=arguments.length>2?arguments[2]:void 0,r=t;n=n||"undefined"!=typeof location&&location,null==t&&(t=n.protocol+"//"+n.host),"string"==typeof t&&("/"===t.charAt(0)&&(t="/"===t.charAt(1)?n.protocol+t:n.host+t),/^(https?|wss?):\/\//.test(t)||(t=void 0!==n?n.protocol+"//"+t:"https://"+t),r=ht(t)),r.port||(/^(http|ws)$/.test(r.protocol)?r.port="80":/^(http|ws)s$/.test(r.protocol)&&(r.port="443")),r.path=r.path||"/";var i=-1!==r.host.indexOf(":")?"["+r.host+"]":r.host;return r.id=r.protocol+"://"+i+":"+r.port+e,r.href=r.protocol+"://"+i+(n&&n.port===r.port?"":":"+r.port),r}(e,(n=n||{}).path||"/socket.io"),o=i.source,s=i.id,a=i.path,c=xt[s]&&a in xt[s].nsps;return n.forceNew||n["force new connection"]||!1===n.multiplex||c?r=new Nt(o,n):(xt[s]||(xt[s]=new Nt(o,n)),r=xt[s]),i.query&&!n.query&&(n.query=i.queryKey),r.socket(i.path,n)}return i(Lt,{Manager:Nt,Socket:Bt,io:Lt,connect:Lt}),Lt}));
-//# sourceMappingURL=socket.io.min.js.map
diff --git a/route/static/js/socket.io.min.js.map b/route/static/js/socket.io.min.js.map
deleted file mode 100644
index ace1b4d44..000000000
--- a/route/static/js/socket.io.min.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"socket.io.min.js","sources":["../node_modules/engine.io-client/node_modules/engine.io-parser/build/esm/commons.js","../node_modules/@socket.io/base64-arraybuffer/dist/base64-arraybuffer.es5.js","../node_modules/engine.io-client/node_modules/engine.io-parser/build/esm/encodePacket.browser.js","../node_modules/engine.io-client/node_modules/engine.io-parser/build/esm/decodePacket.browser.js","../node_modules/engine.io-client/node_modules/engine.io-parser/build/esm/index.js","../node_modules/@socket.io/component-emitter/index.mjs","../node_modules/engine.io-client/build/esm/globalThis.browser.js","../node_modules/engine.io-client/build/esm/util.js","../node_modules/engine.io-client/build/esm/contrib/yeast.js","../node_modules/engine.io-client/build/esm/transport.js","../node_modules/engine.io-client/build/esm/contrib/parseqs.js","../node_modules/engine.io-client/build/esm/contrib/has-cors.js","../node_modules/engine.io-client/build/esm/transports/xmlhttprequest.browser.js","../node_modules/engine.io-client/build/esm/transports/polling.js","../node_modules/engine.io-client/build/esm/transports/websocket-constructor.browser.js","../node_modules/engine.io-client/build/esm/transports/websocket.js","../node_modules/engine.io-client/build/esm/transports/index.js","../node_modules/engine.io-client/build/esm/contrib/parseuri.js","../node_modules/engine.io-client/build/esm/socket.js","../node_modules/socket.io-parser/build/esm/is-binary.js","../node_modules/socket.io-parser/build/esm/binary.js","../node_modules/socket.io-parser/build/esm/index.js","../build/esm/on.js","../build/esm/socket.js","../build/esm/contrib/backo2.js","../build/esm/manager.js","../build/esm/index.js","../build/esm/url.js"],"sourcesContent":["const PACKET_TYPES = Object.create(null); // no Map = no polyfill\nPACKET_TYPES[\"open\"] = \"0\";\nPACKET_TYPES[\"close\"] = \"1\";\nPACKET_TYPES[\"ping\"] = \"2\";\nPACKET_TYPES[\"pong\"] = \"3\";\nPACKET_TYPES[\"message\"] = \"4\";\nPACKET_TYPES[\"upgrade\"] = \"5\";\nPACKET_TYPES[\"noop\"] = \"6\";\nconst PACKET_TYPES_REVERSE = Object.create(null);\nObject.keys(PACKET_TYPES).forEach(key => {\n    PACKET_TYPES_REVERSE[PACKET_TYPES[key]] = key;\n});\nconst ERROR_PACKET = { type: \"error\", data: \"parser error\" };\nexport { PACKET_TYPES, PACKET_TYPES_REVERSE, ERROR_PACKET };\n","/*\n * base64-arraybuffer 1.0.1 <https://github.com/niklasvh/base64-arraybuffer>\n * Copyright (c) 2022 Niklas von Hertzen <https://hertzen.com>\n * Released under MIT License\n */\nvar chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';\n// Use a lookup table to find the index.\nvar lookup = typeof Uint8Array === 'undefined' ? [] : new Uint8Array(256);\nfor (var i = 0; i < chars.length; i++) {\n    lookup[chars.charCodeAt(i)] = i;\n}\nvar encode = function (arraybuffer) {\n    var bytes = new Uint8Array(arraybuffer), i, len = bytes.length, base64 = '';\n    for (i = 0; i < len; i += 3) {\n        base64 += chars[bytes[i] >> 2];\n        base64 += chars[((bytes[i] & 3) << 4) | (bytes[i + 1] >> 4)];\n        base64 += chars[((bytes[i + 1] & 15) << 2) | (bytes[i + 2] >> 6)];\n        base64 += chars[bytes[i + 2] & 63];\n    }\n    if (len % 3 === 2) {\n        base64 = base64.substring(0, base64.length - 1) + '=';\n    }\n    else if (len % 3 === 1) {\n        base64 = base64.substring(0, base64.length - 2) + '==';\n    }\n    return base64;\n};\nvar decode = function (base64) {\n    var bufferLength = base64.length * 0.75, len = base64.length, i, p = 0, encoded1, encoded2, encoded3, encoded4;\n    if (base64[base64.length - 1] === '=') {\n        bufferLength--;\n        if (base64[base64.length - 2] === '=') {\n            bufferLength--;\n        }\n    }\n    var arraybuffer = new ArrayBuffer(bufferLength), bytes = new Uint8Array(arraybuffer);\n    for (i = 0; i < len; i += 4) {\n        encoded1 = lookup[base64.charCodeAt(i)];\n        encoded2 = lookup[base64.charCodeAt(i + 1)];\n        encoded3 = lookup[base64.charCodeAt(i + 2)];\n        encoded4 = lookup[base64.charCodeAt(i + 3)];\n        bytes[p++] = (encoded1 << 2) | (encoded2 >> 4);\n        bytes[p++] = ((encoded2 & 15) << 4) | (encoded3 >> 2);\n        bytes[p++] = ((encoded3 & 3) << 6) | (encoded4 & 63);\n    }\n    return arraybuffer;\n};\n\nexport { decode, encode };\n//# sourceMappingURL=base64-arraybuffer.es5.js.map\n","import { PACKET_TYPES } from \"./commons.js\";\nconst withNativeBlob = typeof Blob === \"function\" ||\n    (typeof Blob !== \"undefined\" &&\n        Object.prototype.toString.call(Blob) === \"[object BlobConstructor]\");\nconst withNativeArrayBuffer = typeof ArrayBuffer === \"function\";\n// ArrayBuffer.isView method is not defined in IE10\nconst isView = obj => {\n    return typeof ArrayBuffer.isView === \"function\"\n        ? ArrayBuffer.isView(obj)\n        : obj && obj.buffer instanceof ArrayBuffer;\n};\nconst encodePacket = ({ type, data }, supportsBinary, callback) => {\n    if (withNativeBlob && data instanceof Blob) {\n        if (supportsBinary) {\n            return callback(data);\n        }\n        else {\n            return encodeBlobAsBase64(data, callback);\n        }\n    }\n    else if (withNativeArrayBuffer &&\n        (data instanceof ArrayBuffer || isView(data))) {\n        if (supportsBinary) {\n            return callback(data);\n        }\n        else {\n            return encodeBlobAsBase64(new Blob([data]), callback);\n        }\n    }\n    // plain string\n    return callback(PACKET_TYPES[type] + (data || \"\"));\n};\nconst encodeBlobAsBase64 = (data, callback) => {\n    const fileReader = new FileReader();\n    fileReader.onload = function () {\n        const content = fileReader.result.split(\",\")[1];\n        callback(\"b\" + content);\n    };\n    return fileReader.readAsDataURL(data);\n};\nexport default encodePacket;\n","import { ERROR_PACKET, PACKET_TYPES_REVERSE } from \"./commons.js\";\nimport { decode } from \"@socket.io/base64-arraybuffer\";\nconst withNativeArrayBuffer = typeof ArrayBuffer === \"function\";\nconst decodePacket = (encodedPacket, binaryType) => {\n    if (typeof encodedPacket !== \"string\") {\n        return {\n            type: \"message\",\n            data: mapBinary(encodedPacket, binaryType)\n        };\n    }\n    const type = encodedPacket.charAt(0);\n    if (type === \"b\") {\n        return {\n            type: \"message\",\n            data: decodeBase64Packet(encodedPacket.substring(1), binaryType)\n        };\n    }\n    const packetType = PACKET_TYPES_REVERSE[type];\n    if (!packetType) {\n        return ERROR_PACKET;\n    }\n    return encodedPacket.length > 1\n        ? {\n            type: PACKET_TYPES_REVERSE[type],\n            data: encodedPacket.substring(1)\n        }\n        : {\n            type: PACKET_TYPES_REVERSE[type]\n        };\n};\nconst decodeBase64Packet = (data, binaryType) => {\n    if (withNativeArrayBuffer) {\n        const decoded = decode(data);\n        return mapBinary(decoded, binaryType);\n    }\n    else {\n        return { base64: true, data }; // fallback for old browsers\n    }\n};\nconst mapBinary = (data, binaryType) => {\n    switch (binaryType) {\n        case \"blob\":\n            return data instanceof ArrayBuffer ? new Blob([data]) : data;\n        case \"arraybuffer\":\n        default:\n            return data; // assuming the data is already an ArrayBuffer\n    }\n};\nexport default decodePacket;\n","import encodePacket from \"./encodePacket.js\";\nimport decodePacket from \"./decodePacket.js\";\nconst SEPARATOR = String.fromCharCode(30); // see https://en.wikipedia.org/wiki/Delimiter#ASCII_delimited_text\nconst encodePayload = (packets, callback) => {\n    // some packets may be added to the array while encoding, so the initial length must be saved\n    const length = packets.length;\n    const encodedPackets = new Array(length);\n    let count = 0;\n    packets.forEach((packet, i) => {\n        // force base64 encoding for binary packets\n        encodePacket(packet, false, encodedPacket => {\n            encodedPackets[i] = encodedPacket;\n            if (++count === length) {\n                callback(encodedPackets.join(SEPARATOR));\n            }\n        });\n    });\n};\nconst decodePayload = (encodedPayload, binaryType) => {\n    const encodedPackets = encodedPayload.split(SEPARATOR);\n    const packets = [];\n    for (let i = 0; i < encodedPackets.length; i++) {\n        const decodedPacket = decodePacket(encodedPackets[i], binaryType);\n        packets.push(decodedPacket);\n        if (decodedPacket.type === \"error\") {\n            break;\n        }\n    }\n    return packets;\n};\nexport const protocol = 4;\nexport { encodePacket, encodePayload, decodePacket, decodePayload };\n","/**\n * Initialize a new `Emitter`.\n *\n * @api public\n */\n\nexport function Emitter(obj) {\n  if (obj) return mixin(obj);\n}\n\n/**\n * Mixin the emitter properties.\n *\n * @param {Object} obj\n * @return {Object}\n * @api private\n */\n\nfunction mixin(obj) {\n  for (var key in Emitter.prototype) {\n    obj[key] = Emitter.prototype[key];\n  }\n  return obj;\n}\n\n/**\n * Listen on the given `event` with `fn`.\n *\n * @param {String} event\n * @param {Function} fn\n * @return {Emitter}\n * @api public\n */\n\nEmitter.prototype.on =\nEmitter.prototype.addEventListener = function(event, fn){\n  this._callbacks = this._callbacks || {};\n  (this._callbacks['$' + event] = this._callbacks['$' + event] || [])\n    .push(fn);\n  return this;\n};\n\n/**\n * Adds an `event` listener that will be invoked a single\n * time then automatically removed.\n *\n * @param {String} event\n * @param {Function} fn\n * @return {Emitter}\n * @api public\n */\n\nEmitter.prototype.once = function(event, fn){\n  function on() {\n    this.off(event, on);\n    fn.apply(this, arguments);\n  }\n\n  on.fn = fn;\n  this.on(event, on);\n  return this;\n};\n\n/**\n * Remove the given callback for `event` or all\n * registered callbacks.\n *\n * @param {String} event\n * @param {Function} fn\n * @return {Emitter}\n * @api public\n */\n\nEmitter.prototype.off =\nEmitter.prototype.removeListener =\nEmitter.prototype.removeAllListeners =\nEmitter.prototype.removeEventListener = function(event, fn){\n  this._callbacks = this._callbacks || {};\n\n  // all\n  if (0 == arguments.length) {\n    this._callbacks = {};\n    return this;\n  }\n\n  // specific event\n  var callbacks = this._callbacks['$' + event];\n  if (!callbacks) return this;\n\n  // remove all handlers\n  if (1 == arguments.length) {\n    delete this._callbacks['$' + event];\n    return this;\n  }\n\n  // remove specific handler\n  var cb;\n  for (var i = 0; i < callbacks.length; i++) {\n    cb = callbacks[i];\n    if (cb === fn || cb.fn === fn) {\n      callbacks.splice(i, 1);\n      break;\n    }\n  }\n\n  // Remove event specific arrays for event types that no\n  // one is subscribed for to avoid memory leak.\n  if (callbacks.length === 0) {\n    delete this._callbacks['$' + event];\n  }\n\n  return this;\n};\n\n/**\n * Emit `event` with the given args.\n *\n * @param {String} event\n * @param {Mixed} ...\n * @return {Emitter}\n */\n\nEmitter.prototype.emit = function(event){\n  this._callbacks = this._callbacks || {};\n\n  var args = new Array(arguments.length - 1)\n    , callbacks = this._callbacks['$' + event];\n\n  for (var i = 1; i < arguments.length; i++) {\n    args[i - 1] = arguments[i];\n  }\n\n  if (callbacks) {\n    callbacks = callbacks.slice(0);\n    for (var i = 0, len = callbacks.length; i < len; ++i) {\n      callbacks[i].apply(this, args);\n    }\n  }\n\n  return this;\n};\n\n// alias used for reserved events (protected method)\nEmitter.prototype.emitReserved = Emitter.prototype.emit;\n\n/**\n * Return array of callbacks for `event`.\n *\n * @param {String} event\n * @return {Array}\n * @api public\n */\n\nEmitter.prototype.listeners = function(event){\n  this._callbacks = this._callbacks || {};\n  return this._callbacks['$' + event] || [];\n};\n\n/**\n * Check if this emitter has `event` handlers.\n *\n * @param {String} event\n * @return {Boolean}\n * @api public\n */\n\nEmitter.prototype.hasListeners = function(event){\n  return !! this.listeners(event).length;\n};\n","export default (() => {\n    if (typeof self !== \"undefined\") {\n        return self;\n    }\n    else if (typeof window !== \"undefined\") {\n        return window;\n    }\n    else {\n        return Function(\"return this\")();\n    }\n})();\n","import globalThis from \"./globalThis.js\";\nexport function pick(obj, ...attr) {\n    return attr.reduce((acc, k) => {\n        if (obj.hasOwnProperty(k)) {\n            acc[k] = obj[k];\n        }\n        return acc;\n    }, {});\n}\n// Keep a reference to the real timeout functions so they can be used when overridden\nconst NATIVE_SET_TIMEOUT = setTimeout;\nconst NATIVE_CLEAR_TIMEOUT = clearTimeout;\nexport function installTimerFunctions(obj, opts) {\n    if (opts.useNativeTimers) {\n        obj.setTimeoutFn = NATIVE_SET_TIMEOUT.bind(globalThis);\n        obj.clearTimeoutFn = NATIVE_CLEAR_TIMEOUT.bind(globalThis);\n    }\n    else {\n        obj.setTimeoutFn = setTimeout.bind(globalThis);\n        obj.clearTimeoutFn = clearTimeout.bind(globalThis);\n    }\n}\n// base64 encoded buffers are about 33% bigger (https://en.wikipedia.org/wiki/Base64)\nconst BASE64_OVERHEAD = 1.33;\n// we could also have used `new Blob([obj]).size`, but it isn't supported in IE9\nexport function byteLength(obj) {\n    if (typeof obj === \"string\") {\n        return utf8Length(obj);\n    }\n    // arraybuffer or blob\n    return Math.ceil((obj.byteLength || obj.size) * BASE64_OVERHEAD);\n}\nfunction utf8Length(str) {\n    let c = 0, length = 0;\n    for (let i = 0, l = str.length; i < l; i++) {\n        c = str.charCodeAt(i);\n        if (c < 0x80) {\n            length += 1;\n        }\n        else if (c < 0x800) {\n            length += 2;\n        }\n        else if (c < 0xd800 || c >= 0xe000) {\n            length += 3;\n        }\n        else {\n            i++;\n            length += 4;\n        }\n    }\n    return length;\n}\n","// imported from https://github.com/unshiftio/yeast\n'use strict';\nconst alphabet = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_'.split(''), length = 64, map = {};\nlet seed = 0, i = 0, prev;\n/**\n * Return a string representing the specified number.\n *\n * @param {Number} num The number to convert.\n * @returns {String} The string representation of the number.\n * @api public\n */\nexport function encode(num) {\n    let encoded = '';\n    do {\n        encoded = alphabet[num % length] + encoded;\n        num = Math.floor(num / length);\n    } while (num > 0);\n    return encoded;\n}\n/**\n * Return the integer value specified by the given string.\n *\n * @param {String} str The string to convert.\n * @returns {Number} The integer value represented by the string.\n * @api public\n */\nexport function decode(str) {\n    let decoded = 0;\n    for (i = 0; i < str.length; i++) {\n        decoded = decoded * length + map[str.charAt(i)];\n    }\n    return decoded;\n}\n/**\n * Yeast: A tiny growing id generator.\n *\n * @returns {String} A unique id.\n * @api public\n */\nexport function yeast() {\n    const now = encode(+new Date());\n    if (now !== prev)\n        return seed = 0, prev = now;\n    return now + '.' + encode(seed++);\n}\n//\n// Map each character to its index.\n//\nfor (; i < length; i++)\n    map[alphabet[i]] = i;\n","import { decodePacket } from \"engine.io-parser\";\nimport { Emitter } from \"@socket.io/component-emitter\";\nimport { installTimerFunctions } from \"./util.js\";\nclass TransportError extends Error {\n    constructor(reason, description, context) {\n        super(reason);\n        this.description = description;\n        this.context = context;\n        this.type = \"TransportError\";\n    }\n}\nexport class Transport extends Emitter {\n    /**\n     * Transport abstract constructor.\n     *\n     * @param {Object} options.\n     * @api private\n     */\n    constructor(opts) {\n        super();\n        this.writable = false;\n        installTimerFunctions(this, opts);\n        this.opts = opts;\n        this.query = opts.query;\n        this.readyState = \"\";\n        this.socket = opts.socket;\n    }\n    /**\n     * Emits an error.\n     *\n     * @param {String} reason\n     * @param description\n     * @param context - the error context\n     * @return {Transport} for chaining\n     * @api protected\n     */\n    onError(reason, description, context) {\n        super.emitReserved(\"error\", new TransportError(reason, description, context));\n        return this;\n    }\n    /**\n     * Opens the transport.\n     *\n     * @api public\n     */\n    open() {\n        if (\"closed\" === this.readyState || \"\" === this.readyState) {\n            this.readyState = \"opening\";\n            this.doOpen();\n        }\n        return this;\n    }\n    /**\n     * Closes the transport.\n     *\n     * @api public\n     */\n    close() {\n        if (\"opening\" === this.readyState || \"open\" === this.readyState) {\n            this.doClose();\n            this.onClose();\n        }\n        return this;\n    }\n    /**\n     * Sends multiple packets.\n     *\n     * @param {Array} packets\n     * @api public\n     */\n    send(packets) {\n        if (\"open\" === this.readyState) {\n            this.write(packets);\n        }\n        else {\n            // this might happen if the transport was silently closed in the beforeunload event handler\n        }\n    }\n    /**\n     * Called upon open\n     *\n     * @api protected\n     */\n    onOpen() {\n        this.readyState = \"open\";\n        this.writable = true;\n        super.emitReserved(\"open\");\n    }\n    /**\n     * Called with data.\n     *\n     * @param {String} data\n     * @api protected\n     */\n    onData(data) {\n        const packet = decodePacket(data, this.socket.binaryType);\n        this.onPacket(packet);\n    }\n    /**\n     * Called with a decoded packet.\n     *\n     * @api protected\n     */\n    onPacket(packet) {\n        super.emitReserved(\"packet\", packet);\n    }\n    /**\n     * Called upon close.\n     *\n     * @api protected\n     */\n    onClose(details) {\n        this.readyState = \"closed\";\n        super.emitReserved(\"close\", details);\n    }\n}\n","// imported from https://github.com/galkn/querystring\n/**\n * Compiles a querystring\n * Returns string representation of the object\n *\n * @param {Object}\n * @api private\n */\nexport function encode(obj) {\n    let str = '';\n    for (let i in obj) {\n        if (obj.hasOwnProperty(i)) {\n            if (str.length)\n                str += '&';\n            str += encodeURIComponent(i) + '=' + encodeURIComponent(obj[i]);\n        }\n    }\n    return str;\n}\n/**\n * Parses a simple querystring into an object\n *\n * @param {String} qs\n * @api private\n */\nexport function decode(qs) {\n    let qry = {};\n    let pairs = qs.split('&');\n    for (let i = 0, l = pairs.length; i < l; i++) {\n        let pair = pairs[i].split('=');\n        qry[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1]);\n    }\n    return qry;\n}\n","// imported from https://github.com/component/has-cors\nlet value = false;\ntry {\n    value = typeof XMLHttpRequest !== 'undefined' &&\n        'withCredentials' in new XMLHttpRequest();\n}\ncatch (err) {\n    // if XMLHttp support is disabled in IE then it will throw\n    // when trying to create\n}\nexport const hasCORS = value;\n","// browser shim for xmlhttprequest module\nimport { hasCORS } from \"../contrib/has-cors.js\";\nimport globalThis from \"../globalThis.js\";\nexport default function (opts) {\n    const xdomain = opts.xdomain;\n    // XMLHttpRequest can be disabled on IE\n    try {\n        if (\"undefined\" !== typeof XMLHttpRequest && (!xdomain || hasCORS)) {\n            return new XMLHttpRequest();\n        }\n    }\n    catch (e) { }\n    if (!xdomain) {\n        try {\n            return new globalThis[[\"Active\"].concat(\"Object\").join(\"X\")](\"Microsoft.XMLHTTP\");\n        }\n        catch (e) { }\n    }\n}\n","import { Transport } from \"../transport.js\";\nimport { yeast } from \"../contrib/yeast.js\";\nimport { encode } from \"../contrib/parseqs.js\";\nimport { encodePayload, decodePayload } from \"engine.io-parser\";\nimport XMLHttpRequest from \"./xmlhttprequest.js\";\nimport { Emitter } from \"@socket.io/component-emitter\";\nimport { installTimerFunctions, pick } from \"../util.js\";\nimport globalThis from \"../globalThis.js\";\nfunction empty() { }\nconst hasXHR2 = (function () {\n    const xhr = new XMLHttpRequest({\n        xdomain: false\n    });\n    return null != xhr.responseType;\n})();\nexport class Polling extends Transport {\n    /**\n     * XHR Polling constructor.\n     *\n     * @param {Object} opts\n     * @api public\n     */\n    constructor(opts) {\n        super(opts);\n        this.polling = false;\n        if (typeof location !== \"undefined\") {\n            const isSSL = \"https:\" === location.protocol;\n            let port = location.port;\n            // some user agents have empty `location.port`\n            if (!port) {\n                port = isSSL ? \"443\" : \"80\";\n            }\n            this.xd =\n                (typeof location !== \"undefined\" &&\n                    opts.hostname !== location.hostname) ||\n                    port !== opts.port;\n            this.xs = opts.secure !== isSSL;\n        }\n        /**\n         * XHR supports binary\n         */\n        const forceBase64 = opts && opts.forceBase64;\n        this.supportsBinary = hasXHR2 && !forceBase64;\n    }\n    /**\n     * Transport name.\n     */\n    get name() {\n        return \"polling\";\n    }\n    /**\n     * Opens the socket (triggers polling). We write a PING message to determine\n     * when the transport is open.\n     *\n     * @api private\n     */\n    doOpen() {\n        this.poll();\n    }\n    /**\n     * Pauses polling.\n     *\n     * @param {Function} callback upon buffers are flushed and transport is paused\n     * @api private\n     */\n    pause(onPause) {\n        this.readyState = \"pausing\";\n        const pause = () => {\n            this.readyState = \"paused\";\n            onPause();\n        };\n        if (this.polling || !this.writable) {\n            let total = 0;\n            if (this.polling) {\n                total++;\n                this.once(\"pollComplete\", function () {\n                    --total || pause();\n                });\n            }\n            if (!this.writable) {\n                total++;\n                this.once(\"drain\", function () {\n                    --total || pause();\n                });\n            }\n        }\n        else {\n            pause();\n        }\n    }\n    /**\n     * Starts polling cycle.\n     *\n     * @api public\n     */\n    poll() {\n        this.polling = true;\n        this.doPoll();\n        this.emitReserved(\"poll\");\n    }\n    /**\n     * Overloads onData to detect payloads.\n     *\n     * @api private\n     */\n    onData(data) {\n        const callback = packet => {\n            // if its the first message we consider the transport open\n            if (\"opening\" === this.readyState && packet.type === \"open\") {\n                this.onOpen();\n            }\n            // if its a close packet, we close the ongoing requests\n            if (\"close\" === packet.type) {\n                this.onClose({ description: \"transport closed by the server\" });\n                return false;\n            }\n            // otherwise bypass onData and handle the message\n            this.onPacket(packet);\n        };\n        // decode payload\n        decodePayload(data, this.socket.binaryType).forEach(callback);\n        // if an event did not trigger closing\n        if (\"closed\" !== this.readyState) {\n            // if we got data we're not polling\n            this.polling = false;\n            this.emitReserved(\"pollComplete\");\n            if (\"open\" === this.readyState) {\n                this.poll();\n            }\n            else {\n            }\n        }\n    }\n    /**\n     * For polling, send a close packet.\n     *\n     * @api private\n     */\n    doClose() {\n        const close = () => {\n            this.write([{ type: \"close\" }]);\n        };\n        if (\"open\" === this.readyState) {\n            close();\n        }\n        else {\n            // in case we're trying to close while\n            // handshaking is in progress (GH-164)\n            this.once(\"open\", close);\n        }\n    }\n    /**\n     * Writes a packets payload.\n     *\n     * @param {Array} data packets\n     * @param {Function} drain callback\n     * @api private\n     */\n    write(packets) {\n        this.writable = false;\n        encodePayload(packets, data => {\n            this.doWrite(data, () => {\n                this.writable = true;\n                this.emitReserved(\"drain\");\n            });\n        });\n    }\n    /**\n     * Generates uri for connection.\n     *\n     * @api private\n     */\n    uri() {\n        let query = this.query || {};\n        const schema = this.opts.secure ? \"https\" : \"http\";\n        let port = \"\";\n        // cache busting is forced\n        if (false !== this.opts.timestampRequests) {\n            query[this.opts.timestampParam] = yeast();\n        }\n        if (!this.supportsBinary && !query.sid) {\n            query.b64 = 1;\n        }\n        // avoid port if default for schema\n        if (this.opts.port &&\n            ((\"https\" === schema && Number(this.opts.port) !== 443) ||\n                (\"http\" === schema && Number(this.opts.port) !== 80))) {\n            port = \":\" + this.opts.port;\n        }\n        const encodedQuery = encode(query);\n        const ipv6 = this.opts.hostname.indexOf(\":\") !== -1;\n        return (schema +\n            \"://\" +\n            (ipv6 ? \"[\" + this.opts.hostname + \"]\" : this.opts.hostname) +\n            port +\n            this.opts.path +\n            (encodedQuery.length ? \"?\" + encodedQuery : \"\"));\n    }\n    /**\n     * Creates a request.\n     *\n     * @param {String} method\n     * @api private\n     */\n    request(opts = {}) {\n        Object.assign(opts, { xd: this.xd, xs: this.xs }, this.opts);\n        return new Request(this.uri(), opts);\n    }\n    /**\n     * Sends data.\n     *\n     * @param {String} data to send.\n     * @param {Function} called upon flush.\n     * @api private\n     */\n    doWrite(data, fn) {\n        const req = this.request({\n            method: \"POST\",\n            data: data\n        });\n        req.on(\"success\", fn);\n        req.on(\"error\", (xhrStatus, context) => {\n            this.onError(\"xhr post error\", xhrStatus, context);\n        });\n    }\n    /**\n     * Starts a poll cycle.\n     *\n     * @api private\n     */\n    doPoll() {\n        const req = this.request();\n        req.on(\"data\", this.onData.bind(this));\n        req.on(\"error\", (xhrStatus, context) => {\n            this.onError(\"xhr poll error\", xhrStatus, context);\n        });\n        this.pollXhr = req;\n    }\n}\nexport class Request extends Emitter {\n    /**\n     * Request constructor\n     *\n     * @param {Object} options\n     * @api public\n     */\n    constructor(uri, opts) {\n        super();\n        installTimerFunctions(this, opts);\n        this.opts = opts;\n        this.method = opts.method || \"GET\";\n        this.uri = uri;\n        this.async = false !== opts.async;\n        this.data = undefined !== opts.data ? opts.data : null;\n        this.create();\n    }\n    /**\n     * Creates the XHR object and sends the request.\n     *\n     * @api private\n     */\n    create() {\n        const opts = pick(this.opts, \"agent\", \"pfx\", \"key\", \"passphrase\", \"cert\", \"ca\", \"ciphers\", \"rejectUnauthorized\", \"autoUnref\");\n        opts.xdomain = !!this.opts.xd;\n        opts.xscheme = !!this.opts.xs;\n        const xhr = (this.xhr = new XMLHttpRequest(opts));\n        try {\n            xhr.open(this.method, this.uri, this.async);\n            try {\n                if (this.opts.extraHeaders) {\n                    xhr.setDisableHeaderCheck && xhr.setDisableHeaderCheck(true);\n                    for (let i in this.opts.extraHeaders) {\n                        if (this.opts.extraHeaders.hasOwnProperty(i)) {\n                            xhr.setRequestHeader(i, this.opts.extraHeaders[i]);\n                        }\n                    }\n                }\n            }\n            catch (e) { }\n            if (\"POST\" === this.method) {\n                try {\n                    xhr.setRequestHeader(\"Content-type\", \"text/plain;charset=UTF-8\");\n                }\n                catch (e) { }\n            }\n            try {\n                xhr.setRequestHeader(\"Accept\", \"*/*\");\n            }\n            catch (e) { }\n            // ie6 check\n            if (\"withCredentials\" in xhr) {\n                xhr.withCredentials = this.opts.withCredentials;\n            }\n            if (this.opts.requestTimeout) {\n                xhr.timeout = this.opts.requestTimeout;\n            }\n            xhr.onreadystatechange = () => {\n                if (4 !== xhr.readyState)\n                    return;\n                if (200 === xhr.status || 1223 === xhr.status) {\n                    this.onLoad();\n                }\n                else {\n                    // make sure the `error` event handler that's user-set\n                    // does not throw in the same tick and gets caught here\n                    this.setTimeoutFn(() => {\n                        this.onError(typeof xhr.status === \"number\" ? xhr.status : 0);\n                    }, 0);\n                }\n            };\n            xhr.send(this.data);\n        }\n        catch (e) {\n            // Need to defer since .create() is called directly from the constructor\n            // and thus the 'error' event can only be only bound *after* this exception\n            // occurs.  Therefore, also, we cannot throw here at all.\n            this.setTimeoutFn(() => {\n                this.onError(e);\n            }, 0);\n            return;\n        }\n        if (typeof document !== \"undefined\") {\n            this.index = Request.requestsCount++;\n            Request.requests[this.index] = this;\n        }\n    }\n    /**\n     * Called upon error.\n     *\n     * @api private\n     */\n    onError(err) {\n        this.emitReserved(\"error\", err, this.xhr);\n        this.cleanup(true);\n    }\n    /**\n     * Cleans up house.\n     *\n     * @api private\n     */\n    cleanup(fromError) {\n        if (\"undefined\" === typeof this.xhr || null === this.xhr) {\n            return;\n        }\n        this.xhr.onreadystatechange = empty;\n        if (fromError) {\n            try {\n                this.xhr.abort();\n            }\n            catch (e) { }\n        }\n        if (typeof document !== \"undefined\") {\n            delete Request.requests[this.index];\n        }\n        this.xhr = null;\n    }\n    /**\n     * Called upon load.\n     *\n     * @api private\n     */\n    onLoad() {\n        const data = this.xhr.responseText;\n        if (data !== null) {\n            this.emitReserved(\"data\", data);\n            this.emitReserved(\"success\");\n            this.cleanup();\n        }\n    }\n    /**\n     * Aborts the request.\n     *\n     * @api public\n     */\n    abort() {\n        this.cleanup();\n    }\n}\nRequest.requestsCount = 0;\nRequest.requests = {};\n/**\n * Aborts pending requests when unloading the window. This is needed to prevent\n * memory leaks (e.g. when using IE) and to ensure that no spurious error is\n * emitted.\n */\nif (typeof document !== \"undefined\") {\n    // @ts-ignore\n    if (typeof attachEvent === \"function\") {\n        // @ts-ignore\n        attachEvent(\"onunload\", unloadHandler);\n    }\n    else if (typeof addEventListener === \"function\") {\n        const terminationEvent = \"onpagehide\" in globalThis ? \"pagehide\" : \"unload\";\n        addEventListener(terminationEvent, unloadHandler, false);\n    }\n}\nfunction unloadHandler() {\n    for (let i in Request.requests) {\n        if (Request.requests.hasOwnProperty(i)) {\n            Request.requests[i].abort();\n        }\n    }\n}\n","import globalThis from \"../globalThis.js\";\nexport const nextTick = (() => {\n    const isPromiseAvailable = typeof Promise === \"function\" && typeof Promise.resolve === \"function\";\n    if (isPromiseAvailable) {\n        return cb => Promise.resolve().then(cb);\n    }\n    else {\n        return (cb, setTimeoutFn) => setTimeoutFn(cb, 0);\n    }\n})();\nexport const WebSocket = globalThis.WebSocket || globalThis.MozWebSocket;\nexport const usingBrowserWebSocket = true;\nexport const defaultBinaryType = \"arraybuffer\";\n","import { Transport } from \"../transport.js\";\nimport { encode } from \"../contrib/parseqs.js\";\nimport { yeast } from \"../contrib/yeast.js\";\nimport { pick } from \"../util.js\";\nimport { defaultBinaryType, nextTick, usingBrowserWebSocket, WebSocket } from \"./websocket-constructor.js\";\nimport { encodePacket } from \"engine.io-parser\";\n// detect ReactNative environment\nconst isReactNative = typeof navigator !== \"undefined\" &&\n    typeof navigator.product === \"string\" &&\n    navigator.product.toLowerCase() === \"reactnative\";\nexport class WS extends Transport {\n    /**\n     * WebSocket transport constructor.\n     *\n     * @api {Object} connection options\n     * @api public\n     */\n    constructor(opts) {\n        super(opts);\n        this.supportsBinary = !opts.forceBase64;\n    }\n    /**\n     * Transport name.\n     *\n     * @api public\n     */\n    get name() {\n        return \"websocket\";\n    }\n    /**\n     * Opens socket.\n     *\n     * @api private\n     */\n    doOpen() {\n        if (!this.check()) {\n            // let probe timeout\n            return;\n        }\n        const uri = this.uri();\n        const protocols = this.opts.protocols;\n        // React Native only supports the 'headers' option, and will print a warning if anything else is passed\n        const opts = isReactNative\n            ? {}\n            : pick(this.opts, \"agent\", \"perMessageDeflate\", \"pfx\", \"key\", \"passphrase\", \"cert\", \"ca\", \"ciphers\", \"rejectUnauthorized\", \"localAddress\", \"protocolVersion\", \"origin\", \"maxPayload\", \"family\", \"checkServerIdentity\");\n        if (this.opts.extraHeaders) {\n            opts.headers = this.opts.extraHeaders;\n        }\n        try {\n            this.ws =\n                usingBrowserWebSocket && !isReactNative\n                    ? protocols\n                        ? new WebSocket(uri, protocols)\n                        : new WebSocket(uri)\n                    : new WebSocket(uri, protocols, opts);\n        }\n        catch (err) {\n            return this.emitReserved(\"error\", err);\n        }\n        this.ws.binaryType = this.socket.binaryType || defaultBinaryType;\n        this.addEventListeners();\n    }\n    /**\n     * Adds event listeners to the socket\n     *\n     * @api private\n     */\n    addEventListeners() {\n        this.ws.onopen = () => {\n            if (this.opts.autoUnref) {\n                this.ws._socket.unref();\n            }\n            this.onOpen();\n        };\n        this.ws.onclose = closeEvent => this.onClose({\n            description: \"websocket connection closed\",\n            context: closeEvent\n        });\n        this.ws.onmessage = ev => this.onData(ev.data);\n        this.ws.onerror = e => this.onError(\"websocket error\", e);\n    }\n    /**\n     * Writes data to socket.\n     *\n     * @param {Array} array of packets.\n     * @api private\n     */\n    write(packets) {\n        this.writable = false;\n        // encodePacket efficient as it uses WS framing\n        // no need for encodePayload\n        for (let i = 0; i < packets.length; i++) {\n            const packet = packets[i];\n            const lastPacket = i === packets.length - 1;\n            encodePacket(packet, this.supportsBinary, data => {\n                // always create a new object (GH-437)\n                const opts = {};\n                if (!usingBrowserWebSocket) {\n                    if (packet.options) {\n                        opts.compress = packet.options.compress;\n                    }\n                    if (this.opts.perMessageDeflate) {\n                        const len = \n                        // @ts-ignore\n                        \"string\" === typeof data ? Buffer.byteLength(data) : data.length;\n                        if (len < this.opts.perMessageDeflate.threshold) {\n                            opts.compress = false;\n                        }\n                    }\n                }\n                // Sometimes the websocket has already been closed but the browser didn't\n                // have a chance of informing us about it yet, in that case send will\n                // throw an error\n                try {\n                    if (usingBrowserWebSocket) {\n                        // TypeError is thrown when passing the second argument on Safari\n                        this.ws.send(data);\n                    }\n                    else {\n                        this.ws.send(data, opts);\n                    }\n                }\n                catch (e) {\n                }\n                if (lastPacket) {\n                    // fake drain\n                    // defer to next tick to allow Socket to clear writeBuffer\n                    nextTick(() => {\n                        this.writable = true;\n                        this.emitReserved(\"drain\");\n                    }, this.setTimeoutFn);\n                }\n            });\n        }\n    }\n    /**\n     * Closes socket.\n     *\n     * @api private\n     */\n    doClose() {\n        if (typeof this.ws !== \"undefined\") {\n            this.ws.close();\n            this.ws = null;\n        }\n    }\n    /**\n     * Generates uri for connection.\n     *\n     * @api private\n     */\n    uri() {\n        let query = this.query || {};\n        const schema = this.opts.secure ? \"wss\" : \"ws\";\n        let port = \"\";\n        // avoid port if default for schema\n        if (this.opts.port &&\n            ((\"wss\" === schema && Number(this.opts.port) !== 443) ||\n                (\"ws\" === schema && Number(this.opts.port) !== 80))) {\n            port = \":\" + this.opts.port;\n        }\n        // append timestamp to URI\n        if (this.opts.timestampRequests) {\n            query[this.opts.timestampParam] = yeast();\n        }\n        // communicate binary support capabilities\n        if (!this.supportsBinary) {\n            query.b64 = 1;\n        }\n        const encodedQuery = encode(query);\n        const ipv6 = this.opts.hostname.indexOf(\":\") !== -1;\n        return (schema +\n            \"://\" +\n            (ipv6 ? \"[\" + this.opts.hostname + \"]\" : this.opts.hostname) +\n            port +\n            this.opts.path +\n            (encodedQuery.length ? \"?\" + encodedQuery : \"\"));\n    }\n    /**\n     * Feature detection for WebSocket.\n     *\n     * @return {Boolean} whether this transport is available.\n     * @api public\n     */\n    check() {\n        return (!!WebSocket &&\n            !(\"__initialize\" in WebSocket && this.name === WS.prototype.name));\n    }\n}\n","import { Polling } from \"./polling.js\";\nimport { WS } from \"./websocket.js\";\nexport const transports = {\n    websocket: WS,\n    polling: Polling\n};\n","// imported from https://github.com/galkn/parseuri\n/**\n * Parses an URI\n *\n * @author Steven Levithan <stevenlevithan.com> (MIT license)\n * @api private\n */\nconst re = /^(?:(?![^:@]+:[^:@\\/]*@)(http|https|ws|wss):\\/\\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?((?:[a-f0-9]{0,4}:){2,7}[a-f0-9]{0,4}|[^:\\/?#]*)(?::(\\d*))?)(((\\/(?:[^?#](?![^?#\\/]*\\.[^?#\\/.]+(?:[?#]|$)))*\\/?)?([^?#\\/]*))(?:\\?([^#]*))?(?:#(.*))?)/;\nconst parts = [\n    'source', 'protocol', 'authority', 'userInfo', 'user', 'password', 'host', 'port', 'relative', 'path', 'directory', 'file', 'query', 'anchor'\n];\nexport function parse(str) {\n    const src = str, b = str.indexOf('['), e = str.indexOf(']');\n    if (b != -1 && e != -1) {\n        str = str.substring(0, b) + str.substring(b, e).replace(/:/g, ';') + str.substring(e, str.length);\n    }\n    let m = re.exec(str || ''), uri = {}, i = 14;\n    while (i--) {\n        uri[parts[i]] = m[i] || '';\n    }\n    if (b != -1 && e != -1) {\n        uri.source = src;\n        uri.host = uri.host.substring(1, uri.host.length - 1).replace(/;/g, ':');\n        uri.authority = uri.authority.replace('[', '').replace(']', '').replace(/;/g, ':');\n        uri.ipv6uri = true;\n    }\n    uri.pathNames = pathNames(uri, uri['path']);\n    uri.queryKey = queryKey(uri, uri['query']);\n    return uri;\n}\nfunction pathNames(obj, path) {\n    const regx = /\\/{2,9}/g, names = path.replace(regx, \"/\").split(\"/\");\n    if (path.substr(0, 1) == '/' || path.length === 0) {\n        names.splice(0, 1);\n    }\n    if (path.substr(path.length - 1, 1) == '/') {\n        names.splice(names.length - 1, 1);\n    }\n    return names;\n}\nfunction queryKey(uri, query) {\n    const data = {};\n    query.replace(/(?:^|&)([^&=]*)=?([^&]*)/g, function ($0, $1, $2) {\n        if ($1) {\n            data[$1] = $2;\n        }\n    });\n    return data;\n}\n","import { transports } from \"./transports/index.js\";\nimport { installTimerFunctions, byteLength } from \"./util.js\";\nimport { decode } from \"./contrib/parseqs.js\";\nimport { parse } from \"./contrib/parseuri.js\";\nimport { Emitter } from \"@socket.io/component-emitter\";\nimport { protocol } from \"engine.io-parser\";\nexport class Socket extends Emitter {\n    /**\n     * Socket constructor.\n     *\n     * @param {String|Object} uri or options\n     * @param {Object} opts - options\n     * @api public\n     */\n    constructor(uri, opts = {}) {\n        super();\n        if (uri && \"object\" === typeof uri) {\n            opts = uri;\n            uri = null;\n        }\n        if (uri) {\n            uri = parse(uri);\n            opts.hostname = uri.host;\n            opts.secure = uri.protocol === \"https\" || uri.protocol === \"wss\";\n            opts.port = uri.port;\n            if (uri.query)\n                opts.query = uri.query;\n        }\n        else if (opts.host) {\n            opts.hostname = parse(opts.host).host;\n        }\n        installTimerFunctions(this, opts);\n        this.secure =\n            null != opts.secure\n                ? opts.secure\n                : typeof location !== \"undefined\" && \"https:\" === location.protocol;\n        if (opts.hostname && !opts.port) {\n            // if no port is specified manually, use the protocol default\n            opts.port = this.secure ? \"443\" : \"80\";\n        }\n        this.hostname =\n            opts.hostname ||\n                (typeof location !== \"undefined\" ? location.hostname : \"localhost\");\n        this.port =\n            opts.port ||\n                (typeof location !== \"undefined\" && location.port\n                    ? location.port\n                    : this.secure\n                        ? \"443\"\n                        : \"80\");\n        this.transports = opts.transports || [\"polling\", \"websocket\"];\n        this.readyState = \"\";\n        this.writeBuffer = [];\n        this.prevBufferLen = 0;\n        this.opts = Object.assign({\n            path: \"/engine.io\",\n            agent: false,\n            withCredentials: false,\n            upgrade: true,\n            timestampParam: \"t\",\n            rememberUpgrade: false,\n            rejectUnauthorized: true,\n            perMessageDeflate: {\n                threshold: 1024\n            },\n            transportOptions: {},\n            closeOnBeforeunload: true\n        }, opts);\n        this.opts.path = this.opts.path.replace(/\\/$/, \"\") + \"/\";\n        if (typeof this.opts.query === \"string\") {\n            this.opts.query = decode(this.opts.query);\n        }\n        // set on handshake\n        this.id = null;\n        this.upgrades = null;\n        this.pingInterval = null;\n        this.pingTimeout = null;\n        // set on heartbeat\n        this.pingTimeoutTimer = null;\n        if (typeof addEventListener === \"function\") {\n            if (this.opts.closeOnBeforeunload) {\n                // Firefox closes the connection when the \"beforeunload\" event is emitted but not Chrome. This event listener\n                // ensures every browser behaves the same (no \"disconnect\" event at the Socket.IO level when the page is\n                // closed/reloaded)\n                addEventListener(\"beforeunload\", () => {\n                    if (this.transport) {\n                        // silently close the transport\n                        this.transport.removeAllListeners();\n                        this.transport.close();\n                    }\n                }, false);\n            }\n            if (this.hostname !== \"localhost\") {\n                this.offlineEventListener = () => {\n                    this.onClose(\"transport close\", {\n                        description: \"network connection lost\"\n                    });\n                };\n                addEventListener(\"offline\", this.offlineEventListener, false);\n            }\n        }\n        this.open();\n    }\n    /**\n     * Creates transport of the given type.\n     *\n     * @param {String} transport name\n     * @return {Transport}\n     * @api private\n     */\n    createTransport(name) {\n        const query = Object.assign({}, this.opts.query);\n        // append engine.io protocol identifier\n        query.EIO = protocol;\n        // transport name\n        query.transport = name;\n        // session id if we already have one\n        if (this.id)\n            query.sid = this.id;\n        const opts = Object.assign({}, this.opts.transportOptions[name], this.opts, {\n            query,\n            socket: this,\n            hostname: this.hostname,\n            secure: this.secure,\n            port: this.port\n        });\n        return new transports[name](opts);\n    }\n    /**\n     * Initializes transport to use and starts probe.\n     *\n     * @api private\n     */\n    open() {\n        let transport;\n        if (this.opts.rememberUpgrade &&\n            Socket.priorWebsocketSuccess &&\n            this.transports.indexOf(\"websocket\") !== -1) {\n            transport = \"websocket\";\n        }\n        else if (0 === this.transports.length) {\n            // Emit error on next tick so it can be listened to\n            this.setTimeoutFn(() => {\n                this.emitReserved(\"error\", \"No transports available\");\n            }, 0);\n            return;\n        }\n        else {\n            transport = this.transports[0];\n        }\n        this.readyState = \"opening\";\n        // Retry with the next transport if the transport is disabled (jsonp: false)\n        try {\n            transport = this.createTransport(transport);\n        }\n        catch (e) {\n            this.transports.shift();\n            this.open();\n            return;\n        }\n        transport.open();\n        this.setTransport(transport);\n    }\n    /**\n     * Sets the current transport. Disables the existing one (if any).\n     *\n     * @api private\n     */\n    setTransport(transport) {\n        if (this.transport) {\n            this.transport.removeAllListeners();\n        }\n        // set up transport\n        this.transport = transport;\n        // set up transport listeners\n        transport\n            .on(\"drain\", this.onDrain.bind(this))\n            .on(\"packet\", this.onPacket.bind(this))\n            .on(\"error\", this.onError.bind(this))\n            .on(\"close\", reason => this.onClose(\"transport close\", reason));\n    }\n    /**\n     * Probes a transport.\n     *\n     * @param {String} transport name\n     * @api private\n     */\n    probe(name) {\n        let transport = this.createTransport(name);\n        let failed = false;\n        Socket.priorWebsocketSuccess = false;\n        const onTransportOpen = () => {\n            if (failed)\n                return;\n            transport.send([{ type: \"ping\", data: \"probe\" }]);\n            transport.once(\"packet\", msg => {\n                if (failed)\n                    return;\n                if (\"pong\" === msg.type && \"probe\" === msg.data) {\n                    this.upgrading = true;\n                    this.emitReserved(\"upgrading\", transport);\n                    if (!transport)\n                        return;\n                    Socket.priorWebsocketSuccess = \"websocket\" === transport.name;\n                    this.transport.pause(() => {\n                        if (failed)\n                            return;\n                        if (\"closed\" === this.readyState)\n                            return;\n                        cleanup();\n                        this.setTransport(transport);\n                        transport.send([{ type: \"upgrade\" }]);\n                        this.emitReserved(\"upgrade\", transport);\n                        transport = null;\n                        this.upgrading = false;\n                        this.flush();\n                    });\n                }\n                else {\n                    const err = new Error(\"probe error\");\n                    // @ts-ignore\n                    err.transport = transport.name;\n                    this.emitReserved(\"upgradeError\", err);\n                }\n            });\n        };\n        function freezeTransport() {\n            if (failed)\n                return;\n            // Any callback called by transport should be ignored since now\n            failed = true;\n            cleanup();\n            transport.close();\n            transport = null;\n        }\n        // Handle any error that happens while probing\n        const onerror = err => {\n            const error = new Error(\"probe error: \" + err);\n            // @ts-ignore\n            error.transport = transport.name;\n            freezeTransport();\n            this.emitReserved(\"upgradeError\", error);\n        };\n        function onTransportClose() {\n            onerror(\"transport closed\");\n        }\n        // When the socket is closed while we're probing\n        function onclose() {\n            onerror(\"socket closed\");\n        }\n        // When the socket is upgraded while we're probing\n        function onupgrade(to) {\n            if (transport && to.name !== transport.name) {\n                freezeTransport();\n            }\n        }\n        // Remove all listeners on the transport and on self\n        const cleanup = () => {\n            transport.removeListener(\"open\", onTransportOpen);\n            transport.removeListener(\"error\", onerror);\n            transport.removeListener(\"close\", onTransportClose);\n            this.off(\"close\", onclose);\n            this.off(\"upgrading\", onupgrade);\n        };\n        transport.once(\"open\", onTransportOpen);\n        transport.once(\"error\", onerror);\n        transport.once(\"close\", onTransportClose);\n        this.once(\"close\", onclose);\n        this.once(\"upgrading\", onupgrade);\n        transport.open();\n    }\n    /**\n     * Called when connection is deemed open.\n     *\n     * @api private\n     */\n    onOpen() {\n        this.readyState = \"open\";\n        Socket.priorWebsocketSuccess = \"websocket\" === this.transport.name;\n        this.emitReserved(\"open\");\n        this.flush();\n        // we check for `readyState` in case an `open`\n        // listener already closed the socket\n        if (\"open\" === this.readyState &&\n            this.opts.upgrade &&\n            this.transport.pause) {\n            let i = 0;\n            const l = this.upgrades.length;\n            for (; i < l; i++) {\n                this.probe(this.upgrades[i]);\n            }\n        }\n    }\n    /**\n     * Handles a packet.\n     *\n     * @api private\n     */\n    onPacket(packet) {\n        if (\"opening\" === this.readyState ||\n            \"open\" === this.readyState ||\n            \"closing\" === this.readyState) {\n            this.emitReserved(\"packet\", packet);\n            // Socket is live - any packet counts\n            this.emitReserved(\"heartbeat\");\n            switch (packet.type) {\n                case \"open\":\n                    this.onHandshake(JSON.parse(packet.data));\n                    break;\n                case \"ping\":\n                    this.resetPingTimeout();\n                    this.sendPacket(\"pong\");\n                    this.emitReserved(\"ping\");\n                    this.emitReserved(\"pong\");\n                    break;\n                case \"error\":\n                    const err = new Error(\"server error\");\n                    // @ts-ignore\n                    err.code = packet.data;\n                    this.onError(err);\n                    break;\n                case \"message\":\n                    this.emitReserved(\"data\", packet.data);\n                    this.emitReserved(\"message\", packet.data);\n                    break;\n            }\n        }\n        else {\n        }\n    }\n    /**\n     * Called upon handshake completion.\n     *\n     * @param {Object} data - handshake obj\n     * @api private\n     */\n    onHandshake(data) {\n        this.emitReserved(\"handshake\", data);\n        this.id = data.sid;\n        this.transport.query.sid = data.sid;\n        this.upgrades = this.filterUpgrades(data.upgrades);\n        this.pingInterval = data.pingInterval;\n        this.pingTimeout = data.pingTimeout;\n        this.maxPayload = data.maxPayload;\n        this.onOpen();\n        // In case open handler closes socket\n        if (\"closed\" === this.readyState)\n            return;\n        this.resetPingTimeout();\n    }\n    /**\n     * Sets and resets ping timeout timer based on server pings.\n     *\n     * @api private\n     */\n    resetPingTimeout() {\n        this.clearTimeoutFn(this.pingTimeoutTimer);\n        this.pingTimeoutTimer = this.setTimeoutFn(() => {\n            this.onClose(\"ping timeout\");\n        }, this.pingInterval + this.pingTimeout);\n        if (this.opts.autoUnref) {\n            this.pingTimeoutTimer.unref();\n        }\n    }\n    /**\n     * Called on `drain` event\n     *\n     * @api private\n     */\n    onDrain() {\n        this.writeBuffer.splice(0, this.prevBufferLen);\n        // setting prevBufferLen = 0 is very important\n        // for example, when upgrading, upgrade packet is sent over,\n        // and a nonzero prevBufferLen could cause problems on `drain`\n        this.prevBufferLen = 0;\n        if (0 === this.writeBuffer.length) {\n            this.emitReserved(\"drain\");\n        }\n        else {\n            this.flush();\n        }\n    }\n    /**\n     * Flush write buffers.\n     *\n     * @api private\n     */\n    flush() {\n        if (\"closed\" !== this.readyState &&\n            this.transport.writable &&\n            !this.upgrading &&\n            this.writeBuffer.length) {\n            const packets = this.getWritablePackets();\n            this.transport.send(packets);\n            // keep track of current length of writeBuffer\n            // splice writeBuffer and callbackBuffer on `drain`\n            this.prevBufferLen = packets.length;\n            this.emitReserved(\"flush\");\n        }\n    }\n    /**\n     * Ensure the encoded size of the writeBuffer is below the maxPayload value sent by the server (only for HTTP\n     * long-polling)\n     *\n     * @private\n     */\n    getWritablePackets() {\n        const shouldCheckPayloadSize = this.maxPayload &&\n            this.transport.name === \"polling\" &&\n            this.writeBuffer.length > 1;\n        if (!shouldCheckPayloadSize) {\n            return this.writeBuffer;\n        }\n        let payloadSize = 1; // first packet type\n        for (let i = 0; i < this.writeBuffer.length; i++) {\n            const data = this.writeBuffer[i].data;\n            if (data) {\n                payloadSize += byteLength(data);\n            }\n            if (i > 0 && payloadSize > this.maxPayload) {\n                return this.writeBuffer.slice(0, i);\n            }\n            payloadSize += 2; // separator + packet type\n        }\n        return this.writeBuffer;\n    }\n    /**\n     * Sends a message.\n     *\n     * @param {String} message.\n     * @param {Function} callback function.\n     * @param {Object} options.\n     * @return {Socket} for chaining.\n     * @api public\n     */\n    write(msg, options, fn) {\n        this.sendPacket(\"message\", msg, options, fn);\n        return this;\n    }\n    send(msg, options, fn) {\n        this.sendPacket(\"message\", msg, options, fn);\n        return this;\n    }\n    /**\n     * Sends a packet.\n     *\n     * @param {String} packet type.\n     * @param {String} data.\n     * @param {Object} options.\n     * @param {Function} callback function.\n     * @api private\n     */\n    sendPacket(type, data, options, fn) {\n        if (\"function\" === typeof data) {\n            fn = data;\n            data = undefined;\n        }\n        if (\"function\" === typeof options) {\n            fn = options;\n            options = null;\n        }\n        if (\"closing\" === this.readyState || \"closed\" === this.readyState) {\n            return;\n        }\n        options = options || {};\n        options.compress = false !== options.compress;\n        const packet = {\n            type: type,\n            data: data,\n            options: options\n        };\n        this.emitReserved(\"packetCreate\", packet);\n        this.writeBuffer.push(packet);\n        if (fn)\n            this.once(\"flush\", fn);\n        this.flush();\n    }\n    /**\n     * Closes the connection.\n     *\n     * @api public\n     */\n    close() {\n        const close = () => {\n            this.onClose(\"forced close\");\n            this.transport.close();\n        };\n        const cleanupAndClose = () => {\n            this.off(\"upgrade\", cleanupAndClose);\n            this.off(\"upgradeError\", cleanupAndClose);\n            close();\n        };\n        const waitForUpgrade = () => {\n            // wait for upgrade to finish since we can't send packets while pausing a transport\n            this.once(\"upgrade\", cleanupAndClose);\n            this.once(\"upgradeError\", cleanupAndClose);\n        };\n        if (\"opening\" === this.readyState || \"open\" === this.readyState) {\n            this.readyState = \"closing\";\n            if (this.writeBuffer.length) {\n                this.once(\"drain\", () => {\n                    if (this.upgrading) {\n                        waitForUpgrade();\n                    }\n                    else {\n                        close();\n                    }\n                });\n            }\n            else if (this.upgrading) {\n                waitForUpgrade();\n            }\n            else {\n                close();\n            }\n        }\n        return this;\n    }\n    /**\n     * Called upon transport error\n     *\n     * @api private\n     */\n    onError(err) {\n        Socket.priorWebsocketSuccess = false;\n        this.emitReserved(\"error\", err);\n        this.onClose(\"transport error\", err);\n    }\n    /**\n     * Called upon transport close.\n     *\n     * @api private\n     */\n    onClose(reason, description) {\n        if (\"opening\" === this.readyState ||\n            \"open\" === this.readyState ||\n            \"closing\" === this.readyState) {\n            // clear timers\n            this.clearTimeoutFn(this.pingTimeoutTimer);\n            // stop event from firing again for transport\n            this.transport.removeAllListeners(\"close\");\n            // ensure transport won't stay open\n            this.transport.close();\n            // ignore further transport communication\n            this.transport.removeAllListeners();\n            if (typeof removeEventListener === \"function\") {\n                removeEventListener(\"offline\", this.offlineEventListener, false);\n            }\n            // set ready state\n            this.readyState = \"closed\";\n            // clear session id\n            this.id = null;\n            // emit close event\n            this.emitReserved(\"close\", reason, description);\n            // clean buffers after, so users can still\n            // grab the buffers on `close` event\n            this.writeBuffer = [];\n            this.prevBufferLen = 0;\n        }\n    }\n    /**\n     * Filters upgrades, returning only those matching client transports.\n     *\n     * @param {Array} server upgrades\n     * @api private\n     *\n     */\n    filterUpgrades(upgrades) {\n        const filteredUpgrades = [];\n        let i = 0;\n        const j = upgrades.length;\n        for (; i < j; i++) {\n            if (~this.transports.indexOf(upgrades[i]))\n                filteredUpgrades.push(upgrades[i]);\n        }\n        return filteredUpgrades;\n    }\n}\nSocket.protocol = protocol;\n","const withNativeArrayBuffer = typeof ArrayBuffer === \"function\";\nconst isView = (obj) => {\n    return typeof ArrayBuffer.isView === \"function\"\n        ? ArrayBuffer.isView(obj)\n        : obj.buffer instanceof ArrayBuffer;\n};\nconst toString = Object.prototype.toString;\nconst withNativeBlob = typeof Blob === \"function\" ||\n    (typeof Blob !== \"undefined\" &&\n        toString.call(Blob) === \"[object BlobConstructor]\");\nconst withNativeFile = typeof File === \"function\" ||\n    (typeof File !== \"undefined\" &&\n        toString.call(File) === \"[object FileConstructor]\");\n/**\n * Returns true if obj is a Buffer, an ArrayBuffer, a Blob or a File.\n *\n * @private\n */\nexport function isBinary(obj) {\n    return ((withNativeArrayBuffer && (obj instanceof ArrayBuffer || isView(obj))) ||\n        (withNativeBlob && obj instanceof Blob) ||\n        (withNativeFile && obj instanceof File));\n}\nexport function hasBinary(obj, toJSON) {\n    if (!obj || typeof obj !== \"object\") {\n        return false;\n    }\n    if (Array.isArray(obj)) {\n        for (let i = 0, l = obj.length; i < l; i++) {\n            if (hasBinary(obj[i])) {\n                return true;\n            }\n        }\n        return false;\n    }\n    if (isBinary(obj)) {\n        return true;\n    }\n    if (obj.toJSON &&\n        typeof obj.toJSON === \"function\" &&\n        arguments.length === 1) {\n        return hasBinary(obj.toJSON(), true);\n    }\n    for (const key in obj) {\n        if (Object.prototype.hasOwnProperty.call(obj, key) && hasBinary(obj[key])) {\n            return true;\n        }\n    }\n    return false;\n}\n","import { isBinary } from \"./is-binary.js\";\n/**\n * Replaces every Buffer | ArrayBuffer | Blob | File in packet with a numbered placeholder.\n *\n * @param {Object} packet - socket.io event packet\n * @return {Object} with deconstructed packet and list of buffers\n * @public\n */\nexport function deconstructPacket(packet) {\n    const buffers = [];\n    const packetData = packet.data;\n    const pack = packet;\n    pack.data = _deconstructPacket(packetData, buffers);\n    pack.attachments = buffers.length; // number of binary 'attachments'\n    return { packet: pack, buffers: buffers };\n}\nfunction _deconstructPacket(data, buffers) {\n    if (!data)\n        return data;\n    if (isBinary(data)) {\n        const placeholder = { _placeholder: true, num: buffers.length };\n        buffers.push(data);\n        return placeholder;\n    }\n    else if (Array.isArray(data)) {\n        const newData = new Array(data.length);\n        for (let i = 0; i < data.length; i++) {\n            newData[i] = _deconstructPacket(data[i], buffers);\n        }\n        return newData;\n    }\n    else if (typeof data === \"object\" && !(data instanceof Date)) {\n        const newData = {};\n        for (const key in data) {\n            if (Object.prototype.hasOwnProperty.call(data, key)) {\n                newData[key] = _deconstructPacket(data[key], buffers);\n            }\n        }\n        return newData;\n    }\n    return data;\n}\n/**\n * Reconstructs a binary packet from its placeholder packet and buffers\n *\n * @param {Object} packet - event packet with placeholders\n * @param {Array} buffers - binary buffers to put in placeholder positions\n * @return {Object} reconstructed packet\n * @public\n */\nexport function reconstructPacket(packet, buffers) {\n    packet.data = _reconstructPacket(packet.data, buffers);\n    packet.attachments = undefined; // no longer useful\n    return packet;\n}\nfunction _reconstructPacket(data, buffers) {\n    if (!data)\n        return data;\n    if (data && data._placeholder) {\n        return buffers[data.num]; // appropriate buffer (should be natural order anyway)\n    }\n    else if (Array.isArray(data)) {\n        for (let i = 0; i < data.length; i++) {\n            data[i] = _reconstructPacket(data[i], buffers);\n        }\n    }\n    else if (typeof data === \"object\") {\n        for (const key in data) {\n            if (Object.prototype.hasOwnProperty.call(data, key)) {\n                data[key] = _reconstructPacket(data[key], buffers);\n            }\n        }\n    }\n    return data;\n}\n","import { Emitter } from \"@socket.io/component-emitter\";\nimport { deconstructPacket, reconstructPacket } from \"./binary.js\";\nimport { isBinary, hasBinary } from \"./is-binary.js\";\n/**\n * Protocol version.\n *\n * @public\n */\nexport const protocol = 5;\nexport var PacketType;\n(function (PacketType) {\n    PacketType[PacketType[\"CONNECT\"] = 0] = \"CONNECT\";\n    PacketType[PacketType[\"DISCONNECT\"] = 1] = \"DISCONNECT\";\n    PacketType[PacketType[\"EVENT\"] = 2] = \"EVENT\";\n    PacketType[PacketType[\"ACK\"] = 3] = \"ACK\";\n    PacketType[PacketType[\"CONNECT_ERROR\"] = 4] = \"CONNECT_ERROR\";\n    PacketType[PacketType[\"BINARY_EVENT\"] = 5] = \"BINARY_EVENT\";\n    PacketType[PacketType[\"BINARY_ACK\"] = 6] = \"BINARY_ACK\";\n})(PacketType || (PacketType = {}));\n/**\n * A socket.io Encoder instance\n */\nexport class Encoder {\n    /**\n     * Encoder constructor\n     *\n     * @param {function} replacer - custom replacer to pass down to JSON.parse\n     */\n    constructor(replacer) {\n        this.replacer = replacer;\n    }\n    /**\n     * Encode a packet as a single string if non-binary, or as a\n     * buffer sequence, depending on packet type.\n     *\n     * @param {Object} obj - packet object\n     */\n    encode(obj) {\n        if (obj.type === PacketType.EVENT || obj.type === PacketType.ACK) {\n            if (hasBinary(obj)) {\n                obj.type =\n                    obj.type === PacketType.EVENT\n                        ? PacketType.BINARY_EVENT\n                        : PacketType.BINARY_ACK;\n                return this.encodeAsBinary(obj);\n            }\n        }\n        return [this.encodeAsString(obj)];\n    }\n    /**\n     * Encode packet as string.\n     */\n    encodeAsString(obj) {\n        // first is type\n        let str = \"\" + obj.type;\n        // attachments if we have them\n        if (obj.type === PacketType.BINARY_EVENT ||\n            obj.type === PacketType.BINARY_ACK) {\n            str += obj.attachments + \"-\";\n        }\n        // if we have a namespace other than `/`\n        // we append it followed by a comma `,`\n        if (obj.nsp && \"/\" !== obj.nsp) {\n            str += obj.nsp + \",\";\n        }\n        // immediately followed by the id\n        if (null != obj.id) {\n            str += obj.id;\n        }\n        // json data\n        if (null != obj.data) {\n            str += JSON.stringify(obj.data, this.replacer);\n        }\n        return str;\n    }\n    /**\n     * Encode packet as 'buffer sequence' by removing blobs, and\n     * deconstructing packet into object with placeholders and\n     * a list of buffers.\n     */\n    encodeAsBinary(obj) {\n        const deconstruction = deconstructPacket(obj);\n        const pack = this.encodeAsString(deconstruction.packet);\n        const buffers = deconstruction.buffers;\n        buffers.unshift(pack); // add packet info to beginning of data list\n        return buffers; // write all the buffers\n    }\n}\n/**\n * A socket.io Decoder instance\n *\n * @return {Object} decoder\n */\nexport class Decoder extends Emitter {\n    /**\n     * Decoder constructor\n     *\n     * @param {function} reviver - custom reviver to pass down to JSON.stringify\n     */\n    constructor(reviver) {\n        super();\n        this.reviver = reviver;\n    }\n    /**\n     * Decodes an encoded packet string into packet JSON.\n     *\n     * @param {String} obj - encoded packet\n     */\n    add(obj) {\n        let packet;\n        if (typeof obj === \"string\") {\n            packet = this.decodeString(obj);\n            if (packet.type === PacketType.BINARY_EVENT ||\n                packet.type === PacketType.BINARY_ACK) {\n                // binary packet's json\n                this.reconstructor = new BinaryReconstructor(packet);\n                // no attachments, labeled binary but no binary data to follow\n                if (packet.attachments === 0) {\n                    super.emitReserved(\"decoded\", packet);\n                }\n            }\n            else {\n                // non-binary full packet\n                super.emitReserved(\"decoded\", packet);\n            }\n        }\n        else if (isBinary(obj) || obj.base64) {\n            // raw binary data\n            if (!this.reconstructor) {\n                throw new Error(\"got binary data when not reconstructing a packet\");\n            }\n            else {\n                packet = this.reconstructor.takeBinaryData(obj);\n                if (packet) {\n                    // received final buffer\n                    this.reconstructor = null;\n                    super.emitReserved(\"decoded\", packet);\n                }\n            }\n        }\n        else {\n            throw new Error(\"Unknown type: \" + obj);\n        }\n    }\n    /**\n     * Decode a packet String (JSON data)\n     *\n     * @param {String} str\n     * @return {Object} packet\n     */\n    decodeString(str) {\n        let i = 0;\n        // look up type\n        const p = {\n            type: Number(str.charAt(0)),\n        };\n        if (PacketType[p.type] === undefined) {\n            throw new Error(\"unknown packet type \" + p.type);\n        }\n        // look up attachments if type binary\n        if (p.type === PacketType.BINARY_EVENT ||\n            p.type === PacketType.BINARY_ACK) {\n            const start = i + 1;\n            while (str.charAt(++i) !== \"-\" && i != str.length) { }\n            const buf = str.substring(start, i);\n            if (buf != Number(buf) || str.charAt(i) !== \"-\") {\n                throw new Error(\"Illegal attachments\");\n            }\n            p.attachments = Number(buf);\n        }\n        // look up namespace (if any)\n        if (\"/\" === str.charAt(i + 1)) {\n            const start = i + 1;\n            while (++i) {\n                const c = str.charAt(i);\n                if (\",\" === c)\n                    break;\n                if (i === str.length)\n                    break;\n            }\n            p.nsp = str.substring(start, i);\n        }\n        else {\n            p.nsp = \"/\";\n        }\n        // look up id\n        const next = str.charAt(i + 1);\n        if (\"\" !== next && Number(next) == next) {\n            const start = i + 1;\n            while (++i) {\n                const c = str.charAt(i);\n                if (null == c || Number(c) != c) {\n                    --i;\n                    break;\n                }\n                if (i === str.length)\n                    break;\n            }\n            p.id = Number(str.substring(start, i + 1));\n        }\n        // look up json data\n        if (str.charAt(++i)) {\n            const payload = this.tryParse(str.substr(i));\n            if (Decoder.isPayloadValid(p.type, payload)) {\n                p.data = payload;\n            }\n            else {\n                throw new Error(\"invalid payload\");\n            }\n        }\n        return p;\n    }\n    tryParse(str) {\n        try {\n            return JSON.parse(str, this.reviver);\n        }\n        catch (e) {\n            return false;\n        }\n    }\n    static isPayloadValid(type, payload) {\n        switch (type) {\n            case PacketType.CONNECT:\n                return typeof payload === \"object\";\n            case PacketType.DISCONNECT:\n                return payload === undefined;\n            case PacketType.CONNECT_ERROR:\n                return typeof payload === \"string\" || typeof payload === \"object\";\n            case PacketType.EVENT:\n            case PacketType.BINARY_EVENT:\n                return Array.isArray(payload) && payload.length > 0;\n            case PacketType.ACK:\n            case PacketType.BINARY_ACK:\n                return Array.isArray(payload);\n        }\n    }\n    /**\n     * Deallocates a parser's resources\n     */\n    destroy() {\n        if (this.reconstructor) {\n            this.reconstructor.finishedReconstruction();\n        }\n    }\n}\n/**\n * A manager of a binary event's 'buffer sequence'. Should\n * be constructed whenever a packet of type BINARY_EVENT is\n * decoded.\n *\n * @param {Object} packet\n * @return {BinaryReconstructor} initialized reconstructor\n */\nclass BinaryReconstructor {\n    constructor(packet) {\n        this.packet = packet;\n        this.buffers = [];\n        this.reconPack = packet;\n    }\n    /**\n     * Method to be called when binary data received from connection\n     * after a BINARY_EVENT packet.\n     *\n     * @param {Buffer | ArrayBuffer} binData - the raw binary data received\n     * @return {null | Object} returns null if more binary data is expected or\n     *   a reconstructed packet object if all buffers have been received.\n     */\n    takeBinaryData(binData) {\n        this.buffers.push(binData);\n        if (this.buffers.length === this.reconPack.attachments) {\n            // done with buffer list\n            const packet = reconstructPacket(this.reconPack, this.buffers);\n            this.finishedReconstruction();\n            return packet;\n        }\n        return null;\n    }\n    /**\n     * Cleans up binary packet reconstruction variables.\n     */\n    finishedReconstruction() {\n        this.reconPack = null;\n        this.buffers = [];\n    }\n}\n","export function on(obj, ev, fn) {\n    obj.on(ev, fn);\n    return function subDestroy() {\n        obj.off(ev, fn);\n    };\n}\n","import { PacketType } from \"socket.io-parser\";\nimport { on } from \"./on.js\";\nimport { Emitter, } from \"@socket.io/component-emitter\";\n/**\n * Internal events.\n * These events can't be emitted by the user.\n */\nconst RESERVED_EVENTS = Object.freeze({\n    connect: 1,\n    connect_error: 1,\n    disconnect: 1,\n    disconnecting: 1,\n    // EventEmitter reserved events: https://nodejs.org/api/events.html#events_event_newlistener\n    newListener: 1,\n    removeListener: 1,\n});\nexport class Socket extends Emitter {\n    /**\n     * `Socket` constructor.\n     *\n     * @public\n     */\n    constructor(io, nsp, opts) {\n        super();\n        this.connected = false;\n        this.receiveBuffer = [];\n        this.sendBuffer = [];\n        this.ids = 0;\n        this.acks = {};\n        this.flags = {};\n        this.io = io;\n        this.nsp = nsp;\n        if (opts && opts.auth) {\n            this.auth = opts.auth;\n        }\n        if (this.io._autoConnect)\n            this.open();\n    }\n    /**\n     * Whether the socket is currently disconnected\n     */\n    get disconnected() {\n        return !this.connected;\n    }\n    /**\n     * Subscribe to open, close and packet events\n     *\n     * @private\n     */\n    subEvents() {\n        if (this.subs)\n            return;\n        const io = this.io;\n        this.subs = [\n            on(io, \"open\", this.onopen.bind(this)),\n            on(io, \"packet\", this.onpacket.bind(this)),\n            on(io, \"error\", this.onerror.bind(this)),\n            on(io, \"close\", this.onclose.bind(this)),\n        ];\n    }\n    /**\n     * Whether the Socket will try to reconnect when its Manager connects or reconnects\n     */\n    get active() {\n        return !!this.subs;\n    }\n    /**\n     * \"Opens\" the socket.\n     *\n     * @public\n     */\n    connect() {\n        if (this.connected)\n            return this;\n        this.subEvents();\n        if (!this.io[\"_reconnecting\"])\n            this.io.open(); // ensure open\n        if (\"open\" === this.io._readyState)\n            this.onopen();\n        return this;\n    }\n    /**\n     * Alias for connect()\n     */\n    open() {\n        return this.connect();\n    }\n    /**\n     * Sends a `message` event.\n     *\n     * @return self\n     * @public\n     */\n    send(...args) {\n        args.unshift(\"message\");\n        this.emit.apply(this, args);\n        return this;\n    }\n    /**\n     * Override `emit`.\n     * If the event is in `events`, it's emitted normally.\n     *\n     * @return self\n     * @public\n     */\n    emit(ev, ...args) {\n        if (RESERVED_EVENTS.hasOwnProperty(ev)) {\n            throw new Error('\"' + ev + '\" is a reserved event name');\n        }\n        args.unshift(ev);\n        const packet = {\n            type: PacketType.EVENT,\n            data: args,\n        };\n        packet.options = {};\n        packet.options.compress = this.flags.compress !== false;\n        // event ack callback\n        if (\"function\" === typeof args[args.length - 1]) {\n            const id = this.ids++;\n            const ack = args.pop();\n            this._registerAckCallback(id, ack);\n            packet.id = id;\n        }\n        const isTransportWritable = this.io.engine &&\n            this.io.engine.transport &&\n            this.io.engine.transport.writable;\n        const discardPacket = this.flags.volatile && (!isTransportWritable || !this.connected);\n        if (discardPacket) {\n        }\n        else if (this.connected) {\n            this.notifyOutgoingListeners(packet);\n            this.packet(packet);\n        }\n        else {\n            this.sendBuffer.push(packet);\n        }\n        this.flags = {};\n        return this;\n    }\n    /**\n     * @private\n     */\n    _registerAckCallback(id, ack) {\n        const timeout = this.flags.timeout;\n        if (timeout === undefined) {\n            this.acks[id] = ack;\n            return;\n        }\n        // @ts-ignore\n        const timer = this.io.setTimeoutFn(() => {\n            delete this.acks[id];\n            for (let i = 0; i < this.sendBuffer.length; i++) {\n                if (this.sendBuffer[i].id === id) {\n                    this.sendBuffer.splice(i, 1);\n                }\n            }\n            ack.call(this, new Error(\"operation has timed out\"));\n        }, timeout);\n        this.acks[id] = (...args) => {\n            // @ts-ignore\n            this.io.clearTimeoutFn(timer);\n            ack.apply(this, [null, ...args]);\n        };\n    }\n    /**\n     * Sends a packet.\n     *\n     * @param packet\n     * @private\n     */\n    packet(packet) {\n        packet.nsp = this.nsp;\n        this.io._packet(packet);\n    }\n    /**\n     * Called upon engine `open`.\n     *\n     * @private\n     */\n    onopen() {\n        if (typeof this.auth == \"function\") {\n            this.auth((data) => {\n                this.packet({ type: PacketType.CONNECT, data });\n            });\n        }\n        else {\n            this.packet({ type: PacketType.CONNECT, data: this.auth });\n        }\n    }\n    /**\n     * Called upon engine or manager `error`.\n     *\n     * @param err\n     * @private\n     */\n    onerror(err) {\n        if (!this.connected) {\n            this.emitReserved(\"connect_error\", err);\n        }\n    }\n    /**\n     * Called upon engine `close`.\n     *\n     * @param reason\n     * @param description\n     * @private\n     */\n    onclose(reason, description) {\n        this.connected = false;\n        delete this.id;\n        this.emitReserved(\"disconnect\", reason, description);\n    }\n    /**\n     * Called with socket packet.\n     *\n     * @param packet\n     * @private\n     */\n    onpacket(packet) {\n        const sameNamespace = packet.nsp === this.nsp;\n        if (!sameNamespace)\n            return;\n        switch (packet.type) {\n            case PacketType.CONNECT:\n                if (packet.data && packet.data.sid) {\n                    const id = packet.data.sid;\n                    this.onconnect(id);\n                }\n                else {\n                    this.emitReserved(\"connect_error\", new Error(\"It seems you are trying to reach a Socket.IO server in v2.x with a v3.x client, but they are not compatible (more information here: https://socket.io/docs/v3/migrating-from-2-x-to-3-0/)\"));\n                }\n                break;\n            case PacketType.EVENT:\n            case PacketType.BINARY_EVENT:\n                this.onevent(packet);\n                break;\n            case PacketType.ACK:\n            case PacketType.BINARY_ACK:\n                this.onack(packet);\n                break;\n            case PacketType.DISCONNECT:\n                this.ondisconnect();\n                break;\n            case PacketType.CONNECT_ERROR:\n                this.destroy();\n                const err = new Error(packet.data.message);\n                // @ts-ignore\n                err.data = packet.data.data;\n                this.emitReserved(\"connect_error\", err);\n                break;\n        }\n    }\n    /**\n     * Called upon a server event.\n     *\n     * @param packet\n     * @private\n     */\n    onevent(packet) {\n        const args = packet.data || [];\n        if (null != packet.id) {\n            args.push(this.ack(packet.id));\n        }\n        if (this.connected) {\n            this.emitEvent(args);\n        }\n        else {\n            this.receiveBuffer.push(Object.freeze(args));\n        }\n    }\n    emitEvent(args) {\n        if (this._anyListeners && this._anyListeners.length) {\n            const listeners = this._anyListeners.slice();\n            for (const listener of listeners) {\n                listener.apply(this, args);\n            }\n        }\n        super.emit.apply(this, args);\n    }\n    /**\n     * Produces an ack callback to emit with an event.\n     *\n     * @private\n     */\n    ack(id) {\n        const self = this;\n        let sent = false;\n        return function (...args) {\n            // prevent double callbacks\n            if (sent)\n                return;\n            sent = true;\n            self.packet({\n                type: PacketType.ACK,\n                id: id,\n                data: args,\n            });\n        };\n    }\n    /**\n     * Called upon a server acknowlegement.\n     *\n     * @param packet\n     * @private\n     */\n    onack(packet) {\n        const ack = this.acks[packet.id];\n        if (\"function\" === typeof ack) {\n            ack.apply(this, packet.data);\n            delete this.acks[packet.id];\n        }\n        else {\n        }\n    }\n    /**\n     * Called upon server connect.\n     *\n     * @private\n     */\n    onconnect(id) {\n        this.id = id;\n        this.connected = true;\n        this.emitBuffered();\n        this.emitReserved(\"connect\");\n    }\n    /**\n     * Emit buffered events (received and emitted).\n     *\n     * @private\n     */\n    emitBuffered() {\n        this.receiveBuffer.forEach((args) => this.emitEvent(args));\n        this.receiveBuffer = [];\n        this.sendBuffer.forEach((packet) => {\n            this.notifyOutgoingListeners(packet);\n            this.packet(packet);\n        });\n        this.sendBuffer = [];\n    }\n    /**\n     * Called upon server disconnect.\n     *\n     * @private\n     */\n    ondisconnect() {\n        this.destroy();\n        this.onclose(\"io server disconnect\");\n    }\n    /**\n     * Called upon forced client/server side disconnections,\n     * this method ensures the manager stops tracking us and\n     * that reconnections don't get triggered for this.\n     *\n     * @private\n     */\n    destroy() {\n        if (this.subs) {\n            // clean subscriptions to avoid reconnections\n            this.subs.forEach((subDestroy) => subDestroy());\n            this.subs = undefined;\n        }\n        this.io[\"_destroy\"](this);\n    }\n    /**\n     * Disconnects the socket manually.\n     *\n     * @return self\n     * @public\n     */\n    disconnect() {\n        if (this.connected) {\n            this.packet({ type: PacketType.DISCONNECT });\n        }\n        // remove socket from pool\n        this.destroy();\n        if (this.connected) {\n            // fire events\n            this.onclose(\"io client disconnect\");\n        }\n        return this;\n    }\n    /**\n     * Alias for disconnect()\n     *\n     * @return self\n     * @public\n     */\n    close() {\n        return this.disconnect();\n    }\n    /**\n     * Sets the compress flag.\n     *\n     * @param compress - if `true`, compresses the sending data\n     * @return self\n     * @public\n     */\n    compress(compress) {\n        this.flags.compress = compress;\n        return this;\n    }\n    /**\n     * Sets a modifier for a subsequent event emission that the event message will be dropped when this socket is not\n     * ready to send messages.\n     *\n     * @returns self\n     * @public\n     */\n    get volatile() {\n        this.flags.volatile = true;\n        return this;\n    }\n    /**\n     * Sets a modifier for a subsequent event emission that the callback will be called with an error when the\n     * given number of milliseconds have elapsed without an acknowledgement from the server:\n     *\n     * ```\n     * socket.timeout(5000).emit(\"my-event\", (err) => {\n     *   if (err) {\n     *     // the server did not acknowledge the event in the given delay\n     *   }\n     * });\n     * ```\n     *\n     * @returns self\n     * @public\n     */\n    timeout(timeout) {\n        this.flags.timeout = timeout;\n        return this;\n    }\n    /**\n     * Adds a listener that will be fired when any event is emitted. The event name is passed as the first argument to the\n     * callback.\n     *\n     * @param listener\n     * @public\n     */\n    onAny(listener) {\n        this._anyListeners = this._anyListeners || [];\n        this._anyListeners.push(listener);\n        return this;\n    }\n    /**\n     * Adds a listener that will be fired when any event is emitted. The event name is passed as the first argument to the\n     * callback. The listener is added to the beginning of the listeners array.\n     *\n     * @param listener\n     * @public\n     */\n    prependAny(listener) {\n        this._anyListeners = this._anyListeners || [];\n        this._anyListeners.unshift(listener);\n        return this;\n    }\n    /**\n     * Removes the listener that will be fired when any event is emitted.\n     *\n     * @param listener\n     * @public\n     */\n    offAny(listener) {\n        if (!this._anyListeners) {\n            return this;\n        }\n        if (listener) {\n            const listeners = this._anyListeners;\n            for (let i = 0; i < listeners.length; i++) {\n                if (listener === listeners[i]) {\n                    listeners.splice(i, 1);\n                    return this;\n                }\n            }\n        }\n        else {\n            this._anyListeners = [];\n        }\n        return this;\n    }\n    /**\n     * Returns an array of listeners that are listening for any event that is specified. This array can be manipulated,\n     * e.g. to remove listeners.\n     *\n     * @public\n     */\n    listenersAny() {\n        return this._anyListeners || [];\n    }\n    /**\n     * Adds a listener that will be fired when any event is emitted. The event name is passed as the first argument to the\n     * callback.\n     *\n     * @param listener\n     *\n     * <pre><code>\n     *\n     * socket.onAnyOutgoing((event, ...args) => {\n     *   console.log(event);\n     * });\n     *\n     * </pre></code>\n     *\n     * @public\n     */\n    onAnyOutgoing(listener) {\n        this._anyOutgoingListeners = this._anyOutgoingListeners || [];\n        this._anyOutgoingListeners.push(listener);\n        return this;\n    }\n    /**\n     * Adds a listener that will be fired when any event is emitted. The event name is passed as the first argument to the\n     * callback. The listener is added to the beginning of the listeners array.\n     *\n     * @param listener\n     *\n     * <pre><code>\n     *\n     * socket.prependAnyOutgoing((event, ...args) => {\n     *   console.log(event);\n     * });\n     *\n     * </pre></code>\n     *\n     * @public\n     */\n    prependAnyOutgoing(listener) {\n        this._anyOutgoingListeners = this._anyOutgoingListeners || [];\n        this._anyOutgoingListeners.unshift(listener);\n        return this;\n    }\n    /**\n     * Removes the listener that will be fired when any event is emitted.\n     *\n     * @param listener\n     *\n     * <pre><code>\n     *\n     * const handler = (event, ...args) => {\n     *   console.log(event);\n     * }\n     *\n     * socket.onAnyOutgoing(handler);\n     *\n     * // then later\n     * socket.offAnyOutgoing(handler);\n     *\n     * </pre></code>\n     *\n     * @public\n     */\n    offAnyOutgoing(listener) {\n        if (!this._anyOutgoingListeners) {\n            return this;\n        }\n        if (listener) {\n            const listeners = this._anyOutgoingListeners;\n            for (let i = 0; i < listeners.length; i++) {\n                if (listener === listeners[i]) {\n                    listeners.splice(i, 1);\n                    return this;\n                }\n            }\n        }\n        else {\n            this._anyOutgoingListeners = [];\n        }\n        return this;\n    }\n    /**\n     * Returns an array of listeners that are listening for any event that is specified. This array can be manipulated,\n     * e.g. to remove listeners.\n     *\n     * @public\n     */\n    listenersAnyOutgoing() {\n        return this._anyOutgoingListeners || [];\n    }\n    /**\n     * Notify the listeners for each packet sent\n     *\n     * @param packet\n     *\n     * @private\n     */\n    notifyOutgoingListeners(packet) {\n        if (this._anyOutgoingListeners && this._anyOutgoingListeners.length) {\n            const listeners = this._anyOutgoingListeners.slice();\n            for (const listener of listeners) {\n                listener.apply(this, packet.data);\n            }\n        }\n    }\n}\n","/**\n * Initialize backoff timer with `opts`.\n *\n * - `min` initial timeout in milliseconds [100]\n * - `max` max timeout [10000]\n * - `jitter` [0]\n * - `factor` [2]\n *\n * @param {Object} opts\n * @api public\n */\nexport function Backoff(opts) {\n    opts = opts || {};\n    this.ms = opts.min || 100;\n    this.max = opts.max || 10000;\n    this.factor = opts.factor || 2;\n    this.jitter = opts.jitter > 0 && opts.jitter <= 1 ? opts.jitter : 0;\n    this.attempts = 0;\n}\n/**\n * Return the backoff duration.\n *\n * @return {Number}\n * @api public\n */\nBackoff.prototype.duration = function () {\n    var ms = this.ms * Math.pow(this.factor, this.attempts++);\n    if (this.jitter) {\n        var rand = Math.random();\n        var deviation = Math.floor(rand * this.jitter * ms);\n        ms = (Math.floor(rand * 10) & 1) == 0 ? ms - deviation : ms + deviation;\n    }\n    return Math.min(ms, this.max) | 0;\n};\n/**\n * Reset the number of attempts.\n *\n * @api public\n */\nBackoff.prototype.reset = function () {\n    this.attempts = 0;\n};\n/**\n * Set the minimum duration\n *\n * @api public\n */\nBackoff.prototype.setMin = function (min) {\n    this.ms = min;\n};\n/**\n * Set the maximum duration\n *\n * @api public\n */\nBackoff.prototype.setMax = function (max) {\n    this.max = max;\n};\n/**\n * Set the jitter\n *\n * @api public\n */\nBackoff.prototype.setJitter = function (jitter) {\n    this.jitter = jitter;\n};\n","import { Socket as Engine, installTimerFunctions, } from \"engine.io-client\";\nimport { Socket } from \"./socket.js\";\nimport * as parser from \"socket.io-parser\";\nimport { on } from \"./on.js\";\nimport { Backoff } from \"./contrib/backo2.js\";\nimport { Emitter, } from \"@socket.io/component-emitter\";\nexport class Manager extends Emitter {\n    constructor(uri, opts) {\n        var _a;\n        super();\n        this.nsps = {};\n        this.subs = [];\n        if (uri && \"object\" === typeof uri) {\n            opts = uri;\n            uri = undefined;\n        }\n        opts = opts || {};\n        opts.path = opts.path || \"/socket.io\";\n        this.opts = opts;\n        installTimerFunctions(this, opts);\n        this.reconnection(opts.reconnection !== false);\n        this.reconnectionAttempts(opts.reconnectionAttempts || Infinity);\n        this.reconnectionDelay(opts.reconnectionDelay || 1000);\n        this.reconnectionDelayMax(opts.reconnectionDelayMax || 5000);\n        this.randomizationFactor((_a = opts.randomizationFactor) !== null && _a !== void 0 ? _a : 0.5);\n        this.backoff = new Backoff({\n            min: this.reconnectionDelay(),\n            max: this.reconnectionDelayMax(),\n            jitter: this.randomizationFactor(),\n        });\n        this.timeout(null == opts.timeout ? 20000 : opts.timeout);\n        this._readyState = \"closed\";\n        this.uri = uri;\n        const _parser = opts.parser || parser;\n        this.encoder = new _parser.Encoder();\n        this.decoder = new _parser.Decoder();\n        this._autoConnect = opts.autoConnect !== false;\n        if (this._autoConnect)\n            this.open();\n    }\n    reconnection(v) {\n        if (!arguments.length)\n            return this._reconnection;\n        this._reconnection = !!v;\n        return this;\n    }\n    reconnectionAttempts(v) {\n        if (v === undefined)\n            return this._reconnectionAttempts;\n        this._reconnectionAttempts = v;\n        return this;\n    }\n    reconnectionDelay(v) {\n        var _a;\n        if (v === undefined)\n            return this._reconnectionDelay;\n        this._reconnectionDelay = v;\n        (_a = this.backoff) === null || _a === void 0 ? void 0 : _a.setMin(v);\n        return this;\n    }\n    randomizationFactor(v) {\n        var _a;\n        if (v === undefined)\n            return this._randomizationFactor;\n        this._randomizationFactor = v;\n        (_a = this.backoff) === null || _a === void 0 ? void 0 : _a.setJitter(v);\n        return this;\n    }\n    reconnectionDelayMax(v) {\n        var _a;\n        if (v === undefined)\n            return this._reconnectionDelayMax;\n        this._reconnectionDelayMax = v;\n        (_a = this.backoff) === null || _a === void 0 ? void 0 : _a.setMax(v);\n        return this;\n    }\n    timeout(v) {\n        if (!arguments.length)\n            return this._timeout;\n        this._timeout = v;\n        return this;\n    }\n    /**\n     * Starts trying to reconnect if reconnection is enabled and we have not\n     * started reconnecting yet\n     *\n     * @private\n     */\n    maybeReconnectOnOpen() {\n        // Only try to reconnect if it's the first time we're connecting\n        if (!this._reconnecting &&\n            this._reconnection &&\n            this.backoff.attempts === 0) {\n            // keeps reconnection from firing twice for the same reconnection loop\n            this.reconnect();\n        }\n    }\n    /**\n     * Sets the current transport `socket`.\n     *\n     * @param {Function} fn - optional, callback\n     * @return self\n     * @public\n     */\n    open(fn) {\n        if (~this._readyState.indexOf(\"open\"))\n            return this;\n        this.engine = new Engine(this.uri, this.opts);\n        const socket = this.engine;\n        const self = this;\n        this._readyState = \"opening\";\n        this.skipReconnect = false;\n        // emit `open`\n        const openSubDestroy = on(socket, \"open\", function () {\n            self.onopen();\n            fn && fn();\n        });\n        // emit `error`\n        const errorSub = on(socket, \"error\", (err) => {\n            self.cleanup();\n            self._readyState = \"closed\";\n            this.emitReserved(\"error\", err);\n            if (fn) {\n                fn(err);\n            }\n            else {\n                // Only do this if there is no fn to handle the error\n                self.maybeReconnectOnOpen();\n            }\n        });\n        if (false !== this._timeout) {\n            const timeout = this._timeout;\n            if (timeout === 0) {\n                openSubDestroy(); // prevents a race condition with the 'open' event\n            }\n            // set timer\n            const timer = this.setTimeoutFn(() => {\n                openSubDestroy();\n                socket.close();\n                // @ts-ignore\n                socket.emit(\"error\", new Error(\"timeout\"));\n            }, timeout);\n            if (this.opts.autoUnref) {\n                timer.unref();\n            }\n            this.subs.push(function subDestroy() {\n                clearTimeout(timer);\n            });\n        }\n        this.subs.push(openSubDestroy);\n        this.subs.push(errorSub);\n        return this;\n    }\n    /**\n     * Alias for open()\n     *\n     * @return self\n     * @public\n     */\n    connect(fn) {\n        return this.open(fn);\n    }\n    /**\n     * Called upon transport open.\n     *\n     * @private\n     */\n    onopen() {\n        // clear old subs\n        this.cleanup();\n        // mark as open\n        this._readyState = \"open\";\n        this.emitReserved(\"open\");\n        // add new subs\n        const socket = this.engine;\n        this.subs.push(on(socket, \"ping\", this.onping.bind(this)), on(socket, \"data\", this.ondata.bind(this)), on(socket, \"error\", this.onerror.bind(this)), on(socket, \"close\", this.onclose.bind(this)), on(this.decoder, \"decoded\", this.ondecoded.bind(this)));\n    }\n    /**\n     * Called upon a ping.\n     *\n     * @private\n     */\n    onping() {\n        this.emitReserved(\"ping\");\n    }\n    /**\n     * Called with data.\n     *\n     * @private\n     */\n    ondata(data) {\n        this.decoder.add(data);\n    }\n    /**\n     * Called when parser fully decodes a packet.\n     *\n     * @private\n     */\n    ondecoded(packet) {\n        this.emitReserved(\"packet\", packet);\n    }\n    /**\n     * Called upon socket error.\n     *\n     * @private\n     */\n    onerror(err) {\n        this.emitReserved(\"error\", err);\n    }\n    /**\n     * Creates a new socket for the given `nsp`.\n     *\n     * @return {Socket}\n     * @public\n     */\n    socket(nsp, opts) {\n        let socket = this.nsps[nsp];\n        if (!socket) {\n            socket = new Socket(this, nsp, opts);\n            this.nsps[nsp] = socket;\n        }\n        return socket;\n    }\n    /**\n     * Called upon a socket close.\n     *\n     * @param socket\n     * @private\n     */\n    _destroy(socket) {\n        const nsps = Object.keys(this.nsps);\n        for (const nsp of nsps) {\n            const socket = this.nsps[nsp];\n            if (socket.active) {\n                return;\n            }\n        }\n        this._close();\n    }\n    /**\n     * Writes a packet.\n     *\n     * @param packet\n     * @private\n     */\n    _packet(packet) {\n        const encodedPackets = this.encoder.encode(packet);\n        for (let i = 0; i < encodedPackets.length; i++) {\n            this.engine.write(encodedPackets[i], packet.options);\n        }\n    }\n    /**\n     * Clean up transport subscriptions and packet buffer.\n     *\n     * @private\n     */\n    cleanup() {\n        this.subs.forEach((subDestroy) => subDestroy());\n        this.subs.length = 0;\n        this.decoder.destroy();\n    }\n    /**\n     * Close the current socket.\n     *\n     * @private\n     */\n    _close() {\n        this.skipReconnect = true;\n        this._reconnecting = false;\n        this.onclose(\"forced close\");\n        if (this.engine)\n            this.engine.close();\n    }\n    /**\n     * Alias for close()\n     *\n     * @private\n     */\n    disconnect() {\n        return this._close();\n    }\n    /**\n     * Called upon engine close.\n     *\n     * @private\n     */\n    onclose(reason, description) {\n        this.cleanup();\n        this.backoff.reset();\n        this._readyState = \"closed\";\n        this.emitReserved(\"close\", reason, description);\n        if (this._reconnection && !this.skipReconnect) {\n            this.reconnect();\n        }\n    }\n    /**\n     * Attempt a reconnection.\n     *\n     * @private\n     */\n    reconnect() {\n        if (this._reconnecting || this.skipReconnect)\n            return this;\n        const self = this;\n        if (this.backoff.attempts >= this._reconnectionAttempts) {\n            this.backoff.reset();\n            this.emitReserved(\"reconnect_failed\");\n            this._reconnecting = false;\n        }\n        else {\n            const delay = this.backoff.duration();\n            this._reconnecting = true;\n            const timer = this.setTimeoutFn(() => {\n                if (self.skipReconnect)\n                    return;\n                this.emitReserved(\"reconnect_attempt\", self.backoff.attempts);\n                // check again for the case socket closed in above events\n                if (self.skipReconnect)\n                    return;\n                self.open((err) => {\n                    if (err) {\n                        self._reconnecting = false;\n                        self.reconnect();\n                        this.emitReserved(\"reconnect_error\", err);\n                    }\n                    else {\n                        self.onreconnect();\n                    }\n                });\n            }, delay);\n            if (this.opts.autoUnref) {\n                timer.unref();\n            }\n            this.subs.push(function subDestroy() {\n                clearTimeout(timer);\n            });\n        }\n    }\n    /**\n     * Called upon successful reconnect.\n     *\n     * @private\n     */\n    onreconnect() {\n        const attempt = this.backoff.attempts;\n        this._reconnecting = false;\n        this.backoff.reset();\n        this.emitReserved(\"reconnect\", attempt);\n    }\n}\n","import { url } from \"./url.js\";\nimport { Manager } from \"./manager.js\";\nimport { Socket } from \"./socket.js\";\n/**\n * Managers cache.\n */\nconst cache = {};\nfunction lookup(uri, opts) {\n    if (typeof uri === \"object\") {\n        opts = uri;\n        uri = undefined;\n    }\n    opts = opts || {};\n    const parsed = url(uri, opts.path || \"/socket.io\");\n    const source = parsed.source;\n    const id = parsed.id;\n    const path = parsed.path;\n    const sameNamespace = cache[id] && path in cache[id][\"nsps\"];\n    const newConnection = opts.forceNew ||\n        opts[\"force new connection\"] ||\n        false === opts.multiplex ||\n        sameNamespace;\n    let io;\n    if (newConnection) {\n        io = new Manager(source, opts);\n    }\n    else {\n        if (!cache[id]) {\n            cache[id] = new Manager(source, opts);\n        }\n        io = cache[id];\n    }\n    if (parsed.query && !opts.query) {\n        opts.query = parsed.queryKey;\n    }\n    return io.socket(parsed.path, opts);\n}\n// so that \"lookup\" can be used both as a function (e.g. `io(...)`) and as a\n// namespace (e.g. `io.connect(...)`), for backward compatibility\nObject.assign(lookup, {\n    Manager,\n    Socket,\n    io: lookup,\n    connect: lookup,\n});\n/**\n * Protocol version.\n *\n * @public\n */\nexport { protocol } from \"socket.io-parser\";\n/**\n * Expose constructors for standalone build.\n *\n * @public\n */\nexport { Manager, Socket, lookup as io, lookup as connect, lookup as default, };\n","import { parse } from \"engine.io-client\";\n/**\n * URL parser.\n *\n * @param uri - url\n * @param path - the request path of the connection\n * @param loc - An object meant to mimic window.location.\n *        Defaults to window.location.\n * @public\n */\nexport function url(uri, path = \"\", loc) {\n    let obj = uri;\n    // default to window.location\n    loc = loc || (typeof location !== \"undefined\" && location);\n    if (null == uri)\n        uri = loc.protocol + \"//\" + loc.host;\n    // relative path support\n    if (typeof uri === \"string\") {\n        if (\"/\" === uri.charAt(0)) {\n            if (\"/\" === uri.charAt(1)) {\n                uri = loc.protocol + uri;\n            }\n            else {\n                uri = loc.host + uri;\n            }\n        }\n        if (!/^(https?|wss?):\\/\\//.test(uri)) {\n            if (\"undefined\" !== typeof loc) {\n                uri = loc.protocol + \"//\" + uri;\n            }\n            else {\n                uri = \"https://\" + uri;\n            }\n        }\n        // parse\n        obj = parse(uri);\n    }\n    // make sure we treat `localhost:80` and `localhost` equally\n    if (!obj.port) {\n        if (/^(http|ws)$/.test(obj.protocol)) {\n            obj.port = \"80\";\n        }\n        else if (/^(http|ws)s$/.test(obj.protocol)) {\n            obj.port = \"443\";\n        }\n    }\n    obj.path = obj.path || \"/\";\n    const ipv6 = obj.host.indexOf(\":\") !== -1;\n    const host = ipv6 ? \"[\" + obj.host + \"]\" : obj.host;\n    // define unique id\n    obj.id = obj.protocol + \"://\" + host + \":\" + obj.port + path;\n    // define href\n    obj.href =\n        obj.protocol +\n            \"://\" +\n            host +\n            (loc && loc.port === obj.port ? \"\" : \":\" + obj.port);\n    return obj;\n}\n"],"names":["PACKET_TYPES","Object","create","PACKET_TYPES_REVERSE","keys","forEach","key","ERROR_PACKET","type","data","withNativeBlob","Blob","prototype","toString","call","withNativeArrayBuffer","ArrayBuffer","encodePacket","supportsBinary","callback","obj","encodeBlobAsBase64","isView","buffer","fileReader","FileReader","onload","content","result","split","readAsDataURL","chars","lookup","Uint8Array","i","length","charCodeAt","decodePacket","encodedPacket","binaryType","mapBinary","charAt","decodeBase64Packet","substring","decoded","base64","encoded1","encoded2","encoded3","encoded4","bufferLength","len","p","arraybuffer","bytes","decode","SEPARATOR","String","fromCharCode","Emitter","mixin","on","addEventListener","event","fn","_callbacks","this","push","once","off","apply","arguments","removeListener","removeAllListeners","removeEventListener","cb","callbacks","splice","emit","args","Array","slice","emitReserved","listeners","hasListeners","self","window","Function","pick","attr","reduce","acc","k","hasOwnProperty","NATIVE_SET_TIMEOUT","setTimeout","NATIVE_CLEAR_TIMEOUT","clearTimeout","installTimerFunctions","opts","useNativeTimers","setTimeoutFn","bind","globalThis","clearTimeoutFn","prev","TransportError","reason","description","context","Error","Transport","writable","query","readyState","socket","doOpen","doClose","onClose","packets","write","packet","onPacket","details","alphabet","map","seed","encode","num","encoded","Math","floor","yeast","now","Date","str","encodeURIComponent","qs","qry","pairs","l","pair","decodeURIComponent","value","XMLHttpRequest","err","hasCORS","xdomain","e","concat","join","empty","hasXHR2","responseType","Polling","polling","location","isSSL","protocol","port","xd","hostname","xs","secure","forceBase64","poll","onPause","pause","_this2","total","doPoll","encodedPayload","encodedPackets","decodedPacket","decodePayload","_this3","onOpen","close","_this4","count","encodePayload","_this5","doWrite","schema","timestampRequests","timestampParam","sid","b64","Number","encodedQuery","indexOf","path","Request","uri","req","request","method","xhrStatus","_this6","onError","onData","_this7","pollXhr","async","undefined","xscheme","xhr","open","extraHeaders","setDisableHeaderCheck","setRequestHeader","withCredentials","requestTimeout","timeout","onreadystatechange","status","_this9","onLoad","send","document","index","requestsCount","requests","cleanup","fromError","abort","responseText","attachEvent","unloadHandler","nextTick","Promise","resolve","then","WebSocket","MozWebSocket","isReactNative","navigator","product","toLowerCase","WS","check","protocols","headers","ws","addEventListeners","onopen","autoUnref","_socket","unref","onclose","closeEvent","onmessage","ev","onerror","lastPacket","name","transports","websocket","re","parts","parse","src","b","replace","m","exec","source","host","authority","ipv6uri","pathNames","regx","names","substr","queryKey","$0","$1","$2","Socket","_this","writeBuffer","prevBufferLen","_extends","agent","upgrade","rememberUpgrade","rejectUnauthorized","perMessageDeflate","threshold","transportOptions","closeOnBeforeunload","id","upgrades","pingInterval","pingTimeout","pingTimeoutTimer","transport","offlineEventListener","EIO","priorWebsocketSuccess","createTransport","shift","setTransport","onDrain","failed","onTransportOpen","msg","upgrading","flush","freezeTransport","error","onTransportClose","onupgrade","to","probe","onHandshake","JSON","resetPingTimeout","sendPacket","code","filterUpgrades","maxPayload","getWritablePackets","payloadSize","c","utf8Length","ceil","byteLength","size","options","compress","cleanupAndClose","waitForUpgrade","filteredUpgrades","j","withNativeFile","File","isBinary","hasBinary","toJSON","_typeof","isArray","deconstructPacket","buffers","packetData","pack","_deconstructPacket","attachments","placeholder","_placeholder","newData","reconstructPacket","_reconstructPacket","PacketType","Encoder","replacer","EVENT","ACK","encodeAsString","BINARY_EVENT","BINARY_ACK","encodeAsBinary","nsp","stringify","deconstruction","unshift","Decoder","reviver","decodeString","reconstructor","BinaryReconstructor","takeBinaryData","start","buf","next","payload","tryParse","isPayloadValid","finishedReconstruction","CONNECT","DISCONNECT","CONNECT_ERROR","reconPack","binData","RESERVED_EVENTS","freeze","connect","connect_error","disconnect","disconnecting","newListener","io","connected","receiveBuffer","sendBuffer","ids","acks","flags","auth","_autoConnect","subs","onpacket","subEvents","_readyState","ack","pop","_registerAckCallback","isTransportWritable","engine","discardPacket","notifyOutgoingListeners","timer","_packet","onconnect","onevent","onack","ondisconnect","destroy","message","emitEvent","_anyListeners","sent","emitBuffered","subDestroy","listener","_anyOutgoingListeners","Backoff","ms","min","max","factor","jitter","attempts","duration","pow","rand","random","deviation","reset","setMin","setMax","setJitter","Manager","_a","nsps","reconnection","reconnectionAttempts","Infinity","reconnectionDelay","reconnectionDelayMax","randomizationFactor","backoff","_parser","parser","encoder","decoder","autoConnect","v","_reconnection","_reconnectionAttempts","_reconnectionDelay","_randomizationFactor","_reconnectionDelayMax","_timeout","_reconnecting","reconnect","Engine","skipReconnect","openSubDestroy","errorSub","maybeReconnectOnOpen","onping","ondata","ondecoded","add","active","_close","delay","onreconnect","attempt","cache","parsed","loc","test","href","url","sameNamespace","forceNew","multiplex"],"mappings":"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"}
\ No newline at end of file
diff --git a/route/static/js/term-websocketio.js b/route/static/js/term-websocketio.js
deleted file mode 100644
index 145598f5e..000000000
--- a/route/static/js/term-websocketio.js
+++ /dev/null
@@ -1,136 +0,0 @@
-function Terms_WebSocketIO (el, config) {
-    if (typeof config == "undefined") {
-        config = {};
-    }
-    this.el = el;
-    this.id = config.ssh_info.id || '';
-    this.ws = null; //websocket对象
-    this.route = 'webssh_websocketio'; // 访问的方法
-    this.term = null; //term对象
-    this.info = null; // 请求数据
-    this.last_body = null;
-    this.fontSize = 14; //终端字体大小
-    this.ssh_info = config.ssh_info;
-    this.term_timer = null;
-
-    this.is_connected = false;
-
-    this.callback_close = null;
-    this.callback_connected = null;
-    this.run();
-}
-
-Terms_WebSocketIO.prototype = {
-
-    registerCloseCallBack:function(callback){
-        this.callback_close =  callback;
-    },
-
-    registerConnectedCallBack:function(callback){
-        this.callback_connected =  callback;
-    },
-
-    registerExitCallBack:function(callback){
-        this.callback_exit =  callback;
-    },
-
-    connectWs: function (callback) {
-        this.ws = io.connect();
-        // console.log(this.ws);
-    },
-
-    connectSsh:function(){
-        this.send(this.ssh_info);
-        // this.send('\n');
-    },
-
-    close:function(){
-        this.ws.disconnect();
-        this.ws.close();
-    },
-
-    on_message: function (ws_event) {
-        this.term.write(ws_event.data);
-        if (ws_event.data == '\r\n登出\r\n' ||  ws_event.data == '登出\r\n' || 
-            ws_event.data == '\r\nlogout\r\n' ||  ws_event.data == 'logout\r\n'||
-            ws_event.data == '\r\nexit\r\n' ||  ws_event.data == 'exit\r\n') {
-            this.term.destroy();
-            this.ws.disconnect();
-            this.ws.close();
-            clearInterval(this.term_timer);
-
-            if (this.callback_close){
-                this.callback_close();
-            }
-        }
-    },
-
-    on_connect:function(ws_event){
-        this.is_connected = true;
-        if (this.callback_connected){
-            this.callback_connected();
-        }
-    },
-
-    on_reconnect:function(ws_event){
-        this.is_connected = false;
-        // if (this.callback_connected){
-        //     this.callback_connected();
-        // }
-    },
-
-    on_exit:function(){
-        if (this.callback_exit){
-            this.callback_exit();
-        }
-    },
-
-    send:function(data){
-        this.ws.emit(this.route, data);
-    },
-
-    resize: function (size) {
-        if (this.ws && this.is_connected) {
-            size['resize'] = 1;
-            this.send(size)
-        }
-    },
-    run: function (ssh_info) {
-        this.connectWs();
-
-        var that = this;    
-        var termCols = 83;
-        var termRows = 21;
-        this.term = new Terminal({fontSize: this.fontSize,screenKeys: true, useStyle: true});
-
-        this.term.open($('#'+this.id)[0]);
-        this.term.setOption('cursorBlink', true);
-        this.ws.on('server_response', function (ev) { that.on_message(ev)});
-        this.ws.on('connect', function (ev) { that.on_connect(ev)});
-        this.ws.on('reconnect', function (ev) { that.on_reconnect(ev)});
-        this.ws.on('exit', function (ev) { that.on_exit(ev)});
-
-        if (this.ws) {
-            this.term_timer = setInterval(function () {
-                if (that.is_connected){
-                    that.send('');
-                } else{
-                    that.on_exit();
-                }
-            }, 600);
-        }
-        
-        this.term.on('data', function (data) {
-            if (that.is_connected){
-                that.send(data);
-            } else{
-                that.term.write('\r\n连接丢失,正在尝试重新连接!\r\n');
-                that.connectSsh();
-            }
-        });
-
-        this.term.write('\r\n请稍等,正在链接中...\r\n');
-        this.connectSsh();
-        this.term.focus();
-    }
-}
diff --git a/route/static/js/term.js b/route/static/js/term.js
deleted file mode 100644
index 47fb7ac9c..000000000
--- a/route/static/js/term.js
+++ /dev/null
@@ -1,158 +0,0 @@
-function Terms (el, config) {
-  if (typeof config == "undefined") config = {};
-  this.el = el;
-  this.id = config.ssh_info.id || '';
-  this.bws = null; //websocket对象
-  this.route = '/webssh'; // 访问的方法
-  this.term = null; //term对象
-  this.info = null; // 请求数据
-  this.last_body = null;
-  this.fontSize = 15; //终端字体大小
-  this.ssh_info = config.ssh_info;
-  this.run();
-}
-Terms.prototype = {
-  // websocket持久化连接
-  connect: function (callback) {
-      var that = this;
-      // 判断当前websocket连接是否存在
-      if (!this.bws || this.bws.readyState == 3 || this.bws.readyState == 2) {
-          this.bws = new WebSocket((window.location.protocol === 'http:' ? 'ws://' : 'wss://') + window.location.host + this.route);
-          this.bws.addEventListener('message', function (ev) { that.on_message(ev) });
-          this.bws.addEventListener('close', function (ev) { that.on_close(ev) });
-          this.bws.addEventListener('error', function (ev) { that.on_error(ev) });
-          this.bws.addEventListener('open', function (ev) { that.on_open(ev) });
-          if (callback) callback(this.bws)
-      }
-  },
-
-  //连接服务器成功
-  on_open: function (ws_event) {
-      var http_token = $("#request_token_head").attr('token');
-      this.ssh_info['x-http-token'] = http_token;
-
-      this.send(JSON.stringify(this.ssh_info || { 'x-http-token': http_token }))
-      this.term.FitAddon.fit();
-      this.resize({ cols: this.term.cols, rows: this.term.rows });
-  },
-  //服务器消息事件
-  on_message: function (ws_event) {
-      result = ws_event.data;
-      if (!result) return;
-      that = this;
-      if ((result.indexOf("@127.0.0.1:") != -1 || result.indexOf("@localhost:") != -1) && result.indexOf('Authentication failed') != -1) {
-          that.term.write(result);
-          host_trem.localhost_login_form(result);
-          that.close();
-          return;
-      }
-      if (result.length > 1 && that.last_body === false) {
-          that.last_body = true;
-      }
-      that.term.write(result);
-      that.set_term_icon(1);
-      if (result == '\r\n登出\r\n' || result == '登出\r\n' || result == '\r\nlogout\r\n' || result == 'logout\r\n') {
-          that.close();
-          that.bws = null;
-
-      }
-  },
-  
-  //websocket关闭事件
-  on_close: function (ws_event) {
-      this.set_term_icon(0);
-      this.bws = null;
-  },
-
-  /**
-   * @name 设置终端标题状态
-   * @param {number} status 终端状态
-   * @return void 
-  */
-  set_term_icon: function (status) {
-      var icon_list = ['icon-warning', 'icon-sucess', 'icon-info'];
-      if (status == 1) {
-          if ($("[data-id='" + this.id + "']").attr("class").indexOf('active') == -1) {
-              status = 2;
-          }
-      }
-      $("[data-id='" + this.id + "']").find('.icon').removeAttr('class').addClass(icon_list[status] + ' icon');
-      if (status == 2) {
-          that = this;
-          setTimeout(function () {
-              $("[data-id='" + that.id + "']").find('.icon').removeAttr('class').addClass(icon_list[1] + ' icon');
-          }, 200);
-      }
-  },
-
-
-  //websocket错误事件
-  on_error: function (ws_event) {
-      if (ws_event.target.readyState === 3) {
-          // var msg = '错误: 无法创建WebSocket连接，请在面板设置页面关闭【开发者模式】';
-          // layer.msg(msg,{time:5000})
-          // if(Term.state === 3) return
-          // Term.term.write(msg)
-          // Term.state = 3;
-      } else {
-          console.log(ws_event)
-      }
-  },
-  //发送数据
-  //@param event 唯一事件名称
-  //@param data 发送的数据
-  //@param callback 服务器返回结果时回调的函数,运行完后将被回收
-  send: function (data, num) {
-      var that = this;
-      //如果没有连接，则尝试连接服务器
-      if (!this.bws || this.bws.readyState == 3 || this.bws.readyState == 2) {
-          this.connect();
-      }
-      //判断当前连接状态,如果!=1，则100ms后尝试重新发送
-      if (this.bws.readyState === 1) {
-          this.bws.send(data);
-      } else {
-          if (this.state === 3) return;
-          if (!num) num = 0;
-          if (num < 5) {
-              num++;
-              setTimeout(function () { that.send(data, num++); }, 100)
-          }
-      }
-  },
-  //关闭连接
-  close: function () {
-      this.bws.close();
-      this.set_term_icon(0);
-  },
-  resize: function (size) {
-      if (this.bws) {
-          size['resize'] = 1;
-          this.send(JSON.stringify(size));
-      }
-
-  },
-  run: function (ssh_info) {
-      var that = this;
-      this.term = new Terminal({ fontSize: this.fontSize, screenKeys: true, useStyle: true });
-      this.term.setOption('cursorBlink', true);
-      this.last_body = false;
-      this.term.open($(this.el)[0]);
-
-      // this.term.FitAddon = new window.FitAddon();
-      // this.term.loadAddon(this.term.FitAddon);
-      // this.term.WebLinksAddon = new WebLinksAddon.WebLinksAddon();
-      // this.term.loadAddon(this.term.WebLinksAddon);
-      if (ssh_info) this.ssh_info = ssh_info;
-      this.connect();
-      that.term.onData(function (data) {
-          try {
-              that.bws.send(data);
-          } catch (e) {
-              that.term.write('\r\n连接丢失,正在尝试重新连接!\r\n');
-              that.connect();
-          }
-      });
-      this.term.focus();
-  }
-}
diff --git a/route/static/js/xm-select.js b/route/static/js/xm-select.js
deleted file mode 100755
index bf44849bf..000000000
--- a/route/static/js/xm-select.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*!
- * @Title: xm-select
- * @Version: 1.2.4
- * @Description：基于layui的多选解决方案
- * @Site: https://gitee.com/maplemei/xm-select
- * @Author: maplemei
- * @License：Apache License 2.0
- */!function(e){var t={};function n(o){if(t[o])return t[o].exports;var r=t[o]={i:o,l:!1,exports:{}};return e[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)n.d(o,r,function(t){return e[t]}.bind(null,r));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="./",n(n.s=214)}({1:function(e,t,n){"use strict";function o(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,o)}return n}function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function i(e){return function(e){if(Array.isArray(e))return a(e)}(e)||function(e){if("undefined"!=typeof Symbol&&Symbol.iterator in Object(e))return Array.from(e)}(e)||function(e,t){if(!e)return;if("string"==typeof e)return a(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return a(e,t)}(e)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function a(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,o=new Array(t);n<t;n++)o[n]=e[n];return o}function l(e){return e.nodeType?e:document.querySelector(e)}function s(){for(var e=[],t=0;t<arguments.length;t++)e.push("".concat(t+1,". ").concat(arguments[t]));console.warn(e.join("\n"))}function c(e){return"[object Array]"==Object.prototype.toString.call(e)}function u(e){return"[object Function]"==Object.prototype.toString.call(e)}function p(e){return e-=0,isNaN(e)&&(e=0),e}function f(e,t){var n;for(n in t)e[n]=e[n]&&"[object Object]"===e[n].toString()&&t[n]&&"[object Object]"===t[n].toString()?f(e[n],t[n]):e[n]=t[n];return e}function d(e,t,n){for(var o=n.value,r=i(t),a=function(n){var i=e[n];t.find((function(e){return e[o]==i[o]}))||r.push(i)},l=0;l<e.length;l++)a(l);return r}function h(){return-1!=navigator.userAgent.indexOf("Mac OS")?"mac":"win"}function m(e,t,n,o){if(e&&c(e)){var r=o.children,i=o.selected,a=o.value;e.forEach((function(e){e.__node[i]||t.find((function(t){return t[a]===e[a]}))?n.push(e):m(e[r],t,n,o)}))}}function b(e,t,n){if(e&&c(e))return e.map((function(e){return e=function(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?o(Object(n),!0).forEach((function(t){r(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):o(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}({},e),n.forEach((function(t){return delete e[t]})),e[t]=b(e[t],t,n),e}))}function y(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:100,n=!(arguments.length>2&&void 0!==arguments[2])||arguments[2],o=this,r=!1;return function(){for(var i=arguments.length,a=new Array(i),l=0;l<i;l++)a[l]=arguments[l];r||(r=!0,!n&&e.call.apply(e,[o].concat(a)),setTimeout((function(){n&&e.call.apply(e,[o].concat(a)),r=!1}),t))}}n.d(t,"g",(function(){return l})),n.d(t,"k",(function(){return s})),n.d(t,"d",(function(){return c})),n.d(t,"e",(function(){return u})),n.d(t,"i",(function(){return p})),n.d(t,"b",(function(){return f})),n.d(t,"f",(function(){return d})),n.d(t,"a",(function(){return h})),n.d(t,"j",(function(){return m})),n.d(t,"c",(function(){return b})),n.d(t,"h",(function(){return y}))},106:function(e,t){e.exports=function(e){var t="undefined"!=typeof window&&window.location;if(!t)throw new Error("fixUrls requires window.location");if(!e||"string"!=typeof e)return e;var n=t.protocol+"//"+t.host,o=n+t.pathname.replace(/\/[^\/]*$/,"/");return e.replace(/url\s*\(((?:[^)(]|\((?:[^)(]+|\([^)(]*\))*\))*)\)/gi,(function(e,t){var r,i=t.trim().replace(/^"(.*)"$/,(function(e,t){return t})).replace(/^'(.*)'$/,(function(e,t){return t}));return/^(#|data:|http:\/\/|https:\/\/|file:\/\/\/|\s*$)/i.test(i)?e:(r=0===i.indexOf("//")?i:0===i.indexOf("/")?n+i:o+i.replace(/^\.\//,""),"url("+JSON.stringify(r)+")")}))}},214:function(e,t,n){"use strict";n.r(t),function(e){n(216),n(217),n(219);var t=n(42),o=n(1);window.addEventListener("click",(function(){Object.keys(t.b).forEach((function(e){var n=t.b[e];n&&n.closed&&n.closed()}))})),window.addEventListener("scroll",Object(o.h)((function(){Object.keys(t.b).forEach((function(e){var n=t.b[e];n&&n.calcPosition&&n.calcPosition()}))}))),"object"===("undefined"==typeof exports?"undefined":_typeof(exports))?e.exports=t.c:"function"==typeof define&&n(221)?define(xmSelect):window.layui&&layui.define&&layui.define((function(e){e("xmSelect",t.c)})),window.xmSelect=t.c}.call(this,n(215)(e))},215:function(e,t){e.exports=function(e){if(!e.webpackPolyfill){var t=Object.create(e);t.children||(t.children=[]),Object.defineProperty(t,"loaded",{enumerable:!0,get:function(){return t.l}}),Object.defineProperty(t,"id",{enumerable:!0,get:function(){return t.i}}),Object.defineProperty(t,"exports",{enumerable:!0}),t.webpackPolyfill=1}return t}},216:function(e,t){Array.prototype.map||(Array.prototype.map=function(e,t){var n,o,r,i=Object(this),a=i.length>>>0;for(t&&(n=t),o=new Array(a),r=0;r<a;){var l,s;r in i&&(l=i[r],s=e.call(n,l,r,i),o[r]=s),r++}return o}),Array.prototype.forEach||(Array.prototype.forEach=function(e,t){var n,o;if(null==this)throw new TypeError("this is null or not defined");var r=Object(this),i=r.length>>>0;if("function"!=typeof e)throw new TypeError(e+" is not a function");for(arguments.length>1&&(n=t),o=0;o<i;){var a;o in r&&(a=r[o],e.call(n,a,o,r)),o++}}),Array.prototype.filter||(Array.prototype.filter=function(e){if(null==this)throw new TypeError;var t=Object(this),n=t.length>>>0;if("function"!=typeof e)throw new TypeError;for(var o=[],r=arguments[1],i=0;i<n;i++)if(i in t){var a=t[i];e.call(r,a,i,t)&&o.push(a)}return o}),Array.prototype.find||(Array.prototype.find=function(e){return e&&(this.filter(e)||[])[0]}),Array.prototype.findIndex||(Array.prototype.findIndex=function(e){for(var t,n=Object(this),o=n.length>>>0,r=arguments[1],i=0;i<o;i++)if(t=n[i],e.call(r,t,i,n))return i;return-1})},217:function(e,t,n){var o=n(218);"string"==typeof o&&(o=[[e.i,o,""]]);var r={hmr:!0,transform:void 0,insertInto:void 0};n(28)(o,r);o.locals&&(e.exports=o.locals)},218:function(e,t,n){(t=n(27)(!1)).push([e.i,'@font-face {\n  font-family: "xm-iconfont";\n  src: url(\'//at.alicdn.com/t/font_792691_ptvyboo0bno.eot?t=1574048839056\');\n  /* IE9 */\n  src: url(\'//at.alicdn.com/t/font_792691_ptvyboo0bno.eot?t=1574048839056#iefix\') format(\'embedded-opentype\'), /* IE6-IE8 */ url(\'data:application/x-font-woff2;charset=utf-8;base64,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\') format(\'woff2\'), url(\'//at.alicdn.com/t/font_792691_ptvyboo0bno.woff?t=1574048839056\') format(\'woff\'), url(\'//at.alicdn.com/t/font_792691_ptvyboo0bno.ttf?t=1574048839056\') format(\'truetype\'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ url(\'//at.alicdn.com/t/font_792691_ptvyboo0bno.svg?t=1574048839056#iconfont\') format(\'svg\');\n  /* iOS 4.1- */\n}\n.xm-iconfont {\n  font-family: "xm-iconfont" !important;\n  font-size: 16px;\n  font-style: normal;\n  -webkit-font-smoothing: antialiased;\n  -moz-osx-font-smoothing: grayscale;\n}\n.xm-icon-quanxuan:before {\n  content: "\\e62c";\n}\n.xm-icon-caidan:before {\n  content: "\\e610";\n}\n.xm-icon-fanxuan:before {\n  content: "\\e837";\n}\n.xm-icon-pifu:before {\n  content: "\\e668";\n}\n.xm-icon-qingkong:before {\n  content: "\\e63e";\n}\n.xm-icon-sousuo:before {\n  content: "\\e600";\n}\n.xm-icon-danx:before {\n  content: "\\e62b";\n}\n.xm-icon-duox:before {\n  content: "\\e613";\n}\n.xm-icon-close:before {\n  content: "\\e601";\n}\n.xm-icon-expand:before {\n  content: "\\e641";\n}\n.xm-icon-banxuan:before {\n  content: "\\e60d";\n}\n',""]),e.exports=t},219:function(e,t,n){var o=n(220);"string"==typeof o&&(o=[[e.i,o,""]]);var r={hmr:!0,transform:void 0,insertInto:void 0};n(28)(o,r);o.locals&&(e.exports=o.locals)},220:function(e,t,n){(t=n(27)(!1)).push([e.i,"@-webkit-keyframes xm-upbit {\n  from {\n    -webkit-transform: translate3d(0, 30px, 0);\n    opacity: 0.3;\n  }\n  to {\n    -webkit-transform: translate3d(0, 0, 0);\n    opacity: 1;\n  }\n}\n@keyframes xm-upbit {\n  from {\n    transform: translate3d(0, 30px, 0);\n    opacity: 0.3;\n  }\n  to {\n    transform: translate3d(0, 0, 0);\n    opacity: 1;\n  }\n}\n@-webkit-keyframes loader {\n  0% {\n    -webkit-transform: rotate(0deg);\n    transform: rotate(0deg);\n  }\n  100% {\n    -webkit-transform: rotate(360deg);\n    transform: rotate(360deg);\n  }\n}\n@keyframes loader {\n  0% {\n    -webkit-transform: rotate(0deg);\n    transform: rotate(0deg);\n  }\n  100% {\n    -webkit-transform: rotate(360deg);\n    transform: rotate(360deg);\n  }\n}\nxm-select {\n  background-color: #FFF;\n  position: relative;\n  border: 1px solid #E6E6E6;\n  border-radius: 2px;\n  display: block;\n  width: 100%;\n  cursor: pointer;\n  outline: none;\n}\nxm-select * {\n  margin: 0;\n  padding: 0;\n  box-sizing: border-box;\n  font-size: 14px;\n  font-weight: 400;\n  text-overflow: ellipsis;\n  user-select: none;\n  -ms-user-select: none;\n  -moz-user-select: none;\n  -webkit-user-select: none;\n}\nxm-select:hover,\nxm-select:focus {\n  border-color: #C0C4CC;\n}\nxm-select > .xm-tips {\n  color: #999999;\n  padding: 0 10px;\n  position: absolute;\n  display: flex;\n  height: 100%;\n  align-items: center;\n}\nxm-select > .xm-icon {\n  display: inline-block;\n  overflow: hidden;\n  position: absolute;\n  width: 0;\n  height: 0;\n  right: 10px;\n  top: 50%;\n  margin-top: -3px;\n  cursor: pointer;\n  border: 6px dashed transparent;\n  border-top-color: #C2C2C2;\n  border-top-style: solid;\n  transition: all 0.3s;\n  -webkit-transition: all 0.3s;\n}\nxm-select > .xm-icon-expand {\n  margin-top: -9px;\n  transform: rotate(180deg);\n}\nxm-select > .xm-label.single-row {\n  position: absolute;\n  top: 0;\n  bottom: 0px;\n  left: 0px;\n  right: 30px;\n  overflow: auto hidden;\n}\nxm-select > .xm-label.single-row .scroll {\n  overflow-y: hidden;\n}\nxm-select > .xm-label.single-row .label-content {\n  flex-wrap: nowrap;\n  white-space: nowrap;\n}\nxm-select > .xm-label.auto-row .label-content {\n  flex-wrap: wrap;\n  padding-right: 30px !important;\n}\nxm-select > .xm-label.auto-row .xm-label-block > span {\n  white-space: unset;\n  height: 100%;\n}\nxm-select > .xm-label .scroll .label-content {\n  display: flex;\n  padding: 3px 10px;\n}\nxm-select > .xm-label .xm-label-block {\n  display: flex;\n  position: relative;\n  padding: 0px 5px;\n  margin: 2px 5px 2px 0;\n  border-radius: 3px;\n  align-items: baseline;\n  color: #FFF;\n}\nxm-select > .xm-label .xm-label-block > span {\n  display: flex;\n  color: #FFF;\n  white-space: nowrap;\n}\nxm-select > .xm-label .xm-label-block > i {\n  color: #FFF;\n  margin-left: 8px;\n  font-size: 12px;\n  cursor: pointer;\n  display: flex;\n}\nxm-select > .xm-label .xm-label-block.disabled {\n  background-color: #C2C2C2 !important;\n  cursor: no-drop !important;\n}\nxm-select > .xm-label .xm-label-block.disabled > i {\n  cursor: no-drop !important;\n}\nxm-select > .xm-body {\n  position: absolute;\n  left: 0;\n  top: 42px;\n  padding: 5px 0;\n  z-index: 999;\n  width: 100%;\n  min-width: fit-content;\n  border: 1px solid #E6E6E6;\n  background-color: #fff;\n  border-radius: 2px;\n  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12);\n  animation-name: xm-upbit;\n  animation-duration: 0.3s;\n  animation-fill-mode: both;\n}\nxm-select > .xm-body .scroll-body {\n  overflow-x: hidden;\n  overflow-y: auto;\n}\nxm-select > .xm-body .scroll-body::-webkit-scrollbar {\n  width: 8px;\n}\nxm-select > .xm-body .scroll-body::-webkit-scrollbar-track {\n  -webkit-border-radius: 2em;\n  -moz-border-radius: 2em;\n  -ms-border-radius: 2em;\n  border-radius: 2em;\n  background-color: #FFF;\n}\nxm-select > .xm-body .scroll-body::-webkit-scrollbar-thumb {\n  -webkit-border-radius: 2em;\n  -moz-border-radius: 2em;\n  -ms-border-radius: 2em;\n  border-radius: 2em;\n  background-color: #C2C2C2;\n}\nxm-select > .xm-body.up {\n  top: auto;\n  bottom: 42px;\n}\nxm-select > .xm-body.relative {\n  position: relative;\n  display: block !important;\n  top: 0;\n  box-shadow: none;\n  border: none;\n  animation-name: none;\n  animation-duration: 0;\n  min-width: 100%;\n}\nxm-select > .xm-body .xm-group {\n  cursor: default;\n}\nxm-select > .xm-body .xm-group-item {\n  display: inline-block;\n  cursor: pointer;\n  padding: 0 10px;\n  color: #999;\n  font-size: 12px;\n}\nxm-select > .xm-body .xm-option {\n  display: flex;\n  align-items: center;\n  position: relative;\n  padding: 0 10px;\n  cursor: pointer;\n}\nxm-select > .xm-body .xm-option-icon {\n  color: transparent;\n  display: flex;\n  border: 1px solid #E6E6E6;\n  border-radius: 3px;\n  justify-content: center;\n  align-items: center;\n}\nxm-select > .xm-body .xm-option-icon.xm-custom-icon {\n  color: unset;\n  border: unset;\n}\nxm-select > .xm-body .xm-option-icon-hidden {\n  margin-right: -10px;\n}\nxm-select > .xm-body .xm-option-icon.xm-icon-danx {\n  border-radius: 100%;\n}\nxm-select > .xm-body .xm-option-content {\n  display: flex;\n  position: relative;\n  padding-left: 15px;\n  overflow: hidden;\n  white-space: nowrap;\n  text-overflow: ellipsis;\n  color: #666;\n  width: calc(100% - 20px);\n}\nxm-select > .xm-body .xm-option.hide-icon .xm-option-content {\n  padding-left: 0;\n}\nxm-select > .xm-body .xm-option.selected.hide-icon .xm-option-content {\n  color: #FFF !important;\n}\nxm-select > .xm-body .xm-option .loader {\n  width: 0.8em;\n  height: 0.8em;\n  margin-right: 6px;\n  color: #C2C2C2;\n}\nxm-select > .xm-body .xm-select-empty {\n  text-align: center;\n  color: #999;\n}\nxm-select > .xm-body .disabled {\n  cursor: no-drop;\n}\nxm-select > .xm-body .disabled:hover {\n  background-color: #FFF;\n}\nxm-select > .xm-body .disabled .xm-option-icon {\n  border-color: #C2C2C2 !important;\n}\nxm-select > .xm-body .disabled .xm-option-content {\n  color: #C2C2C2 !important;\n}\nxm-select > .xm-body .disabled.selected > .xm-option-icon {\n  color: #C2C2C2 !important;\n}\nxm-select > .xm-body .xm-search {\n  background-color: #FFF !important;\n  position: relative;\n  padding: 0 10px;\n  margin-bottom: 5px;\n  cursor: pointer;\n}\nxm-select > .xm-body .xm-search > i {\n  position: absolute;\n  color: #666;\n}\nxm-select > .xm-body .xm-search-input {\n  border: none;\n  border-bottom: 1px solid #E6E6E6;\n  padding-left: 27px;\n  cursor: text;\n}\nxm-select > .xm-body .xm-paging {\n  padding: 0 10px;\n  display: flex;\n  margin-top: 5px;\n}\nxm-select > .xm-body .xm-paging > span:first-child {\n  border-radius: 2px 0 0 2px;\n}\nxm-select > .xm-body .xm-paging > span:last-child {\n  border-radius: 0 2px 2px 0;\n}\nxm-select > .xm-body .xm-paging > span {\n  display: flex;\n  flex: auto;\n  justify-content: center;\n  vertical-align: middle;\n  margin: 0 -1px 0 0;\n  background-color: #fff;\n  color: #333;\n  font-size: 12px;\n  border: 1px solid #e2e2e2;\n  flex-wrap: nowrap;\n  width: 100%;\n  overflow: hidden;\n  min-width: 50px;\n}\nxm-select > .xm-body .xm-toolbar {\n  padding: 0 10px;\n  display: flex;\n  margin: -3px 0;\n  cursor: default;\n}\nxm-select > .xm-body .xm-toolbar .toolbar-tag {\n  cursor: pointer;\n  display: flex;\n  margin-right: 20px;\n  color: #666;\n  align-items: baseline;\n}\nxm-select > .xm-body .xm-toolbar .toolbar-tag:hover {\n  opacity: 0.8;\n}\nxm-select > .xm-body .xm-toolbar .toolbar-tag:active {\n  opacity: 1;\n}\nxm-select > .xm-body .xm-toolbar .toolbar-tag > i {\n  margin-right: 2px;\n  font-size: 14px;\n}\nxm-select > .xm-body .xm-toolbar .toolbar-tag:last-child {\n  margin-right: 0;\n}\nxm-select > .xm-body .xm-body-custom {\n  line-height: initial;\n  cursor: default;\n}\nxm-select > .xm-body .xm-body-custom * {\n  box-sizing: initial;\n}\nxm-select > .xm-body .xm-tree {\n  position: relative;\n}\nxm-select > .xm-body .xm-tree-icon {\n  display: inline-block;\n  margin-right: 3px;\n  cursor: pointer;\n  border: 6px dashed transparent;\n  border-left-color: #C2C2C2;\n  border-left-style: solid;\n  transition: all 0.3s;\n  -webkit-transition: all 0.3s;\n  z-index: 2;\n  visibility: hidden;\n}\nxm-select > .xm-body .xm-tree-icon.expand {\n  margin-top: 3px;\n  margin-right: 5px;\n  margin-left: -2px;\n  transform: rotate(90deg);\n}\nxm-select > .xm-body .xm-tree-icon.xm-visible {\n  visibility: visible;\n}\nxm-select > .xm-body .xm-tree .left-line {\n  position: absolute;\n  left: 13px;\n  width: 0;\n  z-index: 1;\n  border-left: 1px dotted #c0c4cc !important;\n}\nxm-select > .xm-body .xm-tree .top-line {\n  position: absolute;\n  left: 13px;\n  height: 0;\n  z-index: 1;\n  border-top: 1px dotted #c0c4cc !important;\n}\nxm-select > .xm-body .xm-tree .xm-tree-icon + .top-line {\n  margin-left: 1px;\n}\nxm-select > .xm-body .scroll-body > .xm-tree > .xm-option > .top-line,\nxm-select > .xm-body .scroll-body > .xm-option > .top-line {\n  width: 0 !important;\n}\nxm-select > .xm-body .xm-cascader-box {\n  position: absolute;\n  left: 0;\n  right: 0;\n  top: 0;\n  bottom: 0;\n  padding: 5px 0;\n  border: 1px solid #E6E6E6;\n  background-color: #fff;\n  border-radius: 2px;\n  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12);\n  margin: -1px;\n}\nxm-select > .xm-body .xm-cascader-box::before {\n  content: ' ';\n  position: absolute;\n  width: 0;\n  height: 0;\n  border: 6px solid transparent;\n  border-right-color: #E6E6E6;\n  top: 10px;\n  left: -12px;\n}\nxm-select > .xm-body .xm-cascader-box::after {\n  content: ' ';\n  position: absolute;\n  width: 0;\n  height: 0;\n  border: 6px solid transparent;\n  border-right-color: #fff;\n  top: 10px;\n  left: -11px;\n}\nxm-select > .xm-body .xm-cascader-scroll {\n  height: 100%;\n  overflow-x: hidden;\n  overflow-y: auto;\n}\nxm-select > .xm-body.cascader {\n  width: unset;\n  min-width: unset;\n}\nxm-select > .xm-body.cascader .xm-option-content {\n  padding-left: 8px;\n}\nxm-select > .xm-body.cascader .disabled .xm-right-arrow {\n  color: #C2C2C2 !important;\n}\nxm-select > .xm-body.cascader .hide-icon.disabled .xm-right-arrow {\n  color: #999 !important;\n}\nxm-select .xm-input {\n  cursor: pointer;\n  border-radius: 2px;\n  border-width: 1px;\n  border-style: solid;\n  border-color: #E6E6E6;\n  display: block;\n  width: 100%;\n  box-sizing: border-box;\n  background-color: #FFF;\n  line-height: 1.3;\n  padding-left: 10px;\n  outline: 0;\n  user-select: text;\n  -ms-user-select: text;\n  -moz-user-select: text;\n  -webkit-user-select: text;\n}\nxm-select .dis {\n  display: none;\n}\nxm-select .loading {\n  position: absolute;\n  top: 0;\n  left: 0;\n  right: 0;\n  bottom: 0;\n  background-color: rgba(255, 255, 255, 0.6);\n  display: flex;\n  align-items: center;\n  justify-content: center;\n}\nxm-select .loader {\n  border: 0.2em dotted currentcolor;\n  border-radius: 50%;\n  -webkit-animation: 1s loader linear infinite;\n  animation: 1s loader linear infinite;\n  display: inline-block;\n  width: 1em;\n  height: 1em;\n  color: inherit;\n  vertical-align: middle;\n  pointer-events: none;\n}\nxm-select .xm-select-default {\n  position: absolute;\n  width: 100%;\n  height: 100%;\n  border: none;\n  visibility: hidden;\n}\nxm-select .xm-select-disabled {\n  position: absolute;\n  left: 0;\n  right: 0;\n  top: 0;\n  bottom: 0;\n  cursor: no-drop;\n  z-index: 2;\n  opacity: 0.3;\n  background-color: #FFF;\n}\nxm-select .item--divided {\n  border-top: 1px solid #ebeef5;\n  width: calc(100% - 20px);\n  cursor: initial;\n}\nxm-select .xm-right-arrow {\n  position: absolute;\n  color: #666;\n  right: 5px;\n  top: -1px;\n  font-weight: 700;\n  transform: scale(0.6, 1);\n}\nxm-select .xm-right-arrow::after {\n  content: '>';\n}\nxm-select[size='large'] {\n  min-height: 40px;\n  line-height: 40px;\n}\nxm-select[size='large'] .xm-input {\n  height: 40px;\n}\nxm-select[size='large'] .xm-label .scroll .label-content {\n  line-height: 34px;\n}\nxm-select[size='large'] .xm-label .xm-label-block {\n  height: 30px;\n  line-height: 30px;\n}\nxm-select[size='large'] .xm-body .xm-option .xm-option-icon {\n  height: 20px;\n  width: 20px;\n  font-size: 20px;\n}\nxm-select[size='large'] .xm-paging > span {\n  height: 34px;\n  line-height: 34px;\n}\nxm-select[size='large'] .xm-tree .left-line {\n  height: 100%;\n  bottom: 20px;\n}\nxm-select[size='large'] .xm-tree .left-line-group {\n  height: calc(100% - 40px);\n}\nxm-select[size='large'] .xm-tree .xm-tree-icon.xm-hidden + .top-line {\n  top: 19px;\n}\nxm-select[size='large'] .item--divided {\n  margin: 10px;\n}\nxm-select {\n  min-height: 36px;\n  line-height: 36px;\n}\nxm-select .xm-input {\n  height: 36px;\n}\nxm-select .xm-label .scroll .label-content {\n  line-height: 30px;\n}\nxm-select .xm-label .xm-label-block {\n  height: 26px;\n  line-height: 26px;\n}\nxm-select .xm-body .xm-option .xm-option-icon {\n  height: 18px;\n  width: 18px;\n  font-size: 18px;\n}\nxm-select .xm-paging > span {\n  height: 30px;\n  line-height: 30px;\n}\nxm-select .xm-tree .left-line {\n  height: 100%;\n  bottom: 18px;\n}\nxm-select .xm-tree .left-line-group {\n  height: calc(100% - 36px);\n}\nxm-select .xm-tree .xm-tree-icon.xm-hidden + .top-line {\n  top: 17px;\n}\nxm-select .item--divided {\n  margin: 9px;\n}\nxm-select[size='small'] {\n  min-height: 32px;\n  line-height: 32px;\n}\nxm-select[size='small'] .xm-input {\n  height: 32px;\n}\nxm-select[size='small'] .xm-label .scroll .label-content {\n  line-height: 26px;\n}\nxm-select[size='small'] .xm-label .xm-label-block {\n  height: 22px;\n  line-height: 22px;\n}\nxm-select[size='small'] .xm-body .xm-option .xm-option-icon {\n  height: 16px;\n  width: 16px;\n  font-size: 16px;\n}\nxm-select[size='small'] .xm-paging > span {\n  height: 26px;\n  line-height: 26px;\n}\nxm-select[size='small'] .xm-tree .left-line {\n  height: 100%;\n  bottom: 16px;\n}\nxm-select[size='small'] .xm-tree .left-line-group {\n  height: calc(100% - 32px);\n}\nxm-select[size='small'] .xm-tree .xm-tree-icon.xm-hidden + .top-line {\n  top: 15px;\n}\nxm-select[size='small'] .item--divided {\n  margin: 8px;\n}\nxm-select[size='mini'] {\n  min-height: 28px;\n  line-height: 28px;\n}\nxm-select[size='mini'] .xm-input {\n  height: 28px;\n}\nxm-select[size='mini'] .xm-label .scroll .label-content {\n  line-height: 22px;\n}\nxm-select[size='mini'] .xm-label .xm-label-block {\n  height: 18px;\n  line-height: 18px;\n}\nxm-select[size='mini'] .xm-body .xm-option .xm-option-icon {\n  height: 14px;\n  width: 14px;\n  font-size: 14px;\n}\nxm-select[size='mini'] .xm-paging > span {\n  height: 22px;\n  line-height: 22px;\n}\nxm-select[size='mini'] .xm-tree .left-line {\n  height: 100%;\n  bottom: 14px;\n}\nxm-select[size='mini'] .xm-tree .left-line-group {\n  height: calc(100% - 28px);\n}\nxm-select[size='mini'] .xm-tree .xm-tree-icon.xm-hidden + .top-line {\n  top: 13px;\n}\nxm-select[size='mini'] .item--divided {\n  margin: 7px;\n}\n.layui-form-pane xm-select {\n  margin: -1px -1px -1px 0;\n}\n",""]),e.exports=t},221:function(e,t){(function(t){e.exports=t}).call(this,{})},27:function(e,t,n){"use strict";e.exports=function(e){var t=[];return t.toString=function(){return this.map((function(t){var n=function(e,t){var n=e[1]||"",o=e[3];if(!o)return n;if(t&&"function"==typeof btoa){var r=function(e){var t=btoa(unescape(encodeURIComponent(JSON.stringify(e)))),n="sourceMappingURL=data:application/json;charset=utf-8;base64,".concat(t);return"/*# ".concat(n," */")}(o),i=o.sources.map((function(e){return"/*# sourceURL=".concat(o.sourceRoot||"").concat(e," */")}));return[n].concat(i).concat([r]).join("\n")}return[n].join("\n")}(t,e);return t[2]?"@media ".concat(t[2]," {").concat(n,"}"):n})).join("")},t.i=function(e,n,o){"string"==typeof e&&(e=[[null,e,""]]);var r={};if(o)for(var i=0;i<this.length;i++){var a=this[i][0];null!=a&&(r[a]=!0)}for(var l=0;l<e.length;l++){var s=[].concat(e[l]);o&&r[s[0]]||(n&&(s[2]?s[2]="".concat(n," and ").concat(s[2]):s[2]=n),t.push(s))}},t}},28:function(e,t,n){var o,r,i={},a=(o=function(){return window&&document&&document.all&&!window.atob},function(){return void 0===r&&(r=o.apply(this,arguments)),r}),l=function(e,t){return t?t.querySelector(e):document.querySelector(e)},s=function(e){var t={};return function(e,n){if("function"==typeof e)return e();if(void 0===t[e]){var o=l.call(this,e,n);if(window.HTMLIFrameElement&&o instanceof window.HTMLIFrameElement)try{o=o.contentDocument.head}catch(e){o=null}t[e]=o}return t[e]}}(),c=null,u=0,p=[],f=n(106);function d(e,t){for(var n=0;n<e.length;n++){var o=e[n],r=i[o.id];if(r){r.refs++;for(var a=0;a<r.parts.length;a++)r.parts[a](o.parts[a]);for(;a<o.parts.length;a++)r.parts.push(v(o.parts[a],t))}else{var l=[];for(a=0;a<o.parts.length;a++)l.push(v(o.parts[a],t));i[o.id]={id:o.id,refs:1,parts:l}}}}function h(e,t){for(var n=[],o={},r=0;r<e.length;r++){var i=e[r],a=t.base?i[0]+t.base:i[0],l={css:i[1],media:i[2],sourceMap:i[3]};o[a]?o[a].parts.push(l):n.push(o[a]={id:a,parts:[l]})}return n}function m(e,t){var n=s(e.insertInto);if(!n)throw new Error("Couldn't find a style target. This probably means that the value for the 'insertInto' parameter is invalid.");var o=p[p.length-1];if("top"===e.insertAt)o?o.nextSibling?n.insertBefore(t,o.nextSibling):n.appendChild(t):n.insertBefore(t,n.firstChild),p.push(t);else if("bottom"===e.insertAt)n.appendChild(t);else{if("object"!=typeof e.insertAt||!e.insertAt.before)throw new Error("[Style Loader]\n\n Invalid value for parameter 'insertAt' ('options.insertAt') found.\n Must be 'top', 'bottom', or Object.\n (https://github.com/webpack-contrib/style-loader#insertat)\n");var r=s(e.insertAt.before,n);n.insertBefore(t,r)}}function b(e){if(null===e.parentNode)return!1;e.parentNode.removeChild(e);var t=p.indexOf(e);t>=0&&p.splice(t,1)}function y(e){var t=document.createElement("style");if(void 0===e.attrs.type&&(e.attrs.type="text/css"),void 0===e.attrs.nonce){var o=function(){0;return n.nc}();o&&(e.attrs.nonce=o)}return x(t,e.attrs),m(e,t),t}function x(e,t){Object.keys(t).forEach((function(n){e.setAttribute(n,t[n])}))}function v(e,t){var n,o,r,i;if(t.transform&&e.css){if(!(i="function"==typeof t.transform?t.transform(e.css):t.transform.default(e.css)))return function(){};e.css=i}if(t.singleton){var a=u++;n=c||(c=y(t)),o=w.bind(null,n,a,!1),r=w.bind(null,n,a,!0)}else e.sourceMap&&"function"==typeof URL&&"function"==typeof URL.createObjectURL&&"function"==typeof URL.revokeObjectURL&&"function"==typeof Blob&&"function"==typeof btoa?(n=function(e){var t=document.createElement("link");return void 0===e.attrs.type&&(e.attrs.type="text/css"),e.attrs.rel="stylesheet",x(t,e.attrs),m(e,t),t}(t),o=O.bind(null,n,t),r=function(){b(n),n.href&&URL.revokeObjectURL(n.href)}):(n=y(t),o=k.bind(null,n),r=function(){b(n)});return o(e),function(t){if(t){if(t.css===e.css&&t.media===e.media&&t.sourceMap===e.sourceMap)return;o(e=t)}else r()}}e.exports=function(e,t){if("undefined"!=typeof DEBUG&&DEBUG&&"object"!=typeof document)throw new Error("The style-loader cannot be used in a non-browser environment");(t=t||{}).attrs="object"==typeof t.attrs?t.attrs:{},t.singleton||"boolean"==typeof t.singleton||(t.singleton=a()),t.insertInto||(t.insertInto="head"),t.insertAt||(t.insertAt="bottom");var n=h(e,t);return d(n,t),function(e){for(var o=[],r=0;r<n.length;r++){var a=n[r];(l=i[a.id]).refs--,o.push(l)}e&&d(h(e,t),t);for(r=0;r<o.length;r++){var l;if(0===(l=o[r]).refs){for(var s=0;s<l.parts.length;s++)l.parts[s]();delete i[l.id]}}}};var g,_=(g=[],function(e,t){return g[e]=t,g.filter(Boolean).join("\n")});function w(e,t,n,o){var r=n?"":o.css;if(e.styleSheet)e.styleSheet.cssText=_(t,r);else{var i=document.createTextNode(r),a=e.childNodes;a[t]&&e.removeChild(a[t]),a.length?e.insertBefore(i,a[t]):e.appendChild(i)}}function k(e,t){var n=t.css,o=t.media;if(o&&e.setAttribute("media",o),e.styleSheet)e.styleSheet.cssText=n;else{for(;e.firstChild;)e.removeChild(e.firstChild);e.appendChild(document.createTextNode(n))}}function O(e,t,n){var o=n.css,r=n.sourceMap,i=void 0===t.convertToAbsoluteUrls&&r;(t.convertToAbsoluteUrls||i)&&(o=f(o)),r&&(o+="\n/*# sourceMappingURL=data:application/json;base64,"+btoa(unescape(encodeURIComponent(JSON.stringify(r))))+" */");var a=new Blob([o],{type:"text/css"}),l=e.href;e.href=URL.createObjectURL(a),l&&URL.revokeObjectURL(l)}},37:function(e){e.exports=JSON.parse('{"a":"xm-select","b":"1.2.4","c":"https://maplemei.gitee.io/xm-select"}')},42:function(e,t,n){"use strict";n.d(t,"b",(function(){return Xe})),n.d(t,"d",(function(){return $e})),n.d(t,"a",(function(){return et}));var o,r,i,a,l,s=n(37),c=n(1),u={},p=[],f=/acit|ex(?:s|g|n|p|$)|rph|grid|ows|mnc|ntw|ine[ch]|zoo|^ord|itera/i;function d(e,t){for(var n in t)e[n]=t[n];return e}function h(e){var t=e.parentNode;t&&t.removeChild(e)}function m(e,t,n){var o,r=arguments,i={};for(o in t)"key"!==o&&"ref"!==o&&(i[o]=t[o]);if(arguments.length>3)for(n=[n],o=3;o<arguments.length;o++)n.push(r[o]);if(null!=n&&(i.children=n),"function"==typeof e&&null!=e.defaultProps)for(o in e.defaultProps)void 0===i[o]&&(i[o]=e.defaultProps[o]);return b(e,i,t&&t.key,t&&t.ref,null)}function b(e,t,n,r,i){var a={type:e,props:t,key:n,ref:r,__k:null,__:null,__b:0,__e:null,__d:void 0,__c:null,constructor:void 0,__v:i};return null==i&&(a.__v=a),o.vnode&&o.vnode(a),a}function y(e){return e.children}function x(e,t){this.props=e,this.context=t}function v(e,t){if(null==t)return e.__?v(e.__,e.__.__k.indexOf(e)+1):null;for(var n;t<e.__k.length;t++)if(null!=(n=e.__k[t])&&null!=n.__e)return n.__e;return"function"==typeof e.type?v(e):null}function g(e){var t,n;if(null!=(e=e.__)&&null!=e.__c){for(e.__e=e.__c.base=null,t=0;t<e.__k.length;t++)if(null!=(n=e.__k[t])&&null!=n.__e){e.__e=e.__c.base=n.__e;break}return g(e)}}function _(e){(!e.__d&&(e.__d=!0)&&r.push(e)&&!w.__r++||a!==o.debounceRendering)&&((a=o.debounceRendering)||i)(w)}function w(){for(var e;w.__r=r.length;)e=r.sort((function(e,t){return e.__v.__b-t.__v.__b})),r=[],e.some((function(e){var t,n,o,r,i,a,l;e.__d&&(a=(i=(t=e).__v).__e,(l=t.__P)&&(n=[],(o=d({},i)).__v=o,r=A(l,i,o,t.__n,void 0!==l.ownerSVGElement,null,n,null==a?v(i):a),R(n,i),r!=a&&g(i)))}))}function k(e,t,n,o,r,i,a,l,s,c){var f,d,m,x,g,_,w,k=o&&o.__k||p,C=k.length;for(s==u&&(s=null!=a?a[0]:C?v(o,0):null),n.__k=[],f=0;f<t.length;f++)if(null!=(x=n.__k[f]=null==(x=t[f])||"boolean"==typeof x?null:"string"==typeof x||"number"==typeof x?b(null,x,null,null,x):Array.isArray(x)?b(y,{children:x},null,null,null):null!=x.__e||null!=x.__c?b(x.type,x.props,x.key,null,x.__v):x)){if(x.__=n,x.__b=n.__b+1,null===(m=k[f])||m&&x.key==m.key&&x.type===m.type)k[f]=void 0;else for(d=0;d<C;d++){if((m=k[d])&&x.key==m.key&&x.type===m.type){k[d]=void 0;break}m=null}g=A(e,x,m=m||u,r,i,a,l,s,c),(d=x.ref)&&m.ref!=d&&(w||(w=[]),m.ref&&w.push(m.ref,null,x),w.push(d,x.__c||g,x)),null!=g?(null==_&&(_=g),s=O(e,x,m,k,a,g,s),"option"==n.type?e.value="":"function"==typeof n.type&&(n.__d=s)):s&&m.__e==s&&s.parentNode!=e&&(s=v(m))}if(n.__e=_,null!=a&&"function"!=typeof n.type)for(f=a.length;f--;)null!=a[f]&&h(a[f]);for(f=C;f--;)null!=k[f]&&D(k[f],k[f]);if(w)for(f=0;f<w.length;f++)I(w[f],w[++f],w[++f])}function O(e,t,n,o,r,i,a){var l,s,c;if(void 0!==t.__d)l=t.__d,t.__d=void 0;else if(r==n||i!=a||null==i.parentNode)e:if(null==a||a.parentNode!==e)e.appendChild(i),l=null;else{for(s=a,c=0;(s=s.nextSibling)&&c<o.length;c+=2)if(s==i)break e;e.insertBefore(i,a),l=a}return void 0!==l?l:i.nextSibling}function C(e,t,n){"-"===t[0]?e.setProperty(t,n):e[t]="number"==typeof n&&!1===f.test(t)?n+"px":null==n?"":n}function j(e,t,n,o,r){var i,a,l,s,c;if(r?"className"===t&&(t="class"):"class"===t&&(t="className"),"style"===t)if(i=e.style,"string"==typeof n)i.cssText=n;else{if("string"==typeof o&&(i.cssText="",o=null),o)for(s in o)n&&s in n||C(i,s,"");if(n)for(c in n)o&&n[c]===o[c]||C(i,c,n[c])}else"o"===t[0]&&"n"===t[1]?(a=t!==(t=t.replace(/Capture$/,"")),l=t.toLowerCase(),t=(l in e?l:t).slice(2),n?(o||e.addEventListener(t,S,a),(e.l||(e.l={}))[t]=n):e.removeEventListener(t,S,a)):"list"!==t&&"tagName"!==t&&"form"!==t&&"type"!==t&&"size"!==t&&!r&&t in e?e[t]=null==n?"":n:"function"!=typeof n&&"dangerouslySetInnerHTML"!==t&&(t!==(t=t.replace(/^xlink:?/,""))?null==n||!1===n?e.removeAttributeNS("http://www.w3.org/1999/xlink",t.toLowerCase()):e.setAttributeNS("http://www.w3.org/1999/xlink",t.toLowerCase(),n):null==n||!1===n&&!/^ar/.test(t)?e.removeAttribute(t):e.setAttribute(t,n))}function S(e){this.l[e.type](o.event?o.event(e):e)}function E(e,t,n){var o,r;for(o=0;o<e.__k.length;o++)(r=e.__k[o])&&(r.__=e,r.__e&&("function"==typeof r.type&&r.__k.length>1&&E(r,t,n),t=O(n,r,r,e.__k,null,r.__e,t),"function"==typeof e.type&&(e.__d=t)))}function A(e,t,n,r,i,a,l,s,c){var u,p,f,h,m,b,v,g,_,w,O,C=t.type;if(void 0!==t.constructor)return null;(u=o.__b)&&u(t);try{e:if("function"==typeof C){if(g=t.props,_=(u=C.contextType)&&r[u.__c],w=u?_?_.props.value:u.__:r,n.__c?v=(p=t.__c=n.__c).__=p.__E:("prototype"in C&&C.prototype.render?t.__c=p=new C(g,w):(t.__c=p=new x(g,w),p.constructor=C,p.render=M),_&&_.sub(p),p.props=g,p.state||(p.state={}),p.context=w,p.__n=r,f=p.__d=!0,p.__h=[]),null==p.__s&&(p.__s=p.state),null!=C.getDerivedStateFromProps&&(p.__s==p.state&&(p.__s=d({},p.__s)),d(p.__s,C.getDerivedStateFromProps(g,p.__s))),h=p.props,m=p.state,f)null==C.getDerivedStateFromProps&&null!=p.componentWillMount&&p.componentWillMount(),null!=p.componentDidMount&&p.__h.push(p.componentDidMount);else{if(null==C.getDerivedStateFromProps&&g!==h&&null!=p.componentWillReceiveProps&&p.componentWillReceiveProps(g,w),!p.__e&&null!=p.shouldComponentUpdate&&!1===p.shouldComponentUpdate(g,p.__s,w)||t.__v===n.__v){p.props=g,p.state=p.__s,t.__v!==n.__v&&(p.__d=!1),p.__v=t,t.__e=n.__e,t.__k=n.__k,p.__h.length&&l.push(p),E(t,s,e);break e}null!=p.componentWillUpdate&&p.componentWillUpdate(g,p.__s,w),null!=p.componentDidUpdate&&p.__h.push((function(){p.componentDidUpdate(h,m,b)}))}p.context=w,p.props=g,p.state=p.__s,(u=o.__r)&&u(t),p.__d=!1,p.__v=t,p.__P=e,u=p.render(p.props,p.state,p.context),p.state=p.__s,null!=p.getChildContext&&(r=d(d({},r),p.getChildContext())),f||null==p.getSnapshotBeforeUpdate||(b=p.getSnapshotBeforeUpdate(h,m)),O=null!=u&&u.type==y&&null==u.key?u.props.children:u,k(e,Array.isArray(O)?O:[O],t,n,r,i,a,l,s,c),p.base=t.__e,p.__h.length&&l.push(p),v&&(p.__E=p.__=null),p.__e=!1}else null==a&&t.__v===n.__v?(t.__k=n.__k,t.__e=n.__e):t.__e=P(n.__e,t,n,r,i,a,l,c);(u=o.diffed)&&u(t)}catch(e){t.__v=null,o.__e(e,t,n)}return t.__e}function R(e,t){o.__c&&o.__c(t,e),e.some((function(t){try{e=t.__h,t.__h=[],e.some((function(e){e.call(t)}))}catch(e){o.__e(e,t.__v)}}))}function P(e,t,n,o,r,i,a,l){var s,c,f,d,h,m=n.props,b=t.props;if(r="svg"===t.type||r,null!=i)for(s=0;s<i.length;s++)if(null!=(c=i[s])&&((null===t.type?3===c.nodeType:c.localName===t.type)||e==c)){e=c,i[s]=null;break}if(null==e){if(null===t.type)return document.createTextNode(b);e=r?document.createElementNS("http://www.w3.org/2000/svg",t.type):document.createElement(t.type,b.is&&{is:b.is}),i=null,l=!1}if(null===t.type)m!==b&&e.data!=b&&(e.data=b);else{if(null!=i&&(i=p.slice.call(e.childNodes)),f=(m=n.props||u).dangerouslySetInnerHTML,d=b.dangerouslySetInnerHTML,!l){if(null!=i)for(m={},h=0;h<e.attributes.length;h++)m[e.attributes[h].name]=e.attributes[h].value;(d||f)&&(d&&f&&d.__html==f.__html||(e.innerHTML=d&&d.__html||""))}(function(e,t,n,o,r){var i;for(i in n)"children"===i||"key"===i||i in t||j(e,i,null,n[i],o);for(i in t)r&&"function"!=typeof t[i]||"children"===i||"key"===i||"value"===i||"checked"===i||n[i]===t[i]||j(e,i,t[i],n[i],o)})(e,b,m,r,l),d?t.__k=[]:(s=t.props.children,k(e,Array.isArray(s)?s:[s],t,n,o,"foreignObject"!==t.type&&r,i,a,u,l)),l||("value"in b&&void 0!==(s=b.value)&&s!==e.value&&j(e,"value",s,m.value,!1),"checked"in b&&void 0!==(s=b.checked)&&s!==e.checked&&j(e,"checked",s,m.checked,!1))}return e}function I(e,t,n){try{"function"==typeof e?e(t):e.current=t}catch(e){o.__e(e,n)}}function D(e,t,n){var r,i,a;if(o.unmount&&o.unmount(e),(r=e.ref)&&(r.current&&r.current!==e.__e||I(r,null,t)),n||"function"==typeof e.type||(n=null!=(i=e.__e)),e.__e=e.__d=void 0,null!=(r=e.__c)){if(r.componentWillUnmount)try{r.componentWillUnmount()}catch(e){o.__e(e,t)}r.base=r.__P=null}if(r=e.__k)for(a=0;a<r.length;a++)r[a]&&D(r[a],t,n);null!=i&&h(i)}function M(e,t,n){return this.constructor(e,n)}function T(e,t,n){var r,i,a;o.__&&o.__(e,t),i=(r=n===l)?null:n&&n.__k||t.__k,e=m(y,null,[e]),a=[],A(t,(r?t:n||t).__k=e,i||u,u,void 0!==t.ownerSVGElement,n&&!r?[n]:i?null:t.childNodes.length?p.slice.call(t.childNodes):null,a,n||u,r),R(a,e)}function z(e){return(z="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function L(e){return function(e){if(Array.isArray(e))return V(e)}(e)||function(e){if("undefined"!=typeof Symbol&&Symbol.iterator in Object(e))return Array.from(e)}(e)||function(e,t){if(!e)return;if("string"==typeof e)return V(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return V(e,t)}(e)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function V(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,o=new Array(t);n<t;n++)o[n]=e[n];return o}function F(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function U(e,t){return(U=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function N(e){var t=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(e){return!1}}();return function(){var n,o=K(e);if(t){var r=K(this).constructor;n=Reflect.construct(o,arguments,r)}else n=o.apply(this,arguments);return B(this,n)}}function B(e,t){return!t||"object"!==z(t)&&"function"!=typeof t?function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e):t}function K(e){return(K=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}o={__e:function(e,t){for(var n,o;t=t.__;)if((n=t.__c)&&!n.__)try{if(n.constructor&&null!=n.constructor.getDerivedStateFromError&&(o=!0,n.setState(n.constructor.getDerivedStateFromError(e))),null!=n.componentDidCatch&&(o=!0,n.componentDidCatch(e)),o)return _(n.__E=n)}catch(t){e=t}throw e}},x.prototype.setState=function(e,t){var n;n=this.__s!==this.state?this.__s:this.__s=d({},this.state),"function"==typeof e&&(e=e(n,this.props)),e&&d(n,e),null!=e&&this.__v&&(t&&this.__h.push(t),_(this))},x.prototype.forceUpdate=function(e){this.__v&&(this.__e=!0,e&&this.__h.push(e),_(this))},x.prototype.render=y,r=[],i="function"==typeof Promise?Promise.prototype.then.bind(Promise.resolve()):setTimeout,w.__r=0,l=u;var H=function(e){!function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&U(e,t)}(i,e);var t,n,o,r=N(i);function i(e){return function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,i),r.call(this,e)}return t=i,(n=[{key:"iconClick",value:function(e,t,n,o){this.props.ck(e,t,n,!0),o.stopPropagation()}},{key:"scrollFunc",value:function(e){if(0==e.wheelDeltaX){for(var t=this.labelRef.getElementsByClassName("xm-label-block"),n=10,o=0;o<t.length;o++)n+=t[o].getBoundingClientRect().width+5;var r=this.labelRef.getBoundingClientRect().width,i=n>r?n-r:r,a=this.labelRef.scrollLeft+e.deltaY;a<0&&(a=0),a>i&&(a=i),this.labelRef.scrollLeft=a}}},{key:"blur",value:function(){var e=this.base.querySelector(".label-search-input");e&&e.blur()}},{key:"labelDrag",value:function(e,t){for(var n=t.type,o=t.target;;){if(!o||"I"===o.tagName)return;if("DIV"===o.tagName&&"fixed"!==o.style.position)break;o=o.parentNode}if(console.log(t),"mousedown"===n){var r=o.cloneNode(!0),i=t.pageX,a=t.pageY,l=t.offsetX,s=t.offsetY;console.log(i,a,l,s),r.style.position="fixed",r.style.left=i-l+"px",r.style.top=a-s+"px",o.appendChild(r),console.log(r),r.onmousemove=function(e){r.style.left=e.pageX-l+"px",r.style.top=e.pageY-s+"px"},r.mouseup=function(){r.parentNode.removeChild(r),r.onmousemove=null,r.mouseup=null,r.mouseleave=null},r.mouseleave=function(){console.log("mouseleave")}}else if("mouseup"===n)for(var c=o.childNodes,u=0;u<c.length;u++){var p=c[u];if("DIV"===p.tagName){o.removeChild(p),p.onmousemove=null;break}}t.stopPropagation()}},{key:"componentDidMount",value:function(){this.labelRef.addEventListener&&this.labelRef.addEventListener("DOMMouseScroll",this.scrollFunc.bind(this),!1),this.labelRef.attachEvent&&this.labelRef.attachEvent("onmousewheel",this.scrollFunc.bind(this)),this.labelRef.onmousewheel=this.scrollFunc.bind(this)}},{key:"render",value:function(e){var t=this,n=e.data,o=e.prop,r=e.theme,i=e.model,a=e.sels,l=e.autoRow,s=e.tree,u=o.name,p=o.disabled,f=i.label,d=f.type,h=f[d],b=a;s.show&&s.strict&&s.simple&&(b=[],Object(c.j)(n,a,b,o));var y="",x=!0,v=b.map((function(e){return e[u]})).join(",");if("text"===d)y=b.map((function(e){return"".concat(h.left).concat(e[u]).concat(h.right)})).join(h.separator);else if("block"===d){x=!1;var g=L(b),_={backgroundColor:r.color},w=h.showCount<=0?g.length:h.showCount;y=g.splice(0,w).map((function(e){var n={width:h.showIcon?"calc(100% - 20px)":"100%"};return m("div",{class:["xm-label-block",e[p]?"disabled":""].join(" "),style:_},h.template&&Object(c.e)(h.template)?m("span",{style:n,dangerouslySetInnerHTML:{__html:h.template(e,g)}}):m("span",{style:n},e[u]),h.showIcon&&m("i",{class:"xm-iconfont xm-icon-close",onClick:t.iconClick.bind(t,e,!0,e[p])}))})),g.length&&y.push(m("div",{class:"xm-label-block",style:_},"+ ",g.length))}else if("search"==d){x=!1;var k="";b.length&&(k=b[0][u]),y=m("input",{class:"label-search-input",type:"text",placeholder:e.searchTips,style:{width:"100%",border:"none"},value:k,onInput:function(e){t.props.onReset(e,"labelSearch")},onCompositionstart:function(e){t.props.onReset(e,"labelSearch")},compositionupdate:function(e){t.props.onReset(e,"labelSearch")},compositionend:function(e){t.props.onReset(e,"labelSearch")},onClick:function(e){e.stopPropagation()}})}else y=b.length&&h&&h.template?h.template(n,b):b.map((function(e){return e[u]})).join(",");return m("div",{class:["xm-label",l?"auto-row":"single-row"].join(" ")},m("div",{class:"scroll",ref:function(e){return t.labelRef=e}},x?m("div",{class:"label-content",dangerouslySetInnerHTML:{__html:y}}):m("div",{class:"label-content",title:v},y)))}}])&&F(t.prototype,n),o&&F(t,o),i}(x);function q(e){return(q="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function Y(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,o)}return n}function Z(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?Y(Object(n),!0).forEach((function(t){Q(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):Y(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function Q(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function J(e){return function(e){if(Array.isArray(e))return W(e)}(e)||function(e){if("undefined"!=typeof Symbol&&Symbol.iterator in Object(e))return Array.from(e)}(e)||function(e,t){if(!e)return;if("string"==typeof e)return W(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return W(e,t)}(e)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function W(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,o=new Array(t);n<t;n++)o[n]=e[n];return o}function G(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function X(e,t){return(X=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function $(e){var t=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(e){return!1}}();return function(){var n,o=te(e);if(t){var r=te(this).constructor;n=Reflect.construct(o,arguments,r)}else n=o.apply(this,arguments);return ee(this,n)}}function ee(e,t){return!t||"object"!==q(t)&&"function"!=typeof t?function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e):t}function te(e){return(te=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}var ne={},oe=function(e){!function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&X(e,t)}(i,e);var t,n,o,r=$(i);function i(e){var t;return function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,i),(t=r.call(this,e)).setState({filterValue:"",remote:!0,loading:!1,pageIndex:1,totalSize:0,val:ne}),t.searchCid=0,t.inputOver=!0,t.__value="",t.tempData=[],t.size=0,t}return t=i,(n=[{key:"optionClick",value:function(e,t,n,o){this.props.ck(e,t,n),this.focus(),this.blockClick(o)}},{key:"groupClick",value:function(e,t){var n=this.props.prop,o=n.click,r=n.children,i=n.disabled,a=e[o],l=e[r].filter((function(e){return!e[i]}));"SELECT"===a?this.props.onReset(l,"append"):"CLEAR"===a?this.props.onReset(l,"delete"):"AUTO"===a?this.props.onReset(l,"auto"):Object(c.e)(a)&&a(e),this.focus(),this.blockClick(t)}},{key:"blockClick",value:function(e){e.stopPropagation()}},{key:"pagePrevClick",value:function(){arguments.length>0&&void 0!==arguments[0]||this.size;var e=this.state.pageIndex;e<=1||(this.changePageIndex(e-1),this.props.pageRemote&&this.postData(e-1,!0))}},{key:"pageNextClick",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:this.size,t=this.state.pageIndex;t>=e||(this.changePageIndex(t+1),this.props.pageRemote&&this.postData(t+1,!0))}},{key:"changePageIndex",value:function(e){this.setState({pageIndex:e})}},{key:"labelSearch",value:function(e){"input"==e.type?this.searchInput(e):this.handleComposition(e)}},{key:"searchInput",value:function(e){var t=this,n=e.target.value;n!==this.__value&&(this.searchCid&&clearTimeout(this.searchCid),this.inputOver&&(this.__value=n,this.searchCid=setTimeout((function(){t.callback=!0,t.setState({filterValue:t.__value,remote:!0,pageIndex:1})}),this.props.delay)))}},{key:"focus",value:function(){this.searchInputRef&&this.searchInputRef.focus()}},{key:"blur",value:function(){this.searchInputRef&&this.searchInputRef.blur()}},{key:"handleComposition",value:function(e){var t=e.type;"compositionstart"===t?(this.inputOver=!1,this.searchCid&&clearTimeout(this.searchCid)):"compositionend"===t&&(this.inputOver=!0,this.searchInput(e))}},{key:"postData",value:function(){var e=this,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:this.state.pageIndex,n=arguments.length>1&&void 0!==arguments[1]&&arguments[1];(this.state.remote||n)&&(this.callback=!1,this.setState({loading:!0,remote:!1}),this.blur(),this.props.remoteMethod(this.state.filterValue,(function(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:1;setTimeout((function(){e.focus(),e.callback=!0,e.setState({loading:!1,totalSize:n}),e.props.onReset(t,"data")}),10)}),this.props.show,t))}},{key:"keydown",value:function(e,t){var n=this,o=t.keyCode;if("div"===e&&(27===o||9===o?this.props.onReset(!1,"close"):37===o?this.pagePrevClick():39===o&&this.pageNextClick()),this.props.enableKeyboard){var r=this.props.prop,i=r.value,a=r.optgroup,l=r.disabled,s=this.tempData.filter((function(e){return!e[a]&&!e[l]})),c=s.length-1;if(-1===c)return;var u=s.findIndex((function(e){return e[i]===n.state.val}));if(38===o){u<=0?u=c:u>0&&(u-=1);var p=s[u][i];this.setState({val:p}),this.viewTo(p)}else if(40===o){-1===u||u===c?u=0:u<c&&(u+=1);var f=s[u][i];this.setState({val:f}),this.viewTo(f)}else if(o===this.props.selectedKeyCode&&this.state.val!=ne){var d=s[u];this.optionClick(d,-1!=this.props.sels.findIndex((function(e){return e[i]===n.state.val})),d[l],t)}}}},{key:"viewTo",value:function(e){if(null!=this.base){var t=this.base.querySelector('.xm-option[value="'.concat(e,'"]'));t&&t.scrollIntoView(!1)}}},{key:"componentWillReceiveProps",value:function(e){var t=this;this.props.show!=e.show&&(e.show?setTimeout((function(){"search"===e.model.label.type||(e.filterable?t.focus():t.base.focus())}),0):(this.setState({filterValue:"",val:ne}),this.__value="",this.searchInputRef&&(this.searchInputRef.value=""),this.props.onReset("","labelSearchBlur"))),this.props.__update!=e.__update&&this.setState({remote:!0})}},{key:"render",value:function(e){var t,n=this,o=e.data,r=e.flatData,i=e.prop,a=e.template,l=e.theme,s=e.radio,u=e.sels,p=e.empty,f=e.filterable,d=e.filterMethod,h=e.remoteSearch,b=(e.remoteMethod,e.delay,e.searchTips),y=e.create,x=e.pageRemote,v=e.max,g=e.enableKeyboard,_=e.enableHoverFirst,w=i.name,k=i.value,O=i.disabled,C=i.children,j=i.optgroup,S=Object(c.b)([],r);if((x||f&&h)&&this.postData(),f&&!h&&!x){S=S.filter((function(e,t){return e[j]?(delete e.__del,!0):d(n.state.filterValue,e,t,i)}));for(var E=0;E<S.length-1;E++){var A=S[E],R=S[E+1];A[j]&&R[j]&&(S[E].__del=!0)}S.length&&S[S.length-1][j]&&(S[S.length-1].__del=!0),S=S.filter((function(e){return!e.__del})),t=this.state.filterValue&&Object(c.e)(y)}var P=m("div",{class:f&&"search"!=e.model.label.type?"xm-search":"xm-search dis"},m("i",{class:"xm-iconfont xm-icon-sousuo"}),m("input",{class:"xm-input xm-search-input",placeholder:b})),I={};S.filter((function(e){return e[j]})).forEach((function(e,t){I[t]=e,e[C].forEach((function(e){return e.__group__index=t}))})),S=S.filter((function(e){return!e[j]}));var D="";if(e.paging){var M=x?this.state.totalSize:Math.floor((S.length-1)/e.pageSize)+1;M<=0&&(M=1);var T=this.state.pageIndex;if(T>M&&(T=M),M>0&&T<=0&&(T=1),!x){var z=(T-1)*e.pageSize,L=z+e.pageSize;S=S.slice(z,L)}var V={cursor:"no-drop",color:"#d2d2d2"},F={},U={};T<=1&&(F=V),T==M&&(U=V),this.state.pageIndex!==T&&this.changePageIndex(T),this.size=M,D=m("div",{class:"xm-paging"},m("span",{style:F,onClick:this.pagePrevClick.bind(this,M)},e.languageProp.paging.prev),m("span",null,this.state.pageIndex," / ",M),m("span",{style:U,onClick:this.pageNextClick.bind(this,M)},e.languageProp.paging.next))}else e.showCount>0&&(S=S.slice(0,e.showCount));var N,B,K=[],H={__tmp:!0};H[j]=!0,S.forEach((function(e){var t=I[e.__group__index];delete e.__group__index,N&&!t&&(t=H),t!=N&&(N=t,t&&K.push(N)),K.push(e)})),S=K,t&&null!=(t=y(this.state.filterValue,Object(c.b)([],S)))&&(B=S).splice.apply(B,[0,0].concat(J((Object(c.d)(t)?t:[t]).map((function(e){return Z(Z({},e),{},{__node:{}})})))));var q=Object(c.b)([],S);this.tempData=q;var Y=m("div",{class:"xm-toolbar"},e.toolbar.list.map((function(t){var o,r=e.languageProp.toolbar[t];o="ALL"===t?{icon:"xm-iconfont xm-icon-quanxuan",name:r,method:function(e){var t=i.optgroup,o=i.disabled,r=e.filter((function(e){return!e[t]})).filter((function(e){return!e[o]})),a=u.filter((function(e){return e[i.disabled]})),l=[];l=s?a.length?a:r.slice(0,1):v>0?a.length>=v?a:Object(c.f)(r.slice(0,v-a.length),a,i):Object(c.f)(r,u,i),n.props.onReset(l,"sels")}}:"CLEAR"===t?{icon:"xm-iconfont xm-icon-qingkong",name:r,method:function(e){n.props.onReset(u.filter((function(e){return e[i.disabled]})),"sels")}}:"REVERSE"===t?{icon:"xm-iconfont xm-icon-fanxuan",name:r,method:function(e){var t=i.optgroup,o=i.disabled,r=e.filter((function(e){return!e[t]})).filter((function(e){return!e[o]})),a=[];u.forEach((function(e){var t=r.findIndex((function(t){return t[k]===e[k]}));-1==t?a.push(e):r.splice(t,1)}));var l=a.filter((function(e){return e[i.disabled]})),p=[];p=s?l.length?l:r.slice(0,1):v>0?l.length>=v?l:Object(c.f)(r.slice(0,v-l.length),l,i):Object(c.f)(r,a,i),n.props.onReset(p,"sels")}}:t;var a=function(e){"mouseenter"===e.type&&(e.target.style.color=l.color),"mouseleave"===e.type&&(e.target.style.color="")};return m("div",{class:"toolbar-tag",style:{},onClick:function(){Object(c.e)(o.method)&&o.method(q),n.focus()},onMouseEnter:a,onMouseLeave:a},e.toolbar.showIcon&&m("i",{class:o.icon}),m("span",null,o.name))})).filter((function(e){return e}))),Q="hidden"!=e.model.icon;return(S=S.map((function(t){return t[j]?t.__tmp?m("div",{class:"item--divided"}):m("div",{class:"xm-group"},m("div",{class:"xm-group-item",onClick:n.groupClick.bind(n,t)},t[w])):function(t){var r=!!u.find((function(e){return e[k]==t[k]})),i=r?{color:l.color,border:"none"}:{borderColor:l.color},c={};g&&t[k]===n.state.val&&(c.backgroundColor=l.hover),!Q&&r&&(c.backgroundColor=l.color,t[O]&&(c.backgroundColor="#C2C2C2"));var p,f,d=["xm-option",t[O]?" disabled":"",r?" selected":"",Q?"show-icon":"hide-icon"].join(" "),h=["xm-option-icon",(p=e.iconfont.select,f=e.iconfont.unselect,(p?!r&&f?f+" xm-custom-icon":p:0)||"xm-iconfont "+(s?"xm-icon-danx":"xm-icon-duox"))].join(" "),b=function(e){"mouseenter"===e.type?t[O]||(g?n.setState({val:t[k]}):e.target.style.backgroundColor=l.hover):"mouseleave"===e.type&&(t[O]||g||(e.target.style.backgroundColor=""))};return m("div",{class:d,style:c,value:t[k],onClick:n.optionClick.bind(n,t,r,t[O]),onMouseEnter:b,onMouseLeave:b},Q&&m("i",{class:h,style:i}),m("div",{class:"xm-option-content",dangerouslySetInnerHTML:{__html:a({data:o,item:t,arr:u,name:t[w],value:t[k]})}}))}(t)}))).length?_&&this.state.val==ne&&this.keydown("div",{keyCode:40}):(!e.pageEmptyShow&&(D=""),S.push(m("div",{class:"xm-select-empty"},p))),m("div",{onClick:this.blockClick,tabindex:"1",style:"outline: none;"},m("div",null,e.toolbar.show&&Y,P,m("div",{class:"scroll-body",style:{maxHeight:e.height}},S),e.paging&&D),this.state.loading&&m("div",{class:"loading"},m("span",{class:"loader"})))}},{key:"componentDidMount",value:function(){var e=this.base.querySelector(".xm-search-input");e&&(e.addEventListener("compositionstart",this.handleComposition.bind(this)),e.addEventListener("compositionupdate",this.handleComposition.bind(this)),e.addEventListener("compositionend",this.handleComposition.bind(this)),e.addEventListener("input",this.searchInput.bind(this)),this.searchInputRef=e),this.base.addEventListener("keydown",this.keydown.bind(this,"div"))}},{key:"componentDidUpdate",value:function(){if(this.callback){this.callback=!1;var e=this.props.filterDone;Object(c.e)(e)&&e(this.state.filterValue,this.tempData||[])}}}])&&G(t.prototype,n),o&&G(t,o),i}(x);function re(e){return(re="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function ie(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function ae(e,t){return(ae=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function le(e){var t=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(e){return!1}}();return function(){var n,o=ce(e);if(t){var r=ce(this).constructor;n=Reflect.construct(o,arguments,r)}else n=o.apply(this,arguments);return se(this,n)}}function se(e,t){return!t||"object"!==re(t)&&"function"!=typeof t?function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e):t}function ce(e){return(ce=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}var ue=function(e){!function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&ae(e,t)}(i,e);var t,n,o,r=le(i);function i(e){return function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,i),r.call(this,e)}return t=i,(n=[{key:"blockClick",value:function(e){e.stopPropagation()}},{key:"shouldComponentUpdate",value:function(){return!this.prepare}},{key:"render",value:function(e){return this.prepare=!0,m("div",{onClick:this.blockClick,class:"xm-body-custom"},m("div",{class:"scroll-body",style:{maxHeight:e.height}},m("div",{style:"margin: 5px 0",dangerouslySetInnerHTML:{__html:e.content}})))}}])&&ie(t.prototype,n),o&&ie(t,o),i}(x);function pe(e){return(pe="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function fe(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function de(e,t){return(de=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function he(e){var t=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(e){return!1}}();return function(){var n,o=be(e);if(t){var r=be(this).constructor;n=Reflect.construct(o,arguments,r)}else n=o.apply(this,arguments);return me(this,n)}}function me(e,t){return!t||"object"!==pe(t)&&"function"!=typeof t?function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e):t}function be(e){return(be=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}var ye={},xe=function(e){!function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&de(e,t)}(i,e);var t,n,o,r=he(i);function i(e){var t;return function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,i),(t=r.call(this,e)).state={expandedKeys:[],filterValue:"",remote:!0,loading:!1,val:ye},t.searchCid=0,t.inputOver=!0,t.__value="",t.tempData=[],t.__skipAutoExpand="",t}return t=i,(n=[{key:"init",value:function(e){var t=e.tree,n=e.dataObj,o=e.flatData,r=e.prop,i=r.value,a=r.optgroup,l=[];!0===t.expandedKeys?l=o.filter((function(e){return!0===e[a]})).map((function(e){return e[i]})):!1===t.expandedKeys||t.expandedKeys.forEach((function(e){l.push(e);for(var t=n[e],o=function(){var e=t[i];-1===l.findIndex((function(t){return t===e}))&&l.push(e),t=t.__node.parent};t;)o()})),this.setState({expandedKeys:l})}},{key:"blockClick",value:function(e){e.stopPropagation()}},{key:"optionClick",value:function(e,t,n,o,r){var i=this;if("line"===o){if(!0===e.__node.loading)return;var a=this.props,l=a.tree,s=a.prop,u=a.sels,p=l.clickExpand,f=l.clickCheck,d=r.target&&Object(c.e)(r.target.getAttribute)&&"expand"===r.target.getAttribute("type");if(p||d){if(!l.lazy&&!e[s.optgroup])return void this.props.ck(e,t,n);var h=e[this.props.prop.value],m=this.state.expandedKeys,b=m.findIndex((function(e){return e===h}));-1===b?m.push(h):m.splice(b,1),this.setState({expandedKeys:m});var y=e[s.children];l.lazy&&y&&0===y.length&&!1!==e.__node.loading&&(e.__node.loading=!0,l.load(e,(function(t){e.__node.loading=!1,e[s.children]=i.handlerData(t,s.children),e[s.selected]=-1!=u.findIndex((function(t){return t[s.value]===e[s.value]})),i.props.onReset(u,"treeData")})))}else f&&(o="checkbox")}"checkbox"===o&&this.props.ck(e,t,n),this.blockClick(r)}},{key:"handlerData",value:function(e,t){var n=this;return e.map((function(e){return e.__node={},e[t]&&(e[t]=n.handlerData(e[t],t)),e}))}},{key:"searchInput",value:function(e){var t=this,n=e.target.value;n!==this.__value&&(clearTimeout(this.searchCid),this.inputOver&&(this.__value=n,this.searchCid=setTimeout((function(){t.callback=!0,t.setState({filterValue:t.__value,remote:!0})}),this.props.delay)))}},{key:"focus",value:function(){this.searchInputRef&&this.searchInputRef.focus()}},{key:"blur",value:function(){this.searchInputRef&&this.searchInputRef.blur()}},{key:"handleComposition",value:function(e){var t=e.type;"compositionstart"===t?(this.inputOver=!1,clearTimeout(this.searchCid)):"compositionend"===t&&(this.inputOver=!0,this.searchInput(e))}},{key:"filterData",value:function(e,t,n){var o=this,r=this.props,i=r.prop,a=r.filterMethod,l=r.tree,s=i.children,c=i.optgroup,u=(i.name,i.value);return e.forEach((function(e,r){var p,f=!!t&&!a(t,e,r,i);if(l.strict?p=!1:f=p=!1!==n&&f,e[c]){var d=o.filterData(e[s],t,p),h=!!t&&0===d.filter((function(e){return!e.__node.hidn})).length;if(!(f=(l.strict||p)&&h)&&o.__skipAutoExpand!=t){var m=o.state.expandedKeys;t&&-1===m.findIndex((function(t){return t===e[u]}))&&(m.push(e[u]),o.setState({expandedKeys:m})),o.__skipAutoExpand=t}}e.__node.hidn=f})),e}},{key:"postData",value:function(){var e=this;this.state.remote&&(this.callback=!1,this.setState({loading:!0,remote:!1}),this.blur(),this.props.remoteMethod(this.state.filterValue,(function(t,n){e.focus(),e.callback=!0,e.setState({loading:!1,totalSize:n}),e.props.onReset(t,"data")}),this.props.show,1))}},{key:"componentWillReceiveProps",value:function(e){var t=this;this.props.show!=e.show&&(e.show?setTimeout((function(){return t.focus()}),0):(this.setState({filterValue:"",val:ye}),this.__value="",this.__skipAutoExpand="",this.searchInputRef&&(this.searchInputRef.value="")))}},{key:"componentWillMount",value:function(){this.init(this.props)}},{key:"render",value:function(e,t){var n=this,o=(t.expandedKeys,e.prop),r=e.empty,i=e.sels,a=e.theme,l=e.radio,s=e.template,u=e.data,p=e.tree,f=e.filterable,d=e.remoteSearch,h=e.searchTips,b=e.iconfont,y=e.enableKeyboard,x=o.name,v=o.value,g=o.disabled,_=o.children,w=o.optgroup,k="hidden"!=e.model.icon,O=function(e,t,o){var r=!!i.find((function(t){return t[v]==e[v]})),c=e[g],f=!0===e.__node.half;p.strict&&(r=r||f||e.__node.selected,c=c||e.__node.disabled);var d=r?{color:a.color,border:"none"}:{borderColor:a.color},h={paddingLeft:t+"px"};y&&e[v]===n.state.val&&(h.backgroundColor=a.hover),!k&&r&&(h.backgroundColor=a.color,c&&(h.backgroundColor="#C2C2C2"));var w=["xm-option",c?" disabled":"",r?" selected":"",k?"show-icon":"hide-icon"].join(" "),O=0!==o&&"hidden"===b.parent?"xm-option-icon-hidden":["xm-option-icon",(f?b.half?b.half+" xm-custom-icon":0:0!==o&&b.parent?b.parent+" xm-custom-icon":r?b.select?b.select:0:b.unselect?b.unselect+" xm-custom-icon":0)||"xm-iconfont "+(l?"xm-icon-danx":p.strict&&f?"xm-icon-banxuan":"xm-icon-duox")].join(" "),C=["xm-tree-icon",o?"expand":"",e[_]&&(e[_].length>0||p.lazy&&!1!==e.__node.loading)?"xm-visible":"xm-hidden"].join(" "),j=[];p.showFolderIcon&&(j.push(m("i",{class:C,type:"expand"})),p.showLine&&(o&&j.push(m("i",{class:"left-line",style:{left:t-p.indent+3+"px"}})),j.push(m("i",{class:"top-line",style:{left:t-p.indent+3+"px",width:p.indent+(0===o?10:-2)+"px"}}))));var S=function(t){"mouseenter"===t.type?e[g]||(y?n.setState({val:e[v]}):t.target.style.backgroundColor=a.hover):"mouseleave"===t.type&&(e[g]||y||(t.target.style.backgroundColor=""))};return m("div",{class:w,style:h,value:e[v],onClick:n.optionClick.bind(n,e,r,e[g],"line"),onMouseEnter:S,onMouseLeave:S},j,e.__node.loading&&m("span",{class:"loader"}),k&&m("i",{class:O,style:d,onClick:n.optionClick.bind(n,e,r,e[g],"checkbox")}),m("div",{class:"xm-option-content",dangerouslySetInnerHTML:{__html:s({data:u,item:e,arr:i,name:e[x],value:e[v]})}}))};f&&(d?this.postData():this.filterData(u,this.state.filterValue));var C=Object(c.b)([],u),j=Object(c.b)([],i);this.tempData=C;var S=u.map((function(e){return function e(t,o){if(!t.__node.hidn){var r=t[_];if(o+=p.indent,r){var i=-1!==n.state.expandedKeys.findIndex((function(e){return t[v]===e}));return 0===r.length&&(i=!1),m("div",{class:"xm-tree"},p.showFolderIcon&&p.showLine&&i&&r.length>0&&m("i",{class:"left-line left-line-group",style:{left:o+3+"px"}}),O(t,o,0===r.length&&(!p.lazy||p.lazy&&!1===t.__node.loading)?0:i),i&&m("div",{class:"xm-tree-box"},r.map((function(t){return e(t,o)}))))}return O(t,o,0)}}(e,10-p.indent)})).filter((function(e){return e}));function E(e,t){t.forEach((function(t){t[w]?(p.strict||"hidden"===b.parent||e.push(t),E(e,t[_])):e.push(t)}))}var A=m("div",{class:"xm-toolbar"},e.toolbar.list.map((function(t){var r,s=e.languageProp.toolbar[t];r="ALL"===t?{icon:"xm-iconfont xm-icon-quanxuan",name:s,method:function(e){var t=[];E(t,e),t=t.filter((function(e){return!e[g]&&!e.__node.hidn})),n.props.onReset(l?t.slice(0,1):Object(c.f)(t,i,o),"treeData")}}:"CLEAR"===t?{icon:"xm-iconfont xm-icon-qingkong",name:s,method:function(e){n.props.onReset(i.filter((function(e){return e[o.disabled]})),"treeData")}}:"REVERSE"===t?{icon:"xm-iconfont xm-icon-fanxuan",name:s,method:function(e){var t=[];E(t,e),t=t.filter((function(e){return!e[g]&&!e.__node.hidn}));var r=[];i.forEach((function(e){var n=t.findIndex((function(t){return t[v]===e[v]}));-1==n?r.push(e):t.splice(n,1)})),n.props.onReset(l?r.slice(0,1):Object(c.f)(t,r,o),"treeData")}}:t;var u=function(e){"mouseenter"===e.type&&(e.target.style.color=a.color),"mouseleave"===e.type&&(e.target.style.color="")};return m("div",{class:"toolbar-tag",onClick:function(){Object(c.e)(r.method)&&r.method(C,j)},onMouseEnter:u,onMouseLeave:u},e.toolbar.showIcon&&m("i",{class:r.icon}),m("span",null,r.name))})).filter((function(e){return e}))),R=m("div",{class:f?"xm-search":"xm-search dis"},m("i",{class:"xm-iconfont xm-icon-sousuo"}),m("input",{class:"xm-input xm-search-input",placeholder:h}));return S.length||S.push(m("div",{class:"xm-select-empty"},r)),m("div",{onClick:this.blockClick,class:"xm-body-tree"},e.toolbar.show&&A,R,m("div",{class:"scroll-body",style:{maxHeight:e.height}},S),this.state.loading&&m("div",{class:"loading"},m("span",{class:"loader"})))}},{key:"componentDidMount",value:function(){var e=this.base.querySelector(".xm-search-input");e&&(e.addEventListener("compositionstart",this.handleComposition.bind(this)),e.addEventListener("compositionupdate",this.handleComposition.bind(this)),e.addEventListener("compositionend",this.handleComposition.bind(this)),e.addEventListener("input",this.searchInput.bind(this)),this.searchInputRef=e)}},{key:"componentDidUpdate",value:function(){if(this.callback){this.callback=!1;var e=this.props.filterDone;Object(c.e)(e)&&e(this.state.filterValue,this.tempData||[])}}}])&&fe(t.prototype,n),o&&fe(t,o),i}(x);function ve(e){return(ve="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function ge(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function _e(e,t){return(_e=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function we(e){var t=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(e){return!1}}();return function(){var n,o=Oe(e);if(t){var r=Oe(this).constructor;n=Reflect.construct(o,arguments,r)}else n=o.apply(this,arguments);return ke(this,n)}}function ke(e,t){return!t||"object"!==ve(t)&&"function"!=typeof t?function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e):t}function Oe(e){return(Oe=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}var Ce=function(e){!function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&_e(e,t)}(i,e);var t,n,o,r=we(i);function i(e){var t;return function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,i),(t=r.call(this,e)).state={expand:[]},t}return t=i,(n=[{key:"blockClick",value:function(e){e.stopPropagation()}},{key:"optionClick",value:function(e,t,n,o,r,i){if("line"===o){if(!e.optgroup&&n)return;if(!0===e.__node.loading)return;var a=this.props,l=a.cascader,s=a.prop;if(a.sels,!l.lazy&&!e[s.optgroup])return void this.props.ck(e,t,n);var c=this.state.expand.slice(0,r+1);c[r]=e[this.props.prop.value],this.setState({expand:c})}else"checkbox"===o&&this.props.ck(e,t,n);this.blockClick(i)}},{key:"componentWillReceiveProps",value:function(e){}},{key:"componentWillMount",value:function(){}},{key:"render",value:function(e,t){var n=this,o=e.prop,r=e.empty,i=e.sels,a=e.theme,l=e.radio,s=e.template,c=e.data,u=e.cascader,p=o.name,f=o.value,d=o.disabled,h=o.children,b=o.optgroup,y="hidden"!=e.model.icon,x=[],v=function t(o,r,v){var g=o[h];r=r+u.indent+6;var _=g&&n.state.expand[v]===o[f];return _&&x.push(m("div",{class:"xm-cascader-box",index:v%4,style:{left:r+"px",width:u.indent+"px"}},m("div",{class:"xm-cascader-scroll scroll-body"},g.map((function(e){return t(e,r,v+1)}))))),function(t,o,r,x){var v=!!i.find((function(e){return e[f]==t[f]})),g=t[d],_=!0===t.__node.half;u.strict&&(v=v||_||t.__node.selected,g=g||t.__node.disabled);var w=v?{color:a.color,border:"none"}:{borderColor:a.color},k=t[h]&&t[h].length>0,O={backgroundColor:"transparent"},C=["xm-option",g?" disabled":"",v?" selected":"",y?"show-icon":"hide-icon"].join(" "),j=k&&"hidden"===e.iconfont.parent?"xm-option-icon-hidden":["xm-option-icon",(_?e.iconfont.half?e.iconfont.half+" xm-custom-icon":0:k&&e.iconfont.parent?e.iconfont.parent+" xm-custom-icon":v?e.iconfont.select?e.iconfont.select:0:e.iconfont.unselect?e.iconfont.unselect+" xm-custom-icon":0)||"xm-iconfont "+(l?"xm-icon-danx":u.strict&&_?"xm-icon-banxuan":"xm-icon-duox")].join(" ");t[f]===n.state.val&&(O.backgroundColor=a.hover),!y&&v&&(O.backgroundColor=a.color,g&&(O.backgroundColor="#C2C2C2"));var S={},E={};x&&(S.color=a.color,S.fontWeight=700,E.color=a.color);var A=function(e){"mouseenter"===e.type?t[d]||n.setState({val:t[f]}):"mouseleave"===e.type&&n.setState({val:""})};return m("div",{class:C,style:O,value:t[f],onClick:n.optionClick.bind(n,t,v,g,"line",r),onMouseEnter:A,onMouseLeave:A},y&&m("i",{class:j,style:w,onClick:n.optionClick.bind(n,t,v,g,"checkbox",r)}),m("div",{class:"xm-option-content",style:S,dangerouslySetInnerHTML:{__html:s({data:c,item:t,arr:i,name:t[p],value:t[f]})}}),t[b]&&m("div",{class:"xm-right-arrow",style:E}))}(o,0,v,_)},g=c.map((function(e){return v(e,2,0)})).concat(x).filter((function(e){return e}));return g.length||g.push(m("div",{class:"xm-select-empty"},r)),m("div",{onClick:this.blockClick,class:"xm-body-cascader scroll-body",style:{width:u.indent+"px",maxHeight:e.height}},g)}},{key:"componentDidMount",value:function(){this.props.onReset("cascader","class")}}])&&ge(t.prototype,n),o&&ge(t,o),i}(x);function je(){return(je=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e}).apply(this,arguments)}function Se(e){return function(e){if(Array.isArray(e))return Ee(e)}(e)||function(e){if("undefined"!=typeof Symbol&&Symbol.iterator in Object(e))return Array.from(e)}(e)||function(e,t){if(!e)return;if("string"==typeof e)return Ee(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return Ee(e,t)}(e)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function Ee(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,o=new Array(t);n<t;n++)o[n]=e[n];return o}function Ae(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,o)}return n}function Re(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?Ae(Object(n),!0).forEach((function(t){Pe(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):Ae(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function Pe(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function Ie(e){return(Ie="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function De(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function Me(e,t){return(Me=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function Te(e){var t=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(e){return!1}}();return function(){var n,o=Ve(e);if(t){var r=Ve(this).constructor;n=Reflect.construct(o,arguments,r)}else n=o.apply(this,arguments);return ze(this,n)}}function ze(e,t){return!t||"object"!==Ie(t)&&"function"!=typeof t?Le(e):t}function Le(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}function Ve(e){return(Ve=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}var Fe=function(e){!function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&Me(e,t)}(i,e);var t,n,o,r=Te(i);function i(e){var t;return function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,i),t=r.call(this,e),et[e.el]=Le(t),t.state=t.initState(),t.bodyView=null,t}return t=i,(n=[{key:"initState",value:function(){return{data:[],dataObj:{},flatData:[],sels:[],show:!1,tmpColor:"",bodyClass:"",time:0}}},{key:"init",value:function(e,t){var n,o=e.data,r=e.prop,i=e.initValue,a=e.radio,l=e.tree,s=e.cascader;if(t){var c={},u=[];this.load(o,c,u,null,0,i?i.map((function(e){return"object"===Ie(e)?e[r.value]:e})):null),n=this.exchangeValue(i||Object.keys(c).filter((function(e){return!0===c[e][r.selected]})),c),a&&n.length>1&&(n=n.slice(0,1),(l.show&&l.strict||s.show&&s.strict)&&this.clearAndReset(o,n,!1)),this.setState({sels:n,dataObj:c,flatData:u})}return this.setState({data:o}),n}},{key:"upDate",value:function(e,t){var n=this.state.dataObj,o=this.props,r=o.prop,i=o.tree,a=o.cascader,l=r.value,s=r.disabled,u=r.children;e.map((function(e){return n["object"===Ie(e)?e[l]:e]})).filter((function(e){return e})).forEach((function(e){if(e[s]=!t,i.show&&i.strict||a.show&&a.strict){if(t)for(var n=e;n;)n[s]=!1,n=n.__node.parent;!function e(n){n[s]=!t;var o=n[u];o&&Object(c.d)(o)&&o.forEach((function(t){return e(t)}))}(e)}})),this.setState({dataObj:n})}},{key:"exchangeValue",value:function(e){var t=this,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:this.state.dataObj,o=this.props,r=o.prop,i=o.tree,a=o.cascader,l=(o.data,r.children),s=r.value,u=e.map((function(e){return"object"===Ie(e)?Re(Re({},e),{},{__node:{}}):n[e]})).filter((function(e){return e})),p=Se(u);if(i.show&&i.strict||a.show&&a.strict){var f=function e(t,n){var o=n[l];o&&Object(c.d)(o)&&o.forEach((function(n){-1===u.findIndex((function(e){return e[s]===n[s]}))&&t.push(n),e(t,n)}))},d={};d[l]=u,f(p,d),p=p.filter((function(e){return!0!==e[t.props.prop.optgroup]}))}return p}},{key:"value",value:function(e,t,n,o){var r=!(arguments.length>4&&void 0!==arguments[4])||arguments[4];!1!==t&&!0!==t&&(t=this.state.show);var i=this.props,a=i.prop,l=i.tree,s=i.cascader,c=this.exchangeValue(e);if(!this.checkMax(c,c,!0)){if(l.show&&l.strict||s.show&&s.strict){var u=this.state.data;this.clearAndReset(u,c,!1),c=this.init({data:u,prop:a},!0)}this.resetSelectValue(c,o||c,r,n),this.setState({show:t})}}},{key:"clearAndReset",value:function(e,t,n){var o=this,r=this.props.prop,i=r.selected,a=r.disabled,l=r.children,s=r.value;e.forEach((function(e){e[i]=-1!=t.findIndex((function(t){return t[s]===e[s]}))||n;var r=e[l];if(r&&Object(c.d)(r)&&r.length>0){o.clearAndReset(r,t,e[i]);var u=r.length,p=r.filter((function(e){return!0===e[i]||!0===e.__node.selected})).length;e.__node.selected=p===u,e.__node.half=p>0&&p<u||r.filter((function(e){return!0===e.__node.half})).length>0,e.__node.disabled=r.filter((function(e){return!0===e[a]||!0===e.__node.disabled})).length===u}}))}},{key:"load",value:function(e,t,n,o){var r=this,i=arguments.length>4&&void 0!==arguments[4]?arguments[4]:0,a=arguments.length>5?arguments[5]:void 0,l=this.props,s=l.prop,u=l.tree,p=l.cascader,f=s.children,d=s.optgroup,h=s.value,m=s.selected,b=s.disabled;e.forEach((function(e){e.__node={parent:o,level:i,loading:e.__node&&e.__node.loading},a&&(delete e[m],a.find((function(t){return t===e[h]}))&&(e[m]=!0)),t[e[h]]=e,n.push(e);var l=e[f];if(l&&Object(c.d)(l)){var s=l.length;if(s>0){r.load(l,t,n,e,i+1,a),e[d]=!0,(u.show&&u.strict||p.show&&p.strict)&&(!0===e[m]&&(delete e[m],l.forEach((function(e){return e[m]=!0}))),!0===e[b]&&(delete e[b],l.forEach((function(e){return e[b]=!0}))));var y=l.filter((function(e){return!0===e[m]||!0===e.__node.selected})).length;e.__node.selected=y===s,e.__node.half=y>0&&y<s||l.filter((function(e){return!0===e.__node.half})).length>0,e.__node.disabled=l.filter((function(e){return!0===e[b]||!0===e.__node.disabled})).length===s}}}))}},{key:"resetSelectValue",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:[],n=arguments.length>2?arguments[2]:void 0,o=!(arguments.length>3&&void 0!==arguments[3])||arguments[3],r=this.props.on;if(Object(c.e)(r)&&this.prepare&&o){var i=r({arr:e,change:t,isAdd:n});if(Object(c.d)(i))return this.value(i,null,!1)}this.setState({sels:e})}},{key:"updateBorderColor",value:function(e){this.setState({tmpColor:e})}},{key:"treeHandler",value:function(e,t,n,o,r){var i=this,a=this.props.prop,l=a.value,s=(a.selected,a.disabled),c=a.children,u=a.optgroup,p=t[c];if(p.filter((function(e){return!(e[s]||e.__node.disabled)})).forEach((function(t){if(t[u])i.treeHandler(e,t,n,o,r);else{var a=e.findIndex((function(e){return e[l]==t[l]}));"del"===o?-1!=a&&(e.splice(a,1),n.push(t)):"half"!==o&&"add"!==o||-1==a&&(e.push(t),n.push(t))}})),r){var f=p.length,d=p.filter((function(t){return-1!==e.findIndex((function(e){return e[l]===t[l]}))||!0===t.__node.selected})).length;t.__node.selected=d===f,t.__node.half=d>0&&d<f}}},{key:"checkMax",value:function(e,t,n){var o=this.props,r=o.max,i=o.maxMethod,a=o.theme,l=Object(c.i)(r),s=(n?t.length:(Object(c.d)(e)?e.length:1)+t.length)>l;if(l>0&&s)return this.updateBorderColor(a.maxColor),i&&Object(c.e)(i)&&i(t,e),!0}},{key:"itemClick",value:function(e,t,n,o){var r=this.props,i=(r.theme,r.prop),a=r.radio,l=r.repeat,s=r.clickClose,c=(r.max,r.maxMethod,r.tree),u=r.cascader,p=r.data,f=Se(this.state.sels),d=i.value,h=(i.selected,i.disabled,i.children),m=i.optgroup;if(!n){if(e[m]&&(c.show&&c.strict||u.show&&u.strict)){e[h];var b,y=[],x=!0;if(e.__node.selected?(b="del",x=!1):e.__node.half?(b="half",this.treeHandler(f,e,y,b),0===y.length&&(b="del",x=!1)):b="add","half"!=b&&this.treeHandler(f,e,y,b),this.checkMax(y,f))return;f=Se(this.state.sels),y=[],this.treeHandler(f,e,y,b,!0),this.resetSelectValue(f,y,x),this.setState({data:this.state.data})}else if(!t||l&&!o){if(this.checkMax(e,f))return;f=a?[e]:[].concat(Se(f),[e]),this.clearAndReset(p,f,t),this.resetSelectValue(f,[e],!t)}else{var v=f.findIndex((function(t){return t[d]==e[d]}));-1!=v&&(f.splice(v,1),this.resetSelectValue(f,[e],!t))}var g=e.__node.parent;if(g){for(;g;){var _=g[h],w=_.length,k=_.filter((function(e){return-1!==f.findIndex((function(t){return t[d]===e[d]}))||!0===e.__node.selected})).length;g.__node.selected=k===w,g.__node.half=k>0&&k<w||_.filter((function(e){return!0===e.__node.half})).length>0,g=g.__node.parent}this.setState({data:this.state.data})}s&&!o&&this.onClick()}}},{key:"onClick",value:function(e){var t=this;if("relative"!==this.props.model.type)if(this.props.disabled)!1!==this.state.show&&this.setState({show:!1});else{var n=!this.state.show;if(n){if(this.props.show&&0==this.props.show())return;Object.keys(Xe).filter((function(e){return e!=t.props.el})).forEach((function(e){return Xe[e].closed()}))}else{if(this.props.hide&&0==this.props.hide())return;this.bodyView.scroll&&this.bodyView.scroll(0,0)}this.setState({show:n}),e&&e.stopPropagation()}}},{key:"onReset",value:function(e,t){var n=this;if("data"===t){var o=e.filter((function(e){return!0===e[n.props.prop.selected]}));this.resetSelectValue(Object(c.f)(o,this.state.sels,this.props.prop),o,!0);var r=[];this.load(e,{},r),this.setState({data:e,flatData:r})}else"sels"===t?this.resetSelectValue(e,e,!0):"append"===t?this.append(e):"delete"===t?this.del(e):"auto"===t?this.auto(e):"treeData"===t?this.value(e,null,!0,!1,!1):"close"===t?this.onClick():"class"===t?this.setState({bodyClass:e}):"labelSearchBlur"===t?this.labelRef.blur(e):"labelSearch"===t&&this.generalRef.labelSearch(e)}},{key:"append",value:function(e){var t=this.exchangeValue(e);this.value(Object(c.f)(t,this.state.sels,this.props.prop),this.props.show,!0,t)}},{key:"del",value:function(e){var t=this.props.prop.value,n=this.state.sels,o=this.exchangeValue(e);o.forEach((function(e){var o=n.findIndex((function(n){return n[t]===e[t]}));-1!=o&&n.splice(o,1)})),this.value(n,this.props.show,!0,o,!1)}},{key:"auto",value:function(e){var t=this,n=this.props.prop.value;e.filter((function(e){return-1!=t.state.sels.findIndex((function(t){return t[n]===e[n]}))})).length==e.length?this.del(e):this.append(e)}},{key:"changeExpandedKeys",value:function(e){var t=this.props,n=t.tree,o=t.prop,r=this.state,i=r.dataObj,a=r.flatData;n.show&&this.treeRef.init({dataObj:i,flatData:a,prop:o,tree:{expandedKeys:e}})}},{key:"calcPosition",value:function(){if(this.state.show&&"fixed"===this.props.model.type){var e=this.base.getBoundingClientRect();return Date.now()-this.state.time>10&&this.setState({time:Date.now()}),{position:"fixed",left:e.x,top:e.y+e.height+4,width:e.width}}return{}}},{key:"componentWillReceiveProps",value:function(e){this.init(e,e.updateData)}},{key:"componentWillMount",value:function(){this.init(this.props,!0)}},{key:"render",value:function(e,t){var n=this,o=e.theme,r=e.prop,i=(e.radio,e.repeat,e.clickClose,e.on,e.max,e.maxMethod,e.content),a=e.disabled,l=e.tree,s=e.submitConversion,u={borderColor:o.color},p=t.data,f=t.dataObj,d=t.flatData,h=t.sels,b=t.show,y=t.tmpColor,x=t.bodyClass;a&&(b=!1);var v={style:Re(Re({},e.style),b?u:{}),onClick:this.onClick.bind(this),ua:Object(c.a)(),size:e.size,tabindex:1};y&&(v.style.borderColor=y,setTimeout((function(){v.style.borderColor="",n.updateBorderColor("")}),300)),r.value;var g=Re(Re({},e),{},{data:p,sels:h,ck:this.itemClick.bind(this),title:h.map((function(e){return e[r.name]})).join(","),onReset:this.onReset.bind(this)}),_=Re(Re({},e),{},{data:p,dataObj:f,flatData:d,sels:h,ck:this.itemClick.bind(this),show:b,onReset:this.onReset.bind(this)}),w=i?m(ue,_):l.show?m(xe,je({},_,{ref:function(e){return n.treeRef=e}})):e.cascader.show?m(Ce,_):m(oe,je({},_,{ref:function(e){return n.generalRef=e}})),k=this.calcPosition();return m("xm-select",v,m("input",{class:"xm-select-default","lay-verify":e.layVerify,"lay-verType":e.layVerType,"lay-reqText":e.layReqText,name:e.name,value:s(h,r)}),m("i",{class:b?"xm-icon xm-icon-expand":"xm-icon"}),0===h.length&&m("div",{class:"xm-tips"},e.tips),m(H,je({},g,{ref:function(e){return n.labelRef=e}})),m("div",{class:["xm-body",x,e.model.type,b?"":"dis"].join(" "),style:k,ref:function(e){return n.bodyView=e}},w),a&&m("div",{class:"xm-select-disabled"}))}},{key:"componentDidMount",value:function(){var e=this;this.prepare=!0,this.base.addEventListener("keydown",(function(t){13===t.keyCode&&e.onClick(t)})),this.input=this.base.querySelector(".xm-select-default");var t=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;t&&new t((function(t){t.forEach((function(t){"attributes"==t.type&&"class"===t.attributeName&&-1!==e.input.className.indexOf("layui-form-danger")&&(e.input.className="xm-select-default",e.base.style.borderColor=e.props.theme.maxColor,e.base.scrollIntoView&&e.base.scrollIntoView({behavior:"smooth"}))}))})).observe(this.input,{attributes:!0});for(var n=this.base;n;){if("FORM"===n.tagName){var o=n.querySelector('button[type="reset"]');o&&o.addEventListener("click",(function(t){e.init(e.props,!0)}));break}n=n.parentElement}var r=this.props.done;r&&r()}},{key:"componentDidUpdate",value:function(){var e=this.props,t=e.direction,n=e.model;if("relative"!==n.type&&"fixed"!==n.type){var o=this.base.getBoundingClientRect();if("auto"===t){this.bodyView.style.display="block",this.bodyView.style.visibility="hidden";var r=this.bodyView.getBoundingClientRect().height;this.bodyView.style.display="",this.bodyView.style.visibility="";var i=o.y||o.top||0,a=document.documentElement.clientHeight-i-o.height-20;t=a>r||i<a?"down":"up"}"down"==t?(this.bodyView.style.top=o.height+4+"px",this.bodyView.style.bottom="auto"):(this.bodyView.style.top="auto",this.bodyView.style.bottom=o.height+4+"px")}}}])&&De(t.prototype,n),o&&De(t,o),i}(x),Ue={tips:"请选择",empty:"暂无数据",searchTips:"请选择",toolbar:{ALL:"全选",CLEAR:"清空",REVERSE:"反选",SEARCH:"搜索"},paging:{prev:"上一页",next:"下一页"}},Ne={zn:Ue,en:{tips:"please selected",empty:"no data",searchTips:"please search",toolbar:{ALL:"select all",CLEAR:"clear",REVERSE:"invert select",SEARCH:"search"},paging:{prev:"prev",next:"next"}}};function Be(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,o)}return n}function Ke(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?Be(Object(n),!0).forEach((function(t){He(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):Be(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function He(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function qe(){return(qe=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e}).apply(this,arguments)}function Ye(e){return(Ye="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function Ze(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}var Qe=function(){function e(t){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this.init(t)}var t,n,o;return t=e,(n=[{key:"init",value:function(e){this.options=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"zn",t=Ne[e]||Ue;return{language:e,languageProp:t,data:[],content:"",name:"select",layVerify:"",layVerType:"",layReqText:"",size:"medium",disabled:!1,initValue:null,create:null,tips:t.tips,empty:t.empty,delay:500,searchTips:t.searchTips,filterable:!1,filterMethod:function(e,t,n,o){return!e||-1!=t[o.name].indexOf(e)},remoteSearch:!1,remoteMethod:function(e,t){t([])},direction:"auto",style:{},height:"200px",autoRow:!1,paging:!1,pageSize:10,pageEmptyShow:!0,pageRemote:!1,radio:!1,repeat:!1,clickClose:!1,max:0,maxMethod:function(e,t){},showCount:0,enableKeyboard:!0,enableHoverFirst:!0,selectedKeyCode:13,toolbar:{show:!1,showIcon:!0,list:["ALL","CLEAR"]},tree:{show:!1,showFolderIcon:!0,showLine:!0,indent:20,expandedKeys:[],strict:!0,lazy:!1,load:null,simple:!1,nodeType:"__node_type",clickExpand:!0,clickCheck:!0},cascader:{show:!1,indent:100,strict:!0},prop:{name:"name",value:"value",selected:"selected",disabled:"disabled",children:"children",optgroup:"optgroup",click:"click"},theme:{color:"#009688",maxColor:"#e54d42",hover:"#f2f2f2"},model:{label:{type:"block",text:{left:"",right:"",separator:", "},block:{showCount:0,showIcon:!0,template:null},count:{template:function(e,t){return"已选中 ".concat(t.length," 项, 共 ").concat(e.length," 项")}}},icon:"show",type:"absolute"},iconfont:{select:"",unselect:"",half:"",parent:""},show:function(){},hide:function(){},template:function(e){e.item,e.sels;var t=e.name;return e.value,t},on:function(e){e.arr,e.item,e.selected},submitConversion:function(e,t){return e.map((function(e){return e[t.value]})).join(",")},done:function(){}}}(e.language),this.update(e)}},{key:"update",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=!!e.data;this.options=Object(c.b)(this.options,e),this.options.__render_success=!1;var n=this.options.dom;if(n){var o=this.options.data||[];if("function"==typeof o&&(o=o(),this.options.data=o),Object(c.d)(o))return T(m(Fe,qe({},this.options,{__update:Date.now(),updateData:t})),n),this.options.__render_success=!0,this;Object(c.k)("data数据必须为数组类型, 不能是".concat("undefined"==typeof data?"undefined":Ye(data),"类型"))}else Object(c.k)("没有找到渲染对象: ".concat(e.el,", 请检查"))}},{key:"reset",value:function(){var e=this.options.el;return this.init($e[e]),et[e].init(this.options,!0),this}},{key:"opened",value:function(){var e=et[this.options.el];return!e.state.show&&e.onClick(),this}},{key:"closed",value:function(){var e=et[this.options.el];return e.state.show&&e.onClick(),this}},{key:"getValue",value:function(e){var t=this,n=this.options,o=n.tree,r=n.prop,i=n.data,a=et[this.options.el].state.sels,l=a;o.show&&o.strict&&o.simple&&(l=[],Object(c.j)(i,a,l,r));var s=Object(c.c)(l,r.children,["__node"]);return"name"===e?s.map((function(e){return e[t.options.prop.name]})):"nameStr"===e?s.map((function(e){return e[t.options.prop.name]})).join(","):"value"===e?s.map((function(e){return e[t.options.prop.value]})):"valueStr"===e?s.map((function(e){return e[t.options.prop.value]})).join(","):s}},{key:"setValue",value:function(e,t){var n=arguments.length>2&&void 0!==arguments[2]&&arguments[2];if(Object(c.d)(e))return et[this.options.el].value(this.options.radio?e.slice(0,1):e,t,n),this;Object(c.k)("请传入数组结构...")}},{key:"append",value:function(e){if(Object(c.d)(e))return et[this.options.el].append(e),this;Object(c.k)("请传入数组结构...")}},{key:"delete",value:function(e){if(Object(c.d)(e))return et[this.options.el].del(e),this;Object(c.k)("请传入数组结构...")}},{key:"warning",value:function(e){var t=arguments.length>1&&void 0!==arguments[1]&&arguments[1],n=e||this.options.theme.maxColor;return!0===t?et[this.options.el].base.style.borderColor=n:et[this.options.el].updateBorderColor(n),this}},{key:"getTreeValue",value:function(e,t){var n=this.options,o=n.tree,r=n.cascader,i=n.prop,a=i.value;if(!o.show&&!r.show)return this.getValue(e);for(var l=et[this.options.el].state.sels,s=[],u=o.nodeType,p=function(e,t){s.find((function(t){return t[a]===e[a]}))||((e=Ke({},e))[u]=t,s.push(e))},f=0;f<l.length;f++){var d=Ke({},l[f]);for(p(d,"leaf");d=d.__node.parent;){var h=d.__node,m=h.half,b=h.selected;!e&&b?p(d,"parent"):t&&m&&!b&&p(d,"half")}}return Object(c.c)(s,i.children,["__node"])}},{key:"changeExpandedKeys",value:function(e){return et[this.options.el].changeExpandedKeys(e),this}},{key:"enable",value:function(e){if(Object(c.d)(e)){if(0!==e.length)return et[this.options.el].upDate(e,!0),this}else Object(c.k)("请传入数组结构...")}},{key:"disable",value:function(e){if(Object(c.d)(e)){if(0!==e.length)return et[this.options.el].upDate(e,!1),this}else Object(c.k)("请传入数组结构...")}},{key:"scroll",value:function(e){var t=this.options.dom.querySelector('.xm-option[value="'.concat(e,'"]'));return t&&t.scrollIntoView(!1),this}},{key:"calcPosition",value:function(){return et[this.options.el].calcPosition(),this}}])&&Ze(t.prototype,n),o&&Ze(t,o),e}();function Je(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function We(e){return function(e){if(Array.isArray(e))return Ge(e)}(e)||function(e){if("undefined"!=typeof Symbol&&Symbol.iterator in Object(e))return Array.from(e)}(e)||function(e,t){if(!e)return;if("string"==typeof e)return Ge(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return Ge(e,t)}(e)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function Ge(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,o=new Array(t);n<t;n++)o[n]=e[n];return o}var Xe={},$e={},et={};t.c={name:s.a,version:s.b,doc:s.c,KeyCode:{Enter:13,Space:32},render:function(e){var t=e.el;if(e.dom=Object(c.g)(t),t.nodeType){var n="DOM_RENDER_"+Date.now()+"_"+Math.random();t.setAttribute(s.a,n),t="[".concat(s.a,"='").concat(n,"']"),e.el=t}$e[t]=e;var o=new Qe(e);return o&&o.options.__render_success&&(Xe[t]=o),o},get:function(e,t){var n;switch(Object.prototype.toString.call(e)){case"[object String]":e&&(n=function(t){return t===e});break;case"[object RegExp]":n=function(t){return e.test(t)};break;case"[object Function]":n=e}var o=Object.keys(Xe),r=(n?o.filter(n):o).map((function(e){return Xe[e]})).filter((function(e){return Object(c.g)(e.options.el)}));return t?r[0]:r},batch:function(e,t){var n=Array.prototype.slice.call(arguments);return n.splice(0,2),this.get(e).map((function(e){return e[t].apply(e,We(n))}))},arr2tree:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"pid",n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"id",o=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"children",r=arguments.length>4&&void 0!==arguments[4]?arguments[4]:0,i={};return safety(e).filter((function(e){var a=e[n],l=e[t],s=i[a],c=i[l];return s&&(e[o]=s[o]),i[a]=e,c||(c=Je({},o,[]),i[l]=c),c.push(e),n==r}))}}}});
\ No newline at end of file
diff --git a/route/static/language/Simplified_Chinese/lan.js b/route/static/language/Simplified_Chinese/lan.js
deleted file mode 100755
index bcc28814c..000000000
--- a/route/static/language/Simplified_Chinese/lan.js
+++ /dev/null
@@ -1,1016 +0,0 @@
-var lan = {
-	"get":function(key,args){
-		var msgs = {
-			"diskinfo_span_1":"磁盘分区[{1}]的可用容量小于1GB，这可能会导致MySQL自动停止，面板无法访问等问题，请及时清理！",
-			"process_kill_confirm":"结束进程名[{1}],PID[{2}]后可能会影响服务器的正常运行，继续吗？",
-			"del":"删除[{1}]",
-			"del_all_task":"您共选择了[{1}]个任务,删除后将无法恢复,真的要删除吗?",
-			"del_all_task_ok":"成功删除[{1}]个任务!",
-			"del_all_task_the":"正在删除[{1}],请稍候...",
-			"add_all_task_ok":"成功添加[{1}]个计划任务!",
-			"add":"正在添加[{1}],请稍候...",
-			"confirm_del":"您真的要删除[{1}]吗？",
-			"update_num":"一次只能选择{1}个文件上传，剩下的不作处理！",
-			"service_confirm":"您真的要{1}{2}服务吗？",
-			"service_the":"正在{1}{2}服务,请稍候...",
-			"service_ok":"{1}服务已{2}",
-			"service_err":"{1}服务{2}失败!",
-			"recycle_bin_confirm":"您确实要把此文件[{1}]放入回收站吗?",
-			"recycle_bin_confirm_dir":"您确实要把此目录[{1}]放入回收站吗?",
-			"del_all_ftp":"您共选择了[{1}]个FTP,删除后将无法恢复,真的要删除吗?",
-			"del_all_ftp_ok":"成功删除{1}个FTP帐户",
-			"del_all_database":"您共选择了[{1}]个数据库,删除后将无法恢复,真的要删除吗?",
-			"del_all_database_ok":"成功删除[{1}]个数据库!",
-			"config_edit_ps":"此处为{1}主配置文件,若您不了解配置规则,请勿随意修改。",
-			"install_confirm":"您真的要安装{1}-{2}吗?",
-			"del_all_site":"您共选择了[{1}]个站点,删除后将无法恢复,真的要删除吗?",
-			"del_all_site_ok":"成功删除[{1}]个站点!",
-			"ssl_enable":"您已启用[{1}]证书，如需关闭，请点击\"关闭SSL\"按钮。"
-		}
-		
-		if(!msgs[key]) return '';
-		msg = msgs[key];
-		for(var i=0;i<args.length;i++){
-			console.log('test',args[i])
-			msg = msg.replace('{'+(i+1)+'}',args[i]+'');
-		}
-		
-		return msg;
-	},
-	"index":{
-		"memre":"内存释放",
-		"memre_ok":"释放完成",
-		"memre_ok_0":"释放中",
-		"memre_ok_1":"已释放",
-		"memre_ok_2":"状态最佳",
-		"mem_warning":"当前可用物理内存小于64M，这可能导致MySQL自动停止，站点502等错误，请尝试释放内存！",
-		"user_warning":"当前面板用户为admin,这可能为面板安全带来风险！",
-		"cpu_core":"核心",
-		"interfacespeed":"接口速率",
-		"package_num":"报文数量",
-		"interface_net":"接口流量实时",
-		"net_up":"上行",
-		"net_down":"下行",
-		"unit":"单位",
-		"net_font":"宋体",
-		"update_go":"立即更新",
-		"update_get":"正在获取版本信息...",
-		"update_check":"检查更新",
-		"update_to":"升级到",
-		"update_the":"正在升级面板..",
-		"update_ok":"升级成功!",
-		"update_log":"版本更新",
-		"reboot_title":"安全重启服务器",
-		"reboot_warning":"注意，若您的服务器是一个容器，请取消。",
-		"reboot_ps":"安全重启有利于保障文件安全，将执行以下操作：",
-		"reboot_ps_1":"1.停止Web服务",
-		"reboot_ps_2":"2.停止MySQL服务",
-		"reboot_ps_3":"3.开始重启服务器",
-		"reboot_ps_4":"4.等待服务器启动",
-		"reboot_msg_1":"正在停止Web服务",
-		"reboot_msg_2":"正在停止MySQL服务",
-		"reboot_msg_3":"开始重启服务器",
-		"reboot_msg_4":"等待服务器启动",
-		"reboot_msg_5":"服务器重启成功!",
-		"panel_reboot_title":"重启面板服务",
-		"panel_reboot_msg":"即将重启面板服务，继续吗？",
-		"panel_reboot_to":"正在重启面板服务,请稍候...",
-		"panel_reboot_ok":"面板服务重启成功!",
-		"net_dorp_ip":"屏蔽此IP",
-		"net_doup_ip_msg":"屏蔽此IP后，对方将无法访问本服务器，你可以在【安全】中删除，继续吗？",
-		"net_doup_ip_ps":"手动屏蔽",
-		"net_doup_ip_to":"手动屏蔽",
-		"net_status_title":"网络状态",
-		"net_protocol":"协议",
-		"net_address_dst":"本地地址",
-		"net_address_src":"远程地址",
-		"net_address_status":"状态",
-		"net_process":"进程",
-		"net_process_pid":"PID",
-		"process_check":"正在分析...",
-		"process_kill":"结束",
-		"process_kill_title":"结束此进程",
-		"process_title":"进程管理",
-		"process_pid":"PID",
-		"process_name":"名称",
-		"process_cpu":"CPU",
-		"process_mem":"内存",
-		"process_disk":"读/写",
-		"process_status":"状态",
-		"process_thread":"线程",
-		"process_user":"用户",
-		"process_act":"操作",
-		"kill_msg":"正在结束进程...",
-		"rep_panel_msg":"将尝试校验并修复面板程序，继续吗？",
-		"rep_panel_title":"修复面板",
-		"rep_panel_the":"正在校验模块...",
-		"rep_panel_ok":"修复完成，请按 Ctrl+F5 刷新缓存!"
-	},
-	
-	"config":{
-		"close_panel_msg":"关闭面板会导致您无法访问面板 ,您真的要关闭Linux面板吗？",
-		"close_panel_title":"关闭面板",
-		"config_save":"正在保存配置...",
-		"config_sync":"正在同步时间...",
-		"config_user_binding":"绑定帐号",
-		"config_user_edit":"修改绑定账号",
-		"binding":"绑定",
-		"token_get":"正在获取密钥...",
-		"user_bt":"官网账户",
-		"pass_bt":"官网密码",
-		"binding_un_msg":"您确定要解除绑定帐号码？",
-		"binding_un_title":"解除绑定",
-		"binding_un":"解绑",
-		"ssl_close_msg":"关闭SSL后,必需使用http协议访问面板,继续吗?",
-		"ssl_open_ps":"危险！此功能不懂别开启!",
-		"ssl_open_ps_1":"必须要用到且了解此功能才决定自己是否要开启!",
-		"ssl_open_ps_2":"面板SSL是自签证书，不被浏览器信任，显示不安全是正常现象",
-		"ssl_open_ps_3":"开启后导致面板不能访问，可以点击下面链接了解解决方法",
-		"ssl_open_ps_4":"我已了经解详情,并愿意承担风险",
-		"ssl_open_ps_5":"了解详情",
-		"ssl_title":"设置面板SSL",
-		"ssl_ps":"请先确认风险!",
-		"ssl_msg":"正在安装并设置SSL组件,这需要几分钟时间..."
-		
-	},
-	
-	"control":{
-		"save_day_err":"保存天数不合法!",
-		"close_log":"清空记录",
-		"close_log_msg":"您真的清空所有监控记录吗？",
-		"disk_read_num":"读取次数",
-		"disk_write_num":"写入次数",
-		"disk_read_bytes":"读取字节数",
-		"disk_write_bytes":"写入字节数"
-	},
-	
-	"crontab":{
-		"task_log_title": "任务执行日志",
-		"task_empty":"当前没有计划任务",
-		"del_task":"您确定要删除该任务吗?",
-		"del_task_all_title":"批量删除任务",
-		"del_task_err":"以下任务删除失败:",
-		"add_task_empty":"任务名称不能为空!",
-		"input_hour_err":"小时值不合法!",
-		"input_minute_err":"分钟值不合法!",
-		"input_number_err":"不能有负数!",
-		"input_file_err":"请选择脚本文件!",
-		"input_script_err":"脚本代码不能为空!",
-		"input_url_err":"URL地址不正确!",
-		"input_empty_err":"对象列表为空，无法继续!",
-		"backup_site":"备份网站",
-		"backup_database":"备份数据库",
-		"backup_log":"切割日志",
-		"backup_all_err":"以下对象添加任务失败:",
-		"day":"天",
-		"hour":"小时",
-		"minute":"分钟",
-		"sun":"日",
-		"sbody":"脚本内容",
-		"log_site":"切割网站",
-		"url_address":"URL地址",
-		"backup_to":"备份到",
-		"disk":"服务器磁盘",
-		"save_new":"保留最新",
-		"save_num":"份",
-		"TZZ1":"周一",
-		"TZZ2":"周二",
-		"TZZ3":"周三",
-		"TZZ4":"周四",
-		"TZZ5":"周五",
-		"TZZ6":"周六",
-		"TZZ7":"周日",
-		"mem_ps":"释放PHP、MYSQL、PURE-FTPD、APACHE、NGINX的内存占用,建议在每天半夜执行!",
-		"mem":"释放内存"
-		
-	},
-	
-	"firewall":{
-		"empty":"已清理!",
-		"port":"端口",
-		"accept":"放行",
-		"port_ps":"说明: 支持放行端口范围，如: 3000:3500",
-		"ip":"欲屏蔽的IP地址",
-		"drop":"屏蔽",
-		"ip_ps":"说明: 支持屏蔽IP段，如: 192.168.0.0/24",
-		"ssh_port_msg":"更改远程端口时，将会注消所有已登录帐户，您真的要更改远程端口吗？",
-		"ssh_port_title":"远程端口",
-		"ssh_off_msg":"停用SSH服务的同时也将注销所有已登录用户,继续吗？",
-		"ssh_on_msg":"确定启用SSH服务吗？",
-		"ping_msg":"禁PING后不影响服务器正常使用，但无法ping通服务器，您真的要禁PING吗？",
-		"ping_un_msg":"解除禁PING状态可能会被黑客发现您的服务器，您真的要解禁吗？",
-		"ping_title":"是否禁ping",
-		"ping":"已禁Ping",
-		"ping_un":"已解除禁Ping",
-		"ping_err":"连接服务器失败",
-		"status_not":"未使用",
-		"status_net":"外网不通",
-		"status_ok":"正常",
-		"drop_ip":"屏蔽IP",
-		"accept_port":"放行端口",
-		"port_err":"端口范围不合法!",
-		"ps_err":"备注/说明 不能为空!",
-		"del_title":"删除防火墙规则",
-		"close_log":"清空日志",
-		"close_log_msg":"即将清空面板日志，继续吗？",
-		"close_the":"正在清理,请稍候..."
-	},
-	
-	"upload":{
-		"file_type_err":"不允许上传的文件类型!",
-		"file_err":"错误的文件",
-		"file_err_empty":"不能为空字节文件!",
-		"select_file":"请选择文件!",
-		"select_empty":"没有可用文件上传，重新选择文件",
-		"up_sleep":"等待上传",
-		"up_the":"已上传",
-		"up_save":"正在保存..",
-		"up_ok":"已上传成功",
-		"up_ok_1":"上传完成",
-		"up_ok_2":"已上传",
-		"up_speed":"上传进度:",
-		"up_err":" 上传错误",
-		"ie_err":"抱歉,IE 6/7/8 不支持请更换浏览器再上传"
-	},
-	
-	"bt":{
-		"empty":"空",
-		"dir":"选择目录",
-		"path":"当前路径",
-		"comp":"计算机",
-		"filename":"文件名",
-		"etime":"修改时间",
-		"access":"权限",
-		"own":"所有者",
-		"adddir":"新建文件夹",
-		"path_ok":"选择",
-		"save_file":"正在保存,请稍候...",
-		"read_file":"正在读取文件,请稍候...",
-		"edit_title":"在线编辑",
-		"edit_ps":"提示：Ctrl+F 搜索关键字，Ctrl+G 查找下一个，Ctrl+S 保存，Ctrl+Shift+R 查找替换!",
-		"stop":"停止",
-		"start":"启动",
-		"restart":"重启",
-		"reload":"重载",
-		"php_status_err":"抱歉，不支持PHP5.2",
-		"php_status_title":"PHP负载状态",
-		"php_pool":"应用池(pool)",
-		"php_manager":"进程管理方式(process manager)",
-		"dynamic":"动态",
-		"static":"静态",
-		"php_start":"启动日期(start time)",
-		"php_accepted":"请求数(accepted conn)",
-		"php_queue":"请求队列(listen queue)",
-		"php_max_queue":"最大等待队列(max listen queue)",
-		"php_len_queue":"socket队列长度(listen queue len)",
-		"php_idle":"空闲进程数量(idle processes)",
-		"php_active":"活跃进程数量(active processes)",
-		"php_total":"总进程数量(total processes)",
-		"php_max_active":"最大活跃进程数量(max active processes)",
-		"php_max_children":"到达进程上限次数(max children reached)",
-		"php_slow":"慢请求数量(slow requests)",
-		"nginx_title":"Nginx负载状态",
-		"nginx_active":"活动连接(Active connections)",
-		"nginx_accepts":"总连接次数(accepts)",
-		"nginx_handled":"总握手次数(handled)",
-		"nginx_requests":"总请求数(requests)",
-		"nginx_reading":"请求数(Reading)",
-		"nginx_writing":"响应数(Writing)",
-		"nginx_waiting":"驻留进程(Waiting)",
-		"drop_ip_title":"屏蔽此IP",
-		"net_status_title":"网络状态",
-		"net_pool":"协议",
-		"copy_ok":"复制成功",
-		"copy_empty":"密码为空",
-		"cal_msg":"计算结果：",
-		"cal_empty":"输入计算结果，否则无法删除",
-		"cal_err":"计算错误，请重新计算",
-		"loginout":"您真的要退出面板吗?",
-		"pass_err_len":"面板密码不能少于8位!",
-		"pass_err":"面板密码不能为弱口令",
-		"pass_err_re":"两次输入的密码不一致",
-		"pass_title":"修改密码",
-		"pass_new_title":"新的密码",
-		"pass_rep":"随机密码",
-		"pass_rep_btn":"随机",
-		"pass_re":"重复",
-		"pass_re_title":"再输一次",
-		"pass_rep_ps":"请在修改前记录好您的新密码!",
-		"user_len":"用户名长度不能少于3位",
-		"user_err_re":"两次输入的用户名不一致",
-		"user_title":"修改面板用户名",
-		"user":"用户名",
-		"user_new":"新的用户名",
-		"task_list":"任务列表",
-		"task_msg":"消息列表",
-		"task_not_list":"当前没有任务!",
-		"task_scan":"正在扫描",
-		"task_install":"正在安装",
-		"task_sleep":"等待",
-		"task_downloading":"下载中",
-		"task_the":"正在处理",
-		"task_ok":"已完成",
-		"task_close":"任务已取消!",
-		"time":"耗时",
-		"s":"秒",
-		"install_title":"推荐安装套件",
-		"install_ps":"我们为您推荐以下一键套件，请按需选择或在",
-		"install_s":"软件管理",
-		"install_s1":"页面中自动选择，推荐安装LNMP。",
-		"install_lnmp":"LNMP(推荐)",
-		"install_type":"安装方式",
-		"install_rpm":"极速安装",
-		"install_rpm_title":"即rpm，安装时间极快（5~10分钟），性能与稳定性略低于编译安装",
-		"install_src":"编译安装",
-		"install_src_title":"安装时间长（30分钟到3小时），适合生产环境",
-		"install_key":"一键安装",
-		"install_apache22":"您选择的是Apache2.2,PHP将会以php5_module模式运行!",
-		"install_apache24":"您选择的是Apache2.4,PHP将会以php-fpm模式运行!",
-		"insatll_s22":"Apache2.2不支持",
-		"insatll_s24":"Apache2.4不支持",
-		"insatll_mem":"您的内存小于{1},不建议安装MySQL-{2}",
-		"install_to":"正在添加到安装器...",
-		"install_ok":"已将安装请求添加到安装器",
-		"task_add":"已添加到队列",
-		"panel_open":"正在打开面板...",
-		"panel_add":"关联面板",
-		"panel_edit":"修改关联",
-		"panel_err_format":"面板地址格式不正确，示例：",
-		"panel_err_empty":"面板资料不能为空",
-		"panel_address":"面板地址",
-		"panel_user":"用户名",
-		"panel_pass":"密码",
-		"panel_ps":"备注",
-		"panel_ps_1":"收藏其它服务器面板资料，实现一键登录面板功能",
-		"panel_ps_2":"面板备注不可重复",
-		"panel_ps_3":"<font style='color:red'>注意，开启广告拦截会导致无法快捷登录。</font>",
-		"task_time":"时间",
-		"task_name":"名称",
-		"task_msg_title":"消息提醒",
-		"task_title":"消息盒子",
-		"task_tip_read":"标记已读",
-		"task_tip_all":"全部已读"
-	},
-	
-	"files":{
-		"recycle_bin_re":"恢复",
-		"recycle_bin_del":"永久删除",
-		"recycle_bin_on":"文件回收站",
-		"recycle_bin_on_db":"数据库回收站",
-		"recycle_bin_ps":"注意：关闭回收站，删除的文件无法恢复！",
-		"recycle_bin_close":"清空回收站",
-		"recycle_bin_type1":"全部",
-		"recycle_bin_type2":"文件夹",
-		"recycle_bin_type3":"文件",
-		"recycle_bin_type4":"图片",
-		"recycle_bin_type5":"文档",
-		"recycle_bin_type6":"数据库",
-		"recycle_bin_th1":"文件名",
-		"recycle_bin_th2":"原位置",
-		"recycle_bin_th3":"大小",
-		"recycle_bin_th4":"删除时间",
-		"recycle_bin_th5":"操作",
-		"recycle_bin_title":"回收站",
-		"recycle_bin_re_title":"恢复文件",
-		"recycle_bin_re_msg":"若您的原位置已有同名文件或目录，将被覆盖，继续吗？",
-		"recycle_bin_re_the":"正在恢复,请稍候...",
-		"recycle_bin_del_title":"删除文件",
-		"recycle_bin_del_msg":"删除操作不可逆，继续吗？",
-		"recycle_bin_del_the":"正在删除,请稍候...",
-		"recycle_bin_close_msg":"清空回收站操作会永久删除回收站中的文件，继续吗？",
-		"recycle_bin_close_the":"正在删除,请稍候...",
-		"file_menu_copy":"复制",
-		"file_menu_mv":"剪切",
-		"file_menu_rename":"重命名",
-		"file_menu_auth":"权限",
-		"file_menu_zip":"压缩",
-		"file_menu_unzip":"解压",
-		"file_menu_edit":"编辑",
-		"file_menu_img":"预览",
-		"file_menu_down":"下载",
-		"file_menu_del":"删除",
-		"file_name":"文件名",
-		"file_size":"大小",
-		"file_etime":"修改时间",
-		"file_auth":"权限",
-		"file_own":"所有者",
-		"file_read":"读取",
-		"file_write":"写入",
-		"file_exec":"执行",
-		"file_public":"公共",
-		"file_group":"用户组",
-		"file_act":"操作",
-		"get_size":"共{1}个目录与{2}个文件,大小:",
-		"get":"获取",
-		"new":"新建",
-		"new_empty_file":"新建空白文件",
-		"new_dir":"新建目录",
-		"dir_name":"目录名称",
-		"return":"返回上一级",
-		"shell":"终端",
-		"paste":"粘贴",
-		"paste_all":"粘贴所有",
-		"path_root":"根目录",
-		"all":"批量",
-		"set_auth":"设置权限",
-		"up_title":"上传文件",
-		"up_add":"添加文件",
-		"up_start":"开始上传",
-		"up_coding":"文件编码",
-		"up_bin":"二进制",
-		"unzip_title":"解压文件",
-		"unzip_name":"文件名",
-		"unzip_name_title":"压缩文件名",
-		"unzip_to":"解压到",
-		"unzip_coding":"编码",
-		"unzip_the":"正在解压,请稍候...",
-		"zip_title":"压缩文件",
-		"zip_to":"压缩到",
-		"zip_the":"正在压缩,请稍候...",
-		"zip_ok":"服务器正在后台压缩文件,请稍候刷新文件列表查看进度!",
-		"zip_pass_title":"解压密码",
-		"zip_pass_msg":"不需要请留空",
-		"mv_the":"正在移动,请稍候...",
-		"copy_the":"正在复制,请稍候...",
-		"copy_ok":"已复制",
-		"mv_ok":"已剪切",
-		"shell_title":"执行SHELL (仅支持非交互命令)",
-		"shell_go":"发送",
-		"shell_ps":"shell命令",
-		"down_title":"下载文件",
-		"down_url":"URL地址",
-		"down_to":"下载到",
-		"down_save":"保存文件名",
-		"down_task":"正在添加到队列，请稍候..",
-		"del_file":"删除文件",
-		"del_dir":"删除目录",
-		"del_all_file":"批量删除文件",
-		"del_all_msg":"您确实要把这些文件放入回收站吗?"
-	},
-	
-	"ftp":{
-		"empty":"当前没有FTP数据",
-		"stop_title":"停用这个帐号",
-		"start_title":"启用这个帐号",
-		"stop":"已停用",
-		"start":"已启用",
-		"copy":"复制密码",
-		"open_path":"打开目录",
-		"edit_pass":"改密",
-		"ps":"备注信息",
-		"add_title":"添加FTP帐户",
-		"add_user":"用户名",
-		"add_pass":"密码",
-		"add_pass_rep":"随机密码",
-		"add_path":"根目录",
-		"add_path_title":"帐户根目录，会自动创建同名目录",
-		"add_path_ps":"FTP所指向的目录",
-		"add_ps":"备注",
-		"add_ps_title":"备注信息(小于255个字符)",
-		"del_all":"批量删除FTP",
-		"del_all_err":"以下FTP帐户删除失败:",
-		"stop_confirm":"您真的要停止{1}的FTP吗?",
-		"stop_title":"FTP帐户",
-		"pass_title":"修改FTP用户密码",
-		"pass_user":"用户名",
-		"pass_new":"新密码",
-		"pass_confirm":"您确定要修改该FTP帐户密码吗?",
-		"port_title":"修改FTP端口"
-	},
-	
-	"database":{
-		"empty":"当前没有数据库数据",
-		"backup_empty":"无备份",
-		"backup_ok":"有备份",
-		"copy_pass":"复制密码",
-		"input":"导入",
-		"input_title":"导入数据库",
-		"admin":"管理",
-		"admin_title":"数据库管理",
-		"auth":"权限",
-		"auth_title":"设置访问权限",
-		"edit_pass":"改密",
-		"edit_pass_title":"修改数据库密码",
-		"del_title":"删除数据库",
-		"ps":"备注信息",
-		"add_title":"添加数据库",
-		"add_name":"数据库名",
-		"add_name_title":"新的数据库名称",
-		"add_pass":"密码",
-		"add_pass_title":"数据库密码",
-		"add_pass_rep":"随机密码",
-		"add_auth":"访问权限",
-		"add_auth_local":"本地服务器",
-		"add_auth_all":"所有人",
-		"add_auth_ip":"指定IP",
-		"add_auth_ip_title":"请输允许访问此数据库的IP地址",
-		"add_ps":"备注",
-		"edit_root":"root密码",
-		"user":"用户名",
-		"edit_pass_new":"新密码",
-		"edit_pass_new_title":"新的数据库密码",
-		"edit_pass_confirm":"您确定要修改数据库密码吗?",
-		"backup_re":"恢复",
-		"backup_name":"文件名称",
-		"backup_size":"文件大小",
-		"backup_time":"备份时间",
-		"backup_title":"数据库备份详情",
-		"backup":"备份",
-		"input_confirm":"数据库将被覆盖，继续吗?",
-		"input_the":"正在导入,请稍候...",
-		"backup_the":"正在备份,请稍候...",
-		"backup_del_title":"删除备份文件",
-		"backup_del_confirm":"您真的要删除备份文件吗?",
-		"del_all_title":"批量删除数据库",
-		"del_all_err":"以下数据库删除失败:",
-		"input_title_file":"从文件导入数据库",
-		"input_local_up":"从本地上传",
-		"input_ps1":"仅支持sql、zip、(tar.gz|gz|tgz)",
-		"input_ps2":"zip、tar.gz压缩包结构：test.zip或test.tar.gz压缩包内，必需包含test.sql",
-		"input_ps3":"若文件过大，您还可以使用SFTP工具，将数据库文件上传到/www/backup/database",
-		"input_up_type":"请上传sql或zip或tar.gz压缩包",
-		"auth_err":"此数据库不能修改访问权限",
-		"auth_title":"设置数据库权限",
-		"auth_name":"访问权限",
-		"sync_the":"正在同步,请稍候...",
-		"phpmyadmin_err":"请先安装phpMyAdmin",
-		"phpmyadmin":"正在打开phpMyAdmin"
-	},
-	
-	"soft":{
-		"php_main1":"php服务",
-		"php_main2":"上传限制",
-		"php_main3":"超时限制",
-		"php_main4":"配置文件",
-		"php_main5":"安装扩展",
-		"php_main6":"禁用函数",
-		"php_main7":"性能调整",
-		"php_main8":"负载状态",
-		"php_menu_ext":"扩展配置",
-		"admin":"管理",
-		"off":"关闭",
-		"on":"开启",
-		"stop":"停止",
-		"start":"启动",
-		"status":"当前状态",
-		"restart":"重启",
-		"reload":"重载配置",
-		"mysql_mem_err":"机器内存小于1G，不建议使用mysql5.5以上版本</li><li>如果数据库经常自动停止，请尝试使用linux工具箱增加SWAP或者升级服务器内存",
-		"concurrency_m":"自定义",
-		"concurrency":"并发",
-		"concurrency_type":"并发方案",
-		"php_fpm_model":"运行模式",
-		"php_fpm_ps1":"PHP-FPM运行模式",
-		"php_fpm_ps2":"允许创建的最大子进程数",
-		"php_fpm_ps3":"起始进程数（服务启动后初始进程数量）",
-		"php_fpm_ps4":"最小空闲进程数（清理空闲进程后的保留数量）",
-		"php_fpm_ps5":"最大空闲进程数（当空闲进程达到此值时清理）",
-		"php_fpm_err1":"max_spare_servers 不能大于 max_children",
-		"php_fpm_err2":"min_spare_servers 不能大于 start_servers",
-		"php_fpm_err3":"min_spare_servers 不能大于 max_spare_servers",
-		"php_fpm_err4":"start_servers 不能大于 max_children",
-		"php_fpm_err5":"配置值不能小于1",
-		"phpinfo":"查看phpinfo()",
-		"get":"正在获取...",
-		"get_list":"正在获取列表...",
-		"the_save":"正在保存数据...",
-		"config_edit":"配置修改",
-		"edit_empty":"不修改请留空",
-		"php_upload_size":"上传大小限制不能小于2M",
-		"mvc_ps":"MVC架构的程序需要开启,如typecho",
-		"the_install":"正在安装...",
-		"the_uninstall":"正在卸载...",
-		"install_the":"安装中...",
-		"sleep_install":"等待安装...",
-		"install":"安装",
-		"uninstall":"卸载",
-		"php_ext_name":"名称",
-		"php_ext_type":"类型",
-		"php_ext_ps":"说明",
-		"php_ext_status":"状态",
-		"php_ext_install_confirm":"您真的要安装{1}吗?",
-		"php_ext_uninstall_confirm":"您真的要安装{1}吗?",
-		"add_install":"正在添加到安装器...",
-		"install_title":"软件安装",
-		"insatll_type":"安装方式",
-		"install_version":"安装版本",
-		"type_title":"选择安装方式",
-		"err_install1":"请先卸载Apache",
-		"err_install2":"请先卸载Nginx",
-		"err_install3":"请先安装php",
-		"err_install4":"请先安装MySQL",
-		"setup":"设置",
-		"apache22":"警告:当前为php-fpm模式,将不被Apache2.2支持,请重新安装此PHP版本!",
-		"apache24":"警告:当前为php5_module模式,将不被nginx/apache2.4支持,请重新安装此PHP版本!",
-		"apache22_err":"Apache2.2不支持多PHP版本共存,请先卸载已安装PHP版本,再安装此版本!",
-		"mysql_f":"注意: 安装新的MySQL版本,会覆盖数据库数据,请先备份数据库!",
-		"mysql_d":"抱歉,出于安全考虑,请先到[数据库]管理备份数据库,并中删除所有数据库!",
-		"fun_ps1":"添加要被禁止的函数名,如: exec",
-		"fun_ps2":"在此处可以禁用指定函数的调用,以增强环境安全性!",
-		"fun_ps3":"强烈建议禁用如exec,system等危险函数!",
-		"fun_msg":"您输入的函数已被禁用!",
-		"nginx_status":"负载状态",
-		"nginx_version":"切换版本",
-		"waf_title":"过滤器",
-		"web_service":"Web服务",
-		"waf_not":"您当前Nginx版本不支持waf模块,请安装Nginx1.12,重装Nginx不会丢失您的网站配置!",
-		"waf_edit":"编辑规则",
-		"waf_up":"上传限制",
-		"waf_input1":"URL过滤",
-		"waf_input2":"Cookie过滤",
-		"waf_input3":"POST过滤",
-		"waf_input4":"防CC攻击",
-		"waf_input5":"记录防御信息",
-		"waf_input6":"CC攻击触发频率(次)",
-		"waf_input7":"CC攻击触发周期",
-		"waf_input8":"IP白名单",
-		"waf_input9":"IP黑名单",
-		"waf_ip":"IP地址",
-		"waf_up_title":"文件上传后缀黑名单",
-		"waf_up_from1":"添加禁止上传的扩展名,如: zip",
-		"waf_up_from2":"扩展名",
-		"waf_url_white":"URL白名单",
-		"waf_index":"警告内容",
-		"waf_cloud":"从云端更新",
-		"waf_update":"正在更新规则文件,请稍候..",
-		"waf_cc_err":"CC防御配置值超出可用值 (频率1-3000|周期1-1800)",
-		"php_version":"php版本",
-		"save_path":"存储位置",
-		"service":"服务",
-		"safe":"安全设置",
-		"log":"日志",
-		"mysql_to_msg":"迁移数据库文件过程中将会停止数据库运行,继续吗?",
-		"mysql_to_msg1":"正在迁移文件,请稍候...",
-		"mysql_to":"迁移",
-		"mysql_log_close":"清空",
-		"mysql_log_bin":"二进制日志",
-		"mysql_log_err":"错误日志",
-		"mysql_log_ps1":"当前没有日志内容!",
-		"mysql_port_title":"修改数据库端口可能会导致您的站点无法连接数据库,确定要修改吗?",
-		"select_version":"选择版本",
-		"version_to":"切换",
-		"pma_port":"访问端口",
-		"pma_port_title":"phpmyadmin访问端口",
-		"pma_pass":"密码访问",
-		"pma_user":"授权账号",
-		"pma_pass1":"访问密码",
-		"pma_pass2":"重复密码",
-		"pma_ps":"为phpmyadmin增加一道访问安全锁",
-		"pma_pass_close":"您真的要关闭访问认证吗?",
-		"pma_pass_empty":"授权用户或密码不能为空!",
-		"menu_temp":"正在获取模板...",
-		"menu_phpsafe":"php守护已启动，无需设置",
-		"qiniu_lise":"正在从云端获取...",
-		"qiniu_file_title":"文件列表",
-		"qiniu_th1":"名称",
-		"qiniu_th2":"类型",
-		"qiniu_th3":"大小",
-		"qiniu_th4":"更新时间",
-		"mysql_del_err":"抱歉,为安全考虑,请先到[数据库]管理备份数据库并中删除所有数据库!",
-		"uninstall_confirm":"您真的要卸载[{1}-{2}]吗?",
-		"from_err":"表单错误!",
-		"lib_the":"正在提交配置,请稍候...",
-		"lib_config":"配置",
-		"lib_insatll_confirm":"您真的要安装[{1}]插件吗？",
-		"lib_uninsatll_confirm":"您真的要卸载[{1}]插件吗？",
-		"lib_install":"安装插件",
-		"lib_uninstall":"卸载插件",
-		"lib_install_the":"正在安装,请稍候...",
-		"lib_uninstall_the":"正在卸载,请稍候...",
-		"mysql_set_msg":"优化方案",
-		"mysql_set_select":"请选择",
-		"mysql_set_maxmem":"最大使用内存",
-		"mysql_set_key_buffer_size":"用于索引的缓冲区大小",
-		"mysql_set_query_cache_size":"查询缓存,不开启请设为0",
-		"mysql_set_tmp_table_size":"临时表缓存大小",
-		"mysql_set_innodb_buffer_pool_size":"Innodb缓冲区大小",
-		"mysql_set_innodb_log_buffer_size":"Innodb日志缓冲区大小",
-		"mysql_set_sort_buffer_size":"每个线程排序的缓冲大小",
-		"mysql_set_read_buffer_size":"读入缓冲区大小",
-		"mysql_set_read_rnd_buffer_size":"随机读取缓冲区大小",
-		"mysql_set_join_buffer_size":"关联表缓存大小",
-		"mysql_set_thread_stack":"每个线程的堆栈大小",
-		"mysql_set_binlog_cache_size":"二进制日志缓存大小(4096的倍数)",
-		"mysql_set_thread_cache_size":"线程池大小",
-		"mysql_set_table_open_cache":"表缓存(最大不要超过2048)",
-		"mysql_set_max_connections":"最大连接数",
-		"mysql_set_restart":"重启数据库",
-		"mysql_set_conn":"连接数",
-		"mysql_set_err":"错误,内存分配过高!<p style='color:red;'>物理内存: {1}MB<br>最大使用内存: {2}MB<br>可能造成的后果: 导致数据库不稳定,甚至无法启动MySQLd服务!</p>",
-		"mysql_status_title1":"启动时间",
-		"mysql_status_title2":"总连接次数",
-		"mysql_status_title3":"发送",
-		"mysql_status_title4":"接收",
-		"mysql_status_title5":"每秒查询",
-		"mysql_status_title6":"每秒事务",
-		"mysql_status_title7":"File",
-		"mysql_status_title8":"Position",
-		"mysql_status_title9":"活动/峰值连接数",
-		"mysql_status_title10":"线程缓存命中率",
-		"mysql_status_title11":"索引命中率",
-		"mysql_status_title12":"Innodb索引命中率",
-		"mysql_status_title13":"查询缓存命中率",
-		"mysql_status_title14":"创建临时表到磁盘",
-		"mysql_status_title15":"已打开的表",
-		"mysql_status_title16":"没有使用索引的量",
-		"mysql_status_title17":"没有索引的JOIN量",
-		"mysql_status_title18":"排序后的合并次数",
-		"mysql_status_title19":"锁表次数",
-		"mysql_status_ps1":"若值过大,增加max_connections",
-		"mysql_status_ps2":"若过低,增加thread_cache_size",
-		"mysql_status_ps3":"若过低,增加key_buffer_size",
-		"mysql_status_ps4":"若过低,增加innodb_buffer_pool_size",
-		"mysql_status_ps5":"若过低,增加query_cache_size",
-		"mysql_status_ps6":"若过大,尝试增加tmp_table_size",
-		"mysql_status_ps7":"若过大,增加table_cache_size",
-		"mysql_status_ps8":"若不为0,请检查数据表的索引是否合理",
-		"mysql_status_ps9":"若不为0,请检查数据表的索引是否合理",
-		"mysql_status_ps10":"若值过大,增加sort_buffer_size",
-		"mysql_status_ps11":"若值过大,请考虑增加您的数据库性能"
-	},
-	
-	"site":{
-		"running":"正在运行",
-		"running_title":"停用这个站点",
-		"running_text":"运行中",
-		"stopped":"已停止",
-		"stopped_title":"启用这个站点",
-		"backup_yes":"有备份",
-		"backup_no":"无备份",
-		"web_end_time":"永久",
-		"open_path_txt":"打开目录",
-		"set":"设置",
-		"site_del_title":"删除站点",
-		"site_no_data":"当前没有站点数据",
-		"site_null":"null",
-		"site_bak":"备注信息",
-		"saving_txt":"正在保存...",
-		"domain_err_txt":"域名格式不正确，请重新输入!",
-		"ftp":"FTP账号资料",
-		"ftp_tips":"只要将网站上传至以上FTP即可访问!",
-		"user":"用户",
-		"password":"密码",
-		"database_txt":"数据库账号资料",
-		"database":"数据库",
-		"database_name":"数据库名",
-		"database_set":"数据库设置",
-		"success_txt":"成功创建站点",
-		"php_ver":"PHP版本",
-		"site_add":"添加网站",
-		"domain":"域名",
-		"port":"端口",
-		"note":"备注",
-		"note_ph":"网站备注",
-		"web_root_dir":"网站根目录",
-		"web_dir":"网站目录",
-		"root_dir":"根目录",
-		"yes":"创建",
-		"no":"不创建",
-		"ftp_set":"FTP设置",
-		"ftp_help":"创建站点的同时，为站点创建一个对应FTP帐户，并且FTP目录指向站点所在目录。",
-		"database_help":"创建站点的同时，为站点创建一个对应的数据库帐户，方便不同站点使用不同数据库。",
-		"domain_help":"每行填写一个域名，默认为80端口<br>泛解析添加方法 *.domain.com<br>如另加端口格式为 www.domain.com:88",
-		"domain_len_msg":"不要超出20个字符",
-		"anti_XSS_attack":"防跨站攻击",
-		"write_access_log":"写访问日志",
-		"run_dir":"运行目录",
-		"site_help_1":"部分程序需要指定二级目录作为运行目录，如ThinkPHP5，Laravel",
-		"site_help_2":"选择您的运行目录，点保存即可",
-		"default_doc_help":"默认文档，每行一个，优先级由上至下。",
-		"site_stop_txt":"站点停用后将无法访问，您真的要停用这个站点吗？",
-		"site_start_txt":"即将启动站点，您真的要启用这个站点吗？",
-		"site_del_info":"是否要删除同名的FTP、数据库、根目录",
-		"all_del_info":"同时删除站点根目录",
-		"all_del_site":"批量删除站点",
-		"del_err":"以下站点删除失败",
-		"click_access":"点击访问",
-		"operate":"操作",
-		"domain_man":"域名管理",
-		"unresolved":"未解析",
-		"parsed":"已解析",
-		"this_domain_un":"该域名未解析",
-		"analytic_ip":"域名解析IP为",
-		"current_server_ip":"当前服务器IP",
-		"parsed_info":"仅供参考,使用CDN的用户请无视",
-		"domain_empty":"域名不能为空!",
-		"domain_last_cannot":"最后一个域名不能删除",
-		"domain_del_confirm":"您真的要从站点中删除这个域名吗？",
-		"webback_del_confirm":"真的要删除备份包吗?",
-		"del_bak_file":"删除备份文件",
-		"filename":"文件名称",
-		"filesize":"文件大小",
-		"backuptime":"打包时间",
-		"backup_title":"打包备份",
-		"public_set":"全局设置",
-		"local_site":"本站",
-		"setindex":"设置网站默认文档",
-		"default_doc":"默认文档",
-		"default_site":"默认站点",
-		"default_site_yes":"设置默认站点",
-		"default_site_no":"未设置默认站点",
-		"default_site_help_1":"设置默认站点后,所有未绑定的域名和IP都被定向到默认站点",
-		"default_site_help_2":"可有效防止恶意解析",
-		"site_menu_1":"子目录绑定",
-		"site_menu_2":"网站目录",
-		"site_menu_3":"流量限制",
-		"site_menu_4":"伪静态",
-		"site_menu_5":"默认文档",
-		"site_menu_6":"配置文件",
-		"site_menu_7":"SSL",
-		"site_menu_8":"PHP版本",
-		"site_menu_9":"Tomcat",
-		"site_menu_10":"301重定向",
-		"site_menu_11":"反向代理",
-		"site_menu_12":"防盗链",
-		"website_change":"站点修改",
-		"addtime":"添加时间",
-		"the_msg":"正在提交任务...",
-		"start_scan":"开始扫描",
-		"update_lib":"更新特征库",
-		"scanned":"已扫描",
-		"risk_quantity":"风险数量",
-		"danger_fun":"危险函数",
-		"danger_fun_no":"未禁用危险函数",
-		"danger":"危险",
-		"file":"文件",
-		"ssh_port":"SSH端口",
-		"high_risk":"高危",
-		"sshd_tampering":"sshd文件被篡改",
-		"xss_attack":"跨站攻击",
-		"site_xss_attack":"站点未开启防跨站攻击!",
-		"mod_time":"修改时间",
-		"code":"代码",
-		"behavior":"行为",
-		"risk":"风险",
-		"details":"详情",
-		"to_update":"正在更新，请稍候...",
-		"limit_net_1":"论坛/博客",
-		"limit_net_2":"图片站",
-		"limit_net_3":"下载站",
-		"limit_net_4":"商城",
-		"limit_net_5":"门户",
-		"limit_net_6":"企业站",
-		"limit_net_7":"视频站",
-		"limit_net_8":"启用流量控制",
-		"limit_net_9":"限制方案",
-		"limit_net_10":"并发限制",
-		"limit_net_11":"限制当前站点最大并发数",
-		"limit_net_12":"单IP限制",
-		"limit_net_13":"限制单个IP访问最大并发数",
-		"limit_net_14":"流量限制",
-		"limit_net_15":"限制每个请求的流量上限（单位：KB）",
-		"subdirectories":"子目录",
-		"url_rewrite_alter":"你真的要为这个子目录创建独立的伪静态规则吗？",
-		"rule_cov_tool":"规则转换工具",
-		"a_c_n":"Apache转Nginx",
-		"save_as_template":"另存为模板",
-		"url_rw_help_1":"请选择您的应用，若设置伪静态后，网站无法正常访问，请尝试设置回default",
-		"url_rw_help_2":"您可以对伪静态规则进行修改，修改完后保存即可。",
-		"config_url":"配置伪静态规则",
-		"d_s_empty":"域名和子目录名称不能为空",
-		"s_bin_del":"您真的要删除这个子目录绑定吗？",
-		"proxy_url":"目标URL",
-		"proxy_url_info":"请填写完整URL,例：http://www.test.com",
-		"proxy_domain":"发送域名",
-		"proxy_domian_info":"发送到目标服务器的域名,例：www.test.com",
-		"proxy_cache":"开启缓存",
-		"con_rep":"内容替换",
-		"con_rep_info":"被替换的文本,可留空",
-		"to_con":"替换为,可留空",
-		"proxy_enable":"启用反向代理",
-		"proxy_help_1":"目标Url必需是可以访问的，否则将直接502",
-		"proxy_help_2":"默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名",
-		"proxy_help_3":"若您是被动代理，请在发送域名处填写上目标站点的域名",
-		"proxy_help_4":"若您不需要内容替换功能，请直接留空",
-		"proxy_help_5":"可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png",
-		"access_domain":"访问域名",
-		"all_site":"整站",
-		"target_url":"目标URL",
-		"eg_url":"请填写完整URL,例：http://www.test.com",
-		"enable_301":"启用301",
-		"to301_help_1":"选择[整站]时请不要将目标URL设为同一站点下的域名.",
-		"to301_help_2":"取消301重定向后，需清空浏览器缓存才能看到生效结果.",
-		"bt_ssl":"SSL",
-		"lets_ssl":"Let\'s Encrypt免费证书",
-		"other":"其它",
-		"other_ssl":"其他证书",
-		"use_other_ssl":"使用其他证书",
-		"ssl_help_1":"本站点未设置SSL，如需设置SSL，请选择切换类目申请开启SSL<br><p style='color:red;'>关闭SSL以后,请务必清除浏览器缓存再访问站点</p>",
-		"ssl_help_2":"已为您自动生成Let\'s Encrypt免费证书；",
-		"ssl_help_3":"如需使用其他SSL,请切换其他证书后粘贴您的KEY以及PEM内容，然后保存即可。",
-		"ssl_key":"密钥(KEY)",
-		"ssl_crt":"证书(PEM格式)",
-		"ssl_close":"关闭SSL",
-		"bt_bind_no":"未绑定账号，请注册绑定，绑定账号(非论坛账号)可实现一键部署SSL",
-		"bt_user":"账号",
-		"login":"登录",
-		"bt_reg":"注册账号",
-		"bt_ssl_help_1":"SSL证书为亚洲诚信证书，需要实名认证才能申请使用",
-		"bt_ssl_help_2":"已有账号请登录绑定",
-		"bt_ssl_help_3":"SSL申请的是TrustAsia DV SSL CA - G5 原价：1900元/1年，用户免费！",
-		"bt_ssl_help_4":"一年满期后免费颁发。",
-		"btapply":"申请",
-		"endtime":"到期时间",
-		"status":"状态",
-		"bt_ssl_help_5":"申请之前，请确保域名已解析，如未解析会导致审核失败",
-		"bt_ssl_help_6":"SSL申请的是免费版TrustAsia DV SSL CA - G5证书，仅支持单个域名申请",
-		"bt_ssl_help_7":"有效期1年，不支持续签，到期后需要重新申请",
-		"bt_ssl_help_8":"Let\'s Encrypt免费证书，有效期3个月，支持多域名。默认会自动续签",
-		"bt_ssl_help_9":"若您的站点使用了CDN或301重定向会导致续签失败",
-		"bt_ssl_help_10":"粘贴您的*.key以及*.pem内容，然后保存即可。",
-		"phone_input":"请输入手机号码",
-		"ssl_apply_1":"正在提交订单，请稍后..",
-		"ssl_apply_2":"正在校验域名，请稍后..",
-		"ssl_apply_3":"正在部署证书，请稍后..",
-		"ssl_apply_4":"正在更新证书，请稍后..",
-		"lets_help_1":"不用实名认证，浏览器兼容较低，申请存在一定失败率",
-		"lets_help_2":"let's Encrypt证书有效期为3个月",
-		"lets_help_3":"3个月有效期后自动续签",
-		"get_ssl_list":"正在获取证书列表，请稍后..",
-		"order_success":"订单完成",
-		"deploy":"部署",
-		"deployed":"已部署",
-		"domain_wait":"待域名确认",
-		"domain_validate":"验证域名",
-		"domain_check":"请检查域名是否解析到本服务器",
-		"update_ssl":"更新证书",
-		"get_ssl_err":"证书获取失败",
-		"get_ssl_err1":"证书获取失败，返回如下错误信息",
-		"err_type":"错误类型",
-		"ssl_close_info":"已关闭SSL,请务必清除浏览器缓存后再访问站点!",
-		"switch":"切换",
-		"switch_php_help1":"请根据您的程序需求选择版本",
-		"switch_php_help2":"若非必要,请尽量不要使用PHP5.2,这会降低您的服务器安全性；",
-		"switch_php_help3":"PHP7不支持mysql扩展，默认安装mysqli以及mysql-pdo。",
-		"enable_nodejs":"启用Node.js",
-		"nodejs_help1":"当前版本为Node.js",
-		"nodejs_help2":"Node.js可以与PHP共存,但无法与Tomcat共存；",
-		"nodejs_help3":"若您的Node.js应用中有php脚本,访问时请添加.php扩展名",
-		"a_n_n":"apache2.2暂不支持Tomcat!",
-		"enable_tomcat":"启用Tomcat",
-		"tomcat_help1":"当前版本为Tomcat",
-		"tomcat_help2":"若您需要其它版本,请到软件管理 - 所有软件 中切换；",
-		"tomcat_help3":"部署顺序: 安装Tomcat >> 创建站点 >> 上传并配置项目 >> 启用Tomcat",
-		"tomcat_help4":"若您的tomcat应用中有php脚本,访问时请添加.php扩展名",
-		"tomcat_help5":"开启成功后,大概需要1-5分钟时间生效!",
-		"tomcat_err_msg":"您没有安装Tomcat，请先安装!",
-		"tomcat_err_msg1":"请先安装Tomcat!",
-		"web_config_help":"此处为站点主配置文件,若您不了解配置规则,请勿随意修改.",
-		"rewritename":"0.当前",
-		"template_empty":"模板名称不能为空",
-		"save_rewrite_temp":"保存为Rewrite模板",
-		"template_name":"模板名称",
-		"change_defalut_page":"修改默认页",
-		"err_404":"404错误页",
-		"empty_page":"空白页",
-		"default_page_stop":"默认站点停止页"
-	},
-	
-	"public":{
-		"success":"操作成功!",
-		"error":"操作失败!",
-		"add_success":"添加成功!",
-		"del_success":"删除成功",
-		"save":"保存",
-		"edit":"修改",
-		"edit_ok":"修改成功!",
-		"edit_err":"修改失败!",
-		"know":"知道了",
-		"close":"关闭",
-		"cancel":"取消",
-		"ok":"确定",
-		"empty":"清空",
-		"submit":"提交",
-		"exec":"执行",
-		"script":"脚本",
-		"log":"日志",
-		"del":"删除",
-		"add":"添加",
-		"the_get":"正在获取,请稍候...",
-		"fresh":"刷新",
-		"config":"正在设置...",
-		"config_ok":"设置成功!",
-		"the":"正在处理,请稍候...",
-		"user":"帐号",
-		"pass":"密码",
-		"read":"正在读取,请稍候...",
-		"pre":"百分比",
-		"num":"次数",
-		"byte":"字节",
-		"input_err":"表单不合法,请重新输入!",
-		"the_add":"正在添加,请稍候...",
-		"the_del":"正在删除,请稍候...",
-		"msg":"提示",
-		"list_empty":"列表为空!",
-		"all":"所有",
-		"upload":"上传",
-		"download":"下载",
-		"action":"操作",
-		"warning":"警告",
-		"return":"返回",
-		"help":"帮助",
-		"list":"列表",
-		"off":"关闭",
-		"on":"开启"
-	}
-}
diff --git a/route/static/language/Simplified_Chinese/log.json b/route/static/language/Simplified_Chinese/log.json
deleted file mode 100755
index bf0b8cb02..000000000
--- a/route/static/language/Simplified_Chinese/log.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-	"TYPE_SITE":"网站管理",
-	"TYPE_LOGIN":"用户登录",
-	"TYPE_DATABASE":"数据库管理",
-	"TYPE_FTP":"FTP管理",
-	"TYPE_FILE":"文件管理",
-	"TYPE_SETUP":"安装器",
-	"TYPE_SOFT":"软件管理",
-	"TYPE_SOFE":"守护程序",
-	"TYPE_CONFIG":"面板设置",
-	"TYPE_PROCESS":"进程管理",
-	"TYPE_PANEL":"面板配置",
-	"TYPE_PHP":"PHP配置",
-	"TYPE_CRON":"计划任务",
-	"TYPE_FIREWALL":"防火墙管理",
-	"DOMAIN_ADD_SUCCESS":"网站[{1}]添加域名[{2}]成功!",
-	"DOMAIN_DEL_SUCCESS":"网站[{1}]删除域名[{2}]成功!",
-	"SITE_ADD_SUCCESS":"添加网站[{1}]成功!",
-	"SITE_DEL_SUCCESS":"删除网站[{1}]成功!",
-	"SITE_SSL_SAVE_SUCCESS":"证书已保存!",
-	"SITE_SSL_OPEN_SUCCESS":"网站[{1}]开启SSL成功!",
-	"SITE_SSL_CLOSE_SUCCESS":"网站[{1}]关闭SSL成功!",
-	"SITE_STOP_SUCCESS":"网站[{1}]已被停用!",
-	"SITE_START_SUCCESS":"网站[{1}]已被启用!",
-	"SITE_NETLIMIT_CLOSE_SUCCESS":"网站[{1}]流量限制已关闭!",
-	"SITE_NETLIMIT_OPEN_SUCCESS":"网站[{1}]流量限制已开启!",
-	"SITE_BINDING_ADD_SUCCESS":"网站[{1}]子目录[{2}]绑定到[{3}]",
-	"SITE_BINDING_DEL_SUCCESS":"删除网站[{1}]子目录[{2}]绑定",
-	"SITE_INDEX_SUCCESS":"网站[{1}]的默认文档设置为[{2}]",
-	"SITE_PATH_SUCCESS":"修改网站[{1}]物理路径成功!",
-	"SITE_PHPVERSION_SUCCESS":"将网站[{1}]PHP版本切换为[{2}]!",
-	"SITE_BACKUP_SUCCESS":"备份网站[{1}]成功!",
-	"SITE_BACKUP_DEL_SUCCESS":"删除网站[{1}]的备份[{2}]成功!",
-	"SITE_AUTH_OPEN_SUCCESS":"设置网站[{1}]为需要密码认证!",
-	"SITE_AUTH_CLOSE_SUCCESS":"清除网站[{1}]的密码认证!",
-	"SITE_TOMCAT_OPEN":"开启站点[{1}]的Tomcat支持!",
-	"SITE_TOMCAT_CLOSE":"关闭站点[{1}]的Tomcat支持!",
-	"SITE_SCAN_ADD":"添加目录[{1}]木马扫描任务!",
-	"SITE_EXPIRE_SUCCESS":"设置站点[{1}]到期日期为[{2}]!",
-	"SOFT_PHPMYADMIN_STATUS":"PHPMyAdmin已{1}!",
-	"SOFT_PHPMYADMIN_PHP":"修改PHPMyAdmin运行PHP版本为PHP-{1}!",
-	"SOFT_PHPMYADMIN_PORT":"修改PHPMyAdmin访问端口为{1}!",
-	"LOG_CLOSE":"面板操作日志已清空!",
-	"KILL_PROCESS":"结束进程[{1}][{2}]成功!",
-	"USER_PASSWORD_SUCCESS":"修改用户[{1}]密码成功!",
-	"USER_USERNAME_SUCCESS":"用户名从[{1}]修改为[{2}]",
-	"PANEL_SET_SUCCESS":"设置面板端口[{1}],域名[{2}],默认备份路径[{3}],默认网站路径[{4}],服务器IP[{5}],授权IP[{6}]!",
-	"PHP_PATHINFO_SUCCESS":"设置PHP-{1} PATH_INFO模块为[{2}]!",
-	"PHP_UPLOAD_MAX":"设置PHP-{1}最大上传大小为[{2}MB]!",
-	"PHP_DISABLE_FUNCTION":"修改PHP-{1}的禁用函数为[{2}]",
-	"PHP_TIMEOUT":"设置PHP-{1}最大脚本超时时间为[{2}秒]!",
-	"PHP_CHILDREN":"设置PHP-{1}并发设置,max_children={2},start_servers={3},min_spare_servers={4},max_spare_servers={5}",
-	"DATE_SUCCESS":"同步服务器时间成功!",
-	"CONTROL_CLOSE":"监控记录已清空!",
-	"CONTROL_OPEN":"开启监控服务,记录保存[{1}]天!",
-	"CONTROL_CLOSE":"监控服务已关闭!",
-	"CRONTAB_DEL":"删除计划任务[{1}]成功!",
-	"DATABASE_ADD_SUCCESS":"添加数据库[{1}]成功!",
-	"DATABASE_ADD_ERR":"添加数据库[{1}]失败!,{2}",
-	"DATABASE_DEL_SUCCESS":"删除数据库[{1}]成功!",
-	"DATABASE_DEL_ERR":"删除数据库[{1}]失败!,{2}",
-	"DATABASE_ROOT_SUCCESS":"数据库root密码修改成功!",
-	"DATABASE_PASS_SUCCESS":"修改数据库[{1}]密码成功!",
-	"DATABASE_PASS_ERROR":"修改数据库[{1}]密码失败! => {2}",
-	"DATABASE_BACKUP_SUCCESS":"备份数据库[{1}]成功!",
-	"DATABASE_BACKUP_DEL_SUCCESS":"删除数据库[{1}]的备份[{2}]成功!",
-	"DATABASE_BACKUP_DEL_ERR":"删除数据库[{1}]的备份[{2}]失败! => {3}",
-	"DATABASE_INPUT_ERR":"导入数据库[{1}]失败, => {2}",
-	"DATABASE_ACCESS_ERR":"设置数据库权限[{1}]失败 => {2}",
-	"FILE_UPLOAD_SUCCESS":"上传文件[{1}] 到 [{2}]成功!",
-	"FILE_CREATE_SUCCESS":"创建文件[{1}]成功!",
-	"DIR_CREATE_SUCCESS":"创建目录[{1}]成功!",
-	"DIR_DEL_SUCCESS":"删除目录[{1}]成功!",
-	"FILE_DEL_SUCCESS":"删除文件[{1}]成功!",
-	"FILE_MOVE_RECYCLE_BIN":"移动文件[{1}]到回收站成功!",
-	"FILE_MOVE_RECYCLE_BIN_ERR":"移动文件[{1}]到回收站失败!",
-	"FILE_RE_RECYCLE_BIN_ERR":"从回收站恢复[{1}]失败!",
-	"FILE_RE_RECYCLE_BIN":"从回收站恢复[{1}]成功!",
-	"FILE_DEL_RECYCLE_BIN":"已彻底从回收站删除{1}!",
-	"FILE_CLOSE_RECYCLE_BIN":"已清空回收站!",
-	"FILE_OFF_RECYCLE_BIN":"已关闭回收站功能!",
-	"FILE_ON_RECYCLE_BIN":"已开启回收站功能!",
-	"FILE_COPY_SUCCESS":"复制文件[{1}]到[{2}]成功!",
-	"DIR_COPY_SUCCESS":"复制目录[{1}]到[{2}]成功!",
-	"MOVE_SUCCESS":"移动文件或目录[{1}]到[{2}]成功!",
-	"FILE_SAVE_SUCCESS":"文件[{1}]保存成功!",
-	"ZIP_SUCCESS":"压缩文件[{1}]到[{2}]成功!",
-	"UNZIP_SUCCESS":"解压文件[{1}]到[{2}]成功!",
-	"FILE_ACCESS_SUCCESS":"设置[{1}]权限为[{2}]所有者为[{3}]",
-	"SITE_LOG_CLOSE":"网站日志已被清空!",
-	"FILE_ALL_ACCESS":"批量设置权限成功!",
-	"FILE_ALL_DEL":"批量设置权限成功!",
-	"FILE_ALL_COPY":"从[{1}]批量复制到[{2}]成功",
-	"FILE_ALL_MOTE":"从[{1}]批量移动到[{2}]成功",
-	"FILE_DOWNLOAD":"下载文件[{1}]到[{2}]",
-	"PLUGIN_ADD":"添加安装任务[{1}-{2}]成功",
-	"PLUGIN_UNINSTALL":"卸载[{1}-{2}]成功",
-	"PLUGIN_UNINSTALL_SOFT":"卸载软件[{1}]成功",
-	"PLUGIN_INSTALL_LIB":"安装插件[{1}]成功",
-	"PLUGIN_UNINSTALL_LIB":"卸载插件[{1}]成功",
-	"FIREWALL_DROP_IP":"屏蔽IP[{1}]成功!",
-	"FIREWALL_ACCEPT_IP":"解除IP[{1}]的屏蔽!",
-	"FIREWALL_ACCEPT_PORT":"放行端口[{1}]成功!",
-	"FIREWALL_DROP_PORT":"删除防火墙放行端口[{1}]成功!",
-	"FIREWALL_SSH_PORT":"改SSH端口为[{1}]成功!",
-	"FTP_ADD_SUCCESS":"添加FTP用户[{1}]成功!",
-	"FTP_ADD_ERR":"添加FTP用户[{1}]失败! => {2}",
-	"FTP_DEL_SUCCESS":"删除FTP用户[{1}]成功!",
-	"FTP_DEL_ERR":"删除FTP用户[{1}]失败! => {2}",
-	"FTP_PASS_SUCCESS":"FTP用户[{1}]密码修改成功!",
-	"FTP_PASS_ERR":"FTP用户[{1}]密码修改失败! => {2}",
-	"FTP_STATUS":"{1}FTP用户[{2}]成功!",
-	"FTP_STATUS_ERR":"{1}FTP用户[{2}]失败! => {3}",
-	"FTP_PORT":"修改FTP端口为[{1}]成功!",
-	"FTP_PORT_ERR":"修改FTP端口失败! => {1}",
-	"CONF_CHECK_ERR":"配置文件错误: {1}",
-	"MYSQL_CHECK_ERR":"检测到MySQL配置文件异常,可能导致mysqld服务无法正常启动,已自动修复!",
-	"SYS_EXEC_ERR":"执行失败: {1}",
-	"SYS_EXEC_SUCCESS":"{1}执行成功",
-	"LOGIN_ERR_CODE":"<a style='color:red;'>验证码错误</a>,帐号:{1},验证码:{2},登录IP:{3}",
-	"LOGIN_ERR_PASS":"<a style='color:red;'>密码错误</a>,帐号:{1},密码:{2},登录IP:{3}",
-	"LOGIN_SUCCESS":"<a style='color:green;'>登录成功</a>,帐号:{1},登录IP:{2}"
-}
diff --git a/route/static/language/Simplified_Chinese/public.json b/route/static/language/Simplified_Chinese/public.json
deleted file mode 100755
index da483db40..000000000
--- a/route/static/language/Simplified_Chinese/public.json
+++ /dev/null
@@ -1,303 +0,0 @@
-{
-	"NAME":"Linux面板",
-	"BRAND":"MW",
-	"PRODUCT":"Linux面板",
-	"PAGE_ERR_TITLE":"拒绝访问",
-	"PAGE_ERR_DOMAIN_H1":"抱歉,您没有访问权限",
-	"PAGE_ERR_DOMAIN_P1":"请使用正确的域名访问!",
-	"PAGE_ERR_DOMAIN_P2":"查看许可域名: cat /www/server/panel/data/domain.conf",
-	"PAGE_ERR_DOMAIN_P3":"关闭访问限制: rm -f /www/server/panel/data/domain.conf",
-	"PAGE_ERR_IP_H1":"抱歉,您的IP没有被授权",
-	"PAGE_ERR_IP_P1":"您当前的IP为[{1}]，请使用正确的IP访问!",
-	"PAGE_ERR_IP_P2":"查看授权IP: cat /www/server/panel/data/limitip.conf",
-	"PAGE_ERR_IP_P3":"关闭访问限制: rm -f /www/server/panel/data/limitip.conf",
-	"PAGE_ERR_404_TITLE":"404 Not Found",
-	"PAGE_ERR_404_H1":"抱歉,页面不存在",
-	"PAGE_ERR_404_P1":"您请求的页面不存在,请检查URL地址是否正确!",
-	"PAGE_ERR_500_TITLE":"500 Internal Server Error",
-	"PAGE_ERR_500_H1":"抱歉,程序异常",
-	"PAGE_ERR_500_P1":"您请求的页面因发生异常而中断!",
-	"PAGE_ERR_HELP":"请求帮助",
-	"ARGS_ERR":"指定参数无效!",
-	"CODE_BOOM":"请不要频繁刷新验证码!",
-	"LOGIN_USER_EMPTY":"用户名或密码不能为空!",
-	"LOGIN_ERR_LIMIT":"您多次登录失败,暂时禁止登录!",
-	"LOGIN_SUCCESS":"登录成功,正在跳转...",
-	"LOGIN_USER_ERR":"用户名或密码错误,您还可以尝试[{1}]次!",
-	"ERROR":"操作失败",
-	"SUCCESS":"操作成功",
-	"START":"启动",
-	"STOP":"停止",
-	"OFF":"停用",
-	"ON":"启用",
-	"OPEN":"打开",
-	"CLOSE":"关闭",
-	"ADD_SUCCESS":"添加成功",
-	"ADD_ERROR":"添加失败",
-	"DEL_SUCCESS":"删除成功",
-	"DEL_ERROR":"删除失败",
-	"SET_SUCCESS":"设置成功",
-	"SET_ERROR":"设置失败",
-	"EDIT_SUCCESS":"修改成功",
-	"EDIT_ERROR":"修改失败",
-	"CONF_ERROR":"配置文件错误",
-	"PHP_GET_ERR":"PHP版本获取失败!",
-	"PHP_NOT_EXISTS":"指定PHP版本不存在!",
-	"DIR_EMPTY":"目录不能为空!",
-	"FILE_NOT_EXISTS":"指定文件不存在!",
-	"PATH_ERROR":"不能以系统关键目录作为站点目录",
-	"BACKUP_SUCCESS":"备份成功!",
-	"UPDATE_SUCCESS":"更新成功!",
-	"PANEL_UPDATE":"成功升级到{1}",
-	"PANEL_UPDATE_ERR_DOWN":"文件下载失败，请重试或在命令行手动升级!",
-	"PANEL_UPDATE_ERR_NEW":"当前已是最新版本!",
-	"PANEL_UPDATE_MSG":"当前为正式版，已是最新版本，正式版更新周期一般一两个月更新一次，内测版每周三更新!",
-	"PANEL_UPDATE_MSG_TEST":"当前为内测版，已是最新版本，正式版更新周期一般一两个月更新一次，内测版每周三更新!",
-	"EXEC_ERR_TASK":"请等待所有安装任务完成再执行!",
-	"CONNECT_ERR":"连接服务器失败!",
-	"INPUT_PS":"填写备注",
-	"FILE_NOT_EXISTS":"文件{1}不存在!",
-	"SET_PORT_SUCCESS":"端口修改成功!",
-	"SITE_ADD_SUCCESS":"成功创建站点!",
-	"SITE_ADD_ERR_EXISTS":"您添加的站点已存在!",
-	"SITE_ADD_ERR_PORT":"端口范围不合法",
-	"SITE_ADD_ERR_PHPEMPTY":"PHP版本号不能为空",
-	"SITE_ADD_ERR_DOMAIN":"主域名格式不正确",
-	"SITE_ADD_ERR_DOMAIN_TOW":"主域名不能为泛解析",
-	"SITE_ADD_ERR_DOMAIN_EXISTS":"您添加的域名已存在",
-	"SITE_ADD_ERR_WRITE":"添加失败,写入配置错误!",
-	"SITE_DEL_SUCCESS":"站点删除成功!",
-	"SITE_ADD_DOMAIN":"域名添加成功!",
-	"SITE_ADD_DOMAIN_ERR_EXISTS":"指定域名已绑定过!",
-	"SITE_ADD_DOMAIN_ERR_POER":"端口范围不合法!",
-	"SITE_ADD_DOMAIN_ERR_FORMAT":"域名格式不正确!",
-	"SITE_ADD_DOMAIN_ERR_EMPTY":"域名不能为空!",
-	"SITE_DEL_DOMAIN_ERR_ONLY":"最后一个域名不能删除!",
-	"SITE_SSL_ERR_PRIVATE":"秘钥错误，请检查!",
-	"SITE_SSL_ERR_CERT":"证书错误，请检查!",
-	"SITE_SSL_SUCCESS":"证书已保存!",
-	"SITE_SSL_UPDATE_SUCCESS":"证书已更新!",
-	"SITE_SSL_OPEN_SUCCESS":"SSL开启成功!",
-	"SITE_SSL_CLOSE_SUCCESS":"SSL已关闭!",
-	"SITE_SSL_ERR_301":"检测到您的站点做了301重定向设置，请先关闭重定向!",
-	"SITE_SSL_ERR_DNS":"以下域名解析错误，或解析未生效:{1}",
-	"SITE_SSL_ERR_EMPTY":"请选择域名(不包括IP地址与泛域名)",
-	"SITE_SSL_ERR_RE":"索引到当前域名组件的证书尚未到期，不能重复申请，请尝试其它域名组合!",
-	"SITE_SSL_ERR_AU":"授权错误: 您的服务器最近提交了过多无效申请!",
-	"SITE_SSL_ERR_ACCESS":"Let's Encrypt证书获取失败，认证服务器无法访问您的站点!",
-	"SITE_START_SUCCESS":"站点已启用",
-	"SITE_STOP_SUCCESS":"站点已停用",
-	"SITE_NETLIMIT_ERR":"流量限制当前仅支持Nginx环境!",
-	"SITE_NETLIMIT_CLOSE_SUCCESS":"已关闭流量限制!",
-	"SITE_ADD_BINDING":"域名和子目录名称不能为空!",
-	"SITE_INDEX_ERR_FORMAT":"默认文档格式不正确，例：index.html",
-	"SITE_INDEX_ERR_EMPTY":"默认文档不能为空!",
-	"SITE_PATH_ERR_RE":"与原路径一致，无需修改!",
-	"SITE_PHPVERSION_ERR_A22":"Apache2.2不支持多PHP版本共存!",
-	"SITE_PHPVERSION_SUCCESS":"成功切换网站[{1}]的PHP版本为PHP-{2}",
-	"SITE_BASEDIR_OPEN_SUCCESS":"已打开防跨站设置!",
-	"SITE_BASEDIR_CLOSE_SUCCESS":"已清除防跨站设置!",
-	"SITE_PROXY_ERR_URL":"URL地址不正确!",
-	"SITE_PROXY_ERR_HOST":"发送域名格式不正确!",
-	"SITE_REWRITE_NOW":"当前",
-	"SITE_REWRITE_SAVE":"已保存URL重写规则到模板!",
-	"SITE_TOMCAT_OPEN":"开启成功,请测试jsp程序!",
-	"SITE_TOMCAT_CLOSE":"已关闭Tomcat映射!",
-	"SITE_SCAN_ADD":"已将扫描任务添加到队列!",
-	"SITE_EXPIRE_SUCCESS":"设置成功,站点到期后将自动停止!",
-	"SOFT_PHPVERSION_SET":"PHP版本修改成功!",
-	"SOFT_PHPVERSION_PS":"新的phpMyAdmin端口",
-	"SOFT_PHPVERSION_ERR_PORT":"与当前端口相同，无需修改!",
-	"SOFT_PHPVERSION_ERR_PORT_RE":"不能和面板设为同一端口!",
-	"LOG_CLOSE":"面板操作日志已清空!",
-	"KILL_PROCESS":"结束进程[{1}][{2}]成功!",
-	"KILL_PROCESS_ERR":"失败，无法结束此进程!",
-	"USER_PASSWORD_CHECK":"两次输入的密码不一致，请重新输入!",
-	"USER_USERNAME_CHECK":"两次输入的用户名不一致，请重新输入!",
-	"USER_PASSWORD_LEN":"用户密码不能小于5位!",
-	"USER_PASSWORD_SUCCESS":"密码修改成功!",
-	"USER_USERNAME_SUCCESS":"用户修改成功!",
-	"PORT_CHECK_EXISTS":"端口[{1}]已被占用!",
-	"PORT_CHECK_RANGE":"端口范围不正确!",
-	"PORT_CHECK_PS":"新的面板端口",
-	"PANEL_SAVE":"配置已保存",
-	"PHP_UPLOAD_MAX_ERR":"上传大小限制不能小于2MB",
-	"PHP_TIMEOUT_ERR":"请填写30-86400间的值!",
-	"DATE_SUCCESS":"同步服务器时间成功!",
-	"CONTROL_CLOSE":"监控服务已关闭!",
-	"CONTROL_ERR":"保存天数不合法!",
-	"PANEL_CLOSE":"面板已关闭!",
-	"PANEL_SSL_CLOSE":"SSL已关闭，请使用http协议访问面板!",
-	"PANEL_SSL_ERR":"开启失败，无法自动安装pyOpenSSL组件!<p>请尝试手动安装: pip install pyOpenSSL</p>",
-	"PANEL_SSL_OPEN":"开启成功，请使用https协议访问面板!",
-	"PANEL_SSL_ADD_EXISTS":"备注或面板地址重复!",
-	"PANEL_SSL_ADD_NOT_EXISTS":"指定面板资料不存在!",
-	"CRONTAB_TODAY":"每天",
-	"CRONTAB_TODAY_CYCLE":"每天, {1}点{2}分 执行",
-	"CRONTAB_N_TODAY":"每{1}天",
-	"CRONTAB_N_TODAY_CYCLE":"每隔{1}天, {2}点{3}分 执行",
-	"CRONTAB_HOUR":"每小时",
-	"CRONTAB_HOUR_CYCLE":"每小时, 第{1}分钟 执行",
-	"CRONTAB_N_HOUR":"每{1}小时",
-	"CRONTAB_N_HOUR_CYCLE":"每{1}小时, 第{2}分钟 执行",
-	"CRONTAB_N_MINUTE":"每{1}分钟",
-	"CRONTAB_N_MINUTE_CYCLE":"每隔{1}分钟执行",
-	"CRONTAB_WEEK":"每周",
-	"CRONTAB_WEEK_CYCLE":"每周{1}, {2}点{3}分执行",
-	"CRONTAB_MONTH":"每月",
-	"CRONTAB_MONTH_CYCLE":"每月, {1}日 {2}点{3}分执行",
-	"CRONTAB_SUNDAY":"日",
-	"CRONTAB_MONDAY":"一",
-	"CRONTAB_TUESDAY":"二",
-	"CRONTAB_WEDNESDAY":"三",
-	"CRONTAB_THURSDAY":"四",
-	"CRONTAB_FRIDAY":"五",
-	"CRONTAB_SATURDAY":"六",
-	"CRONTAB_TASKNAME_EMPTY":"任务名称不能为空!",
-	"CRONTAB_TASKLOG_EMPTY":"当前日志为空!",
-	"CRONTAB_TASKLOG_CLOSE":"任务日志已清空!",
-	"CRONTAB_TASKLOG_CLOSE_ERR":"任务日志清空失败!",
-	"FILE_WRITE_ERR":"文件写入失败!",
-	"CRONTAB_TASK_EXEC":"任务已执行!",
-	"DATABASE_NAME_ERR":"数据库名称不合法!",
-	"DATABASE_NAME_ERR_T":"数据库名称不能带有特殊符号!",
-	"DATABASE_NAME_EXISTS":"数据库已存在!",
-	"DATABASE_NAME_LEN":"数据库名不能大于16位!",
-	"DATABASE_ERR_CONNECT":"数据库连接失败,请检查数据库服务是否启动!",
-	"DATABASE_ERR_PASS":"数据库管理密码错误!",
-	"DATABASE_ERR_NOT_EXISTS":"数据库用户不存在!",
-	"DATABASE_ERR_MYSQLDB":"MySQLdb组件缺失! <br>进入SSH命令行输入： pip install mysql-python",
-	"DATABASE_ROOT_SUCCESS":"数据库root密码修改成功!",
-	"DATABASE_PASS_ERR_NOT_EXISTS":"修改失败,数据库用户不存在!",
-	"DATABASE_PASS_SUCCESS":"修改数据库[{1}]密码成功!",
-	"DATABASE_PASS_ERROR":"修改数据库[{1}]密码失败!",
-	"DATABASE_INPUT_ERR_FORMAT":"请选择sql、gz、zip文件格式!",
-	"DATABASE_INPUT_ERR":"导入数据库失败!",
-	"DATABASE_INPUT_SUCCESS":"导入数据库成功!",
-	"DATABASE_SYNC_SUCCESS":"本次共同步了{1}个数据库!",
-	"DATABASE_GET_SUCCESS":"本次共从服务器获取了{1}个数据库!",
-	"DATABASE_TEST":"测试数据库",
-	"DATABASE_MOVE_RE":"与当前存储目录相同，无法迁移文件!",
-	"DATABASE_MOVE_ERR":"文件迁移失败!",
-	"DATABASE_MOVE_SUCCESS":"存储目录迁移成功!",
-	"LOG_CLOSE":"日志已清空",
-	"FILE_UPLOAD_SUCCESS":"上传成功!",
-	"FILE_EXISTS":"指定文件已存在!",
-	"DIR_EXISTS":"指定目录已存在!",
-	"DIR_NOT_EXISTS":"指定目录不存在!",
-	"DIR_ERR_NOT_EMPTY":"不能删除非空目录!",
-	"FILE_DANGER":"请不要花样作死",
-	"FILE_CREATE_SUCCESS":"文件创建成功!",
-	"FILE_CREATE_ERR":"文件创建失败!",
-	"DIR_CREATE_SUCCESS":"目录创建成功!",
-	"DIR_CREATE_ERR":"目录创建失败!",
-	"DIR_MOVE_RECYCLE_BIN":"已将目录移动到回收站!",
-	"FILE_MOVE_RECYCLE_BIN":"已将文件移动到回收站!",
-	"DIR_DEL_SUCCESS":"删除目录成功!",
-	"DIR_DEL_ERR":"删除目录失败!",
-	"FILE_DEL_SUCCESS":"删除文件成功!",
-	"FILE_DEL_ERR":"删除文件失败!",
-	"FILE_RE_RECYCLE_BIN_ERR":"恢复失败!",
-	"FILE_RE_RECYCLE_BIN":"恢复成功!",
-	"FILE_DEL_RECYCLE_BIN":"已彻底从回收站删除{1}!",
-	"FILE_CLOSE_RECYCLE_BIN":"已清空回收站!",
-	"FILE_OFF_RECYCLE_BIN":"已关闭回收站功能!",
-	"FILE_ON_RECYCLE_BIN":"已开启回收站功能!",
-	"FILE_COPY_SUCCESS":"文件复制成功!",
-	"FILE_COPY_ERR":"文件复制失败!",
-	"DIR_COPY_SUCCESS":"目录复制成功!",
-	"DIR_COPY_ERR":"目录复制失败!",
-	"MOVE_SUCCESS":"移动文件或目录成功!",
-	"MOVE_ERR":"移动文件或目录失败!",
-	"FILE_GET_ERR":"文件内容获取失败,格式不被支持!",
-	"FILE_SAVE_SUCCESS":"文件已保存!",
-	"FILE_SAVE_ERR":"文件保存失败!",
-	"ZIP_SUCCESS":"文件压缩成功!",
-	"ZIP_ERR":"文件压缩失败!",
-	"UNZIP_SUCCESS":"文件解压成功!",
-	"UNZIP_ERR":"文件解压失败!",
-	"UNZIP_ERR":"文件解压失败!",
-	"FILE_ALL_TIPS":"标记成功,请在目标目录点击粘贴所有按钮!",
-	"FILE_ALL_ACCESS":"批量设置权限成功!",
-	"FILE_ALL_DEL":"批量删除成功!",
-	"FILE_ALL":"批量操作成功[{1}],失败[{2}]",
-	"FILE_DOANLOAD":"已将下载任务添加到队列!",
-	"PLUGIN_ADD":"已将下载任务添加到队列!",
-	"PLUGIN_DEL":"任务已删除",
-	"PLUGIN_ACTION":"任务队列已激活",
-	"PLUGIN_UNINSTALL":"卸载成功",
-	"PLUGIN_INSTALL_ADD":"已将安装任务添加到队列",
-	"PLUGIN_INSTALL_SUCCESS":"安装成功!",
-	"PLUGIN_INSTALL_ERR":"安装成功!",
-	"PLUGIN_SORT":"排序已保存",
-	"PLUGIN_GET_HTML":"该插件没有配置模板!",
-	"PLUGIN_UPDATE_ERR":"您的插件列表已经是最新版本",
-	"PLUGIN_UPDATE":"成功从云端获取[{1}]个新插件,[{2}]个插件更新!",
-	"PLUGIN_INPUT_A":"请传入插件名称!",
-	"PLUGIN_INPUT_B":"该插件没有扩展方法!",
-	"PLUGIN_INPUT_C":"指定方法[{1}]不存在!",
-	"TASK_SLEEP":"等待执行...",
-	"FILE_SHELL_ERR":"抱歉,不支持[{1}]命令!",
-	"FILE_SHELL_EXEC":"命令已发送",
-	"FILE_SHELL_EMPTY":"当前没有SHELL在执行!",
-	"FIREWALL_IP_FORMAT":"您输入的IP地址不合法!",
-	"FIREWALL_IP_EXISTS":"您要放屏蔽的IP已存在屏蔽列表，无需重复处理!",
-	"FIREWALL_PORT_EXISTS":"您要放行的端口已存在，无需重复放行!",
-	"FIREWALL_PORT_PANEL":"失败，不能删除当前面板端口!",
-	"FIREWALL_SSH_STOP":"SSH服务已停用",
-	"FIREWALL_SSH_START":"SSH服务已启用",
-	"FIREWALL_SSH_PORT_ERR":"端口范围必需在22-65535之间!",
-	"FIREWALL_SSH_PORT_EXISTS":"指定端口为常用端口，请换一个试试!",
-	"FTP_USERNAME_ERR_T":"用户名不合法,不能带有特殊符号!",
-	"FTP_USERNAME_ERR_LEN":"用户名不合法,不能少于3个字符!",
-	"FTP_USERNAME_ERR_DIR":"不能以系统关键目录作为FTP目录!",
-	"FTP_USERNAME_ERR_EXISTS":"用户[{1}]已存在!",
-	"FTP_STATUS_ERR":"{1}FTP用户失败!",
-	"FTP_PORT_PS":"FTP端口",
-	"PAGE":{"PREV":"上一页","NEXT":"下一页","START":"首页","END":"尾页","COUNT_START":"共","COUNT_END":"条数据","FO":"从","LINE":"条"},
-	"SSL_CHECK_WRITE_ERR":"验证信息写入失败!",
-	"SSL_CHECK_DNS_ERR":"以下域名解析不正确，或解析未生效!<li style='color:red;'>{1}</li>",
-	"SSL_GET_SUCCESS":"获取成功!",
-	"SSL_NOT_BTUSER":"请绑定宝塔帐户!",
-	"SSL_BTUSER_UN":"已解除绑定!",
-	"WAF_NOT_NGINX":"当前只支持Nginx",
-	"WAF_NOT_NGINX_VERSION":"您当前的Nginx未安装WAF支持，请重新安装Nginx!",
-	"WAF_UPDATE":"更新成功!",
-	"WAF_CONF_NOT_EXISTS":"失败，指定配置值不存在!",
-	"WAF_CONF_EXISTS":"失败，指定配置值已存在!",
-	"WAF_CONF_ERR":"失败，设置值不合法!",
-	"CODE_ERR":"验证码错误,请重新输入!",
-	"CODE_TIMEOUT":"验证码已过期,请点验证码图片重新获取!",
-	"CODE_NOT_EXISTS":"验证码不存在!",
-	"REQUEST_ERR":"错误的请求!",
-	"SYS_BOOT_TIME":"{1}天{2}小时{3}分钟",
-	"SYS_NOT_INSTALL_APACHE":"执行失败,请检查是否安装Apache",
-	"SYS_CONF_APACHE_ERR":"Apache配置规则错误: <br><a style='color:red;'>{1}</a>",
-	"SYS_CONF_NGINX_REP":"因重装Nginx导致的配置文件不匹配已修正",
-	"SYS_CONF_NGINX_ERR":"Nginx配置规则错误: <br><a style='color:red;'>{1}</a>",
-	"SYS_EXEC_SUCCESS":"执行成功!",
-	"SYS_REBOOT":"命令发送成功!",
-	"TOMCAT_IP":"失败,主域名不能为IP地址!",
-	"RECYCLE_BIN_DB":"已成功将数据库移动到回收站!",
-	"RECYCLEDB":"已恢复数据库!",
-	"UNZIP_ERR_DIR":"不能在关键目录解压文件,这会导致系统目录的权限被替换.",
-	"PHP_CONF_1":"短标签支持",
-	"PHP_CONF_2":"ASP标签支持",
-	"PHP_CONF_3":"安全模式",
-	"PHP_CONF_4":"最大脚本运行时间",
-	"PHP_CONF_5":"最大输入时间",
-	"PHP_CONF_6":"脚本内存限制",
-	"PHP_CONF_7":"POST数据最大尺寸",
-	"PHP_CONF_8":"是否允许上传文件",
-	"PHP_CONF_9":"允许上传文件的最大尺寸",
-	"PHP_CONF_10":"允许同时上传文件的最大数量",
-	"PHP_CONF_11":"Socket超时时间",
-	"PHP_CONF_12":"错误级别",
-	"PHP_CONF_13":"是否输出详细错误信息",
-	"PHP_CONF_14":"是否开启pathinfo",
-	"PHP_CONF_15":"时区",
-	"NGINX_CONF_MSG1":"SSL相关配置，请勿删除或修改下一行带注释的404规则",
-	"NGINX_CONF_MSG2":"错误页配置，可以注释、删除或修改",
-	"NGINX_CONF_MSG3":"PHP引用配置，可以注释或修改",
-	"NGINX_CONF_MSG4":"URL重写规则引用,修改后将导致面板设置的伪静态规则失效"
-}
\ No newline at end of file
diff --git a/route/static/language/Simplified_Chinese/template.json b/route/static/language/Simplified_Chinese/template.json
deleted file mode 100755
index c39269f31..000000000
--- a/route/static/language/Simplified_Chinese/template.json
+++ /dev/null
@@ -1,299 +0,0 @@
-{
-	"index":{
-		"H1":"首页",
-		"H2":"服务器状态",
-		"V1":"版本",
-		"V2":"（测试版）",
-		"V3":"检查更新",
-		"S1":"系统:",
-		"S2":"获取中: ",
-		"S3":"已不间断运行: ",
-		"S4":" 获取中",
-		"S5":"重启服务器",
-		"S6":"重启面板",
-		"S7":"修复面板",
-		"L1":"管理",
-		"L2":"添加",
-		"L3":"个",
-		"N1":"网站",
-		"N2":"数据库",
-		"N3":"FTP",
-		"T1":"服务器状态",
-		"T2":"连接管理",
-		"T3":"进程管理",
-		"P1":"CPU使用率",
-		"P2":"内存使用率",
-		"P3":"点击释放内存",
-		"P4":"软件",
-		"NET1":"网络流量",
-		"NET2":"上行速度",
-		"NET3":"下行速度",
-		"NET4":"总发送",
-		"NET5":"总接收"
-	},
-	
-	"site":{
-		"H1":"首页",
-		"H2":"网站管理",
-		"SEARCH":"网站搜索",
-		"PS":"使用宝塔Linux面板创建站点时会自动创建权限配置，统一使用www用户。",
-		"BTN1":"添加站点",
-		"BTN2":"修改默认页",
-		"BTN3":"默认站点",
-		"BTN4":"删除选中",
-		"TH1":"域名",
-		"TH2":"网站状态",
-		"TH3":"备份",
-		"TH4":"网站目录",
-		"TH5":"到期日期",
-		"TH6":"备注",
-		"TH7":"操作",
-		"JS1":"请先安装Web服务器!",
-		"JS2":"去安装"
-	},
-	
-	"ftp":{
-		"H1":"首页",
-		"H2":"FTP管理",
-		"SEARCH":"FTP搜索",
-		"PS":"当前FTP地址为：",
-		"BTN1":"添加FTP",
-		"BTN2":"修改FTP端口",
-		"BTN3":"删除选中",
-		"TH1":"用户名",
-		"TH2":"密码",
-		"TH3":"状态",
-		"TH4":"根目录",
-		"TH5":"备注",
-		"TH6":"操作",
-		"JS1":"请先安装Prue-Ftpd!",
-		"JS2":"去安装"
-	},
-	
-	"database":{
-		"H1":"首页",
-		"H2":"数据库管理",
-		"SEARCH":"搜索数据库",
-		"BTN1":"添加数据库",
-		"BTN2":"root密码",
-		"BTN3":"phpMyAdmin",
-		"BTN4":"删除选中",
-		"BTNT1":"添加数据库",
-		"BTNT2":"设置MySQL管理员密码",
-		"BTNT3":"打开phpMyadmin",
-		"BTNT4":"删除选中项",
-		"TH1":"数据库名",
-		"TH2":"用户名",
-		"TH3":"密码",
-		"TH4":"备份",
-		"TH5":"备注",
-		"TH6":"操作",
-		"SP1":"同步选中",
-		"SP2":"同步所有",
-		"SP3":"从服务器获取",
-		"TP1":"将选中数据库信息同步到服务器",
-		"TP2":"将所有数据库信息同步到服务器",
-		"TP3":"从服务器获取数据库列表",
-		"JS1":"请先安装MySQL数据库!",
-		"JS2":"去安装"
-	},
-	
-	"config":{
-		"H1":"首页",
-		"H2":"面板设置",
-		"I1":"关闭面板",
-		"I2":"自动更新",
-		"I3":"面板SSL",
-		"C1":"设置",
-		"C2":"API设置",
-		"C3":"为了提高安全，请修改别名、默认端口、面板用户和密码!",
-		"C4":"保存",
-		"CT1":"别名",
-		"CT2":"面板端口",
-		"CT3":"域名",
-		"CT4":"授权IP",
-		"CT5":"默认建站目录",
-		"CT6":"默认备份目录",
-		"CT7":"服务器IP",
-		"CT8":"服务器时间",
-		"CT9":"面板用户",
-		"CT10":"面板密码",
-		"CT11":"绑定宝塔账号",
-		"CT12":"面板模板",
-		"CY1":"给面板取个别名，用于伪装面板",
-		"CY2":"建议端口范围8888 - 65535",
-		"CY3":"为面板绑定一个访问域名;注意：一旦绑定域名,只能通过域名访问面板!",
-		"CY4":"设置访问授权IP,多个请使用逗号(,)隔开;注意：一旦设置授权IP,只有指定IP的电脑能访问面板!",
-		"CY5":"新创建的站点,默认将保存到该目录的下级目录!",
-		"CY6":"网站和数据库的备份目录!",
-		"CY7":"默认为外网IP,若您在本地虚拟机测试,请填写虚拟机内网IP!",
-		"CY8":"同步",
-		"CY9":"修改",
-		"CY10":"修改",
-		"CY11":"绑定",
-		"CY12":"确定"
-	},
-	
-	"close":{
-		"TITLE":"面板已关闭",
-		"H1":"抱歉,管理员已关闭面板",
-		"P1":"开启命令: rm -f /www/server/panel/data/close.pl",
-		"NAME":"宝塔Linux面板",
-		"HELP":"请求帮助"
-	},
-	
-	"control":{
-		"H1":"首页",
-		"H2":"系统监控",
-		"C1":"开启监控",
-		"C2":"保存天数：",
-		"C3":"更改",
-		"C4":"清空记录",
-		"T1":"CPU",
-		"T2":"内存",
-		"T3":"磁盘IO",
-		"T4":"网络IO",
-		"S1":"区间检索：",
-		"S2":"自定义时间",
-		"D1":"昨天",
-		"D2":"今天",
-		"D3":"最近7天",
-		"D4":"最近30天",
-		"G1":"开始时间：",
-		"G2":"结束时间：",
-		"G3":"提交"
-	},
-	
-	"crontab":{
-		"H1":"首页",
-		"H2":"计划任务",
-		"H3":"添加计划任务",
-		"H4":"任务列表",
-		"PS":"任务类型包含以下部分：Shell脚本、备份网站、备份数据库、日志切割、释放内存、访问URL",
-		"T1":"任务类型",
-		"T2":"任务名称",
-		"T3":"执行周期",
-		"T4":"脚本内容",
-		"T5":"添加任务",
-		"TT1":"Shell脚本",
-		"TT2":"备份网站",
-		"TT3":"备份数据库",
-		"TT4":"日志切割",
-		"TT5":"释放内存",
-		"TT6":"访问URL",
-		"TZ1":"每天",
-		"TZ2":"N天",
-		"TZ3":"每小时",
-		"TZ4":"N小时",
-		"TZ5":"N分钟",
-		"TZ6":"每星期",
-		"TZ7":"每月",
-		"TZZ1":"周一",
-		"TZZ2":"周二",
-		"TZZ3":"周三",
-		"TZZ4":"周四",
-		"TZZ5":"周五",
-		"TZZ6":"周六",
-		"TZZ7":"周日",
-		"TZS1":"时",
-		"TZS2":"分",
-		"BTN1":"删除选中",
-		"TH1":"任务名称",
-		"TH2":"周期",
-		"TH3":"执行时机",
-		"TH4":"添加时间",
-		"TH5":"操作"
-	},
-	
-	"files":{
-		"BTN1":"后退",
-		"BTN2":"刷新",
-		"BTN3":"上传",
-		"BTN4":"远程下载",
-		"TI1":"下载文件到服务器",
-		"TI2":"图标排列",
-		"TI3":"列表排列",
-		"L1":"复制",
-		"L2":"剪切",
-		"L3":"压缩",
-		"L4":"权限",
-		"L5":"删除"
-	},
-	
-	"firewall":{
-		"H1":"首页",
-		"H2":"系统安全",
-		"H3":"端口控制 ",
-		"H4":"面板操作日志",
-		"SEARCH":"搜索日志",
-		"BTN1":"启用SSH",
-		"BTN2":"SSH端口：",
-		"BTN3":"更改",
-		"BTN4":"启用禁ping",
-		"BTN5":"清空",
-		"S1":"Web日志：",
-		"F1":"放行端口",
-		"F2":"屏蔽IP",
-		"F3":"端口",
-		"F4":"备注/说明",
-		"F5":"放行",
-		"F6":"说明: 支持放行端口范围，如: 3000:3500",
-		"F7":"点击查看说明",
-		"TH1":"编号",
-		"TH2":"行为",
-		"TH3":"状态",
-		"TH4":"添加时间",
-		"TH5":"说明",
-		"TH6":"操作",
-		"LTH1":"编号",
-		"LTH2":"操作类型",
-		"LTH3":"详情",
-		"LTH4":"操作时间"
-	},
-	
-	"soft":{
-		"H1":"首页",
-		"H2":"软件管理",
-		"TH1":"软件名称",
-		"TH2":"类型",
-		"TH3":"说明",
-		"TH4":"位置",
-		"TH5":"状态",
-		"TH6":"首页显示",
-		"TH7":"操作"
-	},
-	
-	"login":{
-		"N1":"请填写账号",
-		"N2":"格式不对",
-		"N3":"账号",
-		"N4":"请填写密码",
-		"N5":"请填写密码",
-		"N6":"密码",
-		"N7":"请填写4位验证码",
-		"N8":"验证码不对",
-		"N9":"请填写验证码",
-		"N10":"点击换一张",
-		"N11":"登录",
-		"N12":"3次以上登录错误将会出现验证码",
-		"N13":"忘记密码>>",
-		"JS1":"表单错误,请重新输入!",
-		"JS2":"正在登录..."
-	},
-	
-	"menu":{
-		"M1":"首页",
-		"M2":"网站",
-		"M3":"FTP",
-		"M4":"数据库",
-		"M5":"监控",
-		"M6":"安全",
-		"M7":"文件",
-		"M8":"计划任务",
-		"M9":"软件管理",
-		"M10":"面板设置",
-		"M11":"退出",
-		"HELP":"问题求助|产品建议请上论坛"
-	}
-	
-}
diff --git a/route/static/language/index.html b/route/static/language/index.html
deleted file mode 100755
index e69de29bb..000000000
diff --git a/route/static/language/list.json b/route/static/language/list.json
deleted file mode 100755
index 995977843..000000000
--- a/route/static/language/list.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-	{"name":"Simplified_Chinese","title":"简体中文"},
-	{"name":"English","title":"English"}
-]
\ No newline at end of file
diff --git a/route/static/language/zh-cn.js b/route/static/language/zh-cn.js
deleted file mode 100755
index b656be85b..000000000
--- a/route/static/language/zh-cn.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var BT_MSG = {
-	"ERROR":"操作失败",
-	"SUCCESS":"操作成功",
-	"ADD_SUCCESS":"添加成功",
-	"ADD_ERROR":"添加失败",
-	"DEL_SUCCESS":"删除成功",
-	"DEL_ERROR":"删除失败",
-	"SET_SUCCESS":"设置成功",
-	"SET_ERROR":"设置失败",
-	"PATH_ERROR":"不能以系统关键目录作为站点目录",
-	"SITE_ADD_SUCCESS":"成功创建站点!",
-	"SITE_ADD_EXISTS":"您添加的站点已存在!",
-	"SITE_ADD_PORT":"端口范围不合法",
-	"SITE_DEL_SUCCESS":"站点删除成功!",
-	"SITE_ADD_DOMAIN":"域名添加成功!",
-	"SITE_ADD_EXISTS":"指定域名已绑定过!",
-	"SITE_ADD_EXISTS":"指定域名已绑定过!",
-	"SITE_ADD_BINDING":"域名和子目录名称不能为空!"
-}
\ No newline at end of file
diff --git a/route/static/laydate/index.html b/route/static/laydate/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/laydate/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/laydate/laydate.js b/route/static/laydate/laydate.js
deleted file mode 100755
index 24ba1378b..000000000
--- a/route/static/laydate/laydate.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(){var isLayui=window.layui&&layui.define,ready={getPath:function(){var jsPath=document.currentScript?document.currentScript.src:function(){var js=document.scripts,last=js.length-1,src;for(var i=last;i>0;i--){if(js[i].readyState==="interactive"){src=js[i].src;break}}return src||js[last].src}();return jsPath.substring(0,jsPath.lastIndexOf("/")+1)}(),getStyle:function(node,name){var style=node.currentStyle?node.currentStyle:window.getComputedStyle(node,null);return style[style.getPropertyValue?"getPropertyValue":"getAttribute"](name)},link:function(href,fn,cssname){if(!laydate.path){return}var head=document.getElementsByTagName("head")[0],link=document.createElement("link");if(typeof fn==="string"){cssname=fn}var app=(cssname||href).replace(/\.|\//g,"");var id="layuicss-"+app,timeout=0;link.rel="stylesheet";link.href=laydate.path+href;link.id=id;if(!document.getElementById(id)){head.appendChild(link)}if(typeof fn!=="function"){return}(function poll(){if(++timeout>8*1000/100){return window.console&&console.error("laydate.css: Invalid")}parseInt(ready.getStyle(document.getElementById(id),"width"))===1989?fn():setTimeout(poll,100)}())}},laydate={v:"5.0.9",config:{},index:(window.laydate&&window.laydate.v)?100000:0,path:ready.getPath,set:function(options){var that=this;that.config=lay.extend({},that.config,options);return that},ready:function(fn){var cssname="laydate",ver="",path=(isLayui?"modules/laydate/":"theme/")+"default/laydate.css?v="+laydate.v+ver;isLayui?layui.addcss(path,fn,cssname):ready.link(path,fn,cssname);return this}},thisDate=function(){var that=this;return{hint:function(content){that.hint.call(that,content)},config:that.config}},MOD_NAME="laydate",ELEM=".layui-laydate",THIS="layui-this",SHOW="layui-show",HIDE="layui-hide",DISABLED="laydate-disabled",TIPS_OUT="开始日期超出了结束日期<br>建议重新选择",LIMIT_YEAR=[100,200000],ELEM_STATIC="layui-laydate-static",ELEM_LIST="layui-laydate-list",ELEM_SELECTED="laydate-selected",ELEM_HINT="layui-laydate-hint",ELEM_PREV="laydate-day-prev",ELEM_NEXT="laydate-day-next",ELEM_FOOTER="layui-laydate-footer",ELEM_CONFIRM=".laydate-btns-confirm",ELEM_TIME_TEXT="laydate-time-text",ELEM_TIME_BTN=".laydate-btns-time",Class=function(options){var that=this;that.index=++laydate.index;that.config=lay.extend({},that.config,laydate.config,options);laydate.ready(function(){that.init()})},lay=function(selector){return new LAY(selector)},LAY=function(selector){var index=0,nativeDOM=typeof selector==="object"?[selector]:(this.selector=selector,document.querySelectorAll(selector||null));for(;index<nativeDOM.length;index++){this.push(nativeDOM[index])}};LAY.prototype=[];LAY.prototype.constructor=LAY;lay.extend=function(){var ai=1,args=arguments,clone=function(target,obj){target=target||(obj.constructor===Array?[]:{});for(var i in obj){target[i]=(obj[i]&&(obj[i].constructor===Object))?clone(target[i],obj[i]):obj[i]}return target};args[0]=typeof args[0]==="object"?args[0]:{};for(;ai<args.length;ai++){if(typeof args[ai]==="object"){clone(args[0],args[ai])}}return args[0]};lay.ie=function(){var agent=navigator.userAgent.toLowerCase();return(!!window.ActiveXObject||"ActiveXObject" in window)?((agent.match(/msie\s(\d+)/)||[])[1]||"11"):false}();lay.stope=function(e){e=e||window.event;e.stopPropagation?e.stopPropagation():e.cancelBubble=true};lay.each=function(obj,fn){var key,that=this;if(typeof fn!=="function"){return that}obj=obj||[];if(obj.constructor===Object){for(key in obj){if(fn.call(obj[key],key,obj[key])){break}}}else{for(key=0;key<obj.length;key++){if(fn.call(obj[key],key,obj[key])){break}}}return that};lay.digit=function(num,length,end){var str="";num=String(num);length=length||2;for(var i=num.length;i<length;i++){str+="0"}return num<Math.pow(10,length)?str+(num|0):num};lay.elem=function(elemName,attr){var elem=document.createElement(elemName);lay.each(attr||{},function(key,value){elem.setAttribute(key,value)});return elem};LAY.addStr=function(str,new_str){str=str.replace(/\s+/," ");new_str=new_str.replace(/\s+/," ").split(" ");lay.each(new_str,function(ii,item){if(!new RegExp("\\b"+item+"\\b").test(str)){str=str+" "+item}});return str.replace(/^\s|\s$/,"")};LAY.removeStr=function(str,new_str){str=str.replace(/\s+/," ");new_str=new_str.replace(/\s+/," ").split(" ");lay.each(new_str,function(ii,item){var exp=new RegExp("\\b"+item+"\\b");if(exp.test(str)){str=str.replace(exp,"")}});return str.replace(/\s+/," ").replace(/^\s|\s$/,"")};LAY.prototype.find=function(selector){var that=this;var index=0,arr=[],isObject=typeof selector==="object";this.each(function(i,item){var nativeDOM=isObject?[selector]:item.querySelectorAll(selector||null);for(;index<nativeDOM.length;index++){arr.push(nativeDOM[index])}that.shift()});if(!isObject){that.selector=(that.selector?that.selector+" ":"")+selector}lay.each(arr,function(i,item){that.push(item)});return that};LAY.prototype.each=function(fn){return lay.each.call(this,this,fn)};LAY.prototype.addClass=function(className,type){return this.each(function(index,item){item.className=LAY[type?"removeStr":"addStr"](item.className,className)})};LAY.prototype.removeClass=function(className){return this.addClass(className,true)};LAY.prototype.hasClass=function(className){var has=false;this.each(function(index,item){if(new RegExp("\\b"+className+"\\b").test(item.className)){has=true}});return has};LAY.prototype.attr=function(key,value){var that=this;return value===undefined?function(){if(that.length>0){return that[0].getAttribute(key)}}():that.each(function(index,item){item.setAttribute(key,value)})};LAY.prototype.removeAttr=function(key){return this.each(function(index,item){item.removeAttribute(key)})};LAY.prototype.html=function(html){return this.each(function(index,item){item.innerHTML=html})};LAY.prototype.val=function(value){return this.each(function(index,item){item.value=value})};LAY.prototype.append=function(elem){return this.each(function(index,item){typeof elem==="object"?item.appendChild(elem):item.innerHTML=item.innerHTML+elem})};LAY.prototype.remove=function(elem){return this.each(function(index,item){elem?item.removeChild(elem):item.parentNode.removeChild(item)})};LAY.prototype.on=function(eventName,fn){return this.each(function(index,item){item.attachEvent?item.attachEvent("on"+eventName,function(e){e.target=e.srcElement;fn.call(item,e)}):item.addEventListener(eventName,fn,false)})};LAY.prototype.off=function(eventName,fn){return this.each(function(index,item){item.detachEvent?item.detachEvent("on"+eventName,fn):item.removeEventListener(eventName,fn,false)})};Class.isLeapYear=function(year){return(year%4===0&&year%100!==0)||year%400===0};Class.prototype.config={type:"date",range:false,format:"yyyy-MM-dd",value:null,min:"1900-1-1",max:"2099-12-31",trigger:"focus",show:false,showBottom:true,btns:["clear","now","confirm"],lang:"cn",theme:"default",position:null,calendar:false,mark:{},zIndex:null,done:null,change:null};Class.prototype.lang=function(){var that=this,options=that.config,text={cn:{weeks:["日","一","二","三","四","五","六"],time:["时","分","秒"],timeTips:"选择时间",startTime:"开始时间",endTime:"结束时间",dateTips:"返回日期",month:["一","二","三","四","五","六","七","八","九","十","十一","十二"],tools:{confirm:"确定",clear:"清空",now:"现在",perpetual:"永久"}},en:{weeks:["Su","Mo","Tu","We","Th","Fr","Sa"],time:["Hours","Minutes","Seconds"],timeTips:"Select Time",startTime:"Start Time",endTime:"End Time",dateTips:"Select Date",month:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],tools:{confirm:"Confirm",clear:"Clear",now:"Now",perpetual:"Perpetual"}}};return text[options.lang]||text["cn"]};Class.prototype.init=function(){var that=this,options=that.config,dateType="yyyy|y|MM|M|dd|d|HH|H|mm|m|ss|s",isStatic=options.position==="static",format={year:"yyyy",month:"yyyy-MM",date:"yyyy-MM-dd",time:"HH:mm:ss",datetime:"yyyy-MM-dd HH:mm:ss"};options.elem=lay(options.elem);options.eventElem=lay(options.eventElem);if(!options.elem[0]){return}if(options.range===true){options.range="-"}if(options.format===format.date){options.format=format[options.type]}that.format=options.format.match(new RegExp(dateType+"|.","g"))||[];that.EXP_IF="";that.EXP_SPLIT="";lay.each(that.format,function(i,item){var EXP=new RegExp(dateType).test(item)?"\\d{"+function(){if(new RegExp(dateType).test(that.format[i===0?i+1:i-1]||"")){if(/^yyyy|y$/.test(item)){return 4}return item.length}if(/^yyyy$/.test(item)){return"1,4"}if(/^y$/.test(item)){return"1,308"}return"1,2"}()+"}":"\\"+item;that.EXP_IF=that.EXP_IF+EXP;that.EXP_SPLIT=that.EXP_SPLIT+"("+EXP+")"});that.EXP_IF=new RegExp("^"+(options.range?that.EXP_IF+"\\s\\"+options.range+"\\s"+that.EXP_IF:that.EXP_IF)+"$");that.EXP_SPLIT=new RegExp("^"+that.EXP_SPLIT+"$","");if(!that.isInput(options.elem[0])){if(options.trigger==="focus"){options.trigger="click"}}if(!options.elem.attr("lay-key")){options.elem.attr("lay-key",that.index);options.eventElem.attr("lay-key",that.index)}options.mark=lay.extend({},(options.calendar&&options.lang==="cn")?{"0-1-1":"元旦","0-2-14":"情人","0-3-8":"妇女","0-3-12":"植树","0-4-1":"愚人","0-5-1":"劳动","0-5-4":"青年","0-6-1":"儿童","0-9-10":"教师","0-9-18":"国耻","0-10-1":"国庆","0-12-25":"圣诞"}:{},options.mark);lay.each(["min","max"],function(i,item){var ymd=[],hms=[];if(typeof options[item]==="number"){var day=options[item],time=new Date().getTime(),STAMP=86400000,thisDate=new Date(day?(day<STAMP?time+day*STAMP:day):time);ymd=[thisDate.getFullYear(),thisDate.getMonth()+1,thisDate.getDate()];day<STAMP||(hms=[thisDate.getHours(),thisDate.getMinutes(),thisDate.getSeconds()])}else{ymd=(options[item].match(/\d+-\d+-\d+/)||[""])[0].split("-");hms=(options[item].match(/\d+:\d+:\d+/)||[""])[0].split(":")}options[item]={year:ymd[0]|0||new Date().getFullYear(),month:ymd[1]?(ymd[1]|0)-1:new Date().getMonth(),date:ymd[2]|0||new Date().getDate(),hours:hms[0]|0,minutes:hms[1]|0,seconds:hms[2]|0}});that.elemID="layui-laydate"+options.elem.attr("lay-key");if(options.show||isStatic){that.render()}isStatic||that.events();if(options.value){if(options.value.constructor===Date){that.setValue(that.parse(0,that.systemDate(options.value)))}else{that.setValue(options.value)}}};Class.prototype.render=function(){var that=this,options=that.config,lang=that.lang(),isStatic=options.position==="static",elem=that.elem=lay.elem("div",{id:that.elemID,"class":["layui-laydate",options.range?" layui-laydate-range":"",isStatic?(" "+ELEM_STATIC):"",options.theme&&options.theme!=="default"&&!/^#/.test(options.theme)?(" laydate-theme-"+options.theme):""].join("")}),elemMain=that.elemMain=[],elemHeader=that.elemHeader=[],elemCont=that.elemCont=[],elemTable=that.table=[],divFooter=that.footer=lay.elem("div",{"class":ELEM_FOOTER});if(options.zIndex){elem.style.zIndex=options.zIndex}lay.each(new Array(2),function(i){if(!options.range&&i>0){return true}var divHeader=lay.elem("div",{"class":"layui-laydate-header"}),headerChild=[function(){var elem=lay.elem("i",{"class":"layui-icon laydate-icon laydate-prev-y"});elem.innerHTML="&#xe65a;";return elem}(),function(){var elem=lay.elem("i",{"class":"layui-icon laydate-icon laydate-prev-m"});elem.innerHTML="&#xe603;";return elem}(),function(){var elem=lay.elem("div",{"class":"laydate-set-ym"}),spanY=lay.elem("span"),spanM=lay.elem("span");elem.appendChild(spanY);elem.appendChild(spanM);return elem}(),function(){var elem=lay.elem("i",{"class":"layui-icon laydate-icon laydate-next-m"});elem.innerHTML="&#xe602;";return elem}(),function(){var elem=lay.elem("i",{"class":"layui-icon laydate-icon laydate-next-y"});elem.innerHTML="&#xe65b;";return elem}()],divContent=lay.elem("div",{"class":"layui-laydate-content"}),table=lay.elem("table"),thead=lay.elem("thead"),theadTr=lay.elem("tr");lay.each(headerChild,function(i,item){divHeader.appendChild(item)});thead.appendChild(theadTr);lay.each(new Array(6),function(i){var tr=table.insertRow(0);lay.each(new Array(7),function(j){if(i===0){var th=lay.elem("th");th.innerHTML=lang.weeks[j];theadTr.appendChild(th)}tr.insertCell(j)})});table.insertBefore(thead,table.children[0]);divContent.appendChild(table);elemMain[i]=lay.elem("div",{"class":"layui-laydate-main laydate-main-list-"+i});elemMain[i].appendChild(divHeader);elemMain[i].appendChild(divContent);elemHeader.push(headerChild);elemCont.push(divContent);elemTable.push(table)});lay(divFooter).html(function(){var html=[],btns=[];if(options.type==="datetime"){html.push('<span lay-type="datetime" class="laydate-btns-time">'+lang.timeTips+"</span>")}lay.each(options.btns,function(i,item){var title=lang.tools[item]||"btn";if(options.range&&item==="now"){return}if(isStatic&&item==="clear"){title=options.lang==="cn"?"重置":"Reset"}btns.push('<span lay-type="'+item+'" class="laydate-btns-'+item+'">'+title+"</span>")});html.push('<div class="laydate-footer-btns">'+btns.join("")+"</div>");return html.join("")}());lay.each(elemMain,function(i,main){elem.appendChild(main)});options.showBottom&&elem.appendChild(divFooter);if(/^#/.test(options.theme)){var style=lay.elem("style"),styleText=["#{{id}} .layui-laydate-header{background-color:{{theme}};}","#{{id}} .layui-this{background-color:{{theme}} !important;}"].join("").replace(/{{id}}/g,that.elemID).replace(/{{theme}}/g,options.theme);if("styleSheet" in style){style.setAttribute("type","text/css");style.styleSheet.cssText=styleText}else{style.innerHTML=styleText}lay(elem).addClass("laydate-theme-molv");elem.appendChild(style)}that.remove(Class.thisElemDate);isStatic?options.elem.append(elem):(document.body.appendChild(elem),that.position());that.checkDate().calendar();that.changeEvent();Class.thisElemDate=that.elemID;typeof options.ready==="function"&&options.ready(lay.extend({},options.dateTime,{month:options.dateTime.month+1}))};Class.prototype.remove=function(prev){var that=this,options=that.config,elem=lay("#"+(prev||that.elemID));if(!elem.hasClass(ELEM_STATIC)){that.checkDate(function(){elem.remove()})}return that};Class.prototype.position=function(){var that=this,options=that.config,elem=that.bindElem||options.elem[0],rect=elem.getBoundingClientRect(),elemWidth=that.elem.offsetWidth,elemHeight=that.elem.offsetHeight,scrollArea=function(type){type=type?"scrollLeft":"scrollTop";return document.body[type]|document.documentElement[type]},winArea=function(type){return document.documentElement[type?"clientWidth":"clientHeight"]},margin=5,left=rect.left,top=rect.bottom;if(left+elemWidth+margin>winArea("width")){left=winArea("width")-elemWidth-margin}if(top+elemHeight+margin>winArea()){top=rect.top>elemHeight?rect.top-elemHeight:winArea()-elemHeight;top=top-margin*2}if(options.position){that.elem.style.position=options.position}that.elem.style.left=left+(options.position==="fixed"?0:scrollArea(1))+"px";that.elem.style.top=top+(options.position==="fixed"?0:scrollArea())+"px"};Class.prototype.hint=function(content){var that=this,options=that.config,div=lay.elem("div",{"class":ELEM_HINT});div.innerHTML=content||"";lay(that.elem).find("."+ELEM_HINT).remove();that.elem.appendChild(div);clearTimeout(that.hinTimer);that.hinTimer=setTimeout(function(){lay(that.elem).find("."+ELEM_HINT).remove()},3000)};Class.prototype.getAsYM=function(Y,M,type){type?M--:M++;if(M<0){M=11;Y--}if(M>11){M=0;Y++}return[Y,M]};Class.prototype.systemDate=function(newDate){var thisDate=newDate||new Date();return{year:thisDate.getFullYear(),month:thisDate.getMonth(),date:thisDate.getDate(),hours:newDate?newDate.getHours():0,minutes:newDate?newDate.getMinutes():0,seconds:newDate?newDate.getSeconds():0}};Class.prototype.checkDate=function(fn){var that=this,thisDate=new Date(),options=that.config,dateTime=options.dateTime=options.dateTime||that.systemDate(),thisMaxDate,error,elem=that.bindElem||options.elem[0],valType=that.isInput(elem)?"val":"html",value=that.isInput(elem)?elem.value:(options.position==="static"?"":elem.innerHTML),checkValid=function(dateTime){if(dateTime.year>LIMIT_YEAR[1]){dateTime.year=LIMIT_YEAR[1],error=true}if(dateTime.month>11){dateTime.month=11,error=true}if(dateTime.hours>23){dateTime.hours=0,error=true}if(dateTime.minutes>59){dateTime.minutes=0,dateTime.hours++,error=true}if(dateTime.seconds>59){dateTime.seconds=0,dateTime.minutes++,error=true}thisMaxDate=laydate.getEndDate(dateTime.month+1,dateTime.year);if(dateTime.date>thisMaxDate){dateTime.date=thisMaxDate,error=true}},initDate=function(dateTime,value,index){var startEnd=["startTime","endTime"];value=(value.match(that.EXP_SPLIT)||[]).slice(1);index=index||0;if(options.range){that[startEnd[index]]=that[startEnd[index]]||{}}lay.each(that.format,function(i,item){var thisv=parseFloat(value[i]);if(value[i].length<item.length){error=true}if(/yyyy|y/.test(item)){if(thisv<LIMIT_YEAR[0]){thisv=LIMIT_YEAR[0],error=true}dateTime.year=thisv}else{if(/MM|M/.test(item)){if(thisv<1){thisv=1,error=true}dateTime.month=thisv-1}else{if(/dd|d/.test(item)){if(thisv<1){thisv=1,error=true}dateTime.date=thisv}else{if(/HH|H/.test(item)){if(thisv<1){thisv=0,error=true}dateTime.hours=thisv;options.range&&(that[startEnd[index]].hours=thisv)}else{if(/mm|m/.test(item)){if(thisv<1){thisv=0,error=true}dateTime.minutes=thisv;options.range&&(that[startEnd[index]].minutes=thisv)}else{if(/ss|s/.test(item)){if(thisv<1){thisv=0,error=true}dateTime.seconds=thisv;options.range&&(that[startEnd[index]].seconds=thisv)}}}}}}});checkValid(dateTime)};if(fn==="limit"){return checkValid(dateTime),that}value=value||options.value;if(typeof value==="string"){value=value.replace(/\s+/g," ").replace(/^\s|\s$/g,"")}if(that.startState&&!that.endState){delete that.startState;that.endState=true}if(typeof value==="string"&&value){if(that.EXP_IF.test(value)){if(options.range){value=value.split(" "+options.range+" ");that.startDate=that.startDate||that.systemDate();that.endDate=that.endDate||that.systemDate();options.dateTime=lay.extend({},that.startDate);lay.each([that.startDate,that.endDate],function(i,item){initDate(item,value[i],i)})}else{initDate(dateTime,value)}}else{if(value!="永久"){that.hint("日期格式不合法<br>必须遵循下述格式：<br>"+(options.range?(options.format+" "+options.range+" "+options.format):options.format)+"<br>已为你重置");error=true}else{error=false}}}else{if(value&&value.constructor===Date){options.dateTime=that.systemDate(value)}else{options.dateTime=that.systemDate();delete that.startState;delete that.endState;delete that.startDate;delete that.endDate;delete that.startTime;delete that.endTime}}checkValid(dateTime);if(error&&value){that.setValue(options.range?(that.endDate?that.parse():""):that.parse())}fn&&fn();return that};Class.prototype.mark=function(td,YMD){var that=this,mark,options=that.config;lay.each(options.mark,function(key,title){var keys=key.split("-");if((keys[0]==YMD[0]||keys[0]==0)&&(keys[1]==YMD[1]||keys[1]==0)&&keys[2]==YMD[2]){mark=title||YMD[2]}});mark&&td.html('<span class="laydate-day-mark">'+mark+"</span>");return that};Class.prototype.limit=function(elem,date,index,time){var that=this,options=that.config,timestrap={},dateTime=options[index>41?"endDate":"dateTime"],isOut,thisDateTime=lay.extend({},dateTime,date||{});lay.each({now:thisDateTime,min:options.min,max:options.max},function(key,item){timestrap[key]=that.newDate(lay.extend({year:item.year,month:item.month,date:item.date},function(){var hms={};lay.each(time,function(i,keys){hms[keys]=item[keys]});return hms}())).getTime()});isOut=timestrap.now<timestrap.min||timestrap.now>timestrap.max;elem&&elem[isOut?"addClass":"removeClass"](DISABLED);return isOut};Class.prototype.calendar=function(value){var that=this,options=that.config,dateTime=value||options.dateTime,thisDate=new Date(),startWeek,prevMaxDate,thisMaxDate,lang=that.lang(),isAlone=options.type!=="date"&&options.type!=="datetime",index=value?1:0,tds=lay(that.table[index]).find("td"),elemYM=lay(that.elemHeader[index][2]).find("span");if(dateTime.year<LIMIT_YEAR[0]){dateTime.year=LIMIT_YEAR[0],that.hint("最低只能支持到公元"+LIMIT_YEAR[0]+"年")}if(dateTime.year>LIMIT_YEAR[1]){dateTime.year=LIMIT_YEAR[1],that.hint("最高只能支持到公元"+LIMIT_YEAR[1]+"年")}if(!that.firstDate){that.firstDate=lay.extend({},dateTime)}thisDate.setFullYear(dateTime.year,dateTime.month,1);startWeek=thisDate.getDay();prevMaxDate=laydate.getEndDate(dateTime.month||12,dateTime.year);thisMaxDate=laydate.getEndDate(dateTime.month+1,dateTime.year);lay.each(tds,function(index,item){var YMD=[dateTime.year,dateTime.month],st=0;item=lay(item);item.removeAttr("class");if(index<startWeek){st=prevMaxDate-startWeek+index;item.addClass("laydate-day-prev");YMD=that.getAsYM(dateTime.year,dateTime.month,"sub")}else{if(index>=startWeek&&index<thisMaxDate+startWeek){st=index-startWeek;if(!options.range){st+1===dateTime.date&&item.addClass(THIS)}}else{st=index-thisMaxDate-startWeek;item.addClass("laydate-day-next");YMD=that.getAsYM(dateTime.year,dateTime.month)}}YMD[1]++;YMD[2]=st+1;item.attr("lay-ymd",YMD.join("-")).html(YMD[2]);that.mark(item,YMD).limit(item,{year:YMD[0],month:YMD[1]-1,date:YMD[2]},index)});lay(elemYM[0]).attr("lay-ym",dateTime.year+"-"+(dateTime.month+1));lay(elemYM[1]).attr("lay-ym",dateTime.year+"-"+(dateTime.month+1));if(options.lang==="cn"){lay(elemYM[0]).attr("lay-type","year").html(dateTime.year+"年");lay(elemYM[1]).attr("lay-type","month").html((dateTime.month+1)+"月")}else{lay(elemYM[0]).attr("lay-type","month").html(lang.month[dateTime.month]);lay(elemYM[1]).attr("lay-type","year").html(dateTime.year)}if(isAlone){if(options.range){value?that.endDate=(that.endDate||{year:dateTime.year+(options.type==="year"?1:0),month:dateTime.month+(options.type==="month"?0:-1)}):(that.startDate=that.startDate||{year:dateTime.year,month:dateTime.month});if(value){that.listYM=[[that.startDate.year,that.startDate.month+1],[that.endDate.year,that.endDate.month+1]];that.list(options.type,0).list(options.type,1);options.type==="time"?that.setBtnStatus("时间",lay.extend({},that.systemDate(),that.startTime),lay.extend({},that.systemDate(),that.endTime)):that.setBtnStatus(true)}}if(!options.range){that.listYM=[[dateTime.year,dateTime.month+1]];that.list(options.type,0)}}if(options.range&&!value){var EYM=that.getAsYM(dateTime.year,dateTime.month);that.calendar(lay.extend({},dateTime,{year:EYM[0],month:EYM[1]}))}if(!options.range){that.limit(lay(that.footer).find(ELEM_CONFIRM),null,0,["hours","minutes","seconds"])}if(options.range&&value&&!isAlone){that.stampRange()}return that};Class.prototype.list=function(type,index){var that=this,options=that.config,dateTime=options.dateTime,lang=that.lang(),isAlone=options.range&&options.type!=="date"&&options.type!=="datetime",ul=lay.elem("ul",{"class":ELEM_LIST+" "+({year:"laydate-year-list",month:"laydate-month-list",time:"laydate-time-list"})[type]}),elemHeader=that.elemHeader[index],elemYM=lay(elemHeader[2]).find("span"),elemCont=that.elemCont[index||0],haveList=lay(elemCont).find("."+ELEM_LIST)[0],isCN=options.lang==="cn",text=isCN?"年":"",listYM=that.listYM[index]||{},hms=["hours","minutes","seconds"],startEnd=["startTime","endTime"][index];if(listYM[0]<1){listYM[0]=1}if(type==="year"){var yearNum,startY=yearNum=listYM[0]-7;if(startY<1){startY=yearNum=1}lay.each(new Array(15),function(i){var li=lay.elem("li",{"lay-ym":yearNum}),ymd={year:yearNum};yearNum==listYM[0]&&lay(li).addClass(THIS);li.innerHTML=yearNum+text;ul.appendChild(li);if(yearNum<that.firstDate.year){ymd.month=options.min.month;ymd.date=options.min.date}else{if(yearNum>=that.firstDate.year){ymd.month=options.max.month;ymd.date=options.max.date}}that.limit(lay(li),ymd,index);yearNum++});lay(elemYM[isCN?0:1]).attr("lay-ym",(yearNum-8)+"-"+listYM[1]).html((startY+text)+" - "+(yearNum-1+text))}else{if(type==="month"){lay.each(new Array(12),function(i){var li=lay.elem("li",{"lay-ym":i}),ymd={year:listYM[0],month:i};i+1==listYM[1]&&lay(li).addClass(THIS);li.innerHTML=lang.month[i]+(isCN?"月":"");ul.appendChild(li);if(listYM[0]<that.firstDate.year){ymd.date=options.min.date}else{if(listYM[0]>=that.firstDate.year){ymd.date=options.max.date}}that.limit(lay(li),ymd,index)});lay(elemYM[isCN?0:1]).attr("lay-ym",listYM[0]+"-"+listYM[1]).html(listYM[0]+text)}else{if(type==="time"){var setTimeStatus=function(){lay(ul).find("ol").each(function(i,ol){lay(ol).find("li").each(function(ii,li){that.limit(lay(li),[{hours:ii},{hours:that[startEnd].hours,minutes:ii},{hours:that[startEnd].hours,minutes:that[startEnd].minutes,seconds:ii}][i],index,[["hours"],["hours","minutes"],["hours","minutes","seconds"]][i])})});if(!options.range){that.limit(lay(that.footer).find(ELEM_CONFIRM),that[startEnd],0,["hours","minutes","seconds"])}};if(options.range){if(!that[startEnd]){that[startEnd]={hours:0,minutes:0,seconds:0}}}else{that[startEnd]=dateTime}lay.each([24,60,60],function(i,item){var li=lay.elem("li"),childUL=["<p>"+lang.time[i]+"</p><ol>"];lay.each(new Array(item),function(ii){childUL.push("<li"+(that[startEnd][hms[i]]===ii?' class="'+THIS+'"':"")+">"+lay.digit(ii,2)+"</li>")});li.innerHTML=childUL.join("")+"</ol>";ul.appendChild(li)});setTimeStatus()}}}if(haveList){elemCont.removeChild(haveList)}elemCont.appendChild(ul);if(type==="year"||type==="month"){lay(that.elemMain[index]).addClass("laydate-ym-show");lay(ul).find("li").on("click",function(){var ym=lay(this).attr("lay-ym")|0;if(lay(this).hasClass(DISABLED)){return}if(index===0){dateTime[type]=ym;if(isAlone){that.startDate[type]=ym}that.limit(lay(that.footer).find(ELEM_CONFIRM),null,0)}else{if(isAlone){that.endDate[type]=ym}else{var YM=type==="year"?that.getAsYM(ym,listYM[1]-1,"sub"):that.getAsYM(listYM[0],ym,"sub");lay.extend(dateTime,{year:YM[0],month:YM[1]})}}if(options.type==="year"||options.type==="month"){lay(ul).find("."+THIS).removeClass(THIS);lay(this).addClass(THIS);if(options.type==="month"&&type==="year"){that.listYM[index][0]=ym;isAlone&&(that[["startDate","endDate"][index]].year=ym);that.list("month",index)}}else{that.checkDate("limit").calendar();that.closeList()}that.setBtnStatus();options.range||that.done(null,"change");lay(that.footer).find(ELEM_TIME_BTN).removeClass(DISABLED)})}else{var span=lay.elem("span",{"class":ELEM_TIME_TEXT}),scroll=function(){lay(ul).find("ol").each(function(i){var ol=this,li=lay(ol).find("li");ol.scrollTop=30*(that[startEnd][hms[i]]-2);if(ol.scrollTop<=0){li.each(function(ii,item){if(!lay(this).hasClass(DISABLED)){ol.scrollTop=30*(ii-2);return true}})}})},haveSpan=lay(elemHeader[2]).find("."+ELEM_TIME_TEXT);scroll();span.innerHTML=options.range?[lang.startTime,lang.endTime][index]:lang.timeTips;lay(that.elemMain[index]).addClass("laydate-time-show");if(haveSpan[0]){haveSpan.remove()}elemHeader[2].appendChild(span);lay(ul).find("ol").each(function(i){var ol=this;lay(ol).find("li").on("click",function(){var value=this.innerHTML|0;if(lay(this).hasClass(DISABLED)){return}if(options.range){that[startEnd][hms[i]]=value}else{dateTime[hms[i]]=value}lay(ol).find("."+THIS).removeClass(THIS);lay(this).addClass(THIS);setTimeStatus();scroll();(that.endDate||options.type==="time")&&that.done(null,"change");that.setBtnStatus()})})}return that};Class.prototype.listYM=[];Class.prototype.closeList=function(){var that=this,options=that.config;lay.each(that.elemCont,function(index,item){lay(this).find("."+ELEM_LIST).remove();lay(that.elemMain[index]).removeClass("laydate-ym-show laydate-time-show")});lay(that.elem).find("."+ELEM_TIME_TEXT).remove()};Class.prototype.setBtnStatus=function(tips,start,end){var that=this,options=that.config,isOut,elemBtn=lay(that.footer).find(ELEM_CONFIRM),isAlone=options.range&&options.type!=="date"&&options.type!=="time";if(isAlone){start=start||that.startDate;end=end||that.endDate;isOut=that.newDate(start).getTime()>that.newDate(end).getTime();(that.limit(null,start)||that.limit(null,end))?elemBtn.addClass(DISABLED):elemBtn[isOut?"addClass":"removeClass"](DISABLED);if(tips&&isOut){that.hint(typeof tips==="string"?TIPS_OUT.replace(/日期/g,tips):TIPS_OUT)}}};Class.prototype.parse=function(state,date){var that=this,options=that.config,dateTime=date||(state?lay.extend({},that.endDate,that.endTime):(options.range?lay.extend({},that.startDate,that.startTime):options.dateTime)),format=that.format.concat();lay.each(format,function(i,item){if(/yyyy|y/.test(item)){format[i]=lay.digit(dateTime.year,item.length)}else{if(/MM|M/.test(item)){format[i]=lay.digit(dateTime.month+1,item.length)}else{if(/dd|d/.test(item)){format[i]=lay.digit(dateTime.date,item.length)}else{if(/HH|H/.test(item)){format[i]=lay.digit(dateTime.hours,item.length)}else{if(/mm|m/.test(item)){format[i]=lay.digit(dateTime.minutes,item.length)}else{if(/ss|s/.test(item)){format[i]=lay.digit(dateTime.seconds,item.length)}}}}}}});if(options.range&&!state){return format.join("")+" "+options.range+" "+that.parse(1)}return format.join("")};Class.prototype.newDate=function(dateTime){dateTime=dateTime||{};return new Date(dateTime.year||1,dateTime.month||0,dateTime.date||1,dateTime.hours||0,dateTime.minutes||0,dateTime.seconds||0)};Class.prototype.setValue=function(value){var that=this,options=that.config,elem=that.bindElem||options.elem[0],valType=that.isInput(elem)?"val":"html";options.position==="static"||lay(elem)[valType](value||"");return this};Class.prototype.stampRange=function(){var that=this,options=that.config,startTime,endTime,tds=lay(that.elem).find("td");if(options.range&&!that.endDate){lay(that.footer).find(ELEM_CONFIRM).addClass(DISABLED)}if(!that.endDate){return}startTime=that.newDate({year:that.startDate.year,month:that.startDate.month,date:that.startDate.date}).getTime();endTime=that.newDate({year:that.endDate.year,month:that.endDate.month,date:that.endDate.date}).getTime();if(startTime>endTime){return that.hint(TIPS_OUT)}lay.each(tds,function(i,item){var ymd=lay(item).attr("lay-ymd").split("-"),thisTime=that.newDate({year:ymd[0],month:ymd[1]-1,date:ymd[2]}).getTime();lay(item).removeClass(ELEM_SELECTED+" "+THIS);if(thisTime===startTime||thisTime===endTime){lay(item).addClass(lay(item).hasClass(ELEM_PREV)||lay(item).hasClass(ELEM_NEXT)?ELEM_SELECTED:THIS)}if(thisTime>startTime&&thisTime<endTime){lay(item).addClass(ELEM_SELECTED)}})};Class.prototype.done=function(param,type){var that=this,options=that.config,start=lay.extend({},that.startDate?lay.extend(that.startDate,that.startTime):options.dateTime),end=lay.extend({},lay.extend(that.endDate,that.endTime));lay.each([start,end],function(i,item){if(!("month" in item)){return}lay.extend(item,{month:item.month+1})});param=param||[that.parse(),start,end];typeof options[type||"done"]==="function"&&options[type||"done"].apply(options,param);return that};Class.prototype.choose=function(td){var that=this,options=that.config,dateTime=options.dateTime,tds=lay(that.elem).find("td"),YMD=td.attr("lay-ymd").split("-"),setDateTime=function(one){var thisDate=new Date();one&&lay.extend(dateTime,YMD);if(options.range){that.startDate?lay.extend(that.startDate,YMD):(that.startDate=lay.extend({},YMD,that.startTime));that.startYMD=YMD}};YMD={year:YMD[0]|0,month:(YMD[1]|0)-1,date:YMD[2]|0};if(td.hasClass(DISABLED)){return}if(options.range){lay.each(["startTime","endTime"],function(i,item){that[item]=that[item]||{hours:0,minutes:0,seconds:0}});if(that.endState){setDateTime();delete that.endState;delete that.endDate;that.startState=true;tds.removeClass(THIS+" "+ELEM_SELECTED);td.addClass(THIS)}else{if(that.startState){td.addClass(THIS);that.endDate?lay.extend(that.endDate,YMD):(that.endDate=lay.extend({},YMD,that.endTime));if(that.newDate(YMD).getTime()<that.newDate(that.startYMD).getTime()){var startDate=lay.extend({},that.endDate,{hours:that.startDate.hours,minutes:that.startDate.minutes,seconds:that.startDate.seconds});lay.extend(that.endDate,that.startDate,{hours:that.endDate.hours,minutes:that.endDate.minutes,seconds:that.endDate.seconds});that.startDate=startDate}options.showBottom||that.done();that.stampRange();that.endState=true;that.done(null,"change")}else{td.addClass(THIS);setDateTime();that.startState=true}}lay(that.footer).find(ELEM_CONFIRM)[that.endDate?"removeClass":"addClass"](DISABLED)}else{if(options.position==="static"){setDateTime(true);that.calendar().done().done(null,"change")}else{if(options.type==="date"){setDateTime(true);that.setValue(that.parse()).remove().done()}else{if(options.type==="datetime"){setDateTime(true);that.calendar().done(null,"change")}}}}};Class.prototype.tool=function(btn,type){var that=this,options=that.config,dateTime=options.dateTime,isStatic=options.position==="static",active={datetime:function(){if(lay(btn).hasClass(DISABLED)){return}that.list("time",0);options.range&&that.list("time",1);lay(btn).attr("lay-type","date").html(that.lang().dateTips)},date:function(){that.closeList();lay(btn).attr("lay-type","datetime").html(that.lang().timeTips)},clear:function(){that.setValue("").remove();isStatic&&(lay.extend(dateTime,that.firstDate),that.calendar());options.range&&(delete that.startState,delete that.endState,delete that.endDate,delete that.startTime,delete that.endTime);that.done(["",{},{}])},now:function(){var thisDate=new Date();lay.extend(dateTime,that.systemDate(),{hours:thisDate.getHours(),minutes:thisDate.getMinutes(),seconds:thisDate.getSeconds()});that.setValue(that.parse()).remove();isStatic&&that.calendar();that.done()},perpetual:function(){that.setValue("永久").remove();that.done()},confirm:function(){if(options.range){if(!that.endDate){return that.hint("请先选择日期范围")}if(lay(btn).hasClass(DISABLED)){return that.hint(options.type==="time"?TIPS_OUT.replace(/日期/g,"时间"):TIPS_OUT)}}else{if(lay(btn).hasClass(DISABLED)){return that.hint("不在有效日期或时间范围内")}}that.done();that.setValue(that.parse()).remove()}};active[type]&&active[type]()};Class.prototype.change=function(index){var that=this,options=that.config,dateTime=options.dateTime,isAlone=options.range&&(options.type==="year"||options.type==="month"),elemCont=that.elemCont[index||0],listYM=that.listYM[index],addSubYeay=function(type){var startEnd=["startDate","endDate"][index],isYear=lay(elemCont).find(".laydate-year-list")[0],isMonth=lay(elemCont).find(".laydate-month-list")[0];if(isYear){listYM[0]=type?listYM[0]-15:listYM[0]+15;that.list("year",index)}if(isMonth){type?listYM[0]--:listYM[0]++;that.list("month",index)}if(isYear||isMonth){lay.extend(dateTime,{year:listYM[0]});if(isAlone){that[startEnd].year=listYM[0]}options.range||that.done(null,"change");that.setBtnStatus();options.range||that.limit(lay(that.footer).find(ELEM_CONFIRM),{year:listYM[0]})}return isYear||isMonth};return{prevYear:function(){if(addSubYeay("sub")){return}dateTime.year--;that.checkDate("limit").calendar();options.range||that.done(null,"change")},prevMonth:function(){var YM=that.getAsYM(dateTime.year,dateTime.month,"sub");lay.extend(dateTime,{year:YM[0],month:YM[1]});that.checkDate("limit").calendar();options.range||that.done(null,"change")},nextMonth:function(){var YM=that.getAsYM(dateTime.year,dateTime.month);lay.extend(dateTime,{year:YM[0],month:YM[1]});that.checkDate("limit").calendar();options.range||that.done(null,"change")},nextYear:function(){if(addSubYeay()){return}dateTime.year++;that.checkDate("limit").calendar();options.range||that.done(null,"change")}}};Class.prototype.changeEvent=function(){var that=this,options=that.config;lay(that.elem).on("click",function(e){lay.stope(e)});lay.each(that.elemHeader,function(i,header){lay(header[0]).on("click",function(e){that.change(i).prevYear()});lay(header[1]).on("click",function(e){that.change(i).prevMonth()});lay(header[2]).find("span").on("click",function(e){var othis=lay(this),layYM=othis.attr("lay-ym"),layType=othis.attr("lay-type");if(!layYM){return}layYM=layYM.split("-");that.listYM[i]=[layYM[0]|0,layYM[1]|0];that.list(layType,i);lay(that.footer).find(ELEM_TIME_BTN).addClass(DISABLED)});lay(header[3]).on("click",function(e){that.change(i).nextMonth()});lay(header[4]).on("click",function(e){that.change(i).nextYear()})});lay.each(that.table,function(i,table){var tds=lay(table).find("td");tds.on("click",function(){that.choose(lay(this))})});lay(that.footer).find("span").on("click",function(){var type=lay(this).attr("lay-type");that.tool(this,type)})};Class.prototype.isInput=function(elem){return/input|textarea/.test(elem.tagName.toLocaleLowerCase())};Class.prototype.events=function(){var that=this,options=that.config,showEvent=function(elem,bind){elem.on(options.trigger,function(){bind&&(that.bindElem=this);that.render()})};if(!options.elem[0]||options.elem[0].eventHandler){return}showEvent(options.elem,"bind");showEvent(options.eventElem);lay(document).on("click",function(e){if(e.target===options.elem[0]||e.target===options.eventElem[0]||e.target===lay(options.closeStop)[0]){return}that.remove()}).on("keydown",function(e){if(e.keyCode===13){if(lay("#"+that.elemID)[0]&&that.elemID===Class.thisElem){e.preventDefault();lay(that.footer).find(ELEM_CONFIRM)[0].click()}}});lay(window).on("resize",function(){if(!that.elem||!lay(ELEM)[0]){return false}that.position()});options.elem[0].eventHandler=true};laydate.render=function(options){var inst=new Class(options);return thisDate.call(inst)};laydate.getEndDate=function(month,year){var thisDate=new Date();thisDate.setFullYear(year||thisDate.getFullYear(),month||(thisDate.getMonth()+1),1);return new Date(thisDate.getTime()-1000*60*60*24).getDate()};window.lay=window.lay||lay;isLayui?(laydate.ready(),layui.define(function(exports){laydate.path=layui.cache.dir;exports(MOD_NAME,laydate)})):((typeof define==="function"&&define.amd)?define(function(){return laydate}):function(){laydate.ready();window.laydate=laydate}())}();
\ No newline at end of file
diff --git a/route/static/laydate/theme/default/font/iconfont.eot b/route/static/laydate/theme/default/font/iconfont.eot
deleted file mode 100755
index c861caa8e2c1e5bfff43ca36bf79fe3195545148..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2456
zcmc&$U2GIp6h3EWclM|4ENt8Dw(PdkmhM(tw(YtU3JL_Uh&B;HOP~_7bZ6U={bRd@
zEkWIo_!|<4i3VfP#9-i&L`)1Jkw+dhCIsS(AsAs3<IjsR;X!Bp?#$GdpZdz|-aFs<
z&bjxVbLY&Qd&Wa_+fBqIk+>vs$|eAFngtr$Wyy=ZNkcq#`CiW=yMTg}p(M>y3Vn%m
zT0=85NqNe_K&9ParfANzDS`>mIG7^M!b;d^G(<5Pgy#R|fm%3GM-`H3aL1lkwq7*8
z{2k<auv=f;GY}vD<GG!Xk3$}x%q9!px65ZB|AzMURAxS{jNXJSUqZy|r}bn?{p|IR
zV0#;Fcp8N3mi!Lz6|~jU*;2XX7a-yr=z^L2WKtUBG{&EUtY(wt0yonE=!1~8Tr#Wg
zz3#-mIkBE}wveAKtsOt`0g?M8^t*-ca-~+GR~-<E&@XJMDWg+N25is0%g0{xJ^dHe
zS++N?hQ1R<*1dMkLGn6?Zu{|BGb!{EIfa$UddUk^Gi6KfrFQBk-ab0^GDcbxTN=*H
zOeMkD5_Ce#U>H7GEPDBGK8+RJ(tFakU{6_h{*~g4v5Pqb-F?@t^s_12Lgng&6~A1e
z3JmP%#Zof%S=^U4h$0%1m;IKCGxnG?STVXEcSH%^K^q{u@e>JMuFBPknuxtzm8$zq
z1Oa1&h1eI7_%cRe1r`xLrt853cuZ~()tf7i+3SmaFWU_+R<Wm|iM_4jd59*SOLf21
z#AB;YSk2DBBlJFfN<VT4mYA*flYB)EQX}=^Mc+<%M_B3OE>#M1XEYI$`nb8%+1%2k
z%F*s<r>nawCO^Y1T}o3RKAecOC@#gvD!21fo$=vlOp5Z_#3pGY#{*&J)>UnL{5>JR
ze44$%X!~2n^U~+s+|eEKZCYdO?BCoJ*BaeN>;3*#zyG9LaXQ_S<nXDSZ3%ds9<O4Y
zbNbqvuXH>ib#Q%av~6r(gSN__d^eE`_q2GJD-~{BrK#sPuWVb1|M9j!qrcU)qQM<(
zYv^9x#7FPc1sm(bk)IK&$jaKE(p|a1%&c`DjxvWv_>^&Ygm+2THyX3X>_#@f1xxIr
z9$v@Noe|?OpBgbPF0sQd*RIJ|@wWS@gEXQ>9*zf^TpkWIDP03R^q|a}`MfV0R*kcq
z^0h~Ny)s{b?1QYU;i%ecyulT|00_$XM40ySiH8Ugi&*=H{FU5CE2xvYh&-%xMG^=q
zk{FJ6@DO+2PjvH;e91_uk+919jW5(tM2+%M<8345i-c6(2P!NmF7ul(3q^dqk0*pK
zYP|Ol0T29i%Y4s;H_d3)>%z#^W*bZ7f^QZtgYUJm12|!0Co0Ak8!O;nu(6l=Xs?ay
zkeeqEF*{Hh=}G#~#*BjWjg2J~vL9?LgTHHI2k<{Oc2WQ}!J0>*AotnWOXIxF#&s0o
zkG<Q9da|Uaw1e~7%w#^7&gV+rOmaR2a*ZH%>r-=?WN|6A6p!o0*_nJ!8;T7srFZB#
zy|^&%?2)N>sg%~z#e7y9#R7UJlh+Ex{2_g^6q_!U3L6Fn#KMA)P3E)sG;Tvx*6kXe
zLc$$HP1pXb<!Q58mtePCwZFg8FK4wJ|L9Y}a@ITGY0f-HSZ9t!e`o0k&Kq%@L`sx~
z|7k>(r!3H@9f6JrGQb)YOx+>OGYRV$O`D?%C@2H?EkwLvA2UxiS&@<AizqHpPabtC
lEV0ZEcCx}Q;<7TIpTl1{HkZfWRh~)C&&=y?`#vP5_!q}2aU1{u

diff --git a/route/static/laydate/theme/default/font/iconfont.svg b/route/static/laydate/theme/default/font/iconfont.svg
deleted file mode 100755
index c6bb0c379..000000000
--- a/route/static/laydate/theme/default/font/iconfont.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg><defs><font horiz-adv-x="1024"><font-face ascent="896" descent="-128" units-per-em="1024"/><missing-glyph/><glyph d="M281 543q-27-1-53-1h-83q-18 0-36.5-6t-32.5-18.5-23-32-9-45.5v-76h912v41q0 16-.5 30t-.5 18q0 13-5 29t-17 29.5-31.5 22.5-49.5 9h-133v-97h-438v97zM955 310v-52q0-23 .5-52t.5-58-10.5-47.5-26-30-33-16-31.5-4.5q-14-1-29.5-.5t-29.5.5h-32l-45 128h-439l-44-128h-29-34q-20 0-45 1-25 0-41 9.5t-25.5 23-13.5 29.5-4 30v167h911zM163 247q-12 0-21-8.5t-9-21.5 9-21.5 21-8.5q13 0 22 8.5t9 21.5-9 21.5-22 8.5zM316 123q-8-26-14-48-5-19-10.5-37t-7.5-25-3-15 1-14.5 9.5-10.5 21.5-4h37 67 81 80 64 36q23 0 34 12t2 38q-5 13-9.5 30.5t-9.5 34.5q-5 19-11 39h-368zM336 498v228q0 11 2.5 23t10 21.5 20.5 15.5 34 6h188q31 0 51.5-14.5t20.5-52.5v-227h-327z" glyph-name="x" horiz-adv-x="1001" unicode="&#x78;"/><glyph d="M283.648 721.918976 340.873216 780.926976 740.352 383.997952 340.876288-12.925952 283.648 46.077952 619.52 383.997952Z" glyph-name="youyou" horiz-adv-x="1024" unicode="&#58882;"/><glyph d="M740.352 721.918976 683.126784 780.926976 283.648 383.997952 683.123712-12.925952 740.352 46.077952 404.48 383.997952Z" glyph-name="zuozuo" horiz-adv-x="1024" unicode="&#58883;"/><glyph d="M62.573 384.103l423.401 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.751-18.976-68.727 0l-39.753 39.753.269.246-385.655 385.661zM451.365 384.103l423.407 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.757-18.977-68.727 0l-39.762 39.754.273.249-385.662 385.661zM451.365 384.103z" glyph-name="xiayiye" horiz-adv-x="1024" unicode="&#58970;"/><glyph d="M948.066926 382.958838l-411.990051-412.24426c-18.47333-18.47333-48.417689-18.47333-66.875207 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L814.691135 383.088983 467.512212 730.269123c-18.466032 18.458735-18.466032 48.405526 0 66.873991 18.468465 18.464816 48.410391 18.464816 66.872774 0l38.682336-38.682336-.261507-.239614 375.259894-375.265975v.003649m-378.312834 0L157.756743-29.285422c-18.47333-18.47333-48.415256-18.47333-66.872775 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L436.369787 383.088983 89.19208 730.269123c-18.4636 18.458735-18.4636 48.405526 0 66.873991 18.470898 18.464816 48.415256 18.464816 66.872774 0l38.692067-38.682336-.266372-.239614 375.267191-375.265975-.004865.003649m0 0z" glyph-name="xiayiye1" horiz-adv-x="1024" unicode="&#58971;"/></font></defs></svg>
\ No newline at end of file
diff --git a/route/static/laydate/theme/default/font/iconfont.ttf b/route/static/laydate/theme/default/font/iconfont.ttf
deleted file mode 100755
index 0bd6c4a88dd899aea3926e49bdfb37e81004bcb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2272
zcmc&#TWl0n82<m6-PudqS=hGQZP{(7E$miXw(YtU3Q7rJ5hW2pOP~_7?9R3&dt-MC
zy9RYb;srwjG0|uYnivc`l8A{9B=X3E#)Lq8F~kdOV!XT<6CZTe@5~Hl<?_s#`Oo?O
z@BEkZpE)x_Ohj!|Cz&R8?0sSDMdP#Ih<F3ot<UZqkI()7)K2Kfq0gmq$>KNt^83(#
zg?zD)t!0$i8_?xTMAC*uJ(*TNe&s#beh-;i1mU_VzX^O9vU)LBsrLK~M0_1xFk46^
zr3uc!{~UBRm#h}Kn+{?=2wlr3bNaq(&fP>#<de=83+2kXxr6Tzxldt!4`J<cy;-Lh
z9Z-qTi)vb%VlrUY{B_~Smwb=^No|(xjVqzAg`qVzuR2Ix57kYQ?JgoI^c*=&U9etU
zL`_q-GI^<=#)!Ai?s^`cR$yy}vr7v}aJGgyG0R{WQ7sm|{5PLL2Dfxl`U>o6Yvf-j
z&hVAUDTBRF+nsqbO<Snin78Ve>r{uCUA;&pW1q#?Do{l=BIcMi#aY`Y16FvCVMLYS
z9kda;8<(iP+K?ObO;LNbAvF$|2nu|Jh1eH{oeVEzU{T>iYW5a9r0gwe+fBU7X2iZ%
zZNU;7*i#{5ZyR_XLd0`v9I!+@w#K|A_6a;nZ_`Kg9fx3vXw4tw%W{x9X@n+eJK-H+
zWt4|hDa?b>L`)jx?m=gFPnRl3hogh8;h~uP1osRnU4i&iBGRL{6d$YH&yNkpr=l?_
z%IgxFrA-_UgqeF+_3ibq3HjwS><vcyUpJnXKH=_x;gE0hT4U$fOjlg%bRTQ?`+NQV
zQ*OoSbW4)Mr*f_*;Bk7qigC{A>+8Ne@Q5_P?Y+^yUHdz<RsQ5#iF|lXkB7Nl=gw7{
zdVXeQ-%8xa`vRT*Ue}5acd)Nxcy$*ayVVx#Y!63%LaE|ZHvf=r%N^#)TJPZ~b7-1R
z8%L&jw{&fjQ8vn(*!&i>*hM|Oo~2vU#t}X}ZCq@z!!9?k%2)8V`)GhPqE4QQ2fADy
z4s<C)<2-q{&NF=87Y(b%Sx)=<Bfb%tFF^M}*VS-T9Wh?zI$r<;Wqc@1NBG1&gs4U2
zzAk?*kJ1Vnq#+^?D?^b4ii#wr;sZR%ga0Rnc~ZV)q}51R<paj2YAB*c`IzyBk@iJG
zD(?ps78F<cHJF7WKHkssVlHZ&yobOF{B+ZN&&6uGA=c}{)DF$U61lK83(Md~Z0rC|
z*w~3b#ughZ;GeOvmquxyjoWZGPoQFUc#!8&de_EGLHg3h5~=j9jb-q+ZR`O4$Hq<y
z;GbZ{Q7FixHulmSZ?kb5Mfd~nwvwK#=xOaxO<PJ8@|i-u;>{*&X^?9Lu}5E6&L&H(
zR4bm-OXa0PUYm?fw9-5Dyk5E!w|sOVUa4fXOsSC5W|2V8W(!)eR5+}sDzU{%rMPi?
zTqG8JELF(i)3}XFq*IbA=+iiGhp2{riBeRcJY~$j0=q11YOt^@*Zya*2Yw5*Y|fV+
zX!RiPIe3?-jA$a8hL1&zCLS1N2dwj^$KC5K(^0G<jw&ixvj!<4Vh(85u0TiBEU-pJ
zbM7$Wq+lJRMboQ@AIdncI~CutkC{7>6DLx95k(XKllwJ=C6?L2PFC1OTvcj?W!%ck
U%LUx7>Qb_{RMXw|I4MH>3rdt+EdT%j

diff --git a/route/static/laydate/theme/default/font/iconfont.woff b/route/static/laydate/theme/default/font/iconfont.woff
deleted file mode 100755
index bfe5599671f9441ceebdc8afeac71d4f65a741c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1492
zcmY+Ec~Fx_7{)gwfRsQv0;F70?g7dvDTi_k2q?&X&U_&x2IUmw6v>BjMv!1R4M!=}
zat=&T#2N_qQ9*2LQO<yJsh|ibjuyIT`$u=?H~T)%zB}*i&byoF?&t_G01m-Ff#|_}
zi2p?&#Qz^oUOsjJU=Bgo1Y*~^$60sxGBAeTQK%gtzP=mICn%BR80ayej)(KzhsxNp
zGZD!&7;i(m0T3_~a(rAyr;@_}z_!CY0|-gHI<15bP3S#`S`nfyJcrGuN5&@sfP)f9
zLx^%~07OJnU>=SDwfF%7h8S8TISJOqsY87jqJohDAyMQ=D)by+U2j;o((iXckC^DV
zczE72m}3s{H1!QBN@7!xFa+U;7E&h2NPO&;2$_!{WCke2Q%=!RR6X#c*wHpdxVQ@K
za*hDVQ^UH0&wKXz%uuu#y<C5N4UfgzTVJ7F97Fntdw9Hl-sl5{46d&8rlFak_faM-
zYImL|(Ko}J00bIt1Os%#@xLXp2Uyc$3>EzG=wzb3;(!RdM}$9bAdD=wplNTO;eyZC
zaM2&yfiXjyZ6~lQXuFf+y6i;QlGYzd46q#^XH64j1zTk6hocD0jQb}8QIei?v+m!M
z<d4Tp)>Es8<;=~df(i=8GaG;6EG(;}OU%e5Cb6m4jH3UrA!c<?W>?--Pi$T{%cW?w
z*{9i}HN@-Md30G>345QLyekC9!Ul1&jl{R8jh&8VsBKL`7^4}hX0rIT%BTTieK%sF
zs%v3xCAH4opxhz-QmdM;TIszbHRsw-;u^EBC`g8uzt30JX$z=NVUHAC6|Jm$*iu{J
zUsWx()qYk+4^yD2KlIe&omj5!hY};(WhWc1<ji@JeKvP6@Fc0aUSZJEJFwCtBE);r
zz>V9qE-R-oRBt)nSWB%q-e;y}w&9mH-9D+eGe@vp`sKnL{YUT8p0R+=*_e&4;lmC$
zd=&ik7f4f|kb9C5tI34j7B7RQQs(WN8S@o#?8Q6FCAHgHYr?ZT9h=PJ6CH!YS-4)K
zcaJxS(}NwkQ(mdkuh?(u@+Gf6YnvL_^H2LUM49?H+SMv4a`yC%;Q_-fZid)Ar^uDa
zeo(e(Gn~`dQO2a{+{0&Eh*rMdbbi~Ca#cfo$4_mC_H)AKHo^Zw!0g_*6-T+*%T0tO
zrh6hTL}x5Jz;!-vUswtMM9Xv~ygxQ5jZYrckbTiv!94Q3ES%6Rp}d&;SFbmcW!YHi
zZQzb}&wh+K^QG?)1cW|5tgAe*HGPrFr;!2LC>%Dfy1K9BPb?clgT;k33$=l#v?%4j
z{4ed-3j}P6SQwdB3~<5=M8h5?BM5S7gvaY;<YA<$F`qvJ01`kRr~)$>_zM4h8wll4
z7(xXYO_gN<JE5$7#0m=}oiTB6{lc|hU9h&q%!ki4qx$V~>l76v?MZS?o+4;ntE=S8
zF&atkofJ(AjZ703tsWd|<!l+@+!LHc&{u}m^X74T<>{E<1yO;4Nxr^6Kcj&!H6C-W
z(`|q5eC8*5XP!ls-sGxvP{KqnbIGD*b5y}$iTwf-T_RYq+Zx=fVf9_<T6$1RVY;4Q
zteSkuIeK0RRoKg@J$R@xDKRTB*>P-1@4Bva?qzk-sa0xR#X8sMG&6E_&HiQKEtgx3
z>LtfIQt8)xnzrY;Yf+EB*DOR&shTfhb@0-ik46GN42H;azKOR$cS5Xl&6XwPzf#7(
zRFpCaYtr3ymQWjRB<qK1Qfi&=>`O~G2;TY7X;p5q<X(To^98qPwdeTzuoO3$6{VrA
zn@?i%tU~(AH9BZc4)RZ}J?@*TyGFd_m?~9wF{yL6dw^04U;FiPv{Sc=V~Wwiorf}j
zzR)X1J}Z}1&dOvJv+`M$Xj?|JaW^67NrTH4n!{B!X*1>+7h_!%j12);&&J2W5A7dm
CyJwOB

diff --git a/route/static/laydate/theme/default/font/index.html b/route/static/laydate/theme/default/font/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/laydate/theme/default/font/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/laydate/theme/default/index.html b/route/static/laydate/theme/default/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/laydate/theme/default/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/laydate/theme/default/laydate.css b/route/static/laydate/theme/default/laydate.css
deleted file mode 100755
index c7e15086b..000000000
--- a/route/static/laydate/theme/default/laydate.css
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! laydate-v5.0.9 日期与时间组件 MIT License  http://www.layui.com/laydate/  By 贤心 */
-.laydate-set-ym,.layui-laydate,.layui-laydate *,.layui-laydate-list{box-sizing:border-box}html #layuicss-laydate{display:none;position:absolute;width:1989px}.layui-laydate *{margin:0;padding:0}.layui-laydate{position:absolute;z-index:66666666;margin:5px 0;border-radius:2px;font-size:14px;-webkit-animation-duration:.3s;animation-duration:.3s;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-name:laydate-upbit;animation-name:laydate-upbit}.layui-laydate-main{width:272px}.layui-laydate-content td,.layui-laydate-header *,.layui-laydate-list li{transition-duration:.3s;-webkit-transition-duration:.3s}@-webkit-keyframes laydate-upbit{from{-webkit-transform:translate3d(0,20px,0);opacity:.3}to{-webkit-transform:translate3d(0,0,0);opacity:1}}@keyframes laydate-upbit{from{transform:translate3d(0,20px,0);opacity:.3}to{transform:translate3d(0,0,0);opacity:1}}.layui-laydate-static{position:relative;z-index:0;display:inline-block;margin:0;-webkit-animation:none;animation:none}.laydate-ym-show .laydate-next-m,.laydate-ym-show .laydate-prev-m{display:none!important}.laydate-ym-show .laydate-next-y,.laydate-ym-show .laydate-prev-y{display:inline-block!important}.laydate-time-show .laydate-set-ym span[lay-type=month],.laydate-time-show .laydate-set-ym span[lay-type=year],.laydate-time-show .layui-laydate-header .layui-icon,.laydate-ym-show .laydate-set-ym span[lay-type=month]{display:none!important}.layui-laydate-header{position:relative;line-height:30px;padding:10px 70px 5px}.laydate-set-ym span,.layui-laydate-header i{padding:0 5px;cursor:pointer}.layui-laydate-header *{display:inline-block;vertical-align:bottom}.layui-laydate-header i{position:absolute;top:10px;color:#999;font-size:18px}.layui-laydate-header i.laydate-prev-y{left:15px}.layui-laydate-header i.laydate-prev-m{left:45px}.layui-laydate-header i.laydate-next-y{right:15px}.layui-laydate-header i.laydate-next-m{right:45px}.laydate-set-ym{width:100%;text-align:center;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.laydate-time-text{cursor:default!important}.layui-laydate-content{position:relative;padding:10px;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.layui-laydate-content table{border-collapse:collapse;border-spacing:0}.layui-laydate-content td,.layui-laydate-content th{width:36px;height:30px;padding:5px;text-align:center}.layui-laydate-content td{position:relative;cursor:pointer}.laydate-day-mark{position:absolute;left:0;top:0;width:100%;height:100%;line-height:30px;font-size:12px;overflow:hidden}.laydate-day-mark::after{position:absolute;content:'';right:2px;top:2px;width:5px;height:5px;border-radius:50%}.layui-laydate-footer{position:relative;height:46px;line-height:26px;padding:10px 20px}.layui-laydate-footer span{margin-right:15px;display:inline-block;cursor:pointer;font-size:12px}.layui-laydate-footer span:hover{color:#5FB878}.laydate-footer-btns{position:absolute;right:10px;top:10px}.laydate-footer-btns span{height:26px;line-height:26px;margin:0 0 0 -1px;padding:0 10px;border:1px solid #C9C9C9;background-color:#fff;white-space:nowrap;vertical-align:top;border-radius:2px}.layui-laydate-list>li,.layui-laydate-range .layui-laydate-main{display:inline-block;vertical-align:middle}.layui-laydate-list{position:absolute;left:0;top:0;width:100%;height:100%;padding:10px;background-color:#fff}.layui-laydate-list>li{position:relative;width:33.3%;height:36px;line-height:36px;margin:3px 0;text-align:center;cursor:pointer}.laydate-month-list>li{width:25%;margin:17px 0}.laydate-time-list>li{height:100%;margin:0;line-height:normal;cursor:default}.laydate-time-list p{position:relative;top:-4px;line-height:29px}.laydate-time-list ol{height:181px;overflow:hidden}.laydate-time-list>li:hover ol{overflow-y:auto}.laydate-time-list ol li{width:130%;padding-left:33px;line-height:30px;text-align:left;cursor:pointer}.layui-laydate-hint{position:absolute;top:115px;left:50%;width:250px;margin-left:-125px;line-height:20px;padding:15px;text-align:center;font-size:12px}.layui-laydate-range{width:546px}.layui-laydate-range .laydate-main-list-0 .laydate-next-m,.layui-laydate-range .laydate-main-list-0 .laydate-next-y,.layui-laydate-range .laydate-main-list-1 .laydate-prev-m,.layui-laydate-range .laydate-main-list-1 .laydate-prev-y{display:none}.layui-laydate-range .laydate-main-list-1 .layui-laydate-content{border-left:1px solid #e2e2e2}.layui-laydate,.layui-laydate-hint{border:1px solid #d2d2d2;box-shadow:0 2px 4px rgba(0,0,0,.12);background-color:#fff;color:#666}.layui-laydate-header{border-bottom:1px solid #e2e2e2}.layui-laydate-header i:hover,.layui-laydate-header span:hover{color:#5FB878}.layui-laydate-content{border-top:none 0;border-bottom:none 0}.layui-laydate-content th{font-weight:400;color:#333}.layui-laydate-content td{color:#666}.layui-laydate-content td.laydate-selected{background-color:#00F7DE}.laydate-selected:hover{background-color:#00F7DE!important}.layui-laydate-content td:hover,.layui-laydate-list li:hover{background-color:#eaeaea;color:#333}.laydate-time-list li ol{margin:0;padding:0;border:1px solid #e2e2e2;border-left-width:0}.laydate-time-list li:first-child ol{border-left-width:1px}.laydate-time-list>li:hover{background:0 0}.layui-laydate-content .laydate-day-next,.layui-laydate-content .laydate-day-prev{color:#d2d2d2}.laydate-selected.laydate-day-next,.laydate-selected.laydate-day-prev{background-color:#f8f8f8!important}.layui-laydate-footer{border-top:1px solid #e2e2e2}.layui-laydate-hint{color:#FF5722}.laydate-day-mark::after{background-color:#5FB878}.layui-laydate-content td.layui-this .laydate-day-mark::after{display:none}.layui-laydate-footer span[lay-type=date]{color:#5FB878}.layui-laydate .layui-this{background-color:#009688!important;color:#fff!important}.layui-laydate .laydate-disabled,.layui-laydate .laydate-disabled:hover{background:0 0!important;color:#d2d2d2!important;cursor:not-allowed!important;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.laydate-theme-molv{border:none}.laydate-theme-molv.layui-laydate-range{width:548px}.laydate-theme-molv .layui-laydate-main{width:274px}.laydate-theme-molv .layui-laydate-header{border:none;background-color:#009688}.laydate-theme-molv .layui-laydate-header i,.laydate-theme-molv .layui-laydate-header span{color:#f6f6f6}.laydate-theme-molv .layui-laydate-header i:hover,.laydate-theme-molv .layui-laydate-header span:hover{color:#fff}.laydate-theme-molv .layui-laydate-content{border:1px solid #e2e2e2;border-top:none;border-bottom:none}.laydate-theme-molv .laydate-main-list-1 .layui-laydate-content{border-left:none}.laydate-theme-grid .laydate-month-list>li,.laydate-theme-grid .laydate-year-list>li,.laydate-theme-grid .layui-laydate-content td,.laydate-theme-grid .layui-laydate-content thead,.laydate-theme-molv .layui-laydate-footer{border:1px solid #e2e2e2}.laydate-theme-grid .laydate-selected,.laydate-theme-grid .laydate-selected:hover{background-color:#f2f2f2!important;color:#009688!important}.laydate-theme-grid .laydate-selected.laydate-day-next,.laydate-theme-grid .laydate-selected.laydate-day-prev{color:#d2d2d2!important}.laydate-theme-grid .laydate-month-list,.laydate-theme-grid .laydate-year-list{margin:1px 0 0 1px}.laydate-theme-grid .laydate-month-list>li,.laydate-theme-grid .laydate-year-list>li{margin:0 -1px -1px 0}.laydate-theme-grid .laydate-year-list>li{height:43px;line-height:43px}.laydate-theme-grid .laydate-month-list>li{height:71px;line-height:71px}@font-face{font-family:laydate-icon;src:url(font/iconfont.eot);src:url(font/iconfont.eot#iefix) format('embedded-opentype'),url(font/iconfont.svg#iconfont) format('svg'),url(font/iconfont.woff) format('woff'),url(font/iconfont.ttf) format('truetype')}.laydate-icon{font-family:laydate-icon!important;font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
\ No newline at end of file
diff --git a/route/static/laydate/theme/index.html b/route/static/laydate/theme/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/laydate/theme/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/layer/extend/index.html b/route/static/layer/extend/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/layer/extend/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/layer/extend/layer.ext.js b/route/static/layer/extend/layer.ext.js
deleted file mode 100755
index a8514aeeb..000000000
--- a/route/static/layer/extend/layer.ext.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! layer弹层组件拓展类 */
-;!function(){layer.use("skin/layer.ext.css",function(){layer.layui_layer_extendlayerextjs=!0});var a=layer.cache,b=function(b){return a.skin?" "+a.skin+" "+a.skin+"-"+b:""};layer.prompt=function(a,c){a=a||{},"function"==typeof a&&(c=a);var d,e=2==a.formType?'<textarea class="layui-layer-input">'+(a.value||"")+"</textarea>":function(){return'<input type="'+(1==a.formType?"password":"text")+'" class="layui-layer-input" value="'+(a.value||"")+'">'}();return layer.open($.extend({btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],content:e,skin:"layui-layer-prompt"+b("prompt"),success:function(a){d=a.find(".layui-layer-input"),d.focus()},yes:function(b){var e=d.val();""===e?d.focus():e.length>(a.maxlength||500)?layer.tips("&#x6700;&#x591A;&#x8F93;&#x5165;"+(a.maxlength||500)+"&#x4E2A;&#x5B57;&#x6570;",d,{tips:1}):c&&c(e,b,d)}},a))},layer.tab=function(a){a=a||{};var c=a.tab||{};return layer.open($.extend({type:1,skin:"layui-layer-tab"+b("tab"),title:function(){var a=c.length,b=1,d="";if(a>0)for(d='<span class="layui-layer-tabnow">'+c[0].title+"</span>";a>b;b++)d+="<span>"+c[b].title+"</span>";return d}(),content:'<ul class="layui-layer-tabmain">'+function(){var a=c.length,b=1,d="";if(a>0)for(d='<li class="layui-layer-tabli xubox_tab_layer">'+(c[0].content||"no content")+"</li>";a>b;b++)d+='<li class="layui-layer-tabli">'+(c[b].content||"no  content")+"</li>";return d}()+"</ul>",success:function(a){var b=a.find(".layui-layer-title").children(),c=a.find(".layui-layer-tabmain").children();b.on("mousedown",function(a){a.stopPropagation?a.stopPropagation():a.cancelBubble=!0;var b=$(this),d=b.index();b.addClass("layui-layer-tabnow").siblings().removeClass("layui-layer-tabnow"),c.eq(d).show().siblings().hide()})}},a))},layer.photos=function(a,c,d){function e(a,b,c){var d=new Image;d.onload=function(){d.onload=null,b(d)},d.onerror=function(a){d.onload=null,c(a)},d.src=a}var f={};if(a=a||{},a.photos){var g=a.photos.constructor===Object,h=g?a.photos:{},i=h.data||[],j=h.start||0;if(f.imgIndex=j+1,g){if(0===i.length)return void layer.msg("&#x6CA1;&#x6709;&#x56FE;&#x7247;")}else{var k=$(a.photos),l=k.find(a.img||"img");if(0===l.length)return;if(c||k.find(h.img||"img").each(function(b){var c=$(this);i.push({alt:c.attr("alt"),pid:c.attr("layer-pid"),src:c.attr("layer-src")||c.attr("src"),thumb:c.attr("src")}),c.on("click",function(){layer.photos($.extend(a,{photos:{start:b,data:i,tab:a.tab},full:a.full}),!0)})}),!c)return}f.imgprev=function(a){f.imgIndex--,f.imgIndex<1&&(f.imgIndex=i.length),f.tabimg(a)},f.imgnext=function(a){f.imgIndex++,f.imgIndex>i.length&&(f.imgIndex=1),f.tabimg(a)},f.keyup=function(a){if(!f.end){var b=a.keyCode;a.preventDefault(),37===b?f.imgprev(!0):39===b?f.imgnext(!0):27===b&&layer.close(f.index)}},f.tabimg=function(b){h.start=f.imgIndex-1,layer.close(f.index),layer.photos(a,!0,b)},f.event=function(){f.bigimg.hover(function(){f.imgsee.show()},function(){f.imgsee.hide()}),f.bigimg.find(".layui-layer-imgprev").on("click",function(a){a.preventDefault(),f.imgprev()}),f.bigimg.find(".layui-layer-imgnext").on("click",function(a){a.preventDefault(),f.imgnext()}),$(document).on("keyup",f.keyup)},f.loadi=layer.load(1,{shade:"shade"in a?!1:.9,scrollbar:!1}),e(i[j].src,function(c){layer.close(f.loadi),f.index=layer.open($.extend({type:1,area:function(){var b=[c.width,c.height],d=[$(window).width()-100,$(window).height()-100];return!a.full&&b[0]>d[0]&&(b[0]=d[0],b[1]=b[0]*d[1]/b[0]),[b[0]+"px",b[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,shift:5*Math.random()|0,skin:"layui-layer-photos"+b("photos"),content:'<div class="layui-layer-phimg"><img src="'+i[j].src+'" alt="'+(i[j].alt||"")+'" layer-pid="'+i[j].pid+'"><div class="layui-layer-imgsee"><span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span><div class="layui-layer-imgbar" style="display:'+(d?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(i[j].alt||"")+"</a><em>"+f.imgIndex+"/"+i.length+"</em></span></div></div></div>",success:function(b,c){f.bigimg=b.find(".layui-layer-phimg"),f.imgsee=b.find(".layui-layer-imguide,.layui-layer-imgbar"),f.event(b),a.tab&&a.tab(i[j],b)},end:function(){f.end=!0,$(document).off("keyup",f.keyup)}},a))},function(){layer.close(f.loadi),layer.msg("&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;",{time:2e3},function(){i.length>1&&f.imgnext(!0)})})}}}();
\ No newline at end of file
diff --git a/route/static/layer/index.html b/route/static/layer/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/layer/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/layer/layer.js b/route/static/layer/layer.js
deleted file mode 100755
index 8cda8ec45..000000000
--- a/route/static/layer/layer.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! layer-v3.0.1 Web弹层组件 MIT License  http://layer.layui.com/  By 贤心 */
- ;!function(e,t){"use strict";var i,n,a=e.layui&&layui.define,o={getPath:function(){var e=document.scripts,t=e[e.length-1],i=t.src;if(!t.getAttribute("merge"))return i.substring(0,i.lastIndexOf("/")+1)}(),config:{},end:{},minIndex:0,minLeft:[],btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],type:["dialog","page","iframe","loading","tips"]},r={v:"3.0.1",ie:function(){var t=navigator.userAgent.toLowerCase();return!!(e.ActiveXObject||"ActiveXObject"in e)&&((t.match(/msie\s(\d+)/)||[])[1]||"11")}(),index:e.layer&&e.layer.v?1e5:0,path:o.getPath,config:function(e,t){return e=e||{},r.cache=o.config=i.extend({},o.config,e),r.path=o.config.path||r.path,"string"==typeof e.extend&&(e.extend=[e.extend]),o.config.path&&r.ready(),e.extend?(a?layui.addcss("modules/layer/"+e.extend):r.link("skin/"+e.extend),this):this},link:function(t,n,a){if(r.path){var o=i("head")[0],l=document.createElement("link");"string"==typeof n&&(a=n);var s=(a||t).replace(/\.|\//g,""),f="layuicss-"+s,c=0;l.rel="stylesheet",l.href=r.path+t,l.id=f,i("#"+f)[0]||o.appendChild(l),"function"==typeof n&&!function d(){return++c>80?e.console&&console.error("layer.css: Invalid"):void(1989===parseInt(i("#"+f).css("width"))?n():setTimeout(d,100))}()}},ready:function(e){var t="skinlayercss",i="1110";return a?layui.addcss("modules/layer/default/layer.css?v="+r.v+i,e,t):r.link("skin/default/layer.css?v="+r.v+i,e,t),this},alert:function(e,t,n){var a="function"==typeof t;return a&&(n=t),r.open(i.extend({content:e,yes:n},a?{}:t))},confirm:function(e,t,n,a){var l="function"==typeof t;return l&&(a=n,n=t),r.open(i.extend({content:e,btn:o.btn,yes:n,btn2:a},l?{}:t))},msg:function(e,n,a){var l="function"==typeof n,f=o.config.skin,c=(f?f+" "+f+"-msg":"")||"layui-layer-msg",d=s.anim.length-1;return l&&(a=n),r.open(i.extend({content:e,time:3e3,shade:!1,skin:c,title:!1,closeBtn:!1,btn:!1,resize:!1,end:a},l&&!o.config.skin?{skin:c+" layui-layer-hui",anim:d}:function(){return n=n||{},(n.icon===-1||n.icon===t&&!o.config.skin)&&(n.skin=c+" "+(n.skin||"layui-layer-hui")),n}()))},load:function(e,t){return r.open(i.extend({type:3,icon:e||0,resize:!1,shade:.01},t))},tips:function(e,t,n){return r.open(i.extend({type:4,content:[e,t],closeBtn:!1,time:3e3,shade:!1,resize:!1,fixed:!1,maxWidth:210},n))}},l=function(e){var t=this;t.index=++r.index,t.config=i.extend({},t.config,o.config,e),document.body?t.creat():setTimeout(function(){t.creat()},50)};l.pt=l.prototype;var s=["layui-layer",".layui-layer-title",".layui-layer-main",".layui-layer-dialog","layui-layer-iframe","layui-layer-content","layui-layer-btn","layui-layer-close"];s.anim=["layer-anim","layer-anim-01","layer-anim-02","layer-anim-03","layer-anim-04","layer-anim-05","layer-anim-06"],l.pt.config={type:0,shade:.3,fixed:!0,move:s[1],title:"&#x4FE1;&#x606F;",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,anim:0,icon:-1,moveType:1,resize:!0,scrollbar:!0,tips:2},l.pt.vessel=function(e,t){var n=this,a=n.index,r=n.config,l=r.zIndex+a,f="object"==typeof r.title,c=r.maxmin&&(1===r.type||2===r.type),d=r.title?'<div class="layui-layer-title" style="'+(f?r.title[1]:"")+'">'+(f?r.title[0]:r.title)+"</div>":"";return r.zIndex=l,t([r.shade?'<div class="layui-layer-shade" id="layui-layer-shade'+a+'" times="'+a+'" style="'+("z-index:"+(l-1)+"; background-color:"+(r.shade[1]||"#000")+"; opacity:"+(r.shade[0]||r.shade)+"; filter:alpha(opacity="+(100*r.shade[0]||100*r.shade)+");")+'"></div>':"",'<div class="'+s[0]+(" layui-layer-"+o.type[r.type])+(0!=r.type&&2!=r.type||r.shade?"":" layui-layer-border")+" "+(r.skin||"")+'" id="'+s[0]+a+'" type="'+o.type[r.type]+'" times="'+a+'" showtime="'+r.time+'" conType="'+(e?"object":"string")+'" style="z-index: '+l+"; width:"+r.area[0]+";height:"+r.area[1]+(r.fixed?"":";position:absolute;")+'">'+(e&&2!=r.type?"":d)+'<div id="'+(r.id||"")+'" class="layui-layer-content'+(0==r.type&&r.icon!==-1?" layui-layer-padding":"")+(3==r.type?" layui-layer-loading"+r.icon:"")+'">'+(0==r.type&&r.icon!==-1?'<i class="layui-layer-ico layui-layer-ico'+r.icon+'"></i>':"")+(1==r.type&&e?"":r.content||"")+'</div><span class="layui-layer-setwin">'+function(){var e=c?'<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>':"";return r.closeBtn&&(e+='<a class="layui-layer-ico '+s[7]+" "+s[7]+(r.title?r.closeBtn:4==r.type?"1":"2")+'" href="javascript:;"></a>'),e}()+"</span>"+(r.btn?function(){var e="";"string"==typeof r.btn&&(r.btn=[r.btn]);for(var t=0,i=r.btn.length;t<i;t++)e+='<a class="'+s[6]+t+'">'+r.btn[t]+"</a>";return'<div class="'+s[6]+" layui-layer-btn-"+(r.btnAlign||"")+'">'+e+"</div>"}():"")+(r.resize?'<span class="layui-layer-resize"></span>':"")+"</div>"],d,i('<div class="layui-layer-move"></div>')),n},l.pt.creat=function(){var e=this,t=e.config,a=e.index,l=t.content,f="object"==typeof l,c=i("body");if(!i("#"+t.id)[0]){switch("string"==typeof t.area&&(t.area="auto"===t.area?["",""]:[t.area,""]),t.shift&&(t.anim=t.shift),6==r.ie&&(t.fixed=!1),t.type){case 0:t.btn="btn"in t?t.btn:o.btn[0],r.closeAll("dialog");break;case 2:var l=t.content=f?t.content:[t.content||"http://layer.layui.com","auto"];t.content='<iframe scrolling="'+(t.content[1]||"auto")+'" allowtransparency="true" id="'+s[4]+a+'" name="'+s[4]+a+'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="'+t.content[0]+'"></iframe>';break;case 3:delete t.title,delete t.closeBtn,t.icon===-1&&0===t.icon,r.closeAll("loading");break;case 4:f||(t.content=[t.content,"body"]),t.follow=t.content[1],t.content=t.content[0]+'<i class="layui-layer-TipsG"></i>',delete t.title,t.tips="object"==typeof t.tips?t.tips:[t.tips,!0],t.tipsMore||r.closeAll("tips")}e.vessel(f,function(n,r,d){c.append(n[0]),f?function(){2==t.type||4==t.type?function(){i("body").append(n[1])}():function(){l.parents("."+s[0])[0]||(l.data("display",l.css("display")).show().addClass("layui-layer-wrap").wrap(n[1]),i("#"+s[0]+a).find("."+s[5]).before(r))}()}():c.append(n[1]),i(".layui-layer-move")[0]||c.append(o.moveElem=d),e.layero=i("#"+s[0]+a),t.scrollbar||s.html.css("overflow","hidden").attr("layer-full",a)}).auto(a),2==t.type&&6==r.ie&&e.layero.find("iframe").attr("src",l[0]),4==t.type?e.tips():e.offset(),t.fixed&&n.on("resize",function(){e.offset(),(/^\d+%$/.test(t.area[0])||/^\d+%$/.test(t.area[1]))&&e.auto(a),4==t.type&&e.tips()}),t.time<=0||setTimeout(function(){r.close(e.index)},t.time),e.move().callback(),s.anim[t.anim]&&e.layero.addClass(s.anim[t.anim]).data("anim",!0)}},l.pt.auto=function(e){function t(e){e=l.find(e),e.height(f[1]-c-d-2*(0|parseFloat(e.css("padding"))))}var a=this,o=a.config,l=i("#"+s[0]+e);""===o.area[0]&&o.maxWidth>0&&(r.ie&&r.ie<8&&o.btn&&l.width(l.innerWidth()),l.outerWidth()>o.maxWidth&&l.width(o.maxWidth));var f=[l.innerWidth(),l.innerHeight()],c=l.find(s[1]).outerHeight()||0,d=l.find("."+s[6]).outerHeight()||0;switch(o.type){case 2:t("iframe");break;default:""===o.area[1]?o.fixed&&f[1]>=n.height()&&(f[1]=n.height(),t("."+s[5])):t("."+s[5])}return a},l.pt.offset=function(){var e=this,t=e.config,i=e.layero,a=[i.outerWidth(),i.outerHeight()],o="object"==typeof t.offset;e.offsetTop=(n.height()-a[1])/2,e.offsetLeft=(n.width()-a[0])/2,o?(e.offsetTop=t.offset[0],e.offsetLeft=t.offset[1]||e.offsetLeft):"auto"!==t.offset&&("t"===t.offset?e.offsetTop=0:"r"===t.offset?e.offsetLeft=n.width()-a[0]:"b"===t.offset?e.offsetTop=n.height()-a[1]:"l"===t.offset?e.offsetLeft=0:"lt"===t.offset?(e.offsetTop=0,e.offsetLeft=0):"lb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=0):"rt"===t.offset?(e.offsetTop=0,e.offsetLeft=n.width()-a[0]):"rb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=n.width()-a[0]):e.offsetTop=t.offset),t.fixed||(e.offsetTop=/%$/.test(e.offsetTop)?n.height()*parseFloat(e.offsetTop)/100:parseFloat(e.offsetTop),e.offsetLeft=/%$/.test(e.offsetLeft)?n.width()*parseFloat(e.offsetLeft)/100:parseFloat(e.offsetLeft),e.offsetTop+=n.scrollTop(),e.offsetLeft+=n.scrollLeft()),i.attr("minLeft")&&(e.offsetTop=n.height()-(i.find(s[1]).outerHeight()||0),e.offsetLeft=i.css("left")),i.css({top:e.offsetTop,left:e.offsetLeft})},l.pt.tips=function(){var e=this,t=e.config,a=e.layero,o=[a.outerWidth(),a.outerHeight()],r=i(t.follow);r[0]||(r=i("body"));var l={width:r.outerWidth(),height:r.outerHeight(),top:r.offset().top,left:r.offset().left},f=a.find(".layui-layer-TipsG"),c=t.tips[0];t.tips[1]||f.remove(),l.autoLeft=function(){l.left+o[0]-n.width()>0?(l.tipLeft=l.left+l.width-o[0],f.css({right:12,left:"auto"})):l.tipLeft=l.left},l.where=[function(){l.autoLeft(),l.tipTop=l.top-o[1]-10,f.removeClass("layui-layer-TipsB").addClass("layui-layer-TipsT").css("border-right-color",t.tips[1])},function(){l.tipLeft=l.left+l.width+10,l.tipTop=l.top,f.removeClass("layui-layer-TipsL").addClass("layui-layer-TipsR").css("border-bottom-color",t.tips[1])},function(){l.autoLeft(),l.tipTop=l.top+l.height+10,f.removeClass("layui-layer-TipsT").addClass("layui-layer-TipsB").css("border-right-color",t.tips[1])},function(){l.tipLeft=l.left-o[0]-10,l.tipTop=l.top,f.removeClass("layui-layer-TipsR").addClass("layui-layer-TipsL").css("border-bottom-color",t.tips[1])}],l.where[c-1](),1===c?l.top-(n.scrollTop()+o[1]+16)<0&&l.where[2]():2===c?n.width()-(l.left+l.width+o[0]+16)>0||l.where[3]():3===c?l.top-n.scrollTop()+l.height+o[1]+16-n.height()>0&&l.where[0]():4===c&&o[0]+16-l.left>0&&l.where[1](),a.find("."+s[5]).css({"background-color":t.tips[1],"padding-right":t.closeBtn?"30px":""}),a.css({left:l.tipLeft-(t.fixed?n.scrollLeft():0),top:l.tipTop-(t.fixed?n.scrollTop():0)})},l.pt.move=function(){var e=this,t=e.config,a=i(document),l=e.layero,s=l.find(t.move),f=l.find(".layui-layer-resize"),c={};return t.move&&s.css("cursor","move"),s.on("mousedown",function(e){e.preventDefault(),t.move&&(c.moveStart=!0,c.offset=[e.clientX-parseFloat(l.css("left")),e.clientY-parseFloat(l.css("top"))],o.moveElem.css("cursor","move").show())}),f.on("mousedown",function(e){e.preventDefault(),c.resizeStart=!0,c.offset=[e.clientX,e.clientY],c.area=[l.outerWidth(),l.outerHeight()],o.moveElem.css("cursor","se-resize").show()}),a.on("mousemove",function(i){if(c.moveStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1],s="fixed"===l.css("position");if(i.preventDefault(),c.stX=s?0:n.scrollLeft(),c.stY=s?0:n.scrollTop(),!t.moveOut){var f=n.width()-l.outerWidth()+c.stX,d=n.height()-l.outerHeight()+c.stY;a<c.stX&&(a=c.stX),a>f&&(a=f),o<c.stY&&(o=c.stY),o>d&&(o=d)}l.css({left:a,top:o})}if(t.resize&&c.resizeStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1];i.preventDefault(),r.style(e.index,{width:c.area[0]+a,height:c.area[1]+o}),c.isResize=!0}}).on("mouseup",function(e){c.moveStart&&(delete c.moveStart,o.moveElem.hide(),t.moveEnd&&t.moveEnd()),c.resizeStart&&(delete c.resizeStart,o.moveElem.hide())}),e},l.pt.callback=function(){function e(){var e=a.cancel&&a.cancel(t.index,n);e===!1||r.close(t.index)}var t=this,n=t.layero,a=t.config;t.openLayer(),a.success&&(2==a.type?n.find("iframe").on("load",function(){a.success(n,t.index)}):a.success(n,t.index)),6==r.ie&&t.IE6(n),n.find("."+s[6]).children("a").on("click",function(){var e=i(this).index();if(0===e)a.yes?a.yes(t.index,n):a.btn1?a.btn1(t.index,n):r.close(t.index);else{var o=a["btn"+(e+1)]&&a["btn"+(e+1)](t.index,n);o===!1||r.close(t.index)}}),n.find("."+s[7]).on("click",e),a.shadeClose&&i("#layui-layer-shade"+t.index).on("click",function(){r.close(t.index)}),n.find(".layui-layer-min").on("click",function(){var e=a.min&&a.min(n);e===!1||r.min(t.index,a)}),n.find(".layui-layer-max").on("click",function(){i(this).hasClass("layui-layer-maxmin")?(r.restore(t.index),a.restore&&a.restore(n)):(r.full(t.index,a),setTimeout(function(){a.full&&a.full(n)},100))}),a.end&&(o.end[t.index]=a.end)},o.reselect=function(){i.each(i("select"),function(e,t){var n=i(this);n.parents("."+s[0])[0]||1==n.attr("layer")&&i("."+s[0]).length<1&&n.removeAttr("layer").show(),n=null})},l.pt.IE6=function(e){i("select").each(function(e,t){var n=i(this);n.parents("."+s[0])[0]||"none"===n.css("display")||n.attr({layer:"1"}).hide(),n=null})},l.pt.openLayer=function(){var e=this;r.zIndex=e.config.zIndex,r.setTop=function(e){var t=function(){r.zIndex++,e.css("z-index",r.zIndex+1)};return r.zIndex=parseInt(e[0].style.zIndex),e.on("mousedown",t),r.zIndex}},o.record=function(e){var t=[e.width(),e.height(),e.position().top,e.position().left+parseFloat(e.css("margin-left"))];e.find(".layui-layer-max").addClass("layui-layer-maxmin"),e.attr({area:t})},o.rescollbar=function(e){s.html.attr("layer-full")==e&&(s.html[0].style.removeProperty?s.html[0].style.removeProperty("overflow"):s.html[0].style.removeAttribute("overflow"),s.html.removeAttr("layer-full"))},e.layer=r,r.getChildFrame=function(e,t){return t=t||i("."+s[4]).attr("times"),i("#"+s[0]+t).find("iframe").contents().find(e)},r.getFrameIndex=function(e){return i("#"+e).parents("."+s[4]).attr("times")},r.iframeAuto=function(e){if(e){var t=r.getChildFrame("html",e).outerHeight(),n=i("#"+s[0]+e),a=n.find(s[1]).outerHeight()||0,o=n.find("."+s[6]).outerHeight()||0;n.css({height:t+a+o}),n.find("iframe").css({height:t})}},r.iframeSrc=function(e,t){i("#"+s[0]+e).find("iframe").attr("src",t)},r.style=function(e,t,n){var a=i("#"+s[0]+e),r=a.find(".layui-layer-content"),l=a.attr("type"),f=a.find(s[1]).outerHeight()||0,c=a.find("."+s[6]).outerHeight()||0;a.attr("minLeft");l!==o.type[3]&&l!==o.type[4]&&(n||(parseFloat(t.width)<=260&&(t.width=260),parseFloat(t.height)-f-c<=64&&(t.height=64+f+c)),a.css(t),c=a.find("."+s[6]).outerHeight(),l===o.type[2]?a.find("iframe").css({height:parseFloat(t.height)-f-c}):r.css({height:parseFloat(t.height)-f-c-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom"))}))},r.min=function(e,t){var a=i("#"+s[0]+e),l=a.find(s[1]).outerHeight()||0,f=a.attr("minLeft")||181*o.minIndex+"px",c=a.css("position");o.record(a),o.minLeft[0]&&(f=o.minLeft[0],o.minLeft.shift()),a.attr("position",c),r.style(e,{width:180,height:l,left:f,top:n.height()-l,position:"fixed",overflow:"hidden"},!0),a.find(".layui-layer-min").hide(),"page"===a.attr("type")&&a.find(s[4]).hide(),o.rescollbar(e),a.attr("minLeft")||o.minIndex++,a.attr("minLeft",f)},r.restore=function(e){var t=i("#"+s[0]+e),n=t.attr("area").split(",");t.attr("type");r.style(e,{width:parseFloat(n[0]),height:parseFloat(n[1]),top:parseFloat(n[2]),left:parseFloat(n[3]),position:t.attr("position"),overflow:"visible"},!0),t.find(".layui-layer-max").removeClass("layui-layer-maxmin"),t.find(".layui-layer-min").show(),"page"===t.attr("type")&&t.find(s[4]).show(),o.rescollbar(e)},r.full=function(e){var t,a=i("#"+s[0]+e);o.record(a),s.html.attr("layer-full")||s.html.css("overflow","hidden").attr("layer-full",e),clearTimeout(t),t=setTimeout(function(){var t="fixed"===a.css("position");r.style(e,{top:t?0:n.scrollTop(),left:t?0:n.scrollLeft(),width:n.width(),height:n.height()},!0),a.find(".layui-layer-min").hide()},100)},r.title=function(e,t){var n=i("#"+s[0]+(t||r.index)).find(s[1]);n.html(e)},r.close=function(e){var t=i("#"+s[0]+e),n=t.attr("type"),a="layer-anim-close";if(t[0]){var l="layui-layer-wrap",f=function(){if(n===o.type[1]&&"object"===t.attr("conType")){t.children(":not(."+s[5]+")").remove();for(var a=t.find("."+l),r=0;r<2;r++)a.unwrap();a.css("display",a.data("display")).removeClass(l)}else{if(n===o.type[2])try{var f=i("#"+s[4]+e)[0];f.contentWindow.document.write(""),f.contentWindow.close(),t.find("."+s[5])[0].removeChild(f)}catch(c){}t[0].innerHTML="",t.remove()}"function"==typeof o.end[e]&&o.end[e](),delete o.end[e]};t.data("anim")&&t.addClass(a),i("#layui-layer-moves, #layui-layer-shade"+e).remove(),6==r.ie&&o.reselect(),o.rescollbar(e),t.attr("minLeft")&&(o.minIndex--,o.minLeft.push(t.attr("minLeft"))),setTimeout(function(){f()},r.ie&&r.ie<10||!t.data("anim")?0:200)}},r.closeAll=function(e){i.each(i("."+s[0]),function(){var t=i(this),n=e?t.attr("type")===e:1;n&&r.close(t.attr("times")),n=null})};var f=r.cache||{},c=function(e){return f.skin?" "+f.skin+" "+f.skin+"-"+e:""};r.prompt=function(e,t){var a="";if(e=e||{},"function"==typeof e&&(t=e),e.area){var o=e.area;a='style="width: '+o[0]+"; height: "+o[1]+';"',delete e.area}var l,s=2==e.formType?'<textarea class="layui-layer-input"'+a+">"+(e.value||"")+"</textarea>":function(){return'<input type="'+(1==e.formType?"password":"text")+'" class="layui-layer-input" value="'+(e.value||"")+'">'}();return r.open(i.extend({type:1,btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],content:s,skin:"layui-layer-prompt"+c("prompt"),maxWidth:n.width(),success:function(e){l=e.find(".layui-layer-input"),l.focus()},resize:!1,yes:function(i){var n=l.val();""===n?l.focus():n.length>(e.maxlength||500)?r.tips("&#x6700;&#x591A;&#x8F93;&#x5165;"+(e.maxlength||500)+"&#x4E2A;&#x5B57;&#x6570;",l,{tips:1}):t&&t(n,i,l)}},e))},r.tab=function(e){e=e||{};var t=e.tab||{};return r.open(i.extend({type:1,skin:"layui-layer-tab"+c("tab"),resize:!1,title:function(){var e=t.length,i=1,n="";if(e>0)for(n='<span class="layui-layer-tabnow">'+t[0].title+"</span>";i<e;i++)n+="<span>"+t[i].title+"</span>";return n}(),content:'<ul class="layui-layer-tabmain">'+function(){var e=t.length,i=1,n="";if(e>0)for(n='<li class="layui-layer-tabli xubox_tab_layer">'+(t[0].content||"no content")+"</li>";i<e;i++)n+='<li class="layui-layer-tabli">'+(t[i].content||"no  content")+"</li>";return n}()+"</ul>",success:function(t){var n=t.find(".layui-layer-title").children(),a=t.find(".layui-layer-tabmain").children();n.on("mousedown",function(t){t.stopPropagation?t.stopPropagation():t.cancelBubble=!0;var n=i(this),o=n.index();n.addClass("layui-layer-tabnow").siblings().removeClass("layui-layer-tabnow"),a.eq(o).show().siblings().hide(),"function"==typeof e.change&&e.change(o)})}},e))},r.photos=function(t,n,a){function o(e,t,i){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,t(n)},void(n.onerror=function(e){n.onerror=null,i(e)}))}var l={};if(t=t||{},t.photos){var s=t.photos.constructor===Object,f=s?t.photos:{},d=f.data||[],u=f.start||0;if(l.imgIndex=(0|u)+1,t.img=t.img||"img",s){if(0===d.length)return r.msg("&#x6CA1;&#x6709;&#x56FE;&#x7247;")}else{var y=i(t.photos),p=function(){d=[],y.find(t.img).each(function(e){var t=i(this);t.attr("layer-index",e),d.push({alt:t.attr("alt"),pid:t.attr("layer-pid"),src:t.attr("layer-src")||t.attr("src"),thumb:t.attr("src")})})};if(p(),0===d.length)return;if(n||y.on("click",t.img,function(){var e=i(this),n=e.attr("layer-index");r.photos(i.extend(t,{photos:{start:n,data:d,tab:t.tab},full:t.full}),!0),p()}),!n)return}l.imgprev=function(e){l.imgIndex--,l.imgIndex<1&&(l.imgIndex=d.length),l.tabimg(e)},l.imgnext=function(e,t){l.imgIndex++,l.imgIndex>d.length&&(l.imgIndex=1,t)||l.tabimg(e)},l.keyup=function(e){if(!l.end){var t=e.keyCode;e.preventDefault(),37===t?l.imgprev(!0):39===t?l.imgnext(!0):27===t&&r.close(l.index)}},l.tabimg=function(e){d.length<=1||(f.start=l.imgIndex-1,r.close(l.index),r.photos(t,!0,e))},l.event=function(){l.bigimg.hover(function(){l.imgsee.show()},function(){l.imgsee.hide()}),l.bigimg.find(".layui-layer-imgprev").on("click",function(e){e.preventDefault(),l.imgprev()}),l.bigimg.find(".layui-layer-imgnext").on("click",function(e){e.preventDefault(),l.imgnext()}),i(document).on("keyup",l.keyup)},l.loadi=r.load(1,{shade:!("shade"in t)&&.9,scrollbar:!1}),o(d[u].src,function(n){r.close(l.loadi),l.index=r.open(i.extend({type:1,area:function(){var a=[n.width,n.height],o=[i(e).width()-100,i(e).height()-100];if(!t.full&&(a[0]>o[0]||a[1]>o[1])){var r=[a[0]/o[0],a[1]/o[1]];r[0]>r[1]?(a[0]=a[0]/r[0],a[1]=a[1]/r[0]):r[0]<r[1]&&(a[0]=a[0]/r[1],a[1]=a[1]/r[1])}return[a[0]+"px",a[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,anim:5*Math.random()|0,skin:"layui-layer-photos"+c("photos"),content:'<div class="layui-layer-phimg"><img src="'+d[u].src+'" alt="'+(d[u].alt||"")+'" layer-pid="'+d[u].pid+'"><div class="layui-layer-imgsee">'+(d.length>1?'<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>':"")+'<div class="layui-layer-imgbar" style="display:'+(a?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(d[u].alt||"")+"</a><em>"+l.imgIndex+"/"+d.length+"</em></span></div></div></div>",success:function(e,i){l.bigimg=e.find(".layui-layer-phimg"),l.imgsee=e.find(".layui-layer-imguide,.layui-layer-imgbar"),l.event(e),t.tab&&t.tab(d[u],e)},end:function(){l.end=!0,i(document).off("keyup",l.keyup)}},t))},function(){r.close(l.loadi),r.msg("&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;",{time:3e4,btn:["&#x4E0B;&#x4E00;&#x5F20;","&#x4E0D;&#x770B;&#x4E86;"],yes:function(){d.length>1&&l.imgnext(!0,!0)}})})}},o.run=function(t){i=t,n=i(e),s.html=i("html"),r.open=function(e){var t=new l(e);return t.index}},e.layui&&layui.define?(r.ready(),layui.define("jquery",function(t){r.path=layui.cache.dir,o.run(layui.jquery),e.layer=r,t("layer",r)})):"function"==typeof define?define(["jquery"],function(){return o.run(e.jQuery),r}):function(){o.run(e.jQuery),r.ready()}()}(window);
\ No newline at end of file
diff --git a/route/static/layer/mobile/index.html b/route/static/layer/mobile/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/layer/mobile/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/layer/mobile/layer.js b/route/static/layer/mobile/layer.js
deleted file mode 100755
index f9cf69313..000000000
--- a/route/static/layer/mobile/layer.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! layer mobile-v2.0.0 Web弹层组件 MIT License  http://layer.layui.com/mobile  By 贤心 */
- ;!function(e){"use strict";var t=document,n="querySelectorAll",i="getElementsByClassName",a=function(e){return t[n](e)},s={type:0,shade:!0,shadeClose:!0,fixed:!0,anim:"scale"},l={extend:function(e){var t=JSON.parse(JSON.stringify(s));for(var n in e)t[n]=e[n];return t},timer:{},end:{}};l.touch=function(e,t){e.addEventListener("click",function(e){t.call(this,e)},!1)};var r=0,o=["layui-m-layer"],c=function(e){var t=this;t.config=l.extend(e),t.view()};c.prototype.view=function(){var e=this,n=e.config,s=t.createElement("div");e.id=s.id=o[0]+r,s.setAttribute("class",o[0]+" "+o[0]+(n.type||0)),s.setAttribute("index",r);var l=function(){var e="object"==typeof n.title;return n.title?'<h3 style="'+(e?n.title[1]:"")+'">'+(e?n.title[0]:n.title)+"</h3>":""}(),c=function(){"string"==typeof n.btn&&(n.btn=[n.btn]);var e,t=(n.btn||[]).length;return 0!==t&&n.btn?(e='<span yes type="1">'+n.btn[0]+"</span>",2===t&&(e='<span no type="0">'+n.btn[1]+"</span>"+e),'<div class="layui-m-layerbtn">'+e+"</div>"):""}();if(n.fixed||(n.top=n.hasOwnProperty("top")?n.top:100,n.style=n.style||"",n.style+=" top:"+(t.body.scrollTop+n.top)+"px"),2===n.type&&(n.content='<i></i><i class="layui-m-layerload"></i><i></i><p>'+(n.content||"")+"</p>"),n.skin&&(n.anim="up"),"msg"===n.skin&&(n.shade=!1),s.innerHTML=(n.shade?"<div "+("string"==typeof n.shade?'style="'+n.shade+'"':"")+' class="layui-m-layershade"></div>':"")+'<div class="layui-m-layermain" '+(n.fixed?"":'style="position:static;"')+'><div class="layui-m-layersection"><div class="layui-m-layerchild '+(n.skin?"layui-m-layer-"+n.skin+" ":"")+(n.className?n.className:"")+" "+(n.anim?"layui-m-anim-"+n.anim:"")+'" '+(n.style?'style="'+n.style+'"':"")+">"+l+'<div class="layui-m-layercont">'+n.content+"</div>"+c+"</div></div></div>",!n.type||2===n.type){var d=t[i](o[0]+n.type),y=d.length;y>=1&&layer.close(d[0].getAttribute("index"))}document.body.appendChild(s);var u=e.elem=a("#"+e.id)[0];n.success&&n.success(u),e.index=r++,e.action(n,u)},c.prototype.action=function(e,t){var n=this;e.time&&(l.timer[n.index]=setTimeout(function(){layer.close(n.index)},1e3*e.time));var a=function(){var t=this.getAttribute("type");0==t?(e.no&&e.no(),layer.close(n.index)):e.yes?e.yes(n.index):layer.close(n.index)};if(e.btn)for(var s=t[i]("layui-m-layerbtn")[0].children,r=s.length,o=0;o<r;o++)l.touch(s[o],a);if(e.shade&&e.shadeClose){var c=t[i]("layui-m-layershade")[0];l.touch(c,function(){layer.close(n.index,e.end)})}e.end&&(l.end[n.index]=e.end)},e.layer={v:"2.0",index:r,open:function(e){var t=new c(e||{});return t.index},close:function(e){var n=a("#"+o[0]+e)[0];n&&(n.innerHTML="",t.body.removeChild(n),clearTimeout(l.timer[e]),delete l.timer[e],"function"==typeof l.end[e]&&l.end[e](),delete l.end[e])},closeAll:function(){for(var e=t[i](o[0]),n=0,a=e.length;n<a;n++)layer.close(0|e[0].getAttribute("index"))}},"function"==typeof define?define(function(){return layer}):function(){var e=document.scripts,n=e[e.length-1],i=n.src,a=i.substring(0,i.lastIndexOf("/")+1);n.getAttribute("merge")||document.head.appendChild(function(){var e=t.createElement("link");return e.href=a+"need/layer.css?2.0",e.type="text/css",e.rel="styleSheet",e.id="layermcss",e}())}()}(window);
\ No newline at end of file
diff --git a/route/static/layer/mobile/need/index.html b/route/static/layer/mobile/need/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/layer/mobile/need/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/layer/mobile/need/layer.css b/route/static/layer/mobile/need/layer.css
deleted file mode 100755
index b9dbf2010..000000000
--- a/route/static/layer/mobile/need/layer.css
+++ /dev/null
@@ -1 +0,0 @@
-.layui-m-layer{position:relative;z-index:19891014}.layui-m-layer *{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.layui-m-layermain,.layui-m-layershade{position:fixed;left:0;top:0;width:100%;height:100%}.layui-m-layershade{background-color:rgba(0,0,0,.7);pointer-events:auto}.layui-m-layermain{display:table;font-family:Helvetica,arial,sans-serif;pointer-events:none}.layui-m-layermain .layui-m-layersection{display:table-cell;vertical-align:middle;text-align:center}.layui-m-layerchild{position:relative;display:inline-block;text-align:left;background-color:#fff;font-size:14px;border-radius:5px;box-shadow:0 0 8px rgba(0,0,0,.1);pointer-events:auto;-webkit-overflow-scrolling:touch;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.2s;animation-duration:.2s}@-webkit-keyframes layui-m-anim-scale{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes layui-m-anim-scale{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}.layui-m-anim-scale{animation-name:layui-m-anim-scale;-webkit-animation-name:layui-m-anim-scale}@-webkit-keyframes layui-m-anim-up{0%{opacity:0;-webkit-transform:translateY(800px);transform:translateY(800px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes layui-m-anim-up{0%{opacity:0;-webkit-transform:translateY(800px);transform:translateY(800px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}.layui-m-anim-up{-webkit-animation-name:layui-m-anim-up;animation-name:layui-m-anim-up}.layui-m-layer0 .layui-m-layerchild{width:90%;max-width:640px}.layui-m-layer1 .layui-m-layerchild{border:none;border-radius:0}.layui-m-layer2 .layui-m-layerchild{width:auto;max-width:260px;min-width:40px;border:none;background:0 0;box-shadow:none;color:#fff}.layui-m-layerchild h3{padding:0 10px;height:60px;line-height:60px;font-size:16px;font-weight:400;border-radius:5px 5px 0 0;text-align:center}.layui-m-layerbtn span,.layui-m-layerchild h3{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-m-layercont{padding:50px 30px;line-height:22px;text-align:center}.layui-m-layer1 .layui-m-layercont{padding:0;text-align:left}.layui-m-layer2 .layui-m-layercont{text-align:center;padding:0;line-height:0}.layui-m-layer2 .layui-m-layercont i{width:25px;height:25px;margin-left:8px;display:inline-block;background-color:#fff;border-radius:100%;-webkit-animation:layui-m-anim-loading 1.4s infinite ease-in-out;animation:layui-m-anim-loading 1.4s infinite ease-in-out;-webkit-animation-fill-mode:both;animation-fill-mode:both}.layui-m-layerbtn,.layui-m-layerbtn span{position:relative;text-align:center;border-radius:0 0 5px 5px}.layui-m-layer2 .layui-m-layercont p{margin-top:20px}@-webkit-keyframes layui-m-anim-loading{0%,100%,80%{transform:scale(0);-webkit-transform:scale(0)}40%{transform:scale(1);-webkit-transform:scale(1)}}@keyframes layui-m-anim-loading{0%,100%,80%{transform:scale(0);-webkit-transform:scale(0)}40%{transform:scale(1);-webkit-transform:scale(1)}}.layui-m-layer2 .layui-m-layercont i:first-child{margin-left:0;-webkit-animation-delay:-.32s;animation-delay:-.32s}.layui-m-layer2 .layui-m-layercont i.layui-m-layerload{-webkit-animation-delay:-.16s;animation-delay:-.16s}.layui-m-layer2 .layui-m-layercont>div{line-height:22px;padding-top:7px;margin-bottom:20px;font-size:14px}.layui-m-layerbtn{display:box;display:-moz-box;display:-webkit-box;width:100%;height:50px;line-height:50px;font-size:0;border-top:1px solid #D0D0D0;background-color:#F2F2F2}.layui-m-layerbtn span{display:block;-moz-box-flex:1;box-flex:1;-webkit-box-flex:1;font-size:14px;cursor:pointer}.layui-m-layerbtn span[yes]{color:#40AFFE}.layui-m-layerbtn span[no]{border-right:1px solid #D0D0D0;border-radius:0 0 0 5px}.layui-m-layerbtn span:active{background-color:#F6F6F6}.layui-m-layerend{position:absolute;right:7px;top:10px;width:30px;height:30px;border:0;font-weight:400;background:0 0;cursor:pointer;-webkit-appearance:none;font-size:30px}.layui-m-layerend::after,.layui-m-layerend::before{position:absolute;left:5px;top:15px;content:'';width:18px;height:1px;background-color:#999;transform:rotate(45deg);-webkit-transform:rotate(45deg);border-radius:3px}.layui-m-layerend::after{transform:rotate(-45deg);-webkit-transform:rotate(-45deg)}body .layui-m-layer .layui-m-layer-footer{position:fixed;width:95%;max-width:100%;margin:0 auto;left:0;right:0;bottom:10px;background:0 0}.layui-m-layer-footer .layui-m-layercont{padding:20px;border-radius:5px 5px 0 0;background-color:rgba(255,255,255,.8)}.layui-m-layer-footer .layui-m-layerbtn{display:block;height:auto;background:0 0;border-top:none}.layui-m-layer-footer .layui-m-layerbtn span{background-color:rgba(255,255,255,.8)}.layui-m-layer-footer .layui-m-layerbtn span[no]{color:#FD482C;border-top:1px solid #c2c2c2;border-radius:0 0 5px 5px}.layui-m-layer-footer .layui-m-layerbtn span[yes]{margin-top:10px;border-radius:5px}body .layui-m-layer .layui-m-layer-msg{width:auto;max-width:90%;margin:0 auto;bottom:-150px;background-color:rgba(0,0,0,.7);color:#fff}.layui-m-layer-msg .layui-m-layercont{padding:10px 20px}
\ No newline at end of file
diff --git a/route/static/layer/skin/default/close.png b/route/static/layer/skin/default/close.png
deleted file mode 100755
index c1162cba9aaa136e5e5f0d00360ee3af5c011a1f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 581
zcmV-L0=oT)P)<h;3K|Lk000e1NJLTq0015U0015c1ONa4kvV250006ENkl<Zc-oDX
zO>0v@6ov=<0j^vL1wjzHQ78xnQIM8`;7V}oe{gdvCWSysuq3Fh5-tR!0nyDBx-At;
z3tb2zU5U~X7eTQoX+jl5eIFNdzrT_hxNw+x&N=hWoO6xI9lECba<!pXa#`exnQU-L
zu8v3z^|hwya&SrwN`{tnrU;$WAlP=qYdqHJ;_-$b5&lJ2^G<mu*sxCvCp91QA#!jt
zjV{=Q5$y~Z%nm;TJRV)=bOO+4xe#@5Sn&^_&zz3n6@cLw)Z%{h#XzVTYd;-}IygKF
zQa^9wb^zWd<VgZm8Zqmmg<Cc<0L^gm1#mzmv>!6!FV)a~Vu530jOGD)G0$~|F}%eI
z@F|hWR~!4XQ4L@-B};%?^e~o(gTs!6?;5=Xc%D&p2=sDM2hYN;VH?2BsM=%*xv0as
zg*OV}79*@0C2)S)O-4Y^{}!g5CzwSKsf13d1%hR+su7}*qXX{cT@|MQ{_!AO>ZTq^
zlVReKtVWN-80`VPONf;`V<k~CwzBoe!m~E^>O_U%28D4UD9JtBdTL|QW&ie7kLvlN
ze%oeHFGU-Cv*>r7jrWpUHkm=D9HZIxpABfCumQe}DIY1mA2q<+dHwT-{sbHPY~s<z
z#be9AR{#x|E9l&s)>>)PZ!lH**U+rG`jz31)nR7BKbGcIldD~}<!VXS^LPCRBZ;fG
TCDi#{00000NkvXXu0mjf?Vtsj

diff --git a/route/static/layer/skin/default/close_hover.png b/route/static/layer/skin/default/close_hover.png
deleted file mode 100755
index 5b9151dbda65fd5c4e60f3476f2986601f52272e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 767
zcmV<b0s#GqP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I0008UNkl<Zcmb`K
z<F|7?5XJlH{V(3nk8RtwZQHhO+qP}nwpq95WIvO&in&crz3<w$On#Y(rnW>RgeXNG
zMqWbRL*6N$0~ky$ZcC>CG%|(xkZdA`=sO1a4!K4uz{1qQB_t_ody<?vQRqNwBoHC*
z$B%IB+zrpNRd9_O2WiiS&2S$*4!^^$gPY_YaY5;e%M{>+OK`UCh(B3!Tl#OlqHqlw
z4&U<^x&e%f1sw_|<J)&QJN4jz*v?rHp4szZ`h1b_9#+tjJiT({_R2L9gEBiibcNw`
za<Cu3|2puMaHQX0FJCP=D6^|;F9^RMOot;EQ*$u!`ApTG1xq4RUXDlmB$VRAN3|W;
z>okhFxa?&stMBJ71oQJ34!+JK4#{4%mYTBuLm=h9bVYWg4yslIm|wpEKA#+b+Mc!@
zlL$sT2mu*4@93kYNT_2i++Mvd#E+kl@}Iw`&qjd~5N;2Tx{U;%K|nMgN+SkP;2dgP
zxu#@;+qiy{gZD`A8wBL)Gf3Z11E-E+Lb<)`HgWJn8-QO3$kDQ$zM&o-6UyzGyO4uF
zWdt{ClQ@_nPYRqN)x8Ephti7YspiiUPBmX#G^$uoo?d0n*;Z0aD_&V#gIL;PZl?g$
za<%`-mREO(sM`s^f8lpb?HTRr-ba6ca5$Y#mIui2(O?q%$oz|deESYsE-KyoJSuys
zirQ<^c>RV)dy9iR@TeUPo2TuPa8H{Rc}Y~3Ol{OMZT1r7Q-;c0j?&Me=XLjS12Td#
z?mb8eF3$uy**H}G<+G|nrh$o8Yg~tl_BK*WpP>mCd%j~Q;Hcj;u8PBW^jKHy&5F0u
z97RT?jCb$h-Lg$a6ta8rba)ROg7M>r4k!Q&j0?)(HOP06qyj$%3fmGD-)iI+WW*s6
xD5IL&(kXeolFyJIlK;q?E%5v#xnClE{R17Dt8J*z8OZ<u002ovPDHLkV1mrzX`KK7

diff --git a/route/static/layer/skin/default/icon-ext.png b/route/static/layer/skin/default/icon-ext.png
deleted file mode 100755
index 15bc30025b35e8a13bd93054457d0aea553e7780..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2713
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
Tf=!_z00000NkvXXu0mjfKHW0S

diff --git a/route/static/layer/skin/default/icon.png b/route/static/layer/skin/default/icon.png
deleted file mode 100755
index 9afc7fda82a4097e9edf6444fdd5bafeda4d7a4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6864
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

diff --git a/route/static/layer/skin/default/index.html b/route/static/layer/skin/default/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/layer/skin/default/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/layer/skin/default/layer.css b/route/static/layer/skin/default/layer.css
deleted file mode 100755
index 08f3a0c9a..000000000
--- a/route/static/layer/skin/default/layer.css
+++ /dev/null
@@ -1 +0,0 @@
-.layui-layer-imgbar,.layui-layer-imgtit a,.layui-layer-tab .layui-layer-title span,.layui-layer-title{text-overflow:ellipsis;white-space:nowrap}*html{background-image:url(about:blank);background-attachment:fixed}html #layuicss-skinlayercss{display:none;position:absolute;width:1989px}.layui-layer,.layui-layer-shade{position:fixed;_position:absolute;pointer-events:auto}.layui-layer-shade{top:0;left:0;width:100%;height:100%;_height:expression(document.body.offsetHeight+"px")}.layui-layer{-webkit-overflow-scrolling:touch;top:150px;left:0;margin:0;padding:0;background-color:#fff;-webkit-background-clip:content;box-shadow:1px 1px 50px rgba(0,0,0,.3)}.layui-layer-close{position:absolute}.layui-layer-content{position:relative}.layui-layer-border{border:1px solid #b2b2b2;border:1px solid rgba(0,0,0,.1);box-shadow:1px 1px 5px rgba(0,0,0,.2)}.layui-layer-load{background:url(loading-1.gif) center center no-repeat #eee}.layui-layer-ico{background:url(icon.png) no-repeat}.layui-layer-btn a,.layui-layer-dialog .layui-layer-ico,.layui-layer-setwin a{display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-move{display:none;position:fixed;*position:absolute;left:0;top:0;width:100%;height:100%;cursor:move;opacity:0;filter:alpha(opacity=0);background-color:#fff;z-index:2147483647}.layui-layer-resize{position:absolute;width:15px;height:15px;right:0;bottom:0;display:none;cursor:se-resize}.layui-layer{border-radius:2px;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.3s;animation-duration:.3s}@-webkit-keyframes bounceIn{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes bounceIn{0%{opacity:0;-webkit-transform:scale(.5);-ms-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layer-anim{-webkit-animation-name:bounceIn;animation-name:bounceIn}@-webkit-keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-01{-webkit-animation-name:zoomInDown;animation-name:zoomInDown}@-webkit-keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.layer-anim-02{-webkit-animation-name:fadeInUpBig;animation-name:fadeInUpBig}@-webkit-keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-03{-webkit-animation-name:zoomInLeft;animation-name:zoomInLeft}@-webkit-keyframes rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}@keyframes rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);-ms-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}.layer-anim-04{-webkit-animation-name:rollIn;animation-name:rollIn}@keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.layer-anim-05{-webkit-animation-name:fadeIn;animation-name:fadeIn}@-webkit-keyframes shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.layer-anim-06{-webkit-animation-name:shake;animation-name:shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}@-webkit-keyframes bounceOut{100%{opacity:0;-webkit-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.05);transform:scale(1.05)}0%{-webkit-transform:scale(1);transform:scale(1)}}@keyframes bounceOut{100%{opacity:0;-webkit-transform:scale(.7);-ms-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.05);-ms-transform:scale(1.05);transform:scale(1.05)}0%{-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layer-anim-close{-webkit-animation-name:bounceOut;animation-name:bounceOut;-webkit-animation-duration:.2s;animation-duration:.2s}.layui-layer-title{padding:0 80px 0 20px;height:42px;line-height:42px;border-bottom:1px solid #eee;font-size:14px;color:#333;overflow:hidden;background-color:#f8f8f8;border-radius:2px 2px 0 0}.layui-layer-setwin{position:absolute;right:15px;*right:0;top:15px;font-size:0;line-height:initial}.layui-layer-setwin a{position:relative;width:16px;height:16px;margin-left:10px;font-size:12px;_overflow:hidden}.layui-layer-setwin .layui-layer-min cite{position:absolute;width:14px;height:2px;left:0;top:50%;margin-top:-1px;background-color:#2e2d3c;cursor:pointer;_overflow:hidden}.layui-layer-setwin .layui-layer-min:hover cite{background-color:#2d93ca}.layui-layer-setwin .layui-layer-max{background-position:-32px -40px}.layui-layer-setwin .layui-layer-max:hover{background-position:-16px -40px}.layui-layer-setwin .layui-layer-maxmin{background-position:-65px -40px}.layui-layer-setwin .layui-layer-maxmin:hover{background-position:-49px -40px}.layui-layer-setwin .layui-layer-close1{background-position:0 -40px;cursor:pointer}.layui-layer-setwin .layui-layer-close1:hover{opacity:.7}.layui-layer-setwin .layui-layer-close2{background-image:url(close.png);position:absolute;right:-28px;top:-28px;width:30px;height:30px;margin-left:0;transition:All .4s ease-in-out;*right:-18px;_display:none}.layui-layer-setwin .layui-layer-close2:hover{background-image:url(close_hover.png);transform:rotate(180deg)}.layui-layer-btn{background-color:#f6f8f8;border-top:1px solid #edf1f2;float:left;padding:9px 18px 10px;pointer-events:auto;text-align:right;width:100%;user-select:none;-webkit-user-select:none}.layui-layer-btn a{background-color:#20a53a;border-radius:3px;color:#fff;cursor:pointer;float:right;font-size:12px;font-weight:700;height:30px;line-height:28px;margin-left:8px;padding:0 12px;text-decoration:none}.layui-layer-btn a:hover{background-color:#10952a;border-color:#398439;text-decoration:none}.layui-layer-btn a:active{opacity:.8}.layui-layer-btn .layui-layer-btn1{border-color:#cbcbcb;background-color:#cbcbcb;color:#fff}.layui-layer-btn .layui-layer-btn1:hover{background-color:#c9302c}.layui-layer-btn-l{text-align:left}.layui-layer-btn-c{text-align:center}.layui-layer-dialog{min-width:350px}.layui-layer-dialog .layui-layer-content{position:relative;padding:20px;line-height:24px;word-break:break-all;overflow:hidden;font-size:14px;overflow-x:hidden;overflow-y:auto}.layui-layer-dialog .layui-layer-content .layui-layer-ico{position:absolute;top:16px;left:15px;_left:-40px;width:30px;height:30px}.layui-layer-ico1{background-position:-30px 0}.layui-layer-ico2{background-position:-60px 0}.layui-layer-ico3{background-position:-90px 0}.layui-layer-ico4{background-position:-120px 0}.layui-layer-ico5{background-position:-150px 0}.layui-layer-ico6{background-position:-180px 0}.layui-layer-rim{border:6px solid #8d8d8d;border:6px solid rgba(0,0,0,.3);border-radius:5px;box-shadow:none}.layui-layer-msg{min-width:180px;border:1px solid #d3d4d3;box-shadow:none}.layui-layer-hui{min-width:100px;background-color:#000;filter:alpha(opacity=60);background-color:rgba(0,0,0,.6);color:#fff;border:0}.layui-layer-hui .layui-layer-content{padding:12px 25px;text-align:center}.layui-layer-dialog .layui-layer-padding{padding:20px 20px 20px 55px;text-align:left}.layui-layer-page .layui-layer-content{position:relative;overflow:auto}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn{padding-top:10px}.layui-layer-nobg{background:0}.layui-layer-iframe iframe{display:block;width:100%}.layui-layer-loading{border-radius:100%;background:0;box-shadow:none;border:0}.layui-layer-loading .layui-layer-content{width:60px;height:24px;background:url(loading-0.gif) no-repeat}.layui-layer-loading .layui-layer-loading1{width:37px;height:37px;background:url(loading-1.gif) no-repeat}.layui-layer-ico16,.layui-layer-loading .layui-layer-loading2{width:32px;height:32px;background:url(loading-2.gif) no-repeat}.layui-layer-tips{background:0;box-shadow:none;border:0}.layui-layer-tips .layui-layer-content{position:relative;line-height:22px;min-width:12px;padding:5px 10px;font-size:12px;_float:left;border-radius:2px;box-shadow:1px 1px 3px rgba(0,0,0,.2);background-color:#000;color:#fff}.layui-layer-tips .layui-layer-close{right:-2px;top:-1px}.layui-layer-tips i.layui-layer-TipsG{position:absolute;width:0;height:0;border-width:8px;border-color:transparent;border-style:dashed;*overflow:hidden}.layui-layer-tips i.layui-layer-TipsB,.layui-layer-tips i.layui-layer-TipsT{left:5px;border-right-style:solid;border-right-color:#000}.layui-layer-tips i.layui-layer-TipsT{bottom:-8px}.layui-layer-tips i.layui-layer-TipsB{top:-8px}.layui-layer-tips i.layui-layer-TipsL,.layui-layer-tips i.layui-layer-TipsR{top:1px;border-bottom-style:solid;border-bottom-color:#000}.layui-layer-tips i.layui-layer-TipsR{left:-8px}.layui-layer-tips i.layui-layer-TipsL{right:-8px}.layui-layer-lan[type=dialog]{min-width:280px}.layui-layer-lan .layui-layer-title{background:#4476a7;color:#fff;border:0}.layui-layer-lan .layui-layer-btn{padding:10px;text-align:right;border-top:1px solid #e9e7e7}.layui-layer-lan .layui-layer-btn a{background:#bbb5b5;border:0}.layui-layer-lan .layui-layer-btn .layui-layer-btn1{background:#c9c5c5}.layui-layer-molv .layui-layer-title{background:#009f95;color:#fff;border:0}.layui-layer-molv .layui-layer-btn a{background:#009f95}.layui-layer-molv .layui-layer-btn .layui-layer-btn1{background:#92b8b1}.layui-layer-iconext{background:url(icon-ext.png) no-repeat}.layui-layer-prompt .layui-layer-input{display:block;width:220px;height:30px;margin:0 auto;line-height:30px;padding:0 5px;border:1px solid #ccc;box-shadow:1px 1px 5px rgba(0,0,0,.1) inset;color:#333}.layui-layer-prompt textarea.layui-layer-input{width:300px;height:100px;line-height:20px}.layui-layer-prompt .layui-layer-content{padding:20px}.layui-layer-prompt .layui-layer-btn{padding-top:0}.layui-layer-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4)}.layui-layer-tab .layui-layer-title{padding-left:0;border-bottom:1px solid #ccc;background-color:#eee;overflow:visible}.layui-layer-tab .layui-layer-title span{position:relative;float:left;min-width:80px;max-width:260px;padding:0 20px;text-align:center;cursor:default;overflow:hidden}.layui-layer-tab .layui-layer-title span.layui-layer-tabnow{height:43px;border-left:1px solid #ccc;border-right:1px solid #ccc;background-color:#fff;z-index:10}.layui-layer-tab .layui-layer-title span:first-child{border-left:none}.layui-layer-tabmain{line-height:24px;clear:both}.layui-layer-tabmain .layui-layer-tabli{display:none}.layui-layer-tabmain .layui-layer-tabli.xubox_tab_layer{display:block}.xubox_tabclose{position:absolute;right:10px;top:5px;cursor:pointer}.layui-layer-photos{-webkit-animation-duration:1s;animation-duration:1s}.layui-layer-photos .layui-layer-content{overflow:hidden;text-align:center}.layui-layer-photos .layui-layer-phimg img{position:relative;width:100%;display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-imgbar,.layui-layer-imguide{display:none}.layui-layer-imgnext,.layui-layer-imgprev{position:absolute;top:50%;width:27px;_width:44px;height:44px;margin-top:-22px;outline:0;blr:expression(this.onFocus=this.blur())}.layui-layer-imgprev{left:10px;background-position:-5px -5px;_background-position:-70px -5px}.layui-layer-imgprev:hover{background-position:-33px -5px;_background-position:-120px -5px}.layui-layer-imgnext{right:10px;_right:8px;background-position:-5px -50px;_background-position:-70px -50px}.layui-layer-imgnext:hover{background-position:-33px -50px;_background-position:-120px -50px}.layui-layer-imgbar{position:absolute;left:0;bottom:0;width:100%;height:32px;line-height:32px;background-color:rgba(0,0,0,.8);background-color:#000\9;filter:Alpha(opacity=80);color:#fff;overflow:hidden;font-size:0}.layui-layer-imgtit *{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:12px}.layui-layer-imgtit a{max-width:65%;overflow:hidden;color:#fff}.layui-layer-imgtit a:hover{color:#fff;text-decoration:underline}.layui-layer-imgtit em{padding-left:10px;font-style:normal}@media screen and (max-width:1100px){.layui-layer-iframe{overflow-y:auto;-webkit-overflow-scrolling:touch}}
\ No newline at end of file
diff --git a/route/static/layer/skin/default/loading-0.gif b/route/static/layer/skin/default/loading-0.gif
deleted file mode 100755
index fe1097f721b475b3ca38373bc8fc3cdb9193d3c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5310
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
KUl=N6{r>=Lv2t1f

diff --git a/route/static/layer/skin/default/loading-1.gif b/route/static/layer/skin/default/loading-1.gif
deleted file mode 100755
index a6abc9e5731a534085d00dc745d00de4d28d7f8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 699
zcmZ?wbhEHbRAo?Q_{hYt_w)@mZNLBj|1&T!DE{a6a}5c0b_{Se(lcOY1PT3QVdY|A
zV$cDyff`g99GE(%^shWE#V<U=;nK}b_kKRot`Obc_@r`%2D9se9mlkLR<P+l->B=(
zRe!i3s$b+Nhm4r`@ku8xSE|)Jy~<$Y4J(|rY-tqp>1De<-B`_Su<Sa|#aq|9#9d4`
zoxOVH>8G8S#M`c2c2sf|OWHA2;(Ka@N5nMI7td3YG$T9HCLd=3TC_<`B8x3+S}@FY
z3=BE~Kqs;=a5FG4vGxF67Xx)SP)3x2m4OQ^Bih2>D6#kEozB9bRK2z<W%`B>Hz~3r
zREjeQGVm}k!^}XE5oHjCnjy@RH1l8<k8DrYwye}+!NKoz+!zri2rx+Ca0M&e1VXN0
z#O?}41|3$oPlSCEW*)%q3ZOcquxLRF3!n^ASoFv@aNr6Hph~2$0GR;`3$PjRupr<H
Ucvzsh0x2vAxB@9GAg-_m0B#Ap=>Px#

diff --git a/route/static/layer/skin/default/loading-2.gif b/route/static/layer/skin/default/loading-2.gif
deleted file mode 100755
index e1691ac9812b124b689d37bc25cf4d83060bdb8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1785
zcmZXUdr(tn8i&tGPLh*^#atx>2mv&NOAwLRfVC!ZgC+(96De{j36=&CFaf1RvE&LQ
zfQDN@%d&*FHVD=WYPl2}F;HdQ>UgWR9VOUWD`n^|b=7rt+~aI#HnaQv`+f60&pW^O
zeK$$d1Sx7Zzy_9xfY<9C9v;4P=Z??k8yg!l8jZ=x$sh=ZgoG%S%C4@iSFc_HekbA;
zF+-wMY!qcmk`fZpAaWJ)0>WSbA`t)j+3RnG&?D^?=|Jl7C(Pz63KQG97P={fhS+p%
zz@FbG?}Mv1Yi2VH&X$#<3#FZ8)XEe=bX<64|F4OkHic)iy=hfn<tEpD1f9Gow9UQQ
zZM$nzpREYmq0XIrC@pCfr0UEYjd}~cj;V=<6!|fQc6!!^VoIk4ZI3(DsDN>>t$~k@
z!k2A*v&Djm!cwbuoM;4P>#FlXfHtn)eozj;Y<}|>Oz=RhZoHkd`_FWMkhI1kcmulq
z&5fIf&DV|<_U2rkppL7k;3wlhQ&4fA(ALYl#vgrs&KlFD%keJ#G}y}#=_3E9bOsOv
z08k}TdK`g2zsoUTJ!7L4ZJXAWOuyaR)*o56Mb6<xl)7S0K!Mra<;!i$V?HOj13ymx
z%aq)m|5vfEesbHp2E1sHz8S(^ZKbdqu=6dRg{D2z)>Hp--+%cK4S{A$9noa5)){T)
z`ooUaw)Rc?50L+x!0R}|fWY51G>QEAi8kpDPdX|qnA^#|%%xieu5Q|?r*P0@j|}VF
zBEI{ga>VsVa1F1d2_!~*7_b)gaLsm=kz>6iS`Cx-Q{R){%#HNo-ce<Yq!A5d53u1D
zP*tUu9aPfLkTD}ct;?w@*@$n=k%jtc;1G>qfQ)GD(q0)Ag30qI>@yF}2Z*zKj;I?&
zhIEZ+VD1JM-7K>)OHIo~(Ro~@?OW6JSY8q3wk%~t+DFXA8sSVJJ>4@KT176>@N{V_
zIzRkJ$DB1}w7MpuYw;x?XEebZ4w@Qpb;L%T#gC4Z4^RLGLNCtbo<2Sy;C=!B*cADW
zEX&}_!9T*=^KMhP`DEVF>4j&9K*dmhA|ul<>1j)3*0b$P?m;>A?D3}q3;VyMTWaLD
zTdp<6GS#qQ0#o?8RxmR5G!<n}{$W}1b^@$_KX)&#;{V7jgly0{5OOzU0xyW**qOJj
z7bV9yrI?Suu@i;PM{^19e_&sW85DDA5a(j1D!H;2Eg3c}r5}Ea=s7YKFg`n^mS@y%
z_~EQ*D8uq#`AnWs=$YSlDdmVK>U$0bmjq&KICvaxcThbCZO3gdFyX5Az;?_YuvLq-
zSE`j9KdEH^h(r;NNF6}J@b)pxq%+~6zG5i4xr5YC3(7B>0%LHBXGtBL@zLatIN@cz
z(x{O4=clf>x|L*$?4)~l$3K5bMPtpA!GY1e#g{f4`&P{Clz~RU*6Alx>Q%0&RMr6;
zb+10yM8)onYP2*p)Kc+>87({(j4RI|;B;I3d|;$M8Aw0?RECVoJVDT|etDJc)3eXF
zl-RMc1e*13u9kQ8R^Kga60ZI`v8SB}G>E@axk;)?t53T*o|J<hPT7{ZEHqx+ugYBy
zAOHK&&K2EnG55uj73cr-Tg2DLwswap^Y@igYw7FgSlBEG{~*>+0ENK+GbA;Lz+l1L
zw$`(Bk)vQrM`KAW;Ob1U=x7Y)6vz%<Qa@%1edicMVpAL5<$$}LLf7>kI2&!n^QCMO
z*PN5YYmWCye;E&11^@W1*HaO~vB!umJiot?t>f>7!Kw<19@$V~4RusV!>Xs_v4?6a
z9eh6-09f|>sAw`>8|TLa^La1tsW|$=lHSKDv=}>EMr1C=X{0SH+@v!8rNzkapQ8+N
z&#~2v1nc9K!mz%cYm$z00!jv6BafRPxlNAAD`sa9`ia)LuWA)gdU@bpDU@BxBw%*F
z!2~eU5I;5uz({Aj9+dpV9))w_xl`|$nJv;bfR=8PqvU*6IY+50e^B$;qPvK(Ry_A?
zkZd$L7rRCR2+`LUtFmYWqeRtow1D?r+2dTcVU&$}L17iPYfclJcA23{Vub3#A7Hc}
z5CBj}_+bbT*^;A5S55EEr2Cs@)2Hg2sb>n@D8jBy!Fg?wjS&f+i!yv@0=NVPOj1jY
ziufS&Pf3o%oRdcev(sD^qc?sHlyGT4lu^HMdWfDSzc(b@g8G|vOxOpYKnV+N*vWzn
VreKue;JXHW8d%Lm+sVMXe*?P3dK&-$

diff --git a/route/static/layer/skin/index.html b/route/static/layer/skin/index.html
deleted file mode 100755
index 35c63e8b1..000000000
--- a/route/static/layer/skin/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">目标URL</span><input class="bt-input-text" type="text" name="toUrl" value="http://" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="请填写完整URL,例：http://www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">发送域名</span><input class="bt-input-text" type="text" name="toDomain" value="$host" style="margin-left: 5px;width: 380px;height: 30px;margin-right:10px;" placeholder="发送到目标服务器的域名,例：www.test.com"></p>
-	<p style="margin-bottom:8px"><span style="display: inline-block; width: 104px;">内容替换</span><input class="bt-input-text" type="text" name="sub1" value="" style="margin-left: 5px;width: 182px;height: 30px;margin-right:10px;" placeholder="被替换的文本,可留空"><input class="bt-input-text" type="text" name="sub2" value="" style="margin-left: 5px;width: 183px;height: 30px;margin-right:10px;" placeholder="替换为,可留空"></p>
-	<div class="label-input-group ptb10"><label style="font-weight:normal"><input type="checkbox" name="status" onclick="Proxy('w6.hao.com',1)">启用反向代理</label><label style="margin-left: 18px;"><input type="checkbox" name="status" onclick="OpenCache('w6.hao.com',1)">开启缓存</label></div>
-	<ul class="help-info-text c7 ptb10">
-		<li>目标Url必需是可以访问的，否则将直接502</li>
-		<li>默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名</li>
-		<li>若您是被动代理，请在发送域名处填写上目标站点的域名</li>
-		<li>若您不需要内容替换功能，请直接留空</li>
-		<li>可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/route/static/layer/skin/layer.css b/route/static/layer/skin/layer.css
deleted file mode 100755
index 6985801d3..000000000
--- a/route/static/layer/skin/layer.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- 
- @Name: layer's style
- @Author: 贤心
- @Blog： sentsin.com
- 
- */html{background-image:url(about:blank);background-attachment:fixed}html #layui_layer_skinlayercss{display:none;position:absolute;width:1989px}.layui-layer,.layui-layer-shade{position:fixed;_position:absolute;pointer-events:auto}.layui-layer-shade{top:0;left:0;width:100%;height:100%;_height:expression(document.body.offsetHeight+"px")}.layui-layer{top:150px;left:50%;margin:0;padding:0;background-color:#fff;-webkit-background-clip:content;box-shadow:1px 1px 50px rgba(0,0,0,.3);-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.3s;animation-duration:.3s}.layui-layer-close{position:absolute}.layui-layer-content{position:relative}.layui-layer-border{border:1px solid #b2b2b2;border:1px solid rgba(0,0,0,.3);box-shadow:1px 1px 5px rgba(0,0,0,.2)}.layui-layer-moves{position:absolute;border:3px solid #666;border:3px solid rgba(0,0,0,.5);cursor:move;background-color:#fff;background-color:rgba(255,255,255,.3);filter:alpha(opacity=50)}.layui-layer-load{background:url(default/loading-0.gif) center center no-repeat #fff}.layui-layer-ico{background:url(default/icon.png) no-repeat}.layui-layer-btn a,.layui-layer-dialog .layui-layer-ico,.layui-layer-setwin a{display:inline-block;*display:inline;*zoom:1;vertical-align:top}@-webkit-keyframes bounceIn{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes bounceIn{0%{opacity:0;-webkit-transform:scale(.5);-ms-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layui-anim{-webkit-animation-name:bounceIn;animation-name:bounceIn}@-webkit-keyframes bounceOut{100%{opacity:0;-webkit-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.03);transform:scale(1.03)}0%{-webkit-transform:scale(1);transform:scale(1)}}@keyframes bounceOut{100%{opacity:0;-webkit-transform:scale(.7);-ms-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.03);-ms-transform:scale(1.03);transform:scale(1.03)}0%{-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layui-anim-close{-webkit-animation-name:bounceOut;animation-name:bounceOut;-webkit-animation-duration:.2s;animation-duration:.2s}@-webkit-keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layui-anim-01{-webkit-animation-name:zoomInDown;animation-name:zoomInDown}@-webkit-keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.layui-anim-02{-webkit-animation-name:fadeInUpBig;animation-name:fadeInUpBig}@-webkit-keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layui-anim-03{-webkit-animation-name:zoomInLeft;animation-name:zoomInLeft}@-webkit-keyframes rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}@keyframes rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);-ms-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}.layui-anim-04{-webkit-animation-name:rollIn;animation-name:rollIn}@keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.layui-anim-05{-webkit-animation-name:fadeIn;animation-name:fadeIn}@-webkit-keyframes shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.layui-anim-06{-webkit-animation-name:shake;animation-name:shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.layui-layer-title{padding:0 80px 0 10px;height:40px;line-height:40px;border-bottom:1px solid #edf1f2;font-size:14px;color:#333;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;background-color:#f6f8f8}.layui-layer-setwin{position:absolute;right:10px;*right:0;top:10px;font-size:0;line-height:initial}.layui-layer-setwin a{position:relative;width:14px;height:14px;margin-left:10px;font-size:12px;_overflow:hidden}.layui-layer-setwin .layui-layer-min cite{position:absolute;width:14px;height:2px;left:0;top:50%;margin-top:-1px;background-color:#919191;cursor:pointer;_overflow:hidden}.layui-layer-setwin .layui-layer-min:hover cite{background-color:#2d93ca}.layui-layer-setwin .layui-layer-max{background-position:-45px -55px}.layui-layer-setwin .layui-layer-max:hover{background-position:-95px -55px}.layui-layer-setwin .layui-layer-maxmin{background-position:-68px -55px}.layui-layer-setwin .layui-layer-maxmin:hover{background-position:-118px -55px}.layui-layer-setwin .layui-layer-close1{width:14px;height:14px;background-position:-5px -55px;cursor:pointer}.layui-layer-setwin .layui-layer-close1:hover{background-position:-25px -55px}.layui-layer-setwin .layui-layer-close2{position:absolute;right:-23px;top:-23px;width:30px;height:30px;margin-left:0;background-position:-149px -44px;*right:-18px;_right:-15px;_top:-23px;_width:14px;_height:14px;_background-position:-5px -55px}.layui-layer-setwin .layui-layer-close2:hover{background-position:-180px -44px;_background-position:-25px -55px}.layui-layer-btn{background-color:#f6f8f8;border-top:1px solid #edf1f2;float:left;padding:9px 20px 10px;pointer-events:auto;text-align:right;width:100%}.layui-layer-btn a{height:30px;line-height:30px;margin:0 8px;padding:0 20px;background:#5fbfe7;color:#fff;font-size:14px;font-weight:700;cursor:pointer;text-decoration:none}.layui-layer-btn a:hover{opacity:.9;text-decoration:none}.layui-layer-btn a:active{opacity:.7}.layui-layer-btn .layui-layer-btn1{background:#a6bbce}.layui-layer-dialog{min-width:240px}.layui-layer-dialog .layui-layer-content{position:relative;padding:20px;line-height:24px;word-break:break-all;font-size:14px;overflow:auto}.layui-layer-dialog .layui-layer-content .layui-layer-ico{position:absolute;top:15px;left:15px;_left:-50px;width:39px;height:39px}.layui-layer-ico1{background-position:-46px 0}.layui-layer-ico2{background-position:-93px 0}.layui-layer-ico3{background-position:-145px 0}.layui-layer-ico4{background-position:-191px 0}.layui-layer-ico5{background-position:-239px 0}.layui-layer-ico6{background-position:-287px 0}.layui-layer-rim{border:6px solid #8d8d8d;border:6px solid rgba(0,0,0,.3);border-radius:5px;box-shadow:none}.layui-layer-msg{min-width:170px;border-radius:3px;border:5px solid #8d8d8d;border:5px solid rgba(0,0,0,.4)}.layui-layer-msg .layui-layer-content .layui-layer-ico{top:10px}.layui-layer-hui{min-width:100px;background-color:#000;filter:alpha(opacity=60);background-color:rgba(0,0,0,.6);color:#fff;border:0}.layui-layer-hui .layui-layer-content{padding:12px 25px;text-align:center}.layui-layer-dialog .layui-layer-padding{padding:22px 20px 22px 65px;text-align:left}.layui-layer-msg .layui-layer-padding{padding:17px 20px 17px 65px}.layui-layer-page .layui-layer-content{position:relative;overflow:auto}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn{padding-top:10px}.layui-layer-nobg{background:0}.layui-layer-iframe .layui-layer-content{overflow:hidden}.layui-layer-iframe iframe{display:block;width:100%}.layui-layer-loading{border-radius:100%;background:0;box-shadow:none;border:0}.layui-layer-loading .layui-layer-content{width:60px;height:24px;background:url(default/loading-0.gif) no-repeat}.layui-layer-loading .layui-layer-loading1{width:37px;height:37px;background:url(default/loading-1.gif) no-repeat}.layui-layer-ico16,.layui-layer-loading .layui-layer-loading2{width:32px;height:32px;background:url(default/loading-2.gif) no-repeat}.layui-layer-tips{background:0;box-shadow:none;border:0}.layui-layer-tips .layui-layer-content{position:relative;line-height:22px;min-width:12px;padding:5px 10px;font-size:12px;_float:left;border-radius:3px;box-shadow:1px 1px 3px rgba(0,0,0,.3);background-color:#F90;color:#fff}.layui-layer-tips .layui-layer-close{right:-2px;top:-1px}.layui-layer-tips i.layui-layer-TipsG{position:absolute;width:0;height:0;border-width:8px;border-color:transparent;border-style:dashed;*overflow:hidden}.layui-layer-tips i.layui-layer-TipsB,.layui-layer-tips i.layui-layer-TipsT{left:5px;border-right-style:solid;border-right-color:#F90}.layui-layer-tips i.layui-layer-TipsT{bottom:-8px}.layui-layer-tips i.layui-layer-TipsB{top:-8px}.layui-layer-tips i.layui-layer-TipsL,.layui-layer-tips i.layui-layer-TipsR{top:1px;border-bottom-style:solid;border-bottom-color:#F90}.layui-layer-tips i.layui-layer-TipsR{left:-8px}.layui-layer-tips i.layui-layer-TipsL{right:-8px}.layui-layer-lan[type=dialog]{min-width:280px}.layui-layer-lan .layui-layer-title{background:#4476a7;color:#fff;border:0}.layui-layer-lan .layui-layer-btn{padding:10px;text-align:right;border-top:1px solid #e9e7e7}.layui-layer-lan .layui-layer-btn a{background:#bbb5b5}.layui-layer-lan .layui-layer-btn .layui-layer-btn1{background:#c9c5c5}.layui-layer-molv .layui-layer-title{background:#009f95;color:#fff;border:0}.layui-layer-molv .layui-layer-btn a{background:#009f95}.layui-layer-molv .layui-layer-btn .layui-layer-btn1{background:#92b8b1}
\ No newline at end of file
diff --git a/route/static/layer/skin/layer.ext.css b/route/static/layer/skin/layer.ext.css
deleted file mode 100755
index 45a32a80e..000000000
--- a/route/static/layer/skin/layer.ext.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/*!
- 
- @Name: layer拓展样式
- @Date: 2012.12.13
- @Author: 贤心
- @blog: sentsin.com
- 
- */.layui-layer-imgbar,.layui-layer-imgtit a,.layui-layer-tab .layui-layer-title span{text-overflow:ellipsis;white-space:nowrap}.layui-layer-iconext{background:url(default/icon-ext.png) no-repeat}html #layui_layer_skinlayerextcss{display:none;position:absolute;width:1989px}.layui-layer-prompt .layui-layer-input{display:block;width:220px;height:30px;margin:0 auto;line-height:30px;padding:0 5px;border:1px solid #ccc;box-shadow:1px 1px 5px rgba(0,0,0,.1) inset;color:#333}.layui-layer-prompt textarea.layui-layer-input{width:300px;height:100px;line-height:20px}.layui-layer-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4)}.layui-layer-tab .layui-layer-title{padding-left:0;border-bottom:1px solid #ccc;background-color:#eee;overflow:visible}.layui-layer-tab .layui-layer-title span{position:relative;float:left;min-width:80px;max-width:260px;padding:0 20px;text-align:center;cursor:default;overflow:hidden}.layui-layer-tab .layui-layer-title span.layui-layer-tabnow{height:36px;border-left:1px solid #ccc;border-right:1px solid #ccc;background-color:#fff;z-index:10}.layui-layer-tab .layui-layer-title span:first-child{border-left:none}.layui-layer-tabmain{line-height:24px;clear:both}.layui-layer-tabmain .layui-layer-tabli{display:none}.layui-layer-tabmain .layui-layer-tabli.xubox_tab_layer{display:block}.xubox_tabclose{position:absolute;right:10px;top:5px;cursor:pointer}.layui-layer-photos{-webkit-animation-duration:1s;animation-duration:1s;background:url(default/xubox_loading1.gif) center center no-repeat #000}.layui-layer-photos .layui-layer-content{overflow:hidden;text-align:center}.layui-layer-photos .layui-layer-phimg img{position:relative;width:100%;display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-imgbar,.layui-layer-imguide{display:none}.layui-layer-imgnext,.layui-layer-imgprev{position:absolute;top:50%;width:27px;_width:44px;height:44px;margin-top:-22px;outline:0;blr:expression(this.onFocus=this.blur())}.layui-layer-imgprev{left:10px;background-position:-5px -5px;_background-position:-70px -5px}.layui-layer-imgprev:hover{background-position:-33px -5px;_background-position:-120px -5px}.layui-layer-imgnext{right:10px;_right:8px;background-position:-5px -50px;_background-position:-70px -50px}.layui-layer-imgnext:hover{background-position:-33px -50px;_background-position:-120px -50px}.layui-layer-imgbar{position:absolute;left:0;bottom:0;width:100%;height:32px;line-height:32px;background-color:rgba(0,0,0,.8);background-color:#000\9;filter:Alpha(opacity=80);color:#fff;overflow:hidden;font-size:0}.layui-layer-imgtit *{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:12px}.layui-layer-imgtit a{max-width:65%;overflow:hidden;color:#fff}.layui-layer-imgtit a:hover{color:#fff;text-decoration:underline}.layui-layer-imgtit em{padding-left:10px;font-style:normal}
\ No newline at end of file
diff --git a/route/static/logo.png b/route/static/logo.png
deleted file mode 100644
index 34548a078d377180ea04d9d3f4c0f21a42f2e2f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22782
zcmce-2UJwe(l$C|5G1PPAW<X_LmINgAtynyNE~p8gJc8|6eZ^zB&&d+WF!cZlYpY+
z93>7)hTHg_^PY45b-wle>)y4l3uI>R-qqdJ)zwcuRXbcqOXcbnx+@R}<SIf{Q4jo`
zz5FG_2mjOYInIGUM6RmF9uNpI)#Wc1BrSsmToXhZ+(X~f)PP&Np!lt9Tprl+d!t-I
zYY0S2*4x#}+Q}Bp^1#*}=`78<-O$X+g0zulH4@Pj)O1y_bwH~6y4&jeY8hDjI$2BD
zu*%A?NO{A70F*7-ip3lC(Afj-EzSBzE*yNmyez=V@}~*fNt#vuvO|`8nmQ~BF7CE0
zV*EmU)`Eh9EMgM;64ut%FdJK57N{T;Dj+B<AOzzR5`sfT;X)ED|M<rWx^uU&gX<|O
z|D!YTO`6pKjdq0#2zYsU@p}pLySUp62uVmt2na$2pin;0g3rUp8Exgw=j_4uPYH^)
z9@g$iS2WVandMTV)dLq#v@|Oi>R)p}xoT?uE!f%PADRL>6Y#cj6%gVV6hNUaC-$ec
z2U_V7c=#W~_^+)!418Q|1@vq^Ts+;aZIvF`I-}YC^|+qxzh?1&@i=Jy_ro^Ue|PNa
z>HhG~>}{+CY#-X9Kp!4ps6u~_)78NR?c(9!;`;X^|IyjsxBtxVpQA$~?f!?sUEcYR
zrncV5|DoySo&RVGOy<82;-Bih>>jKET+zka^KvE##ebTWjf*wX2LAV8;dT;MHn!Ga
zmF*sg3-Sqyz{L0@U=M`(gd}W5g~UW{pkgrbe@a6*d!VhHt!*!*0r~t$AW6bjT-;XB
zMuHC}Aq3@nU=4%vNl4gP@j*odZLRD?U=r3gqW^qe+Z_pZhSkG=AC=-A7)(h*NnBJy
zP)Q7?ET$+VA}lH*1pbH$Du_T8SXpeW;dU<WC@WwiNR*Ymt$?euJuAz<W}x8m(8XQT
z#l}{eRhX6KQmt^rWjiCJ4cbAP6$*v@`&A8FXZ!!WtaG`pV5_+!tr5;>TX$D?u<b5Q
z8$A1uC-tpRt`BWJbZp&qklwZr|JBjGOPhS?`B!Tp0il1iH~#OJ|8@1QGZIV(G{0P0
zxDxo!(AM4KPoIKN;eTHLGc$eQRlw9lMMQ)}{?Y!=Anqw5!OH&i%%3^_5%uSm@&9=X
zEEZhB-PQ_is|bF<ynvJ76B6WuiW)$L;ZP`CNRUTR94;vMXQkjknMgaI|Jqa-4wLwg
zra)IVR%omLt?{L&`(u%+NDs7&yU#ydk-n|lKR!J~vixxba4YM-wCQ2>$kvAS9~Y7T
z#qxwCtOTt@#H{&XHZVIrD`A)rpM<ce@TE(%vKF<r0k#Je_LopE2iwc#{Lg9s`&|BN
z=HX(8_Of!fmA40b=AZudk9}P3dlslLzc9-!Bc!v9i<bxYKV@4xSUKC<0zWUnD)2u|
z#@faCk*z!WUlVe*a<>9D2NqqL)y~}o#qyVFJG$E1v!Gr6@$J&k|3{HFw(iJ()6l;Q
z{JS@n|97JQSJnUDZTkP;RWERP7X4*X0{^GA{q<e(FQqA8YTN@2P6GJ<7t6YQ9{AJ0
zJ?#JP%l_)q<^PQzyflPA&g~8oed&q*@=5<?AIXSI{ZYh2<lol#zg_xw#r@Yl{xtZv
zQy)nFa|u9+%a4D981Ut97-Z`V_JlhCIpPW=q7aBSIE3U4yfZcfd@>BaCSDxyRULG&
zvcCH1ghQExulT_10XZX#Ux-cvmL|T=zCKv2yFjT4jX#R`(#}DZnUWGQP~6H9LE{w@
zpnJpE)Il`3P@c}WwBXIwcJvlT-1FE_0PWd~J$>ZARrF?K%6FT8#jo0LD<Dko3eyrk
zpJmhJWR;VVduJ5m_c{-*+qZAK9`0C;e)~4RGuKvJR;GOS?)BGi-cUq$TG8P1_CB#S
zeutv3MzPV5yn6SJT-xuqqP#rT@%~y!ytWMO(b3T@Uf%YhTm@~JgGmpb$*ngkkv86t
zpC%?v{&mKNhN3&5S?asMv*Y<enUjYGwzjqh<KyG+kZIg)f@*Qy`8fOq*YrxRL0Vv%
z5Y?0H<>(6$k~Z#c8|bD?nAOjBygb)QpE<pJ@#6NN_(DV?n@W_KSm5a)2M#{Tt#m=F
zJAI*65?0+f_qm2&T<7WY-1rtb-spoFy3S*$F<I-j(1k-ly01~77thy=4PlQ*fFDQ@
zYC=$R1dE1%8A1~_=dax^>oHrP$4wAn5N(MwE7dDVa;xCJ@we(MX}>LIp$F~tL{yx-
zv~cul2L+q*Tgi>L?@7Jp1v7^hu>@bj><2Pr{C@vj!yK(-lUaOl_%ixyV=Vf0Y3W&-
zUe6c9j3b1?7klhTTVp{@s;gJ8k_JJ<@6XLpa2K$w#04oe=WaCeQI6*GtzD?HSGpbU
z%x!c;&|=oWN{j(HE+@#M%xY9m0(aF9=2og`DafOs8@%_(Et>p&5I#OW+nVX3k@u<`
zzkZ);@EXLWOU(|6XkugKTw$p|Np8{wKh+r2NYkD+4dfDGiapJ48VOF_8hc|TaE+S!
zVk||-T82@|d#5liF77iGm)3sYw>);Tpv`>S-lQMI)cjITM|(>grqvH=KluJyXC4-L
zV7KLAoV4U1s)c)-RA=CH5l0jT6aV#`@Ppa=9(W@k`f+b1gJybnc>*WT)I>E(h3&*&
zhMkh=&|fBkMri)m{QUf&awJ`q?_yW1lR({KTqz^NJk<*+NOdez!2TCn;v2jvh87mn
z4R7E6tiQ**EGQae$HKxKonpSy?8dsOf<<F&>Bvz((Aw2JR)sk5v*3z1T$)KQTnkF;
zvw;wX-dUagc=F1sEezE-`-FJe%(WHo;vliypTqp4?`TGC-9qC2-rO_h8+|E43o8)A
zdr4J&f+ToyM`wX}a$hbAk?_ZSy?S9*w<f9+t!M^BEM^2F?3xn~^0wC`&!x{SrlZFa
z2N!0lRv!Dv25N&wGuuY3_jQi^W$@&TlL{ckjg5_07doRKF9|$8>J_h95lVi!akcC7
z-iGDH@#OSJzrhM#r&REeO!gpFQdH}EWAPOD!ubzpYbQ^fU^!%S;MwxoUUGBe>4>(h
z$W+#Z8BZ3`xT43(z@~`HbYr>n+5Sk)x3RHjIKeHrdp-$z$iR3NUkprN`t?YI*Y?tT
zyMEuTVReB3pY_p_ubI<b)<Ig{kn>HK#~aNLe^ho4%3hrQx_kF7^-gg<GEJ2;zQ3gi
zlPu*(FM{XMRJ+&1b8+&5r_6iTbmsUQyk=sNGxHt9fA=%>v%ySBuMT>bMmL1H`IHfs
z_?nqNg=DO%_x%kB!b+*NuuyKGdfR_Ra!@;4=4^ZB{CCY*{a0nNwWm0<KYzSGY2NLi
zPv$qTM-Nw{CYm-eN8~R*-%sPz7*S-6b!`amWJHj=^WZ@CFqkpTO!%)nr?R@`K`@!)
z(b7ltcbp}2&F@Y>zBqe@94VBZ1{0OIW)-2x+EdAEn^stfnjm7(Nr+du_0fGlv?HFH
zsUMFnuc#=)y=VR<fBkB>gvT<8Yr19q>)Pp{0e<yl{wn+aG*8K(>+OWszARE`!ITc9
zhHPuPY_CzG8NAV%GU<hNXRluJ`#zZa6nf;0i6&?vO|U$jryjZ5cCS^0$v#XYXF(&E
zxN2p6ucgAofpoFH(AL<tW+w2Y-x(82(DEor_H>SHfm1u{6ll5k@ag)ua(ADP{X9C5
zN1Cb7rE+cAvwaC?Od>&xVGr<Bd(L%BN!!ob=8h6lb8#%ygZ9;&Z?p+k&-iYX)-bx*
zl>iemJOYd8w`|n3m$=e3I9qZb8qkX~TcN)=NkT9BbMxXb`XXgcwAlyp@b*h;f!{Oe
z5lyi$AklxAw^t8X8_ukd#o=U(%hth3jak62uhC5x=O-U0mz$~Rg0!W7jV=NQcPc|e
zQmB~}QC)=#Ckv{x^lph5{0bcC`R_jA!Hi8&=ByaV>2CDnQ}bb8|KvL?<XyGGIUMn$
zC{B!8?<~%~`i)?@9Q3!h#$@&V(Oe{ui}Qo#0|{WV_IXHiZRd#!-d<y~F(pZ9s{QY`
z-AReOADoPo<tjXD!W?gulewkKMms^y!Oo#YPW+~%^Ut(dq>TTNxq`zqp)?R{)>kwS
z#xC`1RKIi7J#^!$gOkrrD}g=sJ*yX2-=;zqgMYT)sz&iNEiPh?swaW9%$zO8Yd@^<
z`CSW{z0`8xP6+cUd1S-z2&Cg;{RKhOLbIw-$nsf|sdF7_y3uE9a(Tv@F34lKZ|zL`
zVqcqVPZ1ethC^UeI3K)yC{TzjT-qP@61E>W?SIA`_<aN=vxSCWcOC2Elz;p^zP8X2
zd4hAba3cO^;w1mI9HP)W$Wy5Q;ZDs3M)txZZ9;Ct0Akm0`n#rCno3hwE0tGs{2kx;
zAP<*vY-7t<$kjHT*8A^ZMj^r~m^>}%dn-oG$6xUvhO3XbRrN<V!w+7Zgf_74q2Ymy
zEoH!)j0sQSn~6fcBbR2tR0l;!tnqSY1e9^sg9mw1uax58sCYjo+A;@1%A3|ivsc(5
zkIymLgOGRFs<M{)q_?AeedP9El&J<%jP(TmexKd%o<8GoCCF>qXQc+Sw<j}f`~E|9
z%GPfiKMpT7Qy(^R!i4F7gQ=OpP!Bb8f*D4yNjFV)%2aK-XfC}Pj`+`;hyyj}#H7PJ
z%ZWflrYt)BV#1<=Dv6HCcQyAVF)^`hPAjs<#zDkw94E(UT;E29d#K9=9ANZY9}lKC
zqKJTUq>fkfM!qa!cH2#e?g%^^;bG)X^VjW^%~#xd2E?pWT?rzSJ>B_?wjlOO@}c<w
z1XbR3h_$H6nrv4nQ&MR-4ZienG`*EcyI5Cnv3sgF?P9g*Sjd7bB*tG&lyzJX(6!PK
z;;Jz}KHXjG6oFX!EF}gznAjA_&zipUPI_5{^)arL^(gd$Bg^TyVFR4!0uuaKhrcIW
z4j6>(`k0S$hE_B-M42FennlW}2c}E;?5Vqa{AJj@a3x4RiMOJ8H`3)aPV07FRE^4r
z4`g4>{@Og7bD9?LizT05QmaJKLo7V{MJ@yc1P0eWXmDX5tJlSdYg$&ftHvxQI9B@5
z$2fodf!Fr*8Dox5lCP-T>hDFLr9<v~qI8S8j|Dv62qk|l4@zM)5c2Y^1eNhptV^jm
z7H;odnc^C5-N_v)y!5}+4Dk^Eqorhm<&~AkikVn+)bc+0@meDB<*)Z3tBGa2?#L&U
z@@bF8UBGI29W!`9etvy3W{QW0hjj8gm3B*|EJd<NL3|5%UN~EeS!O}#qT4L19Pbvf
zJEyPW*8lou+H9$-`{hkxVTaF@Fr<CK4H7iC5@KsSAW~1-;^XvMg~=0-BOXB$hSggM
zfi>MR<qkEtjn^hfPKc{xVgf${%5ARFr;9-;Uiyjbpu*3Okd`>9WQbSCn+OFAEXN3L
zVlu9;hG5OrQN_a!9+o}djn;P`#|;4Et=9&AwEK64$@2B`#RqeDrYm``6XK3OC8DzM
zIhgYDTj7P2H=iGy7UN7idzLehg&vBN6BfIQzrAz<lbJv@%c=Hi*ugEVO^IEbt(X@^
zmAaqi-a$ze@IvH)B(-es`S7=Vnl}CWy!`xu!TER}Sw=R4K|8p~>X79`_4SYVE~kgP
z<&6i^e#Syd?<w)lnlDb8UyhYqUYJi*W5JY@=;-JgpBJih^3sN3wF$<k6~t(8VnMz*
zTuZW@1Aw@0@7I`R^KBlo^;=IYAD{hd3bV>rl3psYv)JvaFhqZO6zHsLWi^*ZZQ*V8
zWP@|HSU2yyJvuI@!;eCzoIxNouBscC15em<eUuvRTWRvF#cL+uz}zlv8JcC*KXxKT
z?z?nPVDBzrupCQdr%UtM?{ssl*(Z3!PlDy{$4=lZUN1-6Ar<C3`Hh|kYD?|5Z&uv<
z*_U_rQH6<-cvQoh2ui}{GZ#uNlUPOYp`b5QvL;#TUN?`0gs%FnYvbq-+c%|dL$uOG
zH{DwNjtYz#v0?MGZ{H92=BjH9T@HB^ob<=^VYzp^nS9W!vB)$XwYir9O{)h0o<yP!
zwkJ+Pz=`R1yfxJza97QTc(aq+2Q&Uitw0YF1i(ht8E9udHa$~A9CT^w-JQ&j{Y8TZ
zM}q295?bY#90CWo7j%0StrOG=-T`b%G$?&AIr{sw$sBTexDef354O)s#AcdZ(a)7%
ztG84MQmP@($97xB0$Dk1(l{S&PfL3OpHKba1Rury-hNPqQBy!4%R}aiQWXEpG#X}_
zX)=+U>qk|7n$_HJXL@4$fG2yfXwjK`1a=AffZuwZlOwmZv{V9&3Rn(?F<_v#ccf`5
zF}tXzynB)0$6&SdgJl8fg7?0w)2B@`+2udp<Y<l<1k1JftRVzx(8qDv+2z>5a>^F5
zNQ={7xQ%4+z~017=gLfQ4(#`f%`l7_n*DHK>rWN7=L{kO*mUAoLl16&J+>>Q%^FQ`
zSXh|oR9-<fU0ARUl&H5dqusPk@P1k$rWx!(>BEo3s9o>Lqn`&SAd1s9FnFqS>#3`F
z#ObO3;>t?iWfbSTFQ=<Z@o7%b(a}-I*f@NB-O<3vXrUz-M;yIMzP_<>`Jj=}Gey=p
zsh8y{U+(Fg6f@Ufn9`dLd#iDSC~8GwKY)ciXl7dlMi+{jxOMB6oP`C`ix)43N=?Pk
z8{e+Rs^ZSM(u7&DFh#SaYCO0&Kl|R`B|ypuf9e2x0lEWD<6aV8^Gvir^C=X?w3<RW
z0!!}~aAEs3ftr`HO5=P`@jV8>H!~S<C_i@T-HxmdT0J|M5lE8>IF?i^p<J)E2^(O|
zN*s{a&Ms(fE62=Gb<a}RHjL1U?9-p8UT7;us6ST7B?n`IKtc$}I@XG^qd;_E)fIDd
zb*5Q1jD+?HleDk+VE)OT&_f3YIdgNyp5ERH=PCGG(;8CAM?YJ>m6}#~tY`tv<W*PS
zsJQpmn7PCSEXL+i%Y1&iusc_=Hrko2>OBCyDKI1@J}JX<Fu41xL%B5Kt}MVZ!Th#Q
zlLFgHz~hODiI*AxGM`<g7roz`#P_`#MgMzyCi?8;KoT>1a1yIlkTC`G&p2f0I(qc7
z)*TWA*3IDduOk3C#Loc^d+WS;fEo_kZo~|rLG-Me*7NL<C<tBA+tZ9^$G;Sysc4!v
zxw$tZ*TfOCdqfMK2b&Ym!2DsF^6~4KqZn28;qxMU_nqt4uHBz)2~H7rW9^7yd>PB8
z^5FYBD-c2LoSeNwO-THF2IKklGDL^_a(%FH@b81Wwev4{baZuthllkZPS#R5jg@^K
zE>N%V!Pt$Cj^-aRqie|{i6OWl@&s?)AJ*moWd5ZR-Q3tHwg2-6RXmq=$7qSZkX;`Q
z34=Jfl9JNSk^g`=2PF}K)Fd=_quYiO*bDdxIQjkgaCaeAmECo=1q*~NcsxdB?I5%V
z``j@hG4Uo-w4}B2ou}g^PR$eTM?8sYxlK(>VOAtQCz~|_5|}>Wi-xM18U&6qYwXb%
zhy6DhYe8i=uTT?*0DDDlls7Xa+1{j!e3hHq`sGt9HaQ&PuBT>o@_Vy(qpU$kUmpi7
z*kp202RAukJ~CU5B}g|<dF~UjK>JwJZxIm1VuR4)%KG{`Iq9>ifSYStPeP(O#5_Fj
z*v>Qs+^e)9S{}@fR(g5Esy|I+0O2uOSnVLU-oRiD)cE8HHVG{h*FMwp1_%x!5b>OI
z0HSJ9nb~l<d&J_V%xsUDuz>@j;vPwuRm=7P09|t2q25wk`%a%<T=!l|G<xTE;QYNh
z64->dRFnfO?OUfA7W2^Lan2Elhv=Og9hIwnL%wCSt1$W4;D6N6hxe^wbBzJ#)jU%U
zaF)egQ`0vODpFo3=iR>Xvcv{ja{1-+gWF8eZ$LMvgU#yfl&^Dh<vA$B?JnoDeu^1%
zS^mE9$Qu&LWqbX`jn^OqE9qqN(<n7>FuZGI#8Z%fd3${9o2bfea63^?jXP0;^DZ>i
zpu|88tSo3y1iXs@3RMcayc7&9wa5b82RsNEfyBYf&V?7nm6dvDXWNgB#Af{8(}_4H
zTmjg5vnWTWkR^hjW+YFA?5>&F+pXq{z+bza%x^yW9l%jWY7zmt6@b;bO&9sPz8((x
z&p4;hm0k6?dp8m8y^{m_>tE+CFo4nBO&4=91Rkcc{&4=~-5Td9gJ>pc191jJfarHk
zjqoo_c%;5_VnZ94{C-x@md?Go3(4|bFL9w<U2HpQID@~@G1$uT+tT&)^d#MJ*gLc-
z1anw@o{}+EQc|J|&JO3_X%FcP#&MPpPVVaJ#@^=U){U0hdv5a4*OP9D=vKu&-pD$_
z)l23_zhhw+cJt0y`223|>+*7=ODzCvMrju4X?--fT>yx<(Z^?Fk4uOJ8g-OdV_}>u
z$_}L|g(X_DXXsxoIAp~I>dCM7_T2AUT4v+JWd_0(KT$k{F~hRlAC?HPpMupK38aK}
z+vt5A8++pbdkx67*JWjffSuBfmj0cRCTR6!{aa}|+m4S7JXx-*!s;E$8@QhAv6~Qn
z<H~mBk>QYp4092P@`#l<;PRsL&KxQo^gQXJuh^45z$L{mNEolQeF+D*MmP=CCV{6b
z_862lIs?I}2h4&sR!5Ed`peG-murAtjlrRF)Q8b|ro>P)zSqk>++GVb$QE`2X7csx
zS4R+BuMbFW8vr^Fjf<b$!<Pv5Ly3`Pz})}<TVEFzDsRp-&rq<!t(2`bOtNrdh~Y9^
zU=0TDVVXGO5qI_V^8iH&$c#k5wB0Q+=%Ijv*#544c0lzyU|QbWQmkiB%r1Dx^ol|r
zeLO$jP>7-nq6UnRfJbgfu$<i4evzyvjUE&)^$xBKQq=8T+;VPxe(3pOr|fI6QB_{;
zVlhhlemMRy7+CnN+%nsaj&kAa=xA|IkJ_`~1U*t$LXAdL>IWE7CG)7SibV(vt?F_l
zK>2qK42oB>{Isqzh!0t5O~qcIyM}1(Gjg{YF<Mn_3(D6cl^I7;hzWd|#9ku&M#Ou5
z>&k+q15cyus#c#~?PsnE8CmX6{|aJlYtJ6;qI@KECM};jKV%=c{gXCboS_vApIZZt
z4gMu9(yyWQU?1$kPVM<+hB5yPH*uQh5|4g<&m914D*&^@H$pli>5Bpn8fHp1Cu)jP
zt#IRBytv{Cs76?+yoQFSL<%}!HfTwszaM69*`-miVtDs%$&dH;Z%XuwUIWCi`AHNa
z@}QmY*Zzq18*q%i2A!!`Q()A0+~z*xrD)}CtjFVXy%KtLt|z@EhB;44N_q{>t9zM&
z$7@lx!+Lwc6H+|ax_&1K+DV`8v<-a$XZYhE0E-rK7ifJoT)k6?qSr6d`V1nG<Qw4&
zT!w3}!VIF}>R)tTh!4BOb+cc3+i*oemuacdu`%Ek?*r(4>8%B=J4p67C&r9@1xawi
z6|sN)`URnDJ8Qi!xLN035*&Y;eS8P?ftLq$HL5(MySM~3@mx6%u&}{$5QS%?pG%6e
zUI1_MV64o1z@>N#Ancty<}*TIgCg~w8_WBll!U9sQZF<XG%hK|h>(ZOU-N$JK3>$*
zQ4c5-LU6_d25t508)|$qrifRsSl?PUGwlyhym+GCbM448-0=!Av6xmW)b{1pgASX4
zDyOk5tepIjw6Dsqu$Dt!r+rJll`%N>jqssA>cxzL)(2!7AlbPx(UfXxYOWo$_AHd)
z_xD%79Cm95KH({Eqy!^<6jYYro^<;(P!^o%88P){S-B#Lj%;UHDbY#n?8V+ur8cVT
z#Fo{B_#vc2sEH0h-ngFq8e7Ql7?8KJ%Efs*q9xgXBtsdV1H!g7bry1m>UV>k+FZ58
zjQ(1S_a>@0M~mR@TH^Og$_<_!8{WJ3oTsc78|-#6--E5G2Tiw`U23=)NDlx&-x3ox
zALDO-y#GZ7ub`kHq`|%7qjdXS@51oecoG&(#}Vo04s*u|`dY0^$(B*TXy#R9k0}N~
zc>Vz<0?~SLPmo6O);0I7RuOpx1so77f#_%sbCd>h;$g0(pITK=3FA+wA<sWQAjHLf
z-npQomYb6U;o#tS$4hMKzl&GxJoN%Vw^_fL6DIzKpU@2dz3u@xXK+$h=XP&AReneO
zS*+Ywj&+ZlpSRgsJIC&CY-|Ae83s)NPtR}G%yfXrgMtv3JW_dNIZkE+mPdary0Zct
zZ}Vg_hdE=w7L9I}J7FDmb7e>H@bP`*1mqaslX}GDX<T2|$UGV{B1Agq#SY+N+YkHf
z$V<=%cze>6TbhwKKDNyXKAiZ*e}xOA8z{p+^j&jgqrL*)**!tTV5`WrU@=B_g1#9#
zs(6WWbqI^Hd~bt*B?>iBZM8L7cZtcGPNufu<00$o<2Wtd5wQzh;Ti_hO&WLDsSdr(
zGnMX7RF4c8+z!>(mcC9VwF4n#5D!}FO>V1vYgbpfA7KW`)w=>*qdv8Oh5v6bm4nxf
zWq7jyL#g@8SZW1nt10_LhNz_p!Y!4KMOr9?djv@?kqOuon!QdMobf>Iz_u^ZAi!wb
z+@B+gienAuNV@StM*Aw6Cof{p6L7JnK=6;>dVlDP9f0@@q}JmfkTin#A)Fd1K_G7e
zKPx)boc1D>;g++ZU#m-a-yMqMLVwV@CIP>i+CBJzw-=$EHwaj>HdM`27~ppZK{Qod
zQi2eE>=FLl>sy(*B&nP*MD#tC%;9XvD}a|HX1SG|<7~__OX9=3Z5e$sw^Rbj%>lz4
zF-v>YjyuYK+!p{pE(I*a;K~R-Gke}@&}R{Df?SwAU+*0h3PpDaoNWAKIC7ZXEbwS)
z6&!@|7;cg4Ri@laDHUeLZu+{%9t^Ph`|5>0@c|t1jN<b%!wfO+92^{6WwcWSu>b`m
z2NGXTTJI~jE{akJJOncyjpI;f-SZWOlo`Lb>jO@^{7q@;X4;MFJChf4Bw8ee@%a!2
zDqXI+f^J36vq0H9x#ZZv5Pz9$P)QZj5mf(st?$9W!)yMt>^OJOvd&?M`1rBBRSvOd
zL~q;sN(`<5I2iVYW;5T7?bUH(Bm?0Go+re&9NEOq&=d$#UOHJylMHW&N|bQw7FwDq
zIxjaDYpUM!k4gb(7eAX%Anw5lqOzL#fE@Y!#;81trCdx{zPG0bfBom<8r3JNj>67*
z?m_N|{#F$|dR4ItlPd{3^}|mWTk?GOEc7<ISKLN~V^ziJl3QNkaEsM-ndBDp5EUBS
zUP>82%WfUG#b*!`mZ3Z;%oy(hvKztTHjnA3g7#BIin%Zo^#HG^$Vy=b2(Qby2khB2
zPHzW>@p{V-!r{m7tUIIRA<G!2e%LJVx5_vwDeb6XB`HrTZcUMrQZ!XJZDT<_TH7}X
zRvLu9%B_H@|0P*+))meEK0Zm}){CA}$X1&gbIP(N_g9iWw16)Y1@iVf4>J{aLOz6T
zlV>I5z$mTpRK|aLwa$OKM4<izBx*FWWf(!GOOc(@Z8?5Co_KZv)8P2^H4%t0NOm@m
zgnkQ=V#m&a8Ypg*=P&l470E-4mgXUt5yw2k0;34;I>W^7^4tx0^NXyKH(Vlg1jMP|
zhs}C%uR$?{Ha4#>f%EyTs*tSS&S>JYq^B8W%=K<xh!iCF(E@d%>c5co(pXVA8r-24
zAAPMr23341K_4VT(vaRY;T`JSq2QF5ZUlkV$k8tt1o#5XK7ePIBn;tEOW3=JdCn`A
z5o5?}tPfn%RJ$h`yxaRyX(Fk{df>7MYODn8$nhJ|ota%cC{?_eLewE0?bii$K}Em=
z7(;JD_Nru#)i)CTPtlU&5<7JQo!NXLe4}<UkNh<by@!N73x$-7OUR_=HPrdR!YH}9
zxsBu7P%75RvBzA-#C```fu|;PJ!<Oe&w7ZG<0rndpULL<aB6VIxN`R9b4ct!gSA%{
zy59M6W@{7JOb1TOJb(=w?wc~X-o*M8!h}m`@+M!k2v+X7%q}+Jd51Gz=at0VS)Yx_
zP>QPSdRBLU>hL<0FM3^<R?1rtIFVW0h||Ew<D`$p5Wih8%l&MJ7f6U%qj!Zzp;Z}L
zjtc@sUeB}(|NJ1zZZ3kS;87t9uDu0+s*mdvDzS1K@+UOODiqy6_mBLMy$l(Y;kcCH
zPpN`fG+RPBQZskGrLK0J22RQ*$jyEV?x?+t1^Wz=L$nF-jkPUSSeA8l`F|pA?KV*a
zA(^;W!O1{zB~;M1=h{ja<uqwcI40bR=3YH|4Hh_s1VENJ<c(n|oqAk+V2nC@)lJLz
z_+Ua4NTNL911PB@|3}aB3@x0Ex7b@VtNyY_Qm;F4_!|Slti;D-(=+@_LbG`K5oHoK
zem;w_A<@xnViTtCq0rQ<$|xJ<W1i5P2Oiz~i!$s4>`U*Xn55}0*9I7G631d?v}ya1
z-R5}J!X*lv9uPSmT4d0IL@7qQw}vfK4Jh=rlOzmwaWEsCO;nTTyy(aWKD0-~xrNtu
z#Omrlplg~|B3@f;8<H-TIn$O&GaFqgWUkV5BxfDQ&A;i>650`S+&0log?D(IP0|<B
zu{2v$?W&)W#esL7tgoxuL%u~5MMquNu6S19#=%EN`b^i%>?gxZRn7o@@<^wVdt~Du
z{k$yem*3(zgEYK&%+|yrHpFyK9+?yF<I|P>;YxBA1EIg3Cns;YHrCYva`vTgHwih2
zxFowcO*i`0F_c`fuba9(oMO$Zg#zo&LBTKC<{7foR>cDjELIU_S6tl28Qf1gw-(LV
zI#yy;o$2&uL$;E+2|rILpUui}dR<qAxZP~+eDPF4oS~yVoJv<mCkTLdf}pyVHnUza
z80?aNX~TMpn}Tl!lJ*9#Q@GcYiSsc8;oiqLQXj&b)s%15{XiTnjwfiy!oR+BB4xVD
z-W&YvdkG&P@vLq@8Hp0$n1mDa;fHy?Qugub-~G*M2fLFcye;dLz@7#_45fY9Z5VUJ
z2FQ}LkQ0hO32A@~TYlTU7D+$mkLz0Yxi+zNd*$FHvnh@!E!=35)!7#y23`<}?cy+A
zt+ne<t1vU^xs`01AD<EjO_i8TUh)+8*ho=G6Oe-38I0dBxnz_ote>$}5j_ReJ;;7b
z0wA#kX@}8AOXo8v`x<h_#N3EU(@q<ZYGFNT(?pT#b<eUJI6652dhPemA0ePPLcH_J
zFk%KUFP9R2ye}HDK<W-5=b-o75Xo|_6IwT(n&IbG%m%uG*x7X$!Bv3g>>lpG;H{R1
z({dSCOWt+l?pe9f9ll@^Y;Pa4zt}{S+~fbLAe$ZMdd6xEE-SW$kB@|5sY&SFH-@<%
zK3oH58bIpE`|DrdB)>NV!F|N}*@@({iM{hL!i#&s4~fb2T*DThaOj)A?hFv3qcW-G
z8tP9MBg=k#E&*K8B`N6uTfcW5K&Q~q(AxcBbzpiCb8XLxQZp|FW9#6X9*XyVeoP8;
zhQ}8s^M@eQqC|vz_Z@gmt0PFeJk5j2btU~}n43=bdM&`IC<+Q;(krp<1BIMn!GyoM
z=i-z~TONx-g^Z5_%of~ohCOU%L!Yw?3!%VFL{Z~UL3CsdHa^fj!K*LDd5BwNv8OF{
z9xL-7Mzq@Q8kvV)X2WS<4l!*zqXbZGA7*d*I!Npnb#9nXzza_Io9!$0_4RbE_sIjB
znSt;4B)Q!f0&ph;e0EQAudR|hI5_gZ_rZaJziyGz%x|-b25LiiCpTt<fQWxu8+ndl
zxkiEYavia$Y9}zo6RVn&pN}ihxbq~h6(QJwU{KM-eDwm8!U5b~!&m%EY?yp_7RZHt
zI~7W;swQ2x%0nBc!eHAH>V(tXvX`1<D^YlD2J4-}7uM5><}-Rx=gC!7(=^wzk6lke
zl-<@5NxuuIs!Iy@a83L13xGRC`pv%DVs-}2(%1I1Y^4Wg%}jSH0NU;9?N#vf6frC_
z3vbw}C#Dy3M!$Lu0xl48H++cG;H*GRh)NwT#$Og5ZPhN2CL|=}0Qb9l69E~*9DdjH
z^R`61beA<x%WN#4JkTo8qmlMSzsLBvhj;Z^Hu)cos`J<7Qv_{%E9K!t^z|p2Rpi!H
zW2X_^zBR<k<_sBT@Xt~&CcZKhP++M%-d2rb5O;+D`nWaw;?y1hwr-zP!cBONTb{Jf
z2TTV0ZZHnP&iqS(SC22wYnRiUh5(=QVYLv(QKAh!=BmP~N);I2NHSPGv4O7H^aJV*
z<nFK4O#AX&Vi|n*CRl5KprgJxgEH@pHdB|6p@2EKcKy0l`*R8{^Rgec1*}uJTSoEA
zfL7DOmJoYWrzCe!7?|~F90}9}V5+)gwJi1X?E#1JoD*s)h$x6~rRXBzlCwv2I%P4W
zybRCvhN-%XX`89VLTy~bgozTv!tg<)!{xnMHTLd)D|Y+B?gtHe+6wly!Mu<#tDLej
z(n~TO<ToM#Jt(vhHuJ1petkJKeIDc&Mq<YX2M1M*jcEfh=`;6%3X$WnPm?FJI{5H>
z%~SQRTsp*}?7$bGIt$j{{+Mm$*-EjRRa>VLe)OR)x0eKnXu&y{miogv_Jeqka;Q8v
zk`wZCrn#AmOk-%q>|J)<1xqriLkX6u<xlp<L87mQd*y1Ak~!%IQ|73&f6ecT1H*a_
zQf6cTZlMEv$C!juE1(dHm!IDSoIC<arZJ+QF{4E@JJq`oMb4cy$~OfqxsP^G+5}`w
z?M~$%!$3_}eyL0K*NYXo?@a-cATq$YtWQxb&?6P}T=?`@d$Zst$9STEwn4o0fX~yD
zSOA8dc2ms}W-P;pw+r5Ztk6ghC*<4c=wi3l@|}g?zLzV|(}8d<xIUu~oR&<li-ejs
z2T`CW?tds~SZ)ysmYNv&*!~u-&M0+{Y3lmz)(`?AuuMNE>qd;d;v4EcQ{j5Oy@9J5
z+OG#`Ck06W{mpCgf$-AgfL9xdgB)&~uwCf_xeou+-Olgzo^RM%kegb^KN(gH4o&hh
zOr1+sVbWf@TJW{}M^(){;bsYGX=(mBL_siQhRvg=6ZtqSM;=mNBZ^F7UAh<p>s+(K
zk>R&aY*z*{?^Qg&tA6-nUJ!p!2^E?DL!E8`Gbrm)$kBDWP!^=|dO0VK!eDA%T3aut
z0>sb&v2cU5T#}(t+M7}ezFAYl1)=94cn49JJcy6R=Ov_#(h}KeRGsvOv13WShoxr?
zbaZll?M|_0rO0~#dwX&RQ;=*ym!`p~S&$IF+sYQ{9B-plrnJa{xy7-`9}_DasLh%c
zaC1ZF_$!F7D;&SxrU?rM=44lB>l6?(C>GJ-wG23@LAL?xihF6{T{!&pge+Ju1X@>N
z%u|wyY7!gXAm{-Vf`@>429BNp5;Zf*)FDEWXMAOx+R{H5oZyQ~OUSCMMWHMBu|tcg
zf-vpL`C0i}=BC`jT-0xCHLQ^nk7htI95d7lU?bWVT$6@Z!F_lHH&iX1V<@$uY^Aho
z{wy+c!$xtG2`6ecH$b3l1uP#)7rGUXd{t+xc!Bwyug47vmk7YpYw>fSE^hYsZntv9
z%gR!zmNfg5_<XFagg%_A|B9$!BjU@Rpri0E)&zt8{@y+sBTc}ZjZ-)As=%CV@*tU|
zuwqW0^u>OCDW1f(TCO)pX`}!;)@@XJ<|I*_z2FvE&(HwDuz$TmM9}_Ouz$I6p|Iw2
z3XrsV_2t%OW(Y8Kz;?J^7Km{3l)E9b)I_ojtG%`@5|Wc8QOm|GPy_AeuPDLgU$u~2
ziNsctiE3R7iztvpDd4lCatm`Njulid(7QaSUcY{=V`*9b%UlA2_>RdipT6OY<rd>U
z6I(XYINaJ@rwltE9R%H_0I2VY4fzlcH)74nuyJ4-+71~Bj_#wzzMZT%9Fgm{hqu`F
zj4ZFQk)b74<n{|k1UGLuPU!j&ZVa>XeOW;Kw!Qu007Iq6@e|4id_}qyL@~^Dj*0rT
z%=Zd3qb+{kX&>7he=W`1tA;5eV}vi_`k-Z)tD=M0sNNOekELe$Z>@?g@(;~*^YyD6
zQLNmhvrj7rUXAiMIN}-cmt-_e+lI{LhjABLuVmre&a)dH%;9AY6y;>5f#$BJ!tepT
ze2a%ieMHbKouUe60S&=*fKC10oLFg`37QrGz~|GPt1utSc3UfN=d+N6l#H6@%1X*-
zWX#Tw+*1}qs>zuZ3a$ZdWmK<4?W~yG`yD(M+Y-O#czOYHp%1ax=2D2;PX>+*xkCYA
z(ppwtu1){*w{lDUi+tlxcz9#}`;0YJ2nEWW+8^9`;ou7{NTyb}%rx0qC!pr-u5Z^k
zN9r1BKM6~>GBX8vR0bJ;8sOmi=<?iiH6<$c&B`{5RY!~m_z1Ei(8JQU&b)(f3V3O1
zj#8q_e=Y$3V`XGy)G*yu9hbn);9t*6dBtS}cWpp5*LN?73;RCr4W}EWeMzA#{YK`l
z!Rc8+=XiXLQ6vWBx&hGZZ{ECdTOGPtTIi(RjHb+j)&G2^QM6zz$dDs-Tr$zng(LF;
z-ActJ4)F+v8bhvMzy1y+l^6>9MMkJp39i{IG8N}+WXv6ANnmG7rI9%VK7R{)M%Z3e
zRRxHm%tvO=aIcT~4*yK}aa&K_Zm-TeMn(B%bkd?riRLg@!S7v})veEYuO@#cuoTH`
zu>RQR&FWp}L_E}G207u;Vk}Qb=-6}ojC_Vvdbmf70372*@7m9;Nki(udfewBBl)uS
zs2l4uM%B|P8zwr*K9*WJ`D`)b#}^rjd$q{!)-qG&IPAM=B@F&%)_RQQ<18z9Vj=wS
z`4rZRQCNS6bUdKwk%j7Ix}3tq4(BrBkf<YhDn#9@b`mp>9T5S>k>LR3(G${u{=#?x
ztie3r)DIs?i_I{IH#bM@&q;i>MDgBDp0%9FZzdITS<=nl34QMGyVi@5Su$Y=aYB`q
zSXa<IG<k_Noaa|(^I|=ywcJgx+Z@O24Cff<K>?zDn}~sE4daw4En}9~<tfk|Gs=&A
zf#_CO=ZQnE9jGYyGt~0P`6qxxRs{Q2(b}nDs&ePHw#S=<;j&+97=EMhjxg^Y{Nc?<
z{7UY*!g0IkO}+Ilx)@|(vqDfx6iqzT&YN7WbMo5wvfpWK7~I4Wso}|)kgz=bHeaUq
zv-9i0iGEsxb7_+}>pYA^aG!nX-dlPf2HA^jd&1rKKKVh3GN>{K1xEr7o*20b4h4Is
z2bD_0KfYDHY#Lc2P@B<BgVnEclhF)GAC)=z-mnyQ;#phAc&ZKzwFhPRNaXEqs@I2l
zKd@1ATKJ+^0O-DIzH#j$ku_m$wU|KB%#rTLMZ(=SI^lz%5m`MIi`JjE6M3A1GZv34
zKs{)Nj&zJ^As59}sjD&v^x|!M&uIwwwVji!P)xNse!Xw~GM7<23)RZ*0TEmM*$Swo
zv*a`-F0}aS;>W}HaOeu(QOc;yT7x>I*P4*KE}eO5aAe44!beb3W&%ZSS1I+Jn(?Y?
zW^aLhMeuU>_kG4OJ+-x&sP=wGsM66l4knhIlb(-ua(2S+gr6qD6qYQZk|l$qT7j83
zI`-eH_a}e<R^j4BZ+;`9U8CMBwaU*$YI9jC$K|j>)R^^aM!$Sz?~Ld2`(AxD{h6=i
z?W>Y6fj<+X9Xh=`*eIi<Xj}Q-46~5#bR>=NQ0oc%Ju;<Il<M8=a5HnbanVHr!ZCtb
z@q`@?8^-AxvQpAbma<$tU+L77_1p+<%pNXU@$?8rm&F2F(^y9b!eahnHO_B}Gc#L_
z(XspSY$yE?dk@>y;%zCCGWGQ&oRm$XZ&UjCq2l^#x!r7yW^FduKBD6SD@xO*HS}53
zbx*NbP)@1-$g45u&Sdk(CfogsZ|ap&d2vTz^fT+G_wEtq)LAB~EB1X(#>-b2V04`&
zY_l_=&x4;fnH{3>TgLCyS8%<LZ|M|1tK*Cb<QY2sE?b{fdcNytw`Xn}aNA#(PA;un
zOPzYSaxQzVrv4DJZO>0$^F2rzWeJ2!GLROPYU<dsc)?j{BWQG$8)`XObh?uhcfwaz
zidFjs`ehwe>?x{(Lln}C_Z+V5rF)wPGMi6GU@%9U#k2kUz!DZrQk|qtoT^ZgsOiI6
z52aRZ`6A!Cmhz1J(3Vaq%J3Fa+~H~3^2mfbL@I<OKzyA+`|i8|&0Hbr*OivU4Ff)D
zQ;S~F-HI`e8#|AB%~S>!8>h@hR)btWoXw$@C@qv7*8~VyDez1)x^g(%LZ3h7M9n8!
z1x!iRYvRJ!Wr;Ka4S@lf4L8`8AvZ({Y95PqZ}1RTx6{Eqs#z^UL!_QSNO0ziC7UDM
zrEimD-pZ3@YCR^rd-y4P$I?dFUV^wxGDDx7houSiTO=_;*nog3%Z<HXHEWLbOj<^{
z;$EK{k2h|LtO~V=S9(6=Ch<=YREA8ITgpD;u4^M(j3VkmXhEwo@w1xY5&7>)nq2iG
z)j3Pf3ecN<=a4m|yII^ul9BgJEpz_+`{+OuryB!b_KmrQptdcpZ`uW;8uv8Mvxqh5
zh^H!vYn<W3&jwhVI8)U`oO9_w$;!hQPpbEEY7kt;5^nDmw_27-lGhw?ETYHyKiuV-
zpz6gTgr+MH&`pa?>7Gp5C$+vVV|8SkdDD5)A|mE>z4o)h)>9HWgdC>1PFae-^}<Lk
zS0$S19e8_#0ntNU?SbbnS09~(Q15n?BzrZaxcAwlu8V)0JJUW;``ldgSh@YZ5xOvg
z#9_y8C%pgKm!yM*Up5!O5t+v{a)jRACbm@WX~*HKlAxCBo?toPQf8${$y15u$KJt{
zrK-$}@~KAPUq9T#l3h_!_9!UFUB%p93aA_WZqfi(J54n^Rv*R-Mi;(^y%#>Rb#HBY
zubPZ(?@VT9lRtaK!Jeg<i@7RXB{_CzbX=lIgyRHG<qZ2Q&u_-h0%R=v1nI^s4k1fV
zaIv6H+_cD%RL8wUi+V%?3F2Uc!^@+m<IuIGtAL#L-jK9*S|&r6J6Ud-h5euq*@rGj
zxQ6$v9LLMhN3yP1Jjs3Tq1wU}HSG}b28kw6q5EwdqNAhZnxdt`*24jzT!V#1OzSlu
zVs<=b1|m{ZOw-_*o3d+BorBi~ToB|oJx{(MNl2RpzEMKO633M=9i1ubLvgr+&fWQ~
zYfPn|i6&XY*&Hnc0|P~d_MM+UdGe%f)a}X?#xu{1#T@b^zZhn9%bjyZwEZzbz7sQl
zs^^Ba-msmz_*z`E1R`AEL;)2$&Y`cUQ*FB9V&^;Xg`9wSDn8@|F_wuktL4=8LD8>B
zoMbND)jl_K%PDrscWNU1MWDpTLv{$aMR-7bfy&%Yl^^$kw`;I)?5M$BJ?`~EyrsU^
z>T_}N#UoGoQbRXyuH)dfsP4GE*NnS{TfcC`?$O(XtvX>ILo^F*8JRv;!;0rdTG*d^
zwCwIKW0V$@57>!WjSiC!Vg(dPm}UHNf;t#?0S2|yUcSQo(`@xAssEneR-gVS=+Os*
z<aF6#-d8idIqF7-h&@$lCagsYVQ!j3o9Y`xoEyp|Y!d^uL|rGn-1MBcwRctm$+yV{
zpU(A?G+HhW>eCbDz{WD%yRRkQxMmFb{Q2_+h!>-nWdmtF4U0J3!_g#dnrf-T>;ZTz
z0iBYTDhuo(!kJ2Y<^-c;Oe71OH>xblbl0O+7CdbS-tfz{on-ON7qU_FnyGti_P<X?
zV~0O|&M$%GP<DN4*=k+Zhyj#<&;xd*2HOF9HV6wxMoiN~<#ysa7n@z3+~g!~TC-}r
zilUDlA%&Q}=R_G=p2&Q$?ENu*zKWD>Ps+e3XW?Sb@KJ!7>TX?PP7<oeFx$s5gP*P!
zN2fl%(Q|g8`v$00^GMsQ_PUW;n0oxJrl|_gVGpY_nt5gj5MKfLLf$4O{Nw~Vr1$r4
zut1Om&@Z^U=BfL=v?0Q5NWClbtG6cNH9iHaK!p*$v}e8fM_mkJ{re%WpPQK4b>n|2
z!>7gL@Cs(mFTf$|$Md@Wy!KrJzZ!pP?qsB}CKZT6rq)iinU$j$>Tal#t*l%@=!ZLD
z2UZs)teQFPV3eSnM|r*<Xkqa_X{h-^ezN18=E;ObPqh8y&LI2K#WMHqcbQ75PsGiJ
z)SDB>3;ZyN51Y-%mJ^86boR7vCw>Ac`)|V+q!2Fctj3^cep94PACxCyH;K}S3^Lq2
zgRji05@rzaTvk~^?1&SF+m~e0e!d~8{jmRvmOsHe-G`A9RzIsQ8lFA`r4L)y*rTtC
zKF*bV6g$W_B&91!4Y`GP8={dR?nZ0wWw#O`JaA|Ly~|&U;~s}aX`b|w!~vqB!O!$G
z7w&FK_UmJTXXV4+p(<Ty6&}@*`1EgjdAs=@&Umi#v0nyk44A4G0|5!n?EdO#HkeI@
z4A%tClh8nyDQ&5uo>B9G?j2yDO!<1pdw>Nw$d_;s%AG#HvL(6pDja~GW6pjpbC|CE
zyv<8w0i@gD8BRh?<Uwk5IH|w;SwxCd{6s7tXA)h86W-d&@X1eZy`HMHYl>)>CXz%a
zwUBX5>n+TYVFr2_ak5%JG7jGMI{uQU^0<e?o<C+FtZ;kjrRbX97RGJuRsaGjiKJX2
zmT8DX%kV~{d%6V3Sae&InuIN=Jrih!Csj5`Sm%_BB1SwsKLu~!n`;&QA;ax}HdH7h
zuL^&v3Ep6Olo9azM-^K7sx8RYtJn8PxbW<%QVUF)#mnGJZ2O;3*qiN@qkU4~BhfW%
z6A9doT*6i+&~kCidP|R{>=yI-hmtZB<7PJQ#{r{wUDKw9?1LJP8Jz)he)6#%uw7CB
z|0)$Iy?MVIRC1OUF)yhRJU5A(m4b76X>Y^@hUaH19<26+kCuM!4*jjsApV@l#}(lv
zYo2hIzr%~ujgO`E(@Ns{y1%aszdz#6*tyv}h=hA91>NS`3r>CMR7mMytC)B#IMUW$
z{p@!PskfZ3ce?79_X;gxqkz9TqJ|^PDMBMYwX`C(m$0!s)nC{m`rGX_sq3ltavChv
z@Ar$kS(Uteu=m?dOpf};Qm=y9JNGwyW6;{#ZMefw&KSu0Vep!>@LNDRwD-j7mpmhV
zE{|L`GkOm{OMFDWME8ss2r`I&`m@%RaQ0V~G2l3}?wzaIB|vb7slWQ19G&G~AG#jE
zrn6g7_(+{k;JsP?W7SWIzX{wSm@Z^lkdEUqh!K-5&|j2Jyff`$lR#Y+AGSLe_LUr3
z$Pv5yd&Og1sT6iD-DA}ZA0PBPo=^M!v6)2%RW_BeKT3#~di|=eAvYf?_b-}a&ea|#
zoSY5UEN$dX{)#cwGfMf!7mG$}jI`&-hg5g@R-ZlqrL^=x%jM7kyg2zQtXpF{@b(t}
zOl?P%I-DmVIXrBw(Ahk70i3jEcw~Ax{Cy;j@o`Ni?b+hsZ2QTr{s+d|UW<f8s!dxe
zzl4bl#KJMlK(gA>FFRrIUgB&&s1D1Z4_D0ClyauBXOIa_^{21b`o&GcFMs=tAQOK+
z-Ul{HhqG6uQPS$Ei^%lh;KM4b6IPO33V<s4o9-!1Ksn)%ou}R=%EQ0H)4x;RYh-RG
zHV_yI>?&iIaaQBLd<`=3H^ki$zXg<jF!J;BTbP=fZZuL&p@u_KBwX{^^PAl>wF_T=
zxmcXle<g|s%MX*Fb6oSvm=jKIZxn#Gw0GXY7YSm+Vlvm0_dCsxf(nh<Nhw7ge;Qf4
z^-i%+7%yoNTgK};8bRalKgFIs`0T#mb0O=Fx91&VO}hn+WmOfI9DSVn^_mintL&+F
zkKLhI^bSnzvog$s12MXiT8x=y{I`myQen*Y7Sl30N5nEjX8wG9`im7j%gKkTS@V3I
z$>W`8K0d=@V-Ax=$?}C}g3=P;)e90vI68hS?M9I0$@tjx=2XK0rC8=Ytx3z6ji6ME
zan<<lOfTBTSW06%19BEy(@G^cXYAQSZa<}JrQ~IfWO4DG2E7(FBYA4GVGbr$OYIut
zx;*DQ_Hnkx;%oWw(`UzH&F5rOo_r8cpx?I+Du@F)EhpzWyNTlT4DcOny3#^Y)?MF6
zH3#24Mk@Zux{nmywO@l;*|a>bK~(EI-r#;%`6ap9ffmW6=8?X|wvy!JIqj9@a5GtK
z)uOJF1Pj*0Qe9i?jY1&84aaRsFqx0fk1jv~SLRsdBXY8PJHZ?!T^u&7v2vG;$L=Ck
z4}w}gv6W~#>>;I4GQX?h;{sz1PDY`Jg>u)n%bl66jCeocxIW_Tx=%i~1yzb_pnx+c
zcifJDlap>=b1PNDSsWBqPxqpw*&s#Q+2@6WD-+`q{f^9tO{JOcL3YN1(S!u<%1$oJ
z<FM13y(83SNEu`O29%XML?e~P2uzr9T7@<P>2xwN;Zm1tSWgA(kUOSNK$}Dp<StIy
zRkBYOs<P_^fEN`S)7N}EXlW!LJ#?IJ4_Aj58E<mY+QhcUqlIlddx?fM=>j_0iZhic
z9qPBC$k!U2ulc)EPkj9uCK?8OV06OzLrO(;bvi>t3S0a;Foks<7wfVhLH(W3;?K0+
zv%v&gSMfu#ar(L5zG1L%*4st%j9(}zk`R5!u<S;pWhuHpSdw6O-<!BoUtAP%Uky`I
zs`8+V<!RaAwXMPS;?mUd$(mv5Xe#Dxom&Z_M#C`ts30MImI#6zn?M2WYq6#Y^)H}A
zzS)B{$DkayxvF4BwD;*8EZ}%wKuhLmQ5w{SG29_h2+9c^Eqk6HJBk4r_&y~Rt8B=#
zQlBn5ReKn}n~yXR#F-LHW!kwdpeD-h$`>JjcM9`D+inJxz2I7%{A#zHp$@|z$q$bZ
zX6jff7EVP5)@6LM2cb{o^ZOzBM{Z_pd#74!+qx%M`Kcvvtcf3rXG;rm0iga!j&|mx
z=q$jAtadJpJ`22*VXAWBp;G&1jA-qL*_HKaVU>8zm-PnEXwnI8<`1@SP^==|IljZM
z$kcOvJo;M6i;InQcy?~*6BQ&w|FkJt=0@f<m9yDEebKz9jRBD1;Zq3gC4cX3qWV?;
ztwq}Mde2GlG6SeU2Jewaq|a>2-sV|ycz%pP6`rpwE%DVIEvG*o8{am?o5cZzTCZoe
zqdme$5`T+$swxvFI!aMJ6)xk?)}fvpO3iS0OXJLv>HW}Hof1|`ky=x4epbn}IX_F6
zlFh0q^KQ~d>tN}OGjcfg|0&_j<DuOCI6h=4Nt=*FH%r--vDFxfQX(Za*KTf>B!&`W
z9c3xI7F=5+j8SB7$}WV+IwD4m>}%FyV)%WZ`}>>MdFDCid(Lyt`F!3Vul*O9sc7*D
z;e8=+&#EXVXMC<)m|1jG)gfz#@v02!S|>HvN($xN%SYM-ryI8B3zIg+!355VWb)G8
zB6#YxK;wvqer8wc>UtMfmwEardWcMjl>4RZM1FsF_p25b7;%$r4z$t>0CwO-zy>C8
z+_T$~M=q;B&oYEcTmF2IQ&z*9r8=NDXqFHp>CJIL2NiK_yFFjnRh{P1zNAF^i~-tQ
zsy1J3S74TQ#l!d9ouj6A-h&C3?9xhLaMi*+@WwexkHF6$@A&5@jQ4{O3jTk18RIX&
z!8#_#rl_Ek>=Qssf#I0D%DbX)@Xg4$i@HDdvY{-Mpud7ClMfb&u91&bEd<=9Vx>8X
zQt!s{Ibrrl)ytAQyq!9JT4|DW`yN;fvDYr!OYPGI<fc?~$BlBTshn#*(fW4qECK%b
z*~hoS6sOoY6JmhJ<Hz;`2}PxCR2zFWXI*?YO{kco+3J8;*|A5@`-|fjaNG?HSbR>=
z=y>8e%GmQY%Wg<{aVYXDru_V~EI;m(^Ei+JV-BA#9Z<g3P^dP%|AvJ{gbsVkWNk7t
zR_qE;@CMCSPW$u<C^r!AGRgcW%@g9iG#A0HTm+t<(%%xUw#1>w8*MlnA8t@2?xC+{
zzcsQ@&zK*>*tb~5M+Ci);O8j<krov_P)MP-mFS+dOEi*MY$F6N6I|I<UA?+n@FZUw
z5R3_+UpT#v67!M?t;aX~a{_c25GR{vM;&=$Gd?YxHZFXg-hfWk^^|ql&|LppAz>VM
zSkYt1bSP-&b~+l^A39eW`VA{!^dHQ-?UUl870Z7RZJpy;!oa2H&ecBTrKP1*r)xSy
zq1~~f776h}7oLry$r@U}J*&Wk7Ffgdsc}#c(hCR(DDk?_b5RUAAZ`NI9w1q@{_^_p
zUP^BZ5RdD2NA_F+;2zb^Y*)y3maA7eiH*!(?Cy76iooT#2QII(r^61pt$FyVe91R^
z4C)ri4Y0$dn15~Oq<zn4J9*4?ijx{8V~cgIF0D>>jeOgw^xn>`!mU%hRF2~Q>kCdN
zIWdunI^J4rm3YQxF(T#T#IhEtX0>XbUGsbR)wf44kSu^-85tSpvYp3!d`^h_jPd}w
z0BSini&y6XHhkgLVH??F(*W&tofFp9ZC;JQT^{|1K?6=<8Zb3BtIKXG2esBBUl3KO
zko$SA-S4Bkn=pfR9g+;XxpxY2RqzKH%36U^X#&mm@z%-%t;xmtAU@IBt3TKvGBcBB
z2tXP=z^8lWI2IysR!TFmLV5-VLjFodJDalgc58da4yuu(r5s{0Ez-B~BTHet68;OD
z0^cenC$AggmqtG+zq}|4pnxa2YB>I8*+Rqq_CAD2zGtvV$D^tj>UQo2GE}Dj@7irI
zaWU+p@q8omzhDwB+4XVcJg+m>__p%w%#k5<k7fF5%i;}96F~QVR<HleEqRcZR~az+
z^pX;b=`qsC)?hjhJuzt7`6=re>?^gsL4B=x5uf6;?W3VA=J(f|s{UA}&@HJjTxGZU
zxx^@DQaB4sCVZJEZLMGIuQTpN!PD~0OT@wdS(Ku^$Cr{xQ46|%02Q7{TFI377H9lf
zjQ!z=XgMSXkQEda5109~mU4q`)(iehFdCGmm_5q(R$sh%LaB10j#M#Q+-mb_dRuY0
zBSmm?V?xIyo!j^6nUkW)Q+@@+kI_fpQZ@z!?X0%Iw{G%D-KJRJ3`Nilz6)f|uOI7a
zG*^w8^mjhJFjiACQ)^$)Z5;@CE8)p=;}kax7{54XO`9{l$8*qRB?3371b`+-jBsml
z&*Qz4Ha`_oJw;JW;z+b^82%3RGAi2i+y$XNUZ(spuO~BpwR@{eT`gJc&Fck~OD(lG
z1)x2|^)La;n{nm6;u4!hLnT25?SA0UALhomhLg9<`BMjwe_Cpm#BoMHZL~~SFjNw9
z4)5CPZ}D<|WiP!yTN>fsn1u4F?20wr5>ElCG|KTv;B2L3DWgS?4!Kn>Hj>J~4P!g^
z^pUq0YbbcPuQi+kOycaH>|mHxW^z{zJN~tanMl1SKF?=$Jbo;6&B*g-*~E>nH1;yw
zrg&Rc5*NKW(64PhEKahe!}Xayqg`G5bTkudF2~kPgw&Y20@qf+2B3YJZrxj(f41C|
zk5J7TKhh#BO#&uC79uem%-c$BvpWl+0KR9Gyw<Ea81@oMZ>c?sIBl57c||r95DhQ6
zAZsqA9cQ#updSn(`8O|q_&&-RfCLTLD}FlVgw$mHZXN#vLDuCDGCm;0@*TmY86$cR
z=aYm(NK{DVx7vsDD5*Wk*=1?UfsTB<Fy{`-TK!A+p>dt3qjf64Wl%FFBw)2I-INcI
zV5T=OzsSO0y97GUxchZi-t`xpn&?{1c76?!9Te|x_xrpD8-j9CW`;lV!M3sp6|*JM
zoGLN{m~82Sv`W2-nbbb>fdf0|w01)g{l~0t4|&l)6@N!4?Mkfv(Mwxnwwuzqhg@Qv
zQLs?Jvawlc`OYo(;fM5+;IqQJ+DZwn^2gkMoV9F{czLDym6J%LQ&~FeE>aj9NaRPV
z`m*DI&g7glQ27h41b+!RUaBj@1uQZ#^JQ%lT07yf$cxJx(+A-+U;6T<s9A^EFFtqu
z<4(i8bo6!lX`|jPm;~f0b<zX|1)B@JqK?j%YW~>v$KPZ43hd>$^z(OcAQ>f;e$1!Y
z_q@<ENH~FNc2?FX1fOK6YCRW-g8|8Y;|3iAHw0U&a7NV}bPdFgBlC8HwOnCM{1I9M
zt8&Zyss;l+6~Dj4p06QX@=7o1SFUZqG_u|J<ch^QA|u!mFFyyo-6obnYn==T8I|bf
zBBo<JB7V-Ar2Vdd8BVyL;vKsaWeUzmgM9wbvnkM9s?Aw@s{%rr2u}uL)_uCAojHg9
zRLobePfK4)`0BPi>%o175;L2HN?&WW^Sr9EJFW@$qlw!TOHCy)XnmOV*^-fO<Ma_B
z=-0|W)47sx_ryxTi!dm%hE0ckYflG83}&C7sUO_n=Lwd71j3^q*le}t<_`;_vhG4^
z2D_m+?__Inx75+3V>ZuM))cJXhn@Y)0fq}n^&ohqNSJ7%<h~GR@g5$FVgsG6eL>0X
zo-0OOBUy0{dUfhz0=eKRs%BAj*v?T5e_|a{@(`;)?YQ4(?M-%NIG7sxqA=J9$Iaf3
zWVM-NTR<H7zHcKP!=PRvKmQulC}{~t?wELUP~0H2Vjq@llIGEPkmLilA8L6UK^&zv
z2K77_undqeAPuxN|7vxPPI_FKZSq4`vNaU*yBbLM2z6UdLJ~$wI<TjI!Nl5dv6Shv
zH2BOa4g^0YDRBA~wRrP(q1Ewxjr5Wh;H$0HO33Ux3CwxsKO&7@J5KW9pIz%vm9tMU
zz9h{nf}V(sy3o2UnI)=JwkO*;kjIV<c@W;AjLK1t!r(E;jakE?s|w;|k}|Ryj&SL}
zu%-*`DQ_Drv(fz8@V(NJc}?*2p6z*+V7Zg<Od()UjzyL0KP##rJ&Bc~8_ZK>;MZ{c
zZ@rl?|Gi{%25;@GVA_?DK5!ge?|7j-(FPxBTc+Q9m7Cl0CENi$+0gyrHc*N?3abB1
z=OJ(a>~=b|Ks(XmVHPWN5<B;fpO;sT)aq(1sIpJaRz1IxD6yAdE(8q<r^1c?azXj@
zYvF>j@nqwCwO;O1KTsFY;LE@xSsrRgcEI&)XMx;;f(b&CN033()9}kZi!Sm9hYw2t
zJ(^@xM{@-miefU*$u3A5$JPm#-n?B(>U8b9mfRKA<LzmTRiN88@Bqu}%N*;-TQus7
z5f;S>MVXUevH7++o<evr{d=Rr+KO-{|2g=YxRB57{G+okjeockpW#I!F5g;45m!RF
z@z_>4#P~8?-&sS5&q?|mt37_$ciY_}%;wq%y$Q0SWP+^4QKzkXcf-xqFC?i(b?`->
zl|sJ8k;GQ$vOd4@&q*~Lg{@H7PsjaP4@II$3AK0TwrIEF?zm8T2WtB!i7TeK#NwE>
zbs<z987|naNd&B1t!6C$+d3AqtFAOrJaFwt?nDPTFk!R0KFfGV@P&*p(^qB#k>U=u
z54JioU#%SGmLdiOT7NH~the~CRN+OO_gdS;9(}%HV|I*wF90j?+!To%`lEBZCueJ_
zzhq()_G&|O@C#QZ6r-sI(NIWfrS3oK>eO6%qb$LbTL$Q+co8IewT>)m0tdD)Twj%k
zw_EbnsVkp+#mr6(IdVE$HmmSEm4yb|8f?scgmXcj3ZQQ_0^*qWo;^8NT`n0KCRjnC
ztjE5_A3N@YnnfvEy)Sf!y-_BOz{K8yfU9e`0vmQcAWF1yPcVn@*Wb!!TXbVnE$F`b
zTy~Uh+m1m|2hR7dj7hjc(Fxmii1tI?meoQ9XTI_wIB@ny9aR1OcB)ZaO>%dTc}BcE
zjt5+->#+Z(&I1r)pa8bT>0~vRMu0M7hoh8rAp%28MP}a)R5VK3xc=>)s;1OUUeUI{
z|JWwi=yR><ABD(_?p`g*4#SR2CSaiFkSC>}ox7hF-E0aRfB>YbL>u3!_SvXp0~q)x
z2@2->UghLWRuLD6Oa2?A2{H+r0S*?Gc*9*N(GM5KkMPR$-N=gGE@s;LWb0gy>3EDO
z9}+_4dtC5rK!7%?wm9!C<PKEl<mB9482UhYCSz=I%JK8R*Wp;-AJDEfVdjL_#B|5;
z)+%L#i#G|(PI?K-w%Ge%u)EopXRexGTwLsAZEfA45(OLxyBYm!osAOJm3b=^_cPO@
zMeqy<knE)y`T0uw_<3g5SEfq*X1^AZ5izG8%-M;4$!}&L!%d(I`N#l3DTZ+$LV3*%
zghJZf(9nlq#H05ARJyd9MWUFYEMjLZgtnd}CO-OqssR#D2N?b&<DIha%H)F!QV*fK
kEZ|LUr>IU|rP8-}mDSA`%zMI~A_>J8&t2BfKWq2!e>~TJjsO4v

diff --git a/route/static/mdw.jpg b/route/static/mdw.jpg
deleted file mode 100644
index f21a10aca04387ff102301cea600d79916fd6632..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 66905
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
b$A24mQk~dO8I+#U;~McE4|z=g^Zow=;b#M^

diff --git a/route/templates/default/close.html b/route/templates/default/close.html
deleted file mode 100755
index 94abce6fb..000000000
--- a/route/templates/default/close.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>抱歉,管理员已关闭面板</title>
-</head>
-<body>
-    <h1>开启命令</h1>
-    <p>mw open</p>
-    <hr>
-   <!--  <address>Linux面板<a href="" target="_blank">请求帮助</a></address> -->
-</body>
-</html>
\ No newline at end of file
diff --git a/route/templates/default/config.html b/route/templates/default/config.html
deleted file mode 100755
index 655630e3c..000000000
--- a/route/templates/default/config.html
+++ /dev/null
@@ -1,196 +0,0 @@
-{% extends "layout.html" %}
-{% block content %}
-<div class="main-content">
-	<div class="container-fluid" style="padding-bottom:54px">
-		<div class="pos-box bgw mtb15">
-			<div class="position f14 c9 pull-left"><a class="plr10 c4" href="/">首页</a>/<span class="plr10 c4">面板设置</span></div>
-		</div>
-		<div class="clearfix bgw mtb15 pd15">
-			<div class="safe-port pull-left">
-				<div class="ss-text pull-left mr50">
-					<em>关闭面板</em>
-					<div class="ssh-item">
-                        <input class="btswitch btswitch-ios" id="closePl" type="checkbox">
-                        <label class="btswitch-btn" for="closePl" onclick="closePanel()"></label>
-                    </div>
-				</div>
-				<div class="ss-text pull-left mr50">
-					<em>开发模式</em>
-					<div class="ssh-item">
-                        <input class="btswitch btswitch-ios" id="debugMode" type="checkbox" {{data['debug']}}>
-                        <label class="btswitch-btn" for="debugMode" onclick="debugMode()"></label>
-                    </div>
-				</div>
-
-				<div class="ss-text pull-left mr50">
-                    <em title="开启后允许使用ipv6访问面板">监听IPv6</em>
-                    <div class='ssh-item'>
-                        <input class='btswitch btswitch-ios' id='panelIPv6' type='checkbox' {{data['ipv6']}}>
-                        <label class='btswitch-btn' for='panelIPv6' onclick="setIPv6()"></label>
-                    </div>
-                </div>
-			</div>
-		</div>
-		<div class="setbox bgw mtb15">
-			<div class="title c6 plr15"><h3 class="f16">设置</h3></div>
-			<div class="info-title-tips" style="margin: 20px 30px 0px;">
-				<p><span class="glyphicon glyphicon-alert" style="color: #f39c12; margin-right: 10px;"></span>为了提高安全,修改面板密码!</p>
-			</div>
-			<div class="setting-con pd15">
-				<form id="set_config">
-					<p class="mtb15">
-						<span class="set-tit text-right">别名</span>
-						<input id="webname" name="webname" class="inputtxt bt-input-text" type="text" value="{{data['title']}}">
-						<button type="button" class="btn btn-success btn-sm ml5 btn_webname" disabled>保存</button>
-						<span class="set-info c7">面板名称</span>
-					</p>
-
-					<p class="mtb15">
-						<span class="set-tit text-right" title="服务器IP">服务器IP</span>
-						<input name="host_ip" class="inputtxt bt-input-text" type="text" value="{{data['ip']}}">
-						<button type="button" class="btn btn-success btn-sm ml5 btn_host_ip" disabled>保存</button>
-						<span class="set-info c7">默认为外网IP,若您在本地虚拟机测试,请填写虚拟机内网IP!</span>
-					</p>
-
-					<p class="mtb15">
-						<span class="set-tit text-right">面板端口</span>
-						<input data-port="{{data['port']}}" id="banport" name="port" class="inputtxt bt-input-text" type="number" value="{{data['port']}}" maxlength="5">
-						<button type="button" class="btn btn-success btn-sm ml5 btn_port" disabled>保存</button>
-						<span class="set-info c7">建议端口范围7200 - 65535</span>
-					</p>
-
-					<p class="mtb15">
-						<span class="set-tit text-right">安全入口</span>
-						<input id="admin_path" name="admin_path" class="inputtxt bt-input-text disable" type="text" value="{{data['admin_path']}}">
-						<button type="button" class="btn btn-success btn-sm ml5" onclick="modifyAuthPath()">设置</button>
-						<span class="set-info c7">面板管理入口,设置后只能通过指定安全入口登录面板,如: /abc</span>
-					</p>
-
-					<p class="mtb15">
-						<span class="set-tit text-right" title="默认建站目录">默认建站目录</span>
-						<input name="sites_path" class="inputtxt bt-input-text" type="text" value="{{data['site_path']}}">
-						<button type="button" class="btn btn-success btn-sm ml5 btn_sites_path" disabled>保存</button>
-						<span class="set-info c7">新创建的站点,默认将保存到该目录的下级目录!</span>
-					</p>
-
-					<p class="mtb15">
-						<span class="set-tit text-right" title="默认建站目录">默认备份目录</span>
-						<input name="backup_path" class="inputtxt bt-input-text" type="text" value="{{data['backup_path']}}">
-						<button type="button" class="btn btn-success btn-sm ml5 btn_backup_path" disabled>保存</button>
-						<span class="set-info c7">网站和数据库的备份目录!</span>
-					</p>
-
-					<p class="mtb15">
-						<span class="set-tit text-right" title="服务器时间">服务器时间</span>
-						<input id="systemdate" name="systemdate" class="inputtxt bt-input-text disable" type="text" value="{{data['systemdate']}}">
-						<button type="button" class="btn btn-success btn-sm ml5" onclick="setTimezone()">设置</button>
-						<span class="set-info c7">设置/同步当前服务器时间</span>
-					</p>
-					<p class="mtb15">
-						<span class="set-tit text-right" title="面板用户">面板用户</span>
-						<input name="username_" class="inputtxt bt-input-text disable" type="text" value="{{data['username']}}" disabled>
-						<button type="button" class="btn btn-success btn-sm ml5" onclick="setUserName()">设置</button>
-						<span class="set-info c7">设置面板账号</span>
-					</p>
-					<p class="mtb15">
-						<span class="set-tit text-right" title="面板密码">面板密码</span>
-						<input name="password_" class="inputtxt bt-input-text disable" type="text" value="******" disabled>
-						<button type="button" class="btn btn-success btn-sm ml5" onclick="setPassword()">设置</button>
-						<span class="set-info c7">设置面板密码</span>
-					</p>
-				</form>
-			</div>
-
-			<div class="title c6 plr15"><h3 class="f16">安全</h3></div>
-			<div class="setting-con pd15">
-
-				<p class="mtb15">
-					<span class="set-tit text-right" title="绑定域名" style="float: left;">绑定域名</span>
-						<input name="bind_domain" class="inputtxt bt-input-text" type="text" value="{{data['bind_domain']}}">
-	                <button type="button" class="btn btn-success btn-sm ml5 btn_bind_domain" disabled>保存</button>
-					<span class="set-info c7">为面板绑定一个访问域名，<b style="color: red;">注意：一旦绑定域名，只能通过域名访问面板</b></span>
-				</p>
-
-				<p class="mtb15">
-					<span class="set-tit text-right" title="面板SSL" style="float: left;">面板SSL</span>
-						<input id="cfg_ssl" name="bind_ssl" class="btswitch btswitch-ios" type="checkbox" {{data['ssl']}}>
-						<label class="btswitch-btn ml5" for="cfg_ssl" style="float: left;margin-top:4px;"></label>
-	                <button ype="button" class="btn btn-default btn-xs panel_api_btn" style="vertical-align: middle; margin-left: 10px" onclick="getPanelSSL();">面板SSL配置</button>
-					<span class="set-info c7">为面板设置https协议访问，提升面板访问<b style="color: red;">安全性</b></span>
-				</p>
-
-				<p class="mtb15">
-					<span class="set-tit text-right" title="BasicAuth认证" style="float: left;">BasicAuth认证</span>
-						<input class="btswitch btswitch-ios" id="cfg_basic_auth" type="checkbox" {{data['basic_auth']}}/>
-	                <label class="btswitch-btn ml5" for="cfg_basic_auth" style="float: left;margin-top:4px;" onclick="setBasicAuth()"></label>
-					<span class="set-info c7">为面板增加一道基于BasicAuth的认证服务，有效防止面板被扫描</span>
-				</p>
-
-				<p class="mtb15">
-					<span class="set-tit text-right" title="API接口" style="float: left;">API接口</span>
-					<input class="btswitch btswitch-ios" id="cfg_panel_api" type="checkbox" {{data['api_token']}}/>
-	                <label class="btswitch-btn ml5" for="cfg_panel_api" style="float: left;margin-top:4px;" onclick="setPanelApi()"></label>
-	                <button ype="button" class="btn btn-default btn-xs panel_api_btn" style="vertical-align: middle; margin-left: 10px" onclick="showPanelApi();">API接口配置</button>
-					<span class="set-info c7">提供面板API接口访问的支持</span>
-				</p>
-
-				<p class="mtb15">
-					<span class="set-tit text-right" title="未认证响应状态">未认证响应状态</span>
-					<input name="status_code" class="inputtxt bt-input-text disable" type="text" value="{{data['status_code_msg']}}" disabled>
-					<button type="button" class="btn btn-success btn-sm ml5" data-code="{{data['status_code']}}" onclick="setStatusCode(this)">设置</button>
-					<span class="set-info c7">用于在未登录且未正确输入安全入口时的响应，可用于隐藏面板特征</span>
-				</p>
-
-				<p class="mtb15">
-					<span class="set-tit text-right" title="临时访问授权">临时访问授权</span>
-					<button type="button" class="btn btn-success btn-sm ml5" onclick="setTempAccess()">临时访问授权管理</button>
-					<span class="set-info c7">为非管理员临时提供面板访问权限</span>
-				</p>
-
-				<p class="mtb15">
-					<span class="set-tit text-right" title="二次验证" style="float: left;">二次验证</span>
-					<input class="btswitch btswitch-ios" id="cfg_panel_auth" type="checkbox" {{data['auth_secret']}}/>
-	                <label class="btswitch-btn ml5" for="cfg_panel_auth" style="float: left;margin-top:4px;" onclick="setAuthSecretApi()"></label>
-					<button type="button" class="btn btn-default btn-xs panel_api_btn" style="vertical-align: middle; margin-left: 10px" onclick="setAuthBind();">绑定设置</button>
-					<span class="set-info c7">二次验证，加强安全登录</span>
-				</p>
-			</div>
-
-
-			<div class="title c6 plr15"><h3 class="f16">通知</h3></div>
-
-			<div class="setting-con pd15">
-
-				<p class="mtb15">
-					<span class="set-tit text-right" title="TelegramBot" style="float: left;">TG机器人通知</span>
-						<input id="cfg_tgbot" name="cfg_tgbot" onclick="setNotifyApi('tgbot',this)" class="btswitch btswitch-ios" type="checkbox" {{data['notify_tgbot_enable']}}>
-						<label class="btswitch-btn ml5" for="cfg_tgbot" style="float: left;margin-top:4px;"></label>
-	                <button ype="button" class="btn btn-default btn-xs panel_api_btn" style="vertical-align: middle; margin-left: 10px" onclick="getTgbot();">TelegramBot配置</button>
-					<span class="set-info c7">Telegram Bot机器人通知【<b style="color:red;">国内可能无法使用</b>】</span>
-				</p>
-
-				<p class="mtb15">
-					<span class="set-tit text-right" title="绑定账号" style="float: left;">邮件通知</span>
-						<input id="cfg_email" name="cfg_email" onclick="setNotifyApi('email',this)" class="btswitch btswitch-ios" type="checkbox" {{data['notify_email_enable']}}>
-						<label class="btswitch-btn ml5" for="cfg_email" style="float: left;margin-top:4px;"></label>
-	                <button ype="button" class="btn btn-default btn-xs panel_api_btn" style="vertical-align: middle; margin-left: 10px" onclick="getEmailCfg();">邮件配置</button>
-					<span class="set-info c7">邮件通知</span>
-				</p>
-
-			</div>
-
-			<!-- <div class="title c6 plr15"><h3 class="f16">VIP</h3></div>
-			<div class="setting-con pd15">
-				<p class="mtb15">
-					<span class="set-tit text-right" title="用户登录" style="float: left;">用户登录</span>
-						<input id="cfg_login" name="cfg_login" onclick="" class="btswitch btswitch-ios" type="checkbox" disabled>
-						<label class="btswitch-btn ml5" for="cfg_login" style="float: left;margin-top:4px;"></label>
-	                <button ype="button" class="btn btn-default btn-xs" style="vertical-align: middle; margin-left: 10px" onclick="setVipInfo();">绑定</button>
-					<span class="set-info c7">【<b style="color:red;">请勿使用</b>】测试版(开发中)</span>
-				</p>
-			</div> -->
-		</div>
-	</div>
-</div>
-<script src="/static/app/config.js?v={{config.version}}"></script>
-{% endblock %}
\ No newline at end of file
diff --git a/route/templates/default/control.html b/route/templates/default/control.html
deleted file mode 100755
index e6fb4da21..000000000
--- a/route/templates/default/control.html
+++ /dev/null
@@ -1,176 +0,0 @@
-{% extends "layout.html" %}
-
-{% block content %}
-
-<div class="main-content">
-		<div class="container-fluid" style="padding-bottom: 50px;">
-			<div class="pos-box bgw mtb15">
-				<div class="position f14 c9 pull-left">
-					<a class="plr10 c4" href="/">首页监控</a>/<span class="plr10 c4">系统监控</span>
-				</div>
-			</div>
-			<div class="safe container-fluid  bgw mtb15 pd15" style="overflow: hidden;">
-				<div class="mr50 pull-left">
-					<div class="ss-text pull-left">
-						<em>开启监控</em>
-						<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="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('save_day',true);">更改</button>
-					</div>
-				</div>
-				<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>
-			<div class="control">
-				<div class="col-xs-12 col-sm-12 col-md-12 pull-left pd0 view0">
-					<div class="mb15">
-						<div class="bgw pb15">
-							<div class="title c6 plr15 mb15">
-								<h3 class="c-tit f16">平均负载</h3>
-								<div class="searcTime pull-right">
-									<span class="tit">区间检索：</span>
-									<span class="gt" onclick="Wday(1,'getload')">昨天</span>
-									<span class="gt on" onclick="Wday(0,'getload')">今天</span>
-									<span class="gt" onclick="Wday(7,'getload')">最近7天</span>
-									<span class="gt" onclick="Wday(30,'getload')">最近30天</span>
-									<div class="ss">
-										<span class="st">自定义时间</span>
-										<div class="time">
-											<span class="bt">时间范围
-												<input id="loadbtn_rtime" class="rtime" type="text" value="2023-07-06 00:00:00 - 2023-08-08 00:00:00">
-											</span>
-											<div class="sbtn loadbtn">提交</div>
-										</div>
-									</div>
-								</div>
-							</div>
-							<div id="getloadview" style="width:100%; height:330px;"></div>
-						</div>
-					</div>
-				</div>
-				<div class="col-xs-12 col-sm-12 col-md-6 pull-left pd0 view1">
-					<div class="pr8">
-						<div class="bgw pb15">
-							<div class="title c6 plr15">
-								<h3 class="c-tit f16">CPU</h3>
-								<div class="searcTime pull-right">
-									<span class="tit">区间检索：</span>
-									<span class="gt" onclick="Wday(1,'cpu')">昨天</span>
-									<span class="gt on" onclick="Wday(0,'cpu')">今天</span>
-									<span class="gt" onclick="Wday(7,'cpu')">最近7天</span>
-									<span class="gt" onclick="Wday(30,'cpu')">最近30天</span>
-									<div class="ss">
-										<span class="st">自定义时间</span>
-										<div class="time">
-											<span class="bt">时间范围
-												<input id="cpubtn_rtime" class="rtime" type="text" value="2023-07-06 00:00:00 - 2023-08-08 00:00:00">
-											</span>
-											<div class="sbtn cpubtn">提交</div>
-										</div>
-									</div>
-								</div>
-							</div>
-							<div id="cupview" style="width:100%; height:330px"></div>
-						</div>
-					</div>
-				</div>
-				<div class="col-xs-12 col-sm-12 col-md-6 pull-left pd0 view2">
-					<div class="pl7">
-						<div class="bgw pb15">
-							<div class="title c6 plr15">
-								<h3 class="c-tit f16">内存</h3>
-								<div class="searcTime pull-right">
-									<span class="tit">区间检索：</span>
-									<span class="gt" onclick="Wday(1,'mem')">昨天</span>
-									<span class="gt on" onclick="Wday(0,'mem')">今天</span>、
-									<span class="gt" onclick="Wday(7,'mem')">最近7天</span>
-									<span class="gt" onclick="Wday(30,'mem')">最近30天</span>
-									<div class="ss">
-										<span class="st">自定义时间</span>
-										<div class="time">
-											<span class="bt">时间范围
-												<input id="membtn_rtime" class="rtime" type="text" value="2023-07-06 00:00:00 - 2023-08-08 00:00:00">
-											</span>
-											<div class="sbtn membtn">提交</div>
-										</div>
-									</div>
-								</div>
-							</div>
-							<div id="memview" style="width:100%; height:330px"></div>
-						</div>
-					</div>
-				</div>
-				<div class="col-xs-12 col-sm-12 col-md-6 pull-left pd0 view1">
-					<div class="pr8">
-						<div class="bgw pb15">
-							<div class="title c6 plr15 mb15">
-								<h3 class="c-tit f16">磁盘IO</h3>
-								<div class="searcTime pull-right">
-									<span class="tit">$data['lan']['S1']</span>
-									<span class="gt" onclick="Wday(1,'disk')">昨天</span>
-									<span class="gt on" onclick="Wday(0,'disk')">今天</span>
-									<span class="gt" onclick="Wday(7,'disk')">最近7天</span>
-									<span class="gt" onclick="Wday(30,'disk')">最近30天</span>
-									<div class="ss">
-										<span class="st">自定义时间</span>
-										<div class="time">
-											<span class="bt">时间范围
-												<input id="diskbtn_rtime" class="rtime" type="text" value="2023-07-06 00:00:00 - 2023-08-08 00:00:00">
-											</span>
-											<div class="sbtn diskbtn">提交</div>
-										</div>
-									</div>
-								</div>
-							</div>
-							<div id="diskview" style="width:100%; height:330px"></div>
-						</div>
-					</div>
-				</div>
-				<div class="col-xs-12 col-sm-12 col-md-6 pull-left pd0 view2">
-					<div class="pl7">
-						<div class="bgw pb15">
-							<div class="title c6 plr15 mb15">
-								<h3 class="c-tit f16">网络IO</h3>
-								<div class="searcTime pull-right">
-									<span class="tit">$data['lan']['S1']</span>
-									<span class="gt" onclick="Wday(1,'network')">昨天</span>
-									<span class="gt on" onclick="Wday(0,'network')">今天</span>
-									<span class="gt" onclick="Wday(7,'network')">最近7天</span>
-									<span class="gt" onclick="Wday(30,'network')">最近30天</span>
-									<div class="ss">
-										<span class="st">自定义时间</span>
-										<div class="time">
-											<span class="bt">时间范围
-												<input id="networkbtn_rtime" class="rtime" type="text" value="2023-07-06 00:00:00 - 2023-08-08 00:00:00">
-											</span>
-											<div class="sbtn networkbtn">提交</div>
-										</div>
-									</div>
-								</div>
-							</div>
-							<div id="network" style="width:100%; height:330px"></div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-<script type="text/javascript" src="/static/laydate/laydate.js?v={{config.version}}"></script>
-<script src="/static/app/control.js?v={{config.version}}"></script>
-{% endblock %}
\ No newline at end of file
diff --git a/route/templates/default/crontab.html b/route/templates/default/crontab.html
deleted file mode 100755
index 7284ec8ee..000000000
--- a/route/templates/default/crontab.html
+++ /dev/null
@@ -1,155 +0,0 @@
-{% extends "layout.html" %}
-
-{% block content %}
-
-<div class="main-content">
-	<div class="container-fluid" style="padding-bottom:54px">
-		<div class="pos-box bgw mtb15">
-			<div class="position f14 c9 pull-left">
-				<a class="plr10 c4" href="/">首页</a>/<span class="plr10 c4">计划任务</span>
-			</div>
-		</div>
-		<div class="setbox bgw mtb15">
-			<div class="title c6 plr15">
-				<h3 class="f16">添加计划任务</h3>
-			</div>
-			<div class="setting-con ptb20">
-				<div class="clearfix plan">
-					<span class="typename c4 pull-left f14 text-right mr20">任务类型</span>
-					<div class="dropdown planjs pull-left mr20">
-						<button class="btn btn-default dropdown-toggle" type="button" id="excode" data-toggle="dropdown" style="width:auto">
-                            <b val="toShell">Shell脚本</b>
-                            <span class="caret"></span>
-                        </button>
-						<ul class="dropdown-menu" role="menu" aria-labelledby="excode">
-							<li><a role="menuitem" tabindex="-1" href="javascript:;" value="toShell">Shell脚本</a></li>
-							<li><a role="menuitem" tabindex="-1" href="javascript:;" value="site">备份网站</a></li>
-							<li><a role="menuitem" tabindex="-1" href="javascript:;" value="database">备份数据库</a></li>
-							{% for db in data['hook_database'] %}
-							<li><a role="menuitem" tabindex="-1" href="javascript:;" value="database_{{db['name']}}">备份数据库【{{db['title']}}】</a></li>
-					        {% endfor %}
-
-					        <li><a role="menuitem" tabindex="-1" href="javascript:;" value="path">备份目录</a></li>
-							<li><a role="menuitem" tabindex="-1" href="javascript:;" value="logs">日志切割</a></li>
-							<li><a role="menuitem" tabindex="-1" href="javascript:;" value="rememory">释放内存</a></li>
-							<li><a role="menuitem" tabindex="-1" href="javascript:;" value="toUrl">访问URL</a></li>
-						</ul>
-					</div>
-					<span class="planSign"><i>*</i>任务类型包含以下部分：Shell脚本、备份网站、备份数据库、备份目录、日志切割、释放内存、访问URL</span>
-				</div>
-				<div class="clearfix plan">
-					<span class="typename c4 pull-left f14 text-right mr20">任务名称</span>
-					<div class="planname pull-left"><input type="text" name="name" class="bt-input-text"></div>
-				</div>
-				<div class="clearfix plan">
-					<span class="typename c4 pull-left f14 text-right mr20">执行周期</span>
-					<div class="dropdown plancycle pull-left mr20">
-						<button class="btn btn-default dropdown-toggle" type="button" id="cycle" data-toggle="dropdown" style="width:94px">
-                            <b val="week">每星期</b>
-                            <span class="caret"></span>
-                        </button>
-						<ul class="dropdown-menu" role="menu" aria-labelledby="cycle">
-							<li><a role="menuitem" tabindex="-1" href="javascript:;" value="day">每天</a></li>
-							<li><a role="menuitem" tabindex="-1" href="javascript:;" value="day-n">N天</a></li>
-							<li><a role="menuitem" tabindex="-1" href="javascript:;" value="hour">每小时</a></li>
-							<li><a role="menuitem" tabindex="-1" href="javascript:;" value="hour-n">N小时</a></li>
-							<li><a role="menuitem" tabindex="-1" href="javascript:;" value="minute-n">N分钟</a></li>
-							<li><a role="menuitem" tabindex="-1" href="javascript:;" value="week">每星期</a></li>
-							<li><a role="menuitem" tabindex="-1" href="javascript:;" value="month">每月</a></li>
-						</ul>
-					</div>
-					<div id="ptime" class="pull-left">
-						<div class="dropdown planweek pull-left mr20">
-							<button class="btn btn-default dropdown-toggle" type="button" id="excode" data-toggle="dropdown">
-								<b val="1">周一</b>
-								<span class="caret"></span>
-							</button>
-							<ul class="dropdown-menu" role="menu" aria-labelledby="excode">
-								<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>
-								<li><a role="menuitem" tabindex="-1" href="javascript:;" value="4">周四</a></li>
-								<li><a role="menuitem" tabindex="-1" href="javascript:;" value="5">周五</a></li>
-								<li><a role="menuitem" tabindex="-1" href="javascript:;" value="6">周六</a></li>
-								<li><a role="menuitem" tabindex="-1" href="javascript:;" value="0">周日</a></li>
-							</ul>
-						</div>
-						<div class="plan_hms pull-left mr20 bt-input-text">
-							<span><input type="number" name="hour" value="1" maxlength="2" max="23" min="0"></span>
-							<span class="name">小时</span>
-						</div>
-						<div class="plan_hms pull-left mr20 bt-input-text">
-							<span><input type="number" name="minute" value="30" maxlength="2" max="59" min="0"></span>
-							<span class="name">分钟</span>
-						</div>
-					</div>
-				</div>
-				<div class="clearfix plan">
-					<span class="typename controls c4 pull-left f14 text-right mr20">脚本内容</span>
-					<div id="implement" style="line-height:34px"><textarea class="txtsjs bt-input-text" name="sBody"></textarea></div>
-				</div>
-				<div class="clearfix plan">
-					<div class="bt-submit plan-submit" onclick="planAdd();">添加任务</div>
-				</div>
-				<ul class="help-info-text c7 ptb15 mlr20">
-					<li>当添加完备份任务，应该手动运行一次，并检查备份包是否完整</li>
-					<li>磁盘容量不够、数据库密码错误、网络不稳定等原因，可能导致数据备份不完整</li>
-				</ul>
-			</div>
-			<form id="cronConfig" action="/crontab/add" enctype="multipart/form-data" method="post" style="display: none;">
-				<input type="text" name="name" value="" />
-				<input type="text" name="type" value="" />
-				<input type="number" name="where1" value="" />
-				<input type="number" name="hour" value="" />
-				<input type="number" name="minute" value="" />
-				<input type="text" name="week" value="" />
-				<input type="text" name="sType" value="" />
-				<textarea name='sBody'></textarea>
-				<input id="sFile" type="file" name="sFile" value="" />
-				<input type="text" name="sName" value="" />
-				<input id="backupTo" type="text" name="backupTo" value="localhost" />
-				<input id="urladdress" type="text" name="urladdress" value="" />
-				<input type="number" name="save" value="" />
-				<input type="submit" />
-			</form>
-		</div>
-		<div class="setbox bgw mtb15">
-			<div class="title c6 plr15">
-				<h3 class="f16">任务列表</h3>
-				<span id="allDelete" style="float: right;display: none;">
-					<button onclick="allDeleteCron();" class="btn btn-default btn-sm">删除选中</button>
-				</span>
-			</div>
-			<div class="setting-con divtable pd15">
-				<table class="table table-hover">
-					<thead>
-						<tr>
-							<th width='30px'><input onclick="checkSelect();" type="checkbox" id="setBox"></th>
-							<th>任务名称</th>
-							<th>状态</th>
-							<th>周期</th>
-							<th>执行时机</th>
-							<th>保存数量</th>
-							<th>备份到</th>
-							<th>添加时间</th>
-							<th width="190">操作</th>
-						</tr>
-					</thead>
-					<tbody id="cronbody"></tbody>
-				</table>
-				<div class="dataTables_paginate paging_bootstrap pagination">
-					<ul id="softPage" class="page"></ul>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-<script src="/static/app/crontab.js?v={{config.version}}"></script>
-<script type="text/javascript">
-toWeek();
-toHour();
-toMinute();
-toShell();
-getCronData(1);
-</script>
-{% endblock %}
\ No newline at end of file
diff --git a/route/templates/default/files.html b/route/templates/default/files.html
deleted file mode 100755
index e074d3004..000000000
--- a/route/templates/default/files.html
+++ /dev/null
@@ -1,113 +0,0 @@
-{% extends "layout.html" %}
-
-{% block content %}
-<div class="main-content">
-    <div class="container-fluid" style="padding-bottom:50px">
-        <div class="file-box bgw mtb15" style="position:relative; padding-top:110px">
-            <div id="tipTools" class="plr15">
-                <div class="ptb15">
-                    <div class="clearfix">
-                        <div class="pull-left">
-                            <button id="backBtn" class="backBtn btn btn-default btn-sm glyphicon glyphicon-arrow-left pull-left" title="" onClick="backDir()"></button>
-                            <button class="backBtn refreshBtn btn btn-default btn-sm glyphicon glyphicon-refresh pull-right" title="" style="margin-left:-1px;"></button>
-                            <span id='DirPathPlace' class="pull-left"><input id="fileInputPath" type="text"></span>
-                            <span id='PathPlaceBtn' class="pull-left"></span>
-                        </div>
-                        <div class="pull-left mlr15" style="line-height:26px"><span id='dir_info'></span></div>
-                        <div class="search pull-right" style="position: absolute; top: 6px; right: 5px;">
-                            <form target="hid">
-                                <input type="text" id="search_file" class="ser-text pull-left" placeholder="搜索文件/目录" autocomplete="false" />
-                                <button type="button" class="ser-sub pull-left" onclick='searchFile(1)'></button>
-                                <div class="file_search" draggable="false">
-                                    <label for="search_file">包含子目录</label>
-                                    <div id="search_all" class="file_search_checked"></div>
-                                </div>
-                            </form>
-                            <iframe name='hid' id="hid" style="display:none"></iframe>
-                        </div>
-                    </div>
-                </div>
-                <div class="clearfix ptb10">
-                    <button class="btn btn-default btn-sm pull-left" onclick="uploadFiles()">上传</button>
-                    <button class="btn btn-default btn-sm pull-left" onclick="downloadFile()" title="远程下载" style="margin:0 5px">远程下载</button>
-                    <span id='BarTools'></span>
-                    <span id='Batch' style="background-color:#fff;position:absolute;right:190px;z-index:10"></span>
-                    <span id='comlist' class="comlist"></span>
-                    <div class="btn-group btn-group-sm pull-right" style="margin-right:5px;">
-                        <button id="set_icon" type="button" class="btn btn-default">
-                            <i class="glyphicon glyphicon-th"></i>
-                        </button>
-                        <button id="set_list" type="button" class="btn btn-default active">
-                            <i class="glyphicon glyphicon-th-list"></i>
-                        </button>
-                    </div>
-                </div>
-            </div>
-            <!-- 文件展示 -->
-            <div class="divtable pd15" id="fileCon"></div>
-            <div class="dataTables_paginate paging_bootstrap pagination plr15" style="position: relative; top: -6px;">
-                <ul id="filePage" class="page"></ul>
-            </div>
-        </div>
-    </div>
-</div>
-</div>
-<ul id="rmenu" class="dropdown-menu" style="display:none">
-    <li onclick="javascript:batch(1);"><a style="cursor: pointer;">复制</a></li>
-    <li onclick="javascript:batch(2);"><a style="cursor: pointer;">剪切</a></li>
-    <li onclick="javascript:batch(3);"><a style="cursor: pointer;">权限</a></li>
-    <li onclick="javascript:batch(5);"><a style="cursor: pointer;">压缩</a></li>
-    <li onclick="javascript:batch(4);"><a style="cursor: pointer;">删除</a></li>
-</ul>
-
-<script src="/static/app/files.js?v={{config.version}}"></script>
-<script src="/static/js/jquery-ui.min.js?v={{config.version}}"></script>
-<script src="/static/js/jquery.contextify.min.js?v={{config.version}}"></script>
-<script type="text/javascript">
-
-
-$("#search_file").focus().keyup(function(e){
-    if(e.keyCode == 13) searchFile(1);
-});
-
-
-setTimeout(function() {
-    getDisk();
-}, 500);
-
-
-var xPath = getCookie('open_dir_path');
-setTimeout(function() {
-    getFiles((xPath != undefined ? xPath : '/www/wwwroot'));
-}, 800);
-
-pathPlaceBtn((xPath != undefined ? xPath : '/www/wwwroot'));
-setCookie('uploadSize', 1024 * 1024 * 1024);
-if (getCookie('rank') == undefined || getCookie('rank') == null) {
-    setCookie('rank', 'a');
-}
-
-$("#set_icon").click(function() {
-    setCookie('rank', 'b');
-    $(this).addClass("active");
-    $("#set_list").removeClass("active");
-    getFiles(getCookie('open_dir_path'));
-});
-
-$("#set_list").click(function() {
-    setCookie('rank', 'a');
-    $(this).addClass("active");
-    $("#set_icon").removeClass("active");
-    getFiles(getCookie('open_dir_path'));
-})
-
-$(".refreshBtn").click(function() {
-    getFiles(getCookie('open_dir_path'));
-})
-
-
-$('#search_all').click(function(){
-    $(this).toggleClass('active');
-});
-</script>
-{% endblock %}
\ No newline at end of file
diff --git a/route/templates/default/firewall.html b/route/templates/default/firewall.html
deleted file mode 100755
index e0b1e5224..000000000
--- a/route/templates/default/firewall.html
+++ /dev/null
@@ -1,117 +0,0 @@
-{% extends "layout.html" %}
-
-{% block content %}
-
-<style>
-.weblog{
-	font-size: 12px;
-    display:inline-block;
-	line-height:30px;
-}
-.weblog em{
-	font-style:normal;
-	color:#666;
-	margin: 0 30px;
-}
-.weblog span{
-	margin-right:5px;
-}
-.weblog a{
-	color:#20a53a;
-}
-.firewall-port-box{
-	margin-bottom:15px;
-}
-</style>
-<div class="main-content">
-	<div class="container-fluid" style="padding-bottom: 50px;">
-		<div class="pos-box bgw mtb15">
-			<div class="position f14 c9 pull-left">
-				<a class="plr10 c4" href="/">首页</a>/<span class="plr10 c4">系统安全</span>
-			</div>
-			<div class="search pull-right">
-				<form target="hid" onsubmit='getLogs(1,$("#SearchValue").prop("value"))'>
-					<input type="text" id="SearchValue" class="ser-text pull-left" placeholder="搜索日志" />
-					<button type="button" class="ser-sub pull-left" onclick='getLogs(1,$("#SearchValue").prop("value"))'></button>
-				</form>
-				<iframe name='hid' id="hid" style="display:none"></iframe>
-			</div>
-		</div>
-		<div class="safe container-fluid bgw mtb15 pd15">
-			<div class="mr20 pull-left" style="border-right: 1px solid #ccc;padding-right: 20px;">
-
-				<form>
-					<div class="ss-text pull-left">
-						<a class="btlink" style="line-height: 32px;" onclick="sshMgr();">SSH管理</a>
-					</div>
-				</form>
-			</div>
-			<div class="mr20 pull-left" style="border-right: 1px solid #ccc;padding-right: 20px;">
-
-				<div class="ss-text pull-left mr5">
-					<em>SSH端口:</em>
-					<input type="text" class="bt-input-text" id="mstscPort" value=""/>
-				</div>
-				<div class="ss-text pull-left">
-					<button id="mstscSubmit" onclick='mstsc($("#mstscPort").prop("value"))' class="btn btn-default btn-sm" type="button">更改</button>
-				</div>
-			</div>
-			<div class="mr20 pull-left" style="border-right: 1px solid #ccc; padding-right: 20px;">
-				<div class="ss-text pull-left">
-					<em>启用禁ping</em>
-					<div class='ssh-item' id="is_ping">
-						<input class='btswitch btswitch-ios' id='noping' type='checkbox'><label class='btswitch-btn noping' for='noping' ></label>
-					</div>
-				</div>
-			</div>
-
-			<div class="mr20 pull-left" style="border-right: 1px solid #ccc; padding-right: 20px;">
-				<form>
-					<div class="ss-text pull-left">
-						<em>启用防火墙</em>
-						<div class='ssh-item' id="firewall_status">
-							<input class='btswitch btswitch-ios' id='firewall_status' type='checkbox'><label class='btswitch-btn sshswitch' for='firewall_status' ></label>
-						</div>
-					</div>
-				</form>
-			</div>
-
-			<div class="weblog" id='firewall_weblog'></div>
-		</div>
-		
-		<div class="white-black-ip bgw mtb15">
-            <div class="black-ip">
-                <div class="def-log">
-                    <div class="title c6 plr15">
-                        <h3 class="f16">防火墙</h3>             
-                    </div>
-
-                    <div class="divtable pd15">
-						<div class="firewall-port-box">
-							<select id="firewalldType" class="bt-input-text c5 mr5" name="type" style="width:80px;">
-								<option value="port">放行端口</option>
-								<option value="address">屏蔽</option>
-							</select>
-							<input type="text" class="bt-input-text mr5" style="width: 117px;" id="AcceptPort" placeholder="端口">
-							<input type="text" class="bt-input-text mr5" id="Ps" placeholder="备注/说明">
-							<select class="bt-input-text c5 mr5" name="protocol" style="width:80px;">
-								<option value="tcp">tcp</option>
-								<option value="udp">udp</option>
-								<option value="tcp/udp">tcp/udp</option>
-							</select>
-							<button id="toAccept" onclick="addAcceptPort();" class="btn btn-default btn-sm va0" type="button">放行</button>
-							<span id="f-ps" class="c9" style="margin-left: 10px;">说明: 支持放行端口范围，如: 3000:3500</span>
-						</div>
-                        <div class="tablescroll">
-                            <table id="firewallBody" class="table table-hover" style="min-width: 640px;border: 0 none;"></table>
-                        </div>
-                        <div id="firewallPage" class="dataTables_paginate paging_bootstrap page firewallBody" style="margin-bottom:0"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        
-	</div>
-</div>
-<script src="/static/app/firewall.js?v={{config.version}}"></script>
-{% endblock %}
\ No newline at end of file
diff --git a/route/templates/default/index.html b/route/templates/default/index.html
deleted file mode 100755
index dd74bd55d..000000000
--- a/route/templates/default/index.html
+++ /dev/null
@@ -1,171 +0,0 @@
-{% extends "layout.html" %} {% block content %}
-<div class="main-content">
-
-    <div class="index-pos-box bgw">
-        <div class="position f12 c6 pull-left" style="background:none;padding-left:15px">
-            <span class="ico-system">系统:</span><span id="info" style="margin-left:10px;">正在获取中...</span>&#12288;&#12288;<span id="running"></span>
-        </div>
-        <span class="pull-right f12 c6" style="line-height:52px; margin-right:15px">
-            <span id="version" style="margin-right:10px">{{config.version}}</span>
-            <span id="toUpdate"><a class="btlink" href="javascript:checkUpdate();">更新</a></span> |
-            <!-- <span style="margin:0 10px"><a class="btlink" href="javascript:rePanel();">修复</a></span> -->
-            <span><a class="btlink" href="javascript:reBoot();">重启</a></span>
-        </span>
-    </div>
-
-    <div class="container-fluid" style="padding-bottom: 66px;">
-        
-        <div class="danger-tips">
-            <div class="alert alert-warning" id="messageError" style="display: none;background-color: #ffe0e0;border-color: #ffb0b0;color: #ff2020; margin-bottom:0;margin-top: 12px;"></div>
-        </div>
-
-        <div class="server bgw mtb15">
-            <div class="title c6 f16 plr15">
-                <h3 class="c6 f16 pull-left">状态</h3>
-            </div>
-            <div class="server-circle">
-                <ul class="row" id="systemInfoList">
-                    <li class="col-xs-6 col-sm-3 col-md-3 col-lg-2 mtb20 circle-box text-center" id="LoadList">
-                        <h3 class="c5 f15">负载状态<a href="https://github.com/midoks/mdserver-web/wiki#负载简述" target="_blank" class="bt-ico-ask" style="cursor: pointer;">?</a></h3>
-                        <div class="circle" style="cursor: pointer;">
-                            <div class="pie_left">
-                                <div class="left"></div>
-                            </div>
-                            <div class="pie_right">
-                                <div class="right"></div>
-                            </div>
-                            <div class="mask"><span id="Load">0</span>%</div>
-                        </div>
-                        <h4 id="LoadState" class="c5 f15">获取中...</h4>
-                    </li>
-                    <li class="col-xs-6 col-sm-3 col-md-3 col-lg-2 mtb20 circle-box text-center" id="cpuChart">
-                        <h3 class="c5 f15">CPU使用率</h3>
-                        <div class="circle">
-                            <div class="pie_left">
-                                <div class="left"></div>
-                            </div>
-                            <div class="pie_right">
-                                <div class="right"></div>
-                            </div>
-                            <div class="mask"><span id="state">0</span>%</div>
-                        </div>
-                        <h4 id="core" class="c5 f15">获取中...</h4>
-                    </li>
-                    <li class="col-xs-6 col-sm-3 col-md-3 col-lg-2 mtb20 circle-box text-center">
-                        <h3 class="c5 f15">内存使用率</h3>
-                        <div class="circle mem-release">
-                            <div class="pie_left">
-                                <div class="left"></div>
-                            </div>
-                            <div class="pie_right">
-                                <div class="right"></div>
-                            </div>
-                            <div class="mask"><span id="left">0</span>%</div>
-                            <div class="mem-re-min" style="display: none;"></div>
-                            <div class="mem-re-con" title=""></div>
-                        </div>
-                        <h4 id="memory" class="c5 f15">获取中...</h4>
-                    </li>
-                </ul>
-            </div>
-        </div>
-
-        
-        <div class="conter-box system-info bgw clearfix mtb15">
-            <div class="title c6 f16 plr15">概览</div>
-            <div class="system-info-con mtb20">
-                <ul class="clearfix text-center" id='index_overview'>
-                    <li class="sys-li-box col-xs-3 col-sm-3 col-md-3 col-lg-3">
-                        <p class="name f15 c9">网站</p>
-                        <div class="val"><a class="btlink" href="/site">{{data['site_count']}}</a></div>
-                    </li>
-                </ul>
-            </div>
-        </div>
-        
-        <div class="col-xs-12 col-sm-12 col-md-6 pull-left pd0">
-            <div class="pr8">
-                <div class="bgw">
-                    <div class="title c6 f16 plr15">软件</div>
-                    <div class="setting-con" style="padding:0; height:442px; margin-right: -4px; overflow: hidden;">
-                        <div class="container-fluid soft-man">
-                            <input name="list1SortOrder" type="hidden" value="" />
-                            <div id="indexsoft" class="row"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-xs-12 col-sm-12 col-md-6 pull-left pd0">
-            <div class="pl7">
-                <div class="bgw radius4" style="height:491px">
-                    <div class="title c6 f16 plr15 tabs-nav">
-                        <div class="tab-list">
-                            <span class="tabs-item active">流量</span>
-                            <span class="tabs-item">磁盘IO</span>
-                        </div>
-
-                        <div class="tabs-down">
-                            <select class="bt-input-text" name="network-io" style="font-size: 12px;">
-                                <option value="ALL">全部</option>
-                            </select>
-                            <select class="bt-input-text hide" name="disk-io" style="font-size: 12px;">
-                                <option value="ALL">全部</option>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="tabs-content">
-                        <div class="tabs-active radius4 tabs-item">
-                            <div class="bw-info">
-                                <div class="col-sm-6 col-md-3"><p class="c9"><span class="ico-up"></span>上行</p><a id="upSpeed">0</a></div>
-                                <div class="col-sm-6 col-md-3"><p class="c9"><span class="ico-down"></span>下行</p><a id="downSpeed">0</a></div>
-                                <div class="col-sm-6 col-md-3"><p class="c9">总发送</p><a id="upAll">0</a></div>
-                                <div class="col-sm-6 col-md-3"><p class="c9">总接收</p><a id="downAll">0</a></div>
-                            </div>
-                            <div id="netImg" style="width:100%;height:330px;"></div>
-                        </div>
-
-                        <div class="radius4 tabs-item">
-                            <div class="bw-info">
-                                <div class="col-sm-6 col-md-3"><p class="c9"><span class="ico-read"></span>读取</p><a id="readBytes">0</a></div>
-                                <div class="col-sm-6 col-md-3"><p class="c9"><span class="ico-write"></span>写入</p><a id="writeBytes">0</a></div>
-                                <div class="col-sm-6 col-md-3"><p class="c9">每秒读写</p><a id="diskIops">0</a></div>
-                                <div class="col-sm-6 col-md-3"><p class="c9">读写IO延迟</p><a id="diskTime" style="color: rgb(32, 165, 58);">0</a></div>
-                            </div>
-                            <div id="ioStat" style="width:100%;height:330px;"></div>
-                        </div>
-                    </div>
-                    
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-</div>
-<script type="text/javascript" src="/static/app/site.js?v={{config.version}}"></script>
-<script type="text/javascript" src="/static/app/soft.js?v={{config.version}}"></script>
-<script type="text/javascript" src="/static/app/index.js?v={{config.version}}"></script>
-<script type="text/javascript">
-
-index.init();
-
-pluginInit();
-//加载关键数据总数
-loadKeyDataCount();
-
-setTimeout(function() {
-    getDiskInfo();
-}, 500)
-
-setTimeout(function() {
-    indexSoft();
-}, 1000);
-
-setTimeout(function() {
-    getInfo();
-}, 200);
-
-</script>
-{% endblock %}
\ No newline at end of file
diff --git a/route/templates/default/layout.html b/route/templates/default/layout.html
deleted file mode 100755
index f86b59826..000000000
--- a/route/templates/default/layout.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="renderer" content="webkit">
-<title>{{data['title']}}</title>
-<link rel="shortcut icon" href="/static/favicon.ico" type="image/x-icon" />
-<link href="/static/bootstrap-3.3.5/css/bootstrap.min.css?v={{config.version}}" rel="stylesheet">
-<link href="/static/css/site.css?v={{config.version}}" rel="stylesheet">
-<link href="/static/codemirror/lib/codemirror.css?v={{config.version}}" rel="stylesheet">
-<script src="/static/language/Simplified_Chinese/lan.js?v={{config.version}}"></script>
-<!--[if lte IE 9]>
-	<script src="/static/js/requestAnimationFrame.js"></script>
-<![endif]-->
-
-
-{% for menu in data['hook_menu'] %}
-{% if menu['css_path'] and data['hook_tag'] == menu['name'] %}
-<!-- 加载插件css -->
-<link href="/plugins/file?name={{menu['name']}}&v={{config.version}}&f={{menu['css_path']}}" rel="stylesheet" />
-{% endif %}
-{% endfor %}
-
-<!-- 全局静态HOOK -->
-{% for menu in data['hook_global_static'] %}
-{% if menu['css_path'] %}
-<link href="/plugins/file?name={{menu['name']}}&v={{config.version}}&f={{menu['css_path']}}" rel="stylesheet" />
-{% endif %}
-{% endfor %}
-</head>
-
-<body>
-    <div class="bt-warp bge6">
-        <div id="container" class="container-fluid">
-            <div class="sidebar-scroll">
-                <div class="sidebar-auto">
-                    <div id="task" class="task cw" onclick="messageBox();"></div>
-                    <h3 class="mypcip"><span class="f14 cw">{{data['ip']}}</span></h3>
-                    <ul class="menu">
-                        <li id="memuA"><a class="menu_home" href="/">首页</a></li>
-                        <li id="memuAsite"><a class="menu_web" href="/site">网站</a></li>
-                        <li id="memuAcontrol"><a class="menu_control" href="/control">监控</a></li>
-                        <li id="memuAfirewall"><a class="menu_firewall" href="/firewall">安全</a></li>
-                        <li id="memuAfiles"><a class="menu_folder" href="/files">文件</a></li>
-                        <li id="memuAlogs"><a class="menu_logs" href="/logs">日志</a></li>                        
-                        <li id="memuAcrontab"><a class="menu_day" href="/crontab">计划任务</a></li>
-                        <!-- 插件设置的菜单 -->
-                        {% for menu in data['hook_menu'] %}
-                        <li id="memuAplugins_{{menu['name']}}">
-                            <a class="menu_plugin_{{menu['name']}}" href="/plugins/menu?tag={{menu['name']}}">{{menu['title']}}</a>
-                        </li>
-                        {% endfor %}
-                        <li id="memuAsoft"><a class="menu_soft" href="/soft">软件管理</a><span class="softnum">1</span></li>
-                        <li id="memuAconfig"><a class="menu_set" href="/config">面板设置</a></li>
-                        <li><a class="menu_exit" href="javascript:;" id="signout">退出</a></li>
-                    </ul>
-                    <div id="newbtpc"></div>
-                    <div class="btpc-plus" onclick="bindPanel(0,'b')">+</div>
-                </div>
-            </div>
-            <button style="display: none;" id="mw_copys" class="mw_copy" data-clipboard-text=""></button>
-            <link rel="stylesheet" href="/static/build/xterm.css?v={{config.version}}">
-            <link rel="stylesheet" href="/static/build/addons/fullscreen/fullscreen.css?v={{config.version}}">
-            <script src="/static/js/jquery-1.10.2.min.js"></script>
-            <script src="/static/js/jquery.cookie-1.4.1.min.js"></script>
-            <script src="/static/js/bootstrap.min.js"></script>
-            <script src="/static/layer/layer.js"></script>
-            <script src="/static/js/jquery.fly.min.js"></script>
-            <script src="/static/js/clipboard.min.js"></script>
-            <script src="/static/build/xterm.js"></script>
-            <script src="/static/build/addons/attach/attach.js"></script>
-            <script src="/static/build/addons/fit/fit.js"></script>
-            <script src="/static/build/addons/fullscreen/fullscreen.js"></script>
-            <script src="/static/js/socket.io.min.js"></script>
-            <script src="/static/build/addons/winptyCompat/winptyCompat.js"></script>
-            <script src="/static/js/term-websocketio.js"></script>
-            <script src="/static/app/upload.js?v={{config.version}}"></script>
-            <script src="/static/app/public.js?v={{config.version}}"></script>
-            <script src="/static/js/echarts.min.js"></script>
-            <!-- <script src="//cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/js/echarts.min.js"></script> -->
-            <!-- <script src="//unpkg.com/echarts@5.4.3/dist/echarts.min.js"></script> -->
-            
-            <script src="/static/js/jquery.dragsort-0.5.2.min.js"></script>
-            <script src="/static/js/jquery-qrcode-0.18.0.min.js?v={{config.version}}"></script>
-            <script src="/static/js/xm-select.js"></script>
-            
-            {% block content %}{% endblock %}
-            <div class="footer bgw">mdserver-web &copy;2018-∞ Linux面板 (<a class="btlink" target="_blank" href="//github.com/midoks/mdserver-web">源码</a>) <span style="margin-left:5px;">/</span>
-                <a class="btlink" target="_blank" style="margin-left:5px;" href="//github.com/midoks/mdserver-web/wiki">WIKI</a><span style="margin-left:5px;">/</span>
-                <a class='btlink panel_ad_list_mode' style="margin-left:5px;">AD</a>
-                <span style="margin-left:5px;">/</span>
-                <a class='btlink' target="_blank" href="https://bbs.midoks.icu" style="margin-left:5px;">交流论坛</a>
-                <span style="margin-left:5px;">/</span>
-                <a class='btlink' target="_blank" href="https://t.me/mdserver_web" style="margin-left:5px;">TG吹水群</a>
-            </div>
-        </div>
-    </div>
-</body>
-
-<script type="text/javascript">
-
-(function ($) {
-    $.getUrlParam = function (name) {
-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
-        var r = window.location.search.substr(1).match(reg);
-        if (r != null) return unescape(r[2]); return null;
-    }
-})(jQuery);
-
-function showAd(){
-    layer.open({
-        type: 1
-        ,title: "【AD】求恰饭"
-        ,closeBtn: 1
-        ,area: '300px;'
-        ,shade: 0.8
-        ,id: 'panel_ad_list_mode'
-        ,btnAlign: 'c'
-        ,moveType: 1
-        ,content: '<div style="padding: 10px; line-height: 22px; font-weight: 300;">\
-                <table class="table table-hover">\
-                    <thead><tr><td style="text-align: center;">商家</td><td style="text-align: center;">优惠码</td><tr></thead>\
-                    <tbody>\
-                        <tr><td><a target="_blank" href="https://digitalvirt.com/aff.php?aff=154"><img src="https://digitalvirt.com/templates/BlueWhite/img/logo-dark.svg"/></a></td><td>mdserver-web</td></tr>\
-                    </tbody>\
-                </table>\
-        </div>'
-        ,success: function(layero){
-        }
-    });
-}
-
-$('.panel_ad_list_mode').click(function(){
-    showAd();
-});
-
-
-function getUrlPath(){
-    var thisUrl = window.location.href;
-    var pathArr = thisUrl.split('/');
-    return pathArr[pathArr.length - 1];
-}
-var thisPath = getUrlPath();
-if (thisPath.indexOf('?')>-1){
-    var tag = $.getUrlParam('tag');
-    if(tag != undefined){
-        $('#memuAplugins_'+tag).css('background-color','#2c3138');
-    } else {
-        $('#memuA').css('background-color','#f2f2f2');
-    }
-} else{
-    if(thisPath != undefined){
-        $('#memuA'+thisPath).css('background-color','#2c3138');
-    } else {
-        $('#memuA').css('background-color','#f2f2f2');
-    }
-}
-</script>
-<script src="/static/codemirror/lib/codemirror.js?v={{config.version}}"></script>
-<script src="/static/codemirror/addon/edit/editAll.js?v={{config.version}}"></script>
-<script src="/static/codemirror/mode/modeAll.js?v={{config.version}}"></script>
-<script src="/static/codemirror/addon/dialog/dialog.js?v={{config.version}}"></script>
-<script src="/static/codemirror/addon/search/search.js?v={{config.version}}"></script>
-<script src="/static/codemirror/addon/scroll/annotatescrollbar.js?v={{config.version}}"></script>
-<script src="/static/laydate/laydate.js?v={{config.version}}"></script>
-
-{% for menu in data['hook_menu'] %}
-{% if menu['js_path'] and data['hook_tag'] == menu['name'] %}
-<script src="/plugins/file?name={{menu['name']}}&f={{menu['js_path']}}&v={{config.version}}"></script>
-{% endif %}
-{% endfor %}
-
-<!-- 全局静态HOOK -->
-{% for menu in data['hook_global_static'] %}
-{% if menu['js_path'] %}
-<script src="/plugins/file?name={{menu['name']}}&f={{menu['js_path']}}&v={{config.version}}"></script>
-{% endif %}
-{% endfor %}
-
-
-<!-- 统计一下用户量,让我的开发更有激情 -->
-<script type="text/javascript">
-$(document).ready(function(){
-    setTimeout(function(){
-        $.getScript('https://www.googletagmanager.com/gtag/js?id=G-FC74BB2RGD', function(){
-            console.log("load google ad!");
-            window.dataLayer = window.dataLayer || [];
-            function gtag(){dataLayer.push(arguments);}
-            gtag('js', new Date());
-            gtag('config', 'G-FC74BB2RGD');
-        });
-    },3000);
-});
-
-</script>
-
-<!-- Google tag (gtag.js) -->
-<!-- <script async src="https://www.googletagmanager.com/gtag/js?id=G-FC74BB2RGD"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-  gtag('config', 'G-FC74BB2RGD');
-</script> -->
-
-</html>
\ No newline at end of file
diff --git a/route/templates/default/login.html b/route/templates/default/login.html
deleted file mode 100755
index aaf5f544a..000000000
--- a/route/templates/default/login.html
+++ /dev/null
@@ -1,257 +0,0 @@
-
-<!doctype html>
-<html lang="zh">
-<head>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> 
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-<link rel="icon" href="/static/favicon.ico" type="image/x-icon" />
-<link rel="shortcut icon" href="/static/favicon.ico" type="image/x-icon" />
-<title>{{data['title']}}</title>
-<link rel="stylesheet" type="text/css" href="/static/layer/skin/default/layer.css?v={{config.version}}">
-<link rel="stylesheet" type="text/css" href="/static/css/site.css?v={{config.version}}">
-<link rel="stylesheet" type="text/css" href="/static/css/login.css?v={{config.version}}">
-<style type="text/css">
-@media screen and (max-width: 640px) {
-    .scanCode{
-    	display: none;
-    }
-    .account{
-    	display: block !important;
-    }
-    .bg_img{
-    	display: none;
-    }
-}
-
-.bg_img.pc{
-	background-position: 0 -60px;
-}
-.bg_img.pc:hover{
-	background-position: -60px -60px;
-}
-
-.qrCode{
-	text-align: center;
-	padding-top: 20px;
-}
-.scanCode .titles{
-	font-size: 23px;
-	margin-top: 25px;
-	color: #444;
-	text-align: center;
-}
-.list_scan{
-	width: 150px;
-	margin: 0 auto; 
-	margin-top: 15px;
-}
-.list_scan>img{
-	width: 40px;
-	height: 40px;
-	float: left;
-	margin-right: 15px;
-}
-.list_scan span{
-	display: inline-block;
-	font-size: 13px;
-	margin-bottom: 5px;
-}
-.list_scan a:hover .weChatSamll{
-	display: block;
-}
-.list_scan .weChatSamll{
-	display: none;
-	width: 150px;
-	height: 150px;
-	position: absolute;
-	border: 1px solid #ececec;
-	border-radius: 5px;
-	bottom: 105px;
-	right: 80px;
-	padding: 20px;
-	background-color: #fff;
-}
-
-.list_scan .weChatSamll img{
-	width: 100%;
-}
-
-.list_scan .weChatSamll em{
-	position: absolute;
-	border: 7px solid #ececec;
-	border-color: #ececec transparent transparent transparent;
-	width: 0;
-	height: 0;
-	right: 87px;
-	bottom: -14px;
-	margin-left: -6px;
-}
-
-.tips{
-	width: 115px;
-	position: absolute;
-	top: 10px;
-	right: 65px;
-	color: rgb(32, 165, 58);
-	background: #dff0d8;
-	padding: 5px 10px;
-	text-align: center;
-	border-radius: 4px;
-}
-
-.tips em{
-	position: absolute;
-	border: 6px solid #dff0d8;
-	border-color:transparent  transparent transparent #dff0d8; 
-	width: 0;
-	height: 0;
-	right: -11px;
-	top: 8px;
-	margin-left: -6px;
-}
-
-.tips img{
-	height: 16px;
-	width: 16px;
-	vertical-align: middle;
-	margin-top: -1px;
-	margin-right: 4px;
-}
-.main .login .rlogo{
-	margin-top: 15px;
-	margin-bottom: 25px;
-}
-
-.layui-layer .layui-layer-btn{
-	width: 235px;
-}
-</style>
-</head>
-<body>
-<div class="main">
-	<div class="login">
-		<div class="account">
-			<form class="loginform" method="post" action="/login" onsubmit="return false;">
-			<div class="rlogo">{{data['title']}}</div>
-			<div class="line">
-				<input class="inputtxt" value="" name="username" datatype="*" nullmsg="请填写账户" errormsg="请填写账户" placeholder="账户" type="text">
-				<div class="Validform_checktip"></div>
-			</div>
-			<div class="line"><input class="inputtxt" name="password" value="" datatype="*" nullmsg="请填写密码" errormsg="请填写密码" placeholder="密码" type="password">
-				<div class="Validform_checktip"></div>
-			</div>
-			<div style="color: red;position: relative;top: -14px;" id="error"></div>
-			<div class="line yzm" style="top: -5px;{% if not session['code'] %}display:none;{% endif %}">
-				<input type="text" class="inputtxt" name="code" nullmsg="请填写4位验证码" errormsg="验证码" datatype="*" placeholder="验证码">
-				<div class="Validform_checktip"></div>
-				<div id='mw_yzm'>{% if session['code'] %}<img width="100" height="40" class="passcode" onClick="this.src=this.src.split('?')[0] + '?'+new Date().getTime()" src="/code" style="border: 1px solid #ccc; float: right;" title="" >{% endif %}</div>
-			</div>
-			<div class="login_btn"><input id="login-button" value="登录" type="submit"></div>
-			<p class="pwinfo" style="display:none"></p>
-			<a class="resetpw" href="//github.com/midoks/mdserver-web/wiki/%E5%AF%86%E7%A0%81%E4%BF%AE%E6%94%B9" target="_blank">忘记密码</a>
-			</form>
-		</div>
-
-	</div>
-</div>
-<script type="text/javascript" src="/static/js/jquery-1.10.2.min.js?v={{config.version}}"></script>
-<script src="/static/language/zh-cn.js?v={{config.version}}"></script>
-<script src="/static/language/Simplified_Chinese/lan.js?v={{config.version}}"></script>
-<script type="text/javascript" src="/static/layer/layer.js?v={{config.version}}"></script>
-<script type="text/javascript" src="/static/js/Validform_v5.3.2_min.js?v={{config.version}}"></script>
-<script type="text/javascript">
-$(function(){
-	wreset();
-})
-
-window.onresize=function(){
-	wreset();
-}
-
-function wreset(){
-	var w = $(window).width();
-	var yzmw = $(".login .line").width() - 140;
-	if($(".yzm").is(":visible") && w > 640){
-		$(".login").css({"height":"365px","margin-top":"-230px"});
-	} else {
-		$(".login").removeAttr("style")
-	}
-	$(".login .yzm .inputtxt").width(yzmw);
-}
-
-
-$(function(){
-	$(".loginform").Validform({
-		tiptype:function(msg,o,cssctl){
-			if(!o.obj.is("form")){
-				var objtip=o.obj.siblings(".Validform_checktip");
-				cssctl(objtip,o.type);
-				objtip.text(msg);
-			}
-		}
-	});
-});
-
-$('#login-button').click(function(){
-	var username = encodeURIComponent($("input[name='username']").val());
-	var password = encodeURIComponent($("input[name='password']").val());
-	var code = $("input[name='code']").val();
-	if(username == '' || password == ''){
-		layer.msg("表单错误,请重新输入!",{icon:2});
-		return;
-	}
-			
-	var data = 'username='+username+'&password='+password+'&code='+code;
-	var loadT = layer.msg("正在登录中...",{icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/do_login',data,function(rdata){
-		console.log(rdata);
-		layer.close(loadT);
-		if(status < 0){
-			if(username == 'admin' && rdata.msg.indexOf('用户名') != -1){
-				rdata.msg += ', <br>获取默认用户和密码命令： mw default';
-			}
-			$("#error").html(rdata.msg);
-			$("input[name='password']").val('');
-			num = rdata.msg.substring(rdata.msg.indexOf('[')+1,rdata.msg.indexOf(']'))
-			if(num < 5){
-				var code_html = '<img width="100" height="40" class="passcode" onClick="this.src=this.src.split(\'?\')[0] + \'?\'+new Date().getTime()" src="/code" style="border: 1px solid #ccc; float: right;">';
-				$('#mw_yzm').html(code_html);
-				// $(".login").css("height","332px");
-				$("input[name='code']").val('');
-				$(".passcode").click();
-			}
-			$(".yzm").show();
-			wreset();
-			layer.msg(rdata.msg,{icon:2,time:5000});
-			return;
-		}
-
-		if (rdata.status == 2){
-			layer.prompt({
-			 	formType: 3,
-			 	value: '',
-			 	title: '二次验证',
-			}, function(value, index, elem){
-			 	$.post('/verify_login',{'auth':value,'username':username,'password':password},function(vdata){
-			 		if (vdata.status < 0){
-			 			layer.msg(vdata.msg,{icon:2,time:5000});
-			 			return;
-			 		}
-
-			 		layer.close(index);
-			 		window.location.href = '/';	
-			 	},'json');
-			  	
-			});
-			return;
-		}
-		
-		layer.msg(rdata.msg,{icon:16,time:0,shade: [0.3, '#000']});
-		window.location.href = '/';	
-	},'json');
-});
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/route/templates/default/logs.html b/route/templates/default/logs.html
deleted file mode 100644
index ac3e0b876..000000000
--- a/route/templates/default/logs.html
+++ /dev/null
@@ -1,189 +0,0 @@
-{% extends "layout.html" %}
-{% block content %}
-
-<style type="text/css">
-#operationLog thead th:nth-child(1),
-#operationLog tbody tr td:nth-child(1){width:100px;}
-#operationLog thead th:nth-child(2),
-#operationLog tbody tr td:nth-child(2){width:130px;}
-#operationLog thead th:nth-child(4),
-#operationLog tbody tr td:nth-child(4){width:150px;}
-
-
-.logAuditContent {
-    padding: 0 0 0 15px;
-    margin-left: 15px;
-    width: 100%;
-    flex: 1;
-    border-left: 1px solid #ececec;
-}
-
-.tootls_group .logs_search .search_input {
-    height: 30px;
-    line-height: 30px;
-    border-radius: 2px;
-    border: 1px solid #ccc;
-    outline: none;
-    padding-left: 8px;
-    vertical-align: top;
-    width: 230px;
-}
-
-.tootls_group .logs_search .glyphicon-search {
-    height: 28px;
-    line-height: 28px;
-    padding: 0 10px;
-    color: #888;
-    position: absolute;
-    right: 0;
-    font-size: 14px;
-    cursor: pointer;
-}
-
-#logAudit .tootls_group {
-    justify-content: space-between;
-}
-
-#logAudit .tootls_group, #panelRun .tootls_group.tools_bottom {
-    display: flex;
-    flex-wrap: wrap;
-    height: auto;
-    line-height: inherit;
-}
-
-.logAuditTabContent {
-    display: flex;
-    height: 100%;
-}
-
-.logAuditTabContent .logAuditTab {
-    border: 1px solid #ececec;
-    overflow: auto;
-}
-
-.logAuditTabContent .logAuditTab .logAuditItem {
-    height: 35px;
-    line-height: 35px;
-    padding: 0 10px;
-    border-bottom: 1px solid #ececec;
-    cursor: pointer;
-    overflow: hidden;
-}
-
-.logAuditTabContent .logAuditTab .logAuditItem:hover, .logAuditTabContent .logAuditTab .logAuditItem.active {
-    background-color: #f2f2f2;
-}
-
-#logAuditTable thead th:nth-child(1),
-#logAuditTable tbody tr td:nth-child(1){width:;}
-#logAuditTable thead th:nth-child(2),
-#logAuditTable tbody tr td:nth-child(2){width:;}
-#logAuditTable thead th:nth-child(3),
-#logAuditTable tbody tr td:nth-child(3){width:;}
-#logAuditTable thead th:nth-child(4),
-#logAuditTable tbody tr td:nth-child(4){width:300px;}
-</style>
-
-<div class="main-content" style="min-height: 389px;">
-	<div class="container-fluid" style="padding-bottom: 50px;">
-		<div id="cutTab" class="pos-box bgw mtb15" style="height:45px">
-			<div class="tab-list">
-				<div class="tabs-item active" data-name="panelLogs">面板日志</div>
-				<div class="tabs-item" data-name="logAudit">日志审计</div>
-			</div>
-		</div>
-
-
-		<div class="bgw mtb15 pd15 tab-view-box firewall-tab-view" style="overflow: hidden;">
-
-			<!-- logs start -->
-			<div class="tab-con show w-full" id="panelLogs" style="padding: 0px;">
-				<div id="operationLog" style="position: relative;">
-					<div class="tootls_group tootls_top">
-						<div class="pull-left">
-							<button type="button" title="刷新日志" class="refresh btn btn-success btn-sm mr5">
-								<span>刷新日志</span>
-							</button>
-							<button type="button" title="清空日志" class="clear btn btn-default btn-sm mr5">
-								<span>清空日志</span>
-							</button>
-						</div>
-					</div>
-					<div class="divtable mtb10">
-						<table class="table table-hover">
-							<thead style="position: relative;z-index: 1;"><tr>
-								<th><span>编号</span></th>
-								<th><span>操作类型</span></th>
-								<th><span>详情</span></th>
-								<th><span>操作时间</span></th>
-							</tr></thead>
-							<tbody></tbody>
-						</table>
-					</div>
-				</div>
-				<div class="dataTables_paginate paging_bootstrap page operationLog">
-					<div><span class="Pcurrent">1</span><span class="Pcount">共1条</span></div>
-				</div>
-			</div>
-			<!-- logs end -->
-
-
-			<div class="tab-con hide" id="logAudit" style="height: auto;">
-				<div class="logAuditTabContent">
-					<div class="logAuditTab" style="width: 300px;overflow: hidden;overflow-y: auto;">
-					<!--	
-						<div class="logAuditItem active" title="wtmp - 登录和重启记录" data-file="/wtmp">
-							wtmp - 登录和重启记录(4.88 KB)
-						</div>
-					-->
-					</div>
-					<div class="logAuditContent" style="overflow: hidden;overflow-y: auto;">
-						<div id="logAuditTable" class="bt_table" style="display: block;">
-							<div class="tootls_group tootls_top">
-								<div class="pull-left">
-									<button type="button" title="刷新列表" class="btn btn-success btn-sm mr5"><span>刷新列表</span></button>
-								</div>
-								<div class="pull-right">
-									<div class="logs_search" style="position: relative;">
-										<input type="text" class="search_input" style="" placeholder="请输入来源/端口/角色/事件">
-										<span class="glyphicon glyphicon-search" aria-hidden="true"></span>
-									</div>
-								</div>
-							</div>
-							<div class="divtable mtb10" style="max-height: 83px;">
-								<table class="table table-hover">
-									<thead style="position: relative;z-index: 1;">
-										<tr>
-											<th><span data-index="0"><span>用户</span></span></th>
-											<th><span data-index="1"><span>来源</span></span></th>
-											<th><span data-index="2"><span>端口</span></span></th>
-											<th><span data-index="3"><span>时间</span></span></th>
-										</tr>
-									</thead>
-									<tbody>
-										<!-- <tr><td><span>root</span></td>
-											<td><span>117.139.193.29</span></td>
-											<td><span>pts/0</span></td>
-											<td><span>2023-08-25 13:27 still logged in</span></td>
-										</tr> -->
-									</tbody>
-								</table>
-							</div>
-							<div class="tootls_group tootls_bottom">
-								<div class="pull-left"></div>
-								<div class="pull-right">
-									<div class="page"><span class="Pcount">第 1 页</span></div>
-								</div>
-							</div>
-						</div>
-						<div id="logAuditPages" class="page" style="display: flex; justify-content: flex-end;"></div>
-						<div id="logAuditPre" style="display: none;"><pre style="height: 188px; background-color: rgb(51, 51, 51); color: rgb(255, 255, 255); overflow-x: hidden; overflow-wrap: break-word; white-space: pre-wrap;"><code></code></pre></div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<script src="/static/app/logs.js?v={{config.version}}"></script>
-{% endblock %}
\ No newline at end of file
diff --git a/route/templates/default/path.html b/route/templates/default/path.html
deleted file mode 100755
index 7998d53fb..000000000
--- a/route/templates/default/path.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>安全入口校验失败</title>
-</head>
-<body>
-    <h1>请使用正确的入口登录面板</h1>
-    <p><b>错误原因：</b>当前新安装的已经开启了安全入口登录，新装机器都会随机一个8位字符的安全入口名称，亦可以在面板设置处修改，如您没记录或不记得了，可以使用以下方式解决</p>
-    <p><b>解决方法：</b>在SSH终端输入以下一种命令来解决</p>
-    <p>1.查看面板入口：mw default</p>
-    <p>2.关闭安全入口：mw close_admin_path </p>
-    <p style="color:red;">注意：【关闭安全入口】将使您的面板登录地址被直接暴露在互联网上，非常危险，请谨慎操作</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/route/templates/default/plugin_menu.html b/route/templates/default/plugin_menu.html
deleted file mode 100644
index 647c28616..000000000
--- a/route/templates/default/plugin_menu.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "layout.html" %}
-{% block content %}
-{{data['plugin_content']|safe }}
-{% endblock %}
\ No newline at end of file
diff --git a/route/templates/default/site.html b/route/templates/default/site.html
deleted file mode 100755
index aa91828b4..000000000
--- a/route/templates/default/site.html
+++ /dev/null
@@ -1,75 +0,0 @@
-{% extends "layout.html" %}
-
-{% block content %}
-<div class="main-content pb55">
-			<div class="container-fluid">
-				<div class="pos-box bgw mtb15">
-					<div class="position f14 c9 pull-left">
-							<a class="plr10 c4" href="/">首页</a>/<span class="plr10 c4">网站</span>
-						</div>
-					<div class="search pull-right">
-						<form onsubmit="return false;">
-							<input type="text" id="site_search_input" class="ser-text pull-left" autocomplete="off" placeholder="网站搜索"/>
-							<button type="button" class="ser-sub pull-left" id="site_search"></button>
-						</form>
-					</div>
-				</div>
-				<div class="safe bgw mtb15 pd15">
-					<div class="info-title-tips">
-						<p><span class="glyphicon glyphicon-alert" style="color:#f39c12; margin-right:10px;"></span>创建站点时会自动创建权限配置，统一使用www用户。</p>
-					</div>
-					<button onclick="webAdd(0)" class="btn btn-success btn-sm btn-title" type="button">添加站点</button>&nbsp;
-					<button onclick="siteDefaultPage();" class="btn btn-default btn-sm btn-title" type="button">修改默认页</button>
-					<button onclick="getDefaultSite();" class="btn btn-default btn-sm btn-title" type="button">默认站点</button>
-					<button onclick="setClassType();" class="btn btn-default btn-sm btn-title" type="button">分类管理</button>
-					<button onclick="setPHPVer();" class="btn btn-default btn-sm btn-title" type="button">PHP命令行版本</button>
-					<span>
-						<button  batch="true" style="float: right; margin-left: 10px;display: none;" onclick="allDeleteSite();" class="btn btn-default btn-sm">删除选中</button>
-					</span>
-					<div class="move_class">
-		                <button batch="false" style="float: right; margin-left: 10px;display: none;" class="btn btn-default btn-sm" onclick="moveClassTYpe()">移动至</button>
-		            </div>
-
-					<div class="divtable mtb10">
-						<div class="tablescroll">
-						<table class="table table-hover" style="min-width: 900px;border: 0 none;">
-							<thead>
-								<tr>
-									<th width="30"><input type="checkbox" onclick="checkSelect();" id="setBox"></th>
-									<th width="150" onclick="listOrder('name','site',this)" style="cursor: pointer;">域名<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb"></span></th>
-									<th onclick="listOrder('status','site',this)" style="cursor: pointer;" width="98">网站状态<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb"></span></th>
-									<th width="58">备份</th>
-									<th width="26%">网站目录</th>
-									<th onclick="listOrder('edate','site',this)" style="cursor: pointer;" width="86">到期日期<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb"></span></th>
-									<th>备注</th>
-									<th width='130' class='text-right'>操作</th>
-								</tr>
-							</thead>
-							<tbody id="webBody"></tbody>
-						</table>
-						</div>
-						<div class="dataTables_paginate paging_bootstrap pagination">
-							<ul id="webPage" class="page"></ul>
-						</div>
-
-						<div class="site_type">
-							<span>站点分类:</span>
-							<select class="bt-input-text mr5" style="width:100px">
-								<!-- <option value="-1">全部分类</option>
-								<option value="0">默认分类</option> -->
-							</select>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-
-<script type="text/javascript" src="/static/laydate/laydate.js?v={{config.version}}"></script>
-<script type="text/javascript" src="/static/app/site.js?v={{config.version}}"></script>
-<script type="text/javascript">		
-setTimeout(function(){
-	getWeb(1);
-},500);
-</script>
-{% endblock %}
\ No newline at end of file
diff --git a/route/templates/default/soft.html b/route/templates/default/soft.html
deleted file mode 100755
index 21f31853f..000000000
--- a/route/templates/default/soft.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{% extends "layout.html" %}
-
-{% block content %}
-
-<div class="main-content">
-		<div class="container-fluid" style="padding-bottom:54px">
-			<div class="pos-box bgw mtb15">
-				<div class="position f14 c9 pull-left">
-					<a class="plr10 c4" href="/">首页</a>/<span class="plr10 c4">软件管理</span>
-				</div>
-				<div class="search pull-right">
-					<form target="_self" onsubmit='getSList();return false;'>
-						<input type="text" id="SearchValue" class="ser-text pull-left" placeholder="搜索" autocomplete="false" />
-						<button type="button" class="ser-sub pull-left" onclick='getSList()'></button>
-					</form>
-				</div>
-			</div>
-			<div class="softbox bgw mtb15">
-				<div class="softlist">
-					<div class="divtable pd15 relative">
-
-						<div class="menu-sub softtype"></div>
-
-						<input type="file" style="display:none;" accept=".zip,.tar.gz" id="update_zip" multiple="multiple">
-						<button class="btn btn-default btn-sm" onclick="importPluginOpen()" title="添加插件" style="position:absolute;top:12px;right:15px">添加插件</button>
-						<div id="updata_pro_info"></div>
-						<table class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0">
-							<thead>
-								<tr>
-									<th width="185">软件名称</th>
-									<th>说明</th>
-									<th width="40">位置</th>
-									<th width="40">状态</th>
-									<th width="64">首页显示</th>
-									<th style="text-align: right;" width="120">操作</th>
-								</tr>
-							</thead>
-							<tbody id="softList"></tbody>
-						</table>
-						<div class="dataTables_paginate paging_bootstrap pagination">
-							<ul id="softPage" class="page"></ul>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-<script type="text/javascript" src="/static/js/jquery.dragsort-0.5.2.min.js?v={{config.version}}"></script>
-<script type="text/javascript" src="/static/laydate/laydate.js?v={{config.version}}"></script>
-<script type="text/javascript" src="/static/app/soft.js?v={{config.version}}"></script>
-<script>
-//取软件列表
-getSList();
-</script>
-
-
-{% endblock %}
\ No newline at end of file
diff --git a/route/templates/index.html b/route/templates/index.html
deleted file mode 100644
index b2d525b29..000000000
--- a/route/templates/index.html
+++ /dev/null
@@ -1 +0,0 @@
-index
\ No newline at end of file

From 080e4ad696cc29126fb4bf4ca1f9a8c9c237d14b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 04:38:28 +0800
Subject: [PATCH 220/965] Update tool_task.py

---
 plugins/webstats/tool_task.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/plugins/webstats/tool_task.py b/plugins/webstats/tool_task.py
index 72b65366a..fe9185f58 100644
--- a/plugins/webstats/tool_task.py
+++ b/plugins/webstats/tool_task.py
@@ -6,6 +6,8 @@ import os
 import time
 import json
 
+from utils.crontab import crontab as MwCrontab
+
 sys.path.append(os.getcwd() + "/class/core")
 import mw
 
@@ -58,11 +60,11 @@ def createBgTask():
         if res and res["id"] == cfg["task_id"]:
             print("计划任务已经存在!")
             return True
-    import crontab_api
-    api = crontab_api.crontab_api()
 
-    cmd = "cd " + mw.getRunDir() + " && nice -n 10 python3 " + \
-        getPluginDir() + "/tool_task.py execute"
+
+    
+
+    cmd = "cd " + mw.getPanelDir() + " && nice -n 10 python3 " + getPluginDir() + "/tool_task.py execute"
     params = {
         'name': name,
         'type': 'day',
@@ -78,7 +80,7 @@ def createBgTask():
         'urladdress': '',
     }
 
-    task_id = api.add(params)
+    task_id = MwCrontab.instance().add(params)
     if task_id > 0:
         cfg["task_id"] = task_id
         mw.writeFile(getTaskConf(), json.dumps(cfg))
@@ -90,10 +92,7 @@ def removeBgTask():
         res = mw.M("crontab").field("id, name").where(
             "id=?", (cfg["task_id"],)).find()
         if res and res["id"] == cfg["task_id"]:
-            import crontab_api
-            api = crontab_api.crontab_api()
-
-            data = api.delete(cfg["task_id"])
+            data = MwCrontab.instance().delete(cfg["task_id"])
             if data[0]:
                 # print(data[1])
                 cfg["task_id"] = -1

From 2d14184c82e3d7e29181029a8cea41ee859739a6 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 04:40:21 +0800
Subject: [PATCH 221/965] Update index.py

---
 plugins/webstats/index.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/webstats/index.py b/plugins/webstats/index.py
index 3c272cce5..11fbfe40e 100755
--- a/plugins/webstats/index.py
+++ b/plugins/webstats/index.py
@@ -7,8 +7,12 @@ import time
 import json
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 
 app_debug = False

From 7eb88d6a9215711bbdf40905d4faaf812e4b227d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 04:43:00 +0800
Subject: [PATCH 222/965] Update tool_task.py

---
 plugins/webstats/tool_task.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/webstats/tool_task.py b/plugins/webstats/tool_task.py
index fe9185f58..614c34ccb 100644
--- a/plugins/webstats/tool_task.py
+++ b/plugins/webstats/tool_task.py
@@ -6,10 +6,14 @@ import os
 import time
 import json
 
-from utils.crontab import crontab as MwCrontab
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+from utils.crontab import crontab as MwCrontab
 
 
 app_debug = False

From d32523c451ed71361e4c52058b8885fe2843d3bd Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 04:43:22 +0800
Subject: [PATCH 223/965] up

---
 plugins/webstats/tool_migrate.py   |  8 ++++++--
 plugins/webstats/webstats_index.py | 12 +++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/plugins/webstats/tool_migrate.py b/plugins/webstats/tool_migrate.py
index 926cd6474..1c02f8438 100644
--- a/plugins/webstats/tool_migrate.py
+++ b/plugins/webstats/tool_migrate.py
@@ -6,9 +6,13 @@ import os
 import time
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
+import core.mw as mw
+from utils.crontab import crontab as MwCrontab
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/webstats/webstats_index.py b/plugins/webstats/webstats_index.py
index 411c8297d..5c5083519 100644
--- a/plugins/webstats/webstats_index.py
+++ b/plugins/webstats/webstats_index.py
@@ -8,11 +8,13 @@ import json
 import re
 
 
-try:
-    sys.path.append(os.getcwd() + "/class/core")
-    import mw
-except Exception as e:
-    import core.mw as mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+from utils.crontab import crontab as MwCrontab
 
 
 app_debug = False

From e4d7ebbe2514b31df9fb34e32f795494eba19645 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 04:44:24 +0800
Subject: [PATCH 224/965] Update tool_task.py

---
 plugins/webstats/tool_task.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/webstats/tool_task.py b/plugins/webstats/tool_task.py
index 614c34ccb..fdfa64393 100644
--- a/plugins/webstats/tool_task.py
+++ b/plugins/webstats/tool_task.py
@@ -66,8 +66,6 @@ def createBgTask():
             return True
 
 
-    
-
     cmd = "cd " + mw.getPanelDir() + " && nice -n 10 python3 " + getPluginDir() + "/tool_task.py execute"
     params = {
         'name': name,

From 5218468b96fa545a92cfb4a28b6544c9761a6e04 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 04:44:31 +0800
Subject: [PATCH 225/965] Update tool_task.py

---
 plugins/webstats/tool_task.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/webstats/tool_task.py b/plugins/webstats/tool_task.py
index fdfa64393..2be6f244f 100644
--- a/plugins/webstats/tool_task.py
+++ b/plugins/webstats/tool_task.py
@@ -79,7 +79,7 @@ def createBgTask():
         'stype': "toShell",
         'sname': '',
         'sbody': cmd,
-        'urladdress': '',
+        'url_address': '',
     }
 
     task_id = MwCrontab.instance().add(params)

From 5a072d7cda93d5449058532892f0f6c792435afc Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 04:46:40 +0800
Subject: [PATCH 226/965] Update crontab.py

---
 web/utils/crontab.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/utils/crontab.py b/web/utils/crontab.py
index 4a8b6035f..8ce71a511 100644
--- a/web/utils/crontab.py
+++ b/web/utils/crontab.py
@@ -16,8 +16,6 @@ import json
 import threading
 import multiprocessing
 
-from admin import model
-
 import core.mw as mw
 import thisdb
 

From 2893f0273598baffcf6960b1008c4ebf03a725c5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 04:51:29 +0800
Subject: [PATCH 227/965] update

---
 plugins/webstats/tool_task.py | 3 +--
 web/admin/crontab/__init__.py | 6 +++++-
 web/utils/crontab.py          | 4 +---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/webstats/tool_task.py b/plugins/webstats/tool_task.py
index 2be6f244f..c57f517da 100644
--- a/plugins/webstats/tool_task.py
+++ b/plugins/webstats/tool_task.py
@@ -59,8 +59,7 @@ def createBgTask():
         return True
 
     if "task_id" in cfg.keys() and cfg["task_id"] > 0:
-        res = mw.M("crontab").field("id, name").where(
-            "id=?", (cfg["task_id"],)).find()
+        res = mw.M("crontab").field("id, name").where("id=?", (cfg["task_id"],)).find()
         if res and res["id"] == cfg["task_id"]:
             print("计划任务已经存在!")
             return True
diff --git a/web/admin/crontab/__init__.py b/web/admin/crontab/__init__.py
index 17f506fba..b6184606f 100644
--- a/web/admin/crontab/__init__.py
+++ b/web/admin/crontab/__init__.py
@@ -115,6 +115,10 @@ def add():
     request_data['sname'] = request.form.get('sName', '')
     request_data['sbody'] = request.form.get('sBody', '')
     request_data['url_address'] = request.form.get('urladdress', '')
-    return MwCrontab.instance().add(request_data)
+    
+    cron_id = MwCrontab.instance().add(request_data)
+    if cron_id > 0:
+        return mw.returnData(True, '添加成功')
+    return mw.returnData(False, '添加失败')
 
 
diff --git a/web/utils/crontab.py b/web/utils/crontab.py
index 8ce71a511..2e5175bdb 100644
--- a/web/utils/crontab.py
+++ b/web/utils/crontab.py
@@ -184,9 +184,7 @@ class crontab(object):
         add_dbdata['url_address'] = data['url_address']
 
         tid = thisdb.addCrontab(add_dbdata)
-        if tid > 0:
-            return mw.returnData(True, '添加成功')
-        return mw.returnData(False, '添加失败')
+        return tid
 
     def delete(self, tid):
         data = thisdb.getCrond(tid)

From aa2126e7e6cca606c67052b4fccdf944065ba18b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 04:57:24 +0800
Subject: [PATCH 228/965] Update crontab.py

---
 web/utils/crontab.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/utils/crontab.py b/web/utils/crontab.py
index 2e5175bdb..f61dc41ff 100644
--- a/web/utils/crontab.py
+++ b/web/utils/crontab.py
@@ -164,9 +164,9 @@ class crontab(object):
         cmd += ' ' + cron_path + '/' + cron_name + ' >> ' + cron_path + '/' + cron_name + '.log 2>&1'
 
         if not mw.isAppleSystem():
-            data = self.writeShell(cmd)
-            if not data['status']:
-                return data
+            sh_data = self.writeShell(cmd)
+            if not sh_data['status']:
+                return sh_data
             self.crondReload()
 
         add_dbdata = {}

From c249da061d9d6bc2accae7f2964844bbce201577 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 05:01:42 +0800
Subject: [PATCH 229/965] Update mw.py

---
 web/core/mw.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/core/mw.py b/web/core/mw.py
index fc9efa08d..19921891e 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -213,6 +213,7 @@ def writeFile(filename, content, mode='w+'):
         fp.close()
         return True
     except Exception as e:
+        print(e)
         return False
 
 

From 41000f0c5d4f1b5c9fd0f3c2aa2c2a23b9159fd1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 05:10:19 +0800
Subject: [PATCH 230/965] update

---
 plugins/webstats/install.sh      | 2 +-
 plugins/webstats/tool_migrate.py | 7 +------
 web/core/mw.py                   | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/plugins/webstats/install.sh b/plugins/webstats/install.sh
index 771f8d290..cb14928e0 100755
--- a/plugins/webstats/install.sh
+++ b/plugins/webstats/install.sh
@@ -133,7 +133,7 @@ Install_App()
 		cp -rf $serverPath/source/webstats/GeoLite2-City.mmdb $serverPath/webstats/GeoLite2-City.mmdb
 	fi
 
-	cd $rootPath && python3 ${rootPath}/plugins/webstats/index.py start
+	cd $rootPath && python3 plugins/webstats/index.py start
 
 	echo '网站统计安装完成'
 
diff --git a/plugins/webstats/tool_migrate.py b/plugins/webstats/tool_migrate.py
index 1c02f8438..ddc66e884 100644
--- a/plugins/webstats/tool_migrate.py
+++ b/plugins/webstats/tool_migrate.py
@@ -31,11 +31,6 @@ def getServerDir():
     return mw.getServerDir() + '/' + getPluginName()
 
 
-def getTaskConf():
-    conf = getServerDir() + "/task_config.json"
-    return conf
-
-
 def getConf():
     conf = getServerDir() + "/lua/config.json"
     return conf
@@ -126,7 +121,7 @@ def migrateSiteHotLogs(site_name, query_date):
                 if field is None:
                     field = "\'\'"
                 elif type(field) == str:
-                    field = "\'" + field.replace("\'", "\”") + "\'"
+                    field = "\'" + field.replace("\'", "\"") + "\'"
                 params += str(field)
             insert_sql = "insert into web_logs(" + \
                 _columns + ") values(" + params + ")"
diff --git a/web/core/mw.py b/web/core/mw.py
index 19921891e..38427e4d0 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -205,7 +205,7 @@ def readFile(filename):
         print(e)
         return False
 
-def writeFile(filename, content, mode='w+'):
+def writeFile(filename, content, mode='aw+'):
     # 写文件内容
     try:
         fp = open(filename, mode)

From 27e1e0c73c827a36020877d9ed018e71288749a7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 05:11:35 +0800
Subject: [PATCH 231/965] Update mw.py

---
 web/core/mw.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index 38427e4d0..19921891e 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -205,7 +205,7 @@ def readFile(filename):
         print(e)
         return False
 
-def writeFile(filename, content, mode='aw+'):
+def writeFile(filename, content, mode='w+'):
     # 写文件内容
     try:
         fp = open(filename, mode)

From 3b857833a7e061f632d6416e5c1dfd2ce6e55d51 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 05:18:34 +0800
Subject: [PATCH 232/965] update

---
 plugins/webstats/install.sh | 2 +-
 web/core/mw.py              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/webstats/install.sh b/plugins/webstats/install.sh
index cb14928e0..bb4395bd2 100755
--- a/plugins/webstats/install.sh
+++ b/plugins/webstats/install.sh
@@ -148,7 +148,7 @@ Install_App()
 
 Uninstall_App()
 {
-	cd $rootPath && python3 ${rootPath}/plugins/webstats/index.py stop
+	cd $rootPath && python3 plugins/webstats/index.py stop
 	rm -rf $serverPath/webstats
 	echo "网站统计卸载完成"
 }
diff --git a/web/core/mw.py b/web/core/mw.py
index 19921891e..7f827f0e4 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -213,7 +213,7 @@ def writeFile(filename, content, mode='w+'):
         fp.close()
         return True
     except Exception as e:
-        print(e)
+        print(getTracebackInfo())
         return False
 
 

From 62a94c5c153d17818a9b87252ebccb8dd8271b27 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 05:26:35 +0800
Subject: [PATCH 233/965] Update tool_task.py

---
 plugins/webstats/tool_task.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/webstats/tool_task.py b/plugins/webstats/tool_task.py
index c57f517da..e1c1af25d 100644
--- a/plugins/webstats/tool_task.py
+++ b/plugins/webstats/tool_task.py
@@ -39,10 +39,9 @@ def getTaskConf():
 
 
 def getConfigData():
-    try:
+    conf = getTaskConf()
+    if os.path.exists(conf):
         return json.loads(mw.readFile(getTaskConf()))
-    except:
-        pass
     return {
         "task_id": -1,
         "task_list": ["migrate_hot_logs"],

From add966bc62785e47aa979ca90d1f0e62ae7a7fc7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 05:32:51 +0800
Subject: [PATCH 234/965] Update crontab.py

---
 web/utils/crontab.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/utils/crontab.py b/web/utils/crontab.py
index f61dc41ff..e308b7a5e 100644
--- a/web/utils/crontab.py
+++ b/web/utils/crontab.py
@@ -258,9 +258,10 @@ class crontab(object):
 
         file = ''
         for i in cron_file:
-            if os.path.exists(file):
+            if os.path.exists(i):
                 file = i
 
+
         if file == '':
             return False
 

From d57b0d0922dda7e1c173d2ddb173af4045a884cb Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 05:36:53 +0800
Subject: [PATCH 235/965] Update mw.py

---
 web/core/mw.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/web/core/mw.py b/web/core/mw.py
index 7f827f0e4..0a04a42b5 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -533,6 +533,33 @@ def getCpuType():
     return cpuType
 
 
+def getLanguage():
+    path = 'data/language.pl'
+    if not os.path.exists(path):
+        return 'Simplified_Chinese'
+    return readFile(path).strip()
+
+
+def getStaticJson(name="public"):
+    file = 'static/language/' + getLanguage() + '/' + name + '.json'
+    if not os.path.exists(file):
+        file = 'route/static/language/' + getLanguage() + '/' + name + '.json'
+    return file
+
+
+def returnMsg(status, msg, args=()):
+    # 取通用字曲返回
+    pjson = getStaticJson('public')
+    logMessage = json.loads(readFile(pjson))
+    keys = logMessage.keys()
+
+    if msg in keys:
+        msg = logMessage[msg]
+        for i in range(len(args)):
+            rep = '{' + str(i + 1) + '}'
+            msg = msg.replace(rep, args[i])
+    return {'status': status, 'msg': msg, 'data': args}
+    
 def getInfo(msg, args=()):
     # 取提示消息
     for i in range(len(args)):

From b0392b7cf106a24fdaf83b47f7d135abae6a8738 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 05:40:30 +0800
Subject: [PATCH 236/965] update

---
 plugins/rsyncd/index.py     |  9 +++++++--
 plugins/rsyncd/tool_task.py | 29 +++++++++++++++--------------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/plugins/rsyncd/index.py b/plugins/rsyncd/index.py
index 708031edb..778e4da14 100755
--- a/plugins/rsyncd/index.py
+++ b/plugins/rsyncd/index.py
@@ -7,8 +7,13 @@ import json
 import re
 import sys
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/rsyncd/tool_task.py b/plugins/rsyncd/tool_task.py
index 0d332ea9b..e57f9eb9e 100644
--- a/plugins/rsyncd/tool_task.py
+++ b/plugins/rsyncd/tool_task.py
@@ -6,8 +6,15 @@ import os
 import time
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+from utils.crontab import crontab as MwCrontab
+
 
 
 app_debug = False
@@ -33,10 +40,9 @@ def getTaskConf():
 
 
 def getConfigData():
-    try:
+    conf = getTaskConf()
+    if os.path.exists(conf):
         return json.loads(mw.readFile(getTaskConf()))
-    except:
-        pass
     return []
 
 
@@ -68,8 +74,6 @@ def createBgTaskByName(name, args):
         if res and res["id"] == cfg["task_id"]:
             print("计划任务已经存在!")
             return True
-    import crontab_api
-    api = crontab_api.crontab_api()
 
     period = args['period']
     _hour = ''
@@ -108,10 +112,10 @@ logs_file=$plugin_path/send/${rname}/run.log
         'stype': "toShell",
         'sname': '',
         'sbody': cmd,
-        'urladdress': '',
+        'url_address': '',
     }
 
-    task_id = api.add(params)
+    task_id = MwCrontab.instance().add(params)
     if task_id > 0:
         cfg["task_id"] = task_id
         cfg["name"] = name
@@ -126,12 +130,9 @@ def removeBgTask():
     for x in range(len(cfg_list)):
         cfg = cfg_list[x]
         if "task_id" in cfg.keys() and cfg["task_id"] > 0:
-            res = mw.M("crontab").field("id, name").where(
-                "id=?", (cfg["task_id"],)).find()
+            res = mw.M("crontab").field("id, name").where("id=?", (cfg["task_id"],)).find()
             if res and res["id"] == cfg["task_id"]:
-                import crontab_api
-                api = crontab_api.crontab_api()
-                data = api.delete(cfg["task_id"])
+                data = MwCrontab.instance().delete(cfg["task_id"])
                 if data[0]:
                     cfg["task_id"] = -1
                     cfg_list[x] = cfg

From beb6dd874ade7f026370ab810e92ba816b87f7a0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 05:41:55 +0800
Subject: [PATCH 237/965] update

---
 plugins/php-apt/index.py         | 12 +++++-------
 plugins/php-apt/index_php_apt.py | 12 +++++-------
 plugins/php-yum/index.py         | 12 +++++-------
 plugins/php-yum/index_php_yum.py | 12 +++++-------
 plugins/php/index.py             | 12 +++++-------
 plugins/php/index_php.py         | 17 +++++------------
 6 files changed, 30 insertions(+), 47 deletions(-)

diff --git a/plugins/php-apt/index.py b/plugins/php-apt/index.py
index b3906c33d..b5abc0efb 100755
--- a/plugins/php-apt/index.py
+++ b/plugins/php-apt/index.py
@@ -9,14 +9,12 @@ import json
 import shutil
 
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
-if mw.isAppleSystem():
-    cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-    info = mw.execShell(cmd)
-    p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-    sys.path.append(p)
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/php-apt/index_php_apt.py b/plugins/php-apt/index_php_apt.py
index 0be394d49..2562967a4 100755
--- a/plugins/php-apt/index_php_apt.py
+++ b/plugins/php-apt/index_php_apt.py
@@ -8,14 +8,12 @@ import re
 import json
 import shutil
 
-# reload(sys)
-# sys.setdefaultencoding('utf8')
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
-try:
-    sys.path.append(os.getcwd() + "/class/core")
-    import mw
-except Exception as e:
-    import core.mw as mw
+import core.mw as mw
 
 if mw.isAppleSystem():
     cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
diff --git a/plugins/php-yum/index.py b/plugins/php-yum/index.py
index 2d0c87ad3..fefbed017 100755
--- a/plugins/php-yum/index.py
+++ b/plugins/php-yum/index.py
@@ -9,14 +9,12 @@ import json
 import shutil
 
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
-if mw.isAppleSystem():
-    cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-    info = mw.execShell(cmd)
-    p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-    sys.path.append(p)
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/php-yum/index_php_yum.py b/plugins/php-yum/index_php_yum.py
index 1a77fb329..11ea23240 100755
--- a/plugins/php-yum/index_php_yum.py
+++ b/plugins/php-yum/index_php_yum.py
@@ -8,14 +8,12 @@ import re
 import json
 import shutil
 
-# reload(sys)
-# sys.setdefaultencoding('utf8')
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
-try:
-    sys.path.append(os.getcwd() + "/class/core")
-    import mw
-except Exception as e:
-    import core.mw as mw
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/php/index.py b/plugins/php/index.py
index ac905c358..f08c86485 100755
--- a/plugins/php/index.py
+++ b/plugins/php/index.py
@@ -11,14 +11,12 @@ import shutil
 # reload(sys)
 # sys.setdefaultencoding('utf8')
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
-if mw.isAppleSystem():
-    cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-    info = mw.execShell(cmd)
-    p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-    sys.path.append(p)
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/php/index_php.py b/plugins/php/index_php.py
index bfd9bca31..617613b1e 100755
--- a/plugins/php/index_php.py
+++ b/plugins/php/index_php.py
@@ -8,19 +8,12 @@ import re
 import json
 import shutil
 
-# reload(sys)
-# sys.setdefaultencoding('utf8')
-try:
-    sys.path.append(os.getcwd() + "/class/core")
-    import mw
-except Exception as e:
-    import core.mw as mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
-if mw.isAppleSystem():
-    cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-    info = mw.execShell(cmd)
-    p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-    sys.path.append(p)
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():

From 141c56fbc2ddcd0c21a9edd7bd547ec7a2555521 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 05:46:05 +0800
Subject: [PATCH 238/965] update

---
 plugins/op_waf/index.py     |  8 ++++++--
 plugins/op_waf/tool_task.py | 22 ++++++++++++----------
 plugins/pgadmin/index.py    | 11 +++++++----
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/plugins/op_waf/index.py b/plugins/op_waf/index.py
index 0f14caaf8..f6db7a141 100755
--- a/plugins/op_waf/index.py
+++ b/plugins/op_waf/index.py
@@ -12,8 +12,12 @@ import subprocess
 import json
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 
 app_debug = False
diff --git a/plugins/op_waf/tool_task.py b/plugins/op_waf/tool_task.py
index 1ee26c173..88416b9ef 100644
--- a/plugins/op_waf/tool_task.py
+++ b/plugins/op_waf/tool_task.py
@@ -6,8 +6,13 @@ import os
 import time
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+from utils.crontab import crontab as MwCrontab
 
 
 app_debug = False
@@ -33,10 +38,9 @@ def getTaskConf():
 
 
 def getConfigData():
-    try:
+    conf = getTaskConf()
+    if os.path.exists(conf):
         return json.loads(mw.readFile(getTaskConf()))
-    except:
-        pass
     return []
 
 
@@ -122,10 +126,10 @@ logs_file=$plugin_path/${rname}.log
         'stype': "toShell",
         'sname': '',
         'sbody': cmd,
-        'urladdress': '',
+        'url_address': '',
     }
 
-    task_id = cron_api.add(params)
+    task_id = MwCrontab.instance().add(params)
     if task_id > 0:
         cfg["task_id"] = task_id
         cfg["name"] = name
@@ -146,9 +150,7 @@ def removeBgTask():
             res = mw.M("crontab").field("id, name").where(
                 "id=?", (cfg["task_id"],)).find()
             if res and res["id"] == cfg["task_id"]:
-                import crontab_api
-                api = crontab_api.crontab_api()
-                data = api.delete(cfg["task_id"])
+                data = MwCrontab.instance().delete(cfg["task_id"])
                 if data[0]:
                     cfg["task_id"] = -1
                     cfg_list[x] = cfg
diff --git a/plugins/pgadmin/index.py b/plugins/pgadmin/index.py
index 178d42804..526f5f145 100755
--- a/plugins/pgadmin/index.py
+++ b/plugins/pgadmin/index.py
@@ -7,9 +7,12 @@ import time
 import re
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
-import site_api
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
@@ -90,7 +93,7 @@ def contentReplace(content):
     content = content.replace('{$APP_PATH}', service_path+'/'+getPluginName()+'/data')
 
     port = cfg["port"]
-    rep = 'listen\s*(.*);'
+    rep = r'listen\s*(.*);'
     content = re.sub(rep, "listen " + port + ';', content)
     return content
 

From 941285d168a4b330cd435ad0836465bc9126c336 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 05:48:35 +0800
Subject: [PATCH 239/965] update

---
 plugins/clean/index.py     |  8 ++++++--
 plugins/clean/tool_task.py | 20 +++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/plugins/clean/index.py b/plugins/clean/index.py
index d9c29d5ed..d6d59b36c 100755
--- a/plugins/clean/index.py
+++ b/plugins/clean/index.py
@@ -5,8 +5,12 @@ import io
 import os
 import time
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/clean/tool_task.py b/plugins/clean/tool_task.py
index bf9654e2d..a90862a06 100644
--- a/plugins/clean/tool_task.py
+++ b/plugins/clean/tool_task.py
@@ -6,8 +6,13 @@ import os
 import time
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+from utils.crontab import crontab as MwCrontab
 
 
 app_debug = False
@@ -33,10 +38,9 @@ def getTaskConf():
 
 
 def getConfigData():
-    try:
+    conf = getTaskConf()
+    if os.path.exists(conf):
         return json.loads(mw.readFile(getTaskConf()))
-    except:
-        pass
     return {
         "task_id": -1,
         "period": "day-n",
@@ -97,7 +101,7 @@ logs_file=$plugin_path/${rname}.log
         'urladdress': '',
     }
 
-    task_id = api.add(params)
+    task_id = MwCrontab.instance().add(params)
     if task_id > 0:
         args["task_id"] = task_id
         args["name"] = name
@@ -110,9 +114,7 @@ def removeBgTask():
         res = mw.M("crontab").field("id, name").where(
             "id=?", (cfg["task_id"],)).find()
         if res and res["id"] == cfg["task_id"]:
-            import crontab_api
-            api = crontab_api.crontab_api()
-            data = api.delete(cfg["task_id"])
+            data = MwCrontab.instance().delete(cfg["task_id"])
             if data[0]:
                 cfg["task_id"] = -1
                 mw.writeFile(getTaskConf(), json.dumps(cfg))

From c9f03c0f691d2e78aa36e1b9d456a495c71a2fe5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 06:02:41 +0800
Subject: [PATCH 240/965] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=95=E5=85=A5?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/acme_pandominassl_apply/index.py   |  8 +++-
 plugins/alist/index.py                     |  8 +++-
 plugins/backup_ftp/index.py                | 13 +++---
 plugins/cloudreve/index.py                 |  8 +++-
 plugins/data_query/index.py                |  8 +++-
 plugins/data_query/nosql_memcached.py      | 11 ++---
 plugins/data_query/nosql_mongodb.py        | 11 ++---
 plugins/data_query/nosql_redis.py          | 10 ++---
 plugins/data_query/sql_mysql.py            | 11 ++---
 plugins/docker/index.py                    |  8 +++-
 plugins/dynamic-tracking/index.py          |  9 ++++-
 plugins/fail2ban/index.py                  |  8 +++-
 plugins/gdrive/index.py                    | 10 +++--
 plugins/gitea/index.py                     | 13 +++---
 plugins/gogs/index.py                      | 20 +++++----
 plugins/gorse/index.py                     |  8 +++-
 plugins/haproxy/index.py                   |  8 +++-
 plugins/imail/index.py                     |  8 +++-
 plugins/keepalived/index.py                |  8 +++-
 plugins/lvs/index.py                       |  8 +++-
 plugins/mariadb/index.py                   |  9 +++--
 plugins/mariadb/index_mariadb.py           |  8 +++-
 plugins/memcached/index.py                 |  8 +++-
 plugins/migration_api/index.py             |  8 +++-
 plugins/mongodb/index.py                   |  8 +++-
 plugins/mosquitto/index.py                 |  8 +++-
 plugins/msonedrive/index.py                | 10 +++--
 plugins/mysql-apt/index.py                 |  9 +++--
 plugins/mysql-apt/index_mysql_apt.py       |  7 +++-
 plugins/mysql-yum/index.py                 | 10 ++---
 plugins/mysql-yum/index_mysql_yum.py       |  7 +++-
 plugins/mysql/index.py                     |  9 +++--
 plugins/mysql/index_mysql.py               |  8 +++-
 plugins/nezha/index.py                     |  8 +++-
 plugins/op_load_balance/index.py           |  8 +++-
 plugins/phpmyadmin/index.py                | 14 ++++---
 plugins/postgresql/index.py                |  8 +++-
 plugins/pureftp/index.py                   |  8 +++-
 plugins/redis/index.py                     |  8 +++-
 plugins/simpleping/index.py                |  8 +++-
 plugins/sphinx/index.py                    |  8 +++-
 plugins/sphinx/tool_cron.py                | 47 +++++++++-------------
 plugins/supervisor/index.py                |  8 +++-
 plugins/swap/index.py                      |  8 +++-
 plugins/sys-opt/index.py                   |  8 +++-
 plugins/system_safe/system_safe.py         |  9 ++++-
 plugins/tamper_proof_py/index.py           |  8 +++-
 plugins/task_manager/index.py              |  8 +++-
 plugins/task_manager/task_manager_index.py | 11 ++---
 plugins/tgbot/index.py                     |  8 +++-
 plugins/tgclient/index.py                  |  8 +++-
 plugins/varnish/index.py                   |  8 +++-
 plugins/webhook/index.py                   |  8 +++-
 plugins/webhook/webhook_index.py           |  8 +++-
 plugins/webssh/index.py                    |  8 +++-
 plugins/xhprof/index.py                    | 12 ++++--
 plugins/zabbix/index.py                    |  8 +++-
 plugins/zabbix_agent/index.py              |  8 +++-
 58 files changed, 368 insertions(+), 190 deletions(-)

diff --git a/plugins/acme_pandominassl_apply/index.py b/plugins/acme_pandominassl_apply/index.py
index e7ba431a2..6e31800bc 100755
--- a/plugins/acme_pandominassl_apply/index.py
+++ b/plugins/acme_pandominassl_apply/index.py
@@ -8,8 +8,12 @@ import re
 import requests
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/alist/index.py b/plugins/alist/index.py
index 3f14b33af..7399dcf7e 100755
--- a/plugins/alist/index.py
+++ b/plugins/alist/index.py
@@ -6,8 +6,12 @@ import os
 import time
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/backup_ftp/index.py b/plugins/backup_ftp/index.py
index 34dd3f959..1f1403890 100755
--- a/plugins/backup_ftp/index.py
+++ b/plugins/backup_ftp/index.py
@@ -12,9 +12,13 @@ if sys.platform != "darwin":
     os.chdir("/www/server/mdserver-web")
 
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
-import db
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+import core.db as db
 
 _ver = sys.version_info
 is_py2 = (_ver[0] == 2)
@@ -251,8 +255,7 @@ def backupAllFunc(stype):
         _name = 'path_{}'.format(os.path.basename(name))
         find_path = mw.getBackupDir() + '/path/'+_name
 
-    find_new_file = "ls " + find_path + \
-        "_* | grep '.gz' | cut -d \  -f 1 | awk 'END {print}'"
+    find_new_file = "ls " + find_path + "_* | grep '.gz' | cut -d \\  -f 1 | awk 'END {print}'"
 
     filename = mw.execShell(find_new_file)[0].strip()
     if filename == "":
diff --git a/plugins/cloudreve/index.py b/plugins/cloudreve/index.py
index a312a2028..c89d411a4 100755
--- a/plugins/cloudreve/index.py
+++ b/plugins/cloudreve/index.py
@@ -6,8 +6,12 @@ import os
 import time
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/data_query/index.py b/plugins/data_query/index.py
index 9bc0dd431..0d8061b61 100755
--- a/plugins/data_query/index.py
+++ b/plugins/data_query/index.py
@@ -6,8 +6,12 @@ import os
 import time
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/data_query/nosql_memcached.py b/plugins/data_query/nosql_memcached.py
index 4b392aad8..18b844edf 100755
--- a/plugins/data_query/nosql_memcached.py
+++ b/plugins/data_query/nosql_memcached.py
@@ -11,11 +11,12 @@ import re
 import json
 import pymemcache
 
-try: 
-    sys.path.append(os.getcwd() + "/class/core")
-    import mw
-except Exception as e:
-    import core.mw as mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
     
 
 def singleton(cls):
diff --git a/plugins/data_query/nosql_mongodb.py b/plugins/data_query/nosql_mongodb.py
index 286c63e45..9b22b9118 100755
--- a/plugins/data_query/nosql_mongodb.py
+++ b/plugins/data_query/nosql_mongodb.py
@@ -12,11 +12,12 @@ import yaml
 from bson.objectid import ObjectId
 from bson.json_util import dumps
 
-try: 
-    sys.path.append(os.getcwd() + "/class/core")
-    import mw
-except Exception as e:
-    import core.mw as mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 def singleton(cls):
     _instance = {}
diff --git a/plugins/data_query/nosql_redis.py b/plugins/data_query/nosql_redis.py
index 65eb675e5..8a3e10f4a 100755
--- a/plugins/data_query/nosql_redis.py
+++ b/plugins/data_query/nosql_redis.py
@@ -7,12 +7,12 @@ import time
 import re
 import redis
 
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
-try: 
-    sys.path.append(os.getcwd() + "/class/core")
-    import mw
-except Exception as e:
-    import core.mw as mw
+import core.mw as mw
 
 
 # def getPluginName():
diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index ee8c83fbf..6b9dc35e4 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -8,11 +8,12 @@ import re
 import pymongo
 import json
 
-try: 
-    sys.path.append(os.getcwd() + "/class/core")
-    import mw
-except Exception as e:
-    import core.mw as mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 def singleton(cls):
     _instance = {}
diff --git a/plugins/docker/index.py b/plugins/docker/index.py
index 59488cead..128498d9a 100755
--- a/plugins/docker/index.py
+++ b/plugins/docker/index.py
@@ -7,8 +7,12 @@ import time
 import re
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 try:
     import docker
diff --git a/plugins/dynamic-tracking/index.py b/plugins/dynamic-tracking/index.py
index 12a4d4a93..a54965cdc 100755
--- a/plugins/dynamic-tracking/index.py
+++ b/plugins/dynamic-tracking/index.py
@@ -6,8 +6,13 @@ import os
 import time
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/fail2ban/index.py b/plugins/fail2ban/index.py
index f2917dcdb..a1aa4e003 100755
--- a/plugins/fail2ban/index.py
+++ b/plugins/fail2ban/index.py
@@ -7,8 +7,12 @@ import time
 import re
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/gdrive/index.py b/plugins/gdrive/index.py
index edf1ed57b..bf940d4c6 100644
--- a/plugins/gdrive/index.py
+++ b/plugins/gdrive/index.py
@@ -13,9 +13,13 @@ if sys.platform != "darwin":
     os.chdir("/www/server/mdserver-web")
 
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
-import db
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+import core.db as db
 
 _ver = sys.version_info
 is_py2 = (_ver[0] == 2)
diff --git a/plugins/gitea/index.py b/plugins/gitea/index.py
index 8aff8694e..40305aa35 100755
--- a/plugins/gitea/index.py
+++ b/plugins/gitea/index.py
@@ -7,15 +7,12 @@ import sys
 import re
 import subprocess
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
-
-
-# cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-# info = mw.execShell(cmd)
-# p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-# sys.path.append(p)
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/gogs/index.py b/plugins/gogs/index.py
index 5311feefc..20c7bc69e 100755
--- a/plugins/gogs/index.py
+++ b/plugins/gogs/index.py
@@ -5,19 +5,17 @@ import time
 import os
 import sys
 import re
-
-
-sys.path.append(os.getcwd() + "/class/core")
-import mw
-
-
-# cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-# info = mw.execShell(cmd)
-# p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-# sys.path.append(p)
-
 import psutil
 
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+
+
+
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/gorse/index.py b/plugins/gorse/index.py
index 35855b5f8..21465ef60 100755
--- a/plugins/gorse/index.py
+++ b/plugins/gorse/index.py
@@ -6,8 +6,12 @@ import os
 import time
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/haproxy/index.py b/plugins/haproxy/index.py
index 452fa05e9..675ba84d0 100755
--- a/plugins/haproxy/index.py
+++ b/plugins/haproxy/index.py
@@ -8,8 +8,12 @@ import re
 import string
 import subprocess
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/imail/index.py b/plugins/imail/index.py
index a79b8d576..a61ac5f3f 100755
--- a/plugins/imail/index.py
+++ b/plugins/imail/index.py
@@ -10,8 +10,12 @@ import json
 
 from datetime import datetime
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/keepalived/index.py b/plugins/keepalived/index.py
index 12455677b..ecd5e8a80 100755
--- a/plugins/keepalived/index.py
+++ b/plugins/keepalived/index.py
@@ -6,8 +6,12 @@ import os
 import time
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/lvs/index.py b/plugins/lvs/index.py
index 9b7ca8c40..82a9f21a3 100755
--- a/plugins/lvs/index.py
+++ b/plugins/lvs/index.py
@@ -8,8 +8,12 @@ import re
 import string
 import subprocess
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/mariadb/index.py b/plugins/mariadb/index.py
index 8e9c75f7a..ea61704bb 100755
--- a/plugins/mariadb/index.py
+++ b/plugins/mariadb/index.py
@@ -9,11 +9,12 @@ import re
 import json
 
 
-# reload(sys)
-# sys.setdefaultencoding('utf-8')
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+import core.mw as mw
 
 
 if mw.isAppleSystem():
diff --git a/plugins/mariadb/index_mariadb.py b/plugins/mariadb/index_mariadb.py
index 2eed99a8e..644f32576 100644
--- a/plugins/mariadb/index_mariadb.py
+++ b/plugins/mariadb/index_mariadb.py
@@ -8,8 +8,12 @@ import subprocess
 import re
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 
 if mw.isAppleSystem():
diff --git a/plugins/memcached/index.py b/plugins/memcached/index.py
index b6b47d343..617f33a2e 100755
--- a/plugins/memcached/index.py
+++ b/plugins/memcached/index.py
@@ -6,8 +6,12 @@ import os
 import time
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/migration_api/index.py b/plugins/migration_api/index.py
index 2d8fd706e..425806cc5 100755
--- a/plugins/migration_api/index.py
+++ b/plugins/migration_api/index.py
@@ -9,8 +9,12 @@ import hashlib
 import json
 import subprocess
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/mongodb/index.py b/plugins/mongodb/index.py
index cfb06584e..c288d66d3 100755
--- a/plugins/mongodb/index.py
+++ b/plugins/mongodb/index.py
@@ -9,8 +9,12 @@ import json
 import datetime
 import yaml
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/mosquitto/index.py b/plugins/mosquitto/index.py
index 5ef4472f7..a1ffaf440 100755
--- a/plugins/mosquitto/index.py
+++ b/plugins/mosquitto/index.py
@@ -6,8 +6,12 @@ import os
 import time
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/msonedrive/index.py b/plugins/msonedrive/index.py
index 2a451df2c..854ec3aec 100644
--- a/plugins/msonedrive/index.py
+++ b/plugins/msonedrive/index.py
@@ -13,9 +13,13 @@ if sys.platform != "darwin":
     os.chdir("/www/server/mdserver-web")
 
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
-import db
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+import core.db as db
 
 _ver = sys.version_info
 is_py2 = (_ver[0] == 2)
diff --git a/plugins/mysql-apt/index.py b/plugins/mysql-apt/index.py
index 456d9aa11..09e79f3fc 100755
--- a/plugins/mysql-apt/index.py
+++ b/plugins/mysql-apt/index.py
@@ -9,11 +9,12 @@ import re
 import json
 
 
-# reload(sys)
-# sys.setdefaultencoding('utf-8')
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/mysql-apt/index_mysql_apt.py b/plugins/mysql-apt/index_mysql_apt.py
index a61c2a015..323d051a9 100644
--- a/plugins/mysql-apt/index_mysql_apt.py
+++ b/plugins/mysql-apt/index_mysql_apt.py
@@ -8,9 +8,12 @@ import subprocess
 import re
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
+import core.mw as mw
 
 if mw.isAppleSystem():
     cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py
index 2ce17b7b3..aa61fefb5 100755
--- a/plugins/mysql-yum/index.py
+++ b/plugins/mysql-yum/index.py
@@ -9,12 +9,12 @@ import re
 import json
 
 
-# reload(sys)
-# sys.setdefaultencoding('utf-8')
-
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
+import core.mw as mw
 
 if mw.isAppleSystem():
     cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
diff --git a/plugins/mysql-yum/index_mysql_yum.py b/plugins/mysql-yum/index_mysql_yum.py
index 1f7cc3a71..7252b633e 100644
--- a/plugins/mysql-yum/index_mysql_yum.py
+++ b/plugins/mysql-yum/index_mysql_yum.py
@@ -8,9 +8,12 @@ import subprocess
 import re
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
+import core.mw as mw
 
 if mw.isAppleSystem():
     cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py
index 885536eb3..84e12e7cd 100755
--- a/plugins/mysql/index.py
+++ b/plugins/mysql/index.py
@@ -10,11 +10,12 @@ import re
 import json
 
 
-# reload(sys)
-# sys.setdefaultencoding('utf-8')
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+import core.mw as mw
 
 
 if mw.isAppleSystem():
diff --git a/plugins/mysql/index_mysql.py b/plugins/mysql/index_mysql.py
index 791d9038f..89d987490 100644
--- a/plugins/mysql/index_mysql.py
+++ b/plugins/mysql/index_mysql.py
@@ -8,8 +8,12 @@ import subprocess
 import re
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 
 if mw.isAppleSystem():
diff --git a/plugins/nezha/index.py b/plugins/nezha/index.py
index 7f4dc3db4..0fa578c8c 100755
--- a/plugins/nezha/index.py
+++ b/plugins/nezha/index.py
@@ -10,8 +10,12 @@ import json
 
 from datetime import datetime
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/op_load_balance/index.py b/plugins/op_load_balance/index.py
index 59a646fb2..622c3025b 100755
--- a/plugins/op_load_balance/index.py
+++ b/plugins/op_load_balance/index.py
@@ -8,8 +8,12 @@ import subprocess
 import json
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 
 app_debug = False
diff --git a/plugins/phpmyadmin/index.py b/plugins/phpmyadmin/index.py
index eac12be55..5e8df07eb 100755
--- a/plugins/phpmyadmin/index.py
+++ b/plugins/phpmyadmin/index.py
@@ -7,9 +7,13 @@ import time
 import re
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
-import site_api
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+from utils.site import sites as MwSites
 
 app_debug = False
 if mw.isAppleSystem():
@@ -85,7 +89,7 @@ def getHomePage():
 
 
 def getPhpVer(expect=55):
-    v = site_api.site_api().getPhpVersion()
+    v = MwSites.instance().getPhpVersion()
     is_find = False
     for i in range(len(v)):
         t = str(v[i]['version'])
@@ -142,7 +146,7 @@ def contentReplace(content):
     content = content.replace('{$PMA_PATH}', cfg['path'])
 
     port = cfg["port"]
-    rep = 'listen\s*(.*);'
+    rep = r'listen\s*(.*);'
     content = re.sub(rep, "listen " + port + ';', content)
     return content
 
diff --git a/plugins/postgresql/index.py b/plugins/postgresql/index.py
index c7217219d..22dfc7fff 100755
--- a/plugins/postgresql/index.py
+++ b/plugins/postgresql/index.py
@@ -17,8 +17,12 @@ import json
 # ps -ef | grep -v grep| grep run_info | awk '{print $2}' | xargs kill -9
 # vi /etc/sysconfig/network-scripts/ifcfg-eth0
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 
 if mw.isAppleSystem():
diff --git a/plugins/pureftp/index.py b/plugins/pureftp/index.py
index 6bb40ff74..909f71ab9 100755
--- a/plugins/pureftp/index.py
+++ b/plugins/pureftp/index.py
@@ -6,8 +6,12 @@ import os
 import time
 import shutil
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/redis/index.py b/plugins/redis/index.py
index 74c117897..3d451c02e 100755
--- a/plugins/redis/index.py
+++ b/plugins/redis/index.py
@@ -6,8 +6,12 @@ import os
 import time
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/simpleping/index.py b/plugins/simpleping/index.py
index 6565cf2f4..176536c90 100755
--- a/plugins/simpleping/index.py
+++ b/plugins/simpleping/index.py
@@ -6,8 +6,12 @@ import os
 import time
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/sphinx/index.py b/plugins/sphinx/index.py
index ade4fca3d..9a04a5d22 100755
--- a/plugins/sphinx/index.py
+++ b/plugins/sphinx/index.py
@@ -8,8 +8,12 @@ import re
 import string
 import subprocess
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/sphinx/tool_cron.py b/plugins/sphinx/tool_cron.py
index 063573d37..19a1ec6a0 100644
--- a/plugins/sphinx/tool_cron.py
+++ b/plugins/sphinx/tool_cron.py
@@ -6,8 +6,14 @@ import os
 import time
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+from utils.crontab import crontab as MwCrontab
+
 
 
 app_debug = False
@@ -35,12 +41,10 @@ def getTaskDeltaConf():
     conf = getServerDir() + "/cron_delta_config.json"
     return conf
 
-
 def getConfigData():
-    try:
+    conf = getTaskConf()
+    if os.path.exists(conf):
         return json.loads(mw.readFile(getTaskConf()))
-    except:
-        pass
     return {
         "task_id": -1,
         "period": "day-n",
@@ -50,10 +54,9 @@ def getConfigData():
     }
 
 def getConfigDeltaData():
-    try:
+    conf = getTaskDeltaConf()
+    if os.path.exists(conf):
         return json.loads(mw.readFile(getTaskDeltaConf()))
-    except:
-        pass
     return {
         "task_id": -1,
         "period": "minute-n",
@@ -80,15 +83,12 @@ def createBgTaskByName(name):
         return True
 
     if "task_id" in args and args["task_id"] > 0:
-        res = mw.M("crontab").field("id, name").where(
-            "id=?", (args["task_id"],)).find()
+        res = mw.M("crontab").field("id, name").where("id=?", (args["task_id"],)).find()
         if res and res["id"] == args["task_id"]:
             print("计划任务已经存在!")
             return True
-    import crontab_api
-    api = crontab_api.crontab_api()
 
-    mw_dir = mw.getRunDir()
+    mw_dir = mw.getPanelDir()
     cmd = '''
 mw_dir=%s
 rname=%s
@@ -118,7 +118,7 @@ logs_file=$plugin_path/${rname}.log
         'urladdress': '',
     }
 
-    task_id = api.add(params)
+    task_id = MwCrontab.instance().add(params)
     if task_id > 0:
         args["task_id"] = task_id
         args["name"] = name
@@ -132,15 +132,12 @@ def createBgTaskDeltaByName(name):
         return True
 
     if "task_id" in args and args["task_id"] > 0:
-        res = mw.M("crontab").field("id, name").where(
-            "id=?", (args["task_id"],)).find()
+        res = mw.M("crontab").field("id, name").where("id=?", (args["task_id"],)).find()
         if res and res["id"] == args["task_id"]:
             print("计划任务已经存在!")
             return True
-    import crontab_api
-    api = crontab_api.crontab_api()
 
-    mw_dir = mw.getRunDir()
+    mw_dir = mw.getPanelDir()
     cmd = '''
 mw_dir=%s
 rname=%s
@@ -170,7 +167,7 @@ logs_file=$plugin_path/${rname}.log
         'urladdress': '',
     }
 
-    task_id = api.add(params)
+    task_id = MwCrontab.instance().add(params)
     if task_id > 0:
         args["task_id"] = task_id
         args["name"] = name
@@ -183,9 +180,7 @@ def removeBgTask():
         res = mw.M("crontab").field("id, name").where(
             "id=?", (cfg["task_id"],)).find()
         if res and res["id"] == cfg["task_id"]:
-            import crontab_api
-            api = crontab_api.crontab_api()
-            data = api.delete(cfg["task_id"])
+            data = MwCrontab.instance().delete(cfg["task_id"])
             if data[0]:
                 cfg["task_id"] = -1
                 mw.writeFile(getTaskConf(), json.dumps(cfg))
@@ -198,9 +193,7 @@ def removeDeltaBgTask():
         res = mw.M("crontab").field("id, name").where(
             "id=?", (cfg["task_id"],)).find()
         if res and res["id"] == cfg["task_id"]:
-            import crontab_api
-            api = crontab_api.crontab_api()
-            data = api.delete(cfg["task_id"])
+            data = MwCrontab.instance().delete(cfg["task_id"])
             if data[0]:
                 cfg["task_id"] = -1
                 mw.writeFile(getTaskDeltaConf(), json.dumps(cfg))
diff --git a/plugins/supervisor/index.py b/plugins/supervisor/index.py
index efc9c6293..0fe4780b8 100755
--- a/plugins/supervisor/index.py
+++ b/plugins/supervisor/index.py
@@ -6,8 +6,12 @@ import os
 import time
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/swap/index.py b/plugins/swap/index.py
index dddc1aac8..3fb07947c 100755
--- a/plugins/swap/index.py
+++ b/plugins/swap/index.py
@@ -5,8 +5,12 @@ import io
 import os
 import time
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/sys-opt/index.py b/plugins/sys-opt/index.py
index 0b97057be..26a7a7bb0 100755
--- a/plugins/sys-opt/index.py
+++ b/plugins/sys-opt/index.py
@@ -7,8 +7,12 @@ import json
 import re
 import sys
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 
 def getPluginName():
diff --git a/plugins/system_safe/system_safe.py b/plugins/system_safe/system_safe.py
index b454a8685..d0f0352d1 100755
--- a/plugins/system_safe/system_safe.py
+++ b/plugins/system_safe/system_safe.py
@@ -10,8 +10,13 @@ import psutil
 from datetime import datetime
 
 sys.dont_write_bytecode = True
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/tamper_proof_py/index.py b/plugins/tamper_proof_py/index.py
index 446dee0c3..82c06070b 100755
--- a/plugins/tamper_proof_py/index.py
+++ b/plugins/tamper_proof_py/index.py
@@ -10,8 +10,12 @@ import psutil
 from datetime import datetime
 
 sys.dont_write_bytecode = True
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/task_manager/index.py b/plugins/task_manager/index.py
index f2f22f90e..90173fb97 100755
--- a/plugins/task_manager/index.py
+++ b/plugins/task_manager/index.py
@@ -6,8 +6,12 @@ import os
 import time
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/task_manager/task_manager_index.py b/plugins/task_manager/task_manager_index.py
index 9790b19b9..22a44fb91 100755
--- a/plugins/task_manager/task_manager_index.py
+++ b/plugins/task_manager/task_manager_index.py
@@ -11,11 +11,12 @@ import json
 
 from typing import List, Dict
 
-try:
-    sys.path.append(os.getcwd() + "/class/core")
-    import mw
-except Exception as e:
-    import  core.mw as mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 
 app_debug = False
diff --git a/plugins/tgbot/index.py b/plugins/tgbot/index.py
index 95c1cbf19..0be333a8e 100755
--- a/plugins/tgbot/index.py
+++ b/plugins/tgbot/index.py
@@ -8,8 +8,12 @@ import re
 import json
 import base64
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/tgclient/index.py b/plugins/tgclient/index.py
index a10030ab9..ec2eb7238 100755
--- a/plugins/tgclient/index.py
+++ b/plugins/tgclient/index.py
@@ -8,8 +8,12 @@ import re
 import json
 import base64
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/varnish/index.py b/plugins/varnish/index.py
index 9b761e997..050e842a0 100755
--- a/plugins/varnish/index.py
+++ b/plugins/varnish/index.py
@@ -5,8 +5,12 @@ import io
 import os
 import time
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/webhook/index.py b/plugins/webhook/index.py
index 4fb14d030..15189f727 100755
--- a/plugins/webhook/index.py
+++ b/plugins/webhook/index.py
@@ -7,8 +7,12 @@ import time
 import re
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/webhook/webhook_index.py b/plugins/webhook/webhook_index.py
index 5b2777da6..dc60912d3 100755
--- a/plugins/webhook/webhook_index.py
+++ b/plugins/webhook/webhook_index.py
@@ -7,8 +7,12 @@ import time
 import re
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/webssh/index.py b/plugins/webssh/index.py
index ad624bc32..4aacad870 100755
--- a/plugins/webssh/index.py
+++ b/plugins/webssh/index.py
@@ -7,8 +7,12 @@ import json
 import re
 import sys
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 
 class App():
diff --git a/plugins/xhprof/index.py b/plugins/xhprof/index.py
index cbe06fd73..7bd54ee70 100755
--- a/plugins/xhprof/index.py
+++ b/plugins/xhprof/index.py
@@ -6,9 +6,13 @@ import os
 import time
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
-import site_api
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+from utils.site import sites as MwSites
 
 app_debug = False
 if mw.isAppleSystem():
@@ -70,7 +74,7 @@ def getHomePage():
 
 def getPhpVer(expect=56):
     import json
-    v = site_api.site_api().getPhpVersion()
+    v = MwSites.instance().getPhpVersion()
     for i in range(len(v)):
         t = int(v[i]['version'])
         if (t >= expect):
diff --git a/plugins/zabbix/index.py b/plugins/zabbix/index.py
index e7901729b..06ea20e96 100755
--- a/plugins/zabbix/index.py
+++ b/plugins/zabbix/index.py
@@ -6,8 +6,12 @@ import os
 import time
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
diff --git a/plugins/zabbix_agent/index.py b/plugins/zabbix_agent/index.py
index 2b48cd444..797a1f6b2 100755
--- a/plugins/zabbix_agent/index.py
+++ b/plugins/zabbix_agent/index.py
@@ -6,8 +6,12 @@ import os
 import time
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():

From c731077fba9bc81fe2ea16435d93b42118a35db9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 06:04:37 +0800
Subject: [PATCH 241/965] Update tool_task.py

---
 plugins/clean/tool_task.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/clean/tool_task.py b/plugins/clean/tool_task.py
index a90862a06..ad4880660 100644
--- a/plugins/clean/tool_task.py
+++ b/plugins/clean/tool_task.py
@@ -68,10 +68,8 @@ def createBgTaskByName(name):
         if res and res["id"] == args["task_id"]:
             print("计划任务已经存在!")
             return True
-    import crontab_api
-    api = crontab_api.crontab_api()
 
-    mw_dir = mw.getRunDir()
+    mw_dir = mw.getPanelDir()
     cmd = '''
 mw_dir=%s
 rname=%s

From df0efaa7b1e84301be958f54c032dcb2ee23b717 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 06:05:18 +0800
Subject: [PATCH 242/965] update

---
 plugins/clean/tool_task.py  | 2 +-
 plugins/sphinx/tool_cron.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/clean/tool_task.py b/plugins/clean/tool_task.py
index ad4880660..cc762f7c9 100644
--- a/plugins/clean/tool_task.py
+++ b/plugins/clean/tool_task.py
@@ -96,7 +96,7 @@ logs_file=$plugin_path/${rname}.log
         'stype': "toShell",
         'sname': '',
         'sbody': cmd,
-        'urladdress': '',
+        'url_address': '',
     }
 
     task_id = MwCrontab.instance().add(params)
diff --git a/plugins/sphinx/tool_cron.py b/plugins/sphinx/tool_cron.py
index 19a1ec6a0..e9859be0a 100644
--- a/plugins/sphinx/tool_cron.py
+++ b/plugins/sphinx/tool_cron.py
@@ -164,7 +164,7 @@ logs_file=$plugin_path/${rname}.log
         'stype': "toShell",
         'sname': '',
         'sbody': cmd,
-        'urladdress': '',
+        'url_address': '',
     }
 
     task_id = MwCrontab.instance().add(params)

From 315a3759c34fdac5e2f174be6c93f37f9969bbb6 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 06:10:07 +0800
Subject: [PATCH 243/965] Update tool_cron.py

---
 plugins/sphinx/tool_cron.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/sphinx/tool_cron.py b/plugins/sphinx/tool_cron.py
index e9859be0a..84c6b11a6 100644
--- a/plugins/sphinx/tool_cron.py
+++ b/plugins/sphinx/tool_cron.py
@@ -115,7 +115,7 @@ logs_file=$plugin_path/${rname}.log
         'stype': "toShell",
         'sname': '',
         'sbody': cmd,
-        'urladdress': '',
+        'url_address': '',
     }
 
     task_id = MwCrontab.instance().add(params)

From b83e632328a112800390666c93058464ffbbbe6e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 06:12:24 +0800
Subject: [PATCH 244/965] Update tool_task.py

---
 plugins/rsyncd/tool_task.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/rsyncd/tool_task.py b/plugins/rsyncd/tool_task.py
index e57f9eb9e..e38a29626 100644
--- a/plugins/rsyncd/tool_task.py
+++ b/plugins/rsyncd/tool_task.py
@@ -42,7 +42,7 @@ def getTaskConf():
 def getConfigData():
     conf = getTaskConf()
     if os.path.exists(conf):
-        return json.loads(mw.readFile(getTaskConf()))
+        return json.loads(mw.readFile(conf))
     return []
 
 
@@ -69,8 +69,7 @@ def createBgTaskByName(name, args):
         return True
 
     if "task_id" in cfg.keys() and cfg["task_id"] > 0:
-        res = mw.M("crontab").field("id, name").where(
-            "id=?", (cfg["task_id"],)).find()
+        res = mw.M("crontab").field("id, name").where("id=?", (cfg["task_id"],)).find()
         if res and res["id"] == cfg["task_id"]:
             print("计划任务已经存在!")
             return True

From 8d6e0f049c5877ecb0ada66042ed4f3742e0240b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 06:16:14 +0800
Subject: [PATCH 245/965] Update install.sh

---
 plugins/supervisor/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/supervisor/install.sh b/plugins/supervisor/install.sh
index eeafc2985..2695ae7e6 100755
--- a/plugins/supervisor/install.sh
+++ b/plugins/supervisor/install.sh
@@ -42,8 +42,8 @@ Install_app()
 
 	echo "${VERSION}" > $serverPath/supervisor/version.pl
 
-	cd ${rootPath} && python3 ${rootPath}/plugins/supervisor/index.py start
-	cd ${rootPath} && python3 ${rootPath}/plugins/supervisor/index.py initd_install
+	cd ${rootPath} && python3 plugins/supervisor/index.py start
+	cd ${rootPath} && python3 plugins/supervisor/index.py initd_install
 	
 	echo '安装完成[supervisor]'
 }

From e9efc4cc3512bd0ce1ab6c8dc528af8a04dc6021 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 06:18:15 +0800
Subject: [PATCH 246/965] Update index.py

---
 plugins/supervisor/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/supervisor/index.py b/plugins/supervisor/index.py
index 0fe4780b8..b1d4fbbb7 100755
--- a/plugins/supervisor/index.py
+++ b/plugins/supervisor/index.py
@@ -107,7 +107,7 @@ def initDreplace():
         mw.writeFile(conf, conf_content)
 
     if os.path.exists(systemDir) and not os.path.exists(systemService):
-        activate_file = mw.getRunDir() + '/bin/activate'
+        activate_file = mw.getPanelDir() + '/bin/activate'
         if os.path.exists(activate_file):
             supervisord_bin = mw.execShell(
                 'source ' + activate_file + '&& which supervisord')[0].strip()

From e76a0b12880b595fe6134a87aef26248873236e4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 06:25:28 +0800
Subject: [PATCH 247/965] Update index.py

---
 plugins/supervisor/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/supervisor/index.py b/plugins/supervisor/index.py
index b1d4fbbb7..485992fce 100755
--- a/plugins/supervisor/index.py
+++ b/plugins/supervisor/index.py
@@ -89,7 +89,7 @@ def initDreplace():
     systemService = systemDir + '/supervisor.service'
     systemServiceTpl = getPluginDir() + '/init.d/supervisor.service'
 
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
 
     if not os.path.exists(confD):
         os.mkdir(confD)

From 06f8a3c01a4529a104841f8eefcf8bf4ef0f5ffc Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 16:38:08 +0800
Subject: [PATCH 248/965] Update site.py

---
 web/utils/site.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 345cc5b1f..1e9265b11 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1755,7 +1755,7 @@ location ^~ {from} {\n\
 
     def createAcmeFile(self, site_name, domains, email, force, renew):
 
-        print(site_name, domains,force,renew, email)
+        print(site_name, domains,force, renew, email)
         
 
         file = self.getHostConf(site_name)
@@ -1778,15 +1778,14 @@ location ^~ {from} {\n\
                     if os.path.exists(proxy_dir_file):
                         return mw.returnData(False, '检测到您的站点做了反向代理设置，请先关闭反向代理!')
 
-        siteInfo = thisdb.getSitesByName(site_name)
+        site_info = thisdb.getSitesByName(site_name)
         path = self.getSitePath(site_name)
         if path == '':
             return mw.returnData(False, '【'+site_name+'】配置文件,异常!')
 
-        srcPath = siteInfo['path']
-
-        
+        srcPath = site_info['path']
 
+        acme_dir = mw.getAcmeDir()
         if force == 'true':
             force_bool = True
 
@@ -1819,10 +1818,8 @@ location ^~ {from} {\n\
 
         self.writeAcmeLog('开始ACME申请...')
         log_file = self.acmeLogFile()
+
         cmd = 'export ACCOUNT_EMAIL=' + email + ' && ' + execStr + ' >> ' + log_file
-        print(domains)
-        print(cmd)
-        return mw.returnData(False, '测试中!')
         result = mw.execShell(cmd)
 
         src_path = mw.getAcmeDomainDir(domains[0])
@@ -1863,7 +1860,7 @@ location ^~ {from} {\n\
         # 写入配置文件
         result = self.setSslConf(site_name)
         if not result['status']:
-            return mw.getJson(result)
+            return result
         result['csr'] = mw.readFile(src_cert)
         result['key'] = mw.readFile(src_key)
 

From 80dd014be5cc23550fdf6d501a7d3295873e1ee3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 16:48:42 +0800
Subject: [PATCH 249/965] update

---
 web/admin/site/ssl.py |  9 +++++++++
 web/utils/site.py     | 35 +++++++++++++++++++++++++++++++++--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/web/admin/site/ssl.py b/web/admin/site/ssl.py
index 15b6a129d..16378177e 100644
--- a/web/admin/site/ssl.py
+++ b/web/admin/site/ssl.py
@@ -32,6 +32,15 @@ def get_ssl():
     ssl_type = request.form.get('ssl_type', '')
     return MwSites.instance().getSsl(site_name, ssl_type)
 
+# 删除证书
+@blueprint.route('/delete_ssl', endpoint='delete_ssl', methods=['POST'])
+@panel_login_required
+def delete_ssl():
+    site_name = request.form.get('site_name', '')
+    ssl_type = request.form.get('ssl_type', '')
+    return MwSites.instance().deleteSsl(site_name, ssl_type)
+
+
 # 获取证书列表
 @blueprint.route('/get_cert_list', endpoint='get_cert_list', methods=['GET','POST'])
 @panel_login_required
diff --git a/web/utils/site.py b/web/utils/site.py
index 1e9265b11..d6a683ffb 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1750,8 +1750,39 @@ location ^~ {from} {\n\
         mw.writeFile(log_file, msg+"\n", "wb+")
         return True
 
-    def createAcmeMultiDomin(self):
-        pass
+    def deleteSsl(self,site_name,ssl_type):
+        path = self.sslDir + '/' + site_name
+        csr_path = path + '/fullchain.pem'
+
+        file = self.getHostConf(site_name)
+        content = mw.readFile(file)
+        key_text = 'ssl_certificate'
+        status = True
+        if content.find(key_text) == -1:
+            status = False
+
+        if ssl_type == 'now':
+            if status:
+                return mw.returnData(False, '使用中,先关闭再删除')
+            if os.path.exists(path):
+                mw.execShell('rm -rf ' + path)
+            else:
+                return mw.returnData(False, '还未申请!')
+        elif ssl_type == 'lets':
+            ssl_lets_dir = self.sslLetsDir + '/' + site_name
+            csr_lets_path = ssl_lets_dir + '/fullchain.pem'  # 生成证书路径
+            if mw.md5(mw.readFile(csr_lets_path)) == mw.md5(mw.readFile(csr_path)):
+                return mw.returnData(False, '使用中,先关闭再删除')
+            mw.execShell('rm -rf ' + ssl_lets_dir)
+        elif ssl_type == 'acme':
+            ssl_acme_dir = mw.getAcmeDomainDir(site_name)
+            csr_acme_path = ssl_acme_dir + '/fullchain.cer'  # 生成证书路径
+            if mw.md5(mw.readFile(csr_acme_path)) == mw.md5(mw.readFile(csr_path)):
+                return mw.returnData(False, '使用中,先关闭再删除')
+            mw.execShell('rm -rf ' + ssl_acme_dir)
+
+        mw.restartWeb()
+        return mw.returnData(True, '删除成功')
 
     def createAcmeFile(self, site_name, domains, email, force, renew):
 

From 7956b6c8f4fb1201a73b6dc16088e5bf3410a2d7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 17:18:57 +0800
Subject: [PATCH 250/965] update

---
 web/admin/site/ssl.py |   9 ++++
 web/utils/site.py     | 105 +++++++++++++++++++++++++++++++-----------
 2 files changed, 87 insertions(+), 27 deletions(-)

diff --git a/web/admin/site/ssl.py b/web/admin/site/ssl.py
index 16378177e..5d7a5b048 100644
--- a/web/admin/site/ssl.py
+++ b/web/admin/site/ssl.py
@@ -32,6 +32,15 @@ def get_ssl():
     ssl_type = request.form.get('ssl_type', '')
     return MwSites.instance().getSsl(site_name, ssl_type)
 
+# 删除证书
+@blueprint.route('/close_ssl_conf', endpoint='close_ssl_conf', methods=['POST'])
+@panel_login_required
+def close_ssl_conf():
+    site_name = request.form.get('siteName', '')
+    ssl_type = request.form.get('updateOf', '')
+    return MwSites.instance().closeSslConf(site_name)
+
+
 # 删除证书
 @blueprint.route('/delete_ssl', endpoint='delete_ssl', methods=['POST'])
 @panel_login_required
diff --git a/web/utils/site.py b/web/utils/site.py
index d6a683ffb..c5cffa4da 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1750,6 +1750,56 @@ location ^~ {from} {\n\
         mw.writeFile(log_file, msg+"\n", "wb+")
         return True
 
+    def closeSslConf(self, site_name):
+        file = self.getHostConf(site_name)
+        conf = mw.readFile(file)
+
+        if conf:
+            rep = "\n\\s*#HTTP_TO_HTTPS_START(.|\n){1,300}#HTTP_TO_HTTPS_END"
+            conf = re.sub(rep, '', conf)
+            rep = "\\s+ssl_certificate\\s+.+;\\s+ssl_certificate_key\\s+.+;"
+            conf = re.sub(rep, '', conf)
+            rep = "\\s+ssl_protocols\\s+.+;\n"
+            conf = re.sub(rep, '', conf)
+            rep = "\\s+ssl_ciphers\\s+.+;\n"
+            conf = re.sub(rep, '', conf)
+            rep = "\\s+ssl_prefer_server_ciphers\\s+.+;\n"
+            conf = re.sub(rep, '', conf)
+            rep = "\\s+ssl_session_cache\\s+.+;\n"
+            conf = re.sub(rep, '', conf)
+            rep = r"\s+ssl_session_timeout\s+.+;\n"
+            conf = re.sub(rep, '', conf)
+            rep = r"\s+ssl_ecdh_curve\s+.+;\n"
+            conf = re.sub(rep, '', conf)
+            rep = r"\s+ssl_session_tickets\s+.+;\n"
+            conf = re.sub(rep, '', conf)
+            rep = r"\s+ssl_stapling\s+.+;\n"
+            conf = re.sub(rep, '', conf)
+            rep = r"\s+ssl_stapling_verify\s+.+;\n"
+            conf = re.sub(rep, '', conf)
+            rep = r"\s+add_header\s+.+;\n"
+            conf = re.sub(rep, '', conf)
+            rep = r"\s+add_header\s+.+;\n"
+            conf = re.sub(rep, '', conf)
+            rep = r"\s+ssl\s+on;"
+            conf = re.sub(rep, '', conf)
+            rep = r"\s+error_page\s497.+;"
+            conf = re.sub(rep, '', conf)
+            rep = r"\s+if.+server_port.+\n.+\n\s+\s*}"
+            conf = re.sub(rep, '', conf)
+            rep = r"\s+listen\s+443.*;"
+            conf = re.sub(rep, '', conf)
+            rep = r"\s+listen\s+\[\:\:\]\:443.*;"
+            conf = re.sub(rep, '', conf)
+            rep = r"\s+http2\s+on;"
+            conf = re.sub(rep, '', conf)
+            mw.writeFile(file, conf)
+
+        msg = mw.getInfo('网站[{1}]关闭SSL成功!', (site_name,))
+        mw.writeLog('网站管理', msg)
+        mw.restartWeb()
+        return mw.returnData(True, 'SSL已关闭!')
+
     def deleteSsl(self,site_name,ssl_type):
         path = self.sslDir + '/' + site_name
         csr_path = path + '/fullchain.pem'
@@ -1785,45 +1835,46 @@ location ^~ {from} {\n\
         return mw.returnData(True, '删除成功')
 
     def createAcmeFile(self, site_name, domains, email, force, renew):
-
         print(site_name, domains,force, renew, email)
-        
 
         file = self.getHostConf(site_name)
-        if os.path.exists(file):
-            siteConf = mw.readFile(file)
-            if siteConf.find('301-END') != -1:
-                return mw.returnData(False, '检测到您的站点做了301重定向设置，请先关闭重定向!')
+        if not os.path.exists(file):
+            return mw.returnData(False, '配置异常!')
 
-            # 检测存在反向代理
-            data_path = self.getProxyDataPath(site_name)
-            data_content = mw.readFile(data_path)
-            if data_content != False:
-                try:
-                    data = json.loads(data_content)
-                except:
-                    pass
-                for proxy in data:
-                    proxy_dir = "{}/{}".format(self.proxyPath, site_name)
-                    proxy_dir_file = proxy_dir + '/' + proxy['id'] + '.conf'
-                    if os.path.exists(proxy_dir_file):
-                        return mw.returnData(False, '检测到您的站点做了反向代理设置，请先关闭反向代理!')
+        content = mw.readFile(file)
+        if content.find('301-END') != -1:
+            return mw.returnData(False, '检测到您的站点做了301重定向设置，请先关闭重定向!')
+
+        # 检测存在反向代理
+        data_path = self.getProxyDataPath(site_name)
+
+        data_content = mw.readFile(data_path)
+        if data_content != False:
+            try:
+                data = json.loads(data_content)
+            except:
+                pass
+            for proxy in data:
+                proxy_dir = "{}/{}".format(self.proxyPath, site_name)
+                proxy_dir_file = proxy_dir + '/' + proxy['id'] + '.conf'
+                if os.path.exists(proxy_dir_file):
+                    return mw.returnData(False, '检测到您的站点做了反向代理设置，请先关闭反向代理!')
 
         site_info = thisdb.getSitesByName(site_name)
         path = self.getSitePath(site_name)
         if path == '':
             return mw.returnData(False, '【'+site_name+'】配置文件,异常!')
 
-        srcPath = site_info['path']
-
+        src_path = site_info['path']
         acme_dir = mw.getAcmeDir()
+
         if force == 'true':
             force_bool = True
 
         if renew == 'true':
-            execStr = acme_dir + "/acme.sh --renew --yes-I-know-dns-manual-mode-enough-go-ahead-please"
+            cmd = acme_dir + "/acme.sh --renew --yes-I-know-dns-manual-mode-enough-go-ahead-please"
         else:
-            execStr = acme_dir + "/acme.sh --issue --force"
+            cmd = acme_dir + "/acme.sh --issue --force"
 
         # 确定主域名顺序
         domainsTmp = []
@@ -1841,8 +1892,8 @@ location ^~ {from} {\n\
                 continue
             if domain.find('*.') != -1:
                 return mw.returnData(False, '泛域名不能使用【文件验证】的方式申请证书!')
-            execStr += ' -w ' + path
-            execStr += ' -d ' + domain
+            cmd += ' -w ' + path
+            cmd += ' -d ' + domain
             domainCount += 1
         if domainCount == 0:
             return mw.returnData(False, '请选择域名(不包括IP地址与泛域名)!')
@@ -1850,7 +1901,7 @@ location ^~ {from} {\n\
         self.writeAcmeLog('开始ACME申请...')
         log_file = self.acmeLogFile()
 
-        cmd = 'export ACCOUNT_EMAIL=' + email + ' && ' + execStr + ' >> ' + log_file
+        cmd = 'export ACCOUNT_EMAIL=' + email + ' && ' + cmd + ' >> ' + log_file
         result = mw.execShell(cmd)
 
         src_path = mw.getAcmeDomainDir(domains[0])
@@ -1875,7 +1926,7 @@ location ^~ {from} {\n\
                 if data['result']['status'] == 429:
                     data['msg'] = msg
             data['status'] = False
-            return mw.getJson(data)
+            return data
 
         dst_path = self.sslDir + '/' + site_name
         dst_cert = dst_path + "/fullchain.pem"  # 生成证书路径

From c5500c57f16aaa6a624190a87bfea5dd32d8db6c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 17:30:45 +0800
Subject: [PATCH 251/965] Update site.py

---
 web/utils/site.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index c5cffa4da..729bceff4 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1847,18 +1847,15 @@ location ^~ {from} {\n\
 
         # 检测存在反向代理
         data_path = self.getProxyDataPath(site_name)
-
-        data_content = mw.readFile(data_path)
-        if data_content != False:
-            try:
-                data = json.loads(data_content)
-            except:
-                pass
+        if os.path.exists(data_path):
+            data_content = mw.readFile(data_path)
+            data = json.loads(data_content)
             for proxy in data:
                 proxy_dir = "{}/{}".format(self.proxyPath, site_name)
                 proxy_dir_file = proxy_dir + '/' + proxy['id'] + '.conf'
                 if os.path.exists(proxy_dir_file):
                     return mw.returnData(False, '检测到您的站点做了反向代理设置，请先关闭反向代理!')
+            
 
         site_info = thisdb.getSitesByName(site_name)
         path = self.getSitePath(site_name)

From 7836622cd6519ec7257a2e147af6c4aa8868ba6f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 17:32:09 +0800
Subject: [PATCH 252/965] Update site.py

---
 web/utils/site.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 729bceff4..9efb8d2fb 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1846,15 +1846,15 @@ location ^~ {from} {\n\
             return mw.returnData(False, '检测到您的站点做了301重定向设置，请先关闭重定向!')
 
         # 检测存在反向代理
-        data_path = self.getProxyDataPath(site_name)
-        if os.path.exists(data_path):
-            data_content = mw.readFile(data_path)
-            data = json.loads(data_content)
-            for proxy in data:
-                proxy_dir = "{}/{}".format(self.proxyPath, site_name)
-                proxy_dir_file = proxy_dir + '/' + proxy['id'] + '.conf'
-                if os.path.exists(proxy_dir_file):
-                    return mw.returnData(False, '检测到您的站点做了反向代理设置，请先关闭反向代理!')
+        # data_path = self.getProxyDataPath(site_name)
+        # if os.path.exists(data_path):
+        #     data_content = mw.readFile(data_path)
+        #     data = json.loads(data_content)
+        #     for proxy in data:
+        #         proxy_dir = "{}/{}".format(self.proxyPath, site_name)
+        #         proxy_dir_file = proxy_dir + '/' + proxy['id'] + '.conf'
+        #         if os.path.exists(proxy_dir_file):
+        #             return mw.returnData(False, '检测到您的站点做了反向代理设置，请先关闭反向代理!')
             
 
         site_info = thisdb.getSitesByName(site_name)

From d1f8cf9a8e68e4dd2767a7d6708b0f6ce3ff1fb3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 17:42:40 +0800
Subject: [PATCH 253/965] update

---
 web/admin/site/proxy.py | 10 ++++++++++
 web/utils/site.py       | 17 ++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/web/admin/site/proxy.py b/web/admin/site/proxy.py
index 55e267693..b4de66b52 100644
--- a/web/admin/site/proxy.py
+++ b/web/admin/site/proxy.py
@@ -47,6 +47,16 @@ def set_proxy():
     pid = request.form.get('id', '')
     return MwSites.instance().setProxy(site_name,site_from,to,host,name,open_proxy, open_cache,cache_time, pid)
 
+# 获取代理状态
+@blueprint.route('/set_proxy_status', endpoint='set_proxy_status', methods=['POST'])
+@panel_login_required
+def set_proxy_status():
+    site_name = request.form.get("siteName", '')
+    status = request.form.get("status", '')
+    proxy_id = request.form.get("id", '')
+    return MwSites.instance().setProxyStatus(site_name,proxy_id,status)
+
+
 # 获取代理配置
 @blueprint.route('/get_proxy_conf', endpoint='get_proxy_conf', methods=['POST'])
 @panel_login_required
diff --git a/web/utils/site.py b/web/utils/site.py
index 9efb8d2fb..e7c0f8e36 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1291,7 +1291,7 @@ class sites(object):
         mw.writeFile(vhost_file, content)
 
     # 设置 网站 反向代理列表
-    def setProxy(self, site_name, site_from, to, host, name, open_proxy, open_cache, cache_time, pid):
+    def setProxy(self, site_name, site_from, to, host, name, open_proxy, open_cache, cache_time, site_id):
         from urllib.parse import urlparse
         if  site_name == "" or site_from == "" or to == "" or host == "" or name == "":
             return mw.returnData(False, "必填项不能为空")
@@ -1433,6 +1433,21 @@ location ^~ {from} {\n\
         mw.restartWeb()
         return mw.returnData(True, "ok", {"hash": pid})
 
+    def setProxyStatus(self, site_name, proxy_id, status):
+        if status == '' or site_name == '' or proxy_id == '':
+            return mw.returnData(False, "必填项不能为空!")
+
+        conf_file = "{}/{}/{}.conf".format(self.proxyPath, site_name, proxy_id)
+        conf_txt = "{}/{}/{}.conf.txt".format(self.proxyPath, site_name, proxy_id)
+
+        if _status == '1':
+            mw.execShell('mv ' + conf_txt + ' ' + conf_file)
+        else:
+            mw.execShell('mv ' + conf_file + ' ' + conf_txt)
+
+        mw.restartWeb()
+        return mw.returnData(True, "OK")
+
     def getProxyConf(self, site_name, pid):
         if pid == '' or site_name == '':
             return mw.returnData(False, "必填项不能为空!")

From dc9d114ca47aee24183fad8bf9f550abbbddd63e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 17:46:23 +0800
Subject: [PATCH 254/965] Update site.py

---
 web/utils/site.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index e7c0f8e36..f40739d2c 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1440,7 +1440,7 @@ location ^~ {from} {\n\
         conf_file = "{}/{}/{}.conf".format(self.proxyPath, site_name, proxy_id)
         conf_txt = "{}/{}/{}.conf.txt".format(self.proxyPath, site_name, proxy_id)
 
-        if _status == '1':
+        if status == '1':
             mw.execShell('mv ' + conf_txt + ' ' + conf_file)
         else:
             mw.execShell('mv ' + conf_file + ' ' + conf_txt)

From 196ab188bb2c9d5c9851f3ef8a16a93760d61a74 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 17:53:07 +0800
Subject: [PATCH 255/965] Update site.py

---
 web/utils/site.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index f40739d2c..bb5ef8669 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1448,13 +1448,13 @@ location ^~ {from} {\n\
         mw.restartWeb()
         return mw.returnData(True, "OK")
 
-    def getProxyConf(self, site_name, pid):
+    def getProxyConf(self, site_name, proxy_id):
         if pid == '' or site_name == '':
             return mw.returnData(False, "必填项不能为空!")
 
-        conf_file = "{}/{}/{}.conf".format(self.proxyPath, site_name, pid)
+        conf_file = "{}/{}/{}.conf".format(self.proxyPath, site_name, proxy_id)
         if not os.path.exists(conf_file):
-            conf_file = "{}/{}/{}.conf.txt".format(self.proxyPath, site_name, pid)
+            conf_file = "{}/{}/{}.conf.txt".format(self.proxyPath, site_name, proxy_id)
 
         if not os.path.exists(conf_file):
             return mw.returnData(False, "获取失败!")

From df46b40c0fb6705d6fccc79ab0d52daa6e638b59 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 17:53:34 +0800
Subject: [PATCH 256/965] Update site.py

---
 web/utils/site.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index bb5ef8669..c934d4e99 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1462,8 +1462,8 @@ location ^~ {from} {\n\
         data = mw.readFile(conf_file)
         return mw.returnData(True, "ok", {"result": data})
 
-    def delProxy(self, site_name, pid):
-        if pid == '' or site_name == '':
+    def delProxy(self, site_name, proxy_id):
+        if proxy_id == '' or site_name == '':
             return mw.returnData(False, "必填项不能为空!")
 
         try:
@@ -1471,7 +1471,7 @@ location ^~ {from} {\n\
             data_content = mw.readFile(data_path) if os.path.exists(data_path) else ""
             data = json.loads(data_content) if data_content != "" else []
             for item in data:
-                if item["id"] == pid:
+                if item["id"] == proxy_id:
                     data.remove(item)
                     break
             # write database
@@ -1481,7 +1481,7 @@ location ^~ {from} {\n\
             if len(data) == 0:
                 self.operateProxyConf(site_name, 'stop')
             # remove conf file
-            cmd = "rm -rf {}/{}.conf*".format(self.getProxyPath(site_name), pid)
+            cmd = "rm -rf {}/{}.conf*".format(self.getProxyPath(site_name), proxy_id)
             mw.execShell(cmd)
         except:
             return mw.returnData(False, "删除反代失败!")

From 116140f5df7574a9390e87a5f153de274c0d526b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 21:20:57 +0800
Subject: [PATCH 257/965] Update site.py

---
 web/utils/site.py | 88 +++++++++++++++++++++++++++++------------------
 1 file changed, 54 insertions(+), 34 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index c934d4e99..c7ff44153 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -156,8 +156,8 @@ class sites(object):
             return path[0:-1]
         return path
 
-    def getSitePath(self, siteName):
-        file = self.getHostConf(siteName)
+    def getSitePath(self, site_name):
+        file = self.getHostConf(site_name)
         if os.path.exists(file):
             conf = mw.readFile(file)
             rep = r'\s*root\s*(.+);'
@@ -1448,6 +1448,34 @@ location ^~ {from} {\n\
         mw.restartWeb()
         return mw.returnData(True, "OK")
 
+
+    def closeProxyAll(self, site_name):
+        self.close_proxy = []
+        proxy_path = self.getProxyDataPath(site_name)
+        if os.path.exists(proxy_path):
+            content = mw.readFile(proxy_path)
+            data = json.loads(content)
+            for proxy in data:
+                proxy_dir = "{}/{}".format(self.proxyPath, site_name)
+                proxy_conf = proxy_dir + '/' + proxy['id'] + '.conf'
+                proxy_txt = "{}/{}/{}.conf.txt".format(self.proxyPath, site_name, proxy['id'])
+                if os.path.exists(proxy_conf):
+                    self.close_proxy.append(proxy['id'])
+                    mw.execShell('mv ' + proxy_conf + ' ' + proxy_txt)
+        return True
+
+    def openProxyByOpen(self, site_name):
+        for proxy_id in self.close_proxy:
+            proxy_dir = "{}/{}".format(self.proxyPath, site_name)
+            proxy_conf = proxy_dir + '/' + proxy_id + '.conf'
+            proxy_txt = "{}/{}/{}.conf.txt".format(self.proxyPath, site_name, proxy_id)
+            if os.path.exists(proxy_conf):
+                mw.execShell('mv ' + proxy_txt + ' ' + proxy_conf)
+        self.close_proxy = []
+        return True
+
+
+
     def getProxyConf(self, site_name, proxy_id):
         if pid == '' or site_name == '':
             return mw.returnData(False, "必填项不能为空!")
@@ -1489,8 +1517,6 @@ location ^~ {from} {\n\
         mw.restartWeb()
         return mw.returnData(True, "删除反代成功!")
 
-
-
     # 是否跳转到https
     def isToHttps(self, site_name):
         file = self.getHostConf(site_name)
@@ -1754,7 +1780,7 @@ location ^~ {from} {\n\
 
     def writeAcmeLog(self,msg):
         log_file = self.acmeLogFile()
-        mw.writeFile(log_file, msg+"\n", "wb+")
+        mw.writeFile(log_file, msg+"\n", 'w+')
         return True
 
     def letLogFile(self):
@@ -1852,25 +1878,16 @@ location ^~ {from} {\n\
     def createAcmeFile(self, site_name, domains, email, force, renew):
         print(site_name, domains,force, renew, email)
 
-        file = self.getHostConf(site_name)
-        if not os.path.exists(file):
+        site_conf = self.getHostConf(site_name)
+        if not os.path.exists(site_conf):
             return mw.returnData(False, '配置异常!')
 
-        content = mw.readFile(file)
+        content = mw.readFile(site_conf)
         if content.find('301-END') != -1:
             return mw.returnData(False, '检测到您的站点做了301重定向设置，请先关闭重定向!')
 
-        # 检测存在反向代理
-        # data_path = self.getProxyDataPath(site_name)
-        # if os.path.exists(data_path):
-        #     data_content = mw.readFile(data_path)
-        #     data = json.loads(data_content)
-        #     for proxy in data:
-        #         proxy_dir = "{}/{}".format(self.proxyPath, site_name)
-        #         proxy_dir_file = proxy_dir + '/' + proxy['id'] + '.conf'
-        #         if os.path.exists(proxy_dir_file):
-        #             return mw.returnData(False, '检测到您的站点做了反向代理设置，请先关闭反向代理!')
-            
+        # 关闭反向代理
+        self.closeProxyAll(site_name)
 
         site_info = thisdb.getSitesByName(site_name)
         path = self.getSitePath(site_name)
@@ -1889,25 +1906,25 @@ location ^~ {from} {\n\
             cmd = acme_dir + "/acme.sh --issue --force"
 
         # 确定主域名顺序
-        domainsTmp = []
+        t = []
         if site_name in domains:
-            domainsTmp.append(site_name)
-        for domainTmp in domains:
-            if domainTmp == site_name:
+            t.append(site_name)
+        for dd in domains:
+            if dd == site_name:
                 continue
-            domainsTmp.append(domainTmp)
-        domains = domainsTmp
+            t.append(dd)
+        domains = t
 
-        domainCount = 0
-        for domain in domains:
-            if mw.checkIp(domain):
+        domain_nums = 0
+        for d in domains:
+            if mw.checkIp(d):
                 continue
-            if domain.find('*.') != -1:
+            if d.find('*.') != -1:
                 return mw.returnData(False, '泛域名不能使用【文件验证】的方式申请证书!')
             cmd += ' -w ' + path
-            cmd += ' -d ' + domain
-            domainCount += 1
-        if domainCount == 0:
+            cmd += ' -d ' + d
+            domain_nums += 1
+        if domain_nums == 0:
             return mw.returnData(False, '请选择域名(不包括IP地址与泛域名)!')
 
         self.writeAcmeLog('开始ACME申请...')
@@ -1916,6 +1933,9 @@ location ^~ {from} {\n\
         cmd = 'export ACCOUNT_EMAIL=' + email + ' && ' + cmd + ' >> ' + log_file
         result = mw.execShell(cmd)
 
+        # 开启代理
+        self.openProxyByOpen(site_name)
+
         src_path = mw.getAcmeDomainDir(domains[0])
         src_cert = src_path + '/fullchain.cer'
         src_key = src_path + '/' + domains[0] + '.key'
@@ -1933,8 +1953,7 @@ location ^~ {from} {\n\
             data['msg'] = msg
             data['result'] = {}
             if result[1].find('new-authz error:') != -1:
-                data['result'] = json.loads(
-                    re.search("{.+}", result[1]).group())
+                data['result'] = json.loads(re.search("{.+}", result[1]).group())
                 if data['result']['status'] == 429:
                     data['msg'] = msg
             data['status'] = False
@@ -2073,6 +2092,7 @@ export PATH
             return mw.returnData(False, '正在申请或更新SSL中...')
 
         if apply_type == 'file':
+            print('apply_type',apply_type)
             return self.createAcmeFile(site_name, domains, email,force,renew)
         elif apply_type == 'dns':
             return self.createAcmeDns(site_name, domains, dnspai, wildcard_domain,force, renew)

From f2dac6e1e6f3722db14d9637651d4a4c7c565d69 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 21:28:30 +0800
Subject: [PATCH 258/965] Update site.py

---
 web/utils/site.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/utils/site.py b/web/utils/site.py
index c7ff44153..e9a370dbc 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1462,6 +1462,7 @@ location ^~ {from} {\n\
                 if os.path.exists(proxy_conf):
                     self.close_proxy.append(proxy['id'])
                     mw.execShell('mv ' + proxy_conf + ' ' + proxy_txt)
+        mw.restartWeb()
         return True
 
     def openProxyByOpen(self, site_name):

From 06bdad4ab09de98f724a2294d8cdd939cdbe9791 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 21:31:04 +0800
Subject: [PATCH 259/965] Update site.py

---
 web/utils/site.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index e9a370dbc..e7d70651d 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1462,7 +1462,7 @@ location ^~ {from} {\n\
                 if os.path.exists(proxy_conf):
                     self.close_proxy.append(proxy['id'])
                     mw.execShell('mv ' + proxy_conf + ' ' + proxy_txt)
-        mw.restartWeb()
+            mw.restartWeb()
         return True
 
     def openProxyByOpen(self, site_name):

From 3f0f21989649ccc1daa43e29f8bada634abd0fc3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 21:31:44 +0800
Subject: [PATCH 260/965] Update site.py

---
 web/utils/site.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index e7d70651d..82c725998 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1472,7 +1472,11 @@ location ^~ {from} {\n\
             proxy_txt = "{}/{}/{}.conf.txt".format(self.proxyPath, site_name, proxy_id)
             if os.path.exists(proxy_conf):
                 mw.execShell('mv ' + proxy_txt + ' ' + proxy_conf)
-        self.close_proxy = []
+
+
+        if len(self.close_proxy) > 0:
+            mw.restartWeb()
+            self.close_proxy = []
         return True
 
 

From d0742244477871922384003e6834d0b3ce615b34 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 21:43:03 +0800
Subject: [PATCH 261/965] Update site.py

---
 web/utils/site.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 82c725998..611a428d2 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1470,10 +1470,9 @@ location ^~ {from} {\n\
             proxy_dir = "{}/{}".format(self.proxyPath, site_name)
             proxy_conf = proxy_dir + '/' + proxy_id + '.conf'
             proxy_txt = "{}/{}/{}.conf.txt".format(self.proxyPath, site_name, proxy_id)
-            if os.path.exists(proxy_conf):
+            if os.path.exists(proxy_txt):
                 mw.execShell('mv ' + proxy_txt + ' ' + proxy_conf)
 
-
         if len(self.close_proxy) > 0:
             mw.restartWeb()
             self.close_proxy = []

From 1ab7c2191011080ebb11777962c3fab3598d6b69 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 21:50:08 +0800
Subject: [PATCH 262/965] update

---
 web/admin/site/proxy.py |  4 ++--
 web/utils/site.py       | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/admin/site/proxy.py b/web/admin/site/proxy.py
index b4de66b52..5c333845a 100644
--- a/web/admin/site/proxy.py
+++ b/web/admin/site/proxy.py
@@ -44,8 +44,8 @@ def set_proxy():
     open_proxy = request.form.get('open_proxy', '')
     open_cache = request.form.get('open_cache', '')
     cache_time = request.form.get('cache_time', '')
-    pid = request.form.get('id', '')
-    return MwSites.instance().setProxy(site_name,site_from,to,host,name,open_proxy, open_cache,cache_time, pid)
+    proxy_id = request.form.get('id', '')
+    return MwSites.instance().setProxy(site_name,site_from,to,host,name,open_proxy, open_cache,cache_time, proxy_id)
 
 # 获取代理状态
 @blueprint.route('/set_proxy_status', endpoint='set_proxy_status', methods=['POST'])
diff --git a/web/utils/site.py b/web/utils/site.py
index 611a428d2..cb4dd2eee 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1291,7 +1291,7 @@ class sites(object):
         mw.writeFile(vhost_file, content)
 
     # 设置 网站 反向代理列表
-    def setProxy(self, site_name, site_from, to, host, name, open_proxy, open_cache, cache_time, site_id):
+    def setProxy(self, site_name, site_from, to, host, name, open_proxy, open_cache, cache_time, proxy_id):
         from urllib.parse import urlparse
         if  site_name == "" or site_from == "" or to == "" or host == "" or name == "":
             return mw.returnData(False, "必填项不能为空")
@@ -1313,8 +1313,8 @@ class sites(object):
         data = json.loads(data_content) if data_content != "" else []
 
         proxy_action = 'add'
-        if pid == "":
-            pid = mw.md5("{}".format(name))
+        if proxy_id == "":
+            proxy_id = mw.md5("{}".format(name))
         else:
             proxy_action = 'edit'
 
@@ -1382,8 +1382,8 @@ location ^~ {from} {\n\
             tpl = tpl.replace("{proxy_cache}", tpl_proxy_nocache, 999)
 
 
-        conf_proxy = "{}/{}.conf".format(self.getProxyPath(site_name), pid)
-        conf_bk = "{}/{}.conf.txt".format(self.getProxyPath(site_name), pid)
+        conf_proxy = "{}/{}.conf".format(self.getProxyPath(site_name), proxy_id)
+        conf_bk = "{}/{}.conf.txt".format(self.getProxyPath(site_name), proxy_id)
         mw.writeFile(conf_proxy, tpl)
 
         rule_test = mw.checkWebConfig()
@@ -1393,7 +1393,7 @@ location ^~ {from} {\n\
 
         if proxy_action == "add":
             # 添加代理
-            pid = mw.md5("{}".format(name))
+            proxy_id = mw.md5("{}".format(name))
             for item in data:
                 if item["name"] == name:
                     return mw.returnData(False, "名称重复!")
@@ -1413,7 +1413,7 @@ location ^~ {from} {\n\
             # 修改代理
             dindex = -1
             for x in range(len(data)):
-                if data[x]["id"] == pid:
+                if data[x]["id"] == proxy_id:
                     dindex = x
                     break
             if dindex < 0:
@@ -1431,7 +1431,7 @@ location ^~ {from} {\n\
         mw.writeFile(proxy_site_path, json.dumps(data))
         self.operateProxyConf(site_name, 'start')
         mw.restartWeb()
-        return mw.returnData(True, "ok", {"hash": pid})
+        return mw.returnData(True, "ok", {"hash": proxy_id})
 
     def setProxyStatus(self, site_name, proxy_id, status):
         if status == '' or site_name == '' or proxy_id == '':

From 3da3453503a2fa71dfd9ed1aa4a19caee50cb434 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 21:53:38 +0800
Subject: [PATCH 263/965] Update cli.sh

---
 cli.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cli.sh b/cli.sh
index d4a3f95dc..77cc72203 100755
--- a/cli.sh
+++ b/cli.sh
@@ -82,14 +82,14 @@ mw_start_bgtask(){
 mw_stop()
 {
 	PLIST=`ps -ef|grep app:app |grep -v grep|awk '{print $2}'`
-	for i in $PLIST
+	for i in ($PLIST)
 	do
 	    kill -9 $i > /dev/null 2>&1
 	done
 
-	pids=`ps -ef|grep panel_task.py | grep -v grep |awk '{print $2}'`
-	arr=($pids)
-    for p in ${arr[@]}
+	PIDS=`ps -ef|grep panel_task.py | grep -v grep |awk '{print $2}'`
+	ARR=($PIDS)
+    for p in ${ARR[@]}
     do
     	kill -9 $p > /dev/null 2>&1
     done

From cd069b24c62d7263b2bfc0366d3b8292724b1997 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 21:54:00 +0800
Subject: [PATCH 264/965] Update cli.sh

---
 cli.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli.sh b/cli.sh
index 77cc72203..c5cdc97db 100755
--- a/cli.sh
+++ b/cli.sh
@@ -82,7 +82,7 @@ mw_start_bgtask(){
 mw_stop()
 {
 	PLIST=`ps -ef|grep app:app |grep -v grep|awk '{print $2}'`
-	for i in ($PLIST)
+	for i in ${($PLIST[@])}
 	do
 	    kill -9 $i > /dev/null 2>&1
 	done

From 6329ce3fd68e7cb58ec39552aa0314bb7fe09e71 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 21:54:28 +0800
Subject: [PATCH 265/965] Update cli.sh

---
 cli.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli.sh b/cli.sh
index c5cdc97db..b451de912 100755
--- a/cli.sh
+++ b/cli.sh
@@ -82,7 +82,7 @@ mw_start_bgtask(){
 mw_stop()
 {
 	PLIST=`ps -ef|grep app:app |grep -v grep|awk '{print $2}'`
-	for i in ${($PLIST[@])}
+	for i in ${($PLIST)[@]}
 	do
 	    kill -9 $i > /dev/null 2>&1
 	done

From 5ea712b9439df68f1f5081b453cf775274bf6613 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 21:56:23 +0800
Subject: [PATCH 266/965] Update cli.sh

---
 cli.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cli.sh b/cli.sh
index b451de912..a2f173b8f 100755
--- a/cli.sh
+++ b/cli.sh
@@ -84,6 +84,7 @@ mw_stop()
 	PLIST=`ps -ef|grep app:app |grep -v grep|awk '{print $2}'`
 	for i in ${($PLIST)[@]}
 	do
+		echo "kill -9 $i > /dev/null 2>&1"
 	    kill -9 $i > /dev/null 2>&1
 	done
 

From 590a246fc01ee1ee09e9b12d54747c2e6912eb50 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 22:03:51 +0800
Subject: [PATCH 267/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 4ba5b9339..3d8364a67 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -135,6 +135,12 @@ mw_stop_panel()
     do
         kill -9 $p > /dev/null 2>&1
     done
+
+    PLIST=`ps -ef|grep app:app |grep -v grep|awk '{print $2}'`
+    for i in ${($PLIST)[@]}
+    do
+        kill -9 $i > /dev/null 2>&1
+    done
     
     echo -e "\033[32mdone\033[0m"
 }

From c560d3fced875633dfb6c16a9fc2b6e914a29456 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 22:04:07 +0800
Subject: [PATCH 268/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 3d8364a67..e879c98ca 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -130,8 +130,8 @@ mw_stop_panel()
         rm -f $pidfile
     fi
 
-    arr=`ps aux|grep 'gunicorn -c setting.py app:app'|grep -v grep|awk '{print $2}'`
-    for p in ${arr[@]}
+    ARR=`ps aux|grep 'gunicorn -c setting.py app:app'|grep -v grep|awk '{print $2}'`
+    for p in ${ARR[@]}
     do
         kill -9 $p > /dev/null 2>&1
     done

From 729ea2df8f51f90afea52ce5061af288d1ade49b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 22:04:31 +0800
Subject: [PATCH 269/965] Update cli.sh

---
 cli.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cli.sh b/cli.sh
index a2f173b8f..b451de912 100755
--- a/cli.sh
+++ b/cli.sh
@@ -84,7 +84,6 @@ mw_stop()
 	PLIST=`ps -ef|grep app:app |grep -v grep|awk '{print $2}'`
 	for i in ${($PLIST)[@]}
 	do
-		echo "kill -9 $i > /dev/null 2>&1"
 	    kill -9 $i > /dev/null 2>&1
 	done
 

From 7d83f29db7a24cb5198b8e9a239a79a105c6b589 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 24 Nov 2024 22:07:47 +0800
Subject: [PATCH 270/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index e879c98ca..05df11e28 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -137,7 +137,8 @@ mw_stop_panel()
     done
 
     PLIST=`ps -ef|grep app:app |grep -v grep|awk '{print $2}'`
-    for i in ${($PLIST)[@]}
+    ARR=($PLIST)
+    for i in ${ARR[@]}
     do
         kill -9 $i > /dev/null 2>&1
     done

From 9c130746fb1dddf5fe015d2a2789cbdacda0d181 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 00:29:25 +0800
Subject: [PATCH 271/965] update

---
 cli.sh                           |   5 +-
 web/admin/dashboard/dashboard.py |   8 +-
 web/admin/site/redirect.py       |  18 ++-
 web/static/app/site.js           | 220 ++++++++++++++++++-------------
 web/utils/site.py                |  95 +++++++++----
 5 files changed, 223 insertions(+), 123 deletions(-)

diff --git a/cli.sh b/cli.sh
index b451de912..084f81840 100755
--- a/cli.sh
+++ b/cli.sh
@@ -82,14 +82,13 @@ mw_start_bgtask(){
 mw_stop()
 {
 	PLIST=`ps -ef|grep app:app |grep -v grep|awk '{print $2}'`
-	for i in ${($PLIST)[@]}
+	for i in $PLIST
 	do
 	    kill -9 $i > /dev/null 2>&1
 	done
 
 	PIDS=`ps -ef|grep panel_task.py | grep -v grep |awk '{print $2}'`
-	ARR=($PIDS)
-    for p in ${ARR[@]}
+    for p in $PIDS
     do
     	kill -9 $p > /dev/null 2>&1
     done
diff --git a/web/admin/dashboard/dashboard.py b/web/admin/dashboard/dashboard.py
index eb5b3d4fc..0fd7b28d8 100644
--- a/web/admin/dashboard/dashboard.py
+++ b/web/admin/dashboard/dashboard.py
@@ -37,16 +37,16 @@ def index():
 @blueprint.route('/<path>',endpoint='admin_safe_path',methods=['GET'])
 def admin_safe_path(path):
     db_path = thisdb.getOption('admin_path')
+    name = thisdb.getOption('template', default='default')
     if isLogined():
        return redirect('/')
-
-    print(db_path,path)
+    # print(db_path,path)
     if db_path == path:
-        return render_template('default/login.html')
+        return render_template('%s/login.html' % name)
 
     unauthorized_status = thisdb.getOption('unauthorized_status')
     if unauthorized_status == '0':
-        return render_template('default/path.html')
+        return render_template('%s/path.html' % name)
     return Response(status=int(unauthorized_status))
 
 # 仅针对webhook插件
diff --git a/web/admin/site/redirect.py b/web/admin/site/redirect.py
index b1b2e4b72..b8e641cd5 100644
--- a/web/admin/site/redirect.py
+++ b/web/admin/site/redirect.py
@@ -43,21 +43,31 @@ def set_redirect():
     keep_path = request.form.get("keep_path", '')   # keep path
     return MwSites.instance().setRedirect(site_name, site_from, to, type, r_type, keep_path)
 
+
+# 设置重定向状态
+@blueprint.route('/set_redirect_status', endpoint='set_redirect_status', methods=['POST'])
+@panel_login_required
+def set_redirect_status():
+    site_name = request.form.get("siteName", '')
+    status = request.form.get("status")
+    redirect_id = request.form.get("id", '')
+    return MwSites.instance().setRedirectStatus(site_name, redirect_id, status)
+
 # 获取重定向配置
 @blueprint.route('/get_redirect_conf', endpoint='get_redirect_conf', methods=['POST'])
 @panel_login_required
 def get_redirect_conf():
     site_name = request.form.get("siteName", '')
-    rid = request.form.get("id", '')
-    return MwSites.instance().getRedirectConf(site_name, rid)
+    redirect_id = request.form.get("id", '')
+    return MwSites.instance().getRedirectConf(site_name, redirect_id)
 
 # 删除重定向配置
 @blueprint.route('/del_redirect', endpoint='del_redirect', methods=['POST'])
 @panel_login_required
 def del_redirect():
     site_name = request.form.get("siteName", '')
-    rid = request.form.get("id", '')
-    return MwSites.instance().delRedirect(site_name, rid)
+    redirect_id = request.form.get("id", '')
+    return MwSites.instance().delRedirect(site_name, redirect_id)
 
 
 
diff --git a/web/static/app/site.js b/web/static/app/site.js
index cd19d997f..ce2fcd4ec 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -1373,70 +1373,75 @@ function to301(siteName, type, obj){
 	
 	// 设置 页面展示
 	if(type == 1) {
-		obj = {
+		var obj = {
+			type: 1,
+			keep_path: 1,
 			to: 'http://',
 			from: '',
 			r_type: '',
+			type: 'path'
+		};
+
+		var keep_path_ht = obj.keep_path == 1 ? 'checked="checked"' : '';
+		var redirect_title = type == 1 ? '创建重定向' : '修改重定向[' + obj.redirectname + ']';
+		layer.open({
 			type: 1,
-			type: 'path',
-			keep_path: 1
-		}
-		var redirect_form = layer.open({
-			type: 1,
-			skin: 'demo-class',
-			area: '650px',
-			title: type == 1 ? '创建重定向' : '修改重定向[' + obj.redirectname + ']',
+			area: ['650px','270px'],
+			title: redirect_title,
 			closeBtn: 1,
 			shift: 5,
+			btn: ['提交','关闭'],
 			shadeClose: false,
-			content: "<form id='form_redirect' class='divtable pd20' style='padding-bottom: 60px'>" +
-				"<div class='line' style='overflow:hidden;height: 40px;'>" +
-				"<div style='display: inline-block;'>" +
-				"<span class='tname' style='margin-left:10px;position: relative;top: -5px;'>保留URI参数</span>" +
-				"<input class='btswitch btswitch-ios' id='keep_path' type='checkbox' name='keep_path' " + (obj.keep_path == 1 ? 'checked="checked"' : '') + " /><label class='btswitch-btn phpmyadmin-btn' for='keep_path' style='float:left'></label>" +
-				"</div>" +
-				"</div>" +
-				"<div class='line' style='clear:both;'>" +
-				"<span class='tname'>重定向类型</span>" +
-				"<div class='info-r  ml0'>" +
-				"<select class='bt-input-text mr5' name='type' style='width:100px'><option value='domain' " + (obj.type == 'domain' ? 'selected ="selected"' : "") + ">域名</option><option value='path'  " + (obj.type == 'path' ? 'selected ="selected"' : "") + ">路径</option></select>" +
-				"<span class='mlr15'>重定向方式</span>" +
-				"<select class='bt-input-text ml10' name='r_type' style='width:100px'><option value='301' " + (obj.r_type == '301' ? 'selected ="selected"' : "") + " >301</option><option value='302' " + (obj.r_type == '302' ? 'selected ="selected"' : "") + ">302</option></select></div>" +
-				"</div>" +
-				"<div class='line redirectdomain'>" +
-				"<span class='tname'>重定向源</span>" +
-				"<div class='info-r  ml0'>" +
-				"<input  name='from' placeholder='域名或路径' class='bt-input-text mr5' type='text' style='width:200px;float: left;margin-right:0px' value='" + obj.from + "'>" +
-				"<span class='tname' style='width:90px'>目标URL</span>" +
-				"<input  name='to' class='bt-input-text mr5' type='text' style='width:200px' value='" + obj.to + "'>" +
-				"</div>" +
-				"</div>" +
-				"</div>" +
-				"<div class='bt-form-submit-btn'><button type='button' class='btn btn-sm btn-danger btn-colse-prosy'>关闭</button><button type='button' class='btn btn-sm btn-success btn-submit-redirect'>" + (type == 1 ? " 提交" : "保存") + "</button></div>" +
-				"</form>"
-		});
-		setTimeout(function() {
-			$('.btn-colse-prosy').click(function() {
-				layer.close(redirect_form);
-			});
-
-			$('.btn-submit-redirect').click(function() {
+			content: "<form id='form_redirect' class='divtable pd20'>\
+			<div class='line' style='overflow:hidden;height: 40px;'>\
+				<div style='display: inline-block;'>\
+					<span class='tname' style='margin-left:10px;position: relative;top: -5px;'>保留URI参数</span>\
+					<input class='btswitch btswitch-ios' id='keep_path' type='checkbox' name='keep_path' " + keep_path_ht + " />\
+					<label class='btswitch-btn' for='keep_path' style='float:left'></label>\
+				</div>\
+			</div>\
+			<div class='line' style='clear:both;'><span class='tname'>重定向类型</span>\
+				<div class='info-r ml0'>\
+					<select class='bt-input-text mr5' name='type' style='width:100px'>\
+						<option value='domain' " + (obj.type == 'domain' ? 'selected ="selected"' : "") + ">域名</option>\
+						<option value='path'  " + (obj.type == 'path' ? 'selected ="selected"' : "") + ">路径</option>\
+					</select>\
+					<span class='mlr15'>重定向方式</span>\
+					<select class='bt-input-text ml10' name='r_type' style='width:100px'>\
+						<option value='301' " + (obj.r_type == '301' ? 'selected ="selected"' : "") + " >301</option>\
+						<option value='302' " + (obj.r_type == '302' ? 'selected ="selected"' : "") + ">302</option>\
+					</select>\
+				</div>\
+			</div>\
+			<div class='line redirectdomain'>\
+				<span class='tname'>重定向源</span>\
+				<div class='info-r ml0'>\
+					<input  name='from' placeholder='域名或路径' class='bt-input-text mr5' type='text' style='width:200px;float: left;margin-right:0px' value='" + obj.from + "'>\
+					<span class='tname' style='width:90px'>目标URL</span>\
+					<input name='to' class='bt-input-text mr5' type='text' style='width:200px' value='" + obj.to + "'>\
+				</div>\
+			</div>\
+			</form>",
+			success:function(index,layero){
+			},
+			yes:function(index,index1){
 				var keep_path = $('[name="keep_path"]').prop('checked') ? 1 : 0;
 				var r_type = $('[name="r_type"]').val();
 				var type = $('[name="type"]').val();
 				var from = $('[name="from"]').val();
 				var to = $('[name="to"]').val();
 				
-				$.post('/site/set_redirect', {siteName: siteName,type: type,r_type: r_type,from: from,to: to,keep_path: keep_path}, function(data) {
+				var pdata = {siteName: siteName, type: type,r_type: r_type,from: from,to: to,keep_path: keep_path};
+				$.post('/site/set_redirect', pdata, function(data) {
 					if (data.status) {
-						layer.close(redirect_form);
+						layer.close(index);
 						to301(siteName);
 					} else {
 						layer.msg(data.msg, {icon: 2});
 					}
 				},'json');
-			});
-		}, 100);
+			}
+		});
 	}
 
 	if (type == 2) {
@@ -1516,40 +1521,53 @@ function to301(siteName, type, obj){
 	}
 
 	var body = '<div id="redirect_list" class="bt_table">\
-					<div style="padding-bottom: 10px">\
-						<button type="button" title="添加重定向" class="btn btn-success btn-sm mr5" onclick="to301(\''+siteName+'\',1)" ><span>添加重定向</span></button>\
-					</div>\
-					<div class="divtable" style="max-height:200px;">\
-						<table class="table table-hover" >\
-							<thead style="position: relative;z-index: 1;">\
-								<tr>\
-									<th><span data-index="1"><span>重定向类型</span></span></th>\
-									<th><span data-index="2"><span>重定向方式</span></span></th>\
-									<th><span data-index="3"><span>保留URL参数</span></span></th>\
-									<th><span data-index="4"><span>操作</span></span></th>\
-								</tr>\
-							</thead>\
-							<tbody id="md-301-body">\
-							</tbody>\
-						</table>\
-					</div>\
-				</div>';
+		<div style="padding-bottom: 10px">\
+			<button type="button" title="添加重定向" class="btn btn-success btn-sm mr5" onclick="to301(\''+siteName+'\',1)" >\
+			<span>添加重定向</span>\
+		</button>\
+		</div>\
+		<div class="divtable" style="max-height:200px;">\
+			<table class="table table-hover" >\
+				<thead style="position: relative;z-index: 1;">\
+					<tr>\
+						<th><span data-index="1"><span>重定向类型</span></span></th>\
+						<th><span data-index="2"><span>重定向方式</span></span></th>\
+						<th><span data-index="3"><span>保留URL参数</span></span></th>\
+						<th><span data-index="4"><span>状态</span></span></th>\
+						<th><span data-index="5"><span>操作</span></span></th>\
+					</tr>\
+				</thead>\
+				<tbody id="md-301-body">\
+				</tbody>\
+			</table>\
+		</div>\
+	</div>';
 	$("#webedit-con").html(body);
 	
 	var loadT = layer.msg(lan.site.the_msg,{icon:16,time:0,shade: [0.3, '#000']});
 	$.post('/site/get_redirect','siteName='+siteName, function(res) {
 		layer.close(loadT);
 		$("#md-301-loading").remove();
-		if (res.status === true) {
-			let data = res.data.result;
+		if (res.status) {
+			var data = res.data.result;
 			data.forEach(function(item){
-				lan_r_type = item.r_type == 0 ? "永久重定向" : "临时重定向"
-				keep_path = item.keep_path == 0 ? "不保留" : "保留"
+				var lan_r_type = item.r_type == 0 ? "永久重定向" : "临时重定向";
+				var keep_path = item.keep_path == 0 ? "不保留" : "保留";
+
+				var switchProxy  = '<span onclick="toRedirect(\''+siteName+'\',\''+ item.id +'\',10)" style="color:rgb(92, 184, 92);" class="btlink glyphicon glyphicon-play"></span>';
+				if (!item['status']){
+					switchProxy = '<span onclick="toRedirect(\''+siteName+'\',\''+ item.id +'\',11)" style="color:rgb(255, 0, 0);" class="btlink glyphicon glyphicon-pause"></span>';
+				}
+
 				let tmp = '<tr>\
 					<td><span data-index="1"><span>'+item.r_from+'</span></span></td>\
 					<td><span data-index="2"><span>'+lan_r_type+'</span></span></td>\
-					<td><span data-index="2"><span>'+keep_path+'</span></span></td>\
-					<td><span data-index="4"  onclick="to301(\''+siteName+'\', 3, \''+ item.id +'\')"  class="btlink">详细</span> | <span data-index="5" onclick="to301(\''+siteName+'\', 2, \''+ item.id +'\')" class="btlink">删除</span></td>\
+					<td><span data-index="3"><span>'+keep_path+'</span></span></td>\
+					<td><span data-index="4"><span>'+switchProxy+'</span></span></td>\
+					<td>\
+						<span data-index="5" onclick="to301(\''+siteName+'\', 3, \''+ item.id +'\')"  class="btlink">详细</span> | \
+						<span data-index="5" onclick="to301(\''+siteName+'\', 2, \''+ item.id +'\')" class="btlink">删除</span>\
+					</td>\
 				</tr>';
 				$("#md-301-body").append(tmp);
 			})
@@ -1560,6 +1578,28 @@ function to301(siteName, type, obj){
 }
 
 
+function toRedirect(siteName, redirect_id, type){
+	if (type == 10 || type == 11) {
+		//[11]启动 或 停止[10]
+		var status = type == 10 ? '0' : '1';
+		var loading = layer.msg(lan.site.the_msg,{icon:16,time:0,shade: [0.3, '#000']});
+
+		var pdata = {siteName: siteName, 'status':status,'id':redirect_id };
+		$.post('/site/set_redirect_status', pdata, function(rdata) {
+			layer.close(loading);
+			if (!rdata.status){
+				layer.msg(res.msg, {time: 3000,icon: 2});
+				return;
+			}
+
+			showMsg("设置成功",function(){
+				to301(siteName);
+			},{icon: 1,time:2000});
+		},'json');
+		return;
+	}
+}
+
 //反向代理
 function toProxy(siteName, type, obj) {
 	// 设置 页面展示
@@ -1828,27 +1868,27 @@ function toProxy(siteName, type, obj) {
 	}
 
 	var body = '<div id="proxy_list" class="bt_table">\
-					<div style="padding-bottom: 10px">\
-						<button type="button" title="添加反向代理" class="btn btn-success btn-sm mr5" onclick="toProxy(\''+siteName+'\',1)" >\
-							<span>添加反向代理</span>\
-						</button>\
-					</div>\
-					<div class="divtable" style="max-height:200px;">\
-						<table class="table table-hover" >\
-							<thead style="position: relative;z-index: 1;">\
-								<tr>\
-									<th>名称</th>\
-									<th>代理目录</th>\
-									<th>目标地址</th>\
-									<th>缓存</th>\
-									<th>状态</th>\
-									<th>操作</th>\
-								</tr>\
-							</thead>\
-							<tbody id="md-301-body"></tbody>\
-						</table>\
-					</div>\
-				</div>';
+		<div style="padding-bottom: 10px">\
+			<button type="button" title="添加反向代理" class="btn btn-success btn-sm mr5" onclick="toProxy(\''+siteName+'\',1)" >\
+				<span>添加反向代理</span>\
+			</button>\
+		</div>\
+		<div class="divtable" style="max-height:200px;">\
+			<table class="table table-hover" >\
+				<thead style="position: relative;z-index: 1;">\
+					<tr>\
+						<th>名称</th>\
+						<th>代理目录</th>\
+						<th>目标地址</th>\
+						<th>缓存</th>\
+						<th>状态</th>\
+						<th>操作</th>\
+					</tr>\
+				</thead>\
+				<tbody id="md-301-body"></tbody>\
+			</table>\
+		</div>\
+	</div>';
 	$("#webedit-con").html(body);
 	
 	var loading = layer.msg(lan.site.the_msg,{icon:16,time:0,shade: [0.3, '#000']});
diff --git a/web/utils/site.py b/web/utils/site.py
index cb4dd2eee..ae99a4489 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -128,20 +128,20 @@ class sites(object):
             mw.removeBackFile(path)
         return rdata
 
-    def getRewriteConf(self, siteName):
-        return self.rewritePath + '/' + siteName + '.conf'
+    def getRewriteConf(self, site_name):
+        return self.rewritePath + '/' + site_name + '.conf'
 
-    def getRedirectDataPath(self, siteName):
-        return "{}/{}/data.json".format(self.redirectPath, siteName)
+    def getRedirectDataPath(self, site_name):
+        return "{}/{}/data.json".format(self.redirectPath, site_name)
 
-    def getRedirectPath(self, siteName):
-        return "{}/{}".format(self.redirectPath, siteName)
+    def getRedirectPath(self, site_name):
+        return "{}/{}".format(self.redirectPath, site_name)
 
-    def getProxyDataPath(self, siteName):
-        return "{}/{}/data.json".format(self.proxyPath, siteName)
+    def getProxyDataPath(self, site_name):
+        return "{}/{}/data.json".format(self.proxyPath, site_name)
 
-    def getProxyPath(self, siteName):
-        return "{}/{}".format(self.proxyPath, siteName)
+    def getProxyPath(self, site_name):
+        return "{}/{}".format(self.proxyPath, site_name)
 
     def getDirBindRewrite(self, site_name, dir_name):
         return self.rewritePath + '/' + site_name + '_' + dir_name + '.conf'
@@ -1084,8 +1084,10 @@ class sites(object):
             rep = r"limit_rate\s+([0-9]+)\w+;"
             conf = re.sub(rep, str_limit_rate, conf)
         else:
-            conf = conf.replace('#error_page 404/404.html;', "#error_page 404/404.html;\n    " +
-                                str_perserver + "\n    " + str_perip + "\n    " + str_limit_rate)
+            conf = conf.replace('#error_page 404/404.html;', "#error_page 404/404.html;\n    "+\
+                                str_perserver+"\n    "+\
+                                str_perip+"\n    "+\
+                                str_limit_rate)
 
         mw.writeFile(filename, conf)
         mw.restartWeb()
@@ -1116,17 +1118,39 @@ class sites(object):
 
 
     # 获取重定向配置
-    def getRedirect(self, siteName):
-        redirect_file = self.getRedirectDataPath(siteName)
+    def getRedirect(self, site_name):
+        redirect_file = self.getRedirectDataPath(site_name)
         if not os.path.exists(redirect_file):
-            mw.execShell("mkdir {}/{}".format(self.redirectPath, siteName))
+            mw.execShell("mkdir " + self.getRedirectPath(site_name))
             return mw.returnData(True, "no exists!", {"result": [], "count": 0})
 
         content = mw.readFile(redirect_file)
         data = json.loads(content)
-        # 处理301信息
+
+        for i in range(len(data)):
+            redirect_dir = self.getRedirectPath(site_name)
+            redirect_file = redirect_dir + '/' + data[i]['id'] + '.conf'
+            if os.path.exists(redirect_file):
+                data[i]['status'] = True
+            else:
+                data[i]['status'] = False
         return mw.returnData(True, "ok", {"result": data, "count": len(data)})
 
+    def setRedirectStatus(self, site_name, redirect_id, status):
+        if status == '' or site_name == '' or redirect_id == '':
+            return mw.returnData(False, "必填项不能为空!")
+
+        conf_file = "{}/{}/{}.conf".format(self.redirectPath, site_name, redirect_id)
+        conf_txt = "{}/{}/{}.conf.txt".format(self.redirectPath, site_name, redirect_id)
+
+        if status == '1':
+            mw.execShell('mv ' + conf_txt + ' ' + conf_file)
+        else:
+            mw.execShell('mv ' + conf_file + ' ' + conf_txt)
+
+        mw.restartWeb()
+        return mw.returnData(True, "OK")
+
     # 操作 重定向配置
     def operateRedirectConf(self, siteName, method='start'):
         vhost_file = self.getHostConf(siteName)
@@ -1134,7 +1158,7 @@ class sites(object):
 
         cnf_301 = '''#301-START
     include %s/*.conf;
-    #301-END''' % (self.getRedirectPath( siteName))
+    #301-END''' % (self.getRedirectPath(siteName,))
 
         cnf_301_source = '#301-START'
         # print('operateRedirectConf', content.find('#301-END'))
@@ -1213,12 +1237,12 @@ class sites(object):
         mw.restartWeb()
         return mw.returnData(True, "设置成功")
 
-    def getRedirectConf(self, siteName, rid):
-        if rid == '' or siteName == '':
+    def getRedirectConf(self, site_name, redirect_id):
+        if redirect_id == '' or site_name == '':
             return mw.returnData(False, "必填项不能为空!")
 
-        path = self.getRedirectPath(siteName)
-        conf = "{}/{}.conf".format(path, rid)
+        path = self.getRedirectPath(site_name)
+        conf = "{}/{}.conf".format(path, redirect_id)
         data = mw.readFile(conf)
         if data == False:
             return mw.returnData(False, "获取失败!")
@@ -1407,7 +1431,7 @@ location ^~ {from} {\n\
                 "open_cache": open_cache,
                 "open_proxy": open_proxy,
                 "cache_time": cache_time,
-                "id": pid,
+                "id": proxy_id,
             })
         else:
             # 修改代理
@@ -1478,6 +1502,33 @@ location ^~ {from} {\n\
             self.close_proxy = []
         return True
 
+    def closeRedirectAll(self, site_name):
+        self.close_redirect = []
+        redirect_path = self.getRedirectDataPath(site_name)
+        if os.path.exists(redirect_path):
+            content = mw.readFile(redirect_path)
+            data = json.loads(content)
+            for r in data:
+                redirect_dir = "{}/{}".format(self.redirectPath, site_name)
+                redirect_conf = redirect_dir + '/' + r['id'] + '.conf'
+                redirect_txt = "{}/{}/{}.conf.txt".format(self.redirectPath, site_name, r['id'])
+                if os.path.exists(proxy_conf):
+                    self.close_redirect.append(r['id'])
+                    mw.execShell('mv ' + proxy_conf + ' ' + proxy_txt)
+            mw.restartWeb()
+
+    def openProxyByOpen(self, site_name):
+        for redirect_id in self.close_redirect:
+            redirect_dir = "{}/{}".format(self.redirectPath, site_name)
+            redirect_conf = redirect_dir + '/' + redirect_id + '.conf'
+            redirect_txt = "{}/{}/{}.conf.txt".format(self.redirectPath, site_name, redirect_id)
+            if os.path.exists(proxy_txt):
+                mw.execShell('mv ' + redirect_txt + ' ' + redirect_conf)
+
+        if len(self.close_redirect) > 0:
+            mw.restartWeb()
+            self.close_redirect = []
+        return True
 
 
     def getProxyConf(self, site_name, proxy_id):

From 5ebdbc74ade94e8e952997e55f344e79921255c9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 00:30:10 +0800
Subject: [PATCH 272/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index ffe400f04..31e7a2e8f 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.1
+APP_SMALL_VERSION = 0.2
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From 1fa57de2c0950e3e9078d0cf7a8ef4bee8b25fd1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 00:35:54 +0800
Subject: [PATCH 273/965] Update site.py

---
 web/utils/site.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index ae99a4489..08c7d4ec3 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1517,7 +1517,7 @@ location ^~ {from} {\n\
                     mw.execShell('mv ' + proxy_conf + ' ' + proxy_txt)
             mw.restartWeb()
 
-    def openProxyByOpen(self, site_name):
+    def openRedirectByOpen(self, site_name):
         for redirect_id in self.close_redirect:
             redirect_dir = "{}/{}".format(self.redirectPath, site_name)
             redirect_conf = redirect_dir + '/' + redirect_id + '.conf'
@@ -1931,18 +1931,14 @@ location ^~ {from} {\n\
         return mw.returnData(True, '删除成功')
 
     def createAcmeFile(self, site_name, domains, email, force, renew):
-        print(site_name, domains,force, renew, email)
-
         site_conf = self.getHostConf(site_name)
         if not os.path.exists(site_conf):
             return mw.returnData(False, '配置异常!')
 
-        content = mw.readFile(site_conf)
-        if content.find('301-END') != -1:
-            return mw.returnData(False, '检测到您的站点做了301重定向设置，请先关闭重定向!')
-
         # 关闭反向代理
         self.closeProxyAll(site_name)
+        # 关闭重定向
+        self.closeRedirectAll(site_name)
 
         site_info = thisdb.getSitesByName(site_name)
         path = self.getSitePath(site_name)
@@ -1990,6 +1986,8 @@ location ^~ {from} {\n\
 
         # 开启代理
         self.openProxyByOpen(site_name)
+        # 开启重定向
+        self.openRedirectByOpen(site_name)
 
         src_path = mw.getAcmeDomainDir(domains[0])
         src_cert = src_path + '/fullchain.cer'
@@ -2147,7 +2145,6 @@ export PATH
             return mw.returnData(False, '正在申请或更新SSL中...')
 
         if apply_type == 'file':
-            print('apply_type',apply_type)
             return self.createAcmeFile(site_name, domains, email,force,renew)
         elif apply_type == 'dns':
             return self.createAcmeDns(site_name, domains, dnspai, wildcard_domain,force, renew)

From 6cd613a1722102cd4338c620619ec71b266f8ff2 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 00:38:50 +0800
Subject: [PATCH 274/965] Update site.py

---
 web/utils/site.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 08c7d4ec3..fbf793b03 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1514,7 +1514,7 @@ location ^~ {from} {\n\
                 redirect_txt = "{}/{}/{}.conf.txt".format(self.redirectPath, site_name, r['id'])
                 if os.path.exists(proxy_conf):
                     self.close_redirect.append(r['id'])
-                    mw.execShell('mv ' + proxy_conf + ' ' + proxy_txt)
+                    mw.execShell('mv ' + redirect_conf + ' ' + redirect_txt)
             mw.restartWeb()
 
     def openRedirectByOpen(self, site_name):

From 58950d581c73a8d5c9ca871fa061dbbf43b70d58 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 00:40:18 +0800
Subject: [PATCH 275/965] Update site.py

---
 web/utils/site.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index fbf793b03..e49850566 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1512,7 +1512,7 @@ location ^~ {from} {\n\
                 redirect_dir = "{}/{}".format(self.redirectPath, site_name)
                 redirect_conf = redirect_dir + '/' + r['id'] + '.conf'
                 redirect_txt = "{}/{}/{}.conf.txt".format(self.redirectPath, site_name, r['id'])
-                if os.path.exists(proxy_conf):
+                if os.path.exists(redirect_conf):
                     self.close_redirect.append(r['id'])
                     mw.execShell('mv ' + redirect_conf + ' ' + redirect_txt)
             mw.restartWeb()
@@ -1522,7 +1522,7 @@ location ^~ {from} {\n\
             redirect_dir = "{}/{}".format(self.redirectPath, site_name)
             redirect_conf = redirect_dir + '/' + redirect_id + '.conf'
             redirect_txt = "{}/{}/{}.conf.txt".format(self.redirectPath, site_name, redirect_id)
-            if os.path.exists(proxy_txt):
+            if os.path.exists(redirect_txt):
                 mw.execShell('mv ' + redirect_txt + ' ' + redirect_conf)
 
         if len(self.close_redirect) > 0:

From 6433d6fc509834bad0b5d2d42385f8dd06add2e4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 00:40:41 +0800
Subject: [PATCH 276/965] Update site.py

---
 web/utils/site.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index e49850566..2ea31e939 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1508,10 +1508,10 @@ location ^~ {from} {\n\
         if os.path.exists(redirect_path):
             content = mw.readFile(redirect_path)
             data = json.loads(content)
-            for r in data:
+            for redirect_data in data:
                 redirect_dir = "{}/{}".format(self.redirectPath, site_name)
-                redirect_conf = redirect_dir + '/' + r['id'] + '.conf'
-                redirect_txt = "{}/{}/{}.conf.txt".format(self.redirectPath, site_name, r['id'])
+                redirect_conf = redirect_dir + '/' + redirect_data['id'] + '.conf'
+                redirect_txt = "{}/{}/{}.conf.txt".format(self.redirectPath, site_name, redirect_data['id'])
                 if os.path.exists(redirect_conf):
                     self.close_redirect.append(r['id'])
                     mw.execShell('mv ' + redirect_conf + ' ' + redirect_txt)

From d56de6d827ef98e68c4f8e8737bcfe8ae7453a9a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 00:41:58 +0800
Subject: [PATCH 277/965] Update site.py

---
 web/utils/site.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 2ea31e939..fbb3a83dc 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1513,7 +1513,7 @@ location ^~ {from} {\n\
                 redirect_conf = redirect_dir + '/' + redirect_data['id'] + '.conf'
                 redirect_txt = "{}/{}/{}.conf.txt".format(self.redirectPath, site_name, redirect_data['id'])
                 if os.path.exists(redirect_conf):
-                    self.close_redirect.append(r['id'])
+                    self.close_redirect.append(redirect_data['id'])
                     mw.execShell('mv ' + redirect_conf + ' ' + redirect_txt)
             mw.restartWeb()
 

From a156c14248cfe4e53609b6e76cafd643d72d1c40 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 00:52:48 +0800
Subject: [PATCH 278/965] Update index.py

---
 plugins/mysql/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py
index 84e12e7cd..d40ad5c45 100755
--- a/plugins/mysql/index.py
+++ b/plugins/mysql/index.py
@@ -954,7 +954,7 @@ def __createUser(dbname, username, password, address):
 
 
 def getDbBackupListFunc(dbname=''):
-    bkDir = mw.getRootDir() + '/backup/database'
+    bkDir = mw.getFatherDir() + '/backup/database'
     blist = os.listdir(bkDir)
     r = []
 

From 741e1aedf6b4b4810b814a981cc7279ffa7f441a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 00:56:59 +0800
Subject: [PATCH 279/965] Update mw.py

---
 web/core/mw.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index 0a04a42b5..118eb7d46 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -106,11 +106,19 @@ def getPanelTaskLog():
     return getMWLogs() + '/panel_task.log'
 
 def getWwwDir():
-    file = getPanelDir() + '/data/site.pl'
-    if os.path.exists(file):
-        return readFile(file).strip()
-    return getFatherDir() + '/wwwroot'
+    import thisdb
+    site_path = thisdb.getOption('site_path')
+    return site_path
 
+def getBackupDir():
+    import thisdb
+    backup_path = thisdb.getOption('backup_path')
+    return backup_path
+
+def setBackupDir(bdir):
+    import thisdb
+    thisdb.setOption('backup_path', bdir)
+    return True
 
 def getPanelPort():
     port_file = getPanelDir()+'/data/port.pl'

From 3340112c110d05cbca80a34edfff3faaf9423690 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 01:01:20 +0800
Subject: [PATCH 280/965] update

---
 plugins/mysql-apt/index_mysql_apt.py |  6 ++--
 plugins/mysql-yum/index.py           | 41 +++++++++++++---------------
 plugins/mysql-yum/index_mysql_yum.py |  6 ++--
 plugins/mysql/index.py               |  2 +-
 plugins/mysql/index_mysql.py         |  6 ++--
 5 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/plugins/mysql-apt/index_mysql_apt.py b/plugins/mysql-apt/index_mysql_apt.py
index 323d051a9..d252c1cea 100644
--- a/plugins/mysql-apt/index_mysql_apt.py
+++ b/plugins/mysql-apt/index_mysql_apt.py
@@ -51,7 +51,7 @@ def getConf():
 def getDataDir():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'datadir\s*=\s*(.*)'
+    rep = r'datadir\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
@@ -59,7 +59,7 @@ def getDataDir():
 def getRelayLogName():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'relay-log\s*=\s*(.*)'
+    rep = r'relay-log\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
@@ -67,7 +67,7 @@ def getRelayLogName():
 def getLogBinName():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'log-bin\s*=\s*(.*)'
+    rep = r'log-bin\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py
index aa61fefb5..470dfdaeb 100755
--- a/plugins/mysql-yum/index.py
+++ b/plugins/mysql-yum/index.py
@@ -85,21 +85,21 @@ def getConf():
 def getDataDir():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'datadir\s*=\s*(.*)'
+    rep = r'datadir\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
 def getLogBinName():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'log-bin\s*=\s*(.*)'
+    rep = r'log-bin\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
 def getPidFile():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'pid-file\s*=\s*(.*)'
+    rep = r'pid-file\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
@@ -107,7 +107,7 @@ def getPidFile():
 def getDbPort():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'port\s*=\s*(.*)'
+    rep = r'port\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
@@ -115,7 +115,7 @@ def getDbPort():
 def getDbServerId():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'server-id\s*=\s*(.*)'
+    rep = r'server-id\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
@@ -123,7 +123,7 @@ def getDbServerId():
 def getSocketFile():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'socket\s*=\s*(.*)'
+    rep = r'socket\s*=\s*(.*)'
     tmp = re.search(rep, content)
     socket = tmp.groups()[0].strip()
 
@@ -136,14 +136,14 @@ def getSocketFile():
 def getErrorLogsFile():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'log-error\s*=\s*(.*)'
+    rep = r'log-error\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
 def getAuthPolicy():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'authentication_policy\s*=\s*(.*)'
+    rep = r'authentication_policy\s*=\s*(.*)'
     tmp = re.search(rep, content)
     if tmp:
         return tmp.groups()[0].strip()
@@ -385,7 +385,7 @@ def getErrorLog():
 def getShowLogFile():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'slow-query-log-file\s*=\s*(.*)'
+    rep = r'slow-query-log-file\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
@@ -435,7 +435,7 @@ def initMysql8Data():
     return True
 
 def getLib64Pos(name=''):
-    cmd = "ls /usr/lib64 | grep "+name+".so | cut -d \  -f 1 | awk 'END {print}'"
+    cmd = "ls /usr/lib64 | grep "+name+".so | cut -d \\  -f 1 | awk 'END {print}'"
     d = mw.execShell(cmd)
     return '/usr/lib64/'+d[0]
 
@@ -604,7 +604,7 @@ def initdUinstall():
 def getMyDbPos():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'datadir\s*=\s*(.*)'
+    rep = r'datadir\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
@@ -655,7 +655,7 @@ def setMyDbPos(version=''):
 def getMyPort():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'port\s*=\s*(.*)'
+    rep = r'port\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
@@ -669,7 +669,7 @@ def setMyPort():
     port = args['port']
     file = getConf()
     content = mw.readFile(file)
-    rep = "port\s*=\s*([0-9]+)\s*\n"
+    rep = r"port\s*=\s*([0-9]+)\s*\n"
     content = re.sub(rep, 'port = ' + port + '\n', content)
     mw.writeFile(file, content)
     restart()
@@ -757,7 +757,7 @@ def setDbStatus(version):
             s = 'K'
         if g in emptys:
             s = ''
-        rep = '\s*' + g + '\s*=\s*\d+(M|K|k|m|G)?\n'
+        rep = r'\s*' + g + r'\s*=\s*\d+(M|K|k|m|G)?\n'
         c = g + ' = ' + args[g] + s + '\n'
         if content.find(g) != -1:
             content = re.sub(rep, '\n' + c, content, 1)
@@ -1349,7 +1349,7 @@ def addDb():
     dataAccess = args['dataAccess'].strip()
     ps = args['ps'].strip()
 
-    reg = "^[\w-]+$"
+    reg = r"^[\w-]+$"
     if not re.match(reg, args['name']):
         return mw.returnJson(False, '数据库名称不能带有特殊符号!')
     checks = ['root', 'mysql', 'test', 'sys', 'performance_schema','information_schema']
@@ -1512,13 +1512,10 @@ def resetDbRootPwd(version):
         auth_policy = getAuthPolicy()
 
         reset_pwd = 'flush privileges;'
-        reset_pwd = reset_pwd + \
-            "UPDATE mysql.user SET authentication_string='' WHERE user='root';"
+        reset_pwd = reset_pwd + "UPDATE mysql.user SET authentication_string='' WHERE user='root';"
         reset_pwd = reset_pwd + "flush privileges;"
-        reset_pwd = reset_pwd + \
-            "alter user 'root'@'localhost' IDENTIFIED by '" + pwd + "';"
-        reset_pwd = reset_pwd + \
-            "alter user 'root'@'localhost' IDENTIFIED WITH "+auth_policy+" by '" + pwd + "';"
+        reset_pwd = reset_pwd + "alter user 'root'@'localhost' IDENTIFIED by '" + pwd + "';"
+        reset_pwd = reset_pwd + "alter user 'root'@'localhost' IDENTIFIED WITH "+auth_policy+" by '" + pwd + "';"
         reset_pwd = reset_pwd + "flush privileges;"
 
         tmp_file = "/tmp/mysql_init_tmp.log"
@@ -2113,7 +2110,7 @@ def addMasterRepSlaveUser(version=''):
     username = args['username'].strip()
     password = args['password'].strip()
 
-    reg = "^[\w-]+$"
+    reg = r"^[\w-]+$"
     if not re.match(reg, username):
         return mw.returnJson(False, '用户名不能带有特殊符号!')
     checks = ['root', 'mysql', 'test', 'sys', 'performance_schema','information_schema']
diff --git a/plugins/mysql-yum/index_mysql_yum.py b/plugins/mysql-yum/index_mysql_yum.py
index 7252b633e..79e7bbf83 100644
--- a/plugins/mysql-yum/index_mysql_yum.py
+++ b/plugins/mysql-yum/index_mysql_yum.py
@@ -51,7 +51,7 @@ def getConf():
 def getDataDir():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'datadir\s*=\s*(.*)'
+    rep = r'datadir\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
@@ -59,7 +59,7 @@ def getDataDir():
 def getRelayLogName():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'relay-log\s*=\s*(.*)'
+    rep = r'relay-log\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
@@ -67,7 +67,7 @@ def getRelayLogName():
 def getLogBinName():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'log-bin\s*=\s*(.*)'
+    rep = r'log-bin\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py
index d40ad5c45..4181c93cc 100755
--- a/plugins/mysql/index.py
+++ b/plugins/mysql/index.py
@@ -954,7 +954,7 @@ def __createUser(dbname, username, password, address):
 
 
 def getDbBackupListFunc(dbname=''):
-    bkDir = mw.getFatherDir() + '/backup/database'
+    bkDir = mw.getBackupDir() + '/database'
     blist = os.listdir(bkDir)
     r = []
 
diff --git a/plugins/mysql/index_mysql.py b/plugins/mysql/index_mysql.py
index 89d987490..d06228d4b 100644
--- a/plugins/mysql/index_mysql.py
+++ b/plugins/mysql/index_mysql.py
@@ -52,7 +52,7 @@ def getConf():
 def getDataDir():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'datadir\s*=\s*(.*)'
+    rep = r'datadir\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
@@ -60,7 +60,7 @@ def getDataDir():
 def getRelayLogName():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'relay-log\s*=\s*(.*)'
+    rep = r'relay-log\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
@@ -68,7 +68,7 @@ def getRelayLogName():
 def getLogBinName():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'log-bin\s*=\s*(.*)'
+    rep = r'log-bin\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 

From 6603a49d7bb2dfff067583c1482ad376a723e53c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 01:01:55 +0800
Subject: [PATCH 281/965] Update index.py

---
 plugins/msonedrive/index.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/msonedrive/index.py b/plugins/msonedrive/index.py
index 854ec3aec..6a34658ed 100644
--- a/plugins/msonedrive/index.py
+++ b/plugins/msonedrive/index.py
@@ -285,8 +285,7 @@ def backupAllFunc(stype):
         bk_name = stype
 
     find_path = backup_dir + '/' + bk_name + '/' + bk_prefix + '_' + name
-    find_new_file = "ls " + find_path + \
-        "_* | grep '.gz' | cut -d \  -f 1 | awk 'END {print}'"
+    find_new_file = "ls " + find_path + "_* | grep '.gz' | cut -d \\  -f 1 | awk 'END {print}'"
 
     # print(find_new_file)
 

From 00c0c592fce0fab8762e41120758f37da1da1254 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 01:04:38 +0800
Subject: [PATCH 282/965] Update index.py

---
 plugins/mongodb/index.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/mongodb/index.py b/plugins/mongodb/index.py
index c288d66d3..62c1d4ff5 100755
--- a/plugins/mongodb/index.py
+++ b/plugins/mongodb/index.py
@@ -1387,15 +1387,15 @@ def importDbBackup():
 
     port = getConfPort()
 
-    file_tgz = mw.getRootDir() + '/backup/database/' + file
-    file_dir = mw.getRootDir() + '/backup/database/' + file.replace('.tar.gz','')
+    file_tgz = mw.getBackupDir() + '/database/' + file
+    file_dir = mw.getBackupDir() + '/database/' + file.replace('.tar.gz','')
 
     if not os.path.exists(file_dir):
         mw.execShell("mkdir -p "+file_dir)
 
     # print(os.path.exists(file_tgz))
     if os.path.exists(file_tgz):
-        cmd = 'cd ' + mw.getRootDir() + '/backup/database && tar -xzvf ' + file + " -C "+file_dir
+        cmd = 'cd ' + mw.getBackupDir() + '/database && tar -xzvf ' + file + " -C "+file_dir
         # print(cmd)
         mw.execShell(cmd)
 
@@ -1549,8 +1549,8 @@ def installPreInspection(version):
 def uninstallPreInspection(version):
     stop()
 
-    import plugins_api
-    plugins_api.plugins_api().removeIndex(getPluginName(), version)
+    from utils.plugin import plugin as MwPlugin
+    MwPlugin.instance().removeIndex(getPluginName(), version)
 
     return "请手动删除MongoDB[{}]<br/> rm -rf {}".format(version, getServerDir())
 

From d7fe140ff2a9e4a819cbb32975370eb117524ff4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 01:13:47 +0800
Subject: [PATCH 283/965] update

---
 plugins/acme_pandominassl_apply/index.py |  2 +-
 plugins/alist/index.py                   |  2 +-
 plugins/cloudreve/index.py               |  2 +-
 plugins/docker/index.py                  |  8 ++++----
 plugins/fail2ban/index.py                |  2 +-
 plugins/gitea/index.py                   |  4 ++--
 plugins/gogs/index.py                    |  4 ++--
 plugins/gorse/index.py                   |  2 +-
 plugins/haproxy/index.py                 |  2 +-
 plugins/imail/index.py                   |  2 +-
 plugins/mariadb/index.py                 |  4 ++--
 plugins/mariadb/scripts/backup.py        |  4 ++--
 plugins/migration_api/index.py           |  4 ++--
 plugins/mongodb/index.py                 | 15 +++++++--------
 plugins/mongodb/scripts/backup.py        |  2 +-
 plugins/mysql-apt/index.py               |  4 ++--
 plugins/mysql-apt/scripts/backup.py      |  4 ++--
 plugins/mysql-yum/index.py               |  4 ++--
 plugins/mysql-yum/scripts/backup.py      |  4 ++--
 plugins/mysql/index.py                   | 24 ++++++++++++------------
 plugins/nezha/index.py                   |  2 +-
 plugins/op_load_balance/index.py         |  2 +-
 plugins/op_waf/index.py                  |  2 +-
 plugins/pgadmin/index.py                 |  2 +-
 plugins/php-apt/index.py                 |  4 ++--
 plugins/php-apt/index_php_apt.py         |  2 +-
 plugins/php-yum/index.py                 | 10 +++++-----
 plugins/php-yum/index_php_yum.py         |  2 +-
 plugins/php/index.py                     |  4 ++--
 plugins/php/index_php.py                 |  2 +-
 plugins/phpmyadmin/index.py              |  2 +-
 plugins/postgresql/index.py              |  5 ++---
 plugins/pureftp/index.py                 |  2 +-
 plugins/redis/index.py                   |  2 +-
 plugins/simpleping/index.py              |  2 +-
 plugins/sphinx/index.py                  |  2 +-
 plugins/sys-opt/index.py                 |  2 +-
 plugins/varnish/index.py                 |  2 +-
 plugins/xhprof/index.py                  |  4 ++--
 plugins/zabbix/index.py                  |  2 +-
 plugins/zabbix_agent/index.py            |  2 +-
 41 files changed, 78 insertions(+), 80 deletions(-)

diff --git a/plugins/acme_pandominassl_apply/index.py b/plugins/acme_pandominassl_apply/index.py
index 6e31800bc..1679e0bf9 100755
--- a/plugins/acme_pandominassl_apply/index.py
+++ b/plugins/acme_pandominassl_apply/index.py
@@ -131,7 +131,7 @@ def status():
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$SERVER_APP}', service_path + '/redis')
     content = content.replace('{$REDIS_PASS}', mw.getRandomString(10))
diff --git a/plugins/alist/index.py b/plugins/alist/index.py
index 7399dcf7e..1d0ded778 100755
--- a/plugins/alist/index.py
+++ b/plugins/alist/index.py
@@ -107,7 +107,7 @@ def status():
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$SERVER_APP}', service_path + '/'+getPluginName())
     return content
diff --git a/plugins/cloudreve/index.py b/plugins/cloudreve/index.py
index c89d411a4..8f26a8e82 100755
--- a/plugins/cloudreve/index.py
+++ b/plugins/cloudreve/index.py
@@ -107,7 +107,7 @@ def status():
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$SERVER_APP}', service_path + '/'+getPluginName())
     return content
diff --git a/plugins/docker/index.py b/plugins/docker/index.py
index 128498d9a..252cd678b 100755
--- a/plugins/docker/index.py
+++ b/plugins/docker/index.py
@@ -438,7 +438,7 @@ def dockerRemoveImage():
 
 
 def getImageListFunc(dbname=''):
-    bkDir = mw.getRootDir() + '/backup/docker'
+    bkDir = mw.getFatherDir() + '/backup/docker'
     blist = os.listdir(bkDir)
     r = []
 
@@ -452,13 +452,13 @@ def getImageListFunc(dbname=''):
 
 
 def dockerImagePickDir():
-    bkDir = mw.getRootDir() + '/backup/docker'
+    bkDir = mw.getFatherDir() + '/backup/docker'
     return mw.returnJson(True, 'ok', bkDir)
 
 
 def dockerImagePickList():
 
-    bkDir = mw.getRootDir() + '/backup/docker'
+    bkDir = mw.getFatherDir() + '/backup/docker'
     if not os.path.exists(bkDir):
         os.mkdir(bkDir)
 
@@ -490,7 +490,7 @@ def dockerImagePickSave():
     if not data[0]:
         return data[1]
 
-    bkDir = mw.getRootDir() + '/backup/docker/'
+    bkDir = mw.getFatherDir() + '/backup/docker/'
     images = args['images']
     try:
         file_name = bkDir + \
diff --git a/plugins/fail2ban/index.py b/plugins/fail2ban/index.py
index a1aa4e003..4d478ab10 100755
--- a/plugins/fail2ban/index.py
+++ b/plugins/fail2ban/index.py
@@ -123,7 +123,7 @@ def status():
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     return content
 
diff --git a/plugins/gitea/index.py b/plugins/gitea/index.py
index 40305aa35..b263398ac 100755
--- a/plugins/gitea/index.py
+++ b/plugins/gitea/index.py
@@ -119,7 +119,7 @@ export HOME=%s && ''' % ( getRunUser(), getHomeDir())
 def contentReplace(content):
 
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$RUN_USER}', getRunUser())
     content = content.replace('{$HOME_DIR}', getHomeDir())
@@ -686,7 +686,7 @@ def projectScriptLoad():
     commit_tpl = getPluginDir() + '/hook/commit.tpl'
     commit = path + '/custom_hooks/commit'
 
-    codeDir = mw.getRootDir() + '/git'
+    codeDir = mw.getFatherDir() + '/git'
 
     cc_content = mw.readFile(commit_tpl)
 
diff --git a/plugins/gogs/index.py b/plugins/gogs/index.py
index 20c7bc69e..e4643edb8 100755
--- a/plugins/gogs/index.py
+++ b/plugins/gogs/index.py
@@ -119,7 +119,7 @@ export HOME=%s && ''' % ( getRunUser(), getHomeDir())
 def contentReplace(content):
 
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$RUN_USER}', getRunUser())
     content = content.replace('{$HOME_DIR}', getHomeDir())
@@ -688,7 +688,7 @@ def projectScriptLoad():
     commit_tpl = getPluginDir() + '/hook/commit.tpl'
     commit = path + '/custom_hooks/commit'
 
-    codeDir = mw.getRootDir() + '/git'
+    codeDir = mw.getFatherDir() + '/git'
 
     cc_content = mw.readFile(commit_tpl)
 
diff --git a/plugins/gorse/index.py b/plugins/gorse/index.py
index 21465ef60..090c48576 100755
--- a/plugins/gorse/index.py
+++ b/plugins/gorse/index.py
@@ -140,7 +140,7 @@ def initRedisConf():
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$CONFIG_ADMIN}', mw.getRandomString(6))
     content = content.replace('{$CONFIG_PASS}', mw.getRandomString(10))
diff --git a/plugins/haproxy/index.py b/plugins/haproxy/index.py
index 675ba84d0..843ac5090 100755
--- a/plugins/haproxy/index.py
+++ b/plugins/haproxy/index.py
@@ -99,7 +99,7 @@ def readConfigTpl():
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$HA_USER}', mw.getRandomString(8))
     content = content.replace('{$HA_PWD}', mw.getRandomString(10))
diff --git a/plugins/imail/index.py b/plugins/imail/index.py
index a61ac5f3f..6fa0c4758 100755
--- a/plugins/imail/index.py
+++ b/plugins/imail/index.py
@@ -104,7 +104,7 @@ class App:
     def contentReplace(self, content):
 
         service_path = mw.getServerDir()
-        content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+        content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
         content = content.replace('{$SERVER_PATH}', service_path)
         content = content.replace('{$RUN_USER}', self.getRunUser())
         content = content.replace('{$HOME_DIR}', self.getHomeDir())
diff --git a/plugins/mariadb/index.py b/plugins/mariadb/index.py
index ea61704bb..01f895af1 100755
--- a/plugins/mariadb/index.py
+++ b/plugins/mariadb/index.py
@@ -139,7 +139,7 @@ def getInitdTpl(version=''):
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$SERVER_APP_PATH}', service_path + '/mariadb')
     server_id = int(time.time())
@@ -890,7 +890,7 @@ def importDbExternalProgressBar():
     file = args['file']
     name = args['name']
 
-    import_dir = mw.getRootDir() + '/backup/import/'
+    import_dir = mw.getFatherDir() + '/backup/import/'
 
     file_path = import_dir + file
     if not os.path.exists(file_path):
diff --git a/plugins/mariadb/scripts/backup.py b/plugins/mariadb/scripts/backup.py
index a70445a28..a6177cc38 100755
--- a/plugins/mariadb/scripts/backup.py
+++ b/plugins/mariadb/scripts/backup.py
@@ -40,7 +40,7 @@ class backupTools:
                 "----------------------------------------------------------------------------")
             return
 
-        backup_path = mw.getRootDir() + '/backup/database/mariadb'
+        backup_path = mw.getFatherDir() + '/backup/database/mariadb'
         if not os.path.exists(backup_path):
             mw.execShell("mkdir -p " + backup_path)
 
@@ -52,7 +52,7 @@ class backupTools:
 
         my_conf_path = db_path + '/etc/my.cnf'
         content = mw.readFile(my_conf_path)
-        rep = "\[mysqldump\]\nuser=root"
+        rep = r"\[mysqldump\]\nuser=root"
         sea = "[mysqldump]\n"
         subStr = sea + "user=root\npassword=" + mysql_root + "\n"
         content = content.replace(sea, subStr)
diff --git a/plugins/migration_api/index.py b/plugins/migration_api/index.py
index 425806cc5..061deca92 100755
--- a/plugins/migration_api/index.py
+++ b/plugins/migration_api/index.py
@@ -379,7 +379,7 @@ class classApi:
         # 创建目录
         self.send('/files/create_dir', {"path": dpath})
 
-        backup_path = mw.getRootDir() + '/backup'
+        backup_path = mw.getFatherDir() + '/backup'
         if not os.path.exists(backup_path):
             os.makedirs(backup_path, 384)
 
@@ -701,7 +701,7 @@ class classApi:
         root = self.getDbConn('mysql', 'config').where(
             'id=?', (1,)).getField('mysql_root')
 
-        backup_path = mw.getRootDir() + '/backup'
+        backup_path = mw.getFatherDir() + '/backup'
         if not os.path.exists(backup_path):
             os.makedirs(backup_path, 384)
 
diff --git a/plugins/mongodb/index.py b/plugins/mongodb/index.py
index 62c1d4ff5..07a1b5a3c 100755
--- a/plugins/mongodb/index.py
+++ b/plugins/mongodb/index.py
@@ -1204,7 +1204,7 @@ def replClose():
     return mw.returnJson(True, '关闭副本同步成功!')
 
 def getDbBackupListFunc(dbname=''):
-    bkDir = mw.getRootDir() + '/backup/database'
+    bkDir = mw.getBackupDir() + '/database'
     blist = os.listdir(bkDir)
     r = []
 
@@ -1223,7 +1223,7 @@ def getDbBackupList():
         return data[1]
 
     r = getDbBackupListFunc(args['name'])
-    bkDir = mw.getRootDir() + '/backup/database'
+    bkDir = mw.getBackupDir() + '/database'
     rr = []
     for x in range(0, len(r)):
         p = bkDir + '/' + r[x]
@@ -1245,7 +1245,7 @@ def getDbBackupList():
 
 def getDbBackupImportList():
 
-    bkImportDir = mw.getRootDir() + '/backup/mongodb_import'
+    bkImportDir = mw.getBackupDir() + '/mongodb_import'
     if not os.path.exists(bkImportDir):
         os.mkdir(bkImportDir)
 
@@ -1283,7 +1283,7 @@ def deleteDbBackup():
 
     path = args['path']
     full_file = ""
-    bkDir = mw.getRootDir() + '/backup/database'
+    bkDir = mw.getBackupDir() + '/database'
     full_file = bkDir + '/' + args['filename']
     if path != "":
         full_file = path + "/" + args['filename']
@@ -1303,7 +1303,7 @@ def setDbBackup():
 
 
 def getListBson(dbname=''):
-    bkDir = mw.getRootDir() + '/backup/mongodb_import/'+dbname
+    bkDir = mw.getBackupDir() + '/mongodb_import/'+dbname
     blist = os.listdir(bkDir)
     r = []
 
@@ -1327,7 +1327,7 @@ def importDbExternal():
     file = args['file']
     name = args['name']
 
-    import_dir = mw.getRootDir() + '/backup/mongodb_import/'
+    import_dir = mw.getBackupDir() + '/mongodb_import/'
     mg_root = pSqliteDb('config').where('id=?', (1,)).getField('mg_root')
     port = getConfPort()
 
@@ -1535,8 +1535,7 @@ def installPreInspection(version):
     if sys[1] != '':
         return '暂时不支持该系统'
 
-    sys_id = mw.execShell(
-        "cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F '\"' '{print $2}'")
+    sys_id = mw.execShell("cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F '\"' '{print $2}'")
 
     sysName = sys[0].strip().lower()
     sysId = sys_id[0].strip()
diff --git a/plugins/mongodb/scripts/backup.py b/plugins/mongodb/scripts/backup.py
index 77a9ed0d6..12a887353 100644
--- a/plugins/mongodb/scripts/backup.py
+++ b/plugins/mongodb/scripts/backup.py
@@ -131,7 +131,7 @@ def mongdbClient():
 class backupTools:
 
     def getDbBackupList(self,dbname=''):
-        bkDir = mw.getRootDir() + '/backup/database'
+        bkDir = mw.getFatherDir() + '/backup/database'
         blist = os.listdir(bkDir)
         r = []
 
diff --git a/plugins/mysql-apt/index.py b/plugins/mysql-apt/index.py
index 09e79f3fc..73a46e8a5 100755
--- a/plugins/mysql-apt/index.py
+++ b/plugins/mysql-apt/index.py
@@ -135,7 +135,7 @@ def getAuthPolicy():
     
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$SERVER_APP_PATH}',
                               service_path + '/' + getPluginName())
@@ -932,7 +932,7 @@ def importDbExternalProgressBar():
     file = args['file']
     name = args['name']
 
-    import_dir = mw.getRootDir() + '/backup/import/'
+    import_dir = mw.getFatherDir() + '/backup/import/'
 
     file_path = import_dir + file
     if not os.path.exists(file_path):
diff --git a/plugins/mysql-apt/scripts/backup.py b/plugins/mysql-apt/scripts/backup.py
index 992219655..55603de19 100755
--- a/plugins/mysql-apt/scripts/backup.py
+++ b/plugins/mysql-apt/scripts/backup.py
@@ -44,7 +44,7 @@ class backupTools:
                 "----------------------------------------------------------------------------")
             return
 
-        backup_path = mw.getRootDir() + '/backup/database/mysql-apt'
+        backup_path = mw.getFatherDir() + '/backup/database/mysql-apt'
         if not os.path.exists(backup_path):
             mw.execShell("mkdir -p " + backup_path)
 
@@ -56,7 +56,7 @@ class backupTools:
 
         my_conf_path = db_path + '/etc/my.cnf'
         mycnf = mw.readFile(my_conf_path)
-        rep = "\[mysqldump\]\nuser=root"
+        rep = r"\[mysqldump\]\nuser=root"
         sea = "[mysqldump]\n"
         subStr = sea + "user=root\npassword=" + mysql_root + "\n"
         mycnf = mycnf.replace(sea, subStr)
diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py
index 470dfdaeb..7c85d1afb 100755
--- a/plugins/mysql-yum/index.py
+++ b/plugins/mysql-yum/index.py
@@ -152,7 +152,7 @@ def getAuthPolicy():
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$SERVER_APP_PATH}',service_path + '/' + getPluginName())
 
@@ -930,7 +930,7 @@ def importDbExternalProgressBar():
     file = args['file']
     name = args['name']
 
-    import_dir = mw.getRootDir() + '/backup/import/'
+    import_dir = mw.getFatherDir() + '/backup/import/'
 
     file_path = import_dir + file
     if not os.path.exists(file_path):
diff --git a/plugins/mysql-yum/scripts/backup.py b/plugins/mysql-yum/scripts/backup.py
index 1c4dd3cc0..e958f182b 100755
--- a/plugins/mysql-yum/scripts/backup.py
+++ b/plugins/mysql-yum/scripts/backup.py
@@ -44,7 +44,7 @@ class backupTools:
                 "----------------------------------------------------------------------------")
             return
 
-        backup_path = mw.getRootDir() + '/backup/database/mysql-yum'
+        backup_path = mw.getFatherDir() + '/backup/database/mysql-yum'
         if not os.path.exists(backup_path):
             mw.execShell("mkdir -p " + backup_path)
 
@@ -58,7 +58,7 @@ class backupTools:
 
         mw.backFile(my_cnf)
         content = mw.readFile(my_cnf)
-        rep = "\[mysqldump\]\nuser=root"
+        rep = r"\[mysqldump\]\nuser=root"
         sea = "[mysqldump]\n"
         subStr = sea + "user=root\npassword=" + mysql_root + "\n"
         content = content.replace(sea, subStr)
diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py
index 4181c93cc..b53a42ecc 100755
--- a/plugins/mysql/index.py
+++ b/plugins/mysql/index.py
@@ -139,7 +139,7 @@ def getInitdTpl(version=''):
 def contentReplace(content):
 
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$SERVER_APP_PATH}', service_path + '/mysql')
 
@@ -1011,7 +1011,7 @@ def importDbExternal():
     file = args['file']
     name = args['name']
 
-    import_dir = mw.getRootDir() + '/backup/import/'
+    import_dir = mw.getFatherDir() + '/backup/import/'
 
     file_path = import_dir + file
     if not os.path.exists(file_path):
@@ -1096,7 +1096,7 @@ def importDbExternalProgressBar():
     file = args['file']
     name = args['name']
 
-    import_dir = mw.getRootDir() + '/backup/import/'
+    import_dir = mw.getFatherDir() + '/backup/import/'
 
     file_path = import_dir + file
     if not os.path.exists(file_path):
@@ -1159,11 +1159,11 @@ def importDbBackup():
     file = args['file']
     name = args['name']
 
-    file_path = mw.getRootDir() + '/backup/database/' + file
-    file_path_sql = mw.getRootDir() + '/backup/database/' + file.replace('.gz', '')
+    file_path = mw.getFatherDir() + '/backup/database/' + file
+    file_path_sql = mw.getFatherDir() + '/backup/database/' + file.replace('.gz', '')
 
     if not os.path.exists(file_path_sql):
-        cmd = 'cd ' + mw.getRootDir() + '/backup/database && gzip -d ' + file
+        cmd = 'cd ' + mw.getFatherDir() + '/backup/database && gzip -d ' + file
         mw.execShell(cmd)
 
     local_mode = recognizeDbMode()
@@ -1210,11 +1210,11 @@ def importDbBackupProgressBar():
     file = args['file']
     name = args['name']
 
-    file_path = mw.getRootDir() + '/backup/database/' + file
-    file_path_sql = mw.getRootDir() + '/backup/database/' + file.replace('.gz', '')
+    file_path = mw.getFatherDir() + '/backup/database/' + file
+    file_path_sql = mw.getFatherDir() + '/backup/database/' + file.replace('.gz', '')
 
     if not os.path.exists(file_path_sql):
-        cmd = 'cd ' + mw.getRootDir() + '/backup/database && gzip -d ' + file
+        cmd = 'cd ' + mw.getFatherDir() + '/backup/database && gzip -d ' + file
         mw.execShell(cmd)
 
     local_mode = recognizeDbMode()
@@ -1241,7 +1241,7 @@ def deleteDbBackup():
 
     path = args['path']
     full_file = ""
-    bkDir = mw.getRootDir() + '/backup/database'
+    bkDir = mw.getFatherDir() + '/backup/database'
     full_file = bkDir + '/' + args['filename']
     if path != "":
         full_file = path + "/" + args['filename']
@@ -1256,7 +1256,7 @@ def getDbBackupList():
         return data[1]
 
     r = getDbBackupListFunc(args['name'])
-    bkDir = mw.getRootDir() + '/backup/database'
+    bkDir = mw.getFatherDir() + '/backup/database'
     rr = []
     for x in range(0, len(r)):
         p = bkDir + '/' + r[x]
@@ -1279,7 +1279,7 @@ def getDbBackupList():
 
 def getDbBackupImportList():
 
-    bkImportDir = mw.getRootDir() + '/backup/import'
+    bkImportDir = mw.getFatherDir() + '/backup/import'
     if not os.path.exists(bkImportDir):
         os.mkdir(bkImportDir)
 
diff --git a/plugins/nezha/index.py b/plugins/nezha/index.py
index 0fa578c8c..d79ad4bc2 100755
--- a/plugins/nezha/index.py
+++ b/plugins/nezha/index.py
@@ -119,7 +119,7 @@ class App:
     def contentReplace(self, content):
 
         service_path = mw.getServerDir()
-        content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+        content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
         content = content.replace('{$SERVER_PATH}', service_path)
         content = content.replace('{$RUN_USER}', self.getRunUser())
         content = content.replace('{$HOME_DIR}', self.getHomeDir())
diff --git a/plugins/op_load_balance/index.py b/plugins/op_load_balance/index.py
index 622c3025b..262a20b04 100755
--- a/plugins/op_load_balance/index.py
+++ b/plugins/op_load_balance/index.py
@@ -77,7 +77,7 @@ def writeConf(data):
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$APP_PATH}', app_path)
     return content
diff --git a/plugins/op_waf/index.py b/plugins/op_waf/index.py
index f6db7a141..92698b3e9 100755
--- a/plugins/op_waf/index.py
+++ b/plugins/op_waf/index.py
@@ -249,7 +249,7 @@ def contentReplace(content):
     service_path = mw.getServerDir()
     waf_root = getServerDir()
     waf_path = waf_root + "/waf"
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$WAF_PATH}', waf_path)
     content = content.replace('{$WAF_ROOT}', waf_root)
diff --git a/plugins/pgadmin/index.py b/plugins/pgadmin/index.py
index 526f5f145..85984f5d6 100755
--- a/plugins/pgadmin/index.py
+++ b/plugins/pgadmin/index.py
@@ -88,7 +88,7 @@ def contentReplace(content):
     cfg = getCfg()
     service_path = mw.getServerDir()
 
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$APP_PATH}', service_path+'/'+getPluginName()+'/data')
 
diff --git a/plugins/php-apt/index.py b/plugins/php-apt/index.py
index b5abc0efb..d6146bfac 100755
--- a/plugins/php-apt/index.py
+++ b/plugins/php-apt/index.py
@@ -85,7 +85,7 @@ def status(version):
 
 def contentReplace(content, version):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$PHP_VERSION}', version)
     content = content.replace('{$LOCAL_IP}', mw.getLocalIp())
@@ -739,7 +739,7 @@ def getPhpinfo(version):
         return 'PHP[' + version + ']未启动,不可访问!!!'
 
     sock_file = getFpmAddress(version)
-    root_dir = mw.getRootDir() + '/phpinfo'
+    root_dir = mw.getFatherDir() + '/phpinfo'
 
     mw.execShell("rm -rf " + root_dir)
     mw.execShell("mkdir -p " + root_dir)
diff --git a/plugins/php-apt/index_php_apt.py b/plugins/php-apt/index_php_apt.py
index 2562967a4..c6b4301b0 100755
--- a/plugins/php-apt/index_php_apt.py
+++ b/plugins/php-apt/index_php_apt.py
@@ -118,7 +118,7 @@ def getPhpinfo(version):
 
     sock_file = getFpmAddress(version)
     # print(sock_file)
-    root_dir = mw.getRootDir() + '/phpinfo'
+    root_dir = mw.getFatherDir() + '/phpinfo'
 
     mw.execShell("rm -rf " + root_dir)
     mw.execShell("mkdir -p " + root_dir)
diff --git a/plugins/php-yum/index.py b/plugins/php-yum/index.py
index fefbed017..153addc64 100755
--- a/plugins/php-yum/index.py
+++ b/plugins/php-yum/index.py
@@ -77,7 +77,7 @@ def status(version):
 
 def contentReplace(content, version):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$PHP_VERSION}', version)
     content = content.replace('{$LOCAL_IP}', mw.getLocalIp())
@@ -88,15 +88,15 @@ def contentReplace(content, version):
         content = content.replace('{$PHP_USER}', 'nobody')
         content = content.replace('{$PHP_GROUP}', 'nobody')
 
-        rep = 'listen.owner\s*=\s*(.+)\r?\n'
+        rep = r'listen.owner\s*=\s*(.+)\r?\n'
         val = ';listen.owner = nobody\n'
         content = re.sub(rep, val, content)
 
-        rep = 'listen.group\s*=\s*(.+)\r?\n'
+        rep = r'listen.group\s*=\s*(.+)\r?\n'
         val = ';listen.group = nobody\n'
         content = re.sub(rep, val, content)
 
-        rep = 'user\s*=\s*(.+)\r?\n'
+        rep = r'user\s*=\s*(.+)\r?\n'
         val = ';user = nobody\n'
         content = re.sub(rep, val, content)
 
@@ -742,7 +742,7 @@ def getPhpinfo(version):
         return 'PHP[' + version + ']未启动,不可访问!!!'
 
     sock_file = getFpmAddress(version)
-    root_dir = mw.getRootDir() + '/phpinfo'
+    root_dir = mw.getFatherDir() + '/phpinfo'
 
     mw.execShell("rm -rf " + root_dir)
     mw.execShell("mkdir -p " + root_dir)
diff --git a/plugins/php-yum/index_php_yum.py b/plugins/php-yum/index_php_yum.py
index 11ea23240..17bae712b 100755
--- a/plugins/php-yum/index_php_yum.py
+++ b/plugins/php-yum/index_php_yum.py
@@ -97,7 +97,7 @@ def getPhpinfo(version):
         return 'PHP[' + version + ']未启动,不可访问!!!'
 
     sock_file = getFpmAddress(version)
-    root_dir = mw.getRootDir() + '/phpinfo'
+    root_dir = mw.getFatherDir() + '/phpinfo'
 
     mw.execShell("rm -rf " + root_dir)
     mw.execShell("mkdir -p " + root_dir)
diff --git a/plugins/php/index.py b/plugins/php/index.py
index f08c86485..761a33902 100755
--- a/plugins/php/index.py
+++ b/plugins/php/index.py
@@ -119,7 +119,7 @@ def status(version):
 
 def contentReplace(content, version):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$PHP_VERSION}', version)
     content = content.replace('{$LOCAL_IP}', mw.getLocalIp())
@@ -913,7 +913,7 @@ def getPhpinfo(version):
         return 'PHP[' + version + ']未启动,不可访问!!!'
 
     sock_file = getFpmAddress(version)
-    root_dir = mw.getRootDir() + '/phpinfo'
+    root_dir = mw.getFatherDir() + '/phpinfo'
 
     mw.execShell("rm -rf " + root_dir)
     mw.execShell("mkdir -p " + root_dir)
diff --git a/plugins/php/index_php.py b/plugins/php/index_php.py
index 617613b1e..06a90a9c4 100755
--- a/plugins/php/index_php.py
+++ b/plugins/php/index_php.py
@@ -111,7 +111,7 @@ def getPhpinfo(version):
         return 'PHP[' + version + ']未启动,不可访问!!!'
 
     sock_file = getFpmAddress(version)
-    root_dir = mw.getRootDir() + '/phpinfo'
+    root_dir = mw.getFatherDir() + '/phpinfo'
 
     mw.execShell("rm -rf " + root_dir)
     mw.execShell("mkdir -p " + root_dir)
diff --git a/plugins/phpmyadmin/index.py b/plugins/phpmyadmin/index.py
index 5e8df07eb..884ef2f34 100755
--- a/plugins/phpmyadmin/index.py
+++ b/plugins/phpmyadmin/index.py
@@ -122,7 +122,7 @@ def contentReplace(content):
     blowfish_secret = tmp[0].strip()
     # print php_ver
     php_conf_dir = mw.getServerDir() + '/web_conf/php/conf'
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$PHP_CONF_PATH}', php_conf_dir)
     content = content.replace('{$PHP_VER}', php_ver)
diff --git a/plugins/postgresql/index.py b/plugins/postgresql/index.py
index 22dfc7fff..6ce89e219 100755
--- a/plugins/postgresql/index.py
+++ b/plugins/postgresql/index.py
@@ -147,7 +147,7 @@ def getInitdTpl(version=''):
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$APP_PATH}', service_path + '/postgresql')
     return content
@@ -721,8 +721,7 @@ def importDbBackup():
 
     pwd = pSqliteDb('config').where('id=?', (1,)).getField('pg_root')
 
-    mysql_cmd = mw.getRootDir() + '/server/mysql/bin/mysql -uroot -p' + pwd + \
-        ' ' + name + ' < ' + file_path_sql
+    mysql_cmd = mw.getFatherDir() + '/server/mysql/bin/mysql -uroot -p' + pwd + ' ' + name + ' < ' + file_path_sql
 
     # print(mysql_cmd)
     os.system(mysql_cmd)
diff --git a/plugins/pureftp/index.py b/plugins/pureftp/index.py
index 909f71ab9..15d6535ed 100755
--- a/plugins/pureftp/index.py
+++ b/plugins/pureftp/index.py
@@ -80,7 +80,7 @@ def status():
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     return content
 
diff --git a/plugins/redis/index.py b/plugins/redis/index.py
index 3d451c02e..494064594 100755
--- a/plugins/redis/index.py
+++ b/plugins/redis/index.py
@@ -122,7 +122,7 @@ def status():
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$SERVER_APP}', service_path + '/'+getPluginName())
     content = content.replace('{$REDIS_PASS}', mw.getRandomString(10))
diff --git a/plugins/simpleping/index.py b/plugins/simpleping/index.py
index 176536c90..dcc6853f0 100755
--- a/plugins/simpleping/index.py
+++ b/plugins/simpleping/index.py
@@ -135,7 +135,7 @@ def status():
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$SERVER_APP}', service_path + '/simpleping')
     return content
diff --git a/plugins/sphinx/index.py b/plugins/sphinx/index.py
index 9a04a5d22..515d94a0a 100755
--- a/plugins/sphinx/index.py
+++ b/plugins/sphinx/index.py
@@ -98,7 +98,7 @@ def readConfigTpl():
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$SERVER_APP}', service_path + '/sphinx')
     return content
diff --git a/plugins/sys-opt/index.py b/plugins/sys-opt/index.py
index 26a7a7bb0..a9a66c583 100755
--- a/plugins/sys-opt/index.py
+++ b/plugins/sys-opt/index.py
@@ -52,7 +52,7 @@ def checkArgs(data, ck=[]):
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$SERVER_APP}', service_path + '/sys-opt')
     return content
diff --git a/plugins/varnish/index.py b/plugins/varnish/index.py
index 050e842a0..5336dc01a 100755
--- a/plugins/varnish/index.py
+++ b/plugins/varnish/index.py
@@ -50,7 +50,7 @@ def getInitDTpl():
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$SERVER_APP}', service_path + '/varnish')
     return content
diff --git a/plugins/xhprof/index.py b/plugins/xhprof/index.py
index 7bd54ee70..a2861b17a 100755
--- a/plugins/xhprof/index.py
+++ b/plugins/xhprof/index.py
@@ -97,7 +97,7 @@ def contentReplace(content):
     service_path = mw.getServerDir()
     php_ver = getCachePhpVer()
     # print php_ver
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$PHP_VER}', php_ver)
     return content
@@ -106,7 +106,7 @@ def contentReplace(content):
 def contentReplacePHP(content, version):
     service_path = mw.getServerDir()
     # print php_ver
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$PHP_VER}', version)
     return content
diff --git a/plugins/zabbix/index.py b/plugins/zabbix/index.py
index 06ea20e96..167c85669 100755
--- a/plugins/zabbix/index.py
+++ b/plugins/zabbix/index.py
@@ -97,7 +97,7 @@ def getInstallVerion():
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$ZABBIX_ROOT}', '/usr/share/zabbix')
     content = content.replace('{$ZABBIX_PORT}', '18888')
diff --git a/plugins/zabbix_agent/index.py b/plugins/zabbix_agent/index.py
index 797a1f6b2..c015c1ecd 100755
--- a/plugins/zabbix_agent/index.py
+++ b/plugins/zabbix_agent/index.py
@@ -83,7 +83,7 @@ def status():
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     return content
 

From e027700d506e19147d7d09da668b123828ef6243 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 01:33:59 +0800
Subject: [PATCH 284/965] update

---
 web/admin/site/ssl.py  | 10 ++++++++++
 web/static/app/site.js |  5 +++--
 web/utils/site.py      | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/web/admin/site/ssl.py b/web/admin/site/ssl.py
index 5d7a5b048..a7cdd4bc4 100644
--- a/web/admin/site/ssl.py
+++ b/web/admin/site/ssl.py
@@ -32,6 +32,16 @@ def get_ssl():
     ssl_type = request.form.get('ssl_type', '')
     return MwSites.instance().getSsl(site_name, ssl_type)
 
+# 获取证书信息
+@blueprint.route('/set_ssl', endpoint='set_ssl', methods=['POST'])
+@panel_login_required
+def set_ssl():
+    site_name = request.form.get('siteName', '')
+    key = request.form.get('key', '')
+    csr = request.form.get('csr', '')
+    return MwSites.instance().setSsl(site_name, key, csr)
+
+
 # 删除证书
 @blueprint.route('/close_ssl_conf', endpoint='close_ssl_conf', methods=['POST'])
 @panel_login_required
diff --git a/web/static/app/site.js b/web/static/app/site.js
index ce2fcd4ec..8bac91dad 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -1025,8 +1025,10 @@ function setIndexList(id){
 }
 
 
-/*站点修改*/
+/* 站点修改 */
 function webEdit(id,website,endTime,addtime){
+	// 暂时关闭 - 子目录绑定
+	// <p onclick='dirBinding("+id+")'>子目录绑定</p>\
 	layer.open({
 		type: 1,
 		area: '700px',
@@ -1036,7 +1038,6 @@ function webEdit(id,website,endTime,addtime){
 		content: "<div class='bt-form'>\
 			<div class='bt-w-menu pull-left' style='height: 565px;'>\
 				<p class='bgw' onclick=\"domainEdit(" + id + ",'" + website + "')\">域名管理</p>\
-				<p onclick='dirBinding("+id+")'>子目录绑定</p>\
 				<p onclick='webPathEdit("+id+")'>网站目录</p>\
 				<p onclick='limitNet("+id+")'>流量限制</p>\
 				<p onclick=\"rewrite('"+website+"')\">伪静态</p>\
diff --git a/web/utils/site.py b/web/utils/site.py
index fbb3a83dc..ae0aecf81 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -413,6 +413,46 @@ class sites(object):
         mw.writeLog('网站管理', '设置成功,站点【{1}】到期【{2}】后将自动停止!', (info['name'], end_date,))
         return mw.returnData(True, '设置成功,站点到期后将自动停止!')
 
+    def setSsl(self, site_name, key, csr):
+        path = self.sslDir + '/' + site_name
+        if not os.path.exists(path):
+            mw.execShell('mkdir -p ' + path)
+
+        csrpath = path + "/fullchain.pem"  # 生成证书路径
+        keypath = path + "/privkey.pem"    # 密钥文件路径
+
+        if(key.find('KEY') == -1):
+            return mw.returnJson(False, '秘钥错误，请检查!')
+        if(csr.find('CERTIFICATE') == -1):
+            return mw.returnJson(False, '证书错误，请检查!')
+
+        mw.writeFile('/tmp/cert.pl', csr)
+        if not mw.checkCert('/tmp/cert.pl'):
+            return mw.returnData(False, '证书错误,请粘贴正确的PEM格式证书!')
+
+        mw.backFile(keypath)
+        mw.backFile(csrpath)
+
+        mw.writeFile(keypath, key)
+        mw.writeFile(csrpath, csr)
+
+        # 写入配置文件
+        result = self.setSslConf(site_name)
+        if not result['status']:
+            return result
+
+        isError = mw.checkWebConfig()
+        if(type(isError) == str):
+            mw.restoreFile(keypath)
+            mw.restoreFile(csrpath)
+
+            msg = 'ERROR: <br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>'
+            return mw.returnData(False, msg)
+
+        mw.writeLog('网站管理', '证书已保存!')
+        mw.restartWeb()
+        return mw.returnData(True, '证书已保存!')
+
     # ssl相关方法 start
     def setSslConf(self, site_name):
         file = self.getHostConf(site_name)

From cf74b0a941e8a406b980f46a8df963fe07d62443 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 01:37:38 +0800
Subject: [PATCH 285/965] Update mw.py

---
 web/core/mw.py | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)

diff --git a/web/core/mw.py b/web/core/mw.py
index 118eb7d46..bcf565d6b 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -180,6 +180,105 @@ def getCommonFile():
     }
     return data
 
+def checkCert(certPath='ssl/certificate.pem'):
+    # 验证证书
+    openssl = '/usr/bin/openssl'
+    if not os.path.exists(openssl):
+        openssl = '/usr/local/openssl/bin/openssl'
+    if not os.path.exists(openssl):
+        openssl = 'openssl'
+    certPem = readFile(certPath)
+    s = "\n-----BEGIN CERTIFICATE-----"
+    tmp = certPem.strip().split(s)
+    for tmp1 in tmp:
+        if tmp1.find('-----BEGIN CERTIFICATE-----') == -1:
+            tmp1 = s + tmp1
+        writeFile(certPath, tmp1)
+        result = execShell(openssl + " x509 -in " +
+                           certPath + " -noout -subject")
+        if result[1].find('-bash:') != -1:
+            return True
+        if len(result[1]) > 2:
+            return False
+        if result[0].find('error:') != -1:
+            return False
+    return True
+
+def sortFileList(path, ftype = 'mtime', sort = 'desc'):
+    flist = os.listdir(path)
+    if ftype == 'mtime':
+        if sort == 'desc':
+            flist = sorted(flist, key=lambda f: os.path.getmtime(os.path.join(path,f)), reverse=True)
+        if sort == 'asc':
+            flist = sorted(flist, key=lambda f: os.path.getmtime(os.path.join(path,f)), reverse=False)
+
+    if ftype == 'size':
+        if sort == 'desc':
+            flist = sorted(flist, key=lambda f: os.path.getsize(os.path.join(path,f)), reverse=True)
+        if sort == 'asc':
+            flist = sorted(flist, key=lambda f: os.path.getsize(os.path.join(path,f)), reverse=False)
+
+    if ftype == 'fname':
+        if sort == 'desc':
+            flist = sorted(flist, key=lambda f: os.path.join(path,f), reverse=True)
+        if sort == 'asc':
+            flist = sorted(flist, key=lambda f: os.path.join(path,f), reverse=False)
+    return flist
+
+
+def sortAllFileList(path, ftype = 'mtime', sort = 'desc', search = '',limit = 3000):
+    count = 0
+    flist = []
+    for d_list in os.walk(path):
+        if count >= limit:
+            break
+
+        for d in d_list[1]:
+            if count >= limit:
+                break
+            if d.lower().find(search) != -1:
+                filename = d_list[0] + '/' + d
+                if not os.path.exists(filename):
+                    continue
+                count += 1
+                flist.append(filename)
+
+        for f in d_list[2]:
+            if count >= limit:
+                break
+
+            if f.lower().find(search) != -1:
+                filename = d_list[0] + '/' + f
+                if not os.path.exists(filename):
+                    continue
+                count += 1
+                flist.append(filename)
+
+    if ftype == 'mtime':
+        if sort == 'desc':
+            flist = sorted(flist, key=lambda f: os.path.getmtime(f), reverse=True)
+        if sort == 'asc':
+            flist = sorted(flist, key=lambda f: os.path.getmtime(f), reverse=False)
+
+    if ftype == 'size':
+        if sort == 'desc':
+            flist = sorted(flist, key=lambda f: os.path.getsize(f), reverse=True)
+        if sort == 'asc':
+            flist = sorted(flist, key=lambda f: os.path.getsize(f), reverse=False)
+    return flist
+
+def getPathSize(path):
+    # 取文件或目录大小
+    if not os.path.exists(path):
+        return 0
+    if not os.path.isdir(path):
+        return os.path.getsize(path)
+    size_total = 0
+    for nf in os.walk(path):
+        for f in nf[2]:
+            filename = nf[0] + '/' + f
+            size_total += os.path.getsize(filename)
+    return size_total
 
 def toSize(size, middle='') -> str:
     """

From 72917bdc5b4842b58604c210cfd63da2f2a1d3ec Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 01:39:17 +0800
Subject: [PATCH 286/965] Update site.py

---
 web/utils/site.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index ae0aecf81..5d46eadbb 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -426,10 +426,13 @@ class sites(object):
         if(csr.find('CERTIFICATE') == -1):
             return mw.returnJson(False, '证书错误，请检查!')
 
-        mw.writeFile('/tmp/cert.pl', csr)
-        if not mw.checkCert('/tmp/cert.pl'):
+        tmp_cert = '/tmp/cert.pl'
+        mw.writeFile(tmp_cert, csr)
+        if not mw.checkCert(tmp_cert):
+            os.remove(tmp_cert)
             return mw.returnData(False, '证书错误,请粘贴正确的PEM格式证书!')
-
+        os.remove(tmp_cert)
+        
         mw.backFile(keypath)
         mw.backFile(csrpath)
 

From e013eb81375d09dcff93c439ad99c7e02f6b1115 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 01:59:22 +0800
Subject: [PATCH 287/965] update

---
 web/static/app/site.js | 37 +++++++++++++++++++------------------
 web/version.py         |  2 +-
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/web/static/app/site.js b/web/static/app/site.js
index 8bac91dad..f958a1250 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -98,16 +98,16 @@ $('#site_search').click(function(){
 				var _this = $(this);
 				var id = $(this).attr('data-ids');
 				laydate.render({
-					elem: '#site_'+ id //指定元素
-					,min:getDate(1)
-					,max:'2099-12-31'
-					,vlue:getDate(365)
-					,type:'date'
-					,format :'yyyy-MM-dd'
-					,trigger:'click'
-					,btns:['perpetual', 'confirm']
-					,theme:'#20a53a'
-					,done:function(dates){
+					elem: '#site_'+ id,
+					min:getDate(1),
+					max:'9999-12-31',
+					vlue:getDate(365),
+					type:'date',
+					format :'yyyy-MM-dd',
+					trigger:'click',
+					btns:['perpetual', 'confirm'],
+					theme:'#20a53a',
+					done:function(dates){
 						if(_this.html() == '永久'){
 						 	dates = '0000-00-00';
 						}
@@ -1031,7 +1031,7 @@ function webEdit(id,website,endTime,addtime){
 	// <p onclick='dirBinding("+id+")'>子目录绑定</p>\
 	layer.open({
 		type: 1,
-		area: '700px',
+		area: ['700px','580px'],
 		title: '站点修改['+website+']  --  添加时间['+addtime+']',
 		closeBtn: 1,
 		shift: 0,
@@ -1082,7 +1082,7 @@ function webEdit(id,website,endTime,addtime){
 	});	
 }
 
-//取网站日志
+//取网站日志pluginLogs
 function getSiteLogs(siteName){
 	var loadT = layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']});
 	$.post('/site/get_logs',{siteName:siteName},function(logs){
@@ -1091,9 +1091,10 @@ function getSiteLogs(siteName){
 			logs.msg = '';
 		}
 		if (logs.msg == '') logs.msg = '当前没有日志.';
-		var phpCon = '<textarea wrap="off" readonly="" style="white-space: pre;margin: 0px;width: 560px;height: 530px;background-color: #333;color:#fff; padding:0 5px" id="error_log">'+logs.msg+'</textarea>';
-		$("#webedit-con").html(phpCon);
-		var ob = document.getElementById('error_log');
+		var h =  parseInt($('.bt-w-menu').css('height')) - 50;
+		var con = '<textarea wrap="off" style="white-space:pre;margin: 0px;width: 560px;height: '+h+'px;background-color: #333;color:#fff; padding:0 5px;" id="site_log">'+logs.msg+'</textarea>';
+		$("#webedit-con").html(con);
+		var ob = document.getElementById('site_log');
 		ob.scrollTop = ob.scrollHeight;		
 	},'json');
 }
@@ -1102,14 +1103,14 @@ function getSiteLogs(siteName){
 function getSiteErrorLogs(siteName){
 	var loadT = layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']});
 	$.post('/site/get_error_logs',{siteName:siteName},function(logs){
-		// console.log(logs);
 		layer.close(loadT);
 		if(logs.status !== true){
 			logs.msg = '';
 		}
 		if (logs.msg == '') logs.msg = '当前没有日志.';
-		var phpCon = '<textarea wrap="off" readonly="" style="white-space: pre;margin: 0px;width: 560px;height: 530px;background-color: #333;color:#fff; padding:0 5px" id="error_log">'+logs.msg+'</textarea>';
-		$("#webedit-con").html(phpCon);
+		var h =  parseInt($('.bt-w-menu').css('height')) - 50;
+		var con = '<textarea wrap="off" style="white-space:pre;margin:0px;width:560px;height:'+h+'px;background-color: #333;color:#fff; padding:0 5px;" id="error_log">'+logs.msg+'</textarea>';
+		$("#webedit-con").html(con);
 		var ob = document.getElementById('error_log');
 		ob.scrollTop = ob.scrollHeight;		
 	},'json');
diff --git a/web/version.py b/web/version.py
index 31e7a2e8f..3ade5933b 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.2
+APP_SMALL_VERSION = 0.3
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From d8a34e7a0b5d0f768762b8d9c56981c4b05273b9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 02:04:47 +0800
Subject: [PATCH 288/965] Update site.js

---
 web/static/app/site.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/static/app/site.js b/web/static/app/site.js
index f958a1250..8bd7f51fa 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -1031,12 +1031,12 @@ function webEdit(id,website,endTime,addtime){
 	// <p onclick='dirBinding("+id+")'>子目录绑定</p>\
 	layer.open({
 		type: 1,
-		area: ['700px','580px'],
+		area: ['700px','570px'],
 		title: '站点修改['+website+']  --  添加时间['+addtime+']',
 		closeBtn: 1,
 		shift: 0,
 		content: "<div class='bt-form'>\
-			<div class='bt-w-menu pull-left' style='height: 565px;'>\
+			<div class='bt-w-menu pull-left'>\
 				<p class='bgw' onclick=\"domainEdit(" + id + ",'" + website + "')\">域名管理</p>\
 				<p onclick='webPathEdit("+id+")'>网站目录</p>\
 				<p onclick='limitNet("+id+")'>流量限制</p>\
@@ -1051,7 +1051,7 @@ function webEdit(id,website,endTime,addtime){
 				<p id='site_"+id+"' onclick=\"getSiteLogs('"+website+"')\">响应日志</p>\
 				<p id='site_"+id+"' onclick=\"getSiteErrorLogs('"+website+"')\">错误日志</p>\
 			</div>\
-			<div id='webedit-con' class='bt-w-con webedit-con pd15' style='height: 565px;overflow: scroll;'></div>\
+			<div id='webedit-con' class='bt-w-con webedit-con pd15' style='height: 100%;overflow: scroll;'></div>\
 		</div>",
 		success:function(){
 			//域名输入提示
@@ -1091,7 +1091,7 @@ function getSiteLogs(siteName){
 			logs.msg = '';
 		}
 		if (logs.msg == '') logs.msg = '当前没有日志.';
-		var h =  parseInt($('.bt-w-menu').css('height')) - 50;
+		var h =  parseInt($('.bt-w-menu').css('height')) - 35;
 		var con = '<textarea wrap="off" style="white-space:pre;margin: 0px;width: 560px;height: '+h+'px;background-color: #333;color:#fff; padding:0 5px;" id="site_log">'+logs.msg+'</textarea>';
 		$("#webedit-con").html(con);
 		var ob = document.getElementById('site_log');
@@ -1108,7 +1108,7 @@ function getSiteErrorLogs(siteName){
 			logs.msg = '';
 		}
 		if (logs.msg == '') logs.msg = '当前没有日志.';
-		var h =  parseInt($('.bt-w-menu').css('height')) - 50;
+		var h =  parseInt($('.bt-w-menu').css('height')) - 35;
 		var con = '<textarea wrap="off" style="white-space:pre;margin:0px;width:560px;height:'+h+'px;background-color: #333;color:#fff; padding:0 5px;" id="error_log">'+logs.msg+'</textarea>';
 		$("#webedit-con").html(con);
 		var ob = document.getElementById('error_log');

From e0384dd6cb9b1c0126333d7419b1f284671e5510 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 02:10:44 +0800
Subject: [PATCH 289/965] Update msodclient.py

---
 plugins/msonedrive/class/msodclient.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugins/msonedrive/class/msodclient.py b/plugins/msonedrive/class/msodclient.py
index 2181caf66..f21a13aac 100644
--- a/plugins/msonedrive/class/msodclient.py
+++ b/plugins/msonedrive/class/msodclient.py
@@ -8,14 +8,19 @@ import re
 import json
 import io
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
-
 import oauthlib
 import requests
 import datetime
 from requests_oauthlib import OAuth2Session
 
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+
+
 DEBUG = False
 
 

From ae4f3851e5d48fc745a4a74b1efca84d7a7f275a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 02:20:47 +0800
Subject: [PATCH 290/965] Update index.py

---
 plugins/pureftp/index.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/pureftp/index.py b/plugins/pureftp/index.py
index 15d6535ed..d84534d2d 100755
--- a/plugins/pureftp/index.py
+++ b/plugins/pureftp/index.py
@@ -88,8 +88,8 @@ def contentReplace(content):
 def ftp_release_port(port):
     from collections import namedtuple
     try:
-        import firewall_api
-        firewall_api.firewall_api().addAcceptPortArgs(port, 'pure-ftpd', 'port')
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().addAcceptPort(port, 'pure-ftpd', 'port')
         return port
     except Exception as e:
         return "Release failed {}".format(e)

From df7a43919fdf3df76159065e2d2eb3c4f5bad251 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 02:21:07 +0800
Subject: [PATCH 291/965] Update index.py

---
 plugins/pureftp/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pureftp/index.py b/plugins/pureftp/index.py
index d84534d2d..3c96e2a26 100755
--- a/plugins/pureftp/index.py
+++ b/plugins/pureftp/index.py
@@ -104,7 +104,7 @@ def openFtpPort():
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getFatherDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):

From a3af4ac4058952aa24cb6b5614060dcc31f878fb Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 02:22:03 +0800
Subject: [PATCH 292/965] Update index.py

---
 plugins/pureftp/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pureftp/index.py b/plugins/pureftp/index.py
index 3c96e2a26..2e9436bfe 100755
--- a/plugins/pureftp/index.py
+++ b/plugins/pureftp/index.py
@@ -398,7 +398,7 @@ def modFtpPort():
             return '端口范围不正确!'
         file = file = getServerDir() + '/etc/pure-ftpd.conf'
         conf = mw.readFile(file)
-        rep = u"\n#?\s*Bind\s+[0-9]+\.[0-9]+\.[0-9]+\.+[0-9]+,([0-9]+)"
+        rep = r"\n#?\s*Bind\s+[0-9]+\.[0-9]+\.[0-9]+\.+[0-9]+,([0-9]+)"
         # preg_match(rep,conf,tmp)
         conf = re.sub(
             rep, "\nBind                         0.0.0.0," + port, conf)

From 60a1bfe67980c56169543f0e6fa9befb9a29fee4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 02:22:13 +0800
Subject: [PATCH 293/965] Update index.py

---
 plugins/pureftp/index.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/pureftp/index.py b/plugins/pureftp/index.py
index 2e9436bfe..c7a88c4f7 100755
--- a/plugins/pureftp/index.py
+++ b/plugins/pureftp/index.py
@@ -400,8 +400,7 @@ def modFtpPort():
         conf = mw.readFile(file)
         rep = r"\n#?\s*Bind\s+[0-9]+\.[0-9]+\.[0-9]+\.+[0-9]+,([0-9]+)"
         # preg_match(rep,conf,tmp)
-        conf = re.sub(
-            rep, "\nBind                         0.0.0.0," + port, conf)
+        conf = re.sub(rep, "\nBind                         0.0.0.0," + port, conf)
         mw.writeFile(file, conf)
         restart()
         return 'ok'

From 15314974f6218030ec9a979c1528cd510ccf5aa3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 02:27:21 +0800
Subject: [PATCH 294/965] Update index.py

---
 plugins/pureftp/index.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/pureftp/index.py b/plugins/pureftp/index.py
index c7a88c4f7..cf5e118ab 100755
--- a/plugins/pureftp/index.py
+++ b/plugins/pureftp/index.py
@@ -104,7 +104,7 @@ def openFtpPort():
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = mw.getFatherDir()
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
@@ -145,8 +145,8 @@ def initDreplace():
 
     if os.path.exists(systemDir):
         # and not os.path.exists(systemService)
-        se_content = mw.readFile(systemServiceTpl)
-        se_content = se_content.replace('{$SERVER_PATH}', service_path)
+        content = mw.readFile(systemServiceTpl)
+        content = content.replace('{$SERVER_PATH}', service_path)
         mw.writeFile(systemService, se_content)
         mw.execShell('systemctl daemon-reload')
 

From c6d900c4e01270cebe0e722231a45bf83056694f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 02:31:12 +0800
Subject: [PATCH 295/965] Update index.py

---
 plugins/pureftp/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pureftp/index.py b/plugins/pureftp/index.py
index cf5e118ab..11508e7fa 100755
--- a/plugins/pureftp/index.py
+++ b/plugins/pureftp/index.py
@@ -147,7 +147,7 @@ def initDreplace():
         # and not os.path.exists(systemService)
         content = mw.readFile(systemServiceTpl)
         content = content.replace('{$SERVER_PATH}', service_path)
-        mw.writeFile(systemService, se_content)
+        mw.writeFile(systemService, content)
         mw.execShell('systemctl daemon-reload')
 
     return file_bin

From 2d8528ca8de85a0792a6a8e6d9ec3c03bd284a24 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 02:32:11 +0800
Subject: [PATCH 296/965] Update index.py

---
 plugins/pureftp/index.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/pureftp/index.py b/plugins/pureftp/index.py
index 11508e7fa..0dc6a00e3 100755
--- a/plugins/pureftp/index.py
+++ b/plugins/pureftp/index.py
@@ -144,7 +144,6 @@ def initDreplace():
     systemServiceTpl = getPluginDir() + '/init.d/pureftp.service.tpl'
 
     if os.path.exists(systemDir):
-        # and not os.path.exists(systemService)
         content = mw.readFile(systemServiceTpl)
         content = content.replace('{$SERVER_PATH}', service_path)
         mw.writeFile(systemService, content)

From d00101f6eb6a0005bf508c3f9012de1c71030e5e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 02:40:09 +0800
Subject: [PATCH 297/965] update

---
 setting.py     | 95 --------------------------------------------------
 web/setting.py | 13 +++++++
 2 files changed, 13 insertions(+), 95 deletions(-)
 delete mode 100755 setting.py

diff --git a/setting.py b/setting.py
deleted file mode 100755
index eac374df0..000000000
--- a/setting.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 配置文件
-# ---------------------------------------------------------------------------------
-
-
-import time
-import sys
-import random
-import os
-
-pwd = os.getcwd()
-sys.path.append(pwd + '/class/core')
-
-import mw
-
-# cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-# info = mw.execShell(cmd)
-# p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-# p_debain = "/usr/local/lib/" + info[0].strip() + "/dist-packages"
-
-# sys.path.append(p)
-# sys.path.append(p_debain)
-
-import system_api
-cpu_info = system_api.system_api().getCpuInfo()
-workers = cpu_info[1]
-
-
-log_dir = os.getcwd() + '/logs'
-if not os.path.exists(log_dir):
-    os.mkdir(log_dir)
-
-# default port
-mw_port = "7200"
-if os.path.exists("data/port.pl"):
-    mw_port = mw.readFile('data/port.pl')
-    mw_port.strip()
-else:
-    import firewall_api
-    import common
-    common.initDB()
-    mw_port = str(random.randint(10000, 65530))
-    firewall_api.firewall_api().addAcceptPortArgs(mw_port, 'WEB面板', 'port')
-    mw.writeFile('data/port.pl', mw_port)
-
-bind = []
-if os.path.exists('data/ipv6.pl'):
-    bind.append('[0:0:0:0:0:0:0:0]:%s' % mw_port)
-else:
-    bind.append('0.0.0.0:%s' % mw_port)
-
-ssl_choose_file = 'ssl/choose.pl'
-if os.path.exists(ssl_choose_file):
-    ssl_choose = mw.readFile(ssl_choose_file).strip()
-    if mw.inArray(['local','nginx'],ssl_choose):
-        tmp_cert = 'ssl/'+ssl_choose+'/cert.pem'
-        tmp_private = 'ssl/'+ssl_choose+'/private.pem'
-        if os.path.exists(tmp_cert) and os.path.exists(tmp_private):
-            certfile = tmp_cert
-            keyfile  = tmp_private
-            ciphers = 'TLSv1 TLSv1.1 TLSv1.2 TLSv1.3'
-            ssl_version = 2
-
-# 初始安装时,自动生成安全路径
-if not os.path.exists('data/admin_path.pl'):
-    admin_path = mw.getRandomString(8)
-    mw.writeFile('data/admin_path.pl', '/' + admin_path.lower())
-
-if workers > 2:
-    workers = 1
-
-threads = workers * 1
-backlog = 512
-reload = False
-daemon = True
-worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
-timeout = 7200
-keepalive = 60
-preload_app = True
-capture_output = True
-access_log_format = '%(t)s %(p)s %(h)s "%(r)s" %(s)s %(L)s %(b)s %(f)s" "%(a)s"'
-loglevel = 'info'
-errorlog = log_dir + '/error.log'
-accesslog = log_dir + '/access.log'
-pidfile = log_dir + '/mw.pid'
diff --git a/web/setting.py b/web/setting.py
index 46672561d..8defa4abe 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -50,6 +50,19 @@ if os.path.exists(default_ipv6_file):
 else:
     bind.append('0.0.0.0:%s' % panel_port)
 
+
+ssl_choose_file = panel_dir+'/ssl/choose.pl'
+if os.path.exists(ssl_choose_file):
+    ssl_choose = mw.readFile(ssl_choose_file).strip()
+    if mw.inArray(['local','nginx'],ssl_choose):
+        tmp_cert = panel_dir+'/ssl/'+ssl_choose+'/cert.pem'
+        tmp_private = panel_dir+'/ssl/'+ssl_choose+'/private.pem'
+        if os.path.exists(tmp_cert) and os.path.exists(tmp_private):
+            certfile = tmp_cert
+            keyfile  = tmp_private
+            ciphers = 'TLSv1 TLSv1.1 TLSv1.2 TLSv1.3'
+            ssl_version = 2
+
 if workers > 2:
     workers = 1
 

From 000b825ef08040e0db8f17cdf069216b563c8434 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 02:40:26 +0800
Subject: [PATCH 298/965] Delete app.py

---
 app.py | 52 ----------------------------------------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 app.py

diff --git a/app.py b/app.py
deleted file mode 100644
index 685346c77..000000000
--- a/app.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 入口文件
-# ---------------------------------------------------------------------------------
-
-
-# pip install profiler_online
-# 性能测试
-# from profiler_online import run_profiler
-# run_profiler()
-import sys
-import io
-import os
-
-sys.dont_write_bytecode = True
-from route import app, socketio
-
-
-from gevent.pywsgi import WSGIServer
-from geventwebsocket.handler import WebSocketHandler
-
-
-from gevent import monkey
-monkey.patch_all()
-
-try:
-    if __name__ == "__main__":
-
-        PORT = 7200
-        if os.path.exists('data/port.pl'):
-            f = open('data/port.pl')
-            PORT = int(f.read())
-            f.close()
-
-        # HOST = '0.0.0.0'
-        # app.run(host=HOST, port=PORT)
-
-        http_server = WSGIServer(
-            (HOST, PORT), app, handler_class=WebSocketHandler)
-        http_server.serve_forever()
-        socketio.run(app, host=HOST, port=PORT)
-except Exception as ex:
-    print(ex)

From 9ab361604ff68ba7f6194830680d6bd826ceeec9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 02:53:00 +0800
Subject: [PATCH 299/965] Update site.py

---
 web/utils/site.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 5d46eadbb..2ed4a2226 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -503,8 +503,8 @@ class sites(object):
                     http_ssl = http_ssl + "\n\tlisten [::]:443 quic;"
                     http_ssl = http_ssl + "\n\thttp2 on;"
                 else:
-                    http_ssl = "\n\tlisten 443 ssl http2;"
-                    http_ssl = http_ssl + "\n\tlisten [::]:443 ssl http2;"
+                    http_ssl = "\n\tlisten 443 ssl;"
+                    http_ssl = http_ssl + "\n\tlisten [::]:443 ssl;"
 
 
                 conf = conf.replace(listen, listen + http_ssl)

From 43384f8ca41621b3f1bfae844b115ea879940133 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 02:53:55 +0800
Subject: [PATCH 300/965] Update site.py

---
 web/utils/site.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 2ed4a2226..4d3c3269b 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -496,7 +496,7 @@ class sites(object):
             if not mw.inArray(tmp, '443'):
                 listen = re.search(rep, conf).group()
                 
-                if version.startswith('1.25'):
+                if version.startswith('1.25') or version.startswith('1.27'):
                     http_ssl = "\n\tlisten 443 ssl;"
                     http_ssl = http_ssl + "\n\tlisten [::]:443 ssl;"
                     http_ssl = http_ssl + "\n\tlisten 443 quic;"

From ce3e37b6f87b783d50a1bb54c7b2b371ca39cfc9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 02:54:41 +0800
Subject: [PATCH 301/965] Update site.py

---
 web/utils/site.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 4d3c3269b..60166b1b9 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -473,7 +473,7 @@ class sites(object):
     add_header Strict-Transport-Security "max-age=63072000";
     add_header Alt-Svc 'h3=":443";ma=86400';
 """
-                if not version.startswith('1.25'):
+                if not version.startswith('1.25') or version.startswith('1.27'):
                     http3Header = '';
 
                 sslStr = """#error_page 404/404.html;

From b3370f2937c6d4531d03f7c2e24880da872c2b3f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 03:04:04 +0800
Subject: [PATCH 302/965] Update firewall.py

---
 web/utils/firewall.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 7a1906a75..1cdf02df1 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -72,7 +72,7 @@ class Firewall(object):
 
             if not is_same:
                 t = {}
-                t['port'] = info[0]
+                t['port'] = info[0].replace('-',':')
                 t['protocol'] = info[1]
                 ports_all.append(t)
 

From 360d94d573f28bf718a70b09800aa03d2a567ff3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 03:07:09 +0800
Subject: [PATCH 303/965] Update firewall.py

---
 web/utils/firewall.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 1cdf02df1..4545d8f18 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -313,8 +313,10 @@ class Firewall(object):
     ):
         panel_port = mw.getPanelPort()
 
-        if(int(port) == int(panel_port)):
-            return mw.returnData(False, '失败，不能删除当前面板端口!')
+        if port.find(':') > 0:
+        else:
+            if(int(port) == int(panel_port)):
+                return mw.returnData(False, '失败，不能删除当前面板端口!')
         try:
             self.delAcceptPortCmd(port, protocol)
             mw.M('firewall').where("id=?", (firewall_id,)).delete()

From cfd7030d001dca3800ea81b60af6e177fd31f113 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 03:08:18 +0800
Subject: [PATCH 304/965] Update firewall.py

---
 web/utils/firewall.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 4545d8f18..27320b06e 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -314,6 +314,7 @@ class Firewall(object):
         panel_port = mw.getPanelPort()
 
         if port.find(':') > 0:
+            pass
         else:
             if(int(port) == int(panel_port)):
                 return mw.returnData(False, '失败，不能删除当前面板端口!')

From d5678d3f34db6ed582cc2f6641e01598b5ea6f96 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 03:08:33 +0800
Subject: [PATCH 305/965] Update firewall.py

---
 web/utils/firewall.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 27320b06e..3a5d1d7ac 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -315,6 +315,8 @@ class Firewall(object):
 
         if port.find(':') > 0:
             pass
+        elif port.find('-') > 0:
+            pass
         else:
             if(int(port) == int(panel_port)):
                 return mw.returnData(False, '失败，不能删除当前面板端口!')

From 8e0a4ec34bb446928e55e0dd9404bf82caebaaa4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 03:15:08 +0800
Subject: [PATCH 306/965] Update install.sh

---
 plugins/pureftp/install.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/pureftp/install.sh b/plugins/pureftp/install.sh
index 961fab27a..874c46668 100755
--- a/plugins/pureftp/install.sh
+++ b/plugins/pureftp/install.sh
@@ -7,8 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 
 if [ -f ${rootPath}/bin/activate ];then
 	source ${rootPath}/bin/activate
@@ -103,12 +101,12 @@ Install_pureftp()
 	
 	if [ -d ${serverPath}/pureftp ];then 
 		echo "${1}" > ${serverPath}/pureftp/version.pl
-		echo '安装完成' > $install_tmp
+		echo '安装完成'
 
 		cd ${rootPath} && python3 ${rootPath}/plugins/pureftp/index.py start
 		cd ${rootPath} && python3 ${rootPath}/plugins/pureftp/index.py initd_install
 	else
-		echo '安装失败' > $install_tmp
+		echo '安装失败'
 	fi
 }
 
@@ -128,7 +126,7 @@ Uninstall_pureftp()
 	rm -rf ${serverPath}/pureftp
 	userdel ftp
 	groupdel ftp
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1

From 4e6f867ba479708962f8db930ec63e3fff5f5dae Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 03:16:46 +0800
Subject: [PATCH 307/965] update

---
 plugins/php-apt/install.sh             | 5 ++---
 plugins/php-apt/versions/56/install.sh | 1 -
 plugins/php-apt/versions/70/install.sh | 2 --
 plugins/php-apt/versions/71/install.sh | 1 -
 plugins/php-apt/versions/72/install.sh | 1 -
 plugins/php-apt/versions/73/install.sh | 1 -
 plugins/php-apt/versions/74/install.sh | 2 --
 plugins/php-apt/versions/80/install.sh | 2 --
 plugins/php-apt/versions/81/install.sh | 2 --
 plugins/php-apt/versions/82/install.sh | 2 --
 plugins/php-apt/versions/83/install.sh | 2 --
 plugins/php-apt/versions/84/install.sh | 1 -
 12 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/plugins/php-apt/install.sh b/plugins/php-apt/install.sh
index 071fe921e..910d4b708 100755
--- a/plugins/php-apt/install.sh
+++ b/plugins/php-apt/install.sh
@@ -7,7 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 if id www &> /dev/null ;then 
     echo "www uid is `id -u www`"
@@ -34,12 +33,12 @@ type=$2
 apt_ver=${type:0:1}.${type:1:2}
 
 if [ "${2}" == "" ];then
-	echo '缺少安装脚本...' > $install_tmp
+	echo '缺少安装脚本...'
 	exit 0
 fi 
 
 if [ ! -d $curPath/versions/$2 ];then
-	echo '缺少安装脚本2...' > $install_tmp
+	echo '缺少安装脚本2...'
 	exit 0
 fi
 
diff --git a/plugins/php-apt/versions/56/install.sh b/plugins/php-apt/versions/56/install.sh
index 7fc6788dc..ba3973dc5 100755
--- a/plugins/php-apt/versions/56/install.sh
+++ b/plugins/php-apt/versions/56/install.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 
 #获取信息和版本
diff --git a/plugins/php-apt/versions/70/install.sh b/plugins/php-apt/versions/70/install.sh
index ba1457a76..3631acf80 100755
--- a/plugins/php-apt/versions/70/install.sh
+++ b/plugins/php-apt/versions/70/install.sh
@@ -8,8 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 
 #获取信息和版本
 # bash /www/server/mdsever-web/scripts/getos.sh
diff --git a/plugins/php-apt/versions/71/install.sh b/plugins/php-apt/versions/71/install.sh
index 0af724652..c8955a33a 100755
--- a/plugins/php-apt/versions/71/install.sh
+++ b/plugins/php-apt/versions/71/install.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 
 #获取信息和版本
diff --git a/plugins/php-apt/versions/72/install.sh b/plugins/php-apt/versions/72/install.sh
index 66bb3a74b..816f7f4db 100755
--- a/plugins/php-apt/versions/72/install.sh
+++ b/plugins/php-apt/versions/72/install.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 
 #获取信息和版本
diff --git a/plugins/php-apt/versions/73/install.sh b/plugins/php-apt/versions/73/install.sh
index e19cb1bb2..475825e55 100755
--- a/plugins/php-apt/versions/73/install.sh
+++ b/plugins/php-apt/versions/73/install.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 
 #获取信息和版本
diff --git a/plugins/php-apt/versions/74/install.sh b/plugins/php-apt/versions/74/install.sh
index f7852231f..956a864ff 100755
--- a/plugins/php-apt/versions/74/install.sh
+++ b/plugins/php-apt/versions/74/install.sh
@@ -8,8 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 
 #获取信息和版本
 # bash /www/server/mdsever-web/scripts/getos.sh
diff --git a/plugins/php-apt/versions/80/install.sh b/plugins/php-apt/versions/80/install.sh
index c8102196d..f30fba31c 100755
--- a/plugins/php-apt/versions/80/install.sh
+++ b/plugins/php-apt/versions/80/install.sh
@@ -8,8 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 
 #获取信息和版本
 # bash /www/server/mdsever-web/scripts/getos.sh
diff --git a/plugins/php-apt/versions/81/install.sh b/plugins/php-apt/versions/81/install.sh
index cdd5b943d..124c765ad 100755
--- a/plugins/php-apt/versions/81/install.sh
+++ b/plugins/php-apt/versions/81/install.sh
@@ -8,8 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 
 #获取信息和版本
 # bash /www/server/mdsever-web/scripts/getos.sh
diff --git a/plugins/php-apt/versions/82/install.sh b/plugins/php-apt/versions/82/install.sh
index bab78a3d1..b23415303 100755
--- a/plugins/php-apt/versions/82/install.sh
+++ b/plugins/php-apt/versions/82/install.sh
@@ -8,8 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 
 #获取信息和版本
 # bash /www/server/mdsever-web/scripts/getos.sh
diff --git a/plugins/php-apt/versions/83/install.sh b/plugins/php-apt/versions/83/install.sh
index d1ee9485a..e0ace4c94 100755
--- a/plugins/php-apt/versions/83/install.sh
+++ b/plugins/php-apt/versions/83/install.sh
@@ -8,8 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 
 #获取信息和版本
 # bash /www/server/mdsever-web/scripts/getos.sh
diff --git a/plugins/php-apt/versions/84/install.sh b/plugins/php-apt/versions/84/install.sh
index 17027048b..33f2925ab 100755
--- a/plugins/php-apt/versions/84/install.sh
+++ b/plugins/php-apt/versions/84/install.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 
 #获取信息和版本

From 82a5af071a233d9f9e9826125a85fe3e0bf63d41 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 03:17:52 +0800
Subject: [PATCH 308/965] update

---
 plugins/php-yum/install.sh             | 2 --
 plugins/php-yum/versions/74/install.sh | 3 +--
 plugins/php-yum/versions/80/install.sh | 4 +---
 plugins/php-yum/versions/81/install.sh | 4 +---
 plugins/php-yum/versions/82/install.sh | 4 +---
 plugins/php-yum/versions/83/install.sh | 4 +---
 plugins/php-yum/versions/84/install.sh | 4 +---
 7 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/plugins/php-yum/install.sh b/plugins/php-yum/install.sh
index 65581a900..49cc293d8 100755
--- a/plugins/php-yum/install.sh
+++ b/plugins/php-yum/install.sh
@@ -7,8 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 if id www &> /dev/null ;then 
     echo "www uid is `id -u www`"
     echo "www shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
diff --git a/plugins/php-yum/versions/74/install.sh b/plugins/php-yum/versions/74/install.sh
index 8b3eae5fd..b2098e1e5 100755
--- a/plugins/php-yum/versions/74/install.sh
+++ b/plugins/php-yum/versions/74/install.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 version=7.4.x
 PHP_VER=74
@@ -30,7 +29,7 @@ Uninstall_php()
 {
 	yum remove -y php74 php74-php-fpm php74-*
 	rm -rf $serverPath/php-yum/${PHP_VER}
-	echo "卸载php-${version}..." > $install_tmp
+	echo "卸载php-${version}..."
 }
 
 action=${1}
diff --git a/plugins/php-yum/versions/80/install.sh b/plugins/php-yum/versions/80/install.sh
index c3e0b37f0..070c2544c 100755
--- a/plugins/php-yum/versions/80/install.sh
+++ b/plugins/php-yum/versions/80/install.sh
@@ -8,8 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 
 version=8.0.x
 PHP_VER=80
@@ -32,7 +30,7 @@ Uninstall_php()
 {
 	# $serverPath/php-ya/init.d/php${PHP_VER} stop
 	rm -rf $serverPath/php-yum/${PHP_VER}
-	echo "卸载php-${version}..." > $install_tmp
+	echo "卸载php-${version}..."
 }
 
 action=${1}
diff --git a/plugins/php-yum/versions/81/install.sh b/plugins/php-yum/versions/81/install.sh
index c0b4bde9e..5877e21df 100755
--- a/plugins/php-yum/versions/81/install.sh
+++ b/plugins/php-yum/versions/81/install.sh
@@ -8,8 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 
 version=8.1.x
 PHP_VER=81
@@ -30,7 +28,7 @@ Uninstall_php()
 {
 	yum remove -y php81 php81-php-fpm php81-*
 	rm -rf $serverPath/php-yum/${PHP_VER}
-	echo "卸载php-${version}..." > $install_tmp
+	echo "卸载php-${version}..."
 }
 
 action=${1}
diff --git a/plugins/php-yum/versions/82/install.sh b/plugins/php-yum/versions/82/install.sh
index 8aa04e5f6..6440c2966 100755
--- a/plugins/php-yum/versions/82/install.sh
+++ b/plugins/php-yum/versions/82/install.sh
@@ -8,8 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 
 version=8.2.x
 PHP_VER=82
@@ -30,7 +28,7 @@ Uninstall_php()
 {
 	yum remove -y php82 php82-php-fpm php82-*
 	rm -rf $serverPath/php-yum/${PHP_VER}
-	echo "卸载php-${version}..." > $install_tmp
+	echo "卸载php-${version}..."
 }
 
 action=${1}
diff --git a/plugins/php-yum/versions/83/install.sh b/plugins/php-yum/versions/83/install.sh
index 59deca624..1a195b8c9 100755
--- a/plugins/php-yum/versions/83/install.sh
+++ b/plugins/php-yum/versions/83/install.sh
@@ -8,8 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 
 version=8.3.x
 PHP_VER=83
@@ -30,7 +28,7 @@ Uninstall_php()
 {
 	yum remove -y php83 php83-php-fpm php83-*
 	rm -rf $serverPath/php-yum/${PHP_VER}
-	echo "卸载php-${version}..." > $install_tmp
+	echo "卸载php-${version}..."
 }
 
 action=${1}
diff --git a/plugins/php-yum/versions/84/install.sh b/plugins/php-yum/versions/84/install.sh
index fcad71440..105495362 100755
--- a/plugins/php-yum/versions/84/install.sh
+++ b/plugins/php-yum/versions/84/install.sh
@@ -8,8 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 
 version=8.4.x
 PHP_VER=84
@@ -30,7 +28,7 @@ Uninstall_php()
 {
 	yum remove -y php84 php84-php-fpm php84-*
 	rm -rf $serverPath/php-yum/${PHP_VER}
-	echo "卸载php-${version}..." > $install_tmp
+	echo "卸载php-${version}..."
 }
 
 action=${1}

From 6a6166c8acb7872b4226e5031a6d3313dcbd318f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 03:20:54 +0800
Subject: [PATCH 309/965] update

---
 plugins/php/install.sh             | 5 ++---
 plugins/php/versions/52/install.sh | 5 ++---
 plugins/php/versions/53/install.sh | 5 ++---
 plugins/php/versions/54/install.sh | 6 ++----
 plugins/php/versions/55/install.sh | 6 ++----
 plugins/php/versions/56/install.sh | 6 ++----
 plugins/php/versions/70/install.sh | 3 +--
 plugins/php/versions/71/install.sh | 6 ++----
 plugins/php/versions/72/install.sh | 2 --
 plugins/php/versions/73/install.sh | 1 -
 plugins/php/versions/74/install.sh | 1 -
 plugins/php/versions/80/install.sh | 3 +--
 plugins/php/versions/81/install.sh | 3 +--
 plugins/php/versions/82/install.sh | 3 +--
 plugins/php/versions/83/install.sh | 3 +--
 plugins/php/versions/84/install.sh | 3 +--
 16 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/plugins/php/install.sh b/plugins/php/install.sh
index 7ce3a2a01..1460c6cc0 100755
--- a/plugins/php/install.sh
+++ b/plugins/php/install.sh
@@ -7,7 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 if id www &> /dev/null ;then 
     echo "www uid is `id -u www`"
@@ -22,12 +21,12 @@ action=$1
 type=$2
 
 if [ "${2}" == "" ];then
-	echo '缺少安装脚本...' > $install_tmp
+	echo '缺少安装脚本...'
 	exit 0
 fi 
 
 if [ ! -d $curPath/versions/$2 ];then
-	echo '缺少安装脚本2...' > $install_tmp
+	echo '缺少安装脚本2...'
 	exit 0
 fi
 
diff --git a/plugins/php/versions/52/install.sh b/plugins/php/versions/52/install.sh
index a4d80eea5..28ef0b968 100755
--- a/plugins/php/versions/52/install.sh
+++ b/plugins/php/versions/52/install.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 SYS_ARCH=`arch`
 
 version=5.2.17
@@ -16,7 +15,7 @@ PHP_VER=52
 Install_php()
 {
 #------------------------ install start ------------------------------------#
-echo "安装php-${version} ..." > $install_tmp
+echo "安装php-${version} ..."
 mkdir -p $sourcePath/php
 mkdir -p $serverPath/php
 
@@ -163,7 +162,7 @@ Uninstall_php()
 {
 	$serverPath/php/init.d/php${PHP_VER} stop
 	rm -rf $serverPath/php/${PHP_VER}
-	echo "uninstall php-${version} ..." > $install_tmp
+	echo "uninstall php-${version} ..."
 }
 
 action=${1}
diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh
index 48713d8d6..5bd5a99e9 100755
--- a/plugins/php/versions/53/install.sh
+++ b/plugins/php/versions/53/install.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 SYS_ARCH=`arch`
 
 version=5.3.29
@@ -16,7 +15,7 @@ PHP_VER=53
 Install_php()
 {
 #------------------------ install start ------------------------------------#
-echo "安装php-5.3.29 ..." > $install_tmp
+echo "安装php-5.3.29 ..."
 mkdir -p $sourcePath/php
 mkdir -p $serverPath/php
 
@@ -167,7 +166,7 @@ Uninstall_php()
 {
 	$serverPath/php/init.d/php53 stop
 	rm -rf $serverPath/php/53
-	echo "uninstall php-5.3.29 ..." > $install_tmp
+	echo "uninstall php-5.3.29 ..."
 }
 
 action=${1}
diff --git a/plugins/php/versions/54/install.sh b/plugins/php/versions/54/install.sh
index a1ebad15c..149acba46 100755
--- a/plugins/php/versions/54/install.sh
+++ b/plugins/php/versions/54/install.sh
@@ -10,14 +10,12 @@ sourcePath=${serverPath}/source
 sysName=`uname`
 SYS_ARCH=`arch`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 version=5.4.45
 PHP_VER=54
 Install_php()
 {
 #------------------------ install start ------------------------------------#
-echo "安装php-${version} ..." > $install_tmp
+echo "安装php-${version} ..."
 mkdir -p $sourcePath/php
 mkdir -p $serverPath/php
 
@@ -182,7 +180,7 @@ Uninstall_php()
 {
 	$serverPath/php/init.d/php54 stop
 	rm -rf $serverPath/php/54
-	echo "卸载php-5.4.45 ..." > $install_tmp
+	echo "卸载php-5.4.45 ..."
 }
 
 action=${1}
diff --git a/plugins/php/versions/55/install.sh b/plugins/php/versions/55/install.sh
index 7b8cdef88..01e26ecb6 100755
--- a/plugins/php/versions/55/install.sh
+++ b/plugins/php/versions/55/install.sh
@@ -10,14 +10,12 @@ sourcePath=${serverPath}/source
 sysName=`uname`
 SYS_ARCH=`arch`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 version=5.5.38
 PHP_VER=55
 Install_php()
 {
 #------------------------ install start ------------------------------------#
-echo "安装php-5.5.38 ..." > $install_tmp
+echo "安装php-5.5.38 ..."
 mkdir -p $sourcePath/php
 mkdir -p $serverPath/php
 
@@ -151,7 +149,7 @@ Uninstall_php()
 {
 	$serverPath/php/init.d/php55 stop
 	rm -rf $serverPath/php/55
-	echo "卸载php-5.5.38 ..." > $install_tmp
+	echo "卸载php-5.5.38 ..."
 }
 
 action=${1}
diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh
index 8224972af..be2fef3da 100755
--- a/plugins/php/versions/56/install.sh
+++ b/plugins/php/versions/56/install.sh
@@ -12,15 +12,13 @@ sourcePath=${serverPath}/source
 sysName=`uname`
 SYS_ARCH=`arch`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 version=5.6.40
 PHP_VER=56
 
 Install_php()
 {
 #------------------------ install start ------------------------------------#
-echo "安装php-${version} ..." > $install_tmp
+echo "安装php-${version} ..." >
 mkdir -p $sourcePath/php
 mkdir -p $serverPath/php
 
@@ -161,7 +159,7 @@ Uninstall_php()
 {
 	$serverPath/php/init.d/php56 stop
 	rm -rf $serverPath/php/56
-	echo "卸载php-${version} ..." > $install_tmp
+	echo "卸载php-${version} ..."
 }
 
 action=${1}
diff --git a/plugins/php/versions/70/install.sh b/plugins/php/versions/70/install.sh
index 6f262eadb..f2792f258 100755
--- a/plugins/php/versions/70/install.sh
+++ b/plugins/php/versions/70/install.sh
@@ -9,14 +9,13 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
 SYS_ARCH=`arch`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 version=7.0.33
 PHP_VER=70
 Install_php()
 {
 #------------------------ install start ------------------------------------#
-echo "安装php-${version} ..." > $install_tmp
+echo "安装php-${version} ..."
 mkdir -p $sourcePath/php
 mkdir -p $serverPath/php
 
diff --git a/plugins/php/versions/71/install.sh b/plugins/php/versions/71/install.sh
index 73f7818e8..542db0efa 100755
--- a/plugins/php/versions/71/install.sh
+++ b/plugins/php/versions/71/install.sh
@@ -10,14 +10,12 @@ sourcePath=${serverPath}/source
 sysName=`uname`
 SYS_ARCH=`arch`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 version=7.1.33
 PHP_VER=71
 Install_php()
 {
 #------------------------ install start ------------------------------------#
-echo "安装php-${version} ..." > $install_tmp
+echo "安装php-${version} ..."
 mkdir -p $sourcePath/php
 mkdir -p $serverPath/php
 
@@ -144,7 +142,7 @@ Uninstall_php()
 {
 	$serverPath/php/init.d/php71 stop
 	rm -rf $serverPath/php/71
-	echo "卸载php-${version}..." > $install_tmp
+	echo "卸载php-${version}..."
 }
 
 action=${1}
diff --git a/plugins/php/versions/72/install.sh b/plugins/php/versions/72/install.sh
index b61f972fa..01f63f99e 100755
--- a/plugins/php/versions/72/install.sh
+++ b/plugins/php/versions/72/install.sh
@@ -9,8 +9,6 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
 SYS_ARCH=`arch`
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 
 version=7.2.31
 PHP_VER=72
diff --git a/plugins/php/versions/73/install.sh b/plugins/php/versions/73/install.sh
index 71834229e..2a538c05f 100755
--- a/plugins/php/versions/73/install.sh
+++ b/plugins/php/versions/73/install.sh
@@ -9,7 +9,6 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
 SYS_ARCH=`arch`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
 function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh
index 8d77742b7..226affc6f 100755
--- a/plugins/php/versions/74/install.sh
+++ b/plugins/php/versions/74/install.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
 function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
diff --git a/plugins/php/versions/80/install.sh b/plugins/php/versions/80/install.sh
index dd67abcf4..57ae1c0aa 100755
--- a/plugins/php/versions/80/install.sh
+++ b/plugins/php/versions/80/install.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
 function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
@@ -21,7 +20,7 @@ PHP_VER=80
 Install_php()
 {
 #------------------------ install start ------------------------------------#
-echo "安装php-${version} ..." > $install_tmp
+echo "安装php-${version} ..."
 mkdir -p $sourcePath/php
 mkdir -p $serverPath/php
 
diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh
index e03bc9824..784bc27cf 100755
--- a/plugins/php/versions/81/install.sh
+++ b/plugins/php/versions/81/install.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
 function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
@@ -21,7 +20,7 @@ PHP_VER=81
 Install_php()
 {
 #------------------------ install start ------------------------------------#
-echo "安装php-${version} ..." > $install_tmp
+echo "安装php-${version} ..."
 mkdir -p $sourcePath/php
 mkdir -p $serverPath/php
 
diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh
index a4cb42167..d30d81356 100755
--- a/plugins/php/versions/82/install.sh
+++ b/plugins/php/versions/82/install.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
 function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
@@ -21,7 +20,7 @@ PHP_VER=82
 Install_php()
 {
 #------------------------ install start ------------------------------------#
-echo "安装php-${version} ..." > $install_tmp
+echo "安装php-${version} ..."
 mkdir -p $sourcePath/php
 mkdir -p $serverPath/php
 
diff --git a/plugins/php/versions/83/install.sh b/plugins/php/versions/83/install.sh
index 218b88925..d3d35f33a 100755
--- a/plugins/php/versions/83/install.sh
+++ b/plugins/php/versions/83/install.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
 function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
@@ -20,7 +19,7 @@ PHP_VER=83
 Install_php()
 {
 #------------------------ install start ------------------------------------#
-echo "安装php-${version} ..." > $install_tmp
+echo "安装php-${version} ..."
 mkdir -p $sourcePath/php
 mkdir -p $serverPath/php
 
diff --git a/plugins/php/versions/84/install.sh b/plugins/php/versions/84/install.sh
index d34ec9f11..7024f0b2d 100755
--- a/plugins/php/versions/84/install.sh
+++ b/plugins/php/versions/84/install.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
 function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
@@ -20,7 +19,7 @@ PHP_VER=84
 Install_php()
 {
 #------------------------ install start ------------------------------------#
-echo "安装php-${version} ..." > $install_tmp
+echo "安装php-${version} ..."
 mkdir -p $sourcePath/php
 mkdir -p $serverPath/php
 

From bd5753eb277622d14b5151fe8e62d58d294c9fd0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 16:26:18 +0800
Subject: [PATCH 310/965] Update panel_task.py

---
 panel_task.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panel_task.py b/panel_task.py
index 97c64e853..ba3fe4482 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -148,7 +148,7 @@ def siteEdate():
         oldEdate = mEdate
         mw.writeFile('data/edate.pl', mEdate)
     except Exception as e:
-        print(str(e))
+        print(mw.getTracebackInfo())
 
 
 def systemTask():

From 8af22d14c865283593c4286f01437171571a4a7d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 16:52:18 +0800
Subject: [PATCH 311/965] update

---
 web/admin/site/site.py | 16 ++++++++++++++
 web/thisdb/sites.py    |  4 ++++
 web/utils/site.py      | 47 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)

diff --git a/web/admin/site/site.py b/web/admin/site/site.py
index 0650bda16..1eeb82f27 100644
--- a/web/admin/site/site.py
+++ b/web/admin/site/site.py
@@ -53,6 +53,22 @@ def add():
     port = request.form.get('port', '')
     return MwSites.instance().add(webinfo, port, ps, path, version)
 
+# 站点停止
+@blueprint.route('/stop', endpoint='stop',methods=['POST'])
+@panel_login_required
+def stop():
+    site_id = request.form.get('id', '')
+    site_name = request.form.get('name', '')
+    return MwSites.instance().stop(site_id, site_name)
+
+# 站点开启
+@blueprint.route('/start', endpoint='start',methods=['POST'])
+@panel_login_required
+def start():
+    site_id = request.form.get('id', '')
+    site_name = request.form.get('name', '')
+    return MwSites.instance().start(site_id, site_name)
+
 # 添加站点 - 域名
 @blueprint.route('/add_domain', endpoint='add_domain',methods=['POST'])
 @panel_login_required
diff --git a/web/thisdb/sites.py b/web/thisdb/sites.py
index 20c316012..95a426526 100644
--- a/web/thisdb/sites.py
+++ b/web/thisdb/sites.py
@@ -106,6 +106,7 @@ def setSitesData(site_id,
     edate: str | None = None,
     ps: str | None = None,
     path: str | None = None,
+    status: str | None = None,
 ):
     update_data = {}
     if edate is not None:
@@ -116,5 +117,8 @@ def setSitesData(site_id,
     if path is not None:
         update_data['path'] = path
 
+    if status is not None:
+        update_data['status'] = status
+
     return mw.M('sites').where('id=?',(site_id,)).update(update_data)
 
diff --git a/web/utils/site.py b/web/utils/site.py
index 60166b1b9..055df1e12 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -211,6 +211,53 @@ class sites(object):
         mw.restartWeb()
         return mw.returnData(True, '添加成功')
 
+    def stop(self, site_id, site_name):
+        path = self.setupPath + '/stop'
+        if not os.path.exists(path):
+            os.makedirs(path)
+            default_text = 'The website has been closed!!!'
+            mw.writeFile(path + '/index.html', default_text)
+
+        binding = thisdb.getBindingListBySiteId(site_id)
+        for b in binding:
+            bpath = path + '/' + b['path']
+            if not os.path.exists(bpath):
+                mw.execShell('mkdir -p ' + bpath)
+                mw.execShell('ln -sf ' + path +'/index.html ' + bpath + '/index.html')
+
+        site_info = thisdb.getSitesById(site_id)
+
+        # nginx
+        file = self.getHostConf(site_name)
+        conf = mw.readFile(file)
+        if conf:
+            conf = conf.replace(site_info['path'], path)
+            mw.writeFile(file, conf)
+
+        thisdb.setSitesData(site_id, status='0')
+        msg = mw.getInfo('网站[{1}]已被停用!', (site_name,))
+        mw.writeLog('网站管理', msg)
+        mw.restartWeb()
+        return mw.returnData(True, '站点已停用!')
+
+    def start(self, site_id, site_name):
+        path = self.setupPath + '/stop'
+
+        site_info = thisdb.getSitesById(site_id)
+        # nginx
+        file = self.getHostConf(site_name)
+        conf = mw.readFile(file)
+        if conf:
+            conf = conf.replace(path, site_info['path'])
+            mw.writeFile(file, conf)
+
+        thisdb.setSitesData(site_id, status='1')
+        
+        msg = mw.getInfo('网站[{1}]已被启用!', (site_name,))
+        mw.writeLog('网站管理', msg)
+        mw.restartWeb()
+        return mw.returnData(True, '站点已启用!')
+
     def nginxAddDomain(self, site_name, domain, port):
         file = self.getHostConf(site_name)
         conf = mw.readFile(file)

From 5796e311a9578698e5033734954e521b65a682b2 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 22:13:45 +0800
Subject: [PATCH 312/965] update

---
 panel_task.py          | 31 +++++++++++++------------------
 web/admin/site/site.py |  6 ++----
 web/static/app/site.js | 25 ++++++++++++-------------
 web/thisdb/sites.py    |  4 ++++
 web/utils/site.py      | 19 ++++++++++---------
 5 files changed, 41 insertions(+), 44 deletions(-)

diff --git a/panel_task.py b/panel_task.py
index ba3fe4482..f896256f1 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -114,10 +114,10 @@ def runPanelTask():
             thisdb.setTaskData(run_task['id'], end=end)
             thisdb.setTaskStatus(run_task['id'], 1)
     except Exception as e:
-        print(mw.getTracebackInfo())
+        pass
 
     # 站点过期检查
-    # siteEdate()
+    siteEdateCheck()
 
 # 任务队列
 def startPanelTask():
@@ -130,25 +130,20 @@ def startPanelTask():
         startPanelTask()
 
 # 网站到期处理
-def siteEdate():
-    global oldEdate
+def siteEdateCheck():
     try:
-        if not oldEdate:
-            oldEdate = mw.readFile('data/edate.pl')
-        if not oldEdate:
-            oldEdate = '0000-00-00'
-        mEdate = time.strftime('%Y-%m-%d', time.localtime())
-        if oldEdate == mEdate:
+        from utils.site import sites as MwSites
+        website_edate = thisdb.getOption('website_edate', default='0000-00-00')
+        now_time_ymd = time.strftime('%Y-%m-%d', time.localtime())
+
+        if website_edate == now_time_ymd:
             return False
-        edateSites = mw.M('sites').where('edate>? AND edate<? AND (status=? OR status=?)',
-                                         ('0000-00-00', mEdate, 1, '正在运行')).field('id,name').select()
-        import site_api
-        for site in edateSites:
-            site_api.site_api().stop(site['id'], site['name'])
-        oldEdate = mEdate
-        mw.writeFile('data/edate.pl', mEdate)
+        site_list = thisdb.getSitesEdateList(now_time_ymd)
+        for site in site_list:
+            MwSites.instance().stop(site['id'])
+        thisdb.setOption('website_edate', now_time_ymd)
     except Exception as e:
-        print(mw.getTracebackInfo())
+        pass
 
 
 def systemTask():
diff --git a/web/admin/site/site.py b/web/admin/site/site.py
index 1eeb82f27..b0e925977 100644
--- a/web/admin/site/site.py
+++ b/web/admin/site/site.py
@@ -58,16 +58,14 @@ def add():
 @panel_login_required
 def stop():
     site_id = request.form.get('id', '')
-    site_name = request.form.get('name', '')
-    return MwSites.instance().stop(site_id, site_name)
+    return MwSites.instance().stop(site_id)
 
 # 站点开启
 @blueprint.route('/start', endpoint='start',methods=['POST'])
 @panel_login_required
 def start():
     site_id = request.form.get('id', '')
-    site_name = request.form.get('name', '')
-    return MwSites.instance().start(site_id, site_name)
+    return MwSites.instance().start(site_id)
 
 # 添加站点 - 域名
 @blueprint.route('/add_domain', endpoint='add_domain',methods=['POST'])
diff --git a/web/static/app/site.js b/web/static/app/site.js
index 8bd7f51fa..2993a5b22 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -10,6 +10,16 @@ $('#site_search').click(function(){
 	getWeb(1, -1, $('#site_search_input').val());
 });
 
+//设置到期日期
+function getDate(a) {
+	var dd = new Date();
+	dd.setTime(dd.getTime() + (a == undefined || isNaN(parseInt(a)) ? 0 : parseInt(a)) * 86400000);
+	var y = dd.getFullYear();
+	var m = dd.getMonth() + 1;
+	var d = dd.getDate();
+	return y + "-" + (m < 10 ? ('0' + m) : m) + "-" + (d < 10 ? ('0' + d) : d);
+}
+
 /**
  * 取回网站数据列表
  * @param {Number} page   当前页
@@ -84,22 +94,12 @@ $('#site_search').click(function(){
 					</td></tr>"
 			
 			$("#webBody").append(body);
-			//setEdate(data.data[i].id,data.data[i].edate);
-         	//设置到期日期
-			function getDate(a) {
-				var dd = new Date();
-				dd.setTime(dd.getTime() + (a == undefined || isNaN(parseInt(a)) ? 0 : parseInt(a)) * 86400000);
-				var y = dd.getFullYear();
-				var m = dd.getMonth() + 1;
-				var d = dd.getDate();
-				return y + "-" + (m < 10 ? ('0' + m) : m) + "-" + (d < 10 ? ('0' + d) : d);
-			}
             $('#webBody').on('click','#site_'+ data.data[i].id,function(){
 				var _this = $(this);
 				var id = $(this).attr('data-ids');
 				laydate.render({
 					elem: '#site_'+ id,
-					min:getDate(1),
+					min:getDate(-1),
 					max:'9999-12-31',
 					vlue:getDate(365),
 					type:'date',
@@ -111,7 +111,7 @@ $('#site_search').click(function(){
 						if(_this.html() == '永久'){
 						 	dates = '0000-00-00';
 						}
-						var loadT = layer.msg(lan.site.saving_txt, { icon: 16, time: 0, shade: [0.3, "#000"]}); 
+						var loadT = layer.msg('正在保存...', { icon: 16, time: 0, shade: [0.3, "#000"]}); 
 						$.post('/site/set_end_date','id='+id+'&edate='+dates,function(rdata){
 							layer.close(loadT);
 							layer.msg(rdata.msg,{icon:rdata.status?1:5});
@@ -123,7 +123,6 @@ $('#site_search').click(function(){
 		}
 		if(body.length < 10){
 			body = "<tr><td colspan='9' style='text-align: center;'>当前没有站点数据</td></tr>";
-			// $(".dataTables_paginate").hide();
 			$("#webBody").html(body);
 		}
 		//输出数据列表
diff --git a/web/thisdb/sites.py b/web/thisdb/sites.py
index 95a426526..e02daa300 100644
--- a/web/thisdb/sites.py
+++ b/web/thisdb/sites.py
@@ -66,6 +66,10 @@ def isSitesExist(name):
         return True
     return False
 
+def getSitesEdateList(edate):
+    elist = mw.M('sites').field(__FIELD).where('edate>? AND edate<? AND status=?', ('0000-00-00', edate, 1,)).select()
+    return elist
+
 def getSitesList(
     page:int | None = 1,
     size:int | None = 10,
diff --git a/web/utils/site.py b/web/utils/site.py
index 055df1e12..5d8a460dd 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -211,7 +211,9 @@ class sites(object):
         mw.restartWeb()
         return mw.returnData(True, '添加成功')
 
-    def stop(self, site_id, site_name):
+    def stop(self, site_id):
+        site_info = thisdb.getSitesById(site_id)
+
         path = self.setupPath + '/stop'
         if not os.path.exists(path):
             os.makedirs(path)
@@ -225,27 +227,26 @@ class sites(object):
                 mw.execShell('mkdir -p ' + bpath)
                 mw.execShell('ln -sf ' + path +'/index.html ' + bpath + '/index.html')
 
-        site_info = thisdb.getSitesById(site_id)
 
         # nginx
-        file = self.getHostConf(site_name)
+        file = self.getHostConf(site_info['name'])
         conf = mw.readFile(file)
         if conf:
             conf = conf.replace(site_info['path'], path)
             mw.writeFile(file, conf)
 
         thisdb.setSitesData(site_id, status='0')
-        msg = mw.getInfo('网站[{1}]已被停用!', (site_name,))
+        msg = mw.getInfo('网站[{1}]已被停用!', (site_info['name'],))
         mw.writeLog('网站管理', msg)
         mw.restartWeb()
         return mw.returnData(True, '站点已停用!')
 
-    def start(self, site_id, site_name):
-        path = self.setupPath + '/stop'
-
+    def start(self, site_id):
         site_info = thisdb.getSitesById(site_id)
+
+        path = self.setupPath + '/stop'
         # nginx
-        file = self.getHostConf(site_name)
+        file = self.getHostConf(site_info['name'])
         conf = mw.readFile(file)
         if conf:
             conf = conf.replace(path, site_info['path'])
@@ -253,7 +254,7 @@ class sites(object):
 
         thisdb.setSitesData(site_id, status='1')
         
-        msg = mw.getInfo('网站[{1}]已被启用!', (site_name,))
+        msg = mw.getInfo('网站[{1}]已被启用!', (site_info['name'],))
         mw.writeLog('网站管理', msg)
         mw.restartWeb()
         return mw.returnData(True, '站点已启用!')

From 4b7296f99eefeecdbb5bfcab24366edfb76384f9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 22:16:19 +0800
Subject: [PATCH 313/965] Update panel_task.py

---
 panel_task.py | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/panel_task.py b/panel_task.py
index f896256f1..1c26b6fb0 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -31,8 +31,6 @@ from admin import setup
 setup.init()
 
 g_log_file = mw.getPanelTaskLog()
-isTask = mw.getMWLogs() + '/panelTask.pl'
-
 if not os.path.exists(g_log_file):
     os.system("touch " + g_log_file)
 
@@ -95,6 +93,9 @@ def downloadHook(count, blockSize, totalSize):
     writeLogs(json.dumps(speed))
 
 def runPanelTask():
+    # 站点过期检查
+    siteEdateCheck()
+
     try:
         bash_list = thisdb.getTaskList(status=-1)
         for task in bash_list:
@@ -116,19 +117,6 @@ def runPanelTask():
     except Exception as e:
         pass
 
-    # 站点过期检查
-    siteEdateCheck()
-
-# 任务队列
-def startPanelTask():
-    try:
-        while True:
-            runPanelTask()
-            time.sleep(5)
-    except Exception as e:
-        time.sleep(30)
-        startPanelTask()
-
 # 网站到期处理
 def siteEdateCheck():
     try:
@@ -145,6 +133,15 @@ def siteEdateCheck():
     except Exception as e:
         pass
 
+# 任务队列
+def startPanelTask():
+    try:
+        while True:
+            runPanelTask()
+            time.sleep(5)
+    except Exception as e:
+        time.sleep(30)
+        startPanelTask()
 
 def systemTask():
     # 系统监控任务
@@ -157,7 +154,6 @@ def systemTask():
         time.sleep(30)
         systemTask()
 
-
 # -------------------------------------- PHP监控 start --------------------------------------------- #
 # 502错误检查线程
 def check502Task():
@@ -239,7 +235,7 @@ def startPHPVersion(version):
         if os.path.exists(cgi):
             return True
     except Exception as e:
-        print(mw.getTracebackInfo())
+        # print(mw.getTracebackInfo())
         mw.writeLog('PHP守护程序', '自动修复异常:'+str(e))
         return True
 
@@ -331,13 +327,11 @@ def run():
     oraos = setDaemon(oraos)
     oraos.start()
 
-
     # OpenResty Auto Restart Start
     oar = threading.Thread(target=openrestyAutoRestart)
     oar = setDaemon(oar)
     oar.start()
 
-
     # Panel Restart Start
     rps = threading.Thread(target=restartPanelService)
     rps = setDaemon(rps)

From ffcceb16cf85a2f1456e202e785d614d271ce96b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 25 Nov 2024 22:38:16 +0800
Subject: [PATCH 314/965] update

---
 web/admin/site/site.py          |  3 +-
 web/static/app/site.js          | 55 ++++++++++++++++-----------------
 web/templates/default/site.html | 12 ++++---
 web/thisdb/sites.py             |  9 ++++--
 4 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/web/admin/site/site.py b/web/admin/site/site.py
index b0e925977..26ffbd81b 100644
--- a/web/admin/site/site.py
+++ b/web/admin/site/site.py
@@ -34,8 +34,9 @@ def list():
     limit = request.form.get('limit', '10')
     type_id = request.form.get('type_id', '0').strip()
     search = request.form.get('search', '').strip()
+    order = request.form.get('order', '').strip()
 
-    info = thisdb.getSitesList(page=int(p),size=int(limit),type_id=int(type_id), search=search)
+    info = thisdb.getSitesList(page=int(p),size=int(limit),type_id=int(type_id), search=search,order=order)
 
     data = {}
     data['data'] = info['list']
diff --git a/web/static/app/site.js b/web/static/app/site.js
index 2993a5b22..ff10cea86 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -45,56 +45,56 @@ function getDate(a) {
 		type = '&type_id='+type_id;
 	}
 
-	var sUrl = '/site/list';
 	var pdata = 'limit=10&p=' + page + '&search=' + search + order + type;
 	var loadT = layer.load();
 	//取回数据
-	$.post(sUrl, pdata, function(data) {
+	$.post('/site/list', pdata, function(data) {
 		layer.close(loadT);
 		//构造数据列表
 		var body = '';
 		$("#webBody").html(body);
-		for (var i = 0; i < data.data.length; i++) {
+		var list = data.data;
+		for (var i = 0; i < list.length; i++) {
 			//当前站点状态
-			if (data.data[i].status == '正在运行' || data.data[i].status == '1') {
-				var status = "<a href='javascript:;' title='停用这个站点' onclick=\"webStop(" + data.data[i].id + ",'" + data.data[i].name + "')\" class='btn-defsult'><span style='color:rgb(92, 184, 92)'>运行中</span><span style='color:rgb(92, 184, 92)' class='glyphicon glyphicon-play'></span></a>";
+			if (list[i].status == '正在运行' || list[i].status == '1') {
+				var status = "<a href='javascript:;' title='停用这个站点' onclick=\"webStop(" + list[i].id + ",'" + list[i].name + "')\" class='btn-defsult'><span style='color:rgb(92, 184, 92)'>运行中</span><span style='color:rgb(92, 184, 92)' class='glyphicon glyphicon-play'></span></a>";
 			} else {
-				var status = "<a href='javascript:;' title='启用这个站点' onclick=\"webStart(" + data.data[i].id + ",'" + data.data[i].name + "')\" class='btn-defsult'><span style='color:red'>已停止</span><span style='color:rgb(255, 0, 0);' class='glyphicon glyphicon-pause'></span></a>";
+				var status = "<a href='javascript:;' title='启用这个站点' onclick=\"webStart(" + list[i].id + ",'" + list[i].name + "')\" class='btn-defsult'><span style='color:red'>已停止</span><span style='color:rgb(255, 0, 0);' class='glyphicon glyphicon-pause'></span></a>";
 			}
 
 			//是否有备份
-			if (data.data[i].backup_count > 0) {
-				var backup = "<a href='javascript:;' class='btlink' onclick=\"getBackup(" + data.data[i].id + ")\">有备份</a>";
+			if (list[i].backup_count > 0) {
+				var backup = "<a href='javascript:;' class='btlink' onclick=\"getBackup(" + list[i].id + ")\">有备份</a>";
 			} else {
-				var backup = "<a href='javascript:;' class='btlink' onclick=\"getBackup(" + data.data[i].id + ")\">无备份</a>";
+				var backup = "<a href='javascript:;' class='btlink' onclick=\"getBackup(" + list[i].id + ")\">无备份</a>";
 			}
 			//是否设置有效期
-			var web_end_time = (data.data[i].edate == "0000-00-00") ? '永久': data.data[i].edate;
+			var web_end_time = (list[i].edate == "0000-00-00") ? '永久': list[i].edate;
 			//表格主体
-			var shortwebname = data.data[i].name;
-			var shortpath = data.data[i].path;
-			if(data.data[i].name.length > 30) {
-				shortwebname = data.data[i].name.substring(0, 30) + "...";
+			var shortwebname = list[i].name;
+			var shortpath = list[i].path;
+			if(list[i].name.length > 30) {
+				shortwebname = list[i].name.substring(0, 30) + "...";
 			}
-			if(data.data[i].path.length > 30){
-				shortpath = data.data[i].path.substring(0, 30) + "...";
+			if(list[i].path.length > 30){
+				shortpath = list[i].path.substring(0, 30) + "...";
 			}
-			var idname = data.data[i].name.replace(/\./g,'_');
+			var idname = list[i].name.replace(/\./g,'_');
 			
-			body = "<tr><td><input type='checkbox' name='id' title='"+data.data[i].name+"' onclick='checkSelect();' value='" + data.data[i].id + "'></td>\
-					<td><a class='btlink webtips' href='javascript:;' onclick=\"webEdit(" + data.data[i].id + ",'" + data.data[i].name + "','" + data.data[i].edate + "','" + data.data[i].add_time + "')\" title='"+data.data[i].name+"'>" + shortwebname + "</td>\
+			body = "<tr><td><input type='checkbox' name='id' title='"+list[i].name+"' onclick='checkSelect();' value='" + list[i].id + "'></td>\
+					<td><a class='btlink webtips' href='javascript:;' onclick=\"webEdit(" + list[i].id + ",'" + list[i].name + "','" + list[i].edate + "','" + list[i].add_time + "')\" title='"+list[i].name+"'>" + shortwebname + "</td>\
 					<td>" + status + "</td>\
 					<td>" + backup + "</td>\
-					<td><a class='btlink' title='打开目录"+data.data[i].path+"' href=\"javascript:openPath('"+data.data[i].path+"');\">" + shortpath + "</a></td>\
-					<td><a class='btlink setTimes' id='site_"+data.data[i].id+"' data-ids='"+data.data[i].id+"'>" + web_end_time + "</a></td>\
-					<td><a class='btlinkbed' href='javascript:;' data-id='"+data.data[i].id+"'>" + data.data[i].ps + "</a></td>\
+					<td><a class='btlink' title='打开目录"+list[i].path+"' href=\"javascript:openPath('"+data.data[i].path+"');\">" + shortpath + "</a></td>\
+					<td><a class='btlink setTimes' id='site_"+list[i].id+"' data-ids='"+list[i].id+"'>" + web_end_time + "</a></td>\
+					<td><a class='btlinkbed' href='javascript:;' data-id='"+list[i].id+"'>" + list[i].ps + "</a></td>\
 					<td style='text-align:right; color:#bbb'>\
-					<a href='javascript:;' class='btlink' onclick=\"webEdit(" + data.data[i].id + ",'" + data.data[i].name + "','" + data.data[i].edate + "','" + data.data[i].add_time + "')\">设置</a>\
-                        | <a href='javascript:;' class='btlink' onclick=\"webDelete('" + data.data[i].id + "','" + data.data[i].name + "')\" title='删除站点'>删除</a>\
+					<a href='javascript:;' class='btlink' onclick=\"webEdit(" + list[i].id + ",'" + list[i].name + "','" +list[i].edate + "','" + list[i].add_time + "')\">设置</a>\
+                        | <a href='javascript:;' class='btlink' onclick=\"webDelete('" + list[i].id + "','" + list[i].name + "')\" title='删除站点'>删除</a>\
 					</td></tr>"
 			
 			$("#webBody").append(body);
-            $('#webBody').on('click','#site_'+ data.data[i].id,function(){
+            $('#webBody').on('click','#site_'+ list[i].id,function(){
 				var _this = $(this);
 				var id = $(this).attr('data-ids');
 				laydate.render({
@@ -134,7 +134,6 @@ function getDate(a) {
 		
 		//输出分页
 		$("#webPage").html(data.page);
-		// $("#webPage").html('<div class="site_type"><span>站点分类:</span><select class="bt-input-text mr5" style="width:100px"><option value="-1">全部分类</option><option value="0">默认分类</option></select></div>');
 		
 		$(".btlinkbed").click(function(){
 			var dataid = $(this).attr("data-id");
@@ -336,9 +335,7 @@ function webAddPage(type) {
 				if (len > 20) {
 					str = str.substring(0, 20);
 					$(this).val(str);
-					layer.msg('不能超出20个字符!', {
-						icon: 0
-					});
+					layer.msg('不能超出20个字符!', {icon: 0});
 				}
 			})
 			//获取当前时间时间戳，截取后6位
diff --git a/web/templates/default/site.html b/web/templates/default/site.html
index aa91828b4..29e0628c9 100755
--- a/web/templates/default/site.html
+++ b/web/templates/default/site.html
@@ -37,10 +37,12 @@
 								<tr>
 									<th width="30"><input type="checkbox" onclick="checkSelect();" id="setBox"></th>
 									<th width="150" onclick="listOrder('name','site',this)" style="cursor: pointer;">域名<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb"></span></th>
-									<th onclick="listOrder('status','site',this)" style="cursor: pointer;" width="98">网站状态<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb"></span></th>
+									<th style="cursor: pointer;" width="98">网站状态</th>
 									<th width="58">备份</th>
 									<th width="26%">网站目录</th>
-									<th onclick="listOrder('edate','site',this)" style="cursor: pointer;" width="86">到期日期<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb"></span></th>
+									<th onclick="listOrder('edate','site',this)" style="cursor: pointer;" width="86">
+										到期日期<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb"></span>
+									</th>
 									<th>备注</th>
 									<th width='130' class='text-right'>操作</th>
 								</tr>
@@ -55,8 +57,10 @@
 						<div class="site_type">
 							<span>站点分类:</span>
 							<select class="bt-input-text mr5" style="width:100px">
-								<!-- <option value="-1">全部分类</option>
-								<option value="0">默认分类</option> -->
+								<!--
+									<option value="-1">全部分类</option>
+									<option value="0">默认分类</option> 
+								-->
 							</select>
 						</div>
 					</div>
diff --git a/web/thisdb/sites.py b/web/thisdb/sites.py
index e02daa300..fb2f0a3c4 100644
--- a/web/thisdb/sites.py
+++ b/web/thisdb/sites.py
@@ -74,7 +74,8 @@ def getSitesList(
     page:int | None = 1,
     size:int | None = 10,
     type_id:int | None = 0,
-    search: str | None = ''
+    search: str | None = '',
+    order:str | None = None,
 ):
     sql_where = ''
     if search != '' :
@@ -94,7 +95,11 @@ def getSitesList(
 
     start = (int(page) - 1) * (int(size))
     limit = str(start) + ',' +str(size)
-    site_list = dbM.limit(limit).order('id desc').select()
+
+    if order is not None:
+        site_list = dbM.limit(limit).order(order).select()
+    else:
+        site_list = dbM.limit(limit).order('id desc').select()
 
     
     data = {}

From 0b37a34528fc652a5eb51e2bac2374fc007c2f5c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 00:37:55 +0800
Subject: [PATCH 315/965] up

---
 panel_task.py              | 47 ++++++++++++++++++++------------------
 web/admin/files/files.py   | 20 +++++++++++++++-
 web/admin/task/__init__.py | 10 ++++----
 web/core/mw.py             |  7 ++++--
 web/static/app/public.js   |  2 +-
 web/thisdb/tasks.py        | 30 +++++++++++++++++++++++-
 6 files changed, 84 insertions(+), 32 deletions(-)

diff --git a/panel_task.py b/panel_task.py
index 1c26b6fb0..39e436064 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -77,43 +77,46 @@ def downloadFile(url, filename):
         if not mw.isAppleSystem():
             os.system('chown www.www ' + filename)
 
-        writeLogs('done')
+        writeLogs(filename + ' download success!')
     except Exception as e:
         writeLogs(str(e))
     return True
 
 def downloadHook(count, blockSize, totalSize):
     # 下载文件进度回调
-    global pre
     used = count * blockSize
-    pre1 = int((100.0 * used / totalSize))
-    if pre == (100 - pre1):
-        return
-    speed = {'total': totalSize, 'used': used, 'pre': pre1}
+    pre = int((100.0 * used / totalSize))
+    speed = {'total': totalSize, 'used': used, 'pre': pre}
     writeLogs(json.dumps(speed))
 
 def runPanelTask():
     # 站点过期检查
     siteEdateCheck()
 
+    lock_file = mw.getTriggerTaskLockFile()
+    # mw.writeFile(lock_file,'True')
     try:
-        bash_list = thisdb.getTaskList(status=-1)
-        for task in bash_list:
-            thisdb.setTaskStatus(task['id'], 0)
+        if os.path.exists(lock_file):
+            bash_list = thisdb.getTaskList(status=-1)
+            for task in bash_list:
+                thisdb.setTaskStatus(task['id'], 0)
 
-        run_list = thisdb.getTaskList(status=0)
-        for run_task in run_list:
-            start = int(time.time())
-            thisdb.setTaskData(run_task['id'], start=start)
-            thisdb.setTaskStatus(run_task['id'], -1)
-            if run_task['type'] == 'download':
-                argv = run_task['cmd'].split('|mw|')
-                downloadFile(argv[0], argv[1])
-            elif run_task['type'] == 'execshell':
-                execShell(run_task['cmd'])
-            end = int(time.time())
-            thisdb.setTaskData(run_task['id'], end=end)
-            thisdb.setTaskStatus(run_task['id'], 1)
+            run_list = thisdb.getTaskList(status=0)
+            for run_task in run_list:
+                start = int(time.time())
+                thisdb.setTaskData(run_task['id'], start=start)
+                thisdb.setTaskStatus(run_task['id'], -1)
+
+                if run_task['type'] == 'download':
+                    argv = run_task['cmd'].split('|mw|')
+                    downloadFile(argv[0], argv[1])
+                elif run_task['type'] == 'execshell':
+                    execShell(run_task['cmd'])
+
+                end = int(time.time())
+                thisdb.setTaskData(run_task['id'], end=end)
+                thisdb.setTaskStatus(run_task['id'], 1)
+            os.remove(lock_file)
     except Exception as e:
         pass
 
diff --git a/web/admin/files/files.py b/web/admin/files/files.py
index 326ff7e9c..dcca06a1b 100644
--- a/web/admin/files/files.py
+++ b/web/admin/files/files.py
@@ -9,6 +9,7 @@
 # ---------------------------------------------------------------------------------
 
 import os
+import time
 
 from flask import Blueprint, render_template
 from flask import request
@@ -185,7 +186,7 @@ def delete_dir():
     path = request.form.get('path', '')
     return file.dirDelete(path)
 
-# 删除文件
+# 下载文件
 @blueprint.route('/download', endpoint='download', methods=['GET'])
 @panel_login_required
 def download():
@@ -199,6 +200,23 @@ def download():
     response = make_response(send_from_directory(os.path.dirname(filename), os.path.basename(filename), as_attachment=is_attachment))
     return response
 
+# 远程下载
+@blueprint.route('/download_file', endpoint='download_file', methods=['POST'])
+@panel_login_required
+def download_file():
+    url = request.form.get('url', '')
+    path = request.form.get('path', '')
+    filename = request.form.get('filename', '')
+    
+    execstr = url + '|mw|' + path + '/' + filename
+    execstr = execstr.strip()
+
+    title = '下载文件[' + filename + ']'
+    thisdb.addTaskByDownload(name=title, cmd=execstr)
+    # self.setFileAccept(path + '/' + filename)
+    mw.triggerTask()
+    return mw.returnData(True, '已将下载任务添加到队列!')
+
 # 日志清空
 @blueprint.route('/close_logs', endpoint='close_logs', methods=['POST'])
 @panel_login_required
diff --git a/web/admin/task/__init__.py b/web/admin/task/__init__.py
index 68598414c..92465b109 100644
--- a/web/admin/task/__init__.py
+++ b/web/admin/task/__init__.py
@@ -8,6 +8,8 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
+import json
+import time
 
 from flask import Blueprint, render_template
 from flask import request
@@ -62,14 +64,12 @@ def get_task_speed():
     data['cmd'] = row['cmd']
 
     if row['type'] == 'download':
-        readLine = ""
+        readLine = ''
         for i in range(3):
             try:
                 readLine = mw.readFile(task_logfile)
-                if len(readLine) > 10:
-                    data['msg'] = json.loads(readLine)
-                    data['isDownload'] = True
-                    break
+                data['msg'] = json.loads(readLine)
+                data['isDownload'] = True
             except Exception as e:
                 if i == 2:
                     thisdb.setTaskStatus(row['id'],0)
diff --git a/web/core/mw.py b/web/core/mw.py
index bcf565d6b..d9bccef99 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -1273,9 +1273,12 @@ def fileNameCheck(filename):
             return False
     return True
 
+def getTriggerTaskLockFile():
+    return getPanelDir() + '/logs/panel_task.lock'
+
 def triggerTask():
-    isTask = getPanelDir() + '/logs/panel_task.lock'
-    writeFile(isTask, 'True')
+    lock_file = getTriggerTaskLockFile()
+    writeFile(lock_file, 'True')
 
 def restartTask():
     initd = getPanelDir() + '/scripts/init.d/mw'
diff --git a/web/static/app/public.js b/web/static/app/public.js
index 6188975cf..d0df5768d 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1493,7 +1493,7 @@ function getReloads() {
 								<div class='line-progress' style='width:" + h.msg.pre + "%'></div>\
 								<span class='titlename'>" + h.task[g].name + "<a style='margin-left:130px;'>" + (toSize(h.msg.used) + "/" + toSize(h.msg.total)) + "</a></span>\
 									<span class='com-progress'>" + h.msg.pre + "%</span>\
-									<span class='state'>"+lan.bt.task_downloading+" <img src='/static/img/ing.gif'> | <a href=\"javascript:removeTask(" + h.task[g].id + ")\">"+lan.public.close+"</a></span>\
+									<span class='state'>下载中<img src='/static/img/ing.gif'> | <a href=\"javascript:removeTask(" + h.task[g].id + ")\">"+lan.public.close+"</a></span>\
 							</li>"
 					}
 				} else {
diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index 44c4c1722..317e5e065 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -22,6 +22,34 @@ def getTaskCount(
 def getTaskUnexecutedCount() -> int:
     return mw.M('tasks').where('status!=?',(1,)).count()
 
+def addTaskByDownload(
+    name: str | None = '下载文件',
+    cmd: str | None = None,
+    type: str | None = 'download',
+    status: int | None = 0,
+):
+    '''
+    添加后台任务
+    :name -> str 类型
+    :cmd -> str 日志内容 (必填)
+    :type -> str 用户ID
+    '''
+    if cmd is None:
+        return False
+
+    add_time = mw.formatDate()
+    insert_data = {
+        'name':name,
+        'type':type,
+        'cmd':cmd,
+        'start':0,
+        'end':0,
+        'status':status,
+        'add_time':add_time,
+    }
+    mw.M('tasks').insert(insert_data)
+    return True
+
 def addTask(
     name: str | None = '常用任务',
     cmd: str | None = None,
@@ -77,7 +105,7 @@ def getTaskPage(
     return rdata
 
 def getTaskFirstByRun() -> None:
-    data = mw.M('tasks').where('status=?', (-1,)).field(__FIELD).order('id asc').find()
+    data = mw.M('tasks').where('status=? or status=0', (-1,)).field(__FIELD).order('id asc').find()
     if data is None:
         return None
     return data

From 39a1c1e6e06c486d5c220d1d5c20bbbf136dd5f4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 01:56:33 +0800
Subject: [PATCH 316/965] update

---
 plugins/php/versions/82/install.sh | 27 ++++++++++++++++++++++++++-
 plugins/php/versions/83/install.sh |  6 +++++-
 plugins/php/versions/84/install.sh |  5 ++---
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh
index d30d81356..3a2bdd117 100755
--- a/plugins/php/versions/82/install.sh
+++ b/plugins/php/versions/82/install.sh
@@ -73,7 +73,10 @@ cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
-	OPTIONS="${OPTIONS} --with-curl"
+	BREW_DIR=`which brew`
+	BREW_DIR=${BREW_DIR/\/bin\/brew/}
+	LIB_DEPEND_DIR=`brew info curl | grep ${BREW_DIR}/Cellar/curl | cut -d \  -f 1 | awk 'END {print}'`
+	OPTIONS="${OPTIONS} --with-curl=$LIB_DEPEND_DIR"
 else
 	OPTIONS="${OPTIONS} --with-curl"
 	OPTIONS="${OPTIONS} --with-readline"
@@ -150,6 +153,28 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
+	echo "./configure \
+	--prefix=$serverPath/php/${PHP_VER} \
+	--exec-prefix=$serverPath/php/${PHP_VER} \
+	--with-config-file-path=$serverPath/php/${PHP_VER}/etc \
+	--enable-mysqlnd \
+	--with-mysqli=mysqlnd \
+	--with-pdo-mysql=mysqlnd \
+	--with-zlib-dir=$serverPath/lib/zlib \
+	$ZIP_OPTION \
+	--enable-mbstring \
+	--enable-ftp \
+	--enable-sockets \
+	--enable-simplexml \
+	--enable-soap \
+	--enable-posix \
+	--enable-sysvmsg \
+	--enable-sysvsem \
+	--enable-sysvshm \
+	--disable-intl \
+	--disable-fileinfo \
+	$OPTIONS \
+	--enable-fpm"
 	make clean && make -j${cpuCore} && make install && make clean
 
 	# rm -rf $sourcePath/php/php${PHP_VER}
diff --git a/plugins/php/versions/83/install.sh b/plugins/php/versions/83/install.sh
index d3d35f33a..406040830 100755
--- a/plugins/php/versions/83/install.sh
+++ b/plugins/php/versions/83/install.sh
@@ -72,7 +72,11 @@ cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
-	OPTIONS="${OPTIONS} --with-curl"
+	# BREW_DIR=`which brew`
+	# BREW_DIR=${BREW_DIR/\/bin\/brew/}
+	# LIB_DEPEND_DIR=`brew info curl | grep ${BREW_DIR}/Cellar/curl | cut -d \  -f 1 | awk 'END {print}'`
+	# OPTIONS="${OPTIONS} --with-curl=$LIB_DEPEND_DIR"
+	echo "curl"
 else
 	OPTIONS="${OPTIONS} --with-curl"
 	OPTIONS="${OPTIONS} --with-readline"
diff --git a/plugins/php/versions/84/install.sh b/plugins/php/versions/84/install.sh
index 7024f0b2d..67ad8147e 100755
--- a/plugins/php/versions/84/install.sh
+++ b/plugins/php/versions/84/install.sh
@@ -14,7 +14,7 @@ function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)"
 function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; }
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
-version=8.4.0RC2
+version=8.4.1
 PHP_VER=84
 Install_php()
 {
@@ -36,8 +36,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 	
 
 	if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then
-		# wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://www.php.net/distributions/php-${version}.tar.xz
-		wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://downloads.php.net/~calvinb/php-${version}.tar.xz
+		wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://www.php.net/distributions/php-${version}.tar.xz
 	fi
 
 	#检测文件是否损坏.

From add4d4bb5e8eb4c099f4713d8b7735add6ba867c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 02:01:07 +0800
Subject: [PATCH 317/965] Update panel_task.py

---
 panel_task.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panel_task.py b/panel_task.py
index 39e436064..ce12b9641 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -94,7 +94,7 @@ def runPanelTask():
     siteEdateCheck()
 
     lock_file = mw.getTriggerTaskLockFile()
-    # mw.writeFile(lock_file,'True')
+    mw.writeFile(lock_file,'True')
     try:
         if os.path.exists(lock_file):
             bash_list = thisdb.getTaskList(status=-1)

From 7da0fa43798fecd28f92c188eba29ddc56ba2365 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 03:41:53 +0800
Subject: [PATCH 318/965] Update index.py

---
 plugins/phpmyadmin/index.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/phpmyadmin/index.py b/plugins/phpmyadmin/index.py
index 884ef2f34..123c99dab 100755
--- a/plugins/phpmyadmin/index.py
+++ b/plugins/phpmyadmin/index.py
@@ -67,7 +67,7 @@ def getConfInc():
 def getPort():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'listen\s*(.*);'
+    rep = r'listen\s*(.*);'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
@@ -196,8 +196,8 @@ def status():
 def __release_port(port):
     from collections import namedtuple
     try:
-        import firewall_api
-        firewall_api.firewall_api().addAcceptPortArgs(port, 'phpMyAdmin默认端口', 'port')
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().addAcceptPort(port, 'phpMyAdmin默认端口', 'port')
         return port
     except Exception as e:
         return "Release failed {}".format(e)
@@ -206,8 +206,8 @@ def __release_port(port):
 def __delete_port(port):
     from collections import namedtuple
     try:
-        import firewall_api
-        firewall_api.firewall_api().delAcceptPortArgs(port, 'tcp')
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().delAcceptPortCmd(port, 'tcp')
         return port
     except Exception as e:
         return "Release failed {}".format(e)

From 88b86b2b2bdb372c65aba5060390f4fd72702602 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 03:46:00 +0800
Subject: [PATCH 319/965] Update install.sh

---
 plugins/php/install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/php/install.sh b/plugins/php/install.sh
index 1460c6cc0..d6ba610a0 100755
--- a/plugins/php/install.sh
+++ b/plugins/php/install.sh
@@ -73,6 +73,9 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php/${type} ];then
 	cd ${rootPath}/plugins/php/versions/common && bash gettext.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash redis.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash memcached.sh install ${type}
+	cd ${rootPath}/plugins/php/versions/common && bash pcntl.sh install ${type}
+
+	
 
 	if [ "${type}" -gt "73" ];then
 		cd ${rootPath}/plugins/php/versions/common && bash zlib.sh install ${type}

From 5ca5265b92483585972d307a595bc449017054c3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 03:49:36 +0800
Subject: [PATCH 320/965] Update index.py

---
 plugins/php/index.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/plugins/php/index.py b/plugins/php/index.py
index 761a33902..0487f9108 100755
--- a/plugins/php/index.py
+++ b/plugins/php/index.py
@@ -978,14 +978,10 @@ def installLib(version):
         return data[1]
 
     name = args['name']
-    execstr = "cd " + getPluginDir() + "/versions && /bin/bash  common.sh " + \
-        version + ' install ' + name
-
-    rettime = time.strftime('%Y-%m-%d %H:%M:%S')
-    insert_info = (None, '安装[' + name + '-' + version + ']',
-                   'execshell', '0', rettime, execstr)
-    mw.M('tasks').add('id,name,type,status,addtime,execstr', insert_info)
-
+    cmd = "cd " + getPluginDir() + "/versions && /bin/bash  common.sh " + version + ' install ' + name
+    install_name = '安装[' + name + '-' + version + ']'
+    import thisdb
+    thisdb.addTask(name=install_name,cmd=cmd)
     mw.triggerTask()
     return mw.returnJson(True, '已将下载任务添加到队列!')
 

From 453639bf92e7d90d4b6d283d4cf15408527356aa Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 03:50:08 +0800
Subject: [PATCH 321/965] Update index.py

---
 plugins/php/index.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/php/index.py b/plugins/php/index.py
index 0487f9108..1a6e8d6c9 100755
--- a/plugins/php/index.py
+++ b/plugins/php/index.py
@@ -982,6 +982,7 @@ def installLib(version):
     install_name = '安装[' + name + '-' + version + ']'
     import thisdb
     thisdb.addTask(name=install_name,cmd=cmd)
+
     mw.triggerTask()
     return mw.returnJson(True, '已将下载任务添加到队列!')
 
@@ -993,8 +994,7 @@ def uninstallLib(version):
         return data[1]
 
     name = args['name']
-    execstr = "cd " + getPluginDir() + "/versions && /bin/bash  common.sh " + \
-        version + ' uninstall ' + name
+    execstr = "cd " + getPluginDir() + "/versions && /bin/bash  common.sh " + version + ' uninstall ' + name
 
     data = mw.execShell(execstr)
     # data[0] == '' and

From f5089eeb16e1bcc6894e5296571fd149d0b64197 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 03:53:21 +0800
Subject: [PATCH 322/965] update

---
 plugins/php-apt/index.py | 11 ++++-------
 plugins/php-yum/index.py | 11 ++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/plugins/php-apt/index.py b/plugins/php-apt/index.py
index d6146bfac..33ed29553 100755
--- a/plugins/php-apt/index.py
+++ b/plugins/php-apt/index.py
@@ -798,13 +798,10 @@ def installLib(version):
         return data[1]
 
     name = args['name']
-    execstr = "cd " + getPluginDir() + "/versions  && /bin/bash common.sh " + \
-        version + ' install ' + name
-
-    rettime = time.strftime('%Y-%m-%d %H:%M:%S')
-    insert_info = (None, '安装PHPAPT[' + name + '-' + version + ']',
-                   'execshell', '0', rettime, execstr)
-    mw.M('tasks').add('id,name,type,status,addtime,execstr', insert_info)
+    cmd = "cd " + getPluginDir() + "/versions && /bin/bash  common.sh " + version + ' install ' + name
+    install_name = '安装PHPAPT[' + name + '-' + version + ']'
+    import thisdb
+    thisdb.addTask(name=install_name,cmd=cmd)
 
     mw.triggerTask()
     return mw.returnJson(True, '已将下载任务添加到队列!')
diff --git a/plugins/php-yum/index.py b/plugins/php-yum/index.py
index 153addc64..00d3c1f4d 100755
--- a/plugins/php-yum/index.py
+++ b/plugins/php-yum/index.py
@@ -799,13 +799,10 @@ def installLib(version):
         return data[1]
 
     name = args['name']
-    execstr = "cd " + getPluginDir() + '/versions/' + \
-        " && /bin/bash common.sh " + version + ' install ' + name
-
-    rettime = time.strftime('%Y-%m-%d %H:%M:%S')
-    insert_info = (None, '安装PHPYUM[' + name + '-' + version + ']',
-                   'execshell', '0', rettime, execstr)
-    mw.M('tasks').add('id,name,type,status,addtime,execstr', insert_info)
+    cmd = "cd " + getPluginDir() + "/versions && /bin/bash  common.sh " + version + ' install ' + name
+    install_name = '安装PHPYUM[' + name + '-' + version + ']'
+    import thisdb
+    thisdb.addTask(name=install_name,cmd=cmd)
 
     mw.triggerTask()
     return mw.returnJson(True, '已将下载任务添加到队列!')

From 79160854b9ee16845f7c409eddb95d7955e901ca Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 03:53:33 +0800
Subject: [PATCH 323/965] Update index.py

---
 plugins/php-yum/index.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/php-yum/index.py b/plugins/php-yum/index.py
index 00d3c1f4d..edae3a4b8 100755
--- a/plugins/php-yum/index.py
+++ b/plugins/php-yum/index.py
@@ -815,8 +815,7 @@ def uninstallLib(version):
         return data[1]
 
     name = args['name']
-    execstr = "cd " + getPluginDir() + '/versions/' + \
-        " && /bin/bash common.sh " + version + ' uninstall ' + name
+    execstr = "cd " + getPluginDir() + '/versions/' + " && /bin/bash common.sh " + version + ' uninstall ' + name
 
     data = mw.execShell(execstr)
     # data[0] == '' and

From 6e48e0c3396d9e603b8ec228663ffc578afc9ac4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 03:55:43 +0800
Subject: [PATCH 324/965] Update mongodb.sh

---
 plugins/php/versions/common/mongodb.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/php/versions/common/mongodb.sh b/plugins/php/versions/common/mongodb.sh
index 3f60b9f79..96228c86b 100755
--- a/plugins/php/versions/common/mongodb.sh
+++ b/plugins/php/versions/common/mongodb.sh
@@ -18,7 +18,7 @@ actionType=$1
 version=$2
 
 if [ "$version" -ge '74' ];then
-	LIBV=1.19.0
+	LIBV=1.20.0
 fi
 
 if [ "$version" == '71' ];then

From b124aabb7b86b70afba96d0905742252bc3abba9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 04:38:55 +0800
Subject: [PATCH 325/965] update

---
 web/admin/setting/__init__.py  |   2 +
 web/admin/setting/panel_ssl.py |  52 +++++++
 web/core/mw.py                 |  11 +-
 web/static/app/config.js       |   6 +-
 web/utils/setting.py           | 259 +++++++++++++++++++++++++++++++++
 5 files changed, 322 insertions(+), 8 deletions(-)
 create mode 100644 web/admin/setting/panel_ssl.py
 create mode 100644 web/utils/setting.py

diff --git a/web/admin/setting/__init__.py b/web/admin/setting/__init__.py
index 1627e3b8f..f6183dbaf 100644
--- a/web/admin/setting/__init__.py
+++ b/web/admin/setting/__init__.py
@@ -18,3 +18,5 @@ from .notify_email import *
 from .notify_tgbot import *
 from .app import *
 
+from .panel_ssl import *
+
diff --git a/web/admin/setting/panel_ssl.py b/web/admin/setting/panel_ssl.py
new file mode 100644
index 000000000..bf903a495
--- /dev/null
+++ b/web/admin/setting/panel_ssl.py
@@ -0,0 +1,52 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import re
+import json
+import os
+import time
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin import session
+from admin.user_login_check import panel_login_required
+
+import core.mw as mw
+import utils.config as utils_config
+
+from utils.setting import setting as MwSetting
+
+from .setting import blueprint
+import thisdb
+
+# 获取面板证书信息
+@blueprint.route('/get_panel_ssl', endpoint='get_panel_ssl', methods=['POST'])
+@panel_login_required
+def get_panel_ssl():
+    return MwSetting.instance().getPanelSsl()
+
+
+# 获取面板证书信息
+@blueprint.route('/save_panel_ssl', endpoint='save_panel_ssl', methods=['POST'])
+@panel_login_required
+def save_panel_ssl():
+    choose = request.form.get('choose', '').strip()
+    certPem = request.form.get('certPem', '').strip()
+    privateKey = request.form.get('privateKey', '').strip()
+    return MwSetting.instance().savePanelSsl(choose,certPem,privateKey)
+
+# 获取面板证书信息
+@blueprint.route('/del_panel_ssl', endpoint='del_panel_ssl', methods=['POST'])
+@panel_login_required
+def del_panel_ssl():
+    choose = request.form.get('choose', '').strip()
+    return MwSetting.instance().delPanelSsl(choose)
+
diff --git a/web/core/mw.py b/web/core/mw.py
index d9bccef99..4564d6825 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -1548,9 +1548,10 @@ def getCertName(certPath):
         return None
 
 def createLocalSSL():
-    if not os.path.exists('ssl/local'):
-        execShell('mkdir -p ssl/local')
-
+    pdir = getPanelDir()
+    local_dir = pdir+'/ssl/local'
+    if not os.path.exists(local_dir):
+        execShell('mkdir -p ' + local_dir)
 
     # 自签证书
     # if os.path.exists('ssl/local/input.pl'):
@@ -1577,8 +1578,8 @@ def createLocalSSL():
     cert_ca = OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_PEM, cert)
     private_key = OpenSSL.crypto.dump_privatekey(OpenSSL.crypto.FILETYPE_PEM, key)
     if len(cert_ca) > 100 and len(private_key) > 100:
-        writeFile('ssl/local/cert.pem', cert_ca, 'wb+')
-        writeFile('ssl/local/private.pem', private_key, 'wb+')
+        writeFile(local_dir+'/cert.pem', cert_ca, 'wb+')
+        writeFile(local_dir+'/private.pem', private_key, 'wb+')
         return True
     return False
 
diff --git a/web/static/app/config.js b/web/static/app/config.js
index a56a25a10..aad1c776e 100755
--- a/web/static/app/config.js
+++ b/web/static/app/config.js
@@ -905,7 +905,7 @@ function getPanelSSL(){
 						btn3:function(){
 							data['choose'] = 'nginx';
 							var loadT = layer.msg('正在安装并设置SSL组件,这需要几分钟时间...',{icon:16,time:0,shade: [0.3, '#000']});
-							$.post('/config/save_panel_ssl',data,function(rdata){
+							$.post('/setting/save_panel_ssl',data,function(rdata){
 								layer.close(loadT);
 								if(rdata.status){
 									layer.closeAll();
@@ -917,7 +917,7 @@ function getPanelSSL(){
 					function(index) {
 						data['choose'] = 'local';
 				    	var loadT = layer.msg('正在安装并设置SSL组件,这需要几分钟时间...',{icon:16,time:0,shade: [0.3, '#000']});
-						$.post('/config/save_panel_ssl',data,function(rdata){
+						$.post('/setting/save_panel_ssl',data,function(rdata){
 							layer.close(loadT);
 							if(rdata.status){
 								layer.closeAll();
@@ -942,7 +942,7 @@ function getPanelSSL(){
 							var data = {};
 							data['choose'] = 'nginx';
 							var loadT = layer.msg('正在删除面板SSL【nginx】...',{icon:16,time:0,shade: [0.3, '#000']});
-							$.post('/config/del_panel_ssl',data,function(rdata){
+							$.post('/setting/del_panel_ssl',data,function(rdata){
 								layer.close(loadT);
 								if(rdata.status){
 									layer.closeAll();
diff --git a/web/utils/setting.py b/web/utils/setting.py
new file mode 100644
index 000000000..bd9cd4a29
--- /dev/null
+++ b/web/utils/setting.py
@@ -0,0 +1,259 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+import re
+import threading
+import re
+import time
+
+import core.mw as mw
+import thisdb
+
+class setting(object):
+
+    # lock
+    _instance_lock = threading.Lock()
+
+    @classmethod
+    def instance(cls, *args, **kwargs):
+        if not hasattr(setting, "_instance"):
+            with setting._instance_lock:
+                if not hasattr(setting, "_instance"):
+                    setting._instance = setting(*args, **kwargs)
+        return setting._instance
+
+    def __init__(self):
+        pass
+
+
+    # 保存面板证书
+    def savePanelSsl(self, choose, cert_pem, private_key):
+        if not mw.inArray(['local','nginx'], choose):
+            return mw.returnData(True, '保存错误面板SSL类型!')
+
+        pdir = mw.getPanelDir()
+        keyPath = pdir+'/ssl/'+choose+'/private.pem'
+        certPath = pdir+'/ssl/'+choose+'/cert.pem'
+        check_cert_pl = '/tmp/cert.pl'
+
+        if not os.path.exists(keyPath):
+            return mw.returnData(False, '【'+choose+'】SSL类型不存在,先申请!')
+
+        if(private_key.find('KEY') == -1):
+            return mw.returnData(False, '秘钥错误，请检查!')
+        if(cert_pem.find('CERTIFICATE') == -1):
+            return mw.returnData(False, '证书错误，请检查!')
+
+        mw.writeFile(check_cert_pl, cert_pem)
+        if private_key:
+            mw.writeFile(keyPath, private_key)
+        if cert_pem:
+            mw.writeFile(certPath, cert_pem)
+        if not mw.checkCert(check_cert_pl):
+            os.remove(check_cert_pl)
+            return mw.returnData(False, '证书错误,请检查!')
+        os.remove(check_cert_pl)
+        return mw.returnData(True, '证书已保存!')
+
+
+    def getPanelSsl(self):
+        rdata = {}
+        rdata['choose'] = 'local'
+
+
+        pdir = mw.getPanelDir()
+
+        keyPath = pdir+'/ssl/local/private.pem'
+        certPath = pdir+'/ssl/local/cert.pem'
+
+        if not os.path.exists(certPath):
+            mw.createLocalSSL()
+
+        cert = {}
+        cert['privateKey'] = mw.readFile(keyPath)
+        cert['is_https'] = ''
+        cert['certPem'] = mw.readFile(certPath)
+        cert['info'] = mw.getCertName(certPath)
+        rdata['local'] = cert
+
+        panel_ssl = mw.getServerDir() + "/web_conf/nginx/vhost/panel.conf"
+        if not os.path.exists(panel_ssl):
+            cert['is_https'] = ''
+        else:
+            ssl_data = mw.readFile(panel_ssl)
+            if ssl_data.find('$server_port !~ 443') != -1:
+                cert['is_https'] = 'checked'
+
+        keyPath = pdir+'/ssl/nginx/private.pem'
+        certPath = pdir+'/ssl/nginx/cert.pem'
+
+        cert = {}
+        cert['privateKey'] = ''
+        cert['certPem'] = ''
+        cert['info'] = {}
+        if os.path.exists(keyPath):
+            cert['privateKey'] = mw.readFile(keyPath)
+
+        if os.path.exists(keyPath):
+            cert['certPem'] = mw.readFile(certPath)
+            cert['info'] = mw.getCertName(certPath)
+
+        rdata['nginx'] = cert
+
+        return rdata
+
+    # 删除面板证书
+    def delPanelSsl(self, choose):
+        ip = mw.getLocalIp()
+        if mw.isAppleSystem():
+            ip = '127.0.0.1'
+
+        
+        if not mw.inArray(['local','nginx'], choose):
+            return mw.returnData(True, '删除错误面板SSL类型!')
+
+        port_pl = mw.getPanelDir()+'/data/port.pl'
+        port = mw.readFile(port_pl).strip()
+
+        to_panel_url = 'http://'+ip+":"+port+'/config'
+
+        if choose == 'local':
+            dst_path = mw.getPanelDir() + '/ssl/local'
+            if os.path.exists(dst_path):
+                mw.execShell('rm -rf ' + dst_path)
+                mw.restartMw();
+                return mw.returnData(True, '删除本地面板SSL成功!',to_panel_url)
+            else:
+                return mw.returnData(True, '已经删除本地面板SSL!',to_panel_url)
+
+        if choose == 'nginx':
+
+            bind_domain = self.__file['bind_domain']
+            if not os.path.exists(bind_domain):
+                return mw.returnData(False, '未绑定域名!')
+
+            siteName = mw.readFile(bind_domain).strip()
+
+            src_path = mw.getServerDir() + '/web_conf/letsencrypt/' + siteName
+
+            dst_path = mw.getPanelDir() + '/ssl/nginx'
+            dst_csrpath = dst_path + '/cert.pem'
+            dst_keypath = dst_path + '/private.pem'
+
+            if os.path.exists(src_path) or os.path.exists(dst_path):
+                if os.path.exists(src_letpath):
+                    mw.execShell('rm -rf ' + src_letpath)
+                if os.path.exists(dst_csrpath):
+                    mw.execShell('rm -rf ' + dst_csrpath)
+                if os.path.exists(dst_keypath):
+                    mw.execShell('rm -rf ' + dst_keypath)
+                mw.restartNginx()
+                return mw.returnData(True, '删除面板SSL成功!')
+
+            mw.restartNginx()
+            mw.restartMw()
+            return mw.returnData(False, '已经删除面板SSL!')
+        return  mw.returnData(False, '未知类型!')
+
+    # 面板本地SSL设置
+    def setPanelLocalSsl(self):
+        pdir = mw.getPanelDir()
+
+        cert = {}
+        keyPath = pdir+'/ssl/local/private.pem'
+        certPath = pdir+'/ssl/local/cert.pem'
+
+        if not os.path.exists(certPath):
+            mw.createLocalSSL()
+
+        choose_file = self.__file['ssl']
+        mw.writeFile(choose_file, 'local')
+
+        mw.restartMw()
+        return mw.returnJson(True, '设置成功')
+
+    # 申请面板let证书
+    # def applyPanelAcmeSsl(self):
+    #     bind_domain = self.__file['bind_domain']
+    #     if not os.path.exists(bind_domain):
+    #         return mw.returnJson(False, '先要绑定域名!')
+
+    #     # 生成nginx配置
+    #     domain = mw.readFile(bind_domain)
+    #     panel_tpl = mw.getRunDir() + "/data/tpl/nginx_panel.conf"
+    #     dst_panel_path = mw.getServerDir() + "/web_conf/nginx/vhost/panel.conf"
+    #     if not os.path.exists(dst_panel_path):
+    #         reg = r"^([\w\-\*]{1,100}\.){1,4}(\w{1,10}|\w{1,10}\.\w{1,10})$"
+    #         if not re.match(reg, domain):
+    #             return mw.returnJson(False, '主域名格式不正确')
+
+    #         op_dir = mw.getServerDir() + "/openresty"
+    #         if not os.path.exists(op_dir):
+    #             return mw.returnJson(False, '依赖OpenResty,先安装启动它!')
+
+    #         content = mw.readFile(panel_tpl)
+    #         content = content.replace("{$PORT}", "80")
+    #         content = content.replace("{$SERVER_NAME}", domain)
+    #         content = content.replace("{$PANAL_PORT}", mw.readFile('data/port.pl'))
+    #         content = content.replace("{$LOGPATH}", mw.getRunDir() + '/logs')
+    #         content = content.replace("{$PANAL_ADDR}", mw.getRunDir())
+    #         mw.writeFile(dst_panel_path, content)
+    #         mw.restartNginx()
+
+    #     siteName = mw.readFile(bind_domain).strip()
+    #     auth_to = mw.getRunDir() + "/tmp"
+    #     to_args = {
+    #         'domains': [siteName],
+    #         'auth_type': 'http',
+    #         'auth_to': auth_to,
+    #     }
+
+    #     src_path = mw.getServerDir() + '/web_conf/letsencrypt/' + siteName
+    #     src_csrpath = src_path + "/fullchain.pem"  # 生成证书路径
+    #     src_keypath = src_path + "/privkey.pem"  # 密钥文件路径
+
+    #     dst_path = mw.getRunDir() + '/ssl/nginx'
+    #     dst_csrpath = dst_path + '/cert.pem'
+    #     dst_keypath = dst_path + '/private.pem'
+
+    #     is_already_apply = False
+
+    #     if not os.path.exists(src_path):
+    #         import cert_api
+    #         data = cert_api.cert_api().applyCertApi(to_args)
+    #         if not data['status']:
+    #             msg = data['msg']
+    #             if type(data['msg']) != str:
+    #                 msg = data['msg'][0]
+    #                 emsg = data['msg'][1]['challenges'][0]['error']
+    #                 msg = msg + '<p><span>响应状态:</span>' + str(emsg['status']) + '</p><p><span>错误类型:</span>' + emsg[
+    #                     'type'] + '</p><p><span>错误代码:</span>' + emsg['detail'] + '</p>'
+    #             return mw.returnJson(data['status'], msg, data['msg'])
+    #     else:
+    #         is_already_apply = True
+
+    #     mw.buildSoftLink(src_csrpath, dst_csrpath, True)
+    #     mw.buildSoftLink(src_keypath, dst_keypath, True)
+    #     mw.execShell('echo "acme" > "' + dst_path + '/README"')
+
+    #     tmp_well_know = auth_to + '/.well-known'
+    #     if os.path.exists(tmp_well_know):
+    #         mw.execShell('rm -rf ' + tmp_well_know)
+
+    #     if os.path.exists(dst_path):
+    #         choose_file = self.__file['ssl']
+    #         mw.writeFile(choose_file, 'nginx')
+
+    #     data = self.getPanelSslData()
+
+    #     if is_already_apply:
+    #         return mw.returnJson(True, '重复申请!', data)
+    #     return mw.returnJson(True, '申请成功!', data)
\ No newline at end of file

From f46c28b39d647990d74c86578ec404af342aed09 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 04:43:57 +0800
Subject: [PATCH 326/965] update

---
 data/json/type.json                           |  42 -----
 data/sql/default.sql                          | 146 ------------------
 data/sql/system.sql                           |  41 -----
 data/vip/readme.md                            |   1 -
 web/misc/nginx/rewrite/EmpireCMS.conf         |  10 ++
 web/misc/nginx/rewrite/cloudfare_real_ip.conf |  43 ++++++
 web/misc/nginx/rewrite/dedecms.conf           |  12 ++
 web/misc/nginx/rewrite/discuzx.conf           |  18 +++
 web/misc/nginx/rewrite/discuzx2.conf          |  14 ++
 web/misc/nginx/rewrite/discuzx3.conf          |  15 ++
 web/misc/nginx/rewrite/drupal.conf            |   5 +
 web/misc/nginx/rewrite/ecshop.conf            |  33 ++++
 web/misc/nginx/rewrite/emlog.conf             |   7 +
 web/misc/nginx/rewrite/fastdfs.conf           |   5 +
 web/misc/nginx/rewrite/gunicorn.conf          |   9 ++
 web/misc/nginx/rewrite/header_cors.conf       |  15 ++
 web/misc/nginx/rewrite/laravel5.conf          |   3 +
 web/misc/nginx/rewrite/mvc.conf               |   6 +
 web/misc/nginx/rewrite/nezha.conf             |  15 ++
 web/misc/nginx/rewrite/phpcms.conf            |   9 ++
 web/misc/nginx/rewrite/phpwind.conf           |   4 +
 web/misc/nginx/rewrite/proxy.conf             |   7 +
 web/misc/nginx/rewrite/proxydg.conf           |   8 +
 web/misc/nginx/rewrite/sablog.conf            |  16 ++
 web/misc/nginx/rewrite/seacms.conf            |  11 ++
 web/misc/nginx/rewrite/shopex.conf            |   5 +
 web/misc/nginx/rewrite/sub.conf.tpl           |  16 ++
 web/misc/nginx/rewrite/thinkphp.conf          |   5 +
 web/misc/nginx/rewrite/typecho.conf           |  13 ++
 web/misc/nginx/rewrite/v2ray.conf             |  15 ++
 web/misc/nginx/rewrite/walle.conf             |  34 ++++
 web/misc/nginx/rewrite/whmcs.conf             |  16 ++
 web/misc/nginx/rewrite/wmcms.conf             |  16 ++
 web/misc/nginx/rewrite/wordpress.conf         |  14 ++
 web/misc/nginx/rewrite/zblog.conf             |  11 ++
 web/misc/nginx/tpl/nginx.conf                 |  53 +++++++
 web/misc/nginx/tpl/nginx_dirbind.conf         |  48 ++++++
 web/misc/nginx/tpl/nginx_panel.conf           |  23 +++
 38 files changed, 534 insertions(+), 230 deletions(-)
 delete mode 100755 data/json/type.json
 delete mode 100755 data/sql/default.sql
 delete mode 100755 data/sql/system.sql
 delete mode 100644 data/vip/readme.md
 create mode 100755 web/misc/nginx/rewrite/EmpireCMS.conf
 create mode 100644 web/misc/nginx/rewrite/cloudfare_real_ip.conf
 create mode 100755 web/misc/nginx/rewrite/dedecms.conf
 create mode 100755 web/misc/nginx/rewrite/discuzx.conf
 create mode 100755 web/misc/nginx/rewrite/discuzx2.conf
 create mode 100755 web/misc/nginx/rewrite/discuzx3.conf
 create mode 100755 web/misc/nginx/rewrite/drupal.conf
 create mode 100755 web/misc/nginx/rewrite/ecshop.conf
 create mode 100755 web/misc/nginx/rewrite/emlog.conf
 create mode 100644 web/misc/nginx/rewrite/fastdfs.conf
 create mode 100755 web/misc/nginx/rewrite/gunicorn.conf
 create mode 100755 web/misc/nginx/rewrite/header_cors.conf
 create mode 100755 web/misc/nginx/rewrite/laravel5.conf
 create mode 100755 web/misc/nginx/rewrite/mvc.conf
 create mode 100644 web/misc/nginx/rewrite/nezha.conf
 create mode 100755 web/misc/nginx/rewrite/phpcms.conf
 create mode 100755 web/misc/nginx/rewrite/phpwind.conf
 create mode 100644 web/misc/nginx/rewrite/proxy.conf
 create mode 100644 web/misc/nginx/rewrite/proxydg.conf
 create mode 100755 web/misc/nginx/rewrite/sablog.conf
 create mode 100755 web/misc/nginx/rewrite/seacms.conf
 create mode 100755 web/misc/nginx/rewrite/shopex.conf
 create mode 100644 web/misc/nginx/rewrite/sub.conf.tpl
 create mode 100755 web/misc/nginx/rewrite/thinkphp.conf
 create mode 100755 web/misc/nginx/rewrite/typecho.conf
 create mode 100644 web/misc/nginx/rewrite/v2ray.conf
 create mode 100755 web/misc/nginx/rewrite/walle.conf
 create mode 100755 web/misc/nginx/rewrite/whmcs.conf
 create mode 100755 web/misc/nginx/rewrite/wmcms.conf
 create mode 100755 web/misc/nginx/rewrite/wordpress.conf
 create mode 100755 web/misc/nginx/rewrite/zblog.conf
 create mode 100755 web/misc/nginx/tpl/nginx.conf
 create mode 100755 web/misc/nginx/tpl/nginx_dirbind.conf
 create mode 100755 web/misc/nginx/tpl/nginx_panel.conf

diff --git a/data/json/type.json b/data/json/type.json
deleted file mode 100755
index 2943516b5..000000000
--- a/data/json/type.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-	{
-		"title":"全部",
-		"type":0,
-		"ps":""
-	},
-	{
-		"title":"已安装",
-		"type":-1,
-		"ps":""
-	},
-	{
-		"title":"运行环境",
-		"type":1,
-		"ps":""
-	},
-	{
-		"title":"数据软件",
-		"type":2,
-		"ps":""
-	},
-	{
-		"title":"代码管理",
-		"type":3,
-		"ps":""
-	},
-	{
-		"title":"系统工具",
-		"type":4,
-		"ps":""
-	},
-	{
-		"title":"其他插件",
-		"type":5,
-		"ps":""
-	},
-	{
-		"title":"辅助插件",
-		"type":6,
-		"ps":""
-	}
-]
\ No newline at end of file
diff --git a/data/sql/default.sql b/data/sql/default.sql
deleted file mode 100755
index ec3bc47d0..000000000
--- a/data/sql/default.sql
+++ /dev/null
@@ -1,146 +0,0 @@
-
-CREATE TABLE IF NOT EXISTS `backup` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `type` INTEGER,
-  `name` TEXT,
-  `pid` INTEGER,
-  `filename` TEXT,
-  `size` INTEGER,
-  `add_time` TEXT
-);
-
-CREATE TABLE IF NOT EXISTS `binding` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `pid` INTEGER,
-  `domain` TEXT,
-  `path` TEXT,
-  `port` INTEGER,
-  `add_time` TEXT
-);
-
-
-CREATE TABLE IF NOT EXISTS `crontab` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `name` TEXT,
-  `type` TEXT,
-  `where1` TEXT,
-  `where_hour` INTEGER,
-  `where_minute` INTEGER,
-  `echo` TEXT,
-  `status` INTEGER DEFAULT '1',
-  `save` INTEGER DEFAULT '3',
-  `backup_to` TEXT DEFAULT 'off', 
-  `sname` TEXT,
-  `sbody` TEXT,
-  'stype' TEXT,
-  `url_address` TEXT,
-  `add_time` TEXT,
-  `update_time` TEXT
-);
-
-CREATE TABLE IF NOT EXISTS `firewall` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `port` TEXT,
-  `protocol` TEXT DEFAULT 'tcp',
-  `ps` TEXT,
-  `add_time` TEXT,
-  `update_time` TEXT
-);
-
-ALTER TABLE `firewall` ADD COLUMN `protocol` TEXT DEFAULT 'tcp';
-
-INSERT INTO `firewall` (`id`, `port`, `protocol`, `ps`, `add_time`) VALUES
-(1, '80',  'tcp','网站默认端口', '0000-00-00 00:00:00','0000-00-00 00:00:00'),
-(2, '443', 'tcp/udp', 'HTTPS', '0000-00-00 00:00:00','0000-00-00 00:00:00');
-
-
-
-CREATE TABLE IF NOT EXISTS `logs` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `type` TEXT,
-  `log` TEXT,
-  `uid` INTEGER DEFAULT '1',
-  `add_time` TEXT
-);
-
-CREATE TABLE IF NOT EXISTS `sites` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `name` TEXT,
-  `path` TEXT,
-  `status` TEXT,
-  `index` TEXT,
-  `type_id` INTEGER,
-  `ps` TEXT,
-  `edate` TEXT,
-  `ssl_effective_date` TEXT,
-  `ssl_expiration_date` TEXT,
-  `add_time` TEXT,
-  `update_time` TEXT
-);
-
-CREATE TABLE IF NOT EXISTS `site_types` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `name` TEXT
-);
-
-CREATE TABLE IF NOT EXISTS `domain` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `pid` INTEGER,
-  `name` TEXT,
-  `port` INTEGER,
-  `add_time` TEXT
-);
-
-CREATE TABLE IF NOT EXISTS `users` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `name` TEXT,
-  `password` TEXT,
-  `login_ip` TEXT,
-  `login_time` TEXT,
-  `phone` TEXT,
-  `email` TEXT,
-  `add_time` INTEGER,
-  `update_time` INTEGER
-);
-
-CREATE TABLE IF NOT EXISTS `tasks` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `name` 			TEXT,
-  `type`			TEXT,
-  `start` 	  INTEGER,
-  `end` 	    INTEGER,
-  `cmd` 	    TEXT,
-  `status`    INTEGER,
-  `add_time`  INTEGER
-);
-
-CREATE TABLE IF NOT EXISTS `temp_login` (
-  `id`  INTEGER PRIMARY KEY AUTOINCREMENT,
-  `token` REAL,
-  `salt`  REAL,
-  `state` INTEGER,
-  `login_time`  INTEGER,
-  `login_addr`  REAL,
-  `logout_time` INTEGER,
-  `expire`  INTEGER,
-  `add_time` INTEGER
-);
-
-CREATE TABLE IF NOT EXISTS `panel` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `title` TEXT,
-  `url` TEXT,
-  `username` TEXT,
-  `password` TEXT,
-  `click` INTEGER,
-  `add_time` INTEGER
-);
-
-CREATE TABLE IF NOT EXISTS `option` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `name` TEXT,
-  `type` TEXT,
-  `value` TEXT
-);
-
-CREATE UNIQUE INDEX name_idx ON option(name);
diff --git a/data/sql/system.sql b/data/sql/system.sql
deleted file mode 100755
index 75fe9557f..000000000
--- a/data/sql/system.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-CREATE TABLE IF NOT EXISTS `network` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `up` TEXT,
-  `down` TEXT,
-  `total_up` INTEGER,
-  `total_down` INTEGER,
-  `down_packets` INTEGER,
-  `up_packets` INTEGER,
-  `addtime` INTEGER
-);
-CREATE INDEX addtime_idx ON network(`addtime`);
-
-CREATE TABLE IF NOT EXISTS `cpuio` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `pro` TEXT,
-  `mem` TEXT,
-  `addtime` INTEGER
-);
-CREATE INDEX addtime_idx ON cpuio(`addtime`);
-
-CREATE TABLE IF NOT EXISTS `diskio` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `read_count` INTEGER,
-  `write_count` INTEGER,
-  `read_bytes` INTEGER,
-  `write_bytes` INTEGER,
-  `read_time` INTEGER,
-  `write_time` INTEGER,
-  `addtime` INTEGER
-);
-CREATE INDEX addtime_idx ON diskio(`addtime`);
-
-CREATE TABLE IF NOT EXISTS `load_average` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `pro` REAL,
-  `one` REAL,
-  `five` REAL,
-  `fifteen` REAL,
-  `addtime` INTEGER
-);
-CREATE INDEX addtime_idx ON load_average(`addtime`);
\ No newline at end of file
diff --git a/data/vip/readme.md b/data/vip/readme.md
deleted file mode 100644
index cf9aac38d..000000000
--- a/data/vip/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-存放VIP关键数据
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/EmpireCMS.conf b/web/misc/nginx/rewrite/EmpireCMS.conf
new file mode 100755
index 000000000..33cdf5791
--- /dev/null
+++ b/web/misc/nginx/rewrite/EmpireCMS.conf
@@ -0,0 +1,10 @@
+location / {
+	rewrite ^([^\.]*)/listinfo-(.+?)-(.+?)\.html$ $1/e/action/ListInfo/index.php?classid=$2&page=$3 last;
+	rewrite ^([^\.]*)/showinfo-(.+?)-(.+?)-(.+?)\.html$ $1/e/action/ShowInfo.php?classid=$2&id=$3&page=$4 last;
+	rewrite ^([^\.]*)/infotype-(.+?)-(.+?)\.html$ $1/e/action/InfoType/index.php?ttid=$2&page=$3 last;
+	rewrite ^([^\.]*)/tags-(.+?)-(.+?)\.html$ $1/e/tags/index.php?tagname=$2&page=$3 last;
+	rewrite ^([^\.]*)/comment-(.+?)-(.+?)-(.+?)-(.+?)-(.+?)-(.+?)\.html$  $1/e/pl/index\.php\?doaction=$2&classid=$3&id=$4&page=$5&myorder=$6&tempid=$7 last;
+	if (!-e $request_filename) {
+		return 404;
+	}
+}
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/cloudfare_real_ip.conf b/web/misc/nginx/rewrite/cloudfare_real_ip.conf
new file mode 100644
index 000000000..cd19beb0e
--- /dev/null
+++ b/web/misc/nginx/rewrite/cloudfare_real_ip.conf
@@ -0,0 +1,43 @@
+location / {
+
+	# https://www.cloudflare.com/zh-cn/ips/
+    set_real_ip_from 173.245.48.0/20;
+    set_real_ip_from 103.21.244.0/22;
+    set_real_ip_from 103.22.200.0/22;
+    set_real_ip_from 103.31.4.0/22;
+    set_real_ip_from 141.101.64.0/18;
+    set_real_ip_from 108.162.192.0/18;
+    set_real_ip_from 190.93.240.0/20;
+    set_real_ip_from 188.114.96.0/20;
+    set_real_ip_from 197.234.240.0/22;
+	set_real_ip_from 198.41.128.0/17;
+	set_real_ip_from 162.158.0.0/15;
+	set_real_ip_from 104.16.0.0/13;
+	set_real_ip_from 104.24.0.0/14;
+	set_real_ip_from 172.64.0.0/13;
+	set_real_ip_from 131.0.72.0/22;
+	set_real_ip_from 2400:cb00::/32;
+	set_real_ip_from 2606:4700::/32;
+	set_real_ip_from 2803:f800::/32;
+	set_real_ip_from 2405:b500::/32;
+	set_real_ip_from 2405:8100::/32;
+    set_real_ip_from 2a06:98c0::/29;
+    set_real_ip_from 2c0f:f248::/32;
+    # use any of the following two
+    real_ip_header CF-Connecting-IP;
+    #real_ip_header X-Forwarded-For;
+
+     
+	index index.html index.php; 
+	if (-f $request_filename/index.html){ 
+		rewrite (.*) $1/index.html break; 
+	} 
+	if (-f $request_filename/index.php){ 
+		rewrite (.*) $1/index.php; 
+	} 
+	if (!-f $request_filename){ 
+		rewrite (.*) /index.php; 
+	} 
+} 
+
+rewrite /wp-admin$ $scheme://$host$uri/ permanent;
diff --git a/web/misc/nginx/rewrite/dedecms.conf b/web/misc/nginx/rewrite/dedecms.conf
new file mode 100755
index 000000000..9e1d20206
--- /dev/null
+++ b/web/misc/nginx/rewrite/dedecms.conf
@@ -0,0 +1,12 @@
+location / {
+	rewrite ^/list-([0-9]+)\.html$ /plus/list.php?tid=$1 last;
+	rewrite ^/list-([0-9]+)-([0-9]+)-([0-9]+)\.html$ /plus/list.php?tid=$1&totalresult=$2&PageNo=$3 last;
+	rewrite ^/view-([0-9]+)-1\.html$ /plus/view.php?arcID=$1 last;
+	rewrite ^/view-([0-9]+)-([0-9]+)\.html$" /plus/view.php?aid=$1&pageno=$2 last;
+	rewrite ^/plus/list-([0-9]+)\.html$ /plus/list.php?tid=$1 last;
+	rewrite ^/plus/list-([0-9]+)-([0-9]+)-([0-9]+)\.html$ /plus/list.php?tid=$1&totalresult=$2&PageNo=$3 last;
+	rewrite ^/plus/view-([0-9]+)-1\.html$ /plus/view.php?arcID=$1 last;
+	rewrite ^/plus/view-([0-9]+)-([0-9]+)\.html$ /plus/view.php?aid=$1&pageno=$2 last;
+	rewrite ^/tags.html$ /tags.php last;
+	rewrite ^/tag-([0-9]+)-([0-9]+)\.html$ /tags.php?/$1/$2/ last;
+}
diff --git a/web/misc/nginx/rewrite/discuzx.conf b/web/misc/nginx/rewrite/discuzx.conf
new file mode 100755
index 000000000..be93e7de0
--- /dev/null
+++ b/web/misc/nginx/rewrite/discuzx.conf
@@ -0,0 +1,18 @@
+location / {
+	rewrite ^([^\.]*)/topic-(.+)\.html$ $1/portal.php?mod=topic&topic=$2 last;
+	rewrite ^([^\.]*)/article-([0-9]+)-([0-9]+)\.html$ $1/portal.php?mod=view&aid=$2&page=$3 last;
+	rewrite ^([^\.]*)/forum-(\w+)-([0-9]+)\.html$ $1/forum.php?mod=forumdisplay&fid=$2&page=$3 last;
+	rewrite ^([^\.]*)/thread-([0-9]+)-([0-9]+)-([0-9]+)\.html$ $1/forum.php?mod=viewthread&tid=$2&extra=page%3D$4&page=$3 last;
+	rewrite ^([^\.]*)/group-([0-9]+)-([0-9]+)\.html$ $1/forum.php?mod=group&fid=$2&page=$3 last;
+	rewrite ^([^\.]*)/space-(username|uid)-(.+)\.html$ $1/home.php?mod=space&$2=$3 last;
+	rewrite ^([^\.]*)/blog-([0-9]+)-([0-9]+)\.html$ $1/home.php?mod=space&uid=$2&do=blog&id=$3 last;
+	rewrite ^([^\.]*)/(fid|tid)-([0-9]+)\.html$ $1/index.php?action=$2&value=$3 last;
+	rewrite ^([^\.]*)/([a-z]+[a-z0-9_]*)-([a-z0-9_\-]+)\.html$ $1/plugin.php?id=$2:$3 last;
+	if (!-e $request_filename) {
+		rewrite  ^(.*)$  /index.php  last;
+	}
+
+	#if (!-e $request_filename) {
+	#	return 404;
+	#}
+}
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/discuzx2.conf b/web/misc/nginx/rewrite/discuzx2.conf
new file mode 100755
index 000000000..f4040718b
--- /dev/null
+++ b/web/misc/nginx/rewrite/discuzx2.conf
@@ -0,0 +1,14 @@
+location /bbs/ {
+	rewrite ^([^\.]*)/topic-(.+)\.html$ $1/portal.php?mod=topic&topic=$2 last;
+	rewrite ^([^\.]*)/article-([0-9]+)-([0-9]+)\.html$ $1/portal.php?mod=view&aid=$2&page=$3 last;
+	rewrite ^([^\.]*)/forum-(\w+)-([0-9]+)\.html$ $1/forum.php?mod=forumdisplay&fid=$2&page=$3 last;
+	rewrite ^([^\.]*)/thread-([0-9]+)-([0-9]+)-([0-9]+)\.html$ $1/forum.php?mod=viewthread&tid=$2&extra=page%3D$4&page=$3 last;
+	rewrite ^([^\.]*)/group-([0-9]+)-([0-9]+)\.html$ $1/forum.php?mod=group&fid=$2&page=$3 last;
+	rewrite ^([^\.]*)/space-(username|uid)-(.+)\.html$ $1/home.php?mod=space&$2=$3 last;
+	rewrite ^([^\.]*)/blog-([0-9]+)-([0-9]+)\.html$ $1/home.php?mod=space&uid=$2&do=blog&id=$3 last;
+	rewrite ^([^\.]*)/(fid|tid)-([0-9]+)\.html$ $1/index.php?action=$2&value=$3 last;
+	rewrite ^([^\.]*)/([a-z]+[a-z0-9_]*)-([a-z0-9_\-]+)\.html$ $1/plugin.php?id=$2:$3 last;
+	if (!-e $request_filename) {
+		rewrite  ^(.*)$  /index.php  last;
+	}
+}
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/discuzx3.conf b/web/misc/nginx/rewrite/discuzx3.conf
new file mode 100755
index 000000000..bfc8ef92c
--- /dev/null
+++ b/web/misc/nginx/rewrite/discuzx3.conf
@@ -0,0 +1,15 @@
+location / {
+	rewrite ^([^\.]*)/topic-(.+)\.html$ $1/portal.php?mod=topic&topic=$2 last;
+	rewrite ^([^\.]*)/article-([0-9]+)-([0-9]+)\.html$ $1/portal.php?mod=view&aid=$2&page=$3 last;
+	rewrite ^([^\.]*)/forum-(\w+)-([0-9]+)\.html$ $1/forum.php?mod=forumdisplay&fid=$2&page=$3 last;
+	rewrite ^([^\.]*)/thread-([0-9]+)-([0-9]+)-([0-9]+)\.html$ $1/forum.php?mod=viewthread&tid=$2&extra=page%3D$4&page=$3 last;
+	rewrite ^([^\.]*)/group-([0-9]+)-([0-9]+)\.html$ $1/forum.php?mod=group&fid=$2&page=$3 last;
+	rewrite ^([^\.]*)/space-(username|uid)-(.+)\.html$ $1/home.php?mod=space&$2=$3 last;
+	rewrite ^([^\.]*)/blog-([0-9]+)-([0-9]+)\.html$ $1/home.php?mod=space&uid=$2&do=blog&id=$3 last;
+	rewrite ^([^\.]*)/(fid|tid)-([0-9]+)\.html$ $1/index.php?action=$2&value=$3 last;
+	rewrite ^([^\.]*)/([a-z]+[a-z0-9_]*)-([a-z0-9_\-]+)\.html$ $1/plugin.php?id=$2:$3 last;
+	if (!-e $request_filename) {
+		rewrite  ^(.*)$  /index.php  last;
+	}
+}
+
diff --git a/web/misc/nginx/rewrite/drupal.conf b/web/misc/nginx/rewrite/drupal.conf
new file mode 100755
index 000000000..2c4bc7b82
--- /dev/null
+++ b/web/misc/nginx/rewrite/drupal.conf
@@ -0,0 +1,5 @@
+location / {
+	if (!-e $request_filename) {
+	 	rewrite ^/(.*)$ /index.php?q=$1 last;
+	}
+}
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/ecshop.conf b/web/misc/nginx/rewrite/ecshop.conf
new file mode 100755
index 000000000..109c04b6c
--- /dev/null
+++ b/web/misc/nginx/rewrite/ecshop.conf
@@ -0,0 +1,33 @@
+location / {
+	if (!-e $request_filename) {
+		rewrite "^/index\.html" /index.php last;
+		rewrite "^/category$" /index.php last;
+		rewrite "^/feed-c([0-9]+)\.xml$" /feed.php?cat=$1 last;
+		rewrite "^/feed-b([0-9]+)\.xml$" /feed.php?brand=$1 last;
+		rewrite "^/feed\.xml$" /feed.php last;
+		rewrite "^/category-([0-9]+)-b([0-9]+)-min([0-9]+)-max([0-9]+)-attr([^-]*)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /category.php?id=$1&brand=$2&price_min=$3&price_max=$4&filter_attr=$5&page=$6&sort=$7&order=$8 last;
+		rewrite "^/category-([0-9]+)-b([0-9]+)-min([0-9]+)-max([0-9]+)-attr([^-]*)(.*)\.html$" /category.php?id=$1&brand=$2&price_min=$3&price_max=$4&filter_attr=$5 last;
+		rewrite "^/category-([0-9]+)-b([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /category.php?id=$1&brand=$2&page=$3&sort=$4&order=$5 last;
+		rewrite "^/category-([0-9]+)-b([0-9]+)-([0-9]+)(.*)\.html$" /category.php?id=$1&brand=$2&page=$3 last;
+		rewrite "^/category-([0-9]+)-b([0-9]+)(.*)\.html$" /category.php?id=$1&brand=$2 last;
+		rewrite "^/category-([0-9]+)(.*)\.html$" /category.php?id=$1 last;
+		rewrite "^/goods-([0-9]+)(.*)\.html" /goods.php?id=$1 last;
+		rewrite "^/article_cat-([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /article_cat.php?id=$1&page=$2&sort=$3&order=$4 last;
+		rewrite "^/article_cat-([0-9]+)-([0-9]+)(.*)\.html$" /article_cat.php?id=$1&page=$2 last;
+		rewrite "^/article_cat-([0-9]+)(.*)\.html$" /article_cat.php?id=$1 last;
+		rewrite "^/article-([0-9]+)(.*)\.html$" /article.php?id=$1 last;
+		rewrite "^/brand-([0-9]+)-c([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)\.html" /brand.php?id=$1&cat=$2&page=$3&sort=$4&order=$5 last;
+		rewrite "^/brand-([0-9]+)-c([0-9]+)-([0-9]+)(.*)\.html" /brand.php?id=$1&cat=$2&page=$3 last;
+		rewrite "^/brand-([0-9]+)-c([0-9]+)(.*)\.html" /brand.php?id=$1&cat=$2 last;
+		rewrite "^/brand-([0-9]+)(.*)\.html" /brand.php?id=$1 last;
+		rewrite "^/tag-(.*)\.html" /search.php?keywords=$1 last;
+		rewrite "^/snatch-([0-9]+)\.html$" /snatch.php?id=$1 last;
+		rewrite "^/group_buy-([0-9]+)\.html$" /group_buy.php?act=view&id=$1 last;
+		rewrite "^/auction-([0-9]+)\.html$" /auction.php?act=view&id=$1 last;
+		rewrite "^/exchange-id([0-9]+)(.*)\.html$" /exchange.php?id=$1&act=view last;
+		rewrite "^/exchange-([0-9]+)-min([0-9]+)-max([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /exchange.php?cat_id=$1&integral_min=$2&integral_max=$3&page=$4&sort=$5&order=$6 last;
+		rewrite ^/exchange-([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /exchange.php?cat_id=$1&page=$2&sort=$3&order=$4 last;
+		rewrite "^/exchange-([0-9]+)-([0-9]+)(.*)\.html$" /exchange.php?cat_id=$1&page=$2 last;
+		rewrite "^/exchange-([0-9]+)(.*)\.html$" /exchange.php?cat_id=$1 last;
+	}
+}
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/emlog.conf b/web/misc/nginx/rewrite/emlog.conf
new file mode 100755
index 000000000..77f1a17d6
--- /dev/null
+++ b/web/misc/nginx/rewrite/emlog.conf
@@ -0,0 +1,7 @@
+location / {
+	index index.php index.html;
+	if (!-e $request_filename)
+	{
+		rewrite ^/(.*)$ /index.php last;
+	}
+}
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/fastdfs.conf b/web/misc/nginx/rewrite/fastdfs.conf
new file mode 100644
index 000000000..1b89c6e01
--- /dev/null
+++ b/web/misc/nginx/rewrite/fastdfs.conf
@@ -0,0 +1,5 @@
+location ~/group([0-9])/M00 {
+    # Need to cooperate with it
+    # https://github.com/mw-plugin/fastdfs
+    ngx_fastdfs_module;
+}
diff --git a/web/misc/nginx/rewrite/gunicorn.conf b/web/misc/nginx/rewrite/gunicorn.conf
new file mode 100755
index 000000000..80709d083
--- /dev/null
+++ b/web/misc/nginx/rewrite/gunicorn.conf
@@ -0,0 +1,9 @@
+
+add_header Access-Control-Allow-Origin *;
+add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
+
+location / {
+     proxy_pass http://127.0.0.1:8000; # 这里是指向 gunicorn host 的服务地址
+     proxy_set_header Host $host;
+     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+}
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/header_cors.conf b/web/misc/nginx/rewrite/header_cors.conf
new file mode 100755
index 000000000..61a875c36
--- /dev/null
+++ b/web/misc/nginx/rewrite/header_cors.conf
@@ -0,0 +1,15 @@
+
+add_header 'Access-Control-Allow-Methods' 'GET,OPTIONS,POST' always;
+add_header 'Access-Control-Allow-Credentials' 'true' always;
+add_header 'Access-Control-Allow-Origin' $http_origin always;
+add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, X-Requested-With, Cache-Control' always;
+
+
+
+#add_header Access-Control-Allow-Origin *;
+#add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
+
+
+#add_header Access-Control-Allow-Origin *;
+#add_header Access-Control-Allow-Methods *;
+#add_header Access-Control-Allow-Header *;
diff --git a/web/misc/nginx/rewrite/laravel5.conf b/web/misc/nginx/rewrite/laravel5.conf
new file mode 100755
index 000000000..d550bbb09
--- /dev/null
+++ b/web/misc/nginx/rewrite/laravel5.conf
@@ -0,0 +1,3 @@
+location / {  
+	try_files $uri $uri/ /index.php$is_args$query_string;  
+}  
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/mvc.conf b/web/misc/nginx/rewrite/mvc.conf
new file mode 100755
index 000000000..44d945a14
--- /dev/null
+++ b/web/misc/nginx/rewrite/mvc.conf
@@ -0,0 +1,6 @@
+location / {
+	if (!-e $request_filename) {
+	   rewrite  ^(.*)$  /index.php/$1  last;
+	   break;
+	}
+}
diff --git a/web/misc/nginx/rewrite/nezha.conf b/web/misc/nginx/rewrite/nezha.conf
new file mode 100644
index 000000000..fe3631d7a
--- /dev/null
+++ b/web/misc/nginx/rewrite/nezha.conf
@@ -0,0 +1,15 @@
+#PROXY-START/
+# root /www/server/nezha/dashboard/resource;
+location / {
+    proxy_pass http://127.0.0.1:9527;
+    proxy_set_header Host $http_host;
+    proxy_set_header      Upgrade $http_upgrade;
+}
+location ~ ^/(ws|terminal/.+)$  {
+    proxy_pass http://127.0.0.1:9527;
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "Upgrade";
+    proxy_set_header Host $http_host;
+}
+#PROXY-END/
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/phpcms.conf b/web/misc/nginx/rewrite/phpcms.conf
new file mode 100755
index 000000000..a6e0df346
--- /dev/null
+++ b/web/misc/nginx/rewrite/phpcms.conf
@@ -0,0 +1,9 @@
+location / {
+	###以下为PHPCMS 伪静态化rewrite法则
+	rewrite ^(.*)show-([0-9]+)-([0-9]+)\.html$ $1/show.php?itemid=$2&page=$3;
+	rewrite ^(.*)list-([0-9]+)-([0-9]+)\.html$ $1/list.php?catid=$2&page=$3;
+	rewrite ^(.*)show-([0-9]+)\.html$ $1/show.php?specialid=$2;
+	####以下为PHPWind 伪静态化rewrite法则
+	rewrite ^(.*)-htm-(.*)$ $1.php?$2 last;
+	rewrite ^(.*)/simple/([a-z0-9\_]+\.html)$ $1/simple/index.php?$2 last;
+}
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/phpwind.conf b/web/misc/nginx/rewrite/phpwind.conf
new file mode 100755
index 000000000..6dba1e34e
--- /dev/null
+++ b/web/misc/nginx/rewrite/phpwind.conf
@@ -0,0 +1,4 @@
+location / {
+    rewrite ^(.*)-htm-(.*)$ $1.php?$2 last;
+    rewrite ^(.*)/simple/([a-z0-9\_]+\.html)$ $1/simple/index.php?$2 last;
+}
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/proxy.conf b/web/misc/nginx/rewrite/proxy.conf
new file mode 100644
index 000000000..8c34c461c
--- /dev/null
+++ b/web/misc/nginx/rewrite/proxy.conf
@@ -0,0 +1,7 @@
+
+location / {
+    proxy_pass http://localhost:11334/;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+}
diff --git a/web/misc/nginx/rewrite/proxydg.conf b/web/misc/nginx/rewrite/proxydg.conf
new file mode 100644
index 000000000..1a2c1e319
--- /dev/null
+++ b/web/misc/nginx/rewrite/proxydg.conf
@@ -0,0 +1,8 @@
+location / {
+   proxy_redirect off;
+   proxy_pass http://127.0.0.1:12345;
+   proxy_http_version 1.1;
+   proxy_set_header Upgrade $http_upgrade;
+   proxy_set_header Connection "upgrade";
+   proxy_set_header Host $http_host;
+}
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/sablog.conf b/web/misc/nginx/rewrite/sablog.conf
new file mode 100755
index 000000000..8009724ef
--- /dev/null
+++ b/web/misc/nginx/rewrite/sablog.conf
@@ -0,0 +1,16 @@
+location / {	
+	rewrite "^/date/([0-9]{6})/?([0-9]+)?/?$" /index.php?action=article&setdate=$1&page=$2 last;
+	rewrite ^/page/([0-9]+)?/?$ /index.php?action=article&page=$1 last;
+	rewrite ^/category/([0-9]+)/?([0-9]+)?/?$ /index.php?action=article&cid=$1&page=$2 last;
+	rewrite ^/category/([^/]+)/?([0-9]+)?/?$ /index.php?action=article&curl=$1&page=$2 last;
+	rewrite ^/(archives|search|article|links)/?$ /index.php?action=$1 last;
+	rewrite ^/(comments|tagslist|trackbacks|article)/?([0-9]+)?/?$ /index.php?action=$1&page=$2 last;
+	rewrite ^/tag/([^/]+)/?([0-9]+)?/?$ /index.php?action=article&item=$1&page=$2 last;
+	rewrite ^/archives/([0-9]+)/?([0-9]+)?/?$ /index.php?action=show&id=$1&page=$2 last;
+	rewrite ^/rss/([0-9]+)?/?$ /rss.php?cid=$1 last;
+	rewrite ^/rss/([^/]+)/?$ /rss.php?url=$1 last;
+	rewrite ^/uid/([0-9]+)/?([0-9]+)?/?$ /index.php?action=article&uid=$1&page=$2 last;
+	rewrite ^/user/([^/]+)/?([0-9]+)?/?$ /index.php?action=article&user=$1&page=$2 last;
+	rewrite sitemap.xml sitemap.php last;
+	rewrite ^(.*)/([0-9a-zA-Z\-\_]+)/?([0-9]+)?/?$ $1/index.php?action=show&alias=$2&page=$3 last;
+}
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/seacms.conf b/web/misc/nginx/rewrite/seacms.conf
new file mode 100755
index 000000000..0dc6f3612
--- /dev/null
+++ b/web/misc/nginx/rewrite/seacms.conf
@@ -0,0 +1,11 @@
+location / {
+	rewrite ^/frim/index(.+?)\.html$ /list/index.php?$1 last;
+	rewrite ^/movie/index(.+?)\.html$ /detail/index.php?$1 last;
+	rewrite ^/play/([0-9]+)-([0-9]+)-([0-9]+)\.html$ /video/index.php?$1-$2-$3 last;
+	rewrite ^/topic/index(.+?)\.html$ /topic/index.php?$1 last;
+	rewrite ^/topiclist/index(.+?).html$ /topiclist/index.php?$1 last;
+	rewrite ^/index\.html$ index.php permanent;
+	rewrite ^/news\.html$ news/ permanent;
+	rewrite ^/part/index(.+?)\.html$ /articlelist/index.php?$1 last;
+	rewrite ^/article/index(.+?)\.html$ /article/index.php?$1 last;
+}
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/shopex.conf b/web/misc/nginx/rewrite/shopex.conf
new file mode 100755
index 000000000..afc87532d
--- /dev/null
+++ b/web/misc/nginx/rewrite/shopex.conf
@@ -0,0 +1,5 @@
+location / {
+	if (!-e $request_filename) {
+		rewrite ^/(.+\.(html|xml|json|htm|php|jsp|asp|shtml))$ /index.php?$1 last;
+	}
+}
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/sub.conf.tpl b/web/misc/nginx/rewrite/sub.conf.tpl
new file mode 100644
index 000000000..5996e01d4
--- /dev/null
+++ b/web/misc/nginx/rewrite/sub.conf.tpl
@@ -0,0 +1,16 @@
+location / {
+    set $replace 'tmplate_replace';
+    set $spider_request '0';
+
+    if ($http_user_agent ~* '(baiduspider|360sipder|Sogou Orion spider|Sogou News Spider|Sogou blog|Sogou spider2|Sogou inst spider|Sogou web spider|Sogou spider|trendiction|Yahoo|semrush|Toutiao|Google|qihoobot|Googlebot|Googlebot-Mobile|Googlebot-Image|Mediapartners-Google|Adsbot-Google|Feedfetcher-Google|Yahoo! Slurp|Yahoo! Slurp China|YoudaoBot|Sosospider|MSNBot|ia_archiver|Tomato Bot)') {
+        set $spider_request '1';
+    }
+
+    if ($spider_request = '0' ) {
+        set $replace 'tmplate_replace';
+    }
+
+    sub_filter 'tmplate_replace' $replace;
+    sub_filter_once on;
+    sub_filter_types *;
+}
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/thinkphp.conf b/web/misc/nginx/rewrite/thinkphp.conf
new file mode 100755
index 000000000..b8c527532
--- /dev/null
+++ b/web/misc/nginx/rewrite/thinkphp.conf
@@ -0,0 +1,5 @@
+location / {
+	if (!-e $request_filename){
+		rewrite  ^(.*)$  /index.php?s=$1  last;   break;
+	}
+}
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/typecho.conf b/web/misc/nginx/rewrite/typecho.conf
new file mode 100755
index 000000000..dcc7c3f1a
--- /dev/null
+++ b/web/misc/nginx/rewrite/typecho.conf
@@ -0,0 +1,13 @@
+location / {
+    if (!-e $request_filename) {
+        rewrite ^(.*)$ /index.php$1 last;
+    }
+}
+
+# 不需要,可以删除
+location /typecho/ {
+    if (!-e $request_filename) {
+        rewrite ^(.*)$ /typecho/index.php$1 last;
+    }
+}
+
diff --git a/web/misc/nginx/rewrite/v2ray.conf b/web/misc/nginx/rewrite/v2ray.conf
new file mode 100644
index 000000000..641313279
--- /dev/null
+++ b/web/misc/nginx/rewrite/v2ray.conf
@@ -0,0 +1,15 @@
+location /{
+	if (!-e $request_filename) {
+	   rewrite  ^(.*)$  /index.php/$1  last;
+	   break;
+	}
+}
+
+location /ws {
+   proxy_redirect off;
+   proxy_pass http://127.0.0.1:34861;
+   proxy_http_version 1.1;
+   proxy_set_header Upgrade $http_upgrade;
+   proxy_set_header Connection "upgrade";
+   proxy_set_header Host $http_host;
+}
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/walle.conf b/web/misc/nginx/rewrite/walle.conf
new file mode 100755
index 000000000..c88ba3d7c
--- /dev/null
+++ b/web/misc/nginx/rewrite/walle.conf
@@ -0,0 +1,34 @@
+
+#upstream webservers { 
+#    server 0.0.0.0:5000 weight=1;
+#}
+
+location / {
+    try_files $uri $uri/ /index.html;
+    add_header access-control-allow-origin *;
+}
+
+location ^~ /api/ {
+    add_header        access-control-allow-origin *;
+    proxy_pass        http://webservers;
+    proxy_set_header  X-Forwarded-Host $host:$server_port;
+    proxy_set_header  X-Real-IP  $remote_addr;
+    proxy_set_header  Origin        $host:$server_port;
+    proxy_set_header  Referer       $host:$server_port;
+}
+
+location ^~ /socket.io/ {
+    add_header        access-control-allow-origin *;
+    proxy_pass        http://webservers;
+    proxy_set_header  X-Forwarded-Host $host:$server_port;
+    proxy_set_header  X-Real-IP  $remote_addr;
+    proxy_set_header  Origin        $host:$server_port;
+    proxy_set_header  Referer       $host:$server_port;
+    proxy_set_header  Host $http_host;
+    proxy_set_header  X-NginX-Proxy true;
+
+    # WebScoket Support
+    proxy_http_version 1.1;
+    proxy_set_header   Upgrade $http_upgrade;
+    proxy_set_header   Connection "upgrade";
+}
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/whmcs.conf b/web/misc/nginx/rewrite/whmcs.conf
new file mode 100755
index 000000000..2cdd0e710
--- /dev/null
+++ b/web/misc/nginx/rewrite/whmcs.conf
@@ -0,0 +1,16 @@
+location / {
+
+	if (!-e $request_filename) {
+		rewrite ^/contact/$ /./contact.php last;
+		rewrite ^/status$ /./pages.php?cate=$1&page=status last;
+		rewrite ^/act$ /./pages.php?cate=$1&page=actindex last;
+		rewrite ^/(\w+)/(\w+)/$ /./pages.php?cate=$1&page=$2 last;
+		rewrite ^/cart/(\w+)$ /./cart.php?a=$1 last;
+		rewrite ^/console$ /./clientarea.php last;
+		rewrite ^/sitemap.xml$ /./sitemap.php last;
+		rewrite ^/console/(\w+)$ /./clientarea.php?action=services&group=$1 last;
+		rewrite ^/console/ec/([0-9]+)$ /./clientarea.php?action=productdetails&id=$1 last;
+		rewrite ^/console/ec/(\w+)$ /./clientarea.php?action=services&group=ec&page=$1 last;
+		rewrite ^ /index.php last;
+	}
+}
diff --git a/web/misc/nginx/rewrite/wmcms.conf b/web/misc/nginx/rewrite/wmcms.conf
new file mode 100755
index 000000000..386b75085
--- /dev/null
+++ b/web/misc/nginx/rewrite/wmcms.conf
@@ -0,0 +1,16 @@
+location / {
+	if (!-e $request_filename) {
+       rewrite ^/index.html$ /index.php last;
+       rewrite ^/top/index.html$ /module/novel/topindex.php last;
+       rewrite ^/(\d*)/list/(\d*).html$ /module/novel/type.php?tid=$1&page=$2 last;
+       rewrite ^/(.*?)/(.*?)/info.html$ /module/novel/info.php?tid=$1&nid=$2 last;
+       rewrite ^/(.*?)/(.*?)/read/(\d*).html$ /module/novel/read.php?tid=$1&nid=$2&cid=$3 last;
+       rewrite ^/(.*?)/(.*?)/menu/(\d*).html$ /module/novel/menu.php?tid=$1&nid=$2&page=$3 last;
+       rewrite ^/search/(\d*)/(.*?)/(\d*).html$ /module/novel/search.php?type=$1&key=$2&page=$3 last;
+
+       rewrite ^/(\d*)/list/(\d*)_(\d*)_(\d*)_(\d*)_(\d*)_(\d*)_(\d*)_(\d*).html$ /module/novel/type.php?tid=$1&page=$9&process=$2&word=$3&chapter=$4&copy=$5&cost=$6&letter=$7&order=$8 last;
+
+       rewrite ^/top/list/(\d*)/(\d*)/(\d*).html$ /module/novel/toplist.php?tid=$1&dtype=$2&page=$3 last;
+       break;  
+    }
+}
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/wordpress.conf b/web/misc/nginx/rewrite/wordpress.conf
new file mode 100755
index 000000000..dfa6381d4
--- /dev/null
+++ b/web/misc/nginx/rewrite/wordpress.conf
@@ -0,0 +1,14 @@
+location / {
+	index index.html index.php; 
+	if (-f $request_filename/index.html){ 
+		rewrite (.*) $1/index.html break; 
+	} 
+	if (-f $request_filename/index.php){ 
+		rewrite (.*) $1/index.php; 
+	} 
+	if (!-f $request_filename){ 
+		rewrite (.*) /index.php; 
+	} 
+} 
+
+rewrite /wp-admin$ $scheme://$host$uri/ permanent;
\ No newline at end of file
diff --git a/web/misc/nginx/rewrite/zblog.conf b/web/misc/nginx/rewrite/zblog.conf
new file mode 100755
index 000000000..37d410519
--- /dev/null
+++ b/web/misc/nginx/rewrite/zblog.conf
@@ -0,0 +1,11 @@
+location / {
+	if (-f $request_filename/index.html){
+		rewrite (.*) $1/index.html break;
+	}
+	if (-f $request_filename/index.php){
+		rewrite (.*) $1/index.php;
+	}
+	if (!-f $request_filename){
+		rewrite (.*) /index.php;
+	}
+}
\ No newline at end of file
diff --git a/web/misc/nginx/tpl/nginx.conf b/web/misc/nginx/tpl/nginx.conf
new file mode 100755
index 000000000..5da306f9d
--- /dev/null
+++ b/web/misc/nginx/tpl/nginx.conf
@@ -0,0 +1,53 @@
+server
+{
+    # reuseport 只能在一个server出现一次
+    listen {$PORT};
+    listen [::]:{$PORT};
+    server_name {$SERVER_NAME};
+    index index.php index.html index.htm default.php default.htm default.html;
+    root {$ROOT_DIR};
+    
+    #SSL-START
+    #error_page 404/404.html;
+    #SSL-END
+
+    #301-START
+    
+    #PROXY-START
+    
+    #ERROR-PAGE-START
+    #error_page 404 /404.html;
+    #error_page 502 /502.html;
+    #ERROR-PAGE-END
+    
+    #PHP-INFO-START
+    include {$PHP_DIR}/conf/enable-php-{$PHPVER}.conf;
+    #PHP-INFO-END
+    
+    #REWRITE-START
+    include {$OR_REWRITE}/{$SERVER_NAME}.conf;
+    #REWRITE-END
+    
+    #禁止访问的文件或目录
+    location ~ ^/(\.user.ini|\.htaccess|\.git|\.svn|\.project|LICENSE|README.md)
+    {
+        return 404;
+    }
+    
+    #一键申请SSL证书验证目录相关设置
+    location ~ \.well-known{
+        allow all;
+    }
+
+    location ~ .*\.(gif|jpg|jpeg|png|bmp|swf|js|css|ttf|woff2)$
+    {
+        expires      30d;
+        access_log /dev/null;
+        if ($invalid_referer){
+           return 404;
+        }
+    }
+    
+    access_log  {$LOGPATH}/{$SERVER_NAME}.log main;
+    error_log   {$LOGPATH}/{$SERVER_NAME}.error.log;
+}
\ No newline at end of file
diff --git a/web/misc/nginx/tpl/nginx_dirbind.conf b/web/misc/nginx/tpl/nginx_dirbind.conf
new file mode 100755
index 000000000..129a7ddd1
--- /dev/null
+++ b/web/misc/nginx/tpl/nginx_dirbind.conf
@@ -0,0 +1,48 @@
+
+#BINDING-{$DIRBIND}-START
+server
+{
+    listen {$PORT};
+    server_name {$DIRBIND};
+    index index.php index.html index.htm default.php default.htm default.html;
+    root {$ROOT_DIR};
+    
+    #SSL-START
+    #error_page 404/404.html;
+    #SSL-END
+    
+    #ERROR-PAGE-START
+    #error_page 404 /404.html;
+    #error_page 502 /502.html;
+    #ERROR-PAGE-END
+    
+    #PHP-INFO-START
+    include {$PHP_DIR}/conf/enable-php-{$PHPVER}.conf;
+    #PHP-INFO-END
+    
+    #REWRITE-START
+    include {$OR_REWRITE}/{$SERVER_MAIN}.conf;
+    #REWRITE-END
+    
+    #禁止访问的文件或目录
+    location ~ ^/(\.user.ini|\.htaccess|\.git|\.svn|\.project|LICENSE|README.md)
+    {
+        return 404;
+    }
+    
+    #一键申请SSL证书验证目录相关设置
+    location ~ \.well-known{
+        allow all;
+    }
+    
+    location ~ .*\\.(gif|jpg|jpeg|png|bmp|swf|js|css)$
+    {
+        error_log /dev/null;
+        access_log /dev/null;
+        expires 30d;
+    }
+    
+    access_log  {$LOGPATH}/{$SERVER_MAIN}_{$DIRBIND}.log;
+    error_log   {$LOGPATH}/{$SERVER_MAIN}_{$DIRBIND}.error.log;
+}
+#BINDING-{$DIRBIND}-END
\ No newline at end of file
diff --git a/web/misc/nginx/tpl/nginx_panel.conf b/web/misc/nginx/tpl/nginx_panel.conf
new file mode 100755
index 000000000..c487094fd
--- /dev/null
+++ b/web/misc/nginx/tpl/nginx_panel.conf
@@ -0,0 +1,23 @@
+server
+{
+    listen {$PORT};
+    listen [::]:{$PORT};
+    
+    server_name {$SERVER_NAME};
+    index index.php index.html index.htm default.php default.htm default.html;
+    
+    #SSL-START
+    #error_page 404/404.html;
+    #SSL-END
+
+    #PROXY-START
+    location ^~ / {
+        proxy_pass http://0.0.0.0:{$PANAL_PORT}/;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+    }
+    #PROXY-END
+
+    error_log   {$LOGPATH}/{$SERVER_NAME}.error.log;
+}
\ No newline at end of file

From 4ed5c48650a75f0016b0dc8039e5e05b5db9de30 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 04:45:38 +0800
Subject: [PATCH 327/965] update

---
 {version => web/misc/version}/api/mw_api.php | 0
 {version => web/misc/version}/api/mw_api.py  | 0
 {version => web/misc/version}/info.json      | 0
 {version => web/misc/version}/r3.6.txt       | 0
 {version => web/misc/version}/r3.7.txt       | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename {version => web/misc/version}/api/mw_api.php (100%)
 rename {version => web/misc/version}/api/mw_api.py (100%)
 rename {version => web/misc/version}/info.json (100%)
 rename {version => web/misc/version}/r3.6.txt (100%)
 rename {version => web/misc/version}/r3.7.txt (100%)

diff --git a/version/api/mw_api.php b/web/misc/version/api/mw_api.php
similarity index 100%
rename from version/api/mw_api.php
rename to web/misc/version/api/mw_api.php
diff --git a/version/api/mw_api.py b/web/misc/version/api/mw_api.py
similarity index 100%
rename from version/api/mw_api.py
rename to web/misc/version/api/mw_api.py
diff --git a/version/info.json b/web/misc/version/info.json
similarity index 100%
rename from version/info.json
rename to web/misc/version/info.json
diff --git a/version/r3.6.txt b/web/misc/version/r3.6.txt
similarity index 100%
rename from version/r3.6.txt
rename to web/misc/version/r3.6.txt
diff --git a/version/r3.7.txt b/web/misc/version/r3.7.txt
similarity index 100%
rename from version/r3.7.txt
rename to web/misc/version/r3.7.txt

From 4e3e7b7301afb27b1e0a24d5750242ffd503bc03 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 04:53:03 +0800
Subject: [PATCH 328/965] update

---
 {rewrite => rewrites}/nginx/EmpireCMS.conf      |  0
 .../nginx/cloudfare_real_ip.conf                |  0
 {rewrite => rewrites}/nginx/dedecms.conf        |  0
 {rewrite => rewrites}/nginx/discuzx.conf        |  0
 {rewrite => rewrites}/nginx/discuzx2.conf       |  0
 {rewrite => rewrites}/nginx/discuzx3.conf       |  0
 {rewrite => rewrites}/nginx/drupal.conf         |  0
 {rewrite => rewrites}/nginx/ecshop.conf         |  0
 {rewrite => rewrites}/nginx/emlog.conf          |  0
 {rewrite => rewrites}/nginx/fastdfs.conf        |  0
 {rewrite => rewrites}/nginx/gunicorn.conf       |  0
 {rewrite => rewrites}/nginx/header_cors.conf    |  0
 {rewrite => rewrites}/nginx/laravel5.conf       |  0
 {rewrite => rewrites}/nginx/mvc.conf            |  0
 {rewrite => rewrites}/nginx/nezha.conf          |  0
 {rewrite => rewrites}/nginx/phpcms.conf         |  0
 {rewrite => rewrites}/nginx/phpwind.conf        |  0
 {rewrite => rewrites}/nginx/proxy.conf          |  0
 {rewrite => rewrites}/nginx/proxydg.conf        |  0
 {rewrite => rewrites}/nginx/sablog.conf         |  0
 {rewrite => rewrites}/nginx/seacms.conf         |  0
 {rewrite => rewrites}/nginx/shopex.conf         |  0
 {rewrite => rewrites}/nginx/sub.conf.tpl        |  0
 {rewrite => rewrites}/nginx/thinkphp.conf       |  0
 {rewrite => rewrites}/nginx/typecho.conf        |  0
 {rewrite => rewrites}/nginx/v2ray.conf          |  0
 {rewrite => rewrites}/nginx/walle.conf          |  0
 {rewrite => rewrites}/nginx/whmcs.conf          |  0
 {rewrite => rewrites}/nginx/wmcms.conf          |  0
 {rewrite => rewrites}/nginx/wordpress.conf      |  0
 {rewrite => rewrites}/nginx/zblog.conf          |  0
 web/admin/site/site.py                          | 10 +++++++++-
 web/utils/site.py                               | 17 +++++++++++++++--
 33 files changed, 24 insertions(+), 3 deletions(-)
 rename {rewrite => rewrites}/nginx/EmpireCMS.conf (100%)
 rename {rewrite => rewrites}/nginx/cloudfare_real_ip.conf (100%)
 rename {rewrite => rewrites}/nginx/dedecms.conf (100%)
 rename {rewrite => rewrites}/nginx/discuzx.conf (100%)
 rename {rewrite => rewrites}/nginx/discuzx2.conf (100%)
 rename {rewrite => rewrites}/nginx/discuzx3.conf (100%)
 rename {rewrite => rewrites}/nginx/drupal.conf (100%)
 rename {rewrite => rewrites}/nginx/ecshop.conf (100%)
 rename {rewrite => rewrites}/nginx/emlog.conf (100%)
 rename {rewrite => rewrites}/nginx/fastdfs.conf (100%)
 rename {rewrite => rewrites}/nginx/gunicorn.conf (100%)
 rename {rewrite => rewrites}/nginx/header_cors.conf (100%)
 rename {rewrite => rewrites}/nginx/laravel5.conf (100%)
 rename {rewrite => rewrites}/nginx/mvc.conf (100%)
 rename {rewrite => rewrites}/nginx/nezha.conf (100%)
 rename {rewrite => rewrites}/nginx/phpcms.conf (100%)
 rename {rewrite => rewrites}/nginx/phpwind.conf (100%)
 rename {rewrite => rewrites}/nginx/proxy.conf (100%)
 rename {rewrite => rewrites}/nginx/proxydg.conf (100%)
 rename {rewrite => rewrites}/nginx/sablog.conf (100%)
 rename {rewrite => rewrites}/nginx/seacms.conf (100%)
 rename {rewrite => rewrites}/nginx/shopex.conf (100%)
 rename {rewrite => rewrites}/nginx/sub.conf.tpl (100%)
 rename {rewrite => rewrites}/nginx/thinkphp.conf (100%)
 rename {rewrite => rewrites}/nginx/typecho.conf (100%)
 rename {rewrite => rewrites}/nginx/v2ray.conf (100%)
 rename {rewrite => rewrites}/nginx/walle.conf (100%)
 rename {rewrite => rewrites}/nginx/whmcs.conf (100%)
 rename {rewrite => rewrites}/nginx/wmcms.conf (100%)
 rename {rewrite => rewrites}/nginx/wordpress.conf (100%)
 rename {rewrite => rewrites}/nginx/zblog.conf (100%)

diff --git a/rewrite/nginx/EmpireCMS.conf b/rewrites/nginx/EmpireCMS.conf
similarity index 100%
rename from rewrite/nginx/EmpireCMS.conf
rename to rewrites/nginx/EmpireCMS.conf
diff --git a/rewrite/nginx/cloudfare_real_ip.conf b/rewrites/nginx/cloudfare_real_ip.conf
similarity index 100%
rename from rewrite/nginx/cloudfare_real_ip.conf
rename to rewrites/nginx/cloudfare_real_ip.conf
diff --git a/rewrite/nginx/dedecms.conf b/rewrites/nginx/dedecms.conf
similarity index 100%
rename from rewrite/nginx/dedecms.conf
rename to rewrites/nginx/dedecms.conf
diff --git a/rewrite/nginx/discuzx.conf b/rewrites/nginx/discuzx.conf
similarity index 100%
rename from rewrite/nginx/discuzx.conf
rename to rewrites/nginx/discuzx.conf
diff --git a/rewrite/nginx/discuzx2.conf b/rewrites/nginx/discuzx2.conf
similarity index 100%
rename from rewrite/nginx/discuzx2.conf
rename to rewrites/nginx/discuzx2.conf
diff --git a/rewrite/nginx/discuzx3.conf b/rewrites/nginx/discuzx3.conf
similarity index 100%
rename from rewrite/nginx/discuzx3.conf
rename to rewrites/nginx/discuzx3.conf
diff --git a/rewrite/nginx/drupal.conf b/rewrites/nginx/drupal.conf
similarity index 100%
rename from rewrite/nginx/drupal.conf
rename to rewrites/nginx/drupal.conf
diff --git a/rewrite/nginx/ecshop.conf b/rewrites/nginx/ecshop.conf
similarity index 100%
rename from rewrite/nginx/ecshop.conf
rename to rewrites/nginx/ecshop.conf
diff --git a/rewrite/nginx/emlog.conf b/rewrites/nginx/emlog.conf
similarity index 100%
rename from rewrite/nginx/emlog.conf
rename to rewrites/nginx/emlog.conf
diff --git a/rewrite/nginx/fastdfs.conf b/rewrites/nginx/fastdfs.conf
similarity index 100%
rename from rewrite/nginx/fastdfs.conf
rename to rewrites/nginx/fastdfs.conf
diff --git a/rewrite/nginx/gunicorn.conf b/rewrites/nginx/gunicorn.conf
similarity index 100%
rename from rewrite/nginx/gunicorn.conf
rename to rewrites/nginx/gunicorn.conf
diff --git a/rewrite/nginx/header_cors.conf b/rewrites/nginx/header_cors.conf
similarity index 100%
rename from rewrite/nginx/header_cors.conf
rename to rewrites/nginx/header_cors.conf
diff --git a/rewrite/nginx/laravel5.conf b/rewrites/nginx/laravel5.conf
similarity index 100%
rename from rewrite/nginx/laravel5.conf
rename to rewrites/nginx/laravel5.conf
diff --git a/rewrite/nginx/mvc.conf b/rewrites/nginx/mvc.conf
similarity index 100%
rename from rewrite/nginx/mvc.conf
rename to rewrites/nginx/mvc.conf
diff --git a/rewrite/nginx/nezha.conf b/rewrites/nginx/nezha.conf
similarity index 100%
rename from rewrite/nginx/nezha.conf
rename to rewrites/nginx/nezha.conf
diff --git a/rewrite/nginx/phpcms.conf b/rewrites/nginx/phpcms.conf
similarity index 100%
rename from rewrite/nginx/phpcms.conf
rename to rewrites/nginx/phpcms.conf
diff --git a/rewrite/nginx/phpwind.conf b/rewrites/nginx/phpwind.conf
similarity index 100%
rename from rewrite/nginx/phpwind.conf
rename to rewrites/nginx/phpwind.conf
diff --git a/rewrite/nginx/proxy.conf b/rewrites/nginx/proxy.conf
similarity index 100%
rename from rewrite/nginx/proxy.conf
rename to rewrites/nginx/proxy.conf
diff --git a/rewrite/nginx/proxydg.conf b/rewrites/nginx/proxydg.conf
similarity index 100%
rename from rewrite/nginx/proxydg.conf
rename to rewrites/nginx/proxydg.conf
diff --git a/rewrite/nginx/sablog.conf b/rewrites/nginx/sablog.conf
similarity index 100%
rename from rewrite/nginx/sablog.conf
rename to rewrites/nginx/sablog.conf
diff --git a/rewrite/nginx/seacms.conf b/rewrites/nginx/seacms.conf
similarity index 100%
rename from rewrite/nginx/seacms.conf
rename to rewrites/nginx/seacms.conf
diff --git a/rewrite/nginx/shopex.conf b/rewrites/nginx/shopex.conf
similarity index 100%
rename from rewrite/nginx/shopex.conf
rename to rewrites/nginx/shopex.conf
diff --git a/rewrite/nginx/sub.conf.tpl b/rewrites/nginx/sub.conf.tpl
similarity index 100%
rename from rewrite/nginx/sub.conf.tpl
rename to rewrites/nginx/sub.conf.tpl
diff --git a/rewrite/nginx/thinkphp.conf b/rewrites/nginx/thinkphp.conf
similarity index 100%
rename from rewrite/nginx/thinkphp.conf
rename to rewrites/nginx/thinkphp.conf
diff --git a/rewrite/nginx/typecho.conf b/rewrites/nginx/typecho.conf
similarity index 100%
rename from rewrite/nginx/typecho.conf
rename to rewrites/nginx/typecho.conf
diff --git a/rewrite/nginx/v2ray.conf b/rewrites/nginx/v2ray.conf
similarity index 100%
rename from rewrite/nginx/v2ray.conf
rename to rewrites/nginx/v2ray.conf
diff --git a/rewrite/nginx/walle.conf b/rewrites/nginx/walle.conf
similarity index 100%
rename from rewrite/nginx/walle.conf
rename to rewrites/nginx/walle.conf
diff --git a/rewrite/nginx/whmcs.conf b/rewrites/nginx/whmcs.conf
similarity index 100%
rename from rewrite/nginx/whmcs.conf
rename to rewrites/nginx/whmcs.conf
diff --git a/rewrite/nginx/wmcms.conf b/rewrites/nginx/wmcms.conf
similarity index 100%
rename from rewrite/nginx/wmcms.conf
rename to rewrites/nginx/wmcms.conf
diff --git a/rewrite/nginx/wordpress.conf b/rewrites/nginx/wordpress.conf
similarity index 100%
rename from rewrite/nginx/wordpress.conf
rename to rewrites/nginx/wordpress.conf
diff --git a/rewrite/nginx/zblog.conf b/rewrites/nginx/zblog.conf
similarity index 100%
rename from rewrite/nginx/zblog.conf
rename to rewrites/nginx/zblog.conf
diff --git a/web/admin/site/site.py b/web/admin/site/site.py
index 26ffbd81b..b8e1a1bcc 100644
--- a/web/admin/site/site.py
+++ b/web/admin/site/site.py
@@ -248,10 +248,18 @@ def get_rewrite_conf():
 # 获取Rewrite模版名
 @blueprint.route('/get_rewrite_tpl', endpoint='get_rewrite_tpl',methods=['POST'])
 @panel_login_required
-def get_php_version():
+def get_rewrite_tpl():
     tplname = request.form.get('tplname', '')
     return MwSites.instance().getRewriteTpl(tplname)
 
+# 设置Rewrite模版名
+@blueprint.route('/set_rewrite_tpl', endpoint='set_rewrite_tpl',methods=['POST'])
+@panel_login_required
+def set_rewrite_tpl():
+    name = request.form.get('name', '')
+    data = request.form.get('data', '')
+    return MwSites.instance().setRewriteTpl(name,data)
+
 # 网站日志开关
 @blueprint.route('/logs_open', endpoint='logs_open',methods=['POST'])
 @panel_login_required
diff --git a/web/utils/site.py b/web/utils/site.py
index 5d8a460dd..e9c9a3329 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -606,16 +606,29 @@ class sites(object):
 
     # 获取模版名内容
     def getRewriteTpl(self, tplname):
-        file = mw.getPanelDir() + '/rewrite/nginx/' + tplname + '.conf'
+        file = mw.getPanelDir() + '/web/misc/nginx/rewrite/' + tplname + '.conf'
         if not os.path.exists(file):
             return mw.returnData(False, '模版不存在!')
         return mw.returnData(True, 'OK', file)
 
+    def setRewriteTpl(self,name,data):
+        path = mw.getPanelDir() + '/web/misc/nginx/rewrite/' + name + ".conf"
+        if os.path.exists(path):
+            return mw.returnData(False, '模版已经存在!')
+
+        if data == "":
+            return mw.returnData(False, '模版内容不能为空!')
+        ok = mw.writeFile(path, data)
+        if not ok:
+            return mw.returnData(False, '模版保持失败!')
+
+        return mw.returnData(True, '设置模板成功!')
+
     def getRewriteList(self):
         rewriteList = {}
         rewriteList['rewrite'] = []
         rewriteList['rewrite'].append('0.当前')
-        rewrite_nginx_dir = mw.getPanelDir() + '/rewrite/nginx'
+        rewrite_nginx_dir = mw.getPanelDir() + '/web/misc/nginx/rewrite'
         for ds in os.listdir(rewrite_nginx_dir):
             rewriteList['rewrite'].append(ds[0:len(ds) - 5])
         rewriteList['rewrite'] = sorted(rewriteList['rewrite'])

From 9933035caefcdd7cd619c24a7a907c755efc84ae Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 04:53:43 +0800
Subject: [PATCH 329/965] update

---
 rewrites/nginx/EmpireCMS.conf         | 10 -------
 rewrites/nginx/cloudfare_real_ip.conf | 43 ---------------------------
 rewrites/nginx/dedecms.conf           | 12 --------
 rewrites/nginx/discuzx.conf           | 18 -----------
 rewrites/nginx/discuzx2.conf          | 14 ---------
 rewrites/nginx/discuzx3.conf          | 15 ----------
 rewrites/nginx/drupal.conf            |  5 ----
 rewrites/nginx/ecshop.conf            | 33 --------------------
 rewrites/nginx/emlog.conf             |  7 -----
 rewrites/nginx/fastdfs.conf           |  5 ----
 rewrites/nginx/gunicorn.conf          |  9 ------
 rewrites/nginx/header_cors.conf       | 15 ----------
 rewrites/nginx/laravel5.conf          |  3 --
 rewrites/nginx/mvc.conf               |  6 ----
 rewrites/nginx/nezha.conf             | 15 ----------
 rewrites/nginx/phpcms.conf            |  9 ------
 rewrites/nginx/phpwind.conf           |  4 ---
 rewrites/nginx/proxy.conf             |  7 -----
 rewrites/nginx/proxydg.conf           |  8 -----
 rewrites/nginx/sablog.conf            | 16 ----------
 rewrites/nginx/seacms.conf            | 11 -------
 rewrites/nginx/shopex.conf            |  5 ----
 rewrites/nginx/sub.conf.tpl           | 16 ----------
 rewrites/nginx/thinkphp.conf          |  5 ----
 rewrites/nginx/typecho.conf           | 13 --------
 rewrites/nginx/v2ray.conf             | 15 ----------
 rewrites/nginx/walle.conf             | 34 ---------------------
 rewrites/nginx/whmcs.conf             | 16 ----------
 rewrites/nginx/wmcms.conf             | 16 ----------
 rewrites/nginx/wordpress.conf         | 14 ---------
 rewrites/nginx/zblog.conf             | 11 -------
 31 files changed, 410 deletions(-)
 delete mode 100755 rewrites/nginx/EmpireCMS.conf
 delete mode 100644 rewrites/nginx/cloudfare_real_ip.conf
 delete mode 100755 rewrites/nginx/dedecms.conf
 delete mode 100755 rewrites/nginx/discuzx.conf
 delete mode 100755 rewrites/nginx/discuzx2.conf
 delete mode 100755 rewrites/nginx/discuzx3.conf
 delete mode 100755 rewrites/nginx/drupal.conf
 delete mode 100755 rewrites/nginx/ecshop.conf
 delete mode 100755 rewrites/nginx/emlog.conf
 delete mode 100644 rewrites/nginx/fastdfs.conf
 delete mode 100755 rewrites/nginx/gunicorn.conf
 delete mode 100755 rewrites/nginx/header_cors.conf
 delete mode 100755 rewrites/nginx/laravel5.conf
 delete mode 100755 rewrites/nginx/mvc.conf
 delete mode 100644 rewrites/nginx/nezha.conf
 delete mode 100755 rewrites/nginx/phpcms.conf
 delete mode 100755 rewrites/nginx/phpwind.conf
 delete mode 100644 rewrites/nginx/proxy.conf
 delete mode 100644 rewrites/nginx/proxydg.conf
 delete mode 100755 rewrites/nginx/sablog.conf
 delete mode 100755 rewrites/nginx/seacms.conf
 delete mode 100755 rewrites/nginx/shopex.conf
 delete mode 100644 rewrites/nginx/sub.conf.tpl
 delete mode 100755 rewrites/nginx/thinkphp.conf
 delete mode 100755 rewrites/nginx/typecho.conf
 delete mode 100644 rewrites/nginx/v2ray.conf
 delete mode 100755 rewrites/nginx/walle.conf
 delete mode 100755 rewrites/nginx/whmcs.conf
 delete mode 100755 rewrites/nginx/wmcms.conf
 delete mode 100755 rewrites/nginx/wordpress.conf
 delete mode 100755 rewrites/nginx/zblog.conf

diff --git a/rewrites/nginx/EmpireCMS.conf b/rewrites/nginx/EmpireCMS.conf
deleted file mode 100755
index 33cdf5791..000000000
--- a/rewrites/nginx/EmpireCMS.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-location / {
-	rewrite ^([^\.]*)/listinfo-(.+?)-(.+?)\.html$ $1/e/action/ListInfo/index.php?classid=$2&page=$3 last;
-	rewrite ^([^\.]*)/showinfo-(.+?)-(.+?)-(.+?)\.html$ $1/e/action/ShowInfo.php?classid=$2&id=$3&page=$4 last;
-	rewrite ^([^\.]*)/infotype-(.+?)-(.+?)\.html$ $1/e/action/InfoType/index.php?ttid=$2&page=$3 last;
-	rewrite ^([^\.]*)/tags-(.+?)-(.+?)\.html$ $1/e/tags/index.php?tagname=$2&page=$3 last;
-	rewrite ^([^\.]*)/comment-(.+?)-(.+?)-(.+?)-(.+?)-(.+?)-(.+?)\.html$  $1/e/pl/index\.php\?doaction=$2&classid=$3&id=$4&page=$5&myorder=$6&tempid=$7 last;
-	if (!-e $request_filename) {
-		return 404;
-	}
-}
\ No newline at end of file
diff --git a/rewrites/nginx/cloudfare_real_ip.conf b/rewrites/nginx/cloudfare_real_ip.conf
deleted file mode 100644
index cd19beb0e..000000000
--- a/rewrites/nginx/cloudfare_real_ip.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-location / {
-
-	# https://www.cloudflare.com/zh-cn/ips/
-    set_real_ip_from 173.245.48.0/20;
-    set_real_ip_from 103.21.244.0/22;
-    set_real_ip_from 103.22.200.0/22;
-    set_real_ip_from 103.31.4.0/22;
-    set_real_ip_from 141.101.64.0/18;
-    set_real_ip_from 108.162.192.0/18;
-    set_real_ip_from 190.93.240.0/20;
-    set_real_ip_from 188.114.96.0/20;
-    set_real_ip_from 197.234.240.0/22;
-	set_real_ip_from 198.41.128.0/17;
-	set_real_ip_from 162.158.0.0/15;
-	set_real_ip_from 104.16.0.0/13;
-	set_real_ip_from 104.24.0.0/14;
-	set_real_ip_from 172.64.0.0/13;
-	set_real_ip_from 131.0.72.0/22;
-	set_real_ip_from 2400:cb00::/32;
-	set_real_ip_from 2606:4700::/32;
-	set_real_ip_from 2803:f800::/32;
-	set_real_ip_from 2405:b500::/32;
-	set_real_ip_from 2405:8100::/32;
-    set_real_ip_from 2a06:98c0::/29;
-    set_real_ip_from 2c0f:f248::/32;
-    # use any of the following two
-    real_ip_header CF-Connecting-IP;
-    #real_ip_header X-Forwarded-For;
-
-     
-	index index.html index.php; 
-	if (-f $request_filename/index.html){ 
-		rewrite (.*) $1/index.html break; 
-	} 
-	if (-f $request_filename/index.php){ 
-		rewrite (.*) $1/index.php; 
-	} 
-	if (!-f $request_filename){ 
-		rewrite (.*) /index.php; 
-	} 
-} 
-
-rewrite /wp-admin$ $scheme://$host$uri/ permanent;
diff --git a/rewrites/nginx/dedecms.conf b/rewrites/nginx/dedecms.conf
deleted file mode 100755
index 9e1d20206..000000000
--- a/rewrites/nginx/dedecms.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-location / {
-	rewrite ^/list-([0-9]+)\.html$ /plus/list.php?tid=$1 last;
-	rewrite ^/list-([0-9]+)-([0-9]+)-([0-9]+)\.html$ /plus/list.php?tid=$1&totalresult=$2&PageNo=$3 last;
-	rewrite ^/view-([0-9]+)-1\.html$ /plus/view.php?arcID=$1 last;
-	rewrite ^/view-([0-9]+)-([0-9]+)\.html$" /plus/view.php?aid=$1&pageno=$2 last;
-	rewrite ^/plus/list-([0-9]+)\.html$ /plus/list.php?tid=$1 last;
-	rewrite ^/plus/list-([0-9]+)-([0-9]+)-([0-9]+)\.html$ /plus/list.php?tid=$1&totalresult=$2&PageNo=$3 last;
-	rewrite ^/plus/view-([0-9]+)-1\.html$ /plus/view.php?arcID=$1 last;
-	rewrite ^/plus/view-([0-9]+)-([0-9]+)\.html$ /plus/view.php?aid=$1&pageno=$2 last;
-	rewrite ^/tags.html$ /tags.php last;
-	rewrite ^/tag-([0-9]+)-([0-9]+)\.html$ /tags.php?/$1/$2/ last;
-}
diff --git a/rewrites/nginx/discuzx.conf b/rewrites/nginx/discuzx.conf
deleted file mode 100755
index be93e7de0..000000000
--- a/rewrites/nginx/discuzx.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-location / {
-	rewrite ^([^\.]*)/topic-(.+)\.html$ $1/portal.php?mod=topic&topic=$2 last;
-	rewrite ^([^\.]*)/article-([0-9]+)-([0-9]+)\.html$ $1/portal.php?mod=view&aid=$2&page=$3 last;
-	rewrite ^([^\.]*)/forum-(\w+)-([0-9]+)\.html$ $1/forum.php?mod=forumdisplay&fid=$2&page=$3 last;
-	rewrite ^([^\.]*)/thread-([0-9]+)-([0-9]+)-([0-9]+)\.html$ $1/forum.php?mod=viewthread&tid=$2&extra=page%3D$4&page=$3 last;
-	rewrite ^([^\.]*)/group-([0-9]+)-([0-9]+)\.html$ $1/forum.php?mod=group&fid=$2&page=$3 last;
-	rewrite ^([^\.]*)/space-(username|uid)-(.+)\.html$ $1/home.php?mod=space&$2=$3 last;
-	rewrite ^([^\.]*)/blog-([0-9]+)-([0-9]+)\.html$ $1/home.php?mod=space&uid=$2&do=blog&id=$3 last;
-	rewrite ^([^\.]*)/(fid|tid)-([0-9]+)\.html$ $1/index.php?action=$2&value=$3 last;
-	rewrite ^([^\.]*)/([a-z]+[a-z0-9_]*)-([a-z0-9_\-]+)\.html$ $1/plugin.php?id=$2:$3 last;
-	if (!-e $request_filename) {
-		rewrite  ^(.*)$  /index.php  last;
-	}
-
-	#if (!-e $request_filename) {
-	#	return 404;
-	#}
-}
\ No newline at end of file
diff --git a/rewrites/nginx/discuzx2.conf b/rewrites/nginx/discuzx2.conf
deleted file mode 100755
index f4040718b..000000000
--- a/rewrites/nginx/discuzx2.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-location /bbs/ {
-	rewrite ^([^\.]*)/topic-(.+)\.html$ $1/portal.php?mod=topic&topic=$2 last;
-	rewrite ^([^\.]*)/article-([0-9]+)-([0-9]+)\.html$ $1/portal.php?mod=view&aid=$2&page=$3 last;
-	rewrite ^([^\.]*)/forum-(\w+)-([0-9]+)\.html$ $1/forum.php?mod=forumdisplay&fid=$2&page=$3 last;
-	rewrite ^([^\.]*)/thread-([0-9]+)-([0-9]+)-([0-9]+)\.html$ $1/forum.php?mod=viewthread&tid=$2&extra=page%3D$4&page=$3 last;
-	rewrite ^([^\.]*)/group-([0-9]+)-([0-9]+)\.html$ $1/forum.php?mod=group&fid=$2&page=$3 last;
-	rewrite ^([^\.]*)/space-(username|uid)-(.+)\.html$ $1/home.php?mod=space&$2=$3 last;
-	rewrite ^([^\.]*)/blog-([0-9]+)-([0-9]+)\.html$ $1/home.php?mod=space&uid=$2&do=blog&id=$3 last;
-	rewrite ^([^\.]*)/(fid|tid)-([0-9]+)\.html$ $1/index.php?action=$2&value=$3 last;
-	rewrite ^([^\.]*)/([a-z]+[a-z0-9_]*)-([a-z0-9_\-]+)\.html$ $1/plugin.php?id=$2:$3 last;
-	if (!-e $request_filename) {
-		rewrite  ^(.*)$  /index.php  last;
-	}
-}
\ No newline at end of file
diff --git a/rewrites/nginx/discuzx3.conf b/rewrites/nginx/discuzx3.conf
deleted file mode 100755
index bfc8ef92c..000000000
--- a/rewrites/nginx/discuzx3.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-location / {
-	rewrite ^([^\.]*)/topic-(.+)\.html$ $1/portal.php?mod=topic&topic=$2 last;
-	rewrite ^([^\.]*)/article-([0-9]+)-([0-9]+)\.html$ $1/portal.php?mod=view&aid=$2&page=$3 last;
-	rewrite ^([^\.]*)/forum-(\w+)-([0-9]+)\.html$ $1/forum.php?mod=forumdisplay&fid=$2&page=$3 last;
-	rewrite ^([^\.]*)/thread-([0-9]+)-([0-9]+)-([0-9]+)\.html$ $1/forum.php?mod=viewthread&tid=$2&extra=page%3D$4&page=$3 last;
-	rewrite ^([^\.]*)/group-([0-9]+)-([0-9]+)\.html$ $1/forum.php?mod=group&fid=$2&page=$3 last;
-	rewrite ^([^\.]*)/space-(username|uid)-(.+)\.html$ $1/home.php?mod=space&$2=$3 last;
-	rewrite ^([^\.]*)/blog-([0-9]+)-([0-9]+)\.html$ $1/home.php?mod=space&uid=$2&do=blog&id=$3 last;
-	rewrite ^([^\.]*)/(fid|tid)-([0-9]+)\.html$ $1/index.php?action=$2&value=$3 last;
-	rewrite ^([^\.]*)/([a-z]+[a-z0-9_]*)-([a-z0-9_\-]+)\.html$ $1/plugin.php?id=$2:$3 last;
-	if (!-e $request_filename) {
-		rewrite  ^(.*)$  /index.php  last;
-	}
-}
-
diff --git a/rewrites/nginx/drupal.conf b/rewrites/nginx/drupal.conf
deleted file mode 100755
index 2c4bc7b82..000000000
--- a/rewrites/nginx/drupal.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-location / {
-	if (!-e $request_filename) {
-	 	rewrite ^/(.*)$ /index.php?q=$1 last;
-	}
-}
\ No newline at end of file
diff --git a/rewrites/nginx/ecshop.conf b/rewrites/nginx/ecshop.conf
deleted file mode 100755
index 109c04b6c..000000000
--- a/rewrites/nginx/ecshop.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-location / {
-	if (!-e $request_filename) {
-		rewrite "^/index\.html" /index.php last;
-		rewrite "^/category$" /index.php last;
-		rewrite "^/feed-c([0-9]+)\.xml$" /feed.php?cat=$1 last;
-		rewrite "^/feed-b([0-9]+)\.xml$" /feed.php?brand=$1 last;
-		rewrite "^/feed\.xml$" /feed.php last;
-		rewrite "^/category-([0-9]+)-b([0-9]+)-min([0-9]+)-max([0-9]+)-attr([^-]*)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /category.php?id=$1&brand=$2&price_min=$3&price_max=$4&filter_attr=$5&page=$6&sort=$7&order=$8 last;
-		rewrite "^/category-([0-9]+)-b([0-9]+)-min([0-9]+)-max([0-9]+)-attr([^-]*)(.*)\.html$" /category.php?id=$1&brand=$2&price_min=$3&price_max=$4&filter_attr=$5 last;
-		rewrite "^/category-([0-9]+)-b([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /category.php?id=$1&brand=$2&page=$3&sort=$4&order=$5 last;
-		rewrite "^/category-([0-9]+)-b([0-9]+)-([0-9]+)(.*)\.html$" /category.php?id=$1&brand=$2&page=$3 last;
-		rewrite "^/category-([0-9]+)-b([0-9]+)(.*)\.html$" /category.php?id=$1&brand=$2 last;
-		rewrite "^/category-([0-9]+)(.*)\.html$" /category.php?id=$1 last;
-		rewrite "^/goods-([0-9]+)(.*)\.html" /goods.php?id=$1 last;
-		rewrite "^/article_cat-([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /article_cat.php?id=$1&page=$2&sort=$3&order=$4 last;
-		rewrite "^/article_cat-([0-9]+)-([0-9]+)(.*)\.html$" /article_cat.php?id=$1&page=$2 last;
-		rewrite "^/article_cat-([0-9]+)(.*)\.html$" /article_cat.php?id=$1 last;
-		rewrite "^/article-([0-9]+)(.*)\.html$" /article.php?id=$1 last;
-		rewrite "^/brand-([0-9]+)-c([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)\.html" /brand.php?id=$1&cat=$2&page=$3&sort=$4&order=$5 last;
-		rewrite "^/brand-([0-9]+)-c([0-9]+)-([0-9]+)(.*)\.html" /brand.php?id=$1&cat=$2&page=$3 last;
-		rewrite "^/brand-([0-9]+)-c([0-9]+)(.*)\.html" /brand.php?id=$1&cat=$2 last;
-		rewrite "^/brand-([0-9]+)(.*)\.html" /brand.php?id=$1 last;
-		rewrite "^/tag-(.*)\.html" /search.php?keywords=$1 last;
-		rewrite "^/snatch-([0-9]+)\.html$" /snatch.php?id=$1 last;
-		rewrite "^/group_buy-([0-9]+)\.html$" /group_buy.php?act=view&id=$1 last;
-		rewrite "^/auction-([0-9]+)\.html$" /auction.php?act=view&id=$1 last;
-		rewrite "^/exchange-id([0-9]+)(.*)\.html$" /exchange.php?id=$1&act=view last;
-		rewrite "^/exchange-([0-9]+)-min([0-9]+)-max([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /exchange.php?cat_id=$1&integral_min=$2&integral_max=$3&page=$4&sort=$5&order=$6 last;
-		rewrite ^/exchange-([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /exchange.php?cat_id=$1&page=$2&sort=$3&order=$4 last;
-		rewrite "^/exchange-([0-9]+)-([0-9]+)(.*)\.html$" /exchange.php?cat_id=$1&page=$2 last;
-		rewrite "^/exchange-([0-9]+)(.*)\.html$" /exchange.php?cat_id=$1 last;
-	}
-}
\ No newline at end of file
diff --git a/rewrites/nginx/emlog.conf b/rewrites/nginx/emlog.conf
deleted file mode 100755
index 77f1a17d6..000000000
--- a/rewrites/nginx/emlog.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-location / {
-	index index.php index.html;
-	if (!-e $request_filename)
-	{
-		rewrite ^/(.*)$ /index.php last;
-	}
-}
\ No newline at end of file
diff --git a/rewrites/nginx/fastdfs.conf b/rewrites/nginx/fastdfs.conf
deleted file mode 100644
index 1b89c6e01..000000000
--- a/rewrites/nginx/fastdfs.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-location ~/group([0-9])/M00 {
-    # Need to cooperate with it
-    # https://github.com/mw-plugin/fastdfs
-    ngx_fastdfs_module;
-}
diff --git a/rewrites/nginx/gunicorn.conf b/rewrites/nginx/gunicorn.conf
deleted file mode 100755
index 80709d083..000000000
--- a/rewrites/nginx/gunicorn.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-
-add_header Access-Control-Allow-Origin *;
-add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
-
-location / {
-     proxy_pass http://127.0.0.1:8000; # 这里是指向 gunicorn host 的服务地址
-     proxy_set_header Host $host;
-     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-}
\ No newline at end of file
diff --git a/rewrites/nginx/header_cors.conf b/rewrites/nginx/header_cors.conf
deleted file mode 100755
index 61a875c36..000000000
--- a/rewrites/nginx/header_cors.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-
-add_header 'Access-Control-Allow-Methods' 'GET,OPTIONS,POST' always;
-add_header 'Access-Control-Allow-Credentials' 'true' always;
-add_header 'Access-Control-Allow-Origin' $http_origin always;
-add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, X-Requested-With, Cache-Control' always;
-
-
-
-#add_header Access-Control-Allow-Origin *;
-#add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
-
-
-#add_header Access-Control-Allow-Origin *;
-#add_header Access-Control-Allow-Methods *;
-#add_header Access-Control-Allow-Header *;
diff --git a/rewrites/nginx/laravel5.conf b/rewrites/nginx/laravel5.conf
deleted file mode 100755
index d550bbb09..000000000
--- a/rewrites/nginx/laravel5.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-location / {  
-	try_files $uri $uri/ /index.php$is_args$query_string;  
-}  
\ No newline at end of file
diff --git a/rewrites/nginx/mvc.conf b/rewrites/nginx/mvc.conf
deleted file mode 100755
index 44d945a14..000000000
--- a/rewrites/nginx/mvc.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-location / {
-	if (!-e $request_filename) {
-	   rewrite  ^(.*)$  /index.php/$1  last;
-	   break;
-	}
-}
diff --git a/rewrites/nginx/nezha.conf b/rewrites/nginx/nezha.conf
deleted file mode 100644
index fe3631d7a..000000000
--- a/rewrites/nginx/nezha.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#PROXY-START/
-# root /www/server/nezha/dashboard/resource;
-location / {
-    proxy_pass http://127.0.0.1:9527;
-    proxy_set_header Host $http_host;
-    proxy_set_header      Upgrade $http_upgrade;
-}
-location ~ ^/(ws|terminal/.+)$  {
-    proxy_pass http://127.0.0.1:9527;
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "Upgrade";
-    proxy_set_header Host $http_host;
-}
-#PROXY-END/
\ No newline at end of file
diff --git a/rewrites/nginx/phpcms.conf b/rewrites/nginx/phpcms.conf
deleted file mode 100755
index a6e0df346..000000000
--- a/rewrites/nginx/phpcms.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-location / {
-	###以下为PHPCMS 伪静态化rewrite法则
-	rewrite ^(.*)show-([0-9]+)-([0-9]+)\.html$ $1/show.php?itemid=$2&page=$3;
-	rewrite ^(.*)list-([0-9]+)-([0-9]+)\.html$ $1/list.php?catid=$2&page=$3;
-	rewrite ^(.*)show-([0-9]+)\.html$ $1/show.php?specialid=$2;
-	####以下为PHPWind 伪静态化rewrite法则
-	rewrite ^(.*)-htm-(.*)$ $1.php?$2 last;
-	rewrite ^(.*)/simple/([a-z0-9\_]+\.html)$ $1/simple/index.php?$2 last;
-}
\ No newline at end of file
diff --git a/rewrites/nginx/phpwind.conf b/rewrites/nginx/phpwind.conf
deleted file mode 100755
index 6dba1e34e..000000000
--- a/rewrites/nginx/phpwind.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-location / {
-    rewrite ^(.*)-htm-(.*)$ $1.php?$2 last;
-    rewrite ^(.*)/simple/([a-z0-9\_]+\.html)$ $1/simple/index.php?$2 last;
-}
\ No newline at end of file
diff --git a/rewrites/nginx/proxy.conf b/rewrites/nginx/proxy.conf
deleted file mode 100644
index 8c34c461c..000000000
--- a/rewrites/nginx/proxy.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-
-location / {
-    proxy_pass http://localhost:11334/;
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-}
diff --git a/rewrites/nginx/proxydg.conf b/rewrites/nginx/proxydg.conf
deleted file mode 100644
index 1a2c1e319..000000000
--- a/rewrites/nginx/proxydg.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-location / {
-   proxy_redirect off;
-   proxy_pass http://127.0.0.1:12345;
-   proxy_http_version 1.1;
-   proxy_set_header Upgrade $http_upgrade;
-   proxy_set_header Connection "upgrade";
-   proxy_set_header Host $http_host;
-}
\ No newline at end of file
diff --git a/rewrites/nginx/sablog.conf b/rewrites/nginx/sablog.conf
deleted file mode 100755
index 8009724ef..000000000
--- a/rewrites/nginx/sablog.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-location / {	
-	rewrite "^/date/([0-9]{6})/?([0-9]+)?/?$" /index.php?action=article&setdate=$1&page=$2 last;
-	rewrite ^/page/([0-9]+)?/?$ /index.php?action=article&page=$1 last;
-	rewrite ^/category/([0-9]+)/?([0-9]+)?/?$ /index.php?action=article&cid=$1&page=$2 last;
-	rewrite ^/category/([^/]+)/?([0-9]+)?/?$ /index.php?action=article&curl=$1&page=$2 last;
-	rewrite ^/(archives|search|article|links)/?$ /index.php?action=$1 last;
-	rewrite ^/(comments|tagslist|trackbacks|article)/?([0-9]+)?/?$ /index.php?action=$1&page=$2 last;
-	rewrite ^/tag/([^/]+)/?([0-9]+)?/?$ /index.php?action=article&item=$1&page=$2 last;
-	rewrite ^/archives/([0-9]+)/?([0-9]+)?/?$ /index.php?action=show&id=$1&page=$2 last;
-	rewrite ^/rss/([0-9]+)?/?$ /rss.php?cid=$1 last;
-	rewrite ^/rss/([^/]+)/?$ /rss.php?url=$1 last;
-	rewrite ^/uid/([0-9]+)/?([0-9]+)?/?$ /index.php?action=article&uid=$1&page=$2 last;
-	rewrite ^/user/([^/]+)/?([0-9]+)?/?$ /index.php?action=article&user=$1&page=$2 last;
-	rewrite sitemap.xml sitemap.php last;
-	rewrite ^(.*)/([0-9a-zA-Z\-\_]+)/?([0-9]+)?/?$ $1/index.php?action=show&alias=$2&page=$3 last;
-}
\ No newline at end of file
diff --git a/rewrites/nginx/seacms.conf b/rewrites/nginx/seacms.conf
deleted file mode 100755
index 0dc6f3612..000000000
--- a/rewrites/nginx/seacms.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-location / {
-	rewrite ^/frim/index(.+?)\.html$ /list/index.php?$1 last;
-	rewrite ^/movie/index(.+?)\.html$ /detail/index.php?$1 last;
-	rewrite ^/play/([0-9]+)-([0-9]+)-([0-9]+)\.html$ /video/index.php?$1-$2-$3 last;
-	rewrite ^/topic/index(.+?)\.html$ /topic/index.php?$1 last;
-	rewrite ^/topiclist/index(.+?).html$ /topiclist/index.php?$1 last;
-	rewrite ^/index\.html$ index.php permanent;
-	rewrite ^/news\.html$ news/ permanent;
-	rewrite ^/part/index(.+?)\.html$ /articlelist/index.php?$1 last;
-	rewrite ^/article/index(.+?)\.html$ /article/index.php?$1 last;
-}
\ No newline at end of file
diff --git a/rewrites/nginx/shopex.conf b/rewrites/nginx/shopex.conf
deleted file mode 100755
index afc87532d..000000000
--- a/rewrites/nginx/shopex.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-location / {
-	if (!-e $request_filename) {
-		rewrite ^/(.+\.(html|xml|json|htm|php|jsp|asp|shtml))$ /index.php?$1 last;
-	}
-}
\ No newline at end of file
diff --git a/rewrites/nginx/sub.conf.tpl b/rewrites/nginx/sub.conf.tpl
deleted file mode 100644
index 5996e01d4..000000000
--- a/rewrites/nginx/sub.conf.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-location / {
-    set $replace 'tmplate_replace';
-    set $spider_request '0';
-
-    if ($http_user_agent ~* '(baiduspider|360sipder|Sogou Orion spider|Sogou News Spider|Sogou blog|Sogou spider2|Sogou inst spider|Sogou web spider|Sogou spider|trendiction|Yahoo|semrush|Toutiao|Google|qihoobot|Googlebot|Googlebot-Mobile|Googlebot-Image|Mediapartners-Google|Adsbot-Google|Feedfetcher-Google|Yahoo! Slurp|Yahoo! Slurp China|YoudaoBot|Sosospider|MSNBot|ia_archiver|Tomato Bot)') {
-        set $spider_request '1';
-    }
-
-    if ($spider_request = '0' ) {
-        set $replace 'tmplate_replace';
-    }
-
-    sub_filter 'tmplate_replace' $replace;
-    sub_filter_once on;
-    sub_filter_types *;
-}
\ No newline at end of file
diff --git a/rewrites/nginx/thinkphp.conf b/rewrites/nginx/thinkphp.conf
deleted file mode 100755
index b8c527532..000000000
--- a/rewrites/nginx/thinkphp.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-location / {
-	if (!-e $request_filename){
-		rewrite  ^(.*)$  /index.php?s=$1  last;   break;
-	}
-}
\ No newline at end of file
diff --git a/rewrites/nginx/typecho.conf b/rewrites/nginx/typecho.conf
deleted file mode 100755
index dcc7c3f1a..000000000
--- a/rewrites/nginx/typecho.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-location / {
-    if (!-e $request_filename) {
-        rewrite ^(.*)$ /index.php$1 last;
-    }
-}
-
-# 不需要,可以删除
-location /typecho/ {
-    if (!-e $request_filename) {
-        rewrite ^(.*)$ /typecho/index.php$1 last;
-    }
-}
-
diff --git a/rewrites/nginx/v2ray.conf b/rewrites/nginx/v2ray.conf
deleted file mode 100644
index 641313279..000000000
--- a/rewrites/nginx/v2ray.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-location /{
-	if (!-e $request_filename) {
-	   rewrite  ^(.*)$  /index.php/$1  last;
-	   break;
-	}
-}
-
-location /ws {
-   proxy_redirect off;
-   proxy_pass http://127.0.0.1:34861;
-   proxy_http_version 1.1;
-   proxy_set_header Upgrade $http_upgrade;
-   proxy_set_header Connection "upgrade";
-   proxy_set_header Host $http_host;
-}
\ No newline at end of file
diff --git a/rewrites/nginx/walle.conf b/rewrites/nginx/walle.conf
deleted file mode 100755
index c88ba3d7c..000000000
--- a/rewrites/nginx/walle.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#upstream webservers { 
-#    server 0.0.0.0:5000 weight=1;
-#}
-
-location / {
-    try_files $uri $uri/ /index.html;
-    add_header access-control-allow-origin *;
-}
-
-location ^~ /api/ {
-    add_header        access-control-allow-origin *;
-    proxy_pass        http://webservers;
-    proxy_set_header  X-Forwarded-Host $host:$server_port;
-    proxy_set_header  X-Real-IP  $remote_addr;
-    proxy_set_header  Origin        $host:$server_port;
-    proxy_set_header  Referer       $host:$server_port;
-}
-
-location ^~ /socket.io/ {
-    add_header        access-control-allow-origin *;
-    proxy_pass        http://webservers;
-    proxy_set_header  X-Forwarded-Host $host:$server_port;
-    proxy_set_header  X-Real-IP  $remote_addr;
-    proxy_set_header  Origin        $host:$server_port;
-    proxy_set_header  Referer       $host:$server_port;
-    proxy_set_header  Host $http_host;
-    proxy_set_header  X-NginX-Proxy true;
-
-    # WebScoket Support
-    proxy_http_version 1.1;
-    proxy_set_header   Upgrade $http_upgrade;
-    proxy_set_header   Connection "upgrade";
-}
\ No newline at end of file
diff --git a/rewrites/nginx/whmcs.conf b/rewrites/nginx/whmcs.conf
deleted file mode 100755
index 2cdd0e710..000000000
--- a/rewrites/nginx/whmcs.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-location / {
-
-	if (!-e $request_filename) {
-		rewrite ^/contact/$ /./contact.php last;
-		rewrite ^/status$ /./pages.php?cate=$1&page=status last;
-		rewrite ^/act$ /./pages.php?cate=$1&page=actindex last;
-		rewrite ^/(\w+)/(\w+)/$ /./pages.php?cate=$1&page=$2 last;
-		rewrite ^/cart/(\w+)$ /./cart.php?a=$1 last;
-		rewrite ^/console$ /./clientarea.php last;
-		rewrite ^/sitemap.xml$ /./sitemap.php last;
-		rewrite ^/console/(\w+)$ /./clientarea.php?action=services&group=$1 last;
-		rewrite ^/console/ec/([0-9]+)$ /./clientarea.php?action=productdetails&id=$1 last;
-		rewrite ^/console/ec/(\w+)$ /./clientarea.php?action=services&group=ec&page=$1 last;
-		rewrite ^ /index.php last;
-	}
-}
diff --git a/rewrites/nginx/wmcms.conf b/rewrites/nginx/wmcms.conf
deleted file mode 100755
index 386b75085..000000000
--- a/rewrites/nginx/wmcms.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-location / {
-	if (!-e $request_filename) {
-       rewrite ^/index.html$ /index.php last;
-       rewrite ^/top/index.html$ /module/novel/topindex.php last;
-       rewrite ^/(\d*)/list/(\d*).html$ /module/novel/type.php?tid=$1&page=$2 last;
-       rewrite ^/(.*?)/(.*?)/info.html$ /module/novel/info.php?tid=$1&nid=$2 last;
-       rewrite ^/(.*?)/(.*?)/read/(\d*).html$ /module/novel/read.php?tid=$1&nid=$2&cid=$3 last;
-       rewrite ^/(.*?)/(.*?)/menu/(\d*).html$ /module/novel/menu.php?tid=$1&nid=$2&page=$3 last;
-       rewrite ^/search/(\d*)/(.*?)/(\d*).html$ /module/novel/search.php?type=$1&key=$2&page=$3 last;
-
-       rewrite ^/(\d*)/list/(\d*)_(\d*)_(\d*)_(\d*)_(\d*)_(\d*)_(\d*)_(\d*).html$ /module/novel/type.php?tid=$1&page=$9&process=$2&word=$3&chapter=$4&copy=$5&cost=$6&letter=$7&order=$8 last;
-
-       rewrite ^/top/list/(\d*)/(\d*)/(\d*).html$ /module/novel/toplist.php?tid=$1&dtype=$2&page=$3 last;
-       break;  
-    }
-}
\ No newline at end of file
diff --git a/rewrites/nginx/wordpress.conf b/rewrites/nginx/wordpress.conf
deleted file mode 100755
index dfa6381d4..000000000
--- a/rewrites/nginx/wordpress.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-location / {
-	index index.html index.php; 
-	if (-f $request_filename/index.html){ 
-		rewrite (.*) $1/index.html break; 
-	} 
-	if (-f $request_filename/index.php){ 
-		rewrite (.*) $1/index.php; 
-	} 
-	if (!-f $request_filename){ 
-		rewrite (.*) /index.php; 
-	} 
-} 
-
-rewrite /wp-admin$ $scheme://$host$uri/ permanent;
\ No newline at end of file
diff --git a/rewrites/nginx/zblog.conf b/rewrites/nginx/zblog.conf
deleted file mode 100755
index 37d410519..000000000
--- a/rewrites/nginx/zblog.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-location / {
-	if (-f $request_filename/index.html){
-		rewrite (.*) $1/index.html break;
-	}
-	if (-f $request_filename/index.php){
-		rewrite (.*) $1/index.php;
-	}
-	if (!-f $request_filename){
-		rewrite (.*) /index.php;
-	}
-}
\ No newline at end of file

From cbdf826951b30a45fa843a392f51c882d28e6139 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 04:56:25 +0800
Subject: [PATCH 330/965] Update site.py

---
 web/utils/site.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index e9c9a3329..b359f419a 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -630,7 +630,10 @@ class sites(object):
         rewriteList['rewrite'].append('0.当前')
         rewrite_nginx_dir = mw.getPanelDir() + '/web/misc/nginx/rewrite'
         for ds in os.listdir(rewrite_nginx_dir):
-            rewriteList['rewrite'].append(ds[0:len(ds) - 5])
+            if ds.startswith('.'):
+                continue
+            if ds.endswith('conf'):
+                rewriteList['rewrite'].append(ds[0:len(ds) - 5])
         rewriteList['rewrite'] = sorted(rewriteList['rewrite'])
         return rewriteList
 

From 570f775c664ac634c56d2a12601e22b604bbad6d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 04:58:11 +0800
Subject: [PATCH 331/965] Update site.py

---
 web/utils/site.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index b359f419a..a61d0e932 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -604,15 +604,18 @@ class sites(object):
             return mw.returnData(False, '日志为空')
         return mw.returnData(True, mw.getLastLine(logPath, 100))
 
+    def getNgxRewriteDir(self):
+        return mw.getPanelDir() + '/web/misc/nginx/rewrite/'
+
     # 获取模版名内容
     def getRewriteTpl(self, tplname):
-        file = mw.getPanelDir() + '/web/misc/nginx/rewrite/' + tplname + '.conf'
+        file = self.getNgxRewriteDir() + tplname + '.conf'
         if not os.path.exists(file):
             return mw.returnData(False, '模版不存在!')
         return mw.returnData(True, 'OK', file)
 
     def setRewriteTpl(self,name,data):
-        path = mw.getPanelDir() + '/web/misc/nginx/rewrite/' + name + ".conf"
+        path = self.getNgxRewriteDir() + name + ".conf"
         if os.path.exists(path):
             return mw.returnData(False, '模版已经存在!')
 
@@ -628,7 +631,7 @@ class sites(object):
         rewriteList = {}
         rewriteList['rewrite'] = []
         rewriteList['rewrite'].append('0.当前')
-        rewrite_nginx_dir = mw.getPanelDir() + '/web/misc/nginx/rewrite'
+        rewrite_nginx_dir = self.getNgxRewriteDir()
         for ds in os.listdir(rewrite_nginx_dir):
             if ds.startswith('.'):
                 continue

From 5f144924e48f0e3ae25a50d4018c656793834b55 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 05:02:47 +0800
Subject: [PATCH 332/965] update

---
 data/tpl/nginx.conf         | 53 -------------------------------------
 data/tpl/nginx_dirbind.conf | 48 ---------------------------------
 data/tpl/nginx_panel.conf   | 23 ----------------
 web/utils/site.py           | 16 ++++++-----
 4 files changed, 10 insertions(+), 130 deletions(-)
 delete mode 100755 data/tpl/nginx.conf
 delete mode 100755 data/tpl/nginx_dirbind.conf
 delete mode 100755 data/tpl/nginx_panel.conf

diff --git a/data/tpl/nginx.conf b/data/tpl/nginx.conf
deleted file mode 100755
index 5da306f9d..000000000
--- a/data/tpl/nginx.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-server
-{
-    # reuseport 只能在一个server出现一次
-    listen {$PORT};
-    listen [::]:{$PORT};
-    server_name {$SERVER_NAME};
-    index index.php index.html index.htm default.php default.htm default.html;
-    root {$ROOT_DIR};
-    
-    #SSL-START
-    #error_page 404/404.html;
-    #SSL-END
-
-    #301-START
-    
-    #PROXY-START
-    
-    #ERROR-PAGE-START
-    #error_page 404 /404.html;
-    #error_page 502 /502.html;
-    #ERROR-PAGE-END
-    
-    #PHP-INFO-START
-    include {$PHP_DIR}/conf/enable-php-{$PHPVER}.conf;
-    #PHP-INFO-END
-    
-    #REWRITE-START
-    include {$OR_REWRITE}/{$SERVER_NAME}.conf;
-    #REWRITE-END
-    
-    #禁止访问的文件或目录
-    location ~ ^/(\.user.ini|\.htaccess|\.git|\.svn|\.project|LICENSE|README.md)
-    {
-        return 404;
-    }
-    
-    #一键申请SSL证书验证目录相关设置
-    location ~ \.well-known{
-        allow all;
-    }
-
-    location ~ .*\.(gif|jpg|jpeg|png|bmp|swf|js|css|ttf|woff2)$
-    {
-        expires      30d;
-        access_log /dev/null;
-        if ($invalid_referer){
-           return 404;
-        }
-    }
-    
-    access_log  {$LOGPATH}/{$SERVER_NAME}.log main;
-    error_log   {$LOGPATH}/{$SERVER_NAME}.error.log;
-}
\ No newline at end of file
diff --git a/data/tpl/nginx_dirbind.conf b/data/tpl/nginx_dirbind.conf
deleted file mode 100755
index 129a7ddd1..000000000
--- a/data/tpl/nginx_dirbind.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-
-#BINDING-{$DIRBIND}-START
-server
-{
-    listen {$PORT};
-    server_name {$DIRBIND};
-    index index.php index.html index.htm default.php default.htm default.html;
-    root {$ROOT_DIR};
-    
-    #SSL-START
-    #error_page 404/404.html;
-    #SSL-END
-    
-    #ERROR-PAGE-START
-    #error_page 404 /404.html;
-    #error_page 502 /502.html;
-    #ERROR-PAGE-END
-    
-    #PHP-INFO-START
-    include {$PHP_DIR}/conf/enable-php-{$PHPVER}.conf;
-    #PHP-INFO-END
-    
-    #REWRITE-START
-    include {$OR_REWRITE}/{$SERVER_MAIN}.conf;
-    #REWRITE-END
-    
-    #禁止访问的文件或目录
-    location ~ ^/(\.user.ini|\.htaccess|\.git|\.svn|\.project|LICENSE|README.md)
-    {
-        return 404;
-    }
-    
-    #一键申请SSL证书验证目录相关设置
-    location ~ \.well-known{
-        allow all;
-    }
-    
-    location ~ .*\\.(gif|jpg|jpeg|png|bmp|swf|js|css)$
-    {
-        error_log /dev/null;
-        access_log /dev/null;
-        expires 30d;
-    }
-    
-    access_log  {$LOGPATH}/{$SERVER_MAIN}_{$DIRBIND}.log;
-    error_log   {$LOGPATH}/{$SERVER_MAIN}_{$DIRBIND}.error.log;
-}
-#BINDING-{$DIRBIND}-END
\ No newline at end of file
diff --git a/data/tpl/nginx_panel.conf b/data/tpl/nginx_panel.conf
deleted file mode 100755
index c487094fd..000000000
--- a/data/tpl/nginx_panel.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-server
-{
-    listen {$PORT};
-    listen [::]:{$PORT};
-    
-    server_name {$SERVER_NAME};
-    index index.php index.html index.htm default.php default.htm default.html;
-    
-    #SSL-START
-    #error_page 404/404.html;
-    #SSL-END
-
-    #PROXY-START
-    location ^~ / {
-        proxy_pass http://0.0.0.0:{$PANAL_PORT}/;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection 'upgrade';
-    }
-    #PROXY-END
-
-    error_log   {$LOGPATH}/{$SERVER_NAME}.error.log;
-}
\ No newline at end of file
diff --git a/web/utils/site.py b/web/utils/site.py
index a61d0e932..b2e0df56c 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -421,7 +421,8 @@ class sites(object):
         return mw.returnData(True, '站点【%s】删除成功!' % webname)
 
     def nginxAddConf(self):
-        source_tpl = mw.getPanelDir() + '/data/tpl/nginx.conf'
+
+        source_tpl = self.getNgxTplDir() + '/nginx.conf'
         vhost_file = self.getHostConf(self.siteName)
         content = mw.readFile(source_tpl)
 
@@ -605,17 +606,20 @@ class sites(object):
         return mw.returnData(True, mw.getLastLine(logPath, 100))
 
     def getNgxRewriteDir(self):
-        return mw.getPanelDir() + '/web/misc/nginx/rewrite/'
+        return mw.getPanelDir() + '/web/misc/nginx/rewrite'
+
+    def getNgxTplDir(self):
+        return mw.getPanelDir() + '/web/misc/nginx/tpl'
 
     # 获取模版名内容
-    def getRewriteTpl(self, tplname):
-        file = self.getNgxRewriteDir() + tplname + '.conf'
+    def getRewriteTpl(self, name):
+        path = self.getNgxRewriteDir() +'/'+ name + ".conf"
         if not os.path.exists(file):
             return mw.returnData(False, '模版不存在!')
         return mw.returnData(True, 'OK', file)
 
     def setRewriteTpl(self,name,data):
-        path = self.getNgxRewriteDir() + name + ".conf"
+        path = self.getNgxRewriteDir() +'/'+ name + ".conf"
         if os.path.exists(path):
             return mw.returnData(False, '模版已经存在!')
 
@@ -820,7 +824,7 @@ class sites(object):
             domain_split = re.search(rep, conf).groups()
             version = domain_split[0]
 
-            source_dirbind_tpl = mw.getPanelDir() + '/data/tpl/nginx_dirbind.conf'
+            source_dirbind_tpl = self.getNgxTplDir() + '/nginx_dirbind.conf'
             content = mw.readFile(source_dirbind_tpl)
             content = content.replace('{$PORT}', port)
             content = content.replace('{$PHPVER}', version)

From e3070b618fcfd16ecc93014ca1b13949d3200b89 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 05:14:26 +0800
Subject: [PATCH 333/965] Update plugin.py

---
 web/utils/plugin.py | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index a9b4a9a55..19375d7a1 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -78,8 +78,6 @@ class plugin(object):
     ]
 
     __plugin_dir = 'plugins'
-    __index = 'data/json/index.json'
-    __index_data = None
 
     # lock
     _instance_lock = threading.Lock()
@@ -95,15 +93,8 @@ class plugin(object):
     """插件类初始化"""
     def __init__(self):
         self.__plugin_dir = mw.getPluginDir()
-        self.__index = mw.getPanelDataDir() + '/json/index.json'
-        self.initIndexData()
 
 
-    def initIndexData(self):
-        if not os.path.exists(self.__index):
-            mw.writeFile(self.__index, '[]')
-        self.__index_data = json.loads(mw.readFile(self.__index))
-
     def getIndexList(self):
         indexList = thisdb.getOptionByJson('display_index')
         plist = []
@@ -307,9 +298,9 @@ class plugin(object):
             return False
 
     def getVersion(self, path):
-        version_t = path + '/version.pl'
-        if os.path.exists(version_t):
-            return mw.readFile(version_t).strip()
+        version_pl = path + '/version.pl'
+        if os.path.exists(version_pl):
+            return mw.readFile(version_pl).strip()
         return ''
 
     def checkIndexList(self, name, version):
@@ -321,7 +312,7 @@ class plugin(object):
         return False
 
     def checkDisplayIndex(self, name, version, coexist):
-        indexList = self.__index_data
+        indexList = thisdb.getOptionByJson('display_index',default=[])
         if coexist:
             if type(version) == list:
                 for index in range(len(version)):

From 3894eebfb5a546d5ec28a69cb830af8e433b756d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 15:47:22 +0800
Subject: [PATCH 334/965] update

---
 cli.sh                             |  2 +-
 panel_task.py                      | 20 ++++----------------
 web/admin/setting/panel_ssl.py     | 17 +++++++++++++++++
 web/core/mw.py                     |  2 +-
 web/setting.py                     | 20 ++++++++++----------
 web/templates/default/setting.html |  2 +-
 web/thisdb/option.py               |  3 +--
 web/utils/config.py                |  2 ++
 web/utils/setting.py               | 28 +++++++++++++++++++++-------
 9 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/cli.sh b/cli.sh
index 084f81840..6c0fbf97c 100755
--- a/cli.sh
+++ b/cli.sh
@@ -110,7 +110,7 @@ case "$1" in
 		mw_start_panel
 		;;
 	'task') 
-		mw_stop 
+		# mw_stop 
 		mw_start_bgtask
 		;;
 esac
\ No newline at end of file
diff --git a/panel_task.py b/panel_task.py
index ce12b9641..859beeebb 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -47,19 +47,6 @@ def writeLogs(data):
     except:
         pass
 
-def mw_async(f):
-    def wrapper(*args, **kwargs):
-        thr = threading.Thread(target=f, args=args, kwargs=kwargs)
-        thr.start()
-    return wrapper
-
-@mw_async
-def restartMw():
-    time.sleep(1)
-    cmd = mw.getPanelDir() + '/scripts/init.d/mw reload &'
-    mw.execShell(cmd)
-
-
 def downloadFile(url, filename):
     # 下载文件
     try:
@@ -298,10 +285,11 @@ def openrestyRestartAtOnce():
 
 # --------------------------------------Panel Restart Start   --------------------------------------------- #
 def restartPanelService():
-    restartTip = mw.getPanelDir()+'/data/restart.pl'
+    restart_tip = mw.getPanelDir()+'/data/restart.pl'
     while True:
-        if os.path.exists(restartTip):
-            os.remove(restartTip)
+        if os.path.exists(restart_tip):
+            print("restart panel")
+            os.remove(restart_tip)
             mw.panelCmd('restart_panel')
         time.sleep(1)
 # --------------------------------------Panel Restart End   --------------------------------------------- #
diff --git a/web/admin/setting/panel_ssl.py b/web/admin/setting/panel_ssl.py
index bf903a495..d6823c0f7 100644
--- a/web/admin/setting/panel_ssl.py
+++ b/web/admin/setting/panel_ssl.py
@@ -50,3 +50,20 @@ def del_panel_ssl():
     choose = request.form.get('choose', '').strip()
     return MwSetting.instance().delPanelSsl(choose)
 
+# 开启面板证书
+@blueprint.route('/set_panel_local_ssl', endpoint='set_panel_local_ssl', methods=['POST'])
+@panel_login_required
+def set_panel_local_ssl():
+    cert_type = request.form.get('cert_type', '').strip()
+    return MwSetting.instance().setPanelLocalSsl(cert_type)
+
+@blueprint.route('/close_panel_ssl', endpoint='close_panel_ssl', methods=['POST'])
+@panel_login_required
+def close_panel_ssl():
+    return MwSetting.instance().closePanelSsl()
+
+
+
+
+
+
diff --git a/web/core/mw.py b/web/core/mw.py
index 4564d6825..55c527e44 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -1298,7 +1298,7 @@ def panelCmd(method):
         execShell(cmd + ' ' + method)
         return
 
-    cmd = mw.getPanelDir() + '/scripts/init.d/mw'
+    cmd = getPanelDir() + '/scripts/init.d/mw'
     if os.path.exists(cmd):
         data = execShell(cmd + ' ' + method)
         return
diff --git a/web/setting.py b/web/setting.py
index 8defa4abe..57e9d86a7 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -21,6 +21,7 @@ import os
 
 import core.mw as mw
 import utils.system as system 
+import thisdb
 
 cpu_info = system.getCpuInfo()
 workers = cpu_info[1]
@@ -50,16 +51,15 @@ if os.path.exists(default_ipv6_file):
 else:
     bind.append('0.0.0.0:%s' % panel_port)
 
-
-ssl_choose_file = panel_dir+'/ssl/choose.pl'
-if os.path.exists(ssl_choose_file):
-    ssl_choose = mw.readFile(ssl_choose_file).strip()
-    if mw.inArray(['local','nginx'],ssl_choose):
-        tmp_cert = panel_dir+'/ssl/'+ssl_choose+'/cert.pem'
-        tmp_private = panel_dir+'/ssl/'+ssl_choose+'/private.pem'
-        if os.path.exists(tmp_cert) and os.path.exists(tmp_private):
-            certfile = tmp_cert
-            keyfile  = tmp_private
+panel_ssl_data = thisdb.getOptionByJson('panel_ssl', default={'open':False})
+if panel_ssl_data['open']:
+    choose = panel_ssl_data['choose']
+    if mw.inArray(['local','nginx'],choose):
+        panel_cert = panel_dir+'/ssl/'+choose+'/cert.pem'
+        panel_private = panel_dir+'/ssl/'+choose+'/private.pem'
+        if os.path.exists(panel_cert) and os.path.exists(panel_private):
+            certfile = panel_cert
+            keyfile  = panel_private
             ciphers = 'TLSv1 TLSv1.1 TLSv1.2 TLSv1.3'
             ssl_version = 2
 
diff --git a/web/templates/default/setting.html b/web/templates/default/setting.html
index eb8bd401c..3d1d068fc 100755
--- a/web/templates/default/setting.html
+++ b/web/templates/default/setting.html
@@ -113,7 +113,7 @@
 
 				<p class="mtb15">
 					<span class="set-tit text-right" title="面板SSL" style="float: left;">面板SSL</span>
-						<input id="cfg_ssl" name="bind_ssl" class="btswitch btswitch-ios" type="checkbox" {{data['ssl']}}>
+						<input id="cfg_ssl" name="bind_ssl" class="btswitch btswitch-ios" type="checkbox" {% if data['panel_ssl']['open'] %}checked{% endif %}>
 						<label class="btswitch-btn ml5" for="cfg_ssl" style="float: left;margin-top:4px;"></label>
 	                <button ype="button" class="btn btn-default btn-xs panel_api_btn" style="vertical-align: middle; margin-left: 10px" onclick="getPanelSSL();">面板SSL配置</button>
 					<span class="set-info c7">为面板设置https协议访问，提升面板访问<b style="color: red;">安全性</b></span>
diff --git a/web/thisdb/option.py b/web/thisdb/option.py
index 767078425..eaf373dcb 100644
--- a/web/thisdb/option.py
+++ b/web/thisdb/option.py
@@ -63,5 +63,4 @@ def setOption(name, value,
         'type':type,
         'value':value
     }
-    mw.M('option').insert(add_option)
-    return True
\ No newline at end of file
+    return mw.M('option').insert(add_option)
\ No newline at end of file
diff --git a/web/utils/config.py b/web/utils/config.py
index bc8307893..b6112ddc7 100644
--- a/web/utils/config.py
+++ b/web/utils/config.py
@@ -83,5 +83,7 @@ def getGlobalVar():
     # 邮件通知设置
     data['notify_email'] = thisdb.getOptionByJson('notify_email', default={'open':False}, type='notify')
     data['notify_tgbot'] = thisdb.getOptionByJson('notify_tgbot', default={'open':False}, type='notify')
+
+    data['panel_ssl'] = thisdb.getOptionByJson('panel_ssl', default={'open':False})
     
     return data
\ No newline at end of file
diff --git a/web/utils/setting.py b/web/utils/setting.py
index bd9cd4a29..5ce5f1fcf 100644
--- a/web/utils/setting.py
+++ b/web/utils/setting.py
@@ -13,6 +13,7 @@ import re
 import threading
 import re
 import time
+import json
 
 import core.mw as mw
 import thisdb
@@ -164,21 +165,34 @@ class setting(object):
         return  mw.returnData(False, '未知类型!')
 
     # 面板本地SSL设置
-    def setPanelLocalSsl(self):
-        pdir = mw.getPanelDir()
+    def setPanelLocalSsl(self, cert_type):
+        panel_ssl_data = thisdb.getOptionByJson('panel_ssl', default={'open':False})
 
+        if not panel_ssl_data['open']:
+            panel_ssl_data['open'] = True
+
+        pdir = mw.getPanelDir()
         cert = {}
         keyPath = pdir+'/ssl/local/private.pem'
         certPath = pdir+'/ssl/local/cert.pem'
-
         if not os.path.exists(certPath):
             mw.createLocalSSL()
 
-        choose_file = self.__file['ssl']
-        mw.writeFile(choose_file, 'local')
-
+        panel_ssl_data['choose'] = 'local'
+        thisdb.setOption('panel_ssl', json.dumps(panel_ssl_data))
         mw.restartMw()
-        return mw.returnJson(True, '设置成功')
+        return mw.returnData(True, '设置成功')
+
+    def closePanelSsl(self):
+        panel_ssl_data = thisdb.getOptionByJson('panel_ssl', default={'open':False})
+
+        if panel_ssl_data['open']:
+            panel_ssl_data['open'] = False
+
+        thisdb.setOption('panel_ssl', json.dumps(panel_ssl_data))
+        mw.restartMw()
+        return mw.returnData(True, '设置成功')
+
 
     # 申请面板let证书
     # def applyPanelAcmeSsl(self):

From 0f1b98721b48ba27e6cb216a904a049819eadbc9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 23:50:17 +0800
Subject: [PATCH 335/965] up

---
 web/admin/__init__.py              |  4 +++
 web/admin/setting/panel_ssl.py     | 11 +++++++
 web/core/mw.py                     | 52 ++++++++++++++++++++++++++++++
 web/templates/default/setting.html |  2 +-
 web/utils/config.py                |  2 ++
 web/utils/setting.py               | 20 +++++++++++-
 6 files changed, 89 insertions(+), 2 deletions(-)

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 6bb30f1a0..738fe5cfe 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -117,6 +117,10 @@ def requestCheck():
         basic_pwd = mw.md5(auth.password.strip() + salt)
         if basic_user != basic_auth['basic_user'] or basic_pwd != basic_auth['basic_pwd']:
             return sendAuthenticated()
+
+    domain_check = mw.checkDomainPanel()
+    if domain_check:
+        return domain_check
             
 
 
diff --git a/web/admin/setting/panel_ssl.py b/web/admin/setting/panel_ssl.py
index d6823c0f7..19f904dcd 100644
--- a/web/admin/setting/panel_ssl.py
+++ b/web/admin/setting/panel_ssl.py
@@ -57,11 +57,22 @@ def set_panel_local_ssl():
     cert_type = request.form.get('cert_type', '').strip()
     return MwSetting.instance().setPanelLocalSsl(cert_type)
 
+# 关闭面板证书
 @blueprint.route('/close_panel_ssl', endpoint='close_panel_ssl', methods=['POST'])
 @panel_login_required
 def close_panel_ssl():
     return MwSetting.instance().closePanelSsl()
 
+# 设置面板域名
+@blueprint.route('/set_panel_domain', endpoint='set_panel_domain', methods=['POST'])
+@panel_login_required
+def set_panel_domain():
+    domain = request.form.get('domain', '').strip()
+    return MwSetting.instance().setPanelDomain(domain)
+
+
+
+
 
 
 
diff --git a/web/core/mw.py b/web/core/mw.py
index 55c527e44..89db9b6dc 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -420,10 +420,62 @@ def getFileMd5(filename):
     return myhash.hexdigest()
 
 
+def getHost(port=False):
+    from flask import request
+    host_tmp = request.headers.get('host')
+    if not host_tmp:
+        if request.url_root:
+            tmp = re.findall(r"(https|http)://([\w:\.-]+)", request.url_root)
+            if tmp:
+                host_tmp = tmp[0][1]
+    if not host_tmp:
+        host_tmp = getLocalIp() + ':' + readFile('data/port.pl').strip()
+    try:
+        if host_tmp.find(':') == -1:
+            host_tmp += ':80'
+    except:
+        host_tmp = "127.0.0.1:8888"
+    h = host_tmp.split(':')
+    if port:
+        return h[-1]
+    return ':'.join(h[0:-1])
+
 def getClientIp():
     from flask import request
     return request.remote_addr.replace('::ffff:', '')
 
+def checkDomainPanel():
+    import thisdb
+    from flask import Flask, redirect, request, url_for
+    current_host = getHost()
+
+    domain = thisdb.getOption('panel_domain', default='')
+    port = getPanelPort()
+    scheme = 'http'
+
+    panel_ssl_data = thisdb.getOptionByJson('panel_ssl', default={'open':False})
+    if panel_ssl_data['open']:
+        choose = panel_ssl_data['choose']        
+        if not inArray(['local','nginx'], choose):
+            return False
+        scheme = 'https'
+
+    client_ip = getClientIp()
+    if client_ip in ['127.0.0.1', 'localhost', '::1']:
+        return False
+
+    ip = getHostAddr()
+    if domain == '':
+        if current_host.strip().lower() != ip.strip().lower():
+            to = scheme + "://" + ip + ":" + str(port)
+            return redirect(to, code=302)
+        return False
+    else:
+        if current_host.strip().lower() != domain.strip().lower():
+            to = scheme + "://" + domain + ":" + str(port)
+            return redirect(to, code=302)
+    return False
+
 def getLocalIp():
     filename = getPanelDir()+'/data/iplist.txt'
     try:
diff --git a/web/templates/default/setting.html b/web/templates/default/setting.html
index 3d1d068fc..1c5edea6c 100755
--- a/web/templates/default/setting.html
+++ b/web/templates/default/setting.html
@@ -106,7 +106,7 @@
 
 				<p class="mtb15">
 					<span class="set-tit text-right" title="绑定域名" style="float: left;">绑定域名</span>
-						<input name="bind_domain" class="inputtxt bt-input-text" type="text" value="{{data['bind_domain']}}">
+						<input name="bind_domain" class="inputtxt bt-input-text" type="text" value="{{data['panel_domain']}}">
 	                <button type="button" class="btn btn-success btn-sm ml5 btn_bind_domain" disabled>保存</button>
 					<span class="set-info c7">为面板绑定一个访问域名，<b style="color: red;">注意：一旦绑定域名，只能通过域名访问面板</b></span>
 				</p>
diff --git a/web/utils/config.py b/web/utils/config.py
index b6112ddc7..cbc0ecc90 100644
--- a/web/utils/config.py
+++ b/web/utils/config.py
@@ -85,5 +85,7 @@ def getGlobalVar():
     data['notify_tgbot'] = thisdb.getOptionByJson('notify_tgbot', default={'open':False}, type='notify')
 
     data['panel_ssl'] = thisdb.getOptionByJson('panel_ssl', default={'open':False})
+    data['panel_domain'] = thisdb.getOption('panel_domain', default='')
+    
     
     return data
\ No newline at end of file
diff --git a/web/utils/setting.py b/web/utils/setting.py
index 5ce5f1fcf..cdeb67e0c 100644
--- a/web/utils/setting.py
+++ b/web/utils/setting.py
@@ -270,4 +270,22 @@ class setting(object):
 
     #     if is_already_apply:
     #         return mw.returnJson(True, '重复申请!', data)
-    #     return mw.returnJson(True, '申请成功!', data)
\ No newline at end of file
+    #     return mw.returnJson(True, '申请成功!', data)
+
+    def setPanelDomain(self, domain):
+        port = mw.getPanelPort()
+        ip = mw.getLocalIp()
+
+        panel_domain = thisdb.getOption('panel_domain', default='')
+        if domain == '':
+            to_panel_url = 'http://'+ip+":"+str(port)+'/setting/index'
+            thisdb.setOption('panel_domain', '')
+            mw.restartMw()
+            return mw.returnData(True, '清空域名成功!', to_panel_url)
+
+        thisdb.setOption('panel_domain', domain)
+        to_panel_url = 'http://'+domain+":"+str(port)+'/setting/index'
+        mw.restartMw()
+        return mw.returnData(True, '设置域名成功!',to_panel_url)
+
+

From 5564b27ff2f3f4ac6e5ddd677a960a8ba2cfe42b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 26 Nov 2024 23:50:47 +0800
Subject: [PATCH 336/965] Update mw.py

---
 web/core/mw.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index 89db9b6dc..4df3def3c 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -447,16 +447,15 @@ def getClientIp():
 def checkDomainPanel():
     import thisdb
     from flask import Flask, redirect, request, url_for
+    
     current_host = getHost()
-
     domain = thisdb.getOption('panel_domain', default='')
     port = getPanelPort()
     scheme = 'http'
 
     panel_ssl_data = thisdb.getOptionByJson('panel_ssl', default={'open':False})
     if panel_ssl_data['open']:
-        choose = panel_ssl_data['choose']        
-        if not inArray(['local','nginx'], choose):
+        if not inArray(['local','nginx'], panel_ssl_data['choose']):
             return False
         scheme = 'https'
 

From 4adaa8565c9ce52dae66159c6864208fe4bef9ce Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 00:01:00 +0800
Subject: [PATCH 337/965] Update setting.py

---
 web/utils/setting.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/web/utils/setting.py b/web/utils/setting.py
index cdeb67e0c..19b16ccfc 100644
--- a/web/utils/setting.py
+++ b/web/utils/setting.py
@@ -274,10 +274,14 @@ class setting(object):
 
     def setPanelDomain(self, domain):
         port = mw.getPanelPort()
-        ip = mw.getLocalIp()
-
+        
         panel_domain = thisdb.getOption('panel_domain', default='')
         if domain == '':
+            ip = mw.getLocalIp()
+            client_ip = mw.getClientIp()
+            if client_ip in ['127.0.0.1', 'localhost', '::1']:
+                ip = client_ip
+
             to_panel_url = 'http://'+ip+":"+str(port)+'/setting/index'
             thisdb.setOption('panel_domain', '')
             mw.restartMw()

From 3305e51fda5c49bccb38637d4b5b7b46f6602f6b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 00:13:34 +0800
Subject: [PATCH 338/965] Update install.sh

---
 plugins/php-apt/versions/84/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/php-apt/versions/84/install.sh b/plugins/php-apt/versions/84/install.sh
index 33f2925ab..585954ca6 100755
--- a/plugins/php-apt/versions/84/install.sh
+++ b/plugins/php-apt/versions/84/install.sh
@@ -9,7 +9,6 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
 
-
 #获取信息和版本
 # bash /www/server/mdsever-web/scripts/getos.sh
 bash ${rootPath}/scripts/getos.sh
@@ -22,6 +21,7 @@ PHP_VER=84
 
 Install_php()
 {
+apt update -y
 #------------------------ install start ------------------------------------#
 apt -y install php${version} php${version}-fpm php${version}-dev
 if [ "$?" == "0" ];then

From b8161b86d2811853a198bd50d8a42d6ddd212089 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 00:17:57 +0800
Subject: [PATCH 339/965] update

---
 plugins/php-apt/install.sh             | 2 ++
 plugins/php-apt/versions/84/install.sh | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/php-apt/install.sh b/plugins/php-apt/install.sh
index 910d4b708..e0f9bed05 100755
--- a/plugins/php-apt/install.sh
+++ b/plugins/php-apt/install.sh
@@ -86,6 +86,8 @@ fi
 cd ${curPath} && sh -x $curPath/versions/$2/install.sh $1
 
 if [ "${action}" == "install" ] && [ -d ${serverPath}/php-apt/${type} ];then
+	apt update -y
+	
 	#初始化 
 	cd ${rootPath} && python3 ${rootPath}/plugins/php-apt/index.py start ${type}
 	cd ${rootPath} && python3 ${rootPath}/plugins/php-apt/index.py restart ${type}
diff --git a/plugins/php-apt/versions/84/install.sh b/plugins/php-apt/versions/84/install.sh
index 585954ca6..435102c7a 100755
--- a/plugins/php-apt/versions/84/install.sh
+++ b/plugins/php-apt/versions/84/install.sh
@@ -21,7 +21,6 @@ PHP_VER=84
 
 Install_php()
 {
-apt update -y
 #------------------------ install start ------------------------------------#
 apt -y install php${version} php${version}-fpm php${version}-dev
 if [ "$?" == "0" ];then

From 296f54127d453c6fe34a04e8332551afdf064ead Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 00:22:01 +0800
Subject: [PATCH 340/965] Update panel_task.py

---
 panel_task.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/panel_task.py b/panel_task.py
index 859beeebb..441572d4c 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -81,7 +81,6 @@ def runPanelTask():
     siteEdateCheck()
 
     lock_file = mw.getTriggerTaskLockFile()
-    mw.writeFile(lock_file,'True')
     try:
         if os.path.exists(lock_file):
             bash_list = thisdb.getTaskList(status=-1)

From f7c9d61e8d3c4a55546e9eb87bd71b239ffd1492 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 00:22:33 +0800
Subject: [PATCH 341/965] Update plugin.py

---
 web/utils/plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index 19375d7a1..c24d085a4 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -250,7 +250,7 @@ class plugin(object):
         self.hookInstall(info_data)
         title = '{0}[{1}-{2}]'.format(msg_head,name,version)
         thisdb.addTask(name=title,cmd=exec_bash, status=0)
-
+        mw.triggerTask()
         # 调式日志
         mw.debugLog(exec_bash)
         return mw.returnData(True, '已将安装任务添加到队列!')

From 2a3bad681b2e41d45866801c91236e00c69bedfe Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 00:56:23 +0800
Subject: [PATCH 342/965] Update install_new.sh

---
 scripts/install_new.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install_new.sh b/scripts/install_new.sh
index 71ca2fb51..608a2d556 100755
--- a/scripts/install_new.sh
+++ b/scripts/install_new.sh
@@ -147,7 +147,7 @@ if [ "${OSNAME}" == "macos" ];then
 	exit 0
 fi
 
-cd /www/server/mdserver-web && bash cli_new.sh start
+cd /www/server/mdserver-web && bash cli.sh start
 isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`
 n=0
 while [ ! -f /etc/rc.d/init.d/mw ];

From 80e49a6ff872eb2838fffe3aa58b8ca9ee3bf816 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 01:19:40 +0800
Subject: [PATCH 343/965] Update setting.py

---
 web/setting.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/setting.py b/web/setting.py
index 57e9d86a7..d0c09281e 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -32,6 +32,10 @@ log_dir = mw.getMWLogs()
 if not os.path.exists(log_dir):
     os.mkdir(log_dir)
 
+data_dir = panel_dir+'/data'
+if not os.path.exists(data_dir):
+    os.mkdir(data_dir)
+
 # default port
 panel_port = '7200'
 default_port_file = panel_dir+'/data/port.pl'

From 8df979956461798007e8dc6358685a6262e6fa0e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 01:23:59 +0800
Subject: [PATCH 344/965] Update mw.py

---
 web/core/mw.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index 4df3def3c..32f7f9fe0 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -546,9 +546,8 @@ def getFileStatsDesc(
     filename: str | None = None,
     path: str | None = None,
 ):
-    # print(filename,path)
-    filename = filename.replace('//', '/')
     try:
+        filename = filename.replace('//', '/')
         stat = os.stat(filename)
         accept = str(oct(stat.st_mode)[-3:])
         mtime = str(int(stat.st_mtime))

From f9f074ef01045caffbb46c397f24ef2c6226e6e5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 01:27:32 +0800
Subject: [PATCH 345/965] update

---
 web/core/mw.py    | 2 ++
 web/utils/file.py | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index 32f7f9fe0..253aca131 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -546,6 +546,8 @@ def getFileStatsDesc(
     filename: str | None = None,
     path: str | None = None,
 ):
+    if path is None or filename is None:
+        return ';;;;;'
     try:
         filename = filename.replace('//', '/')
         stat = os.stat(filename)
diff --git a/web/utils/file.py b/web/utils/file.py
index a9adf31ea..948a8379c 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -295,7 +295,7 @@ def getAllDirList(path, page=1, size=10, order = '', search=None):
     for dst_file in plist:
         if not os.path.exists(dst_file):
             continue
-        stat = getFileStatsDesc(dst_file, path)
+        stat = getFileStatsDesc(filename=dst_file, path=path)
         if os.path.isdir(dst_file):
             dirnames.append(stat)
         else:
@@ -343,7 +343,7 @@ def getDirList(path, page=1, size=10, order = '', search=None):
         if not os.path.exists(abs_file):
             continue
 
-        stats = getFileStatsDesc(abs_file, path)
+        stats = getFileStatsDesc(filename=abs_file, path=path)
         if os.path.isdir(abs_file):
             dirnames.append(stats)
         else:

From 4f1001e487d78b8b44ecd68a9f90dbe2d491ae0e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 01:30:38 +0800
Subject: [PATCH 346/965] Update file.py

---
 web/utils/file.py | 35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

diff --git a/web/utils/file.py b/web/utils/file.py
index 948a8379c..aa3874079 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -176,37 +176,6 @@ def saveBody(path, data, encoding):
     except Exception as ex:
         return mw.returnData(False, '文件保存错误:' + str(ex))
 
-# 获取文件权限描述
-def getFileStatsDesc(
-    filename: str | None = None,
-    path: str | None = None,
-):
-    if path is None or filename is None:
-        return ';;;;;'
-    filename = filename.replace('//', '/')
-    try:
-        stat = os.stat(filename)
-        accept = str(oct(stat.st_mode)[-3:])
-        mtime = str(int(stat.st_mtime))
-        user = ''
-        try:
-            user = str(pwd.getpwuid(stat.st_uid).pw_name)
-        except:
-            user = str(stat.st_uid)
-        size = str(stat.st_size)
-        link = ''
-        if os.path.islink(filename):
-            link = ' -> ' + os.readlink(filename)
-
-        if path:
-            path_t = (path + '/').replace('//', '/')
-            filename = filename.replace(path_t, '', 1)
-
-        return filename + ';' + size + ';' + mtime + ';' + accept + ';' + user + ';' + link
-    except Exception as e:
-        print(str(e))
-        return ';;;;;'
-
 
 def sortFileList(path, ftype = 'mtime', sort = 'desc'):
     flist = os.listdir(path)
@@ -295,7 +264,7 @@ def getAllDirList(path, page=1, size=10, order = '', search=None):
     for dst_file in plist:
         if not os.path.exists(dst_file):
             continue
-        stat = getFileStatsDesc(filename=dst_file, path=path)
+        stat = mw.getFileStatsDesc(filename=dst_file, path=path)
         if os.path.isdir(dst_file):
             dirnames.append(stat)
         else:
@@ -343,7 +312,7 @@ def getDirList(path, page=1, size=10, order = '', search=None):
         if not os.path.exists(abs_file):
             continue
 
-        stats = getFileStatsDesc(filename=abs_file, path=path)
+        stats = mw.getFileStatsDesc(filename=abs_file, path=path)
         if os.path.isdir(abs_file):
             dirnames.append(stats)
         else:

From 37c8da89ae7a5aee3cb39f3181a31a23ceb73cfd Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 01:32:57 +0800
Subject: [PATCH 347/965] Update mw.py

---
 web/core/mw.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index 253aca131..3584d4dd2 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -543,10 +543,10 @@ def getOsID():
 
 # 获取文件权限描述
 def getFileStatsDesc(
-    filename: str | None = None,
-    path: str | None = None,
+    filename: str | None = '',
+    path: str | None = '',
 ):
-    if path is None or filename is None:
+    if path == '' or filename == '':
         return ';;;;;'
     try:
         filename = filename.replace('//', '/')

From 053cd9bc011a277ded4673c5dd38b8ab473fb740 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 01:33:15 +0800
Subject: [PATCH 348/965] Update mw.py

---
 web/core/mw.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index 3584d4dd2..86db6ab62 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -563,7 +563,7 @@ def getFileStatsDesc(
         if os.path.islink(filename):
             link = ' -> ' + os.readlink(filename)
 
-        if path:
+        if path != '':
             tmp_path = (path + '/').replace('//', '/')
             filename = filename.replace(tmp_path, '', 1)
 

From b0070109122cce42324934efef3057cf0287605c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 01:34:38 +0800
Subject: [PATCH 349/965] Update mw.py

---
 web/core/mw.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index 86db6ab62..7d87f970d 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -544,7 +544,7 @@ def getOsID():
 # 获取文件权限描述
 def getFileStatsDesc(
     filename: str | None = '',
-    path: str | None = '',
+    path: str | None = ''
 ):
     if path == '' or filename == '':
         return ';;;;;'

From 1b007460de5bc29350415debb826f32fc3bcddbd Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 01:35:37 +0800
Subject: [PATCH 350/965] update

---
 web/core/mw.py    | 5 +----
 web/utils/file.py | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index 7d87f970d..cf60c8222 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -542,10 +542,7 @@ def getOsID():
     return data[0].strip()
 
 # 获取文件权限描述
-def getFileStatsDesc(
-    filename: str | None = '',
-    path: str | None = ''
-):
+def getFileStatsDesc(filename,path):
     if path == '' or filename == '':
         return ';;;;;'
     try:
diff --git a/web/utils/file.py b/web/utils/file.py
index aa3874079..cf8d04e5d 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -264,7 +264,7 @@ def getAllDirList(path, page=1, size=10, order = '', search=None):
     for dst_file in plist:
         if not os.path.exists(dst_file):
             continue
-        stat = mw.getFileStatsDesc(filename=dst_file, path=path)
+        stat = mw.getFileStatsDesc(dst_file, path)
         if os.path.isdir(dst_file):
             dirnames.append(stat)
         else:
@@ -312,7 +312,7 @@ def getDirList(path, page=1, size=10, order = '', search=None):
         if not os.path.exists(abs_file):
             continue
 
-        stats = mw.getFileStatsDesc(filename=abs_file, path=path)
+        stats = mw.getFileStatsDesc(abs_file, path)
         if os.path.isdir(abs_file):
             dirnames.append(stats)
         else:

From 26bc566aedc52ead21cb3c410ea23eaf82ac256f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 01:41:17 +0800
Subject: [PATCH 351/965] update

---
 web/thisdb/app.py    | 11 ++---------
 web/thisdb/option.py | 12 +++++-------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/web/thisdb/app.py b/web/thisdb/app.py
index f75b2faf7..a3c38e9d2 100644
--- a/web/thisdb/app.py
+++ b/web/thisdb/app.py
@@ -24,10 +24,7 @@ def addApp(app_id,app_secret,white_list):
     }
     return mw.M('app').insert(add_data)
 
-def getAppList(
-    page:int | None = 1,
-    size:int | None = 10,
-):  
+def getAppList(page=1,size=10):  
     m = mw.M('app').field(__FIELD)
 
     start = (int(page) - 1) * (int(size))
@@ -53,11 +50,7 @@ def toggleAppStatus(aid):
     return mw.M('app').where('id=?',(aid,)).update({'status':1})
 
 
-def setAppData(aid,
-    status: str | None = None,
-    app_id: str | None = None,
-    app_secret: str | None = None,
-):
+def setAppData(aid, status=None, app_id=None, app_secret=None):
     up_data = {}
     if status is not None:
         up_data['status'] = status
diff --git a/web/thisdb/option.py b/web/thisdb/option.py
index eaf373dcb..b57fe1f35 100644
--- a/web/thisdb/option.py
+++ b/web/thisdb/option.py
@@ -13,8 +13,8 @@ import json
 import core.mw as mw
 
 def getOption(name,
-    type: str | None = 'common',
-    default : str | None = None
+    type='common',
+    default=None
 ) -> str:
     '''
     获取配置的值
@@ -29,8 +29,8 @@ def getOption(name,
 
 
 def getOptionByJson(name,
-    type: str | None = 'common',
-    default : object | None = None
+    type='common',
+    default=None
 ) -> object:
     '''
     获取配置的值,返回对象类型
@@ -44,9 +44,7 @@ def getOptionByJson(name,
     if data is not None:
         return json.loads(data)
 
-def setOption(name, value,
-    type: str | None = 'common'
-) -> bool:
+def setOption(name, value, type = 'common') -> bool:
     '''
     设置配置的值
     :name -> str 名称 (必填)

From 9265bd57e48e9ea4935181b12aa2076aef59ea70 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 01:46:54 +0800
Subject: [PATCH 352/965] update

---
 web/thisdb/firewall.py   | 10 ++--------
 web/thisdb/logs.py       | 10 ++--------
 web/thisdb/option.py     | 10 ++--------
 web/thisdb/sites.py      |  7 +------
 web/thisdb/tasks.py      | 30 ++++++------------------------
 web/thisdb/temp_login.py | 10 ++--------
 web/thisdb/user.py       | 11 +++--------
 7 files changed, 18 insertions(+), 70 deletions(-)

diff --git a/web/thisdb/firewall.py b/web/thisdb/firewall.py
index 88c7b0c39..bff32e6f2 100644
--- a/web/thisdb/firewall.py
+++ b/web/thisdb/firewall.py
@@ -12,10 +12,7 @@ import core.mw as mw
 
 __FIELD = 'id,port,protocol,ps,add_time,update_time'
 
-def getFirewallList(
-    page:int | None = 1,
-    size:int | None = 10,
-):
+def getFirewallList(page=1,size=10):
     start = (int(page) - 1) * (int(size))
     limit = str(start) + ',' +str(size)
 
@@ -27,10 +24,7 @@ def getFirewallList(
     data['list'] = firewall_list
     return data
 
-def addFirewall(port,
-    protocol: str | None = 'tcp',
-    ps: str | None = '备注'
-) -> bool:
+def addFirewall(port, protocol='tcp',ps='备注') -> bool:
     '''
     设置配置的值
     :port -> str 端口 (必填)
diff --git a/web/thisdb/logs.py b/web/thisdb/logs.py
index d23d59719..f08b7888c 100644
--- a/web/thisdb/logs.py
+++ b/web/thisdb/logs.py
@@ -17,9 +17,7 @@ def clearLog():
     mw.M('logs').where('id>?', (0,)).delete()
     return True
 
-def addLog(type, log,
-    uid: int | None = 1
-) -> str:
+def addLog(type, log, uid = 1) -> str:
     '''
     添加日志
     :type -> str 类型 (必填)
@@ -35,11 +33,7 @@ def addLog(type, log,
     mw.M('logs').insert(insert_data)
     return True
 
-def getLogsList(
-    page:int | None = 1,
-    size:int | None = 10,
-    search: str | None = ''
-):
+def getLogsList(page = 1,size = 10,search = ''):
     sql_where = ''
     if search != '' :
         sql_where = " type like '%" + search + "%' or log like '%" + search + "%' "
diff --git a/web/thisdb/option.py b/web/thisdb/option.py
index b57fe1f35..35a32f5cc 100644
--- a/web/thisdb/option.py
+++ b/web/thisdb/option.py
@@ -12,10 +12,7 @@ import os
 import json
 import core.mw as mw
 
-def getOption(name,
-    type='common',
-    default=None
-) -> str:
+def getOption(name,type='common',default=None) -> str:
     '''
     获取配置的值
     :name -> str 名称 (必填)
@@ -28,10 +25,7 @@ def getOption(name,
     return data
 
 
-def getOptionByJson(name,
-    type='common',
-    default=None
-) -> object:
+def getOptionByJson(name,type='common',default=None) -> object:
     '''
     获取配置的值,返回对象类型
     :name -> str 名称 (必填)
diff --git a/web/thisdb/sites.py b/web/thisdb/sites.py
index fb2f0a3c4..4ba679e4e 100644
--- a/web/thisdb/sites.py
+++ b/web/thisdb/sites.py
@@ -111,12 +111,7 @@ def getSitesList(
 def deleteSitesById(site_id):
     return mw.M('sites').where("id=?", (site_id,)).delete()
 
-def setSitesData(site_id,
-    edate: str | None = None,
-    ps: str | None = None,
-    path: str | None = None,
-    status: str | None = None,
-):
+def setSitesData(site_id, edate = None, ps = None, path = None,status = None):
     update_data = {}
     if edate is not None:
         update_data['edate'] = edate
diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index 317e5e065..bf839cca8 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -12,9 +12,7 @@ import core.mw as mw
 
 __FIELD = 'id,name,type,start,end,cmd,status,add_time'
 
-def getTaskCount(
-        status: int | None = -1
-    ) -> int:
+def getTaskCount(status = -1) -> int:
     return mw.M('tasks').where('status=?',(1,)).count()
 
 
@@ -22,12 +20,7 @@ def getTaskCount(
 def getTaskUnexecutedCount() -> int:
     return mw.M('tasks').where('status!=?',(1,)).count()
 
-def addTaskByDownload(
-    name: str | None = '下载文件',
-    cmd: str | None = None,
-    type: str | None = 'download',
-    status: int | None = 0,
-):
+def addTaskByDownload(name = '下载文件',cmd = None,type = 'download',status = 0):
     '''
     添加后台任务
     :name -> str 类型
@@ -110,19 +103,13 @@ def getTaskFirstByRun() -> None:
         return None
     return data
 
-def getTaskRunList(
-    page: int | None = 1,
-    size: int | None = 10,
-):
+def getTaskRunList(page = 1,size = 10):
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)
     task_list = mw.M('tasks').where('status!=?', (1,)).field(__FIELD).limit(limit).order('id asc').select()
     return task_list
 
-def getTaskRunPage(
-    page: int | None = 1,
-    size: int | None = 10,
-):
+def getTaskRunPage(page = 1, size = 10):
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)
 
@@ -135,16 +122,11 @@ def getTaskRunPage(
     return rdata
 
 
-def setTaskStatus(task_id,
-    status: int | None = 0
-):
+def setTaskStatus(task_id,status = 0):
     mw.M('tasks').where('id=?',(task_id,)).update({'status':status})
     return True
 
-def setTaskData(id,
-    start: int | None = None,
-    end: int | None = None,
-):
+def setTaskData(id, start = None,end = None):
     if start is not None:
         mw.M('tasks').where('id=?',(id,)).update({'start':start})
     if end is not None:
diff --git a/web/thisdb/temp_login.py b/web/thisdb/temp_login.py
index b6ac4e840..558f2526f 100644
--- a/web/thisdb/temp_login.py
+++ b/web/thisdb/temp_login.py
@@ -14,10 +14,7 @@ import core.mw as mw
 
 __FIELD = 'id,token,salt,state,login_time,login_addr,logout_time,expire,add_time'
 
-def addTempLogin(
-    token:str | None = None,
-    expire:int | None = None
-):
+def addTempLogin(token = None,expire = None):
     if expire is None:
         start_time = int(time.time())
         expire=start_time+3600
@@ -40,10 +37,7 @@ def addTempLogin(
 
     return mw.M('temp_login').insert(insert_data)
 
-def getTempLoginPage(
-    page: int | None = 1,
-    size: int | None = 10,
-):
+def getTempLoginPage(page = 1,size = 10):
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)
     tl_list = mw.M('temp_login').where('', ()).field(__FIELD).limit(limit).order('id desc').select()
diff --git a/web/thisdb/user.py b/web/thisdb/user.py
index ebf74532a..20fa5ff09 100644
--- a/web/thisdb/user.py
+++ b/web/thisdb/user.py
@@ -36,8 +36,7 @@ def initAdminUser():
     return True
 
 
-def getUserByName(name,
-) -> None:
+def getUserByName(name) -> None:
     '''
     获取用户信息通过用户名
     '''
@@ -56,8 +55,7 @@ def getUserByName(name,
     row['update_time'] = data['update_time']
     return row
 
-def getUserById(id,
-) -> None:
+def getUserById(id) -> None:
     '''
     获取用户信息通过用户名
     '''
@@ -95,10 +93,7 @@ def setUserPwdByName(name, password):
     pwd = mw.md5(password)
     return mw.M('users').where("name=?", (name,)).setField('password', pwd)
 
-def setUserByRoot(
-    name: str | None = None,
-    password: str | None = None,
-) -> bool:
+def setUserByRoot(name = None,password = None) -> bool:
     '''
     设置配置的值
     :name -> str 名称 (必填)

From be55e79dcfe6e423be0d5200666ad38f55999340 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 01:47:53 +0800
Subject: [PATCH 353/965] Update sites.py

---
 web/thisdb/sites.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/thisdb/sites.py b/web/thisdb/sites.py
index 4ba679e4e..3b46f98f7 100644
--- a/web/thisdb/sites.py
+++ b/web/thisdb/sites.py
@@ -71,11 +71,11 @@ def getSitesEdateList(edate):
     return elist
 
 def getSitesList(
-    page:int | None = 1,
-    size:int | None = 10,
-    type_id:int | None = 0,
-    search: str | None = '',
-    order:str | None = None,
+    page = 1,
+    size = 10,
+    type_id = 0,
+    search = '',
+    order = None,
 ):
     sql_where = ''
     if search != '' :

From 9b0a41c3d53ced2d11387a0ed7ab4523f688da4d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 01:49:20 +0800
Subject: [PATCH 354/965] update

---
 web/thisdb/crontab.py |  4 ++--
 web/thisdb/tasks.py   | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/web/thisdb/crontab.py b/web/thisdb/crontab.py
index 32f755598..85d14ccd5 100644
--- a/web/thisdb/crontab.py
+++ b/web/thisdb/crontab.py
@@ -36,8 +36,8 @@ def deleteCronById(id):
     return True
 
 def getCrontabList(
-    page:int | None = 1,
-    size:int | None = 10,
+    page = 1,
+    size = 10,
 ):
     start = (int(page) - 1) * size
     limit = str(start) + ',' + str(size)
diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index bf839cca8..656bc4313 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -44,10 +44,10 @@ def addTaskByDownload(name = '下载文件',cmd = None,type = 'download',status
     return True
 
 def addTask(
-    name: str | None = '常用任务',
-    cmd: str | None = None,
-    type: str | None = 'execshell',
-    status: int | None = 0,
+    name = '常用任务',
+    cmd = None,
+    type = 'execshell',
+    status = 0,
 ):
     '''
     添加后台任务
@@ -73,9 +73,9 @@ def addTask(
 
 
 def getTaskList(
-    status: int | None = 1,
-    page: int | None = 1,
-    size: int | None = 10,
+    status = 1,
+    page = 1,
+    size = 10,
 ):
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)
@@ -83,9 +83,9 @@ def getTaskList(
     return task_list
 
 def getTaskPage(
-    status: int | None = 1,
-    page: int | None = 1,
-    size: int | None = 10,
+    status = 1,
+    page = 1,
+    size = 10,
 ):
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)

From 2c5ab012377ae86504e513eb1b6f25aa9e12d80f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 01:50:32 +0800
Subject: [PATCH 355/965] Update firewall.py

---
 web/utils/firewall.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 3a5d1d7ac..99844a5c5 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -245,9 +245,7 @@ class Firewall(object):
                 pass
         return mw.returnData(True, '设置成功!')
 
-    def addAcceptPortCmd(self, port,
-        protocol:str  | None ='tcp'
-    ):
+    def addAcceptPortCmd(self, port, protocol ='tcp'):
         if self.__isUfw:
             if protocol == 'tcp':
                 mw.execShell('ufw allow ' + port + '/tcp')

From ae016172ea84b22b8664c8e61561e06c40d53536 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 01:50:47 +0800
Subject: [PATCH 356/965] Update firewall.py

---
 web/utils/firewall.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 99844a5c5..1dd9c5c40 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -285,7 +285,7 @@ class Firewall(object):
 
     # 添加放行端口
     def addAcceptPort(self, port, ps, stype,
-        protocol: str  | None ='tcp'
+        protocol='tcp'
     ):
         if not self.getFwStatus():
             self.setFw(0)

From 86ac000117ac51f91de5f4da0c73ae15131fc606 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 01:51:15 +0800
Subject: [PATCH 357/965] Update firewall.py

---
 web/utils/firewall.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 1dd9c5c40..e2e8aff5b 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -307,7 +307,7 @@ class Firewall(object):
         return mw.returnData(True, msg)
 
     def delAcceptPort(self, firewall_id, port,
-        protocol: str  | None ='tcp'
+        protocol='tcp'
     ):
         panel_port = mw.getPanelPort()
 
@@ -326,7 +326,7 @@ class Firewall(object):
             return mw.returnData(False, '删除失败!:' + str(e))
 
     def delAcceptPortCmd(self, port,
-        protocol: str  | None ='tcp'
+        protocol ='tcp'
     ):
         if self.__isUfw:
             if protocol == 'tcp':

From e4ad01dd42391315ef2c4180fe9ee7ebd65cec05 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 01:55:03 +0800
Subject: [PATCH 358/965] update

---
 web/admin/model/__init__.py   |  36 -------
 web/admin/model/firewall.py   |  41 -------
 web/admin/model/initdb.py     | 194 ----------------------------------
 web/admin/model/logs.py       |  48 ---------
 web/admin/model/option.py     |  74 -------------
 web/admin/model/sites.py      |  16 ---
 web/admin/model/task.py       | 135 -----------------------
 web/admin/model/temp_login.py |  44 --------
 web/admin/model/user.py       |  93 ----------------
 9 files changed, 681 deletions(-)
 delete mode 100644 web/admin/model/__init__.py
 delete mode 100644 web/admin/model/firewall.py
 delete mode 100644 web/admin/model/initdb.py
 delete mode 100644 web/admin/model/logs.py
 delete mode 100644 web/admin/model/option.py
 delete mode 100644 web/admin/model/sites.py
 delete mode 100644 web/admin/model/task.py
 delete mode 100644 web/admin/model/temp_login.py
 delete mode 100644 web/admin/model/user.py

diff --git a/web/admin/model/__init__.py b/web/admin/model/__init__.py
deleted file mode 100644
index e2bb5f82e..000000000
--- a/web/admin/model/__init__.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-
-from .initdb import *
-
-from .logs import addLog,clearLog
-
-from .option import getOption,getOptionByJson,setOption
-from .option import setOption
-
-from .sites import getSitesCount
-
-from .task import addTask
-from .task import getTaskCount,getTaskUnexecutedCount,getTaskList,getTaskFirstByRun,getTaskRunList
-from .task import setTaskStatus,setTaskData
-
-from .user import isLoginCheck
-from .user import getUserByName,getUserById,getUserByRoot
-from .user import setUserByRoot
-
-from .firewall import addFirewall
-
-from .temp_login import getTempLoginByToken,clearTempLogin
-
-
-
-
-
diff --git a/web/admin/model/firewall.py b/web/admin/model/firewall.py
deleted file mode 100644
index db7c36939..000000000
--- a/web/admin/model/firewall.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-from admin.model import db, Firewall
-
-import core.mw as mw
-
-
-
-def addFirewall(port,
-    protocol: str | None = 'tcp',
-    ps: str | None = '备注'
-) -> bool:
-    '''
-    设置配置的值
-    :port -> str 端口 (必填)
-    :protocol -> str 协议 (可选|tcp,udp,tcp/udp)
-    :ps -> str 备注 (可选)
-    '''
-    now_time = mw.formatDate()
-    add_data = Firewall(
-        port=port, 
-        protocol=protocol,
-        add_time=now_time,
-        update_time=now_time)
-    db.session.add(add_data)
-    db.session.commit()
-    return True
-
-
-def getFirewallCountByPort(port):
-    return Firewall.query.filter(Tasks.port==port).count()
-
-
diff --git a/web/admin/model/initdb.py b/web/admin/model/initdb.py
deleted file mode 100644
index 8923feebc..000000000
--- a/web/admin/model/initdb.py
+++ /dev/null
@@ -1,194 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-
-from flask_sqlalchemy import SQLAlchemy
-# from flask_security import UserMixin, RoleMixin
-import config
-
-SCHEMA_VERSION = 1
-
-
-db = SQLAlchemy(
-    engine_options={
-        'pool_size': config.CONFIG_DATABASE_CONNECTION_POOL_SIZE,
-        'max_overflow': config.CONFIG_DATABASE_CONNECTION_MAX_OVERFLOW,
-    }
-)
-
-
-class Version(db.Model):
-    """用于参考/升级的版本号"""
-    __tablename__ = 'version'
-    name = db.Column(db.String(32), primary_key=True)
-    value = db.Column(db.Integer(), nullable=False)
-
-class Role(db.Model):
-    """定义安全角色"""
-    __tablename__ = 'role'
-    id = db.Column(db.Integer(), primary_key=True,autoincrement=True, comment="ID")
-    name = db.Column(db.String(128), unique=True, nullable=False)
-    description = db.Column(db.String(256), nullable=False)
-
-class Option(db.Model):
-    """定义类型"""
-    __tablename__ = 'option'
-    id = db.Column(db.Integer(), primary_key=True,autoincrement=True, comment="ID")
-    name = db.Column(db.String(128), unique=True, nullable=False, comment="配置名称")
-    type = db.Column(db.String(50), unique=False, nullable=False, default='common',comment="计划类型:common/hook/web")
-    value = db.Column(db.TEXT, unique=False, nullable=False, comment="内容")
-
-class Users(db.Model):
-    """定义登录用户"""
-    __tablename__ = 'users'
-    id = db.Column(db.Integer(), primary_key=True,autoincrement=True, comment="ID")
-    name = db.Column(db.String(128), unique=True, nullable=False, comment="用户名")
-    password = db.Column(db.String(128), unique=False, nullable=False, comment="密码")
-    login_ip = db.Column(db.String(128), unique=False, nullable=True, comment="登录IP")
-    login_time = db.Column(db.String(128), unique=False, nullable=True, comment="登录时间")
-    phone = db.Column(db.String(20), unique=False, nullable=False,comment="手机")
-    email = db.Column(db.String(320), nullable=False, comment="邮件")
-    add_time = db.Column(db.TEXT, nullable=False, comment="添加时间")
-    update_time = db.Column(db.TEXT, nullable=False, comment="更新时间")
-
-class Crontab(db.Model):
-    """定义计划任务"""
-    __tablename__ = 'crontab'
-    id = db.Column(db.Integer(), primary_key=True,autoincrement=True, comment="ID")
-    name = db.Column(db.TEXT, unique=True, nullable=False, comment="任务名称")
-    type = db.Column(db.String(128), unique=False, nullable=False, comment="计划类型")
-    where1 = db.Column(db.TEXT, unique=False, nullable=True, comment="执行条件")
-    where_hour = db.Column(db.TEXT, unique=False, nullable=True, comment="执行条件/小时")
-    where_minute = db.Column(db.TEXT, unique=False, nullable=True, comment="执行条件/分钟")
-    echo = db.Column(db.TEXT, unique=False, nullable=True, comment="脚本保存名称")
-    sname = db.Column(db.TEXT, unique=False, nullable=True, default='',comment="名称")
-    sbody = db.Column(db.TEXT, unique=False, nullable=True, default='',comment="脚本")
-    stype = db.Column(db.TEXT, unique=False, nullable=True, default='',comment="脚本类型")
-    url_address = db.Column(db.TEXT, unique=False, nullable=True, default='',comment="URL访问地址")
-    backup_to = db.Column(db.TEXT, unique=False, nullable=True, comment="备份地址")
-    save = db.Column(db.Integer, unique=False, nullable=True, default=3,comment="备份数量")
-    status = db.Column(db.Integer, unique=False, nullable=True, default=1, comment="状态")
-    add_time = db.Column(db.TEXT, nullable=False, comment="添加时间")
-    update_time = db.Column(db.TEXT, nullable=False, comment="更新时间")
-
-class Logs(db.Model):
-    """定义日志"""
-    __tablename__ = 'logs'
-    id = db.Column(db.Integer(), primary_key=True,autoincrement=True, comment="ID")
-    uid = db.Column(db.Integer(), unique=False, nullable=False, comment="用户ID")
-    type = db.Column(db.String(128), unique=False, nullable=False, comment="日志类型")
-    log = db.Column(db.TEXT, unique=False, nullable=True, comment="日志内容")
-    add_time = db.Column(db.TEXT, nullable=False, comment="添加时间")
-
-class Firewall(db.Model):
-    """定义防火墙"""
-    __tablename__ = 'firewall'
-    id = db.Column(db.Integer(), primary_key=True,autoincrement=True, comment="ID")
-    port = db.Column(db.Integer(), unique=False, nullable=False, comment="端口")
-    protocol = db.Column(db.Integer(), unique=False, nullable=False, comment="协议/tcp/udp")
-    ps = db.Column(db.TEXT, unique=False, nullable=False, comment="备注")
-    add_time = db.Column(db.TEXT, nullable=False, comment="添加时间")
-    update_time = db.Column(db.TEXT, nullable=False, comment="更新时间")
-
-
-class Backup(db.Model):
-    """定义备份"""
-    __tablename__ = 'backup'
-    id = db.Column(db.Integer(), primary_key=True,autoincrement=True, comment="ID")
-    pid = db.Column(db.Integer(), unique=False, nullable=False, comment="父级ID")
-    type = db.Column(db.String(128), unique=False, nullable=False, comment="备份类型")
-    name = db.Column(db.TEXT, unique=False, nullable=False, comment="名称")
-    filename = db.Column(db.TEXT, unique=False, nullable=False, comment="文件绝对位置")
-    size = db.Column(db.Integer(), unique=False, nullable=False, comment="大小")
-    add_time = db.Column(db.TEXT, nullable=False, comment="添加时间")
-
-class Sites(db.Model):
-    """定义计划任务"""
-    __tablename__ = 'sites'
-    id = db.Column(db.Integer(), primary_key=True,autoincrement=True, comment="ID")
-    name = db.Column(db.TEXT, unique=False, nullable=False, comment="网站名称")
-    path = db.Column(db.TEXT, unique=False, nullable=False, comment="网站路径")
-    index = db.Column(db.TEXT, unique=False, nullable=False, comment="")
-    ps = db.Column(db.TEXT, unique=False, nullable=False, comment="备注")
-    edate = db.Column(db.TEXT, unique=False, nullable=False, comment="到期时间")
-    type_id = db.Column(db.TEXT, unique=False, nullable=False, comment="分类ID")
-    status = db.Column(db.Integer(), unique=False, nullable=True, default=1, comment="状态")
-    add_time = db.Column(db.TEXT, nullable=False, comment="添加时间")
-    update_time = db.Column(db.TEXT, nullable=False, comment="更新时间")
-
-class SiteType(db.Model):
-    """定义站点类型"""
-    __tablename__ = 'site_type'
-    id = db.Column(db.Integer(), primary_key=True,autoincrement=True, comment="ID")
-    name = db.Column(db.TEXT, unique=False, nullable=False, comment="类型名称")
-    add_time = db.Column(db.TEXT, nullable=False, comment="添加时间")
-    update_time = db.Column(db.TEXT, nullable=False, comment="更新时间")
-
-class Domain(db.Model):
-    """定义站点域名"""
-    __tablename__ = 'domain'
-    id = db.Column(db.Integer(), primary_key=True,autoincrement=True, comment="ID")
-    pid = db.Column(db.Integer(), unique=False, nullable=False, comment="站点ID")
-    name = db.Column(db.TEXT, unique=False, nullable=False, comment="域名")
-    port = db.Column(db.Integer(), unique=False, nullable=False, comment="端口")
-    add_time = db.Column(db.TEXT, nullable=False, comment="添加时间")
-
-class Binding(db.Model):
-    """定义站点绑定"""
-    __tablename__ = 'binding'
-    id = db.Column(db.Integer(), primary_key=True,autoincrement=True, comment="ID")
-    pid = db.Column(db.Integer(), unique=False, nullable=False, comment="站点ID")
-    domain = db.Column(db.TEXT, unique=False, nullable=False, comment="域名")
-    path = db.Column(db.TEXT, unique=False, nullable=False, comment="路径")
-    port = db.Column(db.Integer(), unique=False, nullable=False, comment="端口")
-    add_time = db.Column(db.TEXT, nullable=False, comment="添加时间")
-
-
-class Tasks(db.Model):
-    """定义任务"""
-    __tablename__ = 'tasks'
-    id = db.Column(db.Integer(), primary_key=True,autoincrement=True, comment="ID")
-    name = db.Column(db.TEXT, unique=False, nullable=False, comment="任务名称")
-    type = db.Column(db.TEXT, unique=False, nullable=False, comment="类型")
-    cmd = db.Column(db.TEXT, unique=False, nullable=False, comment="执行命令")
-    start = db.Column(db.Integer(), unique=False, nullable=True, comment="开始执行时间")
-    end = db.Column(db.Integer(), unique=False, nullable=True, comment="结束执行时间")
-    status = db.Column(db.Integer(), unique=False, nullable=True, default=1, comment="状态")
-    add_time = db.Column(db.TEXT, nullable=False, comment="添加时间")
-
-
-class TempLogin(db.Model):
-    """定义临时登录"""
-    __tablename__ = 'temp_login'
-    id = db.Column(db.Integer(), primary_key=True,autoincrement=True, comment="ID")
-    token = db.Column(db.TEXT, unique=False, nullable=False, comment="token")
-    salt = db.Column(db.TEXT, unique=False, nullable=False, comment="salt")
-    state = db.Column(db.Integer(), unique=False, nullable=False, comment="状态")
-    login_time = db.Column(db.Integer(), unique=False, nullable=True, comment="登录时间")
-    login_addr = db.Column(db.Integer(), unique=False, nullable=True, comment="登录地址")
-    logout_time = db.Column(db.Integer(), unique=False, nullable=True, comment="登出时间")
-    expire = db.Column(db.Integer(), unique=False, nullable=True, comment="过期时间")
-    add_time = db.Column(db.TEXT, nullable=False, comment="添加时间")
-
-class Panel(db.Model):
-    """定义其他面板"""
-    __tablename__ = 'panel'
-    id = db.Column(db.Integer(), primary_key=True,autoincrement=True, comment="ID")
-    title = db.Column(db.TEXT, unique=False, nullable=False, comment="标题")
-    url = db.Column(db.TEXT, unique=False, nullable=False, comment="地址")
-    username = db.Column(db.Integer(), unique=False, nullable=False, comment="用户名")
-    password = db.Column(db.Integer(), unique=False, nullable=True, comment="密码")
-    click = db.Column(db.Integer(), unique=False, nullable=True, comment="点击次数")
-    add_time = db.Column(db.TEXT, nullable=False, comment="添加时间")
-
-
-
-
-
diff --git a/web/admin/model/logs.py b/web/admin/model/logs.py
deleted file mode 100644
index 54cda769f..000000000
--- a/web/admin/model/logs.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-
-import json
-import time
-
-from admin.model import db, Logs
-import core.mw as mw
-
-def clearLog():
-    try:
-        # from sqlalchemy import text
-        # db.session.execute(text("DELETE FROM logs where id>1"))
-        db.session.query(Logs).filter(Logs.id > 0).delete(synchronize_session=False)
-        db.session.commit()
-    except Exception as e:
-        db.session.commit()
-    finally:
-        db.session.close()
-    return True
-
-def addLog(type, log,
-    uid: int | None = 1
-) -> str:
-    '''
-    添加日志
-    :type -> str 类型 (必填)
-    :log -> str 日志内容 (必填)
-    :uid -> int 用户ID
-    '''
-    now_time = mw.formatDate()
-    add_logs = Logs(
-        uid=uid,
-        log=log, 
-        type=type,
-        add_time=now_time)
-    db.session.add(add_logs)
-    db.session.commit()
-    db.session.close()
-    return True
\ No newline at end of file
diff --git a/web/admin/model/option.py b/web/admin/model/option.py
deleted file mode 100644
index cbb277be5..000000000
--- a/web/admin/model/option.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-
-import json
-
-from admin.model import db, Option
-
-def getOption(name,
-    type: str | None = 'common',
-    default : str | None = None
-) -> str:
-    '''
-    获取配置的值
-    :name -> str 名称 (必填)
-    :type -> str 类型 (可选|默认common)
-    :default -> str 默认值 (可选)
-    '''
-    data = Option.query.filter_by(name=name, type=type).first()
-    if data is not None:
-        return data.value
-
-    if default is not None:
-        return default
-    return ''
-
-def getOptionByJson(name,
-    type: str | None = 'common',
-    default : object | None = None
-) -> object:
-    '''
-    获取配置的值,返回对象类型
-    :name -> str 名称 (必填)
-    :type -> str 类型 (可选|默认common)
-    :default -> str 默认值 (可选)
-    '''
-    data = Option.query.filter_by(name=name, type=type).first()
-    if data is not None:
-        return json.loads(data.value)
-
-    if default is not None:
-        return default
-    return []
-
-def setOption(name, value,
-    type: str | None = 'common'
-) -> bool:
-    '''
-    设置配置的值
-    :name -> str 名称 (必填)
-    :value -> object值 (必填)
-    :type -> str 类型 (可选|默认common)
-    '''
-    data = Option.query.filter_by(name=name, type=type).first()
-    if data is None:
-        add_option = Option(
-            name=name, 
-            type=type,
-            value=value)
-        db.session.add(add_option)
-        db.session.commit()
-        db.session.close()
-        return True
-    
-    db.session.query(Option).filter_by(name=name, type=type).update({"value":value})
-    db.session.commit()
-    return True
\ No newline at end of file
diff --git a/web/admin/model/sites.py b/web/admin/model/sites.py
deleted file mode 100644
index dbb54064f..000000000
--- a/web/admin/model/sites.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-from admin.model import db, Sites
-
-
-def getSitesCount():
-	return Sites.query.count()
-
diff --git a/web/admin/model/task.py b/web/admin/model/task.py
deleted file mode 100644
index c3ba9ccc7..000000000
--- a/web/admin/model/task.py
+++ /dev/null
@@ -1,135 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-from admin.model import db, Tasks
-
-import core.mw as mw
-
-def getTaskCount(
-        status: int | None = -1
-    ) -> int:
-    return Tasks.query.filter(Tasks.status==status).count()
-
-# 未执行任务总数
-def getTaskUnexecutedCount() -> int:
-    return Tasks.query.filter(Tasks.status!=1).count()
-
-
-def addTask(
-    name: str | None = '常用任务',
-    cmd: str | None = None,
-    type: str | None = 'execshell',
-    status: int | None = 0,
-):
-    '''
-    添加后台任务
-    :name -> str 类型
-    :cmd -> str 日志内容 (必填)
-    :type -> str 用户ID
-    '''
-    if cmd is None:
-        return False
-
-    add_time = mw.formatDate()
-    add_data = Tasks(
-        name=name,
-        cmd=cmd, 
-        type=type,
-        start=0,
-        end=0,
-        status=status,
-        add_time=add_time)
-    db.session.add(add_data)
-    db.session.commit()
-    db.session.close()
-    return True
-
-def getTaskFirstByRun() -> None:
-    item =  Tasks.query.filter(Tasks.status==-1).order_by(Tasks.id.asc()).first()
-
-    if item is None:
-        return None
-    row = {}
-    row['id'] = item.id
-    row['name'] = item.name
-    row['type'] = item.type
-    row['cmd'] = item.cmd
-    row['start'] = item.start
-    row['end'] = item.end
-    row['status'] = item.status
-    row['add_time'] = item.add_time
-    return row
-
-def getTaskList(
-    status: int | None = 1,
-    page: int | None = 1,
-    size: int | None = 10,
-):
-    pagination = Tasks.query.filter(Tasks.status==status).order_by(Tasks.id.asc()).paginate(page=int(page), per_page=int(size))
-  
-    rows = []
-    for item in pagination.items:
-        t = {}
-        t['id'] = item.id
-        t['name'] = item.name
-        t['type'] = item.type
-        t['cmd'] = item.cmd
-        t['start'] = item.start
-        t['end'] = item.end
-        t['status'] = item.status
-        t['add_time'] = item.add_time
-        rows.append(t)
-    return rows
-
-def getTaskRunList(
-    page: int | None = 1,
-    size: int | None = 10,
-):
-    pagination = Tasks.query.filter(Tasks.status!=1).order_by(Tasks.id.asc()).paginate(page=int(page), per_page=int(size))
-  
-    rows = []
-    for item in pagination.items:
-        t = {}
-        t['id'] = item.id
-        t['name'] = item.name
-        t['type'] = item.type
-        t['cmd'] = item.cmd
-        t['start'] = item.start
-        t['end'] = item.end
-        t['status'] = item.status
-        t['add_time'] = item.add_time
-        rows.append(t)
-    return rows
-
-
-
-
-def setTaskStatus(id,
-    status: int | None = 0
-):
-    Tasks.query.filter(Tasks.id==id).update({'status':status})
-    db.session.commit()
-    return True
-
-def setTaskData(id,
-    start: int | None = None,
-    end: int | None = None,
-):
-    update_data = {}
-
-    if start is not None:
-        update_data['start'] = start
-    if end is not None:
-        update_data['end'] = end
-
-    Tasks.query.filter(Tasks.id==id).update(update_data)
-    db.session.commit()
-    return True
-
diff --git a/web/admin/model/temp_login.py b/web/admin/model/temp_login.py
deleted file mode 100644
index ac60f45c4..000000000
--- a/web/admin/model/temp_login.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-import time
-
-from admin.model import db, TempLogin
-
-import core.mw as mw
-
-def getTempLoginByToken(token,
-) -> None:
-    '''
-    获取用户信息通过用户名
-    '''
-    item =  TempLogin.query.filter(TempLogin.token==token).first()
-    if item is None:
-        return None
-    row = {}
-    row['id'] = item.id
-    row['token'] = item.token
-    row['salt'] = item.salt
-    row['state'] = item.state
-    row['login_time'] = item.login_time
-    row['login_addr'] = item.login_addr
-    row['logout_time'] = item.logout_time
-    row['expire'] = item.expire
-    row['add_time'] = item.add_time
-    return row
-
-def clearTempLogin()->bool:
-    '''
-    清空过期数据
-    '''
-    now_time = int(time.time())
-    TempLogin.query.filter(TempLogin.expire<now_time).delete()
-    db.session.commit()
-    return True
\ No newline at end of file
diff --git a/web/admin/model/user.py b/web/admin/model/user.py
deleted file mode 100644
index 058e8fbd1..000000000
--- a/web/admin/model/user.py
+++ /dev/null
@@ -1,93 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-from admin.model import db, Users
-
-import core.mw as mw
-
-def getUserByName(name,
-) -> None:
-    '''
-    获取用户信息通过用户名
-    '''
-    item =  Users.query.filter(Users.name==name).first()
-    if item is None:
-        return None
-    row = {}
-    row['id'] = item.id
-    row['name'] = item.name
-    row['password'] = item.password
-    row['login_ip'] = item.login_ip
-    row['login_time'] = item.login_time
-    row['phone'] = item.phone
-    row['email'] = item.email
-    row['add_time'] = item.add_time
-    row['update_time'] = item.update_time
-    return row
-
-def getUserById(id,
-) -> None:
-    '''
-    获取用户信息通过用户名
-    '''
-    item =  Users.query.filter(Users.id==id).first()
-    if item is None:
-        return None
-    row = {}
-    row['id'] = item.id
-    row['name'] = item.name
-    row['password'] = item.password
-    row['login_ip'] = item.login_ip
-    row['login_time'] = item.login_time
-    row['phone'] = item.phone
-    row['email'] = item.email
-    row['add_time'] = item.add_time
-    row['update_time'] = item.update_time
-    return row
-
-def getUserByRoot() -> None:
-    '''
-    获取用户信息通过用户名
-    '''
-    return getUserById(1)
-
-def setUserByRoot(
-    name: str | None = None,
-    password: str | None = None,
-) -> bool:
-    '''
-    设置配置的值
-    :name -> str 名称 (必填)
-    :value -> object值 (必填)
-    :type -> str 类型 (可选|默认common)
-    '''
-    data = {}
-
-    if name is not None:
-        data['name'] = name
-
-    if password is not None:
-        data['password'] = mw.md5(password)
-
-    if not data:
-        return False
-    
-    Users.query.filter(Users.id==1).update(data)
-    db.session.commit()
-    return True
-
-def isLoginCheck(username, password) -> bool:
-    info = getUserByName(data['username'])
-    if info is None:
-        return False
-
-    if info['password'] == mw.md5(password):
-        return True
-    return False

From c9c52cf7f519756895208f76ce82abb7bd8fc01b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 02:07:08 +0800
Subject: [PATCH 359/965] update

---
 web/admin/__init__.py                  | 4 ++--
 web/admin/common.py                    | 1 -
 web/admin/dashboard/dashboard.py       | 1 -
 web/admin/dashboard/login.py           | 4 ++--
 web/admin/setting/secondary_verifiy.py | 2 --
 web/admin/setting/temp_login.py        | 2 --
 web/admin/setting/timezone.py          | 1 -
 web/admin/setup/option.py              | 2 +-
 web/admin/setup/user.py                | 2 --
 web/admin/site/site.py                 | 1 -
 web/admin/system/upgrade.py            | 2 --
 web/admin/task/__init__.py             | 2 --
 12 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 738fe5cfe..c11f3dd19 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -73,7 +73,7 @@ setup.init()
 # BASIC AUTH
 app.config['BASIC_AUTH_OPEN'] = False
 try:
-    basic_auth = model.getOptionByJson('basic_auth', default={'open':False})
+    basic_auth = thisdb.getOptionByJson('basic_auth', default={'open':False})
     if basic_auth['open']:
         app.config['BASIC_AUTH_OPEN'] = True
 except Exception as e:
@@ -101,7 +101,7 @@ def requestCheck():
     config.APP_START_TIME=time.time()
     # 自定义basic auth认证
     if app.config['BASIC_AUTH_OPEN']:
-        basic_auth = model.getOptionByJson('basic_auth', default={'open':False})
+        basic_auth = thisdb.getOptionByJson('basic_auth', default={'open':False})
         if not basic_auth['open']:
             return
 
diff --git a/web/admin/common.py b/web/admin/common.py
index cc1be06db..235bbbdac 100644
--- a/web/admin/common.py
+++ b/web/admin/common.py
@@ -10,7 +10,6 @@
 
 import time
 
-# from admin import model
 from admin import session
 import thisdb
 
diff --git a/web/admin/dashboard/dashboard.py b/web/admin/dashboard/dashboard.py
index 0fd7b28d8..4fac21077 100644
--- a/web/admin/dashboard/dashboard.py
+++ b/web/admin/dashboard/dashboard.py
@@ -20,7 +20,6 @@ from flask import request,g
 from admin.common import isLogined
 from admin.user_login_check import panel_login_required
 from admin import cache,session
-from admin.model import db,TempLogin,Users
 
 import core.mw as mw
 import thisdb
diff --git a/web/admin/dashboard/login.py b/web/admin/dashboard/login.py
index 746560ce2..f64837f9d 100644
--- a/web/admin/dashboard/login.py
+++ b/web/admin/dashboard/login.py
@@ -174,7 +174,7 @@ def do_login():
                 login_cache_limit = int(login_cache_limit) + 1
 
             if login_cache_limit >= login_cache_count:
-                model.setOption('admin_close', 'yes')
+                thisdb.setOption('admin_close', 'yes')
                 return mw.returnJson(False, '面板已经关闭!')
 
             cache.set('login_cache_limit', login_cache_limit, timeout=10000)
@@ -195,7 +195,7 @@ def do_login():
             login_cache_limit = int(login_cache_limit) + 1
 
         if login_cache_limit >= login_cache_count:
-            model.setOption('admin_close', 'yes')
+            thisdb.setOption('admin_close', 'yes')
             return mw.returnData(False, '面板已经关闭!')
 
         cache.set('login_cache_limit', login_cache_limit, timeout=10000)
diff --git a/web/admin/setting/secondary_verifiy.py b/web/admin/setting/secondary_verifiy.py
index 2e170bf56..d7bf70feb 100644
--- a/web/admin/setting/secondary_verifiy.py
+++ b/web/admin/setting/secondary_verifiy.py
@@ -16,9 +16,7 @@ import time
 from flask import Blueprint, render_template
 from flask import request
 
-from admin import model
 from admin import session
-from admin.model import db,TempLogin
 from admin.user_login_check import panel_login_required
 
 import core.mw as mw
diff --git a/web/admin/setting/temp_login.py b/web/admin/setting/temp_login.py
index 95156b579..6aa7633af 100644
--- a/web/admin/setting/temp_login.py
+++ b/web/admin/setting/temp_login.py
@@ -16,9 +16,7 @@ import time
 from flask import Blueprint, render_template
 from flask import request
 
-from admin import model
 from admin import session
-from admin.model import db,TempLogin
 from admin.user_login_check import panel_login_required
 
 import core.mw as mw
diff --git a/web/admin/setting/timezone.py b/web/admin/setting/timezone.py
index 246b411c3..4b542d123 100644
--- a/web/admin/setting/timezone.py
+++ b/web/admin/setting/timezone.py
@@ -15,7 +15,6 @@ import os
 from flask import Blueprint, render_template
 from flask import request
 
-from admin import model
 from admin.user_login_check import panel_login_required
 
 import core.mw as mw
diff --git a/web/admin/setup/option.py b/web/admin/setup/option.py
index 93a02551a..d6c8c87a5 100644
--- a/web/admin/setup/option.py
+++ b/web/admin/setup/option.py
@@ -39,7 +39,7 @@ def init_option():
     thisdb.setOption('two_step_verification', json.dumps({'open':False}))
 
     # 开启后台任务
-    # model.setOption('run_bg_task', 'close')
+    # thisdb.setOption('run_bg_task', 'close')
 
     # 首页展示初始化
     thisdb.setOption('display_index', '[]')
diff --git a/web/admin/setup/user.py b/web/admin/setup/user.py
index 7c2092ace..1065ef0c1 100644
--- a/web/admin/setup/user.py
+++ b/web/admin/setup/user.py
@@ -10,8 +10,6 @@
 
 from flask import request
 
-from admin import model
-from admin.model import db, Users
 
 import core.mw as mw
 import thisdb
diff --git a/web/admin/site/site.py b/web/admin/site/site.py
index b8e1a1bcc..7fc98afe7 100644
--- a/web/admin/site/site.py
+++ b/web/admin/site/site.py
@@ -13,7 +13,6 @@ import os
 from flask import Blueprint, render_template
 from flask import request
 
-from admin.model import Sites
 from admin.user_login_check import panel_login_required
 
 from utils.plugin import plugin as MwPlugin
diff --git a/web/admin/system/upgrade.py b/web/admin/system/upgrade.py
index 82a00684d..cd8b29d38 100644
--- a/web/admin/system/upgrade.py
+++ b/web/admin/system/upgrade.py
@@ -14,8 +14,6 @@ from flask import request
 
 from admin.user_login_check import panel_login_required
 
-from admin import model
-
 import core.mw as mw
 import utils.system as sys
 
diff --git a/web/admin/task/__init__.py b/web/admin/task/__init__.py
index 92465b109..650d4f26e 100644
--- a/web/admin/task/__init__.py
+++ b/web/admin/task/__init__.py
@@ -14,8 +14,6 @@ import time
 from flask import Blueprint, render_template
 from flask import request
 
-from admin import model
-from admin.model import db,Tasks
 from admin.user_login_check import panel_login_required
 
 import core.mw as mw

From ab088d9355d39ff73777a07759b517b1d2419388 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 02:07:30 +0800
Subject: [PATCH 360/965] Update config.py

---
 web/utils/config.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/utils/config.py b/web/utils/config.py
index cbc0ecc90..87ff77f25 100644
--- a/web/utils/config.py
+++ b/web/utils/config.py
@@ -10,8 +10,6 @@
 
 import os
 
-from admin import model
-
 import core.mw as mw
 import thisdb
 

From 486361f3b7ce24a835a87d8b55d6a68fdf7b4329 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 02:08:55 +0800
Subject: [PATCH 361/965] Update config.py

---
 web/utils/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/config.py b/web/utils/config.py
index 87ff77f25..ac7be3a21 100644
--- a/web/utils/config.py
+++ b/web/utils/config.py
@@ -14,7 +14,7 @@ import core.mw as mw
 import thisdb
 
 def getUnauthStatus(
-    code: str | None = '0'
+    code= '0'
 ):
     code = str(code)
     data = {}

From bf0269a7da6184b96a8781518e4c286ce5974666 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 02:11:58 +0800
Subject: [PATCH 362/965] Update plugin.py

---
 web/utils/plugin.py | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index c24d085a4..8bbc710d8 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -222,7 +222,7 @@ class plugin(object):
         return False
 
     def install(self, name, version,
-        upgrade: bool | None = None
+        upgrade = None
     ):
         if name.strip() == '':
             return mw.returnData(False, '缺少插件名称!', ())
@@ -283,7 +283,7 @@ class plugin(object):
 
     # 插件搜索匹配
     def searchKey(self, info,
-        keyword: str | None = None,
+        keyword = None,
     ):
         if keyword == None:
             return True
@@ -456,8 +456,8 @@ class plugin(object):
 
 
     def getPluginList(self, name,
-        keyword: str | None = None,
-        type: str | None = None,
+        keyword = None,
+        type = None,
     ):
         info = []
         path = self.__plugin_dir + '/' + name
@@ -513,10 +513,10 @@ class plugin(object):
 
     def getAllPluginList(
         self,
-        type: str | None = None,
-        keyword: str | None = None,
-        page: int | None = 1, 
-        size: int | None = 10, 
+        type = None,
+        keyword = None,
+        page = 1, 
+        size = 10, 
     ):
         info = []
 
@@ -539,10 +539,10 @@ class plugin(object):
 
     def getList(
         self,
-        type: str | None = None,
-        keyword: str | None = None,
-        page: int | None = 1, 
-        size: int | None = 10, 
+        type = None,
+        keyword = None,
+        page = 1, 
+        size  = 10, 
     ) -> object:
         # print(type,keyword,page,size)
         rdata = {}
@@ -555,9 +555,9 @@ class plugin(object):
 
     # shell/bash方式调用
     def run(self, name, func,
-        version: str | None = '',
-        args: str | None = '',
-        script: str | None = 'index',
+        version = '',
+        args  = '',
+        script  = 'index',
     ):
 
         path = self.__plugin_dir + '/' + name + '/' + script + '.py'
@@ -583,8 +583,8 @@ class plugin(object):
 
     # 映射包调用
     def callback(self, name, func,
-        args: str | None = '',
-        script: str | None = 'index',
+        args = '',
+        script = 'index',
     ):
 
         package = self.__plugin_dir + '/' + name

From 06db6b02d814b97d73174f6f92ee92b432f0d5e7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 02:13:28 +0800
Subject: [PATCH 363/965] Update plugin.py

---
 web/utils/plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index 8bbc710d8..504977834 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -439,7 +439,7 @@ class plugin(object):
 
     # 对多版本共存进行处理
     def makeCoexistList(self, data,
-        plugin_type: str | None = None,
+        plugin_type = None,
     ):
         plugins_t = []
         # 返回指定类型

From db1dfb9aedb6c7477c70648b3ec8711a26abd649 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 02:15:08 +0800
Subject: [PATCH 364/965] Update crontab.py

---
 web/utils/crontab.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/utils/crontab.py b/web/utils/crontab.py
index e308b7a5e..68fbbb82d 100644
--- a/web/utils/crontab.py
+++ b/web/utils/crontab.py
@@ -274,8 +274,8 @@ class crontab(object):
         return True
 
     def getCrontabList(self,
-        page:int | None = 1,
-        size:int | None = 10
+        page = 1,
+        size = 10
     ):
         info = thisdb.getCrontabList(page=int(page),size=int(size))
 

From aa5ffdc3c0c518c65d40c1d116c7e7f67eb5b59a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 02:17:01 +0800
Subject: [PATCH 365/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 05df11e28..62392e727 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -523,10 +523,10 @@ mw_default(){
         port=$(cat ${PANEL_DIR}/data/port.pl)
     fi
 
-    if [ ! -f ${PANEL_DIR}/data/default.pl ];then
-        echo -e "\033[33mInstall Failed\033[0m"
-        exit 1
-    fi
+    # if [ ! -f ${PANEL_DIR}/data/default.pl ];then
+    #     echo -e "\033[33mInstall Failed\033[0m"
+    #     exit 1
+    # fi
 
     password=$(cat ${PANEL_DIR}/data/default.pl)
 

From 3994d8f0ce15f9c88b0f767ddf3af0cf9bbfe0f1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 02:21:45 +0800
Subject: [PATCH 366/965] update

---
 data/README.md | 4 ++++
 ssl/README.md  | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 data/README.md

diff --git a/data/README.md b/data/README.md
new file mode 100644
index 000000000..bc8dc9fc5
--- /dev/null
+++ b/data/README.md
@@ -0,0 +1,4 @@
+# 自动生成
+
+certificate.pem - 证书信息
+privateKey.pem  - 私钥
\ No newline at end of file
diff --git a/ssl/README.md b/ssl/README.md
index bc8dc9fc5..39c380ce8 100644
--- a/ssl/README.md
+++ b/ssl/README.md
@@ -1,4 +1 @@
-# 自动生成
-
-certificate.pem - 证书信息
-privateKey.pem  - 私钥
\ No newline at end of file
+# 数据目录
\ No newline at end of file

From 7a1b30994b790995baf5ee64be22c47c36c9d605 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 02:47:23 +0800
Subject: [PATCH 367/965] update

---
 web/admin/setting/app.py           | 13 ++++++++-----
 web/admin/setup/option.py          |  2 +-
 web/setting.py                     |  4 ++--
 web/templates/default/setting.html |  2 +-
 web/utils/config.py                |  4 ++--
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/web/admin/setting/app.py b/web/admin/setting/app.py
index 5b025a3e4..273e19ce8 100644
--- a/web/admin/setting/app.py
+++ b/web/admin/setting/app.py
@@ -29,12 +29,15 @@ import thisdb
 @blueprint.route('/set_panel_api', endpoint='set_panel_api', methods=['POST'])
 @panel_login_required
 def set_panel_api():
-    admin_api = thisdb.getOption('api', default='no')
-    if admin_api == 'no':
-        thisdb.setOption('api', 'yes')
+    panel_api = thisdb.getOptionByJson('panel_api', default={'open':False})
+    if not panel_api['open']:
+        panel_api['open'] = True
+        thisdb.setOption('panel_api', json.dumps(panel_api))
         return mw.returnData(True, '开启API成功!')
-    thisdb.setOption('api', 'no')
-    return mw.returnData(True, '开启API成功!')
+    else:
+        panel_api['open'] = False
+        thisdb.setOption('panel_api', json.dumps(panel_api))
+        return mw.returnData(True, '关闭API成功!')
 
 
 # 获取APP列表
diff --git a/web/admin/setup/option.py b/web/admin/setup/option.py
index d6c8c87a5..7542f3791 100644
--- a/web/admin/setup/option.py
+++ b/web/admin/setup/option.py
@@ -53,7 +53,7 @@ def init_option():
     thisdb.setOption('admin_path', mw.getRandomString(8))
 
     # API是否开启|默认关闭
-    thisdb.setOption('api', 'no')
+    thisdb.setOption('panel_api', json.dumps({'open':False}))
 
     # 获取服务器IP
     ip = mw.getLocalIp()
diff --git a/web/setting.py b/web/setting.py
index d0c09281e..500849760 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -45,8 +45,8 @@ if os.path.exists(default_port_file):
 else:
     from utils.firewall import Firewall as MwFirewall
     mw_port = str(random.randint(10000, 65530))
-    MwFirewall.instance().addAcceptPort(panel_port, 'PANEL端口', 'port')
-    mw.writeFile(default_port_file, panel_port)
+    MwFirewall.instance().addAcceptPort(mw_port, 'PANEL端口', 'port')
+    mw.writeFile(default_port_file, mw_port)
 
 bind = []
 default_ipv6_file = panel_dir+'/data/ipv6.pl'
diff --git a/web/templates/default/setting.html b/web/templates/default/setting.html
index 1c5edea6c..9a123904a 100755
--- a/web/templates/default/setting.html
+++ b/web/templates/default/setting.html
@@ -129,7 +129,7 @@
 
 				<p class="mtb15">
 					<span class="set-tit text-right" title="API接口" style="float: left;">API接口</span>
-					<input class="btswitch btswitch-ios" id="cfg_panel_api" type="checkbox" {{data['api_token']}}/>
+					<input class="btswitch btswitch-ios" id="cfg_panel_api" type="checkbox" {% if data['panel_api']['open'] %}checked{% endif %}/>
 	                <label class="btswitch-btn ml5" for="cfg_panel_api" style="float: left;margin-top:4px;" onclick="setPanelApi()"></label>
 	                <button ype="button" class="btn btn-default btn-xs" style="vertical-align: middle; margin-left: 10px" onclick="appPage();">APP应用管理</button>
 					<span class="set-info c7">提供面板API接口访问的支持</span>
diff --git a/web/utils/config.py b/web/utils/config.py
index ac7be3a21..ee081e86b 100644
--- a/web/utils/config.py
+++ b/web/utils/config.py
@@ -81,9 +81,9 @@ def getGlobalVar():
     # 邮件通知设置
     data['notify_email'] = thisdb.getOptionByJson('notify_email', default={'open':False}, type='notify')
     data['notify_tgbot'] = thisdb.getOptionByJson('notify_tgbot', default={'open':False}, type='notify')
-
+    
+    data['panel_api'] = thisdb.getOptionByJson('panel_api', default={'open':False})
     data['panel_ssl'] = thisdb.getOptionByJson('panel_ssl', default={'open':False})
     data['panel_domain'] = thisdb.getOption('panel_domain', default='')
     
-    
     return data
\ No newline at end of file

From 7d2ca4ea744553ae08b3a7efe46dc5558a936ef0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 02:53:02 +0800
Subject: [PATCH 368/965] Update user.py

---
 web/thisdb/user.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/thisdb/user.py b/web/thisdb/user.py
index 20fa5ff09..56bd24328 100644
--- a/web/thisdb/user.py
+++ b/web/thisdb/user.py
@@ -18,17 +18,17 @@ def initAdminUser():
     if data is None:
         name = mw.getRandomString(8).lower()
         password = mw.getRandomString(8).lower()
-        insert_time = mw.formatDate()
+        now_time = mw.formatDate()
         login_ip = '127.0.0.1'
         add_user = {
             'name':name, 
             'password':mw.md5(password),
             'login_ip':login_ip,
-            'login_time':insert_time,
+            'login_time':now_time,
             'phone':'',
             'email':'',
-            'add_time':insert_time,
-            'update_time':insert_time
+            'add_time':now_time,
+            'update_time':now_time
         }
         file_pass_pl = mw.getPanelDataDir() + '/default.pl'
         mw.writeFile(file_pass_pl, password)

From da0e599bad7736136207e028f5a1ab951ca0ab8c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 02:56:43 +0800
Subject: [PATCH 369/965] Update mw.py

---
 web/core/mw.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index cf60c8222..9369abed7 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -463,16 +463,16 @@ def checkDomainPanel():
     if client_ip in ['127.0.0.1', 'localhost', '::1']:
         return False
 
-    ip = getHostAddr()
-    if domain == '':
-        if current_host.strip().lower() != ip.strip().lower():
-            to = scheme + "://" + ip + ":" + str(port)
-            return redirect(to, code=302)
-        return False
-    else:
-        if current_host.strip().lower() != domain.strip().lower():
-            to = scheme + "://" + domain + ":" + str(port)
-            return redirect(to, code=302)
+    # ip = getHostAddr()
+    # if domain == '':
+    #     if current_host.strip().lower() != ip.strip().lower():
+    #         to = scheme + "://" + ip + ":" + str(port)
+    #         return redirect(to, code=302)
+    #     return False
+    # else:
+    #     if current_host.strip().lower() != domain.strip().lower():
+    #         to = scheme + "://" + domain + ":" + str(port)
+    #         return redirect(to, code=302)
     return False
 
 def getLocalIp():

From 0c4460282ad3c6b5f1f0f9ec6d319a9848c1cba1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 03:01:15 +0800
Subject: [PATCH 370/965] Update default.sql

---
 web/admin/setup/sql/default.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/admin/setup/sql/default.sql b/web/admin/setup/sql/default.sql
index a9b8cb531..a3b4216c7 100755
--- a/web/admin/setup/sql/default.sql
+++ b/web/admin/setup/sql/default.sql
@@ -47,10 +47,10 @@ CREATE TABLE IF NOT EXISTS `firewall` (
   `add_time` TEXT,
   `update_time` TEXT
 );
-CREATE UNIQUE INDEX port_idx ON firewall(port);
+-- CREATE UNIQUE INDEX port_idx ON firewall(port);
 
 INSERT INTO `firewall` (`id`, `port`, `protocol`, `ps`, `add_time`, `update_time`) VALUES
-(1, '80',  'tcp','网站默认端口', '0000-00-00 00:00:00','0000-00-00 00:00:00'),
+(1, '80',  'tcp', '网站默认端口', '0000-00-00 00:00:00','0000-00-00 00:00:00'),
 (2, '443', 'tcp/udp', 'HTTPS', '0000-00-00 00:00:00','0000-00-00 00:00:00');
 
 CREATE TABLE IF NOT EXISTS `logs` (

From 2d892575f300ae826c959ac39dea69e97f1659b1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 03:17:24 +0800
Subject: [PATCH 371/965] Update default.sql

---
 web/admin/setup/sql/default.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/admin/setup/sql/default.sql b/web/admin/setup/sql/default.sql
index a3b4216c7..5d8bf40ed 100755
--- a/web/admin/setup/sql/default.sql
+++ b/web/admin/setup/sql/default.sql
@@ -47,7 +47,8 @@ CREATE TABLE IF NOT EXISTS `firewall` (
   `add_time` TEXT,
   `update_time` TEXT
 );
--- CREATE UNIQUE INDEX port_idx ON firewall(port);
+
+CREATE UNIQUE INDEX port_idx ON firewall(port);
 
 INSERT INTO `firewall` (`id`, `port`, `protocol`, `ps`, `add_time`, `update_time`) VALUES
 (1, '80',  'tcp', '网站默认端口', '0000-00-00 00:00:00','0000-00-00 00:00:00'),

From e145e2c57fef70e2246670ef5b50a4ec48d0cab0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 03:27:04 +0800
Subject: [PATCH 372/965] Update default.sql

---
 web/admin/setup/sql/default.sql | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/admin/setup/sql/default.sql b/web/admin/setup/sql/default.sql
index 5d8bf40ed..2e2c60eff 100755
--- a/web/admin/setup/sql/default.sql
+++ b/web/admin/setup/sql/default.sql
@@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS `crontab` (
   `add_time` TEXT,
   `update_time` TEXT
 );
-CREATE UNIQUE INDEX name_idx ON crontab(name);
+CREATE UNIQUE INDEX crontab_name_idx ON crontab(name);
 
 CREATE TABLE IF NOT EXISTS `firewall` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -48,7 +48,7 @@ CREATE TABLE IF NOT EXISTS `firewall` (
   `update_time` TEXT
 );
 
-CREATE UNIQUE INDEX port_idx ON firewall(port);
+CREATE UNIQUE INDEX firewall_port_idx ON firewall(port);
 
 INSERT INTO `firewall` (`id`, `port`, `protocol`, `ps`, `add_time`, `update_time`) VALUES
 (1, '80',  'tcp', '网站默认端口', '0000-00-00 00:00:00','0000-00-00 00:00:00'),
@@ -76,13 +76,13 @@ CREATE TABLE IF NOT EXISTS `sites` (
   `add_time` TEXT,
   `update_time` TEXT
 );
-CREATE UNIQUE INDEX name_idx ON sites(name);
+CREATE UNIQUE INDEX sites_name_idx ON sites(name);
 
 CREATE TABLE IF NOT EXISTS `site_types` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `name` TEXT
 );
-CREATE UNIQUE INDEX name_idx ON site_types(name);
+CREATE UNIQUE INDEX site_types_name_idx ON site_types(name);
 
 CREATE TABLE IF NOT EXISTS `domain` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -147,7 +147,7 @@ CREATE TABLE IF NOT EXISTS `app` (
   `add_time` TEXT,
   `update_time` TEXT
 );
-CREATE UNIQUE INDEX name_idx ON app(name);
+CREATE UNIQUE INDEX app_name_idx ON app(name);
 CREATE UNIQUE INDEX app_id_idx ON app(app_id);
 
 CREATE TABLE IF NOT EXISTS `option` (
@@ -156,4 +156,4 @@ CREATE TABLE IF NOT EXISTS `option` (
   `type` TEXT,
   `value` TEXT
 );
-CREATE UNIQUE INDEX name_idx ON option(name);
+CREATE UNIQUE INDEX option_name_idx ON option(name);

From e4c7a0470176eaf4ae751de5a226c3730e60493b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 03:31:14 +0800
Subject: [PATCH 373/965] Update init.py

---
 web/thisdb/init.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/web/thisdb/init.py b/web/thisdb/init.py
index fac16d6bf..20654721b 100644
--- a/web/thisdb/init.py
+++ b/web/thisdb/init.py
@@ -19,8 +19,10 @@ def initPanelData():
         return True
     sql_file = mw.getPanelDir() + '/web/admin/setup/sql/default.sql'
     sql = mw.M().dbPos(mw.getPanelDataDir(),'panel')
-    csql = mw.readFile(sql_file)
-    csql_list = csql.split(';')
-    for index in range(len(csql_list)):
-        sql.execute(csql_list[index], ())
+    content = mw.readFile(sql_file)
+    csql_data = content.split(';')
+    for i in range(len(csql_data)):
+        # print(csql_data[i])
+        # print(sql.execute(csql_data[i], ()))
+        sql.execute(csql_data[i], ())
     return True
\ No newline at end of file

From e8d1e6e1ebd13505c473a94b92ff209bc5cb92c7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 03:45:31 +0800
Subject: [PATCH 374/965] Update system.sql

---
 web/admin/setup/sql/system.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/admin/setup/sql/system.sql b/web/admin/setup/sql/system.sql
index 75fe9557f..31ed453ee 100755
--- a/web/admin/setup/sql/system.sql
+++ b/web/admin/setup/sql/system.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `network` (
   `up_packets` INTEGER,
   `addtime` INTEGER
 );
-CREATE INDEX addtime_idx ON network(`addtime`);
+CREATE INDEX network_addtime_idx ON network(`addtime`);
 
 CREATE TABLE IF NOT EXISTS `cpuio` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `cpuio` (
   `mem` TEXT,
   `addtime` INTEGER
 );
-CREATE INDEX addtime_idx ON cpuio(`addtime`);
+CREATE INDEX cpuio_addtime_idx ON cpuio(`addtime`);
 
 CREATE TABLE IF NOT EXISTS `diskio` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -28,7 +28,7 @@ CREATE TABLE IF NOT EXISTS `diskio` (
   `write_time` INTEGER,
   `addtime` INTEGER
 );
-CREATE INDEX addtime_idx ON diskio(`addtime`);
+CREATE INDEX diskio_addtime_idx ON diskio(`addtime`);
 
 CREATE TABLE IF NOT EXISTS `load_average` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -38,4 +38,4 @@ CREATE TABLE IF NOT EXISTS `load_average` (
   `fifteen` REAL,
   `addtime` INTEGER
 );
-CREATE INDEX addtime_idx ON load_average(`addtime`);
\ No newline at end of file
+CREATE INDEX load_average_addtime_idx ON load_average(`addtime`);
\ No newline at end of file

From 50eb0137a4ecf4a0ccbd01a3e7ad7d12684d350f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 04:13:19 +0800
Subject: [PATCH 375/965] Update __init__.py

---
 web/admin/__init__.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index c11f3dd19..0da237640 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -37,6 +37,8 @@ import core.mw as mw
 import config
 import utils.config as utils_config
 import thisdb
+# 初始化db
+setup.init()
 
 # from threading import Lock
 # thread = None
@@ -67,9 +69,6 @@ app.config['PERMANENT_SESSION_LIFETIME'] = timedelta(days=31)
 # app.config['SQLALCHEMY_DATABASE_URI'] = mw.getSqitePrefix()+config.SQLITE_PATH+"?timeout=20"  # 使用 SQLite 数据库
 app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = True
 
-# 初始化db
-setup.init()
-
 # BASIC AUTH
 app.config['BASIC_AUTH_OPEN'] = False
 try:

From aef3c5d69410fc6c7c65df77ca6a99ad883e83e1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 04:15:28 +0800
Subject: [PATCH 376/965] Update init.py

---
 web/thisdb/init.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/thisdb/init.py b/web/thisdb/init.py
index 20654721b..1f6050df9 100644
--- a/web/thisdb/init.py
+++ b/web/thisdb/init.py
@@ -14,9 +14,9 @@ import core.mw as mw
 
 
 def initPanelData():
-    _dbfile = mw.getPanelDataDir() + '/panel.db'
-    if os.path.exists(_dbfile):
-        return True
+    # _dbfile = mw.getPanelDataDir() + '/panel.db'
+    # if os.path.exists(_dbfile):
+    #     return True
     sql_file = mw.getPanelDir() + '/web/admin/setup/sql/default.sql'
     sql = mw.M().dbPos(mw.getPanelDataDir(),'panel')
     content = mw.readFile(sql_file)

From 17d46958f86002d4669d050c805cc9d63f489530 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 04:35:55 +0800
Subject: [PATCH 377/965] Update panel_tools.py

---
 panel_tools.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/panel_tools.py b/panel_tools.py
index 8697b747b..6e2f536c5 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -27,6 +27,9 @@ from utils.firewall import Firewall as MwFirewall
 import core.mw as mw
 import thisdb
 
+from admin import setup
+setup.init()
+
 
 INIT_DIR = "/etc/rc.d/init.d"
 if mw.isAppleSystem():

From c3ef396728ead4c945e6070c4c4cfc5968d05dab Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 04:40:29 +0800
Subject: [PATCH 378/965] Update panel_tools.py

---
 panel_tools.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index 6e2f536c5..888886b7a 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -27,8 +27,8 @@ from utils.firewall import Firewall as MwFirewall
 import core.mw as mw
 import thisdb
 
-from admin import setup
-setup.init()
+# from admin import setup
+# setup.init()
 
 
 INIT_DIR = "/etc/rc.d/init.d"

From d25993e78b2ee27bba05fe406240a2971b82fd0a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 04:48:39 +0800
Subject: [PATCH 379/965] update

---
 web/admin/plugins/__init__.py | 35 +++++-----------------
 web/thisdb/init.py            |  6 ++--
 web/utils/plugin.py           | 55 +++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 31 deletions(-)

diff --git a/web/admin/plugins/__init__.py b/web/admin/plugins/__init__.py
index e35a9fb9b..8d7c72fb5 100644
--- a/web/admin/plugins/__init__.py
+++ b/web/admin/plugins/__init__.py
@@ -34,35 +34,14 @@ def index():
 @blueprint.route('/init', endpoint='init', methods=['POST'])
 @panel_login_required
 def init():
-    plugin_names = {
-        'openresty': '1.25.3',
-        'php': '56',
-        'swap': '1.1',
-        'mysql': '5.7',
-        'phpmyadmin': '4.4.15',
-    }
+    return MwPlugin.instance().init()
 
-    pn_dir = mw.getPluginDir()
-    pn_server_dir = mw.getServerDir()
-    pn_list = []
-    for pn in plugin_names:
-        info = {}
-        pn_json = pn_dir + '/' + pn + '/info.json'
-        pn_server = pn_server_dir + '/' + pn
-        if not os.path.exists(pn_server):
-
-            tmp = mw.readFile(pn_json)
-            tmp = json.loads(tmp)
-
-            info['title'] = tmp['title']
-            info['name'] = tmp['name']
-            info['versions'] = tmp['versions']
-            info['default_ver'] = plugin_names[pn]
-            pn_list.append(info)
-        else:
-            return mw.returnData(False, 'ok')
-
-    return mw.returnData(True, 'ok', pn_list)
+# 初始化安装
+@blueprint.route('/init_install', endpoint='init_install', methods=['POST'])
+@panel_login_required
+def init_install(): 
+    plugin_list = request.form.get('list', '')
+    return MwPlugin.instance().initInstall(plugin_list)
 
 # 首页软件展示
 @blueprint.route('/index_list', endpoint='index_list', methods=['GET','POST'])
diff --git a/web/thisdb/init.py b/web/thisdb/init.py
index 1f6050df9..20654721b 100644
--- a/web/thisdb/init.py
+++ b/web/thisdb/init.py
@@ -14,9 +14,9 @@ import core.mw as mw
 
 
 def initPanelData():
-    # _dbfile = mw.getPanelDataDir() + '/panel.db'
-    # if os.path.exists(_dbfile):
-    #     return True
+    _dbfile = mw.getPanelDataDir() + '/panel.db'
+    if os.path.exists(_dbfile):
+        return True
     sql_file = mw.getPanelDir() + '/web/admin/setup/sql/default.sql'
     sql = mw.M().dbPos(mw.getPanelDataDir(),'panel')
     content = mw.readFile(sql_file)
diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index 504977834..ee2b89a46 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -132,6 +132,61 @@ class plugin(object):
         plist = self.checkStatusMThreads(plist)
         return plist
 
+    def init(self):
+        plugin_names = {
+            'openresty': '1.25.3',
+            'php': '56',
+            'swap': '1.1',
+            'mysql': '5.7',
+            'phpmyadmin': '4.4.15',
+        }
+
+        pn_dir = mw.getPluginDir()
+        pn_server_dir = mw.getServerDir()
+        pn_list = []
+        for pn in plugin_names:
+            info = {}
+            pn_json = pn_dir + '/' + pn + '/info.json'
+            pn_server = pn_server_dir + '/' + pn
+            if not os.path.exists(pn_server):
+
+                tmp = mw.readFile(pn_json)
+                tmp = json.loads(tmp)
+
+                info['title'] = tmp['title']
+                info['name'] = tmp['name']
+                info['versions'] = tmp['versions']
+                info['default_ver'] = plugin_names[pn]
+                pn_list.append(info)
+            else:
+                return mw.returnData(False, 'ok')
+
+        return mw.returnData(True, 'ok', pn_list)
+
+    def initInstall(self, plugin_list):
+        try:
+            pn_list = json.loads(plugin_list)
+            for pn in pn_list:
+                name = pn['name']
+                version = pn['version']
+                info_file = self.__plugin_dir + '/' + name + '/' + 'info.json'
+                pluginInfo = json.loads(mw.readFile(info_file))
+                self.hookInstall(pluginInfo)
+
+                cmd = 'cd {0} && bash {1} install {2}'.format(
+                    mw.getPluginDir() + '/'+name,
+                    pluginInfo['shell'],
+                    version
+                )
+                title = '安装[' + name + '-' + version + ']'
+                thisdb.addTask(name=title,cmd=cmd)
+            os.mkdir(mw.getServerDir() + '/php')
+            # 任务执行相关
+            mw.triggerTask()
+            return mw.returnData(True, '添加成功')
+        except Exception as e:
+            return mw.returnData(False, mw.getTracebackInfo())
+
     def menuGetAbsPath(self, tag, path):
         if path[0:1] == '/':
             return path

From 293c902a805ca57bb93bee87b00d5db86c6bb3ae Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 05:23:05 +0800
Subject: [PATCH 380/965] Update init.py

---
 web/thisdb/init.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/thisdb/init.py b/web/thisdb/init.py
index 20654721b..1f6050df9 100644
--- a/web/thisdb/init.py
+++ b/web/thisdb/init.py
@@ -14,9 +14,9 @@ import core.mw as mw
 
 
 def initPanelData():
-    _dbfile = mw.getPanelDataDir() + '/panel.db'
-    if os.path.exists(_dbfile):
-        return True
+    # _dbfile = mw.getPanelDataDir() + '/panel.db'
+    # if os.path.exists(_dbfile):
+    #     return True
     sql_file = mw.getPanelDir() + '/web/admin/setup/sql/default.sql'
     sql = mw.M().dbPos(mw.getPanelDataDir(),'panel')
     content = mw.readFile(sql_file)

From a44873b142edfdf105f91e79aa5d547ba466ea66 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 05:48:44 +0800
Subject: [PATCH 381/965] update

---
 web/admin/__init__.py | 7 ++++---
 web/app.py            | 4 ++--
 web/setting.py        | 6 +++++-
 web/thisdb/init.py    | 6 +++---
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 0da237640..82d7fde1b 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -30,14 +30,16 @@ from flask_migrate import Migrate
 from flask_caching import Cache
 from werkzeug.local import LocalProxy
 
-from admin import setup
+
 from admin.common import isLogined
 
 import core.mw as mw
 import config
 import utils.config as utils_config
 import thisdb
+
 # 初始化db
+from admin import setup
 setup.init()
 
 # from threading import Lock
@@ -77,8 +79,6 @@ try:
         app.config['BASIC_AUTH_OPEN'] = True
 except Exception as e:
     pass
-    
-
 
 # 加载模块
 from .submodules import get_submodules
@@ -178,6 +178,7 @@ def webssh(data):
     shell.run(data)
     return
 
+
 # File logging
 logger = logging.getLogger('werkzeug')
 logger.setLevel(config.CONSOLE_LOG_LEVEL)
diff --git a/web/app.py b/web/app.py
index a6f5f7610..273bc6179 100644
--- a/web/app.py
+++ b/web/app.py
@@ -17,8 +17,8 @@ import config
 from gevent.pywsgi import WSGIServer
 from geventwebsocket.handler import WebSocketHandler
 
-# from gevent import monkey
-# monkey.patch_all()
+import eventlet
+eventlet.monkey_patch(socket=True, select=True)
 
 
 if sys.version_info < (3, 6):
diff --git a/web/setting.py b/web/setting.py
index 500849760..82827b9f3 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -23,6 +23,10 @@ import core.mw as mw
 import utils.system as system 
 import thisdb
 
+# 初始化db
+from admin import setup
+setup.init()
+
 cpu_info = system.getCpuInfo()
 workers = cpu_info[1]
 
@@ -73,7 +77,7 @@ if workers > 2:
 threads = workers * 1
 backlog = 512
 reload = False
-daemon = True
+daemon = False
 # worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
 worker_class = 'eventlet'
 timeout = 600
diff --git a/web/thisdb/init.py b/web/thisdb/init.py
index 1f6050df9..20654721b 100644
--- a/web/thisdb/init.py
+++ b/web/thisdb/init.py
@@ -14,9 +14,9 @@ import core.mw as mw
 
 
 def initPanelData():
-    # _dbfile = mw.getPanelDataDir() + '/panel.db'
-    # if os.path.exists(_dbfile):
-    #     return True
+    _dbfile = mw.getPanelDataDir() + '/panel.db'
+    if os.path.exists(_dbfile):
+        return True
     sql_file = mw.getPanelDir() + '/web/admin/setup/sql/default.sql'
     sql = mw.M().dbPos(mw.getPanelDataDir(),'panel')
     content = mw.readFile(sql_file)

From 4078f4c67bc5fc74ee73a96cfd5e80863971bf4c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 05:50:15 +0800
Subject: [PATCH 382/965] Update setting.py

---
 web/setting.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/setting.py b/web/setting.py
index 82827b9f3..62a46f293 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -77,7 +77,7 @@ if workers > 2:
 threads = workers * 1
 backlog = 512
 reload = False
-daemon = False
+daemon = True
 # worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
 worker_class = 'eventlet'
 timeout = 600

From 0e6ea7cb7edd1bbd1a274440538502c857c44bed Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 06:05:54 +0800
Subject: [PATCH 383/965] Update setting.py

---
 web/setting.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/setting.py b/web/setting.py
index 62a46f293..84fb630df 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -48,9 +48,9 @@ if os.path.exists(default_port_file):
     panel_port.strip()
 else:
     from utils.firewall import Firewall as MwFirewall
-    mw_port = str(random.randint(10000, 65530))
-    MwFirewall.instance().addAcceptPort(mw_port, 'PANEL端口', 'port')
-    mw.writeFile(default_port_file, mw_port)
+    panel_port = str(random.randint(10000, 65530))
+    MwFirewall.instance().addAcceptPort(panel_port, 'PANEL端口', 'port')
+    mw.writeFile(default_port_file, panel_port)
 
 bind = []
 default_ipv6_file = panel_dir+'/data/ipv6.pl'

From 5a800ac1b22cf03cfa405f82e376c58d67f7b472 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 15:52:17 +0800
Subject: [PATCH 384/965] Update gd_old.sh

---
 plugins/php/versions/common/gd_old.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/php/versions/common/gd_old.sh b/plugins/php/versions/common/gd_old.sh
index 6cc7ed365..7f4badb82 100755
--- a/plugins/php/versions/common/gd_old.sh
+++ b/plugins/php/versions/common/gd_old.sh
@@ -89,8 +89,8 @@ Install_lib()
 		--with-png-dir \
 		--with-webp-dir \
 		--with-zlib-dir \
-		--enable-gd-jis-conv
-		# --with-freetype-dir=${serverPath}/lib/freetype_old
+		--enable-gd-jis-conv \
+		--with-freetype-dir=${serverPath}/lib/freetype_old
 		# --enable-gd-native-ttf
 		make clean && make && make install && make clean
 		

From c4c3c1659c3c09bef5d53c83100260515c38885f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 15:59:25 +0800
Subject: [PATCH 385/965] update

---
 plugins/php/versions/56/install.sh | 2 +-
 plugins/php/versions/all_test.sh   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh
index be2fef3da..d9c5fcf18 100755
--- a/plugins/php/versions/56/install.sh
+++ b/plugins/php/versions/56/install.sh
@@ -18,7 +18,7 @@ PHP_VER=56
 Install_php()
 {
 #------------------------ install start ------------------------------------#
-echo "安装php-${version} ..." >
+echo "安装php-${version} ..."
 mkdir -p $sourcePath/php
 mkdir -p $serverPath/php
 
diff --git a/plugins/php/versions/all_test.sh b/plugins/php/versions/all_test.sh
index 98623465a..29f9dd8fd 100644
--- a/plugins/php/versions/all_test.sh
+++ b/plugins/php/versions/all_test.sh
@@ -8,7 +8,7 @@ ROOT_DIR=$(cd "$(dirname "$0")"; pwd)
 # cd /www/server/mdserver-web/scripts/quick && bash debug.sh
 # cd /www/server/mdserver-web/plugins/php/versions && /bin/bash all_test.sh
 
-# cd /www/server/mdserver-web/plugins/php && bash install.sh install 82
+# cd /www/server/mdserver-web/plugins/php && bash install.sh install 56
 # cd /www/server/mdserver-web/plugins/php/versions/common && bash gd.sh install 73
 # cd /www/server/mdserver-web/plugins/php/versions/common && bash swoole.sh install 54
 
@@ -28,7 +28,7 @@ ROOT_DIR=$(cd "$(dirname "$0")"; pwd)
 # echo "php${PHP_VER} -- end"
 
 
-PHP_VER_LIST=(53 54 55 56 70 71 72 73 74 80 81 82 83)
+PHP_VER_LIST=(53 54 55 56 70 71 72 73 74 80 81 82 83 84)
 # PHP_VER_LIST=(81)
 for PHP_VER in ${PHP_VER_LIST[@]}; do
 	echo "php${PHP_VER} -- start"
@@ -39,7 +39,7 @@ for PHP_VER in ${PHP_VER_LIST[@]}; do
 done
 
 cd $DIR
-PHP_VER_LIST=(53 54 55 56 70 71 72 73 74 80 81 82 83)
+PHP_VER_LIST=(53 54 55 56 70 71 72 73 74 80 81 82 83 84)
 # yar
 PHP_EXT_LIST=(ZendGuardLoader pdo mysqlnd sqlite3 openssl opcache mcrypt fileinfo \
 	exif gd intl pcntl memcache memcached redis imagemagick xdebug \

From 58fafd6233ec85b8b3f7d08057ae71352afbe0de Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 18:09:17 +0800
Subject: [PATCH 386/965] Update all_test.sh

---
 plugins/php/versions/all_test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/php/versions/all_test.sh b/plugins/php/versions/all_test.sh
index 29f9dd8fd..259c86ee5 100644
--- a/plugins/php/versions/all_test.sh
+++ b/plugins/php/versions/all_test.sh
@@ -8,7 +8,7 @@ ROOT_DIR=$(cd "$(dirname "$0")"; pwd)
 # cd /www/server/mdserver-web/scripts/quick && bash debug.sh
 # cd /www/server/mdserver-web/plugins/php/versions && /bin/bash all_test.sh
 
-# cd /www/server/mdserver-web/plugins/php && bash install.sh install 56
+# cd /www/server/mdserver-web/plugins/php && bash install.sh install 82
 # cd /www/server/mdserver-web/plugins/php/versions/common && bash gd.sh install 73
 # cd /www/server/mdserver-web/plugins/php/versions/common && bash swoole.sh install 54
 

From eb925d004e36c803b4bbd2822c338449dfcb9146 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 20:28:10 +0800
Subject: [PATCH 387/965] Create backup.py

---
 web/thisdb/backup.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 web/thisdb/backup.py

diff --git a/web/thisdb/backup.py b/web/thisdb/backup.py
new file mode 100644
index 000000000..5b03532cc
--- /dev/null
+++ b/web/thisdb/backup.py
@@ -0,0 +1,30 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import core.mw as mw
+
+# 站点-子目录绑定
+
+__FIELD = 'id,type,name,pid,filename,size,add_time'
+
+def getBackupPage(
+    site_id = 1,
+    page = 1,
+    size = 10,
+):
+    start = (page - 1) * size
+    limit = str(start) + ',' + str(size)
+    bk_list = mw.M('backup').where('pid=?', (site_id,)).field(__FIELD).limit(limit).order('id desc').select()
+    count = mw.M('backup').where('pid=?', (site_id,)).count()
+
+    rdata = {}
+    rdata['list'] = bk_list
+    rdata['count'] = count
+    return rdata

From 4edae5114ef249daeff64b08572c97aa781974b6 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 20:28:15 +0800
Subject: [PATCH 388/965] Update site.py

---
 web/utils/site.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/web/utils/site.py b/web/utils/site.py
index b2e0df56c..90f9789b2 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -2344,6 +2344,16 @@ export PATH
         mw.restartWeb()
         return mw.returnData(data['status'], data['msg'], result)
 
+    def getBackup(self,site_id,page=1,size=10):
+        site_info = thisdb.getSitesById(site_id)
+        info = thisdb.getBackupPage(site_id, page, size)
+        
+        data = {}
+        data['data'] = info['list']
+        data['site'] = site_info
+        data['page'] = mw.getPage({'count':info['count'],'tojs':'getBackup','p':page, 'row':limit})
+        return data
+
 
     def getPhpVersion(self):
         phpVersions = ('00', '52', '53', '54', '55',

From d950501ec6d50102e860454d4d4911560e0e0454 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 20:28:19 +0800
Subject: [PATCH 389/965] Create backup.py

---
 web/admin/site/backup.py | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 web/admin/site/backup.py

diff --git a/web/admin/site/backup.py b/web/admin/site/backup.py
new file mode 100644
index 000000000..e543d81f4
--- /dev/null
+++ b/web/admin/site/backup.py
@@ -0,0 +1,38 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin.user_login_check import panel_login_required
+
+from utils.plugin import plugin as MwPlugin
+from utils.site import sites as MwSites
+
+import core.mw as mw
+import thisdb
+
+from .site import blueprint
+
+# 设置默认站
+@blueprint.route('/get_backup', endpoint='get_backup',methods=['POST'])
+@panel_login_required
+def get_backup():
+    limit = request.form.get('limit', '')
+    page = request.form.get('p', '')
+    site_id = request.form.get('search', '')
+    return MwSites.instance().getBackup(site_id,page=page,size=limit)
+
+
+
+
+

From ccb9d678f683afc40cf29eecbfd355455c06cb33 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 20:28:23 +0800
Subject: [PATCH 390/965] Update __init__.py

---
 web/admin/site/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index 31844ce93..d1128d871 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -12,6 +12,8 @@ from .site import *
 from .site_types import *
 from .site_default import *
 
+from .backup import *
+
 from .php import *
 from .logs import *
 from .dir import *

From 85c62dd51afef9538b3583f3b6445e6953d85f08 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 27 Nov 2024 23:59:56 +0800
Subject: [PATCH 391/965] update

---
 web/admin/setup/sql/default.sql |  2 +-
 web/admin/site/backup.py        | 18 ++++++++++++++-
 web/static/app/site.js          | 30 ++++++++++++------------
 web/thisdb/__init__.py          |  2 ++
 web/thisdb/backup.py            | 30 +++++++++++++++++-------
 web/utils/site.py               | 41 +++++++++++++++++++++++++++++----
 6 files changed, 93 insertions(+), 30 deletions(-)

diff --git a/web/admin/setup/sql/default.sql b/web/admin/setup/sql/default.sql
index 2e2c60eff..b4011cf77 100755
--- a/web/admin/setup/sql/default.sql
+++ b/web/admin/setup/sql/default.sql
@@ -1,9 +1,9 @@
 
 CREATE TABLE IF NOT EXISTS `backup` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `pid` INTEGER,
   `type` INTEGER,
   `name` TEXT,
-  `pid` INTEGER,
   `filename` TEXT,
   `size` INTEGER,
   `add_time` TEXT
diff --git a/web/admin/site/backup.py b/web/admin/site/backup.py
index e543d81f4..72b978fcf 100644
--- a/web/admin/site/backup.py
+++ b/web/admin/site/backup.py
@@ -23,7 +23,7 @@ import thisdb
 
 from .site import blueprint
 
-# 设置默认站
+# 获取备份列表
 @blueprint.route('/get_backup', endpoint='get_backup',methods=['POST'])
 @panel_login_required
 def get_backup():
@@ -32,6 +32,22 @@ def get_backup():
     site_id = request.form.get('search', '')
     return MwSites.instance().getBackup(site_id,page=page,size=limit)
 
+# 设置备份
+@blueprint.route('/to_backup', endpoint='to_backup',methods=['POST'])
+@panel_login_required
+def to_backup():
+    site_id = request.form.get('id', '')
+    return MwSites.instance().toBackup(site_id)
+
+# 删除备份
+@blueprint.route('/del_backup', endpoint='del_backup',methods=['POST'])
+@panel_login_required
+def del_backup():
+    site_id = request.form.get('id', '')
+    return MwSites.instance().delBackup(site_id)
+
+
+
 
 
 
diff --git a/web/static/app/site.js b/web/static/app/site.js
index ff10cea86..50baefff4 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -803,7 +803,7 @@ function getBackup(id,name,page) {
 			var ftpdown = "<a class='btlink' href='/files/download?filename="+frdata.data[i].filename+"&name="+frdata.data[i].name+"' target='_blank'>下载</a> | ";
 			body += "<tr><td><span class='glyphicon glyphicon-file'></span>"+frdata.data[i].name+"</td>\
 					<td>" + (toSize(frdata.data[i].size)) + "</td>\
-					<td>" + frdata.data[i].addtime + "</td>\
+					<td>" + frdata.data[i].add_time + "</td>\
 					<td class='text-right' style='color:#ccc'>"+ ftpdown + "<a class='btlink' href='javascript:;' onclick=\"webBackupDelete('" + frdata.data[i].id + "',"+id+")\">删除</a></td>\
 				</tr>"
 		}
@@ -813,9 +813,9 @@ function getBackup(id,name,page) {
 
 		if(name == 0){
 			var sBody = "<table width='100%' id='webBackupList' class='table table-hover'>\
-						<thead><tr><th>文件名称</th><th>文件大小</th><th>打包时间</th><th width='140px' class='text-right'>操作</th></tr></thead>\
-						<tbody id='webBackupBody' class='list-list'>"+body+"</tbody>\
-						</table>"
+				<thead><tr><th>文件名称</th><th>文件大小</th><th>打包时间</th><th width='140px' class='text-right'>操作</th></tr></thead>\
+				<tbody id='webBackupBody' class='list-list'>"+body+"</tbody>\
+			</table>"
 			$("#webBackupList").html(sBody);
 			$(".page").html(frdata.page);
 			return;
@@ -830,17 +830,17 @@ function getBackup(id,name,page) {
 			shift: 0,
 			shadeClose: false,
 			content: "<div class='bt-form ptb15 mlr15' id='webBackup'>\
-						<button class='btn btn-default btn-sm' style='margin-right:10px' type='button' onclick=\"webBackup('" + frdata['site']['id'] + "','" +  frdata['site']['name'] + "')\">打包备份</button>\
-						<div class='divtable mtb15' style='margin-bottom:0'>\
-							<table width='100%' id='webBackupList' class='table table-hover'>\
-							<thead>\
-								<tr><th>文件名称</th><th>文件大小</th><th>打包时间</th><th width='140px' class='text-right'>操作</th></tr>\
-							</thead>\
-							<tbody id='webBackupBody' class='list-list'>" + body + "</tbody>\
-							</table>\
-							<div class='page'>" + frdata.page + "</div>\
-						</div>\
-					</div>"
+				<button class='btn btn-default btn-sm' style='margin-right:10px' type='button' onclick=\"webBackup('" + frdata['site']['id'] + "','" +  frdata['site']['name'] + "')\">打包备份</button>\
+				<div class='divtable mtb15' style='margin-bottom:0'>\
+					<table width='100%' id='webBackupList' class='table table-hover'>\
+					<thead>\
+						<tr><th>文件名称</th><th>文件大小</th><th>打包时间</th><th width='140px' class='text-right'>操作</th></tr>\
+					</thead>\
+					<tbody id='webBackupBody' class='list-list'>" + body + "</tbody>\
+					</table>\
+					<div class='page'>" + frdata.page + "</div>\
+				</div>\
+			</div>"
 		});
 	},'json');
 }
diff --git a/web/thisdb/__init__.py b/web/thisdb/__init__.py
index 33f664b8b..41674e2d2 100644
--- a/web/thisdb/__init__.py
+++ b/web/thisdb/__init__.py
@@ -13,6 +13,8 @@ from .option import *
 
 from .sites import *
 from .site_types import *
+from .backup import *
+
 from .domain import *
 from .binding import *
 
diff --git a/web/thisdb/backup.py b/web/thisdb/backup.py
index 5b03532cc..961498b82 100644
--- a/web/thisdb/backup.py
+++ b/web/thisdb/backup.py
@@ -10,16 +10,27 @@
 
 import core.mw as mw
 
-# 站点-子目录绑定
+__FIELD = 'id,pid,type,name,filename,size,add_time'
 
-__FIELD = 'id,type,name,pid,filename,size,add_time'
+def addBackup(pid,name,filename,size,type=0):
 
-def getBackupPage(
-    site_id = 1,
-    page = 1,
-    size = 10,
-):
-    start = (page - 1) * size
+    add_time = mw.formatDate()
+    insert_data = {
+        'type':type,
+        'name':name,
+        'pid':pid,
+        'filename':filename,
+        'size':size,
+        'add_time':add_time,
+    }
+    mw.M('backup').insert(insert_data)
+    return True
+
+def getBackupById(bp_id):
+    return mw.M('backup').field(__FIELD).where("id=?", (bp_id,)).find()
+
+def getBackupPage(site_id,page = 1,size = 10):
+    start = (int(page) - 1) * int(size)
     limit = str(start) + ',' + str(size)
     bk_list = mw.M('backup').where('pid=?', (site_id,)).field(__FIELD).limit(limit).order('id desc').select()
     count = mw.M('backup').where('pid=?', (site_id,)).count()
@@ -28,3 +39,6 @@ def getBackupPage(
     rdata['list'] = bk_list
     rdata['count'] = count
     return rdata
+
+def deleteBackupById(bp_id):
+    return mw.M('backup').where("id=?", (bp_id,)).delete()
diff --git a/web/utils/site.py b/web/utils/site.py
index 90f9789b2..5cdb56a4d 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -2351,15 +2351,46 @@ export PATH
         data = {}
         data['data'] = info['list']
         data['site'] = site_info
-        data['page'] = mw.getPage({'count':info['count'],'tojs':'getBackup','p':page, 'row':limit})
+        data['page'] = mw.getPage({'count':info['count'],'tojs':'getBackup','p':page, 'row':size})
         return data
 
+    def toBackup(self, site_id):
+        site_info = thisdb.getSitesById(site_id)
+
+        filename = site_info['name'] + '_' + time.strftime('%Y%m%d_%H%M%S', time.localtime()) + '.zip'
+        backup_path = mw.getBackupDir() + '/site'
+        zip_name = backup_path + '/' + filename
+        if not (os.path.exists(backup_path)):
+            os.makedirs(backup_path)
+        exec_log = mw.getPanelDir() + '/logs/panel_exec.log'
+        cmd = "cd '" + site_info['path'] + "' && zip '" + zip_name + "' -r ./* > " + exec_log + " 2>&1"
+        mw.execShell(cmd)
+
+        fsize = 0
+        if os.path.exists(zip_name):
+            fsize = os.path.getsize(zip_name)
+
+        thisdb.addBackup(site_id,filename,zip_name,fsize)
+
+        msg = mw.getInfo('备份网站[{1}]成功!', (site_info['name'],))
+        mw.writeLog('网站管理', msg)
+        return mw.returnData(True, '备份成功!')
+
+    def delBackup(self,backup_id):
+        info = thisdb.getBackupById(backup_id)
+        if os.path.exists(info['filename']):
+            os.remove(info['filename'])
+        msg = mw.getInfo('删除网站[{1}]的备份[{2}]成功!', (info['name'], info['filename']))
+        mw.writeLog('网站管理', msg)
+
+        thisdb.deleteBackupById(backup_id)
+        return mw.returnData(True, '站点删除成功!')
+
 
     def getPhpVersion(self):
-        phpVersions = ('00', '52', '53', '54', '55',
-                       '56', '70', '71', '72', '73',
-                       '74', '80', '81', '82', '83',
-                       '84')
+        phpVersions = ('00', '52', '53', '54', '55', '56',
+                       '70', '71', '72', '73', '74', '80',
+                       '81', '82', '83', '84')
         data = []
         for val in phpVersions:
             tmp = {}

From 41978d33bd0ff5ded671dd01ba32cf2a704d6b1a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 00:20:33 +0800
Subject: [PATCH 392/965] Update app.py

---
 web/app.py | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/web/app.py b/web/app.py
index 273bc6179..78a70bbcc 100644
--- a/web/app.py
+++ b/web/app.py
@@ -8,17 +8,18 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
+# import eventlet
+# eventlet.monkey_patch()
+
 import sys
 import os
 
+# from admin import create_app
 from admin import app, socketio
 import config
 
-from gevent.pywsgi import WSGIServer
-from geventwebsocket.handler import WebSocketHandler
-
-import eventlet
-eventlet.monkey_patch(socket=True, select=True)
+# from gevent.pywsgi import WSGIServer
+# from geventwebsocket.handler import WebSocketHandler
 
 
 if sys.version_info < (3, 6):
@@ -28,21 +29,27 @@ if sys.version_info < (3, 6):
 if sys.path[0] != os.path.dirname(os.path.realpath(__file__)):
     sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
 
+
 # print(config.DEFAULT_SERVER,config.DEFAULT_SERVER_PORT)
 # app = create_app()
+
 def main():
-    # http_server = WSGIServer(
-    #         (HOST, PORT), app, handler_class=WebSocketHandler)
-    # http_server.serve_forever()
-    # socketio.run(app, host=HOST, port=PORT)
-        
-    socketio.run(
-        app,
-        debug=config.DEBUG,
-        allow_unsafe_werkzeug=True,
-        host=config.DEFAULT_SERVER,
-        port=7201,
-    )
+
+    # try:
+    #     # http_server = WSGIServer(
+    #     #         (HOST, PORT), app, handler_class=WebSocketHandler)
+    #     # http_server.serve_forever()
+    #     # socketio.run(app, host=HOST, port=PORT)
+    #     socketio.run(
+    #         app,
+    #         debug=config.DEBUG,
+    #         host=config.DEFAULT_SERVER,
+    #         port=7201,
+    #     )
+    # except Exception as e:
+    #     print(str(e))
+
+    app.run(debug=True)
 
 if __name__ == '__main__':
-    app.run(debug=True)
+    main()

From d6b68f45e580c9ec5f37ad7c559e98999e9035a6 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 00:24:35 +0800
Subject: [PATCH 393/965] Update __init__.py

---
 web/admin/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 82d7fde1b..8291c21de 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -153,7 +153,9 @@ def inject_global_variables():
     return dict(config=g_config, data=data)
 
 # webssh
-socketio = SocketIO()
+socketio = SocketIO(manage_session=False, async_mode='threading',
+                    logger=False, engineio_logger=False, debug=False,
+                    ping_interval=25, ping_timeout=120)
 socketio.init_app(app)
 
 @socketio.on('webssh_websocketio')

From 0ccf70be5691737c8200d0f1bf01ebbb9ab6f72e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 00:33:08 +0800
Subject: [PATCH 394/965] update

---
 cli.sh         | 8 ++++----
 web/app.py     | 7 +++++--
 web/setting.py | 5 ++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cli.sh b/cli.sh
index 6c0fbf97c..83d1ab515 100755
--- a/cli.sh
+++ b/cli.sh
@@ -59,8 +59,8 @@ mw_start_debug(){
     if [ -f ${DIR}/data/port.pl ];then
         port=$(cat ${DIR}/data/port.pl)
     fi
-    cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1 app:app
-	# cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 app:app
+    # cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1 app:app
+	cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 app:app
 }
 
 mw_start_panel(){
@@ -68,8 +68,8 @@ mw_start_panel(){
 	if [ -f ${DIR}/data/port.pl ];then
         port=$(cat ${DIR}/data/port.pl)
     fi
-	cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1  app:app
-	# cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
+	# cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1  app:app
+	cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
 	
 }
 
diff --git a/web/app.py b/web/app.py
index 78a70bbcc..1f7a8a868 100644
--- a/web/app.py
+++ b/web/app.py
@@ -8,8 +8,6 @@
 # Author: midoks <midoks@163.com>
 # ---------------------------------------------------------------------------------
 
-# import eventlet
-# eventlet.monkey_patch()
 
 import sys
 import os
@@ -21,6 +19,11 @@ import config
 # from gevent.pywsgi import WSGIServer
 # from geventwebsocket.handler import WebSocketHandler
 
+from gevent import monkey
+monkey.patch_all()
+
+from requests.packages.urllib3.util.ssl_ import create_urllib3_context
+create_urllib3_context()
 
 if sys.version_info < (3, 6):
     raise RuntimeError('This application must be run under Python 3.6 or later.')
diff --git a/web/setting.py b/web/setting.py
index 84fb630df..fa464ed05 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -12,7 +12,6 @@
 # 配置文件
 # ---------------------------------------------------------------------------------
 
-
 import time
 import sys
 import random
@@ -78,8 +77,8 @@ threads = workers * 1
 backlog = 512
 reload = False
 daemon = True
-# worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
-worker_class = 'eventlet'
+worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
+# worker_class = 'eventlet'
 timeout = 600
 keepalive = 60
 preload_app = True

From 1bb99bb90e905a4f3acc8ce56c48400e42a98584 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 00:33:31 +0800
Subject: [PATCH 395/965] Update app.py

---
 web/app.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/app.py b/web/app.py
index 1f7a8a868..2ef8b0186 100644
--- a/web/app.py
+++ b/web/app.py
@@ -22,8 +22,8 @@ import config
 from gevent import monkey
 monkey.patch_all()
 
-from requests.packages.urllib3.util.ssl_ import create_urllib3_context
-create_urllib3_context()
+# from requests.packages.urllib3.util.ssl_ import create_urllib3_context
+# create_urllib3_context()
 
 if sys.version_info < (3, 6):
     raise RuntimeError('This application must be run under Python 3.6 or later.')

From f4f4e32612ba1b44df4c5e02ce2961d4528c6ddb Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 00:45:50 +0800
Subject: [PATCH 396/965] update

---
 web/app.py    | 28 +++++++++++-----------------
 web/config.py |  2 +-
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/web/app.py b/web/app.py
index 2ef8b0186..d6df771e1 100644
--- a/web/app.py
+++ b/web/app.py
@@ -12,16 +12,16 @@
 import sys
 import os
 
-# from admin import create_app
 from admin import app, socketio
 import config
 
-# from gevent.pywsgi import WSGIServer
-# from geventwebsocket.handler import WebSocketHandler
+from gevent.pywsgi import WSGIServer
+from geventwebsocket.handler import WebSocketHandler
 
 from gevent import monkey
 monkey.patch_all()
 
+
 # from requests.packages.urllib3.util.ssl_ import create_urllib3_context
 # create_urllib3_context()
 
@@ -38,21 +38,15 @@ if sys.path[0] != os.path.dirname(os.path.realpath(__file__)):
 
 def main():
 
-    # try:
-    #     # http_server = WSGIServer(
-    #     #         (HOST, PORT), app, handler_class=WebSocketHandler)
-    #     # http_server.serve_forever()
-    #     # socketio.run(app, host=HOST, port=PORT)
-    #     socketio.run(
-    #         app,
-    #         debug=config.DEBUG,
-    #         host=config.DEFAULT_SERVER,
-    #         port=7201,
-    #     )
-    # except Exception as e:
-    #     print(str(e))
+    try:
+        http_server = WSGIServer(
+                (HOST, PORT), app, handler_class=WebSocketHandler)
+        http_server.serve_forever()
+        socketio.run(app, host=config.DEFAULT_SERVER,debug=config.DEBUG)
+    except Exception as e:
+        print(str(e))
 
-    app.run(debug=True)
+    # app.run(debug=True)
 
 if __name__ == '__main__':
     main()
diff --git a/web/config.py b/web/config.py
index 60d4b98f2..286d0c517 100644
--- a/web/config.py
+++ b/web/config.py
@@ -60,7 +60,7 @@ LOG_ROTATION_MAX_LOG_FILES = 5  # 要保留的最大备份数
 SQLITE_PATH = os.path.join(DATA_DIR, APP_SQLITE_NAME + '.db')
 
 
-DEFAULT_SERVER = '127.0.0.1'
+DEFAULT_SERVER = '0.0.0.0'
 DEFAULT_SERVER_PORT = 7201
 
 # APP启动时间

From 7ce3160adee7008150bca75e2e55cfef4efd6be8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 00:52:16 +0800
Subject: [PATCH 397/965] Update __init__.py

---
 web/admin/__init__.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 8291c21de..4b95c6533 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -153,9 +153,10 @@ def inject_global_variables():
     return dict(config=g_config, data=data)
 
 # webssh
-socketio = SocketIO(manage_session=False, async_mode='threading',
-                    logger=False, engineio_logger=False, debug=False,
-                    ping_interval=25, ping_timeout=120)
+# socketio = SocketIO(manage_session=False, async_mode='threading',
+#                     logger=False, engineio_logger=False, debug=False,
+#                     ping_interval=25, ping_timeout=120)
+socketio = SocketIO()
 socketio.init_app(app)
 
 @socketio.on('webssh_websocketio')

From 32718d54501b9062c7d7f9f3b3435da477cb4398 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 00:55:49 +0800
Subject: [PATCH 398/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 62392e727..9e35c232b 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -352,7 +352,8 @@ mw_debug(){
     if [ -d ${PANEL_DIR}/web ];then
         cd ${PANEL_DIR}/web
     fi
-    gunicorn -b :$port -k eventlet -w 1  app:app
+    gunicorn -b :$port -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
+    # gunicorn -b :$port -k eventlet -w 1  app:app
 }
 
 

From 25527d09f509ec03603de9a098a7a9b425dac67f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 01:07:00 +0800
Subject: [PATCH 399/965] Update firewall.py

---
 web/utils/firewall.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index e2e8aff5b..0aebdf227 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -55,6 +55,9 @@ class Firewall(object):
     def AIF_Firewalld(self):
         # firewall-cmd --list-all | grep '  ports'
         t = mw.execShell("firewall-cmd --list-all | grep '  ports'")
+        if t[1] != '':
+            return True
+
         all_port = t[0].strip()
         data = all_port.split(":")
         ports_str = data[1]

From 83f48cb05e6fc50a7dd99676720cb1a9decf6fec Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 01:18:57 +0800
Subject: [PATCH 400/965] update

---
 cli.sh                | 8 ++++----
 scripts/init.d/mw.tpl | 4 ++--
 web/admin/__init__.py | 5 +++--
 web/setting.py        | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cli.sh b/cli.sh
index 83d1ab515..6c0fbf97c 100755
--- a/cli.sh
+++ b/cli.sh
@@ -59,8 +59,8 @@ mw_start_debug(){
     if [ -f ${DIR}/data/port.pl ];then
         port=$(cat ${DIR}/data/port.pl)
     fi
-    # cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1 app:app
-	cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 app:app
+    cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1 app:app
+	# cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 app:app
 }
 
 mw_start_panel(){
@@ -68,8 +68,8 @@ mw_start_panel(){
 	if [ -f ${DIR}/data/port.pl ];then
         port=$(cat ${DIR}/data/port.pl)
     fi
-	# cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1  app:app
-	cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
+	cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1  app:app
+	# cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
 	
 }
 
diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 9e35c232b..b71995626 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -352,8 +352,8 @@ mw_debug(){
     if [ -d ${PANEL_DIR}/web ];then
         cd ${PANEL_DIR}/web
     fi
-    gunicorn -b :$port -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
-    # gunicorn -b :$port -k eventlet -w 1  app:app
+    # gunicorn -b :$port -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
+    gunicorn -b :$port -k eventlet -w 1  app:app
 }
 
 
diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 4b95c6533..6a076d707 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -110,7 +110,6 @@ def requestCheck():
         if not auth:
             return sendAuthenticated()
 
-        # print(auth.username.strip(),auth.password.strip())
         salt = basic_auth['salt']
         basic_user = mw.md5(auth.username.strip() + salt)
         basic_pwd = mw.md5(auth.password.strip() + salt)
@@ -156,7 +155,9 @@ def inject_global_variables():
 # socketio = SocketIO(manage_session=False, async_mode='threading',
 #                     logger=False, engineio_logger=False, debug=False,
 #                     ping_interval=25, ping_timeout=120)
-socketio = SocketIO()
+socketio = SocketIO(logger=True,
+    engineio_logger=True,
+    cors_allowed_origins="*")
 socketio.init_app(app)
 
 @socketio.on('webssh_websocketio')
diff --git a/web/setting.py b/web/setting.py
index fa464ed05..93d67d636 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -77,8 +77,8 @@ threads = workers * 1
 backlog = 512
 reload = False
 daemon = True
-worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
-# worker_class = 'eventlet'
+# worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
+worker_class = 'eventlet'
 timeout = 600
 keepalive = 60
 preload_app = True

From 655c2c22684da2b70f1e41e68a36c78fb559a601 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 01:19:44 +0800
Subject: [PATCH 401/965] Update app.py

---
 web/app.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/app.py b/web/app.py
index d6df771e1..010f63869 100644
--- a/web/app.py
+++ b/web/app.py
@@ -18,8 +18,8 @@ import config
 from gevent.pywsgi import WSGIServer
 from geventwebsocket.handler import WebSocketHandler
 
-from gevent import monkey
-monkey.patch_all()
+# from gevent import monkey
+# monkey.patch_all()
 
 
 # from requests.packages.urllib3.util.ssl_ import create_urllib3_context

From af3ceeefe7c816e261d3ff15bcb9544bae663264 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 01:21:14 +0800
Subject: [PATCH 402/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index 3ade5933b..a3e8ed7f7 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.3
+APP_SMALL_VERSION = 0.4
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From ef59c3a654d3b13be05a105b77db5526db43cee5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 01:24:24 +0800
Subject: [PATCH 403/965] Update app.py

---
 web/app.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/app.py b/web/app.py
index 010f63869..038977063 100644
--- a/web/app.py
+++ b/web/app.py
@@ -21,6 +21,9 @@ from geventwebsocket.handler import WebSocketHandler
 # from gevent import monkey
 # monkey.patch_all()
 
+import eventlet
+eventlet.monkey_patch()
+
 
 # from requests.packages.urllib3.util.ssl_ import create_urllib3_context
 # create_urllib3_context()

From 0df069b9a4c90cf539005a3701a5926e25899f09 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 01:28:45 +0800
Subject: [PATCH 404/965] update

---
 web/admin/__init__.py |  4 ++--
 web/app.py            | 30 +++++++-----------------------
 web/setting.py        |  3 +++
 3 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 6a076d707..b2586281f 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -155,8 +155,8 @@ def inject_global_variables():
 # socketio = SocketIO(manage_session=False, async_mode='threading',
 #                     logger=False, engineio_logger=False, debug=False,
 #                     ping_interval=25, ping_timeout=120)
-socketio = SocketIO(logger=True,
-    engineio_logger=True,
+socketio = SocketIO(logger=False,
+    engineio_logger=False,
     cors_allowed_origins="*")
 socketio.init_app(app)
 
diff --git a/web/app.py b/web/app.py
index 038977063..0816196fe 100644
--- a/web/app.py
+++ b/web/app.py
@@ -9,24 +9,13 @@
 # ---------------------------------------------------------------------------------
 
 
+
 import sys
 import os
 
 from admin import app, socketio
 import config
 
-from gevent.pywsgi import WSGIServer
-from geventwebsocket.handler import WebSocketHandler
-
-# from gevent import monkey
-# monkey.patch_all()
-
-import eventlet
-eventlet.monkey_patch()
-
-
-# from requests.packages.urllib3.util.ssl_ import create_urllib3_context
-# create_urllib3_context()
 
 if sys.version_info < (3, 6):
     raise RuntimeError('This application must be run under Python 3.6 or later.')
@@ -36,20 +25,15 @@ if sys.path[0] != os.path.dirname(os.path.realpath(__file__)):
     sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
 
 
-# print(config.DEFAULT_SERVER,config.DEFAULT_SERVER_PORT)
-# app = create_app()
-
 def main():
-
+    import eventlet
+    eventlet.monkey_patch()
     try:
-        http_server = WSGIServer(
-                (HOST, PORT), app, handler_class=WebSocketHandler)
-        http_server.serve_forever()
-        socketio.run(app, host=config.DEFAULT_SERVER,debug=config.DEBUG)
+        socketio.run(app)
+        # app.run(debug=True)
     except Exception as e:
-        print(str(e))
-
-    # app.run(debug=True)
+        pass
 
 if __name__ == '__main__':
+    
     main()
diff --git a/web/setting.py b/web/setting.py
index 93d67d636..2abc9582f 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -12,6 +12,9 @@
 # 配置文件
 # ---------------------------------------------------------------------------------
 
+# import eventlet
+# eventlet.monkey_patch()
+
 import time
 import sys
 import random

From 49867fadf05bb5d59e6392fcc2b565f69363c11f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 01:31:27 +0800
Subject: [PATCH 405/965] Update setting.py

---
 web/setting.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/setting.py b/web/setting.py
index 2abc9582f..5d32e0210 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -12,8 +12,8 @@
 # 配置文件
 # ---------------------------------------------------------------------------------
 
-# import eventlet
-# eventlet.monkey_patch()
+import eventlet
+eventlet.monkey_patch()
 
 import time
 import sys

From 1d1dbfc54c593be175fe7eb0df75a24f867771c0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 01:36:00 +0800
Subject: [PATCH 406/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index b71995626..b4492d548 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -97,8 +97,8 @@ mw_start_task()
 
 mw_start()
 {
-    mw_start_task
 	mw_start_panel
+    mw_start_task
 }
 
 # /www/server/mdserver-web/tmp/panelTask.pl && service mw restart_task

From e5ef7d3e4d4cdf8e0dc3d620300b360ab196e4a0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 01:40:52 +0800
Subject: [PATCH 407/965] Update app.py

---
 web/app.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/web/app.py b/web/app.py
index 0816196fe..1bbceee74 100644
--- a/web/app.py
+++ b/web/app.py
@@ -25,15 +25,21 @@ if sys.path[0] != os.path.dirname(os.path.realpath(__file__)):
     sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
 
 
-def main():
-    import eventlet
-    eventlet.monkey_patch()
+def try_eventlet():
     try:
+        import eventlet
+        eventlet.monkey_patch()
+    except Exception as e:
+        pass
+
+
+def main():
+    try:
+        try_eventlet()
         socketio.run(app)
         # app.run(debug=True)
     except Exception as e:
         pass
 
 if __name__ == '__main__':
-    
     main()

From b02a6a2d1923d5a817569acbc7f24f03201f76e1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 01:49:17 +0800
Subject: [PATCH 408/965] update

---
 web/app.py     | 2 +-
 web/setting.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/app.py b/web/app.py
index 1bbceee74..fa6ea323e 100644
--- a/web/app.py
+++ b/web/app.py
@@ -35,7 +35,7 @@ def try_eventlet():
 
 def main():
     try:
-        try_eventlet()
+        # try_eventlet()
         socketio.run(app)
         # app.run(debug=True)
     except Exception as e:
diff --git a/web/setting.py b/web/setting.py
index 5d32e0210..2abc9582f 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -12,8 +12,8 @@
 # 配置文件
 # ---------------------------------------------------------------------------------
 
-import eventlet
-eventlet.monkey_patch()
+# import eventlet
+# eventlet.monkey_patch()
 
 import time
 import sys

From 9cbec5a68f59b6a3d5dc48e2835026963fa5e1ba Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 01:52:10 +0800
Subject: [PATCH 409/965] Update setting.py

---
 web/setting.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/web/setting.py b/web/setting.py
index 2abc9582f..93d67d636 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -12,9 +12,6 @@
 # 配置文件
 # ---------------------------------------------------------------------------------
 
-# import eventlet
-# eventlet.monkey_patch()
-
 import time
 import sys
 import random

From c2104290867c166bbddf283226ce887963236743 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 16:26:14 +0800
Subject: [PATCH 410/965] update

---
 requirements.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index d50874f51..238d9c682 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,10 @@
 setuptools>=33.1.1
-Werkzeug>=1.0.1,<3.0.0
+Werkzeug>=1.0.1
 wheel>=0.37.1
 gunicorn>=21.2.0
 requests>=2.27.1
 urllib3>=1.21.1
-flask>=2.0.3,<3.0.0
+flask>=2.0.3
 flask-session==0.3.2
 flask-helper==0.19
 flask-bcrypt==1.0.1
@@ -23,10 +23,10 @@ Flask-Migrate==4.*
 pyOpenSSL==23.2.0
 cryptography>=40.0.2
 configparser==5.2.0
-python-engineio==4.3.2
+python-engineio>=4.3.2
 python-socketio>=4.2.0
-flask-socketio==5.2.0
-flask-sockets==0.2.1
+flask-socketio>=5.2.0
+flask-sockets>=0.2.1
 zmq==0.0.0
 paramiko>=2.8.0
 pymongo

From 51d092ca19219a025a92af44243685d5ac572a54 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 18:00:04 +0800
Subject: [PATCH 411/965] Update setting.py

---
 web/setting.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/setting.py b/web/setting.py
index 93d67d636..9f0364288 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -78,7 +78,7 @@ backlog = 512
 reload = False
 daemon = True
 # worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
-worker_class = 'eventlet'
+worker_class = 'sync'
 timeout = 600
 keepalive = 60
 preload_app = True

From dfef78fc8424287b0f721c53088815b958257948 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 18:00:26 +0800
Subject: [PATCH 412/965] Update mw.py

---
 web/core/mw.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index 9369abed7..cf60c8222 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -463,16 +463,16 @@ def checkDomainPanel():
     if client_ip in ['127.0.0.1', 'localhost', '::1']:
         return False
 
-    # ip = getHostAddr()
-    # if domain == '':
-    #     if current_host.strip().lower() != ip.strip().lower():
-    #         to = scheme + "://" + ip + ":" + str(port)
-    #         return redirect(to, code=302)
-    #     return False
-    # else:
-    #     if current_host.strip().lower() != domain.strip().lower():
-    #         to = scheme + "://" + domain + ":" + str(port)
-    #         return redirect(to, code=302)
+    ip = getHostAddr()
+    if domain == '':
+        if current_host.strip().lower() != ip.strip().lower():
+            to = scheme + "://" + ip + ":" + str(port)
+            return redirect(to, code=302)
+        return False
+    else:
+        if current_host.strip().lower() != domain.strip().lower():
+            to = scheme + "://" + domain + ":" + str(port)
+            return redirect(to, code=302)
     return False
 
 def getLocalIp():

From 2a943efcd7cde8b3ff1b42e459cbd404c39cdbd4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 18:03:31 +0800
Subject: [PATCH 413/965] Update setting.py

---
 web/setting.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/setting.py b/web/setting.py
index 9f0364288..460d57e9d 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -78,7 +78,7 @@ backlog = 512
 reload = False
 daemon = True
 # worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
-worker_class = 'sync'
+worker_class = 'gthread'
 timeout = 600
 keepalive = 60
 preload_app = True

From 1dc55d5e1a73875cbbc948af52fe56ae140b6028 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 18:05:23 +0800
Subject: [PATCH 414/965] Update setting.py

---
 web/setting.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/setting.py b/web/setting.py
index 460d57e9d..57f4652ed 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -73,7 +73,7 @@ if panel_ssl_data['open']:
 if workers > 2:
     workers = 1
 
-threads = workers * 1
+threads = workers * 2
 backlog = 512
 reload = False
 daemon = True

From 74817313f6933a3ea80105e95e4687caae2a91b3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 18:13:31 +0800
Subject: [PATCH 415/965] Update setting.py

---
 web/setting.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/web/setting.py b/web/setting.py
index 57f4652ed..32f74e3ce 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -22,15 +22,11 @@ import core.mw as mw
 import utils.system as system 
 import thisdb
 
-# 初始化db
-from admin import setup
-setup.init()
-
 cpu_info = system.getCpuInfo()
 workers = cpu_info[1]
+# workers = 1
 
 panel_dir = mw.getPanelDir()
-
 log_dir = mw.getMWLogs()
 if not os.path.exists(log_dir):
     os.mkdir(log_dir)
@@ -71,14 +67,14 @@ if panel_ssl_data['open']:
             ssl_version = 2
 
 if workers > 2:
-    workers = 1
+    workers = 2
 
 threads = workers * 2
 backlog = 512
 reload = False
 daemon = True
-# worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
-worker_class = 'gthread'
+# # worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
+worker_class = 'eventlet'
 timeout = 600
 keepalive = 60
 preload_app = True

From 009be7e9200f456d89fee64d640c95a89d512e32 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 18:20:11 +0800
Subject: [PATCH 416/965] Update config.py

---
 web/config.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/web/config.py b/web/config.py
index 286d0c517..afe82f97d 100644
--- a/web/config.py
+++ b/web/config.py
@@ -12,7 +12,6 @@
 # 配置信息
 # ---------------------------------------------------------------------------------
 
-
 import builtins
 import logging
 import os
@@ -41,6 +40,18 @@ CONFIG_DATABASE_CONNECTION_MAX_OVERFLOW = 100
 CONSOLE_LOG_LEVEL = logging.WARNING
 FILE_LOG_LEVEL = logging.WARNING
 
+# Number of values to trust for X-Forwarded-For
+PROXY_X_FOR_COUNT = 1
+# Number of values to trust for X-Forwarded-Proto.
+PROXY_X_PROTO_COUNT = 1
+# Number of values to trust for X-Forwarded-Host.
+PROXY_X_HOST_COUNT = 0
+# Number of values to trust for X-Forwarded-Port.
+PROXY_X_PORT_COUNT = 1
+# Number of values to trust for X-Forwarded-Prefix.
+PROXY_X_PREFIX_COUNT = 0
+
+
 DATA_DIR = mw.getPanelDataDir()
 
 # 日志文件名。这将进入数据目录，服务器模式下的非Windows平台除外。

From 58101f889d0c162a4ea3acaea1a765abcc0f1160 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 18:43:49 +0800
Subject: [PATCH 417/965] Update app.py

---
 web/app.py | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/web/app.py b/web/app.py
index fa6ea323e..6903df9fd 100644
--- a/web/app.py
+++ b/web/app.py
@@ -25,21 +25,12 @@ if sys.path[0] != os.path.dirname(os.path.realpath(__file__)):
     sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
 
 
-def try_eventlet():
-    try:
-        import eventlet
-        eventlet.monkey_patch()
-    except Exception as e:
-        pass
-
-
 def main():
-    try:
-        # try_eventlet()
-        socketio.run(app)
-        # app.run(debug=True)
-    except Exception as e:
-        pass
+
+    print(config.DEBUG)
+    socketio.run(app,debug=config.DEBUG)
+    # app.run(debug=True)
+
 
 if __name__ == '__main__':
     main()

From 7d1c2bac14f2d218db7f4075cbbf5fac28aac054 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 18:44:17 +0800
Subject: [PATCH 418/965] Update setting.py

---
 web/setting.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/setting.py b/web/setting.py
index 32f74e3ce..217801034 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -77,7 +77,7 @@ daemon = True
 worker_class = 'eventlet'
 timeout = 600
 keepalive = 60
-preload_app = True
+preload_app = False
 capture_output = True
 access_log_format = '%(t)s %(p)s %(h)s "%(r)s" %(s)s %(L)s %(b)s %(f)s" "%(a)s"'
 loglevel = 'info'

From 769f36c560a7fce3c1673a4e8603ef0a797f603e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 18:47:24 +0800
Subject: [PATCH 419/965] Update app.py

---
 web/app.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/web/app.py b/web/app.py
index 6903df9fd..cb1bac80b 100644
--- a/web/app.py
+++ b/web/app.py
@@ -26,11 +26,8 @@ if sys.path[0] != os.path.dirname(os.path.realpath(__file__)):
 
 
 def main():
-
-    print(config.DEBUG)
     socketio.run(app,debug=config.DEBUG)
     # app.run(debug=True)
 
-
 if __name__ == '__main__':
     main()

From 17b40e5d1d121044a079d7f81bab5b6a8fec5a07 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 18:58:55 +0800
Subject: [PATCH 420/965] Update setting.py

---
 web/setting.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/setting.py b/web/setting.py
index 217801034..ddb8d5566 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -12,6 +12,10 @@
 # 配置文件
 # ---------------------------------------------------------------------------------
 
+# 初始化db
+from admin import setup
+setup.init()
+
 import time
 import sys
 import random

From 852fc6e5a7e0f3fae15665d90cbc0608beab8b57 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 19:04:25 +0800
Subject: [PATCH 421/965] Update mw.py

---
 web/core/mw.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/core/mw.py b/web/core/mw.py
index cf60c8222..a410e909a 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -465,11 +465,13 @@ def checkDomainPanel():
 
     ip = getHostAddr()
     if domain == '':
+        print(current_host.strip().lower(), ip.strip().lower())
         if current_host.strip().lower() != ip.strip().lower():
             to = scheme + "://" + ip + ":" + str(port)
             return redirect(to, code=302)
         return False
     else:
+        print(current_host.strip().lower(), domain.strip().lower())
         if current_host.strip().lower() != domain.strip().lower():
             to = scheme + "://" + domain + ":" + str(port)
             return redirect(to, code=302)

From ee206f014d187932d34c4627f3f9aff70622e5a7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 19:07:59 +0800
Subject: [PATCH 422/965] Update mw.py

---
 web/core/mw.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/core/mw.py b/web/core/mw.py
index a410e909a..95a6f9c04 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -466,6 +466,8 @@ def checkDomainPanel():
     ip = getHostAddr()
     if domain == '':
         print(current_host.strip().lower(), ip.strip().lower())
+        if ip in ['127.0.0.1', 'localhost', '::1']:
+            return False
         if current_host.strip().lower() != ip.strip().lower():
             to = scheme + "://" + ip + ":" + str(port)
             return redirect(to, code=302)

From de3f2ab4d211f496c274a726f06718c705fadaef Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 19:08:22 +0800
Subject: [PATCH 423/965] Update mw.py

---
 web/core/mw.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index 95a6f9c04..3ba9a2763 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -465,7 +465,6 @@ def checkDomainPanel():
 
     ip = getHostAddr()
     if domain == '':
-        print(current_host.strip().lower(), ip.strip().lower())
         if ip in ['127.0.0.1', 'localhost', '::1']:
             return False
         if current_host.strip().lower() != ip.strip().lower():

From 2ac28e9d80d6d573117588d837b953387fe524ce Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 19:12:10 +0800
Subject: [PATCH 424/965] Update plugin.py

---
 web/utils/plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index ee2b89a46..f50c2afe8 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -134,7 +134,7 @@ class plugin(object):
 
     def init(self):
         plugin_names = {
-            'openresty': '1.25.3',
+            'openresty': '1.27.1',
             'php': '56',
             'swap': '1.1',
             'mysql': '5.7',

From a059e0924455c8220d9f5f23d23feeeed35e1a9a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 19:28:17 +0800
Subject: [PATCH 425/965] Update setting.py

---
 web/utils/setting.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/utils/setting.py b/web/utils/setting.py
index 19b16ccfc..c6dd8aedc 100644
--- a/web/utils/setting.py
+++ b/web/utils/setting.py
@@ -121,8 +121,7 @@ class setting(object):
         if not mw.inArray(['local','nginx'], choose):
             return mw.returnData(True, '删除错误面板SSL类型!')
 
-        port_pl = mw.getPanelDir()+'/data/port.pl'
-        port = mw.readFile(port_pl).strip()
+        port = mw.getPanelPort()
 
         to_panel_url = 'http://'+ip+":"+port+'/config'
 

From 12d5ce5eeaf03d72434213ac0ffade5ae5402a93 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 19:31:45 +0800
Subject: [PATCH 426/965] update

---
 cli.sh         | 5 +++--
 web/setting.py | 4 ----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/cli.sh b/cli.sh
index 6c0fbf97c..fc9ef386f 100755
--- a/cli.sh
+++ b/cli.sh
@@ -39,9 +39,10 @@ mw_start_task()
 }
 
 mw_start(){
-	cd ${DIR}/web && gunicorn -c setting.py app:app
-	#安全启动
+	# 后台任务
 	mw_start_task
+	
+	cd ${DIR}/web && gunicorn -c setting.py app:app
 }
 
 
diff --git a/web/setting.py b/web/setting.py
index ddb8d5566..217801034 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -12,10 +12,6 @@
 # 配置文件
 # ---------------------------------------------------------------------------------
 
-# 初始化db
-from admin import setup
-setup.init()
-
 import time
 import sys
 import random

From 7ba7272a7cdc81acc62ce6e350544d844dd4d598 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 19:43:44 +0800
Subject: [PATCH 427/965] Update panel_tools.py

---
 panel_tools.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index 888886b7a..6e2f536c5 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -27,8 +27,8 @@ from utils.firewall import Firewall as MwFirewall
 import core.mw as mw
 import thisdb
 
-# from admin import setup
-# setup.init()
+from admin import setup
+setup.init()
 
 
 INIT_DIR = "/etc/rc.d/init.d"

From 0d1d4b66d6216c876e2c497b371957cad942ef4d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 19:47:24 +0800
Subject: [PATCH 428/965] Update panel_task.py

---
 panel_task.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/panel_task.py b/panel_task.py
index 441572d4c..325f93e25 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -27,9 +27,6 @@ sys.path.append(web_dir)
 import core.mw as mw
 import thisdb
 
-from admin import setup
-setup.init()
-
 g_log_file = mw.getPanelTaskLog()
 if not os.path.exists(g_log_file):
     os.system("touch " + g_log_file)

From 493553ec4bb21e020a929f0e2c5a70d040d4f257 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 19:48:36 +0800
Subject: [PATCH 429/965] update

---
 panel_task.py  | 3 +++
 panel_tools.py | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/panel_task.py b/panel_task.py
index 325f93e25..441572d4c 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -27,6 +27,9 @@ sys.path.append(web_dir)
 import core.mw as mw
 import thisdb
 
+from admin import setup
+setup.init()
+
 g_log_file = mw.getPanelTaskLog()
 if not os.path.exists(g_log_file):
     os.system("touch " + g_log_file)
diff --git a/panel_tools.py b/panel_tools.py
index 6e2f536c5..058281264 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -27,8 +27,6 @@ from utils.firewall import Firewall as MwFirewall
 import core.mw as mw
 import thisdb
 
-from admin import setup
-setup.init()
 
 
 INIT_DIR = "/etc/rc.d/init.d"

From 8e39af00a3bbd138d25df4c477ad3d2cb53631dd Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 20:04:35 +0800
Subject: [PATCH 430/965] update

---
 .gitignore     | 4 +++-
 logs/README.md | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 logs/README.md

diff --git a/.gitignore b/.gitignore
index 5de67f7af..2ea0db831 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,7 +119,9 @@ debug.out
 mdioks.session-journal
 *.session
 
-logs/*
+logs/panel.log
+logs/panel_task.log
+logs/panel.pid
 
 ssl/local
 ssl/nginx
diff --git a/logs/README.md b/logs/README.md
new file mode 100644
index 000000000..cd3d22536
--- /dev/null
+++ b/logs/README.md
@@ -0,0 +1 @@
+logs
\ No newline at end of file

From 8b439801ab889fc376fc9bcf109940d7ac707b3e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 20:05:09 +0800
Subject: [PATCH 431/965] Update .gitignore

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2ea0db831..f7d56fe65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,9 +119,11 @@ debug.out
 mdioks.session-journal
 *.session
 
+logs/panel.pid
 logs/panel.log
 logs/panel_task.log
-logs/panel.pid
+logs/panel_exec.log
+
 
 ssl/local
 ssl/nginx

From ab287d42ef7bf69d65f4dd6a79822826d3eed794 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 20:12:41 +0800
Subject: [PATCH 432/965] Update __init__.py

---
 web/admin/__init__.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index b2586281f..37509d4cd 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -42,10 +42,6 @@ import thisdb
 from admin import setup
 setup.init()
 
-# from threading import Lock
-# thread = None
-# thread_lock = Lock()
-
 app = Flask(__name__, template_folder='templates/default')
 
 # 缓存配置

From 179b00e8a1950e15224b3d4bd5433973cf1be965 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 20:16:02 +0800
Subject: [PATCH 433/965] Update __init__.py

---
 web/admin/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 37509d4cd..c9bc598fd 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -51,6 +51,7 @@ cache.init_app(app, config={'CACHE_TYPE': 'simple'})
 # 静态文件配置
 from whitenoise import WhiteNoise
 app.wsgi_app = WhiteNoise(app.wsgi_app, root="../web/static/", prefix="static/", max_age=604800)
+app.jinja_env.trim_blocks = True
 
 # session配置
 # app.secret_key = uuid.UUID(int=uuid.getnode()).hex[-12:]

From e20341d3dafb7f67393a435ff034aaf73af857d3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 20:16:58 +0800
Subject: [PATCH 434/965] Update setting.py

---
 web/setting.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/setting.py b/web/setting.py
index 217801034..85d5e112e 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -17,6 +17,9 @@ import sys
 import random
 import os
 
+# 初始化db
+from admin import setup
+setup.init()
 
 import core.mw as mw
 import utils.system as system 

From 11ba771db3c61b96b579684c6384033a6743ab1c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 20:17:23 +0800
Subject: [PATCH 435/965] Update __init__.py

---
 web/admin/__init__.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index c9bc598fd..4345899a1 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -38,10 +38,6 @@ import config
 import utils.config as utils_config
 import thisdb
 
-# 初始化db
-from admin import setup
-setup.init()
-
 app = Flask(__name__, template_folder='templates/default')
 
 # 缓存配置

From 2c8108a0be244a547d7eb70ee6e30b55d317398c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 20:21:40 +0800
Subject: [PATCH 436/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index b4492d548..b71995626 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -97,8 +97,8 @@ mw_start_task()
 
 mw_start()
 {
-	mw_start_panel
     mw_start_task
+	mw_start_panel
 }
 
 # /www/server/mdserver-web/tmp/panelTask.pl && service mw restart_task

From 630e518ae38c095509ae4478a9963d21540f21a0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 20:22:01 +0800
Subject: [PATCH 437/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index b71995626..106ea781e 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -101,7 +101,7 @@ mw_start()
 	mw_start_panel
 }
 
-# /www/server/mdserver-web/tmp/panelTask.pl && service mw restart_task
+# /www/server/mdserver-web/logs/panel_task.lock && service mw restart_task
 mw_stop_task()
 {
     if [ -f ${PANEL_DIR}/logs/panel_task.lock ];then

From e2d800a167d56e50d599bbd221756b750a8d4fd2 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 20:29:11 +0800
Subject: [PATCH 438/965] Update init.py

---
 web/thisdb/init.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/thisdb/init.py b/web/thisdb/init.py
index 20654721b..1f6050df9 100644
--- a/web/thisdb/init.py
+++ b/web/thisdb/init.py
@@ -14,9 +14,9 @@ import core.mw as mw
 
 
 def initPanelData():
-    _dbfile = mw.getPanelDataDir() + '/panel.db'
-    if os.path.exists(_dbfile):
-        return True
+    # _dbfile = mw.getPanelDataDir() + '/panel.db'
+    # if os.path.exists(_dbfile):
+    #     return True
     sql_file = mw.getPanelDir() + '/web/admin/setup/sql/default.sql'
     sql = mw.M().dbPos(mw.getPanelDataDir(),'panel')
     content = mw.readFile(sql_file)

From 2beae29d25fecaa1eebd8927918d715c8f9c49e9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 20:29:30 +0800
Subject: [PATCH 439/965] Update init.py

---
 web/thisdb/init.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/thisdb/init.py b/web/thisdb/init.py
index 1f6050df9..b6b690b3a 100644
--- a/web/thisdb/init.py
+++ b/web/thisdb/init.py
@@ -14,9 +14,9 @@ import core.mw as mw
 
 
 def initPanelData():
-    # _dbfile = mw.getPanelDataDir() + '/panel.db'
-    # if os.path.exists(_dbfile):
-    #     return True
+    __dbfile = mw.getPanelDataDir() + '/panel.db'
+    if os.path.exists(__dbfile):
+        return True
     sql_file = mw.getPanelDir() + '/web/admin/setup/sql/default.sql'
     sql = mw.M().dbPos(mw.getPanelDataDir(),'panel')
     content = mw.readFile(sql_file)

From d6972bae753dfac07aada7ee2452f538751574ea Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 20:29:48 +0800
Subject: [PATCH 440/965] Update init.py

---
 web/thisdb/init.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/thisdb/init.py b/web/thisdb/init.py
index b6b690b3a..1f21c341f 100644
--- a/web/thisdb/init.py
+++ b/web/thisdb/init.py
@@ -22,7 +22,7 @@ def initPanelData():
     content = mw.readFile(sql_file)
     csql_data = content.split(';')
     for i in range(len(csql_data)):
-        # print(csql_data[i])
-        # print(sql.execute(csql_data[i], ()))
+        print(csql_data[i])
+        print(sql.execute(csql_data[i], ()))
         sql.execute(csql_data[i], ())
     return True
\ No newline at end of file

From 82e4e5c1d3fd2bfb7418e305ccf841e6759296fe Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 20:39:52 +0800
Subject: [PATCH 441/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 106ea781e..11d0c91d5 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -116,6 +116,13 @@ mw_stop_task()
     do
         kill -9 $p  > /dev/null 2>&1
     done
+
+    zzpids=$(ps -A -o stat,ppid,pid,cmd | grep -e '^[Zz]' | awk '{print $2}')
+    arr=($zzpids)
+    for p in ${arr[@]}
+    do
+        kill -9 $p > /dev/null 2>&1
+    done
     echo -e "\033[32mdone\033[0m"
 }
 

From 6f7c26adc487e60ce1e0fefdb0e74979949c7fd1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 20:42:53 +0800
Subject: [PATCH 442/965] Update init.py

---
 web/thisdb/init.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/thisdb/init.py b/web/thisdb/init.py
index 1f21c341f..c4858b90f 100644
--- a/web/thisdb/init.py
+++ b/web/thisdb/init.py
@@ -23,6 +23,6 @@ def initPanelData():
     csql_data = content.split(';')
     for i in range(len(csql_data)):
         print(csql_data[i])
+        # print(sql.execute(csql_data[i], ()))
         print(sql.execute(csql_data[i], ()))
-        sql.execute(csql_data[i], ())
     return True
\ No newline at end of file

From 9569b64d26c14f2c3b9a58308c451ef0c0d45113 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 20:43:17 +0800
Subject: [PATCH 443/965] Update __init__.py

---
 web/admin/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 4345899a1..c9bc598fd 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -38,6 +38,10 @@ import config
 import utils.config as utils_config
 import thisdb
 
+# 初始化db
+from admin import setup
+setup.init()
+
 app = Flask(__name__, template_folder='templates/default')
 
 # 缓存配置

From c3d6ec90e83c2daf5c88a8a18740de36d8fb522a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 20:43:33 +0800
Subject: [PATCH 444/965] Update panel_tools.py

---
 panel_tools.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index 058281264..18709a8d9 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -27,8 +27,6 @@ from utils.firewall import Firewall as MwFirewall
 import core.mw as mw
 import thisdb
 
-
-
 INIT_DIR = "/etc/rc.d/init.d"
 if mw.isAppleSystem():
     INIT_DIR = mw.getPanelDir() + "/scripts/init.d"

From c71a59cce1dba10837f9c72d44d5fd039f926f4f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 20:48:57 +0800
Subject: [PATCH 445/965] Update init.py

---
 web/thisdb/init.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/thisdb/init.py b/web/thisdb/init.py
index c4858b90f..b6b690b3a 100644
--- a/web/thisdb/init.py
+++ b/web/thisdb/init.py
@@ -22,7 +22,7 @@ def initPanelData():
     content = mw.readFile(sql_file)
     csql_data = content.split(';')
     for i in range(len(csql_data)):
-        print(csql_data[i])
+        # print(csql_data[i])
         # print(sql.execute(csql_data[i], ()))
-        print(sql.execute(csql_data[i], ()))
+        sql.execute(csql_data[i], ())
     return True
\ No newline at end of file

From 58cb061ef2463d837ccf665827ade94ba08ddaae Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 28 Nov 2024 23:28:58 +0800
Subject: [PATCH 446/965] Update index.py

---
 plugins/gogs/index.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/plugins/gogs/index.py b/plugins/gogs/index.py
index e4643edb8..ee168eef6 100755
--- a/plugins/gogs/index.py
+++ b/plugins/gogs/index.py
@@ -103,8 +103,7 @@ def getHomeDir():
 
 def getRunUser():
     if mw.isAppleSystem():
-        user = mw.execShell(
-            "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
+        user = mw.execShell("who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
         return user
     else:
         return 'root'
@@ -566,8 +565,7 @@ def repoList():
     # print(list_data)
     list_data = checkRepoListIsHasScript(list_data)
 
-    data['list'] = mw.getPage({'count': count, 'p': page,
-                               'row': page_size, 'tojs': 'gogsRepoListPage'})
+    data['list'] = mw.getPage({'count': count, 'p': page, 'row': page_size, 'tojs': 'gogsRepoListPage'})
     data['page'] = page
     data['page_size'] = page_size
     data['page_count'] = int(math.ceil(count / page_size))
@@ -826,8 +824,7 @@ def projectScriptSelf_Create():
     name = args['name'] + '.git'
     file = args['file']
 
-    self_path = path = getRootPath() + '/' + user + '/' + \
-        name + '/custom_hooks/self'
+    self_path = path = getRootPath() + '/' + user + '/' + name + '/custom_hooks/self'
 
     if not os.path.exists(self_path):
         os.mkdir(self_path)

From 1846af72713cde41eb3f85ff257c497b3f74a223 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 00:23:07 +0800
Subject: [PATCH 447/965] update

---
 plugins/php/versions/53/install.sh | 2 +-
 plugins/php/versions/54/install.sh | 2 +-
 plugins/php/versions/55/install.sh | 2 +-
 plugins/php/versions/56/install.sh | 2 +-
 plugins/php/versions/70/install.sh | 2 +-
 plugins/php/versions/71/install.sh | 2 +-
 plugins/php/versions/72/install.sh | 2 +-
 plugins/php/versions/73/install.sh | 2 +-
 plugins/php/versions/74/install.sh | 2 +-
 plugins/php/versions/80/install.sh | 2 +-
 plugins/php/versions/81/install.sh | 2 +-
 plugins/php/versions/82/install.sh | 2 +-
 plugins/php/versions/83/install.sh | 2 +-
 plugins/php/versions/84/install.sh | 5 +++--
 plugins/php/versions/all_mac.sh    | 4 ++--
 15 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh
index 5bd5a99e9..421caefd7 100755
--- a/plugins/php/versions/53/install.sh
+++ b/plugins/php/versions/53/install.sh
@@ -88,7 +88,7 @@ if [ -f /proc/cpuinfo ];then
 	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
 fi
 
-MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+MEM_INFO=$(which free > /dev/null && free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
 if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
     if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
         cpuCore="${MEM_INFO}"
diff --git a/plugins/php/versions/54/install.sh b/plugins/php/versions/54/install.sh
index 149acba46..e32ace308 100755
--- a/plugins/php/versions/54/install.sh
+++ b/plugins/php/versions/54/install.sh
@@ -90,7 +90,7 @@ if [ -f /proc/cpuinfo ];then
 	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
 fi
 
-MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+MEM_INFO=$(which free > /dev/null && free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
 if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
     if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
         cpuCore="${MEM_INFO}"
diff --git a/plugins/php/versions/55/install.sh b/plugins/php/versions/55/install.sh
index 01e26ecb6..96f869c46 100755
--- a/plugins/php/versions/55/install.sh
+++ b/plugins/php/versions/55/install.sh
@@ -83,7 +83,7 @@ if [ -f /proc/cpuinfo ];then
 	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
 fi
 
-MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+MEM_INFO=$(which free > /dev/null && free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
 if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
     if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
         cpuCore="${MEM_INFO}"
diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh
index d9c5fcf18..3b7e8c060 100755
--- a/plugins/php/versions/56/install.sh
+++ b/plugins/php/versions/56/install.sh
@@ -87,7 +87,7 @@ if [ -f /proc/cpuinfo ];then
 	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
 fi
 
-MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+MEM_INFO=$(which free > /dev/null && free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
 if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
     if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
         cpuCore="${MEM_INFO}"
diff --git a/plugins/php/versions/70/install.sh b/plugins/php/versions/70/install.sh
index f2792f258..0e7d474e5 100755
--- a/plugins/php/versions/70/install.sh
+++ b/plugins/php/versions/70/install.sh
@@ -82,7 +82,7 @@ if [ -f /proc/cpuinfo ];then
 	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
 fi
 
-MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+MEM_INFO=$(which free > /dev/null && free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
 if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
     if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
         cpuCore="${MEM_INFO}"
diff --git a/plugins/php/versions/71/install.sh b/plugins/php/versions/71/install.sh
index 542db0efa..b5881c8f0 100755
--- a/plugins/php/versions/71/install.sh
+++ b/plugins/php/versions/71/install.sh
@@ -82,7 +82,7 @@ if [ -f /proc/cpuinfo ];then
 	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
 fi
 
-MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+MEM_INFO=$(which free > /dev/null && free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
 if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
     if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
         cpuCore="${MEM_INFO}"
diff --git a/plugins/php/versions/72/install.sh b/plugins/php/versions/72/install.sh
index 01f63f99e..5e2bb9142 100755
--- a/plugins/php/versions/72/install.sh
+++ b/plugins/php/versions/72/install.sh
@@ -80,7 +80,7 @@ if [ -f /proc/cpuinfo ];then
 	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
 fi
 
-MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+MEM_INFO=$(which free > /dev/null && free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
 if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
     if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
         cpuCore="${MEM_INFO}"
diff --git a/plugins/php/versions/73/install.sh b/plugins/php/versions/73/install.sh
index 2a538c05f..3d619b7d0 100755
--- a/plugins/php/versions/73/install.sh
+++ b/plugins/php/versions/73/install.sh
@@ -97,7 +97,7 @@ if [ -f /proc/cpuinfo ];then
 	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
 fi
 
-MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+MEM_INFO=$(which free > /dev/null && free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
 if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
     if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
         cpuCore="${MEM_INFO}"
diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh
index 226affc6f..e21252768 100755
--- a/plugins/php/versions/74/install.sh
+++ b/plugins/php/versions/74/install.sh
@@ -119,7 +119,7 @@ if [ -f /proc/cpuinfo ];then
 	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
 fi
 
-MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+MEM_INFO=$(which free > /dev/null && free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
 if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
     if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
         cpuCore="${MEM_INFO}"
diff --git a/plugins/php/versions/80/install.sh b/plugins/php/versions/80/install.sh
index 57ae1c0aa..5ef789c72 100755
--- a/plugins/php/versions/80/install.sh
+++ b/plugins/php/versions/80/install.sh
@@ -110,7 +110,7 @@ if [ -f /proc/cpuinfo ];then
 	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
 fi
 
-MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+MEM_INFO=$(which free > /dev/null && free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
 if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
     if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
         cpuCore="${MEM_INFO}"
diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh
index 784bc27cf..efbec9804 100755
--- a/plugins/php/versions/81/install.sh
+++ b/plugins/php/versions/81/install.sh
@@ -100,7 +100,7 @@ if [ -f /proc/cpuinfo ];then
 	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
 fi
 
-MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+MEM_INFO=$(which free > /dev/null && free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
 if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
     if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
         cpuCore="${MEM_INFO}"
diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh
index 3a2bdd117..dc7b2c14a 100755
--- a/plugins/php/versions/82/install.sh
+++ b/plugins/php/versions/82/install.sh
@@ -101,7 +101,7 @@ if [ -f /proc/cpuinfo ];then
 	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
 fi
 
-MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+MEM_INFO=$(which free > /dev/null && free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
 if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
     if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
         cpuCore="${MEM_INFO}"
diff --git a/plugins/php/versions/83/install.sh b/plugins/php/versions/83/install.sh
index 406040830..979282dfd 100755
--- a/plugins/php/versions/83/install.sh
+++ b/plugins/php/versions/83/install.sh
@@ -101,7 +101,7 @@ if [ -f /proc/cpuinfo ];then
 	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
 fi
 
-MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+MEM_INFO=$(which free > /dev/null && free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
 if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
     if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
         cpuCore="${MEM_INFO}"
diff --git a/plugins/php/versions/84/install.sh b/plugins/php/versions/84/install.sh
index 67ad8147e..ea47ee991 100755
--- a/plugins/php/versions/84/install.sh
+++ b/plugins/php/versions/84/install.sh
@@ -57,7 +57,8 @@ cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
-	OPTIONS="${OPTIONS} --with-curl"
+	# OPTIONS="${OPTIONS} --with-curl"
+	echo "curl pass"
 else
 	OPTIONS="${OPTIONS} --with-curl"
 	OPTIONS="${OPTIONS} --with-readline"
@@ -82,7 +83,7 @@ if [ -f /proc/cpuinfo ];then
 	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
 fi
 
-MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+MEM_INFO=$(which free > /dev/null && free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
 if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
     if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
         cpuCore="${MEM_INFO}"
diff --git a/plugins/php/versions/all_mac.sh b/plugins/php/versions/all_mac.sh
index a771bd087..0a72317db 100644
--- a/plugins/php/versions/all_mac.sh
+++ b/plugins/php/versions/all_mac.sh
@@ -30,7 +30,7 @@ ROOT_DIR=$(cd "$(dirname "$0")"; pwd)
 # echo "php${PHP_VER} -- end"
 
 
-PHP_VER_LIST=(54 55 56 70 71 72 73 74 80 81 82 83)
+PHP_VER_LIST=(54 55 56 70 71 72 73 74 80 81 82 83 84)
 # PHP_VER_LIST=(81)
 for PHP_VER in ${PHP_VER_LIST[@]}; do
 	echo "php${PHP_VER} -- start"
@@ -41,7 +41,7 @@ for PHP_VER in ${PHP_VER_LIST[@]}; do
 done
 
 cd $DIR
-PHP_VER_LIST=(54 55 56 70 71 72 73 74 80 81 82)
+PHP_VER_LIST=(54 55 56 70 71 72 73 74 80 81 82 83 84)
 # yar
 PHP_EXT_LIST=(ZendGuardLoader pdo mysqlnd sqlite3 openssl opcache mcrypt fileinfo \
 	exif gd intl pcntl memcache memcached redis imagemagick xdebug \

From e04214c14d72ba327e7de0585b3e71cc175b6951 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 00:23:17 +0800
Subject: [PATCH 448/965] Update install.sh

---
 plugins/php/install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/php/install.sh b/plugins/php/install.sh
index d6ba610a0..f2ab97549 100755
--- a/plugins/php/install.sh
+++ b/plugins/php/install.sh
@@ -63,6 +63,7 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php/${type} ];then
 	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash gd.sh install 56
 	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash openssl.sh install 56
 	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash fileinfo.sh install 81
+	# cd ${rootPath}/plugins/php/versions/common && bash curl.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash gd.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash iconv.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash exif.sh install ${type}
@@ -75,6 +76,7 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php/${type} ];then
 	cd ${rootPath}/plugins/php/versions/common && bash memcached.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash pcntl.sh install ${type}
 
+
 	
 
 	if [ "${type}" -gt "73" ];then

From dc5a81ea89c1f8a7280e496c77f528fed22b33bb Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 01:07:57 +0800
Subject: [PATCH 449/965] Create curl.sh

---
 plugins/php/versions/common/curl.sh | 123 ++++++++++++++++++++++++++++
 1 file changed, 123 insertions(+)
 create mode 100755 plugins/php/versions/common/curl.sh

diff --git a/plugins/php/versions/common/curl.sh b/plugins/php/versions/common/curl.sh
new file mode 100755
index 000000000..609974209
--- /dev/null
+++ b/plugins/php/versions/common/curl.sh
@@ -0,0 +1,123 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH=$PATH:/opt/homebrew/bin
+
+curPath=`pwd`
+
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sourcePath=${serverPath}/source/php
+SYS_ARCH=`arch`
+
+actionType=$1
+version=$2
+
+
+LIBNAME=curl
+LIBV=0
+
+LIB_PATH_NAME=lib/php
+if [ -d $serverPath/php/${version}/lib64 ];then
+	LIB_PATH_NAME=lib64
+fi
+
+NON_ZTS_FILENAME=`ls $serverPath/php/${version}/${LIB_PATH_NAME}/extensions | grep no-debug-non-zts`
+extFile=$serverPath/php/${version}/${LIB_PATH_NAME}/extensions/${NON_ZTS_FILENAME}/${LIBNAME}.so
+
+sysName=`uname`
+if [ "$sysName" == "Darwin" ];then
+	BAK='_bak'
+else
+	BAK=''
+fi
+
+
+Install_lib()
+{
+
+	isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"`
+	if [ "${isInstall}" != "" ];then
+		echo "php-$version 已安装${LIBNAME},请选择其它版本!"
+		return
+	fi
+	
+	if [ ! -f "$extFile" ];then
+
+		if [ ! -d $sourcePath/php${version}/ext ];then
+			cd ${rootPath}/plugins/php && /bin/bash ${rootPath}/plugins/php/versions/${version}/install.sh install 
+		fi
+
+		cd $sourcePath/php${version}/ext/${LIBNAME}
+		if [ "${SYS_ARCH}" == "aarch64" ] && [ "$version" -lt "56" ];then
+			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
+		fi
+
+		if [ "$sysName" == "Darwin" ];then
+
+			BREW_DIR=`which brew`
+			BREW_DIR=${BREW_DIR/\/bin\/brew/}
+			LIB_DEPEND_DIR=`brew info curl | grep ${BREW_DIR}/Cellar/curl | cut -d \  -f 1 | awk 'END {print}'`
+			OPTIONS="$OPTIONS --with-curl=$(brew --prefix curl)"
+			export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$LIB_DEPEND_DIR/lib/pkgconfig
+		fi		
+
+
+		$serverPath/php/$version/bin/phpize
+		echo "./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS"
+		./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS
+		
+		make clean && make && make install && make clean
+		
+		if [ -d $sourcePath/php${version} ];then
+			cd ${sourcePath} && rm -rf $sourcePath/php${version}
+		fi
+	fi
+
+	if [ ! -f "$extFile" ];then
+		echo "ERROR!"
+		return
+	fi
+
+
+    echo "" >> $serverPath/php/$version/etc/php.ini
+	echo "[${LIBNAME}]" >> $serverPath/php/$version/etc/php.ini
+	echo "extension=${LIBNAME}.so" >> $serverPath/php/$version/etc/php.ini
+	
+	cd  ${curPath} && bash ${rootPath}/plugins/php/versions/lib.sh $version restart
+	echo '==========================================================='
+	echo 'successful!'
+}
+
+
+Uninstall_lib()
+{
+	if [ ! -f "$serverPath/php/$version/bin/php-config" ];then
+		echo "php-$version 未安装,请选择其它版本!"
+		return
+	fi
+	
+	if [ ! -f "$extFile" ];then
+		echo "php-$version 未安装${LIBNAME},请选择其它版本!"
+		return
+	fi
+	
+	echo $serverPath/php/$version/etc/php.ini
+	sed -i $BAK "/${LIBNAME}.so/d" $serverPath/php/$version/etc/php.ini
+	sed -i $BAK "/${LIBNAME}/d" $serverPath/php/$version/etc/php.ini
+		
+	rm -f $extFile
+	cd  ${curPath} && bash ${rootPath}/plugins/php/versions/lib.sh $version restart
+	echo '==============================================='
+	echo 'successful!'
+}
+
+
+
+if [ "$actionType" == 'install' ];then
+	Install_lib
+elif [ "$actionType" == 'uninstall' ];then
+	Uninstall_lib
+fi
\ No newline at end of file

From 71dc92f59dd870b269f2ea7d249c95bb43e6b4d0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 01:08:01 +0800
Subject: [PATCH 450/965] Update phplib.conf

---
 plugins/php/versions/phplib.conf | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/plugins/php/versions/phplib.conf b/plugins/php/versions/phplib.conf
index ca5226d60..0dd87e352 100755
--- a/plugins/php/versions/phplib.conf
+++ b/plugins/php/versions/phplib.conf
@@ -371,6 +371,30 @@
         "shell": "gd.sh",
         "check": "gd.so"
     },
+    {
+        "name": "curl",
+        "versions": [
+            "52",
+            "53",
+            "54",
+            "55",
+            "56",
+            "70",
+            "71",
+            "72",
+            "73",
+            "74",
+            "80",
+            "81",
+            "82",
+            "83",
+            "84"
+        ],
+        "type": "通用扩展",
+        "msg": "通用网络",
+        "shell": "curl.sh",
+        "check": "curl.so"
+    },
     {
         "name": "intl",
         "versions": [

From 3182bac95e23a195ba9f546c16f45a9695b964a8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 01:08:08 +0800
Subject: [PATCH 451/965] Update install.sh

---
 plugins/php/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/php/install.sh b/plugins/php/install.sh
index f2ab97549..77b87bbfa 100755
--- a/plugins/php/install.sh
+++ b/plugins/php/install.sh
@@ -63,7 +63,7 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php/${type} ];then
 	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash gd.sh install 56
 	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash openssl.sh install 56
 	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash fileinfo.sh install 81
-	# cd ${rootPath}/plugins/php/versions/common && bash curl.sh install ${type}
+	cd ${rootPath}/plugins/php/versions/common && bash curl.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash gd.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash iconv.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash exif.sh install ${type}

From 37e3850b43ba4e7fb263d7bd425121a2ed9de59b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 01:13:22 +0800
Subject: [PATCH 452/965] update

---
 plugins/php/versions/52/install.sh |  9 +--------
 plugins/php/versions/53/install.sh |  5 -----
 plugins/php/versions/54/install.sh | 10 ----------
 plugins/php/versions/55/install.sh |  5 -----
 plugins/php/versions/56/install.sh |  5 -----
 plugins/php/versions/70/install.sh |  5 -----
 plugins/php/versions/71/install.sh |  4 ----
 plugins/php/versions/72/install.sh |  8 +-------
 plugins/php/versions/73/install.sh |  1 -
 plugins/php/versions/74/install.sh | 12 ------------
 plugins/php/versions/80/install.sh |  6 +-----
 plugins/php/versions/81/install.sh |  9 +++------
 plugins/php/versions/82/install.sh | 15 ++++++---------
 plugins/php/versions/83/install.sh | 13 +++----------
 plugins/php/versions/84/install.sh | 11 ++++-------
 plugins/php/versions/phplib.conf   | 24 ++++++++++++++++++++++++
 16 files changed, 43 insertions(+), 99 deletions(-)

diff --git a/plugins/php/versions/52/install.sh b/plugins/php/versions/52/install.sh
index 28ef0b968..daf12c254 100755
--- a/plugins/php/versions/52/install.sh
+++ b/plugins/php/versions/52/install.sh
@@ -82,18 +82,11 @@ if [ -f $serverPath/php/${PHP_VER}/bin/php ];then
 	return
 fi
 
-OPTIONS=''
+OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
-	OPTIONS='--without-iconv'
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
-	OPTIONS="${OPTIONS} --with-curl=${serverPath}/lib/curl"
-else
-	OPTIONS='--without-iconv'
-	# OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-curl"
 fi
 
-
 IS_64BIT=`getconf LONG_BIT`
 if [ "$IS_64BIT" == "64" ];then
 	OPTIONS="${OPTIONS} --with-libdir=lib64"
diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh
index 421caefd7..839d8dcb0 100755
--- a/plugins/php/versions/53/install.sh
+++ b/plugins/php/versions/53/install.sh
@@ -66,12 +66,7 @@ fi
 # OPTIONS="${OPTIONS} --with-jpeg --with-jpeg-dir=/usr/lib"
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
-	
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
-	OPTIONS="${OPTIONS} --with-curl=$(brew --prefix curl)"
-else
-	# OPTIONS=" --with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-curl"
 fi
 
 IS_64BIT=`getconf LONG_BIT`
diff --git a/plugins/php/versions/54/install.sh b/plugins/php/versions/54/install.sh
index e32ace308..58af0987f 100755
--- a/plugins/php/versions/54/install.sh
+++ b/plugins/php/versions/54/install.sh
@@ -59,21 +59,11 @@ fi
 
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
-	
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
-
-	BREW_DIR=`which brew`
-	BREW_DIR=${BREW_DIR/\/bin\/brew/}
-	CURL_DEPEND_DIR=`brew info curl | grep ${BREW_DIR}/Cellar/curl | cut -d \  -f 1 | awk 'END {print}'`
-	OPTIONS="$OPTIONS --with-curl=${CURL_DEPEND_DIR}"
 	# OPTIONS="${OPTIONS} --with-pcre-dir=${serverPath}/lib/pcre"
 	# OPTIONS="${OPTIONS} --with-external-pcre=${serverPath}/lib/pcre"
-
 else
-	# OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-curl"
 	OPTIONS="${OPTIONS} --enable-mbstring"
-	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`
diff --git a/plugins/php/versions/55/install.sh b/plugins/php/versions/55/install.sh
index 96f869c46..59f5712c6 100755
--- a/plugins/php/versions/55/install.sh
+++ b/plugins/php/versions/55/install.sh
@@ -59,14 +59,9 @@ fi
 
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
-	
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
-	OPTIONS="${OPTIONS} --with-curl=$(brew --prefix curl)"
 else
-	# OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-curl"
 	OPTIONS="${OPTIONS} --enable-mbstring"
-	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`
diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh
index 3b7e8c060..b26aa6606 100755
--- a/plugins/php/versions/56/install.sh
+++ b/plugins/php/versions/56/install.sh
@@ -63,14 +63,9 @@ fi
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
-	OPTIONS="${OPTIONS} --with-curl=$(brew --prefix curl)"
 	OPTIONS="${OPTIONS} --with-zlib-dir=$(brew --prefix zlib)"
-	# OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)"
 else
-	# OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-curl"
 	OPTIONS="${OPTIONS} --enable-mbstring"
-	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`
diff --git a/plugins/php/versions/70/install.sh b/plugins/php/versions/70/install.sh
index 0e7d474e5..ebe243815 100755
--- a/plugins/php/versions/70/install.sh
+++ b/plugins/php/versions/70/install.sh
@@ -60,12 +60,7 @@ fi
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
-	OPTIONS="${OPTIONS} --with-curl"
 	# OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)"
-else
-	# OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-curl"
-	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`
diff --git a/plugins/php/versions/71/install.sh b/plugins/php/versions/71/install.sh
index b5881c8f0..20bcb6c94 100755
--- a/plugins/php/versions/71/install.sh
+++ b/plugins/php/versions/71/install.sh
@@ -61,11 +61,7 @@ OPTIONS=''
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
-	OPTIONS="${OPTIONS} --with-curl"
 	OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)"
-else
-	OPTIONS="${OPTIONS} --with-curl"
-	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`
diff --git a/plugins/php/versions/72/install.sh b/plugins/php/versions/72/install.sh
index 5e2bb9142..1cc80f08a 100755
--- a/plugins/php/versions/72/install.sh
+++ b/plugins/php/versions/72/install.sh
@@ -58,13 +58,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 fi
 
 OPTIONS='--without-iconv'
-if [ $sysName == 'Darwin' ]; then
-	OPTIONS="${OPTIONS} --with-curl"
-else
-	OPTIONS="${OPTIONS} --with-curl"
-	OPTIONS="${OPTIONS} --with-zlib-dir=$serverPath/lib/zlib"
-	OPTIONS="${OPTIONS} --with-readline"
-fi
+OPTIONS="${OPTIONS} --with-zlib-dir=$serverPath/lib/zlib"
 
 IS_64BIT=`getconf LONG_BIT`
 if [ "$IS_64BIT" == "64" ];then
diff --git a/plugins/php/versions/73/install.sh b/plugins/php/versions/73/install.sh
index 3d619b7d0..1900b0838 100755
--- a/plugins/php/versions/73/install.sh
+++ b/plugins/php/versions/73/install.sh
@@ -75,7 +75,6 @@ if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-curl=$(brew --prefix curl)"
 	OPTIONS="${OPTIONS} --with-pcre-dir=$(brew --prefix pcre2)"
 else
-	OPTIONS="${OPTIONS} --with-curl"
 	OPTIONS="${OPTIONS} --with-zlib-dir=$serverPath/lib/zlib"
 	OPTIONS="${OPTIONS} ${ZIP_OPTION}"
 	OPTIONS="${OPTIONS} --with-readline"
diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh
index e21252768..17ee9609e 100755
--- a/plugins/php/versions/74/install.sh
+++ b/plugins/php/versions/74/install.sh
@@ -80,19 +80,7 @@ cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
-	
-	OPTIONS="${OPTIONS} --with-curl"
 	OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)"
-
-	# BREW_DIR=`which brew`
-	# BREW_DIR=${BREW_DIR/\/bin\/brew/}
-	# XML_LIB_DEPEND_DIR=`brew info libxml2 | grep /opt/homebrew/Cellar/libxml2 | cut -d \  -f 1 | awk 'END {print}'`
-	# XML_LIB_DEPEND_DIR=`brew info libxml2 | grep ${BREW_DIR}/Cellar/libxml2 | cut -d \  -f 1 | awk 'END {print}'`
-	# OPTIONS="${OPTIONS} --with-libxml=${XML_LIB_DEPEND_DIR}"
-
-else
-	OPTIONS="${OPTIONS} --with-curl"
-	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`
diff --git a/plugins/php/versions/80/install.sh b/plugins/php/versions/80/install.sh
index 5ef789c72..1d84e4685 100755
--- a/plugins/php/versions/80/install.sh
+++ b/plugins/php/versions/80/install.sh
@@ -71,13 +71,9 @@ fi
 cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
+
 if [ $sysName == 'Darwin' ]; then
-	OPTIONS="${OPTIONS} --with-curl"
 	OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)"
-else
-	# OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-curl"
-	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`
diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh
index efbec9804..aef036d86 100755
--- a/plugins/php/versions/81/install.sh
+++ b/plugins/php/versions/81/install.sh
@@ -71,12 +71,9 @@ fi
 cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
-if [ $sysName == 'Darwin' ]; then
-	OPTIONS="${OPTIONS} --with-curl"
-else
-	OPTIONS="${OPTIONS} --with-curl"
-	OPTIONS="${OPTIONS} --with-readline"
-fi
+# if [ $sysName == 'Darwin' ]; then
+# 	OPTIONS="${OPTIONS} --with-curl"
+# fi
 
 argon_version=`pkg-config libargon2 --modversion`
 if [ "$?" == "0" ];then
diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh
index dc7b2c14a..b10c42953 100755
--- a/plugins/php/versions/82/install.sh
+++ b/plugins/php/versions/82/install.sh
@@ -72,15 +72,12 @@ fi
 cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
-if [ $sysName == 'Darwin' ]; then
-	BREW_DIR=`which brew`
-	BREW_DIR=${BREW_DIR/\/bin\/brew/}
-	LIB_DEPEND_DIR=`brew info curl | grep ${BREW_DIR}/Cellar/curl | cut -d \  -f 1 | awk 'END {print}'`
-	OPTIONS="${OPTIONS} --with-curl=$LIB_DEPEND_DIR"
-else
-	OPTIONS="${OPTIONS} --with-curl"
-	OPTIONS="${OPTIONS} --with-readline"
-fi
+# if [ $sysName == 'Darwin' ]; then
+# 	BREW_DIR=`which brew`
+# 	BREW_DIR=${BREW_DIR/\/bin\/brew/}
+# 	LIB_DEPEND_DIR=`brew info curl | grep ${BREW_DIR}/Cellar/curl | cut -d \  -f 1 | awk 'END {print}'`
+# 	OPTIONS="${OPTIONS} --with-curl=$LIB_DEPEND_DIR"
+# fi
 
 IS_64BIT=`getconf LONG_BIT`
 if [ "$IS_64BIT" == "64" ];then
diff --git a/plugins/php/versions/83/install.sh b/plugins/php/versions/83/install.sh
index 979282dfd..334864df3 100755
--- a/plugins/php/versions/83/install.sh
+++ b/plugins/php/versions/83/install.sh
@@ -71,16 +71,9 @@ fi
 cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
-if [ $sysName == 'Darwin' ]; then
-	# BREW_DIR=`which brew`
-	# BREW_DIR=${BREW_DIR/\/bin\/brew/}
-	# LIB_DEPEND_DIR=`brew info curl | grep ${BREW_DIR}/Cellar/curl | cut -d \  -f 1 | awk 'END {print}'`
-	# OPTIONS="${OPTIONS} --with-curl=$LIB_DEPEND_DIR"
-	echo "curl"
-else
-	OPTIONS="${OPTIONS} --with-curl"
-	OPTIONS="${OPTIONS} --with-readline"
-fi
+# if [ $sysName == 'Darwin' ]; then
+# 	OPTIONS="${OPTIONS} --with-curl"
+# fi
 
 argon_version=`pkg-config libargon2 --modversion`
 if [ "$?" == "0" ];then
diff --git a/plugins/php/versions/84/install.sh b/plugins/php/versions/84/install.sh
index ea47ee991..5b1d0bac2 100755
--- a/plugins/php/versions/84/install.sh
+++ b/plugins/php/versions/84/install.sh
@@ -56,13 +56,10 @@ fi
 cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
-if [ $sysName == 'Darwin' ]; then
-	# OPTIONS="${OPTIONS} --with-curl"
-	echo "curl pass"
-else
-	OPTIONS="${OPTIONS} --with-curl"
-	OPTIONS="${OPTIONS} --with-readline"
-fi
+
+# if [ $sysName == 'Darwin' ]; then
+# 	OPTIONS="${OPTIONS} --with-curl"
+# fi
 
 argon_version=`pkg-config libargon2 --modversion`
 if [ "$?" == "0" ];then
diff --git a/plugins/php/versions/phplib.conf b/plugins/php/versions/phplib.conf
index 0dd87e352..f74c87cc5 100755
--- a/plugins/php/versions/phplib.conf
+++ b/plugins/php/versions/phplib.conf
@@ -419,6 +419,30 @@
         "shell": "intl.sh",
         "check": "intl.so"
     },
+    {
+        "name": "readline",
+        "versions": [
+            "52",
+            "53",
+            "54",
+            "55",
+            "56",
+            "70",
+            "71",
+            "72",
+            "73",
+            "74",
+            "80",
+            "81",
+            "82",
+            "83",
+            "84"
+        ],
+        "type": "通用扩展",
+        "msg": "命令行的支持",
+        "shell": "readline.sh",
+        "check": "readline.so"
+    },
     {
         "name": "memcache",
         "versions": [

From bd873b48d02c004013ae3be4f09a21b9fe3c49ea Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 01:16:13 +0800
Subject: [PATCH 453/965] Update readline.sh

---
 plugins/php/versions/common/readline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/php/versions/common/readline.sh b/plugins/php/versions/common/readline.sh
index bde833361..6390b69fa 100755
--- a/plugins/php/versions/common/readline.sh
+++ b/plugins/php/versions/common/readline.sh
@@ -62,7 +62,7 @@ Install_lib()
 			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
 		fi
 
-		OPTIONS="$OPTIONS  --with-libedit=${serverPath}/lib/libedit"
+		OPTIONS="$OPTIONS --with-libedit=${serverPath}/lib/libedit"
 
 		$serverPath/php/$version/bin/phpize
 		./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS

From fa1819feb8936c356ce943adc041ee59c502b14a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 01:21:32 +0800
Subject: [PATCH 454/965] Update readline.sh

---
 plugins/php/versions/common/readline.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/php/versions/common/readline.sh b/plugins/php/versions/common/readline.sh
index 6390b69fa..5ffadc220 100755
--- a/plugins/php/versions/common/readline.sh
+++ b/plugins/php/versions/common/readline.sh
@@ -47,8 +47,6 @@ Install_lib()
 		return
 	fi
 	
-	cd ${rootPath}/plugins/php/lib && /bin/bash libedit.sh
-	
 	if [ ! -f "$extFile" ];then
 
 		if [ ! -d $sourcePath/php${version}/ext ];then
@@ -62,7 +60,12 @@ Install_lib()
 			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
 		fi
 
-		OPTIONS="$OPTIONS --with-libedit=${serverPath}/lib/libedit"
+		if [ "$sysName" == "Darwin" ];then
+			cd ${rootPath}/plugins/php/lib && /bin/bash libedit.sh
+			OPTIONS="$OPTIONS --with-libedit=${serverPath}/lib/libedit"
+		else
+			OPTIONS="$OPTIONS --with-readline"
+		fi
 
 		$serverPath/php/$version/bin/phpize
 		./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS

From 1ce5cac3baa0f6fc44686251254b929ebdf5c3b8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 01:23:55 +0800
Subject: [PATCH 455/965] Update openssl.sh

---
 plugins/php/versions/common/openssl.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/plugins/php/versions/common/openssl.sh b/plugins/php/versions/common/openssl.sh
index c710de021..55251a562 100755
--- a/plugins/php/versions/common/openssl.sh
+++ b/plugins/php/versions/common/openssl.sh
@@ -46,6 +46,10 @@ Install_lib()
 		cd ${rootPath}/plugins/php/lib && /bin/bash openssl_10.sh
 	fi
 
+	if [ "$version" -gt "82" ];then
+		cd ${rootPath}/plugins/php/lib && /bin/bash openssl.sh
+	fi
+
 	if [ "$sysName" == "Darwin" ] ;then 
 		BREW_DIR=`which brew`
 		BREW_DIR=${BREW_DIR/\/bin\/brew/}
@@ -72,15 +76,18 @@ Install_lib()
 			export PKG_CONFIG_PATH=$serverPath/lib/openssl10/lib/pkgconfig
 		fi
 
+		if [ "$version" -gt "82" ] && [ "$sysName" == "Darwin" ];then
+			export PKG_CONFIG_PATH=$serverPath/lib/openssl/lib/pkgconfig
+		fi
+
 		OPTIONS=""
 		if [ "${SYS_ARCH}" == "aarch64" ] && [ "$version" -lt "56" ];then
 			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
 		fi
 
 		$serverPath/php/$version/bin/phpize
-		./configure --with-php-config=$serverPath/php/$version/bin/php-config \
-		$OPTIONS \
-		--with-openssl
+		echo "./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS --with-openssl"
+		./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS --with-openssl
 		make clean && make && make install && make clean
 
 		if [ -d $sourcePath/php${version} ];then

From fb3cd54ce0a91bc35e00ef0a364fc5ac4d9c2cac Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 01:54:48 +0800
Subject: [PATCH 456/965] Update install.sh

---
 plugins/php/versions/84/install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/php/versions/84/install.sh b/plugins/php/versions/84/install.sh
index 5b1d0bac2..cdb855bd2 100755
--- a/plugins/php/versions/84/install.sh
+++ b/plugins/php/versions/84/install.sh
@@ -104,6 +104,8 @@ if version_lt "$libzip_version" "0.11.0" ;then
 	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
 fi
 
+# OPTIONS="${OPTIONS} --enable-debug"
+# OPTIONS="${OPTIONS} --enable-dtrace"
 
 echo "$sourcePath/php/php${PHP_VER}"
 

From 9553add27ab982896412d05f36a72605d36b693a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 02:07:07 +0800
Subject: [PATCH 457/965] Update readline.sh

---
 plugins/php/versions/common/readline.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/php/versions/common/readline.sh b/plugins/php/versions/common/readline.sh
index 5ffadc220..40e13c9af 100755
--- a/plugins/php/versions/common/readline.sh
+++ b/plugins/php/versions/common/readline.sh
@@ -64,7 +64,8 @@ Install_lib()
 			cd ${rootPath}/plugins/php/lib && /bin/bash libedit.sh
 			OPTIONS="$OPTIONS --with-libedit=${serverPath}/lib/libedit"
 		else
-			OPTIONS="$OPTIONS --with-readline"
+			cd ${rootPath}/plugins/php/lib && /bin/bash libedit.sh
+			OPTIONS="$OPTIONS --with-libedit=${serverPath}/lib/libedit"
 		fi
 
 		$serverPath/php/$version/bin/phpize

From 5b9a4146881168c61ae557a6fd5010ef61ee2e5a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 02:24:29 +0800
Subject: [PATCH 458/965] Update openssl.sh

---
 plugins/php/versions/common/openssl.sh | 27 ++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/plugins/php/versions/common/openssl.sh b/plugins/php/versions/common/openssl.sh
index 55251a562..75ad433b3 100755
--- a/plugins/php/versions/common/openssl.sh
+++ b/plugins/php/versions/common/openssl.sh
@@ -73,26 +73,37 @@ Install_lib()
 		# openssl_version=`pkg-config openssl --modversion`
 		# export PKG_CONFIG_PATH=$serverPath/lib/openssl10/lib/pkgconfig
 		if [ "$version" -lt "81" ] && [ "$sysName" != "Darwin" ];then
-			export PKG_CONFIG_PATH=$serverPath/lib/openssl10/lib/pkgconfig
+			export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$serverPath/lib/openssl10/lib/pkgconfig
 		fi
 
-		if [ "$version" -gt "82" ] && [ "$sysName" == "Darwin" ];then
-			export PKG_CONFIG_PATH=$serverPath/lib/openssl/lib/pkgconfig
+		if [ "$sysName" == "Darwin" ];then
+			BREW_DIR=`which brew`
+			BREW_DIR=${BREW_DIR/\/bin\/brew/}
+			LIB_DEPEND_DIR=`brew info openssl | grep ${BREW_DIR}/Cellar/openssl | cut -d \  -f 1 | awk 'END {print}'`
+			OPTIONS="$OPTIONS --with-openssl=$(brew --prefix openssl)"
+			export PKG_CONFIG_PATH=$LIB_DEPEND_DIR/lib/pkgconfig
+			export OPENSSL_CFLAGS="-I${LIB_DEPEND_DIR}/include"
+			export OPENSSL_LIBS="-L/${LIB_DEPEND_DIR}/lib -lssl -lcrypto -lz"
 		fi
 
+		# if [ "$version" -gt "82" ] && [ "$sysName" == "Darwin" ];then
+		# 	export PKG_CONFIG_PATH=$serverPath/lib/openssl/lib/pkgconfig
+		# fi
+
 		OPTIONS=""
 		if [ "${SYS_ARCH}" == "aarch64" ] && [ "$version" -lt "56" ];then
 			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
 		fi
 
 		$serverPath/php/$version/bin/phpize
-		echo "./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS --with-openssl"
-		./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS --with-openssl
+		# --with-openssl
+		echo "./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS"
+		./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS
 		make clean && make && make install && make clean
 
-		if [ -d $sourcePath/php${version} ];then
-			cd ${sourcePath} && rm -rf $sourcePath/php${version}
-		fi
+		# if [ -d $sourcePath/php${version} ];then
+		# 	cd ${sourcePath} && rm -rf $sourcePath/php${version}
+		# fi
 		
 	fi
 

From 8ec3b66f20abb82f65d520c4bd5ccd29d80c2974 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 02:24:37 +0800
Subject: [PATCH 459/965] Update install.sh

---
 plugins/php/versions/53/install.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh
index 839d8dcb0..151fafc88 100755
--- a/plugins/php/versions/53/install.sh
+++ b/plugins/php/versions/53/install.sh
@@ -65,9 +65,10 @@ fi
 # OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf"
 # OPTIONS="${OPTIONS} --with-jpeg --with-jpeg-dir=/usr/lib"
 OPTIONS='--without-iconv'
-if [ $sysName == 'Darwin' ]; then
-	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
-fi
+
+# if [ $sysName == 'Darwin' ]; then
+# 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
+# fi
 
 IS_64BIT=`getconf LONG_BIT`
 if [ "$IS_64BIT" == "64" ];then

From 573e3192fc1b40ef1c2c3ab7dd1eba95a4100ca4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 02:36:40 +0800
Subject: [PATCH 460/965] Update swoole.sh

---
 plugins/php/versions/common/swoole.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/php/versions/common/swoole.sh b/plugins/php/versions/common/swoole.sh
index b0cb4bdfd..d39e624aa 100755
--- a/plugins/php/versions/common/swoole.sh
+++ b/plugins/php/versions/common/swoole.sh
@@ -26,7 +26,7 @@ elif [ "$version" == "71" ];then
 elif [ "$version" == "72" ] || [ "$version" == "73" ] || [ "$version" == "74" ];then
 	LIBV=4.8.10
 elif [ "$version" -gt "74" ];then
-	LIBV=5.1.1
+	LIBV=5.1.6
 else
 	echo 'other?'
 	exit 0

From d604c966b23f1c833c28e10041515081396c83ef Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 02:47:43 +0800
Subject: [PATCH 461/965] update

---
 plugins/php/versions/81/install.sh |  4 ++--
 plugins/php/versions/82/install.sh | 13 +++----------
 plugins/php/versions/83/install.sh |  4 ++--
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh
index aef036d86..cf65d0da4 100755
--- a/plugins/php/versions/81/install.sh
+++ b/plugins/php/versions/81/install.sh
@@ -15,7 +15,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.30
+version=8.1.31
 PHP_VER=81
 Install_php()
 {
@@ -55,7 +55,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 	fi
 	
 	#检测文件是否损坏.
-	md5_file_ok=f24a6007f0b25a53cb7fbaee69c85017e0345b62089c2425a0afb7e177192ed1
+	md5_file_ok=c4f244d46ba51c72f7d13d4f66ce6a9e9a8d6b669c51be35e01765ba58e7afca
 	if [ -f $sourcePath/php/php-${version}.tar.xz ];then
 		md5_file=`sha256sum $sourcePath/php/php-${version}.tar.xz  | awk '{print $1}'`
 		if [ "${md5_file}" != "${md5_file_ok}" ]; then
diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh
index b10c42953..28405bcbc 100755
--- a/plugins/php/versions/82/install.sh
+++ b/plugins/php/versions/82/install.sh
@@ -15,7 +15,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.24
+version=8.2.26
 PHP_VER=82
 Install_php()
 {
@@ -56,7 +56,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 	fi
 
 	#检测文件是否损坏.
-	md5_file_ok=80a5225746a9eb484475b312d4c626c63a88a037d8e56d214f30205e1ba1411a
+	md5_file_ok=54747400cb4874288ad41a785e6147e2ff546cceeeb55c23c00c771ac125c6ef
 	if [ -f $sourcePath/php/php-${version}.tar.xz ];then
 		md5_file=`sha256sum $sourcePath/php/php-${version}.tar.xz  | awk '{print $1}'`
 		if [ "${md5_file}" != "${md5_file_ok}" ]; then
@@ -72,12 +72,6 @@ fi
 cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
-# if [ $sysName == 'Darwin' ]; then
-# 	BREW_DIR=`which brew`
-# 	BREW_DIR=${BREW_DIR/\/bin\/brew/}
-# 	LIB_DEPEND_DIR=`brew info curl | grep ${BREW_DIR}/Cellar/curl | cut -d \  -f 1 | awk 'END {print}'`
-# 	OPTIONS="${OPTIONS} --with-curl=$LIB_DEPEND_DIR"
-# fi
 
 IS_64BIT=`getconf LONG_BIT`
 if [ "$IS_64BIT" == "64" ];then
@@ -123,8 +117,7 @@ if version_lt "$libzip_version" "0.11.0" ;then
 fi
 
 
-echo "$sourcePath/php/php${PHP_VER}"
-
+# echo "$sourcePath/php/php${PHP_VER}"
 if [ ! -d $serverPath/php/${PHP_VER} ];then
 	cd $sourcePath/php/php${PHP_VER}
 	./buildconf --force
diff --git a/plugins/php/versions/83/install.sh b/plugins/php/versions/83/install.sh
index 334864df3..fb703e87b 100755
--- a/plugins/php/versions/83/install.sh
+++ b/plugins/php/versions/83/install.sh
@@ -14,7 +14,7 @@ function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)"
 function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; }
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
-version=8.3.12
+version=8.3.14
 PHP_VER=83
 Install_php()
 {
@@ -55,7 +55,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 	fi
 
 	#检测文件是否损坏.
-	md5_file_ok=f774e28633e26fc8c5197f4dae58ec9e3ff87d1b4311cbc61ab05a7ad24bd131
+	md5_file_ok=58b4cb9019bf70c0cbcdb814c7df79b9065059d14cf7dbf48d971f8e56ae9be7
 	if [ -f $sourcePath/php/php-${version}.tar.xz ];then
 		md5_file=`sha256sum $sourcePath/php/php-${version}.tar.xz  | awk '{print $1}'`
 		if [ "${md5_file}" != "${md5_file_ok}" ]; then

From 7e55e1e29a4d8123471b34b572e694b91563b0e9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 03:13:04 +0800
Subject: [PATCH 462/965] Update plugin.py

---
 web/utils/plugin.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index f50c2afe8..be3166db9 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -78,6 +78,7 @@ class plugin(object):
     ]
 
     __plugin_dir = 'plugins'
+    __tasks = None
 
     # lock
     _instance_lock = threading.Lock()
@@ -366,6 +367,31 @@ class plugin(object):
                 return True
         return False
 
+    def checkSetupTask(self, name, version, coexist):
+        if not self.__tasks:
+            self.__tasks = thisdb.getTaskRunAll()
+        isTask = '1'
+        for task in self.__tasks:
+            tmpt = mw.getStrBetween('[', ']', task['name'])
+            if not tmpt:
+                continue
+            task_sign = tmpt.split('-')
+            task_len = len(task_sign)
+
+            task_name = task_sign[0].lower()
+            task_ver = task_sign[1]
+            if task_len > 2:
+                nameArr = task_sign[0:task_len - 1]
+                task_name = '-'.join(nameArr).lower()
+                task_ver = task_sign[task_len - 1]
+            if coexist:
+                if task_name == name and task_ver == version:
+                    isTask = task['status']
+            else:
+                if task_name == name:
+                    isTask = task['status']
+        return isTask
+
     def checkDisplayIndex(self, name, version, coexist):
         indexList = thisdb.getOptionByJson('display_index',default=[])
         if coexist:
@@ -451,6 +477,7 @@ class plugin(object):
         if path.find('VERSION') > -1:
             pInfo['path'] = path.replace('VERSION', info['versions'])
 
+        pInfo['task'] = self.checkSetupTask(pInfo['name'], info['versions'], coexist)
         pInfo['display'] = self.checkDisplayIndex(info['name'], pInfo['versions'], coexist)
         pInfo['setup'] = os.path.exists(pInfo['install_checks'])
 

From 325a113ac6068fdc74b1f6fe8c5f5750178e61be Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 03:13:30 +0800
Subject: [PATCH 463/965] Update mw.py

---
 web/core/mw.py | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index 3ba9a2763..d4fd928ba 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -50,13 +50,24 @@ def execShell(cmdstring, cwd=None, timeout=None, shell=True):
         return sub.communicate()
 
     data = sub.communicate()
-    # python3 fix 返回byte数据
-    if isinstance(data[0], bytes):
-        t1 = str(data[0], encoding='utf-8')
 
-    if isinstance(data[1], bytes):
-        t2 = str(data[1], encoding='utf-8')
-    return (t1, t2)
+    success = data[0]
+    error = data[1]
+    # python3 fix 返回byte数据
+    if isinstance(success, bytes):
+        # success = str(success, encoding='utf-8')
+        try:
+            success = success.decode('utf-8')
+        except Exception as e:
+            success = str(e)
+
+    if isinstance(error, bytes):
+        # error = str(error, encoding='utf-8')
+        try:
+            error = error.decode('utf-8')
+        except Exception as e:
+            error = str(e)
+    return (success, error)
 
 
 def getTracebackInfo():

From bdfc044783262c278ac67989288b7f78a037b1e4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 03:13:34 +0800
Subject: [PATCH 464/965] Update tasks.py

---
 web/thisdb/tasks.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index 656bc4313..7ee8ab8c5 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -98,7 +98,7 @@ def getTaskPage(
     return rdata
 
 def getTaskFirstByRun() -> None:
-    data = mw.M('tasks').where('status=? or status=0', (-1,)).field(__FIELD).order('id asc').find()
+    data = mw.M('tasks').where('status!=?', (1,)).field(__FIELD).order('id asc').find()
     if data is None:
         return None
     return data
@@ -109,6 +109,10 @@ def getTaskRunList(page = 1,size = 10):
     task_list = mw.M('tasks').where('status!=?', (1,)).field(__FIELD).limit(limit).order('id asc').select()
     return task_list
 
+def getTaskRunAll():
+    task_list = mw.M('tasks').where('status!=?', (1,)).field(__FIELD).order('id asc').select()
+    return task_list
+
 def getTaskRunPage(page = 1, size = 10):
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)

From 407dc56f4080b51d90b586db2065a887dba7ba43 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 03:13:41 +0800
Subject: [PATCH 465/965] Update install.sh

---
 plugins/php/versions/83/install.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/php/versions/83/install.sh b/plugins/php/versions/83/install.sh
index fb703e87b..93e237c5d 100755
--- a/plugins/php/versions/83/install.sh
+++ b/plugins/php/versions/83/install.sh
@@ -71,9 +71,6 @@ fi
 cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
-# if [ $sysName == 'Darwin' ]; then
-# 	OPTIONS="${OPTIONS} --with-curl"
-# fi
 
 argon_version=`pkg-config libargon2 --modversion`
 if [ "$?" == "0" ];then

From dc17d67dc9bccbd0397cbcc99f1bf75598b6ccc7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 03:32:10 +0800
Subject: [PATCH 466/965] Update plugin.py

---
 web/utils/plugin.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index be3166db9..57ccc1a6f 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -368,8 +368,7 @@ class plugin(object):
         return False
 
     def checkSetupTask(self, name, version, coexist):
-        if not self.__tasks:
-            self.__tasks = thisdb.getTaskRunAll()
+        self.__tasks = thisdb.getTaskRunAll()
         isTask = '1'
         for task in self.__tasks:
             tmpt = mw.getStrBetween('[', ']', task['name'])

From 70aca29ce1169c67986f96cf049c10c88edea0cd Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 03:34:38 +0800
Subject: [PATCH 467/965] Update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index f7d56fe65..af6f71703 100644
--- a/.gitignore
+++ b/.gitignore
@@ -192,3 +192,4 @@ plugins/dztasks
 
 
 
+logs/panel_task.lock

From d1d276d026c45a7b8595dd51fd23d3319c011d46 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 03:35:01 +0800
Subject: [PATCH 468/965] Update .gitignore

---
 .gitignore | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index af6f71703..9bde8372c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,7 +123,7 @@ logs/panel.pid
 logs/panel.log
 logs/panel_task.log
 logs/panel_exec.log
-
+logs/panel_task.lock
 
 ssl/local
 ssl/nginx
@@ -189,7 +189,3 @@ plugins/goedge-admin
 plugins/goedge-node
 plugins/goedge-happy
 plugins/dztasks
-
-
-
-logs/panel_task.lock

From 7750fb7b386af3d74811b0f41aaf134af0143352 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 03:54:18 +0800
Subject: [PATCH 469/965] Update readline.sh

---
 plugins/php/versions/common/readline.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/php/versions/common/readline.sh b/plugins/php/versions/common/readline.sh
index 40e13c9af..0c9554019 100755
--- a/plugins/php/versions/common/readline.sh
+++ b/plugins/php/versions/common/readline.sh
@@ -54,7 +54,10 @@ Install_lib()
 		fi
 
 		cd $sourcePath/php${version}/ext/${LIBNAME}
-		
+		if [ ! -f "config.m4" ];then
+			mv config0.m4 config.m4
+		fi
+
 		OPTIONS=""
 		if [ "${SYS_ARCH}" == "aarch64" ] && [ "$version" -lt "56" ];then
 			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
@@ -68,10 +71,10 @@ Install_lib()
 			OPTIONS="$OPTIONS --with-libedit=${serverPath}/lib/libedit"
 		fi
 
+		cd $sourcePath/php${version}/ext/${LIBNAME}
 		$serverPath/php/$version/bin/phpize
 		./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS
 		make clean && make && make install && make clean
-		
 	fi
 
 	if [ ! -f "$extFile" ];then

From 49858199a51b45dfad05ec7ac418d044321d07c3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 03:55:03 +0800
Subject: [PATCH 470/965] Update install.sh

---
 plugins/php/install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/php/install.sh b/plugins/php/install.sh
index 77b87bbfa..c90bdbc6b 100755
--- a/plugins/php/install.sh
+++ b/plugins/php/install.sh
@@ -65,6 +65,7 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php/${type} ];then
 	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash fileinfo.sh install 81
 	cd ${rootPath}/plugins/php/versions/common && bash curl.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash gd.sh install ${type}
+	cd ${rootPath}/plugins/php/versions/common && bash readline.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash iconv.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash exif.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash intl.sh install ${type}

From d0bc04e53ba2e00fbf96704134c5af51c61b7a17 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 04:05:33 +0800
Subject: [PATCH 471/965] Update index.py

---
 plugins/php/index.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/php/index.py b/plugins/php/index.py
index 1a6e8d6c9..e8997a43f 100755
--- a/plugins/php/index.py
+++ b/plugins/php/index.py
@@ -344,8 +344,8 @@ def phpOp(version, method):
 
 
 def start(version):
-    mw.execShell(
-        'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/www/server/lib/icu/lib')
+    cmd = 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/www/server/lib/icu/lib'
+    mw.execShell(cmd)
     return phpOp(version, 'start')
 
 

From dbe9fd422265d8eb3d52f123b4d2e7ab4b978b63 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 04:49:47 +0800
Subject: [PATCH 472/965] update

---
 plugins/php/index.py                   |  2 +-
 plugins/php/versions/common/openssl.sh | 37 +++++++++++++++++++-------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/plugins/php/index.py b/plugins/php/index.py
index e8997a43f..915d9915b 100755
--- a/plugins/php/index.py
+++ b/plugins/php/index.py
@@ -344,7 +344,7 @@ def phpOp(version, method):
 
 
 def start(version):
-    cmd = 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/www/server/lib/icu/lib'
+    cmd = 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/www/server/lib/icu/lib:/opt/homebrew/lib'
     mw.execShell(cmd)
     return phpOp(version, 'start')
 
diff --git a/plugins/php/versions/common/openssl.sh b/plugins/php/versions/common/openssl.sh
index 75ad433b3..b76a61535 100755
--- a/plugins/php/versions/common/openssl.sh
+++ b/plugins/php/versions/common/openssl.sh
@@ -70,13 +70,36 @@ Install_lib()
 			mv config0.m4 config.m4
 		fi
 		
+		OPTIONS=""
+		if [ "${SYS_ARCH}" == "aarch64" ] && [ "$version" -lt "56" ];then
+			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
+		fi
+
 		# openssl_version=`pkg-config openssl --modversion`
 		# export PKG_CONFIG_PATH=$serverPath/lib/openssl10/lib/pkgconfig
 		if [ "$version" -lt "81" ] && [ "$sysName" != "Darwin" ];then
 			export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$serverPath/lib/openssl10/lib/pkgconfig
 		fi
 
-		if [ "$sysName" == "Darwin" ];then
+		# Darwin
+		# otool -L /Users/midoks/Desktop/mwdev/server/php/83/bin/php
+		# lldb /Users/midoks/Desktop/mwdev/server/php/83/bin/php -r 'phpinfo()'
+		# otool -L /Users/midoks/Desktop/mwdev/server/php/83/lib/php/extensions/no-debug-non-zts-20230831/openssl.so 
+		# ldd /www/server/php/83/bin/php
+
+		if [ "$version" -lt "83" ] && [ "$sysName" == "Darwin" ];then
+			BREW_DIR=`which brew`
+			BREW_DIR=${BREW_DIR/\/bin\/brew/}
+			LIB_DEPEND_DIR=`brew info openssl@1.0 | grep ${BREW_DIR}/Cellar/openssl@1.0 | cut -d \  -f 1 | awk 'END {print}'`
+			OPTIONS="$OPTIONS --with-openssl=$(brew --prefix openssl@1.0)"
+			export PKG_CONFIG_PATH=$LIB_DEPEND_DIR/lib/pkgconfig
+			export OPENSSL_CFLAGS="-I${LIB_DEPEND_DIR}/include"
+			export OPENSSL_LIBS="-L/${LIB_DEPEND_DIR}/lib -lssl -lcrypto -lz"
+
+			echo "$LIB_DEPEND_DIR/lib/pkgconfig"
+		fi
+
+		if [ "$version" -ge "84" ] &&  [ "$sysName" == "Darwin" ];then
 			BREW_DIR=`which brew`
 			BREW_DIR=${BREW_DIR/\/bin\/brew/}
 			LIB_DEPEND_DIR=`brew info openssl | grep ${BREW_DIR}/Cellar/openssl | cut -d \  -f 1 | awk 'END {print}'`
@@ -90,20 +113,16 @@ Install_lib()
 		# 	export PKG_CONFIG_PATH=$serverPath/lib/openssl/lib/pkgconfig
 		# fi
 
-		OPTIONS=""
-		if [ "${SYS_ARCH}" == "aarch64" ] && [ "$version" -lt "56" ];then
-			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
-		fi
-
+		
 		$serverPath/php/$version/bin/phpize
 		# --with-openssl
 		echo "./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS"
 		./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS
 		make clean && make && make install && make clean
 
-		# if [ -d $sourcePath/php${version} ];then
-		# 	cd ${sourcePath} && rm -rf $sourcePath/php${version}
-		# fi
+		if [ -d $sourcePath/php${version} ];then
+			cd ${sourcePath} && rm -rf $sourcePath/php${version}
+		fi
 		
 	fi
 

From 8f4fca5a6c75c57595f1efc150eeb4a462d29c49 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 05:10:44 +0800
Subject: [PATCH 473/965] update

---
 plugins/php/versions/74/install.sh | 7 ++++---
 scripts/init.d/mw.tpl              | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh
index 17ee9609e..606cb7f90 100755
--- a/plugins/php/versions/74/install.sh
+++ b/plugins/php/versions/74/install.sh
@@ -79,9 +79,10 @@ fi
 cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
-if [ $sysName == 'Darwin' ]; then
-	OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)"
-fi
+
+# if [ $sysName == 'Darwin' ]; then
+# 	OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)"
+# fi
 
 IS_64BIT=`getconf LONG_BIT`
 if [ "$IS_64BIT" == "64" ];then
diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 11d0c91d5..1919765b3 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -531,10 +531,10 @@ mw_default(){
         port=$(cat ${PANEL_DIR}/data/port.pl)
     fi
 
-    # if [ ! -f ${PANEL_DIR}/data/default.pl ];then
-    #     echo -e "\033[33mInstall Failed\033[0m"
-    #     exit 1
-    # fi
+    if [ ! -f ${PANEL_DIR}/data/default.pl ];then
+        echo -e "\033[33mInstall Failed\033[0m"
+        exit 1
+    fi
 
     password=$(cat ${PANEL_DIR}/data/default.pl)
 

From d2d79092cadc531755e2cc1047bae2577279f68e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 05:12:09 +0800
Subject: [PATCH 474/965] up

---
 plugins/php/versions/common/mcrypt.sh | 2 +-
 plugins/php/versions/phplib.conf      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/php/versions/common/mcrypt.sh b/plugins/php/versions/common/mcrypt.sh
index 19fb0aa87..f1fa160ac 100755
--- a/plugins/php/versions/common/mcrypt.sh
+++ b/plugins/php/versions/common/mcrypt.sh
@@ -22,7 +22,7 @@ if [ "$version" -lt "72" ];then
 fi 
 
 if [ "$version" == "84" ];then
-	LIBV=1.0.7
+	LIBV=1.0.6
 fi 
 
 
diff --git a/plugins/php/versions/phplib.conf b/plugins/php/versions/phplib.conf
index f74c87cc5..9e993fdd0 100755
--- a/plugins/php/versions/phplib.conf
+++ b/plugins/php/versions/phplib.conf
@@ -160,8 +160,7 @@
             "80",
             "81",
             "82",
-            "83",
-            "84"
+            "83"
         ],
         "type": "通用扩展",
         "msg": "加密软件!",

From db79be96edbc6cd7da5789303f8a57febe5930cf Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 05:16:39 +0800
Subject: [PATCH 475/965] Update mcrypt.sh

---
 plugins/php/versions/common/mcrypt.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/plugins/php/versions/common/mcrypt.sh b/plugins/php/versions/common/mcrypt.sh
index f1fa160ac..697b69b99 100755
--- a/plugins/php/versions/common/mcrypt.sh
+++ b/plugins/php/versions/common/mcrypt.sh
@@ -14,7 +14,7 @@ actionType=$1
 version=$2
 
 LIBNAME=mcrypt
-LIBV=1.0.6
+LIBV=1.0.7
 
 if [ "$version" -lt "72" ];then
 	echo "not need"
@@ -22,7 +22,9 @@ if [ "$version" -lt "72" ];then
 fi 
 
 if [ "$version" == "84" ];then
-	LIBV=1.0.6
+	LIBV=1.0.7
+	echo "not need"
+	exit 1
 fi 
 
 
@@ -70,7 +72,12 @@ Install_lib()
 		fi
 
 		if [ "$sysName" == "Darwin" ];then
+
+			BREW_DIR=`which brew`
+			BREW_DIR=${BREW_DIR/\/bin\/brew/}
+			LIB_DEPEND_DIR=`brew info mcrypt | grep ${BREW_DIR}/Cellar/mcrypt | cut -d \  -f 1 | awk 'END {print}'`
 			OPTIONS="$OPTIONS --with-mcrypt=$(brew --prefix mcrypt)"
+			export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$LIB_DEPEND_DIR/lib/pkgconfig
 		fi
 
 		$serverPath/php/$version/bin/phpize

From 6436a933c9b56c2f00245a750a3ab14541f356c0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 05:19:53 +0800
Subject: [PATCH 476/965] Update panel_task.py

---
 panel_task.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/panel_task.py b/panel_task.py
index 441572d4c..9f46ab710 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -102,7 +102,9 @@ def runPanelTask():
                 end = int(time.time())
                 thisdb.setTaskData(run_task['id'], end=end)
                 thisdb.setTaskStatus(run_task['id'], 1)
-            os.remove(lock_file)
+
+            if thisdb.getTaskUnexecutedCount() < 1:
+                os.remove(lock_file)
     except Exception as e:
         pass
 

From 96d5a817d5b317feb09c44d8f120bec78f6398c7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 15:31:26 +0800
Subject: [PATCH 477/965] Update install.sh

---
 plugins/memcached/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/memcached/install.sh b/plugins/memcached/install.sh
index ec5c8e65f..490dde8ca 100755
--- a/plugins/memcached/install.sh
+++ b/plugins/memcached/install.sh
@@ -9,7 +9,7 @@ serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
 sys_os=`uname`
-VERSION=1.6.29
+VERSION=1.6.32
 
 echo $sys_os
 

From d62531c7006a1f833ea552c1c1cece1800fd3413 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 15:31:37 +0800
Subject: [PATCH 478/965] Update info.json

---
 plugins/memcached/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/memcached/info.json b/plugins/memcached/info.json
index b0a9b6463..389213894 100755
--- a/plugins/memcached/info.json
+++ b/plugins/memcached/info.json
@@ -5,7 +5,7 @@
 	"title": "Memcached",
 	"shell": "install.sh",
 	"versions":["1.6"],
-	"updates":["1.6.21"],
+	"updates":["1.6.32"],
 	"tip": "soft",
 	"checks": "server/memcached",
 	"path":"server/memcached",

From b8d6d9ed60f0f92d1c71b5b67176be368582a515 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 15:54:29 +0800
Subject: [PATCH 479/965] update

---
 plugins/redis/info.json  | 4 ++--
 plugins/redis/install.sh | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/redis/info.json b/plugins/redis/info.json
index 4793a12d7..334e636a9 100755
--- a/plugins/redis/info.json
+++ b/plugins/redis/info.json
@@ -4,8 +4,8 @@
 	"name": "redis",
 	"title": "Redis",
 	"shell": "install.sh",
-	"versions":["4.0.14","5.0.9","6.0.9","6.2.9","7.0.15","7.2.5"],
-	"updates":["4.0.14","5.0.9","6.0.9","6.2.9","7.0.15","7.2.5"],
+	"versions":["4.0.14","5.0.9","6.0.9","6.2.9","7.0.15","7.2.6", "7.4.1"],
+	"updates":["4.0.14","5.0.9","6.0.9","6.2.9","7.0.15","7.2.6", "7.4.1"],
 	"tip": "soft",
 	"checks": "server/redis",
 	"path": "server/redis",
diff --git a/plugins/redis/install.sh b/plugins/redis/install.sh
index 444726156..0ec2ecd72 100755
--- a/plugins/redis/install.sh
+++ b/plugins/redis/install.sh
@@ -18,12 +18,11 @@ serverPath=$(dirname "$rootPath")
 # /Users/midoks/Desktop/mwdev/server/redis/bin/redis-cli -h 127.0.0.1 -p 6399
 # /www/server/redis/bin/redis-cli -h 127.0.0.1 -p 6399
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 Install_App()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 	mkdir -p $serverPath/source/redis
 

From 70507e9f652f61a00ef7a038c32d4963abfd251c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 16:05:06 +0800
Subject: [PATCH 480/965] Update index.py

---
 plugins/redis/index.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/redis/index.py b/plugins/redis/index.py
index 494064594..b52f33d74 100755
--- a/plugins/redis/index.py
+++ b/plugins/redis/index.py
@@ -133,7 +133,7 @@ def contentReplace(content):
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
@@ -158,8 +158,7 @@ def initDreplace():
     if not os.path.exists(dst_conf_init):
         conf_content = mw.readFile(getConfTpl())
         conf_content = conf_content.replace('{$SERVER_PATH}', service_path)
-        conf_content = conf_content.replace(
-            '{$REDIS_PASS}', mw.getRandomString(10))
+        conf_content = conf_content.replace('{$REDIS_PASS}', mw.getRandomString(10))
 
         mw.writeFile(dst_conf, conf_content)
         mw.writeFile(dst_conf_init, 'ok')

From 4826dbd8a957939409756b775e11e0ec390c98fe Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 16:05:27 +0800
Subject: [PATCH 481/965] Update index.py

---
 plugins/redis/index.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/redis/index.py b/plugins/redis/index.py
index b52f33d74..cc3ea8742 100755
--- a/plugins/redis/index.py
+++ b/plugins/redis/index.py
@@ -169,9 +169,9 @@ def initDreplace():
     if os.path.exists(systemDir) and not os.path.exists(systemService):
         systemServiceTpl = getPluginDir() + '/init.d/' + getPluginName() + '.service.tpl'
         service_path = mw.getServerDir()
-        se_content = mw.readFile(systemServiceTpl)
-        se_content = se_content.replace('{$SERVER_PATH}', service_path)
-        mw.writeFile(systemService, se_content)
+        content = mw.readFile(systemServiceTpl)
+        content = content.replace('{$SERVER_PATH}', service_path)
+        mw.writeFile(systemService, content)
         mw.execShell('systemctl daemon-reload')
 
     return file_bin

From 777bfa1145cc4e3968f2939c23511adb7157f2f1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 16:06:02 +0800
Subject: [PATCH 482/965] Update index.py

---
 plugins/redis/index.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/redis/index.py b/plugins/redis/index.py
index cc3ea8742..914bdcc16 100755
--- a/plugins/redis/index.py
+++ b/plugins/redis/index.py
@@ -150,6 +150,7 @@ def initDreplace():
     # log
     dataLog = getServerDir() + '/data'
     if not os.path.exists(dataLog):
+        mw.execShell('mkdir -p ' + dataLog)
         mw.execShell('chmod +x ' + file_bin)
 
     # config replace

From 0903589e5b06b1a7a250141011b1b4c009b284cf Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 17:04:09 +0800
Subject: [PATCH 483/965] Update info.json

---
 plugins/redis/info.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/redis/info.json b/plugins/redis/info.json
index 334e636a9..9ede6b27c 100755
--- a/plugins/redis/info.json
+++ b/plugins/redis/info.json
@@ -4,8 +4,8 @@
 	"name": "redis",
 	"title": "Redis",
 	"shell": "install.sh",
-	"versions":["4.0.14","5.0.9","6.0.9","6.2.9","7.0.15","7.2.6", "7.4.1"],
-	"updates":["4.0.14","5.0.9","6.0.9","6.2.9","7.0.15","7.2.6", "7.4.1"],
+	"versions":["4.0.14","5.0.14","6.0.20","6.2.16","7.0.15","7.2.6", "7.4.1"],
+	"updates":["4.0.14","5.0.14","6.0.20","6.2.16","7.0.15","7.2.6", "7.4.1"],
 	"tip": "soft",
 	"checks": "server/redis",
 	"path": "server/redis",

From 79c8081c307a611a4d90aa2a955c7260263be74e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 17:04:15 +0800
Subject: [PATCH 484/965] Update index.py

---
 plugins/redis/index.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/plugins/redis/index.py b/plugins/redis/index.py
index 914bdcc16..a0c361030 100755
--- a/plugins/redis/index.py
+++ b/plugins/redis/index.py
@@ -224,7 +224,7 @@ def getPort():
     conf = getServerDir() + '/redis.conf'
     content = mw.readFile(conf)
 
-    rep = r"^(" + r'port' + r')\s*([.0-9A-Za-z_& ~]+)'
+    rep = r"^(" + r'port' + r'\)\s*([.0-9A-Za-z_& ~]+)'
     tmp = re.search(rep, content, re.M)
     if tmp:
         return tmp.groups()[1]
@@ -236,7 +236,7 @@ def getRedisCmd():
     requirepass = ""
     conf = getServerDir() + '/redis.conf'
     content = mw.readFile(conf)
-    rep = r"^(requirepass" + r')\s*([.0-9A-Za-z_& ~]+)'
+    rep = r"^(requirepass" + r"\)\s*([.0-9A-Za-z_& ~]+)"
     tmp = re.search(rep, content, re.M)
     if tmp:
         requirepass = tmp.groups()[1]
@@ -246,12 +246,10 @@ def getRedisCmd():
     # findDebian = mw.execShell('cat /etc/issue |grep Debian')
     # if findDebian[0] != '':
     #     default_ip = mw.getLocalIp()
-    cmd = getServerDir() + "/bin/redis-cli -h " + \
-        default_ip + ' -p ' + port + " "
+    cmd = getServerDir() + "/bin/redis-cli -h " + default_ip + ' -p ' + port + " "
 
     if requirepass != "":
-        cmd = getServerDir() + '/bin/redis-cli -h ' + default_ip + \
-            ' -p ' + port + ' -a "' + requirepass + '" '
+        cmd = getServerDir() + '/bin/redis-cli -h ' + default_ip + ' -p ' + port + ' -a "' + requirepass + '" '
 
     return cmd
 

From 637a4dacb9df2bb73594b311bee1b4a1040877e4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 17:11:28 +0800
Subject: [PATCH 485/965] update

---
 plugins/mongodb/index.py                 |   2 +-
 plugins/mongodb/info.json                |   2 +-
 plugins/mongodb/versions/8.0/centos.sh   | 108 +++++++++++++++++++++++
 plugins/mongodb/versions/8.0/debian.sh   |  96 ++++++++++++++++++++
 plugins/mongodb/versions/8.0/euler.sh    | 108 +++++++++++++++++++++++
 plugins/mongodb/versions/8.0/macos.sh    |  81 +++++++++++++++++
 plugins/mongodb/versions/8.0/opensuse.sh |  95 ++++++++++++++++++++
 plugins/mongodb/versions/8.0/ubuntu.sh   |  91 +++++++++++++++++++
 8 files changed, 581 insertions(+), 2 deletions(-)
 create mode 100644 plugins/mongodb/versions/8.0/centos.sh
 create mode 100644 plugins/mongodb/versions/8.0/debian.sh
 create mode 100644 plugins/mongodb/versions/8.0/euler.sh
 create mode 100644 plugins/mongodb/versions/8.0/macos.sh
 create mode 100644 plugins/mongodb/versions/8.0/opensuse.sh
 create mode 100644 plugins/mongodb/versions/8.0/ubuntu.sh

diff --git a/plugins/mongodb/index.py b/plugins/mongodb/index.py
index 07a1b5a3c..3396e44e3 100755
--- a/plugins/mongodb/index.py
+++ b/plugins/mongodb/index.py
@@ -226,7 +226,7 @@ def initDreplace():
         mw.execShell("chmod 400 "+mg_key)
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
diff --git a/plugins/mongodb/info.json b/plugins/mongodb/info.json
index 70fd76297..46b147829 100755
--- a/plugins/mongodb/info.json
+++ b/plugins/mongodb/info.json
@@ -7,7 +7,7 @@
 	"shell": "install.sh",
 	"install_pre_inspection":true,
 	"uninstall_pre_inspection":true,
-	"versions":["4.4","5.0","6.0","7.0"],
+	"versions":["4.4","5.0","6.0","7.0","8.0"],
 	"tip": "soft",
 	"checks": "server/mongodb",
 	"path": "server/mongodb",
diff --git a/plugins/mongodb/versions/8.0/centos.sh b/plugins/mongodb/versions/8.0/centos.sh
new file mode 100644
index 000000000..ddbcf22be
--- /dev/null
+++ b/plugins/mongodb/versions/8.0/centos.sh
@@ -0,0 +1,108 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+VERSION=7.0.14
+SYS_ARCH=`arch`
+
+SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+SYS_NAME=${SYS_VERSION_ID/./}
+SYS_NAME_LEN=`echo "$SYS_NAME" | wc -L`
+
+if [ "$SYS_NAME_LEN" == "1" ];then
+	SYS_NAME=${SYS_NAME}0	
+fi
+
+if [ "$SYS_ARCH" == "aarch64" ];then
+	if [ "$SYS_NAME" -gt "90" ];then
+		SYS_NAME="90"
+	fi
+
+	if [ "$SYS_NAME" -lt "82" ];then
+		SYS_NAME="82"
+	fi
+else
+
+	if [ "$SYS_NAME" -gt "90" ];then
+		SYS_NAME="90"
+	fi
+
+	if [ "$SYS_NAME" -lt "70" ];then
+		SYS_NAME="70"
+	fi
+fi
+
+MG_DIR=$serverPath/source/mongodb
+mkdir -p $MG_DIR
+
+FILE_NAME=mongodb-linux-${SYS_ARCH}-rhel${SYS_NAME}-${VERSION}
+FILE_NAME_TGZ=${FILE_NAME}.tgz
+
+if [ ! -f $MG_DIR/${FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${FILE_NAME} ];then 
+	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
+fi
+
+if [ ! -d  $serverPath/mongodb/bin ];then
+	mkdir -p $serverPath/mongodb
+	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+fi
+
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-rhel90-aarch64-100.9.4.tgz
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-rhel90-x86_64-100.9.4.tgz
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-rhel83-s390x-100.9.4.tgz
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-rhel${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-rhel${SYS_NAME}-aarch64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-rhel${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
diff --git a/plugins/mongodb/versions/8.0/debian.sh b/plugins/mongodb/versions/8.0/debian.sh
new file mode 100644
index 000000000..3b5e0b18b
--- /dev/null
+++ b/plugins/mongodb/versions/8.0/debian.sh
@@ -0,0 +1,96 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+VERSION=7.0.14
+SYS_ARCH=`arch`
+SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+SYS_NAME=${SYS_VERSION_ID/./}
+
+
+if [ "$SYS_NAME" -gt "11" ];then
+	SYS_NAME="11"
+fi
+
+if [ "$SYS_NAME" -lt "11" ];then
+	SYS_NAME="11"
+fi
+
+if [ "$SYS_NAME" == "" ];then
+	SYS_NAME="11"
+fi
+
+FILE_NAME=mongodb-linux-${SYS_ARCH}-debian${SYS_NAME}-${VERSION}
+FILE_NAME_TGZ=${FILE_NAME}.tgz
+
+
+MG_DIR=$serverPath/source/mongodb
+mkdir -p $MG_DIR
+
+if [ ! -f $MG_DIR/${FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
+fi
+
+if [ ! -d  $serverPath/mongodb/bin ];then
+	mkdir -p $serverPath/mongodb
+	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+fi
+
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-debian${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-debian${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-debian${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
diff --git a/plugins/mongodb/versions/8.0/euler.sh b/plugins/mongodb/versions/8.0/euler.sh
new file mode 100644
index 000000000..ddbcf22be
--- /dev/null
+++ b/plugins/mongodb/versions/8.0/euler.sh
@@ -0,0 +1,108 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+VERSION=7.0.14
+SYS_ARCH=`arch`
+
+SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+SYS_NAME=${SYS_VERSION_ID/./}
+SYS_NAME_LEN=`echo "$SYS_NAME" | wc -L`
+
+if [ "$SYS_NAME_LEN" == "1" ];then
+	SYS_NAME=${SYS_NAME}0	
+fi
+
+if [ "$SYS_ARCH" == "aarch64" ];then
+	if [ "$SYS_NAME" -gt "90" ];then
+		SYS_NAME="90"
+	fi
+
+	if [ "$SYS_NAME" -lt "82" ];then
+		SYS_NAME="82"
+	fi
+else
+
+	if [ "$SYS_NAME" -gt "90" ];then
+		SYS_NAME="90"
+	fi
+
+	if [ "$SYS_NAME" -lt "70" ];then
+		SYS_NAME="70"
+	fi
+fi
+
+MG_DIR=$serverPath/source/mongodb
+mkdir -p $MG_DIR
+
+FILE_NAME=mongodb-linux-${SYS_ARCH}-rhel${SYS_NAME}-${VERSION}
+FILE_NAME_TGZ=${FILE_NAME}.tgz
+
+if [ ! -f $MG_DIR/${FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${FILE_NAME} ];then 
+	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
+fi
+
+if [ ! -d  $serverPath/mongodb/bin ];then
+	mkdir -p $serverPath/mongodb
+	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+fi
+
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-rhel90-aarch64-100.9.4.tgz
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-rhel90-x86_64-100.9.4.tgz
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-rhel83-s390x-100.9.4.tgz
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-rhel${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-rhel${SYS_NAME}-aarch64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-rhel${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
diff --git a/plugins/mongodb/versions/8.0/macos.sh b/plugins/mongodb/versions/8.0/macos.sh
new file mode 100644
index 000000000..6df92f5d4
--- /dev/null
+++ b/plugins/mongodb/versions/8.0/macos.sh
@@ -0,0 +1,81 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+SYS_ARCH=`arch`
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+VERSION=7.0.14
+
+MG_DIR=$serverPath/source/mongodb
+mkdir -p $MG_DIR
+
+if [ ! -f $MG_DIR/mongodb-macos-x86_64-${VERSION}.tgz ]; then
+	wget --no-check-certificate -O $MG_DIR/mongodb-macos-x86_64-${VERSION}.tgz https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${VERSION}.tgz
+	echo "wget --no-check-certificate -O $MG_DIR/mongodb-macos-x86_64-${VERSION}.tgz https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${VERSION}.tgz"
+fi
+
+if [ ! -d $MG_DIR/mongodb-macos-x86_64-${VERSION} ];then 
+	cd $MG_DIR && tar -zxvf mongodb-macos-x86_64-${VERSION}.tgz
+fi
+
+if [ ! -d $serverPath/mongodb/bin ];then
+	mkdir -p $serverPath/mongodb
+	cd $MG_DIR/mongodb-macos-x86_64-${VERSION} && cp -rf ./bin $serverPath/mongodb
+fi
+
+# https://downloads.mongodb.com/compass/mongosh-2.2.5-darwin-x64.zip
+# https://downloads.mongodb.com/compass/mongosh-2.2.5-darwin-arm64.zip
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-darwin-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-darwin-arm64
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-darwin-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.zip
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && unzip ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+
+
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-macos-arm64-100.9.4.zip
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-macos-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-macos-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-macos-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.zip
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && unzip ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
\ No newline at end of file
diff --git a/plugins/mongodb/versions/8.0/opensuse.sh b/plugins/mongodb/versions/8.0/opensuse.sh
new file mode 100644
index 000000000..66f8ee4b8
--- /dev/null
+++ b/plugins/mongodb/versions/8.0/opensuse.sh
@@ -0,0 +1,95 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+VERSION=7.0.14
+SYS_ARCH=`arch`
+
+SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}' | awk -F . '{print $1}'`
+
+SYS_NAME="15"
+if [ "$SYS_VERSION_ID" -gt "15" ];then
+	SYS_NAME="15"
+fi
+
+if [ "$SYS_NAME" -lt "12" ];then
+	SYS_NAME="12"
+fi
+
+# https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-suse15-4.4.23.tgz
+# https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-suse12-4.4.23.tgz
+
+MG_DIR=$serverPath/source/mongodb
+mkdir -p $MG_DIR
+
+FILE_NAME=mongodb-linux-${SYS_ARCH}-suse${SYS_NAME}-${VERSION}
+FILE_NAME_TGZ=${FILE_NAME}.tgz
+
+if [ ! -f $MG_DIR/${FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${FILE_NAME} ];then 
+	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
+fi
+
+if [ ! -d  $serverPath/mongodb/bin ];then
+	mkdir -p $serverPath/mongodb
+	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+fi
+
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-suse12-x86_64-100.9.4.tgz
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-suse${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-suse${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-suse${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
diff --git a/plugins/mongodb/versions/8.0/ubuntu.sh b/plugins/mongodb/versions/8.0/ubuntu.sh
new file mode 100644
index 000000000..a5d10a5be
--- /dev/null
+++ b/plugins/mongodb/versions/8.0/ubuntu.sh
@@ -0,0 +1,91 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+VERSION=8.0.3
+SYS_ARCH=`arch`
+
+SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+SYS_NAME=${SYS_VERSION_ID/./}
+# https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-4.4.23.tgz
+
+if [ "$SYS_NAME" -gt "2204" ];then
+	SYS_NAME="2204"
+fi
+
+if [ "$SYS_NAME" -lt "2004" ];then
+	SYS_NAME="2004"
+fi
+
+MG_DIR=$serverPath/source/mongodb
+mkdir -p $MG_DIR
+
+FILE_NAME=mongodb-linux-${SYS_ARCH}-ubuntu${SYS_NAME}-${VERSION}
+FILE_NAME_TGZ=${FILE_NAME}.tgz
+
+if [ ! -f $MG_DIR/${FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${FILE_NAME} ];then 
+	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
+fi
+
+if [ ! -d  $serverPath/mongodb/bin ];then
+	mkdir -p $serverPath/mongodb
+	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+fi
+
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu2204-x86_64-100.9.4.tgz
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
\ No newline at end of file

From a660014740eca98b223451e933573146e463cd74 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 17:15:07 +0800
Subject: [PATCH 486/965] update

---
 plugins/mongodb/versions/5.0/centos.sh   | 2 +-
 plugins/mongodb/versions/5.0/debian.sh   | 2 +-
 plugins/mongodb/versions/5.0/macos.sh    | 2 +-
 plugins/mongodb/versions/5.0/opensuse.sh | 2 +-
 plugins/mongodb/versions/5.0/ubuntu.sh   | 2 +-
 plugins/mongodb/versions/6.0/debian.sh   | 2 +-
 plugins/mongodb/versions/6.0/macos.sh    | 2 +-
 plugins/mongodb/versions/6.0/opensuse.sh | 2 +-
 plugins/mongodb/versions/6.0/ubuntu.sh   | 2 +-
 plugins/mongodb/versions/7.0/centos.sh   | 2 +-
 plugins/mongodb/versions/7.0/debian.sh   | 2 +-
 plugins/mongodb/versions/7.0/euler.sh    | 2 +-
 plugins/mongodb/versions/7.0/macos.sh    | 3 +--
 plugins/mongodb/versions/7.0/opensuse.sh | 3 +--
 plugins/mongodb/versions/7.0/ubuntu.sh   | 3 +--
 plugins/mongodb/versions/8.0/centos.sh   | 2 +-
 16 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/plugins/mongodb/versions/5.0/centos.sh b/plugins/mongodb/versions/5.0/centos.sh
index 7d16d1e9d..7a3041691 100644
--- a/plugins/mongodb/versions/5.0/centos.sh
+++ b/plugins/mongodb/versions/5.0/centos.sh
@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=5.0.29
+VERSION=5.0.30
 SYS_ARCH=`arch`
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
diff --git a/plugins/mongodb/versions/5.0/debian.sh b/plugins/mongodb/versions/5.0/debian.sh
index 664cc763b..044fa39d6 100644
--- a/plugins/mongodb/versions/5.0/debian.sh
+++ b/plugins/mongodb/versions/5.0/debian.sh
@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=5.0.29
+VERSION=5.0.30
 SYS_ARCH=`arch`
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 SYS_NAME=${SYS_VERSION_ID/./}
diff --git a/plugins/mongodb/versions/5.0/macos.sh b/plugins/mongodb/versions/5.0/macos.sh
index 819392c1f..d2df41f84 100644
--- a/plugins/mongodb/versions/5.0/macos.sh
+++ b/plugins/mongodb/versions/5.0/macos.sh
@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=5.0.29
+VERSION=5.0.30
 
 MG_DIR=$serverPath/source/mongodb
 mkdir -p $MG_DIR
diff --git a/plugins/mongodb/versions/5.0/opensuse.sh b/plugins/mongodb/versions/5.0/opensuse.sh
index 260de1bc6..d5f914029 100644
--- a/plugins/mongodb/versions/5.0/opensuse.sh
+++ b/plugins/mongodb/versions/5.0/opensuse.sh
@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=5.0.29
+VERSION=5.0.30
 SYS_ARCH=`arch`
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}' | awk -F . '{print $1}'`
diff --git a/plugins/mongodb/versions/5.0/ubuntu.sh b/plugins/mongodb/versions/5.0/ubuntu.sh
index d59417dbf..17e51fb8a 100644
--- a/plugins/mongodb/versions/5.0/ubuntu.sh
+++ b/plugins/mongodb/versions/5.0/ubuntu.sh
@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=5.0.29
+VERSION=5.0.30
 SYS_ARCH=`arch`
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
diff --git a/plugins/mongodb/versions/6.0/debian.sh b/plugins/mongodb/versions/6.0/debian.sh
index 507dc023e..b71774f4c 100644
--- a/plugins/mongodb/versions/6.0/debian.sh
+++ b/plugins/mongodb/versions/6.0/debian.sh
@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=6.0.18
+VERSION=6.0.19
 SYS_ARCH=`arch`
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 SYS_NAME=${SYS_VERSION_ID/./}
diff --git a/plugins/mongodb/versions/6.0/macos.sh b/plugins/mongodb/versions/6.0/macos.sh
index f6e2c64a3..2427bffb7 100644
--- a/plugins/mongodb/versions/6.0/macos.sh
+++ b/plugins/mongodb/versions/6.0/macos.sh
@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=6.0.18
+VERSION=6.0.19
 
 MG_DIR=$serverPath/source/mongodb
 mkdir -p $MG_DIR
diff --git a/plugins/mongodb/versions/6.0/opensuse.sh b/plugins/mongodb/versions/6.0/opensuse.sh
index f8fc098a5..104da1c4c 100644
--- a/plugins/mongodb/versions/6.0/opensuse.sh
+++ b/plugins/mongodb/versions/6.0/opensuse.sh
@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=6.0.18
+VERSION=6.0.19
 SYS_ARCH=`arch`
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}' | awk -F . '{print $1}'`
diff --git a/plugins/mongodb/versions/6.0/ubuntu.sh b/plugins/mongodb/versions/6.0/ubuntu.sh
index c6d524ebc..15dfa7af2 100644
--- a/plugins/mongodb/versions/6.0/ubuntu.sh
+++ b/plugins/mongodb/versions/6.0/ubuntu.sh
@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=6.0.18
+VERSION=6.0.19
 SYS_ARCH=`arch`
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
diff --git a/plugins/mongodb/versions/7.0/centos.sh b/plugins/mongodb/versions/7.0/centos.sh
index ddbcf22be..f3805a0a3 100644
--- a/plugins/mongodb/versions/7.0/centos.sh
+++ b/plugins/mongodb/versions/7.0/centos.sh
@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=7.0.14
+VERSION=7.0.15
 SYS_ARCH=`arch`
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
diff --git a/plugins/mongodb/versions/7.0/debian.sh b/plugins/mongodb/versions/7.0/debian.sh
index 3b5e0b18b..e820e6ac3 100644
--- a/plugins/mongodb/versions/7.0/debian.sh
+++ b/plugins/mongodb/versions/7.0/debian.sh
@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=7.0.14
+VERSION=7.0.15
 SYS_ARCH=`arch`
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 SYS_NAME=${SYS_VERSION_ID/./}
diff --git a/plugins/mongodb/versions/7.0/euler.sh b/plugins/mongodb/versions/7.0/euler.sh
index ddbcf22be..f3805a0a3 100644
--- a/plugins/mongodb/versions/7.0/euler.sh
+++ b/plugins/mongodb/versions/7.0/euler.sh
@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=7.0.14
+VERSION=7.0.15
 SYS_ARCH=`arch`
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
diff --git a/plugins/mongodb/versions/7.0/macos.sh b/plugins/mongodb/versions/7.0/macos.sh
index 6df92f5d4..5ae23731b 100644
--- a/plugins/mongodb/versions/7.0/macos.sh
+++ b/plugins/mongodb/versions/7.0/macos.sh
@@ -9,8 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 SYS_ARCH=`arch`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=7.0.14
+VERSION=7.0.15
 
 MG_DIR=$serverPath/source/mongodb
 mkdir -p $MG_DIR
diff --git a/plugins/mongodb/versions/7.0/opensuse.sh b/plugins/mongodb/versions/7.0/opensuse.sh
index 66f8ee4b8..22d1db08a 100644
--- a/plugins/mongodb/versions/7.0/opensuse.sh
+++ b/plugins/mongodb/versions/7.0/opensuse.sh
@@ -8,8 +8,7 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=7.0.14
+VERSION=7.0.15
 SYS_ARCH=`arch`
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}' | awk -F . '{print $1}'`
diff --git a/plugins/mongodb/versions/7.0/ubuntu.sh b/plugins/mongodb/versions/7.0/ubuntu.sh
index 1592d6e3c..9ea088118 100644
--- a/plugins/mongodb/versions/7.0/ubuntu.sh
+++ b/plugins/mongodb/versions/7.0/ubuntu.sh
@@ -8,8 +8,7 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=7.0.14
+VERSION=7.0.15
 SYS_ARCH=`arch`
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
diff --git a/plugins/mongodb/versions/8.0/centos.sh b/plugins/mongodb/versions/8.0/centos.sh
index ddbcf22be..adf50ec71 100644
--- a/plugins/mongodb/versions/8.0/centos.sh
+++ b/plugins/mongodb/versions/8.0/centos.sh
@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=7.0.14
+VERSION=8.0.3
 SYS_ARCH=`arch`
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`

From ad503863ad35aedb0a8438e57dd2283677d15238 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 17:16:23 +0800
Subject: [PATCH 487/965] update

---
 plugins/mongodb/versions/4.4/centos.sh   | 1 -
 plugins/mongodb/versions/4.4/debian.sh   | 1 -
 plugins/mongodb/versions/4.4/macos.sh    | 1 -
 plugins/mongodb/versions/4.4/opensuse.sh | 1 -
 plugins/mongodb/versions/4.4/rhel.sh     | 1 -
 plugins/mongodb/versions/4.4/ubuntu.sh   | 1 -
 plugins/mongodb/versions/5.0/centos.sh   | 1 -
 plugins/mongodb/versions/5.0/debian.sh   | 1 -
 plugins/mongodb/versions/5.0/macos.sh    | 1 -
 plugins/mongodb/versions/5.0/opensuse.sh | 1 -
 plugins/mongodb/versions/5.0/ubuntu.sh   | 1 -
 plugins/mongodb/versions/6.0/centos.sh   | 3 +--
 plugins/mongodb/versions/6.0/debian.sh   | 1 -
 plugins/mongodb/versions/6.0/macos.sh    | 1 -
 plugins/mongodb/versions/6.0/opensuse.sh | 1 -
 plugins/mongodb/versions/6.0/ubuntu.sh   | 1 -
 plugins/mongodb/versions/7.0/centos.sh   | 1 -
 plugins/mongodb/versions/7.0/debian.sh   | 1 -
 plugins/mongodb/versions/7.0/euler.sh    | 1 -
 plugins/mongodb/versions/8.0/centos.sh   | 1 -
 plugins/mongodb/versions/8.0/debian.sh   | 3 +--
 plugins/mongodb/versions/8.0/euler.sh    | 3 +--
 plugins/mongodb/versions/8.0/macos.sh    | 3 +--
 plugins/mongodb/versions/8.0/opensuse.sh | 3 +--
 plugins/mongodb/versions/8.0/ubuntu.sh   | 1 -
 25 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/plugins/mongodb/versions/4.4/centos.sh b/plugins/mongodb/versions/4.4/centos.sh
index c9fdf25b4..7d79c8eeb 100644
--- a/plugins/mongodb/versions/4.4/centos.sh
+++ b/plugins/mongodb/versions/4.4/centos.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=4.4.23
 SYS_ARCH=`arch`
 
diff --git a/plugins/mongodb/versions/4.4/debian.sh b/plugins/mongodb/versions/4.4/debian.sh
index b890c6ef2..8647f8c05 100644
--- a/plugins/mongodb/versions/4.4/debian.sh
+++ b/plugins/mongodb/versions/4.4/debian.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=4.4.23
 SYS_ARCH=`arch`
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
diff --git a/plugins/mongodb/versions/4.4/macos.sh b/plugins/mongodb/versions/4.4/macos.sh
index df28a3da5..1c2ff9a70 100644
--- a/plugins/mongodb/versions/4.4/macos.sh
+++ b/plugins/mongodb/versions/4.4/macos.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=4.4.23
 
 MG_DIR=$serverPath/source/mongodb
diff --git a/plugins/mongodb/versions/4.4/opensuse.sh b/plugins/mongodb/versions/4.4/opensuse.sh
index b9ef65cd4..016ba6cbb 100644
--- a/plugins/mongodb/versions/4.4/opensuse.sh
+++ b/plugins/mongodb/versions/4.4/opensuse.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=4.4.23
 SYS_ARCH=`arch`
 
diff --git a/plugins/mongodb/versions/4.4/rhel.sh b/plugins/mongodb/versions/4.4/rhel.sh
index c28adbc8f..6413d0639 100644
--- a/plugins/mongodb/versions/4.4/rhel.sh
+++ b/plugins/mongodb/versions/4.4/rhel.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=4.4.23
 SYS_ARCH=`arch`
 
diff --git a/plugins/mongodb/versions/4.4/ubuntu.sh b/plugins/mongodb/versions/4.4/ubuntu.sh
index db969ee75..4dd2b3423 100644
--- a/plugins/mongodb/versions/4.4/ubuntu.sh
+++ b/plugins/mongodb/versions/4.4/ubuntu.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=4.4.23
 SYS_ARCH=`arch`
 
diff --git a/plugins/mongodb/versions/5.0/centos.sh b/plugins/mongodb/versions/5.0/centos.sh
index 7a3041691..4ecaf059f 100644
--- a/plugins/mongodb/versions/5.0/centos.sh
+++ b/plugins/mongodb/versions/5.0/centos.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=5.0.30
 SYS_ARCH=`arch`
 
diff --git a/plugins/mongodb/versions/5.0/debian.sh b/plugins/mongodb/versions/5.0/debian.sh
index 044fa39d6..bfc72cf2a 100644
--- a/plugins/mongodb/versions/5.0/debian.sh
+++ b/plugins/mongodb/versions/5.0/debian.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=5.0.30
 SYS_ARCH=`arch`
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
diff --git a/plugins/mongodb/versions/5.0/macos.sh b/plugins/mongodb/versions/5.0/macos.sh
index d2df41f84..8f811860d 100644
--- a/plugins/mongodb/versions/5.0/macos.sh
+++ b/plugins/mongodb/versions/5.0/macos.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=5.0.30
 
 MG_DIR=$serverPath/source/mongodb
diff --git a/plugins/mongodb/versions/5.0/opensuse.sh b/plugins/mongodb/versions/5.0/opensuse.sh
index d5f914029..af3e43044 100644
--- a/plugins/mongodb/versions/5.0/opensuse.sh
+++ b/plugins/mongodb/versions/5.0/opensuse.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=5.0.30
 SYS_ARCH=`arch`
 
diff --git a/plugins/mongodb/versions/5.0/ubuntu.sh b/plugins/mongodb/versions/5.0/ubuntu.sh
index 17e51fb8a..1b5ef0315 100644
--- a/plugins/mongodb/versions/5.0/ubuntu.sh
+++ b/plugins/mongodb/versions/5.0/ubuntu.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=5.0.30
 SYS_ARCH=`arch`
 
diff --git a/plugins/mongodb/versions/6.0/centos.sh b/plugins/mongodb/versions/6.0/centos.sh
index d77a133fa..8c836bb6c 100644
--- a/plugins/mongodb/versions/6.0/centos.sh
+++ b/plugins/mongodb/versions/6.0/centos.sh
@@ -8,8 +8,7 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=6.0.9
+VERSION=6.0.19
 SYS_ARCH=`arch`
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
diff --git a/plugins/mongodb/versions/6.0/debian.sh b/plugins/mongodb/versions/6.0/debian.sh
index b71774f4c..b0590596b 100644
--- a/plugins/mongodb/versions/6.0/debian.sh
+++ b/plugins/mongodb/versions/6.0/debian.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=6.0.19
 SYS_ARCH=`arch`
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
diff --git a/plugins/mongodb/versions/6.0/macos.sh b/plugins/mongodb/versions/6.0/macos.sh
index 2427bffb7..ed763d4ce 100644
--- a/plugins/mongodb/versions/6.0/macos.sh
+++ b/plugins/mongodb/versions/6.0/macos.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=6.0.19
 
 MG_DIR=$serverPath/source/mongodb
diff --git a/plugins/mongodb/versions/6.0/opensuse.sh b/plugins/mongodb/versions/6.0/opensuse.sh
index 104da1c4c..5262433b3 100644
--- a/plugins/mongodb/versions/6.0/opensuse.sh
+++ b/plugins/mongodb/versions/6.0/opensuse.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=6.0.19
 SYS_ARCH=`arch`
 
diff --git a/plugins/mongodb/versions/6.0/ubuntu.sh b/plugins/mongodb/versions/6.0/ubuntu.sh
index 15dfa7af2..b754a49b8 100644
--- a/plugins/mongodb/versions/6.0/ubuntu.sh
+++ b/plugins/mongodb/versions/6.0/ubuntu.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=6.0.19
 SYS_ARCH=`arch`
 
diff --git a/plugins/mongodb/versions/7.0/centos.sh b/plugins/mongodb/versions/7.0/centos.sh
index f3805a0a3..ff808f549 100644
--- a/plugins/mongodb/versions/7.0/centos.sh
+++ b/plugins/mongodb/versions/7.0/centos.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=7.0.15
 SYS_ARCH=`arch`
 
diff --git a/plugins/mongodb/versions/7.0/debian.sh b/plugins/mongodb/versions/7.0/debian.sh
index e820e6ac3..d66088db6 100644
--- a/plugins/mongodb/versions/7.0/debian.sh
+++ b/plugins/mongodb/versions/7.0/debian.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=7.0.15
 SYS_ARCH=`arch`
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
diff --git a/plugins/mongodb/versions/7.0/euler.sh b/plugins/mongodb/versions/7.0/euler.sh
index f3805a0a3..ff808f549 100644
--- a/plugins/mongodb/versions/7.0/euler.sh
+++ b/plugins/mongodb/versions/7.0/euler.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=7.0.15
 SYS_ARCH=`arch`
 
diff --git a/plugins/mongodb/versions/8.0/centos.sh b/plugins/mongodb/versions/8.0/centos.sh
index adf50ec71..c66fa6c31 100644
--- a/plugins/mongodb/versions/8.0/centos.sh
+++ b/plugins/mongodb/versions/8.0/centos.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=8.0.3
 SYS_ARCH=`arch`
 
diff --git a/plugins/mongodb/versions/8.0/debian.sh b/plugins/mongodb/versions/8.0/debian.sh
index 3b5e0b18b..a4d41d663 100644
--- a/plugins/mongodb/versions/8.0/debian.sh
+++ b/plugins/mongodb/versions/8.0/debian.sh
@@ -8,8 +8,7 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=7.0.14
+VERSION=8.0.3
 SYS_ARCH=`arch`
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 SYS_NAME=${SYS_VERSION_ID/./}
diff --git a/plugins/mongodb/versions/8.0/euler.sh b/plugins/mongodb/versions/8.0/euler.sh
index ddbcf22be..c66fa6c31 100644
--- a/plugins/mongodb/versions/8.0/euler.sh
+++ b/plugins/mongodb/versions/8.0/euler.sh
@@ -8,8 +8,7 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=7.0.14
+VERSION=8.0.3
 SYS_ARCH=`arch`
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
diff --git a/plugins/mongodb/versions/8.0/macos.sh b/plugins/mongodb/versions/8.0/macos.sh
index 6df92f5d4..20cdd6c58 100644
--- a/plugins/mongodb/versions/8.0/macos.sh
+++ b/plugins/mongodb/versions/8.0/macos.sh
@@ -9,8 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 SYS_ARCH=`arch`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=7.0.14
+VERSION=8.0.3
 
 MG_DIR=$serverPath/source/mongodb
 mkdir -p $MG_DIR
diff --git a/plugins/mongodb/versions/8.0/opensuse.sh b/plugins/mongodb/versions/8.0/opensuse.sh
index 66f8ee4b8..6926dd1bc 100644
--- a/plugins/mongodb/versions/8.0/opensuse.sh
+++ b/plugins/mongodb/versions/8.0/opensuse.sh
@@ -8,8 +8,7 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=7.0.14
+VERSION=8.0.3
 SYS_ARCH=`arch`
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}' | awk -F . '{print $1}'`
diff --git a/plugins/mongodb/versions/8.0/ubuntu.sh b/plugins/mongodb/versions/8.0/ubuntu.sh
index a5d10a5be..01e0af931 100644
--- a/plugins/mongodb/versions/8.0/ubuntu.sh
+++ b/plugins/mongodb/versions/8.0/ubuntu.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=8.0.3
 SYS_ARCH=`arch`
 

From fe9cd42210e9459d0ba247c094f7f47fddd45d4c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 17:21:15 +0800
Subject: [PATCH 488/965] Update debian.sh

---
 plugins/mongodb/versions/8.0/debian.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/mongodb/versions/8.0/debian.sh b/plugins/mongodb/versions/8.0/debian.sh
index a4d41d663..4ecfbe0ee 100644
--- a/plugins/mongodb/versions/8.0/debian.sh
+++ b/plugins/mongodb/versions/8.0/debian.sh
@@ -15,15 +15,15 @@ SYS_NAME=${SYS_VERSION_ID/./}
 
 
 if [ "$SYS_NAME" -gt "11" ];then
-	SYS_NAME="11"
+	SYS_NAME="12"
 fi
 
 if [ "$SYS_NAME" -lt "11" ];then
-	SYS_NAME="11"
+	SYS_NAME="12"
 fi
 
 if [ "$SYS_NAME" == "" ];then
-	SYS_NAME="11"
+	SYS_NAME="12"
 fi
 
 FILE_NAME=mongodb-linux-${SYS_ARCH}-debian${SYS_NAME}-${VERSION}

From d940a12ed56ced0bdf62c6212960e9b9d0ea013f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 17:22:28 +0800
Subject: [PATCH 489/965] Update ubuntu.sh

---
 plugins/mongodb/versions/8.0/ubuntu.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/mongodb/versions/8.0/ubuntu.sh b/plugins/mongodb/versions/8.0/ubuntu.sh
index 01e0af931..0f08622d9 100644
--- a/plugins/mongodb/versions/8.0/ubuntu.sh
+++ b/plugins/mongodb/versions/8.0/ubuntu.sh
@@ -23,6 +23,10 @@ if [ "$SYS_NAME" -lt "2004" ];then
 	SYS_NAME="2004"
 fi
 
+if [ "$SYS_NAME" == "2404" ];then
+	SYS_NAME="2404"
+fi
+
 MG_DIR=$serverPath/source/mongodb
 mkdir -p $MG_DIR
 

From bb6a64c0dca6d5c28e053043280c4e6cc6ab543e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 17:23:02 +0800
Subject: [PATCH 490/965] Update ubuntu.sh

---
 plugins/mongodb/versions/8.0/ubuntu.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/mongodb/versions/8.0/ubuntu.sh b/plugins/mongodb/versions/8.0/ubuntu.sh
index 0f08622d9..2a9230b05 100644
--- a/plugins/mongodb/versions/8.0/ubuntu.sh
+++ b/plugins/mongodb/versions/8.0/ubuntu.sh
@@ -15,14 +15,14 @@ SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | a
 SYS_NAME=${SYS_VERSION_ID/./}
 # https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-4.4.23.tgz
 
-if [ "$SYS_NAME" -gt "2204" ];then
-	SYS_NAME="2204"
-fi
-
 if [ "$SYS_NAME" -lt "2004" ];then
 	SYS_NAME="2004"
 fi
 
+if [ "$SYS_NAME" == "2204" ];then
+	SYS_NAME="2204"
+fi
+
 if [ "$SYS_NAME" == "2404" ];then
 	SYS_NAME="2404"
 fi

From 30e0db5adb3f4111475045d43909a91765b962dc Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 17:25:08 +0800
Subject: [PATCH 491/965] Update debian.sh

---
 plugins/mongodb/versions/8.0/debian.sh | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/plugins/mongodb/versions/8.0/debian.sh b/plugins/mongodb/versions/8.0/debian.sh
index 4ecfbe0ee..556dcb41b 100644
--- a/plugins/mongodb/versions/8.0/debian.sh
+++ b/plugins/mongodb/versions/8.0/debian.sh
@@ -14,18 +14,7 @@ SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | a
 SYS_NAME=${SYS_VERSION_ID/./}
 
 
-if [ "$SYS_NAME" -gt "11" ];then
-	SYS_NAME="12"
-fi
-
-if [ "$SYS_NAME" -lt "11" ];then
-	SYS_NAME="12"
-fi
-
-if [ "$SYS_NAME" == "" ];then
-	SYS_NAME="12"
-fi
-
+SYS_NAME="12"
 FILE_NAME=mongodb-linux-${SYS_ARCH}-debian${SYS_NAME}-${VERSION}
 FILE_NAME_TGZ=${FILE_NAME}.tgz
 

From 0cef478d712d4200e2864ca65fcdcce09a798adb Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 17:36:34 +0800
Subject: [PATCH 492/965] Update index.py

---
 plugins/mongodb/index.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/plugins/mongodb/index.py b/plugins/mongodb/index.py
index 3396e44e3..da464e440 100755
--- a/plugins/mongodb/index.py
+++ b/plugins/mongodb/index.py
@@ -1525,6 +1525,12 @@ def runLog():
     return getServerDir() + '/logs.pl'
 
 
+def installPreInspectionDebainCheck(sysId,version):
+    if version.startwidth('8.0'):
+        if sysId != '12':
+            return "[%s]需要debain[12]" % (version,)
+    return ''
+
 def installPreInspection(version):
     if mw.isAppleSystem():
         return 'ok'
@@ -1543,6 +1549,12 @@ def installPreInspection(version):
     supportOs = ['centos', 'ubuntu', 'debian', 'opensuse']
     if not sysName in supportOs:
         return '暂时仅支持{}'.format(','.join(supportOs))
+
+    if sysName == 'debian':
+        check = installPreInspectionDebainCheck(sysId, version) 
+        if check != '':
+            return check
+
     return 'ok'
 
 def uninstallPreInspection(version):
@@ -1556,7 +1568,7 @@ def uninstallPreInspection(version):
 if __name__ == "__main__":
     func = sys.argv[1]
 
-    version = "4.4"
+    version = '4.4'
     if (len(sys.argv) > 2):
         version = sys.argv[2]
 

From 6da57d6ccc1973f967986063db677d6abb43dd44 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 17:38:03 +0800
Subject: [PATCH 493/965] Update index.py

---
 plugins/mongodb/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mongodb/index.py b/plugins/mongodb/index.py
index da464e440..0be3bacb4 100755
--- a/plugins/mongodb/index.py
+++ b/plugins/mongodb/index.py
@@ -1526,7 +1526,7 @@ def runLog():
 
 
 def installPreInspectionDebainCheck(sysId,version):
-    if version.startwidth('8.0'):
+    if version.startswidth('8.0'):
         if sysId != '12':
             return "[%s]需要debain[12]" % (version,)
     return ''

From 98899cd76ef6ac1ca00f92025253a021f0440f2c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 17:41:31 +0800
Subject: [PATCH 494/965] Update index.py

---
 plugins/mongodb/index.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/mongodb/index.py b/plugins/mongodb/index.py
index 0be3bacb4..6a54f7b1a 100755
--- a/plugins/mongodb/index.py
+++ b/plugins/mongodb/index.py
@@ -1535,8 +1535,8 @@ def installPreInspection(version):
     if mw.isAppleSystem():
         return 'ok'
 
-    sys = mw.execShell(
-        "cat /etc/*-release | grep PRETTY_NAME |awk -F = '{print $2}' | awk -F '\"' '{print $2}'| awk '{print $1}'")
+    cmd = "cat /etc/*-release | grep PRETTY_NAME |awk -F = '{print $2}' | awk -F '\"' '{print $2}'| awk '{print $1}'"
+    sys = mw.execShell(cmd)
 
     if sys[1] != '':
         return '暂时不支持该系统'

From 40bc9798a9f17f76964d40cca74782ec9a09cb02 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 17:44:05 +0800
Subject: [PATCH 495/965] Update index.py

---
 plugins/mongodb/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mongodb/index.py b/plugins/mongodb/index.py
index 6a54f7b1a..ee4e752c4 100755
--- a/plugins/mongodb/index.py
+++ b/plugins/mongodb/index.py
@@ -1526,7 +1526,7 @@ def runLog():
 
 
 def installPreInspectionDebainCheck(sysId,version):
-    if version.startswidth('8.0'):
+    if version == '8.0':
         if sysId != '12':
             return "[%s]需要debain[12]" % (version,)
     return ''

From f4859ef7f69f6d02301553552553896370e0a2de Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 17:53:25 +0800
Subject: [PATCH 496/965] Update index.py

---
 plugins/pgadmin/index.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/pgadmin/index.py b/plugins/pgadmin/index.py
index 85984f5d6..2559430f9 100755
--- a/plugins/pgadmin/index.py
+++ b/plugins/pgadmin/index.py
@@ -62,7 +62,7 @@ def getConf():
 def getPort():
     file = getConf()
     content = mw.readFile(file)
-    rep = 'listen\s*(.*);'
+    rep = r'listen\s*(.*);'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
@@ -136,8 +136,8 @@ def returnCfg():
 def __release_port(port):
     from collections import namedtuple
     try:
-        import firewall_api
-        firewall_api.firewall_api().addAcceptPortArgs(port, 'pgAdmin默认端口', 'port')
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().addAcceptPort(port, 'pgAdmin默认端口', 'port')
         return port
     except Exception as e:
         return "Release failed {}".format(e)
@@ -146,8 +146,8 @@ def __release_port(port):
 def __delete_port(port):
     from collections import namedtuple
     try:
-        import firewall_api
-        firewall_api.firewall_api().delAcceptPortArgs(port, 'tcp')
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().delAcceptPort(port, 'tcp')
         return port
     except Exception as e:
         return "Release failed {}".format(e)

From 346f07657d2acde994b6ea2df8161885882780f5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 17:55:37 +0800
Subject: [PATCH 497/965] Update index.py

---
 plugins/pgadmin/index.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/pgadmin/index.py b/plugins/pgadmin/index.py
index 2559430f9..fd973ebff 100755
--- a/plugins/pgadmin/index.py
+++ b/plugins/pgadmin/index.py
@@ -184,8 +184,9 @@ def getPythonName():
     return data[0].strip();
 
 def initPgConfFile():
+    pyname = getPythonName()
     file_tpl = getPluginDir() + '/conf/config_local.py'
-    dst_file = getServerDir()+'/run/lib/python3.10/site-packages/pgadmin4/config_local.py'
+    dst_file = getServerDir()+'/run/lib/'+pyname+'/site-packages/pgadmin4/config_local.py'
     if not os.path.exists(dst_file):
         service_path = mw.getServerDir()
         content = mw.readFile(file_tpl)

From 7b5d9bb3c1dfa52395c4f1cd81d07305da989b59 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 18:09:33 +0800
Subject: [PATCH 498/965] Update index.py

---
 plugins/openresty/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/openresty/index.py b/plugins/openresty/index.py
index 2b2ea8b59..9ba91330c 100755
--- a/plugins/openresty/index.py
+++ b/plugins/openresty/index.py
@@ -208,7 +208,7 @@ def confReplace():
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
 

From d078b285a26831a0f42e458093e737f09f8a98d3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 18:14:02 +0800
Subject: [PATCH 499/965] Update index.py

---
 plugins/openresty/index.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/openresty/index.py b/plugins/openresty/index.py
index 9ba91330c..d323af92f 100755
--- a/plugins/openresty/index.py
+++ b/plugins/openresty/index.py
@@ -564,11 +564,11 @@ def installPreInspection():
 
 
 if __name__ == "__main__":
+
+    version = '1.27.1'
     version_pl = getServerDir() + "/version.pl"
-    if not os.path.exists(version_pl):
-        print('error')
-        exit(-1) 
-    version = mw.readFile(version_pl)
+    if os.path.exists(version_pl):
+        version = mw.readFile(version_pl)
 
 
     func = sys.argv[1]

From b350747eab28d1c3873b3104ea7974e7b9bbead8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 18:21:12 +0800
Subject: [PATCH 500/965] update

---
 plugins/acme_pandominassl_apply/index.py | 1 -
 plugins/alist/index.py                   | 2 +-
 plugins/cloudreve/index.py               | 2 +-
 plugins/fail2ban/index.py                | 3 +--
 plugins/gorse/index.py                   | 2 +-
 plugins/haproxy/index.py                 | 2 +-
 plugins/keepalived/index.py              | 5 ++---
 plugins/lvs/index.py                     | 2 +-
 plugins/mosquitto/index.py               | 2 +-
 plugins/simpleping/index.py              | 3 +--
 plugins/sphinx/index.py                  | 3 +--
 11 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/plugins/acme_pandominassl_apply/index.py b/plugins/acme_pandominassl_apply/index.py
index 1679e0bf9..cd21cf2a8 100755
--- a/plugins/acme_pandominassl_apply/index.py
+++ b/plugins/acme_pandominassl_apply/index.py
@@ -167,7 +167,6 @@ def pSqliteDb(dbname='dnsapi'):
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
diff --git a/plugins/alist/index.py b/plugins/alist/index.py
index 1d0ded778..277920786 100755
--- a/plugins/alist/index.py
+++ b/plugins/alist/index.py
@@ -115,7 +115,7 @@ def contentReplace(content):
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
diff --git a/plugins/cloudreve/index.py b/plugins/cloudreve/index.py
index 8f26a8e82..d01cf0865 100755
--- a/plugins/cloudreve/index.py
+++ b/plugins/cloudreve/index.py
@@ -115,7 +115,7 @@ def contentReplace(content):
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
diff --git a/plugins/fail2ban/index.py b/plugins/fail2ban/index.py
index 4d478ab10..6d9994da4 100755
--- a/plugins/fail2ban/index.py
+++ b/plugins/fail2ban/index.py
@@ -147,7 +147,7 @@ def initJailD():
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
@@ -171,7 +171,6 @@ def initDreplace():
     systemService = systemDir + '/' + getPluginName() + '.service'
     if os.path.exists(systemDir) and not os.path.exists(systemService):
         systemServiceTpl = getPluginDir() + '/init.d/' + getPluginName() + '.service.tpl'
-        service_path = mw.getServerDir()
         content = mw.readFile(systemServiceTpl)
         content = content.replace('{$SERVER_PATH}', service_path)
         mw.writeFile(systemService, content)
diff --git a/plugins/gorse/index.py b/plugins/gorse/index.py
index 090c48576..f734ae4b4 100755
--- a/plugins/gorse/index.py
+++ b/plugins/gorse/index.py
@@ -151,7 +151,7 @@ def contentReplace(content):
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
diff --git a/plugins/haproxy/index.py b/plugins/haproxy/index.py
index 843ac5090..65812d034 100755
--- a/plugins/haproxy/index.py
+++ b/plugins/haproxy/index.py
@@ -118,7 +118,7 @@ def status():
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
diff --git a/plugins/keepalived/index.py b/plugins/keepalived/index.py
index ecd5e8a80..3ee34712d 100755
--- a/plugins/keepalived/index.py
+++ b/plugins/keepalived/index.py
@@ -126,7 +126,7 @@ def status():
 
 
 def contentReplace(content):
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$PLUGIN_PATH}', getPluginDir())
 
@@ -166,7 +166,7 @@ def copyScripts():
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
@@ -202,7 +202,6 @@ def initDreplace():
     systemService = systemDir + '/' + getPluginName() + '.service'
     if os.path.exists(systemDir) and not os.path.exists(systemService):
         systemServiceTpl = getPluginDir() + '/init.d/' + getPluginName() + '.service.tpl'
-        service_path = mw.getServerDir()
         content = mw.readFile(systemServiceTpl)
         content = contentReplace(content)
         mw.writeFile(systemService, content)
diff --git a/plugins/lvs/index.py b/plugins/lvs/index.py
index 82a9f21a3..e1f43e370 100755
--- a/plugins/lvs/index.py
+++ b/plugins/lvs/index.py
@@ -79,7 +79,7 @@ def status():
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
diff --git a/plugins/mosquitto/index.py b/plugins/mosquitto/index.py
index a1ffaf440..5739b1a14 100755
--- a/plugins/mosquitto/index.py
+++ b/plugins/mosquitto/index.py
@@ -88,7 +88,7 @@ def status():
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
diff --git a/plugins/simpleping/index.py b/plugins/simpleping/index.py
index dcc6853f0..6fc8e92fa 100755
--- a/plugins/simpleping/index.py
+++ b/plugins/simpleping/index.py
@@ -145,7 +145,7 @@ def contentReplace(content):
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
@@ -166,7 +166,6 @@ def initDreplace():
     systemService = systemDir + '/' + getPluginName() + '.service'
     if os.path.exists(systemDir) and not os.path.exists(systemService):
         systemServiceTpl = getPluginDir() + '/init.d/' + getPluginName() + '.service.tpl'
-        service_path = mw.getServerDir()
         content = mw.readFile(systemServiceTpl)
         content = content.replace('{$SERVER_PATH}', service_path)
         mw.writeFile(systemService, content)
diff --git a/plugins/sphinx/index.py b/plugins/sphinx/index.py
index 515d94a0a..981a4d4db 100755
--- a/plugins/sphinx/index.py
+++ b/plugins/sphinx/index.py
@@ -129,7 +129,7 @@ def mkdirAll():
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
@@ -155,7 +155,6 @@ def initDreplace():
     systemService = systemDir + '/sphinx.service'
     systemServiceTpl = getPluginDir() + '/init.d/sphinx.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)

From 3e9b47cbf34614d3d31a8a65cf13dcef7c51f0bd Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 18:23:25 +0800
Subject: [PATCH 501/965] Update index.py

---
 plugins/swap/index.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/plugins/swap/index.py b/plugins/swap/index.py
index 3fb07947c..db79fa596 100755
--- a/plugins/swap/index.py
+++ b/plugins/swap/index.py
@@ -79,7 +79,7 @@ def getInitDTpl():
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
@@ -101,12 +101,11 @@ def initDreplace():
     if os.path.exists(systemDir) and not os.path.exists(systemService):
         swapon_bin = mw.execShell('which swapon')[0].strip()
         swapoff_bin = mw.execShell('which swapoff')[0].strip()
-        service_path = mw.getServerDir()
-        se_content = mw.readFile(systemServiceTpl)
-        se_content = se_content.replace('{$SERVER_PATH}', service_path)
-        se_content = se_content.replace('{$SWAPON_BIN}', swapon_bin)
-        se_content = se_content.replace('{$SWAPOFF_BIN}', swapoff_bin)
-        mw.writeFile(systemService, se_content)
+        content = mw.readFile(systemServiceTpl)
+        content = content.replace('{$SERVER_PATH}', service_path)
+        content = content.replace('{$SWAPON_BIN}', swapon_bin)
+        content = content.replace('{$SWAPOFF_BIN}', swapoff_bin)
+        mw.writeFile(systemService, content)
         mw.execShell('systemctl daemon-reload')
 
     return file_bin

From 264dd392f696aef3cbcba04e1ac274ac83140ee5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 18:28:18 +0800
Subject: [PATCH 502/965] Update install.sh

---
 plugins/postgresql/versions/17/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/postgresql/versions/17/install.sh b/plugins/postgresql/versions/17/install.sh
index 3e2f53152..b46b78c2b 100755
--- a/plugins/postgresql/versions/17/install.sh
+++ b/plugins/postgresql/versions/17/install.sh
@@ -13,7 +13,7 @@ sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 postgreDir=${serverPath}/source/postgresql
 
-VERSION=17.0
+VERSION=17.2
 
 # su - postgres -c "/www/server/postgresql/bin/pg_ctl start -D /www/server/postgresql/data"
 

From 48d193141e297e931e5ef681c1b7a07c3da989eb Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 18:31:04 +0800
Subject: [PATCH 503/965] Update install.sh

---
 plugins/pgadmin/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pgadmin/install.sh b/plugins/pgadmin/install.sh
index 8de77dec5..8c5a876c0 100755
--- a/plugins/pgadmin/install.sh
+++ b/plugins/pgadmin/install.sh
@@ -85,7 +85,7 @@ Install_pgadmin()
 	pip install gunicorn
 
 	# pip install https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v8.10/pip/pgadmin4-8.10-py3-none-any.whl
-	pip install https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v8.12/pip/pgadmin4-8.12-py3-none-any.whl
+	pip install https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v8.13/pip/pgadmin4-8.13-py3-none-any.whl
 
 	cd ${rootPath} && python3 ${rootPath}/plugins/pgadmin/index.py start
 	echo '安装完成'

From 45645a52b570745827e3224c1734dbf6bc29375a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 18:40:11 +0800
Subject: [PATCH 504/965] up

---
 plugins/mariadb/info.json                |   2 +-
 plugins/mariadb/versions/11.6/install.sh | 121 +++++++++++++++++++++++
 2 files changed, 122 insertions(+), 1 deletion(-)
 create mode 100755 plugins/mariadb/versions/11.6/install.sh

diff --git a/plugins/mariadb/info.json b/plugins/mariadb/info.json
index 9496a9fba..effaf5f8a 100755
--- a/plugins/mariadb/info.json
+++ b/plugins/mariadb/info.json
@@ -8,7 +8,7 @@
 	"uninstall_pre_inspection":true,
 	"checks": "server/mariadb",
 	"path": "server/mariadb",
-	"versions":["10.6","10.7","10.8","10.9","10.11","11.0","11.1","11.2","11.3","11.4","11.5"],
+	"versions":["10.6","10.7","10.8","10.9","10.11","11.0","11.1","11.2","11.3","11.4","11.5","11.6"],
 	"shell":"install.sh",
 	"checks":"server/mariadb",
 	"path":"server/mariadb",
diff --git a/plugins/mariadb/versions/11.6/install.sh b/plugins/mariadb/versions/11.6/install.sh
new file mode 100755
index 000000000..56b13925f
--- /dev/null
+++ b/plugins/mariadb/versions/11.6/install.sh
@@ -0,0 +1,121 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+#https://dev.mysql.com/downloads/mysql/5.5.html#downloads
+#https://dev.mysql.com/downloads/file/?id=480541
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sysName=`uname`
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+mariadbDir=${serverPath}/source/mariadb
+
+MY_VER=11.6.2
+
+Install_app()
+{
+	mkdir -p ${mariadbDir}
+	echo '正在安装脚本文件...' > $install_tmp
+
+	if [ "$sysName" != "Darwin" ];then
+		mkdir -p /var/log/mariadb
+		touch /var/log/mariadb/mariadb.log
+	fi
+
+	# ----- cpu start ------
+	if [ -z "${cpuCore}" ]; then
+    	cpuCore="1"
+	fi
+
+	if [ -f /proc/cpuinfo ];then
+		cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+	fi
+
+	MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+	if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+	    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+	        cpuCore="${MEM_INFO}"
+	    fi
+	else
+	    cpuCore="1"
+	fi
+
+	if [ "$cpuCore" -gt "2" ];then
+		cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+	else
+		cpuCore="1"
+	fi
+	# ----- cpu end ------
+
+	# if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then
+	# 	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.9.1/source/mariadb-10.9.1.tar.gz
+	if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then
+		wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://archive.mariadb.org/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
+	
+	INSTALL_CMD=cmake
+	# check cmake version
+	CMAKE_VERSION=`cmake -version | grep version | awk '{print $3}' | awk -F '.' '{print $1}'`
+	if [ "$CMAKE_VERSION" -eq "2" ];then
+		mkdir -p /var/log/mariadb
+		touch /var/log/mariadb/mariadb.log
+		INSTALL_CMD=cmake3
+	fi
+
+	if [ ! -d $serverPath/mariadb ];then
+		cd ${mariadbDir}/mariadb-${MY_VER} && ${INSTALL_CMD} \
+		-DCMAKE_INSTALL_PREFIX=$serverPath/mariadb \
+		-DMYSQL_DATADIR=$serverPath/mariadb/data/ \
+		-DMYSQL_USER=mysql \
+		-DMYSQL_UNIX_ADDR=$serverPath/mariadb/mysql.sock \
+		-DWITH_MYISAM_STORAGE_ENGINE=1 \
+		-DWITH_INNOBASE_STORAGE_ENGINE=1 \
+		-DWITH_MEMORY_STORAGE_ENGINE=1 \
+		-DENABLED_LOCAL_INFILE=1 \
+		-DWITH_PARTITION_STORAGE_ENGINE=1 \
+		-DEXTRA_CHARSETS=all \
+		-DDEFAULT_CHARSET=utf8mb4 \
+		-DDEFAULT_COLLATION=utf8mb4_general_ci \
+		-DCMAKE_C_COMPILER=/usr/bin/gcc \
+		-DCMAKE_CXX_COMPILER=/usr/bin/g++
+		make -j${cpuCore} && make install && make clean
+
+		if [ -d $serverPath/mariadb ];then
+			echo '11.4' > $serverPath/mariadb/version.pl
+			echo '安装完成'
+		else
+			echo '安装失败'
+			echo 'install fail'>&2
+			exit 1
+		fi
+	fi
+
+	if [ -d ${mariadbDir}/mariadb-${MY_VER} ];then
+		rm -rf ${mariadbDir}/mariadb-${MY_VER}
+	fi
+
+}
+
+Uninstall_app()
+{
+	rm -rf $serverPath/mariadb
+	echo '卸载完成' > $install_tmp
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_app
+else
+	Uninstall_app
+fi

From abbe16eb87620883280ce7c6ef327ebe576684b7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 18:41:02 +0800
Subject: [PATCH 505/965] up

---
 plugins/mariadb/versions/11.5/install.sh | 2 +-
 plugins/mariadb/versions/11.6/install.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/mariadb/versions/11.5/install.sh b/plugins/mariadb/versions/11.5/install.sh
index 55604cad2..881e93ce8 100755
--- a/plugins/mariadb/versions/11.5/install.sh
+++ b/plugins/mariadb/versions/11.5/install.sh
@@ -92,7 +92,7 @@ Install_app()
 		make -j${cpuCore} && make install && make clean
 
 		if [ -d $serverPath/mariadb ];then
-			echo '11.4' > $serverPath/mariadb/version.pl
+			echo '11.5' > $serverPath/mariadb/version.pl
 			echo '安装完成'
 		else
 			echo '安装失败'
diff --git a/plugins/mariadb/versions/11.6/install.sh b/plugins/mariadb/versions/11.6/install.sh
index 56b13925f..3597e2e22 100755
--- a/plugins/mariadb/versions/11.6/install.sh
+++ b/plugins/mariadb/versions/11.6/install.sh
@@ -92,7 +92,7 @@ Install_app()
 		make -j${cpuCore} && make install && make clean
 
 		if [ -d $serverPath/mariadb ];then
-			echo '11.4' > $serverPath/mariadb/version.pl
+			echo '11.6' > $serverPath/mariadb/version.pl
 			echo '安装完成'
 		else
 			echo '安装失败'

From 7855df5aa254f288a068267b6eb572ea607d8a33 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 18:41:43 +0800
Subject: [PATCH 506/965] up

---
 plugins/mariadb/versions/11.2/install.sh | 2 +-
 plugins/mariadb/versions/11.4/install.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/mariadb/versions/11.2/install.sh b/plugins/mariadb/versions/11.2/install.sh
index 67b1b7408..12778da85 100755
--- a/plugins/mariadb/versions/11.2/install.sh
+++ b/plugins/mariadb/versions/11.2/install.sh
@@ -14,7 +14,7 @@ sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
-MY_VER=11.2.4
+MY_VER=11.2.6
 
 Install_app()
 {
diff --git a/plugins/mariadb/versions/11.4/install.sh b/plugins/mariadb/versions/11.4/install.sh
index 6122b7caf..e6c1aefa5 100755
--- a/plugins/mariadb/versions/11.4/install.sh
+++ b/plugins/mariadb/versions/11.4/install.sh
@@ -14,7 +14,7 @@ sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
-MY_VER=11.4.3
+MY_VER=11.4.4
 
 Install_app()
 {

From 65ec08d40f82ea34a3840c89e38abea41c1650d7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 18:42:55 +0800
Subject: [PATCH 507/965] Update install.sh

---
 plugins/mariadb/versions/10.6/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mariadb/versions/10.6/install.sh b/plugins/mariadb/versions/10.6/install.sh
index 04789763d..b116971b3 100755
--- a/plugins/mariadb/versions/10.6/install.sh
+++ b/plugins/mariadb/versions/10.6/install.sh
@@ -13,7 +13,7 @@ sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
-MY_VER=10.6.18
+MY_VER=10.6.20
 
 Install_app()
 {

From efc715678b6c0554a4ed64744e579db570fcc9a6 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 18:43:25 +0800
Subject: [PATCH 508/965] Update install.sh

---
 plugins/mariadb/versions/10.11/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mariadb/versions/10.11/install.sh b/plugins/mariadb/versions/10.11/install.sh
index 33708c610..0e22e2f7d 100755
--- a/plugins/mariadb/versions/10.11/install.sh
+++ b/plugins/mariadb/versions/10.11/install.sh
@@ -14,7 +14,7 @@ sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
-MY_VER=10.11.8
+MY_VER=10.11.10
 
 Install_app()
 {

From 7a1bc2ee3971386fc8bfbc51b8bf7aae9665148a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 18:45:45 +0800
Subject: [PATCH 509/965] Update ftp_client.py

---
 plugins/backup_ftp/class/ftp_client.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/backup_ftp/class/ftp_client.py b/plugins/backup_ftp/class/ftp_client.py
index 97df92e32..2dc603911 100644
--- a/plugins/backup_ftp/class/ftp_client.py
+++ b/plugins/backup_ftp/class/ftp_client.py
@@ -14,8 +14,12 @@ import json
 import paramiko
 import ftplib
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 DEBUG = True
 BLOCK_SIZE = 1024 * 1024 * 2

From 3030849bd28bd4670b5403d5500a6e7d1721c862 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 18:46:15 +0800
Subject: [PATCH 510/965] Update ftp_client.py

---
 plugins/backup_ftp/class/ftp_client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/backup_ftp/class/ftp_client.py b/plugins/backup_ftp/class/ftp_client.py
index 2dc603911..53a0e7ea8 100644
--- a/plugins/backup_ftp/class/ftp_client.py
+++ b/plugins/backup_ftp/class/ftp_client.py
@@ -140,7 +140,7 @@ class FtpPSClient:
             "database": "db",
             "path": "path",
         }
-        file_regx = prefix_dict.get(data_type) + "_(.+)_20\d+_\d+\."
+        file_regx = prefix_dict.get(data_type) + r"_(.+)_20\d+_\d+\."
         sub_search = re.search(file_regx, file_name)
         sub_path_name = ""
         if sub_search:

From 5f6df46c90d2c8a584b37c3e148b33e489db2224 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 18:52:38 +0800
Subject: [PATCH 511/965] Update mw.py

---
 web/core/mw.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/web/core/mw.py b/web/core/mw.py
index d4fd928ba..fcf4d5fd5 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -1390,6 +1390,20 @@ def checkWebConfig():
         return result[1]
     return True
 
+def isIpAddr(ip):
+    check_ip = re.compile(r'^(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\\d)$')
+    if check_ip.match(ip):
+        return True
+    else:
+        return False
+
+def getWebStatus():
+    pid = getServerDir() + '/openresty/nginx/logs/nginx.pid'
+    if os.path.exists(pid):
+        return True
+    return False
+
+
 def restartWeb():
     return opWeb("reload")
 

From 0397090458952cffd2df29dab47760b8864e99f1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 19:08:11 +0800
Subject: [PATCH 512/965] Update macos.sh

---
 plugins/mongodb/versions/8.0/macos.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/plugins/mongodb/versions/8.0/macos.sh b/plugins/mongodb/versions/8.0/macos.sh
index 20cdd6c58..43b4ecbb4 100644
--- a/plugins/mongodb/versions/8.0/macos.sh
+++ b/plugins/mongodb/versions/8.0/macos.sh
@@ -14,18 +14,25 @@ VERSION=8.0.3
 MG_DIR=$serverPath/source/mongodb
 mkdir -p $MG_DIR
 
-if [ ! -f $MG_DIR/mongodb-macos-x86_64-${VERSION}.tgz ]; then
-	wget --no-check-certificate -O $MG_DIR/mongodb-macos-x86_64-${VERSION}.tgz https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${VERSION}.tgz
-	echo "wget --no-check-certificate -O $MG_DIR/mongodb-macos-x86_64-${VERSION}.tgz https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${VERSION}.tgz"
+# https://fastdl.mongodb.org/osx/mongodb-macos-arm64-8.0.3.tgz
+FILE_NAME=mongodb-macos-x86_64-${VERSION}
+if [ "arm64" == "${SYS_ARCH}" ];then
+	FILE_NAME=mongodb-macos-arm64-${VERSION}
+fi
+FILE_NAME_TGZ=${FILE_NAME}.tgz
+
+if [ ! -f $MG_DIR/${FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/osx/${FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/osx/${FILE_NAME_TGZ}"
 fi
 
-if [ ! -d $MG_DIR/mongodb-macos-x86_64-${VERSION} ];then 
-	cd $MG_DIR && tar -zxvf mongodb-macos-x86_64-${VERSION}.tgz
+if [ ! -d $MG_DIR/${FILE_NAME} ];then 
+	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
 if [ ! -d $serverPath/mongodb/bin ];then
 	mkdir -p $serverPath/mongodb
-	cd $MG_DIR/mongodb-macos-x86_64-${VERSION} && cp -rf ./bin $serverPath/mongodb
+	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi
 
 # https://downloads.mongodb.com/compass/mongosh-2.2.5-darwin-x64.zip

From acc57ee99300b08b550dfc50b6c689380386991d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 19:19:21 +0800
Subject: [PATCH 513/965] Update mw.py

---
 web/core/mw.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index fcf4d5fd5..0ce49aeda 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -556,7 +556,8 @@ def getOsID():
     return data[0].strip()
 
 # 获取文件权限描述
-def getFileStatsDesc(filename,path):
+def getFileStatsDesc(filename, path=None):
+    import pwd
     if path == '' or filename == '':
         return ';;;;;'
     try:
@@ -569,12 +570,13 @@ def getFileStatsDesc(filename,path):
             user = str(pwd.getpwuid(stat.st_uid).pw_name)
         except:
             user = str(stat.st_uid)
+            
         size = str(stat.st_size)
         link = ''
         if os.path.islink(filename):
             link = ' -> ' + os.readlink(filename)
 
-        if path != '':
+        if path:
             tmp_path = (path + '/').replace('//', '/')
             filename = filename.replace(tmp_path, '', 1)
 

From eb0fe483b1d4cec10ed0f1b7ceea1581975a1b9d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 19:24:31 +0800
Subject: [PATCH 514/965] Update index.py

---
 plugins/gorse/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gorse/index.py b/plugins/gorse/index.py
index f734ae4b4..6de72ef1a 100755
--- a/plugins/gorse/index.py
+++ b/plugins/gorse/index.py
@@ -125,7 +125,7 @@ def initRedisConf():
     requirepass = ""
     conf = mw.getServerDir() + '/redis/redis.conf'
     content = mw.readFile(conf)
-    rep = r"^(requirepass" + r')\s*([.0-9A-Za-z_& ~]+)'
+    rep = r"^(requirepass" + r"\)\s*([.0-9A-Za-z_& ~]+)"
     tmp = re.search(rep, content, re.M)
     if tmp:
         requirepass = tmp.groups()[1]

From 52d66b33cbf0451004565242ad9ad5b874a5b8fd Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 19:43:36 +0800
Subject: [PATCH 515/965] update

---
 plugins/php/versions/common/brotli.sh | 114 ++++++++++++++++++++++++++
 plugins/php/versions/common/redis.sh  |   2 +-
 plugins/php/versions/phplib.conf      |  19 +++++
 3 files changed, 134 insertions(+), 1 deletion(-)
 create mode 100755 plugins/php/versions/common/brotli.sh

diff --git a/plugins/php/versions/common/brotli.sh b/plugins/php/versions/common/brotli.sh
new file mode 100755
index 000000000..aeec6c6c5
--- /dev/null
+++ b/plugins/php/versions/common/brotli.sh
@@ -0,0 +1,114 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH=$PATH:/opt/homebrew/bin
+
+curPath=`pwd`
+
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sourcePath=${serverPath}/source/php
+SYS_ARCH=`arch`
+LIBNAME=brotli
+LIBV=0.15.2
+sysName=`uname`
+actionType=$1
+version=$2
+
+if [ "$version" -lt "70" ];then
+	echo "not need"
+	exit 1
+fi
+
+LIB_PATH_NAME=lib/php
+if [ -d $serverPath/php/${version}/lib64 ];then
+	LIB_PATH_NAME=lib64
+fi
+
+NON_ZTS_FILENAME=`ls $serverPath/php/${version}/${LIB_PATH_NAME}/extensions | grep no-debug-non-zts`
+extFile=$serverPath/php/${version}/${LIB_PATH_NAME}/extensions/${NON_ZTS_FILENAME}/${LIBNAME}.so
+
+if [ "$sysName" == "Darwin" ];then
+	BAK='_bak'
+else
+	BAK=''
+fi
+
+
+Install_lib()
+{
+	isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"`
+	if [ "${isInstall}" != "" ];then
+		echo "php-$version 已安装${LIBNAME},请选择其它版本!"
+		return
+	fi
+	
+	if [ ! -f "$extFile" ];then
+		php_lib=$sourcePath/php_lib
+		mkdir -p $php_lib
+		if [ ! -d $php_lib/${LIBNAME}-${LIBV} ];then
+			if [ ! -f $php_lib/${LIBNAME}-${LIBV}.tgz ];then
+				wget --no-check-certificate -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz
+			fi
+			cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz
+		fi
+		cd $php_lib/${LIBNAME}-${LIBV}/extension
+
+		OPTIONS=''
+		if [ "${SYS_ARCH}" == "aarch64" ] && [ "$version" -lt "56" ];then
+			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
+		fi
+
+		$serverPath/php/$version/bin/phpize
+		./configure --enable-brotli \
+		--with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS
+		make clean && make && make install && make clean
+
+		cd $php_lib && rm -rf $php_lib/${LIBNAME}-${LIBV}
+	fi
+	
+	if [ ! -f "$extFile" ];then
+		echo "ERROR!"
+		return
+	fi
+
+	echo "" >> $serverPath/php/$version/etc/php.ini
+	echo "[${LIBNAME}]" >> $serverPath/php/$version/etc/php.ini
+	echo "extension=${LIBNAME}.so" >> $serverPath/php/$version/etc/php.ini
+
+	cd  ${curPath} && bash ${rootPath}/plugins/php/versions/lib.sh $version restart
+	echo '==========================================================='
+	echo 'successful!'
+}
+
+
+Uninstall_lib()
+{
+	if [ ! -f "$serverPath/php/$version/bin/php-config" ];then
+		echo "php-$version 未安装,请选择其它版本!"
+		return
+	fi
+	
+	if [ ! -f "$extFile" ];then
+		echo "php-$version 未安装${LIBNAME},请选择其它版本!"
+		echo "php-$version not install ${LIBNAME}, Plese select other version!"
+		return
+	fi
+	
+	sed -i $BAK "/${LIBNAME}.so/d" $serverPath/php/$version/etc/php.ini
+	sed -i $BAK "/${LIBNAME}/d" $serverPath/php/$version/etc/php.ini
+		
+	rm -f $extFile
+	cd  ${curPath} && bash ${rootPath}/plugins/php/versions/lib.sh $version restart
+	echo '==============================================='
+	echo 'successful!'
+}
+
+
+if [ "$actionType" == 'install' ];then
+	Install_lib
+elif [ "$actionType" == 'uninstall' ];then
+	Uninstall_lib
+fi
\ No newline at end of file
diff --git a/plugins/php/versions/common/redis.sh b/plugins/php/versions/common/redis.sh
index 8b4214744..0b94f387b 100755
--- a/plugins/php/versions/common/redis.sh
+++ b/plugins/php/versions/common/redis.sh
@@ -100,7 +100,7 @@ Uninstall_lib()
 
 	if [ ! -f "$extFile" ];then
 		echo "php-$version 未安装${LIBNAME},请选择其它版本!"
-		echo "php-$version not install memcache, Plese select other version!"
+		echo "php-$version not install ${LIBNAME}, Plese select other version!"
 		return
 	fi
 	
diff --git a/plugins/php/versions/phplib.conf b/plugins/php/versions/phplib.conf
index 9e993fdd0..73d4c7026 100755
--- a/plugins/php/versions/phplib.conf
+++ b/plugins/php/versions/phplib.conf
@@ -85,6 +85,25 @@
         "shell": "sodium.sh",
         "check": "sodium.so"
     },
+    {
+        "name": "brotli",
+        "versions": [
+            "70",
+            "71",
+            "72",
+            "73",
+            "74",
+            "80",
+            "81",
+            "82",
+            "83",
+            "84"
+        ],
+        "type": "压缩库",
+        "msg": "压缩算法",
+        "shell": "brotli.sh",
+        "check": "brotli.so"
+    },
     {
         "name": "gmp",
         "versions": [

From fbf1a36e0096c0cf81805de10b7685fb5da0ff1a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 19:49:55 +0800
Subject: [PATCH 516/965] Update brotli.sh

---
 plugins/php/versions/common/brotli.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/php/versions/common/brotli.sh b/plugins/php/versions/common/brotli.sh
index aeec6c6c5..87141bf8d 100755
--- a/plugins/php/versions/common/brotli.sh
+++ b/plugins/php/versions/common/brotli.sh
@@ -54,7 +54,7 @@ Install_lib()
 			fi
 			cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz
 		fi
-		cd $php_lib/${LIBNAME}-${LIBV}/extension
+		cd $php_lib/${LIBNAME}-${LIBV}
 
 		OPTIONS=''
 		if [ "${SYS_ARCH}" == "aarch64" ] && [ "$version" -lt "56" ];then

From fd1f64a6e269130f596f4a6b7d0e9f18008f437e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 21:14:08 +0800
Subject: [PATCH 517/965] Update .gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 9bde8372c..d5d8772b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,6 +119,8 @@ debug.out
 mdioks.session-journal
 *.session
 
+temp
+
 logs/panel.pid
 logs/panel.log
 logs/panel_task.log
@@ -189,3 +191,4 @@ plugins/goedge-admin
 plugins/goedge-node
 plugins/goedge-happy
 plugins/dztasks
+

From 2dcb8b257e2db770aaa516feb943c8335e0308da Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 21:14:18 +0800
Subject: [PATCH 518/965] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/data_query/nosql_memcached.py |  4 +-
 web/admin/plugins/__init__.py         | 17 +++++++
 web/utils/plugin.py                   | 70 +++++++++++++++++++++++++++
 3 files changed, 89 insertions(+), 2 deletions(-)

diff --git a/plugins/data_query/nosql_memcached.py b/plugins/data_query/nosql_memcached.py
index 18b844edf..b32ef5690 100755
--- a/plugins/data_query/nosql_memcached.py
+++ b/plugins/data_query/nosql_memcached.py
@@ -69,7 +69,7 @@ class nosqlMemcached():
         if not mem_content: return False
 
         keys = ["bind", "PORT"]
-        rep = 'PORT\s*=\s*(.*)'
+        rep = r'PORT\s*=\s*(.*)'
         port_re = re.search(rep, mem_content)
         if port_re:
             result['port'] = int(port_re.groups()[0].strip())
@@ -106,7 +106,7 @@ class nosqlMemcachedCtr():
 
         item_no = []
         for i in m_items:
-            item_match = b'items:(\d*?):number'
+            item_match = rb'items:(\d*?):number'
             item_match_re = re.search(item_match, i)
             if item_match_re:
                 v = item_match_re.groups()[0].strip()
diff --git a/web/admin/plugins/__init__.py b/web/admin/plugins/__init__.py
index 8d7c72fb5..d152ae3e3 100644
--- a/web/admin/plugins/__init__.py
+++ b/web/admin/plugins/__init__.py
@@ -148,6 +148,23 @@ def file():
     content = open(file, 'rb').read()
     return content
 
+
+# 插件上传
+@blueprint.route('/update_zip', endpoint='update_zip', methods=['POST'])
+@panel_login_required
+def update_zip():
+    request_zip = request.files['plugin_zip']
+    return MwPlugin.instance().updateZip(request_zip)
+
+
+@blueprint.route('/input_zip', endpoint='input_zip', methods=['POST'])
+@panel_login_required
+def input_zip():
+    plugin_name = request.form.get('plugin_name', '')
+    tmp_path = request.form.get('tmp_path', '')
+    return MwPlugin.instance().inputZipApi(plugin_name,tmp_path)
+
+
 # 插件设置页
 @blueprint.route('/setting', endpoint='setting', methods=['GET'])
 @panel_login_required
diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index 57ccc1a6f..24c2cea02 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -634,6 +634,76 @@ class plugin(object):
         rdata['list'] = mw.getPage({'count':data[1],'p':page,'tojs':'getSList','row':size})
         return rdata
 
+    def updateZip(self, request_zip):
+        tmp_path = mw.getPanelDir() + '/temp'
+        if not os.path.exists(tmp_path):
+            os.makedirs(tmp_path)
+        mw.execShell("rm -rf " + tmp_path + '/*')
+
+        tmp_file = tmp_path + '/plugin_tmp.zip'
+        if request_zip.filename[-4:] != '.zip':
+            return mw.returnData(False, '仅支持zip文件!')
+
+        request_zip.save(tmp_file)
+        mw.execShell('cd ' + tmp_path + ' && unzip ' + tmp_file)
+        os.remove(tmp_file)
+
+        p_info = tmp_path + '/info.json'
+        if not os.path.exists(p_info):
+            d_path = None
+            for df in os.walk(tmp_path):
+                if len(df[2]) < 3:
+                    continue
+                if not 'info.json' in df[2]:
+                    continue
+                if not 'install.sh' in df[2]:
+                    continue
+                if not os.path.exists(df[0] + '/info.json'):
+                    continue
+                d_path = df[0]
+            if d_path:
+                tmp_path = d_path
+                p_info = tmp_path + '/info.json'
+        try:
+            data = json.loads(mw.readFile(p_info))
+            data['size'] = mw.getPathSize(tmp_path)
+            if not 'author' in data:
+                data['author'] = '未知'
+            if not 'home' in data:
+                data['home'] = 'https://github.com/midoks/mdserver-web'
+            plugin_path = mw.getPluginDir() + data['name'] + '/info.json'
+            data['old_version'] = '0'
+            data['tmp_path'] = tmp_path
+            if os.path.exists(plugin_path):
+                try:
+                    old_info = json.loads(mw.readFile(plugin_path))
+                    data['old_version'] = old_info['versions']
+                except:
+                    pass
+        except:
+            mw.execShell("rm -rf " + tmp_path)
+            return mw.returnData(False, '在压缩包中没有找到插件信息,请检查插件包!')
+        protectPlist = ('openresty', 'mysql', 'php', 'redis', 'memcached'
+                        'mongodb', 'swap', 'gogs', 'pureftp')
+        if data['name'] in protectPlist:
+            return mw.returnData(False, '[' + data['name'] + '],重要插件不可修改!')
+        return data
+
+    def inputZipApi(self, plugin_name,tmp_path):
+        if not os.path.exists(tmp_path):
+            return mw.returnData(False, '临时文件不存在,请重新上传!')
+        plugin_path = mw.getPluginDir() + '/' + plugin_name
+        if not os.path.exists(plugin_path):
+            print(mw.execShell('mkdir -p ' + plugin_path))
+        mw.execShell("cp -rf " + tmp_path + '/* ' + plugin_path + '/')
+        mw.execShell('chmod -R 755 ' + plugin_path)
+        p_info = mw.readFile(plugin_path + '/info.json')
+        if p_info:
+            mw.writeLog('软件管理', '安装第三方插件[%s]' %json.loads(p_info)['title'])
+            return mw.returnData(True, '安装成功!')
+        mw.execShell("rm -rf " + plugin_path)
+        return mw.returnData(False, '安装失败!')
+
     # shell/bash方式调用
     def run(self, name, func,
         version = '',

From a5bc06acf6fa19a699626d2ab9943c5898721c95 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 29 Nov 2024 22:08:54 +0800
Subject: [PATCH 519/965] Update app.js

---
 plugins/data_query/static/js/app.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index 89cb49b95..b8850c4c0 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -353,6 +353,11 @@ function mysqlGetTableList(p){
     // console.log('mysqlGetTableList',p);
     var sid = mysqlGetSid();
     var db = mysqlGetDbName();
+
+    if (!db){
+        return;
+    }
+
     myPostCB('get_table_list',{'sid':sid,'db':db} ,function(rdata){
         if (rdata.data.status){
 

From 00002a8540b6e29fc3a4363d4696671df6992732 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 03:32:33 +0800
Subject: [PATCH 520/965] update

---
 plugins/data_query/sql_mysql.py           |  99 +++++++++++-
 plugins/data_query/static/html/index.html |  10 +-
 plugins/data_query/static/js/app.js       | 179 ++++++++++++++++++++++
 plugins/task_manager/js/task_manager.js   |  38 ++---
 web/core/orm.py                           |   8 +-
 5 files changed, 309 insertions(+), 25 deletions(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index 6b9dc35e4..19df8bd09 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -90,7 +90,7 @@ class nosqlMySQL():
         keys = ["bind_ip", "port"]
 
         result['host'] = '127.0.0.1'
-        rep = 'port\s*=\s*(.*)'
+        rep = r'port\s*=\s*(.*)'
 
         port_re = re.search(rep, my_content)
         if port_re:
@@ -98,7 +98,7 @@ class nosqlMySQL():
         else:
             result['port'] = 3306
 
-        socket_rep = 'socket\s*=\s*(.*)'
+        socket_rep = r'socket\s*=\s*(.*)'
         socket_re = re.search(socket_rep, my_content)
         if socket_re:
             result['socket'] = socket_re.groups()[0].strip()
@@ -281,6 +281,88 @@ class nosqlMySQLCtr():
         rdata['list'] = result
         return mw.returnData(True,'ok', rdata)
 
+    def getNetRow(self, my_instance):
+        row = {}
+
+        data = my_instance.find("SHOW GLOBAL STATUS LIKE 'Com_select'")
+        row['select'] = data['Value']
+
+        data = my_instance.find("SHOW GLOBAL STATUS LIKE 'Com_insert'")
+        row['insert'] = data['Value']
+
+        data = my_instance.find("SHOW GLOBAL STATUS LIKE 'Com_update'")
+        row['update'] = data['Value']
+
+        data = my_instance.find("SHOW GLOBAL STATUS LIKE 'Com_delete'")
+        row['delete']  = data['Value']
+
+        
+
+        data = my_instance.find("SHOW GLOBAL STATUS LIKE 'Bytes_received'")
+        row['recv_bytes']  = data['Value']
+
+        data = my_instance.find("SHOW GLOBAL STATUS LIKE 'Bytes_sent'")
+        row['send_bytes']  = data['Value']
+        return row
+
+
+    def getNetList(self, args):
+        from datetime import datetime
+        sid = args['sid']
+        my_instance = self.getInstanceBySid(sid).conn()
+        if my_instance is False:
+            return mw.returnData(False,'无法链接')
+
+        rdata = []
+        row = {}
+        row1 = self.getNetRow(my_instance)
+        # 等待1秒
+        time.sleep(1)
+        row2 = self.getNetRow(my_instance)
+
+        data = my_instance.find("SHOW GLOBAL VARIABLES LIKE 'max_connections'")
+        row['max_conn'] = data['Value']
+
+        data = my_instance.find("SHOW GLOBAL STATUS LIKE 'Threads_connected'")
+        row['conn']  = data['Value']
+
+        current_time = datetime.now()
+        row['current_time'] = current_time.strftime("%Y-%m-%d %H:%M:%S")
+
+        row['select'] = int(row2['select']) - int(row1['select'])
+        row['insert'] = int(row2['insert']) - int(row1['insert'])
+        row['update'] = int(row2['update']) - int(row1['update'])
+        row['delete'] = int(row2['delete']) - int(row1['delete'])
+
+        recv_per_second = int(row2['recv_bytes']) - int(row1['recv_bytes'])
+        send_per_second = int(row2['send_bytes']) - int(row1['send_bytes'])
+
+        # 将每秒接收和发送数据量从字节转换为兆比特
+        row['recv_mbps'] = "{:.2f}".format(recv_per_second * 8 / 1000000) + " MBit/s" 
+        row['send_mbps'] = "{:.2f}".format(send_per_second * 8 / 1000000) + " MBit/s"
+
+        rdata.append(row)
+        return mw.returnData(True, 'ok', rdata)
+
+
+    def getTopnList(self, args):
+        sid = args['sid']
+        my_instance = self.getInstanceBySid(sid).conn()
+        if my_instance is False:
+            return mw.returnData(False,'无法链接')
+
+        is_performance_schema = my_instance.find("SELECT @@performance_schema")
+        if is_performance_schema["@@performance_schema"] == 0:
+            msg = "performance_schema参数未开启。\n"
+            msg += "在my.cnf配置文件里添加performance_schema=1，并重启mysqld进程生效。"
+            return mw.returnData(False, msg)
+
+        my_instance.execute("SET @sys.statement_truncate_len=4096")
+        data = my_instance.query("select query,db,last_seen,exec_count,max_latency,avg_latency from sys.statement_analysis order by exec_count desc, last_seen desc limit 10")
+        if data is None:
+            return mw.returnData(False, "查询失败!")
+        return mw.returnData(True, 'ok', data)
+
 # ---------------------------------- run ----------------------------------
 # 获取 mysql 列表
 def get_db_list(args):
@@ -308,6 +390,19 @@ def get_stats_list(args):
     t = nosqlMySQLCtr()
     return t.showStatsList(args)
 
+# 查询执行次数最频繁的前N条SQL语句
+def get_topn_list(args):
+    t = nosqlMySQLCtr()
+    return t.getTopnList(args)
+
+# MySQL服务器的QPS/TPS/网络带宽指标
+def get_net_list(args):
+    t = nosqlMySQLCtr()
+    return t.getNetList(args)
+
+
+
+
 
 # 测试
 def test(args):
diff --git a/plugins/data_query/static/html/index.html b/plugins/data_query/static/html/index.html
index c6bcd3ab0..dd589c749 100644
--- a/plugins/data_query/static/html/index.html
+++ b/plugins/data_query/static/html/index.html
@@ -51,9 +51,11 @@
                                 <input name="mysql_field_value" type="text" class="bt-input-text" placeholder="请输入查找内容">
                             </div>
 
-                            <button type="button" class="mysql_find btn btn-success btn-sm mr5 ml5" style="float:right;">
-                                <span>查找</span>
-                            </button>
+
+                            <div style="float:left;">
+                                <button type="button" class="mysql_find btn btn-success btn-sm mr5 ml5" >查找</button>
+                                <button id="mysql_common" type="button" class="mysql_find btn btn-success btn-sm mr5 ml5">常用功能</button>
+                            </div>
                         </div>
 
                     </div>
@@ -78,6 +80,8 @@
                     </div>
                 </div>
 
+                <hr style="border:none;" />
+                
                 <div class="col-md-12" style="padding-left: 3px;">
                     <div id="mysql_list_tab" style="padding-top:0px;">
                         <div class="tab-nav">
diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index b8850c4c0..07648cb98 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -267,6 +267,185 @@ function initTabMySQL(){
         var name = $(this).data('name');
         mysqlRunMysqlTab(name);
     });
+
+    mysqlCommonFunc();
+}
+
+function mysqlCommonFuncMysqlNSQL(){
+    function renderSQL(){
+        var sid = mysqlGetSid();
+        myPostCBN('get_topn_list',{'sid':sid} ,function(rdata){
+            var data = rdata.data;
+            if (data['status']){
+                var items = data.data;
+                var tbody = '';
+                for (var i = 0; i < items.length; i++) {
+                    var t = '<tr>';
+                    t += '<td>'+items[i].query+'</td>';
+                    t += '<td>'+items[i].db+'</td>';
+                    t += '<td>'+items[i].last_seen+'</td>';
+                    t += '<td>'+items[i].exec_count+'</td>';
+                    t += '<td>'+items[i].max_latency+'</td>';
+                    t += '<td>'+items[i].avg_latency+'</td>';
+                    t += '</tr>';
+                    tbody += t;
+                }
+                $('#topn_list tbody').html(tbody);
+            } else {
+                layer.msg(data.msg,{icon:2});
+            }
+        });
+    }
+
+    var sql_timer = null;
+    layer.open({
+        type: 1,
+        title: "查询执行次数最频繁的前N条SQL语句",
+        area: ['1200px', '500px'],
+        closeBtn: 1,
+        shadeClose: false,
+        content: '<div class="bt-form pd20 divtable taskdivtable">\
+            <div class="mr20 pull-left" style="border-right: 1px solid #ccc; padding-right: 20px;">\
+                <div class="ss-text pull-left">\
+                    <em>实时监控</em>\
+                    <div class="ssh-item">\
+                        <input class="btswitch btswitch-ios" id="real_time_monitoring" type="checkbox">\
+                        <label id="real_time_label" class="btswitch-btn" for="real_time_monitoring"></label>\
+                    </div>\
+                </div>\
+            </div>\
+            <hr />\
+            <table class="table table-hover" id="topn_list">\
+                <thead>\
+                    <th>SQL</th>\
+                    <th style="width:100px;">数据名</th>\
+                    <th>最近时间</th>\
+                    <th style="width:100px;">总次数</th>\
+                    <th style="width:100px;">最大时间</th>\
+                    <th style="width:100px;">平均时间</th>\
+                </thead>\
+                <tbody></tbody>\
+            </table>\
+        </div>',
+        success:function(i,l){
+            renderSQL();
+
+            $('#real_time_label').click(function(){
+                sql_timer = setInterval(function(){
+                    var t = $('#real_time_monitoring').is(':checked');
+                    if (t){
+                        renderSQL();
+                    } else{
+                        clearInterval(sql_timer);
+                    }
+                }, 3000);
+            });
+        }
+    });
+}
+
+function mysqlCommonFuncMysqlNet(){
+    function renderSQL(){
+        var sid = mysqlGetSid();
+        myPostCBN('get_net_list',{'sid':sid} ,function(rdata){
+            var data = rdata.data;
+            if (data['status']){
+                var items = data.data;
+                var tbody = '';
+                for (var i = 0; i < items.length; i++) {
+                    var t = '<tr>';
+                    t += '<td>'+items[i]['current_time']+'</td>';
+                    t += '<td>'+items[i]['select']+'</td>';
+                    t += '<td>'+items[i]['insert']+'</td>';
+                    t += '<td>'+items[i]['update']+'</td>';
+                    t += '<td>'+items[i]['delete']+'</td>';
+                    t += '<td>'+items[i]['conn']+'</td>';
+                    t += '<td>'+items[i]['max_conn']+'</td>';
+                    t += '<td>'+items[i]['recv_mbps']+'</td>';
+                    t += '<td>'+items[i]['send_mbps']+'</td>';
+                    t += '</tr>';
+                    tbody += t;
+                }
+                $('#net_list tbody').html(tbody);
+            } else {
+                layer.msg(data.msg,{icon:2});
+            }
+        });
+    }
+
+    var sql_timer = null;
+    layer.open({
+        type: 1,
+        title: "MySQL服务器的QPS/TPS/网络带宽指标",
+        area: ['700px', '220px'],
+        closeBtn: 1,
+        shadeClose: false,
+        content: '<div class="bt-form pd20 divtable taskdivtable">\
+            <div class="mr20 pull-left" style="border-right: 1px solid #ccc; padding-right: 20px;">\
+                <div class="ss-text pull-left">\
+                    <em>实时监控</em>\
+                    <div class="ssh-item">\
+                        <input class="btswitch btswitch-ios" id="real_qps_monitoring" type="checkbox">\
+                        <label id="real_qps_label" class="btswitch-btn" for="real_qps_monitoring"></label>\
+                    </div>\
+                </div>\
+            </div>\
+            <hr />\
+            <table class="table table-hover" id="net_list">\
+                <thead>\
+                    <th style="width:160px;">时间</th>\
+                    <th style="width:50px;">Select</th>\
+                    <th style="width:50px;">Insert</th>\
+                    <th style="width:50px;">Update</th>\
+                    <th style="width:50px;">Delete</th>\
+                    <th style="width:50px;">Conn</th>\
+                    <th style="width:50px;">Max_conn</th>\
+                    <th style="width:90px;">Recv</th>\
+                    <th style="width:90px;">Send</th>\
+                </thead>\
+                <tbody></tbody>\
+            </table>\
+        </div>',
+        success:function(i,l){
+            renderSQL();
+
+            $('#real_qps_label').click(function(){
+                sql_timer = setInterval(function(){
+                    var t = $('#real_qps_monitoring').is(':checked');
+                    if (t){
+                        renderSQL();
+                    } else{
+                        clearInterval(sql_timer);
+                    }
+                }, 3000);
+            });
+        }
+    });
+}
+
+function mysqlCommonFunc(){
+    $('#mysql_common').click(function(){
+        layer.open({
+            type: 1,
+            title: "MySQL常用功能",
+            area: ['600px', '400px'],
+            closeBtn: 1,
+            shadeClose: false,
+            content: '<div class="bt-form pd20">\
+                <button id="mysql_top_nsql" type="button" class="btn btn-default btn-sm">查询执行次数最频繁的前N条SQL语句</button>\
+                <button id="mysql_net_stat" type="button" class="btn btn-default btn-sm">MySQL服务器的QPS/TPS/网络带宽指标</button>\
+            </div>',
+            success:function(i,l){
+                $('#mysql_top_nsql').click(function(){
+                    mysqlCommonFuncMysqlNSQL();
+                });
+
+                $('#mysql_net_stat').click(function(){
+                    mysqlCommonFuncMysqlNet();
+                });
+            }
+        });
+    });
 }
 
 function mysqlRunMysqlTab(name){
diff --git a/plugins/task_manager/js/task_manager.js b/plugins/task_manager/js/task_manager.js
index 6c3f7f36e..16eab7e58 100644
--- a/plugins/task_manager/js/task_manager.js
+++ b/plugins/task_manager/js/task_manager.js
@@ -506,25 +506,25 @@ function get_resource_list() {
       buildRealProcess()
       var tbody_tr = createProcessTable(true);
       var tbody = '<thead>\
-					<tr style="cursor: pointer;">\
-						<th style="width:120px;" class="pro_name pro_ps" onclick="get_process_list(\'ps\',\'' + res_list[reverse] + '\')">应用名称</th>\
-						<th class="pro_pid" onclick="get_process_list(\'pid\',\'' + res_list[reverse] + '\')">PID</th>\
-						<th style="width:50px;"class="pro_threads" onclick="get_process_list(\'threads\',\'True\')">线程</th>\
-						<th style="width:60px;" class="pro_user" onclick="get_process_list(\'user\',\'' + res_list[reverse] + '\')">用户</th>\
-						<th style="width:70px;" class="pro_cpu_percent" onclick="get_process_list(\'cpu_percent\',\'True\')">CPU</th>\
-						<th style="width:70px;" class="pro_memory_used" onclick="get_process_list(\'memory_used\',\'True\')">内存</th>\
-						<th style="width:70px;" class="pro_io_read_speed" onclick="get_process_list(\'io_read_speed\',\'True\')">io读</th>\
-						<th style="width:70px;" class="pro_io_write_speed" onclick="get_process_list(\'io_write_speed\',\'True\')">io写</th>\
-						<th style="width:70px;" class="pro_up" onclick="get_process_list(\'up\',\'True\')">上行</th>\
-						<th style="width:70px;" class="pro_down" onclick="get_process_list(\'down\',\'True\')">下行</th>\
-						<th style="width:50px;" class="pro_connects" onclick="get_process_list(\'connects\',\'True\')">连接</th>\
-						<th style="width:50px;" class="pro_status" onclick="get_process_list(\'status\',\'' + res_list[reverse] + '\')">状态</th>\
-						<th style="width:50px;cursor:text">操作</th>\
-					</tr>\
-				</thead>\
-				<tbody>' + tbody_tr + '</tbody>'
-      $('#taskResourceTable').html(tbody);
-      $(".table-cont").css("height", "220px");
+        	<tr style="cursor: pointer;">\
+        		<th style="width:120px;" class="pro_name pro_ps" onclick="get_process_list(\'ps\',\'' + res_list[reverse] + '\')">应用名称</th>\
+        		<th class="pro_pid" onclick="get_process_list(\'pid\',\'' + res_list[reverse] + '\')">PID</th>\
+        		<th style="width:50px;"class="pro_threads" onclick="get_process_list(\'threads\',\'True\')">线程</th>\
+        		<th style="width:60px;" class="pro_user" onclick="get_process_list(\'user\',\'' + res_list[reverse] + '\')">用户</th>\
+        		<th style="width:70px;" class="pro_cpu_percent" onclick="get_process_list(\'cpu_percent\',\'True\')">CPU</th>\
+        		<th style="width:70px;" class="pro_memory_used" onclick="get_process_list(\'memory_used\',\'True\')">内存</th>\
+        		<th style="width:70px;" class="pro_io_read_speed" onclick="get_process_list(\'io_read_speed\',\'True\')">io读</th>\
+        		<th style="width:70px;" class="pro_io_write_speed" onclick="get_process_list(\'io_write_speed\',\'True\')">io写</th>\
+        		<th style="width:70px;" class="pro_up" onclick="get_process_list(\'up\',\'True\')">上行</th>\
+        		<th style="width:70px;" class="pro_down" onclick="get_process_list(\'down\',\'True\')">下行</th>\
+        		<th style="width:50px;" class="pro_connects" onclick="get_process_list(\'connects\',\'True\')">连接</th>\
+        		<th style="width:50px;" class="pro_status" onclick="get_process_list(\'status\',\'' + res_list[reverse] + '\')">状态</th>\
+        		<th style="width:50px;cursor:text">操作</th>\
+        	</tr>\
+        </thead>\
+        <tbody>' + tbody_tr + '</tbody>';
+        $('#taskResourceTable').html(tbody);
+        $(".table-cont").css("height", "220px");
     })
 
     $("#load_average").html('')
diff --git a/web/core/orm.py b/web/core/orm.py
index 89ba623e9..6baaeb790 100755
--- a/web/core/orm.py
+++ b/web/core/orm.py
@@ -119,6 +119,12 @@ class ORM:
             print(e)
         return True
 
+    def find(self, sql):
+        d = self.query(sql)
+        if d is not None:
+            return d[0]
+        return None
+
     def query(self, sql):
         # 执行SQL语句返回数据集
         if not self.__Conn():
@@ -132,7 +138,7 @@ class ORM:
             self.__Close()
             return result
         except Exception as ex:
-            return ex
+            return None
 
     def __Close(self):
         # 关闭连接

From d3b3b526dbd19de82203426cb5a01495da2e9182 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 03:52:58 +0800
Subject: [PATCH 521/965] update

---
 plugins/data_query/sql_mysql.py     | 23 ++++++++++++
 plugins/data_query/static/js/app.js | 58 ++++++++++++++++++++++++++++-
 2 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index 19df8bd09..68ac3c6ad 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -363,6 +363,24 @@ class nosqlMySQLCtr():
             return mw.returnData(False, "查询失败!")
         return mw.returnData(True, 'ok', data)
 
+    # 查看重复或冗余的索引
+    def getRedundantIndexes(self, args):
+        sid = args['sid']
+        my_instance = self.getInstanceBySid(sid).conn()
+        if my_instance is False:
+            return mw.returnData(False,'无法链接')
+
+        is_performance_schema = my_instance.find("SELECT @@performance_schema")
+        if is_performance_schema["@@performance_schema"] == 0:
+            msg = "performance_schema参数未开启。\n"
+            msg += "在my.cnf配置文件里添加performance_schema=1，并重启mysqld进程生效。"
+            return mw.returnData(False, msg)
+
+        data = my_instance.query("select table_schema,table_name,redundant_index_name,redundant_index_columns,sql_drop_index from sys.schema_redundant_indexes")
+        if data is None:
+            return mw.returnData(False, "查询失败!")
+        # print(data)
+        return mw.returnData(True, 'ok', data)
 # ---------------------------------- run ----------------------------------
 # 获取 mysql 列表
 def get_db_list(args):
@@ -400,6 +418,11 @@ def get_net_list(args):
     t = nosqlMySQLCtr()
     return t.getNetList(args)
 
+# 查看重复或冗余的索引
+def get_redundant_indexes(args):
+    t = nosqlMySQLCtr()
+    return t.getRedundantIndexes(args)
+
 
 
 
diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index 07648cb98..b97fe5558 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -423,6 +423,55 @@ function mysqlCommonFuncMysqlNet(){
     });
 }
 
+function mysqlCommonFuncRedundantIndexes(){
+    function renderSQL(){
+        var sid = mysqlGetSid();
+        myPostCBN('get_redundant_indexes',{'sid':sid} ,function(rdata){
+            var data = rdata.data;
+            if (data['status']){
+                var items = data.data;
+                var tbody = '';
+                for (var i = 0; i < items.length; i++) {
+                    var t = '<tr>';
+                    t += '<td>'+items[i]['table_schema']+'</td>';
+                    t += '<td>'+items[i]['table_name']+'</td>';
+                    t += '<td>'+items[i]['redundant_index_name']+'</td>';
+                    t += '<td>'+items[i]['redundant_index_columns']+'</td>';
+                    t += '<td>'+items[i]['sql_drop_index']+'</td>';
+                    t += '</tr>';
+                    tbody += t;
+                }
+                $('#redundant_indexes tbody').html(tbody);
+            } else {
+                layer.msg(data.msg,{icon:2});
+            }
+        });
+    }
+
+    layer.open({
+        type: 1,
+        title: "查看重复或冗余的索引",
+        area: ['1100px', '400px'],
+        closeBtn: 1,
+        shadeClose: false,
+        content: '<div class="bt-form pd20 divtable taskdivtable">\
+            <table class="table table-hover" id="redundant_indexes">\
+                <thead>\
+                    <th style="width:100px;">数据库名</th>\
+                    <th style="width:50px;">表名</th>\
+                    <th style="width:50px;">冗余索引名</th>\
+                    <th style="width:50px;">冗余索引列名</th>\
+                    <th style="width:300px;">删除冗余索引SQL</th>\
+                </thead>\
+                <tbody></tbody>\
+            </table>\
+        </div>',
+        success:function(i,l){
+            renderSQL();
+        }
+    });
+}
+
 function mysqlCommonFunc(){
     $('#mysql_common').click(function(){
         layer.open({
@@ -432,8 +481,9 @@ function mysqlCommonFunc(){
             closeBtn: 1,
             shadeClose: false,
             content: '<div class="bt-form pd20">\
-                <button id="mysql_top_nsql" type="button" class="btn btn-default btn-sm">查询执行次数最频繁的前N条SQL语句</button>\
-                <button id="mysql_net_stat" type="button" class="btn btn-default btn-sm">MySQL服务器的QPS/TPS/网络带宽指标</button>\
+                <button style="margin-bottom: 8px;" id="mysql_top_nsql" type="button" class="btn btn-default btn-sm">查询执行次数最频繁的前N条SQL语句</button>\
+                <button style="margin-bottom: 8px;" id="mysql_net_stat" type="button" class="btn btn-default btn-sm">MySQL服务器的QPS/TPS/网络带宽指标</button>\
+                <button style="margin-bottom: 8px;" id="mysql_redundant_indexes" type="button" class="btn btn-default btn-sm">查看重复或冗余的索引</button>\
             </div>',
             success:function(i,l){
                 $('#mysql_top_nsql').click(function(){
@@ -443,6 +493,10 @@ function mysqlCommonFunc(){
                 $('#mysql_net_stat').click(function(){
                     mysqlCommonFuncMysqlNet();
                 });
+
+                $('#mysql_redundant_indexes').click(function(){
+                    mysqlCommonFuncRedundantIndexes();
+                });
             }
         });
     });

From 152fadfc8706a45d852ad609e251f3e581012b99 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 04:07:29 +0800
Subject: [PATCH 522/965] Update app.js

---
 plugins/data_query/static/js/app.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index b97fe5558..b5c65d95f 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -438,6 +438,7 @@ function mysqlCommonFuncRedundantIndexes(){
                     t += '<td>'+items[i]['redundant_index_name']+'</td>';
                     t += '<td>'+items[i]['redundant_index_columns']+'</td>';
                     t += '<td>'+items[i]['sql_drop_index']+'</td>';
+                    t += '<td><a class="btlink">执行</a></td>';
                     t += '</tr>';
                     tbody += t;
                 }
@@ -462,6 +463,7 @@ function mysqlCommonFuncRedundantIndexes(){
                     <th style="width:50px;">冗余索引名</th>\
                     <th style="width:50px;">冗余索引列名</th>\
                     <th style="width:300px;">删除冗余索引SQL</th>\
+                    <th style="width:30px;">操作</th>\
                 </thead>\
                 <tbody></tbody>\
             </table>\

From bd2ab7d5293a05d744b8e28f1cebac903c7718f9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 04:21:43 +0800
Subject: [PATCH 523/965] update

---
 plugins/data_query/sql_mysql.py     | 28 ++++++++++++++++++++++++++++
 plugins/data_query/static/js/app.js | 13 ++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index 68ac3c6ad..c5ac17434 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -381,6 +381,29 @@ class nosqlMySQLCtr():
             return mw.returnData(False, "查询失败!")
         # print(data)
         return mw.returnData(True, 'ok', data)
+
+    def redundantIndexesCmd(self, args):
+        sid = args['sid']
+        my_instance = self.getInstanceBySid(sid).conn()
+        if my_instance is False:
+            return mw.returnData(False,'无法链接')
+
+        is_performance_schema = my_instance.find("SELECT @@performance_schema")
+        if is_performance_schema["@@performance_schema"] == 0:
+            msg = "performance_schema参数未开启。\n"
+            msg += "在my.cnf配置文件里添加performance_schema=1，并重启mysqld进程生效。"
+            return mw.returnData(False, msg)
+
+        data = my_instance.query("select table_schema,table_name,redundant_index_name,redundant_index_columns,sql_drop_index from sys.schema_redundant_indexes")
+        if data is None:
+            return mw.returnData(False, "查询失败!")
+
+        index = int(args['index'])
+
+        cmd = data[index]['sql_drop_index']
+
+        my_instance.execute(cmd)
+        return mw.returnData(True, '执行成功!')
 # ---------------------------------- run ----------------------------------
 # 获取 mysql 列表
 def get_db_list(args):
@@ -423,6 +446,11 @@ def get_redundant_indexes(args):
     t = nosqlMySQLCtr()
     return t.getRedundantIndexes(args)
 
+# 查看重复或冗余的索引
+def redundant_indexes_cmd(args):
+    t = nosqlMySQLCtr()
+    return t.redundantIndexesCmd(args)
+
 
 
 
diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index b5c65d95f..36c07f127 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -438,11 +438,22 @@ function mysqlCommonFuncRedundantIndexes(){
                     t += '<td>'+items[i]['redundant_index_name']+'</td>';
                     t += '<td>'+items[i]['redundant_index_columns']+'</td>';
                     t += '<td>'+items[i]['sql_drop_index']+'</td>';
-                    t += '<td><a class="btlink">执行</a></td>';
+                    t += '<td><a class="exec btlink" index="'+i+'">执行</a></td>';
                     t += '</tr>';
                     tbody += t;
                 }
                 $('#redundant_indexes tbody').html(tbody);
+                $('#redundant_indexes tbody .exec').click(function(){
+                    var index = $(this).attr('index');
+                    myPostCB('redundant_indexes_cmd', {'sid':sid, 'index':index}, function(rdata){
+                        var data = rdata.data;
+                        showMsg(data.msg,function(){
+                            if (data.status){
+                                renderSQL();
+                            }
+                        },{icon: data.status ? 1 : 2}, 2000);
+                    });
+                });
             } else {
                 layer.msg(data.msg,{icon:2});
             }

From 6874de5cda56a9f76fa0dd3da16786c1d06d45f9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 04:26:28 +0800
Subject: [PATCH 524/965] Update app.js

---
 plugins/data_query/static/js/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index 36c07f127..7fbf9134c 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -486,7 +486,7 @@ function mysqlCommonFuncRedundantIndexes(){
 }
 
 function mysqlCommonFunc(){
-    $('#mysql_common').click(function(){
+    $('#mysql_common').unbind('click').click(function(){
         layer.open({
             type: 1,
             title: "MySQL常用功能",

From 7e2c192d4095c18b43af3c226a7fba301cbfb087 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 16:42:42 +0800
Subject: [PATCH 525/965] update

---
 plugins/data_query/sql_mysql.py     |  93 ++++++++++++++++++-
 plugins/data_query/static/js/app.js | 137 ++++++++++++++++++++++++++++
 2 files changed, 228 insertions(+), 2 deletions(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index c5ac17434..869699bd8 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -404,6 +404,88 @@ class nosqlMySQLCtr():
 
         my_instance.execute(cmd)
         return mw.returnData(True, '执行成功!')
+
+    def getTableInfo(self, args):
+        from decimal import Decimal
+
+        sid = args['sid']
+        my_instance = self.getInstanceBySid(sid).conn()
+        if my_instance is False:
+            return mw.returnData(False,'无法链接')
+
+        my_instance.execute("SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))")
+        data = my_instance.query(
+            """
+            SELECT t.TABLE_SCHEMA as TABLE_SCHEMA, t.TABLE_NAME as TABLE_NAME, t.ENGINE as ENGINE,
+                IFNULL(t.DATA_LENGTH/1024/1024/1024, 0) as DATA_LENGTH,
+                IFNULL(t.INDEX_LENGTH/1024/1024/1024, 0) as INDEX_LENGTH,
+                IFNULL((DATA_LENGTH+INDEX_LENGTH)/1024/1024/1024, 0) AS TOTAL_LENGTH,
+                c.column_name AS COLUMN_NAME, c.data_type AS DATA_TYPE, c.COLUMN_TYPE AS COLUMN_TYPE,
+                t.AUTO_INCREMENT AS AUTO_INCREMENT, locate('unsigned', c.COLUMN_TYPE) = 0 AS IS_SIGNED 
+            FROM information_schema.TABLES t 
+            JOIN information_schema.COLUMNS c ON t.TABLE_SCHEMA = c.TABLE_SCHEMA AND t.table_name=c.table_name 
+            WHERE t.TABLE_SCHEMA NOT IN ('mysql', 'information_schema', 'performance_schema', 'sys') 
+            GROUP BY TABLE_NAME 
+            ORDER BY TOTAL_LENGTH DESC, AUTO_INCREMENT DESC;
+            """
+        )
+
+        for i in range(len(data)):
+            row = data[i]
+
+            data[i]['DATA_LENGTH'] = round(row['DATA_LENGTH'] or 0, 2)
+            data[i]['INDEX_LENGTH'] = round(row['INDEX_LENGTH'] or 0, 2)
+            data[i]['TOTAL_LENGTH'] = round(row['TOTAL_LENGTH'] or 0, 2)
+
+            AUTO_INCREMENT = row['AUTO_INCREMENT']
+            DATA_TYPE = row['DATA_TYPE']
+            IS_SIGNED = row['IS_SIGNED']
+            RESIDUAL_AUTO_INCREMENT = 0
+            if AUTO_INCREMENT is not None:
+                if DATA_TYPE == 'tinyint':
+                    if IS_SIGNED == 0:
+                        RESIDUAL_AUTO_INCREMENT = int(255 - AUTO_INCREMENT)
+                    if IS_SIGNED == 1:
+                        RESIDUAL_AUTO_INCREMENT = int(127 - AUTO_INCREMENT)
+
+                if DATA_TYPE == 'smallint':
+                    if IS_SIGNED == 0:
+                        RESIDUAL_AUTO_INCREMENT = int(65535 - AUTO_INCREMENT)
+                    if IS_SIGNED == 1:
+                        RESIDUAL_AUTO_INCREMENT = int(32767 - AUTO_INCREMENT)
+
+                if DATA_TYPE == 'int':
+                    if IS_SIGNED == 0:
+                        RESIDUAL_AUTO_INCREMENT = int(4294967295 - AUTO_INCREMENT)
+                    if IS_SIGNED == 1:
+                        RESIDUAL_AUTO_INCREMENT = int(2147483647 - AUTO_INCREMENT)
+
+                if DATA_TYPE == 'bigint':
+                    if IS_SIGNED == 0:
+                        RESIDUAL_AUTO_INCREMENT = Decimal("18446744073709551615") - Decimal(AUTO_INCREMENT)
+                    if IS_SIGNED == 1:
+                        RESIDUAL_AUTO_INCREMENT = Decimal("9223372036854775807") - Decimal(AUTO_INCREMENT)
+            else:
+                RESIDUAL_AUTO_INCREMENT = "主键非自增"
+            data[i]['RESIDUAL_AUTO_INCREMENT'] = RESIDUAL_AUTO_INCREMENT
+        return mw.returnData(True, 'ok', data)
+
+    # 查看应用端IP连接数总和
+    def getConnCount(self, args):
+        sid = args['sid']
+        my_instance = self.getInstanceBySid(sid).conn()
+        if my_instance is False:
+            return mw.returnData(False,'无法链接')
+
+        data = my_instance.query(
+            "SELECT user,db,substring_index(HOST,':',1) AS Client_IP,count(1) AS count FROM information_schema.PROCESSLIST "
+            "GROUP BY user,db,substring_index(HOST,':',1) ORDER BY COUNT(1) DESC"
+        )
+
+        # data2 = my_instance.query("SELECT USER, COUNT(*) as nums FROM information_schema.PROCESSLIST GROUP BY USER ORDER BY COUNT(*) DESC")
+        # print(data)
+        # print(data2)
+        return mw.returnData(True, 'ok', data)
 # ---------------------------------- run ----------------------------------
 # 获取 mysql 列表
 def get_db_list(args):
@@ -446,13 +528,20 @@ def get_redundant_indexes(args):
     t = nosqlMySQLCtr()
     return t.getRedundantIndexes(args)
 
-# 查看重复或冗余的索引
+# 删除重复或冗余的索引
 def redundant_indexes_cmd(args):
     t = nosqlMySQLCtr()
     return t.redundantIndexesCmd(args)
 
+# 统计库里每个表的大小
+def get_table_info(args):
+    t = nosqlMySQLCtr()
+    return t.getTableInfo(args)
 
-
+# 查看应用端IP连接数总和
+def get_conn_count(args):
+    t = nosqlMySQLCtr()
+    return t.getConnCount(args)
 
 
 # 测试
diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index 7fbf9134c..e9141c284 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -485,6 +485,133 @@ function mysqlCommonFuncRedundantIndexes(){
     });
 }
 
+function mysqlCommonFuncTableInfo(){
+    function renderSQL(){
+        var sid = mysqlGetSid();
+        myPostCBN('get_table_info',{'sid':sid} ,function(rdata){
+            var data = rdata.data;
+            if (data['status']){
+                var items = data.data;
+                var tbody = '';
+                for (var i = 0; i < items.length; i++) {
+                    var t = '<tr>';
+                    t += '<td>'+items[i]['TABLE_SCHEMA']+'</td>';
+                    t += '<td>'+items[i]['TABLE_NAME']+'</td>';
+                    t += '<td>'+items[i]['ENGINE']+'</td>';
+                    t += '<td>'+items[i]['DATA_LENGTH']+'</td>';
+                    t += '<td>'+items[i]['INDEX_LENGTH']+'</td>';
+                    t += '<td>'+items[i]['TOTAL_LENGTH']+'</td>';
+                    t += '<td>'+items[i]['COLUMN_NAME']+'</td>';
+                    t += '<td>'+items[i]['COLUMN_TYPE']+'</td>';
+                    t += '<td>'+items[i]['AUTO_INCREMENT']+'</td>';
+                    t += '<td>'+items[i]['RESIDUAL_AUTO_INCREMENT']+'</td>';
+                    t += '</tr>';
+                    tbody += t;
+                }
+                $('#mysql_data_id tbody').html(tbody);
+            } else {
+                layer.msg(data.msg,{icon:2});
+            }
+        });
+    }
+
+    layer.open({
+        type: 1,
+        title: "统计库里每个表的大小",
+        area: ['1200px', '400px'],
+        closeBtn: 1,
+        shadeClose: false,
+        content: '<div class="bt-form pd20 divtable taskdivtable">\
+            <table class="table table-hover" id="mysql_data_id">\
+                <thead>\
+                    <th style="width:100px;">库名</th>\
+                    <th style="width:50px;">表名</th>\
+                    <th style="width:80px;">储存引擎</th>\
+                    <th style="width:150px;">数据大小(GB)</th>\
+                    <th style="width:130px;">索引大小(GB)</th>\
+                    <th style="width:100px;">总计(GB)</th>\
+                    <th style="width:150px;">主键自增字段</th>\
+                    <th style="width:200px;">主键字段属性</th>\
+                    <th style="width:150px;">主键自增当前</th>\
+                    <th style="width:150px;">主键自增剩余</th>\
+                </thead>\
+                <tbody></tbody>\
+            </table>\
+        </div>',
+        success:function(i,l){
+            renderSQL();
+        }
+    });
+}
+function mysqlCommonFuncConnCount(){
+    function renderSQL(){
+        var sid = mysqlGetSid();
+        myPostCBN('get_conn_count',{'sid':sid} ,function(rdata){
+            var data = rdata.data;
+            if (data['status']){
+                var items = data.data;
+                var tbody = '';
+                for (var i = 0; i < items.length; i++) {
+                    var t = '<tr>';
+                    t += '<td>'+items[i]['user']+'</td>';
+                    t += '<td>'+items[i]['db']+'</td>';
+                    t += '<td>'+items[i]['Client_IP']+'</td>';
+                    t += '<td>'+items[i]['count']+'</td>';
+                    t += '</tr>';
+                    tbody += t;
+                }
+                $('#app_ip_list tbody').html(tbody);
+            } else {
+                layer.msg(data.msg,{icon:2});
+            }
+        });
+    }
+
+    var sql_timer = null;
+    layer.open({
+        type: 1,
+        title: "查看应用端IP连接数总和",
+        area: ['700px', '420px'],
+        closeBtn: 1,
+        shadeClose: false,
+        content: '<div class="bt-form pd20 divtable taskdivtable">\
+            <div class="mr20 pull-left" style="border-right: 1px solid #ccc; padding-right: 20px;">\
+                <div class="ss-text pull-left">\
+                    <em>实时监控</em>\
+                    <div class="ssh-item">\
+                        <input class="btswitch btswitch-ios" id="app_ip_monitoring" type="checkbox">\
+                        <label id="app_ip_label" class="btswitch-btn" for="app_ip_monitoring"></label>\
+                    </div>\
+                </div>\
+            </div>\
+            <hr />\
+            <table class="table table-hover" id="app_ip_list">\
+                <thead>\
+                    <th style="width:160px;">连接用户</th>\
+                    <th style="width:50px;">数据库名</th>\
+                    <th style="width:50px;">应用端IP</th>\
+                    <th style="width:50px;">数量</th>\
+                </thead>\
+                <tbody></tbody>\
+            </table>\
+        </div>',
+        success:function(i,l){
+            renderSQL();
+
+            $('#app_ip_label').click(function(){
+                sql_timer = setInterval(function(){
+                    var t = $('#app_ip_monitoring').is(':checked');
+                    if (t){
+                        renderSQL();
+                    } else{
+                        clearInterval(sql_timer);
+                    }
+                }, 3000);
+            });
+        }
+    });
+}
+
 function mysqlCommonFunc(){
     $('#mysql_common').unbind('click').click(function(){
         layer.open({
@@ -497,6 +624,8 @@ function mysqlCommonFunc(){
                 <button style="margin-bottom: 8px;" id="mysql_top_nsql" type="button" class="btn btn-default btn-sm">查询执行次数最频繁的前N条SQL语句</button>\
                 <button style="margin-bottom: 8px;" id="mysql_net_stat" type="button" class="btn btn-default btn-sm">MySQL服务器的QPS/TPS/网络带宽指标</button>\
                 <button style="margin-bottom: 8px;" id="mysql_redundant_indexes" type="button" class="btn btn-default btn-sm">查看重复或冗余的索引</button>\
+                <button style="margin-bottom: 8px;" id="mysql_table_info" type="button" class="btn btn-default btn-sm">统计库里每个表的大小</button>\
+                <button style="margin-bottom: 8px;" id="mysql_conn_count" type="button" class="btn btn-default btn-sm">查看应用端IP连接数总和</button>\
             </div>',
             success:function(i,l){
                 $('#mysql_top_nsql').click(function(){
@@ -510,6 +639,14 @@ function mysqlCommonFunc(){
                 $('#mysql_redundant_indexes').click(function(){
                     mysqlCommonFuncRedundantIndexes();
                 });
+
+                $('#mysql_table_info').click(function(){
+                    mysqlCommonFuncTableInfo();
+                });
+
+                $('#mysql_conn_count').click(function(){
+                    mysqlCommonFuncConnCount();
+                });
             }
         });
     });

From ab7c4792e2a13b11c19518d7b9d49daa8877a40c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 16:51:26 +0800
Subject: [PATCH 526/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index 869699bd8..caeb4318f 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -482,6 +482,13 @@ class nosqlMySQLCtr():
             "GROUP BY user,db,substring_index(HOST,':',1) ORDER BY COUNT(1) DESC"
         )
 
+        for i in range(len(data)):
+            if data[i]['db'] is None:
+                data[i]['db'] = '空'
+
+            if data[i]['Client_IP'] == '':
+                data[i]['Client_IP'] = '空'
+
         # data2 = my_instance.query("SELECT USER, COUNT(*) as nums FROM information_schema.PROCESSLIST GROUP BY USER ORDER BY COUNT(*) DESC")
         # print(data)
         # print(data2)

From 371cc9c4c874f051c178ec4524ecc3b5ce6bca26 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 16:57:58 +0800
Subject: [PATCH 527/965] Update debian.sh

---
 scripts/install/debian.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/install/debian.sh b/scripts/install/debian.sh
index ae0ac0a46..37e4d97ba 100644
--- a/scripts/install/debian.sh
+++ b/scripts/install/debian.sh
@@ -74,7 +74,9 @@ apt install -y rar
 apt install -y unrar
 apt install -y pv
 apt install -y bc
-apt install -y python3-pip python3-dev python3-venv
+apt install -y python3-pip 
+apt install -y python3-dev 
+apt install -y python3-venv
 apt install -y libncurses5
 apt install -y libncurses5-dev
 apt install -y bzip2

From 76b9298efd84ba06fc4eda1972d57bde819c3bcf Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 17:11:00 +0800
Subject: [PATCH 528/965] update

---
 plugins/data_query/sql_mysql.py     | 28 +++++++++++++++++
 plugins/data_query/static/js/app.js | 49 +++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index caeb4318f..8591e9a0d 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -493,6 +493,29 @@ class nosqlMySQLCtr():
         # print(data)
         # print(data2)
         return mw.returnData(True, 'ok', data)
+
+    # 快速找出没有主键的表
+    def getFpkInfo(self, args):
+        sid = args['sid']
+        my_instance = self.getInstanceBySid(sid).conn()
+        if my_instance is False:
+            return mw.returnData(False,'无法链接')
+
+        data = my_instance.query(
+            """
+            SELECT t.table_schema,
+                   t.table_name
+            FROM information_schema.tables t
+            LEFT JOIN information_schema.key_column_usage k
+                 ON t.table_schema = k.table_schema
+                    AND t.table_name = k.table_name
+                    AND k.constraint_name = 'PRIMARY'
+            WHERE t.table_schema NOT IN ('mysql', 'information_schema', 'sys', 'performance_schema')
+              AND k.constraint_name IS NULL
+              AND t.table_type = 'BASE TABLE';
+            """
+        )
+        return mw.returnData(True, 'ok', data)
 # ---------------------------------- run ----------------------------------
 # 获取 mysql 列表
 def get_db_list(args):
@@ -550,6 +573,11 @@ def get_conn_count(args):
     t = nosqlMySQLCtr()
     return t.getConnCount(args)
 
+# 快速找出没有主键的表
+def get_fpk_info(args):
+    t = nosqlMySQLCtr()
+    return t.getFpkInfo(args)
+
 
 # 测试
 def test(args):
diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index e9141c284..4518f6f60 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -543,6 +543,7 @@ function mysqlCommonFuncTableInfo(){
         }
     });
 }
+
 function mysqlCommonFuncConnCount(){
     function renderSQL(){
         var sid = mysqlGetSid();
@@ -612,6 +613,49 @@ function mysqlCommonFuncConnCount(){
     });
 }
 
+function mysqlCommonFuncFpkInfo(){
+    function renderSQL(){
+        var sid = mysqlGetSid();
+        myPostCBN('get_fpk_info',{'sid':sid} ,function(rdata){
+            var data = rdata.data;
+            if (data['status']){
+                var items = data.data;
+                var tbody = '';
+                for (var i = 0; i < items.length; i++) {
+                    var t = '<tr>';
+                    t += '<td>'+items[i]['table_schema']+'</td>';
+                    t += '<td>'+items[i]['table_name']+'</td>';
+                    t += '</tr>';
+                    tbody += t;
+                }
+                $('#mysql_data_id tbody').html(tbody);
+            } else {
+                layer.msg(data.msg,{icon:2});
+            }
+        });
+    }
+
+    layer.open({
+        type: 1,
+        title: "快速找出没有主键的表",
+        area: ['800px', '400px'],
+        closeBtn: 1,
+        shadeClose: false,
+        content: '<div class="bt-form pd20 divtable taskdivtable">\
+            <table class="table table-hover" id="mysql_data_id">\
+                <thead>\
+                    <th style="width:100px;">库名</th>\
+                    <th style="width:50px;">表名</th>\
+                </thead>\
+                <tbody></tbody>\
+            </table>\
+        </div>',
+        success:function(i,l){
+            renderSQL();
+        }
+    });
+}
+
 function mysqlCommonFunc(){
     $('#mysql_common').unbind('click').click(function(){
         layer.open({
@@ -626,6 +670,7 @@ function mysqlCommonFunc(){
                 <button style="margin-bottom: 8px;" id="mysql_redundant_indexes" type="button" class="btn btn-default btn-sm">查看重复或冗余的索引</button>\
                 <button style="margin-bottom: 8px;" id="mysql_table_info" type="button" class="btn btn-default btn-sm">统计库里每个表的大小</button>\
                 <button style="margin-bottom: 8px;" id="mysql_conn_count" type="button" class="btn btn-default btn-sm">查看应用端IP连接数总和</button>\
+                <button style="margin-bottom: 8px;" id="mysql_fpk_info" type="button" class="btn btn-default btn-sm">快速找出没有主键的表</button>\
             </div>',
             success:function(i,l){
                 $('#mysql_top_nsql').click(function(){
@@ -647,6 +692,10 @@ function mysqlCommonFunc(){
                 $('#mysql_conn_count').click(function(){
                     mysqlCommonFuncConnCount();
                 });
+
+                $('#mysql_fpk_info').click(function(){
+                    mysqlCommonFuncFpkInfo();
+                });
             }
         });
     });

From 778e1860df90562a8a8b77bd5d08891963829873 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 18:01:09 +0800
Subject: [PATCH 529/965] Update python-app-op.yml

---
 .github/workflows/python-app-op.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-app-op.yml b/.github/workflows/python-app-op.yml
index 53ab5f7fc..64ce10ca2 100644
--- a/.github/workflows/python-app-op.yml
+++ b/.github/workflows/python-app-op.yml
@@ -31,7 +31,7 @@ jobs:
         sudo bash scripts/install_dev.sh
     - name: Install OpenResty
       run: |
-        cd /www/server/mdserver-web/plugins/openresty && sudo bash install.sh install 1.21.4.1
+        cd /www/server/mdserver-web/plugins/openresty && sudo bash install.sh install 1.27
     - name: Start DEBUG
       run: |
         gunicorn -c setting.py app:app

From 1d9bc68e28911359073f23f4769337a35ecfbf32 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 18:07:22 +0800
Subject: [PATCH 530/965] update

---
 plugins/data_query/sql_mysql.py     | 58 +++++++++++++++++++++
 plugins/data_query/static/js/app.js | 80 +++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index 8591e9a0d..36f97d159 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -516,6 +516,54 @@ class nosqlMySQLCtr():
             """
         )
         return mw.returnData(True, 'ok', data)
+
+    def getLockSql(self, args):
+        sid = args['sid']
+        my_instance = self.getInstanceBySid(sid).conn()
+        if my_instance is False:
+            return mw.returnData(False,'无法链接')
+
+        data = my_instance.query(
+            """
+            SELECT 
+                a.trx_id AS trx_id, 
+                a.trx_state AS trx_state, 
+                a.trx_started AS trx_started, 
+                b.id AS processlist_id, 
+                b.info AS info, 
+                b.user AS user, 
+                b.host AS host, 
+                b.db AS db, 
+                b.command AS command, 
+                b.state AS state, 
+                CONCAT('KILL QUERY ', b.id) AS sql_kill_blocking_query
+            FROM 
+                information_schema.INNODB_TRX a, 
+                information_schema.PROCESSLIST b 
+            WHERE 
+                a.trx_mysql_thread_id = b.id
+            ORDER BY 
+                a.trx_started
+            """
+        )
+
+        print(data)
+        return mw.returnData(True, 'ok', data)
+
+    def getDeadlockInfo(self, args):
+        sid = args['sid']
+        my_instance = self.getInstanceBySid(sid).conn()
+        if my_instance is False:
+            return mw.returnData(False,'无法链接')
+
+        data = my_instance.find("SHOW ENGINE INNODB STATUS")
+        if data is not None:
+            innodb_status = data['Status']
+            deadlock_info = re.search(r"LATEST DETECTED DEADLOCK.*?WE ROLL BACK TRANSACTION\s+\(\d+\)", innodb_status, re.DOTALL)
+            if deadlock_info is None:
+                return mw.returnData(True, 'ok', '无锁表')
+            return mw.returnData(True, 'ok', deadlock_info.group(0))
+        return mw.returnData(True, 'ok', '无锁表')
 # ---------------------------------- run ----------------------------------
 # 获取 mysql 列表
 def get_db_list(args):
@@ -578,6 +626,16 @@ def get_fpk_info(args):
     t = nosqlMySQLCtr()
     return t.getFpkInfo(args)
 
+# 查看当前锁阻塞的SQL
+def get_lock_sql(args):
+    t = nosqlMySQLCtr()
+    return t.getLockSql(args)
+
+# 查看死锁信息
+def get_deadlock_info(args):
+    t = nosqlMySQLCtr()
+    return t.getDeadlockInfo(args)
+
 
 # 测试
 def test(args):
diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index 4518f6f60..27e4ed041 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -656,6 +656,76 @@ function mysqlCommonFuncFpkInfo(){
     });
 }
 
+function mysqlCommonFuncLockSQL(){
+    function renderSQL(){
+        var sid = mysqlGetSid();
+        myPostCBN('get_lock_sql',{'sid':sid} ,function(rdata){
+            var data = rdata.data;
+            if (data['status']){
+                var items = data.data;
+                var tbody = '';
+                for (var i = 0; i < items.length; i++) {
+                    var t = '<tr>';
+                    t += '<td>'+items[i]['table_schema']+'</td>';
+                    t += '<td>'+items[i]['table_name']+'</td>';
+                    t += '</tr>';
+                    tbody += t;
+                }
+                $('#mysql_data_id tbody').html(tbody);
+            } else {
+                layer.msg(data.msg,{icon:2});
+            }
+        });
+    }
+
+    layer.open({
+        type: 1,
+        title: "查看当前锁阻塞的SQL",
+        area: ['800px', '400px'],
+        closeBtn: 1,
+        shadeClose: false,
+        content: '<div class="bt-form pd20 divtable taskdivtable">\
+            <table class="table table-hover" id="mysql_data_id">\
+                <thead>\
+                    <th style="width:100px;">库名</th>\
+                    <th style="width:50px;">表名</th>\
+                </thead>\
+                <tbody></tbody>\
+            </table>\
+        </div>',
+        success:function(i,l){
+            renderSQL();
+        }
+    });
+}
+
+function mysqlCommonFuncDeadlockInfo(){
+
+    function renderSQL(){
+        var sid = mysqlGetSid();
+        myPostCBN('get_deadlock_info',{'sid':sid} ,function(rdata){
+            var data = rdata.data;
+            $('#info_log').html(data.data);
+            var ob = document.getElementById('info_log');
+            ob.scrollTop = ob.scrollHeight; 
+        });
+    }
+
+    layer.open({
+        type: 1,
+        title: "查看死锁信息",
+        area: ['800px', '400px'],
+        closeBtn: 1,
+        shadeClose: false,
+        content: '<div class="bt-form pd15">\
+            <textarea readonly="" style="margin: 0px;height: 330px;width: 100%;background-color: #333;color:#fff; padding:0 5px" id="info_log"></textarea>\
+        </div>',
+        success:function(i,l){
+            renderSQL();
+        }
+    });
+}
+
 function mysqlCommonFunc(){
     $('#mysql_common').unbind('click').click(function(){
         layer.open({
@@ -671,6 +741,8 @@ function mysqlCommonFunc(){
                 <button style="margin-bottom: 8px;" id="mysql_table_info" type="button" class="btn btn-default btn-sm">统计库里每个表的大小</button>\
                 <button style="margin-bottom: 8px;" id="mysql_conn_count" type="button" class="btn btn-default btn-sm">查看应用端IP连接数总和</button>\
                 <button style="margin-bottom: 8px;" id="mysql_fpk_info" type="button" class="btn btn-default btn-sm">快速找出没有主键的表</button>\
+                <button style="margin-bottom: 8px;" id="mysql_lock_sql" type="button" class="btn btn-default btn-sm">查看当前锁阻塞的SQL</button>\
+                <button style="margin-bottom: 8px;" id="mysql_deadlock_info" type="button" class="btn btn-default btn-sm">查看死锁信息</button>\
             </div>',
             success:function(i,l){
                 $('#mysql_top_nsql').click(function(){
@@ -696,6 +768,14 @@ function mysqlCommonFunc(){
                 $('#mysql_fpk_info').click(function(){
                     mysqlCommonFuncFpkInfo();
                 });
+
+                $('#mysql_lock_sql').click(function(){
+                    mysqlCommonFuncLockSQL();
+                });
+
+                $('#mysql_deadlock_info').click(function(){
+                    mysqlCommonFuncDeadlockInfo();
+                });
             }
         });
     });

From c355a120b4eba0c6b094ba604706c9d483263333 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 21:16:21 +0800
Subject: [PATCH 531/965] Update install.sh

---
 plugins/op_waf/install.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/op_waf/install.sh b/plugins/op_waf/install.sh
index e3a7950c7..dd59aff37 100755
--- a/plugins/op_waf/install.sh
+++ b/plugins/op_waf/install.sh
@@ -9,8 +9,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 action=$1
 version=$2
 sys_os=`uname`
@@ -28,7 +26,7 @@ fi
 
 Install_App(){
 	
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source/op_waf
 	mkdir -p $serverPath/op_waf
 
@@ -114,7 +112,7 @@ Install_App(){
 	fi
 
 	echo "${version}" > $serverPath/op_waf/version.pl
-	echo 'install ok' > $install_tmp
+	echo '安装OP防火墙成功!'
 
 	cd ${rootPath} && python3 ${rootPath}/plugins/op_waf/index.py start
 	echo "cd ${rootPath} && python3 ${rootPath}/plugins/op_waf/index.py start"

From 97829cd944705cec04b10004fa2002036f201fd8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 21:16:59 +0800
Subject: [PATCH 532/965] Update install.sh

---
 plugins/op_load_balance/install.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/op_load_balance/install.sh b/plugins/op_load_balance/install.sh
index d78bf73fb..d34795d33 100755
--- a/plugins/op_load_balance/install.sh
+++ b/plugins/op_load_balance/install.sh
@@ -7,7 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 action=$1
 version=$2
@@ -24,11 +23,11 @@ else
 fi
 
 Install_App(){
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/op_load_balance
 	echo "${version}" > $serverPath/op_load_balance/version.pl
 	cd ${rootPath} && python3 ${rootPath}/plugins/op_load_balance/index.py start
-	echo 'install ok' > $install_tmp
+	echo '安装OP负载均衡成功!'
 }
 
 Uninstall_App(){

From 9915ed35d0504f1d57616fac77163852dcfd5f0a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 21:44:09 +0800
Subject: [PATCH 533/965] update

---
 plugins/acme_pandominassl_apply/install.sh    |  3 +--
 plugins/alist/install.sh                      |  1 -
 plugins/backup_ftp/install.sh                 |  3 +--
 plugins/clean/install.sh                      |  7 +++----
 plugins/cloudreve/install.sh                  |  1 -
 plugins/data_query/install.sh                 |  3 +--
 plugins/docker/install.sh                     |  2 +-
 plugins/dynamic-tracking/install.sh           |  9 ++++-----
 plugins/dynamic-tracking/versions/centos.sh   |  1 -
 plugins/dynamic-tracking/versions/debian.sh   |  1 -
 plugins/dynamic-tracking/versions/macos.sh    |  1 -
 plugins/dynamic-tracking/versions/ubuntu.sh   |  1 -
 plugins/fail2ban/install.sh                   |  3 +--
 plugins/gdrive/install.sh                     |  9 ++++-----
 plugins/gitea/install.sh                      |  4 +---
 plugins/gogs/install.sh                       |  8 +++-----
 plugins/gorse/install.sh                      |  4 +---
 plugins/haproxy/install.sh                    |  2 --
 plugins/haproxy/versions/2.6/install.sh       |  5 +----
 plugins/imail/install.sh                      |  6 ++----
 plugins/imail/versions/0.0.19/install.sh      |  7 +++----
 plugins/keepalived/install.sh                 |  2 --
 plugins/lvs/install.sh                        |  1 -
 plugins/mariadb/install.sh                    |  2 --
 plugins/mariadb/versions/10.11/install.sh     |  5 ++---
 plugins/mariadb/versions/10.6/install.sh      |  5 ++---
 plugins/mariadb/versions/10.7/install.sh      |  5 ++---
 plugins/mariadb/versions/10.8/install.sh      |  5 ++---
 plugins/mariadb/versions/10.9/install.sh      |  5 ++---
 plugins/mariadb/versions/11.0/install.sh      |  5 ++---
 plugins/mariadb/versions/11.1/install.sh      |  5 ++---
 plugins/mariadb/versions/11.2/install.sh      |  5 ++---
 plugins/mariadb/versions/11.3/install.sh      |  5 ++---
 plugins/mariadb/versions/11.4/install.sh      |  5 ++---
 plugins/mariadb/versions/11.5/install.sh      |  5 ++---
 plugins/mariadb/versions/11.6/install.sh      |  5 ++---
 plugins/memcached/install.sh                  |  3 +--
 plugins/migration_api/install.sh              |  3 +--
 plugins/mongodb/install.bk1.sh                |  7 +++----
 plugins/mongodb/install.bk2.sh                |  7 +++----
 plugins/mongodb/install.sh                    |  1 -
 plugins/msonedrive/install.sh                 |  5 ++---
 plugins/mysql-apt/install.sh                  |  1 -
 plugins/mysql-apt/versions/5.7/install.sh     | 11 +++++------
 plugins/mysql-apt/versions/8.0/install.sh     | 13 ++++++-------
 plugins/mysql-apt/versions/8.2/install.sh     | 13 ++++++-------
 plugins/mysql-apt/versions/8.3/install.sh     | 13 ++++++-------
 plugins/mysql-apt/versions/8.4/install.sh     |  9 ++++-----
 plugins/mysql-apt/versions/9.0/install.sh     |  7 +++----
 plugins/mysql-yum/install.sh                  |  6 ++----
 plugins/mysql-yum/versions/5.7/install.sh     |  7 +++----
 plugins/mysql-yum/versions/8.0/install.sh     |  4 +---
 plugins/mysql-yum/versions/8.2/install.sh     |  3 +--
 plugins/mysql-yum/versions/8.3/install.sh     |  4 +---
 plugins/mysql-yum/versions/8.4/install.sh     |  4 +---
 plugins/mysql-yum/versions/9.0/install.sh     |  4 +---
 plugins/mysql/install.sh                      |  8 ++------
 plugins/mysql/versions/5.5/install.sh         |  5 ++---
 plugins/mysql/versions/5.6/install.sh         |  3 +--
 plugins/mysql/versions/5.7/install.sh         |  4 +---
 plugins/mysql/versions/8.0/install.sh         |  4 +---
 plugins/mysql/versions/8.2/install.sh         |  4 +---
 plugins/mysql/versions/8.3/install.sh         |  4 +---
 plugins/mysql/versions/8.4/install.sh         |  4 +---
 plugins/mysql/versions/9.0/install.sh         |  3 +--
 plugins/nezha/install.sh                      |  6 ++----
 plugins/nezha/versions/0.15.2/install.sh      |  9 ++++-----
 plugins/openresty/install.sh                  |  1 -
 plugins/openresty/versions/1.17.8/install.sh  |  2 --
 plugins/openresty/versions/1.19.3/install.sh  |  2 --
 plugins/openresty/versions/1.21.4/install.sh  |  1 -
 plugins/openresty/versions/1.25.3/install.sh  |  1 -
 plugins/openresty/versions/1.27.1/install.sh  |  1 -
 plugins/openresty/versions/rtmp/install.sh    |  1 -
 plugins/pgadmin/install.sh                    |  2 --
 plugins/php-guard/install.sh                  |  3 ---
 plugins/php/versions/80/install.sh            |  2 +-
 plugins/php/versions/81/install.sh            |  2 +-
 plugins/php/versions/82/install.sh            |  2 +-
 plugins/php/versions/83/install.sh            |  2 +-
 plugins/php/versions/84/install.sh            |  2 +-
 plugins/phpmyadmin/install.sh                 |  3 ---
 plugins/postgresql/install.sh                 |  2 --
 plugins/postgresql/versions/14/install.sh     |  3 +--
 plugins/postgresql/versions/15/install.sh     |  4 +---
 plugins/postgresql/versions/16/install.sh     |  3 +--
 plugins/postgresql/versions/17/install.sh     |  3 +--
 plugins/rsyncd/install.sh                     | 10 +++++-----
 plugins/simpleping/install.sh                 |  4 +---
 plugins/sphinx/install.sh                     |  1 -
 plugins/supervisor/install.sh                 |  1 -
 plugins/swap/install.sh                       |  8 +++-----
 plugins/sys-opt/install.sh                    | 10 +++-------
 plugins/system_safe/install.sh                |  7 +++----
 plugins/tamper_proof_py/install.sh            |  7 +++----
 plugins/task_manager/install.sh               |  3 +--
 plugins/tgbot/install.sh                      |  9 +++------
 plugins/tgclient/install.sh                   |  9 +++------
 plugins/varnish/install.sh                    |  7 +++----
 plugins/webhook/install.sh                    |  8 +++-----
 plugins/webssh/install.sh                     |  9 +++------
 plugins/webstats/install.sh                   |  1 -
 plugins/xhprof/install.sh                     |  5 ++---
 plugins/zabbix/install.sh                     |  1 -
 plugins/zabbix/versions/6.0/alma.sh           |  1 -
 plugins/zabbix/versions/6.0/centos.sh         |  1 -
 plugins/zabbix/versions/6.0/debian.sh         |  2 +-
 plugins/zabbix/versions/6.0/opensuse.sh       |  1 -
 plugins/zabbix/versions/6.0/rocky.sh          |  1 -
 plugins/zabbix/versions/6.0/ubuntu.sh         |  2 +-
 plugins/zabbix/versions/7.0/alma.sh           |  1 -
 plugins/zabbix/versions/7.0/centos.sh         |  1 -
 plugins/zabbix/versions/7.0/debian.sh         |  2 --
 plugins/zabbix/versions/7.0/opensuse.sh       |  1 -
 plugins/zabbix/versions/7.0/rocky.sh          |  2 +-
 plugins/zabbix/versions/7.0/ubuntu.sh         |  1 -
 plugins/zabbix_agent/install.sh               |  1 -
 plugins/zabbix_agent/versions/6.0/debian.sh   |  1 -
 plugins/zabbix_agent/versions/7.0/alma.sh     |  2 +-
 plugins/zabbix_agent/versions/7.0/centos.sh   |  1 -
 plugins/zabbix_agent/versions/7.0/debian.sh   |  2 +-
 plugins/zabbix_agent/versions/7.0/opensuse.sh |  2 +-
 plugins/zabbix_agent/versions/7.0/rocky.sh    |  1 -
 plugins/zabbix_agent/versions/7.0/ubuntu.sh   |  2 +-
 124 files changed, 170 insertions(+), 325 deletions(-)

diff --git a/plugins/acme_pandominassl_apply/install.sh b/plugins/acme_pandominassl_apply/install.sh
index 4f4ce632f..42591f085 100755
--- a/plugins/acme_pandominassl_apply/install.sh
+++ b/plugins/acme_pandominassl_apply/install.sh
@@ -7,7 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 # curl  https://get.acme.sh | sh
@@ -31,7 +30,7 @@ fi
 # pip install cloudflare
 Install_App()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 	mkdir -p $serverPath/acme_pandominassl_apply
 	echo "${VERSION}" > $serverPath/acme_pandominassl_apply/version.pl
diff --git a/plugins/alist/install.sh b/plugins/alist/install.sh
index a0b26c1a6..900ab6181 100755
--- a/plugins/alist/install.sh
+++ b/plugins/alist/install.sh
@@ -10,7 +10,6 @@ serverPath=$(dirname "$rootPath")
 # cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/alist && bash install.sh install 3.37.4
 # cd /www/server/mdserver-web/plugins/alist && bash install.sh install 3.37.4
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 sysArch=`arch`
diff --git a/plugins/backup_ftp/install.sh b/plugins/backup_ftp/install.sh
index 12f3a5b8c..9d37cbf5d 100755
--- a/plugins/backup_ftp/install.sh
+++ b/plugins/backup_ftp/install.sh
@@ -7,7 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 sys_os=`uname`
 
 
@@ -15,7 +14,7 @@ Install_App()
 {
 	mkdir -p ${serverPath}/backup_ftp
 	echo "${1}" > ${serverPath}/backup_ftp/version.pl
-	echo '安装完成' > $install_tmp
+	echo '安装完成'
 
 }
 
diff --git a/plugins/clean/install.sh b/plugins/clean/install.sh
index c8cfe95d5..d52b1c1c2 100755
--- a/plugins/clean/install.sh
+++ b/plugins/clean/install.sh
@@ -10,7 +10,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 if [ -f ${rootPath}/bin/activate ];then
@@ -20,19 +19,19 @@ fi
 
 Install_app()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/clean
 
 	cd ${rootPath} && python3 ${rootPath}/plugins/clean/index.py start
 	echo "${VERSION}" > $serverPath/clean/version.pl
-	echo '安装完成' > $install_tmp
+	echo '安装完成'
 }
 
 Uninstall_app()
 {
 	cd ${rootPath} && python3 ${rootPath}/plugins/clean/index.py stop
 	rm -rf $serverPath/clean
-	echo "Uninstall_clean" > $install_tmp
+	echo "Uninstall_clean"
 }
 
 action=$1
diff --git a/plugins/cloudreve/install.sh b/plugins/cloudreve/install.sh
index 0de5e44ef..11ac5d927 100755
--- a/plugins/cloudreve/install.sh
+++ b/plugins/cloudreve/install.sh
@@ -10,7 +10,6 @@ serverPath=$(dirname "$rootPath")
 # cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/cloudreve && bash install.sh install 3.8.3
 # cd /www/server/mdserver-web/plugins/cloudreve && bash install.sh install 3.8.3
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 sysArch=`arch`
diff --git a/plugins/data_query/install.sh b/plugins/data_query/install.sh
index b3b580f17..7a45a82a2 100755
--- a/plugins/data_query/install.sh
+++ b/plugins/data_query/install.sh
@@ -7,12 +7,11 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 Install_App()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 	mkdir -p $serverPath/data_query
 	echo "${VERSION}" > $serverPath/data_query/version.pl
diff --git a/plugins/docker/install.sh b/plugins/docker/install.sh
index c0679a66e..75ec2fa1f 100755
--- a/plugins/docker/install.sh
+++ b/plugins/docker/install.sh
@@ -41,7 +41,7 @@ Install_Docker()
 {
 	# which docker
 	# if [ "$?" == "0" ];then
-	# 	echo '安装已经完成docker' > $install_tmp
+	# 	echo '安装已经完成docker'
 	# 	exit 0
 	# fi
 
diff --git a/plugins/dynamic-tracking/install.sh b/plugins/dynamic-tracking/install.sh
index 0ddca4b3a..cb0995050 100755
--- a/plugins/dynamic-tracking/install.sh
+++ b/plugins/dynamic-tracking/install.sh
@@ -10,7 +10,6 @@ serverPath=$(dirname "$rootPath")
 # cd /www/server/mdserver-web/plugins/dynamic-tracking && /bin/bash install.sh uninstall 1.0
 # cd /www/server/mdserver-web/plugins/dynamic-tracking && /bin/bash install.sh install 1.0
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 if [ -f ${rootPath}/bin/activate ];then
@@ -31,7 +30,7 @@ fi
 Install_App()
 {
 
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 	mkdir -p $serverPath/dynamic-tracking
 
@@ -57,7 +56,7 @@ Install_App()
 	shell_file=${curPath}/versions/${OSNAME}.sh
 	echo $shell_file
 	if [ ! -f $shell_file ];then
-		echo '不支持...' > $install_tmp 
+		echo '不支持...' 
 		exit 1
 	fi
 	
@@ -67,7 +66,7 @@ Install_App()
 	cp -rf ${curPath}/shell $serverPath/dynamic-tracking
 
 	echo "${VERSION}" > $serverPath/dynamic-tracking/version.pl
-	echo '安装完成' > $install_tmp
+	echo '安装完成'
 
 	cd ${rootPath} && python3 ${rootPath}/plugins/dynamic-tracking/index.py start
 	# cd ${rootPath} && python3 ${rootPath}/plugins/dynamic-tracking/index.py initd_install
@@ -77,7 +76,7 @@ Install_App()
 Uninstall_App()
 {
 	rm -rf $serverPath/dynamic-tracking
-	echo "Uninstall_App" > $install_tmp
+	echo "Uninstall_App"
 }
 
 action=$1
diff --git a/plugins/dynamic-tracking/versions/centos.sh b/plugins/dynamic-tracking/versions/centos.sh
index f71fbaa58..e74a8469f 100644
--- a/plugins/dynamic-tracking/versions/centos.sh
+++ b/plugins/dynamic-tracking/versions/centos.sh
@@ -7,5 +7,4 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 SYS_ARCH=`arch`
\ No newline at end of file
diff --git a/plugins/dynamic-tracking/versions/debian.sh b/plugins/dynamic-tracking/versions/debian.sh
index c42eff5eb..c87f300fb 100644
--- a/plugins/dynamic-tracking/versions/debian.sh
+++ b/plugins/dynamic-tracking/versions/debian.sh
@@ -7,7 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 SYS_ARCH=`arch`
 
 # apt-get install linux-perf
diff --git a/plugins/dynamic-tracking/versions/macos.sh b/plugins/dynamic-tracking/versions/macos.sh
index 812f66746..f0522e5c3 100644
--- a/plugins/dynamic-tracking/versions/macos.sh
+++ b/plugins/dynamic-tracking/versions/macos.sh
@@ -7,7 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 SYS_ARCH=`arch`
 
 # 关于macosx使用dtrace
diff --git a/plugins/dynamic-tracking/versions/ubuntu.sh b/plugins/dynamic-tracking/versions/ubuntu.sh
index b9dcff40b..b12e95d0f 100644
--- a/plugins/dynamic-tracking/versions/ubuntu.sh
+++ b/plugins/dynamic-tracking/versions/ubuntu.sh
@@ -7,7 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 SYS_ARCH=`arch`
 
 # export GOPROXY=https://goproxy.io
diff --git a/plugins/fail2ban/install.sh b/plugins/fail2ban/install.sh
index ced567e74..09f8b1806 100755
--- a/plugins/fail2ban/install.sh
+++ b/plugins/fail2ban/install.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 # cd /www/server/mdserver-web/plugins/fail2ban && bash install.sh install 1.1.0
@@ -16,7 +15,7 @@ VERSION=$2
 
 Install_App()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 
 	apt install -y fail2ban
diff --git a/plugins/gdrive/install.sh b/plugins/gdrive/install.sh
index 43b8895b5..a10c64155 100644
--- a/plugins/gdrive/install.sh
+++ b/plugins/gdrive/install.sh
@@ -10,7 +10,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 PATH=$PATH:${rootPath}/bin
 export PATH
@@ -58,13 +57,13 @@ Install_App()
             pip install -I google-api-python-client==2.39.0 google-auth-httplib2==0.1.0 google-auth-oauthlib==0.5.0 -i https://pypi.Python.org/simple
             pip install -I httplib2==0.18.1 -i https://pypi.Python.org/simple
         fi
-        echo '正在安装脚本文件...' > $install_tmp
+        echo '正在安装脚本文件...'
 
         mkdir -p $serverPath/gdrive
         echo "${VERSION}" > $serverPath/gdrive/version.pl
-        echo '安装完成' > $install_tmp
+        echo '安装完成'
     else
-        echo '服务器连接不上谷歌云！安装失败！' > $install_tmp
+        echo '服务器连接不上谷歌云！安装失败！'
         exit 1
     fi
 }
@@ -72,7 +71,7 @@ Install_App()
 Uninstall_App()
 {
 	rm -rf $serverPath/gdrive
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 
diff --git a/plugins/gitea/install.sh b/plugins/gitea/install.sh
index 437e431ef..c03be4b16 100755
--- a/plugins/gitea/install.sh
+++ b/plugins/gitea/install.sh
@@ -7,8 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-
-install_tmp=${rootPath}/tmp/mw_install.pl
 if [ -f ${rootPath}/bin/activate ];then
 	source ${rootPath}/bin/activate
 fi
@@ -115,7 +113,7 @@ Uninstall_App()
 	fi
 
 	rm -rf $serverPath/gitea
-	echo 'uninstall success' > $install_tmp
+	echo 'uninstall success'
 }
 
 
diff --git a/plugins/gogs/install.sh b/plugins/gogs/install.sh
index 23da6e351..d9a3af681 100755
--- a/plugins/gogs/install.sh
+++ b/plugins/gogs/install.sh
@@ -7,8 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 if [ -f ${rootPath}/bin/activate ];then
 	source ${rootPath}/bin/activate
 fi
@@ -36,7 +34,7 @@ Install_gogs()
 	
 	mkdir -p $serverPath/source/gogs
 
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	version=$1
 	os=`getOs`
 
@@ -78,7 +76,7 @@ Install_gogs()
 	# 	echo "gogs ALL=(ALL)    NOPASSWD: ALL" >> /etc/sudoers
 	# fi
 
-	echo 'install success' > $install_tmp
+	echo 'install success'
 }
 
 Uninstall_gogs()
@@ -96,7 +94,7 @@ Uninstall_gogs()
 	fi
 
 	rm -rf $serverPath/gogs
-	echo 'uninstall success' > $install_tmp
+	echo 'uninstall success'
 }
 
 
diff --git a/plugins/gorse/install.sh b/plugins/gorse/install.sh
index e34f521c7..3edbb195e 100755
--- a/plugins/gorse/install.sh
+++ b/plugins/gorse/install.sh
@@ -12,13 +12,11 @@ sysArch=`arch`
 # cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/gorse && bash install.sh install 0.4.15
 # cd /www/server/mdserver-web/plugins/gorse && bash install.sh install 0.4.15
 
-
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 Install_App()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 	mkdir -p $serverPath/source/gorse
 
diff --git a/plugins/haproxy/install.sh b/plugins/haproxy/install.sh
index d22eb66d4..8844a1df8 100755
--- a/plugins/haproxy/install.sh
+++ b/plugins/haproxy/install.sh
@@ -8,8 +8,6 @@ curPath=`pwd`
 rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 
 action=$1
 type=$2
diff --git a/plugins/haproxy/versions/2.6/install.sh b/plugins/haproxy/versions/2.6/install.sh
index 43854cb7a..f49b5d395 100755
--- a/plugins/haproxy/versions/2.6/install.sh
+++ b/plugins/haproxy/versions/2.6/install.sh
@@ -8,9 +8,6 @@ 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}'`
@@ -63,7 +60,7 @@ Install_App()
 	fi
 
 	echo $MIN_VERSION > $serverPath/haproxy/version.pl
-	echo '安装Haproxy成功' > $install_tmp
+	echo '安装Haproxy成功'
 
 	#Haproxy日志配置
 	if [ -f /etc/rsyslog.conf ];then
diff --git a/plugins/imail/install.sh b/plugins/imail/install.sh
index 04a563fe9..631a4a26f 100755
--- a/plugins/imail/install.sh
+++ b/plugins/imail/install.sh
@@ -7,18 +7,16 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 action=$1
 type=$2
 
 if [ "${2}" == "" ];then
-	echo '缺少安装脚本...' > $install_tmp
+	echo '缺少安装脚本...'
 	exit 0
 fi 
 
 if [ ! -d $curPath/versions/$2 ];then
-	echo '缺少安装脚本2...' > $install_tmp
+	echo '缺少安装脚本2...'
 	exit 0
 fi
 
diff --git a/plugins/imail/versions/0.0.19/install.sh b/plugins/imail/versions/0.0.19/install.sh
index 3e10c02e0..dbfe92501 100755
--- a/plugins/imail/versions/0.0.19/install.sh
+++ b/plugins/imail/versions/0.0.19/install.sh
@@ -7,7 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=0.0.19
 
 # bash install.sh install 0.0.19
@@ -67,7 +66,7 @@ download_file() {
 
 Install_App()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 
 	load_vars
@@ -93,7 +92,7 @@ Install_App()
 		cd ${rootPath} && python3 ${rootPath}/plugins/imail/index.py start
 		cd ${rootPath} && python3 ${rootPath}/plugins/imail/index.py initd_install
 	fi
-	echo 'install successful' > $install_tmp
+	echo 'install successful'
 }
 
 Uninstall_App()
@@ -101,7 +100,7 @@ Uninstall_App()
 	cd ${rootPath} && python3 ${rootPath}/plugins/imail/index.py initd_uninstall
 	cd ${rootPath} && python3 ${rootPath}/plugins/imail/index.py stop
 	rm -rf $serverPath/imail
-	echo "install fail" > $install_tmp
+	echo "install fail"
 }
 
 action=$1
diff --git a/plugins/keepalived/install.sh b/plugins/keepalived/install.sh
index 067777cbb..d3a869a2d 100755
--- a/plugins/keepalived/install.sh
+++ b/plugins/keepalived/install.sh
@@ -18,8 +18,6 @@ serverPath=$(dirname "$rootPath")
 # systemctl restart keepalived
 # ifconfig
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 VERSION=$2
 
 Install_App()
diff --git a/plugins/lvs/install.sh b/plugins/lvs/install.sh
index fd6bb9f25..9ecaccca4 100755
--- a/plugins/lvs/install.sh
+++ b/plugins/lvs/install.sh
@@ -7,7 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 sys_os=`uname`
 VERSION=1.6.22
 
diff --git a/plugins/mariadb/install.sh b/plugins/mariadb/install.sh
index ae2cbf9c6..ff3f0ac0f 100755
--- a/plugins/mariadb/install.sh
+++ b/plugins/mariadb/install.sh
@@ -14,8 +14,6 @@ serverPath=$(dirname "$rootPath")
 # cd /www/server/mdserver-web && source bin/activate && python3 plugins/mariadb/index.py init_slave_status
 # cd /www/server/mdserver-web && source bin/activate && python3 plugins/mariadb/index.py install_pre_inspection
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 
 action=$1
 type=$2
diff --git a/plugins/mariadb/versions/10.11/install.sh b/plugins/mariadb/versions/10.11/install.sh
index 0e22e2f7d..b76f7d90d 100755
--- a/plugins/mariadb/versions/10.11/install.sh
+++ b/plugins/mariadb/versions/10.11/install.sh
@@ -11,7 +11,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
 MY_VER=10.11.10
@@ -19,7 +18,7 @@ MY_VER=10.11.10
 Install_app()
 {
 	mkdir -p ${mariadbDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
@@ -110,7 +109,7 @@ Install_app()
 Uninstall_app()
 {
 	rm -rf $serverPath/mariadb
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/mariadb/versions/10.6/install.sh b/plugins/mariadb/versions/10.6/install.sh
index b116971b3..93d5c34ab 100755
--- a/plugins/mariadb/versions/10.6/install.sh
+++ b/plugins/mariadb/versions/10.6/install.sh
@@ -10,7 +10,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
 MY_VER=10.6.20
@@ -18,7 +17,7 @@ MY_VER=10.6.20
 Install_app()
 {
 	mkdir -p ${mariadbDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
@@ -113,7 +112,7 @@ Install_app()
 Uninstall_app()
 {
 	rm -rf $serverPath/mariadb
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/mariadb/versions/10.7/install.sh b/plugins/mariadb/versions/10.7/install.sh
index b6d13f624..c680889a3 100755
--- a/plugins/mariadb/versions/10.7/install.sh
+++ b/plugins/mariadb/versions/10.7/install.sh
@@ -11,7 +11,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
 MY_VER=10.7.8
@@ -19,7 +18,7 @@ MY_VER=10.7.8
 Install_app()
 {
 	mkdir -p ${mariadbDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
@@ -100,7 +99,7 @@ Install_app()
 Uninstall_app()
 {
 	rm -rf $serverPath/mariadb
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/mariadb/versions/10.8/install.sh b/plugins/mariadb/versions/10.8/install.sh
index 92e08c542..d85218384 100755
--- a/plugins/mariadb/versions/10.8/install.sh
+++ b/plugins/mariadb/versions/10.8/install.sh
@@ -11,7 +11,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
 MY_VER=10.8.7
@@ -19,7 +18,7 @@ MY_VER=10.8.7
 Install_app()
 {
 	mkdir -p ${mariadbDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
@@ -100,7 +99,7 @@ Install_app()
 Uninstall_app()
 {
 	rm -rf $serverPath/mariadb
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/mariadb/versions/10.9/install.sh b/plugins/mariadb/versions/10.9/install.sh
index 4e86094f5..6f6fcbf1e 100755
--- a/plugins/mariadb/versions/10.9/install.sh
+++ b/plugins/mariadb/versions/10.9/install.sh
@@ -11,7 +11,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
 MY_VER=10.9.8
@@ -19,7 +18,7 @@ MY_VER=10.9.8
 Install_app()
 {
 	mkdir -p ${mariadbDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
@@ -110,7 +109,7 @@ Install_app()
 Uninstall_app()
 {
 	rm -rf $serverPath/mariadb
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/mariadb/versions/11.0/install.sh b/plugins/mariadb/versions/11.0/install.sh
index 18303fd84..7b590149f 100755
--- a/plugins/mariadb/versions/11.0/install.sh
+++ b/plugins/mariadb/versions/11.0/install.sh
@@ -11,7 +11,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
 MY_VER=11.0.5
@@ -19,7 +18,7 @@ MY_VER=11.0.5
 Install_app()
 {
 	mkdir -p ${mariadbDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
@@ -110,7 +109,7 @@ Install_app()
 Uninstall_app()
 {
 	rm -rf $serverPath/mariadb
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/mariadb/versions/11.1/install.sh b/plugins/mariadb/versions/11.1/install.sh
index 40cd366bb..3617d9cf3 100755
--- a/plugins/mariadb/versions/11.1/install.sh
+++ b/plugins/mariadb/versions/11.1/install.sh
@@ -11,7 +11,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
 MY_VER=11.1.4
@@ -19,7 +18,7 @@ MY_VER=11.1.4
 Install_app()
 {
 	mkdir -p ${mariadbDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
@@ -110,7 +109,7 @@ Install_app()
 Uninstall_app()
 {
 	rm -rf $serverPath/mariadb
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/mariadb/versions/11.2/install.sh b/plugins/mariadb/versions/11.2/install.sh
index 12778da85..04690307e 100755
--- a/plugins/mariadb/versions/11.2/install.sh
+++ b/plugins/mariadb/versions/11.2/install.sh
@@ -11,7 +11,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
 MY_VER=11.2.6
@@ -19,7 +18,7 @@ MY_VER=11.2.6
 Install_app()
 {
 	mkdir -p ${mariadbDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
@@ -110,7 +109,7 @@ Install_app()
 Uninstall_app()
 {
 	rm -rf $serverPath/mariadb
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/mariadb/versions/11.3/install.sh b/plugins/mariadb/versions/11.3/install.sh
index b49e06a00..fa7e2eb30 100755
--- a/plugins/mariadb/versions/11.3/install.sh
+++ b/plugins/mariadb/versions/11.3/install.sh
@@ -11,7 +11,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
 MY_VER=11.3.2
@@ -19,7 +18,7 @@ MY_VER=11.3.2
 Install_app()
 {
 	mkdir -p ${mariadbDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
@@ -110,7 +109,7 @@ Install_app()
 Uninstall_app()
 {
 	rm -rf $serverPath/mariadb
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/mariadb/versions/11.4/install.sh b/plugins/mariadb/versions/11.4/install.sh
index e6c1aefa5..1dd951772 100755
--- a/plugins/mariadb/versions/11.4/install.sh
+++ b/plugins/mariadb/versions/11.4/install.sh
@@ -11,7 +11,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
 MY_VER=11.4.4
@@ -19,7 +18,7 @@ MY_VER=11.4.4
 Install_app()
 {
 	mkdir -p ${mariadbDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
@@ -110,7 +109,7 @@ Install_app()
 Uninstall_app()
 {
 	rm -rf $serverPath/mariadb
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/mariadb/versions/11.5/install.sh b/plugins/mariadb/versions/11.5/install.sh
index 881e93ce8..8b3581135 100755
--- a/plugins/mariadb/versions/11.5/install.sh
+++ b/plugins/mariadb/versions/11.5/install.sh
@@ -11,7 +11,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
 MY_VER=11.5.2
@@ -19,7 +18,7 @@ MY_VER=11.5.2
 Install_app()
 {
 	mkdir -p ${mariadbDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
@@ -110,7 +109,7 @@ Install_app()
 Uninstall_app()
 {
 	rm -rf $serverPath/mariadb
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/mariadb/versions/11.6/install.sh b/plugins/mariadb/versions/11.6/install.sh
index 3597e2e22..654f225e0 100755
--- a/plugins/mariadb/versions/11.6/install.sh
+++ b/plugins/mariadb/versions/11.6/install.sh
@@ -11,7 +11,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
 MY_VER=11.6.2
@@ -19,7 +18,7 @@ MY_VER=11.6.2
 Install_app()
 {
 	mkdir -p ${mariadbDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
@@ -110,7 +109,7 @@ Install_app()
 Uninstall_app()
 {
 	rm -rf $serverPath/mariadb
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/memcached/install.sh b/plugins/memcached/install.sh
index 490dde8ca..5744718c6 100755
--- a/plugins/memcached/install.sh
+++ b/plugins/memcached/install.sh
@@ -7,7 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 sys_os=`uname`
 VERSION=1.6.32
 
@@ -16,7 +15,7 @@ echo $sys_os
 Install_mem(){
 	mkdir -p $serverPath/source
 	mkdir -p $serverPath/source/memcached
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if [ ! -f $serverPath/source/memcached.tar.gz ];then
 		wget  --no-check-certificate -O $serverPath/source/memcached/memcached.tar.gz https://www.memcached.org/files/memcached-${VERSION}.tar.gz
diff --git a/plugins/migration_api/install.sh b/plugins/migration_api/install.sh
index 9a1ad2098..a60523ca2 100755
--- a/plugins/migration_api/install.sh
+++ b/plugins/migration_api/install.sh
@@ -8,14 +8,13 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 VERSION=1.0
 
 Install_App(){
 	mkdir -p $serverPath/migration_api
 	echo "${VERSION}" > $serverPath/migration_api/version.pl
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 }
 
 Uninstall_App()
diff --git a/plugins/mongodb/install.bk1.sh b/plugins/mongodb/install.bk1.sh
index 7cbe54115..e0c7a57e9 100755
--- a/plugins/mongodb/install.bk1.sh
+++ b/plugins/mongodb/install.bk1.sh
@@ -10,7 +10,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 sysName=`uname`
@@ -228,7 +227,7 @@ Install_app_linux()
 
 Install_app()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 	
 	if [ "macos" == "$OSNAME" ];then
@@ -240,7 +239,7 @@ Install_app()
 	if [ "$?" == "0" ];then
 		mkdir -p $serverPath/mongodb
 		echo "${VERSION}" > $serverPath/mongodb/version.pl
-		echo '安装完成' > $install_tmp
+		echo '安装完成'
 
 		#初始化 
 		cd ${rootPath} && python3 ${rootPath}/plugins/mongodb/index.py start
@@ -276,7 +275,7 @@ Uninstall_app()
 	fi
 
 	rm -rf $serverPath/mongodb
-	echo "Uninstall_mongodb" > $install_tmp
+	echo "Uninstall_mongodb"
 }
 
 action=$1
diff --git a/plugins/mongodb/install.bk2.sh b/plugins/mongodb/install.bk2.sh
index eb2a67e9c..3c45158da 100755
--- a/plugins/mongodb/install.bk2.sh
+++ b/plugins/mongodb/install.bk2.sh
@@ -10,7 +10,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 sysName=`uname`
@@ -48,7 +47,7 @@ Install_app()
 	fi
 	# ----- cpu end ------
 
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	MG_DIR=$serverPath/source/mongodb
 	mkdir -p $MG_DIR
 
@@ -83,7 +82,7 @@ Install_app()
 	if [ "$?" == "0" ];then
 		mkdir -p $serverPath/mongodb
 		echo "${VERSION}" > $serverPath/mongodb/version.pl
-		echo '安装完成' > $install_tmp
+		echo '安装完成'
 
 		#初始化 
 		cd ${rootPath} && python3 ${rootPath}/plugins/mongodb/index.py start
@@ -96,7 +95,7 @@ Uninstall_app()
 {
 
 	rm -rf $serverPath/mongodb
-	echo "Uninstall_mongodb" > $install_tmp
+	echo "Uninstall_mongodb"
 }
 
 action=$1
diff --git a/plugins/mongodb/install.sh b/plugins/mongodb/install.sh
index eac49d078..a59ce4e29 100755
--- a/plugins/mongodb/install.sh
+++ b/plugins/mongodb/install.sh
@@ -15,7 +15,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 sysName=`uname`
diff --git a/plugins/msonedrive/install.sh b/plugins/msonedrive/install.sh
index 3c0b352da..c1e72bd28 100644
--- a/plugins/msonedrive/install.sh
+++ b/plugins/msonedrive/install.sh
@@ -7,7 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 # cd /www/server/mdserver-web/plugins/msonedrive  && bash install.sh install 1.0
@@ -20,10 +19,10 @@ Install_App()
 {
 	pip install requests-oauthlib==1.3.0
 	mkdir -p $serverPath/msonedrive
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	echo "${VERSION}" > $serverPath/msonedrive/version.pl
-	echo '安装完成' > $install_tmp
+	echo '安装完成'
 
 	echo "Successify"
 }
diff --git a/plugins/mysql-apt/install.sh b/plugins/mysql-apt/install.sh
index 99ec491e5..db63dcd32 100755
--- a/plugins/mysql-apt/install.sh
+++ b/plugins/mysql-apt/install.sh
@@ -15,7 +15,6 @@ serverPath=$(dirname "$rootPath")
 # cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-apt/index.py fix_db_access
 # cd /www/server/mdserver-web && source bin/activate && python3 plugins/mysql/index.py do_full_sync  {"db":"xxx","sign":"","begin":1}
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 
 action=$1
diff --git a/plugins/mysql-apt/versions/5.7/install.sh b/plugins/mysql-apt/versions/5.7/install.sh
index 36af92dc8..46ec670ed 100755
--- a/plugins/mysql-apt/versions/5.7/install.sh
+++ b/plugins/mysql-apt/versions/5.7/install.sh
@@ -17,7 +17,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 myDir=${serverPath}/source/mysql-apt
 
 bash ${rootPath}/scripts/getos.sh
@@ -46,7 +45,7 @@ else
 fi
 
 if [ "$ARCH" != "amd64" ];then
-	echo "暂时不支持该${ARCH}" > $install_tmp
+	echo "暂时不支持该${ARCH}"
 	exit 0
 fi
 
@@ -95,7 +94,7 @@ rm -rf $myDir
 
 Install_mysql()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	isApt=`which apt`
 	if [ "$isApt" != "" ];then
@@ -105,9 +104,9 @@ Install_mysql()
 	if [ "$?" == "0" ];then
 		mkdir -p $serverPath/mysql-apt
 		echo '5.7' > $serverPath/mysql-apt/version.pl
-		echo '安装完成' > $install_tmp
+		echo '安装完成'
 	else
-		echo "暂时不支持该系统" > $install_tmp
+		echo "暂时不支持该系统"
 	fi
 }
 
@@ -120,7 +119,7 @@ Uninstall_mysql()
 	fi
 
 	rm -rf $serverPath/mysql-apt
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/mysql-apt/versions/8.0/install.sh b/plugins/mysql-apt/versions/8.0/install.sh
index fe9d64f03..582e3aab5 100755
--- a/plugins/mysql-apt/versions/8.0/install.sh
+++ b/plugins/mysql-apt/versions/8.0/install.sh
@@ -13,7 +13,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 myDir=${serverPath}/source/mysql-apt
 
 bash ${rootPath}/scripts/getos.sh
@@ -24,7 +23,7 @@ VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -
 
 # 暂时debian12没有标准版,先用11使用
 # if [ "$OSNAME" == 'debian' ] && [ "$VERSION_ID" == '12' ] ;then 
-# 	echo "暂时不支持该${OSNAME}${VERSION_ID}" > $install_tmp
+# 	echo "暂时不支持该${OSNAME}${VERSION_ID}"
 # 	exit 1
 # fi
 
@@ -40,7 +39,7 @@ else
 fi
 
 if [ "$ARCH" != "amd64" ];then
-	echo "暂时不支持该${ARCH}" > $install_tmp
+	echo "暂时不支持该${ARCH}"
 	exit 1
 fi
 
@@ -100,7 +99,7 @@ rm -rf $myDir
 
 Install_mysql()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	isApt=`which apt`
 	if [ "$isApt" != "" ];then
@@ -110,10 +109,10 @@ Install_mysql()
 	if [ "$?" == "0" ];then
 		mkdir -p $serverPath/mysql-apt
 		echo '8.0' > $serverPath/mysql-apt/version.pl
-		echo '安装完成' > $install_tmp
+		echo '安装完成'
 	else
 		echo '8.0' > $serverPath/mysql-apt/version.pl
-		echo "暂时不支持该系统" > $install_tmp
+		echo "暂时不支持该系统"
 	fi
 }
 
@@ -126,7 +125,7 @@ Uninstall_mysql()
 	fi
 
 	rm -rf $serverPath/mysql-apt
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/mysql-apt/versions/8.2/install.sh b/plugins/mysql-apt/versions/8.2/install.sh
index 3866488f4..81cade826 100755
--- a/plugins/mysql-apt/versions/8.2/install.sh
+++ b/plugins/mysql-apt/versions/8.2/install.sh
@@ -14,7 +14,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 myDir=${serverPath}/source/mysql-apt
 
 bash ${rootPath}/scripts/getos.sh
@@ -26,7 +25,7 @@ VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -
 
 # 暂时debian12没有标准版,先用11使用
 # if [ "$OSNAME" == 'debian' ] && [ "$VERSION_ID" == '12' ] ;then 
-# 	echo "暂时不支持该${OSNAME}${VERSION_ID}" > $install_tmp
+# 	echo "暂时不支持该${OSNAME}${VERSION_ID}"
 # 	exit 1
 # fi
 
@@ -42,7 +41,7 @@ else
 fi
 
 if [ "$ARCH" != "amd64" ];then
-	echo "暂时不支持该${ARCH}" > $install_tmp
+	echo "暂时不支持该${ARCH}"
 	exit 1
 fi
 
@@ -101,7 +100,7 @@ rm -rf $myDir
 
 Install_mysql()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	isApt=`which apt`
 	if [ "$isApt" != "" ];then
@@ -111,10 +110,10 @@ Install_mysql()
 	if [ "$?" == "0" ];then
 		mkdir -p $serverPath/mysql-apt
 		echo '8.2' > $serverPath/mysql-apt/version.pl
-		echo '安装完成' > $install_tmp
+		echo '安装完成'
 	else
 		echo '8.2' > $serverPath/mysql-apt/version.pl
-		echo "暂时不支持该系统" > $install_tmp
+		echo "暂时不支持该系统"
 	fi
 }
 
@@ -127,7 +126,7 @@ Uninstall_mysql()
 	fi
 
 	rm -rf $serverPath/mysql-apt
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/mysql-apt/versions/8.3/install.sh b/plugins/mysql-apt/versions/8.3/install.sh
index e5b1e449f..316ae77ed 100755
--- a/plugins/mysql-apt/versions/8.3/install.sh
+++ b/plugins/mysql-apt/versions/8.3/install.sh
@@ -13,7 +13,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 myDir=${serverPath}/source/mysql-apt
 
 bash ${rootPath}/scripts/getos.sh
@@ -24,7 +23,7 @@ VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -
 
 # 暂时debian12没有标准版,先用11使用
 # if [ "$OSNAME" == 'debian' ] && [ "$VERSION_ID" == '12' ] ;then 
-# 	echo "暂时不支持该${OSNAME}${VERSION_ID}" > $install_tmp
+# 	echo "暂时不支持该${OSNAME}${VERSION_ID}"
 # 	exit 1
 # fi
 
@@ -40,7 +39,7 @@ else
 fi
 
 if [ "$ARCH" != "amd64" ];then
-	echo "暂时不支持该${ARCH}" > $install_tmp
+	echo "暂时不支持该${ARCH}"
 	exit 1
 fi
 
@@ -99,7 +98,7 @@ rm -rf $myDir
 
 Install_mysql()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	isApt=`which apt`
 	if [ "$isApt" != "" ];then
@@ -109,10 +108,10 @@ Install_mysql()
 	if [ "$?" == "0" ];then
 		mkdir -p $serverPath/mysql-apt
 		echo '8.3' > $serverPath/mysql-apt/version.pl
-		echo '安装完成' > $install_tmp
+		echo '安装完成'
 	else
 		echo '8.3' > $serverPath/mysql-apt/version.pl
-		echo "暂时不支持该系统" > $install_tmp
+		echo "暂时不支持该系统"
 	fi
 }
 
@@ -125,7 +124,7 @@ Uninstall_mysql()
 	fi
 
 	rm -rf $serverPath/mysql-apt
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/mysql-apt/versions/8.4/install.sh b/plugins/mysql-apt/versions/8.4/install.sh
index a3647de16..04124e5b9 100755
--- a/plugins/mysql-apt/versions/8.4/install.sh
+++ b/plugins/mysql-apt/versions/8.4/install.sh
@@ -13,7 +13,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 myDir=${serverPath}/source/mysql-apt
 
 bash ${rootPath}/scripts/getos.sh
@@ -24,7 +23,7 @@ VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -
 
 # 暂时debian12没有标准版,先用11使用
 # if [ "$OSNAME" == 'debian' ] && [ "$VERSION_ID" == '12' ] ;then 
-# 	echo "暂时不支持该${OSNAME}${VERSION_ID}" > $install_tmp
+# 	echo "暂时不支持该${OSNAME}${VERSION_ID}"
 # 	exit 1
 # fi
 
@@ -40,7 +39,7 @@ else
 fi
 
 if [ "$ARCH" != "amd64" ];then
-	echo "暂时不支持该${ARCH}" > $install_tmp
+	echo "暂时不支持该${ARCH}"
 	exit 1
 fi
 
@@ -102,7 +101,7 @@ rm -rf $myDir
 
 Install_mysql()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	isApt=`which apt`
 	if [ "$isApt" != "" ];then
@@ -128,7 +127,7 @@ Uninstall_mysql()
 	fi
 
 	rm -rf $serverPath/mysql-apt
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/mysql-apt/versions/9.0/install.sh b/plugins/mysql-apt/versions/9.0/install.sh
index 9c6073b0c..e3cf77bae 100755
--- a/plugins/mysql-apt/versions/9.0/install.sh
+++ b/plugins/mysql-apt/versions/9.0/install.sh
@@ -13,7 +13,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 myDir=${serverPath}/source/mysql-apt
 
 bash ${rootPath}/scripts/getos.sh
@@ -24,7 +23,7 @@ VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -
 
 # 暂时debian12没有标准版,先用11使用
 # if [ "$OSNAME" == 'debian' ] && [ "$VERSION_ID" == '12' ] ;then 
-# 	echo "暂时不支持该${OSNAME}${VERSION_ID}" > $install_tmp
+# 	echo "暂时不支持该${OSNAME}${VERSION_ID}"
 # 	exit 1
 # fi
 
@@ -40,7 +39,7 @@ else
 fi
 
 if [ "$ARCH" != "amd64" ];then
-	echo "暂时不支持该${ARCH}" > $install_tmp
+	echo "暂时不支持该${ARCH}"
 	exit 1
 fi
 
@@ -102,7 +101,7 @@ rm -rf $myDir
 
 Install_mysql()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	isApt=`which apt`
 	if [ "$isApt" != "" ];then
diff --git a/plugins/mysql-yum/install.sh b/plugins/mysql-yum/install.sh
index 9a1edcaaf..3fb1a908f 100755
--- a/plugins/mysql-yum/install.sh
+++ b/plugins/mysql-yum/install.sh
@@ -13,8 +13,6 @@ serverPath=$(dirname "$rootPath")
 # cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-yum/index.py start 8.0
 # cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-yum/index.py get_master_status 8.4
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 
 action=$1
 type=$2
@@ -30,12 +28,12 @@ fi
 
 
 if [ "${2}" == "" ];then
-	echo '缺少安装脚本...' > $install_tmp
+	echo '缺少安装脚本...'
 	exit 0
 fi 
 
 if [ ! -d $curPath/versions/$2 ];then
-	echo '缺少安装脚本2...' > $install_tmp
+	echo '缺少安装脚本2...'
 	exit 0
 fi
 
diff --git a/plugins/mysql-yum/versions/5.7/install.sh b/plugins/mysql-yum/versions/5.7/install.sh
index 734b30d65..e94ac9b89 100755
--- a/plugins/mysql-yum/versions/5.7/install.sh
+++ b/plugins/mysql-yum/versions/5.7/install.sh
@@ -13,7 +13,6 @@ serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 myDir=${serverPath}/source/mysql-yum
 
 ARCH=`uname -m`
@@ -118,7 +117,7 @@ rm -rf ${myDir}
 Install_mysql()
 {
 
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	mkdir -p $serverPath/mysql-yum
 
@@ -134,14 +133,14 @@ Install_mysql()
 	
 	rm -rf $myDir
 	echo '5.7' > $serverPath/mysql-yum/version.pl
-	echo '安装完成' > $install_tmp
+	echo '安装完成'
 }
 
 Uninstall_mysql()
 {
 	YUM_UNINSTALL
 	rm -rf $serverPath/mysql-yum
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/mysql-yum/versions/8.0/install.sh b/plugins/mysql-yum/versions/8.0/install.sh
index 1a3319f3d..27e72cbc4 100755
--- a/plugins/mysql-yum/versions/8.0/install.sh
+++ b/plugins/mysql-yum/versions/8.0/install.sh
@@ -12,8 +12,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-
-install_tmp=${rootPath}/tmp/mw_install.pl
 myDir=${serverPath}/source/mysql-yum
 
 ARCH=`uname -m`
@@ -114,7 +112,7 @@ rm -rf ${myDir}
 Install_mysql()
 {
 
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	mkdir -p $serverPath/mysql-yum
 	mkdir -p /var/run/mysqld
diff --git a/plugins/mysql-yum/versions/8.2/install.sh b/plugins/mysql-yum/versions/8.2/install.sh
index 242b0f9a1..08cb36d1e 100755
--- a/plugins/mysql-yum/versions/8.2/install.sh
+++ b/plugins/mysql-yum/versions/8.2/install.sh
@@ -13,7 +13,6 @@ serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 myDir=${serverPath}/source/mysql-yum
 
 ARCH=`uname -m`
@@ -115,7 +114,7 @@ rm -rf ${myDir}
 Install_mysql()
 {
 
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	mkdir -p $serverPath/mysql-yum
 
diff --git a/plugins/mysql-yum/versions/8.3/install.sh b/plugins/mysql-yum/versions/8.3/install.sh
index 50ffd5bdd..f7630ad86 100755
--- a/plugins/mysql-yum/versions/8.3/install.sh
+++ b/plugins/mysql-yum/versions/8.3/install.sh
@@ -12,8 +12,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-
-install_tmp=${rootPath}/tmp/mw_install.pl
 myDir=${serverPath}/source/mysql-yum
 
 ARCH=`uname -m`
@@ -115,7 +113,7 @@ rm -rf ${myDir}
 Install_mysql()
 {
 
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	mkdir -p $serverPath/mysql-yum
 
diff --git a/plugins/mysql-yum/versions/8.4/install.sh b/plugins/mysql-yum/versions/8.4/install.sh
index 9c80cb9bc..02bf03981 100755
--- a/plugins/mysql-yum/versions/8.4/install.sh
+++ b/plugins/mysql-yum/versions/8.4/install.sh
@@ -12,8 +12,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-
-install_tmp=${rootPath}/tmp/mw_install.pl
 myDir=${serverPath}/source/mysql-yum
 
 ARCH=`uname -m`
@@ -118,7 +116,7 @@ rm -rf ${myDir}
 Install_mysql()
 {
 
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/mysql-yum
 
 	mkdir -p /var/lib/mysql
diff --git a/plugins/mysql-yum/versions/9.0/install.sh b/plugins/mysql-yum/versions/9.0/install.sh
index 69c82c001..821b6c488 100755
--- a/plugins/mysql-yum/versions/9.0/install.sh
+++ b/plugins/mysql-yum/versions/9.0/install.sh
@@ -12,8 +12,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-
-install_tmp=${rootPath}/tmp/mw_install.pl
 myDir=${serverPath}/source/mysql-yum
 
 ARCH=`uname -m`
@@ -119,7 +117,7 @@ rm -rf ${myDir}
 Install_mysql()
 {
 
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/mysql-yum
 
 	mkdir -p /var/lib/mysql
diff --git a/plugins/mysql/install.sh b/plugins/mysql/install.sh
index 5e9f903cc..2f0a73f67 100755
--- a/plugins/mysql/install.sh
+++ b/plugins/mysql/install.sh
@@ -16,10 +16,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-
-install_tmp=${rootPath}/tmp/mw_install.pl
-
-
 action=$1
 type=$2
 
@@ -32,12 +28,12 @@ else
 fi
 
 if [ "${2}" == "" ];then
-	echo '缺少安装脚本...' > $install_tmp
+	echo '缺少安装脚本...'
 	exit 0
 fi 
 
 if [ ! -d $curPath/versions/$2 ];then
-	echo '缺少安装脚本2...' > $install_tmp
+	echo '缺少安装脚本2...'
 	exit 0
 fi
 
diff --git a/plugins/mysql/versions/5.5/install.sh b/plugins/mysql/versions/5.5/install.sh
index 22fc66e21..829de8864 100755
--- a/plugins/mysql/versions/5.5/install.sh
+++ b/plugins/mysql/versions/5.5/install.sh
@@ -12,7 +12,6 @@ serverPath=$(dirname "$rootPath")
 sysName=`uname`
 sysArch=`arch`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 mysqlDir=${serverPath}/source/mysql
 
 VERSION=5.5.62
@@ -60,7 +59,7 @@ VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -
 Install_mysql()
 {
 	mkdir -p ${mysqlDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
@@ -164,7 +163,7 @@ Install_mysql()
 Uninstall_mysql()
 {
 	rm -rf $serverPath/mysql
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/mysql/versions/5.6/install.sh b/plugins/mysql/versions/5.6/install.sh
index e05648ccb..43f5d15f9 100755
--- a/plugins/mysql/versions/5.6/install.sh
+++ b/plugins/mysql/versions/5.6/install.sh
@@ -53,14 +53,13 @@ fi
 VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 mysqlDir=${serverPath}/source/mysql
 
 VERSION=5.6.51
 Install_mysql()
 {
 	mkdir -p ${mysqlDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
diff --git a/plugins/mysql/versions/5.7/install.sh b/plugins/mysql/versions/5.7/install.sh
index 98ac7954d..90d7bc303 100755
--- a/plugins/mysql/versions/5.7/install.sh
+++ b/plugins/mysql/versions/5.7/install.sh
@@ -12,8 +12,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-
-install_tmp=${rootPath}/tmp/mw_install.pl
 mysqlDir=${serverPath}/source/mysql
 
 VERSION=5.7.44
@@ -61,7 +59,7 @@ VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -
 Install_mysql()
 {
 	mkdir -p ${mysqlDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
diff --git a/plugins/mysql/versions/8.0/install.sh b/plugins/mysql/versions/8.0/install.sh
index a407718c2..31c3da456 100755
--- a/plugins/mysql/versions/8.0/install.sh
+++ b/plugins/mysql/versions/8.0/install.sh
@@ -12,8 +12,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-
-install_tmp=${rootPath}/tmp/mw_install.pl
 mysqlDir=${serverPath}/source/mysql
 
 _os=`uname`
@@ -60,7 +58,7 @@ VERSION=8.0.37
 Install_mysql()
 {
 	mkdir -p ${mysqlDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	# ----- cpu start ------
 	if [ -z "${cpuCore}" ]; then
diff --git a/plugins/mysql/versions/8.2/install.sh b/plugins/mysql/versions/8.2/install.sh
index 5bb6b6f88..6aa8fce4f 100755
--- a/plugins/mysql/versions/8.2/install.sh
+++ b/plugins/mysql/versions/8.2/install.sh
@@ -12,8 +12,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-
-install_tmp=${rootPath}/tmp/mw_install.pl
 mysqlDir=${serverPath}/source/mysql
 
 _os=`uname`
@@ -60,7 +58,7 @@ VERSION=8.2.0
 Install_mysql()
 {
 	mkdir -p ${mysqlDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	# ----- cpu start ------
 	if [ -z "${cpuCore}" ]; then
diff --git a/plugins/mysql/versions/8.3/install.sh b/plugins/mysql/versions/8.3/install.sh
index 20e9b9dff..a80545d43 100755
--- a/plugins/mysql/versions/8.3/install.sh
+++ b/plugins/mysql/versions/8.3/install.sh
@@ -12,8 +12,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-
-install_tmp=${rootPath}/tmp/mw_install.pl
 mysqlDir=${serverPath}/source/mysql
 
 _os=`uname`
@@ -60,7 +58,7 @@ VERSION=8.3.0
 Install_mysql()
 {
 	mkdir -p ${mysqlDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	# ----- cpu start ------
 	if [ -z "${cpuCore}" ]; then
diff --git a/plugins/mysql/versions/8.4/install.sh b/plugins/mysql/versions/8.4/install.sh
index b93081973..f5a51f5fe 100755
--- a/plugins/mysql/versions/8.4/install.sh
+++ b/plugins/mysql/versions/8.4/install.sh
@@ -12,8 +12,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-
-install_tmp=${rootPath}/tmp/mw_install.pl
 mysqlDir=${serverPath}/source/mysql
 
 _os=`uname`
@@ -62,7 +60,7 @@ VERSION=8.4.2
 Install_mysql()
 {
 	mkdir -p ${mysqlDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 
 	# ----- cpu start ------
diff --git a/plugins/mysql/versions/9.0/install.sh b/plugins/mysql/versions/9.0/install.sh
index 9699b7e3c..a23fbeca3 100755
--- a/plugins/mysql/versions/9.0/install.sh
+++ b/plugins/mysql/versions/9.0/install.sh
@@ -13,7 +13,6 @@ serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 mysqlDir=${serverPath}/source/mysql
 
 _os=`uname`
@@ -62,7 +61,7 @@ VERSION=9.0.1
 Install_mysql()
 {
 	mkdir -p ${mysqlDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 
 	# ----- cpu start ------
diff --git a/plugins/nezha/install.sh b/plugins/nezha/install.sh
index 01b4af5bf..0a007b9a4 100755
--- a/plugins/nezha/install.sh
+++ b/plugins/nezha/install.sh
@@ -7,18 +7,16 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 action=$1
 type=$2
 
 if [ "${2}" == "" ];then
-	echo '缺少安装脚本...' > $install_tmp
+	echo '缺少安装脚本...'
 	exit 0
 fi 
 
 if [ ! -d $curPath/versions/$2 ];then
-	echo '缺少安装脚本2...' > $install_tmp
+	echo '缺少安装脚本2...'
 	exit 0
 fi
 
diff --git a/plugins/nezha/versions/0.15.2/install.sh b/plugins/nezha/versions/0.15.2/install.sh
index f845ca7dc..4ed401a67 100755
--- a/plugins/nezha/versions/0.15.2/install.sh
+++ b/plugins/nezha/versions/0.15.2/install.sh
@@ -7,7 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=0.15.2
 
 # bash install.sh install 0.15.2
@@ -82,7 +81,7 @@ download_file() {
 
 
 Install_dashborad(){
-	echo '正在安装哪吒监控...' > $install_tmp
+	echo '正在安装哪吒监控...'
 	mkdir -p $serverPath/source
 
 	if [ ! -f $TARGET_DIR/nezha ];then
@@ -103,7 +102,7 @@ Install_dashborad(){
 }
 
 Install_agent(){
-	echo -e "正在下载监控端" > $install_tmp
+	echo -e "正在下载监控端"
 	mkdir -p $serverPath/source
 
 	version=v0.15.1
@@ -137,7 +136,7 @@ Install_App()
 		echo "$VERSION" > $serverPath/nezha/version.pl
 		cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py init_cfg
 	fi
-	echo 'install successful' > $install_tmp
+	echo 'install successful'
 }
 
 Uninstall_App()
@@ -147,7 +146,7 @@ Uninstall_App()
 	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py stop
 	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py stop_agent
 	rm -rf $serverPath/nezha
-	echo "install fail" > $install_tmp
+	echo "install fail"
 }
 
 action=$1
diff --git a/plugins/openresty/install.sh b/plugins/openresty/install.sh
index 35680f32d..4be1cad85 100755
--- a/plugins/openresty/install.sh
+++ b/plugins/openresty/install.sh
@@ -15,7 +15,6 @@ action=$1
 type=$2
 
 VERSION=$2
-install_tmp=${rootPath}/tmp/mw_install.pl
 openrestyDir=${serverPath}/source/openresty
 
 if id www &> /dev/null ;then 
diff --git a/plugins/openresty/versions/1.17.8/install.sh b/plugins/openresty/versions/1.17.8/install.sh
index 4259f71ea..544c97b9f 100644
--- a/plugins/openresty/versions/1.17.8/install.sh
+++ b/plugins/openresty/versions/1.17.8/install.sh
@@ -15,8 +15,6 @@ action=$1
 type=$2
 
 VERSION=1.17.8.2
-
-install_tmp=${rootPath}/tmp/mw_install.pl
 openrestyDir=${serverPath}/source/openresty
 
 Install_openresty()
diff --git a/plugins/openresty/versions/1.19.3/install.sh b/plugins/openresty/versions/1.19.3/install.sh
index 555a7a609..2af69a9b1 100644
--- a/plugins/openresty/versions/1.19.3/install.sh
+++ b/plugins/openresty/versions/1.19.3/install.sh
@@ -15,8 +15,6 @@ action=$1
 type=$2
 
 VERSION=1.19.3.1
-
-install_tmp=${rootPath}/tmp/mw_install.pl
 openrestyDir=${serverPath}/source/openresty
 
 Install_openresty()
diff --git a/plugins/openresty/versions/1.21.4/install.sh b/plugins/openresty/versions/1.21.4/install.sh
index 817699157..0ceaa3a91 100644
--- a/plugins/openresty/versions/1.21.4/install.sh
+++ b/plugins/openresty/versions/1.21.4/install.sh
@@ -16,7 +16,6 @@ type=$2
 
 VERSION=1.21.4.4
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 openrestyDir=${serverPath}/source/openresty
 
 Install_openresty()
diff --git a/plugins/openresty/versions/1.25.3/install.sh b/plugins/openresty/versions/1.25.3/install.sh
index 473fe1938..0becee2f0 100644
--- a/plugins/openresty/versions/1.25.3/install.sh
+++ b/plugins/openresty/versions/1.25.3/install.sh
@@ -16,7 +16,6 @@ type=$2
 
 VERSION=1.25.3.2
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 openrestyDir=${serverPath}/source/openresty
 
 Install_openresty()
diff --git a/plugins/openresty/versions/1.27.1/install.sh b/plugins/openresty/versions/1.27.1/install.sh
index 8e4d01ca6..a53019d98 100644
--- a/plugins/openresty/versions/1.27.1/install.sh
+++ b/plugins/openresty/versions/1.27.1/install.sh
@@ -16,7 +16,6 @@ type=$2
 
 VERSION=1.27.1.1
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 openrestyDir=${serverPath}/source/openresty
 
 Install_openresty()
diff --git a/plugins/openresty/versions/rtmp/install.sh b/plugins/openresty/versions/rtmp/install.sh
index eab364971..11a8f5d88 100644
--- a/plugins/openresty/versions/rtmp/install.sh
+++ b/plugins/openresty/versions/rtmp/install.sh
@@ -16,7 +16,6 @@ type=$2
 
 VERSION=1.27.1.1
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 openrestyDir=${serverPath}/source/openresty
 
 Install_openresty()
diff --git a/plugins/pgadmin/install.sh b/plugins/pgadmin/install.sh
index 8c5a876c0..55f861f2a 100755
--- a/plugins/pgadmin/install.sh
+++ b/plugins/pgadmin/install.sh
@@ -26,8 +26,6 @@ echo "python:$P_VER"
 # cd /www/server/mdserver-web && python3 plugins/pgadmin/index.py start
 # cd /www/server/mdserver-web && python3 plugins/pgadmin/index.py stop
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 if [ "$sys_os" == "Darwin" ];then
 	BAK='_bak'
 else
diff --git a/plugins/php-guard/install.sh b/plugins/php-guard/install.sh
index eb6b1c80f..2623847c8 100755
--- a/plugins/php-guard/install.sh
+++ b/plugins/php-guard/install.sh
@@ -7,9 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
-
 Install_pg()
 {
 	echo '卸载PHP守护中...'
diff --git a/plugins/php/versions/80/install.sh b/plugins/php/versions/80/install.sh
index 1d84e4685..e9bacab5f 100755
--- a/plugins/php/versions/80/install.sh
+++ b/plugins/php/versions/80/install.sh
@@ -160,7 +160,7 @@ Uninstall_php()
 {
 	$serverPath/php/init.d/php${PHP_VER} stop
 	rm -rf $serverPath/php/${PHP_VER}
-	echo "卸载php-${version}..." > $install_tmp
+	echo "卸载php-${version}..."
 }
 
 action=${1}
diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh
index cf65d0da4..693975011 100755
--- a/plugins/php/versions/81/install.sh
+++ b/plugins/php/versions/81/install.sh
@@ -151,7 +151,7 @@ Uninstall_php()
 {
 	$serverPath/php/init.d/php${PHP_VER} stop
 	rm -rf $serverPath/php/${PHP_VER}
-	echo "卸载php-${version}..." > $install_tmp
+	echo "卸载php-${version}..."
 }
 
 action=${1}
diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh
index 28405bcbc..a4c9b2edd 100755
--- a/plugins/php/versions/82/install.sh
+++ b/plugins/php/versions/82/install.sh
@@ -176,7 +176,7 @@ Uninstall_php()
 {
 	$serverPath/php/init.d/php${PHP_VER} stop
 	rm -rf $serverPath/php/${PHP_VER}
-	echo "卸载php-${version}..." > $install_tmp
+	echo "卸载php-${version}..."
 }
 
 action=${1}
diff --git a/plugins/php/versions/83/install.sh b/plugins/php/versions/83/install.sh
index 93e237c5d..d4b8790aa 100755
--- a/plugins/php/versions/83/install.sh
+++ b/plugins/php/versions/83/install.sh
@@ -154,7 +154,7 @@ Uninstall_php()
 {
 	$serverPath/php/init.d/php${PHP_VER} stop
 	rm -rf $serverPath/php/${PHP_VER}
-	echo "卸载php-${version}..." > $install_tmp
+	echo "卸载php-${version}..."
 }
 
 action=${1}
diff --git a/plugins/php/versions/84/install.sh b/plugins/php/versions/84/install.sh
index cdb855bd2..9e4e421e8 100755
--- a/plugins/php/versions/84/install.sh
+++ b/plugins/php/versions/84/install.sh
@@ -145,7 +145,7 @@ Uninstall_php()
 {
 	$serverPath/php/init.d/php${PHP_VER} stop
 	rm -rf $serverPath/php/${PHP_VER}
-	echo "卸载php-${version}..." > $install_tmp
+	echo "卸载php-${version}..."
 }
 
 action=${1}
diff --git a/plugins/phpmyadmin/install.sh b/plugins/phpmyadmin/install.sh
index 43d28fdef..9dfb0b45a 100755
--- a/plugins/phpmyadmin/install.sh
+++ b/plugins/phpmyadmin/install.sh
@@ -7,9 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
-
 if [ -f ${rootPath}/bin/activate ];then
 	source ${rootPath}/bin/activate
 fi
diff --git a/plugins/postgresql/install.sh b/plugins/postgresql/install.sh
index 6e8af5591..8d9b534ca 100755
--- a/plugins/postgresql/install.sh
+++ b/plugins/postgresql/install.sh
@@ -9,8 +9,6 @@ serverPath=$(dirname "$rootPath")
 
 # cd /www/server/mdserver-web/plugins/postgresql && bash install.sh install 16
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 action=$1
 type=$2
 
diff --git a/plugins/postgresql/versions/14/install.sh b/plugins/postgresql/versions/14/install.sh
index 43ae5035b..f61f065e1 100755
--- a/plugins/postgresql/versions/14/install.sh
+++ b/plugins/postgresql/versions/14/install.sh
@@ -10,7 +10,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 postgreDir=${serverPath}/source/postgresql
 
 VERSION=14.12
@@ -20,7 +19,7 @@ VERSION=14.12
 Install_App()
 {
 	mkdir -p ${postgreDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if id postgres &> /dev/null ;then 
 	    echo "postgres uid is `id -u postgres`"
diff --git a/plugins/postgresql/versions/15/install.sh b/plugins/postgresql/versions/15/install.sh
index a36706732..76acaff37 100755
--- a/plugins/postgresql/versions/15/install.sh
+++ b/plugins/postgresql/versions/15/install.sh
@@ -10,9 +10,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 postgreDir=${serverPath}/source/postgresql
-
 VERSION=15.7
 
 # su - postgres -c "/www/server/postgresql/bin/pg_ctl start -D /www/server/postgresql/data"
@@ -20,7 +18,7 @@ VERSION=15.7
 Install_App()
 {
 	mkdir -p ${postgreDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if id postgres &> /dev/null ;then 
 	    echo "postgres uid is `id -u postgres`"
diff --git a/plugins/postgresql/versions/16/install.sh b/plugins/postgresql/versions/16/install.sh
index 3392612ee..052e11873 100755
--- a/plugins/postgresql/versions/16/install.sh
+++ b/plugins/postgresql/versions/16/install.sh
@@ -10,7 +10,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 postgreDir=${serverPath}/source/postgresql
 
 VERSION=16.4
@@ -20,7 +19,7 @@ VERSION=16.4
 Install_App()
 {
 	mkdir -p ${postgreDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if id postgres &> /dev/null ;then 
 	    echo "postgres uid is `id -u postgres`"
diff --git a/plugins/postgresql/versions/17/install.sh b/plugins/postgresql/versions/17/install.sh
index b46b78c2b..c103a3c06 100755
--- a/plugins/postgresql/versions/17/install.sh
+++ b/plugins/postgresql/versions/17/install.sh
@@ -10,7 +10,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 postgreDir=${serverPath}/source/postgresql
 
 VERSION=17.2
@@ -20,7 +19,7 @@ VERSION=17.2
 Install_App()
 {
 	mkdir -p ${postgreDir}
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 
 	if id postgres &> /dev/null ;then 
 	    echo "postgres uid is `id -u postgres`"
diff --git a/plugins/rsyncd/install.sh b/plugins/rsyncd/install.sh
index d339a5866..a8a13d86a 100755
--- a/plugins/rsyncd/install.sh
+++ b/plugins/rsyncd/install.sh
@@ -28,11 +28,11 @@ else
 	useradd -g www -s /bin/bash www
 fi
 
-echo $OSNAME
-install_tmp=${rootPath}/tmp/mw_install.pl
+# echo $OSNAME
+
 Install_rsyncd()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	
 
 	if [ "$OSNAME" == "debian" ] || [ "$OSNAME" == "ubuntu" ];then
@@ -55,7 +55,7 @@ Install_rsyncd()
 	mkdir -p $serverPath/rsyncd/send
 	
 	echo '2.0' > $serverPath/rsyncd/version.pl
-	echo '安装完成' > $install_tmp
+	echo '安装完成'
 	cd ${rootPath} && python3 ${rootPath}/plugins/rsyncd/index.py start
 	cd ${rootPath} && python3 ${rootPath}/plugins/rsyncd/index.py initd_install
 }
@@ -83,7 +83,7 @@ Uninstall_rsyncd()
 	fi
 	
 	rm -rf $serverPath/rsyncd
-	echo "卸载完成" > $install_tmp
+	echo "卸载完成"
 }
 
 action=$1
diff --git a/plugins/simpleping/install.sh b/plugins/simpleping/install.sh
index 647106bbd..7a39c14de 100755
--- a/plugins/simpleping/install.sh
+++ b/plugins/simpleping/install.sh
@@ -14,11 +14,9 @@ VERSION=$2
 # 开启可以PING
 # sysctl -w net.ipv4.ping_group_range="0 2147483647"
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 Install_App()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 	mkdir -p $serverPath/source/simpleping
 
diff --git a/plugins/sphinx/install.sh b/plugins/sphinx/install.sh
index 17dc0f5f2..277029f12 100755
--- a/plugins/sphinx/install.sh
+++ b/plugins/sphinx/install.sh
@@ -9,7 +9,6 @@ serverPath=$(dirname "$rootPath")
 sysName=`uname`
 sysArch=`arch`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 if [ -f ${rootPath}/bin/activate ];then
 	source ${rootPath}/bin/activate
diff --git a/plugins/supervisor/install.sh b/plugins/supervisor/install.sh
index 2695ae7e6..96ece61ac 100755
--- a/plugins/supervisor/install.sh
+++ b/plugins/supervisor/install.sh
@@ -7,7 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 # /www/server/mdserver-web/bin/supervisorctl  -c /www/server/supervisor/supervisor.conf
diff --git a/plugins/swap/install.sh b/plugins/swap/install.sh
index 875345c3d..1f698fd13 100755
--- a/plugins/swap/install.sh
+++ b/plugins/swap/install.sh
@@ -8,8 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 SYSOS=`uname`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 VERSION=$2
 
 # cd /www/server/mdserver-web/plugins/swap && /bin/bash install.sh install 1.1
@@ -20,7 +18,7 @@ Install_swap()
 		exit 0
 	fi
 
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 	mkdir -p $serverPath/swap
 	echo "${VERSION}" > $serverPath/swap/version.pl
@@ -34,7 +32,7 @@ Install_swap()
 		swapon $serverPath/swap/swapfile
 	fi 
 
-	echo '安装完成' > $install_tmp
+	echo '安装完成'
 
 	cd ${rootPath} && python3 ${rootPath}/plugins/swap/index.py start
 	cd ${rootPath} && python3 ${rootPath}/plugins/swap/index.py initd_install
@@ -59,7 +57,7 @@ Uninstall_swap()
 
 	rm -rf $serverPath/swap
 	
-	echo "Uninstall_swap" > $install_tmp
+	echo "Uninstall_swap"
 }
 
 action=$1
diff --git a/plugins/sys-opt/install.sh b/plugins/sys-opt/install.sh
index d6370cc71..03e7c82ff 100755
--- a/plugins/sys-opt/install.sh
+++ b/plugins/sys-opt/install.sh
@@ -8,23 +8,19 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-
-install_tmp=${rootPath}/tmp/mw_install.pl
-
-
 Install_sysopt()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/sys-opt
 	echo '1.0' > $serverPath/sys-opt/version.pl
-	echo '安装完成' > $install_tmp
+	echo '安装完成'
 
 }
 
 Uninstall_sysopt()
 {
 	rm -rf $serverPath/sys-opt
-	echo "卸载完成" > $install_tmp
+	echo "卸载完成"
 }
 
 action=$1
diff --git a/plugins/system_safe/install.sh b/plugins/system_safe/install.sh
index 7179c2499..d053a898b 100755
--- a/plugins/system_safe/install.sh
+++ b/plugins/system_safe/install.sh
@@ -7,17 +7,16 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 SYSOS=`uname`
 VERSION=$2
 APP_NAME=system_safe
 
 Install_App()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/system_safe
 	echo "$VERSION" > $serverPath/system_safe/version.pl
-	echo 'install complete' > $install_tmp
+	echo 'install complete'
 
 	#初始化 
 	cd ${serverPath}/mdserver-web && python3 plugins/system_safe/system_safe.py start $VERSION
@@ -36,7 +35,7 @@ Uninstall_App()
 	fi
 
 	rm -rf $serverPath/system_safe
-	echo "uninstall completed" > $install_tmp
+	echo "uninstall completed"
 }
 
 action=$1
diff --git a/plugins/tamper_proof_py/install.sh b/plugins/tamper_proof_py/install.sh
index efa2d12f7..f3b963984 100755
--- a/plugins/tamper_proof_py/install.sh
+++ b/plugins/tamper_proof_py/install.sh
@@ -13,17 +13,16 @@ if [ -f ${rootPath}/bin/activate ];then
 fi
 pip install pyinotify
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 SYSOS=`uname`
 VERSION=$2
 APP_NAME=tamper_proof_py
 
 Install_App()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/tamper_proof_py
 	echo "$VERSION" > $serverPath/tamper_proof_py/version.pl
-	echo 'install complete' > $install_tmp
+	echo 'install complete'
 
 	#初始化 
 	cd ${serverPath}/mdserver-web && python3 plugins/tamper_proof_py/index.py start $VERSION
@@ -41,7 +40,7 @@ Uninstall_App()
 	fi
 
 	rm -rf $serverPath/tamper_proof_py
-	echo "uninstall completed" > $install_tmp
+	echo "uninstall completed"
 }
 
 action=$1
diff --git a/plugins/task_manager/install.sh b/plugins/task_manager/install.sh
index 1884c74a8..896b1af89 100755
--- a/plugins/task_manager/install.sh
+++ b/plugins/task_manager/install.sh
@@ -7,7 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 # python3 plugins/task_manager/task_manager_index.py
@@ -20,7 +19,7 @@ fi
 
 Install_App()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/task_manager
 
 	if [ -f /usr/bin/apt ]; then
diff --git a/plugins/tgbot/install.sh b/plugins/tgbot/install.sh
index cec3fab83..31d91f8e0 100755
--- a/plugins/tgbot/install.sh
+++ b/plugins/tgbot/install.sh
@@ -7,9 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 VERSION=$2
 
 # pip3 install ccxt
@@ -22,7 +19,7 @@ pip3 install telebot
 
 Install_App()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 	mkdir -p $serverPath/tgbot
 	echo "${VERSION}" > $serverPath/tgbot/version.pl
@@ -31,7 +28,7 @@ Install_App()
 
 	cd ${rootPath} && python3 ${rootPath}/plugins/tgbot/index.py start
 	cd ${rootPath} && python3 ${rootPath}/plugins/tgbot/index.py initd_install
-	echo '安装完成' > $install_tmp
+	echo '安装完成'
 }
 
 Uninstall_App()
@@ -48,7 +45,7 @@ Uninstall_App()
 	fi
 
 	rm -rf $serverPath/tgbot
-	echo "Uninstall_redis" > $install_tmp
+	echo "Uninstall_redis"
 }
 
 action=$1
diff --git a/plugins/tgclient/install.sh b/plugins/tgclient/install.sh
index cf06a2d04..6757ba902 100755
--- a/plugins/tgclient/install.sh
+++ b/plugins/tgclient/install.sh
@@ -7,9 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 VERSION=$2
 
 # pip3 install ccxt
@@ -21,7 +18,7 @@ pip3 install telethon
 
 Install_App()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 	mkdir -p $serverPath/tgclient
 	echo "${VERSION}" > $serverPath/tgclient/version.pl
@@ -30,7 +27,7 @@ Install_App()
 
 	cd ${rootPath} && python3 ${rootPath}/plugins/tgclient/index.py start
 	cd ${rootPath} && python3 ${rootPath}/plugins/tgclient/index.py initd_install
-	echo '安装完成' > $install_tmp
+	echo '安装完成'
 }
 
 Uninstall_App()
@@ -47,7 +44,7 @@ Uninstall_App()
 	fi
 
 	rm -rf $serverPath/tgclient
-	echo "Uninstall_redis" > $install_tmp
+	echo "Uninstall_redis"
 }
 
 action=$1
diff --git a/plugins/varnish/install.sh b/plugins/varnish/install.sh
index d47114112..2ce3ad69f 100755
--- a/plugins/varnish/install.sh
+++ b/plugins/varnish/install.sh
@@ -7,7 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 
@@ -18,7 +17,7 @@ OSNAME_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F
 
 Install_varnish()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 
 	if [ "${OSNAME}" == "macos" ]; then
@@ -38,7 +37,7 @@ Install_varnish()
 
 	mkdir -p $serverPath/varnish
 	echo "1.0" > $serverPath/varnish/version.pl
-	echo '安装完成' > $install_tmp
+	echo '安装完成'
 
 	cd ${rootPath} && python3 ${rootPath}/plugins/varnish/index.py start
 	cd ${rootPath} && python3 ${rootPath}/plugins/varnish/index.py initd_install
@@ -63,7 +62,7 @@ Uninstall_varnish()
 		echo "I won't support it"
 	fi
 	rm -rf $serverPath/varnish
-	echo "uninstall varnish" > $install_tmp
+	echo "uninstall varnish"
 }
 
 action=$1
diff --git a/plugins/webhook/install.sh b/plugins/webhook/install.sh
index e3018b0a9..6743e6162 100755
--- a/plugins/webhook/install.sh
+++ b/plugins/webhook/install.sh
@@ -7,22 +7,20 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 VERSION=1.0
 
 Install_App()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/webhook
 	echo "${VERSION}" > $serverPath/webhook/version.pl
-	echo '安装完成' > $install_tmp
+	echo '安装完成'
 }
 
 Uninstall_App()
 {
 	rm -rf $serverPath/webhook
-	echo "Uninstall_App" > $install_tmp
+	echo "Uninstall_App"
 }
 
 action=$1
diff --git a/plugins/webssh/install.sh b/plugins/webssh/install.sh
index 6c7ecedec..31782e34c 100755
--- a/plugins/webssh/install.sh
+++ b/plugins/webssh/install.sh
@@ -8,24 +8,21 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 VERSION=$2
 
 Install_webssh()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/webssh
 	echo "${VERSION}" > $serverPath/webssh/version.pl
-	echo '安装完成' > $install_tmp
+	echo '安装完成'
 
 }
 
 Uninstall_webssh()
 {
 	rm -rf $serverPath/webssh
-	echo "卸载完成" > $install_tmp
+	echo "卸载完成"
 }
 
 action=$1
diff --git a/plugins/webstats/install.sh b/plugins/webstats/install.sh
index bb4395bd2..3545c87e7 100755
--- a/plugins/webstats/install.sh
+++ b/plugins/webstats/install.sh
@@ -12,7 +12,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 sys_os=`uname`
 
diff --git a/plugins/xhprof/install.sh b/plugins/xhprof/install.sh
index 745164925..45eabd0e1 100755
--- a/plugins/xhprof/install.sh
+++ b/plugins/xhprof/install.sh
@@ -7,7 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 sys_os=`uname`
 Install_xh()
 {
@@ -18,7 +17,7 @@ Install_xh()
 	fi
 
 	echo "${1}" > ${serverPath}/xhprof/version.pl
-	echo '安装完成' > $install_tmp
+	echo '安装完成'
 
 	if [ "$sys_os" != "Darwin" ];then
 		cd $rootPath && python3 ${rootPath}/plugins/xhprof/index.py start
@@ -37,7 +36,7 @@ Uninstall_xh()
 	if [ -f ${serverPath}/web_conf/nginx/vhost/xhprof.conf ];then
 		rm -f ${serverPath}/web_conf/nginx/vhost/xhprof.conf
 	fi
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1
diff --git a/plugins/zabbix/install.sh b/plugins/zabbix/install.sh
index a49c4689f..349265683 100755
--- a/plugins/zabbix/install.sh
+++ b/plugins/zabbix/install.sh
@@ -14,7 +14,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 sysName=`uname`
diff --git a/plugins/zabbix/versions/6.0/alma.sh b/plugins/zabbix/versions/6.0/alma.sh
index 5858a76d3..d432a18e4 100644
--- a/plugins/zabbix/versions/6.0/alma.sh
+++ b/plugins/zabbix/versions/6.0/alma.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
diff --git a/plugins/zabbix/versions/6.0/centos.sh b/plugins/zabbix/versions/6.0/centos.sh
index 562d58e70..5ddb82e7a 100644
--- a/plugins/zabbix/versions/6.0/centos.sh
+++ b/plugins/zabbix/versions/6.0/centos.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
diff --git a/plugins/zabbix/versions/6.0/debian.sh b/plugins/zabbix/versions/6.0/debian.sh
index 27915ea75..3df4767ee 100644
--- a/plugins/zabbix/versions/6.0/debian.sh
+++ b/plugins/zabbix/versions/6.0/debian.sh
@@ -8,7 +8,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
+
 debian_suffix=
 if [ "$SYS_ARCH" == "aarch64" ];then
 	debian_suffix="-arm64"
diff --git a/plugins/zabbix/versions/6.0/opensuse.sh b/plugins/zabbix/versions/6.0/opensuse.sh
index 748fc705d..3b316159b 100644
--- a/plugins/zabbix/versions/6.0/opensuse.sh
+++ b/plugins/zabbix/versions/6.0/opensuse.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
diff --git a/plugins/zabbix/versions/6.0/rocky.sh b/plugins/zabbix/versions/6.0/rocky.sh
index 2b3348512..b9e8cfbec 100644
--- a/plugins/zabbix/versions/6.0/rocky.sh
+++ b/plugins/zabbix/versions/6.0/rocky.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
diff --git a/plugins/zabbix/versions/6.0/ubuntu.sh b/plugins/zabbix/versions/6.0/ubuntu.sh
index a65f647e7..b564164a0 100644
--- a/plugins/zabbix/versions/6.0/ubuntu.sh
+++ b/plugins/zabbix/versions/6.0/ubuntu.sh
@@ -9,8 +9,8 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 SYS_ARCH=`arch`
+
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
 ubuntu_suffix=
diff --git a/plugins/zabbix/versions/7.0/alma.sh b/plugins/zabbix/versions/7.0/alma.sh
index dd1cc523c..d53b56da3 100644
--- a/plugins/zabbix/versions/7.0/alma.sh
+++ b/plugins/zabbix/versions/7.0/alma.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
diff --git a/plugins/zabbix/versions/7.0/centos.sh b/plugins/zabbix/versions/7.0/centos.sh
index db9c4a3b0..8bfddec8c 100644
--- a/plugins/zabbix/versions/7.0/centos.sh
+++ b/plugins/zabbix/versions/7.0/centos.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
diff --git a/plugins/zabbix/versions/7.0/debian.sh b/plugins/zabbix/versions/7.0/debian.sh
index a7abe09cd..3492f1786 100644
--- a/plugins/zabbix/versions/7.0/debian.sh
+++ b/plugins/zabbix/versions/7.0/debian.sh
@@ -10,8 +10,6 @@ sourcePath=${serverPath}/source
 sysName=`uname`
 sysArch=`arch`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 debian_suffix=
 if [ "$sysArch" == "aarch64" ];then
 	debian_suffix="-arm64"
diff --git a/plugins/zabbix/versions/7.0/opensuse.sh b/plugins/zabbix/versions/7.0/opensuse.sh
index 805f6419c..6b093949f 100644
--- a/plugins/zabbix/versions/7.0/opensuse.sh
+++ b/plugins/zabbix/versions/7.0/opensuse.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
diff --git a/plugins/zabbix/versions/7.0/rocky.sh b/plugins/zabbix/versions/7.0/rocky.sh
index 8bc6c05a9..7d19a292f 100644
--- a/plugins/zabbix/versions/7.0/rocky.sh
+++ b/plugins/zabbix/versions/7.0/rocky.sh
@@ -8,7 +8,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
+
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
diff --git a/plugins/zabbix/versions/7.0/ubuntu.sh b/plugins/zabbix/versions/7.0/ubuntu.sh
index 7bc4eb851..1e34aa830 100644
--- a/plugins/zabbix/versions/7.0/ubuntu.sh
+++ b/plugins/zabbix/versions/7.0/ubuntu.sh
@@ -11,7 +11,6 @@ sourcePath=${serverPath}/source
 sysName=`uname`
 sysArch=`arch`
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 ubuntu_suffix=
 if [ "$sysArch" == "aarch64" ];then
 	ubuntu_suffix="-arm64"
diff --git a/plugins/zabbix_agent/install.sh b/plugins/zabbix_agent/install.sh
index 0bbaf897b..955c8c072 100755
--- a/plugins/zabbix_agent/install.sh
+++ b/plugins/zabbix_agent/install.sh
@@ -15,7 +15,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 sysName=`uname`
diff --git a/plugins/zabbix_agent/versions/6.0/debian.sh b/plugins/zabbix_agent/versions/6.0/debian.sh
index 80283fa0b..dd284d4e2 100644
--- a/plugins/zabbix_agent/versions/6.0/debian.sh
+++ b/plugins/zabbix_agent/versions/6.0/debian.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
diff --git a/plugins/zabbix_agent/versions/7.0/alma.sh b/plugins/zabbix_agent/versions/7.0/alma.sh
index 39f54df27..0c72c43b7 100644
--- a/plugins/zabbix_agent/versions/7.0/alma.sh
+++ b/plugins/zabbix_agent/versions/7.0/alma.sh
@@ -8,7 +8,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
+
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
diff --git a/plugins/zabbix_agent/versions/7.0/centos.sh b/plugins/zabbix_agent/versions/7.0/centos.sh
index a456ee761..8c4e391d5 100644
--- a/plugins/zabbix_agent/versions/7.0/centos.sh
+++ b/plugins/zabbix_agent/versions/7.0/centos.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
diff --git a/plugins/zabbix_agent/versions/7.0/debian.sh b/plugins/zabbix_agent/versions/7.0/debian.sh
index 3278f253c..f29fb7992 100644
--- a/plugins/zabbix_agent/versions/7.0/debian.sh
+++ b/plugins/zabbix_agent/versions/7.0/debian.sh
@@ -8,7 +8,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
+
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
diff --git a/plugins/zabbix_agent/versions/7.0/opensuse.sh b/plugins/zabbix_agent/versions/7.0/opensuse.sh
index 6ec3cd19c..2b08e20a5 100644
--- a/plugins/zabbix_agent/versions/7.0/opensuse.sh
+++ b/plugins/zabbix_agent/versions/7.0/opensuse.sh
@@ -8,7 +8,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
+
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
diff --git a/plugins/zabbix_agent/versions/7.0/rocky.sh b/plugins/zabbix_agent/versions/7.0/rocky.sh
index c7107c7d6..9d1f8e95c 100644
--- a/plugins/zabbix_agent/versions/7.0/rocky.sh
+++ b/plugins/zabbix_agent/versions/7.0/rocky.sh
@@ -8,7 +8,6 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
diff --git a/plugins/zabbix_agent/versions/7.0/ubuntu.sh b/plugins/zabbix_agent/versions/7.0/ubuntu.sh
index e12309ca5..98d7c1cf6 100644
--- a/plugins/zabbix_agent/versions/7.0/ubuntu.sh
+++ b/plugins/zabbix_agent/versions/7.0/ubuntu.sh
@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
-install_tmp=${rootPath}/tmp/mw_install.pl
+
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 

From da9c57cf84434779e5b9d6e5f7b859aa9bfe7ef5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 21:57:46 +0800
Subject: [PATCH 534/965] update

---
 scripts/install_dev.sh | 1 -
 scripts/install_new.sh | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/install_dev.sh b/scripts/install_dev.sh
index a44795a5c..cde638325 100755
--- a/scripts/install_dev.sh
+++ b/scripts/install_dev.sh
@@ -11,7 +11,6 @@ if [ -f /www/server/mdserver-web/tools.py ];then
 	exit 0
 fi
 
-
 echo -e "您正在安装的是\033[31mmdserver-web测试版\033[0m，非开发测试用途请使用正式版 install.sh ！" 
 echo -e "You are installing\033[31m mdserver-web dev version\033[0m, normally use install.sh for production.\n" 
 sleep 1
diff --git a/scripts/install_new.sh b/scripts/install_new.sh
index 608a2d556..cde638325 100755
--- a/scripts/install_new.sh
+++ b/scripts/install_new.sh
@@ -4,6 +4,13 @@ export PATH
 # LANG=en_US.UTF-8
 is64bit=`getconf LONG_BIT`
 
+if [ -f /www/server/mdserver-web/tools.py ];then
+	echo -e "存在旧版代码,不能安装!,已知风险的情况下" 
+	echo -e "rm -rf /www/server/mdserver-web"
+	echo -e "可安装!" 
+	exit 0
+fi
+
 echo -e "您正在安装的是\033[31mmdserver-web测试版\033[0m，非开发测试用途请使用正式版 install.sh ！" 
 echo -e "You are installing\033[31m mdserver-web dev version\033[0m, normally use install.sh for production.\n" 
 sleep 1

From 3d3cde43537f338d36ff2864320486a30ee6c355 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 21:58:06 +0800
Subject: [PATCH 535/965] Update update_new.sh

---
 scripts/update_new.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/update_new.sh b/scripts/update_new.sh
index 7c4d2ebd6..1f8caa7aa 100755
--- a/scripts/update_new.sh
+++ b/scripts/update_new.sh
@@ -6,6 +6,13 @@ is64bit=`getconf LONG_BIT`
 
 startTime=`date +%s`
 
+if [ -f /www/server/mdserver-web/tools.py ];then
+	echo -e "存在旧版代码,不能安装!,已知风险的情况下" 
+	echo -e "rm -rf /www/server/mdserver-web"
+	echo -e "可安装!" 
+	exit 0
+fi
+
 _os=`uname`
 echo "use system: ${_os}"
 

From b0c3e5b7e5981794ced5cefb2d57c3369aa75511 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 22:41:39 +0800
Subject: [PATCH 536/965] update

---
 README.md              |   5 --
 scripts/install_new.sh | 189 -----------------------------------------
 scripts/update_new.sh  | 134 -----------------------------
 web/setting.py         |   2 +-
 web/utils/firewall.py  |  12 +++
 5 files changed, 13 insertions(+), 329 deletions(-)
 delete mode 100755 scripts/install_new.sh
 delete mode 100755 scripts/update_new.sh

diff --git a/README.md b/README.md
index b4d210106..76298c0bd 100644
--- a/README.md
+++ b/README.md
@@ -182,11 +182,6 @@ curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev
 
 curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/install_dev.sh | bash
 curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/update_dev.sh | bash
-
-
-
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_new.sh | bash
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update_new.sh | bash
 ```
 
 ### 旧版安装
diff --git a/scripts/install_new.sh b/scripts/install_new.sh
deleted file mode 100755
index cde638325..000000000
--- a/scripts/install_new.sh
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/bin/bash
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
-export PATH
-# LANG=en_US.UTF-8
-is64bit=`getconf LONG_BIT`
-
-if [ -f /www/server/mdserver-web/tools.py ];then
-	echo -e "存在旧版代码,不能安装!,已知风险的情况下" 
-	echo -e "rm -rf /www/server/mdserver-web"
-	echo -e "可安装!" 
-	exit 0
-fi
-
-echo -e "您正在安装的是\033[31mmdserver-web测试版\033[0m，非开发测试用途请使用正式版 install.sh ！" 
-echo -e "You are installing\033[31m mdserver-web dev version\033[0m, normally use install.sh for production.\n" 
-sleep 1
-
-LOG_FILE=/var/log/mw-install.log
-
-{
-
-if [ -f /etc/motd ];then
-    echo "welcome to mdserver-web panel" > /etc/motd
-fi
-
-startTime=`date +%s`
-
-_os=`uname`
-echo "use system: ${_os}"
-
-
-if [ ${_os} == "Darwin" ]; then
-	OSNAME='macos'
-elif grep -Eq "openSUSE" /etc/*-release; then
-	OSNAME='opensuse'
-	zypper refresh
-	zypper install -y  wget curl zip unzip unrar rar
-elif grep -Eq "FreeBSD" /etc/*-release; then
-	OSNAME='freebsd'
-	pkg install -y wget curl zip unzip unrar rar
-elif grep -Eqi "EulerOS" /etc/*-release || grep -Eqi "openEuler" /etc/*-release; then
-	OSNAME='euler'
-	yum install -y wget curl zip unzip tar crontabs
-elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "CentOS" /etc/*-release; then
-	OSNAME='rhel'
-	yum install -y wget zip unzip tar
-elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then
-	OSNAME='rhel'
-	yum install -y wget zip unzip tar
-elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then
-	OSNAME='rhel'
-	yum install -y wget zip unzip
-elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eqi "AlmaLinux" /etc/*-release; then
-	OSNAME='rhel'
-	yum install -y wget zip unzip tar 
-elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eqi "Amazon Linux" /etc/*-release; then
-	OSNAME='amazon'
-	yum install -y wget zip unzip tar
-elif grep -Eqi "Ubuntu" /etc/issue || grep -Eqi "Ubuntu" /etc/*-release; then
-	OSNAME='ubuntu'
-	apt install -y wget zip unzip tar
-elif grep -Eqi "Debian" /etc/issue || grep -Eqi "Debian" /etc/*-release; then
-	OSNAME='debian'
-	apt update -y
-	apt install -y devscripts
-	apt install -y wget zip unzip tar
-else
-	OSNAME='unknow'
-fi
-
-if [ "$EUID" -ne 0 ] && [ "$OSNAME" != "macos" ];then 
-	echo "Please run as root!"
- 	exit
-fi
-
-# HTTP_PREFIX="https://"
-# LOCAL_ADDR=common
-# ping  -c 1 github.com > /dev/null 2>&1
-# if [ "$?" != "0" ];then
-# 	LOCAL_ADDR=cn
-# 	HTTP_PREFIX="https://mirror.ghproxy.com/"
-# fi
-
-HTTP_PREFIX="https://"
-LOCAL_ADDR=common
-cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"")
-if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then
-	LOCAL_ADDR=cn
-    HTTP_PREFIX="https://mirror.ghproxy.com/"
-fi
-
-echo "local:${LOCAL_ADDR}"
-echo "OSNAME:${OSNAME}"
-
-if [ $OSNAME != "macos" ];then
-
-	if id www &> /dev/null ;then 
-	    echo ""
-	else
-	    groupadd www
-		useradd -g www -s /usr/sbin/nologin www
-	fi
-	
-	mkdir -p /www/server
-	mkdir -p /www/wwwroot
-	mkdir -p /www/wwwlogs
-	mkdir -p /www/backup/database
-	mkdir -p /www/backup/site
-
-	if [ ! -d /www/server/mdserver-web ];then
-
-		if [ "$LOCAL_ADDR" == "common" ];then
-			curl --insecure -sSLo /tmp/dev.zip ${HTTP_PREFIX}github.com/midoks/mdserver-web/archive/refs/heads/dev.zip
-			cd /tmp && unzip /tmp/dev.zip
-			mv -f /tmp/mdserver-web-dev /www/server/mdserver-web
-			rm -rf /tmp/dev.zip
-			rm -rf /tmp/mdserver-web-dev
-		else
-			# curl --insecure -sSLo /tmp/dev.zip https://code.midoks.icu/midoks/mdserver-web/archive/dev.zip
-			wget --no-check-certificate -O /tmp/dev.zip https://code.midoks.icu/midoks/mdserver-web/archive/dev.zip
-			cd /tmp && unzip /tmp/dev.zip
-			mv -f /tmp/mdserver-web /www/server/mdserver-web
-			rm -rf /tmp/dev.zip
-			rm -rf /tmp/mdserver-web
-		fi	
-	fi
-
-	# install acme.sh
-	if [ ! -d /root/.acme.sh ];then
-	    if [ "$LOCAL_ADDR" != "common" ];then
-	        # curl -sSL -o /tmp/acme.tar.gz ${HTTP_PREFIX}github.com/acmesh-official/acme.sh/archive/master.tar.gz
-	        curl --insecure -sSLo /tmp/acme.tar.gz https://gitee.com/neilpang/acme.sh/repository/archive/master.tar.gz
-	        tar xvzf /tmp/acme.tar.gz -C /tmp
-	        cd /tmp/acme.sh-master
-	        bash acme.sh install
-	    fi
-
-	    if [ ! -d /root/.acme.sh ];then
-	        curl  https://get.acme.sh | sh
-	    fi
-	fi
-fi
-
-echo "use system version: ${OSNAME}"
-
-if [ "${OSNAME}" == "macos" ];then
-	curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/master/scripts/install/macos.sh | bash
-else
-	cd /www/server/mdserver-web && bash scripts/install/${OSNAME}.sh
-fi
-
-if [ "${OSNAME}" == "macos" ];then
-	echo "macos end"
-	exit 0
-fi
-
-cd /www/server/mdserver-web && bash cli.sh start
-isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`
-n=0
-while [ ! -f /etc/rc.d/init.d/mw ];
-do
-    echo -e ".\c"
-    sleep 1
-    let n+=1
-    if [ $n -gt 20 ];then
-    	echo -e "start mw fail"
-        exit 1
-    fi
-done
-
-cd /www/server/mdserver-web && bash /etc/rc.d/init.d/mw stop
-cd /www/server/mdserver-web && bash /etc/rc.d/init.d/mw start
-cd /www/server/mdserver-web && bash /etc/rc.d/init.d/mw default
-
-sleep 2
-if [ ! -e /usr/bin/mw ]; then
-	if [ -f /etc/rc.d/init.d/mw ];then
-		ln -s /etc/rc.d/init.d/mw /usr/bin/mw
-	fi
-fi
-
-endTime=`date +%s`
-((outTime=(${endTime}-${startTime})/60))
-echo -e "Time consumed:\033[32m $outTime \033[0mMinute!"
-
-} 1> >(tee $LOG_FILE) 2>&1
-
-echo -e "\nInstall completed. If error occurs, please contact us with the log file mw-install.log ."
-echo "安装完毕，如果出现错误，请带上同目录下的安装日志 mw-install.log 联系我们反馈."
\ No newline at end of file
diff --git a/scripts/update_new.sh b/scripts/update_new.sh
deleted file mode 100755
index 1f8caa7aa..000000000
--- a/scripts/update_new.sh
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/bash
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
-export PATH
-# LANG=en_US.UTF-8
-is64bit=`getconf LONG_BIT`
-
-startTime=`date +%s`
-
-if [ -f /www/server/mdserver-web/tools.py ];then
-	echo -e "存在旧版代码,不能安装!,已知风险的情况下" 
-	echo -e "rm -rf /www/server/mdserver-web"
-	echo -e "可安装!" 
-	exit 0
-fi
-
-_os=`uname`
-echo "use system: ${_os}"
-
-if [ "$EUID" -ne 0 ]
-	then echo "Please run as root!"
-	exit
-fi
-
-if [ ${_os} != "Darwin" ] && [ ! -d /www/server/mdserver-web/logs ]; then
-	mkdir -p /www/server/mdserver-web/logs
-fi
-
-LOG_FILE=/var/log/mw-update.log
-
-{
-
-if [ ${_os} == "Darwin" ]; then
-	OSNAME='macos'
-elif grep -Eqi "openSUSE" /etc/*-release; then
-	OSNAME='opensuse'
-	zypper refresh
-elif grep -Eqi "EulerOS" /etc/*-release || grep -Eqi "openEuler" /etc/*-release; then
-	OSNAME='euler'
-elif grep -Eqi "FreeBSD" /etc/*-release; then
-	OSNAME='freebsd'
-elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "CentOS" /etc/*-release; then
-	OSNAME='centos'
-	yum install -y wget zip unzip
-elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then
-	OSNAME='rhel'
-	yum install -y wget zip unzip
-elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then
-	OSNAME='rhel'
-	yum install -y wget zip unzip
-elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eqi "AlmaLinux" /etc/*-release; then
-	OSNAME='rhel'
-	yum install -y wget zip unzip
-elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eqi "Amazon Linux" /etc/*-release; then
-	OSNAME='amazon'
-	yum install -y wget zip unzip
-elif grep -Eqi "Debian" /etc/issue || grep -Eqi "Debian" /etc/*-release; then
-	OSNAME='debian'
-	apt install -y wget zip unzip
-elif grep -Eqi "Ubuntu" /etc/issue || grep -Eqi "Ubuntu" /etc/*-release; then
-	OSNAME='ubuntu'
-	apt install -y wget zip unzip
-elif grep -Eqi "Raspbian" /etc/issue || grep -Eqi "Raspbian" /etc/*-release; then
-	OSNAME='raspbian'
-else
-	OSNAME='unknow'
-fi
-
-# HTTP_PREFIX="https://"
-# LOCAL_ADDR=common
-# ping  -c 1 github.com > /dev/null 2>&1
-# if [ "$?" != "0" ];then
-# 	LOCAL_ADDR=cn
-# 	HTTP_PREFIX="https://mirror.ghproxy.com/"
-# fi
-HTTP_PREFIX="https://"
-LOCAL_ADDR=common
-cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"")
-if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then
-	LOCAL_ADDR=cn
-	HTTP_PREFIX="https://mirror.ghproxy.com/"
-fi
-
-echo "local:${LOCAL_ADDR}"
-
-CP_CMD=/usr/bin/cp
-if [ -f /bin/cp ];then
-	CP_CMD=/bin/cp
-fi
-
-echo "update mdserver-web code start"
-
-if [ "$LOCAL_ADDR" != "common" ];then
-	wget --no-check-certificate -O /tmp/dev.zip https://code.midoks.icu/midoks/mdserver-web/archive/dev.zip
-	# curl --insecure -sSLo /tmp/dev.zip https://code.midoks.icu/midoks/mdserver-web/archive/dev.zip
-	cd /tmp && unzip /tmp/dev.zip
-
-	$CP_CMD -rf /tmp/mdserver-web/* /www/server/mdserver-web
-	rm -rf /tmp/master.zip
-	rm -rf /tmp/mdserver-web
-else
-	curl --insecure -sSLo /tmp/dev.zip ${HTTP_PREFIX}github.com/midoks/mdserver-web/archive/refs/heads/dev.zip
-	cd /tmp && unzip /tmp/dev.zip
-	$CP_CMD -rf /tmp/mdserver-web-dev/* /www/server/mdserver-web
-	rm -rf /tmp/dev.zip
-	rm -rf /tmp/mdserver-web-dev
-fi
-
-echo "update mdserver-web code end"
-
-rm -rf /tmp/dev.zip
-rm -rf /tmp/mdserver-web-dev
-
-#pip uninstall public
-echo "use system version: ${OSNAME}"
-cd /www/server/mdserver-web && bash scripts/update/${OSNAME}.sh
-
-bash /etc/rc.d/init.d/mw restart
-bash /etc/rc.d/init.d/mw default
-
-if [ -f /usr/bin/mw ];then
-	rm -rf /usr/bin/mw
-fi
-
-if [ ! -e /usr/bin/mw ]; then
-	if [ ! -f /usr/bin/mw ];then
-		ln -s /etc/rc.d/init.d/mw /usr/bin/mw
-	fi
-fi
-
-endTime=`date +%s`
-((outTime=($endTime-$startTime)/60))
-echo -e "Time consumed:\033[32m $outTime \033[0mMinute!"
-
-} 1> >(tee $LOG_FILE) 2>&1
\ No newline at end of file
diff --git a/web/setting.py b/web/setting.py
index 85d5e112e..a677e0ed8 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -47,7 +47,7 @@ if os.path.exists(default_port_file):
 else:
     from utils.firewall import Firewall as MwFirewall
     panel_port = str(random.randint(10000, 65530))
-    MwFirewall.instance().addAcceptPort(panel_port, 'PANEL端口', 'port')
+    MwFirewall.instance().addPanelPort(panel_port)
     mw.writeFile(default_port_file, panel_port)
 
 bind = []
diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 0aebdf227..993fc7004 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -309,6 +309,18 @@ class Firewall(object):
         mw.writeLog("防火墙管理", msg)
         return mw.returnData(True, msg)
 
+    def addPanelPort(self, port):
+        protocol = 'tcp'
+        ps = 'PANEL端口'
+
+        thisdb.addFirewall(port, ps=ps,protocol=protocol)
+        self.addAcceptPortCmd(port, protocol=protocol)
+        self.reload()
+
+        msg = mw.getInfo('放行端口[{1}][{2}]成功', (port, protocol,))
+        mw.writeLog("防火墙管理", msg)
+        return mw.returnData(True, msg)
+
     def delAcceptPort(self, firewall_id, port,
         protocol='tcp'
     ):

From a36d2f2665c503a556ae2733db4803fcfa430b3c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 22:43:17 +0800
Subject: [PATCH 537/965] Update firewall.py

---
 web/utils/firewall.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 993fc7004..c6550c590 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -310,6 +310,8 @@ class Firewall(object):
         return mw.returnData(True, msg)
 
     def addPanelPort(self, port):
+        self.setFw(0)
+
         protocol = 'tcp'
         ps = 'PANEL端口'
 

From f040b590d55e0f84bf1c7ed3fdbcf89916cf3cdc Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 22:53:40 +0800
Subject: [PATCH 538/965] Update firewall.py

---
 web/utils/firewall.py | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index c6550c590..b2e72ee32 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -51,6 +51,41 @@ class Firewall(object):
     def aIF(self):
         if self.__isFirewalld:
             self.AIF_Firewalld()
+        if self.__isUfw:
+            self.aIF_Ufw()
+
+
+    def aIF_Ufw(self):
+        t = mw.execShell("ufw status|awk '{print $1}' | grep -v 'Status'|grep -v 'To'|grep -v '-'")
+        if t[1] != '':
+            return True
+
+        print(t)
+
+        # all_port = t[0].strip()
+        # data = all_port.split(":")
+        # ports_str = data[1]
+        # ports_list = ports_str.strip().split(' ')
+
+        # ports_all = []
+        # for pinfo in ports_list:
+        #     info = pinfo.split('/')
+
+        #     is_same = False
+        #     for i in range(len(ports_all)):
+        #         if ports_all[i]['port'] == info[0] and ports_all[i]['protocol'] != info[1]:
+        #             ports_all[i]['protocol'] = ports_all[i]['protocol']+'/'+info[1]
+        #             is_same = True
+
+        #     if not is_same:
+        #         t = {}
+        #         t['port'] = info[0].replace('-',':')
+        #         t['protocol'] = info[1]
+        #         ports_all.append(t)
+
+        # for add_info in ports_all:
+        #     if thisdb.getFirewallCountByPort(add_info['port']) == 0:
+        #         thisdb.addFirewall(add_info['port'], ps='自动识别',protocol=add_info['protocol'])
 
     def AIF_Firewalld(self):
         # firewall-cmd --list-all | grep '  ports'

From c66ad2b7fbd95a36ab738ed42c6aec3ced76019a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 22:58:24 +0800
Subject: [PATCH 539/965] Update firewall.py

---
 web/utils/firewall.py | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index b2e72ee32..d7a8771da 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -60,32 +60,27 @@ class Firewall(object):
         if t[1] != '':
             return True
 
-        print(t)
+        all_port = t[0].strip()
+        ports_list = all_port.split('\n')
 
-        # all_port = t[0].strip()
-        # data = all_port.split(":")
-        # ports_str = data[1]
-        # ports_list = ports_str.strip().split(' ')
+        ports_all = []
+        for pinfo in ports_list:
+            info = pinfo.split('/')
 
-        # ports_all = []
-        # for pinfo in ports_list:
-        #     info = pinfo.split('/')
+            is_same = False
+            for i in range(len(ports_all)):
+                if ports_all[i]['port'] == info[0] and ports_all[i]['protocol'] != info[1]:
+                    ports_all[i]['protocol'] = ports_all[i]['protocol']+'/'+info[1]
+                    is_same = True
 
-        #     is_same = False
-        #     for i in range(len(ports_all)):
-        #         if ports_all[i]['port'] == info[0] and ports_all[i]['protocol'] != info[1]:
-        #             ports_all[i]['protocol'] = ports_all[i]['protocol']+'/'+info[1]
-        #             is_same = True
-
-        #     if not is_same:
-        #         t = {}
-        #         t['port'] = info[0].replace('-',':')
-        #         t['protocol'] = info[1]
-        #         ports_all.append(t)
-
-        # for add_info in ports_all:
-        #     if thisdb.getFirewallCountByPort(add_info['port']) == 0:
-        #         thisdb.addFirewall(add_info['port'], ps='自动识别',protocol=add_info['protocol'])
+            if not is_same:
+                t = {}
+                t['port'] = info[0].replace('-',':')
+                t['protocol'] = info[1]
+                ports_all.append(t)
+        for add_info in ports_all:
+            if thisdb.getFirewallCountByPort(add_info['port']) == 0:
+                thisdb.addFirewall(add_info['port'], ps='自动识别',protocol=add_info['protocol'])
 
     def AIF_Firewalld(self):
         # firewall-cmd --list-all | grep '  ports'

From 27b3bc1150c663362c4115e31257f7facf869247 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 23:00:46 +0800
Subject: [PATCH 540/965] Update firewall.py

---
 web/utils/firewall.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index d7a8771da..175a704eb 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -345,6 +345,9 @@ class Firewall(object):
         protocol = 'tcp'
         ps = 'PANEL端口'
 
+        if thisdb.getFirewallCountByPort(port) > 0:
+            return mw.returnData(False, '您要放行的端口已存在，无需重复放行!')
+
         thisdb.addFirewall(port, ps=ps,protocol=protocol)
         self.addAcceptPortCmd(port, protocol=protocol)
         self.reload()

From b97b8c2c9b291c2c66ea8c5f83fcc73d1e6ea58b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 23:01:21 +0800
Subject: [PATCH 541/965] Update setting.py

---
 web/setting.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/setting.py b/web/setting.py
index a677e0ed8..f97cab341 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -40,12 +40,13 @@ if not os.path.exists(data_dir):
 
 # default port
 panel_port = '7200'
+from utils.firewall import Firewall as MwFirewall
 default_port_file = panel_dir+'/data/port.pl'
 if os.path.exists(default_port_file):
     panel_port = mw.readFile(default_port_file)
     panel_port.strip()
+    MwFirewall.instance().addPanelPort(panel_port)
 else:
-    from utils.firewall import Firewall as MwFirewall
     panel_port = str(random.randint(10000, 65530))
     MwFirewall.instance().addPanelPort(panel_port)
     mw.writeFile(default_port_file, panel_port)

From 519951ad69e7f17caaa301b27799c75742352bfd Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 23:02:08 +0800
Subject: [PATCH 542/965] Update setting.py

---
 web/setting.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/setting.py b/web/setting.py
index f97cab341..ae6b782ff 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -45,7 +45,7 @@ default_port_file = panel_dir+'/data/port.pl'
 if os.path.exists(default_port_file):
     panel_port = mw.readFile(default_port_file)
     panel_port.strip()
-    MwFirewall.instance().addPanelPort(panel_port)
+    MwFirewall.instance().addAcceptPort(panel_port,'PANEL端口', 'port')
 else:
     panel_port = str(random.randint(10000, 65530))
     MwFirewall.instance().addPanelPort(panel_port)

From 1cc6953415fcb8f67b1da297304fb3495e1ca5f4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 23:10:58 +0800
Subject: [PATCH 543/965] Update install.sh

---
 plugins/openresty/versions/1.27.1/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/openresty/versions/1.27.1/install.sh b/plugins/openresty/versions/1.27.1/install.sh
index a53019d98..5567b2e64 100644
--- a/plugins/openresty/versions/1.27.1/install.sh
+++ b/plugins/openresty/versions/1.27.1/install.sh
@@ -167,12 +167,12 @@ Install_openresty()
     if [ -d $openrestyDir/openresty-${VERSION} ];then
 		rm -rf $openrestyDir/openresty-${VERSION}
 	fi
-	echo '安装完成'
+	echo 'Installation of Openresty completed'
 }
 
 Uninstall_openresty()
 {
-	echo '卸载完成'
+	echo 'Uninstalling Openresty completed'
 }
 
 action=$1

From 000a4cccf1f4f61c1c5cdb64aa2224c7b2a31814 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 23:35:34 +0800
Subject: [PATCH 544/965] Update python-app-op.yml

---
 .github/workflows/python-app-op.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-app-op.yml b/.github/workflows/python-app-op.yml
index 64ce10ca2..44472d5dd 100644
--- a/.github/workflows/python-app-op.yml
+++ b/.github/workflows/python-app-op.yml
@@ -34,5 +34,5 @@ jobs:
         cd /www/server/mdserver-web/plugins/openresty && sudo bash install.sh install 1.27
     - name: Start DEBUG
       run: |
-        gunicorn -c setting.py app:app
+        cd web && gunicorn -c setting.py app:app
         python3 task.py &

From 31db2207193dc6e790dc4503b01135e1d569e98b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 30 Nov 2024 23:35:48 +0800
Subject: [PATCH 545/965] Update python-app-op.yml

---
 .github/workflows/python-app-op.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-app-op.yml b/.github/workflows/python-app-op.yml
index 44472d5dd..a1818efc2 100644
--- a/.github/workflows/python-app-op.yml
+++ b/.github/workflows/python-app-op.yml
@@ -31,7 +31,7 @@ jobs:
         sudo bash scripts/install_dev.sh
     - name: Install OpenResty
       run: |
-        cd /www/server/mdserver-web/plugins/openresty && sudo bash install.sh install 1.27
+        cd /www/server/mdserver-web/plugins/openresty && sudo bash install.sh install 1.27.1
     - name: Start DEBUG
       run: |
         cd web && gunicorn -c setting.py app:app

From 7352f30d9180d116ef1a8426b17d833617a12dce Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 00:38:35 +0800
Subject: [PATCH 546/965] Update ubuntu.sh

---
 scripts/install/ubuntu.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install/ubuntu.sh b/scripts/install/ubuntu.sh
index 8af0c274f..37f8ef8bf 100644
--- a/scripts/install/ubuntu.sh
+++ b/scripts/install/ubuntu.sh
@@ -70,7 +70,7 @@ echo "SSH PORT:${SSH_PORT}"
 if [ -f /usr/sbin/ufw ];then
 	# look
 	# ufw status
-	ufw enable
+	echo 'y' | ufw enable
 
 	if [ "$SSH_PORT" != "" ];then
 		ufw allow $SSH_PORT/tcp

From eafaf13a3dc5052a2e15a8639febcff662e6231f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 01:14:12 +0800
Subject: [PATCH 547/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index fd75bc2fb..f9ed2bfe8 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -44,6 +44,8 @@ def init_cmd():
 
     if os.path.exists('/etc/init.d'):
         initd_bin = '/etc/init.d/mw'
+        if not os.access(initd_bin, os.W_OK):
+            return False
         shutil.copyfile(script_bin, initd_bin)
         mw.execShell('chmod +x ' + initd_bin)
         # 加入自启动

From 1cc4aee6f7cd3b5bc9b16b89d286954d4088a73a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 01:23:14 +0800
Subject: [PATCH 548/965] Update index.py

---
 plugins/openresty/index.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/openresty/index.py b/plugins/openresty/index.py
index d323af92f..d36710ab7 100755
--- a/plugins/openresty/index.py
+++ b/plugins/openresty/index.py
@@ -196,7 +196,9 @@ def confReplace():
     # vhost
     vhost_dir = mw.getServerDir() + '/web_conf/nginx/vhost'
     vhost_tpl_dir = getPluginDir() + '/conf/vhost'
-    # print(vhost_dir, vhost_tpl_dir)
+    if os.path.exists(vhost_dir):
+        mw.execShell('mkdir -p ' + vhost_dir)
+
     vhost_list = ['0.websocket.conf', '0.nginx_status.conf']
     for f in vhost_list:
         a_conf = vhost_dir + '/' + f

From ce6f7153b3af9c814bab9b187d80f855aa1e6bc1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 01:31:08 +0800
Subject: [PATCH 549/965] Update firewall.py

---
 web/utils/firewall.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 175a704eb..dee7a4ddd 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -83,7 +83,6 @@ class Firewall(object):
                 thisdb.addFirewall(add_info['port'], ps='自动识别',protocol=add_info['protocol'])
 
     def AIF_Firewalld(self):
-        # firewall-cmd --list-all | grep '  ports'
         t = mw.execShell("firewall-cmd --list-all | grep '  ports'")
         if t[1] != '':
             return True

From b432b1c165ba055598b9d28ebae0670e836fedd5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 01:40:56 +0800
Subject: [PATCH 550/965] update

---
 plugins/openresty/index.py   | 2 +-
 plugins/openresty/install.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/openresty/index.py b/plugins/openresty/index.py
index d36710ab7..2a93c65f4 100755
--- a/plugins/openresty/index.py
+++ b/plugins/openresty/index.py
@@ -196,7 +196,7 @@ def confReplace():
     # vhost
     vhost_dir = mw.getServerDir() + '/web_conf/nginx/vhost'
     vhost_tpl_dir = getPluginDir() + '/conf/vhost'
-    if os.path.exists(vhost_dir):
+    if not os.path.exists(vhost_dir):
         mw.execShell('mkdir -p ' + vhost_dir)
 
     vhost_list = ['0.websocket.conf', '0.nginx_status.conf']
diff --git a/plugins/openresty/install.sh b/plugins/openresty/install.sh
index 4be1cad85..7b6f9b7fd 100755
--- a/plugins/openresty/install.sh
+++ b/plugins/openresty/install.sh
@@ -2,8 +2,8 @@
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
 export PATH
 
-# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/openresty && bash install.sh install 1.21.4.2
-# cd /www/server/mdserver-web/plugins/openresty && bash install.sh install 1.21.4.2
+# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/openresty && bash install.sh install 1.21.4
+# cd /www/server/mdserver-web/plugins/openresty && bash install.sh install 1.21.4
 
 curPath=`pwd`
 rootPath=$(dirname "$curPath")

From 7b8bb6380d7138970c22d6b9c10a23fa080cebb1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 01:49:02 +0800
Subject: [PATCH 551/965] Update mw.py

---
 web/core/mw.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index 0ce49aeda..8b74195aa 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -331,7 +331,7 @@ def writeFile(filename, content, mode='w+'):
         fp.close()
         return True
     except Exception as e:
-        print(getTracebackInfo())
+        writeFileLog(getTracebackInfo())
         return False
 
 
@@ -968,7 +968,7 @@ def writeDbLog(stype, msg, args=(), uid=1):
 
 def writeSpeed(title, used, total, speed=0):
     path = getPanelDir()
-    speed_file= path + '/data/panelSpeed.pl'
+    speed_file= path + '/data/panel_speed.pl'
     # 写进度
     if not title:
         data = {'title': None, 'progress': 0,'total': 0, 'used': 0, 'speed': 0}
@@ -981,7 +981,7 @@ def writeSpeed(title, used, total, speed=0):
 
 def getSpeed():
     path = getPanelDir()
-    speed_file= path + '/data/panelSpeed.pl'
+    speed_file= path + '/data/panel_speed.pl'
     # 取进度
     path = getPanelDir()
     data = readFile(speed_file)

From 1f6e6957ea18c2f010d32ac7af3949b7edcf8e0c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 02:15:32 +0800
Subject: [PATCH 552/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index f9ed2bfe8..2b3f1fe25 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -37,6 +37,8 @@ def init_cmd():
     # initd
     if os.path.exists('/etc/rc.d/init.d'):
         initd_bin = '/etc/rc.d/init.d/mw'
+        if not os.access(initd_bin, os.W_OK):
+            return False
         shutil.copyfile(script_bin, initd_bin)
         mw.execShell('chmod +x ' + initd_bin)
         # 加入自启动

From cc165c4cde69a4435ffe47fd30e700acc37cf4c9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 03:23:13 +0800
Subject: [PATCH 553/965] update

---
 plugins/data_query/sql_mysql.py     | 43 +++++++++++++++++++++++++++++
 plugins/data_query/static/js/app.js | 32 +++++++++++++++++++++
 2 files changed, 75 insertions(+)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index 36f97d159..0f945860f 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -564,6 +564,44 @@ class nosqlMySQLCtr():
                 return mw.returnData(True, 'ok', '无锁表')
             return mw.returnData(True, 'ok', deadlock_info.group(0))
         return mw.returnData(True, 'ok', '无锁表')
+
+    def getSlaveStatus(self, args):
+        sid = args['sid']
+        my_instance = self.getInstanceBySid(sid).conn()
+        if my_instance is False:
+            return mw.returnData(False,'无法链接')
+
+        slave_info = my_instance.find('SHOW SLAVE STATUS')
+
+        if len(slave_info) == 0:
+            return mw.returnData(True, 'ok', '未开启从库!')
+
+        msg = ''
+        if slave_info['Auto_Position'] != 1:
+            msg += '你没有开启基于GTID全局事务ID复制，请确保CHANGE MASTER TO MASTER_AUTO_POSITION = 1.\n'
+
+
+        if slave_info['Slave_IO_Running'] == 'Yes' and slave_info['Slave_SQL_Running'] == 'Yes':
+            if slave_info['Seconds_Behind_Master'] == 0:
+                msg = "同步正常，无延迟"
+                return mw.returnData(True, 'ok', msg)
+            else:
+                return mw.returnData(True, 'ok', '同步正常，但有延迟，延迟时间为：%s' % slave_info['Seconds_Behind_Master'])
+        else:
+            msg = '[bold red]主从复制报错，请检查. Slave_IO_Running状态值是：%s\
+                    |  Slave_SQL_Running状态值是：%s  \n  \tLast_Error错误信息是：%s\
+                    \n\n  \tLast_SQL_Error错误信息是：%s [/bold red]' \
+                    % (r_dict['Slave_IO_Running'], r_dict['Slave_SQL_Running'], \
+                         r_dict['Last_Error'], r_dict['Last_SQL_Error'])
+            error_dict = my_instance.find('select LAST_ERROR_NUMBER,LAST_ERROR_MESSAGE,LAST_ERROR_TIMESTAMP '
+                                        'from performance_schema.replication_applier_status_by_worker '
+                                        'ORDER BY LAST_ERROR_TIMESTAMP desc limit 1')
+            msg += '错误号是：%s' % error_dict['LAST_ERROR_NUMBER']
+            msg +='错误信息是：%s' % error_dict['LAST_ERROR_MESSAGE']
+            msg +='报错时间是：%s\n' % error_dict['LAST_ERROR_TIMESTAMP']
+            msg += 'MySQL Replication Health is NOT OK!'
+            return mw.returnData(True, 'ok', msg)
+
 # ---------------------------------- run ----------------------------------
 # 获取 mysql 列表
 def get_db_list(args):
@@ -636,6 +674,11 @@ def get_deadlock_info(args):
     t = nosqlMySQLCtr()
     return t.getDeadlockInfo(args)
 
+# 查看主从复制信息
+def get_slave_status(args):
+    t = nosqlMySQLCtr()
+    return t.getSlaveStatus(args)
+
 
 # 测试
 def test(args):
diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index 27e4ed041..b630235ee 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -726,6 +726,33 @@ function mysqlCommonFuncDeadlockInfo(){
     });
 }
 
+function mysqlCommonFuncSlaveStatus(){
+
+    function renderSQL(){
+        var sid = mysqlGetSid();
+        myPostCBN('get_slave_status',{'sid':sid} ,function(rdata){
+            var data = rdata.data;
+            $('#info_log').html(data.data);
+            var ob = document.getElementById('info_log');
+            ob.scrollTop = ob.scrollHeight; 
+        });
+    }
+
+    layer.open({
+        type: 1,
+        title: "查看主从复制信息",
+        area: ['800px', '400px'],
+        closeBtn: 1,
+        shadeClose: false,
+        content: '<div class="bt-form pd15">\
+            <textarea readonly="" style="margin: 0px;height: 330px;width: 100%;background-color: #333;color:#fff; padding:0 5px" id="info_log"></textarea>\
+        </div>',
+        success:function(i,l){
+            renderSQL();
+        }
+    });
+}
+
 function mysqlCommonFunc(){
     $('#mysql_common').unbind('click').click(function(){
         layer.open({
@@ -743,6 +770,7 @@ function mysqlCommonFunc(){
                 <button style="margin-bottom: 8px;" id="mysql_fpk_info" type="button" class="btn btn-default btn-sm">快速找出没有主键的表</button>\
                 <button style="margin-bottom: 8px;" id="mysql_lock_sql" type="button" class="btn btn-default btn-sm">查看当前锁阻塞的SQL</button>\
                 <button style="margin-bottom: 8px;" id="mysql_deadlock_info" type="button" class="btn btn-default btn-sm">查看死锁信息</button>\
+                <button style="margin-bottom: 8px;" id="mysql_slave_status" type="button" class="btn btn-default btn-sm">查看主从复制信息</button>\
             </div>',
             success:function(i,l){
                 $('#mysql_top_nsql').click(function(){
@@ -776,6 +804,10 @@ function mysqlCommonFunc(){
                 $('#mysql_deadlock_info').click(function(){
                     mysqlCommonFuncDeadlockInfo();
                 });
+
+                $('#mysql_slave_status').click(function(){
+                    mysqlCommonFuncSlaveStatus();
+                });
             }
         });
     });

From d33ce43ad33d79e7be995d67354be1307535163d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 03:26:57 +0800
Subject: [PATCH 554/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index 0f945860f..e84622398 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -572,7 +572,6 @@ class nosqlMySQLCtr():
             return mw.returnData(False,'无法链接')
 
         slave_info = my_instance.find('SHOW SLAVE STATUS')
-
         if len(slave_info) == 0:
             return mw.returnData(True, 'ok', '未开启从库!')
 

From a8019d1ec487483ee66d1900f37941bbb25c7acb Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 03:38:09 +0800
Subject: [PATCH 555/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index e84622398..d96ce5f75 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -587,17 +587,14 @@ class nosqlMySQLCtr():
             else:
                 return mw.returnData(True, 'ok', '同步正常，但有延迟，延迟时间为：%s' % slave_info['Seconds_Behind_Master'])
         else:
-            msg = '[bold red]主从复制报错，请检查. Slave_IO_Running状态值是：%s\
-                    |  Slave_SQL_Running状态值是：%s  \n  \tLast_Error错误信息是：%s\
-                    \n\n  \tLast_SQL_Error错误信息是：%s [/bold red]' \
-                    % (r_dict['Slave_IO_Running'], r_dict['Slave_SQL_Running'], \
-                         r_dict['Last_Error'], r_dict['Last_SQL_Error'])
+            msg = '主从复制报错，请检查\nSlave_IO_Running状态值是：%s, |  Slave_SQL_Running状态值是：%s\nLast_Error错误信息是：%s\nLast_SQL_Error错误信息是：%s\n' \
+            % (slave_info['Slave_IO_Running'], slave_info['Slave_SQL_Running'], slave_info['Last_Error'], slave_info['Last_SQL_Error'])
             error_dict = my_instance.find('select LAST_ERROR_NUMBER,LAST_ERROR_MESSAGE,LAST_ERROR_TIMESTAMP '
                                         'from performance_schema.replication_applier_status_by_worker '
                                         'ORDER BY LAST_ERROR_TIMESTAMP desc limit 1')
-            msg += '错误号是：%s' % error_dict['LAST_ERROR_NUMBER']
-            msg +='错误信息是：%s' % error_dict['LAST_ERROR_MESSAGE']
-            msg +='报错时间是：%s\n' % error_dict['LAST_ERROR_TIMESTAMP']
+            msg += '错误号是：%s \n' % error_dict['LAST_ERROR_NUMBER']
+            msg += '错误信息是：%s \n' % error_dict['LAST_ERROR_MESSAGE']
+            msg += '报错时间是：%s \n' % error_dict['LAST_ERROR_TIMESTAMP']
             msg += 'MySQL Replication Health is NOT OK!'
             return mw.returnData(True, 'ok', msg)
 

From bdd0634f61aa8ddd8dc997c0591f824ad6d17f02 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 04:17:28 +0800
Subject: [PATCH 556/965] update

---
 plugins/data_query/sql_mysql.py     | 45 +++++++++++++++++++---
 plugins/data_query/static/js/app.js | 59 ++++++++++++++++++++++++++---
 2 files changed, 94 insertions(+), 10 deletions(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index d96ce5f75..e1d4007be 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -546,10 +546,33 @@ class nosqlMySQLCtr():
                 a.trx_started
             """
         )
-
-        print(data)
         return mw.returnData(True, 'ok', data)
 
+    def killLockPid(self, args):
+        sid = args['sid']
+        my_instance = self.getInstanceBySid(sid).conn()
+        if my_instance is False:
+            return mw.returnData(False,'无法链接')
+
+        pid = args['pid']
+        my_instance.execute('kill %s' % pid)
+        return mw.returnData(True, '执行成功!')
+
+    def killAllLock(self, args):
+        sid = args['sid']
+        my_instance = self.getInstanceBySid(sid).conn()
+        if my_instance is False:
+            return mw.returnData(False,'无法链接')
+
+        data = self.getLockSql(args)
+        if data['status']:
+            pid_data = data['data']
+            for x in pid_data:
+                my_instance.execute('kill %s' % x['processlist_id'])
+        return mw.returnData(True, '执行成功!')
+
+    
+
     def getDeadlockInfo(self, args):
         sid = args['sid']
         my_instance = self.getInstanceBySid(sid).conn()
@@ -589,9 +612,7 @@ class nosqlMySQLCtr():
         else:
             msg = '主从复制报错，请检查\nSlave_IO_Running状态值是：%s, |  Slave_SQL_Running状态值是：%s\nLast_Error错误信息是：%s\nLast_SQL_Error错误信息是：%s\n' \
             % (slave_info['Slave_IO_Running'], slave_info['Slave_SQL_Running'], slave_info['Last_Error'], slave_info['Last_SQL_Error'])
-            error_dict = my_instance.find('select LAST_ERROR_NUMBER,LAST_ERROR_MESSAGE,LAST_ERROR_TIMESTAMP '
-                                        'from performance_schema.replication_applier_status_by_worker '
-                                        'ORDER BY LAST_ERROR_TIMESTAMP desc limit 1')
+            error_dict = my_instance.find('select LAST_ERROR_NUMBER,LAST_ERROR_MESSAGE,LAST_ERROR_TIMESTAMP from performance_schema.replication_applier_status_by_worker ORDER BY LAST_ERROR_TIMESTAMP desc limit 1')
             msg += '错误号是：%s \n' % error_dict['LAST_ERROR_NUMBER']
             msg += '错误信息是：%s \n' % error_dict['LAST_ERROR_MESSAGE']
             msg += '报错时间是：%s \n' % error_dict['LAST_ERROR_TIMESTAMP']
@@ -665,6 +686,16 @@ def get_lock_sql(args):
     t = nosqlMySQLCtr()
     return t.getLockSql(args)
 
+# KILL阻塞SQL
+def kill_lock_pid(args):
+    t = nosqlMySQLCtr()
+    return t.killLockPid(args)
+
+# KILL阻塞SQL
+def kill_all_lock(args):
+    t = nosqlMySQLCtr()
+    return t.killAllLock(args)
+
 # 查看死锁信息
 def get_deadlock_info(args):
     t = nosqlMySQLCtr()
@@ -676,6 +707,10 @@ def get_slave_status(args):
     return t.getSlaveStatus(args)
 
 
+
+
+
+
 # 测试
 def test(args):
     sid = args['sid']
diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index b630235ee..d46aa31c0 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -666,12 +666,35 @@ function mysqlCommonFuncLockSQL(){
                 var tbody = '';
                 for (var i = 0; i < items.length; i++) {
                     var t = '<tr>';
-                    t += '<td>'+items[i]['table_schema']+'</td>';
-                    t += '<td>'+items[i]['table_name']+'</td>';
+                    t += '<td>'+items[i]['trx_id']+'</td>';
+                    t += '<td>'+items[i]['trx_state']+'</td>';
+                    t += '<td>'+items[i]['trx_started']+'</td>';
+                    t += '<td>'+items[i]['processlist_id']+'</td>';
+                    t += '<td>'+items[i]['info']+'</td>';
+                    t += '<td>'+items[i]['user']+'</td>';
+                    t += '<td>'+items[i]['host']+'</td>';
+                    t += '<td>'+items[i]['db']+'</td>';
+                    t += '<td>'+items[i]['command']+'</td>';
+                    t += '<td>'+items[i]['state']+'</td>';
+                    t += '<td>'+items[i]['sql_kill_blocking_query']+'</td>';
+                    t += '<td><a class="exec btlink" index="'+i+'">执行</a></td>';
                     t += '</tr>';
                     tbody += t;
                 }
                 $('#mysql_data_id tbody').html(tbody);
+
+                $('#mysql_data_id tbody .exec').click(function(){
+                    var index = $(this).attr('index');
+                    var pid = items[index]['processlist_id'];
+                    myPostCB('kill_lock_pid', {'sid':sid, 'pid':pid}, function(rdata){
+                        var data = rdata.data;
+                        showMsg(data.msg,function(){
+                            if (data.status){
+                                renderSQL();
+                            }
+                        },{icon: data.status ? 1 : 2}, 2000);
+                    });
+                });
             } else {
                 layer.msg(data.msg,{icon:2});
             }
@@ -681,20 +704,46 @@ function mysqlCommonFuncLockSQL(){
     layer.open({
         type: 1,
         title: "查看当前锁阻塞的SQL",
-        area: ['800px', '400px'],
+        area: ['1000px', '400px'],
         closeBtn: 1,
         shadeClose: false,
         content: '<div class="bt-form pd20 divtable taskdivtable">\
+            <div class="mr20 pull-left" style="border-right: 1px solid #ccc; padding-right: 20px;">\
+                <button id="kill_all" type="button" class="btn btn-default btn-sm">关闭所有阻塞</button>\
+            </div>\
+            <hr />\
             <table class="table table-hover" id="mysql_data_id">\
                 <thead>\
-                    <th style="width:100px;">库名</th>\
-                    <th style="width:50px;">表名</th>\
+                    <th style="width:80px;">事务ID</th>\
+                    <th style="width:80px;">事务状态</th>\
+                    <th style="width:220px;">执行时间</th>\
+                    <th style="width:100px;">线程ID</th>\
+                    <th style="width:50px;">Info</th>\
+                    <th style="width:50px;">user</th>\
+                    <th style="width:50px;">host</th>\
+                    <th style="width:50px;">db</th>\
+                    <th style="width:50px;">command</th>\
+                    <th style="width:50px;">state</th>\
+                    <th style="width:140px;">kill</th>\
+                    <th style="width:50px;">操作</th>\
                 </thead>\
                 <tbody></tbody>\
             </table>\
         </div>',
         success:function(i,l){
             renderSQL();
+
+            $('#kill_all').unbind('click').click(function(){
+                var sid = mysqlGetSid();
+                myPostCB('kill_all_lock', {'sid':sid}, function(rdata){
+                    var data = rdata.data;
+                    showMsg(data.msg,function(){
+                        if (data.status){
+                            renderSQL();
+                        }
+                    },{icon: data.status ? 1 : 2}, 2000);
+                });
+            });
         }
     });
 }

From 6e197f81ef59bda380b50664fb167c3b452ecfdf Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 04:18:14 +0800
Subject: [PATCH 557/965] Update app.js

---
 plugins/data_query/static/js/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index d46aa31c0..c97e80d53 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -807,7 +807,7 @@ function mysqlCommonFunc(){
         layer.open({
             type: 1,
             title: "MySQL常用功能",
-            area: ['600px', '400px'],
+            area: ['600px', '200px'],
             closeBtn: 1,
             shadeClose: false,
             content: '<div class="bt-form pd20">\

From 37448dc827105f7380d2aadbf2b1cc2cfa80526d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 04:19:00 +0800
Subject: [PATCH 558/965] update

---
 class/core/cert_api.py      | 1621 -------------------
 class/core/cert_request.py  | 1472 ------------------
 class/core/common.py        |  146 --
 class/core/config_api.py    | 1191 --------------
 class/core/crontab_api.py   |  692 ---------
 class/core/db.py            |  401 -----
 class/core/files_api.py     | 1160 --------------
 class/core/firewall_api.py  |  513 ------
 class/core/logs_api.py      |  355 -----
 class/core/mw.py            | 2286 ---------------------------
 class/core/page.py          |  245 ---
 class/core/plugins_api.py   | 1105 -------------
 class/core/site_api.py      | 2909 -----------------------------------
 class/core/ssh_local.py     |  120 --
 class/core/ssh_terminal.py  |  467 ------
 class/core/system_api.py    |  978 ------------
 class/core/task_api.py      |  103 --
 class/core/vilidate.py      |  143 --
 class/core/vip_api.py       |   48 -
 class/fonts/2.ttf           |  Bin 28328 -> 0 bytes
 class/os/README.md          |    0
 class/os/win32/README.md    |    0
 class/plugin/README.md      |    5 -
 class/plugin/fcgi_client.py |  408 -----
 class/plugin/fpm.py         |  208 ---
 class/plugin/memail.py      |   43 -
 class/plugin/orm.py         |  140 --
 class/plugin/ormDb.py       |  115 --
 28 files changed, 16874 deletions(-)
 delete mode 100644 class/core/cert_api.py
 delete mode 100644 class/core/cert_request.py
 delete mode 100755 class/core/common.py
 delete mode 100755 class/core/config_api.py
 delete mode 100755 class/core/crontab_api.py
 delete mode 100755 class/core/db.py
 delete mode 100755 class/core/files_api.py
 delete mode 100755 class/core/firewall_api.py
 delete mode 100644 class/core/logs_api.py
 delete mode 100755 class/core/mw.py
 delete mode 100755 class/core/page.py
 delete mode 100755 class/core/plugins_api.py
 delete mode 100755 class/core/site_api.py
 delete mode 100644 class/core/ssh_local.py
 delete mode 100644 class/core/ssh_terminal.py
 delete mode 100755 class/core/system_api.py
 delete mode 100755 class/core/task_api.py
 delete mode 100755 class/core/vilidate.py
 delete mode 100644 class/core/vip_api.py
 delete mode 100755 class/fonts/2.ttf
 delete mode 100644 class/os/README.md
 delete mode 100644 class/os/win32/README.md
 delete mode 100644 class/plugin/README.md
 delete mode 100644 class/plugin/fcgi_client.py
 delete mode 100644 class/plugin/fpm.py
 delete mode 100644 class/plugin/memail.py
 delete mode 100755 class/plugin/orm.py
 delete mode 100755 class/plugin/ormDb.py

diff --git a/class/core/cert_api.py b/class/core/cert_api.py
deleted file mode 100644
index 8fbc15967..000000000
--- a/class/core/cert_api.py
+++ /dev/null
@@ -1,1621 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 证书申请
-# ---------------------------------------------------------------------------------
-
-import re
-import fcntl
-import datetime
-import binascii
-import hashlib
-import base64
-import json
-import time
-import os
-import sys
-import argparse
-
-if os.path.exists('/www/server/mdserver-web'):
-    os.chdir('/www/server/mdserver-web')
-
-import mw
-
-try:
-    import OpenSSL
-except:
-    mw.execShell("pip install pyopenssl")
-    import OpenSSL
-
-
-def echoErr(msg):
-    writeLog("\033[31m=" * 65)
-    writeLog("|-错误：{}\033[0m".format(msg))
-    exit()
-
-
-def writeLog(log_str, mode="ab+"):
-    # 写日志
-    if __name__ == "__main__":
-        print(log_str)
-        return
-    _log_file = 'logs/letsencrypt.log'
-    f = open(_log_file, mode)
-    log_str += "\n"
-    f.write(log_str.encode('utf-8'))
-    f.close()
-    return True
-
-
-class cert_api:
-    __debug = False
-    __user_agent = "MW-Panel"
-    __apis = None
-    __url = None
-    __replay_nonce = None
-    __acme_timeout = 30
-    __max_check_num = 5
-    __wait_time = 5
-    __bits = 2048
-    __digest = "sha256"
-    __verify = False
-    __config = {}
-    __dns_class = None
-    __auto_wildcard = False
-    __mod_index = {True: "Staging", False: "Production"}
-    __save_path = 'data/letsencrypt'
-    __cfg_file = 'data/letsencrypt.json'
-
-    def __init__(self):
-        self.__user_agent = 'MW-Panel:' + mw.getRandomString(8)
-        self.__save_path = mw.getServerDir() + '/web_conf/letsencrypt'
-        if not os.path.exists(self.__save_path):
-            os.makedirs(self.__save_path)
-        if self.__debug:
-            self.__url = 'https://acme-staging-v02.api.letsencrypt.org/directory'
-        else:
-            self.__url = 'https://acme-v02.api.letsencrypt.org/directory'
-        self.__config = self.readConfig()
-
-    def D(self, name, val):
-        if self.__debug:
-            print('---------{} start--------'.format(name))
-            print(val)
-            print('---------{} end--------'.format(name))
-
-    # 读配置文件
-    def readConfig(self):
-        if not os.path.exists(self.__cfg_file):
-            self.__config['orders'] = {}
-            self.__config['account'] = {}
-            self.__config['apis'] = {}
-            self.__config['email'] = mw.M('users').where(
-                'id=?', (1,)).getField('email')
-            if self.__config['email'] in ['midoks@163.com']:
-                self.__config['email'] = None
-            self.saveConfig()
-            return self.__config
-        tmp_config = mw.readFile(self.__cfg_file)
-        if not tmp_config:
-            return self.__config
-        try:
-            self.__config = json.loads(tmp_config)
-        except:
-            self.saveConfig()
-            return self.__config
-        return self.__config
-
-    def saveConfig(self):
-        # 写配置文件
-        fp = open(self.__cfg_file, 'w+')
-        fcntl.flock(fp, fcntl.LOCK_EX)  # 加锁
-        fp.write(json.dumps(self.__config))
-        fcntl.flock(fp, fcntl.LOCK_UN)  # 解锁
-        fp.close()
-        return True
-
-    def createCertCron(self):
-
-        if mw.isAppleSystem():
-            print('在Macos上不支持创建证书自动续签任务!')
-            return ''
-
-        # 创建证书自动续签任务
-        try:
-            import crontab_api
-            api = crontab_api.crontab_api()
-
-            echo = mw.md5(mw.md5('panel_renew_lets_cron'))
-            cron_id = mw.M('crontab').where('echo=?', (echo,)).getField('id')
-
-            cron_path = mw.getServerDir() + '/cron'
-            if not os.path.exists(cron_path):
-                mw.execShell('mkdir -p ' + cron_path)
-
-            shell = 'python3 -u {}/class/core/cert_api.py --renew=1'.format(
-                mw.getRunDir())
-
-            logs_file = cron_path + '/' + echo + '.log'
-
-            cmd = '''#!/bin/bash
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
-export PATH
-
-dst_dir=%s
-logs_file=%s
-cd $dst_dir
-
-if [ -f bin/activate ];then
-    source bin/activate
-fi
-
-''' % (mw.getRunDir(), logs_file)
-            cmd += 'echo "★【`date +"%Y-%m-%d %H:%M:%S"`】 STSRT★" >> $logs_file' + "\n"
-            cmd += 'echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> $logs_file' + "\n"
-            cmd += 'cd $dst_dir && ' + shell + ' >> $logs_file 2>&1' + "\n"
-            cmd += 'echo "【`date +"%Y-%m-%d %H:%M:%S"`】 END★" >> $logs_file' + "\n"
-            cmd += 'echo "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" >> $logs_file' + "\n"
-
-            file = cron_path + '/' + echo
-
-            if type(cron_id) != int:
-
-                mw.writeFile(file, cmd)
-                mw.execShell('chmod 750 ' + file)
-
-                info = {}
-                info['type'] = 'day'
-                info['minute'] = '10'
-                info['hour'] = '0'
-                shell_cron, rinfo, name = api.getCrondCycle(info)
-                shell_cron += ' ' + cron_path + '/' + echo + \
-                    ' >> ' + logs_file + ' 2>&1'
-
-                api.writeShell(shell_cron)
-
-                insert_id = mw.M('crontab').add('name,type,where1,where_hour,where_minute,echo,addtime,status,save,backup_to,stype,sname,sbody,urladdress', (
-                    "[勿删]续签Let's Encrypt证书", 'day', '', '0', '10', echo, time.strftime('%Y-%m-%d %X', time.localtime()), '1', '', 'localhost', 'toShell', '', cmd, ''))
-
-                if insert_id > 0:
-                    print('创建证书自动续签任务成功!')
-            else:
-                mw.writeFile(file, cmd)
-                mw.execShell('chmod 750 ' + file)
-                mw.M('crontab').where('id=?', (cron_id)).save('sbody', (cmd,))
-        except Exception as e:
-            print(mw.getTracebackInfo())
-
-    def getApis(self):
-        if not self.__apis:
-            # 尝试从配置文件中获取
-            api_index = self.__mod_index[self.__debug]
-            if not 'apis' in self.__config:
-                self.__config['apis'] = {}
-
-            if api_index in self.__config['apis']:
-                if 'expires' in self.__config['apis'][api_index] and 'directory' in self.__config['apis'][api_index]:
-                    if time.time() < self.__config['apis'][api_index]['expires']:
-                        self.__apis = self.__config[
-                            'apis'][api_index]['directory']
-                        return self.__apis
-
-            # 尝试从官方获取获取
-            try:
-                res = mw.httpGet(self.__url)
-                result = json.loads(res)
-                self.__apis = {}
-                self.__apis['newAccount'] = result['newAccount']
-                self.__apis['newNonce'] = result['newNonce']
-                self.__apis['newOrder'] = result['newOrder']
-                self.__apis['revokeCert'] = result['revokeCert']
-                self.__apis['keyChange'] = result['keyChange']
-
-                # 保存到配置文件
-                self.__config['apis'][api_index] = {}
-                self.__config['apis'][api_index]['directory'] = self.__apis
-                self.__config['apis'][api_index]['expires'] = time.time() + \
-                    86400  # 24小时后过期
-                self.saveConfig()
-            except Exception as e:
-                raise Exception('服务因维护而关闭或发生内部错误，查看 <a href="https://letsencrypt.status.io/" target="_blank" class="btlink">https://letsencrypt.status.io/</a> 了解更多详细信息。')
-        return self.__apis
-
-    # 系列化payload
-    def stringfyItems(self, payload):
-        if isinstance(payload, str):
-            return payload
-
-        for k, v in payload.items():
-            if isinstance(k, bytes):
-                k = k.decode("utf-8")
-            if isinstance(v, bytes):
-                v = v.decode("utf-8")
-            payload[k] = v
-        return payload
-
-    # 构造域名列表
-    def formatDomains(self, domains):
-        if type(domains) != list:
-            return []
-        # 是否自动构造通配符
-        if self.__auto_wildcard:
-            domains = self.autoWildcard(domains)
-        wildcard = []
-        tmp_domains = []
-        for domain in domains:
-            domain = domain.strip()
-            if domain in tmp_domains:
-                continue
-            # 将通配符域名转为验证正则表达式
-            f_index = domain.find("*.")
-            if f_index not in [-1, 0]:
-                continue
-            if f_index == 0:
-                wildcard.append(domain.replace(
-                    "*", r"^[\w-]+").replace(".", r"\."))
-            # 添加到申请列表
-            tmp_domains.append(domain)
-
-        # 处理通配符包含
-        apply_domains = tmp_domains[:]
-        for domain in tmp_domains:
-            for w in wildcard:
-                if re.match(w, domain):
-                    apply_domains.pop(domain)
-
-        return apply_domains
-
-    # 转为无填充的Base64
-    def calculateSafeBase64(self, un_encoded_data):
-        if sys.version_info[0] == 3:
-            if isinstance(un_encoded_data, str):
-                un_encoded_data = un_encoded_data.encode("utf8")
-        r = base64.urlsafe_b64encode(un_encoded_data).rstrip(b"=")
-        return r.decode("utf8")
-
-    # 创建Key
-    def createKey(self, key_type=OpenSSL.crypto.TYPE_RSA):
-        key = OpenSSL.crypto.PKey()
-        key.generate_key(key_type, self.__bits)
-        private_key = OpenSSL.crypto.dump_privatekey(
-            OpenSSL.crypto.FILETYPE_PEM, key)
-        return private_key
-
-       # 获用户取密钥对
-    def getAccountKey(self):
-        if not 'account' in self.__config:
-            self.__config['account'] = {}
-        k = self.__mod_index[self.__debug]
-        if not k in self.__config['account']:
-            self.__config['account'][k] = {}
-
-        if not 'key' in self.__config['account'][k]:
-            self.__config['account'][k]['key'] = self.createKey()
-            if type(self.__config['account'][k]['key']) == bytes:
-                self.__config['account'][k]['key'] = self.__config[
-                    'account'][k]['key'].decode()
-            self.saveConfig()
-        return self.__config['account'][k]['key']
-
-    # 注册acme帐户
-    def register(self, existing=False):
-        if not 'email' in self.__config:
-            self.__config['email'] = 'mdioks@163.com'
-        if existing:
-            payload = {"onlyReturnExisting": True}
-        elif self.__config['email']:
-            payload = {
-                "termsOfServiceAgreed": True,
-                "contact": ["mailto:{0}".format(self.__config['email'])],
-            }
-        else:
-            payload = {"termsOfServiceAgreed": True}
-
-        res = self.acmeRequest(url=self.__apis['newAccount'], payload=payload)
-
-        if res.status not in [201, 200, 409]:
-            raise Exception("注册ACME帐户失败: {}".format(res.json()))
-        kid = res.headers["Location"]
-        return kid
-
-    # 获取kid
-    def getKid(self, force=False):
-        # 如果配置文件中不存在kid或force = True时则重新注册新的acme帐户
-        if not 'account' in self.__config:
-            self.__config['account'] = {}
-        k = self.__mod_index[self.__debug]
-        if not k in self.__config['account']:
-            self.__config['account'][k] = {}
-
-        if not 'kid' in self.__config['account'][k]:
-            self.__config['account'][k]['kid'] = self.register()
-            self.saveConfig()
-            time.sleep(3)
-            self.__config = self.readConfig()
-        return self.__config['account'][k]['kid']
-
-    def requestsGet(self, url, timeout):
-        try:
-            import urllib.request
-            import ssl
-            try:
-                ssl._create_default_https_context = ssl._create_unverified_context
-            except:
-                pass
-
-            headers = {"User-Agent": self.__user_agent}
-            req = urllib.request.Request(url=url, headers=headers)
-            req = urllib.request.urlopen(url, timeout=timeout)
-            return req
-        except Exception as ex:
-            raise Exception("requestsGet: {}".format(str(ex)))
-
-    def requestsPost(self, url, data, timeout):
-        try:
-            import urllib.request
-            import ssl
-            try:
-                ssl._create_default_https_context = ssl._create_unverified_context
-            except:
-                pass
-
-            headers = {"User-Agent": self.__user_agent}
-            headers.update({"Content-Type": "application/jose+json"})
-            data = bytes(data, encoding="utf8")
-            req = urllib.request.Request(
-                url, data, headers=headers, method='POST')
-            response = urllib.request.urlopen(req, timeout=timeout)
-            return response
-        except Exception as ex:
-            # self.getError()
-            raise Exception("异常: {}".format(self.getError(str(ex))))
-
-    def getRequestJson(self, response):
-        try:
-            data = response.read().decode('utf-8')
-            return json.loads(data)
-        except Exception as ex:
-            raise Exception("getRequestJson: {}".format(str(ex)))
-
-    def getNonce(self, force=False):
-        # 获取随机数
-        # 如果没有保存上一次的随机数或force=True时则重新获取新的随机数
-        if not self.__replay_nonce or force:
-            try:
-                response = self.requestsGet(
-                    self.__apis['newNonce'], timeout=self.__acme_timeout)
-                self.__replay_nonce = response.headers["replay-nonce"]
-            except Exception as e:
-                raise Exception("获取随机数失败: {}".format(str(e)))
-
-        return self.__replay_nonce
-
-    # 获请ACME请求头
-    def getAcmeHeader(self, url):
-        nonce = self.getNonce()
-
-        header = {"alg": "RS256", "nonce": nonce, "url": url}
-        if url in [self.__apis['newAccount'], 'GET_THUMBPRINT']:
-            from cryptography.hazmat.backends import default_backend
-            from cryptography.hazmat.primitives import serialization
-            private_key = serialization.load_pem_private_key(
-                self.getAccountKey().encode(),
-                password=None,
-                backend=default_backend(),
-            )
-            public_key_public_numbers = private_key.public_key().public_numbers()
-
-            exponent = "{0:x}".format(public_key_public_numbers.e)
-            exponent = "0{0}".format(exponent) if len(
-                exponent) % 2 else exponent
-            modulus = "{0:x}".format(public_key_public_numbers.n)
-            jwk = {
-                "kty": "RSA",
-                "e": self.calculateSafeBase64(binascii.unhexlify(exponent)),
-                "n": self.calculateSafeBase64(binascii.unhexlify(modulus)),
-            }
-            header["jwk"] = jwk
-        else:
-            header["kid"] = self.getKid()
-        return header
-
-    # 计算signature
-    def signMessage(self, message):
-        pk = OpenSSL.crypto.load_privatekey(
-            OpenSSL.crypto.FILETYPE_PEM, self.getAccountKey().encode())
-        return OpenSSL.crypto.sign(pk, message.encode("utf8"), self.__digest)
-
-    def getSiteRunPathByid(self, site_id):
-        if mw.M('sites').where('id=?', (site_id,)).count() >= 1:
-            site_path = mw.M('sites').where('id=?', site_id).getField('path')
-            if not site_path:
-                return None
-            if not os.path.exists(site_path):
-                return None
-            return site_path
-        else:
-            return False
-
-    def getSiteRunPath(self, domains):
-        site_id = 0
-        for domain in domains:
-            site_id = mw.M('domain').where("name=?", domain).getField('pid')
-            if site_id:
-                break
-
-        if not site_id:
-            return None
-        return self.getSiteRunPathByid(site_id)
-
-    # 清理验证文件
-    def clearAuthFile(self, index):
-        if not self.__config['orders'][index]['auth_type'] in ['http', 'tls']:
-            return True
-        acme_path = '{}/.well-known/acme-challenge'.format(
-            self.__config['orders'][index]['auth_to'])
-        writeLog("|-验证目录：{}".format(acme_path))
-        if os.path.exists(acme_path):
-            mw.execShell("rm -f {}/*".format(acme_path))
-
-        acme_path = mw.getServerDir() + '/stop/.well-known/acme-challenge'
-        if os.path.exists(acme_path):
-            mw.execShell("rm -f {}/*".format(acme_path))
-
-    # 获取域名验证方式
-    def getAuthType(self, index):
-        if not index in self.__config['orders']:
-            raise Exception('指定订单不存在!')
-        s_type = 'http-01'
-        if 'auth_type' in self.__config['orders'][index]:
-            if self.__config['orders'][index]['auth_type'] == 'dns':
-                s_type = 'dns-01'
-            elif self.__config['orders'][index]['auth_type'] == 'tls':
-                s_type = 'tls-alpn-01'
-            else:
-                s_type = 'http-01'
-        return s_type
-
-    # 构造验证信息
-    def getIdentifierAuth(self, index, url, auth_info):
-        s_type = self.getAuthType(index)
-        writeLog("|-验证类型：{}".format(s_type))
-        domain = auth_info['identifier']['value']
-        wildcard = False
-        # 处理通配符
-        if 'wildcard' in auth_info:
-            wildcard = auth_info['wildcard']
-        if wildcard:
-            domain = "*." + domain
-
-        for auth in auth_info['challenges']:
-            if auth['type'] != s_type:
-                continue
-            identifier_auth = {
-                "domain": domain,
-                "url": url,
-                "wildcard": wildcard,
-                "token": auth['token'],
-                "dns_challenge_url": auth['url'],
-            }
-            return identifier_auth
-        return None
-
-    # 构造域名验证头和验证值
-    def getKeyauthorization(self, token):
-        acme_header_jwk_json = json.dumps(
-            self.getAcmeHeader("GET_THUMBPRINT")["jwk"], sort_keys=True, separators=(",", ":")
-        )
-        acme_thumbprint = self.calculateSafeBase64(
-            hashlib.sha256(acme_header_jwk_json.encode("utf8")).digest()
-        )
-        acme_keyauthorization = "{0}.{1}".format(token, acme_thumbprint)
-        base64_of_acme_keyauthorization = self.calculateSafeBase64(
-            hashlib.sha256(acme_keyauthorization.encode("utf8")).digest()
-        )
-
-        return acme_keyauthorization, base64_of_acme_keyauthorization
-
-    # 写验证文件
-    def writeAuthFile(self, auth_to, token, acme_keyauthorization):
-        try:
-            # self.D('writeAuthFile', auth_to)
-            acme_path = '{}/.well-known/acme-challenge'.format(auth_to)
-            if not os.path.exists(acme_path):
-                os.makedirs(acme_path)
-                mw.setOwn(acme_path, 'www')
-            wellknown_path = '{}/{}'.format(acme_path, token)
-            mw.writeFile(wellknown_path, acme_keyauthorization)
-            mw.setOwn(wellknown_path, 'www')
-
-            acme_path = mw.getServerDir() + '/stop/.well-known/acme-challenge'
-            if not os.path.exists(acme_path):
-                os.makedirs(acme_path)
-                mw.setOwn(acme_path, 'www')
-            wellknown_path = '{}/{}'.format(acme_path, token)
-            mw.writeFile(wellknown_path, acme_keyauthorization)
-            mw.setOwn(wellknown_path, 'www')
-            return True
-        except:
-            err = mw.getTracebackInfo()
-            raise Exception("写入验证文件失败: {}".format(err))
-
-    # 设置验证信息
-    def setAuthInfo(self, identifier_auth):
-
-        # 是否手动验证DNS
-        if identifier_auth['auth_to'] == 'dns':
-            return None
-
-        # 是否文件验证
-        if identifier_auth['type'] in ['http', 'tls']:
-            self.writeAuthFile(identifier_auth['auth_to'], identifier_auth[
-                               'token'], identifier_auth['acme_keyauthorization'])
-
-    # 获取验证信息
-    def getAuths(self, index):
-        if not index in self.__config['orders']:
-            raise Exception('指定订单不存在!')
-
-        # 检查是否已经获取过授权信息
-        if 'auths' in self.__config['orders'][index]:
-            # 检查授权信息是否过期
-            if time.time() < self.__config['orders'][index]['auths'][0]['expires']:
-                return self.__config['orders'][index]['auths']
-        if self.__config['orders'][index]['auth_type'] != 'dns':
-            site_run_path = self.getSiteRunPath(
-                self.__config['orders'][index]['domains'])
-            if site_run_path:
-                self.__config['orders'][index]['auth_to'] = site_run_path
-
-        # 清理旧验证
-        self.clearAuthFile(index)
-
-        auths = []
-        for auth_url in self.__config['orders'][index]['authorizations']:
-            res = self.acmeRequest(auth_url, "")
-            if res.status not in [200, 201]:
-                raise Exception("获取授权失败: {}".format(res.json()))
-
-            s_body = self.getRequestJson(res)
-            if 'status' in s_body:
-                if s_body['status'] in ['invalid']:
-                    raise Exception("无效订单，此订单当前为验证失败状态!")
-                if s_body['status'] in ['valid']:  # 跳过无需验证的域名
-                    continue
-
-            s_body['expires'] = self.utcToTime(s_body['expires'])
-            identifier_auth = self.getIdentifierAuth(index, auth_url, s_body)
-            if not identifier_auth:
-                raise Exception("验证信息构造失败!{}")
-
-            acme_keyauthorization, auth_value = self.getKeyauthorization(identifier_auth[
-                                                                         'token'])
-            identifier_auth['acme_keyauthorization'] = acme_keyauthorization
-            identifier_auth['auth_value'] = auth_value
-            identifier_auth['expires'] = s_body['expires']
-            identifier_auth['auth_to'] = self.__config[
-                'orders'][index]['auth_to']
-            identifier_auth['type'] = self.__config[
-                'orders'][index]['auth_type']
-
-            # print(identifier_auth)
-            # 设置验证信息
-            self.setAuthInfo(identifier_auth)
-            auths.append(identifier_auth)
-        self.__config['orders'][index]['auths'] = auths
-        self.saveConfig()
-        return auths
-
-    # 更新随机数
-    def updateReplayNonce(self, res):
-        replay_nonce = res.headers.get('replay-nonce')
-        if replay_nonce:
-            self.__replay_nonce = replay_nonce
-
-    # 请求到ACME接口
-    def acmeRequest(self, url, payload):
-        headers = {"User-Agent": self.__user_agent}
-        payload = self.stringfyItems(payload)
-
-        if payload == "":
-            payload64 = payload
-        else:
-            payload64 = self.calculateSafeBase64(json.dumps(payload))
-        protected = self.getAcmeHeader(url)
-        protected64 = self.calculateSafeBase64(json.dumps(protected))
-        signature = self.signMessage(
-            message="{0}.{1}".format(protected64, payload64))  # bytes
-        signature64 = self.calculateSafeBase64(signature)  # str
-        data = json.dumps({
-            "protected": protected64,
-            "payload": payload64,
-            "signature": signature64
-        })
-
-        headers.update({"Content-Type": "application/jose+json"})
-        response = self.requestsPost(
-            url, data=data, timeout=self.__acme_timeout)
-        # 更新随机数
-        self.updateReplayNonce(response)
-        return response
-
-    # UTC时间转时间戳
-    def utcToTime(self, utc_string):
-        try:
-            utc_string = utc_string.split('.')[0]
-            utc_date = datetime.datetime.strptime(
-                utc_string, "%Y-%m-%dT%H:%M:%S")
-            # 按北京时间返回
-            return int(time.mktime(utc_date.timetuple())) + (3600 * 8)
-        except:
-            return int(time.time() + 86400 * 7)
-
-    # 保存订单
-    def saveOrder(self, order_object, index):
-        if not 'orders' in self.__config:
-            self.__config['orders'] = {}
-        renew = False
-        if not index:
-            index = mw.md5(json.dumps(order_object['identifiers']))
-        else:
-            renew = True
-            order_object['certificate_url'] = self.__config[
-                'orders'][index]['certificate_url']
-            order_object['save_path'] = self.__config[
-                'orders'][index]['save_path']
-
-        order_object['expires'] = self.utcToTime(order_object['expires'])
-        self.__config['orders'][index] = order_object
-        self.__config['orders'][index]['index'] = index
-        if not renew:
-            self.__config['orders'][index]['create_time'] = int(time.time())
-            self.__config['orders'][index]['renew_time'] = 0
-        self.saveConfig()
-        return index
-
-    def getError(self, error):
-        # 格式化错误输出
-        if error.find("Max checks allowed") >= 0:
-            return "CA无法验证您的域名，请检查域名解析是否正确，或等待5-10分钟后重试."
-        elif error.find("Max retries exceeded with") >= 0 or error.find('status_code=0 ') != -1:
-            return "CA服务器连接超时，请稍候重试."
-        elif error.find("The domain name belongs") >= 0:
-            return "域名不属于此DNS服务商，请确保域名填写正确."
-        elif error.find('login token ID is invalid') >= 0:
-            return 'DNS服务器连接失败，请检查密钥是否正确.'
-        elif error.find('Error getting validation data') != -1:
-            return '数据验证失败，CA无法从验证连接中获到正确的验证码.'
-        elif "too many certificates already issued for exact set of domains" in error:
-            return '签发失败,该域名%s超出了每周的重复签发次数限制!' % re.findall("exact set of domains: (.+):", error)
-        elif "Error creating new account :: too many registrations for this IP" in error:
-            return '签发失败,当前服务器IP已达到每3小时最多创建10个帐户的限制.'
-        elif "DNS problem: NXDOMAIN looking up A for" in error:
-            return '验证失败,没有解析域名,或解析未生效!'
-        elif "Invalid response from" in error:
-            return '验证失败,域名解析错误或验证URL无法被访问!'
-        elif error.find('TLS Web Server Authentication') != -1:
-            return "连接CA服务器失败，请稍候重试."
-        elif error.find('Name does not end in a public suffix') != -1:
-            return "不支持的域名%s，请检查域名是否正确!" % re.findall("Cannot issue for \"(.+)\":", error)
-        elif error.find('No valid IP addresses found for') != -1:
-            return "域名%s没有找到解析记录，请检查域名是否解析生效!" % re.findall("No valid IP addresses found for (.+)", error)
-        elif error.find('No TXT record found at') != -1:
-            return "没有在域名%s中找到有效的TXT解析记录,请检查是否正确解析TXT记录,如果是DNSAPI方式申请的,请10分钟后重试!" % re.findall("No TXT record found at (.+)", error)
-        elif error.find('Incorrect TXT record') != -1:
-            return "在%s上发现错误的TXT记录:%s,请检查TXT解析是否正确,如果是DNSAPI方式申请的,请10分钟后重试!" % (re.findall("found at (.+)", error), re.findall("Incorrect TXT record \"(.+)\"", error))
-        elif error.find('Domain not under you or your user') != -1:
-            return "这个dnspod账户下面不存在这个域名，添加解析失败!"
-        elif error.find('SERVFAIL looking up TXT for') != -1:
-            return "没有在域名%s中找到有效的TXT解析记录,请检查是否正确解析TXT记录,如果是DNSAPI方式申请的,请10分钟后重试!" % re.findall("looking up TXT for (.+)", error)
-        elif error.find('Timeout during connect') != -1:
-            return "连接超时,CA服务器无法访问您的网站!"
-        elif error.find("DNS problem: SERVFAIL looking up CAA for") != -1:
-            return "域名%s当前被要求验证CAA记录，请手动解析CAA记录，或1小时后重新尝试申请!" % re.findall("looking up CAA for (.+)", error)
-        elif error.find("Read timed out.") != -1:
-            return "验证超时,请检查域名是否正确解析，若已正确解析，可能服务器与Let'sEncrypt连接异常，请稍候再重试!"
-        elif error.find('Cannot issue for') != -1:
-            return "无法为{}颁发证书，不能直接用域名后缀申请通配符证书!".format(re.findall(r'for\s+"(.+)"', error))
-        elif error.find('too many failed authorizations recently'):
-            return '该帐户1小时内失败的订单次数超过5次，请等待1小时再重试!'
-        elif error.find("Error creating new order") != -1:
-            return "订单创建失败，请稍候重试!"
-        elif error.find("Too Many Requests") != -1:
-            return "1小时内超过5次验证失败，暂时禁止申请，请稍候重试!"
-        elif error.find('HTTP Error 400: Bad Request') != -1:
-            return "CA服务器拒绝访问，请稍候重试!"
-        elif error.find('Temporary failure in name resolution') != -1:
-            return '服务器DNS故障，无法解析域名，请使用Linux工具箱检查dns配置'
-        elif error.find('Too Many Requests') != -1:
-            return '该域名请求申请次数过多，请3小时后重试'
-        else:
-            return error
-
-    # 创建订单
-    def createOrder(self, domains, auth_type, auth_to, index=None):
-        domains = self.formatDomains(domains)
-        if not domains:
-            raise Exception("至少需要有一个域名")
-        # 构造标识
-        identifiers = []
-        for domain_name in domains:
-            identifiers.append({"type": 'dns', "value": domain_name})
-        payload = {"identifiers": identifiers}
-
-        # 请求创建订单
-        res = self.acmeRequest(self.__apis['newOrder'], payload)
-        if not res.status in [201]:  # 如果创建失败
-            e_body = self.getRequestJson(res)
-            if 'type' in e_body:
-                # 如果随机数失效
-                if e_body['type'].find('error:badNonce') != -1:
-                    self.getNonce(force=True)
-                    res = self.acmeRequest(self.__apis['newOrder'], payload)
-
-                # 如果帐户失效
-                if e_body['detail'].find('KeyID header contained an invalid account URL') != -1:
-                    k = self._mod_index[self.__debug]
-                    del(self.__config['account'][k])
-                    self.getKid()
-                    self.getNonce(force=True)
-                    res = self.acmeRequest(self.__apis['newOrder'], payload)
-            if not res.status in [201]:
-                a_auth = e_body
-
-                ret_title = self.getError(str(a_auth))
-                raise StopIteration("{0} >>>> {1}".format(
-                    ret_title, json.dumps(a_auth)))
-
-        # 返回验证地址和验证
-        s_json = self.getRequestJson(res)
-        s_json['auth_type'] = auth_type
-        s_json['domains'] = domains
-        s_json['auth_to'] = auth_to
-        index = self.saveOrder(s_json, index)
-        return index
-
-    # 检查验证状态
-    def checkAuthStatus(self, url, desired_status=None):
-
-        desired_status = desired_status or ["pending", "valid", "invalid"]
-        number_of_checks = 0
-        rdata = None
-        while True:
-            if desired_status == ['valid', 'invalid']:
-                writeLog("|-第{}次查询验证结果..".format(number_of_checks + 1))
-                time.sleep(self.__wait_time)
-            check_authorization_status_response = self.acmeRequest(url, "")
-            a_auth = rdata = self.getRequestJson(
-                check_authorization_status_response)
-            authorization_status = a_auth["status"]
-            number_of_checks += 1
-            if authorization_status in desired_status:
-                if authorization_status == "invalid":
-                    writeLog("|-验证失败!")
-                    try:
-                        if 'error' in a_auth['challenges'][0]:
-                            ret_title = a_auth['challenges'][
-                                0]['error']['detail']
-                        elif 'error' in a_auth['challenges'][1]:
-                            ret_title = a_auth['challenges'][
-                                1]['error']['detail']
-                        elif 'error' in a_auth['challenges'][2]:
-                            ret_title = a_auth['challenges'][
-                                2]['error']['detail']
-                        else:
-                            ret_title = str(a_auth)
-                        ret_title = self.getError(ret_title)
-                    except:
-                        ret_title = str(a_auth)
-                    raise StopIteration("{0} >>>> {1}".format(
-                        ret_title, json.dumps(a_auth)))
-                break
-
-            if number_of_checks == self.__max_check_num:
-                raise StopIteration(
-                    "错误：已尝试验证{0}次. 最大验证次数为{1}. 验证时间间隔为{2}秒.".format(
-                        number_of_checks,
-                        self.__max_check_num,
-                        self.__wait_time
-                    )
-                )
-        if desired_status == ['valid', 'invalid']:
-            writeLog("|-验证成功!")
-        return rdata
-
-    # 发送验证请求
-    def respondToChallenge(self, auth):
-        payload = {"keyAuthorization": "{0}".format(
-            auth['acme_keyauthorization'])}
-        respond_to_challenge_response = self.acmeRequest(
-            auth['dns_challenge_url'], payload)
-        return respond_to_challenge_response
-
-    # 检查DNS记录
-    def checkDns(self, domain, value, s_type='TXT'):
-        writeLog(
-            "|-尝试本地验证DNS记录,域名: {} , 类型: {} 记录值: {}".format(domain, s_type, value))
-        time.sleep(10)
-        n = 0
-        while n < 20:
-            n += 1
-            try:
-                import dns.resolver
-                ns = dns.resolver.query(domain, s_type)
-                for j in ns.response.answer:
-                    for i in j.items:
-                        txt_value = i.to_text().replace('"', '').strip()
-                        writeLog("|-第 {} 次验证值: {}".format(n, txt_value))
-                        if txt_value == value:
-                            write_log("|-本地验证成功!")
-                            return True
-            except:
-                try:
-                    import dns.resolver
-                except:
-                    return False
-            time.sleep(3)
-        writeLog("|-本地验证失败!")
-        return True
-
-    def authDomain(self, index):
-        if not index in self.__config['orders']:
-            raise Exception('指定订单不存在!')
-
-        # 开始验证
-        for auth in self.__config['orders'][index]['auths']:
-            res = self.checkAuthStatus(auth['url'])  # 检查是否需要验证
-            if res['status'] == 'pending':
-                if auth['type'] == 'dns':  # 尝试提前验证dns解析
-                    self.checkDns(
-                        "_acme-challenge.{}".format(
-                            auth['domain'].replace('*.', '')),
-                        auth['auth_value'],
-                        "TXT"
-                    )
-                self.respondToChallenge(auth)
-
-        # 检查验证结果
-        for i in range(len(self.__config['orders'][index]['auths'])):
-            self.checkAuthStatus(self.__config['orders'][index]['auths'][i]['url'], [
-                'valid', 'invalid'])
-            self.__config['orders'][index]['status'] = 'valid'
-
-    # 构造可选名称
-    def getAltNames(self, index):
-        domain_name = self.__config['orders'][index]['domains'][0]
-        domain_alt_names = []
-        if len(self.__config['orders'][index]['domains']) > 1:
-            domain_alt_names = self.__config['orders'][index]['domains'][1:]
-        return domain_name, domain_alt_names
-
-    # 创建CSR
-    def createCsr(self, index):
-        if 'csr' in self.__config['orders'][index]:
-            return self.__config['orders']['csr']
-        domain_name, domain_alt_names = self.getAltNames(index)
-        X509Req = OpenSSL.crypto.X509Req()
-        X509Req.get_subject().CN = domain_name
-        if domain_alt_names:
-            SAN = "DNS:{0}, ".format(domain_name).encode("utf8") + ", ".join(
-                "DNS:" + i for i in domain_alt_names
-            ).encode("utf8")
-        else:
-            SAN = "DNS:{0}".format(domain_name).encode("utf8")
-
-        X509Req.add_extensions(
-            [
-                OpenSSL.crypto.X509Extension(
-                    "subjectAltName".encode("utf8"), critical=False, value=SAN
-                )
-            ]
-        )
-        pk = OpenSSL.crypto.load_privatekey(
-            OpenSSL.crypto.FILETYPE_PEM, self.createCertificateKey(
-                index).encode()
-        )
-        X509Req.set_pubkey(pk)
-        # X509Req.set_version(2)
-        X509Req.set_version(0)
-        X509Req.sign(pk, self.__digest)
-        return OpenSSL.crypto.dump_certificate_request(OpenSSL.crypto.FILETYPE_ASN1, X509Req)
-
-    # 获取证书密钥对
-    def createCertificateKey(self, index):
-        # 判断是否已经创建private_key
-        if 'private_key' in self.__config['orders'][index]:
-            return self.__config['orders'][index]['private_key']
-        # 创建新的私钥
-        private_key = self.createKey()
-        if type(private_key) == bytes:
-            private_key = private_key.decode()
-        # 保存私钥到订单配置文件
-        self.__config['orders'][index]['private_key'] = private_key
-        self.saveConfig()
-        return private_key
-
-    # 发送CSR
-    def sendCsr(self, index):
-        csr = self.createCsr(index)
-        payload = {"csr": self.calculateSafeBase64(csr)}
-        send_csr_response = self.acmeRequest(
-            url=self.__config['orders'][index]['finalize'], payload=payload)
-        send_csr_response_json = self.getRequestJson(send_csr_response)
-        if send_csr_response.status not in [200, 201]:
-            raise ValueError(
-                "错误： 发送CSR: 响应状态{status_code} 响应值:{response}".format(
-                    status_code=send_csr_response.status,
-                    response=send_csr_response_json,
-                )
-            )
-        certificate_url = send_csr_response_json["certificate"]
-        self.__config['orders'][index]['certificate_url'] = certificate_url
-        self.saveConfig()
-        return certificate_url
-
-    # 转换时间
-    def strfDate(self, sdate):
-        return time.strftime('%Y-%m-%d', time.strptime(sdate, '%Y%m%d%H%M%S'))
-
-    # 证书转为DER
-    def dumpDer(self, cert_path):
-        cert = OpenSSL.crypto.load_certificate(
-            OpenSSL.crypto.FILETYPE_PEM, mw.readFile(cert_path + '/cert.csr'))
-        return OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_ASN1, cert)
-
-    # 证书转为pkcs12
-    def dumpPkcs12(self, key_pem=None, cert_pem=None, ca_pem=None, friendly_name=None):
-        p12 = OpenSSL.crypto.PKCS12()
-        if cert_pem:
-            p12.set_certificate(OpenSSL.crypto.load_certificate(
-                OpenSSL.crypto.FILETYPE_PEM, cert_pem.encode()))
-        if key_pem:
-            p12.set_privatekey(OpenSSL.crypto.load_privatekey(
-                OpenSSL.crypto.FILETYPE_PEM, key_pem.encode()))
-        if ca_pem:
-            p12.set_ca_certificates((OpenSSL.crypto.load_certificate(
-                OpenSSL.crypto.FILETYPE_PEM, ca_pem.encode()),))
-        if friendly_name:
-            p12.set_friendlyname(friendly_name.encode())
-        return p12.export()
-
-    # 拆分根证书
-    def splitCaData(self, cert):
-        sp_key = '-----END CERTIFICATE-----\n'
-        datas = cert.split(sp_key)
-        return {"cert": datas[0] + sp_key, "root": sp_key.join(datas[1:])}
-
-    # 获取指定证书基本信息
-    def getCertInit(self, pem_file):
-        if not os.path.exists(pem_file):
-            return None
-        try:
-            result = {}
-            x509 = OpenSSL.crypto.load_certificate(
-                OpenSSL.crypto.FILETYPE_PEM, mw.readFile(pem_file))
-            # 取产品名称
-            issuer = x509.get_issuer()
-            result['issuer'] = ''
-            if hasattr(issuer, 'CN'):
-                result['issuer'] = issuer.CN
-            if not result['issuer']:
-                is_key = [b'0', '0']
-                issue_comp = issuer.get_components()
-                if len(issue_comp) == 1:
-                    is_key = [b'CN', 'CN']
-                for iss in issue_comp:
-                    if iss[0] in is_key:
-                        result['issuer'] = iss[1].decode()
-                        break
-            # 取到期时间
-            result['notAfter'] = self.strfDate(
-                bytes.decode(x509.get_notAfter())[:-1])
-            # 取申请时间
-            result['notBefore'] = self.strfDate(
-                bytes.decode(x509.get_notBefore())[:-1])
-            # 取可选名称
-            result['dns'] = []
-            for i in range(x509.get_extension_count()):
-                s_name = x509.get_extension(i)
-                if s_name.get_short_name() in [b'subjectAltName', 'subjectAltName']:
-                    s_dns = str(s_name).split(',')
-                    for d in s_dns:
-                        result['dns'].append(d.split(':')[1])
-            subject = x509.get_subject().get_components()
-            # 取主要认证名称
-            if len(subject) == 1:
-                result['subject'] = subject[0][1].decode()
-            else:
-                result['subject'] = result['dns'][0]
-            return result
-        except:
-            return None
-
-    # 替换服务器上的同域名同品牌证书
-    def subAllCert(self, key_file, pem_file):
-        cert_init = self.getCertInit(pem_file)  # 获取新证书的基本信息
-        paths = ['/www/server/mdserver-web/data/letsencrypt']
-        is_panel = False
-        for path in paths:
-            if not os.path.exists(path):
-                continue
-            for p_name in os.listdir(path):
-                to_path = path + '/' + p_name
-                to_pem_file = to_path + '/fullchain.pem'
-                to_key_file = to_path + '/privkey.pem'
-                to_info = to_path + '/info.json'
-                # 判断目标证书是否存在
-                if not os.path.exists(to_pem_file):
-                    if not p_name in ['ssl']:
-                        continue
-                    to_pem_file = to_path + '/certificate.pem'
-                    to_key_file = to_path + '/privateKey.pem'
-                    if not os.path.exists(to_pem_file):
-                        continue
-                    if path == paths[-1]:
-                        is_panel = True
-                # 获取目标证书的基本信息
-                to_cert_init = self.getCertInit(to_pem_file)
-                # 判断证书品牌是否一致
-                try:
-                    if to_cert_init['issuer'] != cert_init['issuer'] and to_cert_init['issuer'].find("Let's Encrypt") == -1 and to_cert_init['issuer'] != 'R3':
-                        continue
-                except:
-                    continue
-                # 判断目标证书的到期时间是否较早
-                if to_cert_init['notAfter'] > cert_init['notAfter']:
-                    continue
-                # 判断认识名称是否一致
-                if len(to_cert_init['dns']) != len(cert_init['dns']):
-                    continue
-                is_copy = True
-                for domain in to_cert_init['dns']:
-                    if not domain in cert_init['dns']:
-                        is_copy = False
-                if not is_copy:
-                    continue
-
-                # 替换新的证书文件和基本信息
-                mw.writeFile(to_pem_file, mw.readFile(pem_file, 'rb'), 'wb')
-                mw.writeFile(to_key_file, mw.readFile(key_file, 'rb'), 'wb')
-                mw.writeFile(to_info, json.dumps(cert_init))
-                writeLog("|-检测到{}下的证书与本次申请的证书重叠，且到期时间较早，已替换为新证书!".format(to_path))
-        # 重载web服务
-        mw.restartWeb()
-
-    # 保存证书到文件
-    def saveCert(self, cert, index):
-        try:
-            domain_name = self.__config['orders'][index]['domains'][0]
-            path = self.__config['orders'][index]['save_path']
-            if not os.path.exists(path):
-                os.makedirs(path, 384)
-
-            # 存储证书
-            key_file = path + "/privkey.pem"
-            pem_file = path + "/fullchain.pem"
-            mw.writeFile(key_file, cert['private_key'])
-            mw.writeFile(pem_file, cert['cert'] + cert['root'])
-            mw.writeFile(path + "/cert.csr", cert['cert'])
-            mw.writeFile(path + "/root_cert.csr", cert['root'])
-
-            # 转为IIS证书
-            pfx_buffer = self.dumpPkcs12(
-                cert['private_key'], cert['cert'] + cert['root'], cert['root'], domain_name)
-            mw.writeFile(path + "/fullchain.pfx", pfx_buffer, 'wb+')
-
-            ps = '''文件说明：
-privkey.pem     证书私钥
-fullchain.pem   包含证书链的PEM格式证书(nginx/apache)
-root_cert.csr   根证书
-cert.csr        域名证书
-fullchain.pfx   用于IIS的证书格式
-
-如何在MW面板使用：
-privkey.pem         粘贴到密钥输入框
-fullchain.pem       粘贴到证书输入框
-'''
-            mw.writeFile(path + '/readme.txt', ps)
-            self.subAllCert(key_file, pem_file)
-        except:
-            writeLog(mw.getTracebackInfo())
-
-    # 获取证书到期时间
-    def getCertTimeout(self, cret_data):
-        try:
-            x509 = OpenSSL.crypto.load_certificate(
-                OpenSSL.crypto.FILETYPE_PEM, cret_data)
-            cert_timeout = bytes.decode(x509.get_notAfter())[:-1]
-            return int(time.mktime(time.strptime(cert_timeout, '%Y%m%d%H%M%S')))
-        except:
-            return int(time.time() + (86400 * 90))
-
-    # 下载证书
-    def downloadCert(self, index):
-        res = self.acmeRequest(
-            self.__config['orders'][index]['certificate_url'], "")
-
-        pem_certificate = res.read().decode('utf-8')
-        if res.status not in [200, 201]:
-            raise Exception("下载证书失败: {}".format(json.loads(pem_certificate)))
-
-        cert = self.splitCaData(pem_certificate)
-        cert['cert_timeout'] = self.getCertTimeout(cert['cert'])
-        cert['private_key'] = self.__config['orders'][index]['private_key']
-        cert['domains'] = self.__config['orders'][index]['domains']
-        del(self.__config['orders'][index]['private_key'])
-        del(self.__config['orders'][index]['auths'])
-        del(self.__config['orders'][index]['expires'])
-        del(self.__config['orders'][index]['authorizations'])
-        del(self.__config['orders'][index]['finalize'])
-        del(self.__config['orders'][index]['identifiers'])
-        if 'cert' in self.__config['orders'][index]:
-            del(self.__config['orders'][index]['cert'])
-        self.__config['orders'][index]['status'] = 'valid'
-        self.__config['orders'][index]['cert_timeout'] = cert['cert_timeout']
-        domain_name = self.__config['orders'][index]['domains'][0]
-        self.__config['orders'][index]['save_path'] = '{}/{}'.format(
-            self.__save_path, domain_name)
-        cert['save_path'] = self.__config['orders'][index]['save_path']
-        self.saveConfig()
-        self.saveCert(cert, index)
-        return cert
-
-    def applyCert(self, domains, auth_type='http', auth_to='Dns_com|None|None', args={}):
-        writeLog("", "wb+")
-        try:
-            self.getApis()
-            index = None
-            if 'index' in args and args.index:
-                index = args.index
-            if not index:
-                # 判断是否只想验证域名
-                writeLog("|-正在创建订单..")
-                index = self.createOrder(domains, auth_type, auth_to)
-                writeLog("|-正在获取验证信息..")
-                self.getAuths(index)
-                if auth_to == 'dns' and len(self.__config['orders'][index]['auths']) > 0:
-                    return self.__config['orders'][index]
-            writeLog("|-正在验证域名..")
-            self.authDomain(index)
-
-            writeLog("|-正在发送CSR..")
-            self.sendCsr(index)
-
-            writeLog("|-正在下载证书..")
-            cert = self.downloadCert(index)
-
-            # 保存证书配置
-            self.saveConfig()
-            cert['status'] = True
-            cert['msg'] = '申请成功!'
-            writeLog("|-申请成功，正在部署到站点..")
-
-            self.clearAuthFile(index)
-
-            if os.path.exists(auth_to):
-                mw.execShell("rm -rf {}/.well-known".format(auth_to))
-            return cert
-        except Exception as ex:
-            ex = str(ex)
-            if ex.find(">>>>") != -1:
-                msg = ex.split(">>>>")
-                msg[1] = json.loads(msg[1])
-            else:
-                msg = ex
-                writeLog(mw.getTracebackInfo())
-
-            cert = {}
-            cert['status'] = False
-            cert['msg'] = msg
-            return cert
-
-    # 取根域名和记录值
-    def extractZone(self, domain_name):
-        top_domain_list = ['.ac.cn', '.ah.cn', '.bj.cn', '.com.cn', '.cq.cn', '.fj.cn', '.gd.cn', '.gov.cn', '.gs.cn',
-                           '.gx.cn', '.gz.cn', '.ha.cn', '.hb.cn', '.he.cn', '.hi.cn', '.hk.cn', '.hl.cn', '.hn.cn',
-                           '.jl.cn', '.js.cn', '.jx.cn', '.ln.cn', '.mo.cn', '.net.cn', '.nm.cn', '.nx.cn', '.org.cn',
-                           '.my.id', '.com.ac', '.com.ad', '.com.ae', '.com.af', '.com.ag', '.com.ai', '.com.al', '.com.am',
-                           '.com.an', '.com.ao', '.com.aq', '.com.ar', '.com.as', '.com.as', '.com.at', '.com.au', '.com.aw',
-                           '.com.az', '.com.ba', '.com.bb', '.com.bd', '.com.be', '.com.bf', '.com.bg', '.com.bh', '.com.bi',
-                           '.com.bj', '.com.bm', '.com.bn', '.com.bo', '.com.br', '.com.bs', '.com.bt', '.com.bv', '.com.bw',
-                           '.com.by', '.com.bz', '.com.ca', '.com.ca', '.com.cc', '.com.cd', '.com.cf', '.com.cg', '.com.ch',
-                           '.com.ci', '.com.ck', '.com.cl', '.com.cm', '.com.cn', '.com.co', '.com.cq', '.com.cr', '.com.cu',
-                           '.com.cv', '.com.cx', '.com.cy', '.com.cz', '.com.de', '.com.dj', '.com.dk', '.com.dm', '.com.do',
-                           '.com.dz', '.com.ec', '.com.ee', '.com.eg', '.com.eh', '.com.es', '.com.et', '.com.eu', '.com.ev',
-                           '.com.fi', '.com.fj', '.com.fk', '.com.fm', '.com.fo', '.com.fr', '.com.ga', '.com.gb', '.com.gd',
-                           '.com.ge', '.com.gf', '.com.gh', '.com.gi', '.com.gl', '.com.gm', '.com.gn', '.com.gp', '.com.gr',
-                           '.com.gt', '.com.gu', '.com.gw', '.com.gy', '.com.hm', '.com.hn', '.com.hr', '.com.ht', '.com.hu',
-                           '.com.id', '.com.id', '.com.ie', '.com.il', '.com.il', '.com.in', '.com.io', '.com.iq', '.com.ir',
-                           '.com.is', '.com.it', '.com.jm', '.com.jo', '.com.jp', '.com.ke', '.com.kg', '.com.kh', '.com.ki',
-                           '.com.km', '.com.kn', '.com.kp', '.com.kr', '.com.kw', '.com.ky', '.com.kz', '.com.la', '.com.lb',
-                           '.com.lc', '.com.li', '.com.lk', '.com.lr', '.com.ls', '.com.lt', '.com.lu', '.com.lv', '.com.ly',
-                           '.com.ma', '.com.mc', '.com.md', '.com.me', '.com.mg', '.com.mh', '.com.ml', '.com.mm', '.com.mn',
-                           '.com.mo', '.com.mp', '.com.mq', '.com.mr', '.com.ms', '.com.mt', '.com.mv', '.com.mw', '.com.mx',
-                           '.com.my', '.com.mz', '.com.na', '.com.nc', '.com.ne', '.com.nf', '.com.ng', '.com.ni', '.com.nl',
-                           '.com.no', '.com.np', '.com.nr', '.com.nr', '.com.nt', '.com.nu', '.com.nz', '.com.om', '.com.pa',
-                           '.com.pe', '.com.pf', '.com.pg', '.com.ph', '.com.pk', '.com.pl', '.com.pm', '.com.pn', '.com.pr',
-                           '.com.pt', '.com.pw', '.com.py', '.com.qa', '.com.re', '.com.ro', '.com.rs', '.com.ru', '.com.rw',
-                           '.com.sa', '.com.sb', '.com.sc', '.com.sd', '.com.se', '.com.sg', '.com.sh', '.com.si', '.com.sj',
-                           '.com.sk', '.com.sl', '.com.sm', '.com.sn', '.com.so', '.com.sr', '.com.st', '.com.su', '.com.sy',
-                           '.com.sz', '.com.tc', '.com.td', '.com.tf', '.com.tg', '.com.th', '.com.tj', '.com.tk', '.com.tl',
-                           '.com.tm', '.com.tn', '.com.to', '.com.tp', '.com.tr', '.com.tt', '.com.tv', '.com.tw', '.com.tz',
-                           '.com.ua', '.com.ug', '.com.uk', '.com.uk', '.com.us', '.com.uy', '.com.uz', '.com.va', '.com.vc',
-                           '.com.ve', '.com.vg', '.com.vn', '.com.vu', '.com.wf', '.com.ws', '.com.ye', '.com.za', '.com.zm',
-                           '.com.zw', '.mil.cn', '.qh.cn', '.sc.cn', '.sd.cn', '.sh.cn', '.sx.cn', '.tj.cn', '.tw.cn', '.tw.cn',
-                           '.xj.cn', '.xz.cn', '.yn.cn', '.zj.cn', '.bj.cn', '.edu.kg'
-                           ]
-        old_domain_name = domain_name
-        top_domain = "." + ".".join(domain_name.rsplit('.')[-2:])
-        new_top_domain = "." + top_domain.replace(".", "")
-        is_tow_top = False
-        if top_domain in top_domain_list:
-            is_tow_top = True
-            domain_name = domain_name[:-len(top_domain)] + new_top_domain
-
-        if domain_name.count(".") > 1:
-            zone, middle, last = domain_name.rsplit(".", 2)
-            if is_tow_top:
-                last = top_domain[1:]
-            root = ".".join([middle, last])
-        else:
-            zone = ""
-            root = old_domain_name
-        return root, zone
-
-    # 外部API - START ----------------------------------------------------------
-    def getHostConf(self, siteName):
-        return mw.getServerDir() + '/web_conf/nginx/vhost/' + siteName + '.conf'
-
-    def getSitePath(self, siteName):
-        file = self.getHostConf(siteName)
-        if os.path.exists(file):
-            conf = mw.readFile(file)
-            rep = r'\s*root\s*(.+);'
-            path = re.search(rep, conf).groups()[0]
-            return path
-        return ''
-
-    def applyCertApi(self, args):
-        '''
-        申请证书 - api
-        '''
-        return self.applyCert(args['domains'], args['auth_type'], args['auth_to'])
-    # 外部API - END ----------------------------------------------------------
-
-    def getSiteNameByDomains(self, domains):
-        # 通过域名获取网站名称
-        sql = mw.M('domain')
-        site_sql = mw.M('sites')
-        siteName = None
-        for domain in domains:
-            pid = sql.where('name=?', (domain,)).getField('pid')
-            if pid:
-                siteName = site_sql.where('id=?', (pid,)).getField('name')
-                break
-        return siteName
-
-    def renewCertTo(self, domains, auth_type, auth_to, index=None):
-        site_name = None
-        cert = {}
-
-        import site_api
-        api = site_api.site_api()
-        if os.path.exists(auth_to):
-            if mw.M('sites').where('path=?', auth_to).count() == 1:
-                site_id = m.M('sites').where('path=?', auth_to).getField('id')
-                site_name = m.M('sites').where(
-                    'path=?', auth_to).getField('name')
-
-                rdata = api.getSiteRunPath(site_id)
-                runPath = rdata['runPath']
-                if runPath and not runPath in ['/']:
-                    path = auth_to + '/' + runPath
-                    if os.path.exists(path):
-                        auth_to = path.replace('//', '/')
-
-            else:
-                site_name = self.getSiteNameByDomains(domains)
-        is_rep = api.httpToHttps(site_name)
-        api.operateProxyConf(site_name,'stop')
-        mw.restartWeb()
-        try:
-            index = self.createOrder(
-                domains,
-                auth_type,
-                auth_to.replace('//', '/'),
-                index
-            )
-
-            writeLog("|-正在获取验证信息..")
-            self.getAuths(index)
-            writeLog("|-正在验证域名..")
-            self.authDomain(index)
-            writeLog("|-正在发送CSR..")
-            self.sendCsr(index)
-            writeLog("|-正在下载证书..")
-            cert = self.downloadCert(index)
-            self.__config['orders'][index]['renew_time'] = int(time.time())
-
-            # 清理失败重试记录
-            self.__config['orders'][index]['retry_count'] = 0
-            self.__config['orders'][index]['next_retry_time'] = 0
-
-            # 保存证书配置
-            self.saveConfig()
-            cert['status'] = True
-            cert['msg'] = '续签成功!'
-            writeLog("|-续签成功!")
-        except Exception as e:
-            if str(e).find('429') > -1:
-                msg = '至少超过7天，才能续期!'
-                writeLog("|-" + msg)
-                return mw.returnJson(False, msg)
-
-            if str(e).find('请稍候重试') == -1:  # 受其它证书影响和连接CA失败的的不记录重试次数
-                if index:
-                    # 设置下次重试时间
-                    self.__config['orders'][index][
-                        'next_retry_time'] = int(time.time() + (86400 * 2))
-                    # 记录重试次数
-                    if not 'retry_count' in self.__config['orders'][index].keys():
-                        self.__config['orders'][index]['retry_count'] = 1
-                    self.__config['orders'][index]['retry_count'] += 1
-                    # 保存证书配置
-                    self.saveConfig()
-            msg = str(e).split('>>>>')[0]
-            writeLog("|-" + msg)
-            return mw.returnJson(False, msg)
-        finally:
-            is_rep_decode = json.loads(is_rep)
-            if is_rep_decode['status']:
-                api.closeToHttps(site_name)
-
-        api.operateProxyConf(site_name,'start')
-        mw.restartWeb()
-        writeLog("-" * 70)
-        return cert
-
-    def checkDomainIsExsits(self, domain):
-        if mw.M('domain').where("name=?", (domain,)).count() > 0:
-            return True
-
-        if mw.M('sites').where("name=?", (domain,)).count() > 0:
-            return True
-
-        if mw.M('binding').where("name=?", (domain,)).count() > 0:
-            return True                  
-        return False
-
-    def renewCert(self, index):
-        writeLog("", "wb+")
-        # self.D('renew_cert', index)
-        try:
-            order_index = []
-            if index:
-                if type(index) != str:
-                    index = index.index
-                if not index in self.__config['orders']:
-                    raise Exception("指定订单号不存在，无法续签!")
-                order_index.append(index)
-            else:
-                # 测试一天过期
-                now_time = time.time()
-                # print(self.__config)
-                if not 'orders' in self.__config:
-                    self.__config['orders'] = {}
-
-                for i in self.__config['orders'].keys():
-                    # print(self.__config['orders'][i])
-                    if not 'save_path' in self.__config['orders'][i]:
-                        continue
-
-                    if 'cert' in self.__config['orders'][i]:
-                        self.__config['orders'][i]['cert_timeout'] = self.__config['orders'][i]['cert']['cert_timeout']
-
-                    if not 'cert_timeout' in self.__config['orders'][i]:
-                        self.__config['orders'][i]['cert_timeout'] = int(time.time())
-
-                    # print(self.__config['orders'][i]['domains'][0], (self.__config['orders'][i]['cert_timeout'] - now_time)/86400, now_time)
-                    if self.__config['orders'][i]['cert_timeout'] - now_time > 83*86400:
-                        msg = "|-本次跳过域名: {}，未过期!".format(self.__config['orders'][i]['domains'][0])
-                        writeLog(msg)
-                        continue
-
-                    # 已删除的网站直接跳过续签
-                    if self.__config['orders'][i]['auth_to'].find('|') == -1 and self.__config['orders'][i]['auth_to'].find('/') != -1:
-                        if not os.path.exists(self.__config['orders'][i]['auth_to']):
-                            auth_to = self.__config['orders'][i]['auth_to']
-                            if not auth_to:
-                                continue
-
-                            # 域名不存在？
-                            for domain in self.__config['orders'][i]['domains']:
-                                if domain.find('*') != -1:
-                                    break
-
-
-                                if not mw.M('domain').where("name=?", (domain,)).count() and not mw.M('binding').where("domain=?", domain).count():
-                                    auth_to = None
-                                    msg = "|-跳过被删除的域名: {}".format(
-                                        self.__config['orders'][i]['domains'])
-                                    writeLog(msg)
-                            if not auth_to:
-                                continue
-
-                            self.__config['orders'][i]['auth_to'] = auth_to
-
-                        auth_to = True
-                        for domain in self.__config['orders'][i]['domains']:
-                            if not self.checkDomainIsExsits(domain):
-                                auth_to = False
-                                msg = "|-跳过被删除的域名: {}!".format(self.__config['orders'][i]['domains'])
-                                writeLog(msg)
-                        if not auth_to:
-                            continue
-                    # 是否到了允许重试的时间
-                    if 'next_retry_time' in self.__config['orders'][i]:
-                        timeout = self.__config['orders'][i][
-                            'next_retry_time'] - int(time.time())
-                        if timeout > 0:
-                            msg = '|-本次跳过域名:{}，因第上次续签失败，还需要等待{}小时后再重试'.format(
-                                self.__config['orders'][i]['domains'], int(timeout / 60 / 60))
-                            writeLog(msg)
-                            continue
-
-                    # 是否到了最大重试次数
-                    if 'retry_count' in self.__config['orders'][i]:
-                        if self.__config['orders'][i]['retry_count'] >= 100:
-                            msg = '|-本次跳过域名:{}，因连续100次续签失败，不再续签此证书(可尝试手动续签此证书，成功后错误次数将被重置)'.format(
-                                self.__config['orders'][i]['domains'])
-                            writeLog(msg)
-                            continue
-
-                    # 加入到续签订单
-                    order_index.append(i)
-                if not order_index:
-                    writeLog("|-所有任务已处理完成!")
-                    return
-            writeLog("|-共需要续签 {} 张证书".format(len(order_index)))
-
-            n = 0
-            self.getApis()
-            cert = None
-            for index in order_index:
-                n += 1
-                writeLog("|-正在续签第 {} 张，域名: {}..".format(n,
-                                                        self.__config['orders'][index]['domains']))
-                writeLog("|-正在创建订单..")
-                cert = self.renewCertTo(self.__config['orders'][index]['domains'], self.__config[
-                    'orders'][index]['auth_type'], self.__config['orders'][index]['auth_to'], index)
-                self.clearAuthFile(index)
-            return cert
-        except Exception as ex:
-            ex = str(ex)
-            if ex.find(">>>>") != -1:
-                msg = ex.split(">>>>")
-                msg[1] = json.loads(msg[1])
-            else:
-                msg = ex
-                writeLog(mw.getTracebackInfo())
-            return mw.returnJson(False, msg)
-
-    def revokeOrder(self, index):
-        if not index in self.__config['orders']:
-            raise Exception("指定订单不存在!")
-        cert_path = self.__config['orders'][index]['save_path']
-        if not os.path.exists(cert_path):
-            raise Exception("指定订单没有找到可用的证书!")
-        cert = self.dumpDer(cert_path)
-        if not cert:
-            raise Exception("证书读取失败!")
-        payload = {
-            "certificate": self.calculateSafeBase64(cert),
-            "reason": 4
-        }
-
-        self.getApis()
-        res = self.acmeRequest(self.__apis['revokeCert'], payload)
-        if res.status in [200, 201]:
-            if os.path.exists(cert_path):
-                mw.execShell("rm -rf {}".format(cert_path))
-            del(self.__config['orders'][index])
-            self.saveConfig()
-            return mw.returnJson(True, "证书吊销成功!")
-        return res.json()
-
-    def do(self, args):
-        cert = None
-        try:
-            if not args.index:
-                if not args.domains:
-                    echoErr("请在--domain参数中指定要申请证书的域名，多个以逗号(,)隔开")
-                if not args.auth_type in ['http', 'tls']:
-                    echoErr("请在--type参数中指定正确的验证类型，http")
-
-                auth_to = ''
-                if args.auth_type in ['http', 'tls']:
-                    if not args.path:
-                        echoErr("请在--path参数中指定网站根目录!")
-                    if not os.path.exists(args.path):
-                        echoErr("指定网站根目录不存在，请检查：{}".format(args.path))
-                    auth_to = args.path
-                else:
-                    echoErr("仅支持文件验证!")
-                    exit()
-
-                domains = args.domains.strip().split(',')
-                cert = self.applyCert(
-                    domains, auth_type=args.auth_type, auth_to=auth_to, args=args)
-            else:
-                # 重新验证
-                cert = self.applyCert([], auth_type='dns',
-                                      auth_to='dns', index=args.index)
-        except Exception as e:
-            writeLog("|-{}".format(mw.getTracebackInfo()))
-            exit()
-
-        if not cert:
-            exit()
-
-        # print(cert)
-        if not cert['status']:
-            writeLog('|-' + cert['msg'][0])
-            exit()
-        writeLog("=" * 65)
-        writeLog("|-证书获取成功!")
-        writeLog("=" * 65)
-        writeLog("证书到期时间: {}".format(
-            mw.formatDate(times=cert['cert_timeout'])))
-        writeLog("证书已保存在: {}/".format(cert['save_path']))
-
-
-# exp:
-'''
-// create
-python3 class/core/cert_api.py --domain=dev38.cachecha.com --type=http --path=/www/wwwroot/dev38.cachecha.com
-// renew
-cd /www/server/mdserver-web && python3 class/core/cert_api.py --renew=1 --index=46c558aa1fae96facf36ac7df8eb4750
-// revoke
-cd /www/server/mdserver-web && python3 class/core/cert_api.py --revoke=1 --index=370423ed29481b2caf22e36d90a6894a
-
-
-
-python3 class/core/cert_request.py --domain=dev38.cachecha.com --type=http --path=/Users/midoks/Desktop/mwdev/wwwroot/test
-
-python3 class/core/cert_api.py --domain=dev38.cachecha.com --type=http --path=/Users/midoks/Desktop/mwdev/wwwroot/test
-python3 class/core/cert_api.py --renew=1
-python3 class/core/cert_api.py --revoke=1 --index=370423ed29481b2caf22e36d90a6894a
-'''
-if __name__ == "__main__":
-    p = argparse.ArgumentParser(usage="必要的参数：--domain 域名列表，多个以逗号隔开!")
-    p.add_argument('--domain', default=None,
-                   help="请指定要申请证书的域名", dest="domains")
-    p.add_argument('--type', default=None, help="请指定验证类型", dest="auth_type")
-    p.add_argument('--path', default=None, help="请指定网站根目录", dest="path")
-    p.add_argument('--index', default=None, help="指定订单索引", dest="index")
-    p.add_argument('--renew', default=None, help="续签证书", dest="renew")
-    p.add_argument('--revoke', default=None, help="吊销证书", dest="revoke")
-
-    args = p.parse_args()
-    cr = cert_api()
-
-    if args.revoke:
-        if not args.index:
-            echoErr("请在--index参数中传入要被吊销的订单索引")
-        result = cr.revokeOrder(args.index)
-        writeLog(result)
-        exit()
-
-    if args.renew:
-        cr.renewCert(args.index)
-        exit()
-
-    cr.do(args)
diff --git a/class/core/cert_request.py b/class/core/cert_request.py
deleted file mode 100644
index 2a2ccc8d3..000000000
--- a/class/core/cert_request.py
+++ /dev/null
@@ -1,1472 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 证书申请
-# ---------------------------------------------------------------------------------
-
-import re
-import fcntl
-import datetime
-import binascii
-import hashlib
-import base64
-import json
-import time
-import os
-import sys
-import argparse
-
-if os.path.exists('/www/server/mdserver-web'):
-    os.chdir('/www/server/mdserver-web')
-
-import mw
-
-try:
-    import OpenSSL
-except:
-    mw.execShell("pip install pyopenssl")
-    import OpenSSL
-
-# import http_requests as requests
-# requests.DEFAULT_TYPE = 'curl'
-import requests
-requests.packages.urllib3.disable_warnings()
-
-
-def echoErr(msg):
-    writeLog("\033[31m=" * 65)
-    writeLog("|-错误：{}\033[0m".format(msg))
-    exit()
-
-
-def writeLog(log_str, mode="ab+"):
-    # 写日志
-    if __name__ == "__main__":
-        print(log_str)
-        return
-    _log_file = 'logs/letsencrypt.log'
-    f = open(_log_file, mode)
-    log_str += "\n"
-    f.write(log_str.encode('utf-8'))
-    f.close()
-    return True
-
-
-class cert_request:
-    __debug = False
-    __user_agent = "MW-Panel"
-    __apis = None
-    __url = None
-    __replay_nonce = None
-    __acme_timeout = 30
-    __max_check_num = 5
-    __wait_time = 5
-    __bits = 2048
-    __digest = "sha256"
-    __verify = False
-    __config = {}
-    __dns_class = None
-    __auto_wildcard = False
-    __mod_index = {True: "Staging", False: "Production"}
-    __save_path = 'data/letsencrypt'
-    __cfg_file = 'data/letsencrypt.json'
-
-    def __init__(self):
-        self.__save_path = mw.getServerDir() + '/web_conf/letsencrypt'
-        if not os.path.exists(self.__save_path):
-            os.makedirs(self.__save_path)
-        if self.__debug:
-            self.__url = 'https://acme-staging-v02.api.letsencrypt.org/directory'
-        else:
-            self.__url = 'https://acme-v02.api.letsencrypt.org/directory'
-        self.__config = self.readConfig()
-
-    def D(self, name, val):
-        if self.__debug:
-            print('---------{} start--------'.format(name))
-            print(val)
-            print('---------{} end--------'.format(name))
-
-    # 读配置文件
-    def readConfig(self):
-        if not os.path.exists(self.__cfg_file):
-            self.__config['orders'] = {}
-            self.__config['account'] = {}
-            self.__config['apis'] = {}
-            self.__config['email'] = mw.M('users').where(
-                'id=?', (1,)).getField('email')
-            if self.__config['email'] in ['midoks@163.com']:
-                self.__config['email'] = None
-            self.saveConfig()
-            return self.__config
-        tmp_config = mw.readFile(self.__cfg_file)
-        if not tmp_config:
-            return self.__config
-        try:
-            self.__config = json.loads(tmp_config)
-        except:
-            self.saveConfig()
-            return self.__config
-        return self.__config
-
-    # 写配置文件
-    def saveConfig(self):
-        fp = open(self.__cfg_file, 'w+')
-        fcntl.flock(fp, fcntl.LOCK_EX)  # 加锁
-        fp.write(json.dumps(self.__config))
-        fcntl.flock(fp, fcntl.LOCK_UN)  # 解锁
-        fp.close()
-        return True
-
-    def getApis(self):
-        if not self.__apis:
-                # 尝试从配置文件中获取
-            api_index = self.__mod_index[self.__debug]
-            if not 'apis' in self.__config:
-                self.__config['apis'] = {}
-
-            if api_index in self.__config['apis']:
-                if 'expires' in self.__config['apis'][api_index] and 'directory' in self.__config['apis'][api_index]:
-                    if time.time() < self.__config['apis'][api_index]['expires']:
-                        self.__apis = self.__config[
-                            'apis'][api_index]['directory']
-                        return self.__apis
-
-            # 尝试从官方获取获取
-            try:
-                res = mw.httpGet(self.__url)
-                result = json.loads(res)
-                self.__apis = {}
-                self.__apis['newAccount'] = result['newAccount']
-                self.__apis['newNonce'] = result['newNonce']
-                self.__apis['newOrder'] = result['newOrder']
-                self.__apis['revokeCert'] = result['revokeCert']
-                self.__apis['keyChange'] = result['keyChange']
-
-                # 保存到配置文件
-                self.__config['apis'][api_index] = {}
-                self.__config['apis'][api_index]['directory'] = self.__apis
-                self.__config['apis'][api_index]['expires'] = time.time() + \
-                    86400  # 24小时后过期
-                self.saveConfig()
-            except Exception as e:
-                raise Exception(
-                    '服务因维护而关闭或发生内部错误，查看 <a href="https://letsencrypt.status.io/" target="_blank" class="btlink">https://letsencrypt.status.io/</a> 了解更多详细信息。')
-        return self.__apis
-
-    # 系列化payload
-    def stringfyItems(self, payload):
-        if isinstance(payload, str):
-            return payload
-
-        for k, v in payload.items():
-            if isinstance(k, bytes):
-                k = k.decode("utf-8")
-            if isinstance(v, bytes):
-                v = v.decode("utf-8")
-            payload[k] = v
-        return payload
-
-    # 构造域名列表
-    def formatDomains(self, domains):
-        if type(domains) != list:
-            return []
-        # 是否自动构造通配符
-        if self.__auto_wildcard:
-            domains = self.autoWildcard(domains)
-        wildcard = []
-        tmp_domains = []
-        for domain in domains:
-            domain = domain.strip()
-            if domain in tmp_domains:
-                continue
-            # 将通配符域名转为验证正则表达式
-            f_index = domain.find("*.")
-            if f_index not in [-1, 0]:
-                continue
-            if f_index == 0:
-                wildcard.append(domain.replace(
-                    "*", r"^[\w-]+").replace(".", r"\."))
-            # 添加到申请列表
-            tmp_domains.append(domain)
-
-        # 处理通配符包含
-        apply_domains = tmp_domains[:]
-        for domain in tmp_domains:
-            for w in wildcard:
-                if re.match(w, domain):
-                    apply_domains.pop(domain)
-
-        return apply_domains
-
-    # 转为无填充的Base64
-    def calculateSafeBase64(self, un_encoded_data):
-        if sys.version_info[0] == 3:
-            if isinstance(un_encoded_data, str):
-                un_encoded_data = un_encoded_data.encode("utf8")
-        r = base64.urlsafe_b64encode(un_encoded_data).rstrip(b"=")
-        return r.decode("utf8")
-
-    # 创建Key
-    def createKey(self, key_type=OpenSSL.crypto.TYPE_RSA):
-        key = OpenSSL.crypto.PKey()
-        key.generate_key(key_type, self.__bits)
-        private_key = OpenSSL.crypto.dump_privatekey(
-            OpenSSL.crypto.FILETYPE_PEM, key)
-        return private_key
-
-       # 获用户取密钥对
-    def getAccountKey(self):
-        if not 'account' in self.__config:
-            self.__config['account'] = {}
-        k = self.__mod_index[self.__debug]
-        if not k in self.__config['account']:
-            self.__config['account'][k] = {}
-
-        if not 'key' in self.__config['account'][k]:
-            self.__config['account'][k]['key'] = self.createKey()
-            if type(self.__config['account'][k]['key']) == bytes:
-                self.__config['account'][k]['key'] = self.__config[
-                    'account'][k]['key'].decode()
-            self.saveConfig()
-        return self.__config['account'][k]['key']
-
-    # 注册acme帐户
-    def register(self, existing=False):
-        if not 'email' in self.__config:
-            self.__config['email'] = 'xxxx.xxxx@gmail.com'
-        if existing:
-            payload = {"onlyReturnExisting": True}
-        elif self.__config['email']:
-            payload = {
-                "termsOfServiceAgreed": True,
-                "contact": ["mailto:{0}".format(self.__config['email'])],
-            }
-        else:
-            payload = {"termsOfServiceAgreed": True}
-
-        res = self.acmeRequest(url=self.__apis['newAccount'], payload=payload)
-
-        if res.status_code not in [201, 200, 409]:
-            raise Exception("注册ACME帐户失败: {}".format(res.json()))
-        kid = res.headers["Location"]
-        return kid
-
-    # 获取kid
-    def getKid(self, force=False):
-        # 如果配置文件中不存在kid或force = True时则重新注册新的acme帐户
-        if not 'account' in self.__config:
-            self.__config['account'] = {}
-        k = self.__mod_index[self.__debug]
-        if not k in self.__config['account']:
-            self.__config['account'][k] = {}
-
-        if not 'kid' in self.__config['account'][k]:
-            self.__config['account'][k]['kid'] = self.register()
-            self.saveConfig()
-            time.sleep(3)
-            self.__config = self.readConfig()
-        return self.__config['account'][k]['kid']
-
-    # 获取随机数
-    def getNonce(self, force=False):
-        return '1AADXO5Sdc3EzuOS8ViYj-MVdhgx3DRE2kSDSwrObJ1jG_w'
-        # 如果没有保存上一次的随机数或force=True时则重新获取新的随机数
-        if not self.__replay_nonce or force:
-            try:
-
-                import urllib.request
-                try:
-                    response = urllib.request.urlopen(self.__apis['newNonce'],
-                                                      timeout=self.__acme_timeout,
-                                                      headers=headers,
-                                                      verify=self.__verify)
-                    self.__replay_nonce = response.headers["replay-nonce"]
-                    return self.__replay_nonce
-                except Exception as e:
-                    pass
-
-                headers = {"User-Agent": self.__user_agent}
-                response = requests.get(self.__apis['newNonce'],
-                                        timeout=self.__acme_timeout,
-                                        headers=headers,
-                                        verify=self.__verify)
-
-                self.__replay_nonce = response.headers["replay-nonce"]
-            except Exception as e:
-                raise Exception("获取随机数失败: {}".format(str(e)))
-
-        return self.__replay_nonce
-
-    # 获请ACME请求头
-    def getAcmeHeader(self, url):
-        nonce = self.getNonce()
-
-        header = {"alg": "RS256", "nonce": nonce, "url": url}
-        if url in [self.__apis['newAccount'], 'GET_THUMBPRINT']:
-            from cryptography.hazmat.backends import default_backend
-            from cryptography.hazmat.primitives import serialization
-            private_key = serialization.load_pem_private_key(
-                self.getAccountKey().encode(),
-                password=None,
-                backend=default_backend(),
-            )
-            public_key_public_numbers = private_key.public_key().public_numbers()
-
-            exponent = "{0:x}".format(public_key_public_numbers.e)
-            exponent = "0{0}".format(exponent) if len(
-                exponent) % 2 else exponent
-            modulus = "{0:x}".format(public_key_public_numbers.n)
-            jwk = {
-                "kty": "RSA",
-                "e": self.calculateSafeBase64(binascii.unhexlify(exponent)),
-                "n": self.calculateSafeBase64(binascii.unhexlify(modulus)),
-            }
-            header["jwk"] = jwk
-        else:
-            header["kid"] = self.getKid()
-        return header
-
-    # 计算signature
-    def signMessage(self, message):
-        pk = OpenSSL.crypto.load_privatekey(
-            OpenSSL.crypto.FILETYPE_PEM, self.getAccountKey().encode())
-        return OpenSSL.crypto.sign(pk, message.encode("utf8"), self.__digest)
-
-    def getSiteRunPathByid(self, site_id):
-        if mw.M('sites').where('id=?', (site_id,)).count() >= 1:
-            site_path = mw.M('sites').where('id=?', site_id).getField('path')
-            if not site_path:
-                return None
-            if not os.path.exists(site_path):
-                return None
-            args = mw.dict_obj()
-            args.id = site_id
-            import panelSite
-            run_path = panelSite.panelSite().GetRunPath(args)
-            if run_path in ['/']:
-                run_path = ''
-            if run_path:
-                if run_path[0] == '/':
-                    run_path = run_path[1:]
-            site_run_path = os.path.join(site_path, run_path)
-            if not os.path.exists(site_run_path):
-                return site_path
-            return site_run_path
-        else:
-            return False
-
-    def getSiteRunPath(self, domains):
-        site_id = 0
-        for domain in domains:
-            site_id = mw.M('domain').where("name=?", domain).getField('pid')
-            if site_id:
-                break
-
-        if not site_id:
-            return None
-        return self.getSiteRunPathByid(site_id)
-
-    # 清理验证文件
-    def claerAuthFile(self, index):
-        if not self.__config['orders'][index]['auth_type'] in ['http', 'tls']:
-            return True
-        acme_path = '{}/.well-known/acme-challenge'.format(
-            self.__config['orders'][index]['auth_to'])
-        writeLog("|-验证目录：{}".format(acme_path))
-        if os.path.exists(acme_path):
-            mw.execShell("rm -f {}/*".format(acme_path))
-
-        acme_path = mw.getServerDir() + '/stop/.well-known/acme-challenge'
-        if os.path.exists(acme_path):
-            mw.execShell("rm -f {}/*".format(acme_path))
-
-    # 获取域名验证方式
-    def getAuthType(self, index):
-        if not index in self.__config['orders']:
-            raise Exception('指定订单不存在!')
-        s_type = 'http-01'
-        if 'auth_type' in self.__config['orders'][index]:
-            if self.__config['orders'][index]['auth_type'] == 'dns':
-                s_type = 'dns-01'
-            elif self.__config['orders'][index]['auth_type'] == 'tls':
-                s_type = 'tls-alpn-01'
-            else:
-                s_type = 'http-01'
-        return s_type
-
-    # 构造验证信息
-    def getIdentifierAuth(self, index, url, auth_info):
-        s_type = self.getAuthType(index)
-        writeLog("|-验证类型：{}".format(s_type))
-        domain = auth_info['identifier']['value']
-        wildcard = False
-        # 处理通配符
-        if 'wildcard' in auth_info:
-            wildcard = auth_info['wildcard']
-        if wildcard:
-            domain = "*." + domain
-
-        for auth in auth_info['challenges']:
-            if auth['type'] != s_type:
-                continue
-            identifier_auth = {
-                "domain": domain,
-                "url": url,
-                "wildcard": wildcard,
-                "token": auth['token'],
-                "dns_challenge_url": auth['url'],
-            }
-            return identifier_auth
-        return None
-
-    # 构造域名验证头和验证值
-    def getKeyauthorization(self, token):
-        acme_header_jwk_json = json.dumps(
-            self.getAcmeHeader("GET_THUMBPRINT")["jwk"], sort_keys=True, separators=(",", ":")
-        )
-        acme_thumbprint = self.calculateSafeBase64(
-            hashlib.sha256(acme_header_jwk_json.encode("utf8")).digest()
-        )
-        acme_keyauthorization = "{0}.{1}".format(token, acme_thumbprint)
-        base64_of_acme_keyauthorization = self.calculateSafeBase64(
-            hashlib.sha256(acme_keyauthorization.encode("utf8")).digest()
-        )
-
-        return acme_keyauthorization, base64_of_acme_keyauthorization
-
-    # 写验证文件
-    def writeAuthFile(self, auth_to, token, acme_keyauthorization):
-        try:
-            # self.D('writeAuthFile', auth_to)
-            acme_path = '{}/.well-known/acme-challenge'.format(auth_to)
-            if not os.path.exists(acme_path):
-                os.makedirs(acme_path)
-                mw.setOwn(acme_path, 'www')
-            wellknown_path = '{}/{}'.format(acme_path, token)
-            mw.writeFile(wellknown_path, acme_keyauthorization)
-            mw.setOwn(wellknown_path, 'www')
-
-            acme_path = mw.getServerDir() + '/stop/.well-known/acme-challenge'
-            if not os.path.exists(acme_path):
-                os.makedirs(acme_path)
-                mw.setOwn(acme_path, 'www')
-            wellknown_path = '{}/{}'.format(acme_path, token)
-            mw.writeFile(wellknown_path, acme_keyauthorization)
-            mw.setOwn(wellknown_path, 'www')
-            return True
-        except:
-            err = mw.getTracebackInfo()
-            raise Exception("写入验证文件失败: {}".format(err))
-
-    # 设置验证信息
-    def setAuthInfo(self, identifier_auth):
-
-        # 是否手动验证DNS
-        if identifier_auth['auth_to'] == 'dns':
-            return None
-
-        # 是否文件验证
-        if identifier_auth['type'] in ['http', 'tls']:
-            self.writeAuthFile(identifier_auth['auth_to'], identifier_auth[
-                               'token'], identifier_auth['acme_keyauthorization'])
-
-    # 获取验证信息
-    def getAuths(self, index):
-        if not index in self.__config['orders']:
-            raise Exception('指定订单不存在!')
-
-        # 检查是否已经获取过授权信息
-        if 'auths' in self.__config['orders'][index]:
-            # 检查授权信息是否过期
-            if time.time() < self.__config['orders'][index]['auths'][0]['expires']:
-                return self.__config['orders'][index]['auths']
-        if self.__config['orders'][index]['auth_type'] != 'dns':
-            site_run_path = self.getSiteRunPath(
-                self.__config['orders'][index]['domains'])
-            if site_run_path:
-                self.__config['orders'][index]['auth_to'] = site_run_path
-
-        # 清理旧验证
-        self.claerAuthFile(index)
-
-        auths = []
-        for auth_url in self.__config['orders'][index]['authorizations']:
-            res = self.acmeRequest(auth_url, "")
-            if res.status_code not in [200, 201]:
-                raise Exception("获取授权失败: {}".format(res.json()))
-
-            s_body = res.json()
-            if 'status' in s_body:
-                if s_body['status'] in ['invalid']:
-                    raise Exception("无效订单，此订单当前为验证失败状态!")
-                if s_body['status'] in ['valid']:  # 跳过无需验证的域名
-                    continue
-
-            s_body['expires'] = self.utcToTime(s_body['expires'])
-            identifier_auth = self.getIdentifierAuth(index, auth_url, s_body)
-            if not identifier_auth:
-                raise Exception("验证信息构造失败!{}")
-
-            acme_keyauthorization, auth_value = self.getKeyauthorization(identifier_auth[
-                                                                         'token'])
-            identifier_auth['acme_keyauthorization'] = acme_keyauthorization
-            identifier_auth['auth_value'] = auth_value
-            identifier_auth['expires'] = s_body['expires']
-            identifier_auth['auth_to'] = self.__config[
-                'orders'][index]['auth_to']
-            identifier_auth['type'] = self.__config[
-                'orders'][index]['auth_type']
-
-            # print(identifier_auth)
-            # 设置验证信息
-            self.setAuthInfo(identifier_auth)
-            auths.append(identifier_auth)
-        self.__config['orders'][index]['auths'] = auths
-        self.saveConfig()
-        return auths
-
-    # 更新随机数
-    def updateReplayNonce(self, res):
-        replay_nonce = res.headers.get('replay-nonce')
-        if replay_nonce:
-            self.__replay_nonce = replay_nonce
-
-    # 请求到ACME接口
-    def acmeRequest(self, url, payload):
-        headers = {"User-Agent": self.__user_agent}
-        payload = self.stringfyItems(payload)
-
-        if payload == "":
-            payload64 = payload
-        else:
-            payload64 = self.calculateSafeBase64(json.dumps(payload))
-        protected = self.getAcmeHeader(url)
-        protected64 = self.calculateSafeBase64(json.dumps(protected))
-        signature = self.signMessage(
-            message="{0}.{1}".format(protected64, payload64))  # bytes
-        signature64 = self.calculateSafeBase64(signature)  # str
-        data = json.dumps(
-            {"protected": protected64, "payload": payload64, "signature": signature64})
-        headers.update({"Content-Type": "application/jose+json"})
-        response = requests.post(
-            url,
-            data=data.encode("utf8"),
-            timeout=self.__acme_timeout,
-            headers=headers,
-            verify=self.__verify
-        )
-        # 更新随机数
-        self.updateReplayNonce(response)
-        return response
-
-    # UTC时间转时间戳
-    def utcToTime(self, utc_string):
-        try:
-            utc_string = utc_string.split('.')[0]
-            utc_date = datetime.datetime.strptime(
-                utc_string, "%Y-%m-%dT%H:%M:%S")
-            # 按北京时间返回
-            return int(time.mktime(utc_date.timetuple())) + (3600 * 8)
-        except:
-            return int(time.time() + 86400 * 7)
-
-    # 保存订单
-    def saveOrder(self, order_object, index):
-        if not 'orders' in self.__config:
-            self.__config['orders'] = {}
-        renew = False
-        if not index:
-            index = mw.md5(json.dumps(order_object['identifiers']))
-        else:
-            renew = True
-            order_object['certificate_url'] = self.__config[
-                'orders'][index]['certificate_url']
-            order_object['save_path'] = self.__config[
-                'orders'][index]['save_path']
-
-        order_object['expires'] = self.utcToTime(order_object['expires'])
-        self.__config['orders'][index] = order_object
-        self.__config['orders'][index]['index'] = index
-        if not renew:
-            self.__config['orders'][index]['create_time'] = int(time.time())
-            self.__config['orders'][index]['renew_time'] = 0
-        self.saveConfig()
-        return index
-
-    def getError(self, error):
-        # 格式化错误输出
-        if error.find("Max checks allowed") >= 0:
-            return "CA无法验证您的域名，请检查域名解析是否正确，或等待5-10分钟后重试."
-        elif error.find("Max retries exceeded with") >= 0 or error.find('status_code=0 ') != -1:
-            return "CA服务器连接超时，请稍候重试."
-        elif error.find("The domain name belongs") >= 0:
-            return "域名不属于此DNS服务商，请确保域名填写正确."
-        elif error.find('login token ID is invalid') >= 0:
-            return 'DNS服务器连接失败，请检查密钥是否正确.'
-        elif error.find('Error getting validation data') != -1:
-            return '数据验证失败，CA无法从验证连接中获到正确的验证码.'
-        elif "too many certificates already issued for exact set of domains" in error:
-            return '签发失败,该域名%s超出了每周的重复签发次数限制!' % re.findall("exact set of domains: (.+):", error)
-        elif "Error creating new account :: too many registrations for this IP" in error:
-            return '签发失败,当前服务器IP已达到每3小时最多创建10个帐户的限制.'
-        elif "DNS problem: NXDOMAIN looking up A for" in error:
-            return '验证失败,没有解析域名,或解析未生效!'
-        elif "Invalid response from" in error:
-            return '验证失败,域名解析错误或验证URL无法被访问!'
-        elif error.find('TLS Web Server Authentication') != -1:
-            return "连接CA服务器失败，请稍候重试."
-        elif error.find('Name does not end in a public suffix') != -1:
-            return "不支持的域名%s，请检查域名是否正确!" % re.findall("Cannot issue for \"(.+)\":", error)
-        elif error.find('No valid IP addresses found for') != -1:
-            return "域名%s没有找到解析记录，请检查域名是否解析生效!" % re.findall("No valid IP addresses found for (.+)", error)
-        elif error.find('No TXT record found at') != -1:
-            return "没有在域名%s中找到有效的TXT解析记录,请检查是否正确解析TXT记录,如果是DNSAPI方式申请的,请10分钟后重试!" % re.findall("No TXT record found at (.+)", error)
-        elif error.find('Incorrect TXT record') != -1:
-            return "在%s上发现错误的TXT记录:%s,请检查TXT解析是否正确,如果是DNSAPI方式申请的,请10分钟后重试!" % (re.findall("found at (.+)", error), re.findall("Incorrect TXT record \"(.+)\"", error))
-        elif error.find('Domain not under you or your user') != -1:
-            return "这个dnspod账户下面不存在这个域名，添加解析失败!"
-        elif error.find('SERVFAIL looking up TXT for') != -1:
-            return "没有在域名%s中找到有效的TXT解析记录,请检查是否正确解析TXT记录,如果是DNSAPI方式申请的,请10分钟后重试!" % re.findall("looking up TXT for (.+)", error)
-        elif error.find('Timeout during connect') != -1:
-            return "连接超时,CA服务器无法访问您的网站!"
-        elif error.find("DNS problem: SERVFAIL looking up CAA for") != -1:
-            return "域名%s当前被要求验证CAA记录，请手动解析CAA记录，或1小时后重新尝试申请!" % re.findall("looking up CAA for (.+)", error)
-        elif error.find("Read timed out.") != -1:
-            return "验证超时,请检查域名是否正确解析，若已正确解析，可能服务器与Let'sEncrypt连接异常，请稍候再重试!"
-        elif error.find('Cannot issue for') != -1:
-            return "无法为{}颁发证书，不能直接用域名后缀申请通配符证书!".format(re.findall(r'for\s+"(.+)"', error))
-        elif error.find('too many failed authorizations recently'):
-            return '该帐户1小时内失败的订单次数超过5次，请等待1小时再重试!'
-        elif error.find("Error creating new order") != -1:
-            return "订单创建失败，请稍候重试!"
-        elif error.find("Too Many Requests") != -1:
-            return "1小时内超过5次验证失败，暂时禁止申请，请稍候重试!"
-        elif error.find('HTTP Error 400: Bad Request') != -1:
-            return "CA服务器拒绝访问，请稍候重试!"
-        elif error.find('Temporary failure in name resolution') != -1:
-            return '服务器DNS故障，无法解析域名，请使用Linux工具箱检查dns配置'
-        elif error.find('Too Many Requests') != -1:
-            return '该域名请求申请次数过多，请3小时后重试'
-        else:
-            return error
-
-    # 创建订单
-    def createOrder(self, domains, auth_type, auth_to, index=None):
-        domains = self.formatDomains(domains)
-        if not domains:
-            raise Exception("至少需要有一个域名")
-        # 构造标识
-        identifiers = []
-        for domain_name in domains:
-            identifiers.append({"type": 'dns', "value": domain_name})
-        payload = {"identifiers": identifiers}
-
-        # 请求创建订单
-        res = self.acmeRequest(self.__apis['newOrder'], payload)
-        if not res.status_code in [201]:  # 如果创建失败
-            e_body = res.json()
-            if 'type' in e_body:
-                # 如果随机数失效
-                if e_body['type'].find('error:badNonce') != -1:
-                    self.getNonce(force=True)
-                    res = self.acmeRequest(self.__apis['newOrder'], payload)
-
-                # 如果帐户失效
-                if e_body['detail'].find('KeyID header contained an invalid account URL') != -1:
-                    k = self._mod_index[self.__debug]
-                    del(self.__config['account'][k])
-                    self.getKid()
-                    self.getNonce(force=True)
-                    res = self.acmeRequest(self.__apis['newOrder'], payload)
-            if not res.status_code in [201]:
-                a_auth = res.json()
-
-                ret_title = self.getError(str(a_auth))
-                raise StopIteration("{0} >>>> {1}".format(
-                    ret_title, json.dumps(a_auth)))
-
-        # 返回验证地址和验证
-        s_json = res.json()
-        s_json['auth_type'] = auth_type
-        s_json['domains'] = domains
-        s_json['auth_to'] = auth_to
-        index = self.saveOrder(s_json, index)
-        return index
-
-    # 检查验证状态
-    def checkAuthStatus(self, url, desired_status=None):
-        desired_status = desired_status or ["pending", "valid", "invalid"]
-        number_of_checks = 0
-        while True:
-            if desired_status == ['valid', 'invalid']:
-                writeLog("|-第{}次查询验证结果..".format(number_of_checks + 1))
-                time.sleep(self.__wait_time)
-            check_authorization_status_response = self.acmeRequest(url, "")
-            a_auth = check_authorization_status_response.json()
-            authorization_status = a_auth["status"]
-            number_of_checks += 1
-            if authorization_status in desired_status:
-                if authorization_status == "invalid":
-                    writeLog("|-验证失败!")
-                    try:
-                        if 'error' in a_auth['challenges'][0]:
-                            ret_title = a_auth['challenges'][
-                                0]['error']['detail']
-                        elif 'error' in a_auth['challenges'][1]:
-                            ret_title = a_auth['challenges'][
-                                1]['error']['detail']
-                        elif 'error' in a_auth['challenges'][2]:
-                            ret_title = a_auth['challenges'][
-                                2]['error']['detail']
-                        else:
-                            ret_title = str(a_auth)
-                        ret_title = self.getError(ret_title)
-                    except:
-                        ret_title = str(a_auth)
-                    raise StopIteration("{0} >>>> {1}".format(
-                        ret_title, json.dumps(a_auth)))
-                break
-
-            if number_of_checks == self.__max_check_num:
-                raise StopIteration(
-                    "错误：已尝试验证{0}次. 最大验证次数为{1}. 验证时间间隔为{2}秒.".format(
-                        number_of_checks,
-                        self.__max_check_num,
-                        self.__wait_time
-                    )
-                )
-        if desired_status == ['valid', 'invalid']:
-            writeLog("|-验证成功!")
-        return check_authorization_status_response
-
-    # 发送验证请求
-    def respondToChallenge(self, auth):
-        payload = {"keyAuthorization": "{0}".format(
-            auth['acme_keyauthorization'])}
-        respond_to_challenge_response = self.acmeRequest(
-            auth['dns_challenge_url'], payload)
-        return respond_to_challenge_response
-
-    # 检查DNS记录
-    def checkDns(self, domain, value, s_type='TXT'):
-        writeLog(
-            "|-尝试本地验证DNS记录,域名: {} , 类型: {} 记录值: {}".format(domain, s_type, value))
-        time.sleep(10)
-        n = 0
-        while n < 20:
-            n += 1
-            try:
-                import dns.resolver
-                ns = dns.resolver.query(domain, s_type)
-                for j in ns.response.answer:
-                    for i in j.items:
-                        txt_value = i.to_text().replace('"', '').strip()
-                        writeLog("|-第 {} 次验证值: {}".format(n, txt_value))
-                        if txt_value == value:
-                            write_log("|-本地验证成功!")
-                            return True
-            except:
-                try:
-                    import dns.resolver
-                except:
-                    return False
-            time.sleep(3)
-        writeLog("|-本地验证失败!")
-        return True
-
-    def authDomain(self, index):
-        if not index in self.__config['orders']:
-            raise Exception('指定订单不存在!')
-
-        # 开始验证
-        for auth in self.__config['orders'][index]['auths']:
-            res = self.checkAuthStatus(auth['url'])  # 检查是否需要验证
-            if res.json()['status'] == 'pending':
-                if auth['type'] == 'dns':  # 尝试提前验证dns解析
-                    self.checkDns(
-                        "_acme-challenge.{}".format(
-                            auth['domain'].replace('*.', '')),
-                        auth['auth_value'],
-                        "TXT"
-                    )
-                self.respondToChallenge(auth)
-
-        # 检查验证结果
-        for i in range(len(self.__config['orders'][index]['auths'])):
-            self.checkAuthStatus(self.__config['orders'][index]['auths'][i]['url'], [
-                'valid', 'invalid'])
-            self.__config['orders'][index]['status'] = 'valid'
-
-    # 构造可选名称
-    def getAltNames(self, index):
-        domain_name = self.__config['orders'][index]['domains'][0]
-        domain_alt_names = []
-        if len(self.__config['orders'][index]['domains']) > 1:
-            domain_alt_names = self.__config['orders'][index]['domains'][1:]
-        return domain_name, domain_alt_names
-
-    # 创建CSR
-    def createCsr(self, index):
-        if 'csr' in self.__config['orders'][index]:
-            return self.__config['orders']['csr']
-        domain_name, domain_alt_names = self.getAltNames(index)
-        X509Req = OpenSSL.crypto.X509Req()
-        X509Req.get_subject().CN = domain_name
-        if domain_alt_names:
-            SAN = "DNS:{0}, ".format(domain_name).encode("utf8") + ", ".join(
-                "DNS:" + i for i in domain_alt_names
-            ).encode("utf8")
-        else:
-            SAN = "DNS:{0}".format(domain_name).encode("utf8")
-
-        X509Req.add_extensions(
-            [
-                OpenSSL.crypto.X509Extension(
-                    "subjectAltName".encode("utf8"), critical=False, value=SAN
-                )
-            ]
-        )
-        pk = OpenSSL.crypto.load_privatekey(
-            OpenSSL.crypto.FILETYPE_PEM, self.createCertificateKey(
-                index).encode()
-        )
-        X509Req.set_pubkey(pk)
-        # X509Req.set_version(2)
-        X509Req.set_version(0)
-        X509Req.sign(pk, self.__digest)
-        return OpenSSL.crypto.dump_certificate_request(OpenSSL.crypto.FILETYPE_ASN1, X509Req)
-
-    # 获取证书密钥对
-    def createCertificateKey(self, index):
-        # 判断是否已经创建private_key
-        if 'private_key' in self.__config['orders'][index]:
-            return self.__config['orders'][index]['private_key']
-        # 创建新的私钥
-        private_key = self.createKey()
-        if type(private_key) == bytes:
-            private_key = private_key.decode()
-        # 保存私钥到订单配置文件
-        self.__config['orders'][index]['private_key'] = private_key
-        self.saveConfig()
-        return private_key
-
-    # 发送CSR
-    def sendCsr(self, index):
-        csr = self.createCsr(index)
-        payload = {"csr": self.calculateSafeBase64(csr)}
-        send_csr_response = self.acmeRequest(
-            url=self.__config['orders'][index]['finalize'], payload=payload)
-        if send_csr_response.status_code not in [200, 201]:
-            raise ValueError(
-                "错误： 发送CSR: 响应状态{status_code} 响应值:{response}".format(
-                    status_code=send_csr_response.status_code,
-                    response=send_csr_response.json(),
-                )
-            )
-        send_csr_response_json = send_csr_response.json()
-        certificate_url = send_csr_response_json["certificate"]
-        self.__config['orders'][index]['certificate_url'] = certificate_url
-        self.saveConfig()
-        return certificate_url
-
-    # 转换时间
-    def strfDate(self, sdate):
-        return time.strftime('%Y-%m-%d', time.strptime(sdate, '%Y%m%d%H%M%S'))
-
-    # 证书转为DER
-    def dumpDer(self, cert_path):
-        cert = OpenSSL.crypto.load_certificate(
-            OpenSSL.crypto.FILETYPE_PEM, mw.readFile(cert_path + '/cert.csr'))
-        return OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_ASN1, cert)
-
-    # 证书转为pkcs12
-    def dumpPkcs12(self, key_pem=None, cert_pem=None, ca_pem=None, friendly_name=None):
-        p12 = OpenSSL.crypto.PKCS12()
-        if cert_pem:
-            p12.set_certificate(OpenSSL.crypto.load_certificate(
-                OpenSSL.crypto.FILETYPE_PEM, cert_pem.encode()))
-        if key_pem:
-            p12.set_privatekey(OpenSSL.crypto.load_privatekey(
-                OpenSSL.crypto.FILETYPE_PEM, key_pem.encode()))
-        if ca_pem:
-            p12.set_ca_certificates((OpenSSL.crypto.load_certificate(
-                OpenSSL.crypto.FILETYPE_PEM, ca_pem.encode()),))
-        if friendly_name:
-            p12.set_friendlyname(friendly_name.encode())
-        return p12.export()
-
-    # 拆分根证书
-    def splitCaData(self, cert):
-        sp_key = '-----END CERTIFICATE-----\n'
-        datas = cert.split(sp_key)
-        return {"cert": datas[0] + sp_key, "root": sp_key.join(datas[1:])}
-
-    # 获取指定证书基本信息
-    def getCertInit(self, pem_file):
-        if not os.path.exists(pem_file):
-            return None
-        try:
-            result = {}
-            x509 = OpenSSL.crypto.load_certificate(
-                OpenSSL.crypto.FILETYPE_PEM, mw.readFile(pem_file))
-            # 取产品名称
-            issuer = x509.get_issuer()
-            result['issuer'] = ''
-            if hasattr(issuer, 'CN'):
-                result['issuer'] = issuer.CN
-            if not result['issuer']:
-                is_key = [b'0', '0']
-                issue_comp = issuer.get_components()
-                if len(issue_comp) == 1:
-                    is_key = [b'CN', 'CN']
-                for iss in issue_comp:
-                    if iss[0] in is_key:
-                        result['issuer'] = iss[1].decode()
-                        break
-            # 取到期时间
-            result['notAfter'] = self.strfDate(
-                bytes.decode(x509.get_notAfter())[:-1])
-            # 取申请时间
-            result['notBefore'] = self.strfDate(
-                bytes.decode(x509.get_notBefore())[:-1])
-            # 取可选名称
-            result['dns'] = []
-            for i in range(x509.get_extension_count()):
-                s_name = x509.get_extension(i)
-                if s_name.get_short_name() in [b'subjectAltName', 'subjectAltName']:
-                    s_dns = str(s_name).split(',')
-                    for d in s_dns:
-                        result['dns'].append(d.split(':')[1])
-            subject = x509.get_subject().get_components()
-            # 取主要认证名称
-            if len(subject) == 1:
-                result['subject'] = subject[0][1].decode()
-            else:
-                result['subject'] = result['dns'][0]
-            return result
-        except:
-            return None
-
-    # 替换服务器上的同域名同品牌证书
-    def subAllCert(self, key_file, pem_file):
-        cert_init = self.getCertInit(pem_file)  # 获取新证书的基本信息
-        paths = ['/www/server/mdserver-web/data/letsencrypt']
-        is_panel = False
-        for path in paths:
-            if not os.path.exists(path):
-                continue
-            for p_name in os.listdir(path):
-                to_path = path + '/' + p_name
-                to_pem_file = to_path + '/fullchain.pem'
-                to_key_file = to_path + '/privkey.pem'
-                to_info = to_path + '/info.json'
-                # 判断目标证书是否存在
-                if not os.path.exists(to_pem_file):
-                    if not p_name in ['ssl']:
-                        continue
-                    to_pem_file = to_path + '/certificate.pem'
-                    to_key_file = to_path + '/privateKey.pem'
-                    if not os.path.exists(to_pem_file):
-                        continue
-                    if path == paths[-1]:
-                        is_panel = True
-                # 获取目标证书的基本信息
-                to_cert_init = self.getCertInit(to_pem_file)
-                # 判断证书品牌是否一致
-                try:
-                    if to_cert_init['issuer'] != cert_init['issuer'] and to_cert_init['issuer'].find("Let's Encrypt") == -1 and to_cert_init['issuer'] != 'R3':
-                        continue
-                except:
-                    continue
-                # 判断目标证书的到期时间是否较早
-                if to_cert_init['notAfter'] > cert_init['notAfter']:
-                    continue
-                # 判断认识名称是否一致
-                if len(to_cert_init['dns']) != len(cert_init['dns']):
-                    continue
-                is_copy = True
-                for domain in to_cert_init['dns']:
-                    if not domain in cert_init['dns']:
-                        is_copy = False
-                if not is_copy:
-                    continue
-
-                # 替换新的证书文件和基本信息
-                mw.writeFile(to_pem_file, mw.readFile(pem_file, 'rb'), 'wb')
-                mw.writeFile(to_key_file, mw.readFile(key_file, 'rb'), 'wb')
-                mw.writeFile(to_info, json.dumps(cert_init))
-                writeLog("|-检测到{}下的证书与本次申请的证书重叠，且到期时间较早，已替换为新证书!".format(to_path))
-        # 重载web服务
-        mw.restartWeb()
-
-    # 保存证书到文件
-    def saveCert(self, cert, index):
-        try:
-            domain_name = self.__config['orders'][index]['domains'][0]
-            path = self.__config['orders'][index]['save_path']
-            if not os.path.exists(path):
-                os.makedirs(path, 384)
-
-            # 存储证书
-            key_file = path + "/privkey.pem"
-            pem_file = path + "/fullchain.pem"
-            mw.writeFile(key_file, cert['private_key'])
-            mw.writeFile(pem_file, cert['cert'] + cert['root'])
-            mw.writeFile(path + "/cert.csr", cert['cert'])
-            mw.writeFile(path + "/root_cert.csr", cert['root'])
-
-            # 转为IIS证书
-            pfx_buffer = self.dumpPkcs12(
-                cert['private_key'], cert['cert'] + cert['root'], cert['root'], domain_name)
-            mw.writeFile(path + "/fullchain.pfx", pfx_buffer, 'wb+')
-
-            ps = '''文件说明：
-privkey.pem     证书私钥
-fullchain.pem   包含证书链的PEM格式证书(nginx/apache)
-root_cert.csr   根证书
-cert.csr        域名证书
-fullchain.pfx   用于IIS的证书格式
-
-如何在MW面板使用：
-privkey.pem         粘贴到密钥输入框
-fullchain.pem       粘贴到证书输入框
-'''
-            mw.writeFile(path + '/readme.txt', ps)
-            self.subAllCert(key_file, pem_file)
-        except:
-            writeLog(mw.getTracebackInfo())
-
-    # 获取证书到期时间
-    def getCertTimeout(self, cret_data):
-        try:
-            x509 = OpenSSL.crypto.load_certificate(
-                OpenSSL.crypto.FILETYPE_PEM, cret_data)
-            cert_timeout = bytes.decode(x509.get_notAfter())[:-1]
-            return int(time.mktime(time.strptime(cert_timeout, '%Y%m%d%H%M%S')))
-        except:
-            return int(time.time() + (86400 * 90))
-
-    # 下载证书
-    def downloadCert(self, index):
-        res = self.acmeRequest(
-            self.__config['orders'][index]['certificate_url'], "")
-        if res.status_code not in [200, 201]:
-            raise Exception("下载证书失败: {}".format(res.json()))
-
-        pem_certificate = res.content
-        if type(pem_certificate) == bytes:
-            pem_certificate = pem_certificate.decode('utf-8')
-        cert = self.splitCaData(pem_certificate)
-        cert['cert_timeout'] = self.getCertTimeout(cert['cert'])
-        cert['private_key'] = self.__config['orders'][index]['private_key']
-        cert['domains'] = self.__config['orders'][index]['domains']
-        del(self.__config['orders'][index]['private_key'])
-        del(self.__config['orders'][index]['auths'])
-        del(self.__config['orders'][index]['expires'])
-        del(self.__config['orders'][index]['authorizations'])
-        del(self.__config['orders'][index]['finalize'])
-        del(self.__config['orders'][index]['identifiers'])
-        if 'cert' in self.__config['orders'][index]:
-            del(self.__config['orders'][index]['cert'])
-        self.__config['orders'][index]['status'] = 'valid'
-        self.__config['orders'][index]['cert_timeout'] = cert['cert_timeout']
-        domain_name = self.__config['orders'][index]['domains'][0]
-        self.__config['orders'][index]['save_path'] = '{}/{}'.format(
-            self.__save_path, domain_name)
-        cert['save_path'] = self.__config['orders'][index]['save_path']
-        self.saveConfig()
-        self.saveCert(cert, index)
-        return cert
-
-    def applyCert(self, domains, auth_type='http', auth_to='Dns_com|None|None', args={}):
-        writeLog("", "wb+")
-        try:
-            self.getApis()
-            index = None
-            if 'index' in args and args.index:
-                index = args.index
-            if not index:
-                # 判断是否只想验证域名
-                writeLog("|-正在创建订单..")
-                index = self.createOrder(domains, auth_type, auth_to)
-                writeLog("|-正在获取验证信息..")
-                self.getAuths(index)
-                if auth_to == 'dns' and len(self.__config['orders'][index]['auths']) > 0:
-                    return self.__config['orders'][index]
-            writeLog("|-正在验证域名..")
-            self.authDomain(index)
-
-            writeLog("|-正在发送CSR..")
-            self.sendCsr(index)
-
-            writeLog("|-正在下载证书..")
-            cert = self.downloadCert(index)
-
-            # 保存证书配置
-            self.saveConfig()
-            cert['status'] = True
-            cert['msg'] = '申请成功!'
-            writeLog("|-申请成功，正在部署到站点..")
-            return cert
-        except Exception as ex:
-            ex = str(ex)
-            if ex.find(">>>>") != -1:
-                msg = ex.split(">>>>")
-                msg[1] = json.loads(msg[1])
-            else:
-                msg = ex
-                writeLog(mw.getTracebackInfo())
-
-            cert = {}
-            cert['status'] = False
-            cert['msg'] = msg
-            return cert
-
-    # 取根域名和记录值
-    def extractZone(self, domain_name):
-        top_domain_list = ['.ac.cn', '.ah.cn', '.bj.cn', '.com.cn', '.cq.cn', '.fj.cn', '.gd.cn', '.gov.cn', '.gs.cn',
-                           '.gx.cn', '.gz.cn', '.ha.cn', '.hb.cn', '.he.cn', '.hi.cn', '.hk.cn', '.hl.cn', '.hn.cn',
-                           '.jl.cn', '.js.cn', '.jx.cn', '.ln.cn', '.mo.cn', '.net.cn', '.nm.cn', '.nx.cn', '.org.cn',
-                           '.my.id', '.com.ac', '.com.ad', '.com.ae', '.com.af', '.com.ag', '.com.ai', '.com.al', '.com.am',
-                           '.com.an', '.com.ao', '.com.aq', '.com.ar', '.com.as', '.com.as', '.com.at', '.com.au', '.com.aw',
-                           '.com.az', '.com.ba', '.com.bb', '.com.bd', '.com.be', '.com.bf', '.com.bg', '.com.bh', '.com.bi',
-                           '.com.bj', '.com.bm', '.com.bn', '.com.bo', '.com.br', '.com.bs', '.com.bt', '.com.bv', '.com.bw',
-                           '.com.by', '.com.bz', '.com.ca', '.com.ca', '.com.cc', '.com.cd', '.com.cf', '.com.cg', '.com.ch',
-                           '.com.ci', '.com.ck', '.com.cl', '.com.cm', '.com.cn', '.com.co', '.com.cq', '.com.cr', '.com.cu',
-                           '.com.cv', '.com.cx', '.com.cy', '.com.cz', '.com.de', '.com.dj', '.com.dk', '.com.dm', '.com.do',
-                           '.com.dz', '.com.ec', '.com.ee', '.com.eg', '.com.eh', '.com.es', '.com.et', '.com.eu', '.com.ev',
-                           '.com.fi', '.com.fj', '.com.fk', '.com.fm', '.com.fo', '.com.fr', '.com.ga', '.com.gb', '.com.gd',
-                           '.com.ge', '.com.gf', '.com.gh', '.com.gi', '.com.gl', '.com.gm', '.com.gn', '.com.gp', '.com.gr',
-                           '.com.gt', '.com.gu', '.com.gw', '.com.gy', '.com.hm', '.com.hn', '.com.hr', '.com.ht', '.com.hu',
-                           '.com.id', '.com.id', '.com.ie', '.com.il', '.com.il', '.com.in', '.com.io', '.com.iq', '.com.ir',
-                           '.com.is', '.com.it', '.com.jm', '.com.jo', '.com.jp', '.com.ke', '.com.kg', '.com.kh', '.com.ki',
-                           '.com.km', '.com.kn', '.com.kp', '.com.kr', '.com.kw', '.com.ky', '.com.kz', '.com.la', '.com.lb',
-                           '.com.lc', '.com.li', '.com.lk', '.com.lr', '.com.ls', '.com.lt', '.com.lu', '.com.lv', '.com.ly',
-                           '.com.ma', '.com.mc', '.com.md', '.com.me', '.com.mg', '.com.mh', '.com.ml', '.com.mm', '.com.mn',
-                           '.com.mo', '.com.mp', '.com.mq', '.com.mr', '.com.ms', '.com.mt', '.com.mv', '.com.mw', '.com.mx',
-                           '.com.my', '.com.mz', '.com.na', '.com.nc', '.com.ne', '.com.nf', '.com.ng', '.com.ni', '.com.nl',
-                           '.com.no', '.com.np', '.com.nr', '.com.nr', '.com.nt', '.com.nu', '.com.nz', '.com.om', '.com.pa',
-                           '.com.pe', '.com.pf', '.com.pg', '.com.ph', '.com.pk', '.com.pl', '.com.pm', '.com.pn', '.com.pr',
-                           '.com.pt', '.com.pw', '.com.py', '.com.qa', '.com.re', '.com.ro', '.com.rs', '.com.ru', '.com.rw',
-                           '.com.sa', '.com.sb', '.com.sc', '.com.sd', '.com.se', '.com.sg', '.com.sh', '.com.si', '.com.sj',
-                           '.com.sk', '.com.sl', '.com.sm', '.com.sn', '.com.so', '.com.sr', '.com.st', '.com.su', '.com.sy',
-                           '.com.sz', '.com.tc', '.com.td', '.com.tf', '.com.tg', '.com.th', '.com.tj', '.com.tk', '.com.tl',
-                           '.com.tm', '.com.tn', '.com.to', '.com.tp', '.com.tr', '.com.tt', '.com.tv', '.com.tw', '.com.tz',
-                           '.com.ua', '.com.ug', '.com.uk', '.com.uk', '.com.us', '.com.uy', '.com.uz', '.com.va', '.com.vc',
-                           '.com.ve', '.com.vg', '.com.vn', '.com.vu', '.com.wf', '.com.ws', '.com.ye', '.com.za', '.com.zm',
-                           '.com.zw', '.mil.cn', '.qh.cn', '.sc.cn', '.sd.cn', '.sh.cn', '.sx.cn', '.tj.cn', '.tw.cn', '.tw.cn',
-                           '.xj.cn', '.xz.cn', '.yn.cn', '.zj.cn', '.bj.cn', '.edu.kg'
-                           ]
-        old_domain_name = domain_name
-        top_domain = "." + ".".join(domain_name.rsplit('.')[-2:])
-        new_top_domain = "." + top_domain.replace(".", "")
-        is_tow_top = False
-        if top_domain in top_domain_list:
-            is_tow_top = True
-            domain_name = domain_name[:-len(top_domain)] + new_top_domain
-
-        if domain_name.count(".") > 1:
-            zone, middle, last = domain_name.rsplit(".", 2)
-            if is_tow_top:
-                last = top_domain[1:]
-            root = ".".join([middle, last])
-        else:
-            zone = ""
-            root = old_domain_name
-        return root, zone
-
-    # 获取当前正在使用此证书的网站目录
-    def getSslUsedSite(self, save_path):
-        pkey_file = '{}/privkey.pem'.format(save_path)
-        pkey = mw.readFile(pkey_file)
-        if not pkey:
-            return False
-        cert_paths = 'vhost/cert'
-        import panelSite
-        args = mw.dict_obj()
-        args.siteName = ''
-        for c_name in os.listdir(cert_paths):
-            skey_file = '{}/{}/privkey.pem'.format(cert_paths, c_name)
-            skey = mw.readFile(skey_file)
-            if not skey:
-                continue
-            if skey == pkey:
-                args.siteName = c_name
-                run_path = panelSite.panelSite().GetRunPath(args)
-                if not run_path:
-                    continue
-                sitePath = mw.M('sites').where(
-                    'name=?', c_name).getField('path')
-                if not sitePath:
-                    continue
-                to_path = "{}/{}".format(sitePath, run_path)
-                return to_path
-        return False
-
-    def renewCertOther(self):
-        cert_path = "{}/vhost/cert".format(mw.getRunDir())
-        if not os.path.exists(cert_path):
-            return
-        new_time = time.time() + (86400 * 30)
-        n = 0
-        if not 'orders' in self.__config:
-            self.__config['orders'] = {}
-        import panelSite
-        siteObj = panelSite.panelSite()
-        args = mw.dict_obj()
-        for siteName in os.listdir(cert_path):
-            try:
-                cert_file = '{}/{}/fullchain.pem'.format(cert_path, siteName)
-                if not os.path.exists(cert_file):
-                    continue  # 无证书文件
-                siteInfo = mw.M('sites').where('name=?', siteName).find()
-                if not siteInfo:
-                    continue  # 无网站信息
-                cert_init = self.getCertInit(cert_file)
-                if not cert_init:
-                    continue  # 无法获取证书
-                end_time = time.mktime(time.strptime(
-                    cert_init['notAfter'], '%Y-%m-%d'))
-                if end_time > new_time:
-                    continue  # 未到期
-                try:
-                    if not cert_init['issuer'] in ['R3', "Let's Encrypt"] and cert_init['issuer'].find("Let's Encrypt") == -1:
-                        continue  # 非同品牌证书
-                except:
-                    continue
-
-                if isinstance(cert_init['dns'], str):
-                    cert_init['dns'] = [cert_init['dns']]
-                index = self.getIndex(cert_init['dns'])
-                if index in self.__config['orders'].keys():
-                    continue  # 已在订单列表
-
-                n += 1
-                writeLog(
-                    "|-正在续签第 {} 张其它证书，域名: {}..".format(n, cert_init['subject']))
-                writeLog("|-正在创建订单..")
-                args.id = siteInfo['id']
-                runPath = siteObj.GetRunPath(args)
-                if runPath and not runPath in ['/']:
-                    path = siteInfo['path'] + '/' + runPath
-                else:
-                    path = siteInfo['path']
-            except:
-                write_log("|-[{}]续签失败".format(siteName))
-
-    # 外部API - START ----------------------------------------------------------
-    def applyCertApi(self, args):
-        '''
-        申请证书 - api
-        '''
-        return self.applyCert(args['domains'], args['auth_type'], args['auth_to'])
-    # 外部API - END ----------------------------------------------------------
-
-    def renewCert(self, index):
-        writeLog("", "wb+")
-        # self.D('renew_cert', index)
-        try:
-            order_index = []
-            if index:
-                if type(index) != str:
-                    index = index.index
-                if not index in self.__config['orders']:
-                    raise Exception("指定订单号不存在，无法续签!")
-                order_index.append(index)
-            else:
-                start_time = time.time() + (30 * 86400)
-                # print(self.__config)
-                if not 'orders' in self.__config:
-                    self.__config['orders'] = {}
-
-                for i in self.__config['orders'].keys():
-                    # print(self.__config['orders'][i])
-                    if not 'save_path' in self.__config['orders'][i]:
-                        continue
-
-                    if 'cert' in self.__config['orders'][i]:
-                        self.__config['orders'][i]['cert_timeout'] = self.__config[
-                            'orders'][i]['cert']['cert_timeout']
-
-                    if not 'cert_timeout' in self.__config['orders'][i]:
-                        self.__config['orders'][i][
-                            'cert_timeout'] = int(time.time())
-
-                    if self.__config['orders'][i]['cert_timeout'] > start_time:
-                        writeLog(
-                            "|-本次跳过域名: {}，未过期!".format(self.__config['orders'][i]['domains'][0]))
-                        continue
-
-                    # 已删除的网站直接跳过续签
-                    if self.__config['orders'][i]['auth_to'].find('|') == -1 and self.__config['orders'][i]['auth_to'].find('/') != -1:
-                        if not os.path.exists(self.__config['orders'][i]['auth_to']):
-                            auth_to = self.getSslUsedSite(
-                                self.__config['orders'][i]['save_path'])
-                            if not auth_to:
-                                continue
-
-                            # 域名不存在？
-                            for domain in self.__config['orders'][i]['domains']:
-                                if domain.find('*') != -1:
-                                    break
-                                if not mw.M('domain').where("name=?", (domain,)).count() and not mw.M('binding').where("domain=?", domain).count():
-                                    auth_to = None
-                                    writeLog(
-                                        "|-跳过被删除的域名: {}".format(self.__config['orders'][i]['domains']))
-                            if not auth_to:
-                                continue
-
-                            self.__config['orders'][i]['auth_to'] = auth_to
-
-                    # 是否到了允许重试的时间
-                    if 'next_retry_time' in self._config['orders'][i]:
-                        timeout = self.__config['orders'][i][
-                            'next_retry_time'] - int(time.time())
-                        if timeout > 0:
-                            writeLog('|-本次跳过域名:{}，因第上次续签失败，还需要等待{}小时后再重试'.format(
-                                self.__config['orders'][i]['domains'], int(timeout / 60 / 60)))
-                            continue
-
-                    # 是否到了最大重试次数
-                    if 'retry_count' in self.__config['orders'][i]:
-                        if self.__config['orders'][i]['retry_count'] >= 5:
-                            writeLog('|-本次跳过域名:{}，因连续5次续签失败，不再续签此证书(可尝试手动续签此证书，成功后错误次数将被重置)'.format(
-                                self.__config['orders'][i]['domains']))
-                            continue
-
-                    # 加入到续签订单
-                    order_index.append(i)
-                if not order_index:
-                    writeLog("|-没有找到30天内到期的SSL证书，正在尝试去寻找其它可续签证书!")
-                    self.getApis()
-                    # self.renewCertOther()
-                    writeLog("|-所有任务已处理完成!")
-                    return
-            writeLog("|-共需要续签 {} 张证书".format(len(order_index)))
-        except Exception as ex:
-            ex = str(ex)
-            if ex.find(">>>>") != -1:
-                msg = ex.split(">>>>")
-                msg[1] = json.loads(msg[1])
-            else:
-                msg = ex
-                writeLog(mw.getTracebackInfo())
-            return mw.returnJson(False, msg)
-
-    def revokeOrder(self, index):
-        if not index in self.__config['orders']:
-            raise Exception("指定订单不存在!")
-        cert_path = self.__config['orders'][index]['save_path']
-        if not os.path.exists(cert_path):
-            raise Exception("指定订单没有找到可用的证书!")
-        cert = self.dumpDer(cert_path)
-        if not cert:
-            raise Exception("证书读取失败!")
-        payload = {
-            "certificate": self.calculateSafeBase64(cert),
-            "reason": 4
-        }
-
-        self.getApis()
-        res = self.acmeRequest(self.__apis['revokeCert'], payload)
-        if res.status_code in [200, 201]:
-            if os.path.exists(cert_path):
-                mw.execShell("rm -rf {}".format(cert_path))
-            del(self.__config['orders'][index])
-            self.saveConfig()
-            return mw.returnJson(True, "证书吊销成功!")
-        return res.json()
-
-    def do(self, args):
-        cert = None
-        try:
-            if not args.index:
-                if not args.domains:
-                    echoErr("请在--domain参数中指定要申请证书的域名，多个以逗号(,)隔开")
-                if not args.auth_type in ['http', 'tls']:
-                    echoErr("请在--type参数中指定正确的验证类型，http")
-
-                auth_to = ''
-                if args.auth_type in ['http', 'tls']:
-                    if not args.path:
-                        echoErr("请在--path参数中指定网站根目录!")
-                    if not os.path.exists(args.path):
-                        echoErr("指定网站根目录不存在，请检查：{}".format(args.path))
-                    auth_to = args.path
-                else:
-                    echoErr("仅支持文件验证!")
-                    exit()
-
-                domains = args.domains.strip().split(',')
-                cert = self.applyCert(
-                    domains, auth_type=args.auth_type, auth_to=auth_to, args=args)
-            else:
-                # 重新验证
-                cert = self.applyCert([], auth_type='dns',
-                                      auth_to='dns', index=args.index)
-        except Exception as e:
-            writeLog("|-{}".format(mw.getTracebackInfo()))
-            exit()
-
-        if not cert:
-            exit()
-
-        # print(cert)
-        if not cert['status']:
-            writeLog('|-' + cert['msg'][0])
-            exit()
-        writeLog("=" * 65)
-        writeLog("|-证书获取成功!")
-        writeLog("=" * 65)
-        writeLog("证书到期时间: {}".format(
-            mw.formatDate(times=cert['cert_timeout'])))
-        writeLog("证书已保存在: {}/".format(cert['save_path']))
-
-
-# exp:
-'''
-// create
-python3 class/core/cert_request.py --domain=dev38.cachecha.com --type=http --path=/www/wwwroot/dev38.cachecha.com
-// renew
-cd /www/server/mdserver-web && python3 class/core/cert_request.py --renew=1
-// revoke
-cd /www/server/mdserver-web && python3 class/core/cert_request.py --revoke=1 --index=370423ed29481b2caf22e36d90a6894a
-
-python3 class/core/cert_request.py --domain=dev38.cachecha.com --type=http --path=/Users/midoks/Desktop/mwdev/wwwroot/test
-python3 class/core/cert_request.py --renew=1
-python3 class/core/cert_request.py --revoke=1 --index=370423ed29481b2caf22e36d90a6894a
-'''
-if __name__ == "__main__":
-    p = argparse.ArgumentParser(usage="必要的参数：--domain 域名列表，多个以逗号隔开!")
-    p.add_argument('--domain', default=None,
-                   help="请指定要申请证书的域名", dest="domains")
-    p.add_argument('--type', default=None, help="请指定验证类型", dest="auth_type")
-    p.add_argument('--path', default=None, help="请指定网站根目录", dest="path")
-    p.add_argument('--index', default=None, help="指定订单索引", dest="index")
-    p.add_argument('--renew', default=None, help="续签证书", dest="renew")
-    p.add_argument('--revoke', default=None, help="吊销证书", dest="revoke")
-
-    args = p.parse_args()
-    cr = cert_request()
-
-    if args.revoke:
-        if not args.index:
-            echoErr("请在--index参数中传入要被吊销的订单索引")
-        result = cr.revokeOrder(args.index)
-        writeLog(result)
-        exit()
-
-    if args.renew:
-        cr.renewCert(args.index)
-        exit()
-
-    cr.do(args)
diff --git a/class/core/common.py b/class/core/common.py
deleted file mode 100755
index 9e91a4811..000000000
--- a/class/core/common.py
+++ /dev/null
@@ -1,146 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 公共操作
-# ---------------------------------------------------------------------------------
-
-import os
-import sys
-import time
-import string
-import json
-import hashlib
-import shlex
-import datetime
-import subprocess
-import re
-import hashlib
-from random import Random
-
-import mw
-import db
-
-from flask import redirect
-
-
-def init():
-    initDB()
-    initUserInfo()
-    initInitD()
-    initInitTask()
-    return True
-
-
-def local():
-    result = checkClose()
-    if result:
-        return result
-
-
-# 检查面板是否关闭
-def checkClose():
-    if os.path.exists('data/close.pl'):
-        return redirect('/close')
-
-
-def initDB():
-    try:
-        sql = db.Sql().dbfile('default')
-        csql = mw.readFile('data/sql/default.sql')
-        csql_list = csql.split(';')
-        for index in range(len(csql_list)):
-            sql.execute(csql_list[index], ())
-
-    except Exception as ex:
-        print(str(ex))
-
-
-def doContentReplace(src, dst):
-    content = mw.readFile(src)
-    content = content.replace("{$SERVER_PATH}", mw.getRunDir())
-    mw.writeFile(dst, content)
-
-
-def initInitD():
-
-    # systemctl
-    # sysCfgDir = mw.systemdCfgDir()
-    # if os.path.exists(sysCfgDir) and mw.getOsName() == 'centos' and mw.getOsID() == '9':
-    #     systemd_mw = sysCfgDir + '/mw.service'
-    #     systemd_mw_task = sysCfgDir + '/mw-task.service'
-
-    #     systemd_mw_tpl = mw.getRunDir() + '/scripts/init.d/mw.service.tpl'
-    #     systemd_mw_task_tpl = mw.getRunDir() + '/scripts/init.d/mw-task.service.tpl'
-
-    #     if os.path.exists(systemd_mw):
-    #         os.remove(systemd_mw)
-    #     if os.path.exists(systemd_mw_task):
-    #         os.remove(systemd_mw_task)
-
-    #     doContentReplace(systemd_mw_tpl, systemd_mw)
-    #     doContentReplace(systemd_mw_task_tpl, systemd_mw_task)
-
-    #     mw.execShell('systemctl enable mw')
-    #     mw.execShell('systemctl enable mw-task')
-    #     mw.execShell('systemctl daemon-reload')
-
-    script = mw.getRunDir() + '/scripts/init.d/mw.tpl'
-    script_bin = mw.getRunDir() + '/scripts/init.d/mw'
-    doContentReplace(script, script_bin)
-    mw.execShell('chmod +x ' + script_bin)
-
-    # 在linux系统中,确保/etc/init.d存在
-    if not mw.isAppleSystem() and not os.path.exists("/etc/rc.d/init.d"):
-        mw.execShell('mkdir -p /etc/rc.d/init.d')
-
-    if not mw.isAppleSystem() and not os.path.exists("/etc/init.d"):
-        mw.execShell('mkdir -p /etc/init.d')
-
-    # initd
-    if os.path.exists('/etc/rc.d/init.d'):
-        initd_bin = '/etc/rc.d/init.d/mw'
-        if not os.path.exists(initd_bin):
-            import shutil
-            shutil.copyfile(script_bin, initd_bin)
-            mw.execShell('chmod +x ' + initd_bin)
-        # 加入自启动
-        mw.execShell('which chkconfig && chkconfig --add mw')
-
-    if os.path.exists('/etc/init.d'):
-        initd_bin = '/etc/init.d/mw'
-        if not os.path.exists(initd_bin):
-            import shutil
-            shutil.copyfile(script_bin, initd_bin)
-            mw.execShell('chmod +x ' + initd_bin)
-        # 加入自启动
-        mw.execShell('which update-rc.d && update-rc.d -f mw defaults')
-
-    # 获取系统IPV4
-    mw.setHostAddr(mw.getLocalIp())
-
-
-def initInitTask():
-    # 创建证书同步命令
-    import cert_api
-    api = cert_api.cert_api()
-    api.createCertCron()
-
-
-def initUserInfo():
-
-    data = mw.M('users').where('id=?', (1,)).getField('password')
-    if data == '21232f297a57a5a743894a0e4a801fc3':
-
-        pwd = mw.getRandomString(8).lower()
-        file_pw = mw.getRunDir() + '/data/default.pl'
-        mw.writeFile(file_pw, pwd)
-        mw.M('users').where('id=?', (1,)).setField(
-            'password', mw.md5(pwd))
diff --git a/class/core/config_api.py b/class/core/config_api.py
deleted file mode 100755
index 9a89bd4d0..000000000
--- a/class/core/config_api.py
+++ /dev/null
@@ -1,1191 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 配置操作
-# ---------------------------------------------------------------------------------
-
-import psutil
-import time
-import os
-import sys
-import mw
-import re
-import json
-import pwd
-import pytz
-
-from flask import session
-from flask import request
-
-
-class config_api:
-
-    __version = '0.17.4'
-    __api_addr = 'data/api.json'
-
-    # 统一默认配置文件
-    __file = {
-        'api' : 'data/api.json',                                # API文件
-        'debug' : 'data/debug.pl',                              # DEBUG文件
-        'close' : 'data/close.pl',                              # 识别关闭面板文件
-        'basic_auth' : 'data/basic_auth.json',                  # 面板Basic验证
-        'admin_path' : 'data/admin_path.pl',                    # 面板后缀路径设置
-        'ipv6' : 'data/ipv6.pl',                                # ipv6识别文件
-        'bind_domain' : 'data/bind_domain.pl',                  # 面板域名绑定
-        'unauth_status' : 'data/unauthorized_status.pl',        # URL路径未成功显示状态
-        'auth_secret': 'data/auth_secret.pl',                   # 二次验证密钥
-        'ssl':'ssl/choose.pl',                                  # ssl设置
-        'hook_database' : 'data/hook_database.json',            # 数据库钩子
-        'hook_menu' : 'data/hook_menu.json',                    # 菜单钩子
-        'hook_global_static' : 'data/hook_global_static.json',  # 静态文件钩子
-    }
-
-    def __init__(self):
-        pass
-
-    def getVersion(self):
-        return self.__version
-
-    ##### ----- start ----- ###
-
-    # 取面板列表
-    def getPanelListApi(self):
-        data = mw.M('panel').field(
-            'id,title,url,username,password,click,addtime').order('click desc').select()
-        return mw.getJson(data)
-
-    def addPanelInfoApi(self):
-        title = request.form.get('title', '')
-        url = request.form.get('url', '')
-        username = request.form.get('username', '')
-        password = request.form.get('password', '')
-        # 校验是还是重复
-        isAdd = mw.M('panel').where(
-            'title=? OR url=?', (title, url)).count()
-        if isAdd:
-            return mw.returnJson(False, '备注或面板地址重复!')
-        isRe = mw.M('panel').add('title,url,username,password,click,addtime',
-                                 (title, url, username, password, 0, int(time.time())))
-        if isRe:
-            return mw.returnJson(True, '添加成功!')
-        return mw.returnJson(False, '添加失败!')
-
-    # 删除面板资料
-    def delPanelInfoApi(self):
-        mid = request.form.get('id', '')
-        isExists = mw.M('panel').where('id=?', (mid,)).count()
-        if not isExists:
-            return mw.returnJson(False, '指定面板资料不存在!')
-        mw.M('panel').where('id=?', (mid,)).delete()
-        return mw.returnJson(True, '删除成功!')
-
-     # 修改面板资料
-    def setPanelInfoApi(self):
-        title = request.form.get('title', '')
-        url = request.form.get('url', '')
-        username = request.form.get('username', '')
-        password = request.form.get('password', '')
-        mid = request.form.get('id', '')
-        # 校验是还是重复
-        isSave = mw.M('panel').where(
-            '(title=? OR url=?) AND id!=?', (title, url, mid)).count()
-        if isSave:
-            return mw.returnJson(False, '备注或面板地址重复!')
-
-        # 更新到数据库
-        isRe = mw.M('panel').where('id=?', (mid,)).save(
-            'title,url,username,password', (title, url, username, password))
-        if isRe:
-            return mw.returnJson(True, '修改成功!')
-        return mw.returnJson(False, '修改失败!')
-
-    def syncDateApi(self):
-        if mw.isAppleSystem():
-            return mw.returnJson(True, '开发系统不必同步时间!')
-
-        data = mw.execShell('ntpdate -s time.nist.gov')
-        if data[0] == '':
-            return mw.returnJson(True, '同步成功!')
-        return mw.returnJson(False, '同步失败:' + data[0])
-
-    def setPasswordApi(self):
-        password1 = request.form.get('password1', '')
-        password2 = request.form.get('password2', '')
-        if password1 != password2:
-            return mw.returnJson(False, '两次输入的密码不一致，请重新输入!')
-        if len(password1) < 5:
-            return mw.returnJson(False, '用户密码不能小于5位!')
-        mw.M('users').where("username=?", (session['username'],)).setField(
-            'password', mw.md5(password1.strip()))
-        return mw.returnJson(True, '密码修改成功!')
-
-    def setNameApi(self):
-        name1 = request.form.get('name1', '')
-        name2 = request.form.get('name2', '')
-        if name1 != name2:
-            return mw.returnJson(False, '两次输入的用户名不一致，请重新输入!')
-        if len(name1) < 3:
-            return mw.returnJson(False, '用户名长度不能少于3位')
-
-        mw.M('users').where("username=?", (session['username'],)).setField(
-            'username', name1.strip())
-
-        session['username'] = name1
-        return mw.returnJson(True, '用户修改成功!')
-
-    def setWebnameApi(self):
-        webname = request.form.get('webname', '')
-        if webname != mw.getConfig('title'):
-            mw.setConfig('title', webname)
-        return mw.returnJson(True, '面板别名保存成功!')
-
-    def setPortApi(self):
-        port = request.form.get('port', '')
-        if port != mw.getHostPort():
-            import system_api
-            import firewall_api
-
-            sysCfgDir = mw.systemdCfgDir()
-            if os.path.exists(sysCfgDir + "/firewalld.service"):
-                if not firewall_api.firewall_api().getFwStatus():
-                    return mw.returnJson(False, 'firewalld必须先启动!')
-
-            mw.setHostPort(port)
-
-            msg = mw.getInfo('放行端口[{1}]成功', (port,))
-            mw.writeLog("防火墙管理", msg)
-            addtime = time.strftime('%Y-%m-%d %X', time.localtime())
-            mw.M('firewall').add('port,ps,addtime', (port, "配置修改", addtime))
-
-            firewall_api.firewall_api().addAcceptPort(port)
-            firewall_api.firewall_api().firewallReload()
-
-            system_api.system_api().restartMw()
-
-        return mw.returnJson(True, '端口保存成功!')
-
-    def setIpApi(self):
-        host_ip = request.form.get('host_ip', '')
-        if host_ip != mw.getHostAddr():
-            mw.setHostAddr(host_ip)
-        return mw.returnJson(True, 'IP保存成功!')
-
-    def setWwwDirApi(self):
-        sites_path = request.form.get('sites_path', '')
-        if sites_path != mw.getWwwDir():
-            mw.setWwwDir(sites_path)
-        return mw.returnJson(True, '修改默认建站目录成功!')
-
-    def setBackupDirApi(self):
-        backup_path = request.form.get('backup_path', '')
-        if backup_path != mw.getBackupDir():
-            mw.setBackupDir(backup_path)
-        return mw.returnJson(True, '修改默认备份目录成功!')
-
-    def setBasicAuthApi(self):
-        basic_user = request.form.get('basic_user', '').strip()
-        basic_pwd = request.form.get('basic_pwd', '').strip()
-        basic_open = request.form.get('is_open', '').strip()
-
-        salt = '_md_salt'
-        path = self.__file['basic_auth']
-        is_open = True
-
-        if basic_open == 'false':
-            if os.path.exists(path):
-                os.remove(path)
-            return mw.returnJson(True, '删除BasicAuth成功!')
-
-        if basic_user == '' or basic_pwd == '':
-            return mw.returnJson(True, '用户和密码不能为空!')
-
-        ba_conf = None
-        if os.path.exists(path):
-            try:
-                ba_conf = json.loads(public.readFile(path))
-            except:
-                os.remove(path)
-
-        if not ba_conf:
-            ba_conf = {
-                "basic_user": mw.md5(basic_user + salt),
-                "basic_pwd": mw.md5(basic_pwd + salt),
-                "open": is_open
-            }
-        else:
-            ba_conf['basic_user'] = mw.md5(basic_user + salt)
-            ba_conf['basic_pwd'] = mw.md5(basic_pwd + salt)
-            ba_conf['open'] = is_open
-
-        mw.writeFile(path, json.dumps(ba_conf))
-        os.chmod(path, 384)
-        mw.writeLog('面板设置', '设置BasicAuth状态为: %s' % is_open)
-
-        mw.restartMw()
-        return mw.returnJson(True, '设置成功!')
-
-    def setApi(self):
-        webname = request.form.get('webname', '')
-        port = request.form.get('port', '')
-        host_ip = request.form.get('host_ip', '')
-        domain = request.form.get('domain', '')
-        sites_path = request.form.get('sites_path', '')
-        backup_path = request.form.get('backup_path', '')
-
-        if domain != '':
-            reg = "^([\\w\\-\\*]{1,100}\\.){1,4}(\\w{1,10}|\\w{1,10}\\.\\w{1,10})$"
-            if not re.match(reg, domain):
-                return mw.returnJson(False, '主域名格式不正确')
-
-        if int(port) >= 65535 or int(port) < 100:
-            return mw.returnJson(False, '端口范围不正确!')
-
-        if webname != mw.getConfig('title'):
-            mw.setConfig('title', webname)
-
-        if sites_path != mw.getWwwDir():
-            mw.setWwwDir(sites_path)
-
-        if backup_path != mw.getWwwDir():
-            mw.setBackupDir(backup_path)
-
-        if port != mw.getHostPort():
-            import system_api
-            import firewall_api
-
-            sysCfgDir = mw.systemdCfgDir()
-            if os.path.exists(sysCfgDir + "/firewalld.service"):
-                if not firewall_api.firewall_api().getFwStatus():
-                    return mw.returnJson(False, 'firewalld必须先启动!')
-
-            mw.setHostPort(port)
-
-            msg = mw.getInfo('放行端口[{1}]成功', (port,))
-            mw.writeLog("防火墙管理", msg)
-            addtime = time.strftime('%Y-%m-%d %X', time.localtime())
-            mw.M('firewall').add('port,ps,addtime', (port, "配置修改", addtime))
-
-            firewall_api.firewall_api().addAcceptPort(port)
-            firewall_api.firewall_api().firewallReload()
-
-            system_api.system_api().restartMw()
-
-        if host_ip != mw.getHostAddr():
-            mw.setHostAddr(host_ip)
-
-        mhost = mw.getHostAddr()
-        info = {
-            'uri': '/config',
-            'host': mhost + ':' + port
-        }
-        return mw.returnJson(True, '保存成功!', info)
-
-    def setAdminPathApi(self):
-        admin_path = request.form.get('admin_path', '').strip()
-        admin_path_checks = ['/', '/close', '/login',
-                             '/do_login', '/site', '/sites',
-                             '/download_file', '/control', '/crontab',
-                             '/firewall', '/files', 'config',
-                             '/soft', '/system', '/code',
-                             '/ssl', '/plugins', '/hook']
-        if admin_path == '':
-            admin_path = '/'
-        if admin_path != '/':
-            if len(admin_path) < 6:
-                return mw.returnJson(False, '安全入口地址长度不能小于6位!')
-            if admin_path in admin_path_checks:
-                return mw.returnJson(False, '该入口已被面板占用,请使用其它入口!')
-            if not re.match("^/[\\w\\./-_]+$", admin_path):
-                return mw.returnJson(False, '入口地址格式不正确,示例: /mw_rand')
-        # else:
-        #     domain = mw.readFile('data/bind_domain.pl')
-        #     if not domain:
-        #         domain = ''
-        #     limitip = mw.readFile('data/bind_limitip.pl')
-        #     if not limitip:
-        #         limitip = ''
-        #     if not domain.strip() and not limitip.strip():
-        # return mw.returnJson(False,
-        # '警告，关闭安全入口等于直接暴露你的后台地址在外网，十分危险，至少开启以下一种安全方式才能关闭：<a
-        # style="color:red;"><br>1、绑定访问域名<br>2、绑定授权IP</a>')
-
-        admin_path_file = self.__file['admin_path']
-        admin_path_old = '/'
-        if os.path.exists(admin_path_file):
-            admin_path_old = mw.readFile(admin_path_file).strip()
-
-        if admin_path_old != admin_path:
-            mw.writeFile(admin_path_file, admin_path)
-            mw.restartMw()
-        return mw.returnJson(True, '修改成功!')
-
-    def closePanelApi(self):
-        filename = self.__file['close']
-        if os.path.exists(filename):
-            os.remove(filename)
-            return mw.returnJson(True, '开启成功')
-        mw.writeFile(filename, 'True')
-        mw.execShell("chmod 600 " + filename)
-        mw.execShell("chown root.root " + filename)
-        return mw.returnJson(True, '面板已关闭!')
-
-    def openDebugApi(self):
-        filename = 'data/debug.pl'
-        if os.path.exists(filename):
-            os.remove(filename)
-            return mw.returnJson(True, '开发模式关闭!')
-        mw.writeFile(filename, 'True')
-        return mw.returnJson(True, '开发模式开启!')
-
-    def setIpv6StatusApi(self):
-        ipv6_file = self.__file['ipv6']
-        if os.path.exists(ipv6_file):
-            os.remove(ipv6_file)
-            mw.writeLog('面板设置', '关闭面板IPv6兼容!')
-        else:
-            mw.writeFile(ipv6_file, 'True')
-            mw.writeLog('面板设置', '开启面板IPv6兼容!')
-        mw.restartMw()
-        return mw.returnJson(True, '设置成功!')
-
-    # 获取面板证书
-    def getPanelSslApi(self):
-        cert = self.getPanelSslData()
-        return mw.getJson(cert)
-
-    def getPanelSslData(self):
-        rdata = {}
-        choose_file = self.__file['ssl']
-        rdata['choose'] = mw.readFile(choose_file)
-
-
-        keyPath = 'ssl/local/private.pem'
-        certPath = 'ssl/local/cert.pem'
-
-        if not os.path.exists(certPath):
-            mw.createLocalSSL()
-
-        cert = {}
-        cert['privateKey'] = mw.readFile(keyPath)
-        cert['is_https'] = ''
-        cert['certPem'] = mw.readFile(certPath)
-        cert['info'] = mw.getCertName(certPath)
-        rdata['local'] = cert
-
-        panel_ssl = mw.getServerDir() + "/web_conf/nginx/vhost/panel.conf"
-        if not os.path.exists(panel_ssl):
-            cert['is_https'] = ''
-        else:
-            ssl_data = mw.readFile(panel_ssl)
-            if ssl_data.find('$server_port !~ 443') != -1:
-                cert['is_https'] = 'checked'
-
-        keyPath = 'ssl/nginx/private.pem'
-        certPath = 'ssl/nginx/cert.pem'
-
-        cert = {}
-        cert['privateKey'] = mw.readFile(keyPath)
-        cert['certPem'] = mw.readFile(certPath)
-        cert['info'] = mw.getCertName(certPath)
-
-        rdata['nginx'] = cert
-
-        return rdata
-
-    # 面板本地SSL设置
-    def setPanelLocalSslApi(self):
-        cert = {}
-        keyPath = 'ssl/local/private.pem'
-        certPath = 'ssl/local/cert.pem'
-
-        if not os.path.exists(certPath):
-            mw.createLocalSSL()
-
-        choose_file = self.__file['ssl']
-        mw.writeFile(choose_file, 'local')
-
-        mw.restartMw()
-        return mw.returnJson(True, '设置成功')
-
-    # 关闭SSL
-    def closePanelSslApi(self):
-        choose_file = self.__file['ssl']
-        if os.path.exists(choose_file):
-            os.remove(choose_file)
-
-        local_ssl = 'ssl/local'
-        if os.path.exists(local_ssl):
-            mw.execShell('rm -rf '+ local_ssl)
-
-        nginx_ssl = 'ssl/nginx'
-        if os.path.exists(nginx_ssl):
-            mw.execShell('rm -rf '+ nginx_ssl)
-
-        mw.restartMw()
-        return mw.returnJson(True, '关闭SSL成功')
-
-    # 保存面板证书
-    def savePanelSslApi(self):
-
-        choose = request.form.get('choose', '').strip()
-        certPem = request.form.get('certPem', '').strip()
-        privateKey = request.form.get('privateKey', '').strip()
-
-        if not mw.inArray(['local','nginx'], choose):
-            return mw.returnJson(True, '保存错误面板SSL类型!')
-
-
-        keyPath = 'ssl/'+choose+'/private.pem'
-        certPath = 'ssl/'+choose+'/cert.pem'
-        checkCert = '/tmp/cert.pl'
-
-        if not os.path.exists(keyPath):
-            return mw.returnJson(False, '【'+choose+'】SSL类型不存在,先申请!')
-
-        if(privateKey.find('KEY') == -1):
-            return mw.returnJson(False, '秘钥错误，请检查!')
-        if(certPem.find('CERTIFICATE') == -1):
-            return mw.returnJson(False, '证书错误，请检查!')
-
-        mw.writeFile(checkCert, certPem)
-        if privateKey:
-            mw.writeFile(keyPath, privateKey)
-        if certPem:
-            mw.writeFile(certPath, certPem)
-        if not mw.checkCert(checkCert):
-            return mw.returnJson(False, '证书错误,请检查!')
-        return mw.returnJson(True, '证书已保存!')
-
-    # 设置面板SSL证书设置
-    # def setPanelHttpToHttpsApi(self):
-
-    #     bind_domain = self.__file['bind_domain']
-    #     if not os.path.exists(bind_domain):
-    #         return mw.returnJson(False, '先要绑定域名!')
-
-    #     choose_file = self.__file['ssl']
-    #     choose = mw.readFile(choose_file)
-    #     if choose == 'local':
-    #         return mw.returnJson(False, '本地SSL无法使用!')
-
-    #     keyPath = 'ssl/nginx/private.pem'
-    #     if not os.path.exists(keyPath):
-    #         return mw.returnJson(False, '未申请SSL证书!')
-
-    #     is_https = request.form.get('https', '').strip()
-
-    #     panel_ssl = mw.getServerDir() + "/web_conf/nginx/vhost/panel.conf"
-    #     if not os.path.exists(panel_ssl):
-    #         return mw.returnJson(False, '未开启面板SSL!')
-
-    #     if is_https == 'false':
-    #         conf = mw.readFile(panel_ssl)
-    #         if conf:
-    #             if conf.find('ssl_certificate') == -1:
-    #                 return mw.returnJson(False, '当前未开启SSL')
-    #             to = "#error_page 404/404.html;\n\
-    # #HTTP_TO_HTTPS_START\n\
-    # if ($server_port !~ 443){\n\
-    #     rewrite ^(/.*)$ https://$host$1 permanent;\n\
-    # }\n\
-    # #HTTP_TO_HTTPS_END"
-    #             conf = conf.replace('#error_page 404/404.html;', to)
-    #             mw.writeFile(panel_ssl, conf)
-    #     else:
-    #         conf = mw.readFile(panel_ssl)
-    #         if conf:
-    #             rep = "\n\\s*#HTTP_TO_HTTPS_START(.|\n){1,300}#HTTP_TO_HTTPS_END"
-    #             conf = re.sub(rep, '', conf)
-    #             rep = "\\s+if.+server_port.+\n.+\n\\s+\\s*}"
-    #             conf = re.sub(rep, '', conf)
-    #             mw.writeFile(panel_ssl, conf)
-
-    #     mw.restartNginx()
-
-    #     action = '开启'
-    #     if is_https == 'true':
-    #         action = '关闭'
-    #     return mw.returnJson(True, action + 'HTTPS跳转成功!')
-
-    # 删除面板证书
-    def delPanelSslApi(self):
-        ip = mw.getLocalIp()
-        if mw.isAppleSystem():
-            ip = '127.0.0.1'
-
-        port = mw.readFile('data/port.pl').strip()
-
-        choose = request.form.get('choose', '').strip()
-
-        if not mw.inArray(['local','nginx'], choose):
-            return mw.returnJson(True, '删除错误面板SSL类型!')
-
-        to_panel_url = 'http://'+ip+":"+port+'/config'
-
-        if choose == 'local':
-            dst_path = mw.getRunDir() + '/ssl/local'
-            ssl_file = self.__file['ssl']
-            if os.path.exists(dst_path):
-                mw.execShell('rm -rf ' + dst_path)
-                mw.execShell('rm -rf ' + ssl_file)
-                mw.restartMw();
-                return mw.returnJson(True, '删除本地面板SSL成功!',to_panel_url)
-            else:
-                return mw.returnJson(True, '已经删除本地面板SSL!',to_panel_url)
-
-        if choose == 'nginx':
-
-            bind_domain = self.__file['bind_domain']
-            if not os.path.exists(bind_domain):
-                return mw.returnJson(False, '未绑定域名!')
-
-            siteName = mw.readFile(bind_domain).strip()
-
-            src_path = mw.getServerDir() + '/web_conf/letsencrypt/' + siteName
-
-            dst_path = mw.getRunDir() + '/ssl/nginx'
-            dst_csrpath = dst_path + '/cert.pem'
-            dst_keypath = dst_path + '/private.pem'
-
-            if os.path.exists(src_path) or os.path.exists(dst_path):
-                if os.path.exists(src_letpath):
-                    mw.execShell('rm -rf ' + src_letpath)
-                if os.path.exists(dst_csrpath):
-                    mw.execShell('rm -rf ' + dst_csrpath)
-                if os.path.exists(dst_keypath):
-                    mw.execShell('rm -rf ' + dst_keypath)
-                mw.restartNginx()
-                return mw.returnJson(True, '删除面板SSL成功!')
-
-            mw.restartNginx()
-            mw.restartMw()
-            return mw.returnJson(False, '已经删除面板SSL!')
-        return  mw.returnJson(False, '未知类型!')
-
-    # 申请面板let证书
-    # def applyPanelAcmeSslApi(self):
-
-    #     bind_domain = self.__file['bind_domain']
-    #     if not os.path.exists(bind_domain):
-    #         return mw.returnJson(False, '先要绑定域名!')
-
-    #     # 生成nginx配置
-    #     domain = mw.readFile(bind_domain)
-    #     panel_tpl = mw.getRunDir() + "/data/tpl/nginx_panel.conf"
-    #     dst_panel_path = mw.getServerDir() + "/web_conf/nginx/vhost/panel.conf"
-    #     if not os.path.exists(dst_panel_path):
-    #         reg = r"^([\w\-\*]{1,100}\.){1,4}(\w{1,10}|\w{1,10}\.\w{1,10})$"
-    #         if not re.match(reg, domain):
-    #             return mw.returnJson(False, '主域名格式不正确')
-
-    #         op_dir = mw.getServerDir() + "/openresty"
-    #         if not os.path.exists(op_dir):
-    #             return mw.returnJson(False, '依赖OpenResty,先安装启动它!')
-
-    #         content = mw.readFile(panel_tpl)
-    #         content = content.replace("{$PORT}", "80")
-    #         content = content.replace("{$SERVER_NAME}", domain)
-    #         content = content.replace("{$PANAL_PORT}", mw.readFile('data/port.pl'))
-    #         content = content.replace("{$LOGPATH}", mw.getRunDir() + '/logs')
-    #         content = content.replace("{$PANAL_ADDR}", mw.getRunDir())
-    #         mw.writeFile(dst_panel_path, content)
-    #         mw.restartNginx()
-
-    #     siteName = mw.readFile(bind_domain).strip()
-    #     auth_to = mw.getRunDir() + "/tmp"
-    #     to_args = {
-    #         'domains': [siteName],
-    #         'auth_type': 'http',
-    #         'auth_to': auth_to,
-    #     }
-
-    #     src_path = mw.getServerDir() + '/web_conf/letsencrypt/' + siteName
-    #     src_csrpath = src_path + "/fullchain.pem"  # 生成证书路径
-    #     src_keypath = src_path + "/privkey.pem"  # 密钥文件路径
-
-    #     dst_path = mw.getRunDir() + '/ssl/nginx'
-    #     dst_csrpath = dst_path + '/cert.pem'
-    #     dst_keypath = dst_path + '/private.pem'
-
-    #     is_already_apply = False
-
-    #     if not os.path.exists(src_path):
-    #         import cert_api
-    #         data = cert_api.cert_api().applyCertApi(to_args)
-    #         if not data['status']:
-    #             msg = data['msg']
-    #             if type(data['msg']) != str:
-    #                 msg = data['msg'][0]
-    #                 emsg = data['msg'][1]['challenges'][0]['error']
-    #                 msg = msg + '<p><span>响应状态:</span>' + str(emsg['status']) + '</p><p><span>错误类型:</span>' + emsg[
-    #                     'type'] + '</p><p><span>错误代码:</span>' + emsg['detail'] + '</p>'
-    #             return mw.returnJson(data['status'], msg, data['msg'])
-    #     else:
-    #         is_already_apply = True
-
-    #     mw.buildSoftLink(src_csrpath, dst_csrpath, True)
-    #     mw.buildSoftLink(src_keypath, dst_keypath, True)
-    #     mw.execShell('echo "acme" > "' + dst_path + '/README"')
-
-    #     tmp_well_know = auth_to + '/.well-known'
-    #     if os.path.exists(tmp_well_know):
-    #         mw.execShell('rm -rf ' + tmp_well_know)
-
-    #     if os.path.exists(dst_path):
-    #         choose_file = self.__file['ssl']
-    #         mw.writeFile(choose_file, 'nginx')
-
-    #     data = self.getPanelSslData()
-
-    #     if is_already_apply:
-    #         return mw.returnJson(True, '重复申请!', data)
-    #     return mw.returnJson(True, '申请成功!', data)
-
-    def setPanelDomainApi(self):
-        domain = request.form.get('domain', '')
-
-        cfg_domain = self.__file['bind_domain']
-
-        port = mw.readFile('data/port.pl').strip()
-        ip = mw.getLocalIp()
-
-        if domain == '':
-            if os.path.exists(cfg_domain):
-                os.remove(cfg_domain)
-
-            to_panel_url = 'http://'+ip+":"+port+'/config'
-            
-            mw.restartMw()
-            return mw.returnJson(True, '清空域名成功!', to_panel_url)
-
-        mw.writeFile(cfg_domain, domain)
-        to_panel_url = 'http://'+domain+":"+port+'/config'
-        mw.restartMw()
-        return mw.returnJson(True, '设置域名成功!',to_panel_url)
-
-     # 设置面板SSL
-    # def setPanelSslApi(self):
-    #     sslConf = mw.getRunDir() + '/' + self.__file['ssl']
-
-    #     panel_tpl = mw.getRunDir() + "/data/tpl/nginx_panel.conf"
-    #     dst_panel_path = mw.getServerDir() + "/web_conf/nginx/vhost/panel.conf"
-    #     if os.path.exists(sslConf):
-    #         os.system('rm -f ' + sslConf)
-
-    #         conf = mw.readFile(dst_panel_path)
-    #         if conf:
-    #             rep = "\\s+ssl_certificate\\s+.+;\\s+ssl_certificate_key\\s+.+;"
-    #             conf = re.sub(rep, '', conf)
-    #             rep = "\\s+ssl_protocols\\s+.+;\n"
-    #             conf = re.sub(rep, '', conf)
-    #             rep = "\\s+ssl_ciphers\\s+.+;\n"
-    #             conf = re.sub(rep, '', conf)
-    #             rep = "\\s+ssl_prefer_server_ciphers\\s+.+;\n"
-    #             conf = re.sub(rep, '', conf)
-    #             rep = "\\s+ssl_session_cache\\s+.+;\n"
-    #             conf = re.sub(rep, '', conf)
-    #             rep = "\\s+ssl_session_timeout\\s+.+;\n"
-    #             conf = re.sub(rep, '', conf)
-    #             rep = "\\s+ssl_ecdh_curve\\s+.+;\n"
-    #             conf = re.sub(rep, '', conf)
-    #             rep = "\\s+ssl_session_tickets\\s+.+;\n"
-    #             conf = re.sub(rep, '', conf)
-    #             rep = "\\s+ssl_stapling\\s+.+;\n"
-    #             conf = re.sub(rep, '', conf)
-    #             rep = "\\s+ssl_stapling_verify\\s+.+;\n"
-    #             conf = re.sub(rep, '', conf)
-    #             rep = "\\s+ssl\\s+on;"
-    #             conf = re.sub(rep, '', conf)
-    #             rep = "\\s+error_page\\s497.+;"
-    #             conf = re.sub(rep, '', conf)
-    #             rep = "\\s+if.+server_port.+\n.+\n\\s+\\s*}"
-    #             conf = re.sub(rep, '', conf)
-    #             rep = "\\s+listen\\s+443.*;"
-    #             conf = re.sub(rep, '', conf)
-    #             rep = "\\s+listen\\s+\\[\\:\\:\\]\\:443.*;"
-    #             conf = re.sub(rep, '', conf)
-    #             mw.writeFile(dst_panel_path, conf)
-
-    #         mw.writeLog('面板配置', '面板SSL关闭成功!')
-    #         mw.restartWeb()
-    #         return mw.returnJson(True, 'SSL已关闭，请使用http协议访问面板!')
-    #     else:
-    #         try:
-    #             mw.writeFile(sslConf, 'True')
-
-    #             keyPath = mw.getRunDir() + '/ssl/private.pem'
-    #             certPath = mw.getRunDir() + '/ssl/cert.pem'
-
-    #             conf = mw.readFile(dst_panel_path)
-    #             if conf:
-    #                 if conf.find('ssl_certificate') == -1:
-    #                     sslStr = """#error_page 404/404.html;
-    # ssl_certificate    %s;
-    # ssl_certificate_key  %s;
-    # ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-    # ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE;
-    # ssl_prefer_server_ciphers on;
-    # ssl_session_cache shared:SSL:10m;
-    # ssl_session_timeout 10m;
-    # error_page 497  https://$host$request_uri;""" % (certPath, keyPath)
-    #                 if(conf.find('ssl_certificate') != -1):
-    #                     return mw.returnJson(True, 'SSL开启成功!')
-
-    #                 conf = conf.replace('#error_page 404/404.html;', sslStr)
-
-    #                 rep = "listen\\s+([0-9]+)\\s*[default_server]*;"
-    #                 tmp = re.findall(rep, conf)
-    #                 if not mw.inArray(tmp, '443'):
-    #                     listen = re.search(rep, conf).group()
-    #                     http_ssl = "\n\tlisten 443 ssl http2;"
-    #                     http_ssl = http_ssl + "\n\tlisten [::]:443 ssl http2;"
-    #                     conf = conf.replace(listen, listen + http_ssl)
-
-    #                 mw.backFile(dst_panel_path)
-    #                 mw.writeFile(dst_panel_path, conf)
-    #                 isError = mw.checkWebConfig()
-    #                 if(isError != True):
-    #                     mw.restoreFile(dst_panel_path)
-    #                     return mw.returnJson(False, '证书错误: <br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>')
-    #         except Exception as ex:
-    #             return mw.returnJson(False, '开启失败:' + str(ex))
-    #         mw.restartWeb()
-    #         return mw.returnJson(True, '开启成功，请使用https协议访问面板!')
-
-    def getApi(self):
-        data = {}
-        return mw.getJson(data)
-    ##### ----- end ----- ###
-
-    # 获取临时登录列表
-    def getTempLoginApi(self):
-        if 'tmp_login_expire' in session:
-            return mw.returnJson(False, '没有权限')
-        limit = request.form.get('limit', '10').strip()
-        p = request.form.get('p', '1').strip()
-        tojs = request.form.get('tojs', '').strip()
-
-        tempLoginM = mw.M('temp_login')
-        tempLoginM.where('state=? and expire<?',
-                         (0, int(time.time()))).setField('state', -1)
-
-        start = (int(p) - 1) * (int(limit))
-        vlist = tempLoginM.limit(str(start) + ',' + str(limit)).order('id desc').field(
-            'id,addtime,expire,login_time,login_addr,state').select()
-
-        data = {}
-        data['data'] = vlist
-
-        count = tempLoginM.count()
-        page_args = {}
-        page_args['count'] = count
-        page_args['tojs'] = 'get_temp_login'
-        page_args['p'] = p
-        page_args['row'] = limit
-
-        data['page'] = mw.getPage(page_args)
-        return mw.getJson(data)
-
-    # 删除临时登录
-    def removeTempLoginApi(self):
-        if 'tmp_login_expire' in session:
-            return mw.returnJson(False, '没有权限')
-        sid = request.form.get('id', '10').strip()
-        if mw.M('temp_login').where('id=?', (sid,)).delete():
-            mw.writeLog('面板设置', '删除临时登录连接')
-            return mw.returnJson(True, '删除成功')
-        return mw.returnJson(False, '删除失败')
-
-    def setTempLoginApi(self):
-        if 'tmp_login_expire' in session:
-            return mw.returnJson(False, '没有权限')
-        s_time = int(time.time())
-        mw.M('temp_login').where(
-            'state=? and expire>?', (0, s_time)).delete()
-        token = mw.getRandomString(48)
-        salt = mw.getRandomString(12)
-
-        pdata = {
-            'token': mw.md5(token + salt),
-            'salt': salt,
-            'state': 0,
-            'login_time': 0,
-            'login_addr': '',
-            'expire': s_time + 3600,
-            'addtime': s_time
-        }
-
-        if not mw.M('temp_login').count():
-            pdata['id'] = 101
-
-        if mw.M('temp_login').insert(pdata):
-            mw.writeLog('面板设置', '生成临时连接,过期时间:{}'.format(
-                mw.formatDate(times=pdata['expire'])))
-            return mw.getJson({'status': True, 'msg': "临时连接已生成", 'token': token, 'expire': pdata['expire']})
-        return mw.returnJson(False, '连接生成失败')
-
-    def getTempLoginLogsApi(self):
-        if 'tmp_login_expire' in session:
-            return mw.returnJson(False, '没有权限')
-
-        logs_id = request.form.get('id', '').strip()
-        logs_id = int(logs_id)
-        data = mw.M('logs').where(
-            'uid=?', (logs_id,)).order('id desc').field(
-            'id,type,uid,log,addtime').select()
-        return mw.returnJson(False, 'ok', data)
-
-    def checkPanelToken(self):
-        api_file = self.__api_addr
-        if not os.path.exists(api_file):
-            return False, ''
-
-        tmp = mw.readFile(api_file)
-        data = json.loads(tmp)
-        if data['open']:
-            return True, data
-        else:
-            return False, ''
-
-    def setStatusCodeApi(self):
-        status_code = request.form.get('status_code', '').strip()
-        if re.match("^\\d+$", status_code):
-            status_code = int(status_code)
-            if status_code != 0:
-                if status_code < 100 or status_code > 999:
-                    return mw.returnJson(False, '状态码范围错误!')
-        else:
-            return mw.returnJson(False, '状态码范围错误!')
-        unauthorized_status = self.__file['unauth_status']
-        mw.writeFile(unauthorized_status, str(status_code))
-        mw.writeLog('面板设置', '将未授权响应状态码设置为:{}'.format(status_code))
-        return mw.returnJson(True, '设置成功!')
-
-    def getNotifyApi(self):
-        # 获取
-        data = mw.getNotifyData(True)
-        return mw.returnData(True, 'ok', data)
-
-    def setNotifyApi(self):
-        tag = request.form.get('tag', '').strip()
-        data = request.form.get('data', '').strip()
-
-        cfg = mw.getNotifyData(False)
-
-        crypt_data = mw.enDoubleCrypt(tag, data)
-        if tag in cfg:
-            cfg[tag]['cfg'] = crypt_data
-        else:
-            t = {'cfg': crypt_data}
-            cfg[tag] = t
-
-        mw.writeNotify(cfg)
-        return mw.returnData(True, '设置成功')
-
-    def setNotifyTestApi(self):
-        # 异步通知验证
-        tag = request.form.get('tag', '').strip()
-        tag_data = request.form.get('data', '').strip()
-
-        if tag == 'tgbot':
-            t = json.loads(tag_data)
-            test_bool = mw.tgbotNotifyTest(t['app_token'], t['chat_id'])
-            if test_bool:
-                return mw.returnData(True, '验证成功')
-            return mw.returnData(False, '验证失败')
-
-        if tag == 'email':
-            t = json.loads(tag_data)
-            test_bool = mw.emailNotifyTest(t)
-            if test_bool:
-                return mw.returnData(True, '验证成功')
-            return mw.returnData(False, '验证失败')
-
-        return mw.returnData(False, '暂时未支持该验证')
-
-    def setNotifyEnableApi(self):
-        # 异步通知验证
-        tag = request.form.get('tag', '').strip()
-        tag_enable = request.form.get('enable', '').strip()
-
-        data = mw.getNotifyData(False)
-        op_enable = True
-        op_action = '开启'
-        if tag_enable != 'true':
-            op_enable = False
-            op_action = '关闭'
-
-        if tag in data:
-            data[tag]['enable'] = op_enable
-
-        mw.writeNotify(data)
-
-        return mw.returnData(True, op_action + '成功')
-
-    def getPanelTokenApi(self):
-        api_file = self.__api_addr
-        tmp = mw.readFile(api_file)
-        if not os.path.exists(api_file):
-            ready_data = {"open": False, "token": "", "limit_addr": []}
-            mw.writeFile(api_file, json.dumps(ready_data))
-            mw.execShell("chmod 600 " + api_file)
-            tmp = mw.readFile(api_file)
-        data = json.loads(tmp)
-
-        if not 'key' in data:
-            data['key'] = mw.getRandomString(16)
-            mw.writeFile(api_file, json.dumps(data))
-
-        if 'token_crypt' in data:
-            data['token'] = mw.deCrypt(data['token'], data['token_crypt'])
-        else:
-            token = mw.getRandomString(32)
-            data['token'] = mw.md5(token)
-            data['token_crypt'] = mw.enCrypt(
-                data['token'], token)
-            mw.writeFile(api_file, json.dumps(data))
-            data['token'] = "***********************************"
-
-        data['limit_addr'] = '\n'.join(data['limit_addr'])
-
-        del(data['key'])
-        return mw.returnJson(True, 'ok', data)
-
-    def setPanelTokenApi(self):
-        op_type = request.form.get('op_type', '').strip()
-
-        if op_type == '1':
-            token = mw.getRandomString(32)
-            data['token'] = mw.md5(token)
-            data['token_crypt'] = mw.enCrypt(
-                data['token'], token).decode('utf-8')
-            mw.writeLog('API配置', '重新生成API-Token')
-            mw.writeFile(api_file, json.dumps(data))
-            return mw.returnJson(True, 'ok', token)
-
-        api_file = self.__api_addr
-        if not os.path.exists(api_file):
-            return mw.returnJson(False, "先在API接口配置")
-        else:
-            tmp = mw.readFile(api_file)
-            data = json.loads(tmp)
-
-        if op_type == '2':
-            data['open'] = not data['open']
-            stats = {True: '开启', False: '关闭'}
-            if not 'token_crypt' in data:
-                token = mw.getRandomString(32)
-                data['token'] = mw.md5(token)
-                data['token_crypt'] = mw.enCrypt(data['token'], token).decode('utf-8')
-
-            token = stats[data['open']] + '成功!'
-            mw.writeLog('API配置', '%sAPI接口' % stats[data['open']])
-            mw.writeFile(api_file, json.dumps(data))
-            return mw.returnJson(not not data['open'], token)
-
-        elif op_type == '3':
-
-            limit_addr = request.form.get('limit_addr', '').strip()
-            data['limit_addr'] = limit_addr.split('\n')
-            mw.writeLog('API配置', '变更IP限制为[%s]' % limit_addr)
-            mw.writeFile(api_file, json.dumps(data))
-            return mw.returnJson(True, '保存成功!')
-
-    def renderUnauthorizedStatus(self, data):
-        cfg_unauth_status = self.__file['unauth_status']
-        if os.path.exists(cfg_unauth_status):
-            status_code = mw.readFile(cfg_unauth_status)
-            data['status_code'] = status_code
-            data['status_code_msg'] = status_code
-            if status_code == '0':
-                data['status_code_msg'] = "默认-安全入口错误提示"
-            elif status_code == '400':
-                data['status_code_msg'] = "400-客户端请求错误"
-            elif status_code == '401':
-                data['status_code_msg'] = "401-未授权访问"
-            elif status_code == '403':
-                data['status_code_msg'] = "403-拒绝访问"
-            elif status_code == '404':
-                data['status_code_msg'] = "404-页面不存在"
-            elif status_code == '408':
-                data['status_code_msg'] = "408-客户端超时"
-            elif status_code == '416':
-                data['status_code_msg'] = "416-无效的请求"
-        else:
-            data['status_code'] = '0'
-            data['status_code_msg'] = "默认-安全入口错误提示"
-        return data
-
-
-    def getTimezoneListApi(self):
-        # 获取时区列表
-        # pytz.all_timezones | 所有
-        # pytz.common_timezones
-        return pytz.all_timezones
-
-    def setTimezoneApi(self):
-        # 设置时区列表
-        timezone = request.form.get('timezone', '').strip()
-        cmd = 'timedatectl set-timezone "'+timezone+'"'
-        mw.execShell(cmd)
-        return mw.returnJson(True, '设置成功!')
-
-
-    def getAuthSecretApi(self):
-        reset = request.form.get('reset', '')
-
-        import pyotp
-        auth = self.__file['auth_secret']
-        tag = 'mdserver-web'
-        if os.path.exists(auth) and reset != '1':
-            content = mw.readFile(auth)
-            sec = mw.deDoubleCrypt(tag,content)
-        else:
-            sec = pyotp.random_base32()
-            crypt_data = mw.enDoubleCrypt(tag, sec)
-            mw.writeFile(auth, crypt_data)
-
-        ip = mw.getHostAddr()
-        url = pyotp.totp.TOTP(sec).provisioning_uri(name=ip, issuer_name=tag)
-
-        rdata = {}
-        rdata['secret'] = sec
-        rdata['url'] = url
-        return mw.returnJson(True, '设置成功!', rdata)
-
-    def setAuthSecretApi(self):
-        auth = self.__file['auth_secret']
-        if os.path.exists(auth):
-            os.remove(auth)
-            return mw.returnJson(True, '关闭成功!', 0)
-        else:
-            return mw.returnJson(True, '开启成功!', 1)
-
-
-    def get(self):
-
-        data = {}
-        data['title'] = mw.getConfig('title')
-        data['site_path'] = mw.getWwwDir()
-        data['backup_path'] = mw.getBackupDir()
-        sformat = 'date +"%Y-%m-%d %H:%M:%S %Z %z"'
-        data['systemdate'] = mw.execShell(sformat)[0].strip()
-
-        data['port'] = mw.getHostPort()
-        data['ip'] = mw.getHostAddr()
-
-        admin_path_file = self.__file['admin_path']
-        if not os.path.exists(admin_path_file):
-            data['admin_path'] = '/'
-        else:
-            data['admin_path'] = mw.readFile(admin_path_file)
-
-        ipv6_file = self.__file['ipv6']
-        if os.path.exists(ipv6_file):
-            data['ipv6'] = 'checked'
-        else:
-            data['ipv6'] = ''
-
-        debug_file = self.__file['debug']
-        if os.path.exists(debug_file):
-            data['debug'] = 'checked'
-        else:
-            data['debug'] = ''
-
-        ssl_file = self.__file['ssl']
-        if os.path.exists(ssl_file):
-            data['ssl'] = 'checked'
-        else:
-            data['ssl'] = ''
-
-
-        auth_secret = self.__file['auth_secret']
-        if os.path.exists(auth_secret):
-            data['auth_secret'] = 'checked'
-        else:
-            data['auth_secret'] = ''
-
-        basic_auth = self.__file['basic_auth']
-        if os.path.exists(basic_auth):
-            bac = mw.readFile(basic_auth)
-            bac = json.loads(bac)
-            if bac['open']:
-                data['basic_auth'] = 'checked'
-        else:
-            data['basic_auth'] = ''
-
-        cfg_domain = self.__file['bind_domain']
-        if os.path.exists(cfg_domain):
-            domain = mw.readFile(cfg_domain)
-            data['bind_domain'] = domain.strip()
-        else:
-            data['bind_domain'] = ''
-
-        data = self.renderUnauthorizedStatus(data)
-
-        #api
-        api_token = self.__api_addr
-        if os.path.exists(api_token):
-            bac = mw.readFile(api_token)
-            bac = json.loads(bac)
-            if bac['open']:
-                data['api_token'] = 'checked'
-        else:
-            data['api_token'] = ''
-
-        #auth
-
-
-        data['site_count'] = mw.M('sites').count()
-
-        data['username'] = mw.M('users').where(
-            "id=?", (1,)).getField('username')
-
-        data['hook_tag'] = request.args.get('tag', '')
-
-        # databases hook
-        database_hook_file = self.__file['hook_database']
-        if os.path.exists(database_hook_file):
-            df = mw.readFile(database_hook_file)
-            df = json.loads(df)
-            data['hook_database'] = df
-        else:
-            data['hook_database'] = []
-
-        # menu hook
-        menu_hook_file = self.__file['hook_menu']
-        if os.path.exists(menu_hook_file):
-            df = mw.readFile(menu_hook_file)
-            df = json.loads(df)
-            data['hook_menu'] = df
-        else:
-            data['hook_menu'] = []
-
-        # global_static hook
-        global_static_hook_file = self.__file['hook_global_static']
-        if os.path.exists(global_static_hook_file):
-            df = mw.readFile(global_static_hook_file)
-            df = json.loads(df)
-            data['hook_global_static'] = df
-        else:
-            data['hook_global_static'] = []
-
-        # notiy config
-        notify_data = mw.getNotifyData(True)
-        notify_tag_list = ['tgbot', 'email']
-        for tag in notify_tag_list:
-            new_tag = 'notify_' + tag + '_enable'
-            data[new_tag] = ''
-            if tag in notify_data and 'enable' in notify_data[tag]:
-                if notify_data[tag]['enable']:
-                    data[new_tag] = 'checked'
-
-        return data
diff --git a/class/core/crontab_api.py b/class/core/crontab_api.py
deleted file mode 100755
index d9556241a..000000000
--- a/class/core/crontab_api.py
+++ /dev/null
@@ -1,692 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 计划任务操作
-# ---------------------------------------------------------------------------------
-
-
-import psutil
-import time
-import os
-import sys
-import mw
-import re
-import json
-import pwd
-
-from flask import request
-
-
-class crontab_api:
-
-    field = 'id,name,type,where1,where_hour,where_minute,echo,addtime,status,save,backup_to,stype,sname,sbody,urladdress'
-
-    def __init__(self):
-        pass
-
-    ##### ----- start ----- ###
-    def listApi(self):
-        p = request.args.get('p', 1)
-        psize = 10
-
-        startPage = (int(p) - 1) * psize
-        pageInfo = str(startPage) + ',' + str(psize)
-
-        _list = mw.M('crontab').where('', ()).field(self.field).limit(pageInfo).order('id desc').select()
-
-        data = []
-        for i in range(len(_list)):
-            tmp = _list[i]
-            if _list[i]['type'] == "day":
-                tmp['type'] = '每天'
-                tmp['cycle'] = mw.getInfo('每天, {1}点{2}分 执行', (str(
-                    _list[i]['where_hour']), str(_list[i]['where_minute'])))
-            elif _list[i]['type'] == "day-n":
-                tmp['type'] = mw.getInfo(
-                    '每{1}天', (str(_list[i]['where1']),))
-                tmp['cycle'] = mw.getInfo('每隔{1}天, {2}点{3}分 执行',  (str(
-                    _list[i]['where1']), str(_list[i]['where_hour']), str(_list[i]['where_minute'])))
-            elif _list[i]['type'] == "hour":
-                tmp['type'] = '每小时'
-                tmp['cycle'] = mw.getInfo(
-                    '每小时, 第{1}分钟 执行', (str(_list[i]['where_minute']),))
-            elif _list[i]['type'] == "hour-n":
-                tmp['type'] = mw.getInfo(
-                    '每{1}小时', (str(_list[i]['where1']),))
-                tmp['cycle'] = mw.getInfo('每{1}小时, 第{2}分钟 执行', (str(
-                    _list[i]['where1']), str(_list[i]['where_minute'])))
-            elif _list[i]['type'] == "minute-n":
-                tmp['type'] = mw.getInfo(
-                    '每{1}分钟', (str(_list[i]['where1']),))
-                tmp['cycle'] = mw.getInfo(
-                    '每隔{1}分钟执行', (str(_list[i]['where1']),))
-            elif _list[i]['type'] == "week":
-                tmp['type'] = '每周'
-                if not _list[i]['where1']:
-                    _list[i]['where1'] = '0'
-                tmp['cycle'] = mw.getInfo('每周{1}, {2}点{3}分执行', (self.toWeek(int(
-                    _list[i]['where1'])), str(_list[i]['where_hour']), str(_list[i]['where_minute'])))
-            elif _list[i]['type'] == "month":
-                tmp['type'] = '每月'
-                tmp['cycle'] = mw.getInfo('每月, {1}日 {2}点{3}分执行', (str(_list[i]['where1']), str(
-                    _list[i]['where_hour']), str(_list[i]['where_minute'])))
-            data.append(tmp)
-
-        rdata = {}
-        rdata['data'] = data
-
-        count = mw.M('crontab').where('', ()).count()
-        _page = {}
-        _page['count'] = count
-        _page['p'] = p
-        _page['row'] = psize
-        _page['tojs'] = "getCronData"
-
-        rdata['list'] = mw.getPage(_page)
-        rdata['p'] = p
-
-        # backup hook
-        bh_file = mw.getPanelDataDir() + "/hook_backup.json"
-        if os.path.exists(bh_file):
-            hb_data = mw.readFile(bh_file)
-            hb_data = json.loads(hb_data)
-            rdata['backup_hook'] = hb_data
-
-        return mw.getJson(rdata)
-
-    # 设置计划任务状态
-    def setCronStatusApi(self):
-        mid = request.form.get('id', '')
-        cronInfo = mw.M('crontab').where(
-            'id=?', (mid,)).field(self.field).find()
-        status = 1
-        if cronInfo['status'] == status:
-            status = 0
-            self.removeForCrond(cronInfo['echo'])
-        else:
-            cronInfo['status'] = 1
-            self.syncToCrond(cronInfo)
-
-        mw.M('crontab').where('id=?', (mid,)).setField('status', status)
-        mw.writeLog(
-            '计划任务', '修改计划任务[' + cronInfo['name'] + ']状态为[' + str(status) + ']')
-        return mw.returnJson(True, '设置成功')
-
-    # 获取指定任务数据
-    def getCrondFindApi(self):
-        sid = request.form.get('id', '')
-        data = mw.M('crontab').where(
-            'id=?', (sid,)).field(self.field).find()
-        return mw.getJson(data)
-
-    # 参数校验
-    def cronCheck(self, params):
-
-        if params['stype'] == 'site' or params['stype'] == 'database' or params['stype'].find('database_') > -1 or params['stype'] == 'logs' or params['stype'] == 'path':
-            if params['save'] == '':
-                return False, '保留份数不能为空!'
-
-        if params['type'] == 'day':
-            if params['hour'] == '':
-                return False, '小时不能为空!'
-            if params['minute'] == '':
-                return False, '分钟不能为空!'
-
-        if params['type'] == 'day-n':
-            if params['where1'] == '':
-                return False, '天不能为空!'
-            if params['hour'] == '':
-                return False, '小时不能为空!'
-            if params['minute'] == '':
-                return False, '分钟不能为空!'
-        if params['type'] == 'hour':
-            if params['minute'] == '':
-                return False, '分钟不能为空!'
-
-        if params['type'] == 'hour-n':
-            if params['where1'] == '':
-                return False, '小时不能为空!'
-            if params['minute'] == '':
-                return False, '分钟不能为空!'
-
-        if params['type'] == 'minute-n':
-            if params['where1'] == '':
-                return False, '分钟不能为空!'
-
-        if params['type'] == 'week':
-            if params['hour'] == '':
-                return False, '小时不能为空!'
-            if params['minute'] == '':
-                return False, '分钟不能为空!'
-
-        if params['type'] == 'month':
-            if params['where1'] == '':
-                return False, '日不能为空!'
-            if params['hour'] == '':
-                return False, '小时不能为空!'
-            if params['minute'] == '':
-                return False, '分钟不能为空!'
-
-        return True, 'OK'
-
-    def modifyCrondApi(self):
-        sid = request.form.get('id', '')
-        iname = request.form.get('name', '')
-        field_type = request.form.get('type', '')
-        week = request.form.get('week', '')
-        where1 = request.form.get('where1', '')
-        hour = request.form.get('hour', '')
-        minute = request.form.get('minute', '')
-        save = request.form.get('save', '')
-        backup_to = request.form.get('backup_to', '')
-        stype = request.form.get('stype', '')
-        sname = request.form.get('sname', '')
-        sbody = request.form.get('sbody', '')
-        urladdress = request.form.get('urladdress', '')
-
-        if len(iname) < 1:
-            return mw.returnJson(False, '任务名称不能为空!')
-
-        params = {
-            'name': iname,
-            'type': field_type,
-            'week': week,
-            'where1': where1,
-            'hour': hour,
-            'minute': minute,
-            'save': save,
-            'backup_to': backup_to,
-            'stype': stype,
-            'sname': sname,
-            'sbody': sbody,
-            'urladdress': urladdress,
-        }
-
-        is_check_pass, msg = self.cronCheck(params)
-        if not is_check_pass:
-            return mw.returnJson(is_check_pass, msg)
-
-        cuonConfig, get, name = self.getCrondCycle(params)
-        cronInfo = mw.M('crontab').where(
-            'id=?', (sid,)).field(self.field).find()
-        del(cronInfo['id'])
-        del(cronInfo['addtime'])
-        cronInfo['name'] = get['name']
-        cronInfo['type'] = get['type']
-        cronInfo['where1'] = get['where1']
-        cronInfo['where_hour'] = get['hour']
-        cronInfo['where_minute'] = get['minute']
-        cronInfo['save'] = get['save']
-        cronInfo['backup_to'] = get['backup_to']
-        cronInfo['sbody'] = get['sbody']
-        cronInfo['urladdress'] = get['urladdress']
-
-        addData = mw.M('crontab').where('id=?', (sid,)).save('name,type,where1,where_hour,where_minute,save,backup_to, sname, sbody,urladdress',
-                                                             (iname, field_type, get['where1'], get['hour'], get['minute'], get['save'], get['backup_to'], sname, get['sbody'], get['urladdress']))
-        self.removeForCrond(cronInfo['echo'])
-        self.syncToCrond(cronInfo)
-        mw.writeLog('计划任务', '修改计划任务[' + cronInfo['name'] + ']成功')
-        return mw.returnJson(True, '修改成功')
-
-    def logsApi(self):
-        sid = request.form.get('id', '')
-        echo = mw.M('crontab').where("id=?", (sid,)).field('echo').find()
-        logFile = mw.getServerDir() + '/cron/' + echo['echo'] + '.log'
-        if not os.path.exists(logFile):
-            return mw.returnJson(False, '当前日志为空!')
-        log = mw.getLastLine(logFile, 500)
-        return mw.returnJson(True, log)
-
-    def addApi(self):
-        iname = request.form.get('name', '')
-        field_type = request.form.get('type', '')
-        week = request.form.get('week', '')
-        where1 = request.form.get('where1', '')
-        hour = request.form.get('hour', '')
-        minute = request.form.get('minute', '')
-        save = request.form.get('save', '')
-        backup_to = request.form.get('backupTo', '')
-        stype = request.form.get('sType', '')
-        sname = request.form.get('sName', '')
-        sbody = request.form.get('sBody', '')
-        urladdress = request.form.get('urladdress', '')
-
-        if len(iname) < 1:
-            return mw.returnJson(False, '任务名称不能为空!')
-
-        params = {
-            'name': iname,
-            'type': field_type,
-            'week': week,
-            'where1': where1,
-            'hour': hour,
-            'minute': minute,
-            'save': save,
-            'backup_to': backup_to,
-            'stype': stype,
-            'sname': sname,
-            'sbody': sbody,
-            'urladdress': urladdress,
-        }
-
-        is_check_pass, msg = self.cronCheck(params)
-        if not is_check_pass:
-            return mw.returnJson(is_check_pass, msg)
-
-        addData = self.add(params)
-        if type(addData) == str:
-            return addData
-
-        if addData > 0:
-            return mw.returnJson(True, '添加成功')
-        return mw.returnJson(False, '添加失败')
-
-    def add(self, params):
-
-        iname = params["name"]
-        field_type = params["type"]
-        week = params["week"]
-        where1 = params["where1"]
-        hour = params["hour"]
-        minute = params["minute"]
-        save = params["save"]
-        backup_to = params["backup_to"]
-        stype = params["stype"]
-        sname = params["sname"]
-        sbody = params["sbody"]
-        urladdress = params["urladdress"]
-
-        # print params
-        cronConfig, get, name = self.getCrondCycle(params)
-        cronPath = mw.getServerDir() + '/cron'
-        cronName = self.getShell(params)
-
-        if type(cronName) == dict:
-            return cronName
-
-        cronConfig += ' ' + cronPath + '/' + cronName + \
-            ' >> ' + cronPath + '/' + cronName + '.log 2>&1'
-
-        # print(cronConfig)
-        if not mw.isAppleSystem():
-            wRes = self.writeShell(cronConfig)
-            if type(wRes) != bool:
-                return wRes
-            self.crondReload()
-
-        add_time = time.strftime('%Y-%m-%d %X', time.localtime())
-        task_id = mw.M('crontab').add('name,type,where1,where_hour,where_minute,echo,addtime,status,save,backup_to,stype,sname,sbody,urladdress',
-                                      (iname, field_type, where1, hour, minute, cronName, add_time, 1, save, backup_to, stype, sname, sbody, urladdress,))
-        return task_id
-
-    def startTaskApi(self):
-        sid = request.form.get('id', '')
-        echo = mw.M('crontab').where('id=?', (sid,)).getField('echo')
-        execstr = mw.getServerDir() + '/cron/' + echo
-        os.system('chmod +x ' + execstr)
-        os.system('nohup ' + execstr + ' >> ' + execstr + '.log 2>&1 &')
-        return mw.returnJson(True, '任务已执行!')
-
-    def delApi(self):
-        task_id = request.form.get('id', '')
-        try:
-            data = self.delete(task_id)
-            if not data[0]:
-                return mw.returnJson(False, data[1])
-            return mw.returnJson(True, '删除成功')
-        except Exception as e:
-            return mw.returnJson(False, '删除失败:' + str(e))
-
-    def delete(self, tid):
-
-        find = mw.M('crontab').where("id=?", (tid,)).field('name,echo').find()
-        if not self.removeForCrond(find['echo']):
-            return (False, '无法写入文件，请检查是否开启了系统加固功能!')
-
-        cronPath = mw.getServerDir() + '/cron'
-        sfile = cronPath + '/' + find['echo']
-
-        if os.path.exists(sfile):
-            os.remove(sfile)
-        sfile = cronPath + '/' + find['echo'] + '.log'
-        if os.path.exists(sfile):
-            os.remove(sfile)
-
-        mw.M('crontab').where("id=?", (tid,)).delete()
-        mw.writeLog('计划任务', mw.getInfo('删除计划任务[{1}]成功!', (find['name'],)))
-        return (True, "OK")
-
-    def delLogsApi(self):
-        sid = request.form.get('id', '')
-        try:
-            echo = mw.M('crontab').where("id=?", (sid,)).getField('echo')
-            logFile = mw.getServerDir() + '/cron/' + echo + '.log'
-            os.remove(logFile)
-            return mw.returnJson(True, '任务日志已清空!')
-        except:
-            return mw.returnJson(False, '任务日志清空失败!')
-
-    # 取数据列表
-    def getDataListApi(self):
-        stype = request.form.get('type', '')
-
-        bak_data = []
-        if stype == 'site' or stype == 'sites' or stype == 'database' or stype.find('database_') > -1 or stype == 'path':
-            hookPath = mw.getPanelDataDir() + "/hook_backup.json"
-            if os.path.exists(hookPath):
-                t = mw.readFile(hookPath)
-                bak_data = json.loads(t)
-
-        if stype == 'database' or stype.find('database_') > -1:
-            sqlite3_name = 'mysql'
-            path = mw.getServerDir() + '/mysql'
-            if stype != 'database':
-                soft_name = stype.replace('database_', '')
-                path = mw.getServerDir() + '/' + soft_name
-
-                if soft_name == 'postgresql':
-                    sqlite3_name = 'pgsql'
-
-                if soft_name == 'mongodb':
-                    sqlite3_name = 'mongodb'
-
-            db_list = {}
-            db_list['orderOpt'] = bak_data
-
-            if not os.path.exists(path + '/' + sqlite3_name + '.db'):
-                db_list['data'] = []
-            else:
-                db_list['data'] = mw.M('databases').dbPos(path, sqlite3_name).field('name,ps').select()
-            return mw.getJson(db_list)
-
-        if stype == 'path':
-            db_list = {}
-            db_list['data'] = [{"name": mw.getWwwDir(), "ps": "www"}]
-            db_list['orderOpt'] = bak_data
-            return mw.getJson(db_list)
-
-        data = {}
-        data['orderOpt'] = bak_data
-
-        default_db = 'sites'
-        # if stype == 'site' or stype == 'logs':
-        #     stype == 'sites'
-
-        data['data'] = mw.M(default_db).field('name,ps').select()
-        return mw.getJson(data)
-    ##### ----- start ----- ###
-
-    # 转换大写星期
-    def toWeek(self, num):
-        wheres = {
-            0:   '日',
-            1:   '一',
-            2:   '二',
-            3:   '三',
-            4:   '四',
-            5:   '五',
-            6:   '六'
-        }
-        try:
-            return wheres[num]
-        except:
-            return ''
-
-    def getCrondCycle(self, params):
-        cuonConfig = ''
-        name = ''
-        if params['type'] == "day":
-            cuonConfig = self.getDay(params)
-            name = '每天'
-        elif params['type'] == "day-n":
-            cuonConfig = self.getDay_N(params)
-            name = mw.getInfo('每{1}天', (params['where1'],))
-        elif params['type'] == "hour":
-            cuonConfig = self.getHour(params)
-            name = '每小时'
-        elif params['type'] == "hour-n":
-            cuonConfig = self.getHour_N(params)
-            name = '每小时'
-        elif params['type'] == "minute-n":
-            cuonConfig = self.minute_N(params)
-        elif params['type'] == "week":
-            params['where1'] = params['week']
-            cuonConfig = self.week(params)
-        elif params['type'] == "month":
-            cuonConfig = self.month(params)
-        return cuonConfig, params, name
-
-    # 取任务构造Day
-    def getDay(self, param):
-        cuonConfig = "{0} {1} * * * ".format(param['minute'], param['hour'])
-        return cuonConfig
-    # 取任务构造Day_n
-
-    def getDay_N(self, param):
-        cuonConfig = "{0} {1} */{2} * * ".format(
-            param['minute'], param['hour'], param['where1'])
-        return cuonConfig
-
-    # 取任务构造Hour
-    def getHour(self, param):
-        cuonConfig = "{0} * * * * ".format(param['minute'])
-        return cuonConfig
-
-    # 取任务构造Hour-N
-    def getHour_N(self, param):
-        cuonConfig = "{0} */{1} * * * ".format(
-            param['minute'], param['where1'])
-        return cuonConfig
-
-    # 取任务构造Minute-N
-    def minute_N(self, param):
-        cuonConfig = "*/{0} * * * * ".format(param['where1'])
-        return cuonConfig
-
-    # 取任务构造week
-    def week(self, param):
-        cuonConfig = "{0} {1} * * {2}".format(
-            param['minute'], param['hour'], param['week'])
-        return cuonConfig
-
-    # 取任务构造Month
-    def month(self, param):
-        cuonConfig = "{0} {1} {2} * * ".format(param['minute'], param['hour'], param['where1'])
-        return cuonConfig
-
-    # 取执行脚本
-    def getShell(self, param):
-        # try:
-        stype = param['stype']
-        if stype == 'toFile':
-            shell = param.sFile
-        else:
-            head = "#!/bin/bash\nPATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin\nexport PATH\n"
-
-            start_head = '''
-SCRIPT_RUN_TIME="0s"
-MW_ToSeconds()
-{
-    SEC=$1
-    if [ $SEC -lt 60 ]; then
-       SCRIPT_RUN_TIME="${SEC}s"
-    elif [ $SEC -ge 60 ] && [ $SEC -lt 3600 ];then
-       SCRIPT_RUN_TIME="$(( SEC / 60 ))m$(( SEC % 60 ))s"
-    elif [ $SEC -ge 3600 ]; then
-       SCRIPT_RUN_TIME="$(( SEC / 3600 ))h$(( (SEC % 3600) / 60 ))m$(( (SEC % 3600) % 60 ))s"
-    fi
-}
-START_MW_SHELL_TIME=`date +%s`
-'''
-
-            source_bin_activate = '''
-export LANG=en_US.UTF-8
-MW_PATH=%s/bin/activate
-if [ -f $MW_PATH ];then
-    source $MW_PATH
-fi''' % (mw.getRunDir(),)
-
-            head = head + start_head + source_bin_activate + "\n"
-            log = '.log'
-
-            #所有
-            if param['sname'] == 'ALL':
-                log = ''
-
-            script_dir = mw.getRunDir() + "/scripts"
-            source_stype = 'database'
-            if stype.find('database_') > -1:
-                plugin_name = stype.replace('database_', '')
-                script_dir = mw.getRunDir() + "/plugins/" + plugin_name + "/scripts"
-
-                source_stype = stype
-                stype = 'database'
-
-            wheres = {
-                'path': head + "python3 " + script_dir + "/backup.py path " + param['sname'] + " " + str(param['save']),
-                'site':   head + "python3 " + script_dir + "/backup.py site " + param['sname'] + " " + str(param['save']),
-                'database': head + "python3 " + script_dir + "/backup.py 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'
-            }
-            if param['backup_to'] != 'localhost':
-                cfile = mw.getPluginDir() + "/" + \
-                    param['backup_to'] + "/index.py"
-
-                wheres['path'] = head + "python3 " + cfile + \
-                    " path " + param['sname'] + " " + str(param['save'])
-                wheres['site'] = head + "python3 " + cfile + \
-                    " site " + param['sname'] + " " + str(param['save'])
-                wheres['database'] = head + "python3 " + cfile + " " + \
-                    source_stype + " " + \
-                    param['sname'] + " " + str(param['save'])
-            try:
-                shell = wheres[stype]
-            except:
-                if stype == 'toUrl':
-                    shell = head + "curl -sS --connect-timeout 10 -m 60 '" + \
-                        param['urladdress'] + "'"
-                else:
-                    shell = head + param['sbody'].replace("\r\n", "\n")
-
-            shell += '''
-echo "----------------------------------------------------------------------------"
-endDate=`date +"%Y-%m-%d %H:%M:%S"`
-END_MW_SHELL_TIME=`date +"%s"`
-((SHELL_COS_TIME=($END_MW_SHELL_TIME-$START_MW_SHELL_TIME)))
-MW_ToSeconds $SHELL_COS_TIME
-echo "★[$endDate] Successful | Script Run [$SCRIPT_RUN_TIME] "
-echo "----------------------------------------------------------------------------"
-'''
-        cronPath = mw.getServerDir() + '/cron'
-        if not os.path.exists(cronPath):
-            mw.execShell('mkdir -p ' + cronPath)
-
-        if not 'echo' in param:
-            cronName = mw.md5(mw.md5(str(time.time()) + '_mw'))
-        else:
-            cronName = param['echo']
-        file = cronPath + '/' + cronName
-        mw.writeFile(file, self.checkScript(shell))
-        mw.execShell('chmod 750 ' + file)
-        return cronName
-
-    # 检查脚本
-    def checkScript(self, shell):
-        keys = ['shutdown', 'init 0', 'mkfs', 'passwd',
-                'chpasswd', '--stdin', 'mkfs.ext', 'mke2fs']
-        for key in keys:
-            shell = shell.replace(key, '[***]')
-        return shell
-
-    # 将Shell脚本写到文件
-    def writeShell(self, config):
-        file = '/var/spool/cron/crontabs/root'
-        current_os = mw.getOs()
-        if current_os == 'darwin':
-            file = '/etc/crontab'
-        elif current_os.startswith("freebsd"):
-            file = '/var/cron/tabs/root'
-
-        if not os.path.exists(file):
-            file = '/var/spool/cron/root'
-
-        if not os.path.exists(file):
-            mw.writeFile(file, '')
-        conf = mw.readFile(file)
-        conf += str(config) + "\n"
-        if mw.writeFile(file, conf):
-            if not os.path.exists(file):
-                mw.execShell("chmod 600 '" + file +
-                             "' && chown root.root " + file)
-            else:
-                mw.execShell("chmod 600 '" + file +
-                             "' && chown root.crontab " + file)
-            return True
-        return mw.returnJson(False, '文件写入失败,请检查是否开启系统加固功能!')
-
-    # 重载配置
-    def crondReload(self):
-        if mw.isAppleSystem():
-            # mw.execShell('/usr/sbin/cron restart')
-            if os.path.exists('/etc/crontab'):
-                pass
-        else:
-            if os.path.exists('/etc/init.d/crond'):
-                mw.execShell('/etc/init.d/crond reload')
-            elif os.path.exists('/etc/init.d/cron'):
-                mw.execShell('service cron restart')
-            else:
-                mw.execShell("systemctl reload crond")
-
-    # 从crond删除
-    def removeForCrond(self, echo):
-        u_file = '/var/spool/cron/crontabs/root'
-        if not os.path.exists(u_file):
-            file = '/var/spool/cron/root'
-            if mw.isAppleSystem():
-                file = '/etc/crontab'
-
-            if not os.path.exists(file):
-                return False
-        else:
-            file = u_file
-
-        if mw.isAppleSystem():
-            return True
-
-        conf = mw.readFile(file)
-        rep = ".+" + str(echo) + ".+\n"
-        conf = re.sub(rep, "", conf)
-        if not mw.writeFile(file, conf):
-            return False
-        self.crondReload()
-        return True
-
-    def syncToCrond(self, cronInfo):
-        if 'status' in cronInfo:
-            if cronInfo['status'] == 0:
-                return False
-        if 'where_hour' in cronInfo:
-            cronInfo['hour'] = cronInfo['where_hour']
-            cronInfo['minute'] = cronInfo['where_minute']
-            cronInfo['week'] = cronInfo['where1']
-        cuonConfig, cronInfo, name = self.getCrondCycle(cronInfo)
-        cronPath = mw.getServerDir() + '/cron'
-        cronName = self.getShell(cronInfo)
-        if type(cronName) == dict:
-            return cronName
-        cuonConfig += ' ' + cronPath + '/' + cronName + \
-            ' >> ' + cronPath + '/' + cronName + '.log 2>&1'
-        wRes = self.writeShell(cuonConfig)
-        if type(wRes) != bool:
-            return False
-        self.crondReload()
diff --git a/class/core/db.py b/class/core/db.py
deleted file mode 100755
index 3ae39f8d4..000000000
--- a/class/core/db.py
+++ /dev/null
@@ -1,401 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# sqlite3操作
-# ---------------------------------------------------------------------------------
-
-
-import sqlite3
-import os
-import sys
-
-
-class Sql():
-    #------------------------------
-    # 数据库操作类 For sqlite3
-    #------------------------------
-    __DB_FILE = None            # 数据库文件
-    __DB_CONN = None            # 数据库连接对象
-    __DB_TABLE = ""             # 被操作的表名称
-    __OPT_WHERE = ""            # where条件
-    __OPT_LIMIT = ""            # limit条件
-    __OPT_GROUP = ""            # group条件
-    __OPT_ORDER = ""            # order条件
-    __OPT_FIELD = "*"           # field条件
-    __OPT_PARAM = ()            # where值
-
-    def __init__(self):
-        self.__DB_FILE = 'data/default.db'
-
-    def __getConn(self):
-        # 取数据库对象
-        try:
-            if self.__DB_CONN == None:
-                self.__DB_CONN = sqlite3.connect(self.__DB_FILE)
-                self.__DB_CONN.text_factory = str
-        except Exception as ex:
-            # print(mw.getTracebackInfo())
-            return "error: " + str(ex)
-
-    def changeTextFactoryToBytes(self):
-        self.__DB_CONN.text_factory = bytes
-        return True
-
-    def autoTextFactory(self):
-        if sys.version_info[0] == 3:
-            self.__DB_CONN.text_factory = lambda x: str(
-                x, encoding="utf-8", errors='ignore')
-        else:
-            self.__DB_CONN.text_factory = lambda x: unicode(
-                x, "utf-8", "ignore")
-
-    def dbfile(self, name):
-        self.__DB_FILE = 'data/' + name + '.db'
-        return self
-
-    def dbPos(self, path, name, suffix_name = 'db'):
-        self.__DB_FILE = path + '/' + name + '.' + suffix_name
-        return self
-
-    def table(self, table):
-        # 设置表名
-        self.__DB_TABLE = table
-        return self
-
-    def where(self, where, param=()):
-        # WHERE条件
-        if where:
-            self.__OPT_WHERE = " WHERE " + where
-            self.__OPT_PARAM = param
-        return self
-
-    def andWhere(self, where, param):
-        # WHERE条件
-        if where:
-            self.__OPT_WHERE = self.__OPT_WHERE + " and " + where
-            # print(param)
-            # print(self.__OPT_PARAM)
-            self.__OPT_PARAM = self.__OPT_PARAM + param
-        return self
-
-    def order(self, order):
-        # ORDER条件
-        if len(order):
-            self.__OPT_ORDER = " ORDER BY " + order
-        else:
-            self.__OPT_ORDER = ""
-        return self
-
-    def group(self, group):
-        if len(group):
-            self.__OPT_GROUP = " GROUP BY " + group
-        else:
-            self.__OPT_GROUP = ""
-        return self
-
-    def limit(self, limit):
-        # LIMIT条件
-        if len(limit):
-            self.__OPT_LIMIT = " LIMIT " + limit
-        else:
-            self.__OPT_LIMIT = ""
-        return self
-
-    def field(self, field):
-        # FIELD条件
-        if len(field):
-            self.__OPT_FIELD = field
-        return self
-
-    def select(self):
-        # 查询数据集
-        self.__getConn()
-        try:
-            sql = "SELECT " + self.__OPT_FIELD + " FROM " + self.__DB_TABLE + \
-                self.__OPT_WHERE + self.__OPT_GROUP + self.__OPT_ORDER + self.__OPT_LIMIT
-            # print(sql)
-            # print(self.__OPT_PARAM)
-            result = self.__DB_CONN.execute(sql, self.__OPT_PARAM)
-            data = result.fetchall()
-            # 构造字曲系列
-            if self.__OPT_FIELD != "*":
-                field = self.__OPT_FIELD.split(',')
-                tmp = []
-                for row in data:
-                    i = 0
-                    tmp1 = {}
-                    for key in field:
-                        tmp1[key] = row[i]
-                        i += 1
-                    tmp.append(tmp1)
-                    del(tmp1)
-                data = tmp
-                del(tmp)
-            else:
-                # 将元组转换成列表
-                tmp = map(list, data)
-                data = tmp
-                del(tmp)
-            self.__close()
-            return data
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    def inquiry(self, input_field=''):
-        # 查询数据集
-        # 不清空查询参数
-        self.__getConn()
-        try:
-            sql = "SELECT " + self.__OPT_FIELD + " FROM " + self.__DB_TABLE + \
-                self.__OPT_WHERE + self.__OPT_GROUP + self.__OPT_ORDER + self.__OPT_LIMIT
-
-            if os.path.exists('data/debug.pl'):
-                print(sql, self.__OPT_PARAM)
-            result = self.__DB_CONN.execute(sql, self.__OPT_PARAM)
-            data = result.fetchall()
-            # 构造字曲系列
-            if self.__OPT_FIELD != "*":
-
-                if input_field != "":
-                    field = input_field.split(',')
-                else:
-                    field = self.__OPT_FIELD.split(',')
-
-                tmp = []
-                for row in data:
-                    i = 0
-                    tmp1 = {}
-                    for key in field:
-                        tmp1[key] = row[i]
-                        i += 1
-                    tmp.append(tmp1)
-                    del(tmp1)
-                data = tmp
-                del(tmp)
-            else:
-                # 将元组转换成列表
-                tmp = map(list, data)
-                data = tmp
-                del(tmp)
-            return data
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    def getField(self, keyName):
-        # 取回指定字段
-        result = self.field(keyName).select()
-        # print(result)
-        if len(result) == 1:
-            return result[0][keyName]
-        return result
-
-    def setField(self, keyName, keyValue):
-        # 更新指定字段
-        return self.save(keyName, (keyValue,))
-
-    def find(self):
-        # 取一行数据
-        result = self.limit("1").select()
-        if len(result) == 1:
-            return result[0]
-        return result
-
-    def count(self):
-        # 取行数
-        key = "COUNT(*)"
-        data = self.field(key).select()
-        try:
-            return int(data[0][key])
-        except:
-            return 0
-
-    def add(self, keys, param):
-        # 插入数据
-        self.__getConn()
-        try:
-            values = ""
-            for key in keys.split(','):
-                values += "?,"
-            values = self.checkInput(values[0:len(values) - 1])
-            sql = "INSERT INTO " + self.__DB_TABLE + \
-                "(" + keys + ") " + "VALUES(" + values + ")"
-            result = self.__DB_CONN.execute(sql, param)
-            last_id = result.lastrowid
-            self.__close()
-            self.__DB_CONN.commit()
-            return last_id
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    # 插入数据
-    def insert(self, pdata):
-        if not pdata:
-            return False
-        keys, param = self.__format_pdata(pdata)
-        return self.add(keys, param)
-
-    # 更新数据
-    def update(self, pdata):
-        if not pdata:
-            return False
-        keys, param = self.__format_pdata(pdata)
-        return self.save(keys, param)
-
-    # 构造数据
-    def __format_pdata(self, pdata):
-        keys = pdata.keys()
-        keys_str = ','.join(keys)
-        param = []
-        for k in keys:
-            param.append(pdata[k])
-        return keys_str, tuple(param)
-
-    def checkInput(self, data):
-        if not data:
-            return data
-        if type(data) != str:
-            return data
-        checkList = [
-            {'d': '<', 'r': '＜'},
-            {'d': '>', 'r': '＞'},
-            {'d': '\'', 'r': '‘'},
-            {'d': '"', 'r': '“'},
-            {'d': '&', 'r': '＆'},
-            {'d': '#', 'r': '＃'},
-            {'d': '<', 'r': '＜'}
-        ]
-        for v in checkList:
-            data = data.replace(v['d'], v['r'])
-        return data
-
-    def addAll(self, keys, param):
-        # 插入数据
-        self.__getConn()
-        try:
-            values = ""
-            for key in keys.split(','):
-                values += "?,"
-            values = values[0:len(values) - 1]
-            sql = "INSERT INTO " + self.__DB_TABLE + \
-                "(" + keys + ") " + "VALUES(" + values + ")"
-            result = self.__DB_CONN.execute(sql, param)
-            return True
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    def commit(self):
-        self.__close()
-        self.__DB_CONN.commit()
-
-    def save(self, keys, param):
-        # 更新数据
-        self.__getConn()
-        try:
-            opt = ""
-            for key in keys.split(','):
-                opt += key + "=?,"
-            opt = opt[0:len(opt) - 1]
-            sql = "UPDATE " + self.__DB_TABLE + " SET " + opt + self.__OPT_WHERE
-
-            # import mw
-            # mw.writeFile('/tmp/test.pl', sql)
-
-            # 处理拼接WHERE与UPDATE参数
-            tmp = list(param)
-            for arg in self.__OPT_PARAM:
-                tmp.append(arg)
-            self.__OPT_PARAM = tuple(tmp)
-            result = self.__DB_CONN.execute(sql, self.__OPT_PARAM)
-            self.__close()
-            self.__DB_CONN.commit()
-            return result.rowcount
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    def delete(self, id=None):
-        # 删除数据
-        self.__getConn()
-        try:
-            if id:
-                self.__OPT_WHERE = " WHERE id=?"
-                self.__OPT_PARAM = (id,)
-            sql = "DELETE FROM " + self.__DB_TABLE + self.__OPT_WHERE
-            result = self.__DB_CONN.execute(sql, self.__OPT_PARAM)
-            self.__close()
-            self.__DB_CONN.commit()
-            return result.rowcount
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    def originExecute(self, sql, param=()):
-        self.__getConn()
-        try:
-            result = self.__DB_CONN.execute(sql, param)
-            self.__DB_CONN.commit()
-            return result
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    def execute(self, sql, param=()):
-        # 执行SQL语句返回受影响行
-        self.__getConn()
-        # print sql, param
-        try:
-            result = self.__DB_CONN.execute(sql, param)
-            self.__DB_CONN.commit()
-            return result.rowcount
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    def query(self, sql, param=()):
-        # 执行SQL语句返回数据集
-        self.__getConn()
-        try:
-            result = self.__DB_CONN.execute(sql, param)
-            # 将元组转换成列表
-            # data = map(list, result)
-            return result
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    def create(self, name):
-        # 创建数据表
-        self.__getConn()
-        import mw
-        script = mw.readFile('data/' + name + '.sql')
-        result = self.__DB_CONN.executescript(script)
-        self.__DB_CONN.commit()
-        return result.rowcount
-
-    def fofile(self, filename):
-        # 执行脚本
-        self.__getConn()
-        import mw
-        script = mw.readFile(filename)
-        result = self.__DB_CONN.executescript(script)
-        self.__DB_CONN.commit()
-        return result.rowcount
-
-    def __close(self):
-        # 清理条件属性
-        self.__OPT_WHERE = ""
-        self.__OPT_FIELD = "*"
-        self.__OPT_ORDER = ""
-        self.__OPT_LIMIT = ""
-        self.__OPT_PARAM = ()
-
-    def close(self):
-        # 释放资源
-        try:
-            self.__DB_CONN.close()
-            self.__DB_CONN = None
-        except:
-            pass
diff --git a/class/core/files_api.py b/class/core/files_api.py
deleted file mode 100755
index 02aadf1be..000000000
--- a/class/core/files_api.py
+++ /dev/null
@@ -1,1160 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 文件类操作
-# ---------------------------------------------------------------------------------
-
-
-import psutil
-import time
-import os
-import sys
-import mw
-import re
-import json
-import pwd
-import shutil
-
-from flask import request
-from flask import send_file, send_from_directory
-from flask import make_response
-from flask import session
-
-
-class files_api:
-
-    rPath = None
-
-    def __init__(self):
-        self.rPath = mw.getRootDir() + '/recycle_bin/'
-
-    ##### ----- start ----- ###
-    def getBodyApi(self):
-        path = request.form.get('path', '')
-        return self.getBody(path)
-
-    def getLastBodyApi(self):
-        path = request.form.get('path', '')
-        line = request.form.get('line', '100')
-
-        if not os.path.exists(path):
-            return mw.returnJson(False, '文件不存在', (path,))
-
-        try:
-            data = mw.getLastLine(path, int(line))
-            return mw.returnJson(True, 'OK', data)
-        except Exception as ex:
-            return mw.returnJson(False, '无法正确读取文件!' + str(ex))
-
-    def saveBodyApi(self):
-        path = request.form.get('path', '')
-        data = request.form.get('data', '')
-        encoding = request.form.get('encoding', '')
-        return self.saveBody(path, data, encoding)
-
-    def downloadApi(self):
-        filename = request.args.get('filename', '')
-        if not os.path.exists(filename):
-            return ''
-
-        is_attachment = True
-        if filename.endswith(".svg"):
-            is_attachment = False
-
-        response = make_response(send_from_directory(
-            os.path.dirname(filename), os.path.basename(filename), as_attachment=is_attachment))
-        return response
-
-    def zipApi(self):
-        sfile = request.form.get('sfile', '')
-        dfile = request.form.get('dfile', '')
-        stype = request.form.get('type', '')
-        path = request.form.get('path', '')
-        return self.zip(sfile, dfile, stype, path)
-
-    def unzipApi(self):
-        sfile = request.form.get('sfile', '')
-        dfile = request.form.get('dfile', '')
-        stype = request.form.get('type', '')
-        path = request.form.get('path', '')
-        return self.unzip(sfile, dfile, stype, path)
-
-    def uncompressApi(self):
-        sfile = request.form.get('sfile', '')
-        dfile = request.form.get('dfile', '')
-        path = request.form.get('path', '')
-        return self.uncompress(sfile, dfile, path)
-
-    # 移动文件或目录
-    def mvFileApi(self):
-        sfile = request.form.get('sfile', '')
-        dfile = request.form.get('dfile', '')
-        if not self.checkFileName(dfile):
-            return mw.returnJson(False, '文件名中不能包含特殊字符!')
-        if not os.path.exists(sfile):
-            return mw.returnJson(False, '指定文件不存在!')
-
-        if not self.checkDir(sfile):
-            return mw.returnJson(False, 'FILE_DANGER')
-
-        import shutil
-        try:
-            shutil.move(sfile, dfile)
-            msg = mw.getInfo('移动或重名命文件[{1}]到[{2}]成功!', (sfile, dfile,))
-            mw.writeLog('文件管理', msg)
-            return mw.returnJson(True, '移动或重名命文件成功!')
-        except:
-            return mw.returnJson(False, '移动或重名命文件失败!')
-
-    def deleteApi(self):
-        path = request.form.get('path', '')
-        return self.delete(path)
-
-    def fileAccessApi(self):
-        filename = request.form.get('filename', '')
-        data = self.getAccess(filename)
-        data['sys_users'] = self.getSysUserList()
-        return mw.getJson(data)
-
-    def setFileAccessApi(self):
-
-        if mw.isAppleSystem():
-            return mw.returnJson(True, '开发机不设置!')
-
-        filename = request.form.get('filename', '')
-        user = request.form.get('user', '')
-        access = request.form.get('access', '755')
-        sall = '-R'
-        try:
-            if not self.checkDir(filename):
-                return mw.returnJson(False, '请不要花样作死')
-
-            if not os.path.exists(filename):
-                return mw.returnJson(False, '指定文件不存在!')
-
-            os.system('chmod ' + sall + ' ' + access + " '" + filename + "'")
-            os.system('chown ' + sall + ' ' + user +
-                      ':' + user + " '" + filename + "'")
-            msg = mw.getInfo(
-                '设置[{1}]权限为[{2}]所有者为[{3}]', (filename, access, user,))
-            mw.writeLog('文件管理', msg)
-            return mw.returnJson(True, '设置成功!')
-        except:
-            return mw.returnJson(False, '设置失败!')
-
-    def getDirSizeApi(self):
-        path = request.form.get('path', '')
-        tmp = self.getDirSize(path)
-        return mw.returnJson(True, tmp[0].split()[0])
-
-    def getDirApi(self):
-        path = request.form.get('path', '')
-        if not os.path.exists(path):
-            path = mw.getRootDir() + "/wwwroot"
-        search = request.args.get('search', '').strip().lower()
-        search_all = request.args.get('all', '').strip().lower()
-        page = request.args.get('p', '1').strip().lower()
-        row = request.args.get('row', '10')
-        order = request.form.get('order', '')
-
-        if search_all == 'yes' and search != '':
-            return self.getAllDir(path, int(page), int(row), order, search)
-        return self.getDir(path, int(page), int(row), order, search)
-
-    def createFileApi(self):
-        file = request.form.get('path', '')
-        try:
-            if not self.checkFileName(file):
-                return mw.returnJson(False, '文件名中不能包含特殊字符!')
-            if os.path.exists(file):
-                return mw.returnJson(False, '指定文件已存在!')
-            _path = os.path.dirname(file)
-            if not os.path.exists(_path):
-                os.makedirs(_path)
-            open(file, 'w+').close()
-            self.setFileAccept(file)
-            msg = mw.getInfo('创建文件[{1}]成功!', (file,))
-            mw.writeLog('文件管理', msg)
-            return mw.returnJson(True, '文件创建成功!')
-        except Exception as e:
-            return mw.returnJson(True, '文件创建失败!')
-
-    def createDirApi(self):
-        path = request.form.get('path', '')
-        try:
-            if not self.checkFileName(path):
-                return mw.returnJson(False, '目录名中不能包含特殊字符!')
-            if os.path.exists(path):
-                return mw.returnJson(False, '指定目录已存在!')
-            os.makedirs(path)
-            self.setFileAccept(path)
-            msg = mw.getInfo('创建目录[{1}]成功!', (path,))
-            mw.writeLog('文件管理', msg)
-            return mw.returnJson(True, '目录创建成功!')
-        except Exception as e:
-            return mw.returnJson(False, '目录创建失败!')
-
-    def downloadFileApi(self):
-        import db
-        import time
-        url = request.form.get('url', '')
-        path = request.form.get('path', '')
-        filename = request.form.get('filename', '')
-        execstr = url + '|mw|' + path + '/' + filename
-        execstr = execstr.strip()
-        mw.M('tasks').add('name,type,status,addtime,execstr',
-                          ('下载文件[' + filename + ']', 'download', '-1', time.strftime('%Y-%m-%d %H:%M:%S'), execstr))
-
-        # self.setFileAccept(path + '/' + filename)
-        mw.triggerTask()
-        return mw.returnJson(True, '已将下载任务添加到队列!')
-
-    # 删除进程下的所有进程
-    def removeTaskRecursion(self, pid):
-        cmd = "ps -ef|grep " + pid + \
-            " | grep -v grep |sed -n '2,1p' | awk '{print $2}'"
-        sub_pid = mw.execShell(cmd)
-
-        if sub_pid[0].strip() == '':
-            return 'ok'
-
-        self.removeTaskRecursion(sub_pid[0].strip())
-        mw.execShell('kill -9 ' + sub_pid[0].strip())
-        return sub_pid[0].strip()
-
-    def removeTaskApi(self):
-        import system_api
-        mid = request.form.get('id', '')
-        try:
-            name = mw.M('tasks').where('id=?', (mid,)).getField('name')
-            status = mw.M('tasks').where('id=?', (mid,)).getField('status')
-            mw.M('tasks').delete(mid)
-            if status == '-1':
-                task_pid = mw.execShell(
-                    "ps aux | grep 'task.py' | grep -v grep |awk '{print $2}'")
-
-                task_list = task_pid[0].strip().split("\n")
-                for i in range(len(task_list)):
-                    self.removeTaskRecursion(task_list[i])
-
-                mw.triggerTask()
-                system_api.system_api().restartTask()
-        except:
-            system_api.system_api().restartTask()
-
-        # 删除日志
-        task_log = mw.getRunDir() + "/tmp/panelTask.pl"
-        if os.path.exists(task_log):
-            os.remove(task_log)
-        return mw.returnJson(True, '任务已删除!')
-
-    def uploadFileApi(self):
-        # 上传文件
-        from werkzeug.utils import secure_filename
-        from flask import request
-
-        path = request.args.get('path', '')
-
-        if not os.path.exists(path):
-            os.makedirs(path)
-        f = request.files['zunfile']
-        filename = os.path.join(path, f.filename)
-
-        s_path = path
-        if os.path.exists(filename):
-            s_path = filename
-        p_stat = os.stat(s_path)
-
-        # print(filename)
-        f.save(filename)
-        os.chown(filename, p_stat.st_uid, p_stat.st_gid)
-        os.chmod(filename, p_stat.st_mode)
-
-        msg = mw.getInfo('上传文件[{1}] 到 [{2}]成功!', (filename, path))
-        mw.writeLog('文件管理', msg)
-        return mw.returnMsg(True, '上传成功!')
-
-    # 设置文件和目录权限
-    def setMode(self, path):
-        s_path = os.path.dirname(path)
-        p_stat = os.stat(s_path)
-        os.chown(path, p_stat.st_uid, p_stat.st_gid)
-        os.chmod(path, p_stat.st_mode)
-
-    def uploadSegmentApi(self):
-        # 分段上传
-        path = request.form.get('path', '')
-        name = request.form.get('name', '')
-        size = request.form.get('size')
-        start = request.form.get('start')
-        dir_mode = request.form.get('dir_mode', '')
-        file_mode = request.form.get('file_mode', '')
-
-        if not mw.fileNameCheck(name):
-            return mw.returnJson(False, '文件名中不能包含特殊字符!')
-
-        if path == '/':
-            return mw.returnJson(False, '不能直接上传文件到系统根目录!')
-
-        if name.find('./') != -1 or path.find('./') != -1:
-            return mw.returnJson(False, '错误的参数')
-
-        if not os.path.exists(path):
-            os.makedirs(path, 493)
-            if not dir_mode != '' or not file_mode != '':
-                mw.setMode(path)
-
-        save_path = os.path.join(
-            path, name + '.' + str(int(size)) + '.upload.tmp')
-        d_size = 0
-        if os.path.exists(save_path):
-            d_size = os.path.getsize(save_path)
-
-        if d_size != int(start):
-            return str(d_size)
-
-        f = open(save_path, 'ab')
-        b64_data = request.form.get('b64_data', '0')
-        if b64_data == '1':
-            import base64
-            b64_data = base64.b64decode(args.b64_data)
-            f.write(b64_data)
-        else:
-            upload_files = request.files.getlist("blob")
-            for tmp_f in upload_files:
-                f.write(tmp_f.read())
-
-        f.close()
-        f_size = os.path.getsize(save_path)
-        if f_size != int(size):
-            return str(f_size)
-
-        new_name = os.path.join(path, name)
-        if os.path.exists(new_name):
-            if new_name.find('.user.ini') != -1:
-                mw.execShell("chattr -i " + new_name)
-            try:
-                os.remove(new_name)
-            except:
-                mw.execShell("rm -f %s" % new_name)
-
-        os.renames(save_path, new_name)
-
-        if dir_mode != '' and dir_mode != '':
-            mode_tmp1 = dir_mode.split(',')
-            mw.setMode(path, mode_tmp1[0])
-            mw.setOwn(path, mode_tmp1[1])
-            mode_tmp2 = file_mode.split(',')
-            mw.setMode(new_name, mode_tmp2[0])
-            mw.setOwn(new_name, mode_tmp2[1])
-        else:
-            self.setMode(new_name)
-
-        msg = mw.getInfo('上传文件[{1}] 到 [{2}]成功!', (new_name, path))
-        mw.writeLog('文件管理', msg)
-        return mw.returnMsg(True, '上传成功!')
-
-    def getRecycleBinApi(self):
-        rPath = self.rPath
-        if not os.path.exists(rPath):
-            os.system('mkdir -p ' + rPath)
-        data = {}
-        data['dirs'] = []
-        data['files'] = []
-        data['status'] = os.path.exists('data/recycle_bin.pl')
-        data['status_db'] = os.path.exists('data/recycle_bin_db.pl')
-        for file in os.listdir(rPath):
-            try:
-                tmp = {}
-                fname = rPath + file
-                tmp1 = file.split('_mw_')
-                tmp2 = tmp1[len(tmp1) - 1].split('_t_')
-                tmp['rname'] = file
-                tmp['dname'] = file.replace('_mw_', '/').split('_t_')[0]
-                tmp['name'] = tmp2[0]
-                tmp['time'] = int(float(tmp2[1]))
-                if os.path.islink(fname):
-                    filePath = os.readlink(fname)
-                    link = ' -> ' + filePath
-                    if os.path.exists(filePath):
-                        tmp['size'] = os.path.getsize(filePath)
-                    else:
-                        tmp['size'] = 0
-                else:
-                    tmp['size'] = os.path.getsize(fname)
-                if os.path.isdir(fname):
-                    data['dirs'].append(tmp)
-                else:
-                    data['files'].append(tmp)
-            except Exception as e:
-                continue
-        return mw.returnJson(True, 'OK', data)
-
-    # 回收站开关
-    def recycleBinApi(self):
-        c = 'data/recycle_bin.pl'
-        db = request.form.get('db', '')
-        if db != '':
-            c = 'data/recycle_bin_db.pl'
-        if os.path.exists(c):
-            os.remove(c)
-            mw.writeLog('文件管理', '已关闭回收站功能!')
-            return mw.returnJson(True, '已关闭回收站功能!')
-        else:
-            mw.writeFile(c, 'True')
-            mw.writeLog('文件管理', '已开启回收站功能!')
-            return mw.returnJson(True, '已开启回收站功能!')
-
-    def reRecycleBinApi(self):
-        rPath = self.rPath
-        path = request.form.get('path', '')
-        dFile = path.replace('_mw_', '/').split('_t_')[0]
-        try:
-            import shutil
-            shutil.move(rPath + path, dFile)
-            msg = mw.getInfo('移动文件[{1}]到回收站成功!', (dFile,))
-            mw.writeLog('文件管理', msg)
-            return mw.returnJson(True, '恢复成功!')
-        except Exception as e:
-            msg = mw.getInfo('从回收站恢复[{1}]失败!', (dFile,))
-            mw.writeLog('文件管理', msg)
-            return mw.returnJson(False, '恢复失败!')
-
-    def delRecycleBinApi(self):
-        rPath = self.rPath
-        path = request.form.get('path', '')
-        empty = request.form.get('empty', '')
-        dFile = path.split('_t_')[0]
-
-        if not self.checkDir(path):
-            return mw.returnJson(False, '敏感目录,请不要花样作死!')
-
-        mw.execShell('which chattr && chattr -R -i ' + rPath + path)
-        if os.path.isdir(rPath + path):
-            import shutil
-            shutil.rmtree(rPath + path)
-        else:
-            os.remove(rPath + path)
-
-        tfile = path.replace('_mw_', '/').split('_t_')[0]
-        msg = mw.getInfo('已彻底从回收站删除{1}!', (tfile,))
-        mw.writeLog('文件管理', msg)
-        return mw.returnJson(True, msg)
-
-    # 获取进度
-    def getSpeedApi(self):
-        data = mw.getSpeed()
-        return mw.returnJson(True, '已清空回收站!', data)
-
-    def closeRecycleBinApi(self):
-        rPath = self.rPath
-        mw.execShell('which chattr && chattr -R -i ' + rPath)
-        rlist = os.listdir(rPath)
-        i = 0
-        l = len(rlist)
-        for name in rlist:
-            i += 1
-            path = rPath + name
-            mw.writeSpeed(name, i, l)
-            if os.path.isdir(path):
-                shutil.rmtree(path)
-            else:
-                os.remove(path)
-        mw.writeSpeed(None, 0, 0)
-        mw.writeLog('文件管理', '已清空回收站!')
-        return mw.returnJson(True, '已清空回收站!')
-
-    def deleteDirApi(self):
-        path = request.form.get('path', '')
-        if not os.path.exists(path):
-            return mw.returnJson(False, '指定文件不存在!')
-
-        # 检查是否为.user.ini
-        if path.find('.user.ini'):
-            os.system("which chattr && chattr -i '" + path + "'")
-        try:
-            if os.path.exists('data/recycle_bin.pl'):
-                if self.mvRecycleBin(path):
-                    return mw.returnJson(True, '已将文件移动到回收站!')
-            mw.execShell('rm -rf ' + path)
-            mw.writeLog('文件管理', '删除文件成功！', (path,))
-            return mw.returnJson(True, '删除文件成功!')
-        except:
-            return mw.returnJson(False, '删除文件失败!')
-
-    def closeLogsApi(self):
-        logPath = mw.getLogsDir()
-        os.system('rm -f ' + logPath + '/*')
-        os.system('kill -USR1 `cat ' + mw.getServerDir() +
-                  'openresty/nginx/logs/nginx.pid`')
-        mw.writeLog('文件管理', '网站日志已被清空!')
-        tmp = self.getDirSize(logPath)
-        return mw.returnJson(True, tmp[0].split()[0])
-
-    def setBatchDataApi(self):
-        path = request.form.get('path', '')
-        stype = request.form.get('type', '')
-        access = request.form.get('access', '')
-        user = request.form.get('user', '')
-        data = request.form.get('data')
-        if stype == '1' or stype == '2':
-            session['selected'] = {
-                'path': path,
-                'type': stype,
-                'access': access,
-                'user': user,
-                'data': data
-            }
-            return mw.returnJson(True, '标记成功,请在目标目录点击粘贴所有按钮!')
-        elif stype == '3':
-            for key in json.loads(data):
-                try:
-                    filename = path + '/' + key
-                    if not self.checkDir(filename):
-                        return mw.returnJson(False, 'FILE_DANGER')
-                    os.system('chmod -R ' + access + " '" + filename + "'")
-                    os.system('chown -R ' + user + ':' +
-                              user + " '" + filename + "'")
-                except:
-                    continue
-            mw.writeLog('文件管理', '批量设置权限成功!')
-            return mw.returnJson(True, '批量设置权限成功!')
-        else:
-            import shutil
-            isRecyle = os.path.exists('data/recycle_bin.pl')
-            data = json.loads(data)
-            l = len(data)
-            i = 0
-            for key in data:
-                try:
-                    filename = path + '/' + key
-                    topath = filename
-                    if not os.path.exists(filename):
-                        continue
-
-                    i += 1
-                    mw.writeSpeed(key, i, l)
-                    if os.path.isdir(filename):
-                        if not self.checkDir(filename):
-                            return mw.returnJson(False, '请不要花样作死!')
-                        if isRecyle:
-                            self.mvRecycleBin(topath)
-                        else:
-                            shutil.rmtree(filename)
-                    else:
-                        if key == '.user.ini':
-                            os.system('which chattr && chattr -i ' + filename)
-                        if isRecyle:
-                            self.mvRecycleBin(topath)
-                        else:
-                            os.remove(filename)
-                except:
-                    continue
-                mw.writeSpeed(None, 0, 0)
-            mw.writeLog('文件管理', '批量删除成功!')
-            return mw.returnJson(True, '批量删除成功！')
-
-    def checkExistsFilesApi(self):
-        dfile = request.form.get('dfile', '')
-        filename = request.form.get('filename', '')
-        data = []
-        filesx = []
-        if filename == '':
-            filesx = json.loads(session['selected']['data'])
-        else:
-            filesx.append(filename)
-
-        for fn in filesx:
-            if fn == '.':
-                continue
-            filename = dfile + '/' + fn
-            if os.path.exists(filename):
-                tmp = {}
-                stat = os.stat(filename)
-                tmp['filename'] = fn
-                tmp['size'] = os.path.getsize(filename)
-                tmp['mtime'] = str(int(stat.st_mtime))
-                data.append(tmp)
-        return mw.returnJson(True, 'ok', data)
-
-    def batchPasteApi(self):
-        path = request.form.get('path', '')
-        stype = request.form.get('type', '')
-        # filename = request.form.get('filename', '')
-        import shutil
-        if not self.checkDir(path):
-            return mw.returnJson(False, '请不要花样作死!')
-        i = 0
-        myfiles = json.loads(session['selected']['data'])
-        l = len(myfiles)
-        if stype == '1':
-            for key in myfiles:
-                i += 1
-                mw.writeSpeed(key, i, l)
-                try:
-
-                    sfile = session['selected'][
-                        'path'] + '/' + key
-                    dfile = path + '/' + key
-
-                    if os.path.isdir(sfile):
-                        shutil.copytree(sfile, dfile)
-                    else:
-                        shutil.copyfile(sfile, dfile)
-                    stat = os.stat(sfile)
-                    os.chown(dfile, stat.st_uid, stat.st_gid)
-                except:
-                    continue
-            msg = mw.getInfo('从[{1}]批量复制到[{2}]成功',
-                             (session['selected']['path'], path,))
-            mw.writeLog('文件管理', msg)
-        else:
-            for key in myfiles:
-                try:
-                    i += 1
-                    mw.writeSpeed(key, i, l)
-
-                    sfile = session['selected'][
-                        'path'] + '/' + key
-                    dfile = path + '/' + key
-
-                    shutil.move(sfile, dfile)
-                except:
-                    continue
-            msg = mw.getInfo('从[{1}]批量移动到[{2}]成功',
-                             (session['selected']['path'], path,))
-            mw.writeLog('文件管理', msg)
-        mw.writeSpeed(None, 0, 0)
-        errorCount = len(myfiles) - i
-        del(session['selected'])
-        msg = mw.getInfo('批量操作成功[{1}],失败[{2}]', (str(i), str(errorCount)))
-        return mw.returnJson(True, msg)
-
-    def copyFileApi(self):
-        sfile = request.form.get('sfile', '')
-        dfile = request.form.get('dfile', '')
-
-        if sfile == dfile:
-            return mw.returnJson(False, '源与目的一致!')
-
-        if not os.path.exists(sfile):
-            return mw.returnJson(False, '指定文件不存在!')
-
-        if os.path.isdir(sfile):
-            return self.copyDir(sfile, dfile)
-
-        try:
-            import shutil
-            shutil.copyfile(sfile, dfile)
-            msg = mw.getInfo('复制文件[{1}]到[{2}]成功!', (sfile, dfile,))
-            mw.writeLog('文件管理', msg)
-            stat = os.stat(sfile)
-            os.chown(dfile, stat.st_uid, stat.st_gid)
-            return mw.returnJson(True, '文件复制成功!')
-        except:
-            return mw.returnJson(False, '文件复制失败!')
-
-    ##### ----- end ----- ###
-
-    def copyDir(self, sfile, dfile):
-
-        if not os.path.exists(sfile):
-            return mw.returnJson(False, '指定目录不存在!')
-
-        if os.path.exists(dfile):
-            return mw.returnJson(False, '指定目录已存在!')
-        import shutil
-        try:
-            shutil.copytree(sfile, dfile)
-            stat = os.stat(sfile)
-            os.chown(dfile, stat.st_uid, stat.st_gid)
-            msg = mw.getInfo('复制目录[{1}]到[{2}]成功!', (sfile, dfile))
-            mw.writeLog('文件管理', msg)
-            return mw.returnJson(True, '目录复制成功!')
-        except:
-            return mw.returnJson(False, '目录复制失败!')
-
-    # 检查敏感目录
-    def checkDir(self, path):
-        # path = str(path, encoding='utf-8')
-        path = path.replace('//', '/')
-        if path[-1:] == '/':
-            path = path[:-1]
-
-        nDirs = ('',
-                 '/',
-                 '/*',
-                 '/www',
-                 '/root',
-                 '/boot',
-                 '/bin',
-                 '/etc',
-                 '/home',
-                 '/dev',
-                 '/sbin',
-                 '/var',
-                 '/usr',
-                 '/tmp',
-                 '/sys',
-                 '/proc',
-                 '/media',
-                 '/mnt',
-                 '/opt',
-                 '/lib',
-                 '/srv',
-                 '/selinux',
-                 '/www/server',
-                 mw.getRootDir())
-
-        return not path in nDirs
-
-    def getDirSize(self, path):
-        tmp = mw.execShell('du -sh ' + path)
-        return tmp
-
-    def checkFileName(self, filename):
-        # 检测文件名
-        nots = ['\\', '&', '*', '|', ';']
-        if filename.find('/') != -1:
-            filename = filename.split('/')[-1]
-        for n in nots:
-            if n in filename:
-                return False
-        return True
-
-    def setFileAccept(self, filename):
-        auth = 'www:www'
-        if mw.getOs() == 'darwin':
-            user = mw.execShell(
-                "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
-            auth = user + ':staff'
-
-        os.system('chown -R ' + auth + ' ' + filename)
-        os.system('chmod -R 755 ' + filename)
-
-    # 移动到回收站
-    def mvRecycleBin(self, path):
-        rPath = self.rPath
-        if not os.path.exists(rPath):
-            os.system('mkdir -p ' + rPath)
-
-        rFile = rPath + path.replace('/', '_mw_') + '_t_' + str(time.time())
-        try:
-            import shutil
-            shutil.move(path, rFile)
-            mw.writeLog('文件管理', mw.getInfo(
-                '移动文件[{1}]到回收站成功!', (path)))
-            return True
-        except:
-            mw.writeLog('文件管理', mw.getInfo(
-                '移动文件[{1}]到回收站失败!', (path)))
-            return False
-
-    def getBody(self, path):
-        if not os.path.exists(path):
-            return mw.returnJson(False, '文件不存在', (path,))
-
-        if os.path.getsize(path) > 2097152:
-            return mw.returnJson(False, '不能在线编辑大于2MB的文件!')
-
-        if os.path.isdir(path):
-            return mw.returnJson(False, '这不是一个文件!')
-
-        fp = open(path, 'rb')
-        data = {}
-        data['status'] = True
-        if fp:
-            srcBody = fp.read()
-            fp.close()
-
-            encoding_list = ['utf-8', 'GBK', 'BIG5']
-            for el in encoding_list:
-                try:
-                    data['encoding'] = el
-                    data['data'] = srcBody.decode(data['encoding'])
-                    break
-                except Exception as ex:
-                    if el == 'BIG5':
-                        return mw.returnJson(False, '文件编码不被兼容，无法正确读取文件!' + str(ex))
-        else:
-            return mw.returnJson(False, '文件未正常打开!')
-
-        return mw.returnJson(True, 'OK', data)
-
-    def saveBody(self, path, data, encoding='utf-8'):
-        if not os.path.exists(path):
-            return mw.returnJson(False, '文件不存在')
-        try:
-            if encoding == 'ascii':
-                encoding = 'utf-8'
-
-            data = data.encode(
-                encoding, errors='ignore').decode(encoding)
-            fp = open(path, 'w+', encoding=encoding)
-            fp.write(data)
-            fp.close()
-
-            if path.find("web_conf") > 0:
-                mw.restartWeb()
-
-            mw.writeLog('文件管理', '文件[{1}]保存成功', (path,))
-            return mw.returnJson(True, '文件保存成功')
-        except Exception as ex:
-            return mw.returnJson(False, '文件保存错误:' + str(ex))
-
-    def zip(self, sfile, dfile, stype, path):
-        if sfile.find(',') == -1:
-            if not os.path.exists(path + '/' + sfile):
-                return mw.returnMsg(False, '指定文件不存在!')
-
-        try:
-            tmps = mw.getRunDir() + '/tmp/panelExec.log'
-            if stype == 'zip':
-                mw.execShell("cd '" + path + "' && zip '" + dfile +
-                             "' -r '" + sfile + "' > " + tmps + " 2>&1")
-            else:
-                sfiles = ''
-                for sfile in sfile.split(','):
-                    if not sfile:
-                        continue
-                    sfiles += " '" + sfile + "'"
-                mw.execShell("cd '" + path + "' && tar -zcvf '" +
-                             dfile + "' " + sfiles + " > " + tmps + " 2>&1")
-            self.setFileAccept(dfile)
-            mw.writeLog("文件管理", '文件[{1}]压缩[{2}]成功!', (sfile, dfile))
-            return mw.returnJson(True, '文件压缩成功!')
-        except:
-            return mw.returnJson(False, '文件压缩失败!')
-
-    def uncompress(self, sfile, dfile, path):
-        if not os.path.exists(sfile):
-            return mw.returnJson(False, '指定文件不存在!')
-
-        filename = os.path.basename(sfile)
-        extension = os.path.splitext(filename)[-1]
-        extension = extension.strip('.')
-
-        tar_gz = 'tar.gz'
-        tar_gz_len = len(tar_gz)
-        suffix_gz = sfile[-tar_gz_len:]
-        if suffix_gz == tar_gz:
-            extension = suffix_gz
-
-        if not extension in ['tar.gz', 'gz', 'zip', 'rar']:
-            return mw.returnJson(False, '现在仅支持gz,zip,rar格式解压!')
-
-        if mw.isAppleSystem() and extension == 'rar':
-            return mw.returnJson(False, 'macosx暂时不支持rar格式解压')
-
-        try:
-            tmps = mw.getRunDir() + '/tmp/panelExec.log'
-            if extension == 'zip':
-                cmd = "cd " + path + " && unzip -o -d '" + dfile + \
-                    "' '" + sfile + "' > " + tmps + " 2>&1 &"
-                mw.execShell(cmd)
-            if extension == 'tar.gz':
-                cmd = "cd " + path + " && tar -zxvf " + sfile + \
-                    " -C " + dfile + " > " + tmps + " 2>&1 &"
-                mw.execShell(cmd)
-            if extension == 'gz':
-                cmd = "cd " + path + " && gunzip -k " + sfile + " > " + tmps + " 2>&1 &"
-                mw.execShell(cmd)
-            if extension == 'rar':
-                cmd = "cd " + path + " && unrar x " + sfile + \
-                    " " + dfile + " > " + tmps + " 2>&1 &"
-                mw.execShell(cmd)
-
-            if os.path.exists(dfile):
-                self.setFileAccept(dfile)
-            mw.writeLog("文件管理", '文件[{1}]解压[{2}]成功!', (sfile, dfile))
-            return mw.returnJson(True, '文件解压成功!')
-        except Exception as e:
-            return mw.returnJson(False, '文件解压失败!:' + str(e))
-
-    def unzip(self, sfile, dfile, stype, path):
-        if not os.path.exists(sfile):
-            return mw.returnJson(False, '指定文件不存在!')
-
-        try:
-            tmps = mw.getRunDir() + '/tmp/panelExec.log'
-            if stype == 'zip':
-                mw.execShell("cd " + path + " && unzip -o -d '" + dfile +
-                             "' '" + sfile + "' > " + tmps + " 2>&1 &")
-            else:
-                sfiles = ''
-                for sfile in sfile.split(','):
-                    if not sfile:
-                        continue
-                    sfiles += " '" + sfile + "'"
-                mw.execShell("cd " + path + " && tar -zxvf " + sfiles +
-                             " -C " + dfile + " > " + tmps + " 2>&1 &")
-
-            self.setFileAccept(dfile)
-            mw.writeLog("文件管理", '文件[{1}]解压[{2}]成功!', (sfile, dfile))
-            return mw.returnJson(True, '文件解压成功!')
-        except:
-            return mw.returnJson(False, '文件解压失败!')
-
-    def delete(self, path):
-
-        if not os.path.exists(path):
-            return mw.returnJson(False, '指定文件不存在!')
-
-        # 检查是否为.user.ini
-        if path.find('.user.ini') >= 0:
-            mw.execShell("which chattr && chattr -i '" + path + "'")
-
-        try:
-            if os.path.exists('data/recycle_bin.pl'):
-                if self.mvRecycleBin(path):
-                    return mw.returnJson(True, '已将文件移动到回收站!')
-            os.remove(path)
-            mw.writeLog('文件管理', mw.getInfo(
-                '删除文件[{1}]成功!', (path)))
-            return mw.returnJson(True, '删除文件成功!')
-        except:
-            return mw.returnJson(False, '删除文件失败!')
-
-    def getAccess(self, filename):
-        data = {}
-        try:
-            stat = os.stat(filename)
-            data['chmod'] = str(oct(stat.st_mode)[-3:])
-            data['chown'] = pwd.getpwuid(stat.st_uid).pw_name
-        except:
-            data['chmod'] = 755
-            data['chown'] = 'www'
-        return data
-
-    def getSysUserList(self):
-        pwd_file = '/etc/passwd'
-        if os.path.exists(pwd_file):
-            content = mw.readFile(pwd_file)
-            clist = content.split('\n')
-            sys_users = []
-            for line in clist:
-                if line.find(":")<0:
-                    continue
-                lines = line.split(":",1)
-                sys_users.append(lines[0])
-            return sys_users
-        return ['root','mysql','www']
-
-        # 计算文件数量
-    def getCount(self, path, search):
-        i = 0
-        for name in os.listdir(path):
-            if search:
-                if name.lower().find(search) == -1:
-                    continue
-            if name == '.':
-                continue
-            i += 1
-        return i
-
-    def getAllDir(self, path, page=1, page_size=10, order='', search=None):
-        # print("search:", search)
-        data = {}
-        dirnames = []
-        filenames = []
-
-        info = {}
-        
-        i = 0
-        n = 0
-        count = 0
-        max_limit = 3000
-        order_arr = order.split(' ')
-        if len(order_arr) < 2:
-            plist = mw.sortAllFileList(path, order_arr[0],'',search, max_limit)
-        else:
-            plist = mw.sortAllFileList(path, order_arr[0], order_arr[1], search,max_limit)
-
-        info['count'] = len(plist)
-        info['row'] = page_size
-        info['p'] = page
-        info['tojs'] = 'getFiles'
-        pageObj = mw.getPageObject(info, '1,2,3,4,5,6,7,8')
-        data['PAGE'] = pageObj[0]
-
-        for dst_file in plist:
-
-            if not os.path.exists(dst_file):
-                continue
-
-            i += 1
-            if n >= pageObj[1].ROW:
-                break
-            if i < pageObj[1].SHIFT:
-                continue
-
-            if os.path.isdir(dst_file):
-                dirnames.append(self.__get_stats(dst_file, path))
-            else:
-                filenames.append(self.__get_stats(dst_file, path))
-            n += 1
-
-        data['DIR'] = dirnames
-        data['FILES'] = filenames
-        data['PATH'] = path.replace('//', '/')
-
-        return mw.getJson(data)
-
-    #备份
-    def getAllDirBk(self, path, page=1, page_size=10, order='', search=None):
-        data = {}
-        dirnames = []
-        filenames = []
-
-        count = 0
-        max_limit = 3000
-        for d_list in os.walk(path):
-
-            if count >= max_limit:
-                break
-
-            for d in d_list[1]:
-                if count >= max_limit:
-                    break
-                if d.lower().find(search) != -1:
-                    filename = d_list[0] + '/' + d
-                    if not os.path.exists(filename):
-                        continue
-                    dirnames.append(self.__get_stats(filename, path))
-                    count += 1
-
-            for f in d_list[2]:
-                if count >= max_limit:
-                    break
-
-                if f.lower().find(search) != -1:
-                    filename = d_list[0] + '/' + f
-                    if not os.path.exists(filename):
-                        continue
-                    filenames.append(self.__get_stats(filename, path))
-                    count += 1
-
-        data['DIR'] = sorted(dirnames)
-        data['FILES'] = sorted(filenames)
-        data['PATH'] = path.replace('//', '/')
-
-        info = {}
-        info['count'] = len(dirnames) + len(filenames)
-        info['row'] = page_size
-        info['p'] = page
-        info['tojs'] = 'getFiles'
-        pageObj = mw.getPageObject(info, '1,2,3,4,5,6,7,8')
-        data['PAGE'] = pageObj[0]
-
-        return mw.getJson(data)
-
-    def getDir(self, path, page=1, page_size=10, order = '', search=None):
-        data = {}
-        dirnames = []
-        filenames = []
-
-        info = {}
-        info['count'] = self.getCount(path, search)
-        info['row'] = page_size
-        info['p'] = page
-        info['tojs'] = 'getFiles'
-        pageObj = mw.getPageObject(info, '1,2,3,4,5,6,7,8')
-        data['PAGE'] = pageObj[0]
-
-        i = 0
-        n = 0
-
-        order_arr = order.split(' ')
-        if len(order_arr) < 2:
-            plist = mw.sortFileList(path, order_arr[0], '')
-        else:
-            plist = mw.sortFileList(path, order_arr[0], order_arr[1])
-        
-        for filename in plist:
-            if search:
-                if filename.lower().find(search) == -1:
-                    continue
-            i += 1
-            if n >= pageObj[1].ROW:
-                break
-            if i < pageObj[1].SHIFT:
-                continue
-            try:
-                filePath = path + '/' + filename
-                if not os.path.exists(filePath):
-                    continue
-
-                file_stats = self.__get_stats(filePath, path)
-                if os.path.isdir(filePath):
-                    dirnames.append(file_stats)
-                else:
-                    filenames.append(file_stats)
-                n += 1
-            except Exception as e:
-                continue
-        data['DIR'] = dirnames
-        data['FILES'] = filenames
-        data['PATH'] = path.replace('//', '/')
-
-        return mw.getJson(data)
-
-    def execShellApi(self):
-        # 执行SHELL命令
-        shell = request.form.get('shell', '').strip()
-        path = request.form.get('path', '').strip()
-        disabled = ['vi', 'vim', 'top', 'passwd', 'su']
-        tmp = shell.split(' ')
-        if tmp[0] in disabled:
-            return mw.returnJson(False, '禁止执行[{}]'.format(tmp[0]))
-        shellStr = '''#!/bin/bash
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
-export PATH
-cd %s
-%s
-''' % (path, shell)
-        mw.writeFile('/tmp/panelShell.sh', shellStr)
-        mw.execShell(
-            'nohup bash /tmp/panelShell.sh > /tmp/panelShell.pl 2>&1 &')
-        return mw.returnJson(True, 'ok')
-
-    def getExecShellMsgApi(self):
-        # 取SHELL执行结果
-        fileName = '/tmp/panelShell.pl'
-        if not os.path.exists(fileName):
-            return ''
-        status = not mw.processExists('bash', None, '/tmp/panelShell.sh')
-        return mw.returnJson(status, mw.getNumLines(fileName, 200))
-
-    def __get_stats(self, filename, path=None):
-        # print(filename,path)
-        filename = filename.replace('//', '/')
-        try:
-            stat = os.stat(filename)
-            accept = str(oct(stat.st_mode)[-3:])
-            mtime = str(int(stat.st_mtime))
-            user = ''
-            try:
-                user = str(pwd.getpwuid(stat.st_uid).pw_name)
-            except:
-                user = str(stat.st_uid)
-            size = str(stat.st_size)
-            link = ''
-            if os.path.islink(filename):
-                link = ' -> ' + os.readlink(filename)
-
-            if path:
-                tmp_path = (path + '/').replace('//', '/')
-                filename = filename.replace(tmp_path, '', 1)
-
-            return filename + ';' + size + ';' + mtime + ';' + accept + ';' + user + ';' + link
-        except Exception as e:
-            # print(e)
-            return ';;;;;'
diff --git a/class/core/firewall_api.py b/class/core/firewall_api.py
deleted file mode 100755
index 04d48f06b..000000000
--- a/class/core/firewall_api.py
+++ /dev/null
@@ -1,513 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 防火墙操作
-# ---------------------------------------------------------------------------------
-
-
-import psutil
-import time
-import os
-import sys
-import mw
-import re
-import json
-import pwd
-
-from flask import request
-
-
-class firewall_api:
-
-    __isFirewalld = False
-    __isIptables = False
-    __isUfw = False
-    __isMac = False
-
-    def __init__(self):
-        iptables_file = mw.systemdCfgDir() + '/iptables.service'
-        if os.path.exists('/usr/sbin/firewalld'):
-            self.__isFirewalld = True
-        elif os.path.exists('/usr/sbin/ufw'):
-            self.__isUfw = True
-        elif os.path.exists(iptables_file):
-            self.__isIptables = True
-        elif mw.isAppleSystem():
-            self.__isMac = True
-
-    ##### ----- start ----- ###
-    # 添加屏蔽IP
-    def addDropAddressApi(self):
-        import re
-        port = request.form.get('port', '').strip()
-        ps = request.form.get('ps', '').strip()
-
-        rep = r"^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(\/\d{1,2})?$"
-        if not re.search(rep, port):
-            return mw.returnJson(False, '您输入的IP地址不合法!')
-        address = port
-        if mw.M('firewall').where("port=?", (address,)).count() > 0:
-            return mw.returnJson(False, '您要放屏蔽的IP已存在屏蔽列表，无需重复处理!')
-        if self.__isUfw:
-            mw.execShell('ufw deny from ' + address + ' to any')
-        else:
-            if self.__isIptables:
-                cmd = 'iptables -I INPUT -s ' + address + ' -j DROP'
-                mw.execShell(cmd)
-            elif self.__isFirewalld:
-                cmd = 'firewall-cmd --permanent --add-rich-rule=\'rule family=ipv4 source address="' + \
-                    address + '" drop\''
-                mw.execShell(cmd)
-            else:
-                pass
-
-        msg = mw.getInfo('屏蔽IP[{1}]成功!', (address,))
-        mw.writeLog("防火墙管理", msg)
-        addtime = time.strftime('%Y-%m-%d %X', time.localtime())
-        mw.M('firewall').add('port,ps,addtime', (address, ps, addtime))
-        self.firewallReload()
-        return mw.returnJson(True, '添加成功!')
-
-    # 添加放行端口
-    def addAcceptPortApi(self):
-        if not self.getFwStatus():
-            return mw.returnJson(False, '防火墙启动时,才能添加规则!')
-
-        port = request.form.get('port', '').strip()
-        ps = request.form.get('ps', '').strip()
-        stype = request.form.get('type', '').strip()
-        protocol = request.form.get('protocol', '').strip()
-
-        data = self.addAcceptPortArgs(port, ps, stype, protocol)
-        return mw.getJson(data)
-
-    # 添加放行端口
-    def addAcceptPortArgs(self, port, ps, stype, protocol='tcp'):
-        import re
-        import time
-
-        if not self.getFwStatus():
-            self.setFw(0)
-
-        rep = r"^\d{1,5}(:\d{1,5})?$"
-        if not re.search(rep, port):
-            return mw.returnData(False, '端口范围不正确!')
-
-        if mw.M('firewall').where("port=?", (port,)).count() > 0:
-            return mw.returnData(False, '您要放行的端口已存在，无需重复放行!')
-
-        msg = mw.getInfo('放行端口[{1}][{2}]成功', (port, protocol,))
-        mw.writeLog("防火墙管理", msg)
-        addtime = time.strftime('%Y-%m-%d %X', time.localtime())
-        mw.M('firewall').add('port,protocol,ps,addtime',
-                             (port, protocol, ps, addtime))
-
-        self.addAcceptPort(port, protocol)
-        self.firewallReload()
-        return mw.returnData(True, '添加放行(' + port + ')端口成功!')
-
-    # 删除IP屏蔽
-    def delDropAddressApi(self):
-        if not self.getFwStatus():
-            return mw.returnJson(False, '防火墙启动时,才能删除规则!')
-
-        port = request.form.get('port', '').strip()
-        ps = request.form.get('ps', '').strip()
-        sid = request.form.get('id', '').strip()
-        address = port
-        if self.__isUfw:
-            mw.execShell('ufw delete deny from ' + address + ' to any')
-        elif self.__isFirewalld:
-            mw.execShell(
-                'firewall-cmd --permanent --remove-rich-rule=\'rule family=ipv4 source address="' + address + '" drop\'')
-        elif self.__isIptables:
-            cmd = 'iptables -D INPUT -s ' + address + ' -j DROP'
-            mw.execShell(cmd)
-        else:
-            pass
-
-        msg = mw.getInfo('解除IP[{1}]的屏蔽!', (address,))
-        mw.writeLog("防火墙管理", msg)
-        mw.M('firewall').where("id=?", (sid,)).delete()
-
-        self.firewallReload()
-        return mw.returnJson(True, '删除成功!')
-
-    def delAcceptPortArgs(self, port, protocol='tcp'):
-        if self.__isUfw:
-            if protocol == 'tcp':
-                mw.execShell('ufw delete allow ' + port + '/tcp')
-            if protocol == 'udp':
-                mw.execShell('ufw delete allow ' + port + '/udp')
-            if protocol == 'tcp/udp':
-                mw.execShell('ufw delete allow ' + port + '/tcp')
-                mw.execShell('ufw delete allow ' + port + '/udp')
-        elif self.__isFirewalld:
-            port = port.replace(':', '-')
-            if protocol == 'tcp':
-                mw.execShell(
-                    'firewall-cmd --permanent --zone=public --remove-port=' + port + '/tcp')
-            if protocol == 'udp':
-                mw.execShell(
-                    'firewall-cmd --permanent --zone=public --remove-port=' + port + '/udp')
-            if protocol == 'tcp/udp':
-                mw.execShell(
-                    'firewall-cmd --permanent --zone=public --remove-port=' + port + '/tcp')
-                mw.execShell(
-                    'firewall-cmd --permanent --zone=public --remove-port=' + port + '/udp')
-        elif self.__isIptables:
-            if protocol == 'tcp':
-                mw.execShell(
-                    'iptables -D INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT')
-            if protocol == 'udp':
-                mw.execShell(
-                    'iptables -D INPUT -p udp -m state --state NEW -m udp --dport ' + port + ' -j ACCEPT')
-            if protocol == 'tcp/udp':
-                mw.execShell(
-                    'iptables -D INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT')
-                mw.execShell(
-                    'iptables -D INPUT -p udp -m state --state NEW -m udp --dport ' + port + ' -j ACCEPT')
-        else:
-            pass
-
-        mw.M('firewall').where("port=?", (port,)).delete()
-
-        msg = mw.getInfo('删除防火墙放行端口[{1}][{2}]成功!', (port, protocol,))
-        mw.writeLog("防火墙管理", msg)
-
-        self.firewallReload()
-        return True
-
-    # 删除放行端口
-    def delAcceptPortApi(self):
-        port = request.form.get('port', '').strip()
-        protocol = request.form.get('protocol', 'tcp').strip()
-        sid = request.form.get('id', '').strip()
-        mw_port = mw.readFile('data/port.pl')
-
-        if(port == mw_port):
-            return mw.returnJson(False, '失败，不能删除当前面板端口!')
-        try:
-            self.delAcceptPortArgs(port, protocol)
-            mw.M('firewall').where("id=?", (sid,)).delete()
-
-            return mw.returnJson(True, '删除成功!')
-        except Exception as e:
-            return mw.returnJson(False, '删除失败!:' + str(e))
-
-    def getWwwPathApi(self):
-        path = mw.getLogsDir()
-        return mw.getJson({'path': path})
-
-    def getListApi(self):
-        p = request.form.get('p', '1').strip()
-        limit = request.form.get('limit', '10').strip()
-        return self.getList(int(p), int(limit))
-
-    def getSshInfoApi(self):
-        data = {}
-
-        file = '/etc/ssh/sshd_config'
-        conf = mw.readFile(file)
-        rep = r"#*Port\s+([0-9]+)\s*\n"
-        port = re.search(rep, conf).groups(0)[0]
-
-        isPing = True
-        try:
-            if mw.isAppleSystem():
-                isPing = True
-            else:
-                file = '/etc/sysctl.conf'
-                sys_conf = mw.readFile(file)
-                rep = r"#*net\.ipv4\.icmp_echo_ignore_all\s*=\s*([0-9]+)"
-                tmp = re.search(rep, sys_conf).groups(0)[0]
-                if tmp == '1':
-                    isPing = False
-        except:
-            isPing = True
-
-        # sshd 检测
-        status = True
-        cmd = "service sshd status | grep -P '(dead|stop)'|grep -v grep"
-        ssh_status = mw.execShell(cmd)
-        if ssh_status[0] != '':
-            status = False
-
-        cmd = "systemctl status sshd.service | grep 'dead'|grep -v grep"
-        ssh_status = mw.execShell(cmd)
-        if ssh_status[0] != '':
-            status = False
-
-        data['pass_prohibit_status'] = False
-        # 密码登陆配置检查
-        pass_rep = r"PasswordAuthentication\s+(\w*)\s*\n"
-        pass_status = re.search(pass_rep, conf)
-        if pass_status:
-            if pass_status and pass_status.groups(0)[0].strip() == 'no':
-                data['pass_prohibit_status'] = True
-        else:
-            data['pass_prohibit_status'] = True
-
-        data['port'] = port
-        data['status'] = status
-        data['ping'] = isPing
-        if mw.isAppleSystem():
-            data['firewall_status'] = False
-        else:
-            data['firewall_status'] = self.getFwStatus()
-        return mw.getJson(data)
-
-    def setSshPortApi(self):
-        port = request.form.get('port', '1').strip()
-        if int(port) < 22 or int(port) > 65535:
-            return mw.returnJson(False, '端口范围必需在22-65535之间!')
-
-        ports = ['21', '25', '80', '443', '888']
-        if port in ports:
-            return mw.returnJson(False, '(' + port + ')' + '特殊端口不可设置!')
-
-        file = '/etc/ssh/sshd_config'
-        conf = mw.readFile(file)
-
-        rep = r"#*Port\s+([0-9]+)\s*\n"
-        conf = re.sub(rep, "Port " + port + "\n", conf)
-        mw.writeFile(file, conf)
-
-        self.addAcceptPortArgs(port, 'SSH端口修改', 'port')
-        if self.__isUfw:
-            mw.execShell("service ssh restart")
-        elif self.__isIptables:
-            mw.execShell("/etc/init.d/sshd restart")
-        elif self.__isFirewalld:
-            mw.execShell("systemctl restart sshd.service")
-        else:
-            return mw.returnJson(False, '修改失败!')
-        return mw.returnJson(True, '修改成功!')
-
-    def setSshStatusApi(self):
-        if mw.isAppleSystem():
-            return mw.returnJson(True, '开发机不能操作!')
-
-        status = request.form.get('status', '1').strip()
-        msg = 'SSH服务已启用'
-        act = 'start'
-        if status == "1":
-            msg = 'SSH服务已停用'
-            act = 'stop'
-
-        ssh_service = mw.systemdCfgDir() + '/sshd.service'
-        if os.path.exists(ssh_service):
-            mw.execShell("systemctl " + act + " sshd.service")
-        else:
-            mw.execShell('service sshd ' + act)
-
-        if os.path.exists('/etc/init.d/sshd'):
-            mw.execShell('/etc/init.d/sshd ' + act)
-
-        mw.writeLog("防火墙管理", msg)
-        return mw.returnJson(True, '操作成功!')
-
-    def setSshPassStatusApi(self):
-        if mw.isAppleSystem():
-            return mw.returnJson(True, '开发机不能操作!')
-
-        status = request.form.get('status', '1').strip()
-        msg = '禁止密码登陆成功'
-        if status == "1":
-            msg = '开启密码登陆成功'
-
-        file = '/etc/ssh/sshd_config'
-        if not os.path.exists(file):
-            return mw.returnJson(False, '无法设置!')
-
-        conf = mw.readFile(file)
-
-        pass_rep = r"PasswordAuthentication\s+(\w*)\s*\n"
-        pass_status = re.search(pass_rep, conf)
-        if not pass_status:
-            rep = r"(#)?PasswordAuthentication\s+(\w*)\s*\n"
-            conf = re.sub(rep, "PasswordAuthentication yes\n", conf)
-
-        if status == '1':
-            rep = r"PasswordAuthentication\s+(\w*)\s*\n"
-            conf = re.sub(rep, "PasswordAuthentication yes\n", conf)
-        else:
-            rep = r"PasswordAuthentication\s+(\w*)\s*\n"
-            conf = re.sub(rep, "PasswordAuthentication no\n", conf)
-        mw.writeFile(file, conf)
-        mw.execShell("systemctl restart sshd.service")
-        mw.writeLog("SSH管理", msg)
-        return mw.returnJson(True, msg)
-
-    def setPingApi(self):
-        if mw.isAppleSystem():
-            return mw.returnJson(True, '开发机不能操作!')
-
-        status = request.form.get('status')
-        filename = '/etc/sysctl.conf'
-        conf = mw.readFile(filename)
-        if conf.find('net.ipv4.icmp_echo') != -1:
-            rep = r"net\.ipv4\.icmp_echo.*"
-            conf = re.sub(rep, 'net.ipv4.icmp_echo_ignore_all=' + status, conf)
-        else:
-            conf += "\nnet.ipv4.icmp_echo_ignore_all=" + status
-
-        mw.writeFile(filename, conf)
-        mw.execShell('sysctl -p')
-        return mw.returnJson(True, '设置成功!')
-
-    def setFwApi(self):
-        if mw.isAppleSystem():
-            return mw.returnJson(True, '开发机不能设置!')
-
-        status = request.form.get('status', '1')
-        return mw.getJson(self.setFw(status))
-
-    def setFwIptables(self, status):
-        # iptables特殊处理
-        if status == '1':
-            mw.execShell('service iptables save')
-            mw.execShell('service iptables stop')
-        else:
-            # 重新导入数据
-            _list = mw.M('firewall').field('id,port,ps,addtime').limit(
-                '0,1000').order('id desc').select()
-
-            mw.execShell('iptables -P INPUT DROP')
-            mw.execShell('iptables -P OUTPUT ACCEPT')
-            for x in _list:
-                port = x['port']
-                if mw.isIpAddr(port):
-                    cmd = 'iptables -I INPUT -s ' + port + ' -j DROP'
-                    mw.execShell(cmd)
-                else:
-                    self.addAcceptPort(port)
-
-            mw.execShell('service iptables save')
-            mw.execShell('service iptables start')
-
-    def setFw(self, status):
-
-        if self.__isIptables:
-            self.setFwIptables(status)
-            return mw.returnData(True, '设置成功!')
-
-        if status == '1':
-            if self.__isUfw:
-                mw.execShell('/usr/sbin/ufw disable')
-
-            elif self.__isFirewalld:
-                mw.execShell('systemctl stop firewalld.service')
-                mw.execShell('systemctl disable firewalld.service')
-            else:
-                pass
-        else:
-            if self.__isUfw:
-                mw.execShell("echo 'y'| ufw enable")
-            elif self.__isFirewalld:
-                mw.execShell('systemctl start firewalld.service')
-                mw.execShell('systemctl enable firewalld.service')
-            else:
-                pass
-
-        return mw.returnData(True, '设置成功!')
-
-    ##### ----- start ----- ###
-
-    def getList(self, page, limit):
-
-        start = (page - 1) * limit
-
-        _list = mw.M('firewall').field('id,port,protocol,ps,addtime').limit(
-            str(start) + ',' + str(limit)).order('id desc').select()
-        data = {}
-        data['data'] = _list
-
-        count = mw.M('firewall').count()
-        _page = {}
-        _page['count'] = count
-        _page['tojs'] = 'showAccept'
-        _page['p'] = page
-
-        data['page'] = mw.getPage(_page)
-        return mw.getJson(data)
-
-    def addAcceptPort(self, port, protocol='tcp'):
-        if self.__isUfw:
-            if protocol == 'tcp':
-                mw.execShell('ufw allow ' + port + '/tcp')
-            if protocol == 'udp':
-                mw.execShell('ufw allow ' + port + '/udp')
-            if protocol == 'tcp/udp':
-                mw.execShell('ufw allow ' + port + '/tcp')
-                mw.execShell('ufw allow ' + port + '/udp')
-        elif self.__isFirewalld:
-            port = port.replace(':', '-')
-            if protocol == 'tcp':
-                cmd = 'firewall-cmd --permanent --zone=public --add-port=' + port + '/tcp'
-                mw.execShell(cmd)
-            if protocol == 'udp':
-                cmd = 'firewall-cmd --permanent --zone=public --add-port=' + port + '/udp'
-                mw.execShell(cmd)
-            if protocol == 'tcp/udp':
-                cmd = 'firewall-cmd --permanent --zone=public --add-port=' + port + '/tcp'
-                mw.execShell(cmd)
-                cmd = 'firewall-cmd --permanent --zone=public --add-port=' + port + '/udp'
-                mw.execShell(cmd)
-        elif self.__isIptables:
-            if protocol == 'tcp':
-                cmd = 'iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT'
-                mw.execShell(cmd)
-            if protocol == 'udp':
-                cmd = 'iptables -I INPUT -p udp -m state --state NEW -m udp --dport ' + port + ' -j ACCEPT'
-                mw.execShell(cmd)
-            if protocol == 'tcp/udp':
-                cmd = 'iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT'
-                mw.execShell(cmd)
-                cmd = 'iptables -I INPUT -p udp -m state --state NEW -m udp --dport ' + port + ' -j ACCEPT'
-                mw.execShell(cmd)
-        else:
-            pass
-        return True
-
-    def firewallReload(self):
-        if self.__isUfw:
-            mw.execShell('/usr/sbin/ufw reload')
-            return
-        elif self.__isIptables:
-            mw.execShell('service iptables save')
-            mw.execShell('service iptables restart')
-        elif self.__isFirewalld:
-            mw.execShell('firewall-cmd --reload')
-        else:
-            pass
-
-    def getFwStatus(self):
-        if self.__isUfw:
-            cmd = "/usr/sbin/ufw status| grep Status | awk -F ':' '{print $2}'"
-            data = mw.execShell(cmd)
-            if data[0].strip() == 'inactive':
-                return False
-            return True
-        elif self.__isIptables:
-            cmd = "systemctl status iptables | grep 'inactive'"
-            data = mw.execShell(cmd)
-            if data[0] != '':
-                return False
-            return True
-        elif self.__isFirewalld:
-            cmd = "ps -ef|grep firewalld |grep -v grep | awk '{print $2}'"
-            data = mw.execShell(cmd)
-            if data[0] == '':
-                return False
-            return True
-        else:
-            return False
diff --git a/class/core/logs_api.py b/class/core/logs_api.py
deleted file mode 100644
index 128d9a5dd..000000000
--- a/class/core/logs_api.py
+++ /dev/null
@@ -1,355 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 日志类操作
-# ---------------------------------------------------------------------------------
-
-import psutil
-import time
-import os
-import sys
-import mw
-import re
-import json
-import pwd
-
-from datetime import datetime
-from flask import request
-
-
-class logs_api:
-
-    __months = {'Jan': '01', 'Feb': '02', 'Mar': '03', 'Apr': '04', 'May': '05', 'Jun': '06',
-                'Jul': '07', 'Aug': '08', 'Sep': '09', 'Sept': '09', 'Oct': '10', 'Nov': '11', 'Dec': '12'}
-
-    def __init__(self):
-        pass
-
-    def delPanelLogsApi(self):
-        mw.M('logs').where('id>?', (0,)).delete()
-        mw.writeLog('面板设置', '面板操作日志已清空!')
-        return mw.returnJson(True, '面板操作日志已清空!')
-
-    def getLogListApi(self):
-        p = request.form.get('p', '1').strip()
-        limit = request.form.get('limit', '10').strip()
-        search = request.form.get('search', '').strip()
-        return self.getLogList(int(p), int(limit), search)
-
-    def getLogList(self, page, limit, search=''):
-        find_search = ''
-        if search != '':
-            find_search = "type like '%" + search + "%' or log like '%" + \
-                search + "%' or addtime like '%" + search + "%'"
-
-        start = (page - 1) * limit
-
-        _list = mw.M('logs').where(find_search, ()).field(
-            'id,type,log,addtime').limit(str(start) + ',' + str(limit)).order('id desc').select()
-        data = {}
-        data['data'] = _list
-
-        count = mw.M('logs').where(find_search, ()).count()
-        _page = {}
-        _page['count'] = count
-        _page['tojs'] = 'getLogs'
-        _page['p'] = page
-
-        data['page'] = mw.getPage(_page)
-        return mw.getJson(data)
-
-    def getLogsTitle(self, log_name):
-        log_name = log_name.replace('.1', '')
-        if log_name in ['mw-update.log']:
-            return '面板更新日志'
-        if log_name in ['mw-install.log']:
-            return '面板安装日志'
-        if log_name in ['auth.log', 'secure'] or log_name.find('auth.') == 0:
-            return '授权日志'
-        if log_name in ['dmesg'] or log_name.find('dmesg') == 0:
-            return '内核缓冲区日志'
-        if log_name in ['syslog'] or log_name.find('syslog') == 0:
-            return '系统日志'
-        if log_name in ['rsyncd.log']:
-            return '远程同步日志'
-        if log_name in ['btmp']:
-            return '失败的登录记录'
-        if log_name in ['utmp', 'wtmp']:
-            return '登录和重启记录'
-        if log_name in ['lastlog']:
-            return '用户最后登录'
-        if log_name in ['yum.log']:
-            return 'yum包管理器日志'
-        if log_name in ['anaconda.log']:
-            return 'Anaconda日志'
-        if log_name in ['dpkg.log']:
-            return 'dpkg日志'
-        if log_name in ['daemon.log']:
-            return '系统后台守护进程日志'
-        if log_name in ['boot.log']:
-            return '启动日志'
-        if log_name in ['kern.log']:
-            return '内核日志'
-        if log_name in ['maillog', 'mail.log']:
-            return '邮件日志'
-        if log_name.find('Xorg') == 0:
-            return 'Xorg日志'
-        if log_name in ['cron.log']:
-            return '定时任务日志'
-        if log_name in ['alternatives.log']:
-            return '更新替代信息'
-        if log_name in ['debug']:
-            return '调试信息'
-        if log_name.find('apt') == 0:
-            return 'apt-get相关日志'
-        if log_name.find('installer') == 0:
-            return '系统安装相关日志'
-        if log_name in ['messages']:
-            return '综合日志'
-        return '{}日志'.format(log_name.split('.')[0])
-
-    def getAuditLogsFilesApi(self):
-        log_dir = '/var/log'
-        log_files = []
-        for log_file in os.listdir(log_dir):
-            log_suffix = log_file.split('.')[-1:]
-            if log_suffix[0] in ['gz', 'xz', 'bz2', 'asl']:
-                continue
-
-            if log_file in ['.', '..']:
-                continue
-
-            filename = os.path.join(log_dir, log_file)
-            if not os.path.exists(filename):
-                continue
-
-            if os.path.isfile(filename):
-                file_size = os.path.getsize(filename)
-                if not file_size:
-                    continue
-
-                tmp = {
-                    'name': log_file,
-                    'size': file_size,
-                    'log_file': filename,
-                    'title': self.getLogsTitle(log_file),
-                    'uptime': os.path.getmtime(filename)
-                }
-
-                log_files.append(tmp)
-            else:
-                for next_name in os.listdir(filename):
-                    if next_name[-3:] in ['.gz', '.xz']:
-                        continue
-                    next_file = os.path.join(filename, next_name)
-                    if not os.path.isfile(next_file):
-                        continue
-                    file_size = os.path.getsize(next_file)
-                    if not file_size:
-                        continue
-                    log_name = '{}/{}'.format(log_file, next_name)
-                    tmp = {
-                        'name': log_name,
-                        'size': file_size,
-                        'log_file': next_file,
-                        'title': self.getLogsTitle(log_name),
-                        'uptime': os.path.getmtime(next_file)
-                    }
-                    log_files.append(tmp)
-        log_files = sorted(log_files, key=lambda x: x['name'], reverse=True)
-        return mw.getJson(log_files)
-
-    def getAuditFileApi(self):
-        log_name = request.form.get('log_name', '').strip()
-        return self.getAuditLogsName(log_name)
-
-    def __to_date2(self, date_str):
-        tmp = date_str.split()
-        s_date = str(tmp[-1]) + '-' + self.__months.get(tmp[1], tmp[1]) + '-' + tmp[2] + ' ' + tmp[3]
-        return s_date
-
-    def __to_date3(self, date_str):
-        tmp = date_str.split()
-        s_date = str(datetime.now().year) + '-' + self.__months.get(tmp[1], tmp[1]) + '-' + tmp[2] + ' ' + tmp[3]
-        return s_date
-
-    def __to_date4(self, date_str):
-        tmp = date_str.split()
-        s_date = str(datetime.now().year) + '-' + \
-            self.__months.get(tmp[0], tmp[0]) + '-' + tmp[1] + ' ' + tmp[2]
-        return s_date
-
-    def getAuditLast(self, log_name):
-        # 获取日志
-        cmd = '''LANG=en_US.UTF-8 last -n 200 -x -f {} |grep -v 127.0.0.1|grep -v " begins"'''.format(
-            '/var/log/' + log_name)
-        result = mw.execShell(cmd)
-        lastlog_list = []
-        for _line in result[0].split("\n"):
-            if not _line:
-                continue
-            tmp = {}
-            sp_arr = _line.split()
-            tmp['用户'] = sp_arr[0]
-            if sp_arr[0] == 'runlevel':
-                tmp['来源'] = sp_arr[4]
-                tmp['端口'] = ' '.join(sp_arr[1:4])
-                tmp['时间'] = self.__to_date3(
-                    ' '.join(sp_arr[5:])) + ' ' + ' '.join(sp_arr[-2:])
-            elif sp_arr[0] in ['reboot', 'shutdown']:
-                tmp['来源'] = sp_arr[3]
-                tmp['端口'] = ' '.join(sp_arr[1:3])
-                if sp_arr[-3] == '-':
-                    tmp['时间'] = self.__to_date3(
-                        ' '.join(sp_arr[4:])) + ' ' + ' '.join(sp_arr[-3:])
-                else:
-                    tmp['时间'] = self.__to_date3(
-                        ' '.join(sp_arr[4:])) + ' ' + ' '.join(sp_arr[-2:])
-            elif sp_arr[1] in ['tty1', 'tty', 'tty2', 'tty3', 'hvc0', 'hvc1', 'hvc2'] or len(sp_arr) == 9:
-                tmp['来源'] = ''
-                tmp['端口'] = sp_arr[1]
-                tmp['时间'] = self.__to_date3(
-                    ' '.join(sp_arr[2:])) + ' ' + ' '.join(sp_arr[-3:])
-            else:
-                tmp['来源'] = sp_arr[2]
-                tmp['端口'] = sp_arr[1]
-                tmp['时间'] = self.__to_date3(
-                    ' '.join(sp_arr[3:])) + ' ' + ' '.join(sp_arr[-3:])
-
-            # tmp['_line'] = _line
-            lastlog_list.append(tmp)
-        # lastlog_list = sorted(lastlog_list,key=lambda x:x['时间'],reverse=True)
-        return mw.returnData(True, 'ok!', lastlog_list)
-
-    def getAuditLastLog(self):
-        cmd = '''LANG=en_US.UTF-8 lastlog|grep -v Username'''
-        result = mw.execShell(cmd)
-        lastlog_list = []
-        for _line in result[0].split("\n"):
-            if not _line:
-                continue
-            tmp = {}
-            sp_arr = _line.split()
-            tmp['用户'] = sp_arr[0]
-            # tmp['_line'] = _line
-            if _line.find('Never logged in') != -1:
-                tmp['最后登录时间'] = '0'
-                tmp['最后登录来源'] = '-'
-                tmp['最后登录端口'] = '-'
-                lastlog_list.append(tmp)
-                continue
-            tmp['最后登录来源'] = sp_arr[2]
-            tmp['最后登录端口'] = sp_arr[1]
-            tmp['最后登录时间'] = self.__to_date2(' '.join(sp_arr[3:]))
-
-            lastlog_list.append(tmp)
-        lastlog_list = sorted(lastlog_list, key=lambda x: x[
-                              '最后登录时间'], reverse=True)
-        for i in range(len(lastlog_list)):
-            if lastlog_list[i]['最后登录时间'] == '0':
-                lastlog_list[i]['最后登录时间'] = '从未登录过'
-        return mw.returnData(True, 'ok!', lastlog_list)
-
-    def parseAuditFile(self, log_name, result):
-        log_list = []
-        is_string = True
-        for _line in result.split("\n"):
-            if not _line.strip():
-                continue
-            if log_name.find('sa/sa') == -1:
-                if _line[:3] in self.__months:
-                    _msg = _line[16:]
-                    _tmp = _msg.split(": ")
-                    _act = ''
-                    if len(_tmp) > 1:
-                        _act = _tmp[0]
-                        _msg = _tmp[1]
-                    else:
-                        _msg = _tmp[0]
-                    _line = {
-                        "时间": self.__to_date4(_line[:16].strip()),
-                        "角色": _act,
-                        "事件": _msg
-                    }
-                    is_string = False
-                elif _line[:2] in ['19', '20', '21', '22', '23', '24']:
-                    _msg = _line[19:]
-                    _tmp = _msg.split(" ")
-                    _act = _tmp[1]
-                    _msg = ' '.join(_tmp[2:])
-                    _line = {
-                        "时间": _line[:19].strip(),
-                        "角色": _act,
-                        "事件": _msg
-                    }
-                    is_string = False
-                elif log_name.find('alternatives') == 0:
-                    _tmp = _line.split(": ")
-                    _last = _tmp[0].split(" ")
-                    _act = _last[0]
-                    _msg = ' '.join(_tmp[1:])
-                    _line = {
-                        "时间": ' '.join(_last[1:]).strip(),
-                        "角色": _act,
-                        "事件": _msg
-                    }
-                    is_string = False
-                else:
-                    if not is_string:
-                        if type(_line) != dict:
-                            continue
-
-            log_list.append(_line)
-
-        return log_list
-
-    def getAuditLogsName(self, log_name):
-        # print(log_name)
-        if log_name in ['wtmp', 'btmp', 'utmp'] or log_name.find('wtmp') == 0 or log_name.find('btmp') == 0 or log_name.find('utmp') == 0:
-            return self.getAuditLast(log_name)
-
-        if log_name.find('lastlog') == 0:
-            return self.getAuditLastLog()
-
-        if log_name.find('sa/sa') == 0:
-            if log_name.find('sa/sar') == -1:
-                return mw.execShell("sar -f /var/log/{}".format(log_name))[0]
-        log_dir = '/var/log'
-        log_file = log_dir + '/' + log_name
-        if not os.path.exists(log_file):
-            return mw.returnData(False, '日志文件不存在!')
-        result = mw.getLastLine(log_file, 100)
-        try:
-            log_list = self.parseAuditFile(log_name, result)
-            _string = []
-            _dict = []
-            _list = []
-            for _line in log_list:
-                if isinstance(_line, str):
-                    _string.append(_line.strip())
-                elif isinstance(_line, dict):
-                    _dict.append(_line)
-                elif isinstance(_line, list):
-                    _list.append(_line)
-                else:
-                    continue
-            _str_len = len(_string)
-            _dict_len = len(_dict)
-            _list_len = len(_list)
-            if _str_len > _dict_len + _list_len:
-                return "\n".join(_string)
-            elif _dict_len > _str_len + _list_len:
-                return mw.returnData(True, 'ok!', _dict)
-            else:
-                return mw.returnData(True, 'ok!', _list)
-
-        except:
-            return mw.returnData(True, 'ok!', result)
diff --git a/class/core/mw.py b/class/core/mw.py
deleted file mode 100755
index 40bc1771f..000000000
--- a/class/core/mw.py
+++ /dev/null
@@ -1,2286 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 核心方法库
-# ---------------------------------------------------------------------------------
-
-
-import os
-import sys
-import time
-import string
-import json
-import hashlib
-import shlex
-import datetime
-import subprocess
-import glob
-import base64
-import re
-
-from random import Random
-
-import db
-
-
-def execShell(cmdstring, cwd=None, timeout=None, shell=True):
-
-    if shell:
-        cmdstring_list = cmdstring
-    else:
-        cmdstring_list = shlex.split(cmdstring)
-    if timeout:
-        end_time = datetime.datetime.now() + datetime.timedelta(seconds=timeout)
-
-    sub = subprocess.Popen(cmdstring_list, cwd=cwd, stdin=subprocess.PIPE,
-                           shell=shell, bufsize=4096, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-    while sub.poll() is None:
-        time.sleep(0.1)
-        if timeout:
-            if end_time <= datetime.datetime.now():
-                raise Exception("Timeout：%s" % cmdstring)
-
-    if sys.version_info[0] == 2:
-        return sub.communicate()
-
-    data = sub.communicate()
-    # python3 fix 返回byte数据
-    if isinstance(data[0], bytes):
-        t1 = str(data[0], encoding='utf-8')
-
-    if isinstance(data[1], bytes):
-        t2 = str(data[1], encoding='utf-8')
-    return (t1, t2)
-
-
-def getTracebackInfo():
-    import traceback
-    errorMsg = traceback.format_exc()
-    return errorMsg
-
-
-def getRunDir():
-    return os.getcwd()
-
-
-def getRootDir():
-    return os.path.dirname(os.path.dirname(getRunDir()))
-
-
-def getPluginDir():
-    return getRunDir() + '/plugins'
-
-def getPanelDataDir():
-    return getRunDir() + '/data'
-
-def getMWLogs():
-    return getRunDir() + '/logs'
-
-def getPanelTmp():
-    return getRunDir() + '/tmp'
-
-
-def getServerDir():
-    return getRootDir() + '/server'
-
-
-def getLogsDir():
-    return getRootDir() + '/wwwlogs'
-
-
-def getWwwDir():
-    file = getRunDir() + '/data/site.pl'
-    if os.path.exists(file):
-        return readFile(file).strip()
-    return getRootDir() + '/wwwroot'
-
-
-def setWwwDir(wdir):
-    file = getRunDir() + '/data/site.pl'
-    return writeFile(file, wdir)
-
-
-def getBackupDir():
-    file = getRunDir() + '/data/backup.pl'
-    if os.path.exists(file):
-        return readFile(file).strip()
-    return getRootDir() + '/backup'
-
-
-def setBackupDir(bdir):
-    file = getRunDir() + '/data/backup.pl'
-    return writeFile(file, bdir)
-
-
-def getAcmeDir():
-    acme = '/root/.acme.sh'
-    if isAppleSystem():
-        cmd = "who | sed -n '2, 1p' |awk '{print $1}'"
-        user = execShell(cmd)[0].strip()
-        acme = '/Users/' + user + '/.acme.sh'
-    if not os.path.exists(acme):
-        acme = '/.acme.sh'
-    return acme
-
-
-def getAcmeDomainDir(domain):
-    acme_dir = getAcmeDir()
-    acme_domain = acme_dir + '/' + domain
-    acme_domain_ecc = acme_domain + '_ecc'
-    if os.path.exists(acme_domain_ecc):
-        acme_domain = acme_domain_ecc
-    return acme_domain
-
-
-def fileNameCheck(filename):
-    f_strs = [';', '&', '<', '>']
-    for fs in f_strs:
-        if filename.find(fs) != -1:
-            return False
-    return True
-
-
-def triggerTask():
-    isTask = getRunDir() + '/tmp/panelTask.pl'
-    writeFile(isTask, 'True')
-
-
-def systemdCfgDir():
-    # ubuntu
-    cfg_dir = '/lib/systemd/system'
-    if os.path.exists(cfg_dir):
-        return cfg_dir
-
-    # debian,centos
-    cfg_dir = '/usr/lib/systemd/system'
-    if os.path.exists(cfg_dir):
-        return cfg_dir
-
-    # local test
-    return "/tmp"
-
-
-def getSslCrt():
-    if os.path.exists('/etc/ssl/certs/ca-certificates.crt'):
-        return '/etc/ssl/certs/ca-certificates.crt'
-    if os.path.exists('/etc/pki/tls/certs/ca-bundle.crt'):
-        return '/etc/pki/tls/certs/ca-bundle.crt'
-    return ''
-
-
-def getOs():
-    return sys.platform
-
-
-def getOsName():
-    cmd = "cat /etc/*-release | grep PRETTY_NAME |awk -F = '{print $2}' | awk -F '\"' '{print $2}'| awk '{print $1}'"
-    data = execShell(cmd)
-    return data[0].strip().lower()
-
-
-def getOsID():
-    cmd = "cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F '\"' '{print $2}'"
-    data = execShell(cmd)
-    return data[0].strip()
-
-
-def getFileSuffix(file):
-    tmp = file.split('.')
-    ext = tmp[len(tmp) - 1]
-    return ext
-
-
-
-def isAppleSystem():
-    if getOs() == 'darwin':
-        return True
-    return False
-
-def isDocker():
-    return os.path.exists('/.dockerenv')
-
-
-def isSupportSystemctl():
-    if isAppleSystem():
-        return False
-    if isDocker():
-        return False
-
-    current_os = getOs()
-    if current_os.startswith("freebsd"):
-        return False
-    return True
-
-
-def isDebugMode():
-    if isAppleSystem():
-        return True
-
-    debugPath = getRunDir() + "/data/debug.pl"
-    if os.path.exists(debugPath):
-        return True
-
-    return False
-
-
-def isNumber(s):
-    try:
-        float(s)
-        return True
-    except ValueError:
-        pass
-
-    try:
-        import unicodedata
-        unicodedata.numeric(s)
-        return True
-    except (TypeError, ValueError):
-        pass
-
-    return False
-
-
-def deleteFile(file):
-    if os.path.exists(file):
-        os.remove(file)
-
-
-def isInstalledWeb():
-    path = getServerDir() + '/openresty/nginx/sbin/nginx'
-    if os.path.exists(path):
-        return True
-    return False
-
-
-def isIpAddr(ip):
-    check_ip = re.compile(
-        '^(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$')
-    if check_ip.match(ip):
-        return True
-    else:
-        return False
-
-
-def getWebStatus():
-    pid = getServerDir() + '/openresty/nginx/logs/nginx.pid'
-    if os.path.exists(pid):
-        return True
-    return False
-
-
-# ------------------------------ openresty start -----------------------------
-def restartWeb():
-    return opWeb("reload")
-
-
-def opWeb(method):
-    if not isInstalledWeb():
-        return False
-
-    # systemd
-    systemd = '/lib/systemd/system/openresty.service'
-    if os.path.exists(systemd):
-        execShell('systemctl ' + method + ' openresty')
-        return True
-
-    # initd
-    initd = getServerDir() + '/openresty/init.d/openresty'
-
-    if os.path.exists(initd):
-        execShell(initd + ' ' + method)
-        return True
-
-    return False
-
-
-def opLuaMake(cmd_name):
-    path = getServerDir() + '/web_conf/nginx/lua/lua.conf'
-    root_dir = getServerDir() + '/web_conf/nginx/lua/' + cmd_name
-    dst_path = getServerDir() + '/web_conf/nginx/lua/' + cmd_name + '.lua'
-    def_path = getServerDir() + '/web_conf/nginx/lua/empty.lua'
-
-    if not os.path.exists(root_dir):
-        execShell('mkdir -p ' + root_dir)
-
-    files = []
-    for fl in os.listdir(root_dir):
-        suffix = getFileSuffix(fl)
-        if suffix != 'lua':
-            continue
-        flpath = os.path.join(root_dir, fl)
-        files.append(flpath)
-
-    if len(files) > 0:
-        def_path = dst_path
-        content = ''
-        for f in files:
-            t = readFile(f)
-            f_base = os.path.basename(f)
-            content += '-- ' + '*' * 20 + ' ' + f_base + ' start ' + '*' * 20 + "\n"
-            content += t
-            content += "\n" + '-- ' + '*' * 20 + ' ' + f_base + ' end ' + '*' * 20 + "\n"
-        writeFile(dst_path, content)
-    else:
-        if os.path.exists(dst_path):
-            os.remove(dst_path)
-
-    conf = readFile(path)
-    conf = re.sub(cmd_name + ' (.*);',
-                  cmd_name + " " + def_path + ";", conf)
-    writeFile(path, conf)
-
-
-def opLuaInitFile():
-    opLuaMake('init_by_lua_file')
-
-
-def opLuaInitWorkerFile():
-    opLuaMake('init_worker_by_lua_file')
-
-
-def opLuaInitAccessFile():
-    opLuaMake('access_by_lua_file')
-
-
-def opLuaMakeAll():
-    opLuaInitFile()
-    opLuaInitWorkerFile()
-    opLuaInitAccessFile()
-
-# ------------------------------ openresty end -----------------------------
-
-
-def restartMw():
-    import system_api
-    system_api.system_api().restartMw()
-
-def restartNginx(self):
-    writeFile('data/restart_nginx.pl', 'True')
-    return True
-
-def checkWebConfig():
-    op_dir = getServerDir() + '/openresty/nginx'
-    # "ulimit -n 10240 && " +
-    cmd = op_dir + \
-        "/sbin/nginx -t -c " + op_dir + "/conf/nginx.conf"
-    result = execShell(cmd)
-    searchStr = 'test is successful'
-    if result[1].find(searchStr) == -1:
-        msg = getInfo('配置文件错误: {1}', (result[1],))
-        writeLog("软件管理", msg)
-        return result[1]
-    return True
-
-
-def M(table):
-    sql = db.Sql()
-    return sql.table(table)
-
-
-def getPage(args, result='1,2,3,4,5,8'):
-    data = getPageObject(args, result)
-    return data[0]
-
-
-def getPageObject(args, result='1,2,3,4,5,8'):
-    # 取分页
-    import page
-    # 实例化分页类
-    page = page.Page()
-    info = {}
-
-    info['count'] = 0
-    if 'count' in args:
-        info['count'] = int(args['count'])
-
-    info['row'] = 10
-    if 'row' in args:
-        info['row'] = int(args['row'])
-
-    info['p'] = 1
-    if 'p' in args:
-        info['p'] = int(args['p'])
-    info['uri'] = {}
-    info['return_js'] = ''
-    if 'tojs' in args:
-        info['return_js'] = args['tojs']
-
-    if 'args_tpl' in args:
-        info['args_tpl'] = args['args_tpl']
-
-    return (page.GetPage(info, result), page)
-
-
-def md5(content):
-    # 生成MD5
-    try:
-        m = hashlib.md5()
-        m.update(content.encode("utf-8"))
-        return m.hexdigest()
-    except Exception as ex:
-        return False
-
-
-def getFileMd5(filename):
-    # 文件的MD5值
-    if not os.path.isfile(filename):
-        return False
-
-    myhash = hashlib.md5()
-    f = file(filename, 'rb')
-    while True:
-        b = f.read(8096)
-        if not b:
-            break
-        myhash.update(b)
-    f.close()
-    return myhash.hexdigest()
-
-
-def getRandomString(length):
-    # 取随机字符串
-    rnd_str = ''
-    chars = 'AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789'
-    chrlen = len(chars) - 1
-    random = Random()
-    for i in range(length):
-        rnd_str += chars[random.randint(0, chrlen)]
-    return rnd_str
-
-
-def getUniqueId():
-    """
-    根据时间生成唯一ID
-    :return:
-    """
-    current_time = datetime.datetime.now()
-    str_time = current_time.strftime('%Y%m%d%H%M%S%f')[:-3]
-    unique_id = "{0}".format(str_time)
-    return unique_id
-
-
-def getJson(data):
-    import json
-    return json.dumps(data)
-
-def getObjectByJson(data):
-    import json
-    return json.loads(data)
-
-def returnData(status, msg, data=None):
-    return {'status': status, 'msg': msg, 'data': data}
-
-
-def returnJson(status, msg, data=None):
-    # if data == None:
-    #     return {'status': status, 'msg': msg}
-    # return {'status': status, 'msg': msg, 'data': data}
-    if data == None:
-        return getJson({'status': status, 'msg': msg})
-    return getJson({'status': status, 'msg': msg, 'data': data})
-
-
-def getLanguage():
-    path = 'data/language.pl'
-    if not os.path.exists(path):
-        return 'Simplified_Chinese'
-    return readFile(path).strip()
-
-
-def getStaticJson(name="public"):
-    file = 'static/language/' + getLanguage() + '/' + name + '.json'
-    if not os.path.exists(file):
-        file = 'route/static/language/' + getLanguage() + '/' + name + '.json'
-    return file
-
-
-def returnMsg(status, msg, args=()):
-    # 取通用字曲返回
-    pjson = getStaticJson('public')
-    logMessage = json.loads(readFile(pjson))
-    keys = logMessage.keys()
-
-    if msg in keys:
-        msg = logMessage[msg]
-        for i in range(len(args)):
-            rep = '{' + str(i + 1) + '}'
-            msg = msg.replace(rep, args[i])
-    return {'status': status, 'msg': msg, 'data': args}
-
-
-def getInfo(msg, args=()):
-    # 取提示消息
-    for i in range(len(args)):
-        rep = '{' + str(i + 1) + '}'
-        msg = msg.replace(rep, args[i])
-    return msg
-
-
-def getMsg(key, args=()):
-    # 取提示消息
-    try:
-        pjson = getStaticJson('public')
-        logMessage = json.loads(pjson)
-        keys = logMessage.keys()
-        msg = None
-        if key in keys:
-            msg = logMessage[key]
-            for i in range(len(args)):
-                rep = '{' + str(i + 1) + '}'
-                msg = msg.replace(rep, args[i])
-        return msg
-    except:
-        return key
-
-
-def getLan(key):
-    # 取提示消息
-    pjson = getStaticJson('public')
-    logMessage = json.loads(pjson)
-    keys = logMessage.keys()
-    msg = None
-    if key in keys:
-        msg = logMessage[key]
-    return msg
-
-
-def readFile(filename):
-    # 读文件内容
-    try:
-        fp = open(filename, 'r')
-        fBody = fp.read()
-        fp.close()
-        return fBody
-    except Exception as e:
-        # print(e)
-        return False
-
-
-def getDate():
-    # 取格式时间
-    import time
-    return time.strftime('%Y-%m-%d %X', time.localtime())
-
-
-def getDateFromNow(tf_format="%Y-%m-%d %H:%M:%S", time_zone="Asia/Shanghai"):
-    # 取格式时间
-    import time
-    os.environ['TZ'] = time_zone
-    time.tzset()
-    return time.strftime(tf_format, time.localtime())
-
-
-def getDataFromInt(val):
-    time_format = '%Y-%m-%d %H:%M:%S'
-    time_str = time.localtime(val)
-    return time.strftime(time_format, time_str)
-
-
-def writeLog(stype, msg, args=()):
-    # 写日志
-    uid = 1
-    try:
-        from flask import session
-        if 'uid' in session:
-            uid = session['uid']
-    except Exception as e:
-        print('writeL:',e)
-        # pass
-        # writeFileLog(getTracebackInfo())
-
-    print(stype, msg)
-    return writeDbLog(stype, msg, args, uid)
-
-
-def writeFileLog(msg, path=None, limit_size=50 * 1024 * 1024, save_limit=3):
-    log_file = getPanelDir() + '/logs/debug.log'
-    if path != None:
-        log_file = path
-
-    if os.path.exists(log_file):
-        size = os.path.getsize(log_file)
-        if size > limit_size:
-            log_file_rename = log_file + "_" + \
-                time.strftime("%Y-%m-%d_%H%M%S") + '.log'
-            os.rename(log_file, log_file_rename)
-            logs = sorted(glob.glob(log_file + "_*"))
-            count = len(logs)
-            save_limit = count - save_limit
-            for i in range(count):
-                if i > save_limit:
-                    break
-                os.remove(logs[i])
-                # print('|---多余日志[' + logs[i] + ']已删除!')
-
-    f = open(log_file, 'ab+')
-    msg += "\n"
-    if __name__ == '__main__':
-        print(msg)
-    f.write(msg.encode('utf-8'))
-    f.close()
-    return True
-
-
-def writeDbLog(stype, msg, args=(), uid=1):
-    try:
-        add_time = formatDate()
-        format_msg = getInfo(msg, args)
-        add_data = {
-            'type':stype,
-            'msg':format_msg,
-            'uid':uid,
-            'add_time':add_time,
-        }
-        result = M('logs').insert(add_data)
-        return True
-    except Exception as e:
-        return False
-
-
-def writeFile(filename, content, mode='w+'):
-    # 写文件内容
-    try:
-        fp = open(filename, mode)
-        fp.write(content)
-        fp.close()
-        return True
-    except Exception as e:
-        return False
-
-
-def backFile(file, act=None):
-    """
-        @name 备份配置文件
-        @param file 需要备份的文件
-        @param act 如果存在，则备份一份作为默认配置
-    """
-    file_type = "_bak"
-    if act:
-        file_type = "_def"
-
-    # print("cp -p {0} {1}".format(file, file + file_type))
-    execShell("cp -p {0} {1}".format(file, file + file_type))
-
-
-def removeBackFile(file, act=None):
-    """
-        @name 删除备份配置文件
-        @param file 需要删除备份文件
-        @param act 如果存在，则还原默认配置
-    """
-    file_type = "_bak"
-    if act:
-        file_type = "_def"
-    execShell("rm -rf {0}".format(file + file_type))
-
-
-def restoreFile(file, act=None):
-    """
-        @name 还原配置文件
-        @param file 需要还原的文件
-        @param act 如果存在，则还原默认配置
-    """
-    file_type = "_bak"
-    if act:
-        file_type = "_def"
-    execShell("cp -p {1} {0}".format(file, file + file_type))
-
-def base64StrEncode(content):
-    content = bytes(content,'utf-8')
-    content = base64.b64encode(content)
-    return content.decode('utf8')
-
-def base64StrDecode(content):
-    content = bytes(content,'utf-8')
-    content = base64.urlsafe_b64decode(content)
-    return content.decode('utf8')
-
-def enPunycode(domain):
-    if sys.version_info[0] == 2:
-        domain = domain.encode('utf8')
-    tmp = domain.split('.')
-    newdomain = ''
-    for dkey in tmp:
-        if dkey == '*':
-            continue
-        # 匹配非ascii字符
-        match = re.search(u"[\x80-\xff]+", dkey)
-        if not match:
-            match = re.search(u"[\u4e00-\u9fa5]+", dkey)
-        if not match:
-            newdomain += dkey + '.'
-        else:
-            if sys.version_info[0] == 2:
-                newdomain += 'xn--' + dkey.decode('utf-8').encode('punycode') + '.'
-            else:
-                newdomain += 'xn--' + dkey.encode('punycode').decode('utf-8') + '.'
-    if tmp[0] == '*':
-        newdomain = "*." + newdomain
-    return newdomain[0:-1]
-
-
-def dePunycode(domain):
-    # punycode 转中文
-    tmp = domain.split('.')
-    newdomain = ''
-    for dkey in tmp:
-        if dkey.find('xn--') >= 0:
-            newdomain += dkey.replace('xn--','').encode('utf-8').decode('punycode') + '.'
-        else:
-            newdomain += dkey + '.'
-    return newdomain[0:-1]
-
-
-def enCrypt(key, strings):
-    # 加密字符串
-    try:
-        import base64
-        _key = key.encode('utf-8')
-        _key = base64.urlsafe_b64encode(_key)
-
-        if type(strings) != bytes:
-            strings = strings.encode('utf-8')
-        import cryptography
-        from cryptography.fernet import Fernet
-        f = Fernet(_key)
-        result = f.encrypt(strings)
-        return result.decode('utf-8')
-    except:
-        writeFileLog(getTracebackInfo())
-        return strings
-
-
-def deCrypt(key, strings):
-
-    # 解密字符串
-    try:
-        import base64
-        _key = key.encode('utf-8')
-        _key = base64.urlsafe_b64encode(_key)
-
-        if type(strings) != bytes:
-            strings = strings.encode('utf-8')
-        from cryptography.fernet import Fernet
-        f = Fernet(_key)
-        result = f.decrypt(strings).decode('utf-8')
-        return result
-    except:
-        writeFileLog(getTracebackInfo())
-        return strings
-
-
-def enDoubleCrypt(key, strings):
-    # 加密字符串
-    try:
-        import base64
-        _key = md5(key).encode('utf-8')
-        _key = base64.urlsafe_b64encode(_key)
-
-        if type(strings) != bytes:
-            strings = strings.encode('utf-8')
-        import cryptography
-        from cryptography.fernet import Fernet
-        f = Fernet(_key)
-        result = f.encrypt(strings)
-        return result.decode('utf-8')
-    except:
-        writeFileLog(getTracebackInfo())
-        return strings
-
-
-def deDoubleCrypt(key, strings):
-    # 解密字符串
-    try:
-        import base64
-        _key = md5(key).encode('utf-8')
-        _key = base64.urlsafe_b64encode(_key)
-
-        if type(strings) != bytes:
-            strings = strings.encode('utf-8')
-        from cryptography.fernet import Fernet
-        f = Fernet(_key)
-        result = f.decrypt(strings).decode('utf-8')
-        return result
-    except:
-        writeFileLog(getTracebackInfo())
-        return strings
-
-
-def aesEncrypt(data, key='ABCDEFGHIJKLMNOP', vi='0102030405060708'):
-    # aes加密
-    # @param data 被加密的数据
-    # @param key 加解密密匙 16位
-    # @param vi 16位
-
-    from cryptography.hazmat.primitives import padding
-    from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
-    from cryptography.hazmat.backends import default_backend
-
-    if not isinstance(data, bytes):
-        data = data.encode()
-
-    # AES_CBC_KEY = os.urandom(32)
-    # AES_CBC_IV = os.urandom(16)
-
-    AES_CBC_KEY = key.encode()
-    AES_CBC_IV = vi.encode()
-
-    # print("AES_CBC_KEY:", AES_CBC_KEY)
-    # print("AES_CBC_IV:", AES_CBC_IV)
-
-    padder = padding.PKCS7(algorithms.AES.block_size).padder()
-    padded_data = padder.update(data) + padder.finalize()
-
-    cipher = Cipher(algorithms.AES(AES_CBC_KEY),
-                    modes.CBC(AES_CBC_IV),
-                    backend=default_backend())
-    encryptor = cipher.encryptor()
-
-    edata = encryptor.update(padded_data)
-
-    # print(edata)
-    # print(str(edata))
-    # print(edata.decode())
-    return edata
-
-
-def aesDecrypt(data, key='ABCDEFGHIJKLMNOP', vi='0102030405060708'):
-    # aes加密
-    # @param data 被解密的数据
-    # @param key 加解密密匙 16位
-    # @param vi 16位
-
-    from cryptography.hazmat.primitives import padding
-    from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
-    from cryptography.hazmat.backends import default_backend
-
-    from cryptography.hazmat.primitives import padding
-    from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
-    from cryptography.hazmat.backends import default_backend
-
-    if not isinstance(data, bytes):
-        data = data.encode()
-
-    AES_CBC_KEY = key.encode()
-    AES_CBC_IV = vi.encode()
-
-    cipher = Cipher(algorithms.AES(AES_CBC_KEY),
-                    modes.CBC(AES_CBC_IV),
-                    backend=default_backend())
-    decryptor = cipher.decryptor()
-
-    ddata = decryptor.update(data)
-
-    unpadder = padding.PKCS7(algorithms.AES.block_size).unpadder()
-    data = unpadder.update(ddata)
-
-    try:
-        uppadded_data = data + unpadder.finalize()
-    except ValueError:
-        raise Exception('无效的加密信息!')
-
-    return uppadded_data
-
-
-def aesEncrypt_Crypto(data, key, vi):
-    # 该方法保留，暂时不使用
-    # aes加密
-    # @param data 被加密的数据
-    # @param key 加解密密匙 16位
-    # @param vi 16位
-
-    from Crypto.Cipher import AES
-    cryptor = AES.new(key.encode('utf8'), AES.MODE_CBC, vi.encode('utf8'))
-    # 判断是否含有中文
-    zhmodel = re.compile(u'[\u4e00-\u9fff]')
-    match = zhmodel.search(data)
-    if match == None:
-        # 无中文时
-        add = 16 - len(data) % 16
-        pad = lambda s: s + add * chr(add)
-        data = pad(data)
-        enctext = cryptor.encrypt(data.encode('utf8'))
-    else:
-        # 含有中文时
-        data = data.encode()
-        add = 16 - len(data) % 16
-        data = data + add * (chr(add)).encode()
-        enctext = cryptor.encrypt(data)
-    encodestrs = base64.b64encode(enctext).decode('utf8')
-    return encodestrs
-
-
-def aesDecrypt_Crypto(data, key, vi):
-    # 该方法保留，暂时不使用
-    # aes加密
-    # @param data 被加密的数据
-    # @param key 加解密密匙 16位
-    # @param vi 16位
-
-    from crypto.Cipher import AES
-    data = data.encode('utf8')
-    encodebytes = base64.urlsafe_b64decode(data)
-    cipher = AES.new(key.encode('utf8'), AES.MODE_CBC, vi.encode('utf8'))
-    text_decrypted = cipher.decrypt(encodebytes)
-    # 判断是否含有中文
-    zhmodel = re.compile(u'[\u4e00-\u9fff]')
-    match = zhmodel.search(text_decrypted)
-    if match == False:
-        # 无中文时补位
-        unpad = lambda s: s[0:-s[-1]]
-        text_decrypted = unpad(text_decrypted)
-    text_decrypted = text_decrypted.decode('utf8').rstrip()  # 去掉补位的右侧空格
-    return text_decrypted
-
-def getDefault(data,val,def_val=''):
-    if val in data:
-        return data[val]
-    return def_val
-
-def encodeImage(imgsrc, newsrc):
-    # 图片加密
-    import struct
-    old_fp = open(imgsrc, 'rb')
-    imgFile = old_fp.read()
-    old_fp.close()
-
-    new_fp = open(newsrc,"wb")
-    for x in imgFile:
-        value = x ^ 86
-        value = hex(value)
-        s = struct.pack('B',int(value,16))
-        new_fp.write(s)
-    new_fp.close()
-    return True
-    
-def buildSoftLink(src, dst, force=False):
-    '''
-    建立软连接
-    '''
-    if not os.path.exists(src):
-        return False
-
-    if os.path.exists(dst) and force:
-        os.remove(dst)
-
-    if not os.path.exists(dst):
-        execShell('ln -sf "' + src + '" "' + dst + '"')
-        return True
-    return False
-
-
-def HttpGet(url, timeout=10):
-    """
-    发送GET请求
-    @url 被请求的URL地址(必需)
-    @timeout 超时时间默认60秒
-    return string
-    """
-    if sys.version_info[0] == 2:
-        try:
-            import urllib2
-            import ssl
-            if sys.version_info[0] == 2:
-                reload(urllib2)
-                reload(ssl)
-            try:
-                ssl._create_default_https_context = ssl._create_unverified_context
-            except:
-                pass
-            response = urllib2.urlopen(url, timeout=timeout)
-            return response.read()
-        except Exception as ex:
-            return str(ex)
-    else:
-        try:
-            import urllib.request
-            import ssl
-            try:
-                ssl._create_default_https_context = ssl._create_unverified_context
-            except:
-                pass
-            response = urllib.request.urlopen(url, timeout=timeout)
-            result = response.read()
-            if type(result) == bytes:
-                result = result.decode('utf-8')
-            return result
-        except Exception as ex:
-            return str(ex)
-
-
-def HttpGet2(url, timeout):
-    import urllib.request
-
-    try:
-        import ssl
-        try:
-            ssl._create_default_https_context = ssl._create_unverified_context
-        except:
-            pass
-        req = urllib.request.urlopen(url, timeout=timeout)
-        result = req.read().decode('utf-8')
-        return result
-
-    except Exception as e:
-        return str(e)
-
-
-def httpGet(url, timeout=10):
-    return HttpGet2(url, timeout)
-
-
-def HttpPost(url, data, timeout=10):
-    """
-    发送POST请求
-    @url 被请求的URL地址(必需)
-    @data POST参数，可以是字符串或字典(必需)
-    @timeout 超时时间默认60秒
-    return string
-    """
-    if sys.version_info[0] == 2:
-        try:
-            import urllib
-            import urllib2
-            import ssl
-            ssl._create_default_https_context = ssl._create_unverified_context
-            data = urllib.urlencode(data)
-            req = urllib2.Request(url, data)
-            response = urllib2.urlopen(req, timeout=timeout)
-            return response.read()
-        except Exception as ex:
-            return str(ex)
-    else:
-        try:
-            import urllib.request
-            import ssl
-            try:
-                ssl._create_default_https_context = ssl._create_unverified_context
-            except:
-                pass
-            data = urllib.parse.urlencode(data).encode('utf-8')
-            req = urllib.request.Request(url, data)
-            response = urllib.request.urlopen(req, timeout=timeout)
-            result = response.read()
-            if type(result) == bytes:
-                result = result.decode('utf-8')
-            return result
-        except Exception as ex:
-            return str(ex)
-
-
-def httpPost(url, data, timeout=10):
-    return HttpPost(url, data, timeout)
-
-
-def writeSpeed(title, used, total, speed=0):
-    # 写进度
-    if not title:
-        data = {'title': None, 'progress': 0,
-                'total': 0, 'used': 0, 'speed': 0}
-    else:
-        progress = int((100.0 * used / total))
-        data = {'title': title, 'progress': progress,
-                'total': total, 'used': used, 'speed': speed}
-    writeFile('/tmp/panelSpeed.pl', json.dumps(data))
-    return True
-
-
-def getSpeed():
-    # 取进度
-    path = getRootDir()
-    data = readFile(path + '/tmp/panelSpeed.pl')
-    if not data:
-        data = json.dumps({'title': None, 'progress': 0,
-                           'total': 0, 'used': 0, 'speed': 0})
-        writeFile(path + '/tmp/panelSpeed.pl', data)
-    return json.loads(data)
-
-
-def getLastLineBk(inputfile, lineNum):
-    # 读文件指定倒数行数
-    try:
-        fp = open(inputfile, 'rb')
-        lastLine = ""
-        lines = fp.readlines()
-        count = len(lines)
-        if count > lineNum:
-            num = lineNum
-        else:
-            num = count
-        i = 1
-        lastre = []
-        for i in range(1, (num + 1)):
-            n = -i
-            try:
-                lastLine = lines[n].decode("utf-8", "ignore").strip()
-            except Exception as e:
-                lastLine = ""
-            lastre.append(lastLine)
-
-        fp.close()
-        result = ''
-        num -= 1
-        while num >= 0:
-            result += lastre[num] + "\n"
-            num -= 1
-        return result
-    except Exception as e:
-        return str(e)
-        # return getMsg('TASK_SLEEP')
-
-
-def getLastLine(path, num, p=1):
-    pyVersion = sys.version_info[0]
-    try:
-        import html
-        if not os.path.exists(path):
-            return ""
-        start_line = (p - 1) * num
-        count = start_line + num
-        fp = open(path, 'rb')
-        buf = ""
-
-        fp.seek(0, 2)
-        if fp.read(1) == "\n":
-            fp.seek(0, 2)
-        data = []
-        b = True
-        n = 0
-
-        for i in range(count):
-            while True:
-                newline_pos = str.rfind(str(buf), "\n")
-                pos = fp.tell()
-                if newline_pos != -1:
-                    if n >= start_line:
-                        line = buf[newline_pos + 1:]
-                        try:
-                            data.insert(0, html.escape(line))
-                        except Exception as e:
-                            pass
-                    buf = buf[:newline_pos]
-                    n += 1
-                    break
-                else:
-                    if pos == 0:
-                        b = False
-                        break
-                    to_read = min(4096, pos)
-                    fp.seek(-to_read, 1)
-                    t_buf = fp.read(to_read)
-                    if pyVersion == 3:
-                        if type(t_buf) == bytes:
-                            t_buf = t_buf.decode("utf-8", "ignore").strip()
-                    buf = t_buf + buf
-                    fp.seek(-to_read, 1)
-                    if pos - to_read == 0:
-                        buf = "\n" + buf
-            if not b:
-                break
-        fp.close()
-    except Exception as e:
-        return str(e)
-
-    return "\n".join(data)
-
-
-def downloadFile(url, filename):
-    import urllib
-    urllib.urlretrieve(url, filename=filename, reporthook=downloadHook)
-
-
-def downloadHook(count, blockSize, totalSize):
-    speed = {'total': totalSize, 'block': blockSize, 'count': count}
-    print('%02d%%' % (100.0 * count * blockSize / totalSize))
-
-
-def getLocalIpBack():
-    # 取本地外网IP
-    try:
-        import re
-        filename = 'data/iplist.txt'
-        ipaddress = readFile(filename)
-        if not ipaddress or ipaddress == '127.0.0.1':
-            import urllib
-            url = 'http://pv.sohu.com/cityjson?ie=utf-8'
-            req = urllib.request.urlopen(url, timeout=10)
-            content = req.read().decode('utf-8')
-            ipaddress = re.search('\\d+.\\d+.\\d+.\\d+', content).group(0)
-            writeFile(filename, ipaddress)
-
-        ipaddress = re.search('\\d+.\\d+.\\d+.\\d+', ipaddress).group(0)
-        return ipaddress
-    except Exception as ex:
-        # print(ex)
-        return '127.0.0.1'
-
-
-def getClientIp():
-    from flask import request
-    return request.remote_addr.replace('::ffff:', '')
-
-
-def getLocalIp():
-    filename = 'data/iplist.txt'
-    try:
-        ipaddress = readFile(filename)
-        if not ipaddress or ipaddress == '127.0.0.1':
-            cmd = "curl --insecure -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 --insecure -6 -sS --connect-timeout 5 -m 60 https://v6r.ipip.net/?format=text"
-        ip = execShell(cmd)
-        result = ip[0].strip()
-        if result == '':
-            return '127.0.0.1'
-        writeFile(filename, result)
-        return result
-    finally:
-        pass
-    return '127.0.0.1'
-
-
-def inArray(arrays, searchStr):
-    # 搜索数据中是否存在
-    for key in arrays:
-        if key == searchStr:
-            return True
-
-    return False
-
-
-def formatDate(format="%Y-%m-%d %H:%M:%S", times=None):
-    # 格式化指定时间戳
-    if not times:
-        times = int(time.time())
-    time_local = time.localtime(times)
-    return time.strftime(format, time_local)
-
-
-def strfToTime(sdate):
-    # 转换时间
-    import time
-    return time.strftime('%Y-%m-%d', time.strptime(sdate, '%b %d %H:%M:%S %Y %Z'))
-
-
-def checkIp(ip):
-    # 检查是否为IPv4地址
-    import re
-    p = re.compile(
-        '^((25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.){3}(25[0-5]|2[0-4]\\d|[01]?\\d\\d?)$')
-    if p.match(ip):
-        return True
-    else:
-        return False
-
-
-def getHost(port=False):
-    from flask import request
-    host_tmp = request.headers.get('host')
-    if not host_tmp:
-        if request.url_root:
-            tmp = re.findall(r"(https|http)://([\w:\.-]+)", request.url_root)
-            if tmp:
-                host_tmp = tmp[0][1]
-    if not host_tmp:
-        host_tmp = getLocalIp() + ':' + readFile('data/port.pl').strip()
-    try:
-        if host_tmp.find(':') == -1:
-            host_tmp += ':80'
-    except:
-        host_tmp = "127.0.0.1:8888"
-    h = host_tmp.split(':')
-    if port:
-        return h[-1]
-    return ':'.join(h[0:-1])
-
-
-def getClientIp():
-    from flask import request
-    return request.remote_addr.replace('::ffff:', '')
-
-
-def checkDomainPanel():
-    tmp = getHost()
-    domain = readFile('data/bind_domain.pl')
-
-    port = 7200
-    if os.path.exists('data/port.pl'):
-        port = readFile('data/port.pl').strip()
-
-    scheme = 'http'
-
-    choose_file = getRunDir()+'/ssl/choose.pl'
-    if os.path.exists(choose_file):
-        choose = readFile(choose_file).strip()
-        if not inArray(['local','nginx'], choose):
-            return False
-    else:
-        return False
-
-    local_ssl = getRunDir()+'/ssl/local'
-    if choose == 'local':
-        scheme = 'https'
-
-    if choose == 'nginx':
-        # print(port)
-        npid = getServerDir() + "/openresty/nginx/logs/nginx.pid"
-        if not os.path.exists(npid):
-            return False
-
-        nconf = getServerDir() + "/web_conf/nginx/vhost/panel.conf"
-        if os.path.exists(nconf):
-            port = "80"
-    if not domain:
-        return False
-
-    client_ip = getClientIp()
-    if client_ip in ['127.0.0.1', 'localhost', '::1']:
-        return False
-
-    if tmp.strip().lower() != domain.strip().lower():
-        from flask import Flask, redirect, request, url_for
-        to = scheme + "://" + domain + ":" + str(port)
-        # print(to)
-        return redirect(to, code=302)
-
-    return False
-
-
-
-def createLinuxUser(user, group):
-    execShell("groupadd {}".format(group))
-    execShell('useradd -s /sbin/nologin -g {} {}'.format(user, group))
-    return True
-
-
-def setOwn(filename, user, group=None):
-    if isAppleSystem():
-        return True
-
-    # 设置用户组
-    if not os.path.exists(filename):
-        return False
-    from pwd import getpwnam
-    try:
-        user_info = getpwnam(user)
-        user = user_info.pw_uid
-        if group:
-            user_info = getpwnam(group)
-        group = user_info.pw_gid
-    except:
-        if user == 'www':
-            createLinuxUser(user)
-        # 如果指定用户或组不存在，则使用www
-        try:
-            user_info = getpwnam('www')
-        except:
-            createLinuxUser(user)
-            user_info = getpwnam('www')
-        user = user_info.pw_uid
-        group = user_info.pw_gid
-    os.chown(filename, user, group)
-    return True
-
-
-def setMode(filename, mode):
-    # 设置文件权限
-    if not os.path.exists(filename):
-        return False
-    mode = int(str(mode), 8)
-    os.chmod(filename, mode)
-    return True
-
-
-def checkPort(port):
-    # 检查端口是否合法
-    ports = ['21', '443', '888']
-    if port in ports:
-        return False
-    intport = int(port)
-    if intport < 1 or intport > 65535:
-        return False
-    return True
-
-
-def getStrBetween(startStr, endStr, srcStr):
-    # 字符串取中间
-    start = srcStr.find(startStr)
-    if start == -1:
-        return None
-    end = srcStr.find(endStr)
-    if end == -1:
-        return None
-    return srcStr[start + 1:end]
-
-
-def getCpuType():
-    cpuType = ''
-    if isAppleSystem():
-        cmd = "system_profiler SPHardwareDataType | grep 'Processor Name' | awk -F ':' '{print $2}'"
-        cpuinfo = execShell(cmd)
-        return cpuinfo[0].strip()
-
-    current_os = getOs()
-    if current_os.startswith('freebsd'):
-        cmd = "sysctl -a | egrep -i 'hw.model' | awk -F ':' '{print $2}'"
-        cpuinfo = execShell(cmd)
-        return cpuinfo[0].strip()
-
-    # 取CPU类型
-    cpuinfo = open('/proc/cpuinfo', 'r').read()
-    rep = "model\\s+name\\s+:\\s+(.+)"
-    tmp = re.search(rep, cpuinfo, re.I)
-    if tmp:
-        cpuType = tmp.groups()[0]
-    else:
-        cpuinfo = execShell('LANG="en_US.UTF-8" && lscpu')[0]
-        rep = "Model\\s+name:\\s+(.+)"
-        tmp = re.search(rep, cpuinfo, re.I)
-        if tmp:
-            cpuType = tmp.groups()[0]
-    return cpuType
-
-
-def isRestart():
-    # 检查是否允许重启
-    num = M('tasks').where('status!=?', ('1',)).count()
-    if num > 0:
-        return False
-    return True
-
-
-def isUpdateLocalSoft():
-    num = M('tasks').where('status!=?', ('1',)).count()
-    if os.path.exists('mdserver-web.zip'):
-        return True
-
-    if num > 0:
-        data = M('tasks').where('status!=?', ('1',)).field(
-            'id,type,execstr').limit('1').select()
-        argv = data[0]['execstr'].split('|dl|')
-        if data[0]['type'] == 'download' and argv[1] == 'mdserver-web.zip':
-            return True
-
-    return False
-
-
-def hasPwd(password):
-    # 加密密码字符
-    import crypt
-    return crypt.crypt(password, password)
-
-
-def getTimeout(url):
-    start = time.time()
-    result = httpGet(url)
-    if result != 'True':
-        return False
-    return int((time.time() - start) * 1000)
-
-
-def makeConf():
-    file = getRunDir() + '/data/json/config.json'
-    if not os.path.exists(file):
-        c = {}
-        c['title'] = '后羿面板'
-        c['home'] = 'http://github/midoks/mdserver-web'
-        c['recycle_bin'] = True
-        c['template'] = 'default'
-        writeFile(file, json.dumps(c))
-        return c
-    c = readFile(file)
-    return json.loads(c)
-
-
-def getConfig(k):
-    c = makeConf()
-    return c[k]
-
-
-def setConfig(k, v):
-    c = makeConf()
-    c[k] = v
-    file = getRunDir() + '/data/json/config.json'
-    return writeFile(file, json.dumps(c))
-
-
-def getHostAddr():
-    if os.path.exists('data/iplist.txt'):
-        return readFile('data/iplist.txt').strip()
-    return '127.0.0.1'
-
-
-def setHostAddr(addr):
-    file = getRunDir() + '/data/iplist.txt'
-    return writeFile(file, addr)
-
-
-def getHostPort():
-    if os.path.exists('data/port.pl'):
-        return readFile('data/port.pl').strip()
-    return '7200'
-
-
-def setHostPort(port):
-    file = getRunDir() + '/data/port.pl'
-    return writeFile(file, port)
-
-
-def auth_decode(data):
-    # 解密数据
-    token = GetToken()
-    # 是否有生成Token
-    if not token:
-        return returnMsg(False, 'REQUEST_ERR')
-
-    # 校验access_key是否正确
-    if token['access_key'] != data['btauth_key']:
-        return returnMsg(False, 'REQUEST_ERR')
-
-    # 解码数据
-    import binascii
-    import hashlib
-    import urllib
-    import hmac
-    import json
-    tdata = binascii.unhexlify(data['data'])
-
-    # 校验signature是否正确
-    signature = binascii.hexlify(
-        hmac.new(token['secret_key'], tdata, digestmod=hashlib.sha256).digest())
-    if signature != data['signature']:
-        return returnMsg(False, 'REQUEST_ERR')
-
-    # 返回
-    return json.loads(urllib.unquote(tdata))
-
-
-# 数据加密
-def auth_encode(data):
-    token = GetToken()
-    pdata = {}
-
-    # 是否有生成Token
-    if not token:
-        return returnMsg(False, 'REQUEST_ERR')
-
-    # 生成signature
-    import binascii
-    import hashlib
-    import urllib
-    import hmac
-    import json
-    tdata = urllib.quote(json.dumps(data))
-    # 公式  hex(hmac_sha256(data))
-    pdata['signature'] = binascii.hexlify(
-        hmac.new(token['secret_key'], tdata, digestmod=hashlib.sha256).digest())
-
-    # 加密数据
-    pdata['btauth_key'] = token['access_key']
-    pdata['data'] = binascii.hexlify(tdata)
-    pdata['timestamp'] = time.time()
-
-    # 返回
-    return pdata
-
-
-def checkToken(get):
-    # 检查Token
-    tempFile = 'data/tempToken.json'
-    if not os.path.exists(tempFile):
-        return False
-    import json
-    import time
-    tempToken = json.loads(readFile(tempFile))
-    if time.time() > tempToken['timeout']:
-        return False
-    if get.token != tempToken['token']:
-        return False
-    return True
-
-
-def checkInput(data):
-    # 过滤输入
-    if not data:
-        return data
-    if type(data) != str:
-        return data
-    checkList = [
-        {'d': '<', 'r': '＜'},
-        {'d': '>', 'r': '＞'},
-        {'d': '\'', 'r': '‘'},
-        {'d': '"', 'r': '“'},
-        {'d': '&', 'r': '＆'},
-        {'d': '#', 'r': '＃'},
-        {'d': '<', 'r': '＜'}
-    ]
-    for v in checkList:
-        data = data.replace(v['d'], v['r'])
-    return data
-
-
-def checkCert(certPath='ssl/certificate.pem'):
-    # 验证证书
-    openssl = '/usr/bin/openssl'
-    if not os.path.exists(openssl):
-        openssl = '/usr/local/openssl/bin/openssl'
-    if not os.path.exists(openssl):
-        openssl = 'openssl'
-    certPem = readFile(certPath)
-    s = "\n-----BEGIN CERTIFICATE-----"
-    tmp = certPem.strip().split(s)
-    for tmp1 in tmp:
-        if tmp1.find('-----BEGIN CERTIFICATE-----') == -1:
-            tmp1 = s + tmp1
-        writeFile(certPath, tmp1)
-        result = execShell(openssl + " x509 -in " +
-                           certPath + " -noout -subject")
-        if result[1].find('-bash:') != -1:
-            return True
-        if len(result[1]) > 2:
-            return False
-        if result[0].find('error:') != -1:
-            return False
-    return True
-
-
-def sortFileList(path, ftype = 'mtime', sort = 'desc'):
-    flist = os.listdir(path)
-    if ftype == 'mtime':
-        if sort == 'desc':
-            flist = sorted(flist, key=lambda f: os.path.getmtime(os.path.join(path,f)), reverse=True)
-        if sort == 'asc':
-            flist = sorted(flist, key=lambda f: os.path.getmtime(os.path.join(path,f)), reverse=False)
-
-    if ftype == 'size':
-        if sort == 'desc':
-            flist = sorted(flist, key=lambda f: os.path.getsize(os.path.join(path,f)), reverse=True)
-        if sort == 'asc':
-            flist = sorted(flist, key=lambda f: os.path.getsize(os.path.join(path,f)), reverse=False)
-
-    if ftype == 'fname':
-        if sort == 'desc':
-            flist = sorted(flist, key=lambda f: os.path.join(path,f), reverse=True)
-        if sort == 'asc':
-            flist = sorted(flist, key=lambda f: os.path.join(path,f), reverse=False)
-    return flist
-
-
-def sortAllFileList(path, ftype = 'mtime', sort = 'desc', search = '',limit = 3000):
-    count = 0
-    flist = []
-    for d_list in os.walk(path):
-        if count >= limit:
-            break
-
-        for d in d_list[1]:
-            if count >= limit:
-                break
-            if d.lower().find(search) != -1:
-                filename = d_list[0] + '/' + d
-                if not os.path.exists(filename):
-                    continue
-                count += 1
-                flist.append(filename)
-
-        for f in d_list[2]:
-            if count >= limit:
-                break
-
-            if f.lower().find(search) != -1:
-                filename = d_list[0] + '/' + f
-                if not os.path.exists(filename):
-                    continue
-                count += 1
-                flist.append(filename)
-
-    if ftype == 'mtime':
-        if sort == 'desc':
-            flist = sorted(flist, key=lambda f: os.path.getmtime(f), reverse=True)
-        if sort == 'asc':
-            flist = sorted(flist, key=lambda f: os.path.getmtime(f), reverse=False)
-
-    if ftype == 'size':
-        if sort == 'desc':
-            flist = sorted(flist, key=lambda f: os.path.getsize(f), reverse=True)
-        if sort == 'asc':
-            flist = sorted(flist, key=lambda f: os.path.getsize(f), reverse=False)
-    return flist
-
-def getPathSize(path):
-    # 取文件或目录大小
-    if not os.path.exists(path):
-        return 0
-    if not os.path.isdir(path):
-        return os.path.getsize(path)
-    size_total = 0
-    for nf in os.walk(path):
-        for f in nf[2]:
-            filename = nf[0] + '/' + f
-            size_total += os.path.getsize(filename)
-    return size_total
-
-
-def toSize(size):
-    # 字节单位转换
-    d = ('b', 'KB', 'MB', 'GB', 'TB')
-    s = d[0]
-    for b in d:
-        if size < 1024:
-            return str(round(size, 2)) + ' ' + b
-        size = float(size) / 1024.0
-        s = b
-    return str(round(size, 2)) + ' ' + b
-
-
-def getPathSuffix(path):
-    return os.path.splitext(path)[-1]
-
-
-def getMacAddress():
-    # 获取mac
-    import uuid
-    mac = uuid.UUID(int=uuid.getnode()).hex[-12:]
-    return ":".join([mac[e:e + 2] for e in range(0, 11, 2)])
-
-
-def get_string(t):
-    if t != -1:
-        max = 126
-        m_types = [{'m': 122, 'n': 97}, {'m': 90, 'n': 65}, {'m': 57, 'n': 48}, {
-            'm': 47, 'n': 32}, {'m': 64, 'n': 58}, {'m': 96, 'n': 91}, {'m': 125, 'n': 123}]
-    else:
-        max = 256
-        t = 0
-        m_types = [{'m': 255, 'n': 0}]
-    arr = []
-    for i in range(max):
-        if i < m_types[t]['n'] or i > m_types[t]['m']:
-            continue
-        arr.append(chr(i))
-    return arr
-
-
-def get_string_find(t):
-    if type(t) != list:
-        t = [t]
-    return_str = ''
-    for s1 in t:
-        return_str += get_string(int(s1[0]))[int(s1[1:])]
-    return return_str
-
-
-def get_string_arr(t):
-    s_arr = {}
-    t_arr = []
-    for s1 in t:
-        for i in range(6):
-            if not i in s_arr:
-                s_arr[i] = get_string(i)
-            for j in range(len(s_arr[i])):
-                if s1 == s_arr[i][j]:
-                    t_arr.append(str(i) + str(j))
-    return t_arr
-
- # 转换时间
-
-
-def strfDate(sdate):
-    return time.strftime('%Y-%m-%d', time.strptime(sdate, '%Y%m%d%H%M%S'))
-
-
-# 获取证书名称
-def getCertName(certPath):
-    if not os.path.exists(certPath):
-        return None
-    try:
-        import OpenSSL
-        result = {}
-        x509 = OpenSSL.crypto.load_certificate(
-            OpenSSL.crypto.FILETYPE_PEM, readFile(certPath))
-        # 取产品名称
-        issuer = x509.get_issuer()
-        result['issuer'] = ''
-        if hasattr(issuer, 'CN'):
-            result['issuer'] = issuer.CN
-        if not result['issuer']:
-            is_key = [b'0', '0']
-            issue_comp = issuer.get_components()
-            if len(issue_comp) == 1:
-                is_key = [b'CN', 'CN']
-            for iss in issue_comp:
-                if iss[0] in is_key:
-                    result['issuer'] = iss[1].decode()
-                    break
-        if not result['issuer']:
-            if hasattr(issuer, 'O'):
-                result['issuer'] = issuer.O
-        # 取到期时间
-        result['notAfter'] = strfDate(bytes.decode(x509.get_notAfter())[:-1])
-        # 取申请时间
-        result['notBefore'] = strfDate(bytes.decode(x509.get_notBefore())[:-1])
-        # 取可选名称
-        result['dns'] = []
-        for i in range(x509.get_extension_count()):
-            s_name = x509.get_extension(i)
-            if s_name.get_short_name() in [b'subjectAltName', 'subjectAltName']:
-                s_dns = str(s_name).split(',')
-                for d in s_dns:
-                    result['dns'].append(d.split(':')[1])
-        subject = x509.get_subject().get_components()
-        # 取主要认证名称
-        if len(subject) == 1:
-            result['subject'] = subject[0][1].decode()
-        else:
-            if not result['dns']:
-                for sub in subject:
-                    if sub[0] == b'CN':
-                        result['subject'] = sub[1].decode()
-                        break
-                if 'subject' in result:
-                    result['dns'].append(result['subject'])
-            else:
-                result['subject'] = result['dns'][0]
-        result['endtime'] = int(int(time.mktime(time.strptime(
-            result['notAfter'], "%Y-%m-%d")) - time.time()) / 86400)
-        return result
-    except Exception as e:
-        writeFileLog(getTracebackInfo())
-        return None
-
-
-def createLocalSSL():
-    if not os.path.exists('ssl/local'):
-        execShell('mkdir -p ssl/local')
-
-
-    # 自签证书
-    # if os.path.exists('ssl/local/input.pl'):
-    #     return True
-
-    client_ip = getClientIp()
-
-    import OpenSSL
-    key = OpenSSL.crypto.PKey()
-    key.generate_key(OpenSSL.crypto.TYPE_RSA, 2048)
-    cert = OpenSSL.crypto.X509()
-    cert.set_serial_number(0)
-    
-    if client_ip == '127.0.0.1':
-        cert.get_subject().CN = '127.0.0.1'
-    else:
-        cert.get_subject().CN = getLocalIp()
-    
-    cert.set_issuer(cert.get_subject())
-    cert.gmtime_adj_notBefore(0)
-    cert.gmtime_adj_notAfter(86400 * 3650)
-    cert.set_pubkey(key)
-    cert.sign(key, 'md5')
-    cert_ca = OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_PEM, cert)
-    private_key = OpenSSL.crypto.dump_privatekey(OpenSSL.crypto.FILETYPE_PEM, key)
-    if len(cert_ca) > 100 and len(private_key) > 100:
-        writeFile('ssl/local/cert.pem', cert_ca, 'wb+')
-        writeFile('ssl/local/private.pem', private_key, 'wb+')
-        return True
-    return False
-
-
-def getSSHPort():
-    try:
-        file = '/etc/ssh/sshd_config'
-        conf = readFile(file)
-        rep = "(#*)?Port\\s+([0-9]+)\\s*\n"
-        port = re.search(rep, conf).groups(0)[1]
-        return int(port)
-    except:
-        return 22
-
-
-def getSSHStatus():
-    if os.path.exists('/usr/bin/apt-get'):
-        status = execShell("service ssh status | grep -P '(dead|stop)'")
-    else:
-        import system_api
-        version = system_api.system_api().getSystemVersion()
-        if version.find(' Mac ') != -1:
-            return True
-        if version.find(' 7.') != -1:
-            status = execShell("systemctl status sshd.service | grep 'dead'")
-        else:
-            status = execShell(
-                "/etc/init.d/sshd status | grep -e 'stopped' -e '已停'")
-    if len(status[0]) > 3:
-        status = False
-    else:
-        status = True
-    return status
-
-
-def requestFcgiPHP(sock, uri, document_root='/tmp', method='GET', pdata=b''):
-    # 直接请求到PHP-FPM
-    # version php版本
-    # uri 请求uri
-    # filename 要执行的php文件
-    # args 请求参数
-    # method 请求方式
-    sys.path.append(os.getcwd() + "/class/plugin")
-
-    import fpm
-    p = fpm.fpm(sock, document_root)
-
-    if type(pdata) == dict:
-        pdata = url_encode(pdata)
-    result = p.load_url_public(uri, pdata, method)
-    return result
-
-
-def getMyORM():
-    '''
-    获取MySQL资源的ORM
-    '''
-    sys.path.append(os.getcwd() + "/class/plugin")
-    import orm
-    o = orm.ORM()
-    return o
-
-
-def getMyORMDb():
-    '''
-    获取MySQL资源的ORM pip install mysqlclient==2.0.3 | pip install mysql-python
-    '''
-    sys.path.append(os.getcwd() + "/class/plugin")
-    import ormDb
-    o = ormDb.ORM()
-    return o
-
-##################### notify  start #########################################
-
-
-def initNotifyConfig():
-    p = getNotifyPath()
-    if not os.path.exists(p):
-        writeFile(p, '{}')
-    return True
-
-
-def getNotifyPath():
-    path = 'data/notify.json'
-    return path
-
-
-def getNotifyData(is_parse=False):
-    initNotifyConfig()
-    notify_file = getNotifyPath()
-    notify_data = readFile(notify_file)
-
-    data = json.loads(notify_data)
-
-    if is_parse:
-        tag_list = ['tgbot', 'email']
-        for t in tag_list:
-            if t in data and 'cfg' in data[t]:
-                data[t]['data'] = json.loads(deDoubleCrypt(t, data[t]['cfg']))
-    return data
-
-
-def writeNotify(data):
-    p = getNotifyPath()
-    return writeFile(p, json.dumps(data))
-
-
-def tgbotNotifyChatID():
-    data = getNotifyData(True)
-    if 'tgbot' in data and 'enable' in data['tgbot']:
-        if data['tgbot']['enable']:
-            t = data['tgbot']['data']
-            return t['chat_id']
-    return ''
-
-
-def tgbotNotifyObject():
-    data = getNotifyData(True)
-    if 'tgbot' in data and 'enable' in data['tgbot']:
-        if data['tgbot']['enable']:
-            t = data['tgbot']['data']
-            import telebot
-            bot = telebot.TeleBot(app_token)
-            return True, bot
-    return False, None
-
-
-def tgbotNotifyMessage(app_token, chat_id, msg):
-    import telebot
-    bot = telebot.TeleBot(app_token)
-    try:
-        data = bot.send_message(chat_id, msg)
-        return True
-    except Exception as e:
-        writeFileLog(str(e))
-    return False
-
-
-def tgbotNotifyHttpPost(app_token, chat_id, msg):
-    try:
-        url = 'https://api.telegram.org/bot' + app_token + '/sendMessage'
-        post_data = {
-            'chat_id': chat_id,
-            'text': msg,
-        }
-        rdata = httpPost(url, post_data)
-        return True
-    except Exception as e:
-        writeFileLog(str(e))
-    return False
-
-
-def tgbotNotifyTest(app_token, chat_id):
-    msg = 'MW-通知验证测试OK'
-    return tgbotNotifyHttpPost(app_token, chat_id, msg)
-
-
-def emailNotifyMessage(data):
-    '''
-    邮件通知
-    '''
-    sys.path.append(os.getcwd() + "/class/plugin")
-    import memail
-    try:
-        if data['smtp_ssl'] == 'ssl':
-            memail.sendSSL(data['smtp_host'], data['smtp_port'],
-                           data['username'], data['password'],
-                           data['to_mail_addr'], data['subject'], data['content'])
-        else:
-            memail.send(data['smtp_host'], data['smtp_port'],
-                        data['username'], data['password'],
-                        data['to_mail_addr'], data['subject'], data['content'])
-        return True
-    except Exception as e:
-        print(getTracebackInfo())
-    return False
-
-
-def emailNotifyTest(data):
-    # print(data)
-    data['subject'] = 'MW通知测试'
-    data['content'] = data['mail_test']
-    return emailNotifyMessage(data)
-
-
-def notifyMessageTry(msg, stype='common', trigger_time=300, is_write_log=True):
-
-    lock_file = getPanelTmp() + '/notify_lock.json'
-    if not os.path.exists(lock_file):
-        writeFile(lock_file, '{}')
-
-    lock_data = json.loads(readFile(lock_file))
-    if stype in lock_data:
-        diff_time = time.time() - lock_data[stype]['do_time']
-        if diff_time >= trigger_time:
-            lock_data[stype]['do_time'] = time.time()
-        else:
-            return False
-    else:
-        lock_data[stype] = {'do_time': time.time()}
-
-    writeFile(lock_file, json.dumps(lock_data))
-
-    if is_write_log:
-        writeLog("通知管理[" + stype + "]", msg)
-
-    data = getNotifyData(True)
-    # tag_list = ['tgbot', 'email']
-    # tagbot
-    do_notify = False
-    if 'tgbot' in data and 'enable' in data['tgbot']:
-        if data['tgbot']['enable']:
-            t = data['tgbot']['data']
-            i = sys.version_info
-
-            # telebot 在python小于3.7无法使用
-            if i[0] < 3 or i[1] < 7:
-                do_notify = tgbotNotifyHttpPost(
-                    t['app_token'], t['chat_id'], msg)
-            else:
-                do_notify = tgbotNotifyMessage(
-                    t['app_token'], t['chat_id'], msg)
-
-    if 'email' in data and 'enable' in data['email']:
-        if data['email']['enable']:
-            t = data['email']['data']
-            t['subject'] = 'MW通知'
-            t['content'] = msg
-            do_notify = emailNotifyMessage(t)
-    return do_notify
-
-
-def notifyMessage(msg, stype='common', trigger_time=300, is_write_log=True):
-    try:
-        return notifyMessageTry(msg, stype, trigger_time, is_write_log)
-    except Exception as e:
-        writeFileLog(getTracebackInfo())
-        return False
-
-
-##################### notify  end #########################################
-
-
-def getGlibcVersion():
-    try:
-        cmd_result = execShell("ldd --version")[0]
-        if not cmd_result: return ''
-        glibc_version = cmd_result.split("\n")[0].split()[-1]
-    except:
-        return ''
-    return glibc_version
-
-##################### ssh  start #########################################
-def getSshDir():
-    if isAppleSystem():
-        user = execShell("who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
-        return '/Users/' + user + '/.ssh'
-    return '/root/.ssh'
-
-
-def processExists(pname, exe=None, cmdline=None):
-    # 进程是否存在
-    try:
-        import psutil
-        pids = psutil.pids()
-        for pid in pids:
-            try:
-                p = psutil.Process(pid)
-                if p.name() == pname:
-                    if not exe and not cmdline:
-                        return True
-                    else:
-                        if exe:
-                            if p.exe() == exe:
-                                return True
-                        if cmdline:
-                            if cmdline in p.cmdline():
-                                return True
-            except:
-                pass
-        return False
-    except:
-        return True
-
-
-def createRsa():
-    # ssh-keygen -t rsa -P "" -C "midoks@163.com"
-    ssh_dir = getSshDir()
-    # mw.execShell("rm -f /root/.ssh/*")
-    if not os.path.exists(ssh_dir + '/authorized_keys'):
-        execShell('touch ' + ssh_dir + '/authorized_keys')
-
-    if not os.path.exists(ssh_dir + '/id_rsa.pub') and os.path.exists(ssh_dir + '/id_rsa'):
-        execShell('echo y | ssh-keygen -q -t rsa -P "" -f ' +
-                  ssh_dir + '/id_rsa')
-    else:
-        execShell('ssh-keygen -q -t rsa -P "" -f ' + ssh_dir + '/id_rsa')
-
-    execShell('cat ' + ssh_dir + '/id_rsa.pub >> ' +
-              ssh_dir + '/authorized_keys')
-    execShell('chmod 600 ' + ssh_dir + '/authorized_keys')
-
-
-def createSshInfo():
-    ssh_dir = getSshDir()
-    if not os.path.exists(ssh_dir + '/id_rsa') or not os.path.exists(ssh_dir + '/id_rsa.pub'):
-        createRsa()
-
-    # 检查是否写入authorized_keys
-    data = execShell("cat " + ssh_dir + "/id_rsa.pub | awk '{print $3}'")
-    if data[0] != "":
-        cmd = "cat " + ssh_dir + "/authorized_keys | grep " + data[0]
-        ak_data = execShell(cmd)
-        if ak_data[0] == "":
-            cmd = 'cat ' + ssh_dir + '/id_rsa.pub >> ' + ssh_dir + '/authorized_keys'
-            execShell(cmd)
-            execShell('chmod 600 ' + ssh_dir + '/authorized_keys')
-
-
-def connectSsh():
-    import paramiko
-    ssh = paramiko.SSHClient()
-    createSshInfo()
-    ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-
-    port = getSSHPort()
-    try:
-        ssh.connect('127.0.0.1', port, timeout=5)
-    except Exception as e:
-        ssh.connect('localhost', port, timeout=5)
-    except Exception as e:
-        ssh.connect(getHostAddr(), port, timeout=30)
-    except Exception as e:
-        return False
-
-    shell = ssh.invoke_shell(term='xterm', width=83, height=21)
-    shell.setblocking(0)
-    return shell
-
-
-def clearSsh():
-    # 服务器IP
-    ip = getHostAddr()
-    sh = '''
-#!/bin/bash
-PLIST=`who | grep localhost | awk '{print $2}'`
-for i in $PLIST
-do
-    ps -t /dev/$i |grep -v TTY | awk '{print $1}' | xargs kill -9
-done
-
-# getHostAddr
-PLIST=`who | grep "${ip}" | awk '{print $2}'`
-for i in $PLIST
-do
-    ps -t /dev/$i |grep -v TTY | awk '{print $1}' | xargs kill -9
-done
-'''
-    if not isAppleSystem():
-        info = execShell(sh)
-        print(info[0], info[1])
-##################### ssh  end   #########################################
-
-# ---------------------------------------------------------------------------------
-# 打印相关 START
-# ---------------------------------------------------------------------------------
-
-
-def echoStart(tag):
-    print("=" * 89)
-    print("★开始{}[{}]".format(tag, formatDate()))
-    print("=" * 89)
-
-
-def echoEnd(tag):
-    print("=" * 89)
-    print("☆{}完成[{}]".format(tag, formatDate()))
-    print("=" * 89)
-    print("\n")
-
-
-def echoInfo(msg):
-    print("|-{}".format(msg))
-
-# ---------------------------------------------------------------------------------
-# 打印相关 END
-# ---------------------------------------------------------------------------------
diff --git a/class/core/page.py b/class/core/page.py
deleted file mode 100755
index e2ccdb8a1..000000000
--- a/class/core/page.py
+++ /dev/null
@@ -1,245 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 分页库操作
-# ---------------------------------------------------------------------------------
-
-
-import math
-import string
-
-
-class Page():
-    #--------------------------
-    # 分页类 - JS回调版
-    #--------------------------
-    __PREV = '上一页'
-    __NEXT = '下一页'
-    __START = '首页'
-    __END = '尾页'
-    __COUNT_START = '共'
-    __COUNT_END = '条数据'
-    __FO = '从'
-    __LINE = '条'
-    __LIST_NUM = 4
-    SHIFT = None  # 偏移量
-    ROW = None  # 每页行数
-    __C_PAGE = None  # 当前页
-    __COUNT_PAGE = None  # 总页数
-    __COUNT_ROW = None  # 总行数
-    __URI = None  # URI
-    __RTURN_JS = False  # 是否返回JS回调
-    __START_NUM = None  # 起始行
-    __END_NUM = None  # 结束行
-    __ARGS_TPL = ''
-
-    def __init__(self):
-        if False:
-            self.__PREV = tmp['PREV']
-            self.__NEXT = tmp['NEXT']
-            self.__START = tmp['START']
-            self.__END = tmp['END']
-            self.__COUNT_START = tmp['COUNT_START']
-            self.__COUNT_END = tmp['COUNT_END']
-            self.__FO = tmp['FO']
-            self.__LINE = tmp['LINE']
-
-    def getPageNum(self, num):
-        return str(num) + self.__ARGS_TPL
-
-    def GetPage(self, pageInfo, limit='1,2,3,4,5,6,7,8'):
-        # 取分页信息
-        # @param pageInfo 传入分页参数字典
-        # @param limit 返回系列
-        self.__RTURN_JS = pageInfo['return_js']
-        self.__COUNT_ROW = pageInfo['count']
-
-        if 'args_tpl' in pageInfo:
-            self.__ARGS_TPL = pageInfo['args_tpl']
-
-        self.ROW = pageInfo['row']
-        self.__C_PAGE = self.__GetCpage(pageInfo['p'])
-        self.__START_NUM = self.__StartRow()
-        self.__END_NUM = self.__EndRow()
-        self.__COUNT_PAGE = self.__GetCountPage()
-        self.__URI = self.__SetUri(pageInfo['uri'])
-        self.SHIFT = self.__START_NUM - 1
-
-        keys = limit.split(',')
-        pages = {}
-        # 起始页
-        pages['1'] = self.__GetStart()
-        # 上一页
-        pages['2'] = self.__GetPrev()
-        # 分页
-        pages['3'] = self.__GetPages()
-        # 下一页
-        pages['4'] = self.__GetNext()
-        # 尾页
-        pages['5'] = self.__GetEnd()
-
-        # 当前显示页与总页数
-        pages['6'] = "<span class='Pnumber'>" + \
-            str(self.__C_PAGE) + "/" + \
-            str(self.__COUNT_PAGE) + "</span>"
-
-        # 本页显示开始与结束行
-        pages['7'] = "<span class='Pline'>" + str(self.__FO) + \
-            str(self.__START_NUM) + "-" + \
-            str(self.__END_NUM) + str(self.__LINE) + "</span>"
-        # 行数
-        pages['8'] = "<span class='Pcount'>" + str(self.__COUNT_START) + \
-            str(self.__COUNT_ROW) + str(self.__COUNT_END) + "</span>"
-
-        # 构造返回数据
-        retuls = '<div>'
-        for value in keys:
-            retuls += pages[value]
-        retuls += '</div>'
-
-        # 返回分页数据
-        return retuls
-
-    def __GetEnd(self):
-        # 构造尾页
-        endStr = ""
-        if self.__C_PAGE >= self.__COUNT_PAGE:
-            endStr = ''
-        else:
-            if self.__RTURN_JS == "":
-                endStr = "<a class='Pend' href='" + self.__URI + "p=" + \
-                    str(self.__COUNT_PAGE) + "'>" + str(self.__END) + "</a>"
-            else:
-                endStr = "<a class='Pend' onclick='" + self.__RTURN_JS + \
-                    "(" + self.getPageNum(self.__COUNT_PAGE) + ")'>" + \
-                    str(self.__END) + "</a>"
-        return endStr
-
-    def __GetNext(self):
-        # 构造下一页
-        nextStr = ""
-        if self.__C_PAGE >= self.__COUNT_PAGE:
-            nextStr = ''
-        else:
-            if self.__RTURN_JS == "":
-                nextStr = "<a class='Pnext' href='" + self.__URI + "p=" + \
-                    str(self.__C_PAGE + 1) + "'>" + str(self.__NEXT) + "</a>"
-            else:
-                nextStr = "<a class='Pnext' onclick='" + self.__RTURN_JS + \
-                    "(" +   self.getPageNum(self.__C_PAGE + 1) + ")'>" + \
-                    str(self.__NEXT) + "</a>"
-
-        return nextStr
-
-    def __GetPages(self):
-        # 构造分页
-        pages = ''
-        num = 0
-        # 当前页之前
-        if (self.__COUNT_PAGE - self.__C_PAGE) < self.__LIST_NUM:
-            num = self.__LIST_NUM + \
-                (self.__LIST_NUM - (self.__COUNT_PAGE - self.__C_PAGE))
-        else:
-            num = self.__LIST_NUM
-        n = 0
-        for i in range(num):
-            n = num - i
-            page = self.__C_PAGE - n
-            if page > 0:
-                if self.__RTURN_JS == "":
-                    pages += "<a class='Pnum' href='" + self.__URI + \
-                        "p=" + str(page) + "'>" + str(page) + "</a>"
-                else:
-                    pages += "<a class='Pnum' onclick='" + self.__RTURN_JS + \
-                        "(" + self.getPageNum(page) + ")'>" + str(page) + "</a>"
-
-        # 当前页
-        if self.__C_PAGE > 0:
-            pages += "<span class='Pcurrent'>" + \
-                str(self.__C_PAGE) + "</span>"
-
-        # 当前页之后
-        if self.__C_PAGE <= self.__LIST_NUM:
-            num = self.__LIST_NUM + (self.__LIST_NUM - self.__C_PAGE) + 1
-        else:
-            num = self.__LIST_NUM
-        for i in range(num):
-            if i == 0:
-                continue
-            page = self.__C_PAGE + i
-            if page > self.__COUNT_PAGE:
-                break
-            if self.__RTURN_JS == "":
-                pages += "<a class='Pnum' href='" + self.__URI + \
-                    "p=" + str(page) + "'>" + str(page) + "</a>"
-            else:
-                pages += "<a class='Pnum' onclick='" + self.__RTURN_JS + \
-                    "(" + self.getPageNum(page) + ")'>" + str(page) + "</a>"
-
-        return pages
-
-    def __GetPrev(self):
-        # 构造上一页
-        startStr = ''
-        if self.__C_PAGE == 1:
-            startStr = ''
-        else:
-            if self.__RTURN_JS == "":
-                startStr = "<a class='Ppren' href='" + self.__URI + "p=" + \
-                    str(self.__C_PAGE - 1) + "'>" + str(self.__PREV) + "</a>"
-            else:
-                startStr = "<a class='Ppren' onclick='" + self.__RTURN_JS + \
-                    "(" + self.getPageNum(self.__C_PAGE - 1) + ")'>" + \
-                    str(self.__PREV) + "</a>"
-        return startStr
-
-    def __GetStart(self):
-        # 构造起始分页
-        startStr = ''
-        if self.__C_PAGE == 1:
-            startStr = ''
-        else:
-            if self.__RTURN_JS == "":
-                startStr = "<a class='Pstart' href='" + \
-                    self.__URI + "p=1'>" + str(self.__START) + "</a>"
-            else:
-                startStr = "<a class='Pstart' onclick='" + \
-                    self.__RTURN_JS + "("+self.getPageNum(1)+")'>" + str(self.__START) + "</a>"
-        return startStr
-
-    def __GetCpage(self, p):
-        # 取当前页
-        if p:
-            return p
-        return 1
-
-    def __StartRow(self):
-        # 从多少行开始
-        return (self.__C_PAGE - 1) * self.ROW + 1
-
-    def __EndRow(self):
-        # 从多少行结束
-        if self.ROW > self.__COUNT_ROW:
-            return self.__COUNT_ROW
-        return self.__C_PAGE * self.ROW
-
-    def __GetCountPage(self):
-        # 取总页数
-        return int(math.ceil(self.__COUNT_ROW / float(self.ROW)))
-
-    def __SetUri(self, sinput):
-        # 构造URI
-        uri = '?'
-        for key in sinput:
-            if key == 'p':
-                continue
-            uri += key + '=' + sinput[key] + '&'
-        return str(uri)
diff --git a/class/core/plugins_api.py b/class/core/plugins_api.py
deleted file mode 100755
index a08779624..000000000
--- a/class/core/plugins_api.py
+++ /dev/null
@@ -1,1105 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 插件操作
-# ---------------------------------------------------------------------------------
-
-
-import psutil
-import time
-import os
-import mw
-import re
-import json
-
-import sys
-# reload(sys)
-# sys.setdefaultencoding('utf8')
-
-import threading
-import multiprocessing
-
-from flask import render_template
-from flask import request
-
-
-class pa_thread(threading.Thread):
-
-    def __init__(self, func, args, name=''):
-        threading.Thread.__init__(self)
-        self.name = name
-        self.func = func
-        self.args = args
-        self.result = self.func(*self.args)
-
-    def getResult(self):
-        try:
-            return self.result
-        except Exception:
-            return None
-
-
-class plugins_api:
-    __tasks = None
-    __plugin_dir = 'plugins'
-    __type = 'data/json/type.json'
-    __index = 'data/json/index.json'
-    __index_data = None
-    setupPath = None
-
-    def __init__(self):
-        self.setupPath = 'server'
-        self.__plugin_dir = mw.getRunDir() + '/plugins'
-        self.__type = mw.getRunDir() + '/data/json/type.json'
-        self.__index = mw.getRunDir() + '/data/json/index.json'
-
-        self.initIndexData()
-
-    def initIndexData(self):
-        if not os.path.exists(self.__index):
-            mw.writeFile(self.__index, '[]')
-
-        self.__index_data = json.loads(mw.readFile(self.__index))
-
-    ##### ----- start ----- ###
-    def listApi(self):
-        sType = request.args.get('type', '0')
-        sPage = request.args.get('p', '1')
-
-        if not mw.isNumber(sPage):
-            sPage = 1
-
-        if not mw.isNumber(sType):
-            sType = 0
-
-        # print(sPage, sType)
-        search = request.args.get('search', '').lower()
-        data = self.getPluginList(sType, search, int(sPage))
-        return mw.getJson(data)
-
-    def menuGetAbsPath(self, tag, path):
-        if path[0:1] == '/':
-            return path
-        else:
-            return mw.getPluginDir() + '/' + tag + '/' + path
-
-    def menuApi(self):
-        import config_api
-        data = config_api.config_api().get()
-        tag = request.args.get('tag', '')
-        menu_file = 'data/hook_menu.json'
-        content = ''
-        if os.path.exists(menu_file):
-            t = mw.readFile(menu_file)
-            tlist = json.loads(t)
-            for menu_data in tlist:
-                if tag == menu_data['name'] and 'path' in menu_data:
-                    tpath = self.menuGetAbsPath(tag, menu_data['path'])
-                    content = mw.readFile(tpath)
-        data['plugin_content'] = content
-        return render_template('plugin_menu.html', data=data)
-
-    def fileApi(self):
-        name = request.args.get('name', '')
-        if name.strip() == '':
-            return ''
-
-        f = request.args.get('f', '')
-
-        if f.strip() == '':
-            return ''
-
-        file = mw.getPluginDir() + '/' + name + '/' + f
-        if not os.path.exists(file):
-            return ''
-
-        suffix = mw.getPathSuffix(file)
-        if suffix == '.css':
-            content = mw.readFile(file)
-            from flask import Response
-            from flask import make_response
-            v = Response(content, headers={
-                         'Content-Type': 'text/css; charset="utf-8"'})
-            return make_response(v)
-        content = open(file, 'rb').read()
-        return content
-
-    def indexListApi(self):
-        data = self.getIndexList()
-        return mw.getJson(data)
-
-    def indexSortApi(self):
-        sort = request.form.get('ssort', '')
-        if sort.strip() == '':
-            return mw.returnJson(False, '排序数据不能为空!')
-        data = self.setIndexSort(sort)
-        if data:
-            return mw.returnJson(True, '成功!')
-        return mw.returnJson(False, '失败!')
-
-    def initApi(self):
-
-        plugin_names = {
-            'openresty': '1.25.3',
-            'php': '56',
-            'swap': '1.1',
-            'mysql': '5.7',
-            'phpmyadmin': '4.4.15',
-        }
-
-        pn_dir = mw.getPluginDir()
-        pn_server_dir = mw.getServerDir()
-        pn_list = []
-        for pn in plugin_names:
-            info = {}
-            pn_json = pn_dir + '/' + pn + '/info.json'
-            pn_server = pn_server_dir + '/' + pn
-            if not os.path.exists(pn_server):
-
-                tmp = mw.readFile(pn_json)
-                tmp = json.loads(tmp)
-
-                info['title'] = tmp['title']
-                info['name'] = tmp['name']
-                info['versions'] = tmp['versions']
-                info['default_ver'] = plugin_names[pn]
-                pn_list.append(info)
-            else:
-                return mw.returnJson(False, 'ok')
-
-        return mw.returnJson(True, 'ok', pn_list)
-
-    def initInstallApi(self):
-        pn_list = request.form.get('list', '')
-        try:
-            pn_list = json.loads(pn_list)
-
-            for pn in pn_list:
-                name = pn['name']
-                version = pn['version']
-                infoJsonPos = self.__plugin_dir + '/' + name + '/' + 'info.json'
-                pluginInfo = json.loads(mw.readFile(infoJsonPos))
-                self.hookInstall(pluginInfo)
-                execstr = 'cd ' + mw.getPluginDir() + '/' + name + ' && bash ' + \
-                    pluginInfo['shell'] + ' install ' + version
-
-                taskAdd = ('安装[' + name + '-' + version + ']',
-                           'execshell', '0', time.strftime('%Y-%m-%d %H:%M:%S'), execstr)
-
-                mw.M('tasks').add('name,type,status,addtime, execstr', taskAdd)
-            os.mkdir(mw.getServerDir() + '/php')
-            # 任务执行相关
-            mw.triggerTask()
-            return mw.returnJson(True, '添加成功')
-        except Exception as e:
-            return mw.returnJson(False, mw.getTracebackInfo())
-
-    def installApi(self):
-        rundir = mw.getRunDir()
-        name = request.form.get('name', '')
-        version = request.form.get('version', '')
-
-        mmsg = '安装'
-        if hasattr(request.form, 'upgrade'):
-            mtype = 'update'
-            mmsg = 'upgrade'
-
-        if name.strip() == '':
-            return mw.returnJson(False, '缺少插件名称!', ())
-
-        if version.strip() == '':
-            return mw.returnJson(False, '缺少版本信息!', ())
-
-        infoJsonPos = self.__plugin_dir + '/' + name + '/' + 'info.json'
-        # print infoJsonPos
-
-        if not os.path.exists(infoJsonPos):
-            return mw.returnJson(False, '配置文件不存在!', ())
-
-        pluginInfo = json.loads(mw.readFile(infoJsonPos))
-        self.hookInstall(pluginInfo)
-
-        execstr = 'cd ' + mw.getPluginDir() + '/' + name + ' && bash ' + \
-            pluginInfo['shell'] + ' install ' + version
-
-        if mw.isAppleSystem():
-            print(execstr)
-
-        taskAdd = (mmsg + '[' + name + '-' + version + ']',
-                   'execshell', '0', time.strftime('%Y-%m-%d %H:%M:%S'), execstr)
-
-        mw.M('tasks').add('name,type,status,addtime, execstr', taskAdd)
-
-        # 任务执行相关
-        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:
-            data.append(info)
-        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]['name'] == info['name']:
-                data.remove(data[idx])
-                break
-        mw.writeFile(hookPath, json.dumps(data))
-
-    def hookInstall(self, info):
-        valid_hook = ['backup', 'database']
-        valid_list_hook = ['menu', 'global_static', 'site_cb']
-        if 'hook' in info:
-            hooks = info['hook']
-            for h in hooks:
-                hooks_type = type(h)
-                if hooks_type == dict:
-                    tag = h['tag']
-                    if tag in valid_list_hook:
-                        self.hookInstallFile(tag, h[tag])
-                elif hooks_type == str:
-                    for x in hooks:
-                        if x in valid_hook:
-                            self.hookInstallFile(x, info)
-                            return True
-        return False
-
-    def hookUninstall(self, info):
-        valid_hook = ['backup', 'database']
-        valid_list_hook = ['menu', 'global_static', 'site_cb']
-        if 'hook' in info:
-            hooks = info['hook']
-            for h in hooks:
-                hooks_type = type(h)
-                if hooks_type == dict:
-                    tag = h['tag']
-                    if tag in valid_list_hook:
-                        self.hookUninstallFile(tag, h[tag])
-                elif hooks_type == str:
-                    for x in hooks:
-                        if x in valid_hook:
-                            self.hookUninstallFile(x, info)
-                            return True
-        return False
-
-    def uninstallOldApi(self):
-        rundir = mw.getRunDir()
-        name = request.form.get('name', '')
-        version = request.form.get('version', '')
-        if name.strip() == '':
-            return mw.returnJson(False, "缺少插件名称!", ())
-
-        if version.strip() == '':
-            return mw.returnJson(False, "缺少版本信息!", ())
-
-        infoJsonPos = self.__plugin_dir + '/' + name + '/' + 'info.json'
-
-        if not os.path.exists(infoJsonPos):
-            return mw.returnJson(False, "配置文件不存在!", ())
-
-        pluginInfo = json.loads(mw.readFile(infoJsonPos))
-        execstr = "cd " + os.getcwd() + "/plugins/" + \
-            name + " && /bin/bash " + pluginInfo["shell"] \
-            + " uninstall " + version
-
-        taskAdd = (None, '卸载[' + name + '-' + version + ']',
-                   'execshell', '0', time.strftime('%Y-%m-%d %H:%M:%S'), execstr)
-
-        mw.M('tasks').add('id,name,type,status,addtime, execstr', taskAdd)
-        return mw.returnJson(True, '已将卸载任务添加到队列!')
-
-    # 卸载时间短,不加入任务中...
-    def uninstallApi(self):
-        rundir = mw.getRunDir()
-        name = request.form.get('name', '')
-        version = request.form.get('version', '')
-        if name.strip() == '':
-            return mw.returnJson(False, "缺少插件名称!", ())
-
-        if version.strip() == '':
-            return mw.returnJson(False, "缺少版本信息!", ())
-
-        infoJsonPos = self.__plugin_dir + '/' + name + '/' + 'info.json'
-
-        if not os.path.exists(infoJsonPos):
-            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.isDebugMode():
-            print(execstr)
-            print(data[0], data[1])
-        self.removeIndex(name, version)
-        return mw.returnJson(True, '卸载执行成功!')
-        # if data[1] == '':
-        #     return mw.returnJson(True, '已将卸载成功!')
-        # else:
-        #     return mw.returnJson(False, '卸载出现错误信息!' + data[1])
-
-    def checkApi(self):
-        name = request.form.get('name', '')
-        if name.strip() == '':
-            return mw.returnJson(False, "缺少插件名称!", ())
-
-        infoJsonPos = self.__plugin_dir + '/' + name + '/' + 'info.json'
-        if not os.path.exists(infoJsonPos):
-            return mw.returnJson(False, "配置文件不存在!", ())
-        return mw.returnJson(True, "插件存在!", ())
-
-    def setIndexApi(self):
-        name = request.form.get('name', '')
-        status = request.form.get('status', '0')
-        version = request.form.get('version', '')
-        if status == '1':
-            return self.addIndex(name, version)
-        return self.removeIndex(name, version)
-
-    def settingApi(self):
-        name = request.args.get('name', '')
-        html = self.__plugin_dir + '/' + name + '/index.html'
-        return mw.readFile(html)
-
-    def runApi(self):
-        name = request.form.get('name', '')
-        func = request.form.get('func', '')
-        version = request.form.get('version', '')
-        args = request.form.get('args', '')
-        script = request.form.get('script', 'index')
-
-        data = self.run(name, func, version, args, script)
-        if data[1] == '':
-            r = mw.returnJson(True, "OK", data[0].strip())
-        else:
-            r = mw.returnJson(False, data[1].strip())
-        return r
-
-    def callbackApi(self):
-        name = request.form.get('name', '')
-        func = request.form.get('func', '')
-        args = request.form.get('args', '')
-        script = request.form.get('script', 'index')
-
-        data = self.callback(name, func, args, script)
-        if data[0]:
-            return mw.returnJson(True, "OK", data[1])
-        return mw.returnJson(False, data[1])
-
-    def updateZipApi(self):
-        tmp_path = mw.getRootDir() + '/temp'
-        if not os.path.exists(tmp_path):
-            os.makedirs(tmp_path)
-        mw.execShell("rm -rf " + tmp_path + '/*')
-
-        tmp_file = tmp_path + '/plugin_tmp.zip'
-        from werkzeug.utils import secure_filename
-        from flask import request
-        f = request.files['plugin_zip']
-        if f.filename[-4:] != '.zip':
-            return mw.returnJson(False, '仅支持zip文件!')
-        f.save(tmp_file)
-        mw.execShell('cd ' + tmp_path + ' && unzip ' + tmp_file)
-        os.remove(tmp_file)
-
-        p_info = tmp_path + '/info.json'
-        if not os.path.exists(p_info):
-            d_path = None
-            for df in os.walk(tmp_path):
-                if len(df[2]) < 3:
-                    continue
-                if not 'info.json' in df[2]:
-                    continue
-                if not 'install.sh' in df[2]:
-                    continue
-                if not os.path.exists(df[0] + '/info.json'):
-                    continue
-                d_path = df[0]
-            if d_path:
-                tmp_path = d_path
-                p_info = tmp_path + '/info.json'
-        try:
-            data = json.loads(mw.readFile(p_info))
-            data['size'] = mw.getPathSize(tmp_path)
-            if not 'author' in data:
-                data['author'] = '未知'
-            if not 'home' in data:
-                data['home'] = 'https://github.com/midoks/mdserver-web'
-            plugin_path = mw.getPluginDir() + data['name'] + '/info.json'
-            data['old_version'] = '0'
-            data['tmp_path'] = tmp_path
-            if os.path.exists(plugin_path):
-                try:
-                    old_info = json.loads(mw.ReadFile(plugin_path))
-                    data['old_version'] = old_info['versions']
-                except:
-                    pass
-        except:
-            mw.execShell("rm -rf " + tmp_path)
-            return mw.returnJson(False, '在压缩包中没有找到插件信息,请检查插件包!')
-        protectPlist = ('openresty', 'mysql', 'php', 'redis', 'memcached'
-                        'mongodb', 'swap', 'gogs', 'pureftp')
-        if data['name'] in protectPlist:
-            return mw.returnJson(False, '[' + data['name'] + '],重要插件不可修改!')
-        return mw.getJson(data)
-
-    def inputZipApi(self):
-        plugin_name = request.form.get('plugin_name', '')
-        tmp_path = request.form.get('tmp_path', '')
-
-        if not os.path.exists(tmp_path):
-            return mw.returnJson(False, '临时文件不存在,请重新上传!')
-        plugin_path = mw.getPluginDir() + '/' + plugin_name
-        if not os.path.exists(plugin_path):
-            print(mw.execShell('mkdir -p ' + plugin_path))
-        mw.execShell("cp -rf " + tmp_path + '/* ' + plugin_path + '/')
-        mw.execShell('chmod -R 755 ' + plugin_path)
-        p_info = mw.readFile(plugin_path + '/info.json')
-        if p_info:
-            mw.writeLog('软件管理', '安装第三方插件[%s]' %
-                        json.loads(p_info)['title'])
-            return mw.returnJson(True, '安装成功!')
-        mw.execShell("rm -rf " + plugin_path)
-        return mw.returnJson(False, '安装失败!')
-    ##### ----- end ----- ###
-
-    # 进程是否存在
-    def processExists(self, pname, exe=None):
-        try:
-            if not self.pids:
-                self.pids = psutil.pids()
-            for pid in self.pids:
-                try:
-                    p = psutil.Process(pid)
-                    if p.name() == pname:
-                        if not exe:
-                            return True
-                        else:
-                            if p.exe() == exe:
-                                return True
-                except:
-                    pass
-            return False
-        except:
-            return True
-
-    # 检查是否正在安装
-    def checkSetupTask(self, sName, sVer, sCoexist):
-        if not self.__tasks:
-            self.__tasks = mw.M('tasks').where(
-                "status!=?", ('1',)).field('status,name').select()
-        isTask = '1'
-        for task in self.__tasks:
-            tmpt = mw.getStrBetween('[', ']', task['name'])
-            if not tmpt:
-                continue
-            task_sign = tmpt.split('-')
-            task_len = len(task_sign)
-
-            task_name = task_sign[0].lower()
-            task_ver = task_sign[1]
-            if task_len > 2:
-                nameArr = task_sign[0:task_len - 1]
-                task_name = '-'.join(nameArr).lower()
-                task_ver = task_sign[task_len - 1]
-            if sCoexist:
-                if task_name == sName and task_ver == sVer:
-                    isTask = task['status']
-            else:
-                if task_name == sName:
-                    isTask = task['status']
-        return isTask
-
-    def checkStatus(self, info):
-        if not info['setup']:
-            return False
-
-        data = self.run(info['name'], 'status', info['setup_version'])
-        if data[0] == 'start':
-            return True
-        return False
-
-    def checkStatusProcess(self, info, i, return_dict):
-        if not info['setup']:
-            return_dict[i] = False
-            return
-
-        data = self.run(info['name'], 'status', info['setup_version'])
-        if data[0] == 'start':
-            return_dict[i] = True
-        else:
-            return_dict[i] = False
-
-    def checkStatusThreads(self, info, i):
-        if not info['setup']:
-            return False
-        data = self.run(info['name'], 'status', info['setup_version'])
-        if data[0] == 'start':
-            return True
-        else:
-            return False
-
-    # 还无法正常运行,先保留
-    def checkStatusThreadsCallback(self, info, i):
-        if not info['setup']:
-            return False
-
-        try:
-            data = self.callback(info['name'], 'status', info['setup_version'])
-        except Exception as e:
-            data = self.callback(info['name'], 'status')
-
-        # data = self.run(info['name'], 'status', info['setup_version'])
-        if data[0] == 'start':
-            return True
-        else:
-            return False
-
-    def checkStatusMThreads(self, plugins_info):
-        try:
-            threads = []
-            ntmp_list = range(len(plugins_info))
-            for i in ntmp_list:
-                t = pa_thread(self.checkStatusThreads,
-                              (plugins_info[i], i))
-                threads.append(t)
-
-            for i in ntmp_list:
-                threads[i].start()
-            for i in ntmp_list:
-                threads[i].join()
-
-            for i in ntmp_list:
-                t = threads[i].getResult()
-                plugins_info[i]['status'] = t
-        except Exception as e:
-            print('checkStatusMThreads:', str(e))
-
-        return plugins_info
-
-    def checkStatusMProcess(self, plugins_info):
-        manager = multiprocessing.Manager()
-        return_dict = manager.dict()
-        jobs = []
-        for i in range(len(plugins_info)):
-            p = multiprocessing.Process(
-                target=self.checkStatusProcess, args=(plugins_info[i], i, return_dict))
-            jobs.append(p)
-            p.start()
-
-        for proc in jobs:
-            proc.join()
-
-        returnData = return_dict.values()
-        for i in ntmp_list:
-            plugins_info[i]['status'] = returnData[i]
-
-        return plugins_info
-
-    def checkIndexList(self, name, version):
-        indexList = self.__index_data
-        for i in indexList:
-            nv = i.split('-')
-            if nv[0] == name:
-                return True
-        return False
-
-    def checkDisplayIndex(self, name, version, coexist):
-        # if not os.path.exists(self.__index):
-        #     mw.writeFile(self.__index, '[]')
-        # indexList = json.loads(mw.readFile(self.__index))
-
-        indexList = self.__index_data
-        if coexist:
-            if type(version) == list:
-                for index in range(len(version)):
-                    vname = name + '-' + version[index]
-                    if vname in indexList:
-                        return True
-            else:
-                vname = name + '-' + version
-                if vname in indexList:
-                    return True
-
-        else:
-            if type(version) == list:
-                for index in range(len(version)):
-                    return self.checkIndexList(name, version)
-            else:
-                return self.checkIndexList(name, version)
-        return False
-
-    def getVersion(self, path):
-        version_f = path + '/version.pl'
-        if os.path.exists(version_f):
-            return mw.readFile(version_f).strip()
-        return ''
-
-    # 构造本地插件信息
-    def getPluginInfo(self, info):
-        checks = ''
-        path = ''
-        coexist = False
-
-        if info["checks"][0:1] == '/':
-            checks = info["checks"]
-        else:
-            checks = mw.getRootDir() + '/' + info['checks']
-
-        if 'path' in info:
-            path = info['path']
-
-        if path[0:1] != '/':
-            path = mw.getRootDir() + '/' + path
-
-        if 'coexist' in info and info['coexist']:
-            coexist = True
-
-        pInfo = {
-            "id": 10000,
-            "pid": info['pid'],
-            "type": 1000,
-            "name": info['name'],
-            "title": info['title'],
-            "ps": info['ps'],
-            "dependnet": "",
-            "mutex": "",
-            "icon": "",
-            "path": path,
-            "install_checks": checks,
-            "uninsatll_checks": checks,
-            "coexist": coexist,
-            "versions": info['versions'],
-            # "updates": info['updates'],
-            "display": False,
-            "setup": False,
-            "setup_version": "",
-            "status": False,
-            "install_pre_inspection": False,
-            "uninstall_pre_inspection": False,
-        }
-
-        if 'icon' in info:
-            pInfo['icon'] = info['icon']
-
-        if checks.find('VERSION') > -1:
-            pInfo['install_checks'] = checks.replace(
-                'VERSION', info['versions'])
-
-        if path.find('VERSION') > -1:
-            pInfo['path'] = path.replace(
-                'VERSION', info['versions'])
-
-        pInfo['task'] = self.checkSetupTask(
-            pInfo['name'], info['versions'], coexist)
-        pInfo['display'] = self.checkDisplayIndex(
-            info['name'], pInfo['versions'], coexist)
-
-        pInfo['setup'] = os.path.exists(pInfo['install_checks'])
-
-        if coexist and pInfo['setup']:
-            pInfo['setup_version'] = info['versions']
-        else:
-            pInfo['setup_version'] = self.getVersion(pInfo['install_checks'])
-        # pluginInfo['status'] = self.checkStatus(pluginInfo)
-
-        if 'install_pre_inspection' in info:
-            pInfo['install_pre_inspection'] = info['install_pre_inspection']
-        if 'uninstall_pre_inspection' in info:
-            pInfo['uninstall_pre_inspection'] = info[
-                'uninstall_pre_inspection']
-
-        pInfo['status'] = False
-        return pInfo
-
-    def makeCoexist(self, data):
-        plugins_info = []
-        for index in range(len(data['versions'])):
-            tmp = data.copy()
-            tmp['title'] = tmp['title'] + \
-                '-' + data['versions'][index]
-            tmp['versions'] = data['versions'][index]
-            pg = self.getPluginInfo(tmp)
-            plugins_info.append(pg)
-
-        return plugins_info
-
-    def makeList(self, data, sType='0'):
-        plugins_info = []
-
-        # 相应类型
-        if (data['pid'] == sType):
-            if type(data['versions']) == list and 'coexist' in data and data['coexist']:
-                tmp_data = self.makeCoexist(data)
-                for index in range(len(tmp_data)):
-                    plugins_info.append(tmp_data[index])
-            else:
-                pg = self.getPluginInfo(data)
-                plugins_info.append(pg)
-            return plugins_info
-
-        # 全部
-        if sType == '0':
-            if type(data['versions']) == list and 'coexist' in data and data['coexist']:
-                tmp_data = self.makeCoexist(data)
-                for index in range(len(tmp_data)):
-                    plugins_info.append(tmp_data[index])
-            else:
-                pg = self.getPluginInfo(data)
-                plugins_info.append(pg)
-
-        # 已经安装
-        if sType == '-1':
-            if type(data['versions']) == list and 'coexist' in data and data['coexist']:
-                tmp_data = self.makeCoexist(data)
-                for index in range(len(tmp_data)):
-                    if tmp_data[index]['setup']:
-                        plugins_info.append(tmp_data[index])
-            else:
-                pg = self.getPluginInfo(data)
-                if pg['setup']:
-                    plugins_info.append(pg)
-
-        # print plugins_info, data
-        return plugins_info
-
-    def getAllList(self, sType='0'):
-        plugins_info = []
-        for dirinfo in os.listdir(self.__plugin_dir):
-            if dirinfo[0:1] == '.':
-                continue
-            path = self.__plugin_dir + '/' + dirinfo
-            json_file = path + '/info.json'
-            if os.path.exists(json_file):
-                try:
-                    data = json.loads(mw.readFile(json_file))
-                    tmp_data = self.makeList(data, sType)
-                    for index in range(len(tmp_data)):
-                        plugins_info.append(tmp_data[index])
-                except Exception as e:
-                    print(e)
-        return plugins_info
-
-    def searchKey(self, info, kw):
-        try:
-            if info['title'].lower().find(kw) > -1:
-                return True
-            if info['ps'].lower().find(kw) > -1:
-                return True
-            if info['name'].lower().find(kw) > -1:
-                return True
-        except Exception as e:
-            return False
-
-    def getAllListPage(self, sType='0', kw='', page=1, pageSize=10):
-        plugins_info = []
-        for dirinfo in os.listdir(self.__plugin_dir):
-            if dirinfo[0:1] == '.':
-                continue
-            path = self.__plugin_dir + '/' + dirinfo
-            if os.path.isdir(path):
-                info_file = path + '/info.json'
-                if os.path.exists(info_file):
-                    try:
-                        data = json.loads(mw.readFile(info_file))
-                        # 判断是否搜索
-                        if kw != '' and not self.searchKey(data, kw):
-                            continue
-                        tmp_data = self.makeList(data, sType)
-                        for index in range(len(tmp_data)):
-                            plugins_info.append(tmp_data[index])
-                    except Exception as e:
-                        print(mw.getTracebackInfo())
-
-        start = (page - 1) * pageSize
-        end = start + pageSize
-        _plugins_info = plugins_info[start:end]
-
-        _plugins_info = self.checkStatusMThreads(_plugins_info)
-        return (_plugins_info, len(plugins_info))
-
-    def makeListThread(self, data, sType='0'):
-        plugins_info = []
-
-        if (data['pid'] == sType):
-            if type(data['versions']) == list and data.has_key('coexist') and data['coexist']:
-                tmp_data = self.makeCoexist(data)
-                for index in range(len(tmp_data)):
-                    plugins_info.append(tmp_data[index])
-            else:
-                pg = self.getPluginInfo(data)
-                plugins_info.append(pg)
-            return plugins_info
-
-        if sType == '0':
-            if type(data['versions']) == list and data.has_key('coexist') and data['coexist']:
-                tmp_data = self.makeCoexist(data)
-                for index in range(len(tmp_data)):
-                    plugins_info.append(tmp_data[index])
-            else:
-                pg = self.getPluginInfo(data)
-                plugins_info.append(pg)
-
-        # print plugins_info, data
-        return plugins_info
-
-    def getAllListThread(self, sType='0'):
-        plugins_info = []
-        tmp_list = []
-        threads = []
-        for dirinfo in os.listdir(self.__plugin_dir):
-            if dirinfo[0:1] == '.':
-                continue
-            path = self.__plugin_dir + '/' + dirinfo
-            if os.path.isdir(path):
-                json_file = path + '/info.json'
-                if os.path.exists(json_file):
-                    data = json.loads(mw.readFile(json_file))
-                    if sType == '0':
-                        tmp_list.append(data)
-
-                    if (data['pid'] == sType):
-                        tmp_list.append(data)
-
-        ntmp_list = range(len(tmp_list))
-        for i in ntmp_list:
-            t = pa_thread(self.makeListThread, (tmp_list[i], sType))
-            threads.append(t)
-        for i in ntmp_list:
-            threads[i].start()
-        for i in ntmp_list:
-            threads[i].join()
-
-        for i in ntmp_list:
-            t = threads[i].getResult()
-            for index in range(len(t)):
-                plugins_info.append(t[index])
-
-        return plugins_info
-
-    def makeListProcess(self, data, sType, i, return_dict):
-        plugins_info = []
-
-        if (data['pid'] == sType):
-            if type(data['versions']) == list and data.has_key('coexist') and data['coexist']:
-                tmp_data = self.makeCoexist(data)
-                for index in range(len(tmp_data)):
-                    plugins_info.append(tmp_data[index])
-            else:
-                pg = self.getPluginInfo(data)
-                plugins_info.append(pg)
-            # return plugins_info
-
-        if sType == '0':
-            if type(data['versions']) == list and data.has_key('coexist') and data['coexist']:
-                tmp_data = self.makeCoexist(data)
-                for index in range(len(tmp_data)):
-                    plugins_info.append(tmp_data[index])
-            else:
-                pg = self.getPluginInfo(data)
-                plugins_info.append(pg)
-
-        return_dict[i] = plugins_info
-        # return plugins_info
-
-    def getAllListProcess(self, sType='0'):
-        plugins_info = []
-        tmp_list = []
-        manager = multiprocessing.Manager()
-        return_dict = manager.dict()
-        jobs = []
-        for dirinfo in os.listdir(self.__plugin_dir):
-            if dirinfo[0:1] == '.':
-                continue
-            path = self.__plugin_dir + '/' + dirinfo
-            if os.path.isdir(path):
-                json_file = path + '/info.json'
-                if os.path.exists(json_file):
-                    data = json.loads(mw.readFile(json_file))
-                    if sType == '0':
-                        tmp_list.append(data)
-
-                    if (data['pid'] == sType):
-                        tmp_list.append(data)
-
-        ntmp_list = range(len(tmp_list))
-        for i in ntmp_list:
-            p = multiprocessing.Process(
-                target=self.makeListProcess, args=(tmp_list[i], sType, i, return_dict))
-            jobs.append(p)
-            p.start()
-
-        for proc in jobs:
-            proc.join()
-
-        returnData = return_dict.values()
-        for i in ntmp_list:
-            for index in range(len(returnData[i])):
-                plugins_info.append(returnData[i][index])
-
-        return plugins_info
-
-    def getPluginList(self, sType,  kw='', sPage=1, sPageSize=10):
-        # print(sType, kw, sPage, sPageSize)
-
-        ret = {}
-        ret['type'] = json.loads(mw.readFile(self.__type))
-        # plugins_info = self.getAllListThread(sType)
-        # plugins_info = self.getAllListProcess(sType)
-        data = self.getAllListPage(sType, kw, sPage,  sPageSize)
-        ret['data'] = data[0]
-
-        args = {}
-        args['count'] = data[1]
-        args['p'] = sPage
-        args['tojs'] = 'getSList'
-        args['row'] = sPageSize
-
-        ret['list'] = mw.getPage(args)
-        return ret
-
-    def getIndexList(self):
-        if not os.path.exists(self.__index):
-            mw.writeFile(self.__index, '[]')
-
-        indexList = json.loads(mw.readFile(self.__index))
-        plist = []
-        for i in indexList:
-            tmp = i.split('-')
-            tmp_len = len(tmp)
-            plugin_name = tmp[0]
-            plugin_ver = tmp[1]
-            if tmp_len > 2:
-                tmpArr = tmp[0:tmp_len - 1]
-                plugin_name = '-'.join(tmpArr)
-                plugin_ver = tmp[tmp_len - 1]
-
-            read_json_file = self.__plugin_dir + '/' + plugin_name + '/info.json'
-            if os.path.exists(read_json_file):
-                content = mw.readFile(read_json_file)
-                try:
-                    data = json.loads(content)
-                    data = self.makeList(data)
-                    for index in range(len(data)):
-                        if data[index]['coexist']:
-                            if data[index]['versions'] == plugin_ver or plugin_ver in data[index]['versions']:
-                                data[index]['display'] = True
-                                plist.append(data[index])
-                                continue
-                        else:
-                            data[index]['display'] = True
-                            plist.append(data[index])
-
-                except Exception as e:
-                    print('getIndexList:', mw.getTracebackInfo())
-
-        # 使用gevent模式时,无法使用多进程
-        # plist = self.checkStatusMProcess(plist)
-        plist = self.checkStatusMThreads(plist)
-        return plist
-
-    def setIndexSort(self, sort):
-        data = sort.split('|')
-        mw.writeFile(self.__index, json.dumps(data))
-        return True
-
-    def addIndex(self, name, version):
-        if not os.path.exists(self.__index):
-            mw.writeFile(self.__index, '[]')
-
-        indexList = json.loads(mw.readFile(self.__index))
-        vname = name + '-' + version
-
-        if vname in indexList:
-            return mw.returnJson(False, '请不要重复添加!')
-        if len(indexList) > 12:
-            return mw.returnJson(False, '首页最多只能显示12个软件!')
-
-        indexList.append(vname)
-        mw.writeFile(self.__index, json.dumps(indexList))
-        return mw.returnJson(True, '添加成功!')
-
-    def removeIndex(self, name, version):
-        if not os.path.exists(self.__index):
-            mw.writeFile(self.__index, '[]')
-
-        indexList = json.loads(mw.readFile(self.__index))
-        vname = name + '-' + version
-        if not vname in indexList:
-            return mw.returnJson(True, '删除成功!')
-        indexList.remove(vname)
-        mw.writeFile(self.__index, json.dumps(indexList))
-        return mw.returnJson(True, '删除成功!')
-
-    # shell 调用
-    def run(self, name, func, version='', args='', script='index'):
-
-        path = self.__plugin_dir + '/' + name + '/' + script + '.py'
-        if not os.path.exists(path):
-            path = self.__plugin_dir + '/' + name + '/' + name + '.py'
-
-        py = 'python3 ' + path
-
-        if args == '':
-            py_cmd = py + ' ' + func + ' ' + version
-        else:
-            py_cmd = py + ' ' + func + ' ' + version + ' ' + args
-
-        if not os.path.exists(path):
-            return ('', '')
-        data = mw.execShell(py_cmd)
-
-        if mw.isDebugMode():
-            print('run', py_cmd)
-            print(data)
-        # print os.path.exists(py_cmd)
-
-        return (data[0].strip(), data[1].strip())
-
-    # 映射包调用
-    def callback(self, name, func, args='', script='index'):
-        package = self.__plugin_dir + '/' + name
-        if not os.path.exists(package):
-            return (False, "插件不存在!")
-
-        if not package in sys.path:
-            sys.path.append(package)
-        eval_str = "__import__('" + script + "')." + func + '(' + args + ')'
-        newRet = None
-        try:
-            newRet = eval(eval_str)
-        except Exception as e:
-            print(mw.getTracebackInfo())
-        
-        if mw.isDebugMode():
-            print('callback', eval_str)
-
-        return (True, newRet)
diff --git a/class/core/site_api.py b/class/core/site_api.py
deleted file mode 100755
index 3375146db..000000000
--- a/class/core/site_api.py
+++ /dev/null
@@ -1,2909 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 站点操作
-# ---------------------------------------------------------------------------------
-
-import time
-import os
-import sys
-from urllib.parse import urlparse
-import mw
-import re
-import json
-import shutil
-
-
-from flask import request
-
-
-class site_api:
-    siteName = None  # 网站名称
-    sitePath = None  # 根目录
-    sitePort = None  # 端口
-    phpVersion = None  # PHP版本
-
-    setupPath = None  # 安装路径
-    vhostPath = None
-    logsPath = None
-    passPath = None
-    rewritePath = None
-    redirectPath = None
-    sslDir = None       # ssl目录
-    sslLetsDir = None   # lets ssl目录
-
-    def __init__(self):
-        # nginx conf
-        self.setupPath = mw.getServerDir() + '/web_conf'
-
-        self.vhostPath = vhost = self.setupPath + '/nginx/vhost'
-        if not os.path.exists(vhost):
-            mw.execShell("mkdir -p " + vhost + " && chmod -R 755 " + vhost)
-        self.rewritePath = rewrite = self.setupPath + '/nginx/rewrite'
-        if not os.path.exists(rewrite):
-            mw.execShell("mkdir -p " + rewrite + " && chmod -R 755 " + rewrite)
-
-        self.passPath = passwd = self.setupPath + '/nginx/pass'
-        if not os.path.exists(passwd):
-            mw.execShell("mkdir -p " + passwd + " && chmod -R 755 " + passwd)
-
-        self.redirectPath = redirect = self.setupPath + '/nginx/redirect'
-        if not os.path.exists(redirect):
-            mw.execShell("mkdir -p " + redirect +
-                         " && chmod -R 755 " + redirect)
-
-        self.proxyPath = proxy = self.setupPath + '/nginx/proxy'
-        if not os.path.exists(proxy):
-            mw.execShell("mkdir -p " + proxy + " && chmod -R 755 " + proxy)
-
-        self.logsPath = mw.getRootDir() + '/wwwlogs'
-        # ssl conf
-        self.sslDir = self.setupPath + '/ssl'
-        self.sslLetsDir = self.setupPath + '/letsencrypt'
-        if not os.path.exists(self.sslLetsDir):
-            mw.execShell("mkdir -p " + self.sslLetsDir +
-                         " && chmod -R 755 " + self.sslLetsDir)
-
-    def runHook(self, hook_name, func_name):
-        # 站点操作Hook
-        hook_file = 'data/hook_site_cb.json'
-        hook_cfg = []
-        if os.path.exists(hook_file):
-            t = mw.readFile(hook_file)
-            hook_cfg = json.loads(t)
-
-        hook_num = len(hook_cfg)
-        if hook_num == 0:
-            return
-
-        import plugins_api
-        pa = plugins_api.plugins_api()
-
-        for x in range(hook_num):
-            hook_data = hook_cfg[x]
-            if func_name in hook_data:
-                app_name = hook_data["name"]
-                run_func = hook_data[func_name]['func']
-                # print(app_name, run_func)
-                pa.run(app_name, run_func)
-        return True
-
-    ##### ----- start ----- ###
-    def listApi(self):
-        limit = request.form.get('limit', '10')
-        p = request.form.get('p', '1')
-        type_id = request.form.get('type_id', '0').strip()
-        search = request.form.get('search', '').strip()
-
-        start = (int(p) - 1) * (int(limit))
-
-        siteM = siteC = mw.M('sites').field('id,name,path,status,ps,addtime,edate,type_id')
-
-        sql_where = ''
-        if search != '':
-            sql_where = " name like '%" + search + "%' or ps like '%" + search + "%' "
-
-        if type_id != '' and int(type_id) >= 0 and search != '':
-            sql_where = sql_where + " and type_id=" + type_id + ""
-        if type_id != '' and int(type_id) >= 0:
-            sql_where = " type_id=" + type_id
-
-        if sql_where != '':
-            siteM.where(sql_where)
-
-        _list = siteM.limit((str(start)) + ',' +limit).order('id desc').select()
-        if _list != None:
-            for i in range(len(_list)):
-                _list[i]['backup_count'] = mw.M('backup').where("pid=? AND type=?", (_list[i]['id'], 0)).count()
-
-        _ret = {}
-        _ret['data'] = _list
-
-        if sql_where != '':
-            count = siteC.where(sql_where).count()
-        else:
-            count = siteC.count()
-
-        _page = {}
-        _page['count'] = count
-        _page['tojs'] = 'getWeb'
-        _page['p'] = p
-        _page['row'] = limit
-
-        page_args_tpl = ''
-        page_args_tpl += ','+type_id+''
-        if search != '':
-            page_args_tpl += ',"'+search+'"'
-        _page['args_tpl'] = page_args_tpl
-
-        _ret['page'] = mw.getPage(_page)
-        return mw.getJson(_ret)
-
-    def setDefaultSiteApi(self):
-        name = request.form.get('name', '')
-        import time
-        # 清理旧的
-        default_site = mw.readFile('data/default_site.pl')
-        if default_site:
-            path = self.getHostConf(default_site)
-            if os.path.exists(path):
-                conf = mw.readFile(path)
-                rep = "listen\s+80.+;"
-                conf = re.sub(rep, 'listen 80;', conf, 1)
-                rep = "listen\s+443.+;"
-                conf = re.sub(rep, 'listen 443 ssl;', conf, 1)
-                mw.writeFile(path, conf)
-
-        path = self.getHostConf(name)
-        if os.path.exists(path):
-            conf = mw.readFile(path)
-            rep = "listen\s+80\s*;"
-            conf = re.sub(rep, 'listen 80 default_server;', conf, 1)
-            rep = "listen\s+443\s*ssl\s*\w*\s*;"
-            conf = re.sub(rep, 'listen 443 ssl default_server;', conf, 1)
-            mw.writeFile(path, conf)
-
-        mw.writeFile('data/default_site.pl', name)
-        mw.restartWeb()
-        return mw.returnJson(True, '设置成功!')
-
-    def getDefaultSiteApi(self):
-        data = {}
-        data['sites'] = mw.M('sites').field(
-            'name').order('id desc').select()
-        data['default_site'] = mw.readFile('data/default_site.pl')
-        return mw.getJson(data)
-
-    def getCliPhpVersionApi(self):
-        php_dir = mw.getServerDir() + '/php'
-        if not os.path.exists(php_dir):
-            return mw.returnJson(False, '未安装PHP,无法设置')
-
-        php_bin = '/usr/bin/php'
-        php_versions = self.getPhpVersion()
-        php_versions = php_versions[1:]
-
-        if len(php_versions) < 1:
-            return mw.returnJson(False, '未安装PHP,无法设置')
-
-        if os.path.exists(php_bin) and os.path.islink(php_bin):
-            link_re = os.readlink(php_bin)
-            for v in php_versions:
-                if link_re.find(v['version']) != -1:
-                    return mw.getJson({"select": v, "versions": php_versions})
-
-        return mw.getJson({
-            "select": php_versions[0],
-            "versions": php_versions})
-
-    def setCliPhpVersionApi(self):
-        if mw.isAppleSystem():
-            return mw.returnJson(False, "开发机不可设置!")
-
-        version = request.form.get('version', '')
-
-        php_bin = '/usr/bin/php'
-        php_bin_src = "/www/server/php/%s/bin/php" % version
-        php_ize = '/usr/bin/phpize'
-        php_ize_src = "/www/server/php/%s/bin/phpize" % version
-        php_fpm = '/usr/bin/php-fpm'
-        php_fpm_src = "/www/server/php/%s/sbin/php-fpm" % version
-        php_pecl = '/usr/bin/pecl'
-        php_pecl_src = "/www/server/php/%s/bin/pecl" % version
-        php_pear = '/usr/bin/pear'
-        php_pear_src = "/www/server/php/%s/bin/pear" % version
-        if not os.path.exists(php_bin_src):
-            return mw.returnJson(False, '指定PHP版本未安装!')
-
-        is_chattr = mw.execShell('lsattr /usr|grep /usr/bin')[0].find('-i-')
-        if is_chattr != -1:
-            mw.execShell('chattr -i /usr/bin')
-        mw.execShell("rm -f " + php_bin + ' ' + php_ize + ' ' +
-                     php_fpm + ' ' + php_pecl + ' ' + php_pear)
-        mw.execShell("ln -sf %s %s" % (php_bin_src, php_bin))
-        mw.execShell("ln -sf %s %s" % (php_ize_src, php_ize))
-        mw.execShell("ln -sf %s %s" % (php_fpm_src, php_fpm))
-        mw.execShell("ln -sf %s %s" % (php_pecl_src, php_pecl))
-        mw.execShell("ln -sf %s %s" % (php_pear_src, php_pear))
-        if is_chattr != -1:
-            mw.execShell('chattr +i /usr/bin')
-        mw.writeLog('面板设置', '设置PHP-CLI版本为: %s' % version)
-        return mw.returnJson(True, '设置成功!')
-
-    def setPsApi(self):
-        mid = request.form.get('id', '')
-        ps = request.form.get('ps', '')
-        if mw.M('sites').where("id=?", (mid,)).setField('ps', ps):
-            return mw.returnJson(True, '修改成功!')
-        return mw.returnJson(False, '修改失败!')
-
-    def stopApi(self):
-        mid = request.form.get('id', '')
-        name = request.form.get('name', '')
-
-        return self.stop(mid, name)
-
-    def stop(self, mid, name):
-        path = self.setupPath + '/stop'
-        if not os.path.exists(path):
-            os.makedirs(path)
-            default_text = 'The website has been closed!!!'
-            mw.writeFile(path + '/index.html', default_text)
-
-        binding = mw.M('binding').where('pid=?', (mid,)).field(
-            'id,pid,domain,path,port,addtime').select()
-        for b in binding:
-            bpath = path + '/' + b['path']
-            if not os.path.exists(bpath):
-                mw.execShell('mkdir -p ' + bpath)
-                mw.execShell('ln -sf ' + path +
-                             '/index.html ' + bpath + '/index.html')
-
-        sitePath = mw.M('sites').where("id=?", (mid,)).getField('path')
-
-        # nginx
-        file = self.getHostConf(name)
-        conf = mw.readFile(file)
-        if conf:
-            conf = conf.replace(sitePath, path)
-            mw.writeFile(file, conf)
-
-        mw.M('sites').where("id=?", (mid,)).setField('status', '0')
-        mw.restartWeb()
-        msg = mw.getInfo('网站[{1}]已被停用!', (name,))
-        mw.writeLog('网站管理', msg)
-        return mw.returnJson(True, '站点已停用!')
-
-    def startApi(self):
-        mid = request.form.get('id', '')
-        name = request.form.get('name', '')
-        path = self.setupPath + '/stop'
-        sitePath = mw.M('sites').where("id=?", (mid,)).getField('path')
-
-        # nginx
-        file = self.getHostConf(name)
-        conf = mw.readFile(file)
-        if conf:
-            conf = conf.replace(path, sitePath)
-            mw.writeFile(file, conf)
-
-        mw.M('sites').where("id=?", (mid,)).setField('status', '1')
-        mw.restartWeb()
-        msg = mw.getInfo('网站[{1}]已被启用!', (name,))
-        mw.writeLog('网站管理', msg)
-        return mw.returnJson(True, '站点已启用!')
-
-    def getBackupApi(self):
-        limit = request.form.get('limit', '')
-        p = request.form.get('p', '')
-        mid = request.form.get('search', '')
-
-        find = mw.M('sites').where("id=?", (mid,)).field(
-            "id,name,path,status,ps,addtime,edate").find()
-
-        start = (int(p) - 1) * (int(limit))
-        _list = mw.M('backup').where('pid=?', (mid,)).field('id,type,name,pid,filename,size,addtime').limit(
-            (str(start)) + ',' + limit).order('id desc').select()
-        _ret = {}
-        _ret['data'] = _list
-
-        count = mw.M('backup').where("id=?", (mid,)).count()
-        info = {}
-        info['count'] = count
-        info['tojs'] = 'getBackup'
-        info['p'] = p
-        info['row'] = limit
-        _ret['page'] = mw.getPage(info)
-        _ret['site'] = find
-        return mw.getJson(_ret)
-
-    def toBackupApi(self):
-        mid = request.form.get('id', '')
-        find = mw.M('sites').where(
-            "id=?", (mid,)).field('name,path,id').find()
-        fileName = find['name'] + '_' + \
-            time.strftime('%Y%m%d_%H%M%S', time.localtime()) + '.zip'
-        backupPath = mw.getBackupDir() + '/site'
-        zipName = backupPath + '/' + fileName
-        if not (os.path.exists(backupPath)):
-            os.makedirs(backupPath)
-        tmps = mw.getRunDir() + '/tmp/panelExec.log'
-        execStr = "cd '" + find['path'] + "' && zip '" + \
-            zipName + "' -r ./* > " + tmps + " 2>&1"
-        # print execStr
-        mw.execShell(execStr)
-
-        if os.path.exists(zipName):
-            fsize = os.path.getsize(zipName)
-        else:
-            fsize = 0
-        sql = mw.M('backup').add('type,name,pid,filename,size,addtime',
-                                 (0, fileName, find['id'], zipName, fsize, mw.getDate()))
-
-        msg = mw.getInfo('备份网站[{1}]成功!', (find['name'],))
-        mw.writeLog('网站管理', msg)
-        return mw.returnJson(True, '备份成功!')
-
-    def delBackupApi(self):
-        mid = request.form.get('id', '')
-        filename = mw.M('backup').where(
-            "id=?", (mid,)).getField('filename')
-        if os.path.exists(filename):
-            os.remove(filename)
-        name = mw.M('backup').where("id=?", (mid,)).getField('name')
-        msg = mw.getInfo('删除网站[{1}]的备份[{2}]成功!', (name, filename))
-        mw.writeLog('网站管理', msg)
-        mw.M('backup').where("id=?", (mid,)).delete()
-        return mw.returnJson(True, '站点删除成功!')
-
-    def getPhpVersionApi(self):
-        data = self.getPhpVersion()
-        return mw.getJson(data)
-
-    def setPhpVersionApi(self):
-        siteName = request.form.get('siteName', '')
-        version = request.form.get('version', '')
-
-        # nginx
-        file = self.getHostConf(siteName)
-        conf = mw.readFile(file)
-        if conf:
-            rep = "enable-php-(.*)\.conf"
-            tmp = re.search(rep, conf).group()
-            conf = conf.replace(tmp, 'enable-php-' + version + '.conf')
-            mw.writeFile(file, conf)
-
-        msg = mw.getInfo('成功切换网站[{1}]的PHP版本为PHP-{2}', (siteName, version))
-        mw.writeLog("网站管理", msg)
-        mw.restartWeb()
-        return mw.returnJson(True, msg)
-
-    def getDomainApi(self):
-        pid = request.form.get('pid', '')
-        return self.getDomain(pid)
-
-    # 获取站点所有域名
-    def getSiteDomainsApi(self):
-        pid = request.form.get('id', '')
-
-        data = {}
-        domains = mw.M('domain').where(
-            'pid=?', (pid,)).field('name,id').select()
-        binding = mw.M('binding').where(
-            'pid=?', (pid,)).field('domain,id').select()
-        if type(binding) == str:
-            return binding
-        for b in binding:
-            tmp = {}
-            tmp['name'] = b['domain']
-            tmp['id'] = b['id']
-            domains.append(tmp)
-        data['domains'] = domains
-        data['email'] = mw.M('users').getField('email')
-        if data['email'] == 'midoks@163.com':
-            data['email'] = ''
-        return mw.returnJson(True, 'OK', data)
-
-    def getDirBindingApi(self):
-        mid = request.form.get('id', '')
-
-        path = mw.M('sites').where('id=?', (mid,)).getField('path')
-        if not os.path.exists(path):
-            checks = ['/', '/usr', '/etc']
-            if path in checks:
-                data = {}
-                data['dirs'] = []
-                data['binding'] = []
-                return mw.returnJson(True, 'OK', data)
-            os.system('mkdir -p ' + path)
-            os.system('chmod 755 ' + path)
-            os.system('chown www:www ' + path)
-            siteName = mw.M('sites').where(
-                'id=?', (get.id,)).getField('name')
-            mw.writeLog(
-                '网站管理', '站点[' + siteName + '],根目录[' + path + ']不存在,已重新创建!')
-
-        dirnames = []
-        for filename in os.listdir(path):
-            try:
-                filePath = path + '/' + filename
-                if os.path.islink(filePath):
-                    continue
-                if os.path.isdir(filePath):
-                    dirnames.append(filename)
-            except:
-                pass
-
-        data = {}
-        data['dirs'] = dirnames
-        data['binding'] = mw.M('binding').where('pid=?', (mid,)).field(
-            'id,pid,domain,path,port,addtime').select()
-        return mw.returnJson(True, 'OK', data)
-
-    def getDirUserIniApi(self):
-        mid = request.form.get('id', '')
-
-        path = mw.M('sites').where('id=?', (mid,)).getField('path')
-        name = mw.M('sites').where("id=?", (mid,)).getField('name')
-        data = {}
-        data['logs'] = self.getLogsStatus(name)
-        data['runPath'] = self.getSiteRunPath(mid)
-
-        data['userini'] = False
-        if os.path.exists(path + '/.user.ini'):
-            data['userini'] = True
-
-        if data['runPath']['runPath'] != '/':
-            if os.path.exists(path + data['runPath']['runPath'] + '/.user.ini'):
-                data['userini'] = True
-
-        data['pass'] = self.getHasPwd(name)
-        data['path'] = path
-        data['name'] = name
-        return mw.returnJson(True, 'OK', data)
-
-    def setDirUserIniApi(self):
-        path = request.form.get('path', '')
-        runPath = request.form.get('runPath', '')
-        filename = path + '/.user.ini'
-
-        if os.path.exists(filename):
-            self.delUserInI(path)
-            mw.execShell("which chattr && chattr -i " + filename)
-            os.remove(filename)
-            return mw.returnJson(True, '已清除防跨站设置!')
-
-        self.setDirUserINI(path, runPath)
-        mw.execShell("which chattr && chattr +i " + filename)
-
-        return mw.returnJson(True, '已打开防跨站设置!')
-
-    def setRewriteApi(self):
-        data = request.form.get('data', '')
-        path = request.form.get('path', '')
-        encoding = request.form.get('encoding', '')
-        if not os.path.exists(path):
-            mw.writeFile(path, '')
-
-        mw.backFile(path)
-        mw.writeFile(path, data)
-        isError = mw.checkWebConfig()
-        if(type(isError) == str):
-            mw.restoreFile(path)
-            return mw.returnJson(False, 'ERROR: <br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>')
-        mw.restartWeb()
-        return mw.returnJson(True, '设置成功!')
-
-    def setRewriteTplApi(self):
-        data = request.form.get('data', '')
-        name = request.form.get('name', '')
-        path = mw.getRunDir() + "/rewrite/nginx/" + name + ".conf"
-        if os.path.exists(path):
-            return mw.returnJson(False, '模版已经存在!')
-
-        if data == "":
-            return mw.returnJson(False, '模版内容不能为空!')
-        ok = mw.writeFile(path, data)
-        if not ok:
-            return mw.returnJson(False, '模版保持失败!')
-
-        return mw.returnJson(True, '设置模板成功!')
-
-    def logsOpenApi(self):
-        mid = request.form.get('id', '')
-        name = mw.M('sites').where("id=?", (mid,)).getField('name')
-
-        # NGINX
-        filename = self.getHostConf(name)
-        if os.path.exists(filename):
-            conf = mw.readFile(filename)
-            rep = self.logsPath + "/" + name + ".log"
-            if conf.find(rep) != -1:
-                conf = conf.replace(rep + " main", "off")
-            else:
-                conf = conf.replace('access_log  off',
-                                    'access_log  ' + rep + " main")
-            mw.writeFile(filename, conf)
-
-        mw.restartWeb()
-        return mw.returnJson(True, '操作成功!')
-
-    def getCertListApi(self):
-        try:
-            vpath = self.sslDir
-            if not os.path.exists(vpath):
-                os.system('mkdir -p ' + vpath)
-            data = []
-            for d in os.listdir(vpath):
-
-                # keyPath = self.sslDir + siteName + '/privkey.pem'
-                # certPath = self.sslDir + siteName + '/fullchain.pem'
-
-                keyPath = vpath + '/' + d + '/privkey.pem'
-                certPath = vpath + '/' + d + '/fullchain.pem'
-                if os.path.exists(keyPath) and os.path.exists(certPath):
-                    self.saveCert(keyPath, certPath)
-
-                mpath = vpath + '/' + d + '/info.json'
-                if not os.path.exists(mpath):
-                    continue
-
-                tmp = mw.readFile(mpath)
-                if not tmp:
-                    continue
-                tmp1 = json.loads(tmp)
-                data.append(tmp1)
-            return mw.returnJson(True, 'OK', data)
-        except:
-            return mw.returnJson(True, 'OK', [])
-
-    def deleteSslApi(self):
-        site_name = request.form.get('site_name', '')
-        ssl_type = request.form.get('ssl_type', '')
-
-        path = self.sslDir + '/' + site_name
-        csr_path = path + '/fullchain.pem'  # 生成证书路径
-
-        file = self.getHostConf(site_name)
-        content = mw.readFile(file)
-        key_text = 'ssl_certificate'
-        status = True
-        if content.find(key_text) == -1:
-            status = False
-
-        if ssl_type == 'now':
-            if status:
-                return mw.returnJson(False, '使用中,先关闭再删除')
-            if os.path.exists(path):
-                mw.execShell('rm -rf ' + path)
-            else:
-                return mw.returnJson(False, '还未申请!')
-        elif ssl_type == 'lets':
-            ssl_lets_dir = self.sslLetsDir + '/' + site_name
-            csr_lets_path = ssl_lets_dir + '/fullchain.pem'  # 生成证书路径
-            if mw.md5(mw.readFile(csr_lets_path)) == mw.md5(mw.readFile(csr_path)):
-                return mw.returnJson(False, '使用中,先关闭再删除')
-            mw.execShell('rm -rf ' + ssl_lets_dir)
-        elif ssl_type == 'acme':
-            ssl_acme_dir = mw.getAcmeDomainDir(site_name)
-            csr_acme_path = ssl_acme_dir + '/fullchain.cer'  # 生成证书路径
-            if mw.md5(mw.readFile(csr_acme_path)) == mw.md5(mw.readFile(csr_path)):
-                return mw.returnJson(False, '使用中,先关闭再删除')
-            mw.execShell('rm -rf ' + ssl_acme_dir)
-
-        # mw.restartWeb()
-        return mw.returnJson(True, '删除成功')
-
-    def getSslApi(self):
-        site_name = request.form.get('site_name', '')
-        ssl_type = request.form.get('ssl_type', '')
-
-        path = self.sslDir + '/' + site_name
-
-        file = self.getHostConf(site_name)
-        content = mw.readFile(file)
-
-        key_text = 'ssl_certificate'
-        status = True
-        stype = 0
-        if content.find(key_text) == -1:
-            status = False
-            stype = -1
-
-        to_https = self.isToHttps(site_name)
-        sid = mw.M('sites').where("name=?", (site_name,)).getField('id')
-        domains = mw.M('domain').where("pid=?", (sid,)).field('name').select()
-
-        csr_path = path + '/fullchain.pem'  # 生成证书路径
-        key_path = path + '/privkey.pem'    # 密钥文件路径
-
-        cert_data = None
-        if ssl_type == 'lets':
-            csr_path = self.sslLetsDir + '/' + site_name + '/fullchain.pem'  # 生成证书路径
-            key_path = self.sslLetsDir + '/' + site_name + '/privkey.pem'    # 密钥文件路径
-        elif ssl_type == 'acme':
-            acme_dir = mw.getAcmeDomainDir(site_name)
-            csr_path = acme_dir + '/fullchain.cer'  # 生成证书路径
-            key_path = acme_dir + '/' + site_name + '.key'    # 密钥文件路径
-
-        key = mw.readFile(key_path)
-        csr = mw.readFile(csr_path)
-        cert_data = mw.getCertName(csr_path)
-        data = {
-            'status': status,
-            'domain': domains,
-            'key': key,
-            'csr': csr,
-            'type': stype,
-            'httpTohttps': to_https,
-            'cert_data': cert_data,
-        }
-        return mw.returnJson(True, 'OK', data)
-
-    def setSslApi(self):
-        siteName = request.form.get('siteName', '')
-
-        key = request.form.get('key', '')
-        csr = request.form.get('csr', '')
-
-        path = self.sslDir + '/' + siteName
-        if not os.path.exists(path):
-            mw.execShell('mkdir -p ' + path)
-
-        csrpath = path + "/fullchain.pem"  # 生成证书路径
-        keypath = path + "/privkey.pem"  # 密钥文件路径
-
-        if(key.find('KEY') == -1):
-            return mw.returnJson(False, '秘钥错误，请检查!')
-        if(csr.find('CERTIFICATE') == -1):
-            return mw.returnJson(False, '证书错误，请检查!')
-
-        mw.writeFile('/tmp/cert.pl', csr)
-        if not mw.checkCert('/tmp/cert.pl'):
-            return mw.returnJson(False, '证书错误,请粘贴正确的PEM格式证书!')
-
-        mw.backFile(keypath)
-        mw.backFile(csrpath)
-
-        mw.writeFile(keypath, key)
-        mw.writeFile(csrpath, csr)
-
-        # 写入配置文件
-        result = self.setSslConf(siteName)
-        if not result['status']:
-            return mw.getJson(result)
-
-        isError = mw.checkWebConfig()
-        if(type(isError) == str):
-            mw.restoreFile(keypath)
-            mw.restoreFile(csrpath)
-            return mw.returnJson(False, 'ERROR: <br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>')
-
-        mw.writeLog('网站管理', '证书已保存!')
-        mw.restartWeb()
-        return mw.returnJson(True, '证书已保存!')
-
-    def setCertToSiteApi(self):
-        certName = request.form.get('certName', '')
-        siteName = request.form.get('siteName', '')
-        try:
-            path = self.sslDir + '/' + siteName.strip()
-            if not os.path.exists(path):
-                return mw.returnJson(False, '证书不存在!')
-
-            result = self.setSslConf(siteName)
-            if not result['status']:
-                return mw.getJson(result)
-
-            mw.restartWeb()
-            mw.writeLog('网站管理', '证书已部署!')
-            return mw.returnJson(True, '证书已部署!')
-        except Exception as ex:
-            return mw.returnJson(False, '设置错误:' + str(ex))
-
-    def removeCertApi(self):
-        certName = request.form.get('certName', '')
-        try:
-            path = self.sslDir + '/' + certName
-            if not os.path.exists(path):
-                return mw.returnJson(False, '证书已不存在!')
-            os.system("rm -rf " + path)
-            return mw.returnJson(True, '证书已删除!')
-        except:
-            return mw.returnJson(False, '删除失败!')
-
-    def closeSslConfApi(self):
-        siteName = request.form.get('siteName', '')
-
-        file = self.getHostConf(siteName)
-        conf = mw.readFile(file)
-
-        if conf:
-            rep = "\n\\s*#HTTP_TO_HTTPS_START(.|\n){1,300}#HTTP_TO_HTTPS_END"
-            conf = re.sub(rep, '', conf)
-            rep = "\\s+ssl_certificate\\s+.+;\\s+ssl_certificate_key\\s+.+;"
-            conf = re.sub(rep, '', conf)
-            rep = "\\s+ssl_protocols\\s+.+;\n"
-            conf = re.sub(rep, '', conf)
-            rep = "\\s+ssl_ciphers\\s+.+;\n"
-            conf = re.sub(rep, '', conf)
-            rep = "\\s+ssl_prefer_server_ciphers\\s+.+;\n"
-            conf = re.sub(rep, '', conf)
-            rep = "\\s+ssl_session_cache\\s+.+;\n"
-            conf = re.sub(rep, '', conf)
-            rep = r"\s+ssl_session_timeout\s+.+;\n"
-            conf = re.sub(rep, '', conf)
-            rep = r"\s+ssl_ecdh_curve\s+.+;\n"
-            conf = re.sub(rep, '', conf)
-            rep = r"\s+ssl_session_tickets\s+.+;\n"
-            conf = re.sub(rep, '', conf)
-            rep = r"\s+ssl_stapling\s+.+;\n"
-            conf = re.sub(rep, '', conf)
-            rep = r"\s+ssl_stapling_verify\s+.+;\n"
-            conf = re.sub(rep, '', conf)
-            rep = r"\s+add_header\s+.+;\n"
-            conf = re.sub(rep, '', conf)
-            rep = r"\s+add_header\s+.+;\n"
-            conf = re.sub(rep, '', conf)
-            rep = r"\s+ssl\s+on;"
-            conf = re.sub(rep, '', conf)
-            rep = r"\s+error_page\s497.+;"
-            conf = re.sub(rep, '', conf)
-            rep = r"\s+if.+server_port.+\n.+\n\s+\s*}"
-            conf = re.sub(rep, '', conf)
-            rep = r"\s+listen\s+443.*;"
-            conf = re.sub(rep, '', conf)
-            rep = r"\s+listen\s+\[\:\:\]\:443.*;"
-            conf = re.sub(rep, '', conf)
-            rep = r"\s+http2\s+on;"
-            conf = re.sub(rep, '', conf)
-            mw.writeFile(file, conf)
-
-        msg = mw.getInfo('网站[{1}]关闭SSL成功!', (siteName,))
-        mw.writeLog('网站管理', msg)
-        mw.restartWeb()
-        return mw.returnJson(True, 'SSL已关闭!')
-
-    def deploySslApi(self):
-        site_name = request.form.get('site_name', '')
-        ssl_type = request.form.get('ssl_type', '')
-
-        path = self.sslDir + '/' + site_name
-        csr_path = path + '/fullchain.pem'  # 生成证书路径
-        key_path = path + '/privkey.pem'  # 生成证书路径
-
-        if not os.path.exists(path):
-            os.makedirs(path)
-
-        if ssl_type == 'lets':
-            ssl_lets_dir = self.sslLetsDir + '/' + site_name
-            lets_csrpath = ssl_lets_dir + '/fullchain.pem'
-            lets_keypath = ssl_lets_dir + '/privkey.pem'
-            if mw.md5(mw.readFile(lets_csrpath)) == mw.md5(mw.readFile(csr_path)):
-                return mw.returnJson(False, '已部署Lets')
-            else:
-
-                mw.buildSoftLink(lets_csrpath, csr_path, True)
-                mw.buildSoftLink(lets_keypath, key_path, True)
-                mw.execShell('echo "lets" > "' + path + '/README"')
-        elif ssl_type == 'acme':
-            ssl_acme_dir = mw.getAcmeDir() + '/' + site_name
-            if not os.path.exists(ssl_acme_dir):
-                ssl_acme_dir = mw.getAcmeDir() + '/' + site_name + '_ecc'
-
-            acme_csrpath = ssl_acme_dir + '/fullchain.cer'
-            acme_keypath = ssl_acme_dir + '/' + site_name + '.key'
-            if mw.md5(mw.readFile(acme_csrpath)) == mw.md5(mw.readFile(csr_path)):
-                return mw.returnJson(False, '已部署ACME')
-            else:
-                mw.buildSoftLink(acme_csrpath, csr_path, True)
-                mw.buildSoftLink(acme_keypath, key_path, True)
-                mw.execShell('echo "acme" > "' + path + '/README"')
-
-        result = self.setSslConf(site_name)
-        if not result['status']:
-            return mw.getJson(result)
-        return mw.returnJson(True, '部署成功')
-
-    def getLetsIndex(self, site_name):
-        cfg = mw.getRunDir() + '/data/letsencrypt.json'
-        if not os.path.exists(cfg):
-            return False
-
-        data = mw.readFile(cfg)
-        lets_data = json.loads(data)
-        order_list = lets_data['orders']
-
-        for x in order_list:
-            if order_list[x]['status'] == 'valid':
-                for d in order_list[x]['domains']:
-                    if d == site_name:
-                        return x
-        return False
-
-    def renewSslApi(self):
-        site_name = request.form.get('site_name', '')
-        ssl_type = request.form.get('ssl_type', '')
-        if ssl_type == 'lets':
-            index = self.getLetsIndex(site_name)
-            if index:
-                import cert_api
-                data = cert_api.cert_api().renewCert(index)
-                return data
-            else:
-                return mw.returnJson(False, '无效操作')
-
-        return mw.returnJson(True, '续期成功')
-
-    def getLetLogsApi(self):
-        log_file = mw.getRunDir() + '/logs/letsencrypt.log'
-        if not os.path.exists(log_file):
-            mw.execShell('touch ' + log_file)
-        return mw.returnJson(True, 'OK', log_file)
-
-    def createLetApi(self):
-        siteName = request.form.get('siteName', '')
-        domains = request.form.get('domains', '')
-        force = request.form.get('force', '')
-        renew = request.form.get('renew', '')
-        email_args = request.form.get('email', '')
-
-        domains = json.loads(domains)
-        email = mw.M('users').getField('email')
-        if email_args.strip() != '':
-            mw.M('users').setField('email', email_args)
-            email = email_args
-
-        if not len(domains):
-            return mw.returnJson(False, '请选择域名')
-
-        host_conf_file = self.getHostConf(siteName)
-        if os.path.exists(host_conf_file):
-            siteConf = mw.readFile(host_conf_file)
-            if siteConf.find('301-END') != -1:
-                return mw.returnJson(False, '检测到您的站点做了301重定向设置，请先关闭重定向!')
-
-            # 检测存在反向代理
-            data_path = self.getProxyDataPath(siteName)
-            data_content = mw.readFile(data_path)
-            if data_content != False:
-                try:
-                    data = json.loads(data_content)
-                except:
-                    pass
-                for proxy in data:
-                    proxy_dir = "{}/{}".format(self.proxyPath, siteName)
-                    proxy_dir_file = proxy_dir + '/' + proxy['id'] + '.conf'
-                    if os.path.exists(proxy_dir_file):
-                        return mw.returnJson(False, '检测到您的站点做了反向代理设置，请先关闭反向代理!')
-
-            # fix binddir domain ssl apply question
-            mw.backFile(host_conf_file)
-            auth_to = self.getSitePath(siteName)
-            rep = r"\s*root\s*(.+);"
-            replace_root = "\n\troot " + auth_to + ";"
-            siteConf = re.sub(rep, replace_root, siteConf)
-            mw.writeFile(host_conf_file, siteConf)
-            mw.restartWeb()
-
-        to_args = {
-            'domains': domains,
-            'auth_type': 'http',
-            'auth_to': auth_to,
-        }
-
-        src_letpath = mw.getServerDir() + '/web_conf/letsencrypt/' + siteName
-        src_csrpath = src_letpath + "/fullchain.pem"  # 生成证书路径
-        src_keypath = src_letpath + "/privkey.pem"  # 密钥文件路径
-
-        dst_letpath = self.sslDir + '/' + siteName
-        dst_csrpath = dst_letpath + '/fullchain.pem'
-        dst_keypath = dst_letpath + '/privkey.pem'
-
-        if not os.path.exists(src_letpath):
-            import cert_api
-            data = cert_api.cert_api().applyCertApi(to_args)
-            mw.restoreFile(host_conf_file)
-            if not data['status']:
-                msg = data['msg']
-                if type(data['msg']) != str:
-                    msg = data['msg'][0]
-                    emsg = data['msg'][1]['challenges'][0]['error']
-                    msg = msg + '<p><span>响应状态:</span>' + str(emsg['status']) + '</p><p><span>错误类型:</span>' + emsg[
-                        'type'] + '</p><p><span>错误代码:</span>' + emsg['detail'] + '</p>'
-                return mw.returnJson(data['status'], msg, data['msg'])
-
-        mw.execShell('mkdir -p ' + dst_letpath)
-        mw.buildSoftLink(src_csrpath, dst_csrpath, True)
-        mw.buildSoftLink(src_keypath, dst_keypath, True)
-        mw.execShell('echo "lets" > "' + dst_letpath + '/README"')
-
-        # 写入配置文件
-        result = self.setSslConf(siteName)
-        if not result['status']:
-            return mw.getJson(result)
-
-        result['csr'] = mw.readFile(src_csrpath)
-        result['key'] = mw.readFile(src_keypath)
-
-        mw.restartWeb()
-        return mw.returnJson(data['status'], data['msg'], result)
-
-    def getAcmeLogsApi(self):
-        log_file = mw.getRunDir() + '/logs/acme.log'
-        if not os.path.exists(log_file):
-            mw.execShell('touch ' + log_file)
-        return mw.returnJson(True, 'OK', log_file)
-
-    def createAcmeApi(self):
-        siteName = request.form.get('siteName', '')
-        domains = request.form.get('domains', '')
-        force = request.form.get('force', '')
-        renew = request.form.get('renew', '')
-        email_args = request.form.get('email', '')
-
-        domains = json.loads(domains)
-        email = mw.M('users').getField('email')
-        if email_args.strip() != '':
-            mw.M('users').setField('email', email_args)
-            email = email_args
-
-        if not len(domains):
-            return mw.returnJson(False, '请选择域名')
-
-        file = self.getHostConf(siteName)
-        if os.path.exists(file):
-            siteConf = mw.readFile(file)
-            if siteConf.find('301-END') != -1:
-                return mw.returnJson(False, '检测到您的站点做了301重定向设置，请先关闭重定向!')
-
-            # 检测存在反向代理
-            data_path = self.getProxyDataPath(siteName)
-            data_content = mw.readFile(data_path)
-            if data_content != False:
-                try:
-                    data = json.loads(data_content)
-                except:
-                    pass
-                for proxy in data:
-                    proxy_dir = "{}/{}".format(self.proxyPath, siteName)
-                    proxy_dir_file = proxy_dir + '/' + proxy['id'] + '.conf'
-                    if os.path.exists(proxy_dir_file):
-                        return mw.returnJson(False, '检测到您的站点做了反向代理设置，请先关闭反向代理!')
-
-        siteInfo = mw.M('sites').where(
-            'name=?', (siteName,)).field('id,name,path').find()
-        path = self.getSitePath(siteName)
-        if path == '':
-            return mw.returnJson(False, '【'+siteName+'】配置文件,异常!')
-
-        srcPath = siteInfo['path']
-
-        # 检测acme是否安装
-        acme_dir = mw.getAcmeDir()
-        if not os.path.exists(acme_dir):
-            try:
-                mw.execShell("curl -sS curl https://get.acme.sh | sh")
-            except:
-                pass
-        if not os.path.exists(acme_dir):
-            return mw.returnJson(False, '尝试自动安装ACME失败,请通过以下命令尝试手动安装<p>安装命令: curl https://get.acme.sh | sh</p>')
-
-        # 避免频繁执行
-        checkAcmeRun = mw.execShell('ps -ef|grep acme.sh |grep -v grep')
-        if checkAcmeRun[0] != '':
-            return mw.returnJson(False, '正在申请或更新SSL中...')
-
-        if force == 'true':
-            force_bool = True
-
-        if renew == 'true':
-            execStr = acme_dir + "/acme.sh --renew --yes-I-know-dns-manual-mode-enough-go-ahead-please"
-        else:
-            execStr = acme_dir + "/acme.sh --issue --force"
-
-        # 确定主域名顺序
-        domainsTmp = []
-        if siteName in domains:
-            domainsTmp.append(siteName)
-        for domainTmp in domains:
-            if domainTmp == siteName:
-                continue
-            domainsTmp.append(domainTmp)
-        domains = domainsTmp
-
-        domainCount = 0
-        for domain in domains:
-            if mw.checkIp(domain):
-                continue
-            if domain.find('*.') != -1:
-                return mw.returnJson(False, '泛域名不能使用【文件验证】的方式申请证书!')
-            execStr += ' -w ' + path
-            execStr += ' -d ' + domain
-            domainCount += 1
-        if domainCount == 0:
-            return mw.returnJson(False, '请选择域名(不包括IP地址与泛域名)!')
-
-        log_file = mw.getRunDir() + '/logs/acme.log'
-        mw.writeFile(log_file, "开始ACME申请...\n", "wb+")
-        cmd = 'export ACCOUNT_EMAIL=' + email + ' && ' + \
-            execStr + ' >> ' + log_file
-        # print(domains)
-        # print(cmd)
-        result = mw.execShell(cmd)
-
-        src_path = mw.getAcmeDomainDir(domains[0])
-        src_cert = src_path + '/fullchain.cer'
-        src_key = src_path + '/' + domains[0] + '.key'
-        src_cert.replace("\\*", "*")
-
-        msg = '签发失败,您尝试申请证书的失败次数已达上限!<p>1、检查域名是否绑定到对应站点</p>\
-            <p>2、检查域名是否正确解析到本服务器,或解析还未完全生效</p>\
-            <p>3、如果您的站点设置了反向代理,或使用了CDN,请先将其关闭</p>\
-            <p>4、如果您的站点设置了301重定向,请先将其关闭</p>\
-            <p>5、如果以上检查都确认没有问题，请尝试更换DNS服务商</p>'
-        if not os.path.exists(src_cert):
-            data = {}
-            data['err'] = result
-            data['out'] = result[0]
-            data['msg'] = msg
-            data['result'] = {}
-            if result[1].find('new-authz error:') != -1:
-                data['result'] = json.loads(
-                    re.search("{.+}", result[1]).group())
-                if data['result']['status'] == 429:
-                    data['msg'] = msg
-            data['status'] = False
-            return mw.getJson(data)
-
-        dst_path = self.sslDir + '/' + siteName
-        dst_cert = dst_path + "/fullchain.pem"  # 生成证书路径
-        dst_key = dst_path + "/privkey.pem"  # 密钥文件路径
-
-        if not os.path.exists(dst_path):
-            mw.execShell("mkdir -p " + dst_path)
-
-        mw.buildSoftLink(src_cert, dst_cert, True)
-        mw.buildSoftLink(src_key, dst_key, True)
-        mw.execShell('echo "acme" > "' + dst_path + '/README"')
-
-        # 写入配置文件
-        result = self.setSslConf(siteName)
-        if not result['status']:
-            return mw.getJson(result)
-        result['csr'] = mw.readFile(src_cert)
-        result['key'] = mw.readFile(src_key)
-
-        mw.restartWeb()
-        return mw.returnJson(True, '证书已更新!', result)
-
-    def httpToHttpsApi(self):
-        siteName = request.form.get('siteName', '')
-        return self.httpToHttps(siteName)
-
-    def httpToHttps(self, site_name):
-        file = self.getHostConf(site_name)
-        conf = mw.readFile(file)
-        if conf:
-            if conf.find('ssl_certificate') == -1:
-                return mw.returnJson(False, '当前未开启SSL')
-            to = "#error_page 404/404.html;\n\
-    #HTTP_TO_HTTPS_START\n\
-    if ($server_port !~ 443){\n\
-        rewrite ^(/.*)$ https://$host$1 permanent;\n\
-    }\n\
-    #HTTP_TO_HTTPS_END"
-            conf = conf.replace('#error_page 404/404.html;', to)
-            mw.writeFile(file, conf)
-
-        mw.restartWeb()
-        return mw.returnJson(True, '设置成功!')
-
-    def closeToHttpsApi(self):
-        siteName = request.form.get('siteName', '')
-        return self.closeToHttps(siteName)
-
-    def closeToHttps(self, site_name):
-        file = self.getHostConf(site_name)
-        conf = mw.readFile(file)
-        if conf:
-            rep = r"\n\s*#HTTP_TO_HTTPS_START(.|\n){1,300}#HTTP_TO_HTTPS_END"
-            conf = re.sub(rep, '', conf)
-            rep = r"\s+if.+server_port.+\n.+\n\s+\s*}"
-            conf = re.sub(rep, '', conf)
-            mw.writeFile(file, conf)
-
-        mw.restartWeb()
-        return mw.returnJson(True, '关闭HTTPS跳转成功!')
-
-    def getIndexApi(self):
-        sid = request.form.get('id', '')
-        data = {}
-        index = self.getIndex(sid)
-        data['index'] = index
-        return mw.getJson(data)
-
-    def setIndexApi(self):
-        sid = request.form.get('id', '')
-        index = request.form.get('index', '')
-        return self.setIndex(sid, index)
-
-    def getLimitNetApi(self):
-        sid = request.form.get('id', '')
-        return self.getLimitNet(sid)
-
-    def saveLimitNetApi(self):
-        sid = request.form.get('id', '')
-        perserver = request.form.get('perserver', '')
-        perip = request.form.get('perip', '')
-        limit_rate = request.form.get('limit_rate', '')
-        return self.saveLimitNet(sid, perserver, perip, limit_rate)
-
-    def closeLimitNetApi(self):
-        sid = request.form.get('id', '')
-        return self.closeLimitNet(sid)
-
-    def getSecurityApi(self):
-        sid = request.form.get('id', '')
-        name = request.form.get('name', '')
-        return self.getSecurity(sid, name)
-
-    def setSecurityApi(self):
-        fix = request.form.get('fix', '')
-        domains = request.form.get('domains', '')
-        status = request.form.get('status', '')
-        name = request.form.get('name', '')
-        none = request.form.get('none', '')
-        sid = request.form.get('id', '')
-        return self.setSecurity(sid, name, fix, domains, status, none)
-
-    def getLogsApi(self):
-        siteName = request.form.get('siteName', '')
-        return self.getLogs(siteName)
-
-    def getErrorLogsApi(self):
-        siteName = request.form.get('siteName', '')
-        return self.getErrorLogs(siteName)
-
-    def getSitePhpVersionApi(self):
-        siteName = request.form.get('siteName', '')
-        return self.getSitePhpVersion(siteName)
-
-    def getHostConfApi(self):
-        siteName = request.form.get('siteName', '')
-        host = self.getHostConf(siteName)
-        return mw.getJson({'host': host})
-
-    def saveHostConfApi(self):
-        path = request.form.get('path', '')
-        data = request.form.get('data', '')
-        encoding = request.form.get('encoding', '')
-
-        import files_api
-
-        mw.backFile(path)
-        save_ret_data = files_api.files_api().saveBody(path, data, encoding)
-        rdata = json.loads(save_ret_data)
-
-        if rdata['status']:
-            isError = mw.checkWebConfig()
-            if isError != True:
-                mw.restoreFile(path)
-                return mw.returnJson(False, 'ERROR: 检测到配置文件有错误,请先排除后再操作<br><br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>')
-            mw.restartWeb()
-            mw.removeBackFile(path)
-        return save_ret_data
-
-    def getRewriteConfApi(self):
-        siteName = request.form.get('siteName', '')
-        rewrite = self.getRewriteConf(siteName)
-        return mw.getJson({'rewrite': rewrite})
-
-    def getRewriteTplApi(self):
-        tplname = request.form.get('tplname', '')
-        file = mw.getRunDir() + '/rewrite/nginx/' + tplname + '.conf'
-        if not os.path.exists(file):
-            return mw.returnJson(False, '模版不存在!')
-        return mw.returnJson(True, 'OK', file)
-
-    def getRewriteListApi(self):
-        rlist = self.getRewriteList()
-        return mw.getJson(rlist)
-
-    def getRootDirApi(self):
-        data = {}
-        data['dir'] = mw.getWwwDir()
-        return mw.getJson(data)
-
-    def setEndDateApi(self):
-        sid = request.form.get('id', '')
-        edate = request.form.get('edate', '')
-        return self.setEndDate(sid, edate)
-
-    def addApi(self):
-        webname = request.form.get('webinfo', '')
-        ps = request.form.get('ps', '')
-        path = request.form.get('path', '')
-        version = request.form.get('version', '')
-        port = request.form.get('port', '')
-        return self.add(webname, port, ps, path, version)
-
-    def checkWebStatusApi(self):
-        '''
-        创建站点检查web服务
-        '''
-        if not mw.isInstalledWeb():
-            return mw.returnJson(False, '请安装并启动OpenResty服务!')
-
-        # 这个快点
-        pid = mw.getServerDir() + '/openresty/nginx/logs/nginx.pid'
-        if not os.path.exists(pid):
-            return mw.returnJson(False, '请启动OpenResty服务!')
-
-        # path = mw.getServerDir() + '/openresty/init.d/openresty'
-        # data = mw.execShell(path + " status")
-        # if data[0].strip().find('stopped') != -1:
-        #     return mw.returnJson(False, '请启动OpenResty服务!')
-
-        # import plugins_api
-        # data = plugins_api.plugins_api().run('openresty', 'status')
-        # if data[0].strip() == 'stop':
-        #     return mw.returnJson(False, '请启动OpenResty服务!')
-
-        return mw.returnJson(True, 'OK')
-
-    def addDomainApi(self):
-        isError = mw.checkWebConfig()
-        if isError != True:
-            return mw.returnJson(False, 'ERROR: 检测到配置文件有错误,请先排除后再操作<br><br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>')
-
-        domain = request.form.get('domain', '')
-        webname = request.form.get('webname', '')
-        pid = request.form.get('id', '')
-        return self.addDomain(domain, webname, pid)
-
-    def addDomain(self, domain, webname, pid):
-        if len(domain) < 3:
-            return mw.returnJson(False, '域名不能为空!')
-        domains = domain.split(',')
-        for domain in domains:
-            if domain == "":
-                continue
-            domain = domain.split(':')
-            # print domain
-            domain_name = self.toPunycode(domain[0])
-            domain_port = '80'
-
-            reg = r"^([\w\-\*]{1,100}\.){1,4}([\w\-]{1,24}|[\w\-]{1,24}\.[\w\-]{1,24})$"
-            if not re.match(reg, domain_name):
-                return mw.returnJson(False, '域名格式不正确!')
-
-            if len(domain) == 2:
-                domain_port = domain[1]
-            if domain_port == "":
-                domain_port = "80"
-
-            if not mw.checkPort(domain_port):
-                return mw.returnJson(False, '端口范围不合法!')
-
-            opid = mw.M('domain').where(
-                "name=? AND (port=? OR pid=?)", (domain_name, domain_port, pid,)).getField('pid')
-            # print(opid)
-            is_bind = False
-            if type(opid) == list and len(opid) > 0:
-                is_bind = True
-
-            if type(opid) == int and opid > 0:
-                is_bind = True
-
-            if type(opid) == str and int(opid) > 0:
-                is_bind = True
-
-            if is_bind:
-                return mw.returnJson(False, '您添加的域名[{}],已绑定!'.format(domain_name))
-                # if mw.M('sites').where('id=?', (opid,)).count():
-                #     return mw.returnJson(False, '指定域名已绑定过!')
-                # mw.M('domain').where('pid=?', (opid,)).delete()
-
-            if mw.M('binding').where('domain=?', (domain,)).count():
-                return mw.returnJson(False, '您添加的域名,子目录已绑定!')
-
-            self.nginxAddDomain(webname, domain_name, domain_port)
-
-            mw.restartWeb()
-            msg = mw.getInfo('网站[{1}]添加域名[{2}]成功!', (webname, domain_name))
-            mw.writeLog('网站管理', msg)
-            mw.M('domain').add('pid,name,port,addtime',
-                               (pid, domain_name, domain_port, mw.getDate()))
-
-        self.runHook('site_cb', 'add')
-        return mw.returnJson(True, '域名添加成功!')
-
-    def addDirBindApi(self):
-        pid = request.form.get('id', '')
-        domain = request.form.get('domain', '')
-        dirName = request.form.get('dirName', '')
-        tmp = domain.split(':')
-        domain = tmp[0]
-        port = '80'
-        if len(tmp) > 1:
-            port = tmp[1]
-        if dirName == '':
-            mw.returnJson(False, '目录不能为空!')
-
-        reg = r"^([\w\-\*]{1,100}\.){1,4}(\w{1,10}|\w{1,10}\.\w{1,10})$"
-        if not re.match(reg, domain):
-            return mw.returnJson(False, '主域名格式不正确!')
-
-        siteInfo = mw.M('sites').where(
-            "id=?", (pid,)).field('id,path,name').find()
-        webdir = siteInfo['path'] + '/' + dirName
-
-        if mw.M('binding').where("domain=?", (domain,)).count() > 0:
-            return mw.returnJson(False, '您添加的域名已存在!')
-        if mw.M('domain').where("name=?", (domain,)).count() > 0:
-            return mw.returnJson(False, '您添加的域名已存在!')
-
-        filename = self.getHostConf(siteInfo['name'])
-        conf = mw.readFile(filename)
-        if conf:
-            rep = r"enable-php-([0-9]{2,3})\.conf"
-            tmp = re.search(rep, conf).groups()
-            version = tmp[0]
-
-            source_dirbind_tpl = mw.getRunDir() + '/data/tpl/nginx_dirbind.conf'
-            content = mw.readFile(source_dirbind_tpl)
-            content = content.replace('{$PORT}', port)
-            content = content.replace('{$PHPVER}', version)
-            content = content.replace('{$DIRBIND}', domain)
-            content = content.replace('{$ROOT_DIR}', webdir)
-            content = content.replace('{$SERVER_MAIN}', siteInfo['name'])
-            content = content.replace('{$OR_REWRITE}', self.rewritePath)
-            content = content.replace('{$PHP_DIR}', self.setupPath + '/php')
-            content = content.replace('{$LOGPATH}', mw.getLogsDir())
-
-            conf += "\r\n" + content
-            mw.backFile(filename)
-            mw.writeFile(filename, conf)
-        conf = mw.readFile(filename)
-
-        # 检查配置是否有误
-        isError = mw.checkWebConfig()
-        if isError != True:
-            mw.restoreFile(filename)
-            return mw.returnJson(False, 'ERROR: <br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>')
-
-        mw.M('binding').add('pid,domain,port,path,addtime',
-                            (pid, domain, port, dirName, mw.getDate()))
-
-        msg = mw.getInfo('网站[{1}]子目录[{2}]绑定到[{3}]',
-                         (siteInfo['name'], dirName, domain))
-        mw.writeLog('网站管理', msg)
-        mw.restartWeb()
-        mw.removeBackFile(filename)
-        return mw.returnJson(True, '添加成功!')
-
-    def delDirBindApi(self):
-        mid = request.form.get('id', '')
-        binding = mw.M('binding').where(
-            "id=?", (mid,)).field('id,pid,domain,path').find()
-        siteName = mw.M('sites').where(
-            "id=?", (binding['pid'],)).getField('name')
-
-        filename = self.getHostConf(siteName)
-        conf = mw.readFile(filename)
-        if conf:
-            rep = "\s*.+BINDING-" + \
-                binding['domain'] + \
-                "-START(.|\n)+BINDING-" + binding['domain'] + "-END"
-            conf = re.sub(rep, '', conf)
-            mw.writeFile(filename, conf)
-
-        mw.M('binding').where("id=?", (mid,)).delete()
-
-        filename = self.getDirBindRewrite(siteName,  binding['path'])
-        if os.path.exists(filename):
-            os.remove(filename)
-        mw.restartWeb()
-        msg = mw.getInfo('删除网站[{1}]子目录[{2}]绑定',
-                         (siteName, binding['path']))
-        mw.writeLog('网站管理', msg)
-        return mw.returnJson(True, '删除成功!')
-
-        # 取子目录Rewrite
-    def getDirBindRewriteApi(self):
-        mid = request.form.get('id', '')
-        add = request.form.get('add', '0')
-        find = mw.M('binding').where(
-            "id=?", (mid,)).field('id,pid,domain,path').find()
-        site = mw.M('sites').where(
-            "id=?", (find['pid'],)).field('id,name,path').find()
-
-        filename = self.getDirBindRewrite(site['name'], find['path'])
-        if add == '1':
-            mw.writeFile(filename, '')
-            file = self.getHostConf(site['name'])
-            conf = mw.readFile(file)
-            domain = find['domain']
-            rep = "\n#BINDING-" + domain + \
-                "-START(.|\n)+BINDING-" + domain + "-END"
-            tmp = re.search(rep, conf).group()
-            dirConf = tmp.replace('rewrite/' + site['name'] + '.conf;', 'rewrite/' + site[
-                'name'] + '_' + find['path'] + '.conf;')
-            conf = conf.replace(tmp, dirConf)
-            mw.writeFile(file, conf)
-        data = {}
-        data['rewrite_dir'] = self.rewritePath
-        data['status'] = False
-        if os.path.exists(filename):
-            data['status'] = True
-            data['data'] = mw.readFile(filename)
-            data['rlist'] = []
-            for ds in os.listdir(self.rewritePath):
-                if ds[0:1] == '.':
-                    continue
-                if ds == 'list.txt':
-                    continue
-                data['rlist'].append(ds[0:len(ds) - 5])
-            data['filename'] = filename
-        return mw.getJson(data)
-
-    # 修改物理路径
-    def setPathApi(self):
-        mid = request.form.get('id', '')
-        path = request.form.get('path', '')
-
-        path = self.getPath(path)
-        if path == "" or mid == '0':
-            return mw.returnJson(False,  "目录不能为空!")
-
-        import files_api
-        if not files_api.files_api().checkDir(path):
-            return mw.returnJson(False,  "不能以系统关键目录作为站点目录")
-
-        siteFind = mw.M("sites").where(
-            "id=?", (mid,)).field('path,name').find()
-        if siteFind["path"] == path:
-            return mw.returnJson(False,  "与原路径一致，无需修改!")
-        file = self.getHostConf(siteFind['name'])
-        conf = mw.readFile(file)
-        if conf:
-            conf = conf.replace(siteFind['path'], path)
-            mw.writeFile(file, conf)
-
-        # 创建basedir
-        # userIni = path + '/.user.ini'
-        # if os.path.exists(userIni):
-            # mw.execShell("chattr -i " + userIni)
-        # mw.writeFile(userIni, 'open_basedir=' + path + '/:/tmp/:/proc/')
-        # mw.execShell('chmod 644 ' + userIni)
-        # mw.execShell('chown root:root ' + userIni)
-        # mw.execShell('chattr +i ' + userIni)
-
-        mw.restartWeb()
-        mw.M("sites").where("id=?", (mid,)).setField('path', path)
-        msg = mw.getInfo('修改网站[{1}]物理路径成功!', (siteFind['name'],))
-        mw.writeLog('网站管理', msg)
-        return mw.returnJson(True,  "设置成功!")
-
-    # 设置当前站点运行目录
-    def setSiteRunPathApi(self):
-        mid = request.form.get('id', '')
-        runPath = request.form.get('runPath', '')
-        siteName = mw.M('sites').where('id=?', (mid,)).getField('name')
-        sitePath = mw.M('sites').where('id=?', (mid,)).getField('path')
-
-        newPath = sitePath + runPath
-
-        # 处理Nginx
-        filename = self.getHostConf(siteName)
-        if os.path.exists(filename):
-            conf = mw.readFile(filename)
-            rep = r'\s*root\s*(.+);'
-            path = re.search(rep, conf).groups()[0]
-            conf = conf.replace(path, newPath)
-            mw.writeFile(filename, conf)
-
-        self.setDirUserINI(sitePath, runPath)
-
-        mw.restartWeb()
-        return mw.returnJson(True, '设置成功!')
-
-    # 设置目录加密
-    def setHasPwdApi(self):
-        username = request.form.get('username', '')
-        password = request.form.get('password', '')
-        siteName = request.form.get('siteName', '')
-        mid = request.form.get('id', '')
-
-        if len(username.strip()) == 0 or len(password.strip()) == 0:
-            return mw.returnJson(False, '用户名或密码不能为空!')
-
-        if siteName == '':
-            siteName = mw.M('sites').where('id=?', (mid,)).getField('name')
-
-        # self.closeHasPwd(get)
-        filename = self.passPath + '/' + siteName + '.pass'
-        # print(filename)
-        passconf = username + ':' + mw.hasPwd(password)
-
-        if siteName == 'phpmyadmin':
-            configFile = self.getHostConf('phpmyadmin')
-        else:
-            configFile = self.getHostConf(siteName)
-
-        # 处理Nginx配置
-        conf = mw.readFile(configFile)
-        if conf:
-            rep = '#error_page   404   /404.html;'
-            if conf.find(rep) == -1:
-                rep = '#error_page 404/404.html;'
-            data = '''
-    #AUTH_START
-    auth_basic "Authorization";
-    auth_basic_user_file %s;
-    #AUTH_END''' % (filename,)
-            conf = conf.replace(rep, rep + data)
-            mw.writeFile(configFile, conf)
-        # 写密码配置
-        passDir = self.passPath
-        if not os.path.exists(passDir):
-            mw.execShell('mkdir -p ' + passDir)
-        mw.writeFile(filename, passconf)
-
-        mw.restartWeb()
-        msg = mw.getInfo('设置网站[{1}]为需要密码认证!', (siteName,))
-        mw.writeLog("网站管理", msg)
-        return mw.returnJson(True, '设置成功!')
-
-    # 取消目录加密
-    def closeHasPwdApi(self):
-        siteName = request.form.get('siteName', '')
-        mid = request.form.get('id', '')
-        if siteName == '':
-            siteName = mw.M('sites').where('id=?', (mid,)).getField('name')
-
-        if siteName == 'phpmyadmin':
-            configFile = self.getHostConf('phpmyadmin')
-        else:
-            configFile = self.getHostConf(siteName)
-
-        if os.path.exists(configFile):
-            conf = mw.readFile(configFile)
-            rep = r"\n\s*#AUTH_START(.|\n){1,200}#AUTH_END"
-            conf = re.sub(rep, '', conf)
-            mw.writeFile(configFile, conf)
-
-        mw.restartWeb()
-        msg = mw.getInfo('清除网站[{1}]的密码认证!', (siteName,))
-        mw.writeLog("网站管理", msg)
-        return mw.returnJson(True, '设置成功!')
-
-    def delDomainApi(self):
-        domain = request.form.get('domain', '')
-        webname = request.form.get('webname', '')
-        port = request.form.get('port', '')
-        pid = request.form.get('id', '')
-
-        find = mw.M('domain').where("pid=? AND name=?",
-                                    (pid, domain)).field('id,name').find()
-
-        domain_count = mw.M('domain').where("pid=?", (pid,)).count()
-        if domain_count == 1:
-            return mw.returnJson(False, '最后一个域名不能删除!')
-
-        file = self.getHostConf(webname)
-        conf = mw.readFile(file)
-        if conf:
-            # 删除域名
-            rep = r"server_name\s+(.+);"
-            tmp = re.search(rep, conf).group()
-            newServerName = tmp.replace(' ' + domain + ';', ';')
-            newServerName = newServerName.replace(' ' + domain + ' ', ' ')
-            conf = conf.replace(tmp, newServerName)
-
-            # 删除端口
-            rep = r"listen\s+([0-9]+);"
-            tmp = re.findall(rep, conf)
-            port_count = mw.M('domain').where(
-                'pid=? AND port=?', (pid, port)).count()
-            if mw.inArray(tmp, port) == True and port_count < 2:
-                rep = r"\n*\s+listen\s+" + port + ";"
-                conf = re.sub(rep, '', conf)
-            # 保存配置
-            mw.writeFile(file, conf)
-
-        mw.M('domain').where("id=?", (find['id'],)).delete()
-        msg = mw.getInfo('网站[{1}]删除域名[{2}]成功!', (webname, domain))
-        mw.writeLog('网站管理', msg)
-        mw.restartWeb()
-        return mw.returnJson(True, '站点删除成功!')
-
-    def deleteApi(self):
-        sid = request.form.get('id', '')
-        webname = request.form.get('webname', '')
-        path = request.form.get('path', '0')
-        return self.delete(sid, webname, path)
-
-    # 操作 重定向配置
-    def operateRedirectConf(self, siteName, method='start'):
-        vhost_file = self.vhostPath + '/' + siteName + '.conf'
-        content = mw.readFile(vhost_file)
-
-        cnf_301 = '''#301-START
-    include %s/*.conf;
-    #301-END''' % (self.getRedirectPath( siteName))
-
-        cnf_301_source = '#301-START'
-        # print('operateRedirectConf', content.find('#301-END'))
-        if content.find('#301-END') != -1:
-            if method == 'stop':
-                rep = '#301-START(\n|.){1,500}#301-END'
-                content = re.sub(rep, '#301-START', content)
-        else:
-            if method == 'start':
-                content = re.sub(cnf_301_source, cnf_301, content)
-
-        mw.writeFile(vhost_file, content)
-
-    # get_redirect_status
-    def getRedirectApi(self):
-        _siteName = request.form.get("siteName", '')
-
-        # read data base
-        data_path = self.getRedirectDataPath(_siteName)
-        data_content = mw.readFile(data_path)
-        if data_content == False:
-            mw.execShell("mkdir {}/{}".format(self.redirectPath, _siteName))
-            return mw.returnJson(True, "", {"result": [], "count": 0})
-        # get
-        # conf_path = "{}/{}/*.conf".format(self.redirectPath, siteName)
-        # conf_list = glob.glob(conf_path)
-        # if conf_list == []:
-        #     return mw.returnJson(True, "", {"result": [], "count": 0})
-        try:
-            data = json.loads(data_content)
-        except:
-            mw.execShell("rm -rf {}/{}".format(self.redirectPath, _siteName))
-            return mw.returnJson(True, "", {"result": [], "count": 0})
-
-        # 处理301信息
-        return mw.returnJson(True, "ok", {"result": data, "count": len(data)})
-
-    def getRedirectConfApi(self):
-        _siteName = request.form.get("siteName", '')
-        _id = request.form.get("id", '')
-        if _id == '' or _siteName == '':
-            return mw.returnJson(False, "必填项不能为空!")
-
-        data = mw.readFile(
-            "{}/{}/{}.conf".format(self.redirectPath, _siteName, _id))
-        if data == False:
-            return mw.returnJson(False, "获取失败!")
-        return mw.returnJson(True, "ok", {"result": data})
-
-    def saveRedirectConfApi(self):
-        _siteName = request.form.get("siteName", '')
-        _id = request.form.get("id", '')
-        _config = request.form.get("config", "")
-        if _id == '' or _siteName == '':
-            return mw.returnJson(False, "必填项不能为空!")
-
-        _old_config = mw.readFile(
-            "{}/{}/{}.conf".format(self.redirectPath, _siteName, _id))
-        if _old_config == False:
-            return mw.returnJson(False, "非法操作")
-
-        mw.writeFile("{}/{}/{}.conf".format(self.redirectPath,
-                                            _siteName, _id), _config)
-        rule_test = mw.checkWebConfig()
-        if rule_test != True:
-            mw.writeFile("{}/{}/{}.conf".format(self.redirectPath,
-                                                _siteName, _id), _old_config)
-            return mw.returnJson(False, "OpenResty 配置测试不通过, 请重试: {}".format(rule_test))
-
-        self.operateRedirectConf(_siteName, 'start')
-        mw.restartWeb()
-        return mw.returnJson(True, "ok")
-
-    # get redirect status
-    def setRedirectApi(self):
-        _siteName = request.form.get("siteName", '')
-        # from (example.com / /test/)
-        _from = request.form.get("from", '')
-        _to = request.form.get("to", '')              # redirect to
-        _type = request.form.get("type", '')          # path / domain
-        _rType = request.form.get("r_type", '')       # redirect type
-        _keepPath = request.form.get("keep_path", '')  # keep path
-
-        if _siteName == '' or _from == '' or _to == '' or _type == '' or _rType == '':
-            return mw.returnJson(False, "必填项不能为空!")
-
-        data_path = self.getRedirectDataPath(_siteName)
-        data_content = mw.readFile(
-            data_path) if os.path.exists(data_path) else ""
-        data = json.loads(data_content) if data_content != "" else []
-
-        _rTypeCode = 0 if _rType == "301" else 1
-        _typeCode = 0 if _type == "path" else 1
-        _keepPath = 1 if _keepPath == "1" else 0
-
-        # check if domain exists in site
-        if _typeCode == 1:
-            pid = mw.M('domain').where("name=?", (_siteName,)).field(
-                'id,pid,name,port,addtime').select()
-            site_domain_lists = mw.M('domain').where("pid=?", (pid[0]['pid'],)).field(
-                'name').select()
-            found = False
-            for item in site_domain_lists:
-                if item['name'] == _from:
-                    found = True
-                    break
-            if found == False:
-                return mw.returnJson(False, "域名不存在!")
-
-        file_content = ""
-        # path
-        if _typeCode == 0:
-            redirect_type = "permanent" if _rTypeCode == 0 else "redirect"
-            if not _from.startswith("/"):
-                _from = "/{}".format(_from)
-            if _keepPath == 1:
-                _to = "{}$1".format(_to)
-                _from = "{}(.*)".format(_from)
-            file_content = "rewrite ^{} {} {};".format(
-                _from, _to, redirect_type)
-        # domain
-        else:
-            if _keepPath == 1:
-                _to = "{}$request_uri".format(_to)
-
-            redirect_type = "301" if _rTypeCode == 0 else "302"
-            _if = "if ($host ~ '^{}')".format(_from)
-            _return = "return {} {}; ".format(redirect_type, _to)
-            file_content = _if + "{\r\n    " + _return + "\r\n}"
-
-        _id = mw.md5("{}+{}".format(file_content, _siteName))
-
-        # 防止规则重复
-        for item in data:
-            if item["r_from"] == _from:
-                return mw.returnJson(False, "重复的规则!")
-
-        rep = r"http(s)?\:\/\/([a-zA-Z0-9][-a-zA-Z0-9]{0,62}\.)+([a-zA-Z0-9][a-zA-Z0-9]{0,62})+.?"
-        if not re.match(rep, _to):
-            return mw.returnJson(False, "错误的目标地址")
-
-        # write data json file
-        data.append({"r_from": _from, "type": _typeCode, "r_type": _rTypeCode,
-                     "r_to": _to, 'keep_path': _keepPath, 'id': _id})
-        mw.writeFile(data_path, json.dumps(data))
-        mw.writeFile("{}/{}.conf".format(self.getRedirectPath(_siteName), _id), file_content)
-
-        self.operateRedirectConf(_siteName, 'start')
-        mw.restartWeb()
-        return mw.returnJson(True, "ok")
-
-    # 删除指定重定向
-    def delRedirectApi(self):
-        _siteName = request.form.get("siteName", '')
-        _id = request.form.get("id", '')
-        if _id == '' or _siteName == '':
-            return mw.returnJson(False, "必填项不能为空!")
-
-        try:
-            data_path = self.getRedirectDataPath(_siteName)
-            data_content = mw.readFile(
-                data_path) if os.path.exists(data_path) else ""
-            data = json.loads(data_content) if data_content != "" else []
-            for item in data:
-                if item["id"] == _id:
-                    data.remove(item)
-                    break
-            # write database
-            mw.writeFile(data_path, json.dumps(data))
-            # data is empty ,should stop
-            if len(data) == 0:
-                self.operateRedirectConf(_siteName, 'stop')
-            # remove conf file
-            mw.execShell(
-                "rm -rf {}/{}.conf".format(self.getRedirectPath(_siteName), _id))
-        except:
-            return mw.returnJson(False, "删除失败!")
-        return mw.returnJson(True, "删除成功!")
-
-    # 操作 反向代理配置
-    def operateProxyConf(self, siteName, method='start'):
-        vhost_file = self.vhostPath + '/' + siteName + '.conf'
-        content = mw.readFile(vhost_file)
-
-        proxy_cnf = '''#PROXY-START
-    include %s/*.conf;
-    #PROXY-END''' % (self.getProxyPath(siteName))
-
-        proxy_cnf_source = '#PROXY-START'
-
-        if content.find('#PROXY-END') != -1:
-            if method == 'stop':
-                rep = '#PROXY-START(\n|.){1,500}#PROXY-END'
-                content = re.sub(rep, '#PROXY-START', content)
-        else:
-            if method == 'start':
-                content = re.sub(proxy_cnf_source, proxy_cnf, content)
-
-        mw.writeFile(vhost_file, content)
-
-    def getProxyConfApi(self):
-        _siteName = request.form.get("siteName", '')
-        _id = request.form.get("id", '')
-        if _id == '' or _siteName == '':
-            return mw.returnJson(False, "必填项不能为空!")
-
-        conf_file = "{}/{}/{}.conf".format(self.proxyPath, _siteName, _id)
-        if not os.path.exists(conf_file):
-            conf_file = "{}/{}/{}.conf.txt".format(
-                self.proxyPath, _siteName, _id)
-
-        data = mw.readFile(conf_file)
-        if data == False:
-            return mw.returnJson(False, "获取失败!")
-        return mw.returnJson(True, "ok", {"result": data})
-
-    def setProxyStatusApi(self):
-        _siteName = request.form.get("siteName", '')
-        _status = request.form.get("status", '')
-        _id = request.form.get("id", '')
-        if _status == '' or _siteName == '' or _id == '':
-            return mw.returnJson(False, "必填项不能为空!")
-
-        conf_file = "{}/{}/{}.conf".format(self.proxyPath, _siteName, _id)
-        conf_txt = "{}/{}/{}.conf.txt".format(self.proxyPath, _siteName, _id)
-
-        if _status == '1':
-            mw.execShell('mv ' + conf_txt + ' ' + conf_file)
-        else:
-            mw.execShell('mv ' + conf_file + ' ' + conf_txt)
-
-        mw.restartWeb()
-        return mw.returnJson(True, "OK")
-
-    def saveProxyConfApi(self):
-        _siteName = request.form.get("siteName", '')
-        _id = request.form.get("id", '')
-        _config = request.form.get("config", "")
-        if _id == '' or _siteName == '':
-            return mw.returnJson(False, "必填项不能为空!")
-
-        proxy_file = "{}/{}/{}.conf".format(self.proxyPath, _siteName, _id)
-        mw.backFile(proxy_file)
-        mw.writeFile(proxy_file, _config)
-        rule_test = mw.checkWebConfig()
-        if rule_test != True:
-            mw.restoreFile(proxy_file)
-            mw.removeBackFile(proxy_file)
-            return mw.returnJson(False, "OpenResty 配置测试不通过, 请重试: {}".format(rule_test))
-
-        mw.removeBackFile(proxy_file)
-        self.operateRedirectConf(_siteName, 'start')
-        mw.restartWeb()
-        return mw.returnJson(True, "ok")
-
-    # 读取 网站 反向代理列表
-    def getProxyListApi(self):
-        _siteName = request.form.get('siteName', '')
-
-        data_path = self.getProxyDataPath(_siteName)
-        data_content = mw.readFile(data_path)
-
-        # not exists
-        if data_content == False:
-            mw.execShell("mkdir {}/{}".format(self.proxyPath, _siteName))
-            return mw.returnJson(True, "", {"result": [], "count": 0})
-
-        try:
-            data = json.loads(data_content)
-        except:
-            mw.execShell("rm -rf {}/{}".format(self.proxyPath, _siteName))
-            return mw.returnJson(True, "", {"result": [], "count": 0})
-
-        tmp = []
-        for proxy in data:
-            proxy_dir = "{}/{}".format(self.proxyPath, _siteName)
-            proxy_dir_file = proxy_dir + '/' + proxy['id'] + '.conf'
-            if os.path.exists(proxy_dir_file):
-                proxy['status'] = True
-            else:
-                proxy['status'] = False
-            tmp.append(proxy)
-
-        return mw.returnJson(True, "ok", {"result": data, "count": len(data)})
-
-    # 设置 网站 反向代理列表
-    def setProxyApi(self):
-        _siteName = request.form.get('siteName', '')
-        _from = request.form.get('from', '')
-        _to = request.form.get('to', '')
-        _host = request.form.get('host', '')
-        _name = request.form.get('name', '')
-        _open_proxy = request.form.get('open_proxy', '')
-        _open_cache = request.form.get('open_cache', '')
-        _cache_time = request.form.get('cache_time', '')
-        _id = request.form.get('id', '')
-
-        # print(_name, _siteName, _from, _to, _host)
-        if _name == "" or _siteName == "" or _from == "" or _to == "" or _host == "":
-            return mw.returnJson(False, "必填项不能为空")
-
-        rep = r"http(s)?\:\/\/([a-zA-Z0-9][-a-zA-Z0-9]{0,62}\.)+([a-zA-Z0-9][a-zA-Z0-9]{0,62})+.?"
-        if not re.match(rep, _to):
-            return mw.returnJson(False, "错误的目标地址!")
-
-        # get host from url
-        try:
-            if _host == "$host":
-                host_tmp = urlparse(_to)
-                _host = host_tmp.netloc
-        except:
-            return mw.returnJson(False, "错误的目标地址")
-
-        proxy_site_path = self.getProxyDataPath(_siteName)
-        data_content = mw.readFile(
-            proxy_site_path) if os.path.exists(proxy_site_path) else ""
-        data = json.loads(data_content) if data_content != "" else []
-
-        proxy_action = 'add'
-        if _id == "":
-            _id = mw.md5("{}".format(_name))
-        else:
-            proxy_action = 'edit'
-
-        if proxy_action == "add":
-            for item in data:
-                if item["name"] == _name:
-                    return mw.returnJson(False, "名称重复!!")
-                if item["from"] == _from:
-                    return mw.returnJson(False, "代理目录已存在!!")
-
-        tpl = "#PROXY-START\n\
-location ^~ {from} {\n\
-    proxy_pass {to};\n\
-    proxy_set_header Host {host};\n\
-    proxy_ssl_server_name on;\n\
-    proxy_set_header X-Real-IP $remote_addr;\n\
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;\n\
-    proxy_set_header REMOTE-HOST $remote_addr;\n\
-    proxy_set_header Upgrade $http_upgrade;\n\
-    proxy_set_header Connection $connection_upgrade;\n\
-    proxy_http_version 1.1;\n\
-    \n\
-    add_header X-Cache $upstream_cache_status;\n\
-    \n\
-     {proxy_cache}\n\
-}\n\
-# PROXY-END"
-
-        tpl_proxy_cache = r"\n\
-    if ( $uri ~* \"\.(gif|png|jpg|css|js|woff|woff2)$\" )\n\
-    {\n\
-        expires {cache_time}m;\n\
-    }\n\
-    proxy_ignore_headers Set-Cookie Cache-Control expires;\n\
-    proxy_cache mw_cache;\n\
-    proxy_cache_key \"$host$uri$is_args$args\";\n\
-    proxy_cache_valid 200 304 301 302 {cache_time}m;\n\
-"
-
-        tpl_proxy_nocache = r"\n\
-    set $static_files_app 0; \n\
-    if ( $uri ~* \"\.(gif|png|jpg|css|js|woff|woff2)$\" )\n\
-    {\n\
-        set $static_files_app 1;\n\
-        expires 12h;\n\
-    }\n\
-    if ( $static_files_app = 0 )\n\
-    {\n\
-        add_header Cache-Control no-cache;\n\
-    }\n\
-"
-
-        # replace
-        if _from[0] != '/':
-            _from = '/' + _from
-        tpl = tpl.replace("{from}", _from, 999)
-        tpl = tpl.replace("{to}", _to)
-        tpl = tpl.replace("{host}", _host, 999)
-        tpl = tpl.replace("{cache_time}", _cache_time, 999)
-
-        if _open_cache == 'on':
-            tpl_proxy_cache = tpl_proxy_cache.replace(
-                "{cache_time}", _cache_time, 999)
-            tpl = tpl.replace("{proxy_cache}", tpl_proxy_cache, 999)
-        else:
-            tpl = tpl.replace("{proxy_cache}", tpl_proxy_nocache, 999)
-
-
-        conf_proxy = "{}/{}.conf".format(self.getProxyPath(_siteName), _id)
-        conf_bk = "{}/{}.conf.txt".format(self.getProxyPath(_siteName), _id)
-        mw.writeFile(conf_proxy, tpl)
-
-        rule_test = mw.checkWebConfig()
-        if rule_test != True:
-            os.remove(conf_proxy)
-            return mw.returnJson(False, "OpenResty配置测试不通过, 请重试: {}".format(rule_test))
-
-        if proxy_action == "add":
-            # 添加代理
-            _id = mw.md5("{}".format(_name))
-            for item in data:
-                if item["name"] == _name:
-                    return mw.returnJson(False, "名称重复!")
-                if item["from"] == _from:
-                    return mw.returnJson(False, "代理目录已存在!")
-            data.append({
-                "name": _name,
-                "from": _from,
-                "to": _to,
-                "host": _host,
-                "open_cache": _open_cache,
-                "open_proxy": _open_proxy,
-                "cache_time": _cache_time,
-                "id": _id,
-            })
-        else:
-            # 修改代理
-            dindex = -1
-            for x in range(len(data)):
-                if data[x]["id"] == _id:
-                    dindex = x
-                    break
-            if dindex < 0:
-                return mw.returnJson(False, "异常请求")
-            data[dindex]['from'] = _from
-            data[dindex]['to'] = _to
-            data[dindex]['host'] = _host
-            data[dindex]['open_cache'] = _open_cache
-            data[dindex]['open_proxy'] = _open_proxy
-            data[dindex]['cache_time'] = _cache_time
-
-        if _open_proxy != 'on':
-            os.rename(conf_proxy, conf_bk)
-
-        mw.writeFile(proxy_site_path, json.dumps(data))
-        self.operateProxyConf(_siteName, 'start')
-        mw.restartWeb()
-        return mw.returnJson(True, "ok", {"hash": _id})
-
-    def delProxyApi(self):
-        _siteName = request.form.get("siteName", '')
-        _id = request.form.get("id", '')
-        if _id == '' or _siteName == '':
-            return mw.returnJson(False, "必填项不能为空!")
-
-        try:
-            data_path = self.getProxyDataPath(_siteName)
-            data_content = mw.readFile(
-                data_path) if os.path.exists(data_path) else ""
-            data = json.loads(data_content) if data_content != "" else []
-            for item in data:
-                if item["id"] == _id:
-                    data.remove(item)
-                    break
-            # write database
-            mw.writeFile(data_path, json.dumps(data))
-
-            # data is empty,should stop
-            if len(data) == 0:
-                self.operateProxyConf(_siteName, 'stop')
-            # remove conf file
-            cmd = "rm -rf {}/{}.conf*".format(
-                self.getProxyPath(_siteName), _id)
-            mw.execShell(cmd)
-        except:
-            return mw.returnJson(False, "删除反代失败!")
-
-        mw.restartWeb()
-        return mw.returnJson(True, "删除反代成功!")
-
-    def getSiteTypesApi(self):
-        # 取网站分类
-        data = mw.M("site_types").field("id,name").order("id asc").select()
-        data.insert(0, {"id": 0, "name": "默认分类"})
-        return mw.getJson(data)
-
-    def getSiteDocApi(self):
-        stype = request.form.get('type', '0').strip()
-        vlist = []
-        vlist.append('')
-        vlist.append(mw.getServerDir() +
-                     '/openresty/nginx/html/index.html')
-        vlist.append(mw.getServerDir() + '/openresty/nginx/html/404.html')
-        vlist.append(mw.getServerDir() +
-                     '/openresty/nginx/html/index.html')
-        vlist.append(mw.getServerDir() + '/web_conf/stop/index.html')
-        data = {}
-        data['path'] = vlist[int(stype)]
-        return mw.returnJson(True, 'ok', data)
-
-    def addSiteTypeApi(self):
-        name = request.form.get('name', '').strip()
-        if not name:
-            return mw.returnJson(False, "分类名称不能为空")
-        if len(name) > 18:
-            return mw.returnJson(False, "分类名称长度不能超过6个汉字或18位字母")
-        if mw.M('site_types').count() >= 10:
-            return mw.returnJson(False, '最多添加10个分类!')
-        if mw.M('site_types').where('name=?', (name,)).count() > 0:
-            return mw.returnJson(False, "指定分类名称已存在!")
-        mw.M('site_types').add("name", (name,))
-        return mw.returnJson(True, '添加成功!')
-
-    def removeSiteTypeApi(self):
-        mid = request.form.get('id', '')
-        if mw.M('site_types').where('id=?', (mid,)).count() == 0:
-            return mw.returnJson(False, "指定分类不存在!")
-        mw.M('site_types').where('id=?', (mid,)).delete()
-        mw.M("sites").where("type_id=?", (mid,)).save("type_id", (0,))
-        return mw.returnJson(True, "分类已删除!")
-
-    def modifySiteTypeNameApi(self):
-        # 修改网站分类名称
-        name = request.form.get('name', '').strip()
-        mid = request.form.get('id', '')
-        if not name:
-            return mw.returnJson(False, "分类名称不能为空")
-        if len(name) > 18:
-            return mw.returnJson(False, "分类名称长度不能超过6个汉字或18位字母")
-        if mw.M('site_types').where('id=?', (mid,)).count() == 0:
-            return mw.returnJson(False, "指定分类不存在!")
-        mw.M('site_types').where('id=?', (mid,)).setField('name', name)
-        return mw.returnJson(True, "修改成功!")
-
-    def setSiteTypeApi(self):
-        # 设置指定站点的分类
-        site_ids = request.form.get('site_ids', '')
-        mid = request.form.get('id', '')
-        site_ids = json.loads(site_ids)
-        for sid in site_ids:
-            print(mw.M('sites').where('id=?', (sid,)).setField('type_id', mid))
-        return mw.returnJson(True, "设置成功!")
-
-    ##### ----- end   ----- ###
-
-    # 域名编码转换
-    def toPunycode(self, domain):
-        import re
-        if sys.version_info[0] == 2:
-            domain = domain.encode('utf8')
-        tmp = domain.split('.')
-        newdomain = ''
-        for dkey in tmp:
-            # 匹配非ascii字符
-            match = re.search(u"[\x80-\xff]+", dkey)
-            if not match:
-                newdomain += dkey + '.'
-            else:
-                newdomain += 'xn--' + \
-                    dkey.decode('utf-8').encode('punycode') + '.'
-        return newdomain[0:-1]
-
-    # 中文路径处理
-    def toPunycodePath(self, path):
-        if sys.version_info[0] == 2:
-            path = path.encode('utf-8')
-        if os.path.exists(path):
-            return path
-        import re
-        match = re.search(u"[\x80-\xff]+", path)
-        if not match:
-            return path
-        npath = ''
-        for ph in path.split('/'):
-            npath += '/' + self.toPunycode(ph)
-        return npath.replace('//', '/')
-
-    # 路径处理
-    def getPath(self, path):
-        if path[-1] == '/':
-            return path[0:-1]
-        return path
-
-    def getSitePath(self, siteName):
-        file = self.getHostConf(siteName)
-        if os.path.exists(file):
-            conf = mw.readFile(file)
-            rep = r'\s*root\s*(.+);'
-            find_cnf = re.search(rep, conf)
-            if not find_cnf:
-                return ''
-            path = find_cnf.groups()[0]
-            return path
-        return ''
-
-    # 取当站点前运行目录
-    def getSiteRunPath(self, mid):
-        siteName = mw.M('sites').where('id=?', (mid,)).getField('name')
-        sitePath = mw.M('sites').where('id=?', (mid,)).getField('path')
-        path = sitePath
-
-        filename = self.getHostConf(siteName)
-        if os.path.exists(filename):
-            conf = mw.readFile(filename)
-            rep = r'\s*root\s*(.+);'
-            path = re.search(rep, conf).groups()[0]
-
-        data = {}
-        if sitePath == path:
-            data['runPath'] = '/'
-        else:
-            data['runPath'] = path.replace(sitePath, '')
-
-        dirnames = []
-        dirnames.append('/')
-        for filename in os.listdir(sitePath):
-            try:
-                filePath = sitePath + '/' + filename
-                if os.path.islink(filePath):
-                    continue
-                if os.path.isdir(filePath):
-                    dirnames.append('/' + filename)
-            except:
-                pass
-
-        data['dirs'] = dirnames
-        return data
-
-    def getHostConf(self, siteName):
-        return self.vhostPath + '/' + siteName + '.conf'
-
-    def getRewriteConf(self, siteName):
-        return self.rewritePath + '/' + siteName + '.conf'
-
-    def getRedirectDataPath(self, siteName):
-        return "{}/{}/data.json".format(self.redirectPath, siteName)
-
-    def getRedirectPath(self, siteName):
-        return "{}/{}".format(self.redirectPath, siteName)
-
-    def getProxyDataPath(self, siteName):
-        return "{}/{}/data.json".format(self.proxyPath, siteName)
-
-    def getProxyPath(self, siteName):
-        return "{}/{}".format(self.proxyPath, siteName)
-
-    def getDirBindRewrite(self, siteName, dirname):
-        return self.rewritePath + '/' + siteName + '_' + dirname + '.conf'
-
-    def getIndexConf(self):
-        return mw.getServerDir() + '/openresty/nginx/conf/nginx.conf'
-
-    def getDomain(self, pid):
-        _list = mw.M('domain').where("pid=?", (pid,)).field(
-            'id,pid,name,port,addtime').select()
-        return mw.getJson(_list)
-
-    def getLogs(self, siteName):
-        logPath = mw.getLogsDir() + '/' + siteName + '.log'
-        if not os.path.exists(logPath):
-            return mw.returnJson(False, '日志为空')
-        return mw.returnJson(True, mw.getLastLine(logPath, 100))
-
-    def getErrorLogs(self, siteName):
-        logPath = mw.getLogsDir() + '/' + siteName + '.error.log'
-        if not os.path.exists(logPath):
-            return mw.returnJson(False, '日志为空')
-        return mw.returnJson(True, mw.getLastLine(logPath, 100))
-
-    # 取日志状态
-    def getLogsStatus(self, siteName):
-        filename = self.getHostConf(siteName)
-        conf = mw.readFile(filename)
-        if conf.find('#ErrorLog') != -1:
-            return False
-        if conf.find("access_log  off") != -1:
-            return False
-        return True
-
-    # 取目录加密状态
-    def getHasPwd(self, siteName):
-        filename = self.getHostConf(siteName)
-        conf = mw.readFile(filename)
-        if conf.find('#AUTH_START') != -1:
-            return True
-        return False
-
-    def getSitePhpVersion(self, siteName):
-        conf = mw.readFile(self.getHostConf(siteName))
-        rep = r"enable-php-(.*)\.conf"
-        find_php_cnf = re.search(rep, conf)
-
-        def_pver = '00'
-        if find_php_cnf:
-            tmp = find_php_cnf.groups()
-            def_pver = tmp[0]
-            
-        data = {}
-        data['phpversion'] = def_pver
-        return mw.getJson(data)
-
-    def getIndex(self, sid):
-        siteName = mw.M('sites').where("id=?", (sid,)).getField('name')
-        file = self.getHostConf(siteName)
-        conf = mw.readFile(file)
-        rep = r"\s+index\s+(.+);"
-        tmp = re.search(rep, conf).groups()
-        return tmp[0].replace(' ', ',')
-
-    def setIndex(self, sid, index):
-        if index.find('.') == -1:
-            return mw.returnJson(False,  '默认文档格式不正确，例：index.html')
-
-        index = index.replace(' ', '')
-        index = index.replace(',,', ',')
-
-        if len(index) < 3:
-            return mw.returnJson(False,  '默认文档不能为空!')
-
-        siteName = mw.M('sites').where("id=?", (sid,)).getField('name')
-        index_l = index.replace(",", " ")
-        file = self.getHostConf(siteName)
-        conf = mw.readFile(file)
-        if conf:
-            rep = r"\s+index\s+.+;"
-            conf = re.sub(rep, "\n\tindex " + index_l + ";", conf)
-            mw.writeFile(file, conf)
-
-        mw.writeLog('TYPE_SITE', 'SITE_INDEX_SUCCESS', (siteName, index_l))
-        return mw.returnJson(True,  '设置成功!')
-
-    def getLimitNet(self, sid):
-        siteName = mw.M('sites').where("id=?", (sid,)).getField('name')
-        filename = self.getHostConf(siteName)
-        # 站点总并发
-        data = {}
-        conf = mw.readFile(filename)
-        try:
-            rep = r"\s+limit_conn\s+perserver\s+([0-9]+);"
-            tmp = re.search(rep, conf).groups()
-            data['perserver'] = int(tmp[0])
-
-            # IP并发限制
-            rep = r"\s+limit_conn\s+perip\s+([0-9]+);"
-            tmp = re.search(rep, conf).groups()
-            data['perip'] = int(tmp[0])
-
-            # 请求并发限制
-            rep = r"\s+limit_rate\s+([0-9]+)\w+;"
-            tmp = re.search(rep, conf).groups()
-            data['limit_rate'] = int(tmp[0])
-        except:
-            data['perserver'] = 0
-            data['perip'] = 0
-            data['limit_rate'] = 0
-
-        return mw.getJson(data)
-
-    def checkIndexConf(self):
-        limit = self.getIndexConf()
-        nginxConf = mw.readFile(limit)
-        limitConf = "limit_conn_zone $binary_remote_addr zone=perip:10m;\n\t\tlimit_conn_zone $server_name zone=perserver:10m;"
-        nginxConf = nginxConf.replace(
-            "#limit_conn_zone $binary_remote_addr zone=perip:10m;", limitConf)
-        mw.writeFile(limit, nginxConf)
-
-    def saveLimitNet(self, sid, perserver, perip, limit_rate):
-
-        str_perserver = 'limit_conn perserver ' + perserver + ';'
-        str_perip = 'limit_conn perip ' + perip + ';'
-        str_limit_rate = 'limit_rate ' + limit_rate + 'k;'
-
-        siteName = mw.M('sites').where("id=?", (sid,)).getField('name')
-        filename = self.getHostConf(siteName)
-
-        conf = mw.readFile(filename)
-        if(conf.find('limit_conn perserver') != -1):
-            # 替换总并发
-            rep = r"limit_conn\s+perserver\s+([0-9]+);"
-            conf = re.sub(rep, str_perserver, conf)
-
-            # 替换IP并发限制
-            rep = r"limit_conn\s+perip\s+([0-9]+);"
-            conf = re.sub(rep, str_perip, conf)
-
-            # 替换请求流量限制
-            rep = r"limit_rate\s+([0-9]+)\w+;"
-            conf = re.sub(rep, str_limit_rate, conf)
-        else:
-            conf = conf.replace('#error_page 404/404.html;', "#error_page 404/404.html;\n    " +
-                                str_perserver + "\n    " + str_perip + "\n    " + str_limit_rate)
-
-        mw.writeFile(filename, conf)
-        mw.restartWeb()
-        mw.writeLog('TYPE_SITE', 'SITE_NETLIMIT_OPEN_SUCCESS', (siteName,))
-        return mw.returnJson(True, '设置成功!')
-
-    def closeLimitNet(self, sid):
-        siteName = mw.M('sites').where("id=?", (sid,)).getField('name')
-        filename = self.getHostConf(siteName)
-        conf = mw.readFile(filename)
-        # 清理总并发
-        rep = r"\s+limit_conn\s+perserver\s+([0-9]+);"
-        conf = re.sub(rep, '', conf)
-
-        # 清理IP并发限制
-        rep = r"\s+limit_conn\s+perip\s+([0-9]+);"
-        conf = re.sub(rep, '', conf)
-
-        # 清理请求流量限制
-        rep = r"\s+limit_rate\s+([0-9]+)\w+;"
-        conf = re.sub(rep, '', conf)
-        mw.writeFile(filename, conf)
-        mw.restartWeb()
-        mw.writeLog(
-            'TYPE_SITE', 'SITE_NETLIMIT_CLOSE_SUCCESS', (siteName,))
-        return mw.returnJson(True, '已关闭流量限制!')
-
-    def getSecurity(self, sid, name):
-        filename = self.getHostConf(name)
-        conf = mw.readFile(filename)
-        data = {}
-        if conf.find('SECURITY-START') != -1:
-            rep = "#SECURITY-START(\n|.){1,500}#SECURITY-END"
-            tmp = re.search(rep, conf).group()
-            data['fix'] = re.search(
-                r"\(.+\)\$", tmp).group().replace('(', '').replace(')$', '').replace('|', ',')
-
-            data['status'] = False
-            data['none'] = False
-
-            valid_referers = re.search(
-                r"valid_referers\s+(.+);\n", tmp)
-            valid_referers_none = re.search(
-                r"valid_referers\s+none\s+blocked\s+(.+);\n", tmp)
-
-            if valid_referers or valid_referers_none:
-                data['status'] = True
-
-            if valid_referers_none:
-                domain_t = valid_referers_none.groups()[0].split()
-                data['domains'] = ','.join(domain_t)
-                data['none'] = True
-            elif valid_referers:
-                domain_t = valid_referers.groups()[0].split()
-                data['domains'] = ','.join(domain_t)
-                data['none'] = False
-
-            # print(data)
-        else:
-            data['fix'] = 'jpg,jpeg,gif,png,js,css'
-            domains = mw.M('domain').where(
-                'pid=?', (sid,)).field('name').select()
-            tmp = []
-            for domain in domains:
-                tmp.append(domain['name'])
-            data['domains'] = ','.join(tmp)
-            data['status'] = False
-            data['none'] = False
-        return mw.getJson(data)
-
-    def setSecurity(self, sid, name, fix, domains, status, none=''):
-        if len(fix) < 2:
-            return mw.returnJson(False, 'URL后缀不能为空!')
-        file = self.getHostConf(name)
-        if os.path.exists(file):
-            conf = mw.readFile(file)
-            if status == 'false':
-                rep = r"\s{0,4}#SECURITY-START(\n|.){1,500}#SECURITY-END\n?"
-                conf = re.sub(rep, '', conf)
-                mw.writeLog('网站管理', '站点[' + name + ']已关闭防盗链设置!')
-            else:
-                rep = r"\s{0,4}#SECURITY-START(\n|.){1,500}#SECURITY-END\n?"
-                conf = re.sub(rep, '', conf)
-
-                valid_referers = domains.strip().replace(',', ' ')
-                if none == 'true':
-                    valid_referers = 'none blocked ' + valid_referers
-
-                pre_path = self.setupPath + "/php/conf"
-                re_path = r"include\s+" + pre_path + "/enable-php-"
-                rconf = r'''#SECURITY-START 防盗链配置
-    location ~ .*\.(%s)$
-    {
-        expires      30d;
-        access_log /dev/null;
-        valid_referers %s;
-        if ($invalid_referer){
-           return 404;
-        }
-    }
-    #SECURITY-END
-    include %s/enable-php-''' % (fix.strip().replace(',', '|'), valid_referers, pre_path)
-                conf = re.sub(re_path, rconf, conf)
-                mw.writeLog('网站管理', '站点[' + name + ']已开启防盗链!')
-            mw.writeFile(file, conf)
-        mw.restartWeb()
-        return mw.returnJson(True, '设置成功!')
-
-    def getPhpVersion(self):
-        phpVersions = ('00', '52', '53', '54', '55',
-                       '56', '70', '71', '72', '73',
-                       '74', '80', '81', '82', '83',
-                       '84')
-        data = []
-        for val in phpVersions:
-            tmp = {}
-            if val == '00':
-                tmp['version'] = '00'
-                tmp['name'] = '纯静态'
-                data.append(tmp)
-
-            # 标准判断
-            checkPath = mw.getServerDir() + '/php/' + val + '/bin/php'
-            if os.path.exists(checkPath):
-                tmp['version'] = val
-                tmp['name'] = 'PHP-' + val
-                data.append(tmp)
-
-        # 其他PHP安装类型
-        conf_dir = mw.getServerDir() + "/web_conf/php/conf"
-        conf_list = os.listdir(conf_dir)
-        l = len(conf_list)
-        rep = r"enable-php-(.*?)\.conf"
-        for name in conf_list:
-            tmp = {}
-            try:
-                matchVer = re.search(rep, name).groups()[0]
-            except Exception as e:
-                continue
-
-            if matchVer in phpVersions:
-                continue
-
-            tmp['version'] = matchVer
-            tmp['name'] = 'PHP-' + matchVer
-            data.append(tmp)
-
-        return data
-
-    # 是否跳转到https
-    def isToHttps(self, siteName):
-        file = self.getHostConf(siteName)
-        conf = mw.readFile(file)
-        if conf:
-            # if conf.find('HTTP_TO_HTTPS_START') != -1:
-            #     return True
-            if conf.find('$server_port !~ 443') != -1:
-                return True
-        return False
-
-    def getRewriteList(self):
-        rewriteList = {}
-        rewriteList['rewrite'] = []
-        rewriteList['rewrite'].append('0.当前')
-        for ds in os.listdir('rewrite/nginx'):
-            rewriteList['rewrite'].append(ds[0:len(ds) - 5])
-        rewriteList['rewrite'] = sorted(rewriteList['rewrite'])
-        return rewriteList
-
-    def createRootDir(self, path):
-        autoInit = False
-        if not os.path.exists(path):
-            autoInit = True
-            os.makedirs(path)
-        if not mw.isAppleSystem():
-            mw.execShell('chown -R www:www ' + path)
-
-        if autoInit:
-            mw.writeFile(path + '/index.html', 'Work has started!!!')
-            mw.execShell('chmod -R 755 ' + path)
-
-    def nginxAddDomain(self, webname, domain, port):
-        file = self.getHostConf(webname)
-        conf = mw.readFile(file)
-        if not conf:
-            return
-
-        # 添加域名
-        rep = r"server_name\s*(.*);"
-        tmp = re.search(rep, conf).group()
-        domains = tmp.split(' ')
-        if not mw.inArray(domains, domain):
-            newServerName = tmp.replace(';', ' ' + domain + ';')
-            conf = conf.replace(tmp, newServerName)
-
-        # 添加端口
-        rep = r"listen\s+([0-9]+)\s*[default_server]*\s*;"
-        tmp = re.findall(rep, conf)
-        if not mw.inArray(tmp, port):
-            listen = re.search(rep, conf).group()
-            conf = conf.replace(
-                listen, listen + "\n\tlisten " + port + ';')
-        # 保存配置文件
-        mw.writeFile(file, conf)
-        return True
-
-    def nginxAddConf(self):
-        source_tpl = mw.getRunDir() + '/data/tpl/nginx.conf'
-        vhost_file = self.vhostPath + '/' + self.siteName + '.conf'
-        content = mw.readFile(source_tpl)
-
-        content = content.replace('{$PORT}', self.sitePort)
-        content = content.replace('{$SERVER_NAME}', self.siteName)
-        content = content.replace('{$ROOT_DIR}', self.sitePath)
-        content = content.replace('{$PHP_DIR}', self.setupPath + '/php')
-        content = content.replace('{$PHPVER}', self.phpVersion)
-        content = content.replace('{$OR_REWRITE}', self.rewritePath)
-        # content = content.replace('{$OR_REDIRECT}', self.redirectPath)
-        # content = content.replace('{$OR_PROXY}', self.proxyPath)
-
-        logsPath = mw.getLogsDir()
-        content = content.replace('{$LOGPATH}', logsPath)
-        mw.writeFile(vhost_file, content)
-
-# 和反代配置冲突 && 默认伪静态为空
-#         rewrite_content = '''
-# location /{
-#     if ($PHP_ENV != "1"){
-#         break;
-#     }
-
-#     if (!-e $request_filename) {
-#        rewrite  ^(.*)$  /index.php/$1  last;
-#        break;
-#     }
-# }
-# '''
-        rewrite_file = self.rewritePath + '/' + self.siteName + '.conf'
-        mw.writeFile(rewrite_file, '')
-
-    def add(self, webname, port, ps, path, version):
-        site_root_dir = mw.getWwwDir()
-        if site_root_dir == path.rstrip('/'):
-            return mw.returnJson(False, '不要以网站根目录创建站点!')
-
-        siteMenu = json.loads(webname)
-        self.siteName = self.toPunycode(siteMenu['domain'].strip().split(':')[0]).strip()
-        self.sitePath = self.toPunycodePath(self.getPath(path.replace(' ', '')))
-        self.sitePort = port.strip().replace(' ', '')
-        self.phpVersion = version
-
-        if mw.M('sites').where("name=?", (self.siteName,)).count():
-            return mw.returnJson(False, '您添加的站点已存在!')
-
-        # 写入数据库
-        pid = mw.M('sites').add('name,path,status,ps,edate,addtime,type_id',
-                                (self.siteName, self.sitePath, '1', ps, '0000-00-00', mw.getDate(), 0,))
-        opid = mw.M('domain').where("name=?", (self.siteName,)).getField('pid')
-        if opid:
-            if mw.M('sites').where('id=?', (opid,)).count():
-                return mw.returnJson(False, '您添加的域名已存在!')
-            mw.M('domain').where('pid=?', (opid,)).delete()
-
-        self.createRootDir(self.sitePath)
-        self.nginxAddConf()
-
-        mw.M('domain').add('pid,name,port,addtime',
-                           (pid, self.siteName, self.sitePort, mw.getDate()))
-
-        # 添加更多域名
-        for domain in siteMenu['domainlist']:
-            self.addDomain(domain, self.siteName, pid)
-
-        data = {}
-        data['siteStatus'] = False
-        mw.restartWeb()
-
-        self.runHook('site_cb', 'add')
-        return mw.returnJson(True, '添加成功')
-
-    def deleteWSLogs(self, webname):
-        assLogPath = mw.getLogsDir() + '/' + webname + '.log'
-        errLogPath = mw.getLogsDir() + '/' + webname + '.error.log'
-        confFile = self.setupPath + '/nginx/vhost/' + webname + '.conf'
-        rewriteFile = self.setupPath + '/nginx/rewrite/' + webname + '.conf'
-        passFile = self.setupPath + '/nginx/pass/' + webname + '.conf'
-        keyPath = self.sslDir + webname + '/privkey.pem'
-        certPath = self.sslDir + webname + '/fullchain.pem'
-        logs = [assLogPath,
-                errLogPath,
-                confFile,
-                rewriteFile,
-                passFile,
-                keyPath,
-                certPath]
-        for i in logs:
-            mw.deleteFile(i)
-
-        # 重定向目录
-        redirectDir = self.setupPath + '/nginx/redirect/' + webname
-        if os.path.exists(redirectDir):
-            mw.execShell('rm -rf ' + redirectDir)
-        # 代理目录
-        proxyDir = self.setupPath + '/nginx/proxy/' + webname
-        if os.path.exists(proxyDir):
-            mw.execShell('rm -rf ' + proxyDir)
-
-    def delete(self, sid, webname, path):
-        self.deleteWSLogs(webname)
-        if path == '1':
-            rootPath = mw.getWwwDir() + '/' + webname
-            mw.execShell('rm -rf ' + rootPath)
-
-        # ssl
-        ssl_dir = self.sslDir + '/' + webname
-        if os.path.exists(ssl_dir):
-            mw.execShell('rm -rf ' + ssl_dir)
-
-        ssl_lets_dir = self.sslLetsDir + '/' + webname
-        if os.path.exists(ssl_lets_dir):
-            mw.execShell('rm -rf ' + ssl_lets_dir)
-
-        ssl_acme_dir = mw.getAcmeDir() + '/' + webname
-        if os.path.exists(ssl_acme_dir):
-            mw.execShell('rm -rf ' + ssl_acme_dir)
-
-        mw.M('sites').where("id=?", (sid,)).delete()
-        mw.M('domain').where("pid=?", (sid,)).delete()
-        mw.M('domain').where("name=?", (webname,)).delete()
-
-        # binding domain delete
-        binding_list = mw.M('binding').field(
-            'id,domain').where("pid=?", (sid,)).select()
-
-        for x in binding_list:
-            wlog = mw.getLogsDir() + "/" + webname + "_" + x['domain'] + ".log"
-            wlog_error = mw.getLogsDir() + "/" + webname + "_" + \
-                x['domain'] + ".error.log"
-
-            if os.path.exists(wlog):
-                mw.execShell('rm -rf ' + wlog)
-            if os.path.exists(wlog_error):
-                mw.execShell('rm -rf ' + wlog_error)
-
-        mw.M('binding').where("pid=?", (sid,)).delete()
-        mw.restartWeb()
-
-        self.runHook('site_cb', 'delete')
-        return mw.returnJson(True, '站点删除成功!')
-
-    def setEndDate(self, sid, edate):
-        result = mw.M('sites').where(
-            'id=?', (sid,)).setField('edate', edate)
-        siteName = mw.M('sites').where('id=?', (sid,)).getField('name')
-        mw.writeLog('TYPE_SITE', '设置成功,站点到期后将自动停止!', (siteName, edate))
-        return mw.returnJson(True, '设置成功,站点到期后将自动停止!')
-
-    # ssl相关方法 start
-    def setSslConf(self, siteName):
-        file = self.getHostConf(siteName)
-        conf = mw.readFile(file)
-
-        version = ''
-        version_file_pl = mw.getServerDir() + '/openresty/version.pl'
-        if os.path.exists(version_file_pl):
-            version = mw.readFile(version_file_pl)
-            version = version.strip()
-
-
-        keyPath = self.sslDir + '/' + siteName + '/privkey.pem'
-        certPath = self.sslDir + '/' + siteName + '/fullchain.pem'
-        if conf:
-            if conf.find('ssl_certificate') == -1:
-                # ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE;
-                # add_header Alt-Svc 'h3=":443";ma=86400,h3-29=":443";ma=86400';
-                http3Header = """
-    add_header Strict-Transport-Security "max-age=63072000";
-    add_header Alt-Svc 'h3=":443";ma=86400';
-"""
-                if not version.startswith('1.25'):
-                    http3Header = '';
-
-                sslStr = """#error_page 404/404.html;
-    ssl_certificate    %s;
-    ssl_certificate_key  %s;
-    ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
-    ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305;
-    ssl_prefer_server_ciphers on;
-    ssl_session_cache shared:SSL:10m;
-    ssl_session_timeout 10m;
-    %s
-    error_page 497  https://$host$request_uri;""" % (certPath, keyPath, http3Header)
-            if(conf.find('ssl_certificate') != -1):
-                return mw.returnData(True, 'SSL开启成功!')
-
-            conf = conf.replace('#error_page 404/404.html;', sslStr)
-
-            rep = r"listen\s+([0-9]+)\s*[default_server|reuseport]*;"
-            tmp = re.findall(rep, conf)
-            if not mw.inArray(tmp, '443'):
-                listen = re.search(rep, conf).group()
-                
-                if version.startswith('1.25'):
-                    http_ssl = "\n\tlisten 443 ssl;"
-                    http_ssl = http_ssl + "\n\tlisten [::]:443 ssl;"
-                    http_ssl = http_ssl + "\n\tlisten 443 quic;"
-                    http_ssl = http_ssl + "\n\tlisten [::]:443 quic;"
-                    http_ssl = http_ssl + "\n\thttp2 on;"
-                else:
-                    http_ssl = "\n\tlisten 443 ssl http2;"
-                    http_ssl = http_ssl + "\n\tlisten [::]:443 ssl http2;"
-
-
-                conf = conf.replace(listen, listen + http_ssl)
-
-            mw.backFile(file)
-            mw.writeFile(file, conf)
-            isError = mw.checkWebConfig()
-            if(isError != True):
-                mw.restoreFile(file)
-                return mw.returnData(False, '证书错误: <br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>')
-
-        self.saveCert(keyPath, certPath)
-
-        msg = mw.getInfo('网站[{1}]开启SSL成功!', (siteName,))
-        mw.writeLog('网站管理', msg)
-
-        mw.restartWeb()
-        return mw.returnData(True, 'SSL开启成功!')
-
-    def saveCert(self, keyPath, certPath):
-        try:
-            certInfo = mw.getCertName(certPath)
-            if not certInfo:
-                return mw.returnData(False, '证书解析失败!')
-            vpath = self.sslDir + '/' + certInfo['subject'].strip()
-            if not os.path.exists(vpath):
-                os.system('mkdir -p ' + vpath)
-            mw.writeFile(vpath + '/privkey.pem', mw.readFile(keyPath))
-            mw.writeFile(vpath + '/fullchain.pem', mw.readFile(certPath))
-            mw.writeFile(vpath + '/info.json', json.dumps(certInfo))
-            return mw.returnData(True, '证书保存成功!')
-        except Exception as e:
-            return mw.returnData(False, '证书保存失败!')
-
-    # 清除多余user.ini
-    def delUserInI(self, path, up=0):
-        for p1 in os.listdir(path):
-            try:
-                npath = path + '/' + p1
-                if os.path.isdir(npath):
-                    if up < 100:
-                        self.delUserInI(npath, up + 1)
-                else:
-                    continue
-                useriniPath = npath + '/.user.ini'
-                if not os.path.exists(useriniPath):
-                    continue
-                mw.execShell('which chattr && chattr -i ' + useriniPath)
-                mw.execShell('rm -f ' + useriniPath)
-            except:
-                continue
-        return True
-
-    # 设置目录防御
-    def setDirUserINI(self, sitePath, runPath):
-        newPath = sitePath + runPath
-
-        filename = newPath + '/.user.ini'
-        if os.path.exists(filename):
-            mw.execShell("chattr -i " + filename)
-            os.remove(filename)
-            return mw.returnJson(True, '已清除防跨站设置!')
-
-        self.delUserInI(newPath)
-        openPath = 'open_basedir={}/:{}/'.format(newPath, sitePath)
-        if runPath == '/':
-            openPath = 'open_basedir={}/'.format(sitePath)
-
-        mw.writeFile(filename, openPath + ':/www/server/php:/tmp/:/proc/')
-        mw.execShell("chattr +i " + filename)
-
-        return mw.returnJson(True, '已打开防跨站设置!')
-# ssl相关方法 end
diff --git a/class/core/ssh_local.py b/class/core/ssh_local.py
deleted file mode 100644
index 275ff1254..000000000
--- a/class/core/ssh_local.py
+++ /dev/null
@@ -1,120 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# SSH终端操作
-# ---------------------------------------------------------------------------------
-
-import json
-import time
-import os
-import sys
-import socket
-import threading
-import re
-
-from io import BytesIO, StringIO
-
-import mw
-import paramiko
-
-from flask_socketio import SocketIO, emit, send
-
-
-class ssh_local(object):
-
-    __debug_file = 'logs/ssh_local.log'
-    __log_type = 'SSH终端'
-
-    __ssh = None
-
-    # lock
-    _instance_lock = threading.Lock()
-
-    def __init__(self):
-        pass
-
-    @classmethod
-    def instance(cls, *args, **kwargs):
-        if not hasattr(ssh_local, "_instance"):
-            with ssh_local._instance_lock:
-                if not hasattr(ssh_local, "_instance"):
-                    ssh_local._instance = ssh_local(*args, **kwargs)
-        return ssh_local._instance
-
-    def debug(self, msg):
-        msg = "{} - {}:{} => {} \n".format(mw.formatDate(),
-                                           self.__host, self.__port, msg)
-        if not mw.isDebugMode():
-            return
-        mw.writeFile(self.__debug_file, msg, 'a+')
-
-    def returnMsg(self, status, msg):
-        return {'status': status, 'msg': msg}
-
-
-    def connectSsh(self):
-        import paramiko
-        ssh = paramiko.SSHClient()
-        mw.createSshInfo()
-        ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-
-        port = mw.getSSHPort()
-        try:
-            ssh.connect('127.0.0.1', port, timeout=5)
-        except Exception as e:
-            ssh.connect('localhost', port, timeout=5)
-        except Exception as e:
-            ssh.connect(mw.getHostAddr(), port, timeout=30)
-        except Exception as e:
-            return False
-
-        shell = ssh.invoke_shell(term='xterm', width=83, height=21)
-        shell.setblocking(0)
-        return shell
-
-    def send(self):
-        pass
-
-    def close(self):
-        try:
-            if self.__ssh:
-                self.__ssh.close()
-        except:
-            pass
-
-    def wsSend(self, recv):
-        try:
-            t = recv.decode("utf-8")
-            return emit('server_response', {'data': t})
-        except Exception as e:
-            return emit('server_response', {'data': recv})
-
-    def wsSendConnect(self):
-        return emit('connect', {'data': 'ok'})
-
-    def wsSendReConnect(self):
-        return emit('reconnect', {'data': 'ok'})
-
-
-    def run(self, info):
-        if not self.__ssh:
-            self.__ssh = self.connectSsh()
-
-        if self.__ssh.exit_status_ready():
-            self.__ssh = self.connectSsh()
-
-        self.__ssh.send(info)
-        try:
-            time.sleep(0.005)
-            recv = self.__ssh.recv(8192)
-            return self.wsSend(recv)
-        except Exception as ex:
-            return self.wsSend('')
diff --git a/class/core/ssh_terminal.py b/class/core/ssh_terminal.py
deleted file mode 100644
index 315289fb7..000000000
--- a/class/core/ssh_terminal.py
+++ /dev/null
@@ -1,467 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# SSH终端操作
-# ---------------------------------------------------------------------------------
-
-import json
-import time
-import os
-import sys
-import socket
-import threading
-import re
-
-from io import BytesIO, StringIO
-
-import mw
-import paramiko
-
-from flask_socketio import SocketIO, emit, send
-
-
-class ssh_terminal(object):
-
-    __debug_file = 'logs/ssh_terminal.log'
-    __log_type = 'SSH终端'
-
-    # websocketio 唯一标识
-    __sid = ''
-
-    __host = None
-    __type = '0'
-    __port = 22
-    __user = None
-    __pass = None
-    __pkey = None
-    __key_passwd = None
-
-    __rep_ssh_config = False
-    __rep_ssh_service = False
-    __sshd_config_backup = None
-
-    __ssh = None
-    __tp = None
-    __ps = None
-
-    __ssh_list = {}
-    __ssh_last_request_time = {}
-
-    # lock
-    _instance_lock = threading.Lock()
-
-    def __init__(self):
-        ht = threading.Thread(target=self.heartbeat)
-        ht.start()
-
-    @classmethod
-    def instance(cls, *args, **kwargs):
-        if not hasattr(ssh_terminal, "_instance"):
-            with ssh_terminal._instance_lock:
-                if not hasattr(ssh_terminal, "_instance"):
-                    ssh_terminal._instance = ssh_terminal(*args, **kwargs)
-        return ssh_terminal._instance
-
-    def debug(self, msg):
-        msg = "{} - {}:{} => {} \n".format(mw.formatDate(),
-                                           self.__host, self.__port, msg)
-        if not mw.isDebugMode():
-            return
-        mw.writeFile(self.__debug_file, msg, 'a+')
-
-    def returnMsg(self, status, msg):
-        return {'status': status, 'msg': msg}
-
-    def restartSsh(self, act='reload'):
-        '''
-        重启ssh 无参数传递
-        '''
-        version = mw.readFile('/etc/redhat-release')
-        if not os.path.exists('/etc/redhat-release'):
-            mw.execShell('service ssh ' + act)
-        elif version.find(' 7.') != -1 or version.find(' 8.') != -1:
-            mw.execShell("systemctl " + act + " sshd.service")
-        else:
-            mw.execShell("/etc/init.d/sshd " + act)
-
-    def isRunning(self, rep=False):
-        try:
-            if rep and self.__rep_ssh_service:
-                self.restartSsh('stop')
-                return True
-
-            status = self.getSshStatus()
-            if not status:
-                self.restartSsh('start')
-                self.__rep_ssh_service = True
-                return True
-            return False
-        except:
-            return False
-
-    def setSshdConfig(self, rep=False):
-        self.isRunning(rep)
-        if rep and not self.__rep_ssh_config:
-            return False
-
-        try:
-            sshd_config_file = '/etc/ssh/sshd_config'
-            if not os.path.exists(sshd_config_file):
-                return False
-
-            sshd_config = mw.readFile(sshd_config_file)
-            if not sshd_config:
-                return False
-
-            if rep:
-                if self.__sshd_config_backup:
-                    mw.writeFile(sshd_config_file, self.__sshd_config_backup)
-                    self.restartSsh()
-                return True
-
-            pin = r'^\s*PubkeyAuthentication\s+(yes|no)'
-            pubkey_status = re.findall(pin, sshd_config, re.I)
-            if pubkey_status:
-                if pubkey_status[0] == 'yes':
-                    pubkey_status = True
-                else:
-                    pubkey_status = False
-
-            pin = r'^\s*RSAAuthentication\s+(yes|no)'
-            rsa_status = re.findall(pin, sshd_config, re.I)
-            if rsa_status:
-                if rsa_status[0] == 'yes':
-                    rsa_status = True
-                else:
-                    rsa_status = False
-
-            self._sshd_config_backup = sshd_config
-            is_write = False
-            if not pubkey_status:
-                sshd_config = re.sub(
-                    r'\n#?PubkeyAuthentication\s\w+', '\nPubkeyAuthentication yes', sshd_config)
-                is_write = True
-            if not rsa_status:
-                sshd_config = re.sub(
-                    r'\n#?RSAAuthentication\s\w+', '\nRSAAuthentication yes', sshd_config)
-                is_write = True
-
-            if is_write:
-                mw.writeFile(sshd_config_file, sshd_config)
-                self.__rep_ssh_config = True
-                self.restartSsh()
-            else:
-                self.__sshd_config_backup = None
-            return True
-        except:
-            return False
-
-    def setSid(self, sid):
-        self.__sid = sid
-
-    def connect(self, sid):
-        # self.connectBySocket()
-        if self.__host in ['127.0.0.1', 'localhost']:
-            return self.connectLocalSsh(sid)
-        else:
-            return self.connectBySocket(sid)
-
-    def connectLocalSsh(self, sid):
-        mw.createSshInfo()
-        self.__ps = paramiko.SSHClient()
-        self.__ps.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-
-        self.__port = mw.getSSHPort()
-        try:
-            self.__ps.connect(self.__host, self.__port, timeout=60)
-        except Exception as e:
-            self.__ps.connect('127.0.0.1', self.__port)
-        except Exception as e:
-            self.__ps.connect('localhost', self.__port)
-        except Exception as e:
-            self.setSshdConfig(True)
-            self.__ps.close()
-            e = str(e)
-            if e.find('websocket error!') != -1:
-                return self.returnMsg(True, '连接成功')
-            if e.find('Authentication timeout') != -1:
-                self.debug("认证超时{}".format(e))
-                return self.returnMsg(False, '认证超时,请按回车重试!{}'.format(e))
-            if e.find('Connection reset by peer') != -1:
-                self.debug('目标服务器主动拒绝连接')
-                return self.returnMsg(False, '目标服务器主动拒绝连接')
-            if e.find('Error reading SSH protocol banner') != -1:
-                self.debug('协议头响应超时')
-                return self.returnMsg(False, '协议头响应超时，与目标服务器之间的网络质量太糟糕：' + e)
-            if not e:
-                self.debug('SSH协议握手超时')
-                return self.returnMsg(False, "SSH协议握手超时，与目标服务器之间的网络质量太糟糕")
-            err = mw.getTracebackInfo()
-            self.debug(err)
-            return self.returnMsg(False, "未知错误: {}".format(err))
-
-        self.debug('local-ssh:认证成功，正在构建会话通道')
-        ssh = self.__ps.invoke_shell(
-            term='xterm', width=83, height=21)
-        ssh.setblocking(0)
-        self.__ssh_list[sid] = ssh
-        mw.writeLog(self.__log_type, '成功登录到SSH服务器 [{}:{}]'.format(
-            self.__host, self.__port))
-        self.debug('local-ssh:通道已构建')
-        return self.returnMsg(True, '连接成功!')
-
-    def connectBySocket(self, sid):
-        if not self.__host:
-            return self.returnMsg(False, '错误的连接地址')
-        if not self.__user:
-            self.__user = 'root'
-        if not self.__port:
-            self.__port = 22
-
-        self.setSshdConfig(True)
-        num = 0
-        while num < 5:
-            num += 1
-            try:
-                self.debug('正在尝试第{}次连接'.format(num))
-                if self.__rep_ssh_config:
-                    time.sleep(0.1)
-                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                sock.settimeout(2 + num)
-                sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 8192)
-                sock.connect((self.__host, self.__port))
-                break
-            except Exception as e:
-                if num == 5:
-                    self.setSshdConfig(True)
-                    self.debug('重试连接失败,{}'.format(e))
-                    return self.returnMsg(False, '连接目标服务器失败, {}:{}'.format(self.__host, self.__port))
-                else:
-                    time.sleep(0.2)
-
-        # print(self.__host, sock)
-        self.__tp = paramiko.Transport(sock)
-        try:
-            self.__tp.start_client()
-            self.__tp.banner_timeout = 60
-            if not self.__pass and not self.__pkey:
-                return self.returnMsg(False, '密码或私钥不能都为空: {}:{}'.format(self.__host, self.__port))
-
-            if self.__pkey != '' and self.__type != '0':
-                self.debug('正在认证私钥')
-                p_file = StringIO(str(self.__pkey.replace('\\n', '\n')))
-                # p_file = "/tmp/t_ssh_pkey.txt"
-                # mw.writeFile(p_file, self.__pkey.replace('\\n', '\n'))
-                # mw.execShell('chmod 600 ' + p_file)
-                try:
-                    p_file.seek(0)
-                    pkey = paramiko.RSAKey.from_private_key(p_file)
-                except:
-                    try:
-                        p_file.seek(0)  # 重置游标
-                        pkey = paramiko.Ed25519Key.from_private_key(
-                            p_file)
-                    except:
-                        try:
-                            p_file.seek(0)
-                            pkey = paramiko.ECDSAKey.from_private_key(p_file)
-                        except:
-                            p_file.seek(0)
-                            pkey = paramiko.DSSKey.from_private_key(p_file)
-
-                self.__tp.auth_publickey(username=self.__user, key=pkey)
-            else:
-                try:
-                    self.__tp.auth_none(self.__user)
-                except Exception as e:
-                    e = str(e)
-                    if e.find('keyboard-interactive') >= 0:
-                        self._auth_interactive()
-                    else:
-                        self.debug('正在认证密码')
-                        self.__tp.auth_password(
-                            username=self.__user, password=self.__pass)
-        except Exception as e:
-            self.setSshdConfig(True)
-            self.__tp.close()
-            e = str(e)
-            # print(e)
-            if e.find('Authentication timeout') != -1:
-                self.debug("认证超时{}".format(e))
-                return self.returnMsg(False, '认证超时,请按回车重试!{}'.format(e))
-            if e.find('Authentication failed') != -1:
-                self.debug('认证失败{}'.format(e))
-                return self.returnMsg(False, '帐号或密码错误: {}'.format(e + "," + self.__user + "@" + self.__host + ":" + str(self.__port)))
-            if e.find('Bad authentication type; allowed types') != -1:
-                self.debug('认证失败{}'.format(e))
-                if self.__host in ['127.0.0.1', 'localhost'] and self.__pass == 'none':
-                    return self.returnMsg(False, '帐号或密码错误: {}'.format("Authentication failed ," + self.__user + "@" + self.__host + ":" + str(self.__port)))
-                return self.returnMsg(False, '不支持的身份验证类型: {}'.format(e))
-            if e.find('Connection reset by peer') != -1:
-                self.debug('目标服务器主动拒绝连接')
-                return self.returnMsg(False, '目标服务器主动拒绝连接')
-            if e.find('Error reading SSH protocol banner') != -1:
-                self.debug('协议头响应超时')
-                return self.returnMsg(False, '协议头响应超时，与目标服务器之间的网络质量太糟糕：' + e)
-            if not e:
-                self.debug('SSH协议握手超时')
-                return self.returnMsg(False, "SSH协议握手超时，与目标服务器之间的网络质量太糟糕")
-            err = mw.getTracebackInfo()
-            self.debug(err)
-            return self.returnMsg(False, "未知错误: {}".format(err))
-
-        self.debug('认证成功，正在构建会话通道')
-
-        ssh = self.__tp.open_session()
-        ssh.get_pty(term='xterm', width=100, height=34)
-        ssh.invoke_shell()
-        self.__ssh_list[sid] = ssh
-        mw.writeLog(self.__log_type, '成功登录到SSH服务器 [{}:{}]'.format(
-            self.__host, self.__port))
-        self.debug('通道已构建')
-        return self.returnMsg(True, '连接成功.')
-
-    def getSshInfo(self, file):
-        rdata = mw.readFile(file)
-        destr = mw.deDoubleCrypt('mdserver-web', rdata)
-        return json.loads(destr)
-
-    def setAttr(self, sid, info):
-        self.__host = info['host'].strip()
-
-        # 外部连接获取
-        if not self.__host in ['127.0.0.1', 'localhost']:
-            dst_info = mw.getServerDir() + '/webssh/host/' + self.__host + '/info.json'
-            if os.path.exists(dst_info):
-                info = self.getSshInfo(dst_info)
-
-        if 'type' in info:
-            self.__type = info['type']
-
-        if 'port' in info:
-            self.__port = int(info['port'])
-        if 'username' in info:
-            self.__user = info['username']
-        if 'pkey' in info:
-            self.__pkey = info['pkey']
-        if 'password' in info:
-            self.__pass = info['password']
-        if 'pkey_passwd' in info:
-            self.__key_passwd = info['pkey_passwd']
-
-        # print(self.__host, self.__pass, self.__key_passwd)
-        try:
-            result = self.connect(sid)
-            # print(result)
-        except Exception as ex:
-            if str(ex).find("NoneType") == -1:
-                raise ex
-        return result
-
-    def send(self):
-        pass
-
-    def close(self):
-        try:
-            if self.__ssh:
-                self.__ssh.close()
-            if self.__tp:  # 关闭宿主服务
-                self.__tp.close()
-            if self.__ps:
-                self.__ps.close()
-        except:
-            pass
-
-    def resize(self, sid, data):
-        try:
-            self.__ssh_list[sid].resize_pty(
-                width=data['cols'], height=data['rows'])
-            return True
-        except:
-            return False
-
-    def wsSend(self, recv):
-        try:
-            t = recv.decode("utf-8")
-            return emit('server_response', {'data': t})
-        except Exception as e:
-            return emit('server_response', {'data': recv})
-
-    def wsSendConnect(self):
-        return emit('connect', {'data': 'ok'})
-
-    def wsSendReConnect(self):
-        return emit('reconnect', {'data': 'ok'})
-
-    def heartbeat(self):
-        # limit_cos = 10
-        while True:
-            time.sleep(3)
-            cur_time = time.time()
-            for x in list(self.__ssh_list.keys()):
-                ssh_last_time = self.__ssh_last_request_time[x]
-                sid_off_cos = cur_time - ssh_last_time
-
-                # print("heartbeat off cos :", x, sid_off_cos)
-                if sid_off_cos > 3:
-                    cur_ssh = self.__ssh_list[x]
-                    if not cur_ssh:
-                        del(self.__ssh_list[x])
-                        del(self.__ssh_last_request_time[x])
-                        continue
-
-                    if cur_ssh.exit_status_ready():
-                        del(self.__ssh_list[x])
-                        del(self.__ssh_last_request_time[x])
-                        continue
-
-                    cur_ssh.send("exit\r\n")
-                    del(self.__ssh_list[x])
-                    del(self.__ssh_last_request_time[x])
-
-    def run(self, sid, info):
-        self.__sid = sid
-        if not self.__sid:
-            return self.wsSend('WebSocketIO无效')
-
-        self.__ssh_last_request_time[sid] = time.time()
-        if not sid in self.__ssh_list:
-            if type(info) == dict and 'host' in info:
-                result = self.setAttr(sid, info)
-                if result['status']:
-                    return self.wsSendConnect()
-                else:
-                    return self.wsSend(result['msg'])
-            else:
-                return self.wsSendReConnect()
-
-        result = self.returnMsg(False, '')
-        if sid in self.__ssh_list:
-            if 'resize' in info:
-                self.resize(sid, info)
-            result = self.returnMsg(True, '已连接')
-            if result['status']:
-                if type(info) == str:
-                    time.sleep(0.1)
-                    cur_ssh = self.__ssh_list[sid]
-                    if cur_ssh.exit_status_ready():
-                        self.wsSend("logout\r\n")
-                        del(self.__ssh_list[sid])
-                        return
-                    cur_ssh.send(info)
-                    try:
-                        time.sleep(0.005)
-                        recv = cur_ssh.recv(8192)
-                        return self.wsSend(recv)
-                    except Exception as ex:
-                        return self.wsSend('')
-            else:
-                return self.wsSend(result['msg'])
diff --git a/class/core/system_api.py b/class/core/system_api.py
deleted file mode 100755
index 12208a35f..000000000
--- a/class/core/system_api.py
+++ /dev/null
@@ -1,978 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 系统信息操作
-# ---------------------------------------------------------------------------------
-
-
-import psutil
-import time
-import os
-import re
-import math
-import sys
-import json
-
-from flask import Flask, session
-from flask import request
-
-import db
-import mw
-
-import config_api
-import requests
-
-from threading import Thread
-from time import sleep
-
-
-def mw_async(f):
-    def wrapper(*args, **kwargs):
-        thr = Thread(target=f, args=args, kwargs=kwargs)
-        thr.start()
-    return wrapper
-
-
-class system_api:
-    setupPath = None
-    pids = None
-    cache = {}
-    def __init__(self):
-        self.setupPath = mw.getServerDir()
-
-
-    ##### ----- start ----- ###
-    def networkApi(self):
-        data = self.getNetWork()
-        return mw.getJson(data)
-
-    def updateServerApi(self):
-        stype = request.args.get('type', 'check')
-        version = request.args.get('version', '')
-        return self.updateServer(stype, version)
-
-    def systemTotalApi(self):
-        data = self.getSystemTotal()
-        return mw.getJson(data)
-
-    def diskInfoApi(self):
-        diskInfo = self.getDiskInfo()
-        return mw.getJson(diskInfo)
-
-    def setControlApi(self):
-        stype = request.form.get('type', '')
-        day = request.form.get('day', '')
-        data = self.setControl(stype, day)
-        return data
-
-    def getLoadAverageApi(self):
-        start = request.args.get('start', '')
-        end = request.args.get('end', '')
-        data = self.getLoadAverageData(start, end)
-        return mw.getJson(data)
-
-    def getCpuIoApi(self):
-        start = request.args.get('start', '')
-        end = request.args.get('end', '')
-        data = self.getCpuIoData(start, end)
-        return mw.getJson(data)
-
-    def getDiskIoApi(self):
-        start = request.args.get('start', '')
-        end = request.args.get('end', '')
-        data = self.getDiskIoData(start, end)
-        return mw.getJson(data)
-
-    def getNetworkIoApi(self):
-        start = request.args.get('start', '')
-        end = request.args.get('end', '')
-        data = self.getNetWorkIoData(start, end)
-        return mw.getJson(data)
-
-    def rememoryApi(self):
-        os.system('sync')
-        scriptFile = mw.getRunDir() + '/script/rememory.sh'
-        mw.execShell("/bin/bash " + scriptFile)
-        data = self.getMemInfo()
-        return mw.getJson(data)
-
-    # 重启面板
-    def restartApi(self):
-        self.restartMw()
-        return mw.returnJson(True, '面板已重启!')
-
-    def restartServerApi(self):
-        if mw.isAppleSystem():
-            return mw.returnJson(False, "开发环境不可重起")
-        self.restartServer()
-        return mw.returnJson(True, '正在重启服务器!')
-    ##### ----- end ----- ###
-
-    def restartTask(self):
-        initd = mw.getRunDir() + '/scripts/init.d/mw'
-        if os.path.exists(initd):
-            os.system(initd + ' ' + 'restart_task')
-        return True
-
-    def restartMw(self):
-        mw.writeFile('data/restart.pl', 'True')
-        return True
-
-    @mw_async
-    def restartServer(self):
-        if not mw.isRestart():
-            return mw.returnJson(False, '请等待所有安装任务完成再执行!')
-        mw.execShell("sync && init 6 &")
-        return mw.returnJson(True, '命令发送成功!')
-
-        # 名取PID
-    def getPid(self, pname):
-        try:
-            if not self.pids:
-                self.pids = psutil.pids()
-            for pid in self.pids:
-                if psutil.Process(pid).name() == pname:
-                    return True
-            return False
-        except:
-            return False
-
-    # 检查端口是否占用
-    def isOpen(self, port):
-        import socket
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        try:
-            s.connect(('127.0.0.1', int(port)))
-            s.shutdown(2)
-            return True
-        except:
-            return False
-
-    # 检测指定进程是否存活
-    def checkProcess(self, pid):
-        try:
-            if not self.pids:
-                self.pids = psutil.pids()
-            if int(pid) in self.pids:
-                return True
-            return False
-        except:
-            return False
-
-    def getEnvInfoApi(self, get=None):
-        serverInfo = {}
-        serverInfo['status'] = True
-        sdir = mw.getServerDir()
-
-        serverInfo['webserver'] = '未安装'
-        if os.path.exists(sdir + '/openresty/nginx/sbin/nginx'):
-            serverInfo['webserver'] = 'OpenResty'
-        serverInfo['php'] = []
-        phpversions = ['52', '53', '54', '55', '56', '70', '71',
-                       '72', '73', '74', '80', '81', '82', '83', '84']
-        phpPath = sdir + '/php/'
-        for pv in phpversions:
-            if not os.path.exists(phpPath + pv + '/bin/php'):
-                continue
-            serverInfo['php'].append(pv)
-        serverInfo['mysql'] = False
-        if os.path.exists(sdir + '/mysql/bin/mysql'):
-            serverInfo['mysql'] = True
-        import psutil
-        try:
-            diskInfo = psutil.disk_usage('/www')
-        except:
-            diskInfo = psutil.disk_usage('/')
-        serverInfo['disk'] = diskInfo[2]
-        return mw.returnJson(True, 'ok', serverInfo)
-
-    def getPanelInfo(self, get=None):
-        # 取面板配置
-        address = mw.GetLocalIp()
-        try:
-            try:
-                port = web.ctx.host.split(':')[1]
-            except:
-                port = mw.readFile('data/port.pl')
-        except:
-            port = '7200'
-        domain = ''
-        if os.path.exists('data/domain.conf'):
-            domain = mw.readFile('data/domain.conf')
-
-        autoUpdate = ''
-        if os.path.exists('data/autoUpdate.pl'):
-            autoUpdate = 'checked'
-        limitip = ''
-        if os.path.exists('data/limitip.conf'):
-            limitip = mw.readFile('data/limitip.conf')
-
-        templates = []
-        for template in os.listdir('templates/'):
-            if os.path.isdir('templates/' + template):
-                templates.append(template)
-        template = mw.readFile('data/templates.pl')
-
-        check502 = ''
-        if os.path.exists('data/502Task.pl'):
-            check502 = 'checked'
-        return {'port': port, 'address': address, 'domain': domain, 'auto': autoUpdate, '502': check502, 'limitip': limitip, 'templates': templates, 'template': template}
-
-    def getSystemTotal(self, interval=1):
-        # 取系统统计信息
-        data = self.getMemInfo()
-        cpu = self.getCpuInfo(interval)
-        data['cpuNum'] = cpu[1]
-        data['cpuRealUsed'] = cpu[0]
-        data['time'] = self.getBootTime()
-        data['system'] = self.getSystemVersion()
-        data['isuser'] = mw.M('users').where(
-            'username=?', ('admin',)).count()
-        data['version'] = '0.0.1'
-        return data
-
-    def getLoadAverage(self):
-        c = os.getloadavg()
-        data = {}
-        data['one'] = round(float(c[0]), 2)
-        data['five'] = round(float(c[1]), 2)
-        data['fifteen'] = round(float(c[2]), 2)
-        data['max'] = psutil.cpu_count() * 2
-        data['limit'] = data['max']
-        data['safe'] = data['max'] * 0.75
-        return data
-
-    def getAllInfo(self, get):
-        data = {}
-        data['load_average'] = self.GetLoadAverage(get)
-        data['title'] = self.GetTitle()
-        data['network'] = self.GetNetWorkApi(get)
-        data['panel_status'] = not os.path.exists('/www/server/mdserver-web/data/close.pl')
-        import firewalls
-        ssh_info = firewalls.firewalls().GetSshInfo(None)
-        data['enable_ssh_status'] = ssh_info['status']
-        data['disable_ping_status'] = not ssh_info['ping']
-        data['time'] = self.GetBootTime()
-        # data['system'] = self.GetSystemVersion();
-        # data['mem'] = self.GetMemInfo();
-        data['version'] = web.ctx.session.version
-        return data
-
-    def getTitle(self):
-        titlePl = 'data/title.pl'
-        title = 'Linux面板'
-        if os.path.exists(titlePl):
-            title = mw.readFile(titlePl).strip()
-        return title
-
-    def getSystemDeviceTemperature(self):
-        if not hasattr(psutil, "sensors_temperatures"):
-            return False, "platform not supported"
-        temps = psutil.sensors_temperatures()
-        if not temps:
-            return False, "can't read any temperature"
-        for name, entries in temps.items():
-            for entry in entries:
-                return True, entry.label
-                # print("%-20s %s °C (high = %s °C, critical = %s °C)" % (
-                #     entry.label or name, entry.current, entry.high,
-                #     entry.critical))
-        return False, ""
-
-    def getSystemVersion(self):
-        #
-        # 取操作系统版本
-        current_os = mw.getOs()
-        # sys_temper = self.getSystemDeviceTemperature()
-        # print(sys_temper)
-        # mac
-        if current_os == 'darwin':
-            data = mw.execShell('sw_vers')[0]
-            data_list = data.strip().split("\n")
-            mac_version = ''
-            for x in data_list:
-                xlist = x.split("\t")
-                mac_version += xlist[len(xlist)-1] + ' '
-
-            arch_ver = mw.execShell("arch")
-            return mac_version + " (" + arch_ver[0].strip() + ")"
-
-        # freebsd
-        if current_os.startswith('freebsd'):
-            version = mw.execShell(
-                "cat /etc/*-release | grep PRETTY_NAME | awk -F = '{print $2}' | awk -F '\"' '{print $2}'")
-            arch_ver = mw.execShell(
-                "sysctl -a | egrep -i 'hw.machine_arch' | awk -F ':' '{print $2}'")
-            return version[0].strip() + " (" + arch_ver[0].strip() + ")"
-
-        redhat_series = '/etc/redhat-release'
-        if os.path.exists(redhat_series):
-            version = mw.readFile('/etc/redhat-release')
-            version = version.replace('release ', '').strip()
-
-            arch_ver = mw.execShell("arch")
-            return version + " (" + arch_ver[0].strip() + ")"
-
-        os_series = '/etc/os-release'
-        if os.path.exists(os_series):
-            version = mw.execShell(
-                "cat /etc/*-release | grep PRETTY_NAME | awk -F = '{print $2}' | awk -F '\"' '{print $2}'")
-
-            arch_ver = mw.execShell("arch")
-            return version[0].strip() + " (" + arch_ver[0].strip() + ")"
-
-        return '未识别系统信息'
-
-    def getBootTime(self):
-        # 取系统启动时间
-        uptime = mw.readFile('/proc/uptime')
-        if uptime == False:
-            start_time = psutil.boot_time()
-            run_time = time.time() - start_time
-        else:
-            run_time = uptime.split()[0]
-        tStr = float(run_time)
-        min = tStr / 60
-        hours = min / 60
-        days = math.floor(hours / 24)
-        hours = math.floor(hours - (days * 24))
-        min = math.floor(min - (days * 60 * 24) - (hours * 60))
-        return mw.getInfo('已不间断运行: {1}天{2}小时{3}分钟', (str(int(days)), str(int(hours)), str(int(min))))
-
-    def getCpuInfo(self, interval=1):
-        # 取CPU信息
-        cpuCount = psutil.cpu_count()
-        cpuLogicalNum = psutil.cpu_count(logical=False)
-        used = psutil.cpu_percent(interval=interval)
-        cpuLogicalNum = 0
-        if os.path.exists('/proc/cpuinfo'):
-            c_tmp = mw.readFile('/proc/cpuinfo')
-            d_tmp = re.findall("physical id.+", c_tmp)
-            cpuLogicalNum = len(set(d_tmp))
-
-        used_all = psutil.cpu_percent(percpu=True)
-        cpu_name = mw.getCpuType() + " * {}".format(cpuLogicalNum)
-        return used, cpuCount, used_all, cpu_name, cpuCount, cpuLogicalNum
-
-    def getMemInfo(self):
-        # 取内存信息
-        mem = psutil.virtual_memory()
-        if mw.getOs() == 'darwin':
-            memInfo = {
-                'memTotal': mem.total,
-            }
-            memInfo['memRealUsed'] = memInfo['memTotal'] * (mem.percent / 100)
-        else:
-            memInfo = {
-                'memTotal': mem.total,
-                'memFree': mem.free,
-                'memBuffers': mem.buffers,
-                'memCached': mem.cached
-            }
-
-            memInfo['memRealUsed'] = memInfo['memTotal'] - \
-                memInfo['memFree'] - memInfo['memBuffers'] - \
-                memInfo['memCached']
-        return memInfo
-
-    def getMemUsed(self):
-        # 取内存使用率
-        try:
-            import psutil
-            mem = psutil.virtual_memory()
-
-            if mw.getOs() == 'darwin':
-                return mem.percent
-
-            memInfo = {'memTotal': mem.total / 1024 / 1024, 'memFree': mem.free / 1024 / 1024,
-                       'memBuffers': mem.buffers / 1024 / 1024, 'memCached': mem.cached / 1024 / 1024}
-            tmp = memInfo['memTotal'] - memInfo['memFree'] - \
-                memInfo['memBuffers'] - memInfo['memCached']
-            tmp1 = memInfo['memTotal'] / 100
-            return (tmp / tmp1)
-        except Exception as ex:
-            return 1
-
-    def getDiskInfo(self):
-        info = self.getDiskInfo2()
-        if len(info) != 0:
-            return info
-
-        # 取磁盘分区信息
-        diskIo = psutil.disk_partitions()
-        diskInfo = []
-
-        for disk in diskIo:
-            if disk[1] == '/mnt/cdrom':
-                continue
-            if disk[1] == '/boot':
-                continue
-            tmp = {}
-            tmp['path'] = disk[1]
-            size_tmp = psutil.disk_usage(disk[1])
-            tmp['size'] = [mw.toSize(size_tmp[0]), mw.toSize(
-                size_tmp[1]), mw.toSize(size_tmp[2]), str(size_tmp[3]) + '%']
-            diskInfo.append(tmp)
-        return diskInfo
-
-    def getDiskInfo2(self):
-        # 取磁盘分区信息
-        temp = mw.execShell(
-            "df -h -P|grep '/'|grep -v tmpfs | grep -v devfs")[0]
-        tempInodes = mw.execShell(
-            "df -i -P|grep '/'|grep -v tmpfs | grep -v devfs")[0]
-        temp1 = temp.split('\n')
-        tempInodes1 = tempInodes.split('\n')
-        diskInfo = []
-        n = 0
-        cuts = ['/mnt/cdrom', '/boot', '/boot/efi', '/dev',
-                '/dev/shm', '/zroot', '/run/lock', '/run', '/run/shm', '/run/user']
-        for tmp in temp1:
-            n += 1
-            inodes = tempInodes1[n - 1].split()
-            disk = tmp.split()
-            if len(disk) < 5:
-                continue
-            if disk[1].find('M') != -1:
-                continue
-            if disk[1].find('K') != -1:
-                continue
-            if len(disk[5].split('/')) > 4:
-                continue
-            if disk[5] in cuts:
-                continue
-            arr = {}
-            arr['path'] = disk[5]
-            tmp1 = [disk[1], disk[2], disk[3], disk[4]]
-            arr['size'] = tmp1
-            arr['inodes'] = [inodes[1], inodes[2], inodes[3], inodes[4]]
-            diskInfo.append(arr)
-        return diskInfo
-
-    # 清理系统垃圾
-    def clearSystem(self, get):
-        count = total = 0
-        tmp_total, tmp_count = self.ClearMail()
-        count += tmp_count
-        total += tmp_total
-        tmp_total, tmp_count = self.ClearOther()
-        count += tmp_count
-        total += tmp_total
-        return count, total
-
-    # 清理邮件日志
-    def clearMail(self):
-        rpath = '/var/spool'
-        total = count = 0
-        import shutil
-        con = ['cron', 'anacron', 'mail']
-        for d in os.listdir(rpath):
-            if d in con:
-                continue
-            dpath = rpath + '/' + d
-            time.sleep(0.2)
-            num = size = 0
-            for n in os.listdir(dpath):
-                filename = dpath + '/' + n
-                fsize = os.path.getsize(filename)
-                size += fsize
-                if os.path.isdir(filename):
-                    shutil.rmtree(filename)
-                else:
-                    os.remove(filename)
-                # print('mail clear ok')
-                num += 1
-            total += size
-            count += num
-        return total, count
-
-    # 清理其它
-    def clearOther(self):
-        clearPath = [
-            {'path': '/www/server/mdserver-web', 'find': 'testDisk_'},
-            {'path': '/www/wwwlogs', 'find': 'log'},
-            {'path': '/tmp', 'find': 'panelBoot.pl'},
-            {'path': '/www/server/mdserver-web/install', 'find': '.rpm'}
-        ]
-
-        total = count = 0
-        for c in clearPath:
-            for d in os.listdir(c['path']):
-                if d.find(c['find']) == -1:
-                    continue
-                filename = c['path'] + '/' + d
-                fsize = os.path.getsize(filename)
-                total += fsize
-                if os.path.isdir(filename):
-                    shutil.rmtree(filename)
-                else:
-                    os.remove(filename)
-                count += 1
-        mw.restartWeb()
-        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):
-        # 取网络流量信息
-        try:
-            networkInfo = {}
-            # 取网络流量信息
-            # networkIo = self.psutilNetIoCounters()
-            # if not "otime" in session:
-            #     session['up'] = networkIo[0]
-            #     session['down'] = networkIo[1]
-            #     session['otime'] = time.time()
-
-            # ntime = time.time()
-            # print("source",ntime - session['otime'])
-            
-            # networkInfo['upTotal'] = networkIo[0]
-            # networkInfo['downTotal'] = networkIo[1]
-            # networkInfo['up'] = round(float(
-            #     networkIo[0] - session['up']) / (ntime - session['otime']), 2)
-            # networkInfo['down'] = round(
-            #     float(networkIo[1] - session['down']) / (ntime - session['otime']), 2)
-            # networkInfo['downPackets'] = networkIo[3]
-            # networkInfo['upPackets'] = networkIo[2]
-
-            # # print networkIo[1], session['down'], ntime, session['otime']
-            # session['up'] = networkIo[0]
-            # session['down'] = networkIo[1]
-            # session['otime'] = time.time()
-
-            networkInfo['cpu'] = self.getCpuInfo()
-            networkInfo['load'] = self.getLoadAverage()
-            networkInfo['mem'] = self.getMemInfo()
-            networkInfo['iostat'] = self.getDiskIostat()
-            networkInfo['network'] = self.getNetWorkIostat()
-
-            return networkInfo
-        except Exception as e:
-            print(mw.getTracebackInfo())
-            return None
-
-    def getNetWorkIostat(self):
-        netInfo = {}
-
-        netInfo['ALL'] = {}
-        netInfo['ALL']['up'] = 0
-        netInfo['ALL']['down'] = 0
-        netInfo['ALL']['upTotal'] = 0
-        netInfo['ALL']['downTotal'] = 0
-        netInfo['ALL']['upPackets'] = 0
-        netInfo['ALL']['downPackets'] = 0
-
-        mtime = time.time()
-        iokey = 'netstat'
-        netio = None
-        if iokey in self.cache:
-            netio = self.cache[iokey]
-
-        if not netio:
-            netio = {}
-            netio['info'] = None
-            netio['all_io'] = None
-            netio['time'] = mtime
-
-        stime = mtime - netio['time']
-        if not stime: stime = 1
-
-        # print("new:",stime)
-        netio_group = psutil.net_io_counters(pernic=True).keys()
-
-        netio_cache = netio['info']
-        allio_cache = netio['all_io']
-        if not netio_cache:
-            netio_cache = {}
-
-        netio_group_t = {}
-        for name in netio_group:
-            netInfo[name] = {}
-
-            io_data = psutil.net_io_counters(pernic=True).get(name)
-            if not name in netio_cache:
-                netio_cache[name] = io_data
-
-            netio_group_t[name] = io_data
-
-            netInfo[name]['up'] = round(float((io_data[0] - netio_cache[name][0]) / stime), 2)
-            netInfo[name]['down'] = round(float((io_data[1] - netio_cache[name][1])/ stime), 2)
-
-            netInfo[name]['upTotal'] = io_data[0]
-            netInfo[name]['downTotal'] = io_data[1]
-            netInfo[name]['upPackets'] = io_data[2]
-            netInfo[name]['downPackets'] = io_data[3]
-
-        all_io = psutil.net_io_counters()[:4]
-        if not allio_cache:
-            allio_cache = all_io
-        
-        netInfo['ALL']['up'] = round(float((all_io[0] - allio_cache[0]) /stime), 2)
-        netInfo['ALL']['down'] = round(float((all_io[1] - allio_cache[1]) /stime), 2)
-        netInfo['ALL']['upTotal'] = all_io[0]
-        netInfo['ALL']['downTotal'] = all_io[1]
-        netInfo['ALL']['upPackets'] = all_io[2]
-        netInfo['ALL']['downPackets'] = all_io[3]
-
-        self.cache[iokey] = {'info':netio_group_t,'all_io':all_io,'time':mtime}
-        return netInfo
-
-
-    def getDiskIostat(self):
-        iokey = 'iostat'
-        
-        diskInfo = {}
-        diskInfo['ALL'] = {}
-        diskInfo['ALL']['read_count'] = 0
-        diskInfo['ALL']['write_count'] = 0
-        diskInfo['ALL']['read_bytes'] = 0
-        diskInfo['ALL']['write_bytes'] = 0
-        diskInfo['ALL']['read_time'] = 0
-        diskInfo['ALL']['write_time'] = 0
-        diskInfo['ALL']['read_merged_count'] = 0
-        diskInfo['ALL']['write_merged_count'] = 0
-
-        try:
-            diskio = None
-            if iokey in self.cache:
-                diskio = self.cache[iokey]
-            
-            mtime = int(time.time())
-            if not diskio:
-                diskio = {}
-                diskio['info'] = None
-                diskio['time'] = mtime
-
-            diskio_cache = diskio['info']
-            stime = mtime - diskio['time']
-            if not stime: stime = 1
-
-            diskio_group = psutil.disk_io_counters(perdisk=True)
-            if not diskio_cache:
-                diskio_cache = diskio_group
-            
-            for disk_name in diskio_group.keys():
-                diskInfo[disk_name] = {}
-                # print('disk_name',disk_name)
-                # print(diskio_group[disk_name].write_time , diskio_cache[disk_name].write_time)
-                # print(diskio_group[disk_name].write_count , diskio_cache[disk_name].write_count)
-
-                diskInfo[disk_name]['read_count']   = int((diskio_group[disk_name].read_count - diskio_cache[disk_name].read_count) / stime)
-                diskInfo[disk_name]['write_count']  = int((diskio_group[disk_name].write_count - diskio_cache[disk_name].write_count) / stime)
-                diskInfo[disk_name]['read_bytes']   = int((diskio_group[disk_name].read_bytes - diskio_cache[disk_name].read_bytes) / stime)
-                diskInfo[disk_name]['write_bytes']  = int((diskio_group[disk_name].write_bytes - diskio_cache[disk_name].write_bytes) / stime)
-                diskInfo[disk_name]['read_time']    = int((diskio_group[disk_name].read_time - diskio_cache[disk_name].read_time) / stime)
-                diskInfo[disk_name]['write_time']   = int((diskio_group[disk_name].write_time - diskio_cache[disk_name].write_time) / stime)
-
-                if 'read_merged_count' in diskio_group[disk_name] and 'read_merged_count' in diskio_cache[disk_name]:
-                    diskInfo[disk_name]['read_merged_count'] = int((diskio_group[disk_name].read_merged_count - diskio_cache[disk_name].read_merged_count) / stime)
-                if 'write_merged_count' in diskio_group[disk_name] and 'write_merged_count' in diskio_cache[disk_name]:
-                    diskInfo[disk_name]['write_merged_count'] = int((diskio_group[disk_name].write_merged_count - diskio_cache[disk_name].write_merged_count) / stime)
-                
-                diskInfo['ALL']['read_count'] += diskInfo[disk_name]['read_count']
-                diskInfo['ALL']['write_count'] += diskInfo[disk_name]['write_count']
-                diskInfo['ALL']['read_bytes'] += diskInfo[disk_name]['read_bytes']
-                diskInfo['ALL']['write_bytes'] += diskInfo[disk_name]['write_bytes']
-                if diskInfo['ALL']['read_time'] < diskInfo[disk_name]['read_time']:
-                    diskInfo['ALL']['read_time'] = diskInfo[disk_name]['read_time']
-                if diskInfo['ALL']['write_time'] < diskInfo[disk_name]['write_time']:
-                    diskInfo['ALL']['write_time'] = diskInfo[disk_name]['write_time']
-
-                if 'read_merged_count' in diskInfo[disk_name] and 'read_merged_count' in diskInfo[disk_name]:
-                    diskInfo['ALL']['read_merged_count'] += diskInfo[disk_name]['read_merged_count']
-                if 'write_merged_count' in diskInfo[disk_name] and 'write_merged_count' in diskInfo[disk_name]:
-                    diskInfo['ALL']['write_merged_count'] += diskInfo[disk_name]['write_merged_count']
-
-            self.cache[iokey] = {'info':diskio_group,'time':mtime}
-        except Exception as e:
-            pass
-
-        return diskInfo
-
-    def getNetWorkIoData(self, start, end):
-        # 取指定时间段的网络Io
-        data = mw.M('network').dbfile('system').where("addtime>=? AND addtime<=?", (start, end)).field(
-            'id,up,down,total_up,total_down,down_packets,up_packets,addtime').order('id asc').select()
-        return self.toAddtime(data)
-
-    def getDiskIoData(self, start, end):
-        # 取指定时间段的磁盘Io
-        data = mw.M('diskio').dbfile('system').where("addtime>=? AND addtime<=?", (start, end)).field(
-            'id,read_count,write_count,read_bytes,write_bytes,read_time,write_time,addtime').order('id asc').select()
-        return self.toAddtime(data)
-
-    def getCpuIoData(self, start, end):
-        # 取指定时间段的CpuIo
-        data = mw.M('cpuio').dbfile('system').where("addtime>=? AND addtime<=?",
-                                                    (start, end)).field('id,pro,mem,addtime').order('id asc').select()
-        return self.toAddtime(data, True)
-
-    def getLoadAverageData(self, start, end):
-        data = mw.M('load_average').dbfile('system').where("addtime>=? AND addtime<=?", (
-            start, end)).field('id,pro,one,five,fifteen,addtime').order('id asc').select()
-        return self.toAddtime(data)
-
-    # 格式化addtime列
-    def toAddtime(self, data, tomem=False):
-        import time
-        if tomem:
-            import psutil
-            mPre = (psutil.virtual_memory().total / 1024 / 1024) / 100
-        length = len(data)
-        he = 1
-        if length > 100:
-            he = 1
-        if length > 1000:
-            he = 3
-        if length > 10000:
-            he = 15
-        if he == 1:
-            for i in range(length):
-                data[i]['addtime'] = time.strftime(
-                    '%m/%d %H:%M', time.localtime(float(data[i]['addtime'])))
-                if tomem and data[i]['mem'] > 100:
-                    data[i]['mem'] = data[i]['mem'] / mPre
-
-            return data
-        else:
-            count = 0
-            tmp = []
-            for value in data:
-                if count < he:
-                    count += 1
-                    continue
-                value['addtime'] = time.strftime(
-                    '%m/%d %H:%M', time.localtime(float(value['addtime'])))
-                if tomem and value['mem'] > 100:
-                    value['mem'] = value['mem'] / mPre
-                tmp.append(value)
-                count = 0
-            return tmp
-
-    def setControl(self, stype, day):
-
-        filename = 'data/control.conf'
-        stat_pl = 'data/only_netio_counters.pl'
-
-        if stype == '0':
-            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, '请等待所有安装任务完成再执行')
-            os.remove("data/system.db")
-
-            sql = db.Sql().dbfile('system')
-            csql = mw.readFile('data/sql/system.sql')
-            csql_list = csql.split(';')
-            for index in range(len(csql_list)):
-                sql.execute(csql_list[index], ())
-            return mw.returnJson(True, "监控服务已关闭")
-        else:
-            data = {}
-            if os.path.exists(filename):
-                try:
-                    data['day'] = int(mw.readFile(filename))
-                except:
-                    data['day'] = 30
-                data['status'] = True
-            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, "设置成功!")
-
-    def versionDiff(self, old, new):
-        '''
-            test 测试
-            new 有新版本
-            none 没有新版本
-        '''
-        new_list = new.split('.')
-        if len(new_list) > 3:
-            return 'test'
-
-        old_list = old.split('.')
-        ret = 'none'
-
-        isHasNew = True
-        if int(new_list[0]) == int(old_list[0]) and int(new_list[1]) == int(old_list[1]) and int(new_list[2]) == int(old_list[2]):
-            isHasNew = False
-
-        if isHasNew:
-            return 'new'
-        return ret
-
-    def getServerInfo(self):
-        import urllib.request
-        import ssl
-        upAddr = 'https://api.github.com/repos/midoks/mdserver-web/releases/latest'
-        try:
-            context = ssl._create_unverified_context()
-            req = urllib.request.urlopen(upAddr, context=context, timeout=3)
-            result = req.read().decode('utf-8')
-            version = json.loads(result)
-            return version
-        except Exception as e:
-            print('getServerInfo', e)
-        return {}
-
-    def updateServer(self, stype, version=''):
-        return mw.returnJson(False, '与后续版本差异太大,不再提供更新')
-        # 更新服务
-        try:
-            if not mw.isRestart():
-                return mw.returnJson(False, '请等待所有安装任务完成再执行!')
-
-            version_new_info = self.getServerInfo()
-            version_now = config_api.config_api().getVersion()
-
-            new_ver = version_new_info['name']
-
-            if stype == 'check':
-                if not 'name' in version_new_info:
-                    return mw.returnJson(False, '服务器数据或网络有问题!')
-
-                diff = self.versionDiff(version_now, new_ver)
-                if diff == 'new':
-                    return mw.returnJson(True, '有新版本!', new_ver)
-                elif diff == 'test':
-                    return mw.returnJson(True, '有测试版本!', new_ver)
-                else:
-                    return mw.returnJson(False, '已经是最新,无需更新!')
-
-            if stype == 'info':
-                if not 'name' in version_new_info:
-                    return mw.returnJson(False, '服务器数据有问题!')
-                diff = self.versionDiff(version_now, new_ver)
-                data = {}
-                data['version'] = new_ver
-                data['content'] = version_new_info[
-                    'body'].replace("\n", "<br/>")
-                return mw.returnJson(True, '更新信息!', data)
-
-            if stype == 'update':
-                if version == '':
-                    return mw.returnJson(False, '缺少版本信息!')
-
-                if new_ver != version:
-                    return mw.returnJson(False, '更新失败,请重试!')
-
-                toPath = mw.getRootDir() + '/temp'
-                if not os.path.exists(toPath):
-                    mw.execShell('mkdir -p ' + toPath)
-
-                newUrl = "https://github.com/midoks/mdserver-web/archive/refs/tags/" + version + ".zip"
-
-                dist_mw = toPath + '/mw.zip'
-                if not os.path.exists(dist_mw):
-                    mw.execShell(
-                        'wget --no-check-certificate -O ' + dist_mw + ' ' + newUrl)
-
-                dist_to = toPath + "/mdserver-web-" + version
-                if not os.path.exists(dist_to):
-                    os.system('unzip -o ' + toPath +
-                              '/mw.zip' + ' -d ' + toPath)
-
-                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')
-
-                update_env = '''
-#!/bin/bash
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
-
-P_VER=`python3 -V | awk '{print $2}'`
-
-if [ ! -f /www/server/mdserver-web/bin/activate ];then
-    cd /www/server/mdserver-web && python3 -m venv .
-    cd /www/server/mdserver-web && source /www/server/mdserver-web/bin/activate
-else
-    cd /www/server/mdserver-web && source /www/server/mdserver-web/bin/activate
-fi
-
-cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
-PIPSRC="https://pypi.python.org/simple"
-if [ ! -z "$cn" ];then
-    PIPSRC="https://pypi.tuna.tsinghua.edu.cn/simple"
-fi
-
-cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt -i $PIPSRC
-
-P_VER_D=`echo "$P_VER"|awk -F '.' '{print $1}'`
-P_VER_M=`echo "$P_VER"|awk -F '.' '{print $2}'`
-NEW_P_VER=${P_VER_D}.${P_VER_M}
-
-if [ -f /www/server/mdserver-web/version/r${NEW_P_VER}.txt ];then
-    cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/version/r${NEW_P_VER}.txt -i $PIPSRC
-fi
-'''
-                os.system(update_env)
-                self.restartMw()
-                return mw.returnJson(True, '安装更新成功!')
-
-            return mw.returnJson(False, '已经是最新,无需更新!')
-        except Exception as ex:
-            # print('updateServer', ex)
-            return mw.returnJson(False, "连接服务器失败!" + str(ex))
-
-    # 修复面板
-    def repPanel(self, get):
-        vp = ''
-        if mw.readFile('/www/server/mdserver-web/class/common.py').find('checkSafe') != -1:
-            vp = '_pro'
-        mw.ExecShell("wget -O update.sh " + mw.get_url() +
-                     "/install/update" + vp + ".sh && bash update.sh")
-        if hasattr(web.ctx.session, 'getCloudPlugin'):
-            del(web.ctx.session['getCloudPlugin'])
-        return True
diff --git a/class/core/task_api.py b/class/core/task_api.py
deleted file mode 100755
index 19d485e02..000000000
--- a/class/core/task_api.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 任务页操作
-# ---------------------------------------------------------------------------------
-
-
-import psutil
-import time
-import os
-import sys
-import mw
-import re
-import json
-import pwd
-
-
-from flask import request
-
-
-class task_api:
-
-    def __init__(self):
-        pass
-
-    def countApi(self):
-        c = mw.M('tasks').where("status!=?", ('1',)).count()
-        return str(c)
-
-    def listApi(self):
-
-        p = request.form.get('p', '1')
-        limit = request.form.get('limit', '10').strip()
-        search = request.form.get('search', '').strip()
-
-        start = (int(p) - 1) * int(limit)
-        limit_str = str(start) + ',' + str(limit)
-
-        _list = mw.M('tasks').where('', ()).field(
-            'id,name,type,status,addtime,start,end').limit(limit_str).order('id desc').select()
-        _ret = {}
-        _ret['data'] = _list
-
-        count = mw.M('tasks').where('', ()).count()
-        _page = {}
-        _page['count'] = count
-        _page['tojs'] = 'remind'
-        _page['p'] = p
-
-        # return data
-        _ret['count'] = count
-        _ret['page'] = mw.getPage(_page)
-        return mw.getJson(_ret)
-
-    def getExecLogApi(self):
-        file = os.getcwd() + "/tmp/panelExec.log"
-        v = mw.getLastLine(file, 100)
-        return v
-
-    def getTaskSpeedApi(self):
-        tempFile = mw.getRunDir() + '/tmp/panelExec.log'
-        freshFile = mw.getRunDir() + '/tmp/panelFresh'
-
-        find = mw.M('tasks').where('status=? OR status=?',
-                                   ('-1', '0')).field('id,type,name,execstr').find()
-        if not len(find):
-            return mw.returnJson(False, '当前没有任务队列在执行-2!')
-
-        mw.triggerTask()
-
-        data = {}
-        data['name'] = find['name']
-        data['execstr'] = find['execstr']
-        if find['type'] == 'download':
-            readLine = ""
-            for i in range(3):
-                try:
-                    readLine = mw.readFile(tempFile)
-                    if len(readLine) > 10:
-                        data['msg'] = json.loads(readLine)
-                        data['isDownload'] = True
-                        break
-                except Exception as e:
-                    if i == 2:
-                        mw.M('tasks').where("id=?", (find['id'],)).save(
-                            'status', ('0',))
-                        return mw.returnJson(False, '当前没有任务队列在执行-4:' + str(e))
-                time.sleep(0.5)
-        else:
-            data['msg'] = mw.getLastLine(tempFile, 10)
-            data['isDownload'] = False
-
-        data['task'] = mw.M('tasks').where("status!=?", ('1',)).field(
-            'id,status,name,type').order("id asc").select()
-        return mw.getJson(data)
diff --git a/class/core/vilidate.py b/class/core/vilidate.py
deleted file mode 100755
index 14cf6abfb..000000000
--- a/class/core/vilidate.py
+++ /dev/null
@@ -1,143 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 验证码操作
-# ---------------------------------------------------------------------------------
-
-
-import random
-import math
-from PIL import Image, ImageDraw, ImageFont, ImageFilter
-
-
-class vieCode:
-    __fontSize = 20  # 字体大小
-    __width = 120  # 画布宽度
-    __heigth = 45  # 画布高度
-    __length = 4  # 验证码长度
-    __draw = None  # 画布
-    __img = None  # 图片资源
-    __code = None  # 验证码字符
-    __str = None  # 自定义验证码字符集
-    __inCurve = True  # 是否画干扰线
-    __inNoise = True  # 是否画干扰点
-    __type = 2  # 验证码类型 1、纯字母  2、数字字母混合
-    __fontPatn = 'class/fonts/2.ttf'  # 字体
-
-    def GetCodeImage(self, size=80, length=4):
-        '''获取验证码图片
-           @param int size 验证码大小
-           @param int length 验证码长度
-        '''
-        # 准备基础数据
-        self.__length = length
-        self.__fontSize = size
-        self.__width = self.__fontSize * self.__length
-        self.__heigth = int(self.__fontSize * 1.5)
-
-        # 生成验证码图片
-        self.__createCode()
-        self.__createImage()
-        self.__createNoise()
-        self.__printString()
-        self.__cerateFilter()
-
-        return self.__img, self.__code
-
-    def __cerateFilter(self):
-        '''模糊处理'''
-        self.__img = self.__img.filter(ImageFilter.BLUR)
-        filter = ImageFilter.ModeFilter(8)
-        self.__img = self.__img.filter(filter)
-
-    def __createCode(self):
-        '''创建验证码字符'''
-        # 是否自定义字符集合
-        if not self.__str:
-            # 源文本
-            number = "3456789"
-            srcLetter = "qwertyuipasdfghjkzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM"
-            srcUpper = srcLetter.upper()
-            if self.__type == 1:
-                self.__str = number
-            else:
-                self.__str = srcLetter + srcUpper + number
-
-        # 构造验证码
-        self.__code = random.sample(self.__str, self.__length)
-
-    def __createImage(self):
-        '''创建画布'''
-        bgColor = (random.randint(200, 255), random.randint(
-            200, 255), random.randint(200, 255))
-        self.__img = Image.new('RGB', (self.__width, self.__heigth), bgColor)
-        self.__draw = ImageDraw.Draw(self.__img)
-
-    def __createNoise(self):
-        '''画干扰点'''
-        if not self.__inNoise:
-            return
-        font = ImageFont.truetype(self.__fontPatn, int(self.__fontSize / 1.5))
-        for i in range(5):
-            # 杂点颜色
-            noiseColor = (random.randint(150, 200), random.randint(
-                150, 200), random.randint(150, 200))
-            putStr = random.sample(self.__str, 2)
-            for j in range(2):
-                # 绘杂点
-                size = (random.randint(-10, self.__width),
-                        random.randint(-10, self.__heigth))
-                self.__draw.text(size, putStr[j], font=font, fill=noiseColor)
-        pass
-
-    def __createCurve(self):
-        '''画干扰线'''
-        if not self.__inCurve:
-            return
-        x = y = 0
-
-        # 计算曲线系数
-        a = random.uniform(1, self.__heigth / 2)
-        b = random.uniform(-self.__width / 4, self.__heigth / 4)
-        f = random.uniform(-self.__heigth / 4, self.__heigth / 4)
-        t = random.uniform(self.__heigth, self.__width * 2)
-        xend = random.randint(self.__width / 2, self.__width * 2)
-        w = (2 * math.pi) / t
-
-        # 画曲线
-        color = (random.randint(30, 150), random.randint(
-            30, 150), random.randint(30, 150))
-        for x in range(xend):
-            if w != 0:
-                for k in range(int(self.__heigth / 10)):
-                    y = a * math.sin(w * x + f) + b + self.__heigth / 2
-                    i = int(self.__fontSize / 5)
-                    while i > 0:
-                        px = x + i
-                        py = y + i + k
-                        self.__draw.point((px, py), color)
-                        i -= i
-
-    def __printString(self):
-        '''打印验证码字符串'''
-        font = ImageFont.truetype(self.__fontPatn, self.__fontSize)
-        x = 0
-        # 打印字符到画板
-        for i in range(self.__length):
-            # 设置字体随机颜色
-            color = (random.randint(30, 150), random.randint(
-                30, 150), random.randint(30, 150))
-            # 计算座标
-            x = random.uniform(self.__fontSize * i * 0.95,
-                               self.__fontSize * i * 1.1)
-            y = self.__fontSize * random.uniform(0.3, 0.5)
-            # 打印字符
-            self.__draw.text((x, y), self.__code[i], font=font, fill=color)
diff --git a/class/core/vip_api.py b/class/core/vip_api.py
deleted file mode 100644
index df4a3061b..000000000
--- a/class/core/vip_api.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# VIP用户管理
-# ---------------------------------------------------------------------------------
-
-import mw
-
-from flask import request
-import requests
-
-
-class vip_api:
-
-    api_url = 'https://wo.midoks.icu/api/wp-json/vip'
-
-    def __init__(self):
-        pass
-
-    def loginApi(self):
-        username = request.form.get('username', '')
-        password = request.form.get('password', '')
-        password = mw.aesEncrypt(password)
-
-        headers = {
-            "Content-Type": "application/x-www-form-urlencoded",
-        }
-
-        print("name:", str(username))
-        print("pwd:", str(password))
-        args = {
-            'name': username,
-            'pass': password
-        }
-        data = requests.post(self.api_url + '/v1/login',
-                             data=args, headers=headers)
-
-        print(data.text)
-
-        return mw.returnJson(False, "测试中!")
diff --git a/class/fonts/2.ttf b/class/fonts/2.ttf
deleted file mode 100755
index 3a452b68f3baa612539ad43cd427725e96f44100..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 28328
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
D<rsrC

diff --git a/class/os/README.md b/class/os/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/class/os/win32/README.md b/class/os/win32/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/class/plugin/README.md b/class/plugin/README.md
deleted file mode 100644
index a4ce3c56f..000000000
--- a/class/plugin/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-- fcgi-client.py 
-```
-https://pypi.org/project/flup6/1.1.1/#files
-```
diff --git a/class/plugin/fcgi_client.py b/class/plugin/fcgi_client.py
deleted file mode 100644
index f1e0c67e7..000000000
--- a/class/plugin/fcgi_client.py
+++ /dev/null
@@ -1,408 +0,0 @@
-# Copyright (c) 2006 Allan Saddi <allan@saddi.com>
-# 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.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
-#
-# $Id$
-#
-# Copyright (c) 2011 Vladimir Rusinov <vladimir@greenmice.info>
-
-__author__ = 'Allan Saddi <allan@saddi.com>'
-__version__ = '$Revision$'
-import sys
-import select
-import struct
-import socket
-import errno
-import types
-
-
-__all__ = ['FCGIApp']
-
-# Constants from the spec.
-FCGI_LISTENSOCK_FILENO = 0
-
-FCGI_HEADER_LEN = 8
-
-FCGI_VERSION_1 = 1
-
-FCGI_BEGIN_REQUEST = 1
-FCGI_ABORT_REQUEST = 2
-FCGI_END_REQUEST = 3
-FCGI_PARAMS = 4
-FCGI_STDIN = 5
-FCGI_STDOUT = 6
-FCGI_STDERR = 7
-FCGI_DATA = 8
-FCGI_GET_VALUES = 9
-FCGI_GET_VALUES_RESULT = 10
-FCGI_UNKNOWN_TYPE = 11
-FCGI_MAXTYPE = FCGI_UNKNOWN_TYPE
-
-FCGI_NULL_REQUEST_ID = 0
-
-FCGI_KEEP_CONN = 1
-
-FCGI_RESPONDER = 1
-FCGI_AUTHORIZER = 2
-FCGI_FILTER = 3
-
-FCGI_REQUEST_COMPLETE = 0
-FCGI_CANT_MPX_CONN = 1
-FCGI_OVERLOADED = 2
-FCGI_UNKNOWN_ROLE = 3
-
-FCGI_MAX_CONNS = 'FCGI_MAX_CONNS'
-FCGI_MAX_REQS = 'FCGI_MAX_REQS'
-FCGI_MPXS_CONNS = 'FCGI_MPXS_CONNS'
-
-FCGI_Header = '!BBHHBx'
-FCGI_BeginRequestBody = '!HB5x'
-FCGI_EndRequestBody = '!LB3x'
-FCGI_UnknownTypeBody = '!B7x'
-
-FCGI_BeginRequestBody_LEN = struct.calcsize(FCGI_BeginRequestBody)
-FCGI_EndRequestBody_LEN = struct.calcsize(FCGI_EndRequestBody)
-FCGI_UnknownTypeBody_LEN = struct.calcsize(FCGI_UnknownTypeBody)
-
-if __debug__:
-    import time
-
-    # Set non-zero to write debug output to a file.
-    DEBUG = 0
-    DEBUGLOG = '/www/server/mdserver-web/logs/fastcgi.log'
-
-    def _debug(level, msg):
-        if DEBUG < level:
-            return
-
-        try:
-            f = open(DEBUGLOG, 'a')
-            f.write('%sfcgi: %s\n' % (time.ctime()[4:-4], msg))
-            f.close()
-        except:
-            pass
-
-
-def decode_pair(s, pos=0):
-    """
-    Decodes a name/value pair.
-
-    The number of bytes decoded as well as the name/value pair
-    are returned.
-    """
-    nameLength = ord(s[pos])
-    if nameLength & 128:
-        nameLength = struct.unpack('!L', s[pos:pos + 4])[0] & 0x7fffffff
-        pos += 4
-    else:
-        pos += 1
-
-    valueLength = ord(s[pos])
-    if valueLength & 128:
-        valueLength = struct.unpack('!L', s[pos:pos + 4])[0] & 0x7fffffff
-        pos += 4
-    else:
-        pos += 1
-
-    name = s[pos:pos + nameLength]
-    pos += nameLength
-    value = s[pos:pos + valueLength]
-    pos += valueLength
-
-    return (pos, (name, value))
-
-
-def encode_pair(name, value):
-    """
-    Encodes a name/value pair.
-
-    The encoded string is returned.
-    """
-    nameLength = len(name)
-    if nameLength < 128:
-        s = chr(nameLength).encode()
-    else:
-        s = struct.pack('!L', nameLength | 0x80000000)
-
-    valueLength = len(value)
-    if valueLength < 128:
-        s += chr(valueLength).encode()
-    else:
-        s += struct.pack('!L', valueLength | 0x80000000)
-
-    return s + name + value
-
-
-class Record(object):
-    """
-    A FastCGI Record.
-
-    Used for encoding/decoding records.
-    """
-
-    def __init__(self, type=FCGI_UNKNOWN_TYPE, requestId=FCGI_NULL_REQUEST_ID):
-        self.version = FCGI_VERSION_1
-        self.type = type
-        self.requestId = requestId
-        self.contentLength = 0
-        self.paddingLength = 0
-        self.contentData = ''
-
-    def _recvall(sock, length):
-        """
-        Attempts to receive length bytes from a socket, blocking if necessary.
-        (Socket may be blocking or non-blocking.)
-        """
-        dataList = []
-        recvLen = 0
-        while length:
-            try:
-                data = sock.recv(length)
-            except socket.error as e:
-                if e[0] == errno.EAGAIN:
-                    select.select([sock], [], [])
-                    continue
-                else:
-                    raise
-            if not data:  # EOF
-                break
-            dataList.append(data)
-            dataLen = len(data)
-            recvLen += dataLen
-            length -= dataLen
-        return b''.join(dataList), recvLen
-    _recvall = staticmethod(_recvall)
-
-    def read(self, sock):
-        """Read and decode a Record from a socket."""
-        try:
-            header, length = self._recvall(sock, FCGI_HEADER_LEN)
-        except:
-            raise EOFError
-
-        if length < FCGI_HEADER_LEN:
-            raise EOFError
-
-        self.version, self.type, self.requestId, self.contentLength, \
-            self.paddingLength = struct.unpack(FCGI_Header, header)
-
-        if __debug__:
-            _debug(9, 'read: fd = %d, type = %d, requestId = %d, '
-                   'contentLength = %d' %
-                   (sock.fileno(), self.type, self.requestId,
-                    self.contentLength))
-
-        if self.contentLength:
-            try:
-                self.contentData, length = self._recvall(sock,
-                                                         self.contentLength)
-            except:
-                raise EOFError
-
-            if length < self.contentLength:
-                raise EOFError
-
-        if self.paddingLength:
-            try:
-                self._recvall(sock, self.paddingLength)
-            except:
-                raise EOFError
-
-    def _sendall(sock, data):
-        """
-        Writes data to a socket and does not return until all the data is sent.
-        """
-        length = len(data)
-        while length:
-            try:
-                sent = sock.send(data)
-            except socket.error as e:
-                if e[0] == errno.EAGAIN:
-                    select.select([], [sock], [])
-                    continue
-                else:
-                    raise
-            data = data[sent:]
-            length -= sent
-    _sendall = staticmethod(_sendall)
-
-    def write(self, sock):
-        """Encode and write a Record to a socket."""
-        self.paddingLength = -self.contentLength & 7
-
-        if __debug__:
-            _debug(9, 'write: fd = %d, type = %d, requestId = %d, '
-                   'contentLength = %d' %
-                   (sock.fileno(), self.type, self.requestId,
-                    self.contentLength))
-
-        header = struct.pack(FCGI_Header, self.version, self.type,
-                             self.requestId, self.contentLength,
-                             self.paddingLength)
-        self._sendall(sock, header)
-        if self.contentLength:
-            self._sendall(sock, self.contentData)
-        if self.paddingLength:
-            self._sendall(sock, b'\x00' * self.paddingLength)
-
-
-class FCGIApp(object):
-
-    def __init__(self, connect=None, host=None, port=None, filterEnviron=True):
-        if host is not None:
-            assert port is not None
-            connect = (host, port)
-
-        self._connect = connect
-        self._filterEnviron = filterEnviron
-
-    def __call__(self, environ, io, start_response=None):
-        # For sanity's sake, we don't care about FCGI_MPXS_CONN
-        # (connection multiplexing). For every request, we obtain a new
-        # transport socket, perform the request, then discard the socket.
-        # This is, I believe, how mod_fastcgi does things...
-
-        sock = self._getConnection()
-
-        # Since this is going to be the only request on this connection,
-        # set the request ID to 1.
-        requestId = 1
-
-        # Begin the request
-        rec = Record(FCGI_BEGIN_REQUEST, requestId)
-        rec.contentData = struct.pack(FCGI_BeginRequestBody, FCGI_RESPONDER, 0)
-        rec.contentLength = FCGI_BeginRequestBody_LEN
-        rec.write(sock)
-
-        # Filter WSGI environ and send it as FCGI_PARAMS
-        if self._filterEnviron:
-            params = self._defaultFilterEnviron(environ)
-        else:
-            params = self._lightFilterEnviron(environ)
-        # TODO: Anything not from environ that needs to be sent also?
-        # return '200 OK',[],str(params),''
-        self._fcgiParams(sock, requestId, params)
-        self._fcgiParams(sock, requestId, {})
-
-        # Transfer wsgi.input to FCGI_STDIN
-        content_length = int(environ.get('CONTENT_LENGTH') or 0)
-        s = ''
-        #io = StringIO(stdin)
-        while True:
-            if not io:
-                break
-            chunk_size = min(content_length, 4096)
-            s = io.read(chunk_size)
-            content_length -= len(s)
-            rec = Record(FCGI_STDIN, requestId)
-            rec.contentData = s
-            rec.contentLength = len(s)
-            rec.write(sock)
-            if not s:
-                break
-        # Empty FCGI_DATA stream
-        rec = Record(FCGI_DATA, requestId)
-        rec.write(sock)
-        return sock
-
-    def _getConnection(self):
-        if self._connect is not None:
-            # The simple case. Create a socket and connect to the
-            # application.
-            if isinstance(self._connect, str):
-                sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-                sock.connect(self._connect)
-            elif hasattr(socket, 'create_connection'):
-                sock = socket.create_connection(self._connect)
-            else:
-                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                sock.connect(self._connect)
-            return sock
-
-        # To be done when I have more time...
-        # , 'Launching and managing FastCGI programs not yet implemented'
-        raise NotImplementedError
-
-    def _fcgiGetValues(self, sock, vars):
-        # Construct FCGI_GET_VALUES record
-        outrec = Record(FCGI_GET_VALUES)
-        data = []
-        for name in vars:
-            data.append(encode_pair(name, ''))
-        data = ''.join(data)
-        outrec.contentData = data
-        outrec.contentLength = len(data)
-        outrec.write(sock)
-
-        # Await response
-        inrec = Record()
-        inrec.read(sock)
-        result = {}
-        if inrec.type == FCGI_GET_VALUES_RESULT:
-            pos = 0
-            while pos < inrec.contentLength:
-                pos, (name, value) = decode_pair(inrec.contentData, pos)
-                result[name] = value
-        return result
-
-    def _fcgiParams(self, sock, requestId, params):
-        rec = Record(FCGI_PARAMS, requestId)
-        data = []
-        for name, value in params.items():
-            data.append(encode_pair(name.encode(
-                'latin-1'), value.encode('latin-1')))
-        data = b''.join(data)
-        rec.contentData = data
-        rec.contentLength = len(data)
-        rec.write(sock)
-
-    _environPrefixes = ['SERVER_', 'HTTP_', 'REQUEST_', 'REMOTE_', 'PATH_',
-                        'CONTENT_', 'DOCUMENT_', 'SCRIPT_']
-    _environCopies = ['SCRIPT_NAME', 'QUERY_STRING', 'AUTH_TYPE']
-    _environRenames = []
-
-    def _defaultFilterEnviron(self, environ):
-        result = {}
-        for n in environ.keys():
-            iv = False
-            for p in self._environPrefixes:
-                if n.startswith(p):
-                    result[n] = environ[n]
-                    iv = True
-            if n in self._environCopies:
-                result[n] = environ[n]
-                iv = True
-            if n in self._environRenames:
-                result[self._environRenames[n]] = environ[n]
-                iv = True
-            if not iv:
-                result[n] = environ[n]
-
-        return result
-
-    def _lightFilterEnviron(self, environ):
-        result = {}
-        for n in environ.keys():
-            if n.upper() == n:
-                result[n] = environ[n]
-        return result
diff --git a/class/plugin/fpm.py b/class/plugin/fpm.py
deleted file mode 100644
index ed6e8058d..000000000
--- a/class/plugin/fpm.py
+++ /dev/null
@@ -1,208 +0,0 @@
-# coding:utf-8
-
-
-import json
-import os
-import time
-import re
-import sys
-import time
-import struct
-import fcgi_client
-
-FCGI_Header = '!BBHHBx'
-
-if sys.version_info[0] == 2:
-    try:
-        from cStringIO import StringIO
-    except:
-        from StringIO import StringIO
-else:
-    from io import BytesIO as StringIO
-
-
-def get_header_data(sock):
-    '''
-        @name 获取头部32KB数据
-        @param sock socketobject(fastcgi套接字对象)
-        @return bytes
-    '''
-    headers_data = b''
-    total_len = 0
-    header_len = 1024 * 128
-    while True:
-        fastcgi_header = sock.recv(8)
-        if not fastcgi_header:
-            break
-        if len(fastcgi_header) != 8:
-            headers_data += fastcgi_header
-            break
-        fast_pack = struct.unpack(FCGI_Header, fastcgi_header)
-        if fast_pack[1] == 3:
-            break
-
-        tlen = fast_pack[3]
-        while tlen > 0:
-            sd = sock.recv(tlen)
-            if not sd:
-                break
-            headers_data += sd
-            tlen -= len(sd)
-
-        total_len += fast_pack[3]
-        if fast_pack[4]:
-            sock.recv(fast_pack[4])
-        if total_len > header_len:
-            break
-    return headers_data
-
-
-def format_header_data(headers_data):
-    '''
-        @name 格式化响应头
-        @param headers_data bytes(fastcgi头部32KB数据)
-        @return status int(响应状态), headers dict(响应头), bdata bytes(格式化响应头后的多余数据)
-    '''
-    status = '200 OK'
-    headers = {}
-    pos = 0
-    while True:
-        eolpos = headers_data.find(b'\n', pos)
-        if eolpos < 0:
-            break
-        line = headers_data[pos:eolpos - 1]
-        pos = eolpos + 1
-        line = line.strip()
-        if len(line) < 2:
-            break
-        if line.find(b':') == -1:
-            continue
-        header, value = line.split(b':', 1)
-        header = header.strip()
-        value = value.strip()
-        if isinstance(header, bytes):
-            header = header.decode()
-            value = value.decode()
-        if header == 'Status':
-            status = value
-            if status.find(' ') < 0:
-                status += ' BTPanel'
-        else:
-            headers[header] = value
-    bdata = headers_data[pos:]
-    status = int(status.split(' ')[0])
-    return status, headers, bdata
-
-
-def resp_sock(sock, bdata):
-    '''
-        @name 以流的方式发送剩余数据
-        @param sock socketobject(fastcgi套接字对象)
-        @param bdata bytes(格式化响应头后的多余数据)
-        @return yield bytes
-    '''
-    # 发送除响应头以外的多余头部数据
-    yield bdata
-    while True:
-        fastcgi_header = sock.recv(8)
-        if not fastcgi_header:
-            break
-        if len(fastcgi_header) != 8:
-            yield fastcgi_header
-            break
-        fast_pack = struct.unpack(FCGI_Header, fastcgi_header)
-        if fast_pack[1] == 3:
-            break
-        tlen = fast_pack[3]
-        while tlen > 0:
-            sd = sock.recv(tlen)
-            if not sd:
-                break
-            tlen -= len(sd)
-            if sd:
-                yield sd
-
-        if fast_pack[4]:
-            sock.recv(fast_pack[4])
-    sock.close()
-
-
-class fpm(object):
-
-    def __init__(self, sock=None, document_root='', last_path=''):
-        '''
-            @name 实例化FPM对象
-            @param sock string(unixsocket路径)
-            @param document_root string(PHP文档根目录)
-            @return FPM
-        '''
-        if sock:
-            self.fcgi_sock = sock
-            if document_root[-1:] != '/':
-                document_root += '/'
-            self.document_root = document_root
-            self.last_path = last_path
-
-    def load_url_public(self, url, content=b'', method='GET', content_type='application/x-www-form-urlencoded'):
-        '''
-            @name 转发URL到PHP-FPM 公共
-            @param url string(URI地址)
-            @param content stream(POST数据io对象)
-            @return fastcgi-socket
-        '''
-        fcgi = fcgi_client.FCGIApp(connect=self.fcgi_sock)
-        try:
-            script_name, query_string = url.split('?')
-        except ValueError:
-            script_name = url
-            query_string = ''
-
-        content_length = len(content)
-        if content:
-            content = StringIO(content)
-
-        env = {
-            'SCRIPT_FILENAME': '%s%s' % (self.document_root, script_name),
-            'QUERY_STRING': query_string,
-            'REQUEST_METHOD': method,
-            'SCRIPT_NAME': self.last_path + script_name,
-            'REQUEST_URI': url,
-            'GATEWAY_INTERFACE': 'CGI/1.1',
-            'SERVER_SOFTWARE': 'MW-Panel',
-            'REDIRECT_STATUS': '200',
-            'CONTENT_TYPE': content_type,
-            'CONTENT_LENGTH': str(content_length),
-            'DOCUMENT_URI': script_name,
-            'DOCUMENT_ROOT': self.document_root,
-            'SERVER_PROTOCOL': 'HTTP/1.1',
-            'REMOTE_ADDR': '127.0.0.1',
-            'REMOTE_PORT': '7200',
-            'SERVER_ADDR': '127.0.0.1',
-            'SERVER_PORT': '80',
-            'SERVER_NAME': 'MW-Panel'
-        }
-
-        fpm_sock = fcgi(env, content)
-
-        _data = b''
-        while True:
-            fastcgi_header = fpm_sock.recv(8)
-            if not fastcgi_header:
-                break
-            if len(fastcgi_header) != 8:
-                _data += fastcgi_header
-                break
-            fast_pack = struct.unpack(FCGI_Header, fastcgi_header)
-            if fast_pack[1] == 3:
-                break
-            tlen = fast_pack[3]
-            while tlen > 0:
-                sd = fpm_sock.recv(tlen)
-                if not sd:
-                    break
-                tlen -= len(sd)
-                _data += sd
-            if fast_pack[4]:
-                fpm_sock.recv(fast_pack[4])
-        status, headers, data = format_header_data(_data)
-        return data
diff --git a/class/plugin/memail.py b/class/plugin/memail.py
deleted file mode 100644
index 6ba7b62d5..000000000
--- a/class/plugin/memail.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# coding: utf-8
-
-import smtplib
-
-from email import encoders
-from email.header import Header
-from email.mime.text import MIMEText
-from email.utils import parseaddr, formataddr
-
-
-def _format_addr(s):
-    name, addr = parseaddr(s)
-    return formataddr((Header(name, 'utf-8').encode(), addr))
-
-
-def send(smtp_host, smtp_port, username, password, to_mail, subject, content):
-
-    smtp = smtplib.SMTP()
-    smtp.connect(smtp_host, port=smtp_port)
-    smtp.login(user=username, password=password)
-
-    msg = MIMEText(content, 'plain', 'utf-8')
-    msg['From'] = _format_addr(username)
-    msg['To'] = _format_addr(to_mail)
-    msg['Subject'] = Header(subject, 'utf-8').encode()
-
-    smtp.sendmail(from_addr=username, to_addrs=to_mail, msg=msg.as_string())
-    return True
-
-
-def sendSSL(smtp_host, smtp_port, username, password, to_mail, subject, content):
-
-    smtp = smtplib.SMTP_SSL(smtp_host, port=smtp_port)
-    smtp.login(user=username, password=password)
-
-    msg = MIMEText(content, 'plain', 'utf-8')
-    msg['From'] = _format_addr(username)
-    msg['To'] = _format_addr(to_mail)
-    msg['Subject'] = Header(subject, 'utf-8').encode()
-
-    smtp.sendmail(from_addr=username, to_addrs=to_mail, msg=msg.as_string())
-    smtp.quit()
-    return True
diff --git a/class/plugin/orm.py b/class/plugin/orm.py
deleted file mode 100755
index 89ba623e9..000000000
--- a/class/plugin/orm.py
+++ /dev/null
@@ -1,140 +0,0 @@
-# coding: utf-8
-
-import re
-import os
-import sys
-
-import pymysql.cursors
-
-
-class ORM:
-    __DB_PASS = None
-    __DB_USER = 'root'
-    __DB_PORT = 3306
-    __DB_NAME = ''
-    __DB_HOST = 'localhost'
-    __DB_CONN = None
-    __DB_CUR = None
-    __DB_ERR = None
-    __DB_CNF = '/etc/my.cnf'
-    __DB_TIMEOUT=1
-    __DB_SOCKET = '/www/server/mysql/mysql.sock'
-
-    __DB_CHARSET = "utf8"
-
-    def __Conn(self):
-        # print(self.__DB_HOST, self.__DB_USER, self.__DB_PASS, self.__DB_SOCKET)
-        '''连接数据库'''
-        try:
-
-            if self.__DB_HOST != 'localhost':
-                try:
-                    self.__DB_CONN = pymysql.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                    database=self.__DB_NAME,
-                                                    port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=self.__DB_TIMEOUT,
-                                                    cursorclass=pymysql.cursors.DictCursor)
-                except Exception as e:
-                    self.__DB_CONN = pymysql.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                    database=self.__DB_NAME,
-                                                    port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=self.__DB_TIMEOUT,
-                                                    cursorclass=pymysql.cursors.DictCursor)
-            elif os.path.exists(self.__DB_SOCKET):
-                try:
-                    self.__DB_CONN = pymysql.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                     database=self.__DB_NAME,
-                                                     port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=self.__DB_TIMEOUT,
-                                                     unix_socket=self.__DB_SOCKET, cursorclass=pymysql.cursors.DictCursor)
-                except Exception as e:
-                    self.__DB_HOST = '127.0.0.1'
-                    self.__DB_CONN = pymysql.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                     database=self.__DB_NAME,
-                                                     port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=self.__DB_TIMEOUT,
-                                                     unix_socket=self.__DB_SOCKET, cursorclass=pymysql.cursors.DictCursor)
-            else:
-                try:
-                    self.__DB_CONN = pymysql.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                     database=self.__DB_NAME,
-                                                     port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=self.__DB_TIMEOUT,
-                                                     cursorclass=pymysql.cursors.DictCursor)
-                except Exception as e:
-                    self.__DB_HOST = '127.0.0.1'
-                    self.__DB_CONN = pymysql.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                     database=self.__DB_NAME,
-                                                     port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=self.__DB_TIMEOUT,
-                                                     cursorclass=pymysql.cursors.DictCursor)
-
-            self.__DB_CUR = self.__DB_CONN.cursor()
-            return True
-        except Exception as e:
-            self.__DB_ERR = e
-            return False
-
-    def setDbConf(self, conf):
-        self.__DB_CNF = conf
-
-    def setSocket(self, sock):
-        self.__DB_SOCKET = sock
-
-    def setCharset(self, charset):
-        self.__DB_CHARSET = charset
-
-    def setHost(self, host):
-        self.__DB_HOST = host
-
-    def setPort(self, port):
-        self.__DB_PORT = port
-
-    def setUser(self, user):
-        self.__DB_USER = user
-
-    def setPwd(self, pwd):
-        self.__DB_PASS = pwd
-
-    def getPwd(self):
-        return self.__DB_PASS
-
-    def setTimeout(self, timeout = 1):
-        self.__DB_TIMEOUT = timeout
-        return True
-
-    def setDbName(self, name):
-        self.__DB_NAME = name
-
-    def execute(self, sql):
-        # 执行SQL语句返回受影响行
-        if not self.__Conn():
-            return self.__DB_ERR
-        try:
-            result = self.__DB_CUR.execute(sql)
-            self.__DB_CONN.commit()
-            self.__Close()
-            return result
-        except Exception as ex:
-            return ex
-
-    def ping(self):
-        try:
-            self.__DB_CONN.ping()
-        except Exception as e:
-            print(e)
-        return True
-
-    def query(self, sql):
-        # 执行SQL语句返回数据集
-        if not self.__Conn():
-            return self.__DB_ERR
-        try:
-            self.__DB_CUR.execute(sql)
-            result = self.__DB_CUR.fetchall()
-            # print(result)
-            # 将元组转换成列表
-            # data = map(list, result)
-            self.__Close()
-            return result
-        except Exception as ex:
-            return ex
-
-    def __Close(self):
-        # 关闭连接
-        self.__DB_CUR.close()
-        self.__DB_CONN.close()
diff --git a/class/plugin/ormDb.py b/class/plugin/ormDb.py
deleted file mode 100755
index 14624ccc0..000000000
--- a/class/plugin/ormDb.py
+++ /dev/null
@@ -1,115 +0,0 @@
-# coding: utf-8
-
-import re
-import os
-import sys
-
-
-class ORM:
-    __DB_PASS = None
-    __DB_USER = 'root'
-    __DB_PORT = 3306
-    __DB_HOST = 'localhost'
-    __DB_CONN = None
-    __DB_CUR = None
-    __DB_ERR = None
-    __DB_CNF = '/etc/my.cnf'
-
-    __DB_SOCKET = '/www/server/mysql/mysql.sock'
-    __DB_CHARSET = 'utf8'
-
-    def __Conn(self):
-        '''连接MYSQL数据库'''
-        try:
-
-            try:
-                import MySQLdb
-            except Exception as ex:
-                self.__DB_ERR = ex
-                return False
-
-            # print(self.__DB_HOST)
-            # print(self.__DB_USER)
-            # print(self.__DB_PASS)
-            # print(self.__DB_PORT)
-            # print(self.__DB_CHARSET)
-            # print(self.__DB_SOCKET)
-            if os.path.exists(self.__DB_SOCKET):
-                try:
-                    self.__DB_CONN = MySQLdb.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                     port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=1, unix_socket=self.__DB_SOCKET)
-                except Exception as e:
-                    print(e)
-                    self.__DB_HOST = '127.0.0.1'
-                    self.__DB_CONN = MySQLdb.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                     port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=1, unix_socket=self.__DB_SOCKET)
-            else:
-                try:
-                    self.__DB_CONN = MySQLdb.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                     port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=1)
-                except Exception as e:
-                    self.__DB_HOST = '127.0.0.1'
-                    self.__DB_CONN = MySQLdb.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                     port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=1)
-
-            self.__DB_CUR = self.__DB_CONN.cursor()
-
-            return True
-        except MySQLdb.Error as e:
-            self.__DB_ERR = e
-            return False
-
-    def setDbConf(self, conf):
-        self.__DB_CNF = conf
-
-    def setSocket(self, sock):
-        self.__DB_SOCKET = sock
-
-    def setCharset(self, charset):
-        self.__DB_CHARSET = charset
-
-    def setPort(self, port):
-        self.__DB_PORT = port
-
-    def setPwd(self, pwd):
-        self.__DB_PASS = pwd
-
-    def getPwd(self):
-        return self.__DB_PASS
-
-    def setDbName(self, name):
-        self.__DB_NAME = name
-
-    def setUser(self, user):
-        self.__DB_USER = user
-
-    def execute(self, sql):
-        # 执行SQL语句返回受影响行
-        if not self.__Conn():
-            return self.__DB_ERR
-        try:
-            result = self.__DB_CUR.execute(sql)
-            self.__DB_CONN.commit()
-            self.__Close()
-            return result
-        except Exception as ex:
-            return ex
-
-    def query(self, sql):
-        # 执行SQL语句返回数据集
-        if not self.__Conn():
-            return self.__DB_ERR
-        try:
-            self.__DB_CUR.execute(sql)
-            result = self.__DB_CUR.fetchall()
-            # 将元组转换成列表
-            data = map(list, result)
-            self.__Close()
-            return data
-        except Exception as ex:
-            return ex
-
-    # 关闭连接
-    def __Close(self):
-        self.__DB_CUR.close()
-        self.__DB_CONN.close()

From 371b6651f0ff5a1fc4adb1d69c34987e67598892 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 04:21:09 +0800
Subject: [PATCH 559/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index 2b3f1fe25..9163ad25d 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -37,8 +37,8 @@ def init_cmd():
     # initd
     if os.path.exists('/etc/rc.d/init.d'):
         initd_bin = '/etc/rc.d/init.d/mw'
-        if not os.access(initd_bin, os.W_OK):
-            return False
+        # if not os.access(initd_bin, os.W_OK):
+        #     return False
         shutil.copyfile(script_bin, initd_bin)
         mw.execShell('chmod +x ' + initd_bin)
         # 加入自启动
@@ -46,8 +46,8 @@ def init_cmd():
 
     if os.path.exists('/etc/init.d'):
         initd_bin = '/etc/init.d/mw'
-        if not os.access(initd_bin, os.W_OK):
-            return False
+        # if not os.access(initd_bin, os.W_OK):
+        #     return False
         shutil.copyfile(script_bin, initd_bin)
         mw.execShell('chmod +x ' + initd_bin)
         # 加入自启动

From 30e2ea56c8833f7ab5386df932554f5cd882fba4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 13:34:58 +0800
Subject: [PATCH 560/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index 9163ad25d..a307b494a 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -39,8 +39,9 @@ def init_cmd():
         initd_bin = '/etc/rc.d/init.d/mw'
         # if not os.access(initd_bin, os.W_OK):
         #     return False
-        shutil.copyfile(script_bin, initd_bin)
-        mw.execShell('chmod +x ' + initd_bin)
+        if not os.path.exists(initd_bin):
+            shutil.copyfile(script_bin, initd_bin)
+            mw.execShell('chmod +x ' + initd_bin)
         # 加入自启动
         mw.execShell('which chkconfig && chkconfig --add mw')
 
@@ -48,8 +49,9 @@ def init_cmd():
         initd_bin = '/etc/init.d/mw'
         # if not os.access(initd_bin, os.W_OK):
         #     return False
-        shutil.copyfile(script_bin, initd_bin)
-        mw.execShell('chmod +x ' + initd_bin)
+        if not os.path.exists(initd_bin):
+            shutil.copyfile(script_bin, initd_bin)
+            mw.execShell('chmod +x ' + initd_bin)
         # 加入自启动
         mw.execShell('which update-rc.d && update-rc.d -f mw defaults')
     return True
\ No newline at end of file

From 485b0605b410a4d2d897418dcf83afaef81f96b0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 13:52:36 +0800
Subject: [PATCH 561/965] Update python-app-op.yml

---
 .github/workflows/python-app-op.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-app-op.yml b/.github/workflows/python-app-op.yml
index a1818efc2..bab069fd1 100644
--- a/.github/workflows/python-app-op.yml
+++ b/.github/workflows/python-app-op.yml
@@ -35,4 +35,4 @@ jobs:
     - name: Start DEBUG
       run: |
         cd web && gunicorn -c setting.py app:app
-        python3 task.py &
+        python3 panel_task.py &

From 37f424448489bf1b69ab626833a9dd73aec81a1e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 13:53:32 +0800
Subject: [PATCH 562/965] update

---
 .github/workflows/python-app-mysql55.yml | 4 ++--
 .github/workflows/python-app-mysql56.yml | 4 ++--
 .github/workflows/python-app-mysql57.yml | 4 ++--
 .github/workflows/python-app-mysql80.yml | 4 ++--
 .github/workflows/python-app-php.yml     | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/python-app-mysql55.yml b/.github/workflows/python-app-mysql55.yml
index ec8a8e6a1..a1866f13a 100644
--- a/.github/workflows/python-app-mysql55.yml
+++ b/.github/workflows/python-app-mysql55.yml
@@ -34,5 +34,5 @@ jobs:
         cd /www/server/mdserver-web/plugins/mysql && sudo bash install.sh install 5.5
     - name: Start DEBUG
       run: |
-        gunicorn -c setting.py app:app
-        python3 task.py &
+        cd web && gunicorn -c setting.py app:app
+        python3 panel_task.py &
diff --git a/.github/workflows/python-app-mysql56.yml b/.github/workflows/python-app-mysql56.yml
index 75b168717..d4b4a2618 100644
--- a/.github/workflows/python-app-mysql56.yml
+++ b/.github/workflows/python-app-mysql56.yml
@@ -34,5 +34,5 @@ jobs:
         cd /www/server/mdserver-web/plugins/mysql && sudo bash install.sh install 5.6
     - name: Start DEBUG
       run: |
-        gunicorn -c setting.py app:app
-        python3 task.py &
+        cd web && gunicorn -c setting.py app:app
+        python3 panel_task.py &
diff --git a/.github/workflows/python-app-mysql57.yml b/.github/workflows/python-app-mysql57.yml
index 18f1a4f90..fa5871402 100644
--- a/.github/workflows/python-app-mysql57.yml
+++ b/.github/workflows/python-app-mysql57.yml
@@ -34,5 +34,5 @@ jobs:
         cd /www/server/mdserver-web/plugins/mysql && sudo bash install.sh install 5.7
     - name: Start DEBUG
       run: |
-        gunicorn -c setting.py app:app
-        python3 task.py &
+        cd web && gunicorn -c setting.py app:app
+        python3 panel_task.py &
diff --git a/.github/workflows/python-app-mysql80.yml b/.github/workflows/python-app-mysql80.yml
index 2f2799bdd..c51d2ff7a 100644
--- a/.github/workflows/python-app-mysql80.yml
+++ b/.github/workflows/python-app-mysql80.yml
@@ -34,5 +34,5 @@ jobs:
         cd /www/server/mdserver-web/plugins/mysql && sudo bash install.sh install 8.0
     - name: Start DEBUG
       run: |
-        gunicorn -c setting.py app:app
-        python3 task.py &
+        cd web && gunicorn -c setting.py app:app
+        python3 panel_task.py &
diff --git a/.github/workflows/python-app-php.yml b/.github/workflows/python-app-php.yml
index 790544208..5e505ade1 100644
--- a/.github/workflows/python-app-php.yml
+++ b/.github/workflows/python-app-php.yml
@@ -64,5 +64,5 @@ jobs:
         cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 81
     - name: Start DEBUG
       run: |
-        gunicorn -c setting.py app:app
-        python3 task.py &
+        cd web && gunicorn -c setting.py app:app
+        python3 panel_task.py &

From 52e9ff38fad8bcb93dcd2c42b647eb5bd89ee5f1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 14:54:25 +0800
Subject: [PATCH 563/965] Update phplib.conf

---
 plugins/php-apt/versions/phplib.conf | 36 ++++++++++++++--------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/plugins/php-apt/versions/phplib.conf b/plugins/php-apt/versions/phplib.conf
index d64cde6b0..e9b22403a 100755
--- a/plugins/php-apt/versions/phplib.conf
+++ b/plugins/php-apt/versions/phplib.conf
@@ -1,4 +1,22 @@
 [
+    {
+        "name": "ionCube",
+        "versions": [
+            "56",
+            "70",
+            "71",
+            "72",
+            "73",
+            "74",
+            "81",
+            "82",
+            "83"
+        ],
+        "type": "脚本解密",
+        "msg": "用于解密ionCube Encoder加密脚本!",
+        "shell": "ioncube.sh",
+        "check": "ioncube"
+    },
     {
         "name": "pdo",
         "versions": [
@@ -126,24 +144,6 @@
         "shell": "zend_optimizer.sh",
         "check": "ZendOptimizer"
     },
-    {
-        "name": "ionCube",
-        "versions": [
-            "56",
-            "70",
-            "71",
-            "72",
-            "73",
-            "74",
-            "81",
-            "82",
-            "83"
-        ],
-        "type": "脚本解密",
-        "msg": "用于解密ionCube Encoder加密脚本!",
-        "shell": "ioncube.sh",
-        "check": "ioncube"
-    },
     {
         "name": "opcache",
         "versions": [

From afb9f430b35e8b8f27c5578fd7f69a6ccda37aa1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 15:04:12 +0800
Subject: [PATCH 564/965] update

---
 plugins/php-apt/versions/common/sg11.sh | 138 ++++++++++++++++++++++++
 plugins/php-apt/versions/lib.sh         |   2 +
 plugins/php-apt/versions/phplib.conf    |  19 ++++
 3 files changed, 159 insertions(+)
 create mode 100644 plugins/php-apt/versions/common/sg11.sh

diff --git a/plugins/php-apt/versions/common/sg11.sh b/plugins/php-apt/versions/common/sg11.sh
new file mode 100644
index 000000000..8bcf13f33
--- /dev/null
+++ b/plugins/php-apt/versions/common/sg11.sh
@@ -0,0 +1,138 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH=$PATH:/opt/homebrew/bin
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sourcePath=${serverPath}/source/php
+
+# https://www.sourceguardian.com/loaders.html
+
+# support 52-81
+
+LIBNAME=sg11
+LIBV=0
+sysName=`uname`
+actionType=$1
+version=$2
+SG_VER=${version:0:1}.${version:1:2}
+
+
+LIB_PATH_NAME=lib/php
+if [ -d $serverPath/php/${version}/lib64 ];then
+	LIB_PATH_NAME=lib64
+fi
+
+NON_ZTS_FILENAME=`ls $serverPath/php/${version}/${LIB_PATH_NAME}/extensions | grep no-debug-non-zts`
+extFile=$serverPath/php/${version}/${LIB_PATH_NAME}/extensions/${NON_ZTS_FILENAME}/${LIBNAME}.so
+
+if [ "$sysName" == "Darwin" ];then
+	BAK='_bak'
+else
+	BAK=''
+fi
+
+
+Install_lib()
+{
+	bash ${rootPath}/scripts/getos.sh
+	OSNAME=`cat ${rootPath}/data/osname.pl`
+	if [ "$OSNAME" == 'macos' ];then
+		VERSION_ID=none
+	else
+		VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+	fi
+	
+	echo "${OSNAME}:${VERSION_ID}"
+
+	DEFAULT_OSNAME=linux-x86_64
+	SUFFIX_NAME=lin
+	if [ "$OSNAME" == 'macos' ];then
+		DEFAULT_OSNAME=macosx
+		SUFFIX_NAME=dar
+	fi
+
+	isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"`
+	if [ "${isInstall}" != "" ];then
+		echo "php-$version 已安装${LIBNAME},请选择其它版本!"
+		return
+	fi
+	
+	
+	if [ ! -f "$extFile" ];then
+
+		php_lib=$sourcePath/php_lib
+		mkdir -p $php_lib
+		mkdir -p $php_lib/sg11
+		if [ ! -f $php_lib/sg11_loaders.tar.bz2 ];then
+			curl -sSLo $php_lib/sg11_loaders.tar.bz2 https://www.sourceguardian.com/loaders/download/loaders.tar.bz2
+			echo "cd $php_lib && tar -jxvf $php_lib/sg11_loaders.tar.bz2 -C $php_lib/sg11"
+			cd $php_lib && tar -jxvf $php_lib/sg11_loaders.tar.bz2 -C $php_lib/sg11
+		fi 
+
+
+		if [ ! -d $php_lib/sg11/macosx ];then
+			cd $php_lib && tar -jxvf $php_lib/sg11_loaders.tar.bz2 -C $php_lib/sg11
+		fi
+		cd $php_lib/sg11
+		# echo "mv $php_lib/sg11/${DEFAULT_OSNAME}/ixed.${SG_VER}.lin $extFile"
+		if [ -f $php_lib/sg11/${DEFAULT_OSNAME}/ixed.${SG_VER}.${SUFFIX_NAME} ];then
+			cp -rf $php_lib/sg11/${DEFAULT_OSNAME}/ixed.${SG_VER}.${SUFFIX_NAME} $extFile
+		else
+			echo 'Not supported temporarily'
+			exit
+		fi
+
+		if [ "$OSNAME" == 'macos' ];then
+			xattr -c * $extFile
+		fi
+	fi
+	
+	if [ ! -f "$extFile" ];then
+		echo "ERROR!"
+		return
+	fi
+
+	echo "" >> $serverPath/php/$version/etc/php.ini
+	echo "[${LIBNAME}]" >> $serverPath/php/$version/etc/php.ini
+	echo "extension=${LIBNAME}.so" >> $serverPath/php/$version/etc/php.ini
+
+	cd  ${curPath} && bash ${rootPath}/plugins/php/versions/lib.sh $version restart
+	echo '==========================================================='
+	echo 'successful!'
+}
+
+
+Uninstall_lib()
+{
+	if [ ! -f "$serverPath/php/$version/bin/php-config" ];then
+		echo "php$version 未安装,请选择其它版本!"
+		return
+	fi
+	
+	if [ ! -f "$extFile" ];then
+		echo "php$version 未安装${LIBNAME},请选择其它版本!"
+		echo "php-$vphp not install ${LIBNAME}, Plese select other version!"
+		return
+	fi
+	
+	sed -i $BAK "/${LIBNAME}.so/d" $serverPath/php/$version/etc/php.ini
+	sed -i $BAK "/${LIBNAME}/d" $serverPath/php/$version/etc/php.ini
+		
+	rm -f $extFile
+
+	cd  ${curPath} && bash ${rootPath}/plugins/php/versions/lib.sh $version restart
+	echo '==============================================='
+	echo 'successful!'
+}
+
+
+if [ "$actionType" == 'install' ];then
+	Install_lib
+elif [ "$actionType" == 'uninstall' ];then
+	Uninstall_lib
+fi
\ No newline at end of file
diff --git a/plugins/php-apt/versions/lib.sh b/plugins/php-apt/versions/lib.sh
index fed6f11ee..0822ff7c4 100644
--- a/plugins/php-apt/versions/lib.sh
+++ b/plugins/php-apt/versions/lib.sh
@@ -30,4 +30,6 @@ elif [[ "$version" == '8.2' ]]; then
 	echo '20220829'
 elif [[ "$version" == '8.3' ]]; then
 	echo '20230831'
+elif [[ "$version" == '8.4' ]]; then
+	echo '20240924'
 fi
\ No newline at end of file
diff --git a/plugins/php-apt/versions/phplib.conf b/plugins/php-apt/versions/phplib.conf
index e9b22403a..6060939eb 100755
--- a/plugins/php-apt/versions/phplib.conf
+++ b/plugins/php-apt/versions/phplib.conf
@@ -1,4 +1,23 @@
 [
+    {
+        "name": "sg11",
+        "versions": [
+            "56",
+            "70",
+            "71",
+            "72",
+            "73",
+            "74",
+            "80",
+            "81",
+            "82",
+            "83"
+        ],
+        "type": "脚本解密",
+        "msg": "用于解密SG11加密脚本!",
+        "shell": "sg11.sh",
+        "check": "sg11.so"
+    },
     {
         "name": "ionCube",
         "versions": [

From 1972df1f2d37dfa7474a46d8a86ef93f395c6800 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 15:20:29 +0800
Subject: [PATCH 565/965] update

---
 plugins/php-apt/versions/common/phalcon.sh |  2 +
 plugins/php-apt/versions/common/sg11.sh    | 46 +++++++++-------------
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/plugins/php-apt/versions/common/phalcon.sh b/plugins/php-apt/versions/common/phalcon.sh
index 17d4b232c..758ee0961 100755
--- a/plugins/php-apt/versions/common/phalcon.sh
+++ b/plugins/php-apt/versions/common/phalcon.sh
@@ -50,6 +50,8 @@ elif [[ "$version" == '8.2' ]]; then
 	CMD="${CMD}phalcon5"
 elif [[ "$version" == '8.3' ]]; then
 	CMD="${CMD}phalcon5"
+elif [[ "$version" == '8.4' ]]; then
+	CMD="${CMD}phalcon5"
 fi
 
 $CMD
diff --git a/plugins/php-apt/versions/common/sg11.sh b/plugins/php-apt/versions/common/sg11.sh
index 8bcf13f33..d1e7dbbd3 100644
--- a/plugins/php-apt/versions/common/sg11.sh
+++ b/plugins/php-apt/versions/common/sg11.sh
@@ -21,14 +21,8 @@ actionType=$1
 version=$2
 SG_VER=${version:0:1}.${version:1:2}
 
-
-LIB_PATH_NAME=lib/php
-if [ -d $serverPath/php/${version}/lib64 ];then
-	LIB_PATH_NAME=lib64
-fi
-
-NON_ZTS_FILENAME=`ls $serverPath/php/${version}/${LIB_PATH_NAME}/extensions | grep no-debug-non-zts`
-extFile=$serverPath/php/${version}/${LIB_PATH_NAME}/extensions/${NON_ZTS_FILENAME}/${LIBNAME}.so
+extVer=`bash $curPath/lib.sh $version`
+extFile=/usr/lib/php/${extVer}/${LIBNAME}.so
 
 if [ "$sysName" == "Darwin" ];then
 	BAK='_bak'
@@ -36,6 +30,7 @@ else
 	BAK=''
 fi
 
+SORT_LIBNAME="10-${LIBNAME}"
 
 Install_lib()
 {
@@ -56,7 +51,7 @@ Install_lib()
 		SUFFIX_NAME=dar
 	fi
 
-	isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"`
+	isInstall=`cat /etc/php/${version}/fpm/conf.d/* | grep -v '^;' |tr -s '\n' |grep "${LIBNAME}.so"`
 	if [ "${isInstall}" != "" ];then
 		echo "php-$version 已安装${LIBNAME},请选择其它版本!"
 		return
@@ -97,11 +92,11 @@ Install_lib()
 		return
 	fi
 
-	echo "" >> $serverPath/php/$version/etc/php.ini
-	echo "[${LIBNAME}]" >> $serverPath/php/$version/etc/php.ini
-	echo "extension=${LIBNAME}.so" >> $serverPath/php/$version/etc/php.ini
-
-	cd  ${curPath} && bash ${rootPath}/plugins/php/versions/lib.sh $version restart
+	echo  "" >> /etc/php/${version}/fpm/conf.d/${SORT_LIBNAME}.ini
+	echo  "[${LIBNAME}]" >> /etc/php/${version}/fpm/conf.d/${SORT_LIBNAME}.ini
+	echo "extension=${LIBNAME}.so" >> /etc/php/${version}/fpm/conf.d/${SORT_LIBNAME}.ini
+	
+	systemctl restart php${version}-fpm 
 	echo '==========================================================='
 	echo 'successful!'
 }
@@ -109,23 +104,18 @@ Install_lib()
 
 Uninstall_lib()
 {
-	if [ ! -f "$serverPath/php/$version/bin/php-config" ];then
-		echo "php$version 未安装,请选择其它版本!"
+	if [ ! -f "/usr/bin/php-config${version}" ];then
+		echo "php-$version 未安装,请选择其它版本!"
 		return
 	fi
-	
-	if [ ! -f "$extFile" ];then
-		echo "php$version 未安装${LIBNAME},请选择其它版本!"
-		echo "php-$vphp not install ${LIBNAME}, Plese select other version!"
-		return
-	fi
-	
-	sed -i $BAK "/${LIBNAME}.so/d" $serverPath/php/$version/etc/php.ini
-	sed -i $BAK "/${LIBNAME}/d" $serverPath/php/$version/etc/php.ini
-		
-	rm -f $extFile
 
-	cd  ${curPath} && bash ${rootPath}/plugins/php/versions/lib.sh $version restart
+	
+	if [ -f /etc/php/${version}/fpm/conf.d/${SORT_LIBNAME}.ini ];then
+		rm -rf /etc/php/${version}/fpm/conf.d/${SORT_LIBNAME}.ini
+		rm -rf $extFile
+	fi
+
+	systemctl restart php${version}-fpm 
 	echo '==============================================='
 	echo 'successful!'
 }

From 9276dd1bb8d57d74dfa562eccbb3e212554926b8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 15:23:03 +0800
Subject: [PATCH 566/965] Update sg11.sh

---
 plugins/php-apt/versions/common/sg11.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/plugins/php-apt/versions/common/sg11.sh b/plugins/php-apt/versions/common/sg11.sh
index d1e7dbbd3..d2f98c6f0 100644
--- a/plugins/php-apt/versions/common/sg11.sh
+++ b/plugins/php-apt/versions/common/sg11.sh
@@ -34,15 +34,6 @@ SORT_LIBNAME="10-${LIBNAME}"
 
 Install_lib()
 {
-	bash ${rootPath}/scripts/getos.sh
-	OSNAME=`cat ${rootPath}/data/osname.pl`
-	if [ "$OSNAME" == 'macos' ];then
-		VERSION_ID=none
-	else
-		VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
-	fi
-	
-	echo "${OSNAME}:${VERSION_ID}"
 
 	DEFAULT_OSNAME=linux-x86_64
 	SUFFIX_NAME=lin

From 446e39fb6866dd568ff8f679d4d1f45a1761b45c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 15:42:57 +0800
Subject: [PATCH 567/965] Update sg11.sh

---
 plugins/php-apt/versions/common/sg11.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/php-apt/versions/common/sg11.sh b/plugins/php-apt/versions/common/sg11.sh
index d2f98c6f0..a0ad40cee 100644
--- a/plugins/php-apt/versions/common/sg11.sh
+++ b/plugins/php-apt/versions/common/sg11.sh
@@ -6,7 +6,6 @@ curPath=`pwd`
 rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
-rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source/php
 
@@ -19,7 +18,8 @@ LIBV=0
 sysName=`uname`
 actionType=$1
 version=$2
-SG_VER=${version:0:1}.${version:1:2}
+# SG_VER=${version:0:1}.${version:1:2}
+SG_VER=${version}
 
 extVer=`bash $curPath/lib.sh $version`
 extFile=/usr/lib/php/${extVer}/${LIBNAME}.so
@@ -34,6 +34,10 @@ SORT_LIBNAME="10-${LIBNAME}"
 
 Install_lib()
 {
+	bash ${rootPath}/scripts/getos.sh
+	OSNAME=`cat ${rootPath}/data/osname.pl`
+
+	echo "${OSNAME}:${VERSION_ID}"
 
 	DEFAULT_OSNAME=linux-x86_64
 	SUFFIX_NAME=lin

From cb794a946aac02a409fcdf070865c5a8694fad16 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 15:48:17 +0800
Subject: [PATCH 568/965] Update sg11.sh

---
 plugins/php-apt/versions/common/sg11.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/php-apt/versions/common/sg11.sh b/plugins/php-apt/versions/common/sg11.sh
index a0ad40cee..e10e2d3bf 100644
--- a/plugins/php-apt/versions/common/sg11.sh
+++ b/plugins/php-apt/versions/common/sg11.sh
@@ -37,7 +37,7 @@ Install_lib()
 	bash ${rootPath}/scripts/getos.sh
 	OSNAME=`cat ${rootPath}/data/osname.pl`
 
-	echo "${OSNAME}:${VERSION_ID}"
+	echo "${OSNAME}"
 
 	DEFAULT_OSNAME=linux-x86_64
 	SUFFIX_NAME=lin

From 5b0e8ad2da95dfc45901052bf42db6e03ed46bf4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 16:32:05 +0800
Subject: [PATCH 569/965] update

---
 web/admin/setting/__init__.py       |  1 +
 web/admin/setting/panel_bookmark.py | 69 +++++++++++++++++++++++++++++
 web/admin/setting/setting.py        |  6 ---
 web/static/app/public.js            | 31 ++++++-------
 4 files changed, 86 insertions(+), 21 deletions(-)
 create mode 100644 web/admin/setting/panel_bookmark.py

diff --git a/web/admin/setting/__init__.py b/web/admin/setting/__init__.py
index f6183dbaf..1dfb93200 100644
--- a/web/admin/setting/__init__.py
+++ b/web/admin/setting/__init__.py
@@ -19,4 +19,5 @@ from .notify_tgbot import *
 from .app import *
 
 from .panel_ssl import *
+from .panel_bookmark import *
 
diff --git a/web/admin/setting/panel_bookmark.py b/web/admin/setting/panel_bookmark.py
new file mode 100644
index 000000000..cf8c83598
--- /dev/null
+++ b/web/admin/setting/panel_bookmark.py
@@ -0,0 +1,69 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import re
+import json
+import os
+import time
+
+from flask import Blueprint, render_template
+from flask import request
+
+from admin import session
+from admin.user_login_check import panel_login_required
+
+import core.mw as mw
+import utils.config as utils_config
+
+from utils.setting import setting as MwSetting
+
+from .setting import blueprint
+import thisdb
+
+# 添加面板书签
+@blueprint.route('/add_panel_info', endpoint='add_panel_info', methods=['POST'])
+@panel_login_required
+def add_panel_info():
+    title = request.form.get('title', '')
+    url = request.form.get('url', '')
+    username = request.form.get('username', '')
+    password = request.form.get('password', '')
+
+    # 校验是还是重复
+    isAdd = mw.M('panel').where('title=? OR url=?', (title, url)).count()
+    if isAdd:
+        return mw.returnData(False, '备注或面板地址重复!')
+    isRe = mw.M('panel').add('title,url,username,password,click,add_time',
+            (title, url, username, password, 0, int(time.time())))
+    if isRe:
+        return mw.returnData(True, '添加成功!')
+    return mw.returnData(False, '添加失败!')
+
+# 取面板书签列表
+@blueprint.route('/get_panel_list', endpoint='get_panel_list', methods=['GET','POST'])
+@panel_login_required
+def get_panel_list():
+    data = mw.M('panel').field('id,title,url,username,password,click,add_time').order('click desc').select()
+    return data
+
+# 删除面板书签
+@blueprint.route('/del_panel_info', endpoint='del_panel_info', methods=['GET','POST'])
+@panel_login_required
+def del_panel_info():
+    panel_id = request.form.get('id', '')
+    isExists = mw.M('panel').where('id=?', (panel_id,)).count()
+    if not isExists:
+        return mw.returnData(False, '指定面板资料不存在!')
+    mw.M('panel').where('id=?', (panel_id,)).delete()
+    return mw.returnData(True, '删除成功!')
+
+
+
+
diff --git a/web/admin/setting/setting.py b/web/admin/setting/setting.py
index 6f07c3e60..df1eee5fa 100644
--- a/web/admin/setting/setting.py
+++ b/web/admin/setting/setting.py
@@ -32,12 +32,6 @@ def index():
     name = thisdb.getOption('template', default='default')
     return render_template('%s/setting.html' % name)
 
-@blueprint.route('/get_panel_list', endpoint='get_panel_list', methods=['POST'])
-@panel_login_required
-def get_panel_list():
-    return []
-
-
 # 设置面板名称
 @blueprint.route('/set_webname', endpoint='set_webname', methods=['POST'])
 @panel_login_required
diff --git a/web/static/app/public.js b/web/static/app/public.js
index d0df5768d..942a33ec3 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1138,7 +1138,7 @@ function listOrder(skey,type,obj){
 //获取关联列表
 function getPanelList(){
 	var con ='';
-	$.post("/config/get_panel_list",function(rdata){
+	$.post("/setting/get_panel_list",function(rdata){
 		for(var i=0; i<rdata.length; i++){
 			con +='<h3 class="mypcip mypcipnew" style="opacity:.6" data-url="'+rdata[i].url+'" data-user="'+rdata[i].username+'" data-pw="'+rdata[i].password+'">\
 				<span class="f14 cw">'+rdata[i].title+'</span>\
@@ -1203,7 +1203,7 @@ function bindPanel(a,type,ip,btid,url,user,pw){
 	if(pw == undefined) pw="";
 	if(ip == undefined) ip="";
 	if(a == 1) {
-		var gurl = "/config/add_panel_info";
+		var gurl = "/setting/add_panel_info";
 		var btaddress = $("#btaddress").val();
 		if(!btaddress.match(/^(http|https)+:\/\/([\w-]+\.)+[\w-]+:\d+/)){
 			layer.msg('面板地址格式不正确，示例：<p>http://192.168.0.1:8888</p>',{icon:5,time:5000});
@@ -1218,7 +1218,7 @@ function bindPanel(a,type,ip,btid,url,user,pw){
 			return;
 		}
 		if(type=="c"){
-			gurl = "/config/set_panel_info";
+			gurl = "/setting/set_panel_info";
 			data = data+"&id="+btid;
 		}
 		$.post(gurl, data, function(b) {
@@ -1276,7 +1276,7 @@ function bindPanel(a,type,ip,btid,url,user,pw){
 }
 //删除快捷登录
 function bindPaneldel(id){
-	$.post("/config/del_panel_info","id="+id,function(rdata){
+	$.post("/setting/del_panel_info","id="+id,function(rdata){
 		layer.closeAll();
 		layer.msg(rdata.msg,{icon:rdata.status?1:2});
 		getPanelList();
@@ -1309,6 +1309,7 @@ function getSpeed(sele){
 		},1000);
 	},'json');
 }
+
 //消息盒子
 function messageBox() {
 	layer.open({
@@ -1318,17 +1319,17 @@ function messageBox() {
 		closeBtn: 1,
 		shadeClose: false,
 		content: '<div class="bt-form">\
-					<div class="bt-w-main">\
-						<div class="bt-w-menu">\
-							<p class="bgw" id="taskList" onclick="tasklist()">任务列表(<span class="task_count">0</span>)</p>\
-							<p onclick="remind()">消息列表(<span class="msg_count">0</span>)</p>\
-							<p onclick="execLog()">执行日志</p>\
-						</div>\
-						<div class="bt-w-con pd15">\
-							<div class="taskcon"></div>\
-						</div>\
-					</div>\
-				</div>'
+			<div class="bt-w-main">\
+				<div class="bt-w-menu">\
+					<p class="bgw" id="taskList" onclick="tasklist()">任务列表(<span class="task_count">0</span>)</p>\
+					<p onclick="remind()">消息列表(<span class="msg_count">0</span>)</p>\
+					<p onclick="execLog()">执行日志</p>\
+				</div>\
+				<div class="bt-w-con pd15">\
+					<div class="taskcon"></div>\
+				</div>\
+			</div>\
+		</div>'
 	});
 	$(".bt-w-menu p").click(function(){
 		$(this).addClass("bgw").siblings().removeClass("bgw");

From b22f2407195e206a865af6389d9fbf451284ce1e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 16:57:29 +0800
Subject: [PATCH 570/965] Update public.js

---
 web/static/app/public.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/web/static/app/public.js b/web/static/app/public.js
index 942a33ec3..941b95d4e 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1152,10 +1152,13 @@ function getPanelList(){
 		},function(){
 			$(this).css("opacity",".6");
 		}).click(function(){
-			$("#btpanelform").remove();
+			// $("#btpanelform").remove();
 			var murl = $(this).attr("data-url");
 			var user = $(this).attr("data-user");
 			var pw = $(this).attr("data-pw");
+
+			const now_url = new URL(murl)
+			// console.log(murl,user,pw,now_url.origin);
 			layer.open({
 				type: 2,
 				title: false,
@@ -1165,21 +1168,23 @@ function getPanelList(){
 				offset: 'rb', //右下角弹出
 				time: 5, //2秒后自动关闭
 				anim: 2,
-				content: [murl+'/login', 'no']
+				content: [murl, 'no']
 			});
-			var loginForm ='<div id="btpanelform" style="display:none"><form id="toBtpanel" action="'+murl+'/do_login" method="post" target="btpfrom">\
+			// 
+			var loginForm ='<div id="btpanelform" style="display:none"><form id="toBtpanel" action="'+now_url.origin+'/do_login" method="post" target="btpfrom">\
 				<input name="username" id="btp_username" value="'+user+'" type="text">\
 				<input name="password" id="btp_password" value="'+pw+'" type="password">\
-				<input name="code" id="bt_code" value="12345" type="text">\
+				<input name="code" id="bt_code" value="" type="text">\
 			</form><iframe name="btpfrom" src=""></iframe></div>';
 			$("body").append(loginForm);
+			// console.log($("btpanelform").html());
 			layer.msg('正在打开面板...',{icon:16,shade: [0.3, '#000'],time:1000});
 			setTimeout(function(){
 				$("#toBtpanel").submit();
-			},500);
+			},1000);
 			setTimeout(function(){
 				window.open(murl);
-			},1000);
+			},2000);
 		});
 		$(".btedit").click(function(e){
 			e.stopPropagation();

From 9365139430c3a67a49e5c04b7744a8f39faf1923 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 17:12:39 +0800
Subject: [PATCH 571/965] Update public.js

---
 web/static/app/public.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/static/app/public.js b/web/static/app/public.js
index 941b95d4e..2c9f9abcb 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1170,10 +1170,11 @@ function getPanelList(){
 				anim: 2,
 				content: [murl, 'no']
 			});
+			// window.open(murl);
 			// 
 			var loginForm ='<div id="btpanelform" style="display:none"><form id="toBtpanel" action="'+now_url.origin+'/do_login" method="post" target="btpfrom">\
-				<input name="username" id="btp_username" value="'+user+'" type="text">\
-				<input name="password" id="btp_password" value="'+pw+'" type="password">\
+				<input name="username" value="'+user+'" type="text">\
+				<input name="password" value="'+pw+'" type="password">\
 				<input name="code" id="bt_code" value="" type="text">\
 			</form><iframe name="btpfrom" src=""></iframe></div>';
 			$("body").append(loginForm);

From 56055000d96d14987f96ae2624ac8f293694ecaf Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 17:22:31 +0800
Subject: [PATCH 572/965] Update public.js

---
 web/static/app/public.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/static/app/public.js b/web/static/app/public.js
index 2c9f9abcb..18261a3fe 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1152,7 +1152,7 @@ function getPanelList(){
 		},function(){
 			$(this).css("opacity",".6");
 		}).click(function(){
-			// $("#btpanelform").remove();
+			// $("#panel_form").remove();
 			var murl = $(this).attr("data-url");
 			var user = $(this).attr("data-user");
 			var pw = $(this).attr("data-pw");
@@ -1172,13 +1172,13 @@ function getPanelList(){
 			});
 			// window.open(murl);
 			// 
-			var loginForm ='<div id="btpanelform" style="display:none"><form id="toBtpanel" action="'+now_url.origin+'/do_login" method="post" target="btpfrom">\
+			var loginForm ='<div id="panel_form" style="display:none"><form id="toBtpanel" action="'+now_url.origin+'/do_login" method="post" target="btpfrom">\
 				<input name="username" value="'+user+'" type="text">\
 				<input name="password" value="'+pw+'" type="password">\
 				<input name="code" id="bt_code" value="" type="text">\
 			</form><iframe name="btpfrom" src=""></iframe></div>';
 			$("body").append(loginForm);
-			// console.log($("btpanelform").html());
+			// console.log($("panel_form").html());
 			layer.msg('正在打开面板...',{icon:16,shade: [0.3, '#000'],time:1000});
 			setTimeout(function(){
 				$("#toBtpanel").submit();

From 1e4989857e79e22d0d955d231da21731a3f751d3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 17:42:52 +0800
Subject: [PATCH 573/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index a3e8ed7f7..0acac6104 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.4
+APP_SMALL_VERSION = 0.5
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From fe68bf722665f4e418128e417d269c287dd3635c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 20:22:19 +0800
Subject: [PATCH 574/965] update

---
 web/admin/__init__.py    | 3 ++-
 web/static/app/public.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index c9bc598fd..72e447af6 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -130,7 +130,8 @@ def requestAfter(response):
 
 @app.errorhandler(404)
 def page_unauthorized(error):
-    return render_template_string('404 not found', error_info=error), 404
+    return redirect('/', code=302)
+    # return render_template_string('404 not found', error_info=error), 404
 
 
 # 设置模板全局变量
diff --git a/web/static/app/public.js b/web/static/app/public.js
index 18261a3fe..4ace1649f 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1140,7 +1140,7 @@ function getPanelList(){
 	var con ='';
 	$.post("/setting/get_panel_list",function(rdata){
 		for(var i=0; i<rdata.length; i++){
-			con +='<h3 class="mypcip mypcipnew" style="opacity:.6" data-url="'+rdata[i].url+'" data-user="'+rdata[i].username+'" data-pw="'+rdata[i].password+'">\
+			con +='<h3 class="mypcip mypcipnew" style="opacity:.6;cursor: pointer;" data-url="'+rdata[i].url+'" data-user="'+rdata[i].username+'" data-pw="'+rdata[i].password+'">\
 				<span class="f14 cw">'+rdata[i].title+'</span>\
 				<em class="btedit" onclick="bindPanel(0,\'c\',\''+rdata[i].title+'\',\''+rdata[i].id+'\',\''+rdata[i].url+'\',\''+rdata[i].username+'\',\''+rdata[i].password+'\')"></em>\
 				</h3>';

From 5b92f109b90cd24796174108de48ba5228e285fd Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 20:22:46 +0800
Subject: [PATCH 575/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index 0acac6104..ffe400f04 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.5
+APP_SMALL_VERSION = 0.1
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From 34b435ffca8eef6eb1082b2a589da03f7bc40029 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 20:24:57 +0800
Subject: [PATCH 576/965] update

---
 web/admin/__init__.py | 1 +
 web/core/mw.py        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 72e447af6..322ad8338 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -130,6 +130,7 @@ def requestAfter(response):
 
 @app.errorhandler(404)
 def page_unauthorized(error):
+    from flask import redirect
     return redirect('/', code=302)
     # return render_template_string('404 not found', error_info=error), 404
 
diff --git a/web/core/mw.py b/web/core/mw.py
index 8b74195aa..0e9e15288 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -483,7 +483,7 @@ def checkDomainPanel():
             return redirect(to, code=302)
         return False
     else:
-        print(current_host.strip().lower(), domain.strip().lower())
+        # print(current_host.strip().lower(), domain.strip().lower())
         if current_host.strip().lower() != domain.strip().lower():
             to = scheme + "://" + domain + ":" + str(port)
             return redirect(to, code=302)

From f561a1da4fe6855a55a9b62968482be661b44716 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 20:29:41 +0800
Subject: [PATCH 577/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 1919765b3..8461a0df0 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -106,7 +106,7 @@ mw_stop_task()
 {
     if [ -f ${PANEL_DIR}/logs/panel_task.lock ];then
         echo -e "\033[32mthe task is running and cannot be stopped\033[0m"
-        exit 0
+        return 0
     fi
 
     echo -e "stopping mw-tasks... \c";

From 2b0dfcd4601f1b4dbdd11621dc3c07906bd1d7d4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 20:33:49 +0800
Subject: [PATCH 578/965] Update panel_tools.py

---
 panel_tools.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index 18709a8d9..c3834e0e5 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -43,6 +43,8 @@ def mw_input_cmd(msg):
 
 
 def mwcli(mw_input=0):
+    panel_dir = mw.getPanelDir()
+
     raw_tip = "======================================================"
     if not mw_input:
         print("===============mdserver-web cli tools=================")
@@ -139,7 +141,7 @@ def mwcli(mw_input=0):
             os.system(INIT_CMD + " unbind_ssl")
             print("|-解除面板SSL绑定成功")
     elif mw_input == 23:
-        listen_ipv6 = 'data/ipv6.pl'
+        listen_ipv6 = panel_dir + '/data/ipv6.pl'
         if not os.path.exists(listen_ipv6):
             mw.writeFile(listen_ipv6,'True')
             os.system(INIT_CMD + " restart")
@@ -147,7 +149,7 @@ def mwcli(mw_input=0):
         else:
             print("|-已开启IPv6支持!")
     elif mw_input == 24:
-        listen_ipv6 = 'data/ipv6.pl'
+        listen_ipv6 = panel_dir + '/data/ipv6.pl'
         if not os.path.exists(listen_ipv6):
             print("|-已关闭IPv6支持!")
         else:
@@ -181,7 +183,7 @@ def mwcli(mw_input=0):
         if not run_cmd:
             mw.echoInfo("未检测到防火墙!")
     elif mw_input == 100:
-        php_conf = mw.getPanelDir() + '/plugins/php/info.json'
+        php_conf = panel_dir + '/plugins/php/info.json'
         if os.path.exists(php_conf):
             cont = mw.readFile(php_conf)
             cont = re.sub("\"53\"", "\"52\",\"53\"", cont)
@@ -189,7 +191,7 @@ def mwcli(mw_input=0):
             mw.writeFile(php_conf, cont)
             mw.echoInfo("执行PHP52显示成功!")
     elif mw_input == 101:
-        php_conf = mw.getPanelDir() + '/plugins/php/info.json'
+        php_conf = panel_dir + '/plugins/php/info.json'
         if os.path.exists(php_conf):
             cont = mw.readFile(php_conf)
             cont = re.sub("\"52\",", "", cont)

From 91e3900d126072e6331e7a5f8449937b6a939a8b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 20:38:13 +0800
Subject: [PATCH 579/965] Update panel_tools.py

---
 panel_tools.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index c3834e0e5..e4ad47398 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -102,7 +102,7 @@ def mwcli(mw_input=0):
         in_port_int = int(in_port.strip())
         if in_port_int < 65536 and in_port_int > 0:
             MwFirewall.instance().addAcceptPort(in_port, 'WEB面板[TOOLS修改]', 'port')
-            panel_port = mw.getPanelDir() + '/data/port.pl'
+            panel_port = panel_dir + '/data/port.pl'
             mw.writeFile(panel_port, in_port)
             os.system(INIT_CMD + " restart_panel")
             os.system(INIT_CMD + " default")
@@ -121,23 +121,25 @@ def mwcli(mw_input=0):
         input_user = mw_input_cmd("请输入新的面板用户名(>=5位)：")
         set_panel_username(input_user.strip())
     elif mw_input == 13:
-        os.system('tail -100 ' + mw.getPanelDir() + '/logs/panel_error.log')
+        os.system('tail -100 ' + panel_dir + '/logs/panel_error.log')
     elif mw_input == 20:
-        basic_auth = 'data/basic_auth.json'
-        if os.path.exists(basic_auth):
-            os.remove(basic_auth)
+        basic_auth = thisdb.getOptionByJson('basic_auth', default={'open':False})
+        if basic_auth['open']:
+            basic_auth['open'] = False
+            thisdb.setOption('basic_auth', json.dumps(basic_auth))
             os.system(INIT_CMD + " restart")
             print("|-关闭basic_auth成功")
     elif mw_input == 21:
-        bind_domain = 'data/bind_domain.pl'
-        if os.path.exists(bind_domain):
-            os.remove(bind_domain)
+        panel_domain = thisdb.getOption('panel_domain', default='')
+        if panel_domain != '':
+            thisdb.setOption('panel_domain', '')
             os.system(INIT_CMD + " unbind_domain")
             print("|-解除域名绑定成功")
     elif mw_input == 22:
-        ssl_choose = 'ssl/choose.pl'
-        if os.path.exists(ssl_choose):
-            os.remove(ssl_choose)
+        panel_ssl = thisdb.getOptionByJson('panel_ssl', default={'open':False})
+        if panel_ssl['open']:
+            panel_ssl['open'] = False
+            thisdb.setOption('panel_ssl', json.dumps(panel_ssl))
             os.system(INIT_CMD + " unbind_ssl")
             print("|-解除面板SSL绑定成功")
     elif mw_input == 23:

From 404a38d990ef6c640bfb16ec35ada2ad3d176a3a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 20:42:21 +0800
Subject: [PATCH 580/965] update

---
 panel_tools.py        | 10 ++++++++++
 scripts/init.d/mw.tpl |  6 +-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index e4ad47398..f8bd22402 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -277,6 +277,14 @@ def getServerIp():
     print(ip[0])
 
 
+def getPanelSslType():
+    scheme = 'http'
+    panel_ssl = thisdb.getOptionByJson('panel_ssl', default={'open':False})
+    if panel_ssl['open']:
+        scheme = 'https'
+    return scheme
+
+
 def main():
     if len(sys.argv) == 1:
         print('ERROR: Parameter error!')
@@ -297,6 +305,8 @@ def main():
         show_panel_adminpath()
     elif method == 'getServerIp':
         getServerIp()
+    elif method == 'panel_ssl_type':
+        print(getPanelSslType())
     elif method == "cli":
         clinum = 0
         try:
diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 8461a0df0..c6868db1c 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -521,11 +521,7 @@ mw_clean_lib(){
 mw_default(){
     cd ${PANEL_DIR}
     port=7200
-    scheme=http
-
-    if [ -f ${PANEL_DIR}/ssl/choose.pl ];then
-        scheme=https
-    fi
+    scheme=$(python3 ${PANEL_DIR}/panel_tools.py panel_ssl_type)
     
     if [ -f ${PANEL_DIR}/data/port.pl ];then
         port=$(cat ${PANEL_DIR}/data/port.pl)

From 6088386e51950c9298baf66e9a826b0af8dd58c5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 20:47:39 +0800
Subject: [PATCH 581/965] update

---
 panel_tools.py        | 10 ++++++++--
 scripts/init.d/mw.tpl |  5 ++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index f8bd22402..b766c60f7 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -274,7 +274,8 @@ def getServerIp():
     #     "curl --insecure -{} -sS --connect-timeout 5 -m 60 https://v6r.ipip.net/?format=text".format(version))
     ip = mw.execShell(
         "curl --insecure -{} -sS --connect-timeout 5 -m 60 https://ip.cachecha.com/?format=text".format(version))
-    print(ip[0])
+    # print(ip[0])
+    return ip[0]
 
 
 def getPanelSslType():
@@ -284,6 +285,9 @@ def getPanelSslType():
         scheme = 'https'
     return scheme
 
+def getPanelBindDomain():
+    return thisdb.getOption('panel_domain', default='')
+
 
 def main():
     if len(sys.argv) == 1:
@@ -304,9 +308,11 @@ def main():
     elif method == 'admin_path':
         show_panel_adminpath()
     elif method == 'getServerIp':
-        getServerIp()
+        print(getServerIp())
     elif method == 'panel_ssl_type':
         print(getPanelSslType())
+    elif method == 'panel_bind_domain':
+        print(getPanelBindDomain())
     elif method == "cli":
         clinum = 0
         try:
diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index c6868db1c..05decb89b 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -534,9 +534,8 @@ mw_default(){
 
     password=$(cat ${PANEL_DIR}/data/default.pl)
 
-    if [ -f ${PANEL_DIR}/data/domain.conf ];then
-        address=$(cat ${PANEL_DIR}/data/domain.conf)
-    fi
+    panel_bind_domain=$(python3 ${PANEL_DIR}/panel_tools.py panel_bind_domain)
+    print(panel_bind_domain)
 
     admin_path=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py admin_path)
     if [ "$address" == "" ];then

From b538e646bda75bcc3b7047256eb4fdfec9ce00aa Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 20:48:37 +0800
Subject: [PATCH 582/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 05decb89b..0b6df208e 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -535,7 +535,7 @@ mw_default(){
     password=$(cat ${PANEL_DIR}/data/default.pl)
 
     panel_bind_domain=$(python3 ${PANEL_DIR}/panel_tools.py panel_bind_domain)
-    print(panel_bind_domain)
+    echo "panel_bind_domain:$panel_bind_domain"
 
     admin_path=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py admin_path)
     if [ "$address" == "" ];then

From 99de06abc094eca1c6fe84e29aa11ee441d3cf47 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 20:59:32 +0800
Subject: [PATCH 583/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 0b6df208e..3958f402f 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -534,9 +534,6 @@ mw_default(){
 
     password=$(cat ${PANEL_DIR}/data/default.pl)
 
-    panel_bind_domain=$(python3 ${PANEL_DIR}/panel_tools.py panel_bind_domain)
-    echo "panel_bind_domain:$panel_bind_domain"
-
     admin_path=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py admin_path)
     if [ "$address" == "" ];then
         v4=$(python3 ${PANEL_DIR}/panel_tools.py getServerIp 4)
@@ -569,6 +566,11 @@ mw_default(){
         address="MW-PANEL-URL: ${scheme}://$address:$port$admin_path"
     fi
 
+    panel_bind_domain=$(python3 ${PANEL_DIR}/panel_tools.py panel_bind_domain)
+    if [ "$panel_bind_domain" != "" ];then
+        address="${address}\nMW-PANEL-URL: ${scheme}://$panel_bind_domain:$port$admin_path"
+    fi
+
     show_panel_ip="$port|"
     echo -e "=================================================================="
     echo -e "\033[32mMW-PANEL DEFAULT INFO!\033[0m"

From a7a06ea7bfbbf6f41e06178790bb960287ef75ce Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 20:59:45 +0800
Subject: [PATCH 584/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 3958f402f..fc3ab50d8 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -568,7 +568,7 @@ mw_default(){
 
     panel_bind_domain=$(python3 ${PANEL_DIR}/panel_tools.py panel_bind_domain)
     if [ "$panel_bind_domain" != "" ];then
-        address="${address}\nMW-PANEL-URL: ${scheme}://$panel_bind_domain:$port$admin_path"
+        address="MW-PANEL-URL: ${scheme}://$panel_bind_domain:$port$admin_path\n${address}"
     fi
 
     show_panel_ip="$port|"

From ffa16648aea93ff5bfe6ac1d6578cc925d3fa3b2 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 20:59:59 +0800
Subject: [PATCH 585/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index fc3ab50d8..2876421a0 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -566,6 +566,7 @@ mw_default(){
         address="MW-PANEL-URL: ${scheme}://$address:$port$admin_path"
     fi
 
+    # bind domain check
     panel_bind_domain=$(python3 ${PANEL_DIR}/panel_tools.py panel_bind_domain)
     if [ "$panel_bind_domain" != "" ];then
         address="MW-PANEL-URL: ${scheme}://$panel_bind_domain:$port$admin_path\n${address}"

From caa9b598d008e33b04cb3577bf94ae1541f5c142 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 21:26:58 +0800
Subject: [PATCH 586/965] update

---
 web/admin/dashboard/dashboard.py |  7 ++++
 web/static/app/public.js         | 68 +++++++++++++++++++-------------
 2 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/web/admin/dashboard/dashboard.py b/web/admin/dashboard/dashboard.py
index 4fac21077..3e9390971 100644
--- a/web/admin/dashboard/dashboard.py
+++ b/web/admin/dashboard/dashboard.py
@@ -35,6 +35,13 @@ def index():
 # 安全路径
 @blueprint.route('/<path>',endpoint='admin_safe_path',methods=['GET'])
 def admin_safe_path(path):
+
+    login = request.args.get('login', '')
+    if login != '':
+        print(login)
+        return '123'
+
+
     db_path = thisdb.getOption('admin_path')
     name = thisdb.getOption('template', default='default')
     if isLogined():
diff --git a/web/static/app/public.js b/web/static/app/public.js
index 4ace1649f..263fe12b4 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1157,35 +1157,49 @@ function getPanelList(){
 			var user = $(this).attr("data-user");
 			var pw = $(this).attr("data-pw");
 
-			const now_url = new URL(murl)
-			// console.log(murl,user,pw,now_url.origin);
-			layer.open({
-				type: 2,
-				title: false,
-			 	closeBtn: 0, //不显示关闭按钮
-				shade: [0],
-				area: ['340px', '215px'],
-				offset: 'rb', //右下角弹出
-				time: 5, //2秒后自动关闭
-				anim: 2,
-				content: [murl, 'no']
-			});
+			var random_str = getRandomString(8);
+
+			var timestamp = Date.parse(new Date());
+			var data = {
+				'rand':random_str,
+				'username':user,
+				'password':pw,
+				'time':timestamp
+			};
+
+
+			data_json =JSON.stringify(data);
+			login_args = base64_encode(data_json);
+
+			endpoint_url = murl + '?login='+login_args;
+			window.open(endpoint_url);
+			// layer.open({
+			// 	type: 2,
+			// 	title: false,
+			//  	closeBtn: 0, //不显示关闭按钮
+			// 	shade: [0],
+			// 	area: ['340px', '215px'],
+			// 	offset: 'rb', //右下角弹出
+			// 	time: 5, //2秒后自动关闭
+			// 	anim: 2,
+			// 	content: [murl, 'no']
+			// });
 			// window.open(murl);
 			// 
-			var loginForm ='<div id="panel_form" style="display:none"><form id="toBtpanel" action="'+now_url.origin+'/do_login" method="post" target="btpfrom">\
-				<input name="username" value="'+user+'" type="text">\
-				<input name="password" value="'+pw+'" type="password">\
-				<input name="code" id="bt_code" value="" type="text">\
-			</form><iframe name="btpfrom" src=""></iframe></div>';
-			$("body").append(loginForm);
-			// console.log($("panel_form").html());
-			layer.msg('正在打开面板...',{icon:16,shade: [0.3, '#000'],time:1000});
-			setTimeout(function(){
-				$("#toBtpanel").submit();
-			},1000);
-			setTimeout(function(){
-				window.open(murl);
-			},2000);
+			// var loginForm ='<div id="panel_form" style="display:none"><form id="toBtpanel" action="'+now_url.origin+'/do_login" method="post" target="btpfrom">\
+			// 	<input name="username" value="'+user+'" type="text">\
+			// 	<input name="password" value="'+pw+'" type="password">\
+			// 	<input name="code" id="bt_code" value="" type="text">\
+			// </form><iframe name="btpfrom" src=""></iframe></div>';
+			// $("body").append(loginForm);
+			// // console.log($("panel_form").html());
+			// layer.msg('正在打开面板...',{icon:16,shade: [0.3, '#000'],time:1000});
+			// setTimeout(function(){
+			// 	$("#toBtpanel").submit();
+			// },1000);
+			// setTimeout(function(){
+			// 	window.open(murl);
+			// },2000);
 		});
 		$(".btedit").click(function(e){
 			e.stopPropagation();

From c562f9481dd2089c0273a0ff1aa7f4e7b2e6aab3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 21:39:49 +0800
Subject: [PATCH 587/965] Update dashboard.py

---
 web/admin/dashboard/dashboard.py | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/web/admin/dashboard/dashboard.py b/web/admin/dashboard/dashboard.py
index 3e9390971..2d16d3a69 100644
--- a/web/admin/dashboard/dashboard.py
+++ b/web/admin/dashboard/dashboard.py
@@ -35,12 +35,32 @@ def index():
 # 安全路径
 @blueprint.route('/<path>',endpoint='admin_safe_path',methods=['GET'])
 def admin_safe_path(path):
-
     login = request.args.get('login', '')
     if login != '':
-        print(login)
-        return '123'
+        import base64
+        import json
+        try:
+            # print(login)
+            login_str = base64.b64decode(login)
+            login_str = login_str.decode('utf-8')
+            data = json.loads(login_str)
 
+            info = thisdb.getUserByName(data['username'])
+            if info is None:
+                return redirect('/')
+
+            if info['password'] != mw.md5(data['password']):
+                return redirect('/')
+
+            session['login'] = True
+            session['username'] = info['name']
+            session['overdue'] = int(time.time()) + 7 * 24 * 60 * 60
+
+            thisdb.updateUserLoginTime()
+            return redirect('/')
+        except Exception as e:
+            pass
+        
 
     db_path = thisdb.getOption('admin_path')
     name = thisdb.getOption('template', default='default')

From bad42e8e484c9bfcec8a8b9ca4d6ec04fbac3e23 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 21:40:02 +0800
Subject: [PATCH 588/965] Update dashboard.py

---
 web/admin/dashboard/dashboard.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/admin/dashboard/dashboard.py b/web/admin/dashboard/dashboard.py
index 2d16d3a69..4c0239b07 100644
--- a/web/admin/dashboard/dashboard.py
+++ b/web/admin/dashboard/dashboard.py
@@ -66,7 +66,6 @@ def admin_safe_path(path):
     name = thisdb.getOption('template', default='default')
     if isLogined():
        return redirect('/')
-    # print(db_path,path)
     if db_path == path:
         return render_template('%s/login.html' % name)
 

From fde9da1af5f09edd525c8ff2a874b2c01bddac39 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 21:45:16 +0800
Subject: [PATCH 589/965] Update dashboard.py

---
 web/admin/dashboard/dashboard.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/web/admin/dashboard/dashboard.py b/web/admin/dashboard/dashboard.py
index 4c0239b07..750e4a050 100644
--- a/web/admin/dashboard/dashboard.py
+++ b/web/admin/dashboard/dashboard.py
@@ -39,12 +39,20 @@ def admin_safe_path(path):
     if login != '':
         import base64
         import json
+        import time
         try:
             # print(login)
             login_str = base64.b64decode(login)
             login_str = login_str.decode('utf-8')
             data = json.loads(login_str)
 
+            time_now = time.time() * 1000
+            time_diff = time_now - data['time']
+
+            if time_diff > 2000:
+                return redirect('/')
+
+
             info = thisdb.getUserByName(data['username'])
             if info is None:
                 return redirect('/')

From 4e66ed3a32db0850214065f8fb2530761e645803 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 21:51:31 +0800
Subject: [PATCH 590/965] mtproxy

---
 .gitignore                                 |   1 -
 plugins/mtproxy/LICENSE                    | 201 +++++++++++++++++++++
 plugins/mtproxy/README.md                  |  13 ++
 plugins/mtproxy/conf/mt.toml               |  26 +++
 plugins/mtproxy/ico.png                    | Bin 0 -> 1481 bytes
 plugins/mtproxy/index.html                 |  22 +++
 plugins/mtproxy/index.py                   | 182 +++++++++++++++++++
 plugins/mtproxy/info.json                  |  18 ++
 plugins/mtproxy/init.d/mtproxy.service.tpl |  14 ++
 plugins/mtproxy/install.sh                 | 129 +++++++++++++
 plugins/mtproxy/js/mtproxy.js              |   0
 11 files changed, 605 insertions(+), 1 deletion(-)
 create mode 100644 plugins/mtproxy/LICENSE
 create mode 100644 plugins/mtproxy/README.md
 create mode 100644 plugins/mtproxy/conf/mt.toml
 create mode 100644 plugins/mtproxy/ico.png
 create mode 100755 plugins/mtproxy/index.html
 create mode 100755 plugins/mtproxy/index.py
 create mode 100755 plugins/mtproxy/info.json
 create mode 100644 plugins/mtproxy/init.d/mtproxy.service.tpl
 create mode 100755 plugins/mtproxy/install.sh
 create mode 100644 plugins/mtproxy/js/mtproxy.js

diff --git a/.gitignore b/.gitignore
index d5d8772b0..46617a455 100644
--- a/.gitignore
+++ b/.gitignore
@@ -177,7 +177,6 @@ plugins/l2tp
 plugins/openlitespeed
 plugins/tamper_proof
 plugins/cryptocurrency_trade
-plugins/mtproxy
 plugins/zimg
 plugins/bk_demo
 plugins/mail
diff --git a/plugins/mtproxy/LICENSE b/plugins/mtproxy/LICENSE
new file mode 100644
index 000000000..261eeb9e9
--- /dev/null
+++ b/plugins/mtproxy/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/mtproxy/README.md b/plugins/mtproxy/README.md
new file mode 100644
index 000000000..beec8bff2
--- /dev/null
+++ b/plugins/mtproxy/README.md
@@ -0,0 +1,13 @@
+# mtproxy
+MTProxy代理
+
+
+## 基本安装
+```
+cd /www/server/mdserver-web/plugins && rm -rf mtproxy  && git clone https://github.com/mw-plugin/mtproxy && cd mtproxy && rm -rf .git && cd /www/server/mdserver-web/plugins/mtproxy && bash install.sh install 1.0
+```
+
+## DEBUG
+``` 
+cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mtproxy/index.py start
+```
\ No newline at end of file
diff --git a/plugins/mtproxy/conf/mt.toml b/plugins/mtproxy/conf/mt.toml
new file mode 100644
index 000000000..2a1f76c65
--- /dev/null
+++ b/plugins/mtproxy/conf/mt.toml
@@ -0,0 +1,26 @@
+#secret = "7t9xA1qO1IpiPY6D5mrsTQViaW5nLmNvbQ"
+
+
+debug = false
+
+secret = "{$SECRET}"
+bind-to = "0.0.0.0:{$PORT}"
+
+concurrency = 256
+prefer-ip = "prefer-ipv4"
+domain-fronting-port = 443
+tolerate-time-skewness = "10s"
+
+[network]
+doh-ip = "9.9.9.9"
+
+[network.timeout]
+tcp = "5s"
+http = "10s"
+idle = "1m"
+
+[defense.anti-replay]
+enabled = true
+max-size = "1mib"
+error-rate = 0.001
+
diff --git a/plugins/mtproxy/ico.png b/plugins/mtproxy/ico.png
new file mode 100644
index 0000000000000000000000000000000000000000..efaab9dfb7016b4216e990add8f733b8d31a7feb
GIT binary patch
literal 1481
zcmV;)1vdJLP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px)gGod|RA@uhT5D_+RTTct?5arAu(NF<)c8nu7Giw_qlrd{Ac>EN@<$VYSWH3F
zbhe-*B7#OBCJ^zF2AC-|whj2el#QZdB1jdjnh2357_Hse29>l?+nuFa4ASjAX145h
z+wNngomF@KZSHr@`M$Y#&pr3tA-MGTclIn1l2`(uf`}_1Pys?k(mkUW5_*}b7eKEh
zr1n^SWxE@pX*y1PjXg_=NA3q`DS$Z+ef0r+fXVY=ysq+qL)$dmv4C>z`%45}R0D7g
z1M{aEIMa@RPJmh^{=2n5R5j$pr)>e{+R4iWC29n)f`EXNAa=0~L?xg_VsC4I=$c>c
z*x3@`*Sc?E&>j%Yv*UEy80H@dygU|~d#sSJf&$94=wd<qX(30&7?+st90&zI%jY|<
z09lXJ0Mt?pa`t`l3R4ZX=ECO`;L{>c6VZ$I0~HU+%<JNz;I?cLvI>wjV<iZ$7mv~u
zJTo3MLrU{R%Si%!de40XG3C5G1!}fU7}C<XTKUn06g>9RN|gypbQCL1+Gd&qXr);%
zdlzP=*l{!9*NycIY?*GLV%ih1A*L!@Q!&y4tQ|H%7k2(%-+qel=q#L@pW3n00{nV(
z6@#}I^X<9in?S2$YG8-uFGGNF+^yQiDNzPKAQqiW(j5dWDr9ffPBB%vDJ?+OjJrTM
zSjf=jaf5;8;RITSRxACM?^!#HMUn@3ciuDy#@%K}Ih33MS&zH~&{HlG%;Ao93n5xg
z*9X6t2yi3-{IaPA*Pa(({0!jA;tAkm%xH$!^G>|BaxhmMpJqHmgmi`}z~>iJRjwkR
z*0X>}bhuBRhd@#@jflOm`rtR?{I|7v<k<Y@L;|0mUZosKjrlZVKM|JM<-#m2B%f|<
zAz-~-BOACw1o5`_%-Qg7Yi~R=5%1HZ_Y!y`SnM-Hb6?3Em-R>=K(lScNJ1FcY6;j)
zz;e4rIdG?#@s`JneFL@1@oX4*yKx!3*bLxF2CCz#@@6J(R^!R5B~F}l!h?Z5BsWG5
zgULFKJAa7YV;14~@55nisydg;fvg!1Lc$ARE(6gcW}PxA<M|q+4-@lVM<j^bN!B7=
z4o_NLU<xxO!f|!piF^Uentqrq#08tdcpN~N1gaiT1K(zyp~h$fn4fSYz&g3fdgKp)
zF12C!HGl@QE)WJ07sC7X=%WnY1z-li9YQ3kPuE{-WxK48tQ%hfxV@0y@#FlbEddN1
ziL1(DJI>3sXkdic+UD;W#nZbpJTt5NYUliw)1H~+#;Dbem}w`*7{(G{a|to<1{nJ;
z_71l9)!v+y%;Y@IubFDFwh$?Kr*Ru3STpSGNiHGhf8s%aJ_f`=uyoiA1y0GjaVrR|
zV5GYiR#_fbm1pfRk~L!u2(Q|~j>A}g;_0VRIsxzv6N0ZXRi(i$A)jvSA)wkWK7~uB
zQMWg;Y&pIVF<Cdh18`j-+{E$Gjm+IrV!%|DawkN}ntqxsMuz*G*raE`DkZERvhG$f
z$K9qHbkx1`?=qIL!2T%+7%k>T1-MpDe`Tu5f)p89Hy#pV_-NkzuNj*_*yvn9W;yNB
zfyO#n#Z@I)O<Lpuv;lk+M9*g{A1s_-H{NI90mlL|4>ac;P5(&AXfZ>|$}#e3T4w>Q
z&z6~F%{T?Z6;1?9I#P}bnEs)jh_(qv4}qI<5Nh@CxefiHs$}cj*VJ=8jflMUR5m|Z
z5B2V}RoDbb&i6L0x5t9lnf1X>WUYG>NOH9PbGB8^FQb34vBlj0&2_SLENsrkmNi)N
zt;OWJEam2II)9gPdp#whq%SzecG42QVoHf9=}W$ph?2f$O^GP!i|)+Lrer@g$hKpa
j<i{Slw*LR>bDMtvyt$G&*pzLo00000NkvXXu0mjfP;b7r

literal 0
HcmV?d00001

diff --git a/plugins/mtproxy/index.html b/plugins/mtproxy/index.html
new file mode 100755
index 000000000..030b3f3c1
--- /dev/null
+++ b/plugins/mtproxy/index.html
@@ -0,0 +1,22 @@
+<div class="bt-form">
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('mtproxy');">服务</p>
+			<p onclick="pluginInitD('mtproxy');">自启动</p>
+			<p onclick="pluginConfig('mtproxy');">配置修改</p>
+			<p onclick="pluginConfig('mtproxy', null, 'conf_env');">配置文件</p>
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+//mtproxy  start
+var loading = layer.msg("资源加载中...", { icon: 16, time: 0, shade: 0.3 });
+$.getScript( "/plugins/file?name=mtproxy&f=js/mtproxy.js", function(){
+	layer.close(loading);
+	pluginService('mtproxy')
+});
+//mtproxy end
+</script>
\ No newline at end of file
diff --git a/plugins/mtproxy/index.py b/plugins/mtproxy/index.py
new file mode 100755
index 000000000..df7aef97c
--- /dev/null
+++ b/plugins/mtproxy/index.py
@@ -0,0 +1,182 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'mtproxy'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getServiceTpl():
+    path = getPluginDir() + "/init.d/" + getPluginName() + ".service.tpl"
+    return path
+
+
+def getConfEnvTpl():
+    path = getPluginDir() + "/conf/mt.toml"
+    return path
+
+
+def getConfEnv():
+    path = getServerDir() + "/mt.toml"
+    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 status():
+    data = mw.execShell(
+        "ps -ef|grep mtproxy| grep mtg |grep -v grep | grep -v python  | awk '{print $2}'")
+
+    if data[0] == '':
+        return 'stop'
+    return 'start'
+
+
+def getServiceFile():
+    return '/usr/lib/systemd/system/mtproxy.service'
+
+
+def initDreplace():
+
+    envTpl = getConfEnvTpl()
+    dstEnv = getConfEnv()
+    cmd = getServerDir() + '/mtg/mtg generate-secret `head -c 16 /dev/urandom | xxd -ps`'
+    secret = mw.execShell(cmd)
+    if not os.path.exists(dstEnv):
+        env_content = mw.readFile(envTpl)
+        env_content = env_content.replace('{$PORT}', '8349')
+        env_content = env_content.replace('{$SECRET}', secret[0].strip())
+        mw.writeFile(dstEnv, env_content)
+
+    # systemd
+    systemDir = mw.systemdCfgDir()
+    systemService = systemDir + '/mtproxy.service'
+    systemServiceTpl = getServiceTpl()
+    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 'ok'
+
+
+def mtOp(method):
+    file = initDreplace()
+
+    if not mw.isAppleSystem():
+        mw.execShell('systemctl daemon-reload')
+        data = mw.execShell('systemctl ' + method + ' mtproxy')
+        if data[1] == '':
+            return 'ok'
+        return data[1]
+
+    return 'fail'
+
+
+def start():
+    return mtOp('start')
+
+
+def stop():
+    return mtOp('stop')
+
+
+def restart():
+    return mtOp('restart')
+
+
+def reload():
+    return redisOp('reload')
+
+
+def initdStatus():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    shell_cmd = 'systemctl status mtproxy | 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 mtproxy')
+    return 'ok'
+
+
+def initdUinstall():
+
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    mw.execShell('systemctl disable mtproxy')
+    return 'ok'
+
+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(getServiceFile())
+    elif func == 'conf_env':
+        print(getConfEnv())
+    else:
+        print('error')
diff --git a/plugins/mtproxy/info.json b/plugins/mtproxy/info.json
new file mode 100755
index 000000000..6cb413722
--- /dev/null
+++ b/plugins/mtproxy/info.json
@@ -0,0 +1,18 @@
+{
+	"sort": 7,
+	"ps": "你的纸飞机",
+	"name": "mtproxy",
+	"title": "mtproxy",
+	"shell": "install.sh",
+	"versions":["1.0"],
+	"updates":["1.0"],
+	"tip": "soft",
+	"checks": "server/mtproxy",
+	"path": "server/mtproxy",
+	"display": 1,
+	"author": "TelegramMessenger",
+	"date": "2022-07-09",
+	"home": "https://github.com/9seconds/mtg",
+	"type": 0,
+	"pid": "5"
+}
\ No newline at end of file
diff --git a/plugins/mtproxy/init.d/mtproxy.service.tpl b/plugins/mtproxy/init.d/mtproxy.service.tpl
new file mode 100644
index 000000000..03ad10760
--- /dev/null
+++ b/plugins/mtproxy/init.d/mtproxy.service.tpl
@@ -0,0 +1,14 @@
+[Unit]
+Description=MTProxy
+After=network.target
+
+[Service]
+Type=simple
+WorkingDirectory={$SERVER_PATH}/mtproxy
+ExecStart={$SERVER_PATH}/mtproxy/mtg/mtg run {$SERVER_PATH}/mtproxy/mt.toml
+RestartSec=3
+Restart=on-failure
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/plugins/mtproxy/install.sh b/plugins/mtproxy/install.sh
new file mode 100755
index 000000000..acc157fc0
--- /dev/null
+++ b/plugins/mtproxy/install.sh
@@ -0,0 +1,129 @@
+#!/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
+
+
+
+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=v2.1.7
+VERSION_MIN=2.1.7
+OS=$(uname | tr '[:upper:]' '[:lower:]')
+
+ARCH=amd64
+get_arch() {
+	echo "package main
+import (
+	\"fmt\"
+	\"runtime\"
+)
+func main() { fmt.Println(runtime.GOARCH) }" > /tmp/go_arch.go
+
+	ARCH=$(go run /tmp/go_arch.go)
+}
+
+TARGET_DIR="${serverPath}/mtproxy"
+
+
+
+get_download_url() {
+	DOWNLOAD_URL="https://github.com/9seconds/mtg/releases/download/$VERSION/mtg-${VERSION_MIN}-${OS}-${ARCH}.tar.gz"
+}
+
+# download file
+download_file() {
+    url="${1}"
+    destination="${2}"
+
+    printf "Fetching ${url} \n\n"
+
+    if test -x "$(command -v curl)"; then
+        code=$(curl --connect-timeout 15 -w '%{http_code}' -L "${url}" -o "${destination}")
+    elif test -x "$(command -v wget)"; then
+        code=$(wget -t2 -T15 -O "${destination}" --server-response "${url}" 2>&1 | awk '/^  HTTP/{print $2}' | tail -1)
+    else
+        printf "\e[1;31mNeither curl nor wget was available to perform http requests.\e[0m\n"
+        exit 1
+    fi
+
+    if [ "${code}" != 200 ]; then
+        printf "\e[1;31mRequest failed with code %s\e[0m\n" $code
+        exit 1
+    else 
+	    printf "\n\e[1;33mDownload succeeded\e[0m\n"
+    fi
+}
+
+# /www/server/mtproxy/mtg/mtg run /www/server/mtproxy/mt.toml
+
+Install_app()
+{
+
+	if [[ $OSNAME = "centos" ]]; then
+    	yum install -y golang golang-src
+	elif [[ $OSNAME = "amazon" ]]; then
+	    yum install -y golang golang-src
+	else
+		apt install -y golang golang-src
+	fi
+
+	mkdir -p ${serverPath}/mtproxy
+	mkdir -p ${serverPath}/source/mtproxy
+
+	get_arch
+	get_download_url
+
+	DOWNLOAD_FILE="$(mktemp).tar.gz"
+	download_file $DOWNLOAD_URL $DOWNLOAD_FILE
+
+	tar -C "$TARGET_DIR" -zxf $DOWNLOAD_FILE
+	rm -rf $DOWNLOAD_FILE
+
+	if [ -d ${serverPath}/mtproxy/mtg ];then
+		rm -rf ${serverPath}/mtproxy/mtg
+	fi
+
+	# cd ${serverPath}/mtproxy
+	# curl -s https://core.telegram.org/getProxySecret -o proxy-secret
+	# curl -s https://core.telegram.org/getProxyConfig -o proxy-multi.conf
+	
+
+	mv ${serverPath}/mtproxy/mtg-${VERSION_MIN}-${OS}-${ARCH} ${serverPath}/mtproxy/mtg
+
+	
+	echo "${1}" > ${serverPath}/mtproxy/version.pl
+	echo '安装完成' > $install_tmp
+
+	#初始化 
+	cd ${rootPath} && python3 ${rootPath}/plugins/mtproxy/index.py start
+	cd ${rootPath} && python3 ${rootPath}/plugins/mtproxy/index.py initd_install
+}
+
+Uninstall_app()
+{
+	if [ -f /usr/lib/systemd/system/mtproxy.service ];then
+		systemctl stop mtproxy
+		rm -rf /usr/lib/systemd/system/mtproxy.service
+		systemctl daemon-reload
+	fi
+	rm -rf ${serverPath}/mtproxy
+	echo '卸载完成' > $install_tmp
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_app $2
+else
+	Uninstall_app $2
+fi
diff --git a/plugins/mtproxy/js/mtproxy.js b/plugins/mtproxy/js/mtproxy.js
new file mode 100644
index 000000000..e69de29bb

From 34f03d2ccbb9d57bee220fa977590da2708dc9e9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 21:57:23 +0800
Subject: [PATCH 591/965] update

---
 plugins/mtproxy/LICENSE    | 201 -------------------------------------
 plugins/mtproxy/README.md  |  13 ---
 plugins/mtproxy/install.sh |  10 +-
 3 files changed, 3 insertions(+), 221 deletions(-)
 delete mode 100644 plugins/mtproxy/LICENSE
 delete mode 100644 plugins/mtproxy/README.md

diff --git a/plugins/mtproxy/LICENSE b/plugins/mtproxy/LICENSE
deleted file mode 100644
index 261eeb9e9..000000000
--- a/plugins/mtproxy/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/plugins/mtproxy/README.md b/plugins/mtproxy/README.md
deleted file mode 100644
index beec8bff2..000000000
--- a/plugins/mtproxy/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# mtproxy
-MTProxy代理
-
-
-## 基本安装
-```
-cd /www/server/mdserver-web/plugins && rm -rf mtproxy  && git clone https://github.com/mw-plugin/mtproxy && cd mtproxy && rm -rf .git && cd /www/server/mdserver-web/plugins/mtproxy && bash install.sh install 1.0
-```
-
-## DEBUG
-``` 
-cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mtproxy/index.py start
-```
\ No newline at end of file
diff --git a/plugins/mtproxy/install.sh b/plugins/mtproxy/install.sh
index acc157fc0..7c6040009 100755
--- a/plugins/mtproxy/install.sh
+++ b/plugins/mtproxy/install.sh
@@ -7,8 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
-
 
 
 bash ${rootPath}/scripts/getos.sh
@@ -80,6 +78,7 @@ Install_app()
 
 	mkdir -p ${serverPath}/mtproxy
 	mkdir -p ${serverPath}/source/mtproxy
+	echo "${1}" > ${serverPath}/mtproxy/version.pl
 
 	get_arch
 	get_download_url
@@ -100,10 +99,7 @@ Install_app()
 	
 
 	mv ${serverPath}/mtproxy/mtg-${VERSION_MIN}-${OS}-${ARCH} ${serverPath}/mtproxy/mtg
-
-	
-	echo "${1}" > ${serverPath}/mtproxy/version.pl
-	echo '安装完成' > $install_tmp
+	echo '安装完成'
 
 	#初始化 
 	cd ${rootPath} && python3 ${rootPath}/plugins/mtproxy/index.py start
@@ -118,7 +114,7 @@ Uninstall_app()
 		systemctl daemon-reload
 	fi
 	rm -rf ${serverPath}/mtproxy
-	echo '卸载完成' > $install_tmp
+	echo '卸载完成'
 }
 
 action=$1

From d988dce5d825da4e40f4409f8215ba9a542b7b98 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 22:00:04 +0800
Subject: [PATCH 592/965] Update install.sh

---
 plugins/mtproxy/install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/mtproxy/install.sh b/plugins/mtproxy/install.sh
index 7c6040009..6f9612f01 100755
--- a/plugins/mtproxy/install.sh
+++ b/plugins/mtproxy/install.sh
@@ -72,6 +72,8 @@ Install_app()
     	yum install -y golang golang-src
 	elif [[ $OSNAME = "amazon" ]]; then
 	    yum install -y golang golang-src
+	elif [[ $OSNAME = "rocky" ]]; then
+	    yum install -y golang golang-src
 	else
 		apt install -y golang golang-src
 	fi

From e639fc574625bb4891b80b084da5460733ffc2b7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 22:01:45 +0800
Subject: [PATCH 593/965] Update index.py

---
 plugins/mtproxy/index.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/mtproxy/index.py b/plugins/mtproxy/index.py
index df7aef97c..911e1cfa3 100755
--- a/plugins/mtproxy/index.py
+++ b/plugins/mtproxy/index.py
@@ -71,7 +71,8 @@ def status():
 
 
 def getServiceFile():
-    return '/usr/lib/systemd/system/mtproxy.service'
+    systemDir = mw.systemdCfgDir()
+    return systemDir+'/mtproxy.service'
 
 
 def initDreplace():

From 626c64afb26f20339a7b22f9616e3d84773b0142 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 22:01:56 +0800
Subject: [PATCH 594/965] Update index.py

---
 plugins/mtproxy/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mtproxy/index.py b/plugins/mtproxy/index.py
index 911e1cfa3..8652a5372 100755
--- a/plugins/mtproxy/index.py
+++ b/plugins/mtproxy/index.py
@@ -72,7 +72,7 @@ def status():
 
 def getServiceFile():
     systemDir = mw.systemdCfgDir()
-    return systemDir+'/mtproxy.service'
+    return systemDir + '/mtproxy.service'
 
 
 def initDreplace():

From 85f64b72cb0d9725d10dc7654de8a3762fbe8108 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 22:11:25 +0800
Subject: [PATCH 595/965] Update install.sh

---
 plugins/mtproxy/install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/mtproxy/install.sh b/plugins/mtproxy/install.sh
index 6f9612f01..85d808d06 100755
--- a/plugins/mtproxy/install.sh
+++ b/plugins/mtproxy/install.sh
@@ -74,6 +74,8 @@ Install_app()
 	    yum install -y golang golang-src
 	elif [[ $OSNAME = "rocky" ]]; then
 	    yum install -y golang golang-src
+	elif [[ $OSNAME = "rhel" ]]; then
+	    yum install -y golang golang-src
 	else
 		apt install -y golang golang-src
 	fi

From 54f5b44e04680d85f30fa794041057fc76e4dfb9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 22:16:30 +0800
Subject: [PATCH 596/965] Update index.py

---
 plugins/rsyncd/index.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/rsyncd/index.py b/plugins/rsyncd/index.py
index 778e4da14..78b85d451 100755
--- a/plugins/rsyncd/index.py
+++ b/plugins/rsyncd/index.py
@@ -119,9 +119,10 @@ def getLsyncdLog():
 
 
 def __release_port(port):
+    from collections import namedtuple
     try:
-        import firewall_api
-        firewall_api.firewall_api().addAcceptPortArgs(port, 'RSYNC同步', 'port')
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().addAcceptPort(port, 'RSYNC同步', 'port')
         return port
     except Exception as e:
         return "Release failed {}".format(e)
@@ -461,13 +462,12 @@ def delRecBy(name):
                     next_name = reclist[x + 1]['name']
         reg = ''
         if is_end:
-            reg = '\\[' + name + '\\]\\s*(.*)'
+            reg = r'\[' + name + r'\]\s*(.*)'
         else:
-            reg = '\\[' + name + '\\]\\s*(.*)\\s*\\[' + next_name + '\\]'
+            reg = r'\\[' + name + r'\]\s*(.*)\s*\[' + next_name + r'\]'
 
         conre = re.search(reg,  content, re.S)
-        content = content.replace(
-            "[" + name + "]\n" + conre.groups()[0], '')
+        content = content.replace("[" + name + "]\n" + conre.groups()[0], '')
         mw.writeFile(path, content)
     except Exception as e:
         return False

From 58129d5209038e76bf6b83e6aa9a9ddd6994929f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 22:19:49 +0800
Subject: [PATCH 597/965] update

---
 plugins/mtproxy/index.py | 16 ++++++++++++++++
 plugins/rsyncd/index.py  |  6 +++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/plugins/mtproxy/index.py b/plugins/mtproxy/index.py
index 8652a5372..03a5bf227 100755
--- a/plugins/mtproxy/index.py
+++ b/plugins/mtproxy/index.py
@@ -75,6 +75,22 @@ def getServiceFile():
     return systemDir + '/mtproxy.service'
 
 
+def __release_port(port):
+    from collections import namedtuple
+    try:
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().addAcceptPort(port, 'mtproxy', 'port')
+        return port
+    except Exception as e:
+        return "Release failed {}".format(e)
+
+
+def openFtpPort():
+    for i in ["8349"]:
+        __release_port(i)
+    return True
+
+
 def initDreplace():
 
     envTpl = getConfEnvTpl()
diff --git a/plugins/rsyncd/index.py b/plugins/rsyncd/index.py
index 78b85d451..a35c14a6a 100755
--- a/plugins/rsyncd/index.py
+++ b/plugins/rsyncd/index.py
@@ -347,15 +347,15 @@ def getRecListData():
         n = i + 1
         reg = ''
         if n == flist_len:
-            reg = '\\[' + flist[i] + '\\](.*)\\[?'
+            reg = r'\[' + flist[i] + r'\](.*)\[?'
         else:
-            reg = '\\[' + flist[i] + '\\](.*)\\[' + flist[n] + '\\]'
+            reg = r'\[' + flist[i] + r'\](.*)\[' + flist[n] + r'\]'
 
         t1 = re.search(reg, content, re.S)
         if t1:
             args = t1.groups()[0]
             # print('args start', args, 'args_end')
-            t2 = re.findall('\\s*(.*)\\s*\\=\\s*?(.*)?', args, re.M | re.I)
+            t2 = re.findall(r'\s*(.*)\s*\=\s*?(.*)?', args, re.M | re.I)
             for i in range(len(t2)):
                 tmp[t2[i][0].strip()] = t2[i][1].strip()
         ret_list.append(tmp)

From b114c768dc638d716e943eef87e785b6d69e1241 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 22:21:36 +0800
Subject: [PATCH 598/965] Update index.py

---
 plugins/mtproxy/index.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/plugins/mtproxy/index.py b/plugins/mtproxy/index.py
index 03a5bf227..0753edc14 100755
--- a/plugins/mtproxy/index.py
+++ b/plugins/mtproxy/index.py
@@ -75,6 +75,10 @@ def getServiceFile():
     return systemDir + '/mtproxy.service'
 
 
+def getMtproxyPort():
+    return '8349'
+
+
 def __release_port(port):
     from collections import namedtuple
     try:
@@ -85,8 +89,9 @@ def __release_port(port):
         return "Release failed {}".format(e)
 
 
-def openFtpPort():
-    for i in ["8349"]:
+def openPort():
+    port = getMtproxyPort()
+    for i in [port]:
         __release_port(i)
     return True
 
@@ -99,9 +104,10 @@ def initDreplace():
     secret = mw.execShell(cmd)
     if not os.path.exists(dstEnv):
         env_content = mw.readFile(envTpl)
-        env_content = env_content.replace('{$PORT}', '8349')
+        env_content = env_content.replace('{$PORT}', getMtproxyPort())
         env_content = env_content.replace('{$SECRET}', secret[0].strip())
         mw.writeFile(dstEnv, env_content)
+        openPort()
 
     # systemd
     systemDir = mw.systemdCfgDir()

From 14ad2471685fe9bd3a5376f27c12f2295c68d3c3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 22:24:41 +0800
Subject: [PATCH 599/965] Update index.py

---
 plugins/mtproxy/index.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/plugins/mtproxy/index.py b/plugins/mtproxy/index.py
index 0753edc14..3c170871b 100755
--- a/plugins/mtproxy/index.py
+++ b/plugins/mtproxy/index.py
@@ -88,12 +88,26 @@ def __release_port(port):
     except Exception as e:
         return "Release failed {}".format(e)
 
+def __delete_port(port):
+    from collections import namedtuple
+    try:
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().delAcceptPortCmd(port, 'tcp')
+        return port
+    except Exception as e:
+        return "Delete failed {}".format(e)
 
 def openPort():
     port = getMtproxyPort()
     for i in [port]:
         __release_port(i)
     return True
+    
+def delPort():
+    port = getMtproxyPort()
+    for i in [port]:
+        __delete_port(i)
+    return True
 
 
 def initDreplace():

From 1c0dbe76f9db715e9fb77403b9308a4e83869ef6 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 22:30:36 +0800
Subject: [PATCH 600/965] update

---
 plugins/mtproxy/index.html    |  1 +
 plugins/mtproxy/js/mtproxy.js | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/plugins/mtproxy/index.html b/plugins/mtproxy/index.html
index 030b3f3c1..f4a0d936f 100755
--- a/plugins/mtproxy/index.html
+++ b/plugins/mtproxy/index.html
@@ -3,6 +3,7 @@
 		<div class="bt-w-menu">
 			<p class="bgw" onclick="pluginService('mtproxy');">服务</p>
 			<p onclick="pluginInitD('mtproxy');">自启动</p>
+			<p onclick="mtCommonFunc($('.plugin_version').attr('version'));">常用功能</p>
 			<p onclick="pluginConfig('mtproxy');">配置修改</p>
 			<p onclick="pluginConfig('mtproxy', null, 'conf_env');">配置文件</p>
 		</div>
diff --git a/plugins/mtproxy/js/mtproxy.js b/plugins/mtproxy/js/mtproxy.js
index e69de29bb..36e8ef1e2 100644
--- a/plugins/mtproxy/js/mtproxy.js
+++ b/plugins/mtproxy/js/mtproxy.js
@@ -0,0 +1,35 @@
+function mtPost(method, version, args,callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'mtproxy';
+    req_data['func'] = method;
+    req_data['version'] = version;
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/run', req_data, function(data) {
+        layer.close(loadT);
+        if (!data.status){
+            //错误展示10S
+            layer.msg(data.msg,{icon:0,time:2000,shade: [10, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+function mtCommonFunc(){
+	var con = '<hr/><p class="conf_p" style="text-align:center;">\
+        <button class="btn btn-default btn-sm" onclick="">获取连接地址</button>\
+    </p>';
+
+    $(".soft-man-con").html(con);
+}
\ No newline at end of file

From 8ed608e9cd2a7583066ed100fb7ac986369889d1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 23:16:27 +0800
Subject: [PATCH 601/965] update

---
 plugins/mtproxy/index.py      | 20 ++++++------
 plugins/mtproxy/install.sh    | 57 ++++++++++++++++++++---------------
 plugins/mtproxy/js/mtproxy.js |  8 ++++-
 3 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/plugins/mtproxy/index.py b/plugins/mtproxy/index.py
index 3c170871b..d2a4d7f75 100755
--- a/plugins/mtproxy/index.py
+++ b/plugins/mtproxy/index.py
@@ -60,11 +60,9 @@ def getArgs():
 
     return tmp
 
-
 def status():
-    data = mw.execShell(
-        "ps -ef|grep mtproxy| grep mtg |grep -v grep | grep -v python  | awk '{print $2}'")
-
+    cmd = "ps -ef|grep mtproxy| grep mtg |grep -v grep | grep -v python  | awk '{print $2}'"
+    data = mw.execShell(cmd)
     if data[0] == '':
         return 'stop'
     return 'start'
@@ -102,7 +100,7 @@ def openPort():
     for i in [port]:
         __release_port(i)
     return True
-    
+
 def delPort():
     port = getMtproxyPort()
     for i in [port]:
@@ -176,23 +174,25 @@ def initdStatus():
         return 'fail'
     return 'ok'
 
-
 def initdInstall():
     if mw.isAppleSystem():
         return "Apple Computer does not support"
-
     mw.execShell('systemctl enable mtproxy')
     return 'ok'
 
 
 def initdUinstall():
-
     if mw.isAppleSystem():
         return "Apple Computer does not support"
-
     mw.execShell('systemctl disable mtproxy')
     return 'ok'
 
+def getMtproxyUrl():
+    conf = getConfEnv()
+    content = mw.readFile(conf)
+
+    
+
 if __name__ == "__main__":
     func = sys.argv[1]
     if func == 'status':
@@ -215,5 +215,7 @@ if __name__ == "__main__":
         print(getServiceFile())
     elif func == 'conf_env':
         print(getConfEnv())
+    elif func == 'url':
+        print(getMtproxyUrl())
     else:
         print('error')
diff --git a/plugins/mtproxy/install.sh b/plugins/mtproxy/install.sh
index 85d808d06..80814f779 100755
--- a/plugins/mtproxy/install.sh
+++ b/plugins/mtproxy/install.sh
@@ -7,17 +7,18 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
+sysArch=`arch`
+sysName=`uname`
 
 
 bash ${rootPath}/scripts/getos.sh
+echo "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=v2.1.7
 VERSION_MIN=2.1.7
-OS=$(uname | tr '[:upper:]' '[:lower:]')
+VERSION=v${VERSION_MIN}
+
+sysName=$(uname | tr '[:upper:]' '[:lower:]')
 
 ARCH=amd64
 get_arch() {
@@ -29,14 +30,13 @@ import (
 func main() { fmt.Println(runtime.GOARCH) }" > /tmp/go_arch.go
 
 	ARCH=$(go run /tmp/go_arch.go)
+	echo "ARCH:${ARCH}"
 }
 
 TARGET_DIR="${serverPath}/mtproxy"
 
-
-
 get_download_url() {
-	DOWNLOAD_URL="https://github.com/9seconds/mtg/releases/download/$VERSION/mtg-${VERSION_MIN}-${OS}-${ARCH}.tar.gz"
+	DOWNLOAD_URL="https://github.com/9seconds/mtg/releases/download/$VERSION/mtg-${VERSION_MIN}-${sysName}-${ARCH}.tar.gz"
 }
 
 # download file
@@ -64,28 +64,35 @@ download_file() {
 }
 
 # /www/server/mtproxy/mtg/mtg run /www/server/mtproxy/mt.toml
-
 Install_app()
 {
-
-	if [[ $OSNAME = "centos" ]]; then
-    	yum install -y golang golang-src
-	elif [[ $OSNAME = "amazon" ]]; then
-	    yum install -y golang golang-src
-	elif [[ $OSNAME = "rocky" ]]; then
-	    yum install -y golang golang-src
-	elif [[ $OSNAME = "rhel" ]]; then
-	    yum install -y golang golang-src
-	else
-		apt install -y golang golang-src
-	fi
-
 	mkdir -p ${serverPath}/mtproxy
 	mkdir -p ${serverPath}/source/mtproxy
 	echo "${1}" > ${serverPath}/mtproxy/version.pl
 
-	get_arch
-	get_download_url
+	if [ "$OSNAME" == "centos" ]; then
+    	yum install -y golang golang-src
+	elif [ "$OSNAME" == "amazon" ]; then
+	    yum install -y golang golang-src
+	elif [ "$OSNAME" == "rocky" ]; then
+	    yum install -y golang golang-src
+	elif [ "$OSNAME" == "rhel" ]; then
+	    yum install -y golang golang-src
+	elif [ "$sysName" == "macos" ]; then
+	    echo "macos"
+	else
+		apt install -y golang golang-src
+	fi
+
+	if [ "$sysName" == "darwin" ]; then
+		ARCH=arm64
+		DOWNLOAD_URL="https://github.com/9seconds/mtg/releases/download/$VERSION/mtg-${VERSION_MIN}-${sysName}-arm64.tar.gz"
+	elif [ "$sysName" != "macos" ]; then
+		get_arch
+		get_download_url
+	else
+		echo "else"
+	fi
 
 	DOWNLOAD_FILE="$(mktemp).tar.gz"
 	download_file $DOWNLOAD_URL $DOWNLOAD_FILE
@@ -102,7 +109,7 @@ Install_app()
 	# curl -s https://core.telegram.org/getProxyConfig -o proxy-multi.conf
 	
 
-	mv ${serverPath}/mtproxy/mtg-${VERSION_MIN}-${OS}-${ARCH} ${serverPath}/mtproxy/mtg
+	mv ${serverPath}/mtproxy/mtg-${VERSION_MIN}-${sysName}-${ARCH} ${serverPath}/mtproxy/mtg
 	echo '安装完成'
 
 	#初始化 
diff --git a/plugins/mtproxy/js/mtproxy.js b/plugins/mtproxy/js/mtproxy.js
index 36e8ef1e2..da6798cfe 100644
--- a/plugins/mtproxy/js/mtproxy.js
+++ b/plugins/mtproxy/js/mtproxy.js
@@ -28,8 +28,14 @@ function mtPost(method, version, args,callback){
 
 function mtCommonFunc(){
 	var con = '<hr/><p class="conf_p" style="text-align:center;">\
-        <button class="btn btn-default btn-sm" onclick="">获取连接地址</button>\
+        <button id="mtproxy_url" class="btn btn-default btn-sm">获取连接地址</button>\
     </p>';
 
     $(".soft-man-con").html(con);
+
+    $('#mtproxy_url').click(function(){
+    	mtPost('url', '', {}, function(rdata){
+    		console.log(rdata);
+    	});
+    });
 }
\ No newline at end of file

From 12c90f5e6e5420b0c726ae65151a7956bb4af151 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 23:42:01 +0800
Subject: [PATCH 602/965] update

---
 plugins/mtproxy/index.py      | 21 ++++++++++++++++++++-
 plugins/mtproxy/js/mtproxy.js | 22 +++++++++++++++++++++-
 plugins/mysql/js/mysql.js     |  2 +-
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/plugins/mtproxy/index.py b/plugins/mtproxy/index.py
index d2a4d7f75..f25fe21a0 100755
--- a/plugins/mtproxy/index.py
+++ b/plugins/mtproxy/index.py
@@ -4,6 +4,7 @@ import sys
 import io
 import os
 import time
+import re
 
 web_dir = os.getcwd() + "/web"
 if os.path.exists(web_dir):
@@ -191,7 +192,25 @@ def getMtproxyUrl():
     conf = getConfEnv()
     content = mw.readFile(conf)
 
-    
+
+    rep = r'bind-to\s*=\s*(.*)'
+    tmp = re.search(rep, content)
+    bind_to = tmp.groups()[0].strip()
+    bind_to = bind_to.strip('"')
+
+    rep = r'secret\s*=\s*(.*)'
+    tmp = re.search(rep, content)
+    secret = tmp.groups()[0].strip()
+    secret = secret.strip('"')
+
+    info = bind_to.split(":")
+
+    ip = mw.getLocalIp()
+
+    url = 'tg://proxy?server={0}&port={1}&secret={2}'.format(ip, info[1], secret)
+    return mw.returnJson(True, 'ok', url)
+
+
 
 if __name__ == "__main__":
     func = sys.argv[1]
diff --git a/plugins/mtproxy/js/mtproxy.js b/plugins/mtproxy/js/mtproxy.js
index da6798cfe..748e2db60 100644
--- a/plugins/mtproxy/js/mtproxy.js
+++ b/plugins/mtproxy/js/mtproxy.js
@@ -35,7 +35,27 @@ function mtCommonFunc(){
 
     $('#mtproxy_url').click(function(){
     	mtPost('url', '', {}, function(rdata){
-    		console.log(rdata);
+            var data = $.parseJSON(rdata.data);
+
+            layer.open({
+                title: "mtproxy代理信息",
+                area: ['600px', '180px'],
+                type:1,
+                closeBtn: 1,
+                shadeClose: false,
+                btn:["复制","取消"],
+                content: '<div class="pd15">\
+                            <div class="divtable">\
+                                <pre class="layui-code">'+data.data+'</pre>\
+                            </div>\
+                        </div>',
+                success:function(){
+                    copyText(data.data);
+                },
+                yes:function(){
+                    copyText(data.data);
+                }
+            });
     	});
     });
 }
\ No newline at end of file
diff --git a/plugins/mysql/js/mysql.js b/plugins/mysql/js/mysql.js
index dcb54e786..c5c25eae6 100755
--- a/plugins/mysql/js/mysql.js
+++ b/plugins/mysql/js/mysql.js
@@ -2041,7 +2041,7 @@ function getFullSyncStatus(db){
                     myPostN('full_sync_cmd', {'db':db,'sign':''}, function(rdata){
                         var rdata = $.parseJSON(rdata.data);
                         layer.open({
-                        title: "手动执行命令CMD",
+                            title: "手动执行命令CMD",
                             area: ['600px', '180px'],
                             type:1,
                             closeBtn: 1,

From 8867799825a8629fc7ea7399552f91a44936a76f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 23:46:54 +0800
Subject: [PATCH 603/965] Update mt.toml

---
 plugins/mtproxy/conf/mt.toml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/mtproxy/conf/mt.toml b/plugins/mtproxy/conf/mt.toml
index 2a1f76c65..495d45a3e 100644
--- a/plugins/mtproxy/conf/mt.toml
+++ b/plugins/mtproxy/conf/mt.toml
@@ -1,6 +1,3 @@
-#secret = "7t9xA1qO1IpiPY6D5mrsTQViaW5nLmNvbQ"
-
-
 debug = false
 
 secret = "{$SECRET}"

From 6bfa72feb66a7d69eac6978e31b8e060b9049f2d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 1 Dec 2024 23:54:04 +0800
Subject: [PATCH 604/965] update

---
 plugins/docker/index.py       | 4 ++--
 plugins/imail/index.py        | 4 ++--
 plugins/zabbix/index.py       | 8 ++++----
 plugins/zabbix_agent/index.py | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/docker/index.py b/plugins/docker/index.py
index 252cd678b..7fa29f9c3 100755
--- a/plugins/docker/index.py
+++ b/plugins/docker/index.py
@@ -610,8 +610,8 @@ def getDockerCreateInfo():
 def __release_port(port):
     from collections import namedtuple
     try:
-        import firewall_api
-        firewall_api.firewall_api().addAcceptPortArgs(port, 'docker', 'port')
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().addAcceptPort(port, 'docker', 'port')
         return port
     except Exception as e:
         return "Release failed {}".format(e)
diff --git a/plugins/imail/index.py b/plugins/imail/index.py
index 6fa0c4758..2a9177fd0 100755
--- a/plugins/imail/index.py
+++ b/plugins/imail/index.py
@@ -54,8 +54,8 @@ class App:
     def __release_port(self, port):
         from collections import namedtuple
         try:
-            import firewall_api
-            firewall_api.firewall_api().addAcceptPortArgs(port, 'IMail-Server', 'port')
+            from utils.firewall import Firewall as MwFirewall
+            MwFirewall.instance().addAcceptPort(port, 'IMail-Server', 'port')
             return port
         except Exception as e:
             return "Release failed {}".format(e)
diff --git a/plugins/zabbix/index.py b/plugins/zabbix/index.py
index 167c85669..7be515276 100755
--- a/plugins/zabbix/index.py
+++ b/plugins/zabbix/index.py
@@ -338,10 +338,10 @@ def initAgentConf():
 
 def openPort():
     try:
-        import firewall_api
-        firewall_api.firewall_api().addAcceptPortArgs('18888', 'zabbix-web', 'port')
-        firewall_api.firewall_api().addAcceptPortArgs('10051', 'zabbix-server', 'port')
-        firewall_api.firewall_api().addAcceptPortArgs('10050', 'zabbix-agent', 'port')
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().addAcceptPort('18888', 'zabbix-web', 'port')
+        MwFirewall.instance().addAcceptPort('10051', 'zabbix-server', 'port')
+        MwFirewall.instance().addAcceptPort('10050', 'zabbix-agent', 'port')
         return port
     except Exception as e:
         return "Release failed {}".format(e)
diff --git a/plugins/zabbix_agent/index.py b/plugins/zabbix_agent/index.py
index c015c1ecd..d87b1b689 100755
--- a/plugins/zabbix_agent/index.py
+++ b/plugins/zabbix_agent/index.py
@@ -132,8 +132,8 @@ def initDreplace():
 
 def openPort():
     try:
-        import firewall_api
-        firewall_api.firewall_api().addAcceptPortArgs('10050', 'zabbix-agent', 'port')
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().addAcceptPort('10050', 'zabbix-agent', 'port')
         return port
     except Exception as e:
         return "Release failed {}".format(e)

From 7fb006b2ff04f3680a8bb20caaf267f082e8fb77 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 00:27:31 +0800
Subject: [PATCH 605/965] Update index.py

---
 plugins/redis/index.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/redis/index.py b/plugins/redis/index.py
index a0c361030..902006d5f 100755
--- a/plugins/redis/index.py
+++ b/plugins/redis/index.py
@@ -224,7 +224,7 @@ def getPort():
     conf = getServerDir() + '/redis.conf'
     content = mw.readFile(conf)
 
-    rep = r"^(" + r'port' + r'\)\s*([.0-9A-Za-z_& ~]+)'
+    rep = r"^(port)\s*([.0-9A-Za-z_& ~]+)"
     tmp = re.search(rep, content, re.M)
     if tmp:
         return tmp.groups()[1]
@@ -236,7 +236,7 @@ def getRedisCmd():
     requirepass = ""
     conf = getServerDir() + '/redis.conf'
     content = mw.readFile(conf)
-    rep = r"^(requirepass" + r"\)\s*([.0-9A-Za-z_& ~]+)"
+    rep = r"^(requirepass)\s*([.0-9A-Za-z_& ~]+)"
     tmp = re.search(rep, content, re.M)
     if tmp:
         requirepass = tmp.groups()[1]

From bbcac5f8998ac1bf9c89fc8fdcb7ddd0a0a687b3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 00:35:36 +0800
Subject: [PATCH 606/965] Update requirements.txt

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 238d9c682..d052035a8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,7 +15,7 @@ gevent-websocket==0.10.1
 eventlet>=0.24.1
 psutil==5.9.1
 chardet==3.0.4
-SQLAlchemy==2.*
+SQLAlchemy>=1.4.54
 Flask-SQLAlchemy==3.1.*
 Flask-Migrate==4.*
 #Flask-Security-Too==5.5.*; python_version >= '3.10'

From 6ee0496c4c7b455540190d2fe01bca66f716b83f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 00:36:48 +0800
Subject: [PATCH 607/965] Update requirements.txt

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index d052035a8..03f281169 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,7 +16,7 @@ eventlet>=0.24.1
 psutil==5.9.1
 chardet==3.0.4
 SQLAlchemy>=1.4.54
-Flask-SQLAlchemy==3.1.*
+Flask-SQLAlchemy>=2.5.1
 Flask-Migrate==4.*
 #Flask-Security-Too==5.5.*; python_version >= '3.10'
 #Flask-Security-Too==5.4.*; python_version <= '3.9'

From dae5d2d062bd7499302b92058a583bdd4cb0d386 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 01:00:28 +0800
Subject: [PATCH 608/965] update

---
 web/admin/setting/panel_bookmark.py | 3 ++-
 web/static/app/public.js            | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/web/admin/setting/panel_bookmark.py b/web/admin/setting/panel_bookmark.py
index cf8c83598..0a377712c 100644
--- a/web/admin/setting/panel_bookmark.py
+++ b/web/admin/setting/panel_bookmark.py
@@ -51,7 +51,8 @@ def add_panel_info():
 @panel_login_required
 def get_panel_list():
     data = mw.M('panel').field('id,title,url,username,password,click,add_time').order('click desc').select()
-    return data
+    return mw.returnData(True, 'ok!', data)
+
 
 # 删除面板书签
 @blueprint.route('/del_panel_info', endpoint='del_panel_info', methods=['GET','POST'])
diff --git a/web/static/app/public.js b/web/static/app/public.js
index 263fe12b4..e3960155a 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1139,6 +1139,12 @@ function listOrder(skey,type,obj){
 function getPanelList(){
 	var con ='';
 	$.post("/setting/get_panel_list",function(rdata){
+		if (!rdata.status){
+			return;
+		}
+
+		var rdata = rdata.data;
+
 		for(var i=0; i<rdata.length; i++){
 			con +='<h3 class="mypcip mypcipnew" style="opacity:.6;cursor: pointer;" data-url="'+rdata[i].url+'" data-user="'+rdata[i].username+'" data-pw="'+rdata[i].password+'">\
 				<span class="f14 cw">'+rdata[i].title+'</span>\

From 921af8059873f2ee4be2597c9536853e57522ea3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 01:00:42 +0800
Subject: [PATCH 609/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index ffe400f04..31e7a2e8f 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.1
+APP_SMALL_VERSION = 0.2
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From cc9e6283461698c211c63f6196847ec256ac59b1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 01:04:40 +0800
Subject: [PATCH 610/965] update

---
 web/admin/logs/__init__.py | 2 +-
 web/static/app/logs.js     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/admin/logs/__init__.py b/web/admin/logs/__init__.py
index 22993f2a8..2d2218616 100644
--- a/web/admin/logs/__init__.py
+++ b/web/admin/logs/__init__.py
@@ -54,7 +54,7 @@ def del_panel_logs():
 @panel_login_required
 def get_audit_logs_files():
     logs_file = adult_log.getAuditLogsFiles()
-    return logs_file
+    return mw.returnData(True, 'ok', logs_file)
 
 # 系统审计日志列表
 @blueprint.route('/get_audit_file', endpoint='get_audit_file', methods=['POST'])
diff --git a/web/static/app/logs.js b/web/static/app/logs.js
index 18f46c210..24590f2e2 100644
--- a/web/static/app/logs.js
+++ b/web/static/app/logs.js
@@ -58,7 +58,8 @@ $('#panelLogs .clear').click(function(){
 
 function getAuditLogsFiles(){
 	var loadT = layer.msg('正在获取日志审计列表...', { icon: 16, time: 0, shade: 0.3 });
-	$.post('/logs/get_audit_logs_files',{}, function(data) {
+	$.post('/logs/get_audit_logs_files',{}, function(rdata) {
+		var data = rdata.data;
 		layer.close(loadT);
         var option = '';
         for (var i = 0; i < data.length; i++) {

From 829f4def27666987b426277eb8e6119ceb58dec2 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 01:12:04 +0800
Subject: [PATCH 611/965] update

---
 web/static/app/soft.js | 1 +
 web/utils/plugin.py    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/static/app/soft.js b/web/static/app/soft.js
index eacbfcf5f..c4eafaec8 100755
--- a/web/static/app/soft.js
+++ b/web/static/app/soft.js
@@ -337,6 +337,7 @@ function indexListHtml(callback){
 
     // var loadT = layer.msg('正在获取列表...', { icon: 16, time: 0, shade: [0.3, '#000'] });
     $.get('/plugins/index_list', function(rdata) {
+        var rdata = rdata.data;
         // layer.close(loadT);
         $("#indexsoft").html('');
         var con = '';
diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index 24c2cea02..09a61c72e 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -131,7 +131,7 @@ class plugin(object):
         # 使用gevent模式时,无法使用多进程
         # plist = self.checkStatusMProcess(plist)
         plist = self.checkStatusMThreads(plist)
-        return plist
+        return mw.returnData(True, 'ok', plist)
 
     def init(self):
         plugin_names = {

From 1b1d3aec8c52845ba98a163e907658e5a8c8dd98 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 01:16:05 +0800
Subject: [PATCH 612/965] update

---
 web/admin/system/system.py | 2 +-
 web/static/app/files.js    | 1 +
 web/static/app/index.js    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/admin/system/system.py b/web/admin/system/system.py
index d224e408d..d49d25d78 100644
--- a/web/admin/system/system.py
+++ b/web/admin/system/system.py
@@ -54,7 +54,7 @@ def network():
 @panel_login_required
 def disk_info():
     data = sys.getDiskInfo()
-    return data
+    return mw.returnData(True, 'ok', data)
 
 # 获取系统的负载统计信息
 @blueprint.route('/get_load_average', endpoint='get_load_average', methods=['GET'])
diff --git a/web/static/app/files.js b/web/static/app/files.js
index 85e1ef806..75f1f79ab 100755
--- a/web/static/app/files.js
+++ b/web/static/app/files.js
@@ -940,6 +940,7 @@ function getDisk() {
 	var LBody = '';
 
 	$.get('/system/disk_info', function(rdata) {
+		var rdata = rdata.data;
 		for (var i = 0; i < rdata.length; i++) {
 			LBody += "<span onclick=\"getFiles('" + rdata[i].path + "')\">\
 				<span class='glyphicon glyphicon-hdd'></span>&nbsp;" + (rdata[i].path=='/'?lan.files.path_root:rdata[i].path) + "(" + rdata[i].size[2] + ")</span>";
diff --git a/web/static/app/index.js b/web/static/app/index.js
index c623ad35e..309d983cb 100755
--- a/web/static/app/index.js
+++ b/web/static/app/index.js
@@ -117,6 +117,7 @@ function getPercent(num, total) {
 
 function getDiskInfo() {
     $.get('/system/disk_info', function(rdata) {
+        var rdata = rdata.data;
         var dBody;
         for (var i = 0; i < rdata.length; i++) {
             var LoadColor = setcolor(parseInt(rdata[i].size[3].replace('%', '')), false, 75, 90, 95);

From 542610f5a7dc23c2851d9e375dffdbcd61ea173f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 01:20:37 +0800
Subject: [PATCH 613/965] update

---
 web/admin/site/site_types.py |  2 +-
 web/static/app/site.js       | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/web/admin/site/site_types.py b/web/admin/site/site_types.py
index 90d360d60..0f6e34bcb 100644
--- a/web/admin/site/site_types.py
+++ b/web/admin/site/site_types.py
@@ -29,7 +29,7 @@ from .site import blueprint
 def get_site_types():
     data = thisdb.getSiteTypesList()
     data.insert(0, {"id": 0, "name": "默认分类"})
-    return data
+    return mw.returnData(True, "ok", data)
 
 
 # 添加网站分类
diff --git a/web/static/app/site.js b/web/static/app/site.js
index 50baefff4..30c634146 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -2914,6 +2914,7 @@ function changeDefault(type, obj){
 function getClassType(){
 	var select = $('.site_type > select');
 	$.post('/site/get_site_types',function(rdata){
+		var rdata = rdata.data;
 		$(select).html('');
 		$(select).append('<option value="-1">全部分类</option>');
 		for (var i = 0; i<rdata.length; i++) {
@@ -2930,6 +2931,8 @@ getClassType();
 
 function setClassType(){
 	$.post('/site/get_site_types',function(rdata){
+		var rdata = rdata.data;
+		
 		var list = '';
 		for (var i = 0; i<rdata.length; i++) {
 			list +='<tr><td>' + rdata[i]['name'] + '</td>\
@@ -2944,16 +2947,16 @@ function setClassType(){
 			closeBtn: 1,
 			shift: 0,
 			content: '<div class="bt-form edit_site_type">\
-					<div class="divtable mtb15" style="overflow:auto">\
-						<div class="line "><div class="info-r  ml0">\
-							<input name="type_name" class="bt-input-text mr5 type_name" placeholder="请填写分类名称" type="text" style="width:50%" value=""><button name="btn_submit" class="btn btn-success btn-sm mr5 ml5 btn_submit" onclick="addClassType();">添加</button></div>\
-						</div>\
-						<table id="type_table" class="table table-hover" width="100%">\
-							<thead><tr><th>名称</th><th width="80px">操作</th></tr></thead>\
-							<tbody>'+list+'</tbody>\
-						</table>\
+				<div class="divtable mtb15" style="overflow:auto">\
+					<div class="line "><div class="info-r  ml0">\
+						<input name="type_name" class="bt-input-text mr5 type_name" placeholder="请填写分类名称" type="text" style="width:50%" value=""><button name="btn_submit" class="btn btn-success btn-sm mr5 ml5 btn_submit" onclick="addClassType();">添加</button></div>\
 					</div>\
-				</div>'
+					<table id="type_table" class="table table-hover" width="100%">\
+						<thead><tr><th>名称</th><th width="80px">操作</th></tr></thead>\
+						<tbody>'+list+'</tbody>\
+					</table>\
+				</div>\
+			</div>'
 		});
 	},'json');
 }

From 3df5ae86d440b75d7e033124c1c23aa852f8cf0a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 01:21:06 +0800
Subject: [PATCH 614/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index 31e7a2e8f..3ade5933b 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.2
+APP_SMALL_VERSION = 0.3
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From 73e5cc4fbdd4ce626f91002aa2109d3a463f6211 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 01:25:06 +0800
Subject: [PATCH 615/965] update

---
 web/admin/system/system.py | 14 ++++++++------
 web/static/app/control.js  |  4 ++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/web/admin/system/system.py b/web/admin/system/system.py
index d49d25d78..78dd8fc36 100644
--- a/web/admin/system/system.py
+++ b/web/admin/system/system.py
@@ -62,7 +62,8 @@ def disk_info():
 def get_load_average():
     start = request.args.get('start', '')
     end = request.args.get('end', '')
-    return sys.getLoadAverageByDB(start, end)
+    data = sys.getLoadAverageByDB(start, end)
+    return mw.returnData(True, 'ok', data)
 
 # 获取系统的磁盘IO统计信息
 @blueprint.route('/get_disk_io', endpoint='get_disk_io', methods=['GET'])
@@ -70,7 +71,8 @@ def get_load_average():
 def get_disk_io():
     start = request.args.get('start', '')
     end = request.args.get('end', '')
-    return sys.getDiskIoByDB(start, end)
+    data = sys.getDiskIoByDB(start, end)
+    return mw.returnData(True, 'ok', data)
 
 # 获取系统的CPU/IO统计信息
 @blueprint.route('/get_cpu_io', endpoint='get_cpu_io', methods=['GET'])
@@ -78,7 +80,8 @@ def get_disk_io():
 def get_cpu_io():
     start = request.args.get('start', '')
     end = request.args.get('end', '')
-    return sys.getCpuIoByDB(start, end)
+    data = sys.getCpuIoByDB(start, end)
+    return mw.returnData(True, 'ok', data)
 
 # 获取系统网络IO统计信息
 @blueprint.route('/get_network_io', endpoint='get_network_io', methods=['GET'])
@@ -86,7 +89,8 @@ def get_cpu_io():
 def get_network_io():
     start = request.args.get('start', '')
     end = request.args.get('end', '')
-    return sys.getNetworkIoByDB(start, end)
+    data = sys.getNetworkIoByDB(start, end)
+    return mw.returnData(True, 'ok', data)
 
 # 重启面板
 @blueprint.route('/restart', endpoint='restart', methods=['POST'])
@@ -102,8 +106,6 @@ def restart_server():
     mw.restartMw()
     return mw.returnData(True, '面板已重启!')
 
-    
-
 # 设置
 @blueprint.route('/set_control', endpoint='set_control', methods=['POST'])
 @panel_login_required
diff --git a/web/static/app/control.js b/web/static/app/control.js
index 9737dac81..817e11fd7 100755
--- a/web/static/app/control.js
+++ b/web/static/app/control.js
@@ -240,6 +240,7 @@ function getBeforeDate(n){
 //cpu
 function cpu(b,e){
 	$.get('/system/get_cpu_io?start='+b+'&end='+e,function(rdata){
+		var rdata = rdata.data;
 		var myChartCpu = echarts.init(document.getElementById('cupview'));
 		var xData = [];
 		var yData = [];
@@ -311,6 +312,7 @@ function cpu(b,e){
 //内存
 function mem(b,e){
 	$.get('/system/get_cpu_io?start='+b+'&end='+e,function(rdata){
+		var rdata = rdata.data;
 		var myChartMen = echarts.init(document.getElementById('memview'));
 		var xData = [];
 		//var yData = [];
@@ -382,6 +384,7 @@ function mem(b,e){
 //磁盘io
 function disk(b,e){
 	$.get('/system/get_disk_io?start='+b+'&end='+e,function(rdata){
+		var rdata = rdata.data;
 		var myChartDisk = echarts.init(document.getElementById('diskview'));
 		var rData = [];
 		var wData = [];
@@ -469,6 +472,7 @@ function disk(b,e){
 //网络Io
 function network(b,e){
 	$.get('/system/get_network_io?start='+b+'&end='+e,function(rdata){
+		var rdata = rdata.data;
 		var myChartNetwork = echarts.init(document.getElementById('network'));
 		var aData = [];
 		var bData = [];

From 9cba03104931951431e1e2ebaa1aaccc70dbf476 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 01:26:45 +0800
Subject: [PATCH 616/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index 3ade5933b..a3e8ed7f7 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.3
+APP_SMALL_VERSION = 0.4
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From e7d458b2a9a0b3082735df1fa461fa3071a393ac Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 01:28:34 +0800
Subject: [PATCH 617/965] Update control.js

---
 web/static/app/control.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/static/app/control.js b/web/static/app/control.js
index 817e11fd7..04b9fbba9 100755
--- a/web/static/app/control.js
+++ b/web/static/app/control.js
@@ -561,6 +561,7 @@ function network(b,e){
 //负载
 function getload_old(b,e){
 	$.get('/system/get_load_average?start='+b+'&end='+e,function(rdata){
+		var rdata = data.data;
 		var myChartgetload = echarts.init(document.getElementById('getloadview'));
 		var aData = [];
 		var bData = [];

From a8c8f922ebfce128fe719e23c8e08039c4c62d75 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 01:28:54 +0800
Subject: [PATCH 618/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index a3e8ed7f7..0acac6104 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.4
+APP_SMALL_VERSION = 0.5
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From 8ce5d6dfbeff8b0c20ca6052700251522f279f88 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 01:30:41 +0800
Subject: [PATCH 619/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index 0acac6104..c6d4d6a62 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.5
+APP_SMALL_VERSION = 0.6
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From c6d1a44d43e1a892f48327423a5b2bcdd3ee2830 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 01:31:59 +0800
Subject: [PATCH 620/965] Update control.js

---
 web/static/app/control.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/static/app/control.js b/web/static/app/control.js
index 04b9fbba9..59e499333 100755
--- a/web/static/app/control.js
+++ b/web/static/app/control.js
@@ -692,6 +692,7 @@ function getload_old(b,e){
 //系统负载
 function getload(b,e){
 	$.get('/system/get_load_average?start='+b+'&end='+e,function(rdata){
+		var rdata = rdata.data;
 		var myChartgetload = echarts.init(document.getElementById('getloadview'));
 		var aData = [];
 		var bData = [];

From c3241a5c17080019df5c295810482c4f65f78b79 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 01:32:07 +0800
Subject: [PATCH 621/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index c6d4d6a62..4b725b9ed 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.6
+APP_SMALL_VERSION = 0.7
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From 61d90ef8e72285f9db878fd2f087cf5755404618 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 01:44:19 +0800
Subject: [PATCH 622/965] Update site.py

---
 web/utils/site.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 5cdb56a4d..bdfa11dd4 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -548,8 +548,8 @@ class sites(object):
                 if version.startswith('1.25') or version.startswith('1.27'):
                     http_ssl = "\n\tlisten 443 ssl;"
                     http_ssl = http_ssl + "\n\tlisten [::]:443 ssl;"
-                    http_ssl = http_ssl + "\n\tlisten 443 quic;"
-                    http_ssl = http_ssl + "\n\tlisten [::]:443 quic;"
+                    http_ssl = http_ssl + "\n\tlisten 443;"
+                    http_ssl = http_ssl + "\n\tlisten [::]:443;"
                     http_ssl = http_ssl + "\n\thttp2 on;"
                 else:
                     http_ssl = "\n\tlisten 443 ssl;"

From 1dddc3c5ba1192ea781a0a37698e384900c07707 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 01:47:26 +0800
Subject: [PATCH 623/965] Update site.py

---
 web/utils/site.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index bdfa11dd4..0f4b8fcb1 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -548,8 +548,6 @@ class sites(object):
                 if version.startswith('1.25') or version.startswith('1.27'):
                     http_ssl = "\n\tlisten 443 ssl;"
                     http_ssl = http_ssl + "\n\tlisten [::]:443 ssl;"
-                    http_ssl = http_ssl + "\n\tlisten 443;"
-                    http_ssl = http_ssl + "\n\tlisten [::]:443;"
                     http_ssl = http_ssl + "\n\thttp2 on;"
                 else:
                     http_ssl = "\n\tlisten 443 ssl;"

From 46a752480c07b2d69f5ba4b963a02ad20244f2f1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 01:54:28 +0800
Subject: [PATCH 624/965] update

---
 .gitignore        | 1 +
 web/utils/site.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 46617a455..e9423cd79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -191,3 +191,4 @@ plugins/goedge-node
 plugins/goedge-happy
 plugins/dztasks
 
+/logs
diff --git a/web/utils/site.py b/web/utils/site.py
index 0f4b8fcb1..bd1e9bc1b 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -612,9 +612,9 @@ class sites(object):
     # 获取模版名内容
     def getRewriteTpl(self, name):
         path = self.getNgxRewriteDir() +'/'+ name + ".conf"
-        if not os.path.exists(file):
+        if not os.path.exists(path):
             return mw.returnData(False, '模版不存在!')
-        return mw.returnData(True, 'OK', file)
+        return mw.returnData(True, 'OK', path)
 
     def setRewriteTpl(self,name,data):
         path = self.getNgxRewriteDir() +'/'+ name + ".conf"

From 8c841e93a0de74b8d20cbd23599c4802f6ad9a36 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 02:00:13 +0800
Subject: [PATCH 625/965] update

---
 web/admin/site/site.py | 10 ++++++++++
 web/utils/site.py      | 14 ++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/web/admin/site/site.py b/web/admin/site/site.py
index 7fc98afe7..84720f5e1 100644
--- a/web/admin/site/site.py
+++ b/web/admin/site/site.py
@@ -251,6 +251,16 @@ def get_rewrite_tpl():
     tplname = request.form.get('tplname', '')
     return MwSites.instance().getRewriteTpl(tplname)
 
+# 设置站点Rewrite
+@blueprint.route('/set_rewrite', endpoint='set_rewrite',methods=['POST'])
+@panel_login_required
+def set_rewrite():
+    data = request.form.get('data', '')
+    path = request.form.get('path', '')
+    encoding = request.form.get('encoding', '')
+    return MwSites.instance().setRewrite(path,data,encoding)
+
+
 # 设置Rewrite模版名
 @blueprint.route('/set_rewrite_tpl', endpoint='set_rewrite_tpl',methods=['POST'])
 @panel_login_required
diff --git a/web/utils/site.py b/web/utils/site.py
index bd1e9bc1b..56b0c333e 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -616,6 +616,20 @@ class sites(object):
             return mw.returnData(False, '模版不存在!')
         return mw.returnData(True, 'OK', path)
 
+    def setRewrite(self,path,data,encoding):
+        if not os.path.exists(path):
+            mw.writeFile(path, '')
+
+        mw.backFile(path)
+        mw.writeFile(path, data)
+        isError = mw.checkWebConfig()
+        if(type(isError) == str):
+            mw.restoreFile(path)
+            msg = 'ERROR: <br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>'
+            return mw.returnJson(False, msg)
+        mw.restartWeb()
+        return mw.returnData(True, '设置成功!')
+
     def setRewriteTpl(self,name,data):
         path = self.getNgxRewriteDir() +'/'+ name + ".conf"
         if os.path.exists(path):

From 30db5569add5203f806db745286cc28baf746263 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 02:25:52 +0800
Subject: [PATCH 626/965] Update gdriveclient.py

---
 plugins/gdrive/class/gdriveclient.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/gdrive/class/gdriveclient.py b/plugins/gdrive/class/gdriveclient.py
index 8171fc9c1..349098cf3 100644
--- a/plugins/gdrive/class/gdriveclient.py
+++ b/plugins/gdrive/class/gdriveclient.py
@@ -9,8 +9,12 @@ import json
 import io
 
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 # -----------------------------
 import google.oauth2.credentials

From 853d5045f004cbcc390dfaa8ab0a8abc1d44816a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 02:28:30 +0800
Subject: [PATCH 627/965] Update install.sh

---
 plugins/mtproxy/install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/mtproxy/install.sh b/plugins/mtproxy/install.sh
index 80814f779..c191baed1 100755
--- a/plugins/mtproxy/install.sh
+++ b/plugins/mtproxy/install.sh
@@ -78,6 +78,8 @@ Install_app()
 	    yum install -y golang golang-src
 	elif [ "$OSNAME" == "rhel" ]; then
 	    yum install -y golang golang-src
+	elif [ "$OSNAME" == "opensuse" ]; then
+	    zypper install -y golang golang-src
 	elif [ "$sysName" == "macos" ]; then
 	    echo "macos"
 	else

From 74b3118bc350352db09798c11b71695d1b6bde5b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 02:31:43 +0800
Subject: [PATCH 628/965] Update install.sh

---
 plugins/mtproxy/install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/mtproxy/install.sh b/plugins/mtproxy/install.sh
index c191baed1..376508c9d 100755
--- a/plugins/mtproxy/install.sh
+++ b/plugins/mtproxy/install.sh
@@ -11,6 +11,10 @@ sysArch=`arch`
 sysName=`uname`
 
 
+# cd /www/server/mdserver-web && python3 plugins/mtproxy/index.py url
+
+# cd /www/server/mdserver-web/plugins/mtproxy && /bin/bash install.sh install 1.0
+
 bash ${rootPath}/scripts/getos.sh
 echo "bash ${rootPath}/scripts/getos.sh"
 OSNAME=`cat ${rootPath}/data/osname.pl`

From c1dec877844a8f8d03621d8cb3c42c3523abe843 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 02:31:48 +0800
Subject: [PATCH 629/965] Update install.sh

---
 plugins/mtproxy/install.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/mtproxy/install.sh b/plugins/mtproxy/install.sh
index 376508c9d..5a32ab58c 100755
--- a/plugins/mtproxy/install.sh
+++ b/plugins/mtproxy/install.sh
@@ -12,7 +12,6 @@ sysName=`uname`
 
 
 # cd /www/server/mdserver-web && python3 plugins/mtproxy/index.py url
-
 # cd /www/server/mdserver-web/plugins/mtproxy && /bin/bash install.sh install 1.0
 
 bash ${rootPath}/scripts/getos.sh

From e9a01b50562bde9d1e847933b8a34405523fa6e1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 02:33:32 +0800
Subject: [PATCH 630/965] update

---
 plugins/tgbot/startup/extend/push_ad.py                 | 8 ++++++--
 plugins/tgbot/startup/extend/push_bbs_ntid.py           | 8 ++++++--
 plugins/tgbot/startup/extend/push_notice_msg.py         | 8 ++++++--
 plugins/tgbot/startup/extend/receive_faq.py             | 8 ++++++--
 plugins/tgbot/startup/extend/receive_music163_search.py | 6 ++++++
 plugins/tgbot/startup/tgbot.py                          | 8 ++++++--
 plugins/tgbot/startup/tgpush.py                         | 8 ++++++--
 7 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/plugins/tgbot/startup/extend/push_ad.py b/plugins/tgbot/startup/extend/push_ad.py
index 97a660cbf..d0c0d7f52 100644
--- a/plugins/tgbot/startup/extend/push_ad.py
+++ b/plugins/tgbot/startup/extend/push_ad.py
@@ -9,8 +9,12 @@ import json
 import base64
 import threading
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 import telebot
 from telebot import types
diff --git a/plugins/tgbot/startup/extend/push_bbs_ntid.py b/plugins/tgbot/startup/extend/push_bbs_ntid.py
index 4a49ba3ab..88411fe38 100644
--- a/plugins/tgbot/startup/extend/push_bbs_ntid.py
+++ b/plugins/tgbot/startup/extend/push_bbs_ntid.py
@@ -9,8 +9,12 @@ import json
 import base64
 import threading
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 import telebot
 from telebot import types
diff --git a/plugins/tgbot/startup/extend/push_notice_msg.py b/plugins/tgbot/startup/extend/push_notice_msg.py
index 0fea5ff39..bf39fd2e4 100644
--- a/plugins/tgbot/startup/extend/push_notice_msg.py
+++ b/plugins/tgbot/startup/extend/push_notice_msg.py
@@ -9,8 +9,12 @@ import json
 import base64
 import threading
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 import telebot
 from telebot import types
diff --git a/plugins/tgbot/startup/extend/receive_faq.py b/plugins/tgbot/startup/extend/receive_faq.py
index 175090e17..cbb1a2760 100644
--- a/plugins/tgbot/startup/extend/receive_faq.py
+++ b/plugins/tgbot/startup/extend/receive_faq.py
@@ -7,8 +7,12 @@ import json
 import base64
 import threading
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 import telebot
 from telebot import types
diff --git a/plugins/tgbot/startup/extend/receive_music163_search.py b/plugins/tgbot/startup/extend/receive_music163_search.py
index 8ba6b8000..f3a872021 100644
--- a/plugins/tgbot/startup/extend/receive_music163_search.py
+++ b/plugins/tgbot/startup/extend/receive_music163_search.py
@@ -9,6 +9,12 @@ import json
 import base64
 import threading
 
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 import telebot
 from telebot import types
diff --git a/plugins/tgbot/startup/tgbot.py b/plugins/tgbot/startup/tgbot.py
index 75fc6d1ef..60b4a5546 100644
--- a/plugins/tgbot/startup/tgbot.py
+++ b/plugins/tgbot/startup/tgbot.py
@@ -9,8 +9,12 @@ import json
 import base64
 import threading
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 import telebot
 
diff --git a/plugins/tgbot/startup/tgpush.py b/plugins/tgbot/startup/tgpush.py
index fcf34a811..57e2cd6f4 100644
--- a/plugins/tgbot/startup/tgpush.py
+++ b/plugins/tgbot/startup/tgpush.py
@@ -9,8 +9,12 @@ import json
 import base64
 import threading
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 import telebot
 

From bb37fccee3be776acf412d13e201a4524a8f1863 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 02:40:52 +0800
Subject: [PATCH 631/965] Update index.py

---
 plugins/mtproxy/index.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/plugins/mtproxy/index.py b/plugins/mtproxy/index.py
index f25fe21a0..55b7a8c49 100755
--- a/plugins/mtproxy/index.py
+++ b/plugins/mtproxy/index.py
@@ -210,6 +210,21 @@ def getMtproxyUrl():
     url = 'tg://proxy?server={0}&port={1}&secret={2}'.format(ip, info[1], secret)
     return mw.returnJson(True, 'ok', url)
 
+def installPreInspection(version):
+    sys = mw.execShell("cat /etc/*-release | grep PRETTY_NAME |awk -F = '{print $2}' | awk -F '\"' '{print $2}'| awk '{print $1}'")
+
+    if sys[1] != '':
+        return '不支持该系统'
+
+    sys_id = mw.execShell("cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F '\"' '{print $2}'")
+
+    sysName = sys[0].strip().lower()
+    sysId = sys_id[0].strip()
+
+    if sysName in ('opensuse'):
+        return '不支持该系统'
+
+    return 'ok'
 
 
 if __name__ == "__main__":
@@ -230,6 +245,8 @@ if __name__ == "__main__":
         print(initdInstall())
     elif func == 'initd_uninstall':
         print(initdUinstall())
+    elif func == 'install_pre_inspection':
+        print(installPreInspection())
     elif func == 'conf':
         print(getServiceFile())
     elif func == 'conf_env':

From a2e4fc80854ad72f6753a2ed0c51b36ee4a0bd59 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 02:41:49 +0800
Subject: [PATCH 632/965] Update info.json

---
 plugins/mtproxy/info.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/mtproxy/info.json b/plugins/mtproxy/info.json
index 6cb413722..a68c2a59b 100755
--- a/plugins/mtproxy/info.json
+++ b/plugins/mtproxy/info.json
@@ -1,6 +1,7 @@
 {
 	"sort": 7,
 	"ps": "你的纸飞机",
+	"install_pre_inspection":true,
 	"name": "mtproxy",
 	"title": "mtproxy",
 	"shell": "install.sh",

From 821683d4841e029ef92c0fe5e56c7898a93123aa Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 02:54:17 +0800
Subject: [PATCH 633/965] Update init_cmd.py

---
 plugins/tgbot/startup/extend/init_cmd.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/tgbot/startup/extend/init_cmd.py b/plugins/tgbot/startup/extend/init_cmd.py
index 75048aef1..1efb672d5 100644
--- a/plugins/tgbot/startup/extend/init_cmd.py
+++ b/plugins/tgbot/startup/extend/init_cmd.py
@@ -9,8 +9,12 @@ import json
 import base64
 import threading
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 import telebot
 from telebot import types

From 6a33354b2b366a49cdef7a3547a409969850f56c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 03:00:22 +0800
Subject: [PATCH 634/965] Update index.py

---
 plugins/mtproxy/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mtproxy/index.py b/plugins/mtproxy/index.py
index 55b7a8c49..d9cac4501 100755
--- a/plugins/mtproxy/index.py
+++ b/plugins/mtproxy/index.py
@@ -210,7 +210,7 @@ def getMtproxyUrl():
     url = 'tg://proxy?server={0}&port={1}&secret={2}'.format(ip, info[1], secret)
     return mw.returnJson(True, 'ok', url)
 
-def installPreInspection(version):
+def installPreInspection():
     sys = mw.execShell("cat /etc/*-release | grep PRETTY_NAME |awk -F = '{print $2}' | awk -F '\"' '{print $2}'| awk '{print $1}'")
 
     if sys[1] != '':

From ca5b315725d67c7db64a083765a635e34a481dcc Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 03:08:41 +0800
Subject: [PATCH 635/965] update

---
 plugins/data_query/static/html/index.html | 4 ++--
 plugins/data_query/static/js/app.js       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/data_query/static/html/index.html b/plugins/data_query/static/html/index.html
index dd589c749..b07cef4e2 100644
--- a/plugins/data_query/static/html/index.html
+++ b/plugins/data_query/static/html/index.html
@@ -53,8 +53,8 @@
 
 
                             <div style="float:left;">
-                                <button type="button" class="mysql_find btn btn-success btn-sm mr5 ml5" >查找</button>
-                                <button id="mysql_common" type="button" class="mysql_find btn btn-success btn-sm mr5 ml5">常用功能</button>
+                                <button id="mysql_find" type="button" class="btn btn-success btn-sm mr5 ml5" >查找</button>
+                                <button id="mysql_common" type="button" class="btn btn-success btn-sm mr5 ml5">常用功能</button>
                             </div>
                         </div>
 
diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index c97e80d53..26ec63d9f 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -901,7 +901,7 @@ function mysqlInitField(f, data){
 
     $('select[name="mysql_field_key"]').html(option_html);
 
-    $('#mysql .mysql_find').unbind('click').click(function(){
+    $('#mysql_find').unbind('click').click(function(){
         var val = $('input[name="mysql_field_value"]').val();
         if (val == ''){
             layer.msg('搜索不能为空!',{icon:7});

From 5f7f45c64891405f79ef1d92b884d38126ab0c47 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 03:09:33 +0800
Subject: [PATCH 636/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index 4b725b9ed..37d8deecc 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.7
+APP_SMALL_VERSION = 0.8
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From a58fd4476ea0cc91031810c0983d7b49c8852f4e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 03:13:43 +0800
Subject: [PATCH 637/965] Update app.js

---
 plugins/data_query/static/js/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index 26ec63d9f..9c59b95b4 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -377,7 +377,7 @@ function mysqlCommonFuncMysqlNet(){
     layer.open({
         type: 1,
         title: "MySQL服务器的QPS/TPS/网络带宽指标",
-        area: ['700px', '220px'],
+        area: ['750px', '220px'],
         closeBtn: 1,
         shadeClose: false,
         content: '<div class="bt-form pd20 divtable taskdivtable">\

From 70dbb9eab5c7c1781881883f2863e5d6cdb2e79f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 03:18:06 +0800
Subject: [PATCH 638/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index e1d4007be..c6f121812 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -430,6 +430,9 @@ class nosqlMySQLCtr():
             """
         )
 
+        if data is None:
+            return mw.returnData(True, 'ok', [])
+
         for i in range(len(data)):
             row = data[i]
 

From af8375022040b57cf6dded58eb2c344650581067 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 03:45:16 +0800
Subject: [PATCH 639/965] update

---
 scripts/init.d/mw.service.tpl |  2 +-
 web/admin/setup/init_cmd.py   | 30 +++++++++++++++++++++++++++++-
 web/core/mw.py                |  2 --
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/scripts/init.d/mw.service.tpl b/scripts/init.d/mw.service.tpl
index aa21242ac..d43c41387 100755
--- a/scripts/init.d/mw.service.tpl
+++ b/scripts/init.d/mw.service.tpl
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=simple
-WorkingDirectory={$SERVER_PATH}
+WorkingDirectory={$SERVER_PATH}/web
 EnvironmentFile={$SERVER_PATH}/scripts/init.d/service.sh
 ExecStart=gunicorn -c setting.py app:app
 ExecStop=kill -HUP $MAINID
diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index a307b494a..de1dffa90 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -54,4 +54,32 @@ def init_cmd():
             mw.execShell('chmod +x ' + initd_bin)
         # 加入自启动
         mw.execShell('which update-rc.d && update-rc.d -f mw defaults')
-    return True
\ No newline at end of file
+
+    if mw.getOsName() == 'opensuse':
+        init_cmd_systemd()
+    return True
+
+
+
+
+def init_cmd_systemd():
+    systemctl
+    sysCfgDir = mw.systemdCfgDir()
+
+    systemd_mw = sysCfgDir + '/mw.service'
+    systemd_mw_task = sysCfgDir + '/mw-task.service'
+
+    systemd_mw_tpl = mw.getPanelDir() + '/scripts/init.d/mw.service.tpl'
+    systemd_mw_task_tpl = mw.getPanelDir() + '/scripts/init.d/mw-task.service.tpl'
+
+    if os.path.exists(systemd_mw):
+        os.remove(systemd_mw)
+    if os.path.exists(systemd_mw_task):
+        os.remove(systemd_mw_task)
+
+    doContentReplace(systemd_mw_tpl, systemd_mw)
+    doContentReplace(systemd_mw_task_tpl, systemd_mw_task)
+
+    mw.execShell('systemctl enable mw')
+    mw.execShell('systemctl enable mw-task')
+    mw.execShell('systemctl daemon-reload')
\ No newline at end of file
diff --git a/web/core/mw.py b/web/core/mw.py
index 0e9e15288..9f618c3b8 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -543,13 +543,11 @@ def getSslCrt():
 def getOs():
     return sys.platform
 
-
 def getOsName():
     cmd = "cat /etc/*-release | grep PRETTY_NAME |awk -F = '{print $2}' | awk -F '\"' '{print $2}'| awk '{print $1}'"
     data = execShell(cmd)
     return data[0].strip().lower()
 
-
 def getOsID():
     cmd = "cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F '\"' '{print $2}'"
     data = execShell(cmd)

From 2ff6d17d23de296fdae2cfc056c4cc29088c9f0d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 03:54:32 +0800
Subject: [PATCH 640/965] Update debian.sh

---
 scripts/update/debian.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/update/debian.sh b/scripts/update/debian.sh
index 060e92635..dcc663cac 100644
--- a/scripts/update/debian.sh
+++ b/scripts/update/debian.sh
@@ -37,7 +37,11 @@ fi
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data
 
+
 if [ -f /etc/rc.d/init.d/mw ];then
+    if [ -f /usr/bin/mw ];then
+        rm -rf /usr/bin/mw
+    fi
     bash /etc/rc.d/init.d/mw stop && rm -rf /www/server/mdserver-web/scripts/init.d/mw && rm -rf /etc/rc.d/init.d/mw
 fi
 

From 6f2cc030449261a4df010e70e8c641469dd941cc Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 03:54:47 +0800
Subject: [PATCH 641/965] Update ubuntu.sh

---
 scripts/update/ubuntu.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/update/ubuntu.sh b/scripts/update/ubuntu.sh
index 74da1d9d9..1ee4def96 100644
--- a/scripts/update/ubuntu.sh
+++ b/scripts/update/ubuntu.sh
@@ -17,6 +17,9 @@ chmod 755 /www/server/mdserver-web/data
 
 
 if [ -f /etc/rc.d/init.d/mw ];then
+    if [ -f /usr/bin/mw ];then
+        rm -rf /usr/bin/mw
+    fi
     bash /etc/rc.d/init.d/mw stop && rm -rf /www/server/mdserver-web/scripts/init.d/mw && rm -rf /etc/rc.d/init.d/mw
 fi
 

From dfaf09735e8fce451db238784c5b02f8e03efa00 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 04:08:03 +0800
Subject: [PATCH 642/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index c6f121812..ec2525db1 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -413,7 +413,7 @@ class nosqlMySQLCtr():
         if my_instance is False:
             return mw.returnData(False,'无法链接')
 
-        my_instance.execute("SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))")
+        # my_instance.execute("SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))")
         data = my_instance.query(
             """
             SELECT t.TABLE_SCHEMA as TABLE_SCHEMA, t.TABLE_NAME as TABLE_NAME, t.ENGINE as ENGINE,

From a0c228e352010d39cc7c05558589c8ff56050138 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 04:13:19 +0800
Subject: [PATCH 643/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index ec2525db1..c6f121812 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -413,7 +413,7 @@ class nosqlMySQLCtr():
         if my_instance is False:
             return mw.returnData(False,'无法链接')
 
-        # my_instance.execute("SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))")
+        my_instance.execute("SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))")
         data = my_instance.query(
             """
             SELECT t.TABLE_SCHEMA as TABLE_SCHEMA, t.TABLE_NAME as TABLE_NAME, t.ENGINE as ENGINE,

From 9d05edf09f317c9200ce9e4af648ce154f2cb7ea Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 04:33:02 +0800
Subject: [PATCH 644/965] Update orm.py

---
 web/core/orm.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/core/orm.py b/web/core/orm.py
index 6baaeb790..16389c22e 100755
--- a/web/core/orm.py
+++ b/web/core/orm.py
@@ -122,7 +122,8 @@ class ORM:
     def find(self, sql):
         d = self.query(sql)
         if d is not None:
-            return d[0]
+            if len(d) > 0:
+                return d[0]
         return None
 
     def query(self, sql):

From 54bd8f1d5c4fa65e7e67aacecb1e750cc5d1b94d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 04:41:35 +0800
Subject: [PATCH 645/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index c6f121812..a85ba16a3 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -598,7 +598,7 @@ class nosqlMySQLCtr():
             return mw.returnData(False,'无法链接')
 
         slave_info = my_instance.find('SHOW SLAVE STATUS')
-        if len(slave_info) == 0:
+        if slave_info is None:
             return mw.returnData(True, 'ok', '未开启从库!')
 
         msg = ''

From a14301f7695364540619bca8ec340233ca3dd53d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 14:53:23 +0800
Subject: [PATCH 646/965] Update tamper_proof_service.py

---
 plugins/tamper_proof_py/tamper_proof_service.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/tamper_proof_py/tamper_proof_service.py b/plugins/tamper_proof_py/tamper_proof_service.py
index 61645db3a..8c020b836 100644
--- a/plugins/tamper_proof_py/tamper_proof_service.py
+++ b/plugins/tamper_proof_py/tamper_proof_service.py
@@ -12,8 +12,12 @@ import psutil
 import threading
 import datetime
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 
 class MyEventHandler(pyinotify.ProcessEvent):

From 8f1a89f9782a28d688c56e4d3b5d7e83f353268a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 16:24:29 +0800
Subject: [PATCH 647/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index de1dffa90..748f1da44 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -60,14 +60,11 @@ def init_cmd():
     return True
 
 
-
-
 def init_cmd_systemd():
-    systemctl
-    sysCfgDir = mw.systemdCfgDir()
+    systemd_dir = mw.systemdCfgDir()
 
-    systemd_mw = sysCfgDir + '/mw.service'
-    systemd_mw_task = sysCfgDir + '/mw-task.service'
+    systemd_mw = systemd_dir + '/mw.service'
+    systemd_mw_task = systemd_dir + '/mw-task.service'
 
     systemd_mw_tpl = mw.getPanelDir() + '/scripts/init.d/mw.service.tpl'
     systemd_mw_task_tpl = mw.getPanelDir() + '/scripts/init.d/mw-task.service.tpl'

From e1ef876db152a295ee4504964a04edfb7264c003 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 16:25:55 +0800
Subject: [PATCH 648/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index 748f1da44..6c7fff723 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -74,8 +74,8 @@ def init_cmd_systemd():
     if os.path.exists(systemd_mw_task):
         os.remove(systemd_mw_task)
 
-    doContentReplace(systemd_mw_tpl, systemd_mw)
-    doContentReplace(systemd_mw_task_tpl, systemd_mw_task)
+    contentReplace(systemd_mw_tpl, systemd_mw)
+    contentReplace(systemd_mw_task_tpl, systemd_mw_task)
 
     mw.execShell('systemctl enable mw')
     mw.execShell('systemctl enable mw-task')

From 46d7f83cc4fd70028dd601004635c70af27d43ff Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 16:28:42 +0800
Subject: [PATCH 649/965] Update mw.service.tpl

---
 scripts/init.d/mw.service.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/init.d/mw.service.tpl b/scripts/init.d/mw.service.tpl
index d43c41387..8c92d1214 100755
--- a/scripts/init.d/mw.service.tpl
+++ b/scripts/init.d/mw.service.tpl
@@ -4,9 +4,9 @@ After=network.target
 
 [Service]
 Type=simple
-WorkingDirectory={$SERVER_PATH}/web
+WorkingDirectory={$SERVER_PATH}
 EnvironmentFile={$SERVER_PATH}/scripts/init.d/service.sh
-ExecStart=gunicorn -c setting.py app:app
+ExecStart=cd web && gunicorn -c setting.py app:app
 ExecStop=kill -HUP $MAINID
 ExecReload=kill -HUP $MAINID
 KillMode=process

From 3476b4c30adaadf050141f5fa6b01fff3e55a0f6 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 16:33:47 +0800
Subject: [PATCH 650/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index 6c7fff723..3ec0a8ffb 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -55,8 +55,8 @@ def init_cmd():
         # 加入自启动
         mw.execShell('which update-rc.d && update-rc.d -f mw defaults')
 
-    if mw.getOsName() == 'opensuse':
-        init_cmd_systemd()
+    # if mw.getOsName() == 'opensuse':
+    #     init_cmd_systemd()
     return True
 
 

From eca12b2cf3d95452f4b5c816fa7e2cdecf96957c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 16:49:06 +0800
Subject: [PATCH 651/965] update

---
 requirements.txt      | 2 +-
 web/admin/__init__.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 03f281169..d04fe1935 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,7 +17,7 @@ psutil==5.9.1
 chardet==3.0.4
 SQLAlchemy>=1.4.54
 Flask-SQLAlchemy>=2.5.1
-Flask-Migrate==4.*
+#Flask-Migrate==4.*
 #Flask-Security-Too==5.5.*; python_version >= '3.10'
 #Flask-Security-Too==5.4.*; python_version <= '3.9'
 pyOpenSSL==23.2.0
diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 322ad8338..6f5c71c12 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -26,7 +26,6 @@ from flask import render_template_string
 
 from flask_socketio import SocketIO, emit, send
 
-from flask_migrate import Migrate
 from flask_caching import Cache
 from werkzeug.local import LocalProxy
 

From 0312c5ceb0ba1e9c572e6d2ff59e4d7ccb26e128 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 17:12:29 +0800
Subject: [PATCH 652/965] update

---
 web/admin/setup/init_cmd.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index 3ec0a8ffb..738bad881 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -34,6 +34,8 @@ def init_cmd():
     if not mw.isAppleSystem() and not os.path.exists("/etc/init.d"):
         mw.execShell('mkdir -p /etc/init.d')
 
+    sys_name = mw.getOsName()
+
     # initd
     if os.path.exists('/etc/rc.d/init.d'):
         initd_bin = '/etc/rc.d/init.d/mw'
@@ -45,6 +47,10 @@ def init_cmd():
         # 加入自启动
         mw.execShell('which chkconfig && chkconfig --add mw')
 
+        # if sys_name == 'opensuse':
+        #     mw.execShell('which chkconfig && chkconfig --level 3 mw on')
+
+
     if os.path.exists('/etc/init.d'):
         initd_bin = '/etc/init.d/mw'
         # if not os.access(initd_bin, os.W_OK):
@@ -55,7 +61,7 @@ def init_cmd():
         # 加入自启动
         mw.execShell('which update-rc.d && update-rc.d -f mw defaults')
 
-    # if mw.getOsName() == 'opensuse':
+    # if sys_name == 'opensuse':
     #     init_cmd_systemd()
     return True
 

From 5bab1ab4daae987055975adf67386b001f4da2ce Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 17:18:29 +0800
Subject: [PATCH 653/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 2876421a0..fe2a0e286 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -579,7 +579,6 @@ mw_default(){
     echo -e "$address"
     echo -e `python3 ${PANEL_DIR}/panel_tools.py username`
     echo -e `python3 ${PANEL_DIR}/panel_tools.py password`
-    # echo -e "password: $password"
     echo -e "\033[33mWarning:\033[0m"
     echo -e "\033[33mIf you cannot access the panel. \033[0m"
     echo -e "\033[33mrelease the following port (${show_panel_ip}80|443|22) in the security group.\033[0m"

From 85a9ee4b297e84c9018970546cfcf3013536aa34 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 17:22:16 +0800
Subject: [PATCH 654/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index fe2a0e286..427817633 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -521,7 +521,7 @@ mw_clean_lib(){
 mw_default(){
     cd ${PANEL_DIR}
     port=7200
-    scheme=$(python3 ${PANEL_DIR}/panel_tools.py panel_ssl_type)
+    scheme=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py panel_ssl_type)
     
     if [ -f ${PANEL_DIR}/data/port.pl ];then
         port=$(cat ${PANEL_DIR}/data/port.pl)
@@ -536,8 +536,8 @@ mw_default(){
 
     admin_path=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py admin_path)
     if [ "$address" == "" ];then
-        v4=$(python3 ${PANEL_DIR}/panel_tools.py getServerIp 4)
-        v6=$(python3 ${PANEL_DIR}/panel_tools.py getServerIp 6)
+        v4=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py getServerIp 4)
+        v6=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py getServerIp 6)
 
         if [ "$v4" != "" ] && [ "$v6" != "" ]; then
 
@@ -577,8 +577,8 @@ mw_default(){
     echo -e "\033[32mMW-PANEL DEFAULT INFO!\033[0m"
     echo -e "=================================================================="
     echo -e "$address"
-    echo -e `python3 ${PANEL_DIR}/panel_tools.py username`
-    echo -e `python3 ${PANEL_DIR}/panel_tools.py password`
+    echo -e `cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py username`
+    echo -e `cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py password`
     echo -e "\033[33mWarning:\033[0m"
     echo -e "\033[33mIf you cannot access the panel. \033[0m"
     echo -e "\033[33mrelease the following port (${show_panel_ip}80|443|22) in the security group.\033[0m"

From 0357087b06a1bdfd649826f38feec57ff2102a34 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 17:27:08 +0800
Subject: [PATCH 655/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 427817633..1a86903bb 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -520,6 +520,7 @@ mw_clean_lib(){
 
 mw_default(){
     cd ${PANEL_DIR}
+    echo "PANEL_DIR:${PANEL_DIR}"
     port=7200
     scheme=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py panel_ssl_type)
     

From 6c306ad97f6ce18009ef160c3884455ebe3dd725 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 17:39:07 +0800
Subject: [PATCH 656/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 1a86903bb..4709275bb 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -568,7 +568,7 @@ mw_default(){
     fi
 
     # bind domain check
-    panel_bind_domain=$(python3 ${PANEL_DIR}/panel_tools.py panel_bind_domain)
+    panel_bind_domain=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py panel_bind_domain)
     if [ "$panel_bind_domain" != "" ];then
         address="MW-PANEL-URL: ${scheme}://$panel_bind_domain:$port$admin_path\n${address}"
     fi

From fd907e1dc9e482c42ed1ca25e190910facaf66fd Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 17:39:19 +0800
Subject: [PATCH 657/965] Update mw.tpl

---
 scripts/init.d/mw.tpl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 4709275bb..0f06f05e3 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -520,7 +520,6 @@ mw_clean_lib(){
 
 mw_default(){
     cd ${PANEL_DIR}
-    echo "PANEL_DIR:${PANEL_DIR}"
     port=7200
     scheme=$(cd ${PANEL_DIR} && python3 ${PANEL_DIR}/panel_tools.py panel_ssl_type)
     

From 163776c5ffe5638cb3b5d58db595c02e5f27dd05 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 17:54:09 +0800
Subject: [PATCH 658/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index 738bad881..6eb154d07 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -13,18 +13,17 @@ import shutil
 
 import core.mw as mw
 
-def contentReplace(src, dst):
-    content = mw.readFile(src)
+def cmdContent():
+    script = mw.getPanelDir() + '/scripts/init.d/mw.tpl'
     content = content.replace("{$SERVER_PATH}", mw.getPanelDir())
-
     content += "\n# make:{0}".format(mw.formatDate())
-    mw.writeFile(dst, content)
+    return content
 
 
 def init_cmd():
-    script = mw.getPanelDir() + '/scripts/init.d/mw.tpl'
+    cmd_content = cmdContent()
     script_bin = mw.getPanelDir() + '/scripts/init.d/mw'
-    contentReplace(script, script_bin)
+    mw.writeFile(script_bin, cmd_content)
     mw.execShell('chmod +x ' + script_bin)
 
     # 在linux系统中,确保/etc/init.d存在
@@ -41,9 +40,9 @@ def init_cmd():
         initd_bin = '/etc/rc.d/init.d/mw'
         # if not os.access(initd_bin, os.W_OK):
         #     return False
-        if not os.path.exists(initd_bin):
-            shutil.copyfile(script_bin, initd_bin)
-            mw.execShell('chmod +x ' + initd_bin)
+
+        mw.writeFile(initd_bin, cmd_content)
+        mw.execShell('chmod +x ' + initd_bin)
         # 加入自启动
         mw.execShell('which chkconfig && chkconfig --add mw')
 
@@ -55,9 +54,9 @@ def init_cmd():
         initd_bin = '/etc/init.d/mw'
         # if not os.access(initd_bin, os.W_OK):
         #     return False
-        if not os.path.exists(initd_bin):
-            shutil.copyfile(script_bin, initd_bin)
-            mw.execShell('chmod +x ' + initd_bin)
+        mw.writeFile(initd_bin, cmd_content)
+        mw.execShell('chmod +x ' + initd_bin)
+
         # 加入自启动
         mw.execShell('which update-rc.d && update-rc.d -f mw defaults')
 

From 93d4749d9eca71e20f63954cf8cd74ad029aa459 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 17:54:29 +0800
Subject: [PATCH 659/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index 6eb154d07..07359066b 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -38,9 +38,6 @@ def init_cmd():
     # initd
     if os.path.exists('/etc/rc.d/init.d'):
         initd_bin = '/etc/rc.d/init.d/mw'
-        # if not os.access(initd_bin, os.W_OK):
-        #     return False
-
         mw.writeFile(initd_bin, cmd_content)
         mw.execShell('chmod +x ' + initd_bin)
         # 加入自启动

From 99c2c7ce4c85dfd5cce1c865560a1300930d08c9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 17:56:26 +0800
Subject: [PATCH 660/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index 07359066b..5ca4cbb41 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -15,6 +15,7 @@ import core.mw as mw
 
 def cmdContent():
     script = mw.getPanelDir() + '/scripts/init.d/mw.tpl'
+    content = mw.readFile(src)
     content = content.replace("{$SERVER_PATH}", mw.getPanelDir())
     content += "\n# make:{0}".format(mw.formatDate())
     return content

From 824032b33890bb2dd0c9f05a5c8e39df26574464 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 17:57:19 +0800
Subject: [PATCH 661/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index 5ca4cbb41..9edfb89a0 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -15,7 +15,7 @@ import core.mw as mw
 
 def cmdContent():
     script = mw.getPanelDir() + '/scripts/init.d/mw.tpl'
-    content = mw.readFile(src)
+    content = mw.readFile(script)
     content = content.replace("{$SERVER_PATH}", mw.getPanelDir())
     content += "\n# make:{0}".format(mw.formatDate())
     return content

From 408c9c291b13a0f7db7dcd47bbd7444ccd1100da Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 18:03:11 +0800
Subject: [PATCH 662/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index 9edfb89a0..cad992acb 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -44,17 +44,11 @@ def init_cmd():
         # 加入自启动
         mw.execShell('which chkconfig && chkconfig --add mw')
 
-        # if sys_name == 'opensuse':
-        #     mw.execShell('which chkconfig && chkconfig --level 3 mw on')
-
 
     if os.path.exists('/etc/init.d'):
         initd_bin = '/etc/init.d/mw'
-        # if not os.access(initd_bin, os.W_OK):
-        #     return False
         mw.writeFile(initd_bin, cmd_content)
         mw.execShell('chmod +x ' + initd_bin)
-
         # 加入自启动
         mw.execShell('which update-rc.d && update-rc.d -f mw defaults')
 

From c81616894ccf60fa6d3afcd25dcff794dc0210b3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 21:13:50 +0800
Subject: [PATCH 663/965] Update README.md

---
 README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 76298c0bd..097c905c2 100644
--- a/README.md
+++ b/README.md
@@ -110,11 +110,12 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```
 
 
-### 版本更新 0.17.3
+### 版本更新 0.18.0
 
-- 新增pgadmin插件。
-- 新增acme_pandominassl_apply插件。
-- 新增快捷指令:mw pgdb。
+- 重新架构面面板。
+- PHP84正式版。
+- 加入alist插件。
+- 加数据管理-常用命令。
 - 常规更新。
 
 ### JSDelivr安装地址

From 8cbae189868089ec38483838511adc101e6aca72 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 21:46:30 +0800
Subject: [PATCH 664/965] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 097c905c2..9ada4c505 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,7 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 - 重新架构面面板。
 - PHP84正式版。
 - 加入alist插件。
-- 加数据管理-常用命令。
+- 数据管理-常用命令。
 - 常规更新。
 
 ### JSDelivr安装地址

From 846600ef9906a0055e9cb937715d0cdbbf185cba Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 21:48:40 +0800
Subject: [PATCH 665/965] Update index.py

---
 plugins/migration_api/index.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/migration_api/index.py b/plugins/migration_api/index.py
index 061deca92..65fc4319f 100755
--- a/plugins/migration_api/index.py
+++ b/plugins/migration_api/index.py
@@ -242,8 +242,7 @@ class classApi:
     def close_sync(self, args):
         # 取消迁移
         mw.execShell("kill -9 {}".format(self.get_pid()))
-        mw.execShell(
-            "kill -9 $(ps aux|grep index.py|grep -v grep|awk '{print $2}')")
+        mw.execShell("kill -9 $(ps aux|grep index.py|grep -v grep|awk '{print $2}')")
         # 删除迁移配置
         time.sleep(1)
         if os.path.exists(self._INFO_FILE):
@@ -538,14 +537,14 @@ class classApi:
     def getSocketFile(self, mtype='mysql'):
         file = self.getConf(mtype)
         content = mw.readFile(file)
-        rep = 'socket\s*=\s*(.*)'
+        rep = r'socket\s*=\s*(.*)'
         tmp = re.search(rep, content)
         return tmp.groups()[0].strip()
 
     def getDbPort(self, mtype='mysql'):
         file = self.getConf(mtype)
         content = mw.readFile(file)
-        rep = 'port\s*=\s*(.*)'
+        rep = r'port\s*=\s*(.*)'
         tmp = re.search(rep, content)
         return tmp.groups()[0].strip()
 

From 916b3dff6c47864613853ecfb86fec48fb6bf755 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 22:03:25 +0800
Subject: [PATCH 666/965] Update public.js

---
 web/static/app/public.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/static/app/public.js b/web/static/app/public.js
index e3960155a..46ce3a2b5 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1535,7 +1535,7 @@ function getReloads() {
 				return;
 			}
 		},'json').error(function(){});
-	}, 1000);
+	}, 3000);
 }
 
 //检查选中项

From 897e236719683ed25b9823d931ba8f6d42dc8756 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 22:08:53 +0800
Subject: [PATCH 667/965] Update __init__.py

---
 web/admin/task/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/task/__init__.py b/web/admin/task/__init__.py
index 650d4f26e..45873fc4d 100644
--- a/web/admin/task/__init__.py
+++ b/web/admin/task/__init__.py
@@ -78,7 +78,7 @@ def get_task_speed():
         data['isDownload'] = False
 
 
-    data['task'] = thisdb.getTaskRunList()
+    data['task'] = thisdb.getTaskRunList(1,6)
     return data
 
 @blueprint.route('/remove_task', endpoint='remove_task', methods=['POST'])

From 35ce2abae608da3d9752fde40f6a611428e8bb88 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 22:09:34 +0800
Subject: [PATCH 668/965] Update __init__.py

---
 web/admin/task/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/task/__init__.py b/web/admin/task/__init__.py
index 45873fc4d..66d389b7f 100644
--- a/web/admin/task/__init__.py
+++ b/web/admin/task/__init__.py
@@ -77,7 +77,7 @@ def get_task_speed():
         data['msg'] = mw.getLastLine(task_logfile, 10)
         data['isDownload'] = False
 
-
+    data['count'] = count
     data['task'] = thisdb.getTaskRunList(1,6)
     return data
 

From f25066e23e1d3ef5af2657e22387fd9723ee1c77 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 22:10:07 +0800
Subject: [PATCH 669/965] Update public.js

---
 web/static/app/public.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/static/app/public.js b/web/static/app/public.js
index 46ce3a2b5..aaecee54a 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1491,7 +1491,7 @@ function getReloads() {
 			}
 			var b = "";
 			var d = "";
-			$("#task").text(h.task.length);
+			$("#task").text(h.count);
 			$(".task_count").text(h.task.length);
 			for(var g = 0; g < h.task.length; g++) {
 				if(h.task[g].status == "-1") {

From f96ff13843dd2476143f9c8a80828f9ce989e739 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 22:16:05 +0800
Subject: [PATCH 670/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index 37d8deecc..77dbedd38 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.8
+APP_SMALL_VERSION = 0.9
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From 332aa4341913c0e55e68271b4c185776c3fba37c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 22:24:49 +0800
Subject: [PATCH 671/965] Update index.py

---
 plugins/php-guard/index.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/php-guard/index.py b/plugins/php-guard/index.py
index 15ee87527..6846179e9 100755
--- a/plugins/php-guard/index.py
+++ b/plugins/php-guard/index.py
@@ -8,11 +8,12 @@ import re
 import json
 import shutil
 
-# reload(sys)
-# sys.setdefaultencoding('utf8')
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():

From 34e6bb75e09cfdf7293524a4e9e088f9a6ffa63f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 22:26:28 +0800
Subject: [PATCH 672/965] Update index.py

---
 plugins/migration_api/index.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/migration_api/index.py b/plugins/migration_api/index.py
index 65fc4319f..25ad7fbac 100755
--- a/plugins/migration_api/index.py
+++ b/plugins/migration_api/index.py
@@ -788,8 +788,7 @@ class classApi:
 
     def run(self):
         # 开始迁移
-        # self.upload_file("/tmp/mysql-boost-5.7.39.tar.gz",
-        # "/tmp/mysql-boost-5.7.39.tar.gz")
+        # self.upload_file("/tmp/mysql-boost-5.7.39.tar.gz", "/tmp/mysql-boost-5.7.39.tar.gz")
 
         # self.sync_other()
         self.sync_site()

From 1faef6799b93e9c3bff456b764bfd8fb6bc8c6b7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 23:43:05 +0800
Subject: [PATCH 673/965] update

---
 web/static/app/public.js | 17 +----------------
 web/utils/task.py        |  1 +
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/web/static/app/public.js b/web/static/app/public.js
index aaecee54a..09489b60d 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -922,20 +922,6 @@ function task() {
 	messageBox();
 }
 
-function ActionTask() {
-	var a = layer.msg(lan.public.the_del, {
-		icon: 16,
-		time: 0,
-		shade: [0.3, "#000"]
-	});
-	$.post("/files?action=ActionTask", "", function(b) {
-		layer.close(a);
-		layer.msg(b.msg, {
-			icon: b.status ? 1 : 5
-		})
-	})
-}
-
 function removeTask(b) {
 	var a = layer.msg('正在删除,请稍候...', {
 		icon: 16,
@@ -1565,7 +1551,6 @@ function tasklist(a){
 		var b = "";
 		var c = "";
 		var f = false;
-		var task_count =0;
 		for(var d = 0; d < g.data.length; d++) {
 			switch(g.data[d].status) {
 				case "-1":
@@ -1595,7 +1580,7 @@ function tasklist(a){
 		}
 		
 		
-		$(".task_count").text(task_count);
+		$(".task_count").text(g.count);
 		$(".cmdlist").html(b + c);
 		getReloads();
 		return f
diff --git a/web/utils/task.py b/web/utils/task.py
index a6ddbd990..63f9e18df 100644
--- a/web/utils/task.py
+++ b/web/utils/task.py
@@ -20,6 +20,7 @@ def getTaskPage(page=1,size=10):
 
     rdata = {}
     rdata['data'] = info['list']
+    rdata['count'] = info['count']
     rdata['page'] = mw.getPage({'count':info['count'],'tojs':'remind','p':page,'row':size})
     return rdata
 

From f5af7688a745af1ed8e94153f8821f2768ec06ab Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 23:43:36 +0800
Subject: [PATCH 674/965] Update public.js

---
 web/static/app/public.js | 48 ----------------------------------------
 1 file changed, 48 deletions(-)

diff --git a/web/static/app/public.js b/web/static/app/public.js
index 09489b60d..72c29b642 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -938,54 +938,6 @@ function removeTask(b) {
 	});
 }
 
-function GetTaskList(a) {
-	a = a == undefined ? 1 : a;
-	$.post("/task/list", "tojs=GetTaskList&table=tasks&limit=10&p=" + a, function(g) {
-		console.log(g);
-		var e = "";
-		var b = "";
-		var c = "";
-		var f = false;
-		for(var d = 0; d < g.data.length; d++) {
-			switch(g.data[d].status) {
-				case "-1":
-					f = true;
-					if(g.data[d].type != "download") {
-						b = "<li>\
-								<span class='titlename'>" + g.data[d].name + "</span>\
-								<span class='state'>正在安装 <img src='/static/img/ing.gif'> | <a href=\"javascript:removeTask(" + g.data[d].id + ")\">关闭</a></span>\
-								<span class='opencmd'></span><pre class='cmd'></pre>\
-							</li>";
-					} else {
-						b = "<li>\
-							<div class='line-progress' style='width:0%'></div>\
-							<span class='titlename'>" + g.data[d].name + "<a id='speed' style='margin-left:130px;'>0.0M/12.5M</a></span>\
-							<span class='com-progress'>0%</span><span class='state'>\
-								下载中 <img src='/static/img/ing.gif'> | <a href=\"javascript:removeTask(" + g.data[d].id + ")\">"+lan.public.close+"</a>\
-							</span>\
-						</li>";
-					}
-					break;
-				case "0":
-					c += "<li>\
-							<span class='titlename'>" + g.data[d].name + "</span>\
-							<span class='state'>等待</span> | <a href=\"javascript:removeTask(" + g.data[d].id + ")\">删除</a>\
-						</li>";
-					break;
-				case "1":
-					e += "<li>\
-						<span class='titlename'>" + g.data[d].name + "</span>\
-						<span class='state'>" + g.data[d].addtime + "  "+'已完成'+"  "+ '耗时' + (g.data[d].end - g.data[d].start)+"秒</span>\
-						</li>";
-			}
-		}
-		$("#srunning").html(b + c);
-		$("#sbody").html(e);
-		return f
-	})
-}
-
-
 //获取任务总数
 function getTaskCount() {
 	$.get("/task/count", "", function(a) {

From ddef7b1182248bff747a46729526eac84da8d382 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 23:45:31 +0800
Subject: [PATCH 675/965] Update public.js

---
 web/static/app/public.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/static/app/public.js b/web/static/app/public.js
index 72c29b642..5dd2a3c54 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1519,14 +1519,12 @@ function tasklist(a){
 							<span class='com-progress'>0%</span><span class='state'>下载中 <img src='/static/img/ing.gif'> | <a href=\"javascript:removeTask(" + g.data[d].id + ")\">关闭</a></span>\
 						</li>";
 					}
-					task_count++;
 					break;
 				case "0":
 					c += "<li>\
 						<span class='titlename'>" + g.data[d].name + "</span>\
 						<span class='state pull-right c6'>等待</span> | <a href=\"javascript:removeTask(" + g.data[d].id + ")\" class='btlink'>"+lan.public.del+"</a>\
 					</li>";
-					task_count++;
 					break;
 			}
 		}

From 2430cbb11a0c0e0671c814d37e82bfcc0d249ed8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 2 Dec 2024 23:46:02 +0800
Subject: [PATCH 676/965] Update public.js

---
 web/static/app/public.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/static/app/public.js b/web/static/app/public.js
index 5dd2a3c54..511978807 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1523,7 +1523,7 @@ function tasklist(a){
 				case "0":
 					c += "<li>\
 						<span class='titlename'>" + g.data[d].name + "</span>\
-						<span class='state pull-right c6'>等待</span> | <a href=\"javascript:removeTask(" + g.data[d].id + ")\" class='btlink'>"+lan.public.del+"</a>\
+						<span class='state pull-right c6'>等待</span> | <a href=\"javascript:removeTask(" + g.data[d].id + ")\" class='btlink'>删除</a>\
 					</li>";
 					break;
 			}

From d211aa168c8500762fbab77f64b51e818014ff5e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 00:27:34 +0800
Subject: [PATCH 677/965] Update info.json

---
 plugins/migration_api/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/migration_api/info.json b/plugins/migration_api/info.json
index 873b39449..8d115c02c 100755
--- a/plugins/migration_api/info.json
+++ b/plugins/migration_api/info.json
@@ -1,6 +1,6 @@
 {
 	"sort": 7,
-	"ps": "[<span style='color:red;'>潜龙勿用</span>]一键迁移,仅网站数据和MySQL数据(仅支持源码安装软件)",
+	"ps": "一键迁移,仅网站数据和MySQL数据(仅支持源码安装软件)[<span style='color:red;'>暂时不可用</span>]",
 	"name": "migration_api",
 	"title": "一键迁移API",
 	"shell": "install.sh",

From fce4cc332c6450c6164ad1496d86dde71251fcef Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 01:10:02 +0800
Subject: [PATCH 678/965] Update install.sh

---
 plugins/fail2ban/install.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/fail2ban/install.sh b/plugins/fail2ban/install.sh
index 09f8b1806..a07496351 100755
--- a/plugins/fail2ban/install.sh
+++ b/plugins/fail2ban/install.sh
@@ -18,7 +18,8 @@ Install_App()
 	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 
-	apt install -y fail2ban
+	which yum && yum install -y fail2ban
+	which apt && apt install -y fail2ban
 
 	mkdir -p $serverPath/fail2ban
 	echo "${VERSION}" > $serverPath/fail2ban/version.pl
@@ -30,8 +31,11 @@ Install_App()
 
 Uninstall_App()
 {
-	apt remove -y fail2ban
-	apt purge -y fail2ban
+	which apt && apt remove -y fail2ban
+	which apt && apt purge -y fail2ban
+
+	which yum && yum remove -y fail2ban
+	which yum && yum purge -y fail2ban
 
 	if [ -f /usr/lib/systemd/system/fail2ban.service ];then
 		systemctl stop fail2ban

From 9b0b8015df8e1d54d497ec07140ff42a2c15c353 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 15:19:58 +0800
Subject: [PATCH 679/965] update

---
 web/admin/files/files.py |  8 ++++++++
 web/utils/file.py        | 42 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/web/admin/files/files.py b/web/admin/files/files.py
index dcca06a1b..7bfdcede1 100644
--- a/web/admin/files/files.py
+++ b/web/admin/files/files.py
@@ -121,6 +121,14 @@ def get_dir():
     dir_list['page'] = mw.getPage({'p':page, 'row': row, 'tojs':'getFiles', 'count': dir_list['count']}, '1,2,3,4,5,6,7,8')
     return dir_list
 
+# 获取文件列表
+@blueprint.route('/uncompress', endpoint='uncompress', methods=['POST'])
+@panel_login_required
+def uncompress(self):
+    sfile = request.form.get('sfile', '')
+    dfile = request.form.get('dfile', '')
+    path = request.form.get('path', '')
+    return file.uncompress(sfile, dfile, path)
 
 # 上传文件
 @blueprint.route('/upload_file', endpoint='upload_file', methods=['POST'])
diff --git a/web/utils/file.py b/web/utils/file.py
index cf8d04e5d..99df5edcd 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -16,6 +16,48 @@ import shutil
 import core.mw as mw
 import thisdb
 
+def uncompress(sfile, dfile, path):
+    if not os.path.exists(sfile):
+        return mw.returnData(False, '指定文件不存在!')
+
+    filename = os.path.basename(sfile)
+    extension = os.path.splitext(filename)[-1]
+    extension = extension.strip('.')
+
+    tar_gz = 'tar.gz'
+    tar_gz_len = len(tar_gz)
+    suffix_gz = sfile[-tar_gz_len:]
+    if suffix_gz == tar_gz:
+        extension = suffix_gz
+
+    if not extension in ['tar.gz', 'gz', 'zip', 'rar']:
+        return mw.returnData(False, '现在仅支持gz,zip,rar格式解压!')
+
+    if mw.isAppleSystem() and extension == 'rar':
+        return mw.returnData(False, 'macosx暂时不支持rar格式解压')
+
+    try:
+        tmps = mw.getRunDir() + '/logs/panel_exec.log'
+        if extension == 'zip':
+            cmd = "cd " + path + " && unzip -o -d '" + dfile + "' '" + sfile + "' > " + tmps + " 2>&1 &"
+            mw.execShell(cmd)
+        if extension == 'tar.gz':
+            cmd = "cd " + path + " && tar -zxvf " + sfile + " -C " + dfile + " > " + tmps + " 2>&1 &"
+            mw.execShell(cmd)
+        if extension == 'gz':
+            cmd = "cd " + path + " && gunzip -k " + sfile + " > " + tmps + " 2>&1 &"
+            mw.execShell(cmd)
+        if extension == 'rar':
+            cmd = "cd " + path + " && unrar x " + sfile + " " + dfile + " > " + tmps + " 2>&1 &"
+            mw.execShell(cmd)
+
+        if os.path.exists(dfile):
+            setFileAccept(dfile)
+        mw.writeLog("文件管理", '文件[{1}]解压[{2}]成功!', (sfile, dfile))
+        return mw.returnData(True, '文件解压成功!')
+    except Exception as e:
+        return mw.returnData(False, '文件解压失败!:' + str(e))
+
 def copyDir(src_file, dst_file):
     if not os.path.exists(src_file):
         return mw.returnData(False, '指定目录不存在!')

From 4240f49de9e4788c9f713e24b2343b705f64ea58 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 15:28:33 +0800
Subject: [PATCH 680/965] Update file.py

---
 web/utils/file.py | 73 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/web/utils/file.py b/web/utils/file.py
index 99df5edcd..415ee8a97 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -16,6 +16,79 @@ import shutil
 import core.mw as mw
 import thisdb
 
+def uploadSegmentApi(self):
+    # 分段上传
+    path = request.form.get('path', '')
+    name = request.form.get('name', '')
+    size = request.form.get('size')
+    start = request.form.get('start')
+    dir_mode = request.form.get('dir_mode', '')
+    file_mode = request.form.get('file_mode', '')
+
+    if not mw.fileNameCheck(name):
+        return mw.returnData(False, '文件名中不能包含特殊字符!')
+
+    if path == '/':
+        return mw.returnData(False, '不能直接上传文件到系统根目录!')
+
+    if name.find('./') != -1 or path.find('./') != -1:
+        return mw.returnData(False, '错误的参数')
+
+    if not os.path.exists(path):
+        os.makedirs(path, 493)
+        if not dir_mode != '' or not file_mode != '':
+            mw.setMode(path)
+
+    save_path = os.path.join(
+        path, name + '.' + str(int(size)) + '.upload.tmp')
+    d_size = 0
+    if os.path.exists(save_path):
+        d_size = os.path.getsize(save_path)
+
+    if d_size != int(start):
+        return str(d_size)
+
+    f = open(save_path, 'ab')
+    b64_data = request.form.get('b64_data', '0')
+    if b64_data == '1':
+        import base64
+        b64_data = base64.b64decode(args.b64_data)
+        f.write(b64_data)
+    else:
+        upload_files = request.files.getlist("blob")
+        for tmp_f in upload_files:
+            f.write(tmp_f.read())
+
+    f.close()
+    f_size = os.path.getsize(save_path)
+    if f_size != int(size):
+        return str(f_size)
+
+    new_name = os.path.join(path, name)
+    if os.path.exists(new_name):
+        if new_name.find('.user.ini') != -1:
+            mw.execShell("chattr -i " + new_name)
+        try:
+            os.remove(new_name)
+        except:
+            mw.execShell("rm -f %s" % new_name)
+
+    os.renames(save_path, new_name)
+
+    if dir_mode != '' and dir_mode != '':
+        mode_tmp1 = dir_mode.split(',')
+        mw.setMode(path, mode_tmp1[0])
+        mw.setOwn(path, mode_tmp1[1])
+        mode_tmp2 = file_mode.split(',')
+        mw.setMode(new_name, mode_tmp2[0])
+        mw.setOwn(new_name, mode_tmp2[1])
+    else:
+        self.setMode(new_name)
+
+    msg = mw.getInfo('上传文件[{1}] 到 [{2}]成功!', (new_name, path))
+    mw.writeLog('文件管理', msg)
+    return mw.returnData(True, '上传成功!')
+
 def uncompress(sfile, dfile, path):
     if not os.path.exists(sfile):
         return mw.returnData(False, '指定文件不存在!')

From e70113c2805951ef486d22596da9d39aa476f493 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 15:29:05 +0800
Subject: [PATCH 681/965] Update file.py

---
 web/utils/file.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/utils/file.py b/web/utils/file.py
index 415ee8a97..a4975bcfe 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -39,8 +39,7 @@ def uploadSegmentApi(self):
         if not dir_mode != '' or not file_mode != '':
             mw.setMode(path)
 
-    save_path = os.path.join(
-        path, name + '.' + str(int(size)) + '.upload.tmp')
+    save_path = os.path.join(path, name + '.' + str(int(size)) + '.upload.tmp')
     d_size = 0
     if os.path.exists(save_path):
         d_size = os.path.getsize(save_path)

From 2e17870d038b2f2b1a78f3f4b50c344394f2e37d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 15:32:31 +0800
Subject: [PATCH 682/965] update

---
 web/admin/files/files.py | 2 +-
 web/utils/file.py        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/admin/files/files.py b/web/admin/files/files.py
index 7bfdcede1..3da0851f0 100644
--- a/web/admin/files/files.py
+++ b/web/admin/files/files.py
@@ -124,7 +124,7 @@ def get_dir():
 # 获取文件列表
 @blueprint.route('/uncompress', endpoint='uncompress', methods=['POST'])
 @panel_login_required
-def uncompress(self):
+def uncompress():
     sfile = request.form.get('sfile', '')
     dfile = request.form.get('dfile', '')
     path = request.form.get('path', '')
diff --git a/web/utils/file.py b/web/utils/file.py
index a4975bcfe..eff9402d5 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -16,7 +16,7 @@ import shutil
 import core.mw as mw
 import thisdb
 
-def uploadSegmentApi(self):
+def uploadSegmentApi():
     # 分段上传
     path = request.form.get('path', '')
     name = request.form.get('name', '')
@@ -82,7 +82,7 @@ def uploadSegmentApi(self):
         mw.setMode(new_name, mode_tmp2[0])
         mw.setOwn(new_name, mode_tmp2[1])
     else:
-        self.setMode(new_name)
+        mw.setMode(new_name)
 
     msg = mw.getInfo('上传文件[{1}] 到 [{2}]成功!', (new_name, path))
     mw.writeLog('文件管理', msg)

From a718db5457ded0dbcc2b22841dd5eddd625c9744 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 15:34:14 +0800
Subject: [PATCH 683/965] Update file.py

---
 web/utils/file.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/file.py b/web/utils/file.py
index eff9402d5..85d209327 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -109,7 +109,7 @@ def uncompress(sfile, dfile, path):
         return mw.returnData(False, 'macosx暂时不支持rar格式解压')
 
     try:
-        tmps = mw.getRunDir() + '/logs/panel_exec.log'
+        tmps = mw.getPanelDir() + '/logs/panel_exec.log'
         if extension == 'zip':
             cmd = "cd " + path + " && unzip -o -d '" + dfile + "' '" + sfile + "' > " + tmps + " 2>&1 &"
             mw.execShell(cmd)

From 06bb5b5bb08eb9262e81f5170581475c14f34ba1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 15:34:27 +0800
Subject: [PATCH 684/965] Update file.py

---
 web/utils/file.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/file.py b/web/utils/file.py
index 85d209327..96fcc708f 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -125,7 +125,7 @@ def uncompress(sfile, dfile, path):
 
         if os.path.exists(dfile):
             setFileAccept(dfile)
-        mw.writeLog("文件管理", '文件[{1}]解压[{2}]成功!', (sfile, dfile))
+        mw.writeLog("文件管理", '文件[{1}]解压[{2}]成功!', (sfile, dfile,))
         return mw.returnData(True, '文件解压成功!')
     except Exception as e:
         return mw.returnData(False, '文件解压失败!:' + str(e))

From 154c7cbdbcf261637bb3efc04510a269dc04c3d2 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 15:35:17 +0800
Subject: [PATCH 685/965] Update file.py

---
 web/utils/file.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/utils/file.py b/web/utils/file.py
index 96fcc708f..3dbc8f41b 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -108,19 +108,20 @@ def uncompress(sfile, dfile, path):
     if mw.isAppleSystem() and extension == 'rar':
         return mw.returnData(False, 'macosx暂时不支持rar格式解压')
 
+    cmd = "cd " + path
     try:
         tmps = mw.getPanelDir() + '/logs/panel_exec.log'
         if extension == 'zip':
-            cmd = "cd " + path + " && unzip -o -d '" + dfile + "' '" + sfile + "' > " + tmps + " 2>&1 &"
+            cmd += " && unzip -o -d '" + dfile + "' '" + sfile + "' > " + tmps + " 2>&1 &"
             mw.execShell(cmd)
         if extension == 'tar.gz':
-            cmd = "cd " + path + " && tar -zxvf " + sfile + " -C " + dfile + " > " + tmps + " 2>&1 &"
+            cmd += " && tar -zxvf " + sfile + " -C " + dfile + " > " + tmps + " 2>&1 &"
             mw.execShell(cmd)
         if extension == 'gz':
-            cmd = "cd " + path + " && gunzip -k " + sfile + " > " + tmps + " 2>&1 &"
+            cmd += " && gunzip -k " + sfile + " > " + tmps + " 2>&1 &"
             mw.execShell(cmd)
         if extension == 'rar':
-            cmd = "cd " + path + " && unrar x " + sfile + " " + dfile + " > " + tmps + " 2>&1 &"
+            cmd +=  " && unrar x " + sfile + " " + dfile + " > " + tmps + " 2>&1 &"
             mw.execShell(cmd)
 
         if os.path.exists(dfile):

From 299eaa06b8bdea633a6ca58e8b851d0832eaf162 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 15:35:41 +0800
Subject: [PATCH 686/965] Update file.py

---
 web/utils/file.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/utils/file.py b/web/utils/file.py
index 3dbc8f41b..715e5ee5b 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -108,20 +108,20 @@ def uncompress(sfile, dfile, path):
     if mw.isAppleSystem() and extension == 'rar':
         return mw.returnData(False, 'macosx暂时不支持rar格式解压')
 
-    cmd = "cd " + path
+    cmd = "cd " + path + " "
     try:
         tmps = mw.getPanelDir() + '/logs/panel_exec.log'
         if extension == 'zip':
-            cmd += " && unzip -o -d '" + dfile + "' '" + sfile + "' > " + tmps + " 2>&1 &"
+            cmd += "&& unzip -o -d '" + dfile + "' '" + sfile + "' > " + tmps + " 2>&1 &"
             mw.execShell(cmd)
         if extension == 'tar.gz':
-            cmd += " && tar -zxvf " + sfile + " -C " + dfile + " > " + tmps + " 2>&1 &"
+            cmd += "&& tar -zxvf " + sfile + " -C " + dfile + " > " + tmps + " 2>&1 &"
             mw.execShell(cmd)
         if extension == 'gz':
-            cmd += " && gunzip -k " + sfile + " > " + tmps + " 2>&1 &"
+            cmd += "&& gunzip -k " + sfile + " > " + tmps + " 2>&1 &"
             mw.execShell(cmd)
         if extension == 'rar':
-            cmd +=  " && unrar x " + sfile + " " + dfile + " > " + tmps + " 2>&1 &"
+            cmd +=  "&& unrar x " + sfile + " " + dfile + " > " + tmps + " 2>&1 &"
             mw.execShell(cmd)
 
         if os.path.exists(dfile):

From 2ecc29269ff3df3da66dccf2ac3e283252a1be66 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 16:14:47 +0800
Subject: [PATCH 687/965] update

---
 plugins/xui/conf/mt.toml           |  23 +++
 plugins/xui/ico.png                | Bin 0 -> 683 bytes
 plugins/xui/index.html             |  23 +++
 plugins/xui/index.py               | 257 +++++++++++++++++++++++++++++
 plugins/xui/info.json              |  19 +++
 plugins/xui/init.d/xui.service.tpl |  14 ++
 plugins/xui/install.sh             |  33 ++++
 plugins/xui/js/xui.js              |  61 +++++++
 8 files changed, 430 insertions(+)
 create mode 100644 plugins/xui/conf/mt.toml
 create mode 100644 plugins/xui/ico.png
 create mode 100755 plugins/xui/index.html
 create mode 100755 plugins/xui/index.py
 create mode 100755 plugins/xui/info.json
 create mode 100644 plugins/xui/init.d/xui.service.tpl
 create mode 100755 plugins/xui/install.sh
 create mode 100644 plugins/xui/js/xui.js

diff --git a/plugins/xui/conf/mt.toml b/plugins/xui/conf/mt.toml
new file mode 100644
index 000000000..495d45a3e
--- /dev/null
+++ b/plugins/xui/conf/mt.toml
@@ -0,0 +1,23 @@
+debug = false
+
+secret = "{$SECRET}"
+bind-to = "0.0.0.0:{$PORT}"
+
+concurrency = 256
+prefer-ip = "prefer-ipv4"
+domain-fronting-port = 443
+tolerate-time-skewness = "10s"
+
+[network]
+doh-ip = "9.9.9.9"
+
+[network.timeout]
+tcp = "5s"
+http = "10s"
+idle = "1m"
+
+[defense.anti-replay]
+enabled = true
+max-size = "1mib"
+error-rate = 0.001
+
diff --git a/plugins/xui/ico.png b/plugins/xui/ico.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7f2362c5c19cf6f7468a96698be1572c12941de
GIT binary patch
literal 683
zcmV;c0#yBpP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px%Wl2OqRA@uxSzAs6F$_#k2Am8y8E`V_Nb4$_#`f58Dpl-Hr8ahE{Kz=lOMCL?
z^5pp2zbEj~T6<}&y&jqTynf<4@4@=_W6=+3GxfQW0RR;cy>pL*X7_dt#J9(M{5?wm
z5&SYX(@1FG;R@hEBJ^YlSU?28NP@8m;|Uua=)4S!BpC3p3F8SH1PMrKNRxZz5ylfX
z=n$|`^+0PSN7=0qzy?($ypu~Mvr3?XL>hdmX_Qc8GqD8TA|OqNPn^$;z(h$f;6<^a
z){^a03}+=Y1Hx=pO#nhUo?driHxjTwSR|t0y_07KUTjVzMgo>09Lz{$!D}Qu45!i`
z3H%a=Z%<+s{78ZUZxUb~AdP6O*)&STV7df88O1hBs4Aj8LKYZH{8Yy5Da1M-*U4s8
zfw}8JO^GWu%#71kpr)swHA<|I$XsZ`;F(b(L&6iis87=$Gt99k69U3q3nTtC?YU*k
zBM^<2M<NQ|Q*84JmjOSO`{T<jc$37=Q>ZVeRq!f_-8vv+IHRzv)|f)JQZ_6AZCymM
zZ!f_j<8;3<qJXDr7K$piN`R@=>S;8i*eU_<g;n)^AgkE7%9%B>mWApYSyr*#X%w~H
zH#3?GM&8AqxeQr4F>7vlRgYKrqRJ;6o)WVs3)4HJFJ|m;_pcz30UynTN@SJ53iuKd
zD+DS<FI`Sq0+rz1iPLI?-2@_voytO%08{%J#SY^M8<4YoMzJ570r1d-E34R^GEZ9}
zn*lhJSKs}t&-~Y$efwQbpm!+$Be=?WEWrBS#v4<%2^kA`+q#t!+6F4(_z%CvqA?2X
R!BqeN002ovPDHLkV1lFbDTV+5

literal 0
HcmV?d00001

diff --git a/plugins/xui/index.html b/plugins/xui/index.html
new file mode 100755
index 000000000..9d1fe8f8a
--- /dev/null
+++ b/plugins/xui/index.html
@@ -0,0 +1,23 @@
+<div class="bt-form">
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('xui');">服务</p>
+			<p onclick="pluginInitD('xui');">自启动</p>
+			<p onclick="mtCommonFunc($('.plugin_version').attr('version'));">常用功能</p>
+			<p onclick="pluginConfig('xui');">配置修改</p>
+			<p onclick="pluginConfig('xui', null, 'conf_env');">配置文件</p>
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+//xui  start
+var loading = layer.msg("资源加载中...", { icon: 16, time: 0, shade: 0.3 });
+$.getScript( "/plugins/file?name=xui&f=js/xui.js", function(){
+	layer.close(loading);
+	pluginService('xui')
+});
+//xui end
+</script>
\ No newline at end of file
diff --git a/plugins/xui/index.py b/plugins/xui/index.py
new file mode 100755
index 000000000..15e476d70
--- /dev/null
+++ b/plugins/xui/index.py
@@ -0,0 +1,257 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import re
+
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'xui'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getServiceTpl():
+    path = getPluginDir() + "/init.d/" + getPluginName() + ".service.tpl"
+    return path
+
+
+def getConfEnvTpl():
+    path = getPluginDir() + "/conf/mt.toml"
+    return path
+
+
+def getConfEnv():
+    path = getServerDir() + "/mt.toml"
+    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 status():
+    cmd = "ps -ef|grep mtproxy| grep mtg |grep -v grep | grep -v python  | awk '{print $2}'"
+    data = mw.execShell(cmd)
+    if data[0] == '':
+        return 'stop'
+    return 'start'
+
+
+def getServiceFile():
+    systemDir = mw.systemdCfgDir()
+    return systemDir + '/mtproxy.service'
+
+
+def getMtproxyPort():
+    return '8349'
+
+
+def __release_port(port):
+    from collections import namedtuple
+    try:
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().addAcceptPort(port, 'mtproxy', 'port')
+        return port
+    except Exception as e:
+        return "Release failed {}".format(e)
+
+def __delete_port(port):
+    from collections import namedtuple
+    try:
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().delAcceptPortCmd(port, 'tcp')
+        return port
+    except Exception as e:
+        return "Delete failed {}".format(e)
+
+def openPort():
+    port = getMtproxyPort()
+    for i in [port]:
+        __release_port(i)
+    return True
+
+def delPort():
+    port = getMtproxyPort()
+    for i in [port]:
+        __delete_port(i)
+    return True
+
+
+def initDreplace():
+
+    envTpl = getConfEnvTpl()
+    dstEnv = getConfEnv()
+    cmd = getServerDir() + '/mtg/mtg generate-secret `head -c 16 /dev/urandom | xxd -ps`'
+    secret = mw.execShell(cmd)
+    if not os.path.exists(dstEnv):
+        env_content = mw.readFile(envTpl)
+        env_content = env_content.replace('{$PORT}', getMtproxyPort())
+        env_content = env_content.replace('{$SECRET}', secret[0].strip())
+        mw.writeFile(dstEnv, env_content)
+        openPort()
+
+    # systemd
+    systemDir = mw.systemdCfgDir()
+    systemService = systemDir + '/mtproxy.service'
+    systemServiceTpl = getServiceTpl()
+    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 'ok'
+
+
+def mtOp(method):
+    file = initDreplace()
+
+    if not mw.isAppleSystem():
+        mw.execShell('systemctl daemon-reload')
+        data = mw.execShell('systemctl ' + method + ' mtproxy')
+        if data[1] == '':
+            return 'ok'
+        return data[1]
+
+    return 'fail'
+
+
+def start():
+    return mtOp('start')
+
+
+def stop():
+    return mtOp('stop')
+
+
+def restart():
+    return mtOp('restart')
+
+
+def reload():
+    return redisOp('reload')
+
+
+def initdStatus():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    shell_cmd = 'systemctl status mtproxy | 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 mtproxy')
+    return 'ok'
+
+
+def initdUinstall():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+    mw.execShell('systemctl disable mtproxy')
+    return 'ok'
+
+def getMtproxyUrl():
+    conf = getConfEnv()
+    content = mw.readFile(conf)
+
+
+    rep = r'bind-to\s*=\s*(.*)'
+    tmp = re.search(rep, content)
+    bind_to = tmp.groups()[0].strip()
+    bind_to = bind_to.strip('"')
+
+    rep = r'secret\s*=\s*(.*)'
+    tmp = re.search(rep, content)
+    secret = tmp.groups()[0].strip()
+    secret = secret.strip('"')
+
+    info = bind_to.split(":")
+
+    ip = mw.getLocalIp()
+
+    url = 'tg://proxy?server={0}&port={1}&secret={2}'.format(ip, info[1], secret)
+    return mw.returnJson(True, 'ok', url)
+
+def installPreInspection():
+    sys = mw.execShell("cat /etc/*-release | grep PRETTY_NAME |awk -F = '{print $2}' | awk -F '\"' '{print $2}'| awk '{print $1}'")
+
+    if sys[1] != '':
+        return '不支持该系统'
+
+    sys_id = mw.execShell("cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F '\"' '{print $2}'")
+
+    sysName = sys[0].strip().lower()
+    sysId = sys_id[0].strip()
+
+    if sysName in ('opensuse'):
+        return '不支持该系统'
+
+    return 'ok'
+
+
+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 == 'install_pre_inspection':
+        print(installPreInspection())
+    elif func == 'conf':
+        print(getServiceFile())
+    elif func == 'conf_env':
+        print(getConfEnv())
+    elif func == 'url':
+        print(getMtproxyUrl())
+    else:
+        print('error')
diff --git a/plugins/xui/info.json b/plugins/xui/info.json
new file mode 100755
index 000000000..4959bfc54
--- /dev/null
+++ b/plugins/xui/info.json
@@ -0,0 +1,19 @@
+{
+	"sort": 7,
+	"ps": "支持多协议多用户的xray面板",
+	"install_pre_inspection":true,
+	"name": "xui",
+	"title": "xui",
+	"shell": "install.sh",
+	"versions":["1.0"],
+	"updates":["1.0"],
+	"tip": "soft",
+	"checks": "server/xui",
+	"path": "server/xui",
+	"display": 1,
+	"author": "FranzKafkaYu",
+	"date": "2024-12-03",
+	"home": "https://github.com/FranzKafkaYu/x-ui",
+	"type": 0,
+	"pid": "5"
+}
\ No newline at end of file
diff --git a/plugins/xui/init.d/xui.service.tpl b/plugins/xui/init.d/xui.service.tpl
new file mode 100644
index 000000000..03ad10760
--- /dev/null
+++ b/plugins/xui/init.d/xui.service.tpl
@@ -0,0 +1,14 @@
+[Unit]
+Description=MTProxy
+After=network.target
+
+[Service]
+Type=simple
+WorkingDirectory={$SERVER_PATH}/mtproxy
+ExecStart={$SERVER_PATH}/mtproxy/mtg/mtg run {$SERVER_PATH}/mtproxy/mt.toml
+RestartSec=3
+Restart=on-failure
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/plugins/xui/install.sh b/plugins/xui/install.sh
new file mode 100755
index 000000000..e34900719
--- /dev/null
+++ b/plugins/xui/install.sh
@@ -0,0 +1,33 @@
+#!/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")
+
+sysArch=`arch`
+sysName=`uname`
+
+
+# cd /www/server/mdserver-web && python3 plugins/mtproxy/index.py url
+# cd /www/server/mdserver-web/plugins/xui && /bin/bash install.sh install 1.0
+
+
+Install_app()
+{
+	echo '安装完成'
+}
+
+Uninstall_app()
+{
+	echo '卸载完成'
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_app $2
+else
+	Uninstall_app $2
+fi
diff --git a/plugins/xui/js/xui.js b/plugins/xui/js/xui.js
new file mode 100644
index 000000000..748e2db60
--- /dev/null
+++ b/plugins/xui/js/xui.js
@@ -0,0 +1,61 @@
+function mtPost(method, version, args,callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'mtproxy';
+    req_data['func'] = method;
+    req_data['version'] = version;
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/run', req_data, function(data) {
+        layer.close(loadT);
+        if (!data.status){
+            //错误展示10S
+            layer.msg(data.msg,{icon:0,time:2000,shade: [10, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+function mtCommonFunc(){
+	var con = '<hr/><p class="conf_p" style="text-align:center;">\
+        <button id="mtproxy_url" class="btn btn-default btn-sm">获取连接地址</button>\
+    </p>';
+
+    $(".soft-man-con").html(con);
+
+    $('#mtproxy_url').click(function(){
+    	mtPost('url', '', {}, function(rdata){
+            var data = $.parseJSON(rdata.data);
+
+            layer.open({
+                title: "mtproxy代理信息",
+                area: ['600px', '180px'],
+                type:1,
+                closeBtn: 1,
+                shadeClose: false,
+                btn:["复制","取消"],
+                content: '<div class="pd15">\
+                            <div class="divtable">\
+                                <pre class="layui-code">'+data.data+'</pre>\
+                            </div>\
+                        </div>',
+                success:function(){
+                    copyText(data.data);
+                },
+                yes:function(){
+                    copyText(data.data);
+                }
+            });
+    	});
+    });
+}
\ No newline at end of file

From e8d72985e652f496d294ea2c51fc5e8a4bd34cb0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 16:26:24 +0800
Subject: [PATCH 688/965] Update install.sh

---
 plugins/xui/install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/xui/install.sh b/plugins/xui/install.sh
index e34900719..318ec8a7b 100755
--- a/plugins/xui/install.sh
+++ b/plugins/xui/install.sh
@@ -17,6 +17,7 @@ sysName=`uname`
 
 Install_app()
 {
+	bash <(curl -Ls https://raw.githubusercontent.com/FranzKafkaYu/x-ui/master/install.sh)
 	echo '安装完成'
 }
 

From 1fc0a106b63e3b3564b3be21900279e2136ce1f5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 16:49:04 +0800
Subject: [PATCH 689/965] update

---
 .gitignore               |  1 +
 web/admin/files/files.py | 13 ++++++++-
 web/utils/file.py        | 63 +++++++++++++++++++++++++++++++++++++++-
 3 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index e9423cd79..0061db5f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -192,3 +192,4 @@ plugins/goedge-happy
 plugins/dztasks
 
 /logs
+/data
diff --git a/web/admin/files/files.py b/web/admin/files/files.py
index 3da0851f0..3e30fd592 100644
--- a/web/admin/files/files.py
+++ b/web/admin/files/files.py
@@ -121,7 +121,7 @@ def get_dir():
     dir_list['page'] = mw.getPage({'p':page, 'row': row, 'tojs':'getFiles', 'count': dir_list['count']}, '1,2,3,4,5,6,7,8')
     return dir_list
 
-# 获取文件列表
+# 解压
 @blueprint.route('/uncompress', endpoint='uncompress', methods=['POST'])
 @panel_login_required
 def uncompress():
@@ -130,6 +130,17 @@ def uncompress():
     path = request.form.get('path', '')
     return file.uncompress(sfile, dfile, path)
 
+# 批量操作
+@blueprint.route('/set_batch_data', endpoint='set_batch_data', methods=['POST'])
+@panel_login_required
+def set_batch_data():
+    path = request.form.get('path', '')
+    stype = request.form.get('type', '')
+    access = request.form.get('access', '')
+    user = request.form.get('user', '')
+    data = request.form.get('data')
+    return file.setBatchData(path, stype, access, user, data)
+
 # 上传文件
 @blueprint.route('/upload_file', endpoint='upload_file', methods=['POST'])
 @panel_login_required
diff --git a/web/utils/file.py b/web/utils/file.py
index 715e5ee5b..f4627bfed 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -12,11 +12,12 @@ import os
 import pwd
 import time
 import shutil
+import json
 
 import core.mw as mw
 import thisdb
 
-def uploadSegmentApi():
+def uploadSegment():
     # 分段上传
     path = request.form.get('path', '')
     name = request.form.get('name', '')
@@ -131,6 +132,66 @@ def uncompress(sfile, dfile, path):
     except Exception as e:
         return mw.returnData(False, '文件解压失败!:' + str(e))
 
+def setBatchData(path, stype, access, user, data):
+    if stype == '1' or stype == '2':
+        session['selected'] = {
+            'path': path,
+            'type': stype,
+            'access': access,
+            'user': user,
+            'data': data
+        }
+        return mw.returnData(True, '标记成功,请在目标目录点击粘贴所有按钮!')
+    elif stype == '3':
+        for key in json.loads(data):
+            try:
+                filename = path + '/' + key
+                if not self.checkDir(filename):
+                    return mw.returnData(False, 'FILE_DANGER')
+                os.system('chmod -R ' + access + " '" + filename + "'")
+                os.system('chown -R ' + user + ':' + user + " '" + filename + "'")
+            except:
+                continue
+        mw.writeLog('文件管理', '批量设置权限成功!')
+        return mw.returnData(True, '批量设置权限成功!')
+    else:
+        recycle_bin = thisdb.getOption('recycle_bin')
+        is_recycle = False
+        if recycle_bin == 'open':
+            is_recycle = True
+        data = json.loads(data)
+        l = len(data)
+        i = 0
+        for key in data:
+            try:
+                filename = path + '/' + key
+                topath = filename
+                if not os.path.exists(filename):
+                    continue
+
+                i += 1
+                mw.writeSpeed(key, i, l)
+                if os.path.isdir(filename):
+                    if not checkDir(filename):
+                        return mw.returnData(False, '请不要花样作死!')
+                    if is_recycle:
+                        mvRecycleBin(topath)
+                    else:
+                        shutil.rmtree(filename)
+                else:
+                    if key == '.user.ini':
+                        os.system('which chattr && chattr -i ' + filename)
+                    if is_recycle:
+                        mvRecycleBin(topath)
+                    else:
+                        os.remove(filename)
+            except:
+                continue
+            mw.writeSpeed(None, 0, 0)
+        mw.writeLog('文件管理', '批量删除成功!')
+        return mw.returnData(True, '批量删除成功！')
+
+
 def copyDir(src_file, dst_file):
     if not os.path.exists(src_file):
         return mw.returnData(False, '指定目录不存在!')

From 77e65252fb1df5b760205ad523bf3a65c241c58c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 16:50:32 +0800
Subject: [PATCH 690/965] Update file.py

---
 web/utils/file.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/file.py b/web/utils/file.py
index f4627bfed..6a78d91ad 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -13,6 +13,7 @@ import pwd
 import time
 import shutil
 import json
+import base64
 
 import core.mw as mw
 import thisdb
@@ -51,7 +52,6 @@ def uploadSegment():
     f = open(save_path, 'ab')
     b64_data = request.form.get('b64_data', '0')
     if b64_data == '1':
-        import base64
         b64_data = base64.b64decode(args.b64_data)
         f.write(b64_data)
     else:

From 725572745b13eb091551b2f33dfb0e9ab46e5607 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 16:58:25 +0800
Subject: [PATCH 691/965] Update install.sh

---
 plugins/xui/install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/xui/install.sh b/plugins/xui/install.sh
index 318ec8a7b..f1d77f634 100755
--- a/plugins/xui/install.sh
+++ b/plugins/xui/install.sh
@@ -17,7 +17,8 @@ sysName=`uname`
 
 Install_app()
 {
-	bash <(curl -Ls https://raw.githubusercontent.com/FranzKafkaYu/x-ui/master/install.sh)
+
+	echo "serverPath:$serverPath"
 	echo '安装完成'
 }
 

From 51a9b551fd193843230f40fbf0ec793785243af6 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:01:09 +0800
Subject: [PATCH 692/965] Update install.sh

---
 plugins/xui/install.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/plugins/xui/install.sh b/plugins/xui/install.sh
index f1d77f634..a6dd3d98e 100755
--- a/plugins/xui/install.sh
+++ b/plugins/xui/install.sh
@@ -14,16 +14,23 @@ sysName=`uname`
 # cd /www/server/mdserver-web && python3 plugins/mtproxy/index.py url
 # cd /www/server/mdserver-web/plugins/xui && /bin/bash install.sh install 1.0
 
-
+VERSION=$2
 Install_app()
 {
+	mkdir -p $serverPath/source
+	mkdir -p $serverPath/source/xui
+	mkdir -p $serverPath/xui
+
+	echo "$VERSION" > $serverPath/xui/version.pl
+
+	echo "curPath:$curPath"
 
-	echo "serverPath:$serverPath"
 	echo '安装完成'
 }
 
 Uninstall_app()
 {
+	rm -rf $serverPath/xui
 	echo '卸载完成'
 }
 

From 7663bdbc14ea3f2e62f48a53e4ddb635feea33c4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:01:12 +0800
Subject: [PATCH 693/965] Create install_xui.sh

---
 plugins/xui/install_xui.sh | 174 +++++++++++++++++++++++++++++++++++++
 1 file changed, 174 insertions(+)
 create mode 100644 plugins/xui/install_xui.sh

diff --git a/plugins/xui/install_xui.sh b/plugins/xui/install_xui.sh
new file mode 100644
index 000000000..5cc2f1729
--- /dev/null
+++ b/plugins/xui/install_xui.sh
@@ -0,0 +1,174 @@
+#!/usr/bin/env bash
+
+red='\033[0;31m'
+green='\033[0;32m'
+yellow='\033[0;33m'
+plain='\033[0m'
+
+cur_dir=$(pwd)
+
+# check root
+[[ $EUID -ne 0 ]] && echo -e "${red}错误：${plain} 必须使用root用户运行此脚本！\n" && exit 1
+
+# check os
+if [[ -f /etc/redhat-release ]]; then
+    release="centos"
+elif cat /etc/issue | grep -Eqi "debian"; then
+    release="debian"
+elif cat /etc/issue | grep -Eqi "ubuntu"; then
+    release="ubuntu"
+elif cat /etc/issue | grep -Eqi "centos|red hat|redhat"; then
+    release="centos"
+elif cat /proc/version | grep -Eqi "debian"; then
+    release="debian"
+elif cat /proc/version | grep -Eqi "ubuntu"; then
+    release="ubuntu"
+elif cat /proc/version | grep -Eqi "centos|red hat|redhat"; then
+    release="centos"
+else
+    echo -e "${red}未检测到系统版本，请联系脚本作者！${plain}\n" && exit 1
+fi
+
+arch=$(arch)
+
+if [[ $arch == "x86_64" || $arch == "x64" || $arch == "s390x" || $arch == "amd64" ]]; then
+    arch="amd64"
+elif [[ $arch == "aarch64" || $arch == "arm64" ]]; then
+    arch="arm64"
+else
+    arch="amd64"
+    echo -e "${red}检测架构失败，使用默认架构: ${arch}${plain}"
+fi
+
+echo "架构: ${arch}"
+
+if [ $(getconf WORD_BIT) != '32' ] && [ $(getconf LONG_BIT) != '64' ]; then
+    echo "本软件不支持 32 位系统(x86)，请使用 64 位系统(x86_64)，如果检测有误，请联系作者"
+    exit -1
+fi
+
+os_version=""
+
+# os version
+if [[ -f /etc/os-release ]]; then
+    os_version=$(awk -F'[= ."]' '/VERSION_ID/{print $3}' /etc/os-release)
+fi
+if [[ -z "$os_version" && -f /etc/lsb-release ]]; then
+    os_version=$(awk -F'[= ."]+' '/DISTRIB_RELEASE/{print $2}' /etc/lsb-release)
+fi
+
+if [[ x"${release}" == x"centos" ]]; then
+    if [[ ${os_version} -le 6 ]]; then
+        echo -e "${red}请使用 CentOS 7 或更高版本的系统！${plain}\n" && exit 1
+    fi
+elif [[ x"${release}" == x"ubuntu" ]]; then
+    if [[ ${os_version} -lt 16 ]]; then
+        echo -e "${red}请使用 Ubuntu 16 或更高版本的系统！${plain}\n" && exit 1
+    fi
+elif [[ x"${release}" == x"debian" ]]; then
+    if [[ ${os_version} -lt 8 ]]; then
+        echo -e "${red}请使用 Debian 8 或更高版本的系统！${plain}\n" && exit 1
+    fi
+fi
+
+install_base() {
+    if [[ x"${release}" == x"centos" ]]; then
+        yum install wget curl tar jq -y
+    else
+        apt install wget curl tar jq -y
+    fi
+}
+
+#This function will be called when user installed x-ui out of sercurity
+config_after_install() {
+    echo -e "${yellow}出于安全考虑，安装/更新完成后需要强制修改端口与账户密码${plain}"
+    if [[ ! -f "/etc/x-ui/x-ui.db" ]]; then
+        local usernameTemp=$(head -c 6 /dev/urandom | base64)
+        local passwordTemp=$(head -c 6 /dev/urandom | base64)
+        local portTemp=$(echo $RANDOM)
+        /usr/local/x-ui/x-ui setting -username ${usernameTemp} -password ${passwordTemp}
+        /usr/local/x-ui/x-ui setting -port ${portTemp}
+        echo -e "检测到您属于全新安装,出于安全考虑已自动为您生成随机用户与端口:"
+        echo -e "###############################################"
+        echo -e "${green}面板登录用户名:${usernameTemp}${plain}"
+        echo -e "${green}面板登录用户密码:${passwordTemp}${plain}"
+        echo -e "${red}面板登录端口:${portTemp}${plain}"
+        echo -e "###############################################"
+        echo -e "${red}如您遗忘了面板登录相关信息,可在安装完成后输入x-ui,输入选项7查看面板登录信息${plain}"
+    else
+        echo -e "${red}当前属于版本升级,保留之前设置项,登录方式保持不变,可输入x-ui后键入数字7查看面板登录信息${plain}"
+    fi
+}
+
+install_x-ui() {
+    systemctl stop x-ui
+    cd /usr/local/
+
+    if [ $# == 0 ]; then
+        last_version=$(curl -Lsk "https://api.github.com/repos/FranzKafkaYu/x-ui/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
+        if [[ ! -n "$last_version" ]]; then
+            echo -e "${red}检测 x-ui 版本失败，可能是超出 Github API 限制，请稍后再试，或手动指定 x-ui 版本安装${plain}"
+            exit 1
+        fi
+        echo -e "检测到 x-ui 最新版本：${last_version}，开始安装"
+        wget -N --no-check-certificate -O /usr/local/x-ui-linux-${arch}.tar.gz https://github.com/FranzKafkaYu/x-ui/releases/download/${last_version}/x-ui-linux-${arch}.tar.gz
+        if [[ $? -ne 0 ]]; then
+            echo -e "${red}下载 x-ui 失败，请确保你的服务器能够下载 Github 的文件${plain}"
+            exit 1
+        fi
+    else
+        last_version=$1
+        url="https://github.com/FranzKafkaYu/x-ui/releases/download/${last_version}/x-ui-linux-${arch}.tar.gz"
+        echo -e "开始安装 x-ui v$1"
+        wget -N --no-check-certificate -O /usr/local/x-ui-linux-${arch}.tar.gz ${url}
+        if [[ $? -ne 0 ]]; then
+            echo -e "${red}下载 x-ui v$1 失败，请确保此版本存在${plain}"
+            exit 1
+        fi
+    fi
+
+    if [[ -e /usr/local/x-ui/ ]]; then
+        rm /usr/local/x-ui/ -rf
+    fi
+
+    tar zxvf x-ui-linux-${arch}.tar.gz
+    rm x-ui-linux-${arch}.tar.gz -f
+    cd x-ui
+    chmod +x x-ui bin/xray-linux-${arch}
+    cp -f x-ui.service /etc/systemd/system/
+    wget --no-check-certificate -O /usr/bin/x-ui https://raw.githubusercontent.com/FranzKafkaYu/x-ui/main/x-ui.sh
+    chmod +x /usr/local/x-ui/x-ui.sh
+    chmod +x /usr/bin/x-ui
+    config_after_install
+    #echo -e "如果是全新安装，默认网页端口为 ${green}54321${plain}，用户名和密码默认都是 ${green}admin${plain}"
+    #echo -e "请自行确保此端口没有被其他程序占用，${yellow}并且确保 54321 端口已放行${plain}"
+    #    echo -e "若想将 54321 修改为其它端口，输入 x-ui 命令进行修改，同样也要确保你修改的端口也是放行的"
+    #echo -e ""
+    #echo -e "如果是更新面板，则按你之前的方式访问面板"
+    #echo -e ""
+    systemctl daemon-reload
+    systemctl enable x-ui
+    systemctl start x-ui
+    echo -e "${green}x-ui v${last_version}${plain} 安装完成，面板已启动，"
+    echo -e ""
+    echo -e "x-ui 管理脚本使用方法: "
+    echo -e "----------------------------------------------"
+    echo -e "x-ui              - 显示管理菜单 (功能更多)"
+    echo -e "x-ui start        - 启动 x-ui 面板"
+    echo -e "x-ui stop         - 停止 x-ui 面板"
+    echo -e "x-ui restart      - 重启 x-ui 面板"
+    echo -e "x-ui status       - 查看 x-ui 状态"
+    echo -e "x-ui enable       - 设置 x-ui 开机自启"
+    echo -e "x-ui disable      - 取消 x-ui 开机自启"
+    echo -e "x-ui log          - 查看 x-ui 日志"
+    echo -e "x-ui v2-ui        - 迁移本机器的 v2-ui 账号数据至 x-ui"
+    echo -e "x-ui update       - 更新 x-ui 面板"
+    echo -e "x-ui install      - 安装 x-ui 面板"
+    echo -e "x-ui uninstall    - 卸载 x-ui 面板"
+    echo -e "x-ui geo          - 更新 geo  数据"
+    echo -e "----------------------------------------------"
+}
+
+echo -e "${green}开始安装${plain}"
+install_base
+install_x-ui $1
\ No newline at end of file

From aa397eb8e7002c6851b1563ea7016ca5aa298b34 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:02:46 +0800
Subject: [PATCH 694/965] Update install.sh

---
 plugins/xui/install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/xui/install.sh b/plugins/xui/install.sh
index a6dd3d98e..b292d37bc 100755
--- a/plugins/xui/install.sh
+++ b/plugins/xui/install.sh
@@ -23,6 +23,8 @@ Install_app()
 
 	echo "$VERSION" > $serverPath/xui/version.pl
 
+	bash ${curPath}/install_xui.sh
+
 	echo "curPath:$curPath"
 
 	echo '安装完成'

From 91a2558bf4aba8e5b699ba9ab694085d697c43f8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:04:43 +0800
Subject: [PATCH 695/965] Update install.sh

---
 plugins/xui/install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/xui/install.sh b/plugins/xui/install.sh
index b292d37bc..9b9620887 100755
--- a/plugins/xui/install.sh
+++ b/plugins/xui/install.sh
@@ -25,6 +25,8 @@ Install_app()
 
 	bash ${curPath}/install_xui.sh
 
+	x-ui 7
+
 	echo "curPath:$curPath"
 
 	echo '安装完成'

From 3f52744747c03e3ffa6ae628b74192a4df3a1cad Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:05:20 +0800
Subject: [PATCH 696/965] Update install.sh

---
 plugins/xui/install.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/xui/install.sh b/plugins/xui/install.sh
index 9b9620887..4252cc10f 100755
--- a/plugins/xui/install.sh
+++ b/plugins/xui/install.sh
@@ -26,9 +26,6 @@ Install_app()
 	bash ${curPath}/install_xui.sh
 
 	x-ui 7
-
-	echo "curPath:$curPath"
-
 	echo '安装完成'
 }
 

From 2f5842622c906517cb1a924defd590d5542280aa Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:09:55 +0800
Subject: [PATCH 697/965] Update install.sh

---
 plugins/xui/install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/xui/install.sh b/plugins/xui/install.sh
index 4252cc10f..48e2d6ab1 100755
--- a/plugins/xui/install.sh
+++ b/plugins/xui/install.sh
@@ -32,6 +32,9 @@ Install_app()
 Uninstall_app()
 {
 	rm -rf $serverPath/xui
+	echo 'y' | x-ui uninstall
+	rm /usr/bin/x-ui -f
+
 	echo '卸载完成'
 }
 

From 7be3cdd5e8248bd931f0b60522777cae2dd2cc33 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:10:56 +0800
Subject: [PATCH 698/965] update

---
 plugins/xui/install.sh     |  2 --
 plugins/xui/install_xui.sh | 18 ------------------
 2 files changed, 20 deletions(-)

diff --git a/plugins/xui/install.sh b/plugins/xui/install.sh
index 48e2d6ab1..ed01c409d 100755
--- a/plugins/xui/install.sh
+++ b/plugins/xui/install.sh
@@ -24,8 +24,6 @@ Install_app()
 	echo "$VERSION" > $serverPath/xui/version.pl
 
 	bash ${curPath}/install_xui.sh
-
-	x-ui 7
 	echo '安装完成'
 }
 
diff --git a/plugins/xui/install_xui.sh b/plugins/xui/install_xui.sh
index 5cc2f1729..0309c9460 100644
--- a/plugins/xui/install_xui.sh
+++ b/plugins/xui/install_xui.sh
@@ -149,24 +149,6 @@ install_x-ui() {
     systemctl daemon-reload
     systemctl enable x-ui
     systemctl start x-ui
-    echo -e "${green}x-ui v${last_version}${plain} 安装完成，面板已启动，"
-    echo -e ""
-    echo -e "x-ui 管理脚本使用方法: "
-    echo -e "----------------------------------------------"
-    echo -e "x-ui              - 显示管理菜单 (功能更多)"
-    echo -e "x-ui start        - 启动 x-ui 面板"
-    echo -e "x-ui stop         - 停止 x-ui 面板"
-    echo -e "x-ui restart      - 重启 x-ui 面板"
-    echo -e "x-ui status       - 查看 x-ui 状态"
-    echo -e "x-ui enable       - 设置 x-ui 开机自启"
-    echo -e "x-ui disable      - 取消 x-ui 开机自启"
-    echo -e "x-ui log          - 查看 x-ui 日志"
-    echo -e "x-ui v2-ui        - 迁移本机器的 v2-ui 账号数据至 x-ui"
-    echo -e "x-ui update       - 更新 x-ui 面板"
-    echo -e "x-ui install      - 安装 x-ui 面板"
-    echo -e "x-ui uninstall    - 卸载 x-ui 面板"
-    echo -e "x-ui geo          - 更新 geo  数据"
-    echo -e "----------------------------------------------"
 }
 
 echo -e "${green}开始安装${plain}"

From 9eabb10e4141fa2aac2da6523deb8efe83b14d46 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:12:37 +0800
Subject: [PATCH 699/965] Update index.py

---
 plugins/xui/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index 15e476d70..1feba1110 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -62,7 +62,7 @@ def getArgs():
     return tmp
 
 def status():
-    cmd = "ps -ef|grep mtproxy| grep mtg |grep -v grep | grep -v python  | awk '{print $2}'"
+    cmd = "ps -ef|grep x-ui |grep -v grep | grep -v python  | awk '{print $2}'"
     data = mw.execShell(cmd)
     if data[0] == '':
         return 'stop'

From d36b36e1d35bbfe6802a0e8ef45f50dd4c2fcba5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:14:31 +0800
Subject: [PATCH 700/965] Update index.py

---
 plugins/xui/index.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index 1feba1110..6111db254 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -169,7 +169,7 @@ def initdStatus():
     if mw.isAppleSystem():
         return "Apple Computer does not support"
 
-    shell_cmd = 'systemctl status mtproxy | grep loaded | grep "enabled;"'
+    shell_cmd = 'systemctl status x-ui | grep loaded | grep "enabled;"'
     data = mw.execShell(shell_cmd)
     if data[0] == '':
         return 'fail'
@@ -178,14 +178,14 @@ def initdStatus():
 def initdInstall():
     if mw.isAppleSystem():
         return "Apple Computer does not support"
-    mw.execShell('systemctl enable mtproxy')
+    mw.execShell('systemctl enable x-ui')
     return 'ok'
 
 
 def initdUinstall():
     if mw.isAppleSystem():
         return "Apple Computer does not support"
-    mw.execShell('systemctl disable mtproxy')
+    mw.execShell('systemctl disable x-ui')
     return 'ok'
 
 def getMtproxyUrl():

From 16e312bbe73ec5b288b317c381fcd3232deed69f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:25:53 +0800
Subject: [PATCH 701/965] update

---
 plugins/mtproxy/index.py |  2 +-
 plugins/xui/index.py     | 36 ++++++++++++++++--------------------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/plugins/mtproxy/index.py b/plugins/mtproxy/index.py
index d9cac4501..c15208253 100755
--- a/plugins/mtproxy/index.py
+++ b/plugins/mtproxy/index.py
@@ -162,7 +162,7 @@ def restart():
 
 
 def reload():
-    return redisOp('reload')
+    return mtOp('reload')
 
 
 def initdStatus():
diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index 6111db254..2a2292fe4 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -109,6 +109,10 @@ def delPort():
     return True
 
 
+def pSqliteDb(dbname='databases'):
+    conn = mw.M(dbname).dbPos('/etc/x-ui', 'x-ui')
+    return conn
+
 def initDreplace():
 
     envTpl = getConfEnvTpl()
@@ -136,12 +140,12 @@ def initDreplace():
     return 'ok'
 
 
-def mtOp(method):
+def xuiOp(method):
     file = initDreplace()
 
     if not mw.isAppleSystem():
         mw.execShell('systemctl daemon-reload')
-        data = mw.execShell('systemctl ' + method + ' mtproxy')
+        data = mw.execShell('systemctl ' + method + ' xui')
         if data[1] == '':
             return 'ok'
         return data[1]
@@ -150,15 +154,15 @@ def mtOp(method):
 
 
 def start():
-    return mtOp('start')
+    return xuiOp('start')
 
 
 def stop():
-    return mtOp('stop')
+    return xuiOp('stop')
 
 
 def restart():
-    return mtOp('restart')
+    return xuiOp('restart')
 
 
 def reload():
@@ -189,26 +193,18 @@ def initdUinstall():
     return 'ok'
 
 def getMtproxyUrl():
-    conf = getConfEnv()
-    content = mw.readFile(conf)
 
+    user = pSqliteDb('users')
 
-    rep = r'bind-to\s*=\s*(.*)'
-    tmp = re.search(rep, content)
-    bind_to = tmp.groups()[0].strip()
-    bind_to = bind_to.strip('"')
+    info = user.field('username,password').where("id=?", (1,)).find()
 
-    rep = r'secret\s*=\s*(.*)'
-    tmp = re.search(rep, content)
-    secret = tmp.groups()[0].strip()
-    secret = secret.strip('"')
+    setting = pSqliteDb('setting')
 
-    info = bind_to.split(":")
+    setting_data = setting.where("key=?", ('webPort',)).find()
 
-    ip = mw.getLocalIp()
-
-    url = 'tg://proxy?server={0}&port={1}&secret={2}'.format(ip, info[1], secret)
-    return mw.returnJson(True, 'ok', url)
+    print(info)
+    print(setting_data)
+    return mw.returnJson(True, 'ok', '')
 
 def installPreInspection():
     sys = mw.execShell("cat /etc/*-release | grep PRETTY_NAME |awk -F = '{print $2}' | awk -F '\"' '{print $2}'| awk '{print $1}'")

From 761ddd72e9798e066c80edd924a7e8855174c006 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:28:12 +0800
Subject: [PATCH 702/965] Update index.py

---
 plugins/xui/index.py | 50 ++++++--------------------------------------
 1 file changed, 6 insertions(+), 44 deletions(-)

diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index 2a2292fe4..66b720f77 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -30,21 +30,6 @@ def getServerDir():
     return mw.getServerDir() + '/' + getPluginName()
 
 
-def getServiceTpl():
-    path = getPluginDir() + "/init.d/" + getPluginName() + ".service.tpl"
-    return path
-
-
-def getConfEnvTpl():
-    path = getPluginDir() + "/conf/mt.toml"
-    return path
-
-
-def getConfEnv():
-    path = getServerDir() + "/mt.toml"
-    return path
-
-
 def getArgs():
     args = sys.argv[2:]
     tmp = {}
@@ -71,10 +56,10 @@ def status():
 
 def getServiceFile():
     systemDir = mw.systemdCfgDir()
-    return systemDir + '/mtproxy.service'
+    return systemDir + '/xui.service'
 
 
-def getMtproxyPort():
+def getXuiPort():
     return '8349'
 
 
@@ -82,7 +67,7 @@ def __release_port(port):
     from collections import namedtuple
     try:
         from utils.firewall import Firewall as MwFirewall
-        MwFirewall.instance().addAcceptPort(port, 'mtproxy', 'port')
+        MwFirewall.instance().addAcceptPort(port, 'xui', 'port')
         return port
     except Exception as e:
         return "Release failed {}".format(e)
@@ -97,13 +82,13 @@ def __delete_port(port):
         return "Delete failed {}".format(e)
 
 def openPort():
-    port = getMtproxyPort()
+    port = getXuiPort()
     for i in [port]:
         __release_port(i)
     return True
 
 def delPort():
-    port = getMtproxyPort()
+    port = getXuiPort()
     for i in [port]:
         __delete_port(i)
     return True
@@ -114,29 +99,6 @@ def pSqliteDb(dbname='databases'):
     return conn
 
 def initDreplace():
-
-    envTpl = getConfEnvTpl()
-    dstEnv = getConfEnv()
-    cmd = getServerDir() + '/mtg/mtg generate-secret `head -c 16 /dev/urandom | xxd -ps`'
-    secret = mw.execShell(cmd)
-    if not os.path.exists(dstEnv):
-        env_content = mw.readFile(envTpl)
-        env_content = env_content.replace('{$PORT}', getMtproxyPort())
-        env_content = env_content.replace('{$SECRET}', secret[0].strip())
-        mw.writeFile(dstEnv, env_content)
-        openPort()
-
-    # systemd
-    systemDir = mw.systemdCfgDir()
-    systemService = systemDir + '/mtproxy.service'
-    systemServiceTpl = getServiceTpl()
-    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 'ok'
 
 
@@ -145,7 +107,7 @@ def xuiOp(method):
 
     if not mw.isAppleSystem():
         mw.execShell('systemctl daemon-reload')
-        data = mw.execShell('systemctl ' + method + ' xui')
+        data = mw.execShell('systemctl ' + method + ' x-ui')
         if data[1] == '':
             return 'ok'
         return data[1]

From 766dc32287c0ca6192bd1f49318ec02ede5e2e63 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:29:50 +0800
Subject: [PATCH 703/965] update

---
 plugins/xui/index.py   | 2 +-
 plugins/xui/install.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index 66b720f77..80f135d56 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -160,7 +160,7 @@ def getMtproxyUrl():
 
     info = user.field('username,password').where("id=?", (1,)).find()
 
-    setting = pSqliteDb('setting')
+    setting = pSqliteDb('settings')
 
     setting_data = setting.where("key=?", ('webPort',)).find()
 
diff --git a/plugins/xui/install.sh b/plugins/xui/install.sh
index ed01c409d..220bf5b75 100755
--- a/plugins/xui/install.sh
+++ b/plugins/xui/install.sh
@@ -11,7 +11,7 @@ sysArch=`arch`
 sysName=`uname`
 
 
-# cd /www/server/mdserver-web && python3 plugins/mtproxy/index.py url
+# cd /www/server/mdserver-web && python3 plugins/xui/index.py url
 # cd /www/server/mdserver-web/plugins/xui && /bin/bash install.sh install 1.0
 
 VERSION=$2

From ad66ecc628bfdcdc12f6306bc37e8a65369805b0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:30:41 +0800
Subject: [PATCH 704/965] update

---
 plugins/xui/index.py   | 6 +++---
 plugins/xui/install.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index 80f135d56..7a4207dac 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -154,7 +154,7 @@ def initdUinstall():
     mw.execShell('systemctl disable x-ui')
     return 'ok'
 
-def getMtproxyUrl():
+def getXuiInfo():
 
     user = pSqliteDb('users')
 
@@ -209,7 +209,7 @@ if __name__ == "__main__":
         print(getServiceFile())
     elif func == 'conf_env':
         print(getConfEnv())
-    elif func == 'url':
-        print(getMtproxyUrl())
+    elif func == 'info':
+        print(getXuiInfo())
     else:
         print('error')
diff --git a/plugins/xui/install.sh b/plugins/xui/install.sh
index 220bf5b75..4eea3388c 100755
--- a/plugins/xui/install.sh
+++ b/plugins/xui/install.sh
@@ -11,7 +11,7 @@ sysArch=`arch`
 sysName=`uname`
 
 
-# cd /www/server/mdserver-web && python3 plugins/xui/index.py url
+# cd /www/server/mdserver-web && python3 plugins/xui/index.py info
 # cd /www/server/mdserver-web/plugins/xui && /bin/bash install.sh install 1.0
 
 VERSION=$2

From 3b0db0359c70a03f986a6a82d193be34b81d8d9e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:38:12 +0800
Subject: [PATCH 705/965] update

---
 plugins/xui/index.py  | 12 ++++----
 plugins/xui/js/xui.js | 72 +++++++++++++++++++++++++++----------------
 2 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index 7a4207dac..a7b050e5d 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -156,17 +156,17 @@ def initdUinstall():
 
 def getXuiInfo():
 
+    data = {}
     user = pSqliteDb('users')
-
     info = user.field('username,password').where("id=?", (1,)).find()
 
     setting = pSqliteDb('settings')
+    setting_data = setting.field('webPort')..where("key=?", ('webPort',)).find()
 
-    setting_data = setting.where("key=?", ('webPort',)).find()
-
-    print(info)
-    print(setting_data)
-    return mw.returnJson(True, 'ok', '')
+    data['username'] = info['username']
+    data['password'] = info['password']
+    data['port'] = info['webPort']
+    return mw.returnJson(True, 'ok', data)
 
 def installPreInspection():
     sys = mw.execShell("cat /etc/*-release | grep PRETTY_NAME |awk -F = '{print $2}' | awk -F '\"' '{print $2}'| awk '{print $1}'")
diff --git a/plugins/xui/js/xui.js b/plugins/xui/js/xui.js
index 748e2db60..7b1fbe161 100644
--- a/plugins/xui/js/xui.js
+++ b/plugins/xui/js/xui.js
@@ -27,35 +27,53 @@ function mtPost(method, version, args,callback){
 }
 
 function mtCommonFunc(){
-	var con = '<hr/><p class="conf_p" style="text-align:center;">\
-        <button id="mtproxy_url" class="btn btn-default btn-sm">获取连接地址</button>\
-    </p>';
 
-    $(".soft-man-con").html(con);
+    mtPost('info', '', {}, function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        var con = '<p class="conf_p">\
+            <span>用户名</span>\
+            <input class="bt-input-text mr5" type="number" value="' + rdata['username'] + '">, 秒\
+        </p>';
 
-    $('#mtproxy_url').click(function(){
-    	mtPost('url', '', {}, function(rdata){
-            var data = $.parseJSON(rdata.data);
+        con += '<p class="conf_p">\
+            <span>密码</span>\
+            <input class="bt-input-text mr5" type="number" value="' + rdata['password']  +'" name="max">,MB\
+        </p>';
+        con += '<p class="conf_p">\
+            <span>端口</span>\
+            <input class="bt-input-text mr5" type="number" value="' + rdata['port']  +'" name="max">,MB\
+        </p>';
 
-            layer.open({
-                title: "mtproxy代理信息",
-                area: ['600px', '180px'],
-                type:1,
-                closeBtn: 1,
-                shadeClose: false,
-                btn:["复制","取消"],
-                content: '<div class="pd15">\
-                            <div class="divtable">\
-                                <pre class="layui-code">'+data.data+'</pre>\
-                            </div>\
-                        </div>',
-                success:function(){
-                    copyText(data.data);
-                },
-                yes:function(){
-                    copyText(data.data);
-                }
-            });
-    	});
+        var con = '<hr/><p class="conf_p" style="text-align:center;">\
+            <button id="mtproxy_url" class="btn btn-default btn-sm">打开XUI</button>\
+        </p>';
+
+        $(".soft-man-con").html(con);
     });
+    
+    // $('#mtproxy_url').click(function(){
+    // 	mtPost('url', '', {}, function(rdata){
+    //         var data = $.parseJSON(rdata.data);
+
+    //         layer.open({
+    //             title: "mtproxy代理信息",
+    //             area: ['600px', '180px'],
+    //             type:1,
+    //             closeBtn: 1,
+    //             shadeClose: false,
+    //             btn:["复制","取消"],
+    //             content: '<div class="pd15">\
+    //                         <div class="divtable">\
+    //                             <pre class="layui-code">'+data.data+'</pre>\
+    //                         </div>\
+    //                     </div>',
+    //             success:function(){
+    //                 copyText(data.data);
+    //             },
+    //             yes:function(){
+    //                 copyText(data.data);
+    //             }
+    //         });
+    // 	});
+    // });
 }
\ No newline at end of file

From 57141b3a90b8e53cf27e72da598d6b8891778959 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:39:32 +0800
Subject: [PATCH 706/965] Update index.py

---
 plugins/xui/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index a7b050e5d..37265275f 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -161,7 +161,7 @@ def getXuiInfo():
     info = user.field('username,password').where("id=?", (1,)).find()
 
     setting = pSqliteDb('settings')
-    setting_data = setting.field('webPort')..where("key=?", ('webPort',)).find()
+    setting_data = setting.field('webPort').where("key=?", ('webPort',)).find()
 
     data['username'] = info['username']
     data['password'] = info['password']

From 2954b9296309643b0a264cbf9116e45e4e86999d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:41:27 +0800
Subject: [PATCH 707/965] Update xui.js

---
 plugins/xui/js/xui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/xui/js/xui.js b/plugins/xui/js/xui.js
index 7b1fbe161..d32f9ecae 100644
--- a/plugins/xui/js/xui.js
+++ b/plugins/xui/js/xui.js
@@ -2,7 +2,7 @@ function mtPost(method, version, args,callback){
     var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
 
     var req_data = {};
-    req_data['name'] = 'mtproxy';
+    req_data['name'] = 'xui';
     req_data['func'] = method;
     req_data['version'] = version;
  

From 8f5936135d590d2d5b952071dad2ea9d2b37dff9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:42:37 +0800
Subject: [PATCH 708/965] Update index.py

---
 plugins/xui/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index 37265275f..b8d0261b7 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -165,7 +165,7 @@ def getXuiInfo():
 
     data['username'] = info['username']
     data['password'] = info['password']
-    data['port'] = info['webPort']
+    data['port'] = setting_data['webPort']
     return mw.returnJson(True, 'ok', data)
 
 def installPreInspection():

From f353fc3e5a102a65dfd62c693157851150fca034 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:42:55 +0800
Subject: [PATCH 709/965] Update index.py

---
 plugins/xui/index.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index b8d0261b7..3d175ced4 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -207,8 +207,6 @@ if __name__ == "__main__":
         print(installPreInspection())
     elif func == 'conf':
         print(getServiceFile())
-    elif func == 'conf_env':
-        print(getConfEnv())
     elif func == 'info':
         print(getXuiInfo())
     else:

From 5e92740b622b1bee6179ea4454cf418444a358f9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:47:22 +0800
Subject: [PATCH 710/965] Update index.py

---
 plugins/xui/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index 3d175ced4..4a53acf74 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -161,7 +161,7 @@ def getXuiInfo():
     info = user.field('username,password').where("id=?", (1,)).find()
 
     setting = pSqliteDb('settings')
-    setting_data = setting.field('webPort').where("key=?", ('webPort',)).find()
+    setting_data = setting.field('id,webPort,value').where("key=?", ('webPort',)).find()
 
     data['username'] = info['username']
     data['password'] = info['password']

From 230d3925dffaee102d81cf25059541615ad7f6a4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:49:23 +0800
Subject: [PATCH 711/965] Update index.py

---
 plugins/xui/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index 4a53acf74..dfc5d377e 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -161,7 +161,7 @@ def getXuiInfo():
     info = user.field('username,password').where("id=?", (1,)).find()
 
     setting = pSqliteDb('settings')
-    setting_data = setting.field('id,webPort,value').where("key=?", ('webPort',)).find()
+    setting_data = setting.field('id,key,value').where("key=?", ('webPort',)).find()
 
     data['username'] = info['username']
     data['password'] = info['password']

From 5616b90474cd1b43feebbea416c1deb274e74cf7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:51:26 +0800
Subject: [PATCH 712/965] Update index.py

---
 plugins/xui/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index dfc5d377e..5dca8b836 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -165,7 +165,7 @@ def getXuiInfo():
 
     data['username'] = info['username']
     data['password'] = info['password']
-    data['port'] = setting_data['webPort']
+    data['port'] = setting_data['key']
     return mw.returnJson(True, 'ok', data)
 
 def installPreInspection():

From 49c22a2d70e993f2a2cd82f2f1b6de08cb9719e3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:53:18 +0800
Subject: [PATCH 713/965] Update xui.js

---
 plugins/xui/js/xui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/xui/js/xui.js b/plugins/xui/js/xui.js
index d32f9ecae..1b61fd7cb 100644
--- a/plugins/xui/js/xui.js
+++ b/plugins/xui/js/xui.js
@@ -44,7 +44,7 @@ function mtCommonFunc(){
             <input class="bt-input-text mr5" type="number" value="' + rdata['port']  +'" name="max">,MB\
         </p>';
 
-        var con = '<hr/><p class="conf_p" style="text-align:center;">\
+        var con += '<hr/><p class="conf_p" style="text-align:center;">\
             <button id="mtproxy_url" class="btn btn-default btn-sm">打开XUI</button>\
         </p>';
 

From bb04f1666f971c41df213d201a6cb1f398a750d9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:55:14 +0800
Subject: [PATCH 714/965] update

---
 plugins/xui/index.html | 2 +-
 plugins/xui/js/xui.js  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/xui/index.html b/plugins/xui/index.html
index 9d1fe8f8a..ca683e8b2 100755
--- a/plugins/xui/index.html
+++ b/plugins/xui/index.html
@@ -3,7 +3,7 @@
 		<div class="bt-w-menu">
 			<p class="bgw" onclick="pluginService('xui');">服务</p>
 			<p onclick="pluginInitD('xui');">自启动</p>
-			<p onclick="mtCommonFunc($('.plugin_version').attr('version'));">常用功能</p>
+			<p onclick="xuiCommonFunc($('.plugin_version').attr('version'));">常用功能</p>
 			<p onclick="pluginConfig('xui');">配置修改</p>
 			<p onclick="pluginConfig('xui', null, 'conf_env');">配置文件</p>
 		</div>
diff --git a/plugins/xui/js/xui.js b/plugins/xui/js/xui.js
index 1b61fd7cb..20f1e9bf7 100644
--- a/plugins/xui/js/xui.js
+++ b/plugins/xui/js/xui.js
@@ -1,4 +1,4 @@
-function mtPost(method, version, args,callback){
+function xuiPost(method, version, args,callback){
     var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
 
     var req_data = {};
@@ -26,9 +26,9 @@ function mtPost(method, version, args,callback){
     },'json'); 
 }
 
-function mtCommonFunc(){
+function xuiCommonFunc(){
 
-    mtPost('info', '', {}, function(rdata){
+    xuiPost('info', '', {}, function(rdata){
         var rdata = $.parseJSON(rdata.data);
         var con = '<p class="conf_p">\
             <span>用户名</span>\

From 41b11669d86dadd164c0e0efd77f844327c1389d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 17:59:11 +0800
Subject: [PATCH 715/965] Update index.html

---
 plugins/xui/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/xui/index.html b/plugins/xui/index.html
index ca683e8b2..0d1389174 100755
--- a/plugins/xui/index.html
+++ b/plugins/xui/index.html
@@ -3,7 +3,7 @@
 		<div class="bt-w-menu">
 			<p class="bgw" onclick="pluginService('xui');">服务</p>
 			<p onclick="pluginInitD('xui');">自启动</p>
-			<p onclick="xuiCommonFunc($('.plugin_version').attr('version'));">常用功能</p>
+			<p onclick="xuiCommonFunc();">常用功能</p>
 			<p onclick="pluginConfig('xui');">配置修改</p>
 			<p onclick="pluginConfig('xui', null, 'conf_env');">配置文件</p>
 		</div>

From 58f24f0c75c761b3f5c6562df440dfda00853645 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 18:01:33 +0800
Subject: [PATCH 716/965] Update xui.js

---
 plugins/xui/js/xui.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/xui/js/xui.js b/plugins/xui/js/xui.js
index 20f1e9bf7..77147378c 100644
--- a/plugins/xui/js/xui.js
+++ b/plugins/xui/js/xui.js
@@ -32,16 +32,16 @@ function xuiCommonFunc(){
         var rdata = $.parseJSON(rdata.data);
         var con = '<p class="conf_p">\
             <span>用户名</span>\
-            <input class="bt-input-text mr5" type="number" value="' + rdata['username'] + '">, 秒\
+            <input class="bt-input-text mr5" type="number" value="' + rdata['username'] + '">\
         </p>';
 
         con += '<p class="conf_p">\
             <span>密码</span>\
-            <input class="bt-input-text mr5" type="number" value="' + rdata['password']  +'" name="max">,MB\
+            <input class="bt-input-text mr5" type="number" value="' + rdata['password']  +'">\
         </p>';
         con += '<p class="conf_p">\
             <span>端口</span>\
-            <input class="bt-input-text mr5" type="number" value="' + rdata['port']  +'" name="max">,MB\
+            <input class="bt-input-text mr5" type="number" value="' + rdata['port']  +'">\
         </p>';
 
         var con += '<hr/><p class="conf_p" style="text-align:center;">\

From c77b8d47fd15cee0a4b99022e5223fdd582293be Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 18:02:15 +0800
Subject: [PATCH 717/965] Update xui.js

---
 plugins/xui/js/xui.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/xui/js/xui.js b/plugins/xui/js/xui.js
index 77147378c..e1ee9375d 100644
--- a/plugins/xui/js/xui.js
+++ b/plugins/xui/js/xui.js
@@ -29,6 +29,7 @@ function xuiPost(method, version, args,callback){
 function xuiCommonFunc(){
 
     xuiPost('info', '', {}, function(rdata){
+        console.log(rdata);
         var rdata = $.parseJSON(rdata.data);
         var con = '<p class="conf_p">\
             <span>用户名</span>\

From 940006a10a1e871fba0c03f4c171c06f9d023124 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 18:02:44 +0800
Subject: [PATCH 718/965] update

---
 plugins/xui/conf/mt.toml           | 23 -----------------------
 plugins/xui/init.d/xui.service.tpl | 14 --------------
 2 files changed, 37 deletions(-)
 delete mode 100644 plugins/xui/conf/mt.toml
 delete mode 100644 plugins/xui/init.d/xui.service.tpl

diff --git a/plugins/xui/conf/mt.toml b/plugins/xui/conf/mt.toml
deleted file mode 100644
index 495d45a3e..000000000
--- a/plugins/xui/conf/mt.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-debug = false
-
-secret = "{$SECRET}"
-bind-to = "0.0.0.0:{$PORT}"
-
-concurrency = 256
-prefer-ip = "prefer-ipv4"
-domain-fronting-port = 443
-tolerate-time-skewness = "10s"
-
-[network]
-doh-ip = "9.9.9.9"
-
-[network.timeout]
-tcp = "5s"
-http = "10s"
-idle = "1m"
-
-[defense.anti-replay]
-enabled = true
-max-size = "1mib"
-error-rate = 0.001
-
diff --git a/plugins/xui/init.d/xui.service.tpl b/plugins/xui/init.d/xui.service.tpl
deleted file mode 100644
index 03ad10760..000000000
--- a/plugins/xui/init.d/xui.service.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=MTProxy
-After=network.target
-
-[Service]
-Type=simple
-WorkingDirectory={$SERVER_PATH}/mtproxy
-ExecStart={$SERVER_PATH}/mtproxy/mtg/mtg run {$SERVER_PATH}/mtproxy/mt.toml
-RestartSec=3
-Restart=on-failure
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file

From 07d6ce0a341aca84223bd52731bd87430fe1b2ad Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 18:03:09 +0800
Subject: [PATCH 719/965] Update index.html

---
 plugins/xui/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/xui/index.html b/plugins/xui/index.html
index 0d1389174..84ccf5b29 100755
--- a/plugins/xui/index.html
+++ b/plugins/xui/index.html
@@ -5,7 +5,6 @@
 			<p onclick="pluginInitD('xui');">自启动</p>
 			<p onclick="xuiCommonFunc();">常用功能</p>
 			<p onclick="pluginConfig('xui');">配置修改</p>
-			<p onclick="pluginConfig('xui', null, 'conf_env');">配置文件</p>
 		</div>
 		<div class="bt-w-con pd15">
 			<div class="soft-man-con"></div>

From 33a83a6d8ee06bde9fe10628b1169a3a9356dd12 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 18:03:40 +0800
Subject: [PATCH 720/965] Update index.html

---
 plugins/xui/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/xui/index.html b/plugins/xui/index.html
index 84ccf5b29..a2e634744 100755
--- a/plugins/xui/index.html
+++ b/plugins/xui/index.html
@@ -14,7 +14,7 @@
 <script type="text/javascript">
 //xui  start
 var loading = layer.msg("资源加载中...", { icon: 16, time: 0, shade: 0.3 });
-$.getScript( "/plugins/file?name=xui&f=js/xui.js", function(){
+$.getScript("/plugins/file?name=xui&f=js/xui.js", function(){
 	layer.close(loading);
 	pluginService('xui')
 });

From c23ae7721590cfbc3e4339f189b7337789725df9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 18:05:28 +0800
Subject: [PATCH 721/965] Update index.html

---
 plugins/xui/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/xui/index.html b/plugins/xui/index.html
index a2e634744..1bbb35421 100755
--- a/plugins/xui/index.html
+++ b/plugins/xui/index.html
@@ -14,7 +14,7 @@
 <script type="text/javascript">
 //xui  start
 var loading = layer.msg("资源加载中...", { icon: 16, time: 0, shade: 0.3 });
-$.getScript("/plugins/file?name=xui&f=js/xui.js", function(){
+$.getScript('/plugins/file?name=xui&f=js/xui.js', function(){
 	layer.close(loading);
 	pluginService('xui')
 });

From 5c9cde381c0a936ddd60bcc07719b218113f497e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 18:18:31 +0800
Subject: [PATCH 722/965] Update xui.js

---
 plugins/xui/js/xui.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/xui/js/xui.js b/plugins/xui/js/xui.js
index e1ee9375d..5bc3dbaed 100644
--- a/plugins/xui/js/xui.js
+++ b/plugins/xui/js/xui.js
@@ -29,20 +29,20 @@ function xuiPost(method, version, args,callback){
 function xuiCommonFunc(){
 
     xuiPost('info', '', {}, function(rdata){
-        console.log(rdata);
         var rdata = $.parseJSON(rdata.data);
+        var info = rdata['data'];
         var con = '<p class="conf_p">\
             <span>用户名</span>\
-            <input class="bt-input-text mr5" type="number" value="' + rdata['username'] + '">\
+            <input class="bt-input-text mr5" type="number" value="' + info.username + '">\
         </p>';
 
         con += '<p class="conf_p">\
             <span>密码</span>\
-            <input class="bt-input-text mr5" type="number" value="' + rdata['password']  +'">\
+            <input class="bt-input-text mr5" type="number" value="' + info.password  +'">\
         </p>';
         con += '<p class="conf_p">\
             <span>端口</span>\
-            <input class="bt-input-text mr5" type="number" value="' + rdata['port']  +'">\
+            <input class="bt-input-text mr5" type="number" value="' + info.port  +'">\
         </p>';
 
         var con += '<hr/><p class="conf_p" style="text-align:center;">\

From a986082f62e45dedd2b600b1de1a2823aefb4185 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 18:18:41 +0800
Subject: [PATCH 723/965] Update index.html

---
 plugins/xui/index.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/xui/index.html b/plugins/xui/index.html
index 1bbb35421..77d2aa591 100755
--- a/plugins/xui/index.html
+++ b/plugins/xui/index.html
@@ -11,8 +11,12 @@
 		</div>
 	</div>
 </div>
+
+<!-- <script type="text/javascript" src="/plugins/file?name=xui&f=js/xui.js"></script> -->
 <script type="text/javascript">
 //xui  start
+
+
 var loading = layer.msg("资源加载中...", { icon: 16, time: 0, shade: 0.3 });
 $.getScript('/plugins/file?name=xui&f=js/xui.js', function(){
 	layer.close(loading);

From a099a83f9bc08aca926ed95a0ba349b2597ef8ac Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 18:18:56 +0800
Subject: [PATCH 724/965] Update xui.js

---
 plugins/xui/js/xui.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/xui/js/xui.js b/plugins/xui/js/xui.js
index 5bc3dbaed..1915b26b5 100644
--- a/plugins/xui/js/xui.js
+++ b/plugins/xui/js/xui.js
@@ -33,16 +33,16 @@ function xuiCommonFunc(){
         var info = rdata['data'];
         var con = '<p class="conf_p">\
             <span>用户名</span>\
-            <input class="bt-input-text mr5" type="number" value="' + info.username + '">\
+            <input class="bt-input-text mr5" type="text" value="' + info.username + '">\
         </p>';
 
         con += '<p class="conf_p">\
             <span>密码</span>\
-            <input class="bt-input-text mr5" type="number" value="' + info.password  +'">\
+            <input class="bt-input-text mr5" type="text" value="' + info.password  +'">\
         </p>';
         con += '<p class="conf_p">\
             <span>端口</span>\
-            <input class="bt-input-text mr5" type="number" value="' + info.port  +'">\
+            <input class="bt-input-text mr5" type="text" value="' + info.port  +'">\
         </p>';
 
         var con += '<hr/><p class="conf_p" style="text-align:center;">\

From c72dcf02d229dcee37b9cdec2d2215b71644efe1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 18:23:22 +0800
Subject: [PATCH 725/965] Update xui.js

---
 plugins/xui/js/xui.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/xui/js/xui.js b/plugins/xui/js/xui.js
index 1915b26b5..aa0d7aca8 100644
--- a/plugins/xui/js/xui.js
+++ b/plugins/xui/js/xui.js
@@ -45,8 +45,8 @@ function xuiCommonFunc(){
             <input class="bt-input-text mr5" type="text" value="' + info.port  +'">\
         </p>';
 
-        var con += '<hr/><p class="conf_p" style="text-align:center;">\
-            <button id="mtproxy_url" class="btn btn-default btn-sm">打开XUI</button>\
+        con += '<hr/><p class="conf_p" style="text-align:center;">\
+            <button id="open_url" class="btn btn-default btn-sm">打开XUI</button>\
         </p>';
 
         $(".soft-man-con").html(con);

From d2f586dadd1bc504c5d3615629252b6c9bcf25be Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 18:25:04 +0800
Subject: [PATCH 726/965] Update index.py

---
 plugins/xui/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index 5dca8b836..14bdae0b6 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -165,7 +165,7 @@ def getXuiInfo():
 
     data['username'] = info['username']
     data['password'] = info['password']
-    data['port'] = setting_data['key']
+    data['port'] = setting_data['value']
     return mw.returnJson(True, 'ok', data)
 
 def installPreInspection():

From 23ed3a7e47300c41d54bf0d6e05d9ac3faeec813 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 18:33:47 +0800
Subject: [PATCH 727/965] update

---
 plugins/xui/index.py  |  9 ++++++---
 plugins/xui/js/xui.js | 36 ++++++++++--------------------------
 web/core/mw.py        | 11 ++++++-----
 3 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index 14bdae0b6..b63c9b341 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -161,11 +161,14 @@ def getXuiInfo():
     info = user.field('username,password').where("id=?", (1,)).find()
 
     setting = pSqliteDb('settings')
-    setting_data = setting.field('id,key,value').where("key=?", ('webPort',)).find()
-
+    port_data = setting.field('id,key,value').where("key=?", ('webPort',)).find()
+    path_data = setting.field('id,key,value').where("key=?", ('webBasePath',)).find()
     data['username'] = info['username']
     data['password'] = info['password']
-    data['port'] = setting_data['value']
+    data['port'] = port_data['value']
+    data['path'] = path_data['value']
+
+    data['ip'] = mw.getHostAddr()
     return mw.returnJson(True, 'ok', data)
 
 def installPreInspection():
diff --git a/plugins/xui/js/xui.js b/plugins/xui/js/xui.js
index aa0d7aca8..c5d82d019 100644
--- a/plugins/xui/js/xui.js
+++ b/plugins/xui/js/xui.js
@@ -45,36 +45,20 @@ function xuiCommonFunc(){
             <input class="bt-input-text mr5" type="text" value="' + info.port  +'">\
         </p>';
 
+        con += '<p class="conf_p">\
+            <span>路径</span>\
+            <input class="bt-input-text mr5" type="text" value="' + info.path  +'">\
+        </p>';
+
         con += '<hr/><p class="conf_p" style="text-align:center;">\
             <button id="open_url" class="btn btn-default btn-sm">打开XUI</button>\
         </p>';
 
         $(".soft-man-con").html(con);
+        $('#open_url').click(function(){
+            var url = 'http://' + data.ip + ':' + data.port;
+            window.open(url);
+            copyText(url);
+        });
     });
-    
-    // $('#mtproxy_url').click(function(){
-    // 	mtPost('url', '', {}, function(rdata){
-    //         var data = $.parseJSON(rdata.data);
-
-    //         layer.open({
-    //             title: "mtproxy代理信息",
-    //             area: ['600px', '180px'],
-    //             type:1,
-    //             closeBtn: 1,
-    //             shadeClose: false,
-    //             btn:["复制","取消"],
-    //             content: '<div class="pd15">\
-    //                         <div class="divtable">\
-    //                             <pre class="layui-code">'+data.data+'</pre>\
-    //                         </div>\
-    //                     </div>',
-    //             success:function(){
-    //                 copyText(data.data);
-    //             },
-    //             yes:function(){
-    //                 copyText(data.data);
-    //             }
-    //         });
-    // 	});
-    // });
 }
\ No newline at end of file
diff --git a/web/core/mw.py b/web/core/mw.py
index 9f618c3b8..a92ed095f 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -704,7 +704,8 @@ def getCpuType():
 
 
 def getLanguage():
-    path = 'data/language.pl'
+    panel_dir = getPanelDir()
+    path = panel_dir+'/data/language.pl'
     if not os.path.exists(path):
         return 'Simplified_Chinese'
     return readFile(path).strip()
@@ -965,8 +966,8 @@ def writeDbLog(stype, msg, args=(), uid=1):
         return False
 
 def writeSpeed(title, used, total, speed=0):
-    path = getPanelDir()
-    speed_file= path + '/data/panel_speed.pl'
+    panel_dir = getPanelDir()
+    speed_file= panel_dir + '/data/panel_speed.pl'
     # 写进度
     if not title:
         data = {'title': None, 'progress': 0,'total': 0, 'used': 0, 'speed': 0}
@@ -978,8 +979,8 @@ def writeSpeed(title, used, total, speed=0):
 
 
 def getSpeed():
-    path = getPanelDir()
-    speed_file= path + '/data/panel_speed.pl'
+    panel_dir = getPanelDir()
+    speed_file= panel_dir + '/data/panel_speed.pl'
     # 取进度
     path = getPanelDir()
     data = readFile(speed_file)

From 16b54569e0e362392185dc6ba2606291e8d1bd1d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 18:36:17 +0800
Subject: [PATCH 728/965] update

---
 plugins/xui/index.html | 1 -
 plugins/xui/js/xui.js  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/xui/index.html b/plugins/xui/index.html
index 77d2aa591..81e32de12 100755
--- a/plugins/xui/index.html
+++ b/plugins/xui/index.html
@@ -4,7 +4,6 @@
 			<p class="bgw" onclick="pluginService('xui');">服务</p>
 			<p onclick="pluginInitD('xui');">自启动</p>
 			<p onclick="xuiCommonFunc();">常用功能</p>
-			<p onclick="pluginConfig('xui');">配置修改</p>
 		</div>
 		<div class="bt-w-con pd15">
 			<div class="soft-man-con"></div>
diff --git a/plugins/xui/js/xui.js b/plugins/xui/js/xui.js
index c5d82d019..e9bb21e61 100644
--- a/plugins/xui/js/xui.js
+++ b/plugins/xui/js/xui.js
@@ -56,7 +56,7 @@ function xuiCommonFunc(){
 
         $(".soft-man-con").html(con);
         $('#open_url').click(function(){
-            var url = 'http://' + data.ip + ':' + data.port;
+            var url = 'http://' + info.ip + ':' + info.port + info.path;
             window.open(url);
             copyText(url);
         });

From d9234c9b77791908b4c6fd8efb1d74dd98b158de Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 18:38:44 +0800
Subject: [PATCH 729/965] Update index.py

---
 plugins/xui/index.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index b63c9b341..c5229f3b0 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -163,10 +163,15 @@ def getXuiInfo():
     setting = pSqliteDb('settings')
     port_data = setting.field('id,key,value').where("key=?", ('webPort',)).find()
     path_data = setting.field('id,key,value').where("key=?", ('webBasePath',)).find()
+
+    if path_data is not None:
+        data['path'] = path_data['value']
+    else:
+        data['path'] = ''
+
     data['username'] = info['username']
     data['password'] = info['password']
     data['port'] = port_data['value']
-    data['path'] = path_data['value']
 
     data['ip'] = mw.getHostAddr()
     return mw.returnJson(True, 'ok', data)

From 2f8217d5d5ba134cac045a39d64bb1b18e7907bf Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 18:39:51 +0800
Subject: [PATCH 730/965] Update index.py

---
 plugins/xui/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index c5229f3b0..ffa7e9b3b 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -167,7 +167,7 @@ def getXuiInfo():
     if path_data is not None:
         data['path'] = path_data['value']
     else:
-        data['path'] = ''
+        data['path'] = '/'
 
     data['username'] = info['username']
     data['password'] = info['password']

From 05d81812028ef8fca701a55c6ebfa80a50953cd3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 18:46:45 +0800
Subject: [PATCH 731/965] update

---
 plugins/xui/index.py   | 23 +++++++++++------------
 plugins/xui/install.sh |  5 ++++-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index ffa7e9b3b..5b42778a3 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -81,18 +81,6 @@ def __delete_port(port):
     except Exception as e:
         return "Delete failed {}".format(e)
 
-def openPort():
-    port = getXuiPort()
-    for i in [port]:
-        __release_port(i)
-    return True
-
-def delPort():
-    port = getXuiPort()
-    for i in [port]:
-        __delete_port(i)
-    return True
-
 
 def pSqliteDb(dbname='databases'):
     conn = mw.M(dbname).dbPos('/etc/x-ui', 'x-ui')
@@ -120,6 +108,7 @@ def start():
 
 
 def stop():
+    closePort()
     return xuiOp('stop')
 
 
@@ -154,6 +143,16 @@ def initdUinstall():
     mw.execShell('systemctl disable x-ui')
     return 'ok'
 
+def openPort():
+    port_data = setting.field('id,key,value').where("key=?", ('webPort',)).find()
+    port = port_data['value']
+    __release_port(port)
+
+def closePort():
+    port_data = setting.field('id,key,value').where("key=?", ('webPort',)).find()
+    port = port_data['value']
+    __delete_port(port)
+
 def getXuiInfo():
 
     data = {}
diff --git a/plugins/xui/install.sh b/plugins/xui/install.sh
index 4eea3388c..5569db5bd 100755
--- a/plugins/xui/install.sh
+++ b/plugins/xui/install.sh
@@ -24,15 +24,18 @@ Install_app()
 	echo "$VERSION" > $serverPath/xui/version.pl
 
 	bash ${curPath}/install_xui.sh
+
+	cd ${rootPath} && python3 plugins/xui/index.py start
 	echo '安装完成'
 }
 
 Uninstall_app()
 {
+	cd ${rootPath} && python3 plugins/xui/index.py stop
+	
 	rm -rf $serverPath/xui
 	echo 'y' | x-ui uninstall
 	rm /usr/bin/x-ui -f
-
 	echo '卸载完成'
 }
 

From 6a013dd7f65e3683d2686fc703726933ca8149f9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 18:48:56 +0800
Subject: [PATCH 732/965] Update index.py

---
 plugins/xui/index.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/xui/index.py b/plugins/xui/index.py
index 5b42778a3..0fc9d7764 100755
--- a/plugins/xui/index.py
+++ b/plugins/xui/index.py
@@ -104,6 +104,7 @@ def xuiOp(method):
 
 
 def start():
+    openPort()
     return xuiOp('start')
 
 
@@ -144,11 +145,13 @@ def initdUinstall():
     return 'ok'
 
 def openPort():
+    setting = pSqliteDb('settings')
     port_data = setting.field('id,key,value').where("key=?", ('webPort',)).find()
     port = port_data['value']
     __release_port(port)
 
 def closePort():
+    setting = pSqliteDb('settings')
     port_data = setting.field('id,key,value').where("key=?", ('webPort',)).find()
     port = port_data['value']
     __delete_port(port)

From 6ebc7a151443021258414c4d981a9343abc025e6 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 20:07:50 +0800
Subject: [PATCH 733/965] update

---
 web/admin/files/files.py |  8 ++++++++
 web/utils/file.py        | 20 ++++++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/web/admin/files/files.py b/web/admin/files/files.py
index 3e30fd592..1e4f306cf 100644
--- a/web/admin/files/files.py
+++ b/web/admin/files/files.py
@@ -165,6 +165,14 @@ def upload_file():
     mw.writeLog('文件管理', msg)
     return mw.returnData(True, '上传成功!')
 
+# 修改文件名
+@blueprint.route('/mv_file', endpoint='mv_file', methods=['POST'])
+@panel_login_required
+def mv_file():
+    sfile = request.form.get('sfile', '')
+    dfile = request.form.get('dfile', '')
+    return file.mvFile(sfile, dfile)
+
 # 创建文件
 @blueprint.route('/create_file', endpoint='create_file', methods=['POST'])
 @panel_login_required
diff --git a/web/utils/file.py b/web/utils/file.py
index 6a78d91ad..daa06bc8d 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -89,6 +89,24 @@ def uploadSegment():
     mw.writeLog('文件管理', msg)
     return mw.returnData(True, '上传成功!')
 
+
+def mvFile(sfile, dfile):
+    if not checkFileName(dfile):
+        return mw.returnData(False, '文件名中不能包含特殊字符!')
+    if not os.path.exists(sfile):
+        return mw.returnData(False, '指定文件不存在!')
+
+    if not checkDir(sfile):
+        return mw.returnData(False, 'FILE_DANGER')
+
+    try:
+        shutil.move(sfile, dfile)
+        msg = mw.getInfo('移动或重名命文件[{1}]到[{2}]成功!', (sfile, dfile,))
+        mw.writeLog('文件管理', msg)
+        return mw.returnData(True, '移动或重名命文件成功!')
+    except:
+        return mw.returnData(False, '移动或重名命文件失败!')
+
 def uncompress(sfile, dfile, path):
     if not os.path.exists(sfile):
         return mw.returnData(False, '指定文件不存在!')
@@ -199,7 +217,6 @@ def copyDir(src_file, dst_file):
     if os.path.exists(dst_file):
         return mw.returnData(False, '指定目录已存在!')
 
-    import shutil
     try:
         shutil.copytree(src_file, dst_file)
         stat = os.stat(src_file)
@@ -221,7 +238,6 @@ def copyFile(src_file, dst_file):
         return copyDir(src_file, dst_file)
 
     try:
-        import shutil
         shutil.copyfile(src_file, dst_file)
         msg = mw.getInfo('复制文件[{1}]到[{2}]成功!', (src_file, dst_file,))
         mw.writeLog('文件管理', msg)

From 50a96b198a54c96122579bc5cdd0b4111e0d007f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 20:12:55 +0800
Subject: [PATCH 734/965] update

---
 plugins/acme_pandominassl_apply/index.py     | 10 +++++-----
 plugins/acme_pandominassl_apply/tool_cron.py |  2 +-
 plugins/backup_ftp/index.py                  |  6 +++---
 plugins/gdrive/index.py                      |  4 ++--
 plugins/mariadb/index.py                     |  4 ++--
 plugins/migration_api/index.py               |  2 +-
 plugins/msonedrive/index.py                  |  4 ++--
 plugins/mysql-apt/index.py                   |  6 +++---
 plugins/mysql-yum/index.py                   |  6 +++---
 plugins/mysql/index.py                       |  6 +++---
 plugins/op_waf/tool_task.py                  |  2 +-
 11 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/plugins/acme_pandominassl_apply/index.py b/plugins/acme_pandominassl_apply/index.py
index cd21cf2a8..ce92ed492 100755
--- a/plugins/acme_pandominassl_apply/index.py
+++ b/plugins/acme_pandominassl_apply/index.py
@@ -563,7 +563,7 @@ def runHookPy(domain,path):
     # print(domain,path)
     run_log = runLog()
     hook_file = getConf()
-    cmd = 'cd '+mw.getRunDir()
+    cmd = 'cd '+mw.getPanelDir()
     cmd += ' && python3 '+hook_file + ' ' + domain + ' ' + path
     cmd += ' >> '+ run_log
     print(cmd)
@@ -644,7 +644,7 @@ def getHookIdCmd():
     if not data[0]:
         return data[1]
 
-    cmd = "cd "+mw.getRunDir()+" "
+    cmd = "cd "+mw.getPanelDir()+" "
     cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_hook_id 1.0 {"id":"'+args['id']+'"}'
     return mw.returnJson(True, 'ok',cmd)
 
@@ -661,7 +661,7 @@ def runHookId():
     return 'run hook '+args['id']+' end'
 
 def runHookCmd():
-    cmd = "cd "+mw.getRunDir()+" "
+    cmd = "cd "+mw.getPanelDir()+" "
     cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_hook'
     return mw.returnJson(True, 'ok',cmd)
 
@@ -738,7 +738,7 @@ def runSyncCfData():
     return ''
 
 def runSyncCfCmd():
-    cmd = "cd "+mw.getRunDir()+" "
+    cmd = "cd "+mw.getPanelDir()+" "
     cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_sync_cf_data'
     return mw.returnJson(True, 'ok',cmd)
 
@@ -791,7 +791,7 @@ def runSyncDnsPodData():
     return ''
 
 def runSyncDnsPodCmd():
-    cmd = "cd "+mw.getRunDir()+" "
+    cmd = "cd "+mw.getPanelDir()+" "
     cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_sync_dnspod_data'
     return mw.returnJson(True, 'ok',cmd)
 
diff --git a/plugins/acme_pandominassl_apply/tool_cron.py b/plugins/acme_pandominassl_apply/tool_cron.py
index 5e16865d3..5672065fc 100644
--- a/plugins/acme_pandominassl_apply/tool_cron.py
+++ b/plugins/acme_pandominassl_apply/tool_cron.py
@@ -72,7 +72,7 @@ def createBgTaskByName(name):
     import crontab_api
     api = crontab_api.crontab_api()
 
-    mw_dir = mw.getRunDir()
+    mw_dir = mw.getPanelDir()
     cmd = '''
 mw_dir=%s
 rname=%s
diff --git a/plugins/backup_ftp/index.py b/plugins/backup_ftp/index.py
index 1f1403890..dfaa7fe6a 100755
--- a/plugins/backup_ftp/index.py
+++ b/plugins/backup_ftp/index.py
@@ -188,7 +188,7 @@ def findPathName(path, filename):
     return l
 
 def backupAllFunc(stype):
-    os.chdir(mw.getRunDir())
+    os.chdir(mw.getPanelDir())
 
     name = sys.argv[2]
     num = sys.argv[3]
@@ -230,11 +230,11 @@ def backupAllFunc(stype):
             'type=? and pid=?', ('1', pid)).field('id,filename').select()
 
     args = stype + " " + name + " " + num
-    cmd = 'python3 ' + mw.getRunDir() + '/scripts/backup.py ' + args
+    cmd = 'python3 ' + mw.getPanelDir() + '/scripts/backup.py ' + args
     if stype.find('database_') > -1:
         plugin_name = stype.replace('database_', '')
         args = "database " + name + " " + num
-        cmd = 'python3 ' + mw.getRunDir() + '/plugins/' + plugin_name + \
+        cmd = 'python3 ' + mw.getPanelDir() + '/plugins/' + plugin_name + \
             '/scripts/backup.py ' + args
 
     os.system(cmd)
diff --git a/plugins/gdrive/index.py b/plugins/gdrive/index.py
index bf940d4c6..5a1d16103 100644
--- a/plugins/gdrive/index.py
+++ b/plugins/gdrive/index.py
@@ -203,9 +203,9 @@ def backupAllFunc(stype):
         mw.echoInfo("未授权API,无法使用!!!")
         return ''
 
-    os.chdir(mw.getRunDir())
+    os.chdir(mw.getPanelDir())
     backup_dir = mw.getBackupDir()
-    run_dir = mw.getRunDir()
+    run_dir = mw.getPanelDir()
 
     stype = sys.argv[1]
     name = sys.argv[2]
diff --git a/plugins/mariadb/index.py b/plugins/mariadb/index.py
index 01f895af1..4fd9ed3b5 100755
--- a/plugins/mariadb/index.py
+++ b/plugins/mariadb/index.py
@@ -2478,7 +2478,7 @@ def trySlaveSyncBugfix(version=''):
     return mw.returnJson(True, '修复成功!')
 
 def getSlaveSyncCmd(version=''):
-    root = mw.getRunDir()
+    root = mw.getPanelDir()
     cmd = 'cd ' + root + ' && python3 ' + root + \
         '/plugins/mariadb/index.py do_full_sync {"db":"all","sign":""}'
     return mw.returnJson(True, 'ok', cmd)
@@ -3027,7 +3027,7 @@ def fullSync(version=''):
 
     status_file = asyncTmpfile()
     if args['begin'] == '1':
-        cmd = 'cd ' + mw.getRunDir() + ' && python3 ' + \
+        cmd = 'cd ' + mw.getPanelDir() + ' && python3 ' + \
             getPluginDir() + \
             '/index.py do_full_sync {"db":"' + args['db'] + '","sign":"' + sign + '"} &'
         # print(cmd)
diff --git a/plugins/migration_api/index.py b/plugins/migration_api/index.py
index 25ad7fbac..f41493634 100755
--- a/plugins/migration_api/index.py
+++ b/plugins/migration_api/index.py
@@ -384,7 +384,7 @@ class classApi:
 
         zip_file = backup_path + \
             "/psync_tmp_{}.tar.gz".format(os.path.basename(spath))
-        zip_dst = mw.getRunDir() + '/tmp/psync_tmp_{}.tar.gz'.format(
+        zip_dst = mw.getPanelDir() + '/tmp/psync_tmp_{}.tar.gz'.format(
             os.path.basename(dpath))
         write_log("|-正在压缩目录[{}]...".format(spath))
         self.write_speed('done', '正在压缩')
diff --git a/plugins/msonedrive/index.py b/plugins/msonedrive/index.py
index 6a34658ed..71abaeb68 100644
--- a/plugins/msonedrive/index.py
+++ b/plugins/msonedrive/index.py
@@ -217,9 +217,9 @@ def backupAllFunc(stype):
         mw.echoInfo("未授权API,无法使用!!!")
         return ''
 
-    os.chdir(mw.getRunDir())
+    os.chdir(mw.getPanelDir())
     backup_dir = mw.getBackupDir()
-    run_dir = mw.getRunDir()
+    run_dir = mw.getPanelDir()
 
     stype = sys.argv[1]
     name = sys.argv[2]
diff --git a/plugins/mysql-apt/index.py b/plugins/mysql-apt/index.py
index 73a46e8a5..4c79ed0ba 100755
--- a/plugins/mysql-apt/index.py
+++ b/plugins/mysql-apt/index.py
@@ -831,7 +831,7 @@ def setDbBackup():
     if not data[0]:
         return data[1]
 
-    scDir = getPluginDir() + '/scripts/backup.py'
+    scDir = getPanelDir() + '/scripts/backup.py'
     cmd = 'python3 ' + scDir + ' database ' + args['name'] + ' 3'
     os.system(cmd)
     return mw.returnJson(True, 'ok')
@@ -2569,7 +2569,7 @@ def trySlaveSyncBugfix(version=''):
 
 def getSlaveSyncCmd(version=''):
 
-    root = mw.getRunDir()
+    root = mw.getPanelDir()
     cmd = 'cd ' + root + ' && python3 ' + root + \
         '/plugins/mysql/index.py do_full_sync {"db":"all","sign":""}'
     return mw.returnJson(True, 'ok', cmd)
@@ -3450,7 +3450,7 @@ def fullSync(version=''):
 
     status_file = asyncTmpfile()
     if args['begin'] == '1':
-        cmd = 'cd ' + mw.getRunDir() + ' && python3 ' + getPluginDir() + \
+        cmd = 'cd ' + mw.getPanelDir() + ' && python3 ' + getPluginDir() + \
             '/index.py do_full_sync {"db":"' + \
             args['db'] + '","sign":"' + sign + '"} &'
         # print(cmd)
diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py
index 7c85d1afb..d9b450128 100755
--- a/plugins/mysql-yum/index.py
+++ b/plugins/mysql-yum/index.py
@@ -830,7 +830,7 @@ def setDbBackup():
     if not data[0]:
         return data[1]
 
-    scDir = getPluginDir() + '/scripts/backup.py'
+    scDir = getPanelDir() + '/scripts/backup.py'
     cmd = 'python3 ' + scDir + ' database ' + args['name'] + ' 3'
     os.system(cmd)
     return mw.returnJson(True, 'ok')
@@ -2551,7 +2551,7 @@ def trySlaveSyncBugfix(version=''):
 
 def getSlaveSyncCmd(version=''):
 
-    root = mw.getRunDir()
+    root = mw.getPanelDir()
     cmd = 'cd ' + root + ' && python3 ' + root + \
         '/plugins/mysql/index.py do_full_sync {"db":"all"}'
     return mw.returnJson(True, 'ok', cmd)
@@ -3433,7 +3433,7 @@ def fullSync(version=''):
 
     status_file = asyncTmpfile()
     if args['begin'] == '1':
-        cmd = 'cd ' + mw.getRunDir() + ' && python3 ' + getPluginDir() + \
+        cmd = 'cd ' + mw.getPanelDir() + ' && python3 ' + getPluginDir() + \
             '/index.py do_full_sync {"db":"' + \
             args['db'] + '","sign":"' + sign + '"} &'
         # print(cmd)
diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py
index b53a42ecc..3b501cf7a 100755
--- a/plugins/mysql/index.py
+++ b/plugins/mysql/index.py
@@ -973,7 +973,7 @@ def setDbBackup():
     if not data[0]:
         return data[1]
 
-    scDir = mw.getRunDir() + '/scripts/backup.py'
+    scDir = mw.getPanelDir() + '/scripts/backup.py'
     cmd = 'python3 ' + scDir + ' database ' + args['name'] + ' 3'
     os.system(cmd)
     return mw.returnJson(True, 'ok')
@@ -2780,7 +2780,7 @@ def trySlaveSyncBugfix(version=''):
 
 
 def getSlaveSyncCmd(version=''):
-    root = mw.getRunDir()
+    root = mw.getPanelDir()
     cmd = 'cd ' + root + ' && python3 ' + root + \
         '/plugins/mysql/index.py do_full_sync {"db":"all","sign",""}'
     return mw.returnJson(True, 'ok', cmd)
@@ -3728,7 +3728,7 @@ def fullSync(version=''):
 
     status_file = asyncTmpfile()
     if args['begin'] == '1':
-        cmd = 'cd ' + mw.getRunDir() + ' && python3 ' + getPluginDir() + \
+        cmd = 'cd ' + mw.getPanelDir() + ' && python3 ' + getPluginDir() + \
             '/index.py do_full_sync {"db":"' + \
             args['db'] + '","sign":"' + sign + '"} &'
         # print(cmd)
diff --git a/plugins/op_waf/tool_task.py b/plugins/op_waf/tool_task.py
index 88416b9ef..70d2fd107 100644
--- a/plugins/op_waf/tool_task.py
+++ b/plugins/op_waf/tool_task.py
@@ -93,7 +93,7 @@ def createBgTaskByName(name, args):
         _where1 = args['minute-n']
         _minute = ''
 
-    mw_dir = mw.getRunDir()
+    mw_dir = mw.getPanelDir()
     cmd = '''
 mw_dir=%s
 rname=%s

From 8309b8e4937929ca6316087e83a75e42b6da3fd5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 20:16:19 +0800
Subject: [PATCH 735/965] update

---
 scripts/backup.py      | 17 +++++++----------
 scripts/logs_backup.py | 10 +++++-----
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/scripts/backup.py b/scripts/backup.py
index 5ecf5811e..fbec67091 100755
--- a/scripts/backup.py
+++ b/scripts/backup.py
@@ -6,21 +6,18 @@
 import sys
 import os
 import re
+import time
 
 if sys.platform != 'darwin':
     os.chdir('/www/server/mdserver-web')
 
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
-chdir = os.getcwd()
-sys.path.append(chdir + '/class/core')
-
-# reload(sys)
-# sys.setdefaultencoding('utf-8')
-
-
-import mw
-import db
-import time
+import core.mw as mw
+import core.db as db
 
 
 class backupTools:
diff --git a/scripts/logs_backup.py b/scripts/logs_backup.py
index 7c5877402..18203c08e 100755
--- a/scripts/logs_backup.py
+++ b/scripts/logs_backup.py
@@ -13,13 +13,13 @@ if sys.platform != 'darwin':
     os.chdir('/www/server/mdserver-web')
 
 
-chdir = os.getcwd()
-sys.path.append(chdir + '/class/core')
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
-# importlib.reload(sys)
-# sys.setdefaultencoding('utf-8')
+import core.mw as mw
 
-import mw
 print('==================================================================')
 print('★[' + time.strftime("%Y/%m/%d %H:%M:%S") + ']，切割日志')
 print('==================================================================')

From 18202b859bda9a0279aca572099f3cdc33f801d5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 20:19:41 +0800
Subject: [PATCH 736/965] Update system.py

---
 web/admin/system/system.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/system/system.py b/web/admin/system/system.py
index 78dd8fc36..d483e9d23 100644
--- a/web/admin/system/system.py
+++ b/web/admin/system/system.py
@@ -25,7 +25,7 @@ import thisdb
 blueprint = Blueprint('system', __name__, url_prefix='/system', template_folder='../../templates')
 
 # 获取系统的统计信息
-@blueprint.route('/system_total', endpoint='system_total')
+@blueprint.route('/system_total', endpoint='system_total', methods=['GET','POST'])
 @panel_login_required
 def system_total():
     data = sys.getMemInfo()

From 87d76d7cf76414f1bc7913ac5e1cc90febe94f2c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 20:48:01 +0800
Subject: [PATCH 737/965] update

---
 plugins/migration_api/index.html | 11 ++++++++---
 plugins/migration_api/index.py   |  8 +++++---
 plugins/migration_api/js/app.js  |  5 +++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/plugins/migration_api/index.html b/plugins/migration_api/index.html
index 2973244d3..33fde7f05 100755
--- a/plugins/migration_api/index.html
+++ b/plugins/migration_api/index.html
@@ -231,9 +231,14 @@ label.checkbox_label span {
                     <input type="text" class="bt-input-text" name="sync_url" value="" placeholder="接收数据面板地址，如: http://127.0.0.1:8888">
                 </div>
                 <div class="mtb20">
-                    <span class="panel_setp_span">接收数据的面板API</span>
-                    <input type="text" class="bt-input-text" name="sync_token" value="" placeholder="接收数据面板API密钥" />
-                    <a href="#" target="_blank" class="btlink ml5">获取API秘钥</a>
+                    <span class="panel_setp_span">应用ID</span>
+                    <input type="text" class="bt-input-text" name="sync_app_id" value="" placeholder="应用ID" />
+                    <a href="javascript:void();" target="_blank" class="btlink ml5">应用ID</a>
+                </div>
+                <div class="mtb20">
+                    <span class="panel_setp_span">应用密钥</span>
+                    <input type="text" class="bt-input-text" name="sync_app_sercet" value="" placeholder="应用密钥" />
+                    <a href="javascript:void();" target="_blank" class="btlink ml5">应用密钥</a>
                 </div>
                 <div class="mtb20">
                     <span class="panel_setp_span">IP白名单</span>
diff --git a/plugins/migration_api/index.py b/plugins/migration_api/index.py
index f41493634..05fbbd116 100755
--- a/plugins/migration_api/index.py
+++ b/plugins/migration_api/index.py
@@ -895,12 +895,13 @@ def getStepOneData():
 
 def stepOne():
     args = getArgs()
-    data = checkArgs(args, ['url', 'token'])
+    data = checkArgs(args, ['url', 'app_id','app_sercet'])
     if not data[0]:
         return data[1]
 
     url = args['url']
-    token = args['token']
+    app_id = args['app_id']
+    app_sercet = args['app_sercet']
 
     speed_file = getServerDir() + '/config/speed.json'
     if os.path.exists(speed_file):
@@ -919,7 +920,8 @@ def stepOne():
     data = getCfgData()
 
     data['url'] = url
-    data['token'] = token
+    data['app_id'] = app_id
+    data['app_sercet'] = app_sercet
     writeConf(data)
 
     return mw.returnJson(True, '验证成功')
diff --git a/plugins/migration_api/js/app.js b/plugins/migration_api/js/app.js
index 73c21e12b..266b7f2ae 100755
--- a/plugins/migration_api/js/app.js
+++ b/plugins/migration_api/js/app.js
@@ -91,8 +91,9 @@ function selectProgress(val){
 
 function initStep1(){
     var url = $('input[name="sync_url"]').val();
-    var token = $('input[name="sync_token"]').val();
-    maPost('step_one',{url:url,token:token}, function(rdata){
+    var app_id = $('input[name="sync_app_id"]').val();
+    var app_sercet = $('input[name="sync_app_sercet"]').val();
+    maPost('step_one',{'url':url,'app_id':app_id,'app_sercet':app_sercet}, function(rdata){
         var rdata = $.parseJSON(rdata.data);
         showMsg(rdata.msg,function(){
             if (rdata.status){

From 5588976f95ddda66ecfc26b911f7ffeddfdab222 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 21:52:15 +0800
Subject: [PATCH 738/965] Update index.py

---
 plugins/migration_api/index.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/migration_api/index.py b/plugins/migration_api/index.py
index 05fbbd116..84d63c477 100755
--- a/plugins/migration_api/index.py
+++ b/plugins/migration_api/index.py
@@ -980,8 +980,7 @@ def stepTwo():
 def get_src_info(args):
     # 获取本地服务器网站、数据库.
     data = {}
-    data['sites'] = mw.M('sites').field(
-        "id,name,path,ps,status,addtime").order("id desc").select()
+    data['sites'] = mw.M('sites').field("id,name,path,ps,status,add_time").order("id desc").select()
 
     my_db_pos = mw.getServerDir() + '/mysql'
     conn = mw.M('databases').dbPos(my_db_pos, 'mysql')
@@ -995,8 +994,8 @@ def stepThree():
 
 
 def getPid():
-    result = mw.execShell(
-        "ps aux|grep 'plugins/migration_api/index.py bg_process' |grep -v grep|awk '{print $2}'|xargs")[0].strip()
+    cmd = "ps aux|grep 'plugins/migration_api/index.py bg_process' |grep -v grep|awk '{print $2}'|xargs"
+    result = mw.execShell(cmd)[0].strip()
     if not result:
         return None
     return result

From c91928c55f78b5cbcf770193dfb5768c1ceb3fad Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 3 Dec 2024 23:26:15 +0800
Subject: [PATCH 739/965] update

---
 {web/misc/version => version}/r3.6.txt |   0
 {web/misc/version => version}/r3.7.txt |   0
 web/admin/task/__init__.py             |   3 +-
 web/admin/user_login_check.py          |  13 +++
 web/misc/test/api/mw_api.php           |  87 +++++++++++++++++
 web/misc/test/api/mw_api.py            |  57 +++++++++++
 web/misc/version/api/mw_api.php        |  94 -------------------
 web/misc/version/api/mw_api.py         | 125 -------------------------
 web/misc/version/info.json             |  22 -----
 web/static/app/public.js               |  29 +++---
 web/thisdb/app.py                      |   3 +
 11 files changed, 174 insertions(+), 259 deletions(-)
 rename {web/misc/version => version}/r3.6.txt (100%)
 rename {web/misc/version => version}/r3.7.txt (100%)
 create mode 100755 web/misc/test/api/mw_api.php
 create mode 100755 web/misc/test/api/mw_api.py
 delete mode 100755 web/misc/version/api/mw_api.php
 delete mode 100755 web/misc/version/api/mw_api.py
 delete mode 100644 web/misc/version/info.json

diff --git a/web/misc/version/r3.6.txt b/version/r3.6.txt
similarity index 100%
rename from web/misc/version/r3.6.txt
rename to version/r3.6.txt
diff --git a/web/misc/version/r3.7.txt b/version/r3.7.txt
similarity index 100%
rename from web/misc/version/r3.7.txt
rename to version/r3.7.txt
diff --git a/web/admin/task/__init__.py b/web/admin/task/__init__.py
index 66d389b7f..cd387a4fb 100644
--- a/web/admin/task/__init__.py
+++ b/web/admin/task/__init__.py
@@ -26,8 +26,7 @@ blueprint = Blueprint('task', __name__, url_prefix='/task', template_folder='../
 @blueprint.route('/count', endpoint='task_count')
 @panel_login_required
 def task_count():
-    return str(thisdb.getTaskUnexecutedCount())
-
+    return mw.returnData(True, 'ok',thisdb.getTaskUnexecutedCount())
 
 @blueprint.route('/list', endpoint='list', methods=['POST'])
 @panel_login_required
diff --git a/web/admin/user_login_check.py b/web/admin/user_login_check.py
index c2ba5b1dd..7d7bc2e44 100644
--- a/web/admin/user_login_check.py
+++ b/web/admin/user_login_check.py
@@ -11,6 +11,7 @@
 
 from flask import render_template
 from flask import Response
+from flask import request
 
 from functools import wraps
 
@@ -23,6 +24,18 @@ def panel_login_required(func):
 
     @wraps(func)
     def wrapper(*args, **kwargs):
+        # 面板API调用检查
+        app_id = request.headers.get('App-Id','')
+        app_secret = request.headers.get('App-Secret','')
+        if app_id != '' and app_secret != '':
+            panel_api = thisdb.getOptionByJson('panel_api', default={"open":True})
+            if panel_api['open']:
+                return_code = 404
+                info = thisdb.getAppByAppId(app_id)
+                if app_secret != info['app_secret']:
+                    return Response(status=int(return_code))
+                return func(*args, **kwargs)
+
         if not isLogined():
             unauthorized_status = thisdb.getOption('unauthorized_status')
             if unauthorized_status == '0':
diff --git a/web/misc/test/api/mw_api.php b/web/misc/test/api/mw_api.php
new file mode 100755
index 000000000..76f5db522
--- /dev/null
+++ b/web/misc/test/api/mw_api.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * MW API接口示例Demo
+ * 仅供参考，请根据实际项目需求开发，并做好安全处理
+ * date 2022-11-28
+ * author midoks
+ */
+class mwApi {
+	private $MW_PANEL      = "http://127.0.0.1:64307"; //面板地址
+	private $MW_APP_ID     = 'hC6XArWzRY';
+	private $MW_APP_SERECT = 'NSGaFhMWyaN5Yi3ftTkZ';
+
+	//如果希望多台面板，可以在实例化对象时，将面板地址与密钥传入
+	public function __construct($mw_panel = null, $app_id = null, $app_secret = null) {
+		if ($mw_panel) {
+			$this->MW_PANEL = $mw_panel;
+		}
+
+		if ($app_id) {
+			$this->MW_APP_ID = $app_id;
+		}
+
+		if ($app_secret) {
+			$this->MW_APP_SERECT = $app_secret;
+		}
+	}
+
+	/**
+	 * 发起POST请求
+	 * @param String $url 目标网填，带http://
+	 * @param Array|String $data 欲提交的数据
+	 * @return string
+	 */
+	private function httpPost($url, $data, $timeout = 60) {
+
+		$ch = curl_init();
+		// 设置头部信息
+		$headers = [
+			'app-id: ' . $this->MW_APP_ID,
+			'app-secret: ' . $this->MW_APP_SERECT,
+		];
+		curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+		curl_setopt($ch, CURLOPT_URL, $url);
+		curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+		curl_setopt($ch, CURLOPT_POST, 1);
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+		curl_setopt($ch, CURLOPT_COOKIEJAR, $cookie_file);
+		curl_setopt($ch, CURLOPT_COOKIEFILE, $cookie_file);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($ch, CURLOPT_HEADER, 0);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+		$output = curl_exec($ch);
+		curl_close($ch);
+		return $output;
+	}
+
+	public function panel($endpoint, $data) {
+		$url = $this->MW_PANEL . $endpoint;
+		return $this->httpPost($url, $data);
+	}
+
+	//示例取面板日志
+	public function getLogsList() {
+		$post_data['p']     = '1';
+		$post_data['limit'] = 10;
+
+		//请求面板接口
+		$data = $this->panel('/logs/get_log_list', $post_data);
+
+		//解析JSON数据
+		// $data = json_decode($result, true);
+		return $data;
+	}
+
+}
+
+//实例化对象
+$api = new mwApi();
+//获取面板日志
+$rdata = $api->getLogsList();
+
+// var_dump($rdata);
+//输出JSON数据到浏览器
+echo json_encode($rdata);
+
+?>
\ No newline at end of file
diff --git a/web/misc/test/api/mw_api.py b/web/misc/test/api/mw_api.py
new file mode 100755
index 000000000..9c490e01f
--- /dev/null
+++ b/web/misc/test/api/mw_api.py
@@ -0,0 +1,57 @@
+# coding: utf-8
+# +-----------------------------------------------------------------------------------
+# | MW Linux面板
+# +-----------------------------------------------------------------------------------
+# | Copyright (c) 2015-2099 MW(http://github.com/midoks/mdserver) All rights reserved.
+# +-----------------------------------------------------------------------------------
+# | Author: midoks
+# +-----------------------------------------------------------------------------------
+
+#------------------------------
+# API-Demo of Python
+#------------------------------
+import time
+import hashlib
+import sys
+import os
+import json
+
+
+class mwApi:
+    __MW_PANEL = 'http://127.0.0.1:64307'
+    __MW_APP_ID = 'hC6XArWzRY'
+    __MW_APP_SERECT = 'NSGaFhMWyaN5Yi3ftTkZ'
+    
+    # 如果希望多台面板，可以在实例化对象时，将面板地址与密钥传入
+    def __init__(self, panel_url=None, app_id=None, app_serect=None):
+        if panel_url:
+            self.__MW_PANEL = panel_url
+            self.__MW_APP_ID = app_id
+            self.__MW_APP_SERECT = app_serect
+
+    def post(self, endpoint, request_data):
+        import requests
+        url = self.__MW_PANEL + endpoint  
+        post_data = requests.post(url, data=request_data, headers={
+            'app-id':self.__MW_APP_ID,
+            'app-secret':self.__MW_APP_SERECT
+        })
+        try:
+            return post_data.json()
+        except Exception as e:
+            return post_data.text
+    # 取面板日志
+    def getLogs(self):
+        result = self.post('/logs/get_log_list',{'limit':10,'p':1})
+        return result
+
+
+if __name__ == '__main__':
+    # 实例化MW-API对象
+    api = mwApi()
+
+    # 调用get_logs方法
+    rdata = api.getLogs()
+
+    # 打印响应数据
+    print(rdata)
diff --git a/web/misc/version/api/mw_api.php b/web/misc/version/api/mw_api.php
deleted file mode 100755
index 4096d8fdf..000000000
--- a/web/misc/version/api/mw_api.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * MW API接口示例Demo
- * 仅供参考，请根据实际项目需求开发，并做好安全处理
- * date 2022-11-28
- * author midoks
- */
-class mwApi {
-    private $MW_KEY   = "j7GQhzNcBV4KU9QKYPXvtjSzCcmfkc0e"; //接口密钥
-    private $MW_PANEL = "http://127.0.0.1:7200"; //面板地址
-
-    //如果希望多台面板，可以在实例化对象时，将面板地址与密钥传入
-    public function __construct($mw_panel = null, $mw_key = null) {
-        if ($mw_panel) {
-            $this->MW_PANEL = $mw_panel;
-        }
-
-        if ($mw_key) {
-            $this->MW_KEY = $mw_key;
-        }
-    }
-
-    /**
-     * 发起POST请求
-     * @param String $url 目标网填，带http://
-     * @param Array|String $data 欲提交的数据
-     * @return string
-     */
-    private function httpPostCookie($url, $data, $timeout = 60) {
-        //定义cookie保存位置
-        $cookie_file = './' . md5($this->MW_PANEL) . '.cookie';
-        if (!file_exists($cookie_file)) {
-            $fp = fopen($cookie_file, 'w+');
-            fclose($fp);
-        }
-
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
-        curl_setopt($ch, CURLOPT_POST, 1);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-        curl_setopt($ch, CURLOPT_COOKIEJAR, $cookie_file);
-        curl_setopt($ch, CURLOPT_COOKIEFILE, $cookie_file);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_HEADER, 0);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-        $output = curl_exec($ch);
-        curl_close($ch);
-        return $output;
-    }
-
-    /**
-     * 构造带有签名的关联数组
-     */
-    private function getKeyData() {
-        $now_time   = time();
-        $ready_data = array(
-            'request_token' => md5($now_time . '' . md5($this->MW_KEY)),
-            'request_time'  => $now_time,
-        );
-        return $ready_data;
-    }
-
-    //示例取面板日志
-    public function getLogsList() {
-        //拼接URL地址
-        $url = $this->MW_PANEL . '/api/firewall/get_log_list';
-
-        //准备POST数据
-        $post_data          = $this->getKeyData(); //取签名
-        $post_data['p']     = '1';
-        $post_data['limit'] = 10;
-
-        //请求面板接口
-        $result = $this->httpPostCookie($url, $post_data);
-
-        //解析JSON数据
-        $data = json_decode($result, true);
-        return $data;
-    }
-
-}
-
-//实例化对象
-$api = new mwApi();
-//获取面板日志
-$rdata = $api->getLogsList();
-
-// var_dump($rdata);
-//输出JSON数据到浏览器
-echo json_encode($rdata);
-
-?>
\ No newline at end of file
diff --git a/web/misc/version/api/mw_api.py b/web/misc/version/api/mw_api.py
deleted file mode 100755
index 3748e1a8b..000000000
--- a/web/misc/version/api/mw_api.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# coding: utf-8
-# +-----------------------------------------------------------------------------------
-# | MW Linux面板
-# +-----------------------------------------------------------------------------------
-# | Copyright (c) 2015-2099 MW(http://github.com/midoks/mdserver) All rights reserved.
-# +-----------------------------------------------------------------------------------
-# | Author: midoks
-# +-----------------------------------------------------------------------------------
-
-#------------------------------
-# API-Demo of Python
-#------------------------------
-import time
-import hashlib
-import sys
-import os
-import json
-
-
-class mwApi:
-    __MW_KEY = 'uATE5NrKDWIlZuDcYpvLVhoUo1c7A1Pk'
-    __MW_PANEL = 'http://127.0.0.1:7200'
-
-    # 如果希望多台面板，可以在实例化对象时，将面板地址与密钥传入
-    def __init__(self, mw_panel=None, mw_key=None):
-        if mw_panel:
-            self.__MW_PANEL = mw_panel
-            self.__MW_KEY = mw_key
-
-    # 计算MD5
-    def __get_md5(self, s):
-        m = hashlib.md5()
-        m.update(s.encode('utf-8'))
-        return m.hexdigest()
-
-    # 构造带有签名的关联数组
-    def __get_key_data(self):
-        now_time = int(time.time())
-        ready_data = {
-            'request_token': self.__get_md5(str(now_time) + '' + self.__get_md5(self.__MW_KEY)),
-            'request_time': now_time
-        }
-        return ready_data
-
-    # 发送POST请求并保存Cookie
-    #@url 被请求的URL地址(必需)
-    #@data POST参数，可以是字符串或字典(必需)
-    #@timeout 超时时间默认1800秒
-    # return string
-    def __http_post_cookie(self, url, p_data, timeout=1800):
-        cookie_file = '/tmp/' + self.__get_md5(self.__MW_PANEL) + '.cookie'
-        if sys.version_info[0] == 2:
-            # Python2
-            import urllib
-            import urllib2
-            import ssl
-            import cookielib
-
-            # 创建cookie对象
-            cookie_obj = cookielib.MozillaCookieJar(cookie_file)
-
-            # 加载已保存的cookie
-            if os.path.exists(cookie_file):
-                cookie_obj.load(cookie_file, ignore_discard=True,
-                                ignore_expires=True)
-
-            ssl._create_default_https_context = ssl._create_unverified_context
-
-            data = urllib.urlencode(p_data)
-            req = urllib2.Request(url, data)
-            opener = urllib2.build_opener(
-                urllib2.HTTPCookieProcessor(cookie_obj))
-            response = opener.open(req, timeout=timeout)
-
-            # 保存cookie
-            cookie_obj.save(ignore_discard=True, ignore_expires=True)
-            return response.read()
-        else:
-            # Python3
-            import urllib.request
-            import ssl
-            import http.cookiejar
-            cookie_obj = http.cookiejar.MozillaCookieJar(cookie_file)
-            # 加载已保存的cookie
-            if os.path.exists(cookie_file):
-                cookie_obj.load(cookie_file, ignore_discard=True,
-                                ignore_expires=True)
-
-            handler = urllib.request.HTTPCookieProcessor(cookie_obj)
-            data = urllib.parse.urlencode(p_data).encode('utf-8')
-            req = urllib.request.Request(url, data)
-            opener = urllib.request.build_opener(handler)
-            response = opener.open(req, timeout=timeout)
-            cookie_obj.save(ignore_discard=True, ignore_expires=True)
-            result = response.read()
-            if type(result) == bytes:
-                result = result.decode('utf-8')
-            return result
-
-    # 取面板日志
-    def getLogs(self):
-        # 拼接URL地址
-        url = self.__MW_PANEL + '/api/logs/get_log_list'
-
-        # 准备POST数据
-        post_data = self.__get_key_data()  # 取签名
-        post_data['limit'] = 10
-        post_data['p'] = '1'
-
-        # 请求面板接口
-        result = self.__http_post_cookie(url, post_data)
-
-        # 解析JSON数据
-        return json.loads(result)
-
-
-if __name__ == '__main__':
-    # 实例化MW-API对象
-    api = mwApi()
-
-    # 调用get_logs方法
-    rdata = api.getLogs()
-
-    # 打印响应数据
-    print(rdata)
diff --git a/web/misc/version/info.json b/web/misc/version/info.json
deleted file mode 100644
index f56145cde..000000000
--- a/web/misc/version/info.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "version": "0.9.9",
-        "content": "* 目标版本。",
-    },
-    {
-        "version": "0.9.2",
-        "content": "* 批量域名添加修复。<br/> * 常用命令说明。",
-        "path": "https://github.com/midoks/mdserver-web/releases/download/0.9.2/mdserver-web.zip"
-    },
-    {
-        "version": "0.9.1",
-        "content": "* 菜单修复。<br/> * 更新修复",
-        "path": "https://github.com/midoks/mdserver-web/releases/download/0.9.1/mdserver-web.zip",
-        "purge":"https://purge.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/update.sh"
-    },
-    {
-        "version": "0.9.0",
-        "content": "* 主流系统支持。<br/> * 插件支持更多参数。<br/>* MySQL主从支持GTID和经典模式。<br/>* MariaDB主从支持GTID和经典模式。<br/>* Rsyncd更新。<br/>* 添加网站统计的插件。<br/>* 添加varnish插件。",
-        "path": "https://github.com/midoks/mdserver-web/releases/download/0.9.0/mdserver-web.zip"
-    }
-]
\ No newline at end of file
diff --git a/web/static/app/public.js b/web/static/app/public.js
index 511978807..9d6b6675c 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -940,9 +940,9 @@ function removeTask(b) {
 
 //获取任务总数
 function getTaskCount() {
-	$.get("/task/count", "", function(a) {
-		$(".task").text(a);
-	});
+	$.get("/task/count", '', function(data) {
+		$(".task").text(data.data);
+	},'json');
 }
 getTaskCount();
 setInterval(function(){
@@ -1342,7 +1342,6 @@ function remind(a){
 	$.post("/task/list", "table=tasks&result=2,4,6,8&limit=10&p=" + a, function(g) {
 		var e = '';
 		var f = false;
-		var task_count = 0;
 		for(var d = 0; d < g.data.length; d++) {
 			var status = g.data[d].status;
 			var status_text = '已经完成';
@@ -1387,12 +1386,10 @@ function remind(a){
 					</div>\
 					<div id="taskPage" class="page"></div>\
 				</div>';
-		
-		$(".task_count").text(task_count);
-		$(".msg_count").text(g.count);
 		$(".taskcon").html(con);
-		$("#taskPage").html(g.page);
 
+		$(".msg_count").text(g.count);
+		$("#taskPage").html(g.page);
 		$("#Rs-checkAll").click(function(){
 			if($(this).prop("checked")){
 				$("#remind").find("input").prop("checked",true);
@@ -1427,17 +1424,15 @@ function getReloads() {
 				$(".cmdlist").html('当前没有任务!');
 				return;
 			}
-			var b = "";
-			var d = "";
-			$("#task").text(h.count);
-			$(".task_count").text(h.task.length);
+			var b = '';
+			var d = '';
 			for(var g = 0; g < h.task.length; g++) {
 				if(h.task[g].status == "-1") {
 					if(h.task[g].type != "download") {
 						var c = "";
 						var f = h.msg.split("\n");
 						for(var e = 0; e < f.length; e++) {
-							c += f[e] + "<br>"
+							c += f[e] + "<br>";
 						}
 						if(h.task[g].name.indexOf("扫描") != -1) {
 							b = "<li>\
@@ -1457,14 +1452,16 @@ function getReloads() {
 						b = "<li>\
 								<div class='line-progress' style='width:" + h.msg.pre + "%'></div>\
 								<span class='titlename'>" + h.task[g].name + "<a style='margin-left:130px;'>" + (toSize(h.msg.used) + "/" + toSize(h.msg.total)) + "</a></span>\
-									<span class='com-progress'>" + h.msg.pre + "%</span>\
-									<span class='state'>下载中<img src='/static/img/ing.gif'> | <a href=\"javascript:removeTask(" + h.task[g].id + ")\">"+lan.public.close+"</a></span>\
+								<span class='com-progress'>" + h.msg.pre + "%</span>\
+								<span class='state'>下载中<img src='/static/img/ing.gif'> | <a href=\"javascript:removeTask(" + h.task[g].id + ")\">"+lan.public.close+"</a></span>\
 							</li>"
 					}
 				} else {
 					d += "<li><span class='titlename'>" + h.task[g].name + "</span><span class='state'>等待 | <a style='color:green' href=\"javascript:removeTask(" + h.task[g].id + ')">删除</a></span></li>'
 				}
 			}
+			$("#task").text(h.count);
+			$(".task_count").text(h.count);
 			$(".cmdlist").html(b + d);
 			$(".cmd").html(c);
 			try{
@@ -1530,7 +1527,7 @@ function tasklist(a){
 		}
 		
 		
-		$(".task_count").text(g.count);
+		// $(".task_count").text(g.count);
 		$(".cmdlist").html(b + c);
 		getReloads();
 		return f
diff --git a/web/thisdb/app.py b/web/thisdb/app.py
index a3c38e9d2..27fbd0e4e 100644
--- a/web/thisdb/app.py
+++ b/web/thisdb/app.py
@@ -40,6 +40,9 @@ def getAppList(page=1,size=10):
 def getAppById(aid):
     return mw.M('app').field(__FIELD).where("id=?", (aid,)).find()
 
+def getAppByAppId(app_id):
+    return mw.M('app').field(__FIELD).where("app_id=?", (app_id,)).find()
+
 def deleteAppById(aid):
     return mw.M('app').where("id=?", (aid,)).delete()
 

From 773bc41a121e9ac6e98614b21d05059c2455285f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 00:05:00 +0800
Subject: [PATCH 740/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index 77dbedd38..f197d944b 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.9
+APP_SMALL_VERSION = 0.10
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From 3db30b1298519780ec2facbd3ae53a2116ba0e58 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 00:14:53 +0800
Subject: [PATCH 741/965] Update __init__.py

---
 web/admin/task/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/task/__init__.py b/web/admin/task/__init__.py
index cd387a4fb..8bbd78887 100644
--- a/web/admin/task/__init__.py
+++ b/web/admin/task/__init__.py
@@ -23,7 +23,7 @@ import thisdb
 blueprint = Blueprint('task', __name__, url_prefix='/task', template_folder='../../templates/default')
 
 
-@blueprint.route('/count', endpoint='task_count')
+@blueprint.route('/count', endpoint='task_count',methods=['GET','POST'])
 @panel_login_required
 def task_count():
     return mw.returnData(True, 'ok',thisdb.getTaskUnexecutedCount())

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

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

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

From b34cf3fc867d2180f7ecbbd661f16a741b27f4ed Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 00:38:34 +0800
Subject: [PATCH 743/965] Update main.py

---
 web/utils/system/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/system/main.py b/web/utils/system/main.py
index fa2ccdf11..8ef66d4e5 100644
--- a/web/utils/system/main.py
+++ b/web/utils/system/main.py
@@ -17,7 +17,7 @@ import psutil
 
 import core.mw as mw
 
-def getEnvInfo(self):
+def getEnvInfo():
     data = {}
     data['status'] = True
     sdir = mw.getServerDir()

From db8f74f848d60acbfc4d7dc646abc1fe51b8a8f0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 01:26:26 +0800
Subject: [PATCH 744/965] update

---
 plugins/migration_api/index.html |  2 +-
 plugins/migration_api/js/app.js  |  8 +++++---
 web/admin/files/files.py         | 16 ++++++++++++++++
 web/utils/file.py                | 14 ++------------
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/plugins/migration_api/index.html b/plugins/migration_api/index.html
index 33fde7f05..43aef6660 100755
--- a/plugins/migration_api/index.html
+++ b/plugins/migration_api/index.html
@@ -237,7 +237,7 @@ label.checkbox_label span {
                 </div>
                 <div class="mtb20">
                     <span class="panel_setp_span">应用密钥</span>
-                    <input type="text" class="bt-input-text" name="sync_app_sercet" value="" placeholder="应用密钥" />
+                    <input type="text" class="bt-input-text" name="sync_app_secret" value="" placeholder="应用密钥" />
                     <a href="javascript:void();" target="_blank" class="btlink ml5">应用密钥</a>
                 </div>
                 <div class="mtb20">
diff --git a/plugins/migration_api/js/app.js b/plugins/migration_api/js/app.js
index 266b7f2ae..77e0dea68 100755
--- a/plugins/migration_api/js/app.js
+++ b/plugins/migration_api/js/app.js
@@ -92,8 +92,8 @@ function selectProgress(val){
 function initStep1(){
     var url = $('input[name="sync_url"]').val();
     var app_id = $('input[name="sync_app_id"]').val();
-    var app_sercet = $('input[name="sync_app_sercet"]').val();
-    maPost('step_one',{'url':url,'app_id':app_id,'app_sercet':app_sercet}, function(rdata){
+    var app_secret = $('input[name="sync_app_secret"]').val();
+    maPost('step_one',{'url':url,'app_id':app_id,'app_secret':app_secret}, function(rdata){
         var rdata = $.parseJSON(rdata.data);
         showMsg(rdata.msg,function(){
             if (rdata.status){
@@ -106,6 +106,7 @@ function initStep1(){
 function initStep2(){
     maPost('step_two',{}, function(rdata){
         var rdata = $.parseJSON(rdata.data);
+        console.log(rdata);
         showMsg(rdata.msg,function(){
             if (rdata.status){
                 selectProgress(2);
@@ -272,7 +273,8 @@ function initStep(){
     maPost('get_conf',{}, function(rdata){
         var rdata = $.parseJSON(rdata.data);
         $('input[name="sync_url"]').val(rdata.data['url']);
-        $('input[name="sync_token"]').val(rdata.data['token']);
+        $('input[name="sync_app_id"]').val(rdata.data['app_id']);
+        $('input[name="sync_app_secret"]').val(rdata.data['app_secret']);
     });
 
     $('.infoNext').click(function(){
diff --git a/web/admin/files/files.py b/web/admin/files/files.py
index 1e4f306cf..7e6f3edc6 100644
--- a/web/admin/files/files.py
+++ b/web/admin/files/files.py
@@ -165,6 +165,22 @@ def upload_file():
     mw.writeLog('文件管理', msg)
     return mw.returnData(True, '上传成功!')
 
+
+# 上传文件
+@blueprint.route('/upload_segment', endpoint='upload_segment', methods=['POST'])
+@panel_login_required
+def upload_segment():
+    path = request.form.get('path', '')
+    name = request.form.get('name', '')
+    size = request.form.get('size')
+    start = request.form.get('start')
+    dir_mode = request.form.get('dir_mode', '')
+    file_mode = request.form.get('file_mode', '')
+    b64_data = request.form.get('b64_data', '0')
+    upload_files = request.files.getlist("blob")
+    return file.uploadSegment(path,name,size,start,dir_mode,file_mode,b64_data,upload_files)
+
+
 # 修改文件名
 @blueprint.route('/mv_file', endpoint='mv_file', methods=['POST'])
 @panel_login_required
diff --git a/web/utils/file.py b/web/utils/file.py
index daa06bc8d..d96e307ae 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -18,15 +18,7 @@ import base64
 import core.mw as mw
 import thisdb
 
-def uploadSegment():
-    # 分段上传
-    path = request.form.get('path', '')
-    name = request.form.get('name', '')
-    size = request.form.get('size')
-    start = request.form.get('start')
-    dir_mode = request.form.get('dir_mode', '')
-    file_mode = request.form.get('file_mode', '')
-
+def uploadSegment(path,name,size,start,dir_mode,file_mode,b64_data,upload_files):
     if not mw.fileNameCheck(name):
         return mw.returnData(False, '文件名中不能包含特殊字符!')
 
@@ -50,12 +42,10 @@ def uploadSegment():
         return str(d_size)
 
     f = open(save_path, 'ab')
-    b64_data = request.form.get('b64_data', '0')
     if b64_data == '1':
-        b64_data = base64.b64decode(args.b64_data)
+        b64_data = base64.b64decode(b64_data)
         f.write(b64_data)
     else:
-        upload_files = request.files.getlist("blob")
         for tmp_f in upload_files:
             f.write(tmp_f.read())
 

From ebcd450f551ad7552c1a9339679831825b56a745 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 01:26:33 +0800
Subject: [PATCH 745/965] Update index.py

---
 plugins/migration_api/index.py | 126 +++++++++++++--------------------
 1 file changed, 50 insertions(+), 76 deletions(-)

diff --git a/plugins/migration_api/index.py b/plugins/migration_api/index.py
index 84d63c477..c0d71828c 100755
--- a/plugins/migration_api/index.py
+++ b/plugins/migration_api/index.py
@@ -8,6 +8,7 @@ import re
 import hashlib
 import json
 import subprocess
+import requests
 
 web_dir = os.getcwd() + "/web"
 if os.path.exists(web_dir):
@@ -22,8 +23,9 @@ if mw.isAppleSystem():
 
 
 class classApi:
-    __MW_KEY = 'app'
     __MW_PANEL = 'http://127.0.0.1:7200'
+    __MW_APP_ID = ''
+    __MW_APP_SECRET = ''
     __VHOST_PATH = ''
 
     _buff_size = 1024 * 1024 * 2
@@ -34,47 +36,27 @@ class classApi:
     _SYNC_INFO = None
 
     # 如果希望多台面板，可以在实例化对象时，将面板地址与密钥传入
-    def __init__(self, mw_panel=None, mw_key=None):
+    def __init__(self, mw_panel=None, app_id=None, app_secret=None):
         if mw_panel:
             self.__MW_PANEL = mw_panel
-            self.__MW_KEY = mw_key
-
-        import requests
-        if not self._REQUESTS:
-            self._REQUESTS = requests.session()
+            self.__MW_APP_ID = app_id
+            self.__MW_APP_SECRET = app_secret
 
         self._SPEED_FILE = getServerDir() + '/config/speed.json'
         self._INFO_FILE = getServerDir() + '/config/sync_info.json'
         self._SYNC_INFO = self.get_sync_info(None)
         self.__VHOST_PATH = mw.getServerDir() + '/web_conf'
 
-    # 计算MD5
-    def __get_md5(self, s):
-        m = hashlib.md5()
-        m.update(s.encode('utf-8'))
-        return m.hexdigest()
-
-    # 构造带有签名的关联数组
-    def __get_key_data(self):
-        now_time = int(time.time())
-        ready_data = {
-            'request_token': self.__get_md5(str(now_time) + '' + self.__get_md5(self.__MW_KEY)),
-            'request_time': now_time
-        }
-        return ready_data
-
-    def __http_post_cookie(self, url, p_data, timeout=1800):
+    def post(self, endpoint, request_data, timeout=60):
+        url = self.__MW_PANEL + endpoint  
+        post_data = requests.post(url, data=request_data, headers={
+            'app-id':self.__MW_APP_ID,
+            'app-secret':self.__MW_APP_SECRET
+        })
         try:
-            # print(url)
-            res = self._REQUESTS.post(url, p_data, timeout=timeout)
-            return res.text
-        except Exception as ex:
-            ex = str(ex)
-            if ex.find('Max retries exceeded with') != -1:
-                return mw.returnJson(False, '连接服务器失败!')
-            if ex.find('Read timed out') != -1 or ex.find('Connection aborted') != -1:
-                return mw.returnJson(False, '连接超时!')
-            return mw.returnJson(False, '连接服务器失败!')
+            return post_data.json()
+        except Exception as e:
+            return post_data.text
 
     def makeSyncInfo(self, args):
         data = {}
@@ -176,14 +158,11 @@ class classApi:
         return True
 
     def send(self, url, args, timeout=600):
-        url = self.__MW_PANEL + '/api' + url
-        post_data = self.__get_key_data()  # 取签名
-        post_data.update(args)
-        result = self.__http_post_cookie(url, post_data, timeout)
         try:
-            return json.loads(result)
-        except Exception as e:
+            result = self.post(url, args, timeout)
             return result
+        except Exception as e:
+            return str(e)
 
     def sendPlugins(self, name, func, args, timeout=36000):
         url = '/plugins/run'
@@ -225,7 +204,7 @@ class classApi:
         if not os.path.exists(sfile):
             write_log("|-指定目录不存在{}".format(sfile))
             return False
-        pdata = self.__get_key_data()
+
         pdata['name'] = os.path.basename(dfile)
         pdata['path'] = os.path.dirname(dfile)
         pdata['size'] = os.path.getsize(sfile)
@@ -407,10 +386,8 @@ class classApi:
         write_log("|-正在解压文件到目录[{}]...".format(dpath))
         self.write_speed('done', '正在解压')
 
-        self.send('/files/uncompress',
-                  {"sfile": zip_dst, "dfile": dpath, 'path': dpath})
-        self.send('/files/exec_shell',
-                  {"shell": "rm -f " + zip_dst, "path": "/www"}, 30)
+        self.send('/files/uncompress',{"sfile": zip_dst, "dfile": dpath, 'path': dpath})
+        self.send('/files/exec_shell',{"shell": "rm -f " + zip_dst, "path": "/www"}, 30)
         return True
 
     def state(self, stype, index, state, error=''):
@@ -506,20 +483,20 @@ class classApi:
             try:
                 self.state('sites', i, 1)
                 siteInfo = mw.M('sites').where('name=?', (site_name,)).field(
-                    'id,name,path,ps,status,edate,addtime').find()
+                    'id,name,path,ps,status,edate,add_time').find()
 
                 if not siteInfo:
                     err_msg = "指定站点[{}]不存在!".format(site_name)
                     self.state('sites', i, -1, err_msg)
                     self.error(err_msg)
                     continue
-                pid = siteInfo['id']
+                site_id = siteInfo['id']
 
                 siteInfo['port'] = mw.M('domain').where(
-                    'pid=? and name=?', (pid, site_name,)).getField('port')
+                    'pid=? and name=?', (site_id, site_name,)).getField('port')
 
                 siteInfo['domain'] = mw.M('domain').where(
-                    'pid=? and name!=?', (pid, site_name)).field('name,port').select()
+                    'pid=? and name!=?', (site_id, site_name)).field('name,port').select()
 
                 siteInfo['binding'] = mw.M('binding').where(
                     'pid=?', (id,)).field('domain,path,port').select()
@@ -559,21 +536,18 @@ class classApi:
 
         db.setPort(self.getDbPort(mtype))
         db.setSocket(self.getSocketFile(mtype))
-        pwd = self.getDbConn(mtype, 'config').where(
-            'id=?', (1,)).getField('mysql_root')
+        pwd = self.getDbConn(mtype, 'config').where('id=?', (1,)).getField('mysql_root')
         db.setPwd(pwd)
         return db
 
     def getDbList(self):
         conn = self.getDbConn()
-        alist = conn.field(
-            'id,name,username,password,ps').order("id desc").select()
+        alist = conn.field('id,name,username,password,ps').order("id desc").select()
         return alist
 
     def getDbInfo(self, name):
         conn = self.getDbConn()
-        info = conn.field(
-            'id,name,username,password,ps').where('name=?', (name,)).find()
+        info = conn.field('id,name,username,password,ps').where('name=?', (name,)).find()
         return info
 
     def mapToList(self, map_obj):
@@ -895,13 +869,13 @@ def getStepOneData():
 
 def stepOne():
     args = getArgs()
-    data = checkArgs(args, ['url', 'app_id','app_sercet'])
+    data = checkArgs(args, ['url', 'app_id','app_secret'])
     if not data[0]:
         return data[1]
 
     url = args['url']
     app_id = args['app_id']
-    app_sercet = args['app_sercet']
+    app_secret = args['app_secret']
 
     speed_file = getServerDir() + '/config/speed.json'
     if os.path.exists(speed_file):
@@ -911,17 +885,16 @@ def stepOne():
     if os.path.exists(sync_file):
         os.remove(sync_file)
 
-    api = classApi(url, token)
+    api = classApi(url, app_id, app_secret)
     # api =
     # classApi('http://127.0.0.1:7200','HfJNKGP5RPqGvhIOyrwpXG4A2fTjSh9B')
     rdata = api.send('/task/count', {})
-    if type(rdata) != int:
+    if not rdata['status']:
         return mw.returnJson(False, rdata['msg'])
     data = getCfgData()
-
     data['url'] = url
     data['app_id'] = app_id
-    data['app_sercet'] = app_sercet
+    data['app_secret'] = app_secret
     writeConf(data)
 
     return mw.returnJson(True, '验证成功')
@@ -929,44 +902,45 @@ def stepOne():
 
 # 获取本地服务器和环境配置
 def get_src_config(args):
-    serverInfo = {}
-    serverInfo['status'] = True
+    data = {}
+    data['status'] = True
     sdir = mw.getServerDir()
 
-    serverInfo['webserver'] = '未安装'
+    data['webserver'] = '未安装'
     if os.path.exists(sdir + '/openresty/nginx/sbin/nginx'):
-        serverInfo['webserver'] = 'OpenResty'
-    serverInfo['php'] = []
+        data['webserver'] = 'OpenResty'
+    data['php'] = []
     phpversions = ['52', '53', '54', '55', '56', '70', '71',
                    '72', '73', '74', '80', '81', '82', '83', '84']
     phpPath = sdir + '/php/'
     for pv in phpversions:
         if not os.path.exists(phpPath + pv + '/bin/php'):
             continue
-        serverInfo['php'].append(pv)
-    serverInfo['mysql'] = False
+        data['php'].append(pv)
+    data['mysql'] = False
     if os.path.exists(sdir + '/mysql/bin/mysql'):
-        serverInfo['mysql'] = True
+        data['mysql'] = True
     import psutil
     try:
         diskInfo = psutil.disk_usage('/www')
     except:
         diskInfo = psutil.disk_usage('/')
 
-    serverInfo['disk'] = mw.toSize(diskInfo[2])
-    return serverInfo
+    data['disk'] = mw.toSize(diskInfo[2])
+    return data
 
 
 def get_dst_config(args):
 
     data = getCfgData()
-    api = classApi(data['url'], data['token'])
+    api = classApi(data['url'], data['app_id'], data['app_secret'])
     disk = api.send('/system/disk_info', {})
     info = api.send('/system/get_env_info', {})
 
+    # print(disk)
+    # print(info)
     result = info['data']
-
-    result['disk'] = disk
+    result['disk'] = disk['data']
     return result
 
 
@@ -1018,7 +992,7 @@ def bgProcessRun():
     # demo_url = 'http://127.0.0.1:7200'
     # demo_key = 'HfJNKGP5RPqGvhIOyrwpXG4A2fTjSh9B'
     # api = classApi(demo_url, demo_key)
-    api = classApi(data['url'], data['token'])
+    api = classApi(data['url'], data['app_id'], data['app_secret'])
     api.run()
     return ''
 
@@ -1039,7 +1013,7 @@ def stepFour():
         'sites': sites.strip(',').split(','),
         'databases': databases.strip(',').split(',')
     }
-    api = classApi(data['url'], data['token'])
+    api = classApi(data['url'], data['app_id'],data['app_secret'])
     return api.set_sync_info(args)
 
 
@@ -1059,7 +1033,7 @@ def getSpeed():
     except:
         return mw.returnJson(False, '正在准备..')
     data = getCfgData()
-    api = classApi(data['url'], data['token'])
+    api = classApi(data['url'], data['app_id'], data['app_secret'])
     sync_info = api.get_sync_info(None)
     speed_info['all_total'] = sync_info['total']
     speed_info['all_speed'] = sync_info['speed']

From 3504ca24f29d7faf0268361857be9f9ee5ffa7ef Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 01:26:36 +0800
Subject: [PATCH 746/965] Update mw_api.py

---
 web/misc/test/api/mw_api.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/misc/test/api/mw_api.py b/web/misc/test/api/mw_api.py
index 9c490e01f..b78a5e073 100755
--- a/web/misc/test/api/mw_api.py
+++ b/web/misc/test/api/mw_api.py
@@ -18,9 +18,9 @@ import json
 
 
 class mwApi:
-    __MW_PANEL = 'http://127.0.0.1:64307'
-    __MW_APP_ID = 'hC6XArWzRY'
-    __MW_APP_SERECT = 'NSGaFhMWyaN5Yi3ftTkZ'
+    __MW_PANEL = 'http://154.12.53.90:51377/'
+    __MW_APP_ID = 'yhYkxGssPD'
+    __MW_APP_SERECT = 'ErmBdr563eJ5GMM5sWbc'
     
     # 如果希望多台面板，可以在实例化对象时，将面板地址与密钥传入
     def __init__(self, panel_url=None, app_id=None, app_serect=None):
@@ -42,7 +42,7 @@ class mwApi:
             return post_data.text
     # 取面板日志
     def getLogs(self):
-        result = self.post('/logs/get_log_list',{'limit':10,'p':1})
+        result = self.post('/task/count',{'limit':10,'p':1})
         return result
 
 

From 2a60cd981d67977c8dca7bbd8ad0370aa497e965 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 01:37:00 +0800
Subject: [PATCH 747/965] Update index.py

---
 plugins/migration_api/index.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/migration_api/index.py b/plugins/migration_api/index.py
index c0d71828c..e4e244f52 100755
--- a/plugins/migration_api/index.py
+++ b/plugins/migration_api/index.py
@@ -256,9 +256,11 @@ class classApi:
             start_time = time.time()
 
             try:
-                url = self.__MW_PANEL + '/api/files/upload_segment'
-                res = self._REQUESTS.post(
-                    url, data=pdata, files=files, timeout=30000)
+                url = self.__MW_PANEL + '/files/upload_segment'
+                res = self._REQUESTS.post(url, data=pdata, files=files, headers={
+                    'app-id':self.__MW_APP_ID,
+                    'app-secret':self.__MW_APP_SECRET
+                },timeout=30000)
 
                 success_num += 1
                 err_num = 0

From f338d8bd8ea468c752e5313c16233a381cf72056 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 01:54:30 +0800
Subject: [PATCH 748/965] Update index.py

---
 plugins/migration_api/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/migration_api/index.py b/plugins/migration_api/index.py
index e4e244f52..7bdd67ac0 100755
--- a/plugins/migration_api/index.py
+++ b/plugins/migration_api/index.py
@@ -204,7 +204,7 @@ class classApi:
         if not os.path.exists(sfile):
             write_log("|-指定目录不存在{}".format(sfile))
             return False
-
+        pdata = {}
         pdata['name'] = os.path.basename(dfile)
         pdata['path'] = os.path.dirname(dfile)
         pdata['size'] = os.path.getsize(sfile)

From 869a321c145865aececc0cdffe12eda49e72de16 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 01:57:01 +0800
Subject: [PATCH 749/965] Update index.py

---
 plugins/migration_api/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/migration_api/index.py b/plugins/migration_api/index.py
index 7bdd67ac0..19e200d81 100755
--- a/plugins/migration_api/index.py
+++ b/plugins/migration_api/index.py
@@ -257,7 +257,7 @@ class classApi:
 
             try:
                 url = self.__MW_PANEL + '/files/upload_segment'
-                res = self._REQUESTS.post(url, data=pdata, files=files, headers={
+                res = requests.post(url, data=pdata, files=files, headers={
                     'app-id':self.__MW_APP_ID,
                     'app-secret':self.__MW_APP_SECRET
                 },timeout=30000)

From 79ed3f3a4c47e5d2140d5919c38d95976a0e02ca Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 01:57:14 +0800
Subject: [PATCH 750/965] Update index.py

---
 plugins/migration_api/index.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/migration_api/index.py b/plugins/migration_api/index.py
index 19e200d81..8fa03268e 100755
--- a/plugins/migration_api/index.py
+++ b/plugins/migration_api/index.py
@@ -30,7 +30,6 @@ class classApi:
 
     _buff_size = 1024 * 1024 * 2
 
-    _REQUESTS = None
     _SPEED_FILE = None
     _INFO_FILE = None
     _SYNC_INFO = None

From 0f97e0db44b6c4a4fa574b34ced492ccc94e8a52 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 02:20:18 +0800
Subject: [PATCH 751/965] Update install.sh

---
 plugins/migration_api/install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/migration_api/install.sh b/plugins/migration_api/install.sh
index a60523ca2..3be897541 100755
--- a/plugins/migration_api/install.sh
+++ b/plugins/migration_api/install.sh
@@ -9,6 +9,8 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 
+# cd /www/server/mdserver-web && source bin/activate && python3 plugins/migration_api/index.py bg_process
+
 VERSION=1.0
 
 Install_App(){

From 0e5f3bc23be7087a23e31a9a1b547ba8a7e3ae92 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 02:33:56 +0800
Subject: [PATCH 752/965] Update file.py

---
 web/utils/file.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/file.py b/web/utils/file.py
index d96e307ae..71eb5ff0f 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -39,7 +39,7 @@ def uploadSegment(path,name,size,start,dir_mode,file_mode,b64_data,upload_files)
         d_size = os.path.getsize(save_path)
 
     if d_size != int(start):
-        return str(d_size)
+        return mw.returnData(True, 'size', d_size)
 
     f = open(save_path, 'ab')
     if b64_data == '1':

From a30d68a3d9a0020b8f4d61de5aadf42a68b8c2d1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 03:07:01 +0800
Subject: [PATCH 753/965] Update file.py

---
 web/utils/file.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/file.py b/web/utils/file.py
index 71eb5ff0f..c2169ffd6 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -52,7 +52,7 @@ def uploadSegment(path,name,size,start,dir_mode,file_mode,b64_data,upload_files)
     f.close()
     f_size = os.path.getsize(save_path)
     if f_size != int(size):
-        return str(f_size)
+        return mw.returnData(True, 'size', f_size)
 
     new_name = os.path.join(path, name)
     if os.path.exists(new_name):

From 44f5f7f270b3e3099efa3bbe1f574c0fc280b505 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 03:11:35 +0800
Subject: [PATCH 754/965] Update file.py

---
 web/utils/file.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/file.py b/web/utils/file.py
index c2169ffd6..2ecf122db 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -77,7 +77,7 @@ def uploadSegment(path,name,size,start,dir_mode,file_mode,b64_data,upload_files)
 
     msg = mw.getInfo('上传文件[{1}] 到 [{2}]成功!', (new_name, path))
     mw.writeLog('文件管理', msg)
-    return mw.returnData(True, '上传成功!')
+    return mw.returnData(True, '上传成功!', f_size)
 
 
 def mvFile(sfile, dfile):

From face89efc5bed48a2c3e1d6c64b995e65618c6fe Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 03:15:12 +0800
Subject: [PATCH 755/965] Update file.py

---
 web/utils/file.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/file.py b/web/utils/file.py
index 2ecf122db..582898353 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -73,7 +73,7 @@ def uploadSegment(path,name,size,start,dir_mode,file_mode,b64_data,upload_files)
         mw.setMode(new_name, mode_tmp2[0])
         mw.setOwn(new_name, mode_tmp2[1])
     else:
-        mw.setMode(new_name)
+        setMode(new_name)
 
     msg = mw.getInfo('上传文件[{1}] 到 [{2}]成功!', (new_name, path))
     mw.writeLog('文件管理', msg)

From f1478369b5a13add3f1902252c9408a77be590a6 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 03:28:06 +0800
Subject: [PATCH 756/965] Update index.py

---
 plugins/migration_api/index.py | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/plugins/migration_api/index.py b/plugins/migration_api/index.py
index 8fa03268e..11521d95f 100755
--- a/plugins/migration_api/index.py
+++ b/plugins/migration_api/index.py
@@ -244,8 +244,7 @@ class classApi:
         self.write_speed('size', pdata['size'])
         self.write_speed('used', 0)
         self.write_speed('speed', 0)
-        write_log("|-上传文件[{}], 总大小：{}, 当前分片大小为：{}".format(pdata['name'],
-                                                          toSize(pdata['size']), toSize(self._buff_size)))
+        write_log("|-上传文件[{}], 总大小：{}, 当前分片大小为：{}".format(pdata['name'], toSize(pdata['size']), toSize(self._buff_size)))
         while True:
             buff_size = self._buff_size
             max_buff = int(pdata['size'] - pdata['start'])
@@ -269,8 +268,7 @@ class classApi:
                     success_num = up_buff_num - 3  # 如再顺利发送3次则继续提升分片大小
                     if self._buff_size > max_buff_size:
                         self._buff_size = max_buff_size
-                    write_log(
-                        "|-发送顺利, 尝试调整分片大小为: {}".format(toSize(self._buff_size)))
+                    write_log("|-发送顺利, 尝试调整分片大小为: {}".format(toSize(self._buff_size)))
             except Exception as e:
                 times = time.time() - start_time
                 total_time += times
@@ -301,7 +299,7 @@ class classApi:
             times = time.time() - start_time
             total_time += times
 
-            if type(result) == int:
+            if result['status'] and result['msg'] == 'size':
                 if result == split_done:
                     split_num += 1
                 else:
@@ -310,14 +308,14 @@ class classApi:
                 if split_num > 10:
                     write_log("|-上传失败, 跳过本次上传任务")
                     return False
-                if result > pdata['size']:
+                if result['data'] > pdata['size']:
                     write_log("|-上传失败, 跳过本次上传任务")
                     return False
                 self.write_speed('used', result)
                 self.write_speed('speed', int(buff_size / times))
-                write_log("|-已上传 {},上传速度 {}/s, 共用时 {}分{:.2f}秒,  {:.2f}%".format(toSize(float(result)), toSize(
-                    buff_size / times), int(total_time // 60), total_time % 60, (float(result) / float(pdata['size']) * 100)))
-                pdata['start'] = result  # 设置断点
+                write_log("|-已上传 {},上传速度 {}/s, 共用时 {}分{:.2f}秒,  {:.2f}%".format(toSize(result['data']), toSize(
+                    buff_size / times), int(total_time // 60), total_time % 60, (float(result['data']) / float(pdata['size']) * 100)))
+                pdata['start'] = result['data']  # 设置断点
             else:
                 if not result['status']:  # 如果服务器响应上传失败
                     write_log(result['msg'])
@@ -332,8 +330,7 @@ class classApi:
 
         self.write_speed('total_size', pdata['size'])
         self.write_speed('end_time', int(time.time()))
-        write_log("|-总耗时：{} 分钟, {:.2f} 秒, 平均速度：{}/s".format(int(total_time //
-                                                                60), total_time % 60, toSize(pdata['size'] / total_time)))
+        write_log("|-总耗时：{} 分钟, {:.2f} 秒, 平均速度：{}/s".format(int(total_time // 60), total_time % 60, toSize(pdata['size'] / total_time)))
         return True
 
     def send_list(self, s_files):
@@ -369,8 +366,7 @@ class classApi:
         write_log("|-正在压缩目录[{}]...".format(spath))
         self.write_speed('done', '正在压缩')
 
-        mw.execShell(
-            "cd {} && tar zcvf {} ./ > /dev/null".format(spath, zip_file))
+        mw.execShell("cd {} && tar zcvf {} ./ > /dev/null".format(spath, zip_file))
         if not os.path.exists(zip_file):
             self.error("目录[{}]打包失败!".format(spath))
             return False
@@ -662,7 +658,7 @@ class classApi:
 
     def export_database(self, name, index):
         self.write_speed('done', '正在导出数据库')
-        write_log("|-正在导出数据库{}...".format(name))
+        write_log("|-正在导出数据库[{}]...".format(name))
         conn = self.getMyConn()
         result = conn.execute("show databases")
         isError = self.isSqlError(result)
@@ -724,18 +720,14 @@ class classApi:
         db_dir = '/www/backup/import'
         new_db_name = 'psync_import_{}.sql.gz'.format(dbInfo['name'])
         upload_file = db_dir + '/' + new_db_name
-        self.send('/files/exec_shell',
-                  {"shell": "rm -f " + upload_file, "path": "/www"}, 30)
+        self.send('/files/exec_shell', {"shell": "rm -f " + upload_file, "path": "/www"}, 30)
 
         if self.upload_file(filename, upload_file):
             self.write_speed('done', '正在导入数据库')
             write_log("|-正在导入数据库{}...".format(dbInfo['name']))
 
-            t = self.sendPlugins('mysql', 'import_db_external', {
-                "file": new_db_name, "name": dbInfo['name']})
-            # print(t)
-            self.send('/files/exec_shell',
-                      {"shell": "rm -f " + upload_file, "path": "/www"}, 30)
+            self.sendPlugins('mysql', 'import_db_external', {"file": new_db_name, "name": dbInfo['name']})
+            self.send('/files/exec_shell',{"shell": "rm -f " + upload_file, "path": "/www"}, 30)
             return True
         self.state('databases', index, -1, "数据传输失败")
         return False

From d18952a72e4b6dbfc5ca935df2e2e9fe78adb442 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 03:57:56 +0800
Subject: [PATCH 757/965] Update index.py

---
 plugins/migration_api/index.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/migration_api/index.py b/plugins/migration_api/index.py
index 11521d95f..ebec628ed 100755
--- a/plugins/migration_api/index.py
+++ b/plugins/migration_api/index.py
@@ -1021,18 +1021,18 @@ def getSpeed():
     path = getServerDir() + '/config/speed.json'
     if not os.path.exists(path):
         return mw.returnJson(False, '正在准备..')
+
     try:
         speed_info = json.loads(mw.readFile(path))
-    except:
-        return mw.returnJson(False, '正在准备..')
+    except Exception as e:
+        return mw.returnJson(True, str(e)+'...')
     data = getCfgData()
     api = classApi(data['url'], data['app_id'], data['app_secret'])
     sync_info = api.get_sync_info(None)
     speed_info['all_total'] = sync_info['total']
     speed_info['all_speed'] = sync_info['speed']
     speed_info['total_time'] = speed_info['end_time'] - speed_info['time']
-    speed_info['total_time'] = str(int(speed_info[
-        'total_time'] // 60)) + "分" + str(int(speed_info['total_time'] % 60)) + "秒"
+    speed_info['total_time'] = str(int(speed_info['total_time'] // 60)) + "分" + str(int(speed_info['total_time'] % 60)) + "秒"
     log_file = getServerDir() + '/sync.log'
     speed_info['log'] = mw.execShell("tail -n 10 {}".format(log_file))[0]
     speed_info['log_file'] = log_file

From 384419fa30ad493d851428c64db9dbfd06ae3a71 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 04:24:46 +0800
Subject: [PATCH 758/965] Update app.js

---
 plugins/migration_api/js/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/migration_api/js/app.js b/plugins/migration_api/js/app.js
index 77e0dea68..5e059dcb7 100755
--- a/plugins/migration_api/js/app.js
+++ b/plugins/migration_api/js/app.js
@@ -249,7 +249,7 @@ function initStep4(){
         var progress = '<div style="margin: 0 40px;">\
             <div class="line">\
                 <div style="text-align:left"><span class="action">--</span>\
-                <span style="margin-left: 20px;" class="done">当前: --</span><img src="/static/img/ing.gif"><a style="position: absolute;right: 40px;" class="btlink psync_close" onclick="migrate.close();">[取消]</a></div>\
+                <span style="margin-left: 20px;" class="done">当前: --</span><img src="/static/img/ing.gif"><a style="position: absolute;right: 40px;" class="btlink psync_close">[取消]</a></div>\
                 <div class="bt-progress" style="border-radius:0;height:20px;line-height:19px">\
                     <div class="bt-progress-bar progress_info_bar" style="border-radius: 0px; height: 20px; width: 0%;">\
                         <span class="bt-progress-text progress_info"></span></div>\

From 5238d8f263abc79febcf5ed45d1e5ec53eec2214 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 15:11:43 +0800
Subject: [PATCH 759/965] Update pathinfo.conf

---
 plugins/php/conf/pathinfo.conf | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/php/conf/pathinfo.conf b/plugins/php/conf/pathinfo.conf
index 47b573684..fc5ad5219 100644
--- a/plugins/php/conf/pathinfo.conf
+++ b/plugins/php/conf/pathinfo.conf
@@ -5,4 +5,7 @@ if ($fastcgi_script_name ~ "^(.+?\.php)(/.+)$") {
  }
 fastcgi_param SCRIPT_FILENAME $document_root$real_script_name;
 fastcgi_param SCRIPT_NAME $real_script_name;
-fastcgi_param PATH_INFO $path_info;
\ No newline at end of file
+fastcgi_param PATH_INFO $path_info;
+
+#修复http3不传HOST问题
+fastcgi_param HTTP_HOST $host;
\ No newline at end of file

From b963302a969ecddc385200f7a65a9d302176ea2f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 15:24:41 +0800
Subject: [PATCH 760/965] Update push_ad.py

---
 plugins/tgbot/startup/extend/push_ad.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/tgbot/startup/extend/push_ad.py b/plugins/tgbot/startup/extend/push_ad.py
index d0c0d7f52..38a51329e 100644
--- a/plugins/tgbot/startup/extend/push_ad.py
+++ b/plugins/tgbot/startup/extend/push_ad.py
@@ -47,7 +47,7 @@ def send_msg(bot, tag='ad', trigger_time=300):
 
     # https://t.me/gjgzs2022 ｜ 22/m | @GJ_gzs
     # https://zhaoziyuan1.cc | web | 15/m | 2m | next,12/15 ｜ @baleite
-    # 综合包网/NG接口开户 | 28/m | 6m | next,10/28 | @aabbcx888
+    # 综合包网/NG接口开户 | 28/m | 6m | next,4/28 | x
     # 实名认证/过人脸🕵️‍♀️各种账号处理✅ | 30/m| next,12/30 | @nngzs
     # 桃花资源采集| 13/m| next,1/13 | @xiaolizi1122
     keyboard = [

From be83c2c3bb7a5d76e7e8847fefb40b53e2bd2366 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 16:58:37 +0800
Subject: [PATCH 761/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index f197d944b..ba9d39046 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.10
+APP_SMALL_VERSION = 0.11
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From 34551409d9e08b74686e468580be5cf930063941 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 17:44:23 +0800
Subject: [PATCH 762/965] Update version.py

---
 web/version.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/version.py b/web/version.py
index ba9d39046..4bd85afda 100644
--- a/web/version.py
+++ b/web/version.py
@@ -12,8 +12,8 @@
 
 # 应用程序版本号组件
 APP_RELEASE = 0
-APP_REVISION = 18
-APP_SMALL_VERSION = 0.11
+APP_REVISION = 17
+APP_SMALL_VERSION = 2
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From a3d231f619b06e9a8fe97e24d0e391e5f4593288 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 17:58:16 +0800
Subject: [PATCH 763/965] update

---
 web/utils/system/__init__.py |   4 +-
 web/utils/system/update.py   | 152 +++++++++++++++++++++++++++++++++++
 2 files changed, 155 insertions(+), 1 deletion(-)
 create mode 100644 web/utils/system/update.py

diff --git a/web/utils/system/__init__.py b/web/utils/system/__init__.py
index d631fb713..b73ae550e 100644
--- a/web/utils/system/__init__.py
+++ b/web/utils/system/__init__.py
@@ -11,4 +11,6 @@
 from .main import *
 from .query import *
 from .stats import *
-from .monitor import monitor
\ No newline at end of file
+from .monitor import monitor
+
+from .update import *
\ No newline at end of file
diff --git a/web/utils/system/update.py b/web/utils/system/update.py
new file mode 100644
index 000000000..5d9c779e6
--- /dev/null
+++ b/web/utils/system/update.py
@@ -0,0 +1,152 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+import os
+import sys
+import re
+import time
+import math
+import psutil
+
+import core.mw as mw
+
+def versionDiff(old, new):
+    '''
+        test 测试
+        new 有新版本
+        none 没有新版本
+    '''
+    new_list = new.split('.')
+    if len(new_list) > 3:
+        return 'test'
+
+    old_list = old.split('.')
+    ret = 'none'
+
+    isHasNew = True
+    if int(new_list[0]) == int(old_list[0]) and int(new_list[1]) == int(old_list[1]) and int(new_list[2]) == int(old_list[2]):
+        isHasNew = False
+
+    if isHasNew:
+        return 'new'
+    return ret
+
+def getServerInfo():
+    import urllib.request
+    import ssl
+    upAddr = 'https://api.github.com/repos/midoks/mdserver-web/releases/latest'
+    try:
+        context = ssl._create_unverified_context()
+        req = urllib.request.urlopen(upAddr, context=context, timeout=3)
+        result = req.read().decode('utf-8')
+        version = json.loads(result)
+        return version
+    except Exception as e:
+        print(str(e))
+        return None
+    return None
+
+def updateServer(self, stype, version=''):
+    import config
+    # 更新服务
+    try:
+        if not mw.isRestart():
+            return mw.returnData(False, '请等待所有安装任务完成再执行!')
+
+        version_new_info = getServerInfo()
+        if version_new_info is None:
+            return mw.returnData(False, '服务器数据或网络有问题!')
+
+        version_now = config.APP_VERSION
+        new_ver = version_new_info['name']
+        if stype == 'check':
+            diff = versionDiff(version_now, new_ver)
+            if diff == 'new':
+                return mw.returnData(True, '有新版本!', new_ver)
+            elif diff == 'test':
+                return mw.returnData(True, '有测试版本!', new_ver)
+            else:
+                return mw.returnData(False, '已经是最新,无需更新!')
+
+        if stype == 'info':
+            diff = versionDiff(version_now, new_ver)
+            data = {}
+            data['version'] = new_ver
+            data['content'] = version_new_info['body'].replace("\n", "<br/>")
+            return mw.returnData(True, '更新信息!', data)
+
+        if stype == 'update':
+            if version == '':
+                return mw.returnData(False, '缺少版本信息!')
+
+            if new_ver != version:
+                return mw.returnData(False, '更新失败,请重试!')
+
+            toPath = mw.getPanelDir() + '/temp'
+            if not os.path.exists(toPath):
+                mw.execShell('mkdir -p ' + toPath)
+
+            newUrl = "https://github.com/midoks/mdserver-web/archive/refs/tags/" + version + ".zip"
+
+            dist_mw = toPath + '/mw.zip'
+            if not os.path.exists(dist_mw):
+                mw.execShell('wget --no-check-certificate -O ' + dist_mw + ' ' + newUrl)
+
+            dist_to = toPath + "/mdserver-web-" + version
+            if not os.path.exists(dist_to):
+                os.system('unzip -o ' + toPath + '/mw.zip' + ' -d ' + toPath)
+
+            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')
+
+            update_env = '''
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+
+P_VER=`python3 -V | awk '{print $2}'`
+
+if [ ! -f /www/server/mdserver-web/bin/activate ];then
+cd /www/server/mdserver-web && python3 -m venv .
+cd /www/server/mdserver-web && source /www/server/mdserver-web/bin/activate
+else
+cd /www/server/mdserver-web && source /www/server/mdserver-web/bin/activate
+fi
+
+cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
+PIPSRC="https://pypi.python.org/simple"
+if [ ! -z "$cn" ];then
+PIPSRC="https://pypi.tuna.tsinghua.edu.cn/simple"
+fi
+
+cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt -i $PIPSRC
+
+P_VER_D=`echo "$P_VER"|awk -F '.' '{print $1}'`
+P_VER_M=`echo "$P_VER"|awk -F '.' '{print $2}'`
+NEW_P_VER=${P_VER_D}.${P_VER_M}
+
+if [ -f /www/server/mdserver-web/version/r${NEW_P_VER}.txt ];then
+cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/version/r${NEW_P_VER}.txt -i $PIPSRC
+fi
+'''
+            os.system(update_env)
+            mw.restartMw()
+            return mw.returnData(True, '安装更新成功!')
+
+        return mw.returnData(False, '已经是最新,无需更新!')
+    except Exception as ex:
+        # print('updateServer', ex)
+        return mw.returnData(False, "连接服务器失败!" + str(ex))
+
+
+
+

From 2cdb62cbd32a6f8b09ada7b07ffe018ad8f4e29f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 18:03:37 +0800
Subject: [PATCH 764/965] update

---
 web/admin/system/upgrade.py | 4 ++--
 web/utils/system/update.py  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/admin/system/upgrade.py b/web/admin/system/upgrade.py
index cd8b29d38..eeb6a192f 100644
--- a/web/admin/system/upgrade.py
+++ b/web/admin/system/upgrade.py
@@ -25,8 +25,8 @@ from .system import blueprint
 def update_server():
     panel_type = request.args.get('type', 'check')
     version = request.args.get('version', '')
-
-    return mw.returnData(False, '已经是最新,无需更新!')
+    return sys.updateServer(panel_type, version)
+    # return mw.returnData(False, '已经是最新,无需更新!')
 
 
 
diff --git a/web/utils/system/update.py b/web/utils/system/update.py
index 5d9c779e6..3d91e7fde 100644
--- a/web/utils/system/update.py
+++ b/web/utils/system/update.py
@@ -14,6 +14,7 @@ import re
 import time
 import math
 import psutil
+import json
 
 import core.mw as mw
 
@@ -53,7 +54,7 @@ def getServerInfo():
         return None
     return None
 
-def updateServer(self, stype, version=''):
+def updateServer(stype, version=''):
     import config
     # 更新服务
     try:

From fb3404e92f437ba1aead1ad5d90864a799c2bbf1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 18:06:54 +0800
Subject: [PATCH 765/965] Update upgrade.py

---
 web/admin/system/upgrade.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/admin/system/upgrade.py b/web/admin/system/upgrade.py
index eeb6a192f..9418027f7 100644
--- a/web/admin/system/upgrade.py
+++ b/web/admin/system/upgrade.py
@@ -26,7 +26,6 @@ def update_server():
     panel_type = request.args.get('type', 'check')
     version = request.args.get('version', '')
     return sys.updateServer(panel_type, version)
-    # return mw.returnData(False, '已经是最新,无需更新!')
 
 
 

From 4d2793d4dc8036e32979afa2e03f3d93fcf6f4d0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 18:07:10 +0800
Subject: [PATCH 766/965] Update version.py

---
 web/version.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/version.py b/web/version.py
index 4bd85afda..daf9f2951 100644
--- a/web/version.py
+++ b/web/version.py
@@ -12,8 +12,8 @@
 
 # 应用程序版本号组件
 APP_RELEASE = 0
-APP_REVISION = 17
-APP_SMALL_VERSION = 2
+APP_REVISION = 18
+APP_SMALL_VERSION = 0.13
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From d37f651f232abca59bf6e1f371281e85beecf5be Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 00:37:33 +0800
Subject: [PATCH 767/965] Update readline.sh

---
 plugins/php/versions/common/readline.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/php/versions/common/readline.sh b/plugins/php/versions/common/readline.sh
index 0c9554019..653f3a6b4 100755
--- a/plugins/php/versions/common/readline.sh
+++ b/plugins/php/versions/common/readline.sh
@@ -2,7 +2,7 @@
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
 export PATH=$PATH:/opt/homebrew/bin
 
-# cd /www/server/mdserver-web/plugins/php/versions/common && bash readline.sh install 54
+# cd /www/server/mdserver-web/plugins/php/versions/common && bash readline.sh install 81
 
 curPath=`pwd`
 
@@ -63,6 +63,7 @@ Install_lib()
 			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
 		fi
 
+		export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${serverPath}/lib/pkgconfig
 		if [ "$sysName" == "Darwin" ];then
 			cd ${rootPath}/plugins/php/lib && /bin/bash libedit.sh
 			OPTIONS="$OPTIONS --with-libedit=${serverPath}/lib/libedit"

From f45dd1bbf51d1af76114afed0b0c2111a9a7420c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 01:10:51 +0800
Subject: [PATCH 768/965] Update readline.sh

---
 plugins/php/versions/common/readline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/php/versions/common/readline.sh b/plugins/php/versions/common/readline.sh
index 653f3a6b4..ae28ed1a7 100755
--- a/plugins/php/versions/common/readline.sh
+++ b/plugins/php/versions/common/readline.sh
@@ -63,7 +63,7 @@ Install_lib()
 			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
 		fi
 
-		export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${serverPath}/lib/pkgconfig
+		export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${serverPath}/lib/libedit/lib/pkgconfig
 		if [ "$sysName" == "Darwin" ];then
 			cd ${rootPath}/plugins/php/lib && /bin/bash libedit.sh
 			OPTIONS="$OPTIONS --with-libedit=${serverPath}/lib/libedit"

From e480582fcf508fccc9db2aa33f427802c130bd03 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 01:11:43 +0800
Subject: [PATCH 769/965] Update readline.sh

---
 plugins/php/versions/common/readline.sh | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/plugins/php/versions/common/readline.sh b/plugins/php/versions/common/readline.sh
index ae28ed1a7..422729cd8 100755
--- a/plugins/php/versions/common/readline.sh
+++ b/plugins/php/versions/common/readline.sh
@@ -63,15 +63,10 @@ Install_lib()
 			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
 		fi
 
+		cd ${rootPath}/plugins/php/lib && /bin/bash libedit.sh
 		export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${serverPath}/lib/libedit/lib/pkgconfig
-		if [ "$sysName" == "Darwin" ];then
-			cd ${rootPath}/plugins/php/lib && /bin/bash libedit.sh
-			OPTIONS="$OPTIONS --with-libedit=${serverPath}/lib/libedit"
-		else
-			cd ${rootPath}/plugins/php/lib && /bin/bash libedit.sh
-			OPTIONS="$OPTIONS --with-libedit=${serverPath}/lib/libedit"
-		fi
-
+		OPTIONS="$OPTIONS --with-libedit=${serverPath}/lib/libedit"
+		
 		cd $sourcePath/php${version}/ext/${LIBNAME}
 		$serverPath/php/$version/bin/phpize
 		./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS

From f63e375b13a5fccde7bb0fd9aa330a83996b049e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 01:54:12 +0800
Subject: [PATCH 770/965] update

---
 plugins/mysql-apt/scripts/backup.py | 31 +++++++++++------------------
 plugins/mysql-yum/scripts/backup.py | 28 ++++++++++----------------
 2 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/plugins/mysql-apt/scripts/backup.py b/plugins/mysql-apt/scripts/backup.py
index 55603de19..a058e5d23 100755
--- a/plugins/mysql-apt/scripts/backup.py
+++ b/plugins/mysql-apt/scripts/backup.py
@@ -5,22 +5,19 @@
 
 import sys
 import os
+import time
+import re
 
 if sys.platform != 'darwin':
     os.chdir('/www/server/mdserver-web')
 
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
-chdir = os.getcwd()
-sys.path.append(chdir + '/class/core')
-
-# reload(sys)
-# sys.setdefaultencoding('utf-8')
-
-
-import mw
-import db
-import time
-import re
+import core.mw as mw
+import core.db as db
 
 '''
 DEBUG:
@@ -82,11 +79,9 @@ class backupTools:
 
         endDate = time.strftime('%Y/%m/%d %X', time.localtime())
         outTime = time.time() - startTime
-        pid = mw.M('databases').dbPos(db_path, db_name).where(
-            'name=?', (name,)).getField('id')
+        pid = mw.M('databases').dbPos(db_path, db_name).where('name=?', (name,)).getField('id')
 
-        mw.M('backup').add('type,name,pid,filename,addtime,size', (1, os.path.basename(
-            filename), pid, filename, endDate, os.path.getsize(filename)))
+        mw.M('backup').add('type,name,pid,filename,add_time,size', (1, os.path.basename(filename), pid, filename, endDate, os.path.getsize(filename)))
         log = "数据库[" + name + "]备份成功,用时[" + str(round(outTime, 2)) + "]秒"
         mw.writeLog('计划任务', log)
         print("★[" + endDate + "] " + log)
@@ -94,8 +89,7 @@ class backupTools:
         print("|---文件名:" + filename)
 
         # 清理多余备份
-        backups = mw.M('backup').where(
-            'type=? and pid=?', ('1', pid)).field('id,filename').select()
+        backups = mw.M('backup').where('type=? and pid=?', ('1', pid)).field('id,filename').select()
 
         num = len(backups) - int(count)
         if num > 0:
@@ -110,8 +104,7 @@ class backupTools:
     def backupDatabaseAll(self, save):
         db_path = mw.getServerDir() + '/mysql-apt'
         db_name = 'mysql'
-        databases = mw.M('databases').dbPos(
-            db_path, db_name).field('name').select()
+        databases = mw.M('databases').dbPos(db_path, db_name).field('name').select()
         for database in databases:
             self.backupDatabase(database['name'], save)
 
diff --git a/plugins/mysql-yum/scripts/backup.py b/plugins/mysql-yum/scripts/backup.py
index e958f182b..d18caf8e6 100755
--- a/plugins/mysql-yum/scripts/backup.py
+++ b/plugins/mysql-yum/scripts/backup.py
@@ -5,22 +5,20 @@
 
 import sys
 import os
+import time
+import re
 
 if sys.platform != 'darwin':
     os.chdir('/www/server/mdserver-web')
 
 
-chdir = os.getcwd()
-sys.path.append(chdir + '/class/core')
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
-# reload(sys)
-# sys.setdefaultencoding('utf-8')
-
-
-import mw
-import db
-import time
-import re
+import core.mw as mw
+import core.db as db
 
 '''
 DEBUG:
@@ -80,11 +78,9 @@ class backupTools:
 
         endDate = time.strftime('%Y/%m/%d %X', time.localtime())
         outTime = time.time() - startTime
-        pid = mw.M('databases').dbPos(db_path, db_name).where(
-            'name=?', (name,)).getField('id')
+        pid = mw.M('databases').dbPos(db_path, db_name).where('name=?', (name,)).getField('id')
 
-        mw.M('backup').add('type,name,pid,filename,addtime,size', (1, os.path.basename(
-            filename), pid, filename, endDate, os.path.getsize(filename)))
+        mw.M('backup').add('type,name,pid,filename,add_time,size', (1, os.path.basename(filename), pid, filename, endDate, os.path.getsize(filename)))
         log = "数据库[" + name + "]备份成功,用时[" + str(round(outTime, 2)) + "]秒"
         mw.writeLog('计划任务', log)
         print("★[" + endDate + "] " + log)
@@ -92,9 +88,7 @@ class backupTools:
         print("|---文件名:" + filename)
 
         # 清理多余备份
-        backups = mw.M('backup').where(
-            'type=? and pid=?', ('1', pid)).field('id,filename').select()
-
+        backups = mw.M('backup').where('type=? and pid=?', ('1', pid)).field('id,filename').select()
         num = len(backups) - int(count)
         if num > 0:
             for backup in backups:

From 49ca076d6c0c1e5c24f9db1b41200ce48888dcc2 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 01:57:03 +0800
Subject: [PATCH 771/965] Update index.py

---
 plugins/mysql-apt/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mysql-apt/index.py b/plugins/mysql-apt/index.py
index 4c79ed0ba..0d923b48e 100755
--- a/plugins/mysql-apt/index.py
+++ b/plugins/mysql-apt/index.py
@@ -831,7 +831,7 @@ def setDbBackup():
     if not data[0]:
         return data[1]
 
-    scDir = getPanelDir() + '/scripts/backup.py'
+    scDir = mw.getPanelDir() + '/scripts/backup.py'
     cmd = 'python3 ' + scDir + ' database ' + args['name'] + ' 3'
     os.system(cmd)
     return mw.returnJson(True, 'ok')

From 2f5bd3b5ed03f1098fc53eb753a058a34b38d507 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 01:57:20 +0800
Subject: [PATCH 772/965] Update index.py

---
 plugins/mysql-yum/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py
index d9b450128..21989f340 100755
--- a/plugins/mysql-yum/index.py
+++ b/plugins/mysql-yum/index.py
@@ -830,7 +830,7 @@ def setDbBackup():
     if not data[0]:
         return data[1]
 
-    scDir = getPanelDir() + '/scripts/backup.py'
+    scDir = mw.getPanelDir() + '/scripts/backup.py'
     cmd = 'python3 ' + scDir + ' database ' + args['name'] + ' 3'
     os.system(cmd)
     return mw.returnJson(True, 'ok')

From 727c36ebc704ee037907dd17909792479355b7cd Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 02:11:47 +0800
Subject: [PATCH 773/965] update

---
 plugins/mysql-apt/index.py | 5 ++---
 plugins/mysql-yum/index.py | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/mysql-apt/index.py b/plugins/mysql-apt/index.py
index 0d923b48e..187098fe3 100755
--- a/plugins/mysql-apt/index.py
+++ b/plugins/mysql-apt/index.py
@@ -831,15 +831,14 @@ def setDbBackup():
     if not data[0]:
         return data[1]
 
-    scDir = mw.getPanelDir() + '/scripts/backup.py'
+    scDir = getPluginDir() + '/scripts/backup.py'
     cmd = 'python3 ' + scDir + ' database ' + args['name'] + ' 3'
     os.system(cmd)
     return mw.returnJson(True, 'ok')
 
 
 def rootPwd():
-    return pSqliteDb('config').where(
-        'id=?', (1,)).getField('mysql_root')
+    return pSqliteDb('config').where('id=?', (1,)).getField('mysql_root')
 
 
 def importDbExternal():
diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py
index 21989f340..b24ca820e 100755
--- a/plugins/mysql-yum/index.py
+++ b/plugins/mysql-yum/index.py
@@ -830,7 +830,7 @@ def setDbBackup():
     if not data[0]:
         return data[1]
 
-    scDir = mw.getPanelDir() + '/scripts/backup.py'
+    scDir = getPluginDir() + '/scripts/backup.py'
     cmd = 'python3 ' + scDir + ' database ' + args['name'] + ' 3'
     os.system(cmd)
     return mw.returnJson(True, 'ok')

From 00afaec282ab523b43768cd0ed930e41d4f3b075 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 02:51:38 +0800
Subject: [PATCH 774/965] Update index.html

---
 plugins/gdrive/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gdrive/index.html b/plugins/gdrive/index.html
index f0f95cbb0..0a5a01079 100644
--- a/plugins/gdrive/index.html
+++ b/plugins/gdrive/index.html
@@ -302,7 +302,7 @@
     </div>
 </div>
 </script>
-<script type="text/javascript" src="/plugins/file?name=gdrive&f=js/gdrive.js"></script>
+<!-- <script type="text/javascript" src="/plugins/file?name=gdrive&f=js/gdrive.js"></script> -->
 <script type="text/javascript">
 $.getScript( "/plugins/file?name=gdrive&f=js/gdrive.js", function(){
     gdList('');

From ac8c048b28e5d48082cb5b891a06650d991c3283 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 02:57:33 +0800
Subject: [PATCH 775/965] Update crontab.py

---
 web/utils/crontab.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/web/utils/crontab.py b/web/utils/crontab.py
index 68fbbb82d..28d39768b 100644
--- a/web/utils/crontab.py
+++ b/web/utils/crontab.py
@@ -69,10 +69,7 @@ class crontab(object):
     
         bak_data = []
         if stype == 'site' or stype == 'sites' or stype == 'database' or stype.find('database_') > -1 or stype == 'path':
-            hookPath = mw.getPanelDataDir() + "/hook_backup.json"
-            if os.path.exists(hookPath):
-                t = mw.readFile(hookPath)
-                bak_data = json.loads(t)
+            bak_data = thisdb.getOptionByJson('hook_backup',type='hook', default=[])
 
         if stype == 'database' or stype.find('database_') > -1:
             sqlite3_name = 'mysql'
@@ -94,20 +91,20 @@ class crontab(object):
                 db_list['data'] = []
             else:
                 db_list['data'] = mw.M('databases').dbPos(path, sqlite3_name).field('name,ps').select()
-            return mw.getJson(db_list)
+            return db_list
 
         if stype == 'path':
             db_list = {}
             db_list['data'] = [{"name": mw.getWwwDir(), "ps": "www"}]
             db_list['orderOpt'] = bak_data
-            return mw.getJson(db_list)
+            return db_list
 
         data = {}
         data['orderOpt'] = bak_data
 
         default_db = 'sites'
         data['data'] = mw.M(default_db).field('name,ps').select()
-        return mw.getJson(data)
+        return data
 
     def setCronStatus(self,cron_id):
         data = thisdb.getCrond(cron_id)

From 716c0a6d46780204d358fe1da79b26dc77ad7726 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 03:04:37 +0800
Subject: [PATCH 776/965] Update crontab.py

---
 web/utils/crontab.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/utils/crontab.py b/web/utils/crontab.py
index 28d39768b..b945a844e 100644
--- a/web/utils/crontab.py
+++ b/web/utils/crontab.py
@@ -279,6 +279,10 @@ class crontab(object):
         rdata = {}
         rdata['data'] = self.getCrontabHuman(info['list'])
         rdata['page'] = mw.getPage({'count':info['count'],'tojs':'getCronData','p':page,'row':size})
+
+
+        # backup hook
+        rdata['backup_hook'] = thisdb.getOptionByJson('hook_backup', type='hook', default=[])
         return rdata
 
     def getCrondCycle(self, params):

From b251de30b116d410adebd399cf0c95a39d4db167 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 03:05:22 +0800
Subject: [PATCH 777/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index daf9f2951..d883596a8 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.13
+APP_SMALL_VERSION = 0.14
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From 661a3460608a4ed2264828a8bd854e85a53cb243 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 03:11:29 +0800
Subject: [PATCH 778/965] Update config.py

---
 web/utils/config.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/utils/config.py b/web/utils/config.py
index ee081e86b..326566aac 100644
--- a/web/utils/config.py
+++ b/web/utils/config.py
@@ -76,6 +76,7 @@ def getGlobalVar():
 
     data['hook_menu'] = thisdb.getOptionByJson('hook_menu',type='hook',default=[])
     data['hook_global_static'] = thisdb.getOptionByJson('hook_global_static',type='hook',default=[])
+    data['hook_database'] = thisdb.getOptionByJson('hook_database',type='hook',default=[])
 
 
     # 邮件通知设置

From a308c630fc4d7a6697feca85ee1255106cc8c2c4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 03:58:04 +0800
Subject: [PATCH 779/965] Update update.py

---
 web/utils/system/update.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/web/utils/system/update.py b/web/utils/system/update.py
index 3d91e7fde..54a78c35f 100644
--- a/web/utils/system/update.py
+++ b/web/utils/system/update.py
@@ -18,7 +18,7 @@ import json
 
 import core.mw as mw
 
-def versionDiff(old, new):
+def versionDiff(now, new):
     '''
         test 测试
         new 有新版本
@@ -28,16 +28,13 @@ def versionDiff(old, new):
     if len(new_list) > 3:
         return 'test'
 
-    old_list = old.split('.')
+    now_list = now.split('.')
     ret = 'none'
-
-    isHasNew = True
-    if int(new_list[0]) == int(old_list[0]) and int(new_list[1]) == int(old_list[1]) and int(new_list[2]) == int(old_list[2]):
-        isHasNew = False
-
-    if isHasNew:
+    from distutils.version import LooseVersion
+    if LooseVersion(new) > LooseVersion(now):
         return 'new'
-    return ret
+    else:
+        return 'none'
 
 def getServerInfo():
     import urllib.request

From ac0dac2561799036c387f2f24bbe8cc9a33a0888 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 04:23:06 +0800
Subject: [PATCH 780/965] Update __init__.py

---
 web/admin/crontab/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/crontab/__init__.py b/web/admin/crontab/__init__.py
index b6184606f..dc60b5b1d 100644
--- a/web/admin/crontab/__init__.py
+++ b/web/admin/crontab/__init__.py
@@ -83,7 +83,7 @@ def modify_crond():
     request_data['hour'] = request.form.get('hour', '')
     request_data['minute'] = request.form.get('minute', '')
     request_data['save'] = request.form.get('save', '')
-    request_data['backup_to'] = request.form.get('backupTo', '')
+    request_data['backup_to'] = request.form.get('backup_to', '')
     request_data['stype'] = request.form.get('stype', '')
     request_data['sname'] = request.form.get('sname', '')
     request_data['sbody'] = request.form.get('sbody', '')

From 829a2516ba681ff95919452b311fa9703fa9a303 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 04:27:37 +0800
Subject: [PATCH 781/965] update

---
 web/admin/crontab/__init__.py      |  8 ++++----
 web/static/app/crontab.js          | 10 +++++-----
 web/templates/default/crontab.html | 10 +++++-----
 web/version.py                     |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/web/admin/crontab/__init__.py b/web/admin/crontab/__init__.py
index dc60b5b1d..a59de70ba 100644
--- a/web/admin/crontab/__init__.py
+++ b/web/admin/crontab/__init__.py
@@ -110,10 +110,10 @@ def add():
     request_data['hour'] = request.form.get('hour', '')
     request_data['minute'] = request.form.get('minute', '')
     request_data['save'] = request.form.get('save', '')
-    request_data['backup_to'] = request.form.get('backupTo', '')
-    request_data['stype'] = request.form.get('sType', '')
-    request_data['sname'] = request.form.get('sName', '')
-    request_data['sbody'] = request.form.get('sBody', '')
+    request_data['backup_to'] = request.form.get('backup_to', '')
+    request_data['stype'] = request.form.get('stype', '')
+    request_data['sname'] = request.form.get('sname', '')
+    request_data['sbody'] = request.form.get('sbody', '')
     request_data['url_address'] = request.form.get('urladdress', '')
     
     cron_id = MwCrontab.instance().add(request_data)
diff --git a/web/static/app/crontab.js b/web/static/app/crontab.js
index 24682b4c6..2110e088d 100755
--- a/web/static/app/crontab.js
+++ b/web/static/app/crontab.js
@@ -270,7 +270,7 @@ function planAdd(){
 
 	if (sType == 'toShell'){
 		if(sBody == ''){
-			$("#implement textarea[name='sBody']").focus();
+			$("#implement textarea[name='sbody']").focus();
 			layer.msg('脚本代码不能为空!',{icon:2});
 			return;
 		}
@@ -293,8 +293,8 @@ function planAdd(){
 	}
 	// urladdress = encodeURIComponent(urladdress);
 	$("#cronConfig input[name='urladdress']").val(urladdress);
-	$("#cronConfig input[name='sType']").val(sType);
-	$("#cronConfig textarea[name='sBody']").val(decodeURIComponent(sBody));
+	$("#cronConfig input[name='stype']").val(sType);
+	$("#cronConfig textarea[name='sbody']").val(decodeURIComponent(sBody));
 	
 	if(sType == 'site' || sType == 'database' || sType == 'path'){
 		var backupTo = $(".planBackupTo").find("b").attr("val");
@@ -339,9 +339,9 @@ function planAdd(){
 	}
 	
 	
-	$("#cronConfig input[name='sName']").val(sName);
+	$("#cronConfig input[name='sname']").val(sName);
 	layer.msg('正在添加,请稍候...!',{icon:16,time:0,shade: [0.3, '#000']});
-	var data = $("#cronConfig").serialize() + '&sBody='+sBody;
+	var data = $("#cronConfig").serialize() + '&sbody='+sBody;
 	// console.log(data);
 	$.post('/crontab/add',data,function(rdata){
 		if(!rdata.status) {
diff --git a/web/templates/default/crontab.html b/web/templates/default/crontab.html
index 7284ec8ee..3360ed83b 100755
--- a/web/templates/default/crontab.html
+++ b/web/templates/default/crontab.html
@@ -103,11 +103,11 @@
 				<input type="number" name="hour" value="" />
 				<input type="number" name="minute" value="" />
 				<input type="text" name="week" value="" />
-				<input type="text" name="sType" value="" />
-				<textarea name='sBody'></textarea>
-				<input id="sFile" type="file" name="sFile" value="" />
-				<input type="text" name="sName" value="" />
-				<input id="backupTo" type="text" name="backupTo" value="localhost" />
+				<input type="text" name="stype" value="" />
+				<textarea name='sbody'></textarea>
+				<input id="sFile" type="file" name="sfile" value="" />
+				<input type="text" name="sname" value="" />
+				<input id="backupTo" type="text" name="backup_to" value="localhost" />
 				<input id="urladdress" type="text" name="urladdress" value="" />
 				<input type="number" name="save" value="" />
 				<input type="submit" />
diff --git a/web/version.py b/web/version.py
index d883596a8..9c7bcec84 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.14
+APP_SMALL_VERSION = 0.15
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From c27248af988309c80e04acc2d83c13565563131e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 04:42:36 +0800
Subject: [PATCH 782/965] Update index.py

---
 plugins/gdrive/index.py | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/plugins/gdrive/index.py b/plugins/gdrive/index.py
index 5a1d16103..bdf940bf9 100644
--- a/plugins/gdrive/index.py
+++ b/plugins/gdrive/index.py
@@ -203,7 +203,6 @@ def backupAllFunc(stype):
         mw.echoInfo("未授权API,无法使用!!!")
         return ''
 
-    os.chdir(mw.getPanelDir())
     backup_dir = mw.getBackupDir()
     run_dir = mw.getPanelDir()
 
@@ -218,20 +217,15 @@ def backupAllFunc(stype):
     }
 
     backups = []
-    sql = db.Sql()
-
     # print("stype:", stype)
     # 提前获取-清理多余备份
     if stype == 'site':
-        pid = sql.table('sites').where('name=?', (name,)).getField('id')
-        backups = sql.table('backup').where(
-            'type=? and pid=?', ('0', pid)).field('id,filename').select()
+        pid = mw.M('sites').where('name=?', (name,)).getField('id')
+        backups = mw.M('backup').where('type=? and pid=?', ('0', pid)).field('id,filename').select()
     if stype == 'database':
         db_path = mw.getServerDir() + '/mysql'
-        pid = mw.M('databases').dbPos(db_path, 'mysql').where(
-            'name=?', (name,)).getField('id')
-        backups = sql.table('backup').where(
-            'type=? and pid=?', ('1', pid)).field('id,filename').select()
+        pid = mw.M('databases').dbPos(db_path, 'mysql').where('name=?', (name,)).getField('id')
+        backups = mw.M('backup').where('type=? and pid=?', ('1', pid)).field('id,filename').select()
     if stype == 'path':
         backup_path = backup_dir + '/path'
         _name = 'path_{}'.format(os.path.basename(name))
@@ -251,8 +245,7 @@ def backupAllFunc(stype):
     if stype.find('database_') > -1:
         plugin_name = stype.replace('database_', '')
         args = "database " + name + " " + num
-        cmd = 'python3 ' + run_dir + '/plugins/' + \
-            plugin_name + '/scripts/backup.py ' + args
+        cmd = 'python3 ' + run_dir + '/plugins/' + plugin_name + '/scripts/backup.py ' + args
 
     if stype == 'path':
         name = os.path.basename(name)
@@ -271,8 +264,7 @@ def backupAllFunc(stype):
         bk_name = stype
 
     find_path = backup_dir + '/' + bk_name + '/' + bk_prefix + '_' + name
-    find_new_file = "ls " + find_path + \
-        "_* | grep '.gz' | cut -d \  -f 1 | awk 'END {print}'"
+    find_new_file = "ls " + find_path + "_* | grep '.gz' | cut -d \\  -f 1 | awk 'END {print}'"
 
     # print(find_new_file)
 

From 19aadb581f261f593fc1c286c080520c610ba8c0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 04:46:36 +0800
Subject: [PATCH 783/965] Update index.py

---
 plugins/gdrive/index.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/gdrive/index.py b/plugins/gdrive/index.py
index bdf940bf9..4d25f1df8 100644
--- a/plugins/gdrive/index.py
+++ b/plugins/gdrive/index.py
@@ -235,10 +235,8 @@ def backupAllFunc(stype):
     if stype.find('database_') > -1:
         plugin_name = stype.replace('database_', '')
         db_path = mw.getServerDir() + '/' + plugin_name
-        pid = mw.M('databases').dbPos(db_path, 'mysql').where(
-            'name=?', (name,)).getField('id')
-        backups = sql.table('backup').where(
-            'type=? and pid=?', ('1', pid)).field('id,filename').select()
+        pid = mw.M('databases').dbPos(db_path, 'mysql').where('name=?', (name,)).getField('id')
+        backups = mw.M('backup').where('type=? and pid=?', ('1', pid)).field('id,filename').select()
 
     args = stype + " " + name + " " + num
     cmd = 'python3 ' + run_dir + '/scripts/backup.py ' + args

From 09d656ef60af1a9fafeb52e02d65dbd348f37d00 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 04:54:06 +0800
Subject: [PATCH 784/965] update

---
 web/static/app/crontab.js | 10 +++++-----
 web/version.py            |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/static/app/crontab.js b/web/static/app/crontab.js
index 2110e088d..de273367e 100755
--- a/web/static/app/crontab.js
+++ b/web/static/app/crontab.js
@@ -298,11 +298,12 @@ function planAdd(){
 	
 	if(sType == 'site' || sType == 'database' || sType == 'path'){
 		var backupTo = $(".planBackupTo").find("b").attr("val");
-		$("#backupTo").val(backupTo);
+		$("#backup_to").val(backupTo);
 	}
 	
-	var sName = $("#sName").attr("val");
-	
+	var sName = $("#sname").attr("val");
+	$("#cronConfig input[name='sname']").val(sName);
+
 	// if(sName == 'backupAll'){
 	// 	var alist = $("ul[aria-labelledby='backdata'] li a");
 	// 	var dataList = new Array();
@@ -338,8 +339,7 @@ function planAdd(){
 		$("#cronConfig input[name='where1']").val(where1);
 	}
 	
-	
-	$("#cronConfig input[name='sname']").val(sName);
+
 	layer.msg('正在添加,请稍候...!',{icon:16,time:0,shade: [0.3, '#000']});
 	var data = $("#cronConfig").serialize() + '&sbody='+sBody;
 	// console.log(data);
diff --git a/web/version.py b/web/version.py
index 9c7bcec84..c5c898e0c 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.15
+APP_SMALL_VERSION = 0.16
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From 6eda36aec2cf9256fed111e7070f3aa735a296a5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 04:56:02 +0800
Subject: [PATCH 785/965] Update index.py

---
 plugins/backup_ftp/index.py | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/plugins/backup_ftp/index.py b/plugins/backup_ftp/index.py
index dfaa7fe6a..9b292b0db 100755
--- a/plugins/backup_ftp/index.py
+++ b/plugins/backup_ftp/index.py
@@ -188,7 +188,6 @@ def findPathName(path, filename):
     return l
 
 def backupAllFunc(stype):
-    os.chdir(mw.getPanelDir())
 
     name = sys.argv[2]
     num = sys.argv[3]
@@ -200,20 +199,15 @@ def backupAllFunc(stype):
     }
 
     backups = []
-    sql = db.Sql()
-
     # print("stype:", stype)
     # 提前获取-清理多余备份
     if stype == 'site':
-        pid = sql.table('sites').where('name=?', (name,)).getField('id')
-        backups = sql.table('backup').where(
-            'type=? and pid=?', ('0', pid)).field('id,filename').select()
+        pid = mw.M('sites').where('name=?', (name,)).getField('id')
+        backups = mw.M('backup').where('type=? and pid=?', ('0', pid)).field('id,filename').select()
     if stype == 'database':
         db_path = mw.getServerDir() + '/mysql'
-        pid = mw.M('databases').dbPos(db_path, 'mysql').where(
-            'name=?', (name,)).getField('id')
-        backups = sql.table('backup').where(
-            'type=? and pid=?', ('1', pid)).field('id,filename').select()
+        pid = mw.M('databases').dbPos(db_path, 'mysql').where('name=?', (name,)).getField('id')
+        backups = mw.M('backup').where('type=? and pid=?', ('1', pid)).field('id,filename').select()
     if stype == 'path':
         backup_dir = mw.getBackupDir()
         backup_path = backup_dir + '/path'
@@ -224,18 +218,15 @@ def backupAllFunc(stype):
     if stype.find('database_') > -1:
         plugin_name = stype.replace('database_', '')
         db_path = mw.getServerDir() + '/' + plugin_name
-        pid = mw.M('databases').dbPos(db_path, 'mysql').where(
-            'name=?', (name,)).getField('id')
-        backups = sql.table('backup').where(
-            'type=? and pid=?', ('1', pid)).field('id,filename').select()
+        pid = mw.M('databases').dbPos(db_path, 'mysql').where('name=?', (name,)).getField('id')
+        backups = mw.M('backup').where('type=? and pid=?', ('1', pid)).field('id,filename').select()
 
     args = stype + " " + name + " " + num
     cmd = 'python3 ' + mw.getPanelDir() + '/scripts/backup.py ' + args
     if stype.find('database_') > -1:
         plugin_name = stype.replace('database_', '')
         args = "database " + name + " " + num
-        cmd = 'python3 ' + mw.getPanelDir() + '/plugins/' + plugin_name + \
-            '/scripts/backup.py ' + args
+        cmd = 'python3 ' + mw.getPanelDir() + '/plugins/' + plugin_name + '/scripts/backup.py ' + args
 
     os.system(cmd)
 

From 1d8448d6bbd0c2b366e9bea1e2fa5bd5cea3c40e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 05:05:47 +0800
Subject: [PATCH 786/965] update

---
 web/static/app/crontab.js | 58 +++++++++++++++++++--------------------
 web/version.py            |  2 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/web/static/app/crontab.js b/web/static/app/crontab.js
index de273367e..fa72f8872 100755
--- a/web/static/app/crontab.js
+++ b/web/static/app/crontab.js
@@ -266,7 +266,7 @@ function planAdd(){
 	$("#cronConfig input[name='week']").val($(".planweek").find("b").attr("val"));
 
 	var sType = $(".planjs").find("b").attr("val");
-	var sBody = encodeURIComponent($("#implement textarea[name='sBody']").val());
+	var sBody = encodeURIComponent($("#implement textarea[name='sbody']").val());
 
 	if (sType == 'toShell'){
 		if(sBody == ''){
@@ -296,7 +296,7 @@ function planAdd(){
 	$("#cronConfig input[name='stype']").val(sType);
 	$("#cronConfig textarea[name='sbody']").val(decodeURIComponent(sBody));
 	
-	if(sType == 'site' || sType == 'database' || sType == 'path'){
+	if(sType == 'site' || sType == 'database' || sType.find('_mysql')>0 || sType == 'path'){
 		var backupTo = $(".planBackupTo").find("b").attr("val");
 		$("#backup_to").val(backupTo);
 	}
@@ -602,31 +602,31 @@ function toBackup(type){
 		}
 
 		var sBody = '<div class="dropdown pull-left mr20 check">\
-					  <button class="btn btn-default dropdown-toggle sname" type="button" id="backdata" data-toggle="dropdown" style="width:auto">\
-						<b id="sName" val="'+rdata.data[0].name+'">'+rdata.data[0].name+'['+rdata.data[0].ps+']</b> <span class="caret"></span>\
-					  </button>\
-					  <ul class="dropdown-menu" role="menu" aria-labelledby="backdata">'+sOpt+'</ul>\
-					</div>\
-					'+ changeDir +'\
-					<div class="textname pull-left mr20">备份到</div>\
-					<div class="dropdown planBackupTo pull-left mr20">\
-					  <button class="btn btn-default dropdown-toggle" type="button" id="excode" data-toggle="dropdown" style="width:auto;">\
-						<b val="localhost">服务器磁盘</b><span class="caret"></span>\
-					  </button>\
-					  <ul class="dropdown-menu" role="menu" aria-labelledby="excode">\
-						<li><a role="menuitem" tabindex="-1" href="javascript:;" value="localhost">服务器磁盘</a></li>\
-						'+ orderOpt +'\
-					  </ul>\
-					</div>\
-					<div class="textname pull-left mr20">保留最新</div><div class="plan_hms pull-left mr20 bt-input-text">\
-					<span><input type="number" name="save" id="save" value="3" maxlength="4" max="100" min="1"></span>\
-					<span class="name">份</span>\
-					</div>';
+		 	<button class="btn btn-default dropdown-toggle sname" type="button" id="backdata" data-toggle="dropdown" style="width:auto">\
+				<b id="sName" val="'+rdata.data[0].name+'">'+rdata.data[0].name+'['+rdata.data[0].ps+']</b> <span class="caret"></span>\
+		  	</button>\
+		 	<ul class="dropdown-menu" role="menu" aria-labelledby="backdata">'+sOpt+'</ul>\
+		</div>\
+		'+ changeDir +'\
+		<div class="textname pull-left mr20">备份到</div>\
+		<div class="dropdown planBackupTo pull-left mr20">\
+		  	<button class="btn btn-default dropdown-toggle" type="button" id="excode" data-toggle="dropdown" style="width:auto;">\
+				<b val="localhost">服务器磁盘</b><span class="caret"></span>\
+		  	</button>\
+		  	<ul class="dropdown-menu" role="menu" aria-labelledby="excode">\
+				<li><a role="menuitem" tabindex="-1" href="javascript:;" value="localhost">服务器磁盘</a></li>\
+				'+ orderOpt +'\
+		  	</ul>\
+		</div>\
+		<div class="textname pull-left mr20">保留最新</div><div class="plan_hms pull-left mr20 bt-input-text">\
+			<span><input type="number" name="save" id="save" value="3" maxlength="4" max="100" min="1"></span>\
+			<span class="name">份</span>\
+		</div>';
 		$("#implement").html(sBody);
 		getselectname();
 
 		$('.changePathDir').click(function(){
-			changePathCallback($('#sName').val(),function(select_dir){
+			changePathCallback($('#sname').val(),function(select_dir){
 				$(".planname input[name='name']").val('备份目录['+select_dir+']');
 				$('#implement .sname b').attr('val',select_dir).text(select_dir);
 			});
@@ -634,7 +634,7 @@ function toBackup(type){
 
 
 		$(".dropdown ul li a").click(function(){
-			var sName = $("#sName").attr("val");
+			var sName = $("#sname").attr("val");
 			if(!sName) return;
 			$(".planname input[name='name']").val(sMsg+'['+sName+']');
 		});
@@ -1032,8 +1032,8 @@ function toWhere1(ix){
 //小时
 function toHour(){
 	var mBody = '<div class="plan_hms pull-left mr20 bt-input-text">\
-	<span><input type="number" name="hour" value="1" maxlength="2" max="23" min="0"></span>\
-	<span class="name">小时</span>\
+		<span><input type="number" name="hour" value="1" maxlength="2" max="23" min="0"></span>\
+		<span class="name">小时</span>\
 	</div>';
 	$("#ptime").append(mBody);
 }
@@ -1041,8 +1041,8 @@ function toHour(){
 //分钟
 function toMinute(){
 	var mBody = '<div class="plan_hms pull-left mr20 bt-input-text">\
-	<span><input type="number" name="minute" value="30" maxlength="2" max="59" min="0"></span>\
-	<span class="name">分钟</span>\
+		<span><input type="number" name="minute" value="30" maxlength="2" max="59" min="0"></span>\
+		<span class="name">分钟</span>\
 	</div>';
 	$("#ptime").append(mBody);
 	
@@ -1051,7 +1051,7 @@ function toMinute(){
 //从文件
 function toFile(){
 	var tBody = '<input type="text" value="" name="file" id="viewfile" onclick="fileupload()" readonly="true">\
-				<button class="btn btn-default" onclick="fileupload()">上次</button>';
+		<button class="btn btn-default" onclick="fileupload()">上次</button>';
 	$("#implement").html(tBody);
 	$(".planname input[name='name']").removeAttr('readonly style').val("");
 }
diff --git a/web/version.py b/web/version.py
index c5c898e0c..949efeedb 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.16
+APP_SMALL_VERSION = 0.17
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From 2250770f663089f6843df35f771046a0af745e58 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 05:08:06 +0800
Subject: [PATCH 787/965] Update crontab.js

---
 web/static/app/crontab.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/static/app/crontab.js b/web/static/app/crontab.js
index fa72f8872..5922fc481 100755
--- a/web/static/app/crontab.js
+++ b/web/static/app/crontab.js
@@ -296,7 +296,7 @@ function planAdd(){
 	$("#cronConfig input[name='stype']").val(sType);
 	$("#cronConfig textarea[name='sbody']").val(decodeURIComponent(sBody));
 	
-	if(sType == 'site' || sType == 'database' || sType.find('_mysql')>0 || sType == 'path'){
+	if(sType == 'site' || sType == 'database' || sType.indexOf('database_')>-1 || sType == 'path'){
 		var backupTo = $(".planBackupTo").find("b").attr("val");
 		$("#backup_to").val(backupTo);
 	}

From 0e633491bd03f68b05e61d3454273c5ec7547fe7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 05:08:17 +0800
Subject: [PATCH 788/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index 949efeedb..14abd26a1 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.17
+APP_SMALL_VERSION = 0.18
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From dd3092639e919d7e1d8682d06889023f3c15390d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 05:13:38 +0800
Subject: [PATCH 789/965] Update crontab.html

---
 web/templates/default/crontab.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/templates/default/crontab.html b/web/templates/default/crontab.html
index 3360ed83b..2e91b1592 100755
--- a/web/templates/default/crontab.html
+++ b/web/templates/default/crontab.html
@@ -105,9 +105,9 @@
 				<input type="text" name="week" value="" />
 				<input type="text" name="stype" value="" />
 				<textarea name='sbody'></textarea>
-				<input id="sFile" type="file" name="sfile" value="" />
+				<input id="sfile" type="file" name="sfile" value="" />
 				<input type="text" name="sname" value="" />
-				<input id="backupTo" type="text" name="backup_to" value="localhost" />
+				<input id="backup_to" type="text" name="backup_to" value="localhost" />
 				<input id="urladdress" type="text" name="urladdress" value="" />
 				<input type="number" name="save" value="" />
 				<input type="submit" />

From d6b414f022a4ee9d22d05f1f276348c8c7cfe63e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 05:13:45 +0800
Subject: [PATCH 790/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index 14abd26a1..fb87fce5b 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.18
+APP_SMALL_VERSION = 0.19
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From 92b26bd14f46717235d8c1330d5cd4b2b5423067 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 05:22:16 +0800
Subject: [PATCH 791/965] update

---
 web/thisdb/crontab.py | 7 +++++--
 web/utils/crontab.py  | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/web/thisdb/crontab.py b/web/thisdb/crontab.py
index 85d14ccd5..c9c3d98e0 100644
--- a/web/thisdb/crontab.py
+++ b/web/thisdb/crontab.py
@@ -20,6 +20,9 @@ def addCrontab(data):
     data['update_time'] = now_time
     return mw.M('crontab').insert(data)
 
+def getCronByName(name):
+    return mw.M('crontab').where("name=?", (name,)).find()
+
 def setCrontabData(cron_id, data):
     mw.M('crontab').where('id=?', (cron_id,)).update(data)
     return True
@@ -31,8 +34,8 @@ def setCrontabStatus(cron_id, status):
 def getCrond(id):
     return mw.M('crontab').where('id=?', (id,)).field(__field).find()
 
-def deleteCronById(id):
-    mw.M('crontab').where("id=?", (id,)).delete()
+def deleteCronById(cron_id):
+    mw.M('crontab').where("id=?", (cron_id,)).delete()
     return True
 
 def getCrontabList(
diff --git a/web/utils/crontab.py b/web/utils/crontab.py
index b945a844e..68ae58528 100644
--- a/web/utils/crontab.py
+++ b/web/utils/crontab.py
@@ -150,6 +150,10 @@ class crontab(object):
         if len(data['name']) < 1:
             return mw.returnData(False, '任务名称不能为空!')
 
+        info = thisdb.getCronByName(data['name'])
+        if info is not None:
+            return mw.returnData(False, '任务名称重复!')
+
         is_check_pass, msg = self.cronCheck(data)
         if not is_check_pass:
             return mw.returnData(is_check_pass, msg)

From fcf20958c9d94a3af2d06e0a9f36a0ba5672941d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 05:29:09 +0800
Subject: [PATCH 792/965] Update crontab.html

---
 web/templates/default/crontab.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/templates/default/crontab.html b/web/templates/default/crontab.html
index 2e91b1592..2fb4d5921 100755
--- a/web/templates/default/crontab.html
+++ b/web/templates/default/crontab.html
@@ -106,7 +106,7 @@
 				<input type="text" name="stype" value="" />
 				<textarea name='sbody'></textarea>
 				<input id="sfile" type="file" name="sfile" value="" />
-				<input type="text" name="sname" value="" />
+				<input id="sname" type="text" name="sname" value="" />
 				<input id="backup_to" type="text" name="backup_to" value="localhost" />
 				<input id="urladdress" type="text" name="urladdress" value="" />
 				<input type="number" name="save" value="" />

From 79591675543168d5d196c01590cd03037a7d90de Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 05:29:18 +0800
Subject: [PATCH 793/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index fb87fce5b..e8002c968 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.19
+APP_SMALL_VERSION = 0.21
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From b9a1d142d15f606407382740e40c6cd4e3591f25 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 05:36:06 +0800
Subject: [PATCH 794/965] Update crontab.py

---
 web/utils/crontab.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/utils/crontab.py b/web/utils/crontab.py
index 68ae58528..113bf7ed5 100644
--- a/web/utils/crontab.py
+++ b/web/utils/crontab.py
@@ -148,11 +148,13 @@ class crontab(object):
 
     def add(self, data):
         if len(data['name']) < 1:
-            return mw.returnData(False, '任务名称不能为空!')
+            # 任务名称不能为空
+            return -1
 
         info = thisdb.getCronByName(data['name'])
         if info is not None:
-            return mw.returnData(False, '任务名称重复!')
+            # 任务名称重复!
+            return -1
 
         is_check_pass, msg = self.cronCheck(data)
         if not is_check_pass:

From c9ef1cd141a330dc16bb7af3409b0e79c8cfb0bc Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 05:38:11 +0800
Subject: [PATCH 795/965] up

---
 web/admin/crontab/__init__.py | 6 +++++-
 web/utils/crontab.py          | 5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/web/admin/crontab/__init__.py b/web/admin/crontab/__init__.py
index a59de70ba..64adb51cf 100644
--- a/web/admin/crontab/__init__.py
+++ b/web/admin/crontab/__init__.py
@@ -115,7 +115,11 @@ def add():
     request_data['sname'] = request.form.get('sname', '')
     request_data['sbody'] = request.form.get('sbody', '')
     request_data['url_address'] = request.form.get('urladdress', '')
-    
+
+    info = thisdb.getCronByName(request_data['name'])
+    if info is not None:
+        return mw.returnData(False, '任务名称重复')
+
     cron_id = MwCrontab.instance().add(request_data)
     if cron_id > 0:
         return mw.returnData(True, '添加成功')
diff --git a/web/utils/crontab.py b/web/utils/crontab.py
index 113bf7ed5..5670a327b 100644
--- a/web/utils/crontab.py
+++ b/web/utils/crontab.py
@@ -151,11 +151,6 @@ class crontab(object):
             # 任务名称不能为空
             return -1
 
-        info = thisdb.getCronByName(data['name'])
-        if info is not None:
-            # 任务名称重复!
-            return -1
-
         is_check_pass, msg = self.cronCheck(data)
         if not is_check_pass:
             return mw.returnData(is_check_pass, msg)

From 0777b65919e8965199a00e74ceb26fc764df3ecc Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 05:45:06 +0800
Subject: [PATCH 796/965] up

---
 web/static/app/crontab.js          | 4 ++--
 web/templates/default/crontab.html | 4 ++--
 web/version.py                     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/static/app/crontab.js b/web/static/app/crontab.js
index 5922fc481..0ba5debd4 100755
--- a/web/static/app/crontab.js
+++ b/web/static/app/crontab.js
@@ -301,7 +301,7 @@ function planAdd(){
 		$("#backup_to").val(backupTo);
 	}
 	
-	var sName = $("#sname").attr("val");
+	var sName = $("#sName").attr("val");
 	$("#cronConfig input[name='sname']").val(sName);
 
 	// if(sName == 'backupAll'){
@@ -1058,7 +1058,7 @@ function toFile(){
 
 //从脚本
 function toShell(){
-	var tBody = "<textarea class='txtsjs bt-input-text' name='sBody'></textarea>";
+	var tBody = "<textarea class='txtsjs bt-input-text' name='sbody'></textarea>";
 	$("#implement").html(tBody);
 	$(".planname input[name='name']").removeAttr('readonly style').val("");
 }
diff --git a/web/templates/default/crontab.html b/web/templates/default/crontab.html
index 2fb4d5921..4765bd408 100755
--- a/web/templates/default/crontab.html
+++ b/web/templates/default/crontab.html
@@ -86,7 +86,7 @@
 				</div>
 				<div class="clearfix plan">
 					<span class="typename controls c4 pull-left f14 text-right mr20">脚本内容</span>
-					<div id="implement" style="line-height:34px"><textarea class="txtsjs bt-input-text" name="sBody"></textarea></div>
+					<div id="implement" style="line-height:34px"><textarea class="txtsjs bt-input-text" name="sbody"></textarea></div>
 				</div>
 				<div class="clearfix plan">
 					<div class="bt-submit plan-submit" onclick="planAdd();">添加任务</div>
@@ -106,7 +106,7 @@
 				<input type="text" name="stype" value="" />
 				<textarea name='sbody'></textarea>
 				<input id="sfile" type="file" name="sfile" value="" />
-				<input id="sname" type="text" name="sname" value="" />
+				<input type="text" name="sname" value="" />
 				<input id="backup_to" type="text" name="backup_to" value="localhost" />
 				<input id="urladdress" type="text" name="urladdress" value="" />
 				<input type="number" name="save" value="" />
diff --git a/web/version.py b/web/version.py
index e8002c968..882a1a819 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.21
+APP_SMALL_VERSION = 0.22
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From 643338eab170b2038c09dd536a8f1f9ee3b323d3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 06:02:42 +0800
Subject: [PATCH 797/965] update

---
 panel_tools.py              | 7 ++++++-
 web/admin/setup/__init__.py | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index b766c60f7..93a1a2cc3 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -65,6 +65,7 @@ def mwcli(mw_input=0):
         print("(25)     开启防火墙SSH端口")
         print("(26)     关闭二次验证")
         print("(27)     查看防火墙信息")
+        print("(28)     自动识别防火墙端口到面板")
         print("(100)    开启PHP52显示")
         print("(101)    关闭PHP52显示")
         print("(200)    切换Linux系统软件源")
@@ -80,7 +81,7 @@ def mwcli(mw_input=0):
 
     nums = [
         1, 2, 3, 4, 5, 10, 11, 12, 13,
-        20, 21, 22, 23, 24, 25, 26, 27,
+        20, 21, 22, 23, 24, 25, 26, 27, 28
         100, 101, 
         200, 201
     ]
@@ -184,6 +185,10 @@ def mwcli(mw_input=0):
             os.system('firewall-cmd --list-all')
         if not run_cmd:
             mw.echoInfo("未检测到防火墙!")
+    elif mw_input == 28:
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().aIF()
+        mw.echoInfo("执行自动识别防火墙端口到面板成功!")
     elif mw_input == 100:
         php_conf = panel_dir + '/plugins/php/info.json'
         if os.path.exists(php_conf):
diff --git a/web/admin/setup/__init__.py b/web/admin/setup/__init__.py
index cd0d5d2b5..a5ee11a2b 100644
--- a/web/admin/setup/__init__.py
+++ b/web/admin/setup/__init__.py
@@ -31,5 +31,8 @@ def init():
 	init_db_system()
 
 	# 自动识别防火墙配置
-	MwFirewall.instance().aIF()
+	firewall_port = thisdb.getOption('setpu_auto_identify_firewall_port', default='no')
+	if firewall_port == 'no':
+		MwFirewall.instance().aIF()
+		thisdb.getOption('setpu_auto_identify_firewall_port', 'yes')
 

From bfe0e0a31a2b110d71bf164f6a190d12a8a21bb3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 06:04:05 +0800
Subject: [PATCH 798/965] Update panel_tools.py

---
 panel_tools.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panel_tools.py b/panel_tools.py
index 93a1a2cc3..3c60456f7 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -81,7 +81,7 @@ def mwcli(mw_input=0):
 
     nums = [
         1, 2, 3, 4, 5, 10, 11, 12, 13,
-        20, 21, 22, 23, 24, 25, 26, 27, 28
+        20, 21, 22, 23, 24, 25, 26, 27, 28,
         100, 101, 
         200, 201
     ]

From e3606a1ca4ff65eb24f5ad9ae1d11eaa6124cc82 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 06:07:05 +0800
Subject: [PATCH 799/965] Update __init__.py

---
 web/admin/setup/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/admin/setup/__init__.py b/web/admin/setup/__init__.py
index a5ee11a2b..4197f844f 100644
--- a/web/admin/setup/__init__.py
+++ b/web/admin/setup/__init__.py
@@ -27,8 +27,9 @@ def init():
 	    thisdb.initPanelData()
 	    init_admin_user()
 	    init_option()
+	    init_db_system()
+
 	init_cmd()
-	init_db_system()
 
 	# 自动识别防火墙配置
 	firewall_port = thisdb.getOption('setpu_auto_identify_firewall_port', default='no')

From 7fbe40e73fdcec67e7e4dae69b8bf64d424e2ff9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 06:11:03 +0800
Subject: [PATCH 800/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index cad992acb..fc659b485 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -39,16 +39,19 @@ def init_cmd():
     # initd
     if os.path.exists('/etc/rc.d/init.d'):
         initd_bin = '/etc/rc.d/init.d/mw'
-        mw.writeFile(initd_bin, cmd_content)
-        mw.execShell('chmod +x ' + initd_bin)
+        if not os.path.exists(initd_bin):
+            mw.writeFile(initd_bin, cmd_content)
+            mw.execShell('chmod +x ' + initd_bin)
         # 加入自启动
         mw.execShell('which chkconfig && chkconfig --add mw')
 
 
     if os.path.exists('/etc/init.d'):
         initd_bin = '/etc/init.d/mw'
-        mw.writeFile(initd_bin, cmd_content)
-        mw.execShell('chmod +x ' + initd_bin)
+
+        if not os.path.exists(initd_bin):
+            mw.writeFile(initd_bin, cmd_content)
+            mw.execShell('chmod +x ' + initd_bin)
         # 加入自启动
         mw.execShell('which update-rc.d && update-rc.d -f mw defaults')
 

From 3826bb53aa1d2ff168d7c974cffe8707e708b2de Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 06:11:23 +0800
Subject: [PATCH 801/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index fc659b485..02c913ae0 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -48,7 +48,6 @@ def init_cmd():
 
     if os.path.exists('/etc/init.d'):
         initd_bin = '/etc/init.d/mw'
-
         if not os.path.exists(initd_bin):
             mw.writeFile(initd_bin, cmd_content)
             mw.execShell('chmod +x ' + initd_bin)

From 73f8226854e9d8b9aaeafa39b8906a615d7c884d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 06:11:49 +0800
Subject: [PATCH 802/965] Update init_cmd.py

---
 web/admin/setup/init_cmd.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/web/admin/setup/init_cmd.py b/web/admin/setup/init_cmd.py
index 02c913ae0..bb0280a59 100644
--- a/web/admin/setup/init_cmd.py
+++ b/web/admin/setup/init_cmd.py
@@ -33,9 +33,6 @@ def init_cmd():
 
     if not mw.isAppleSystem() and not os.path.exists("/etc/init.d"):
         mw.execShell('mkdir -p /etc/init.d')
-
-    sys_name = mw.getOsName()
-
     # initd
     if os.path.exists('/etc/rc.d/init.d'):
         initd_bin = '/etc/rc.d/init.d/mw'
@@ -54,6 +51,7 @@ def init_cmd():
         # 加入自启动
         mw.execShell('which update-rc.d && update-rc.d -f mw defaults')
 
+    # sys_name = mw.getOsName()
     # if sys_name == 'opensuse':
     #     init_cmd_systemd()
     return True

From 723d5e3959683284fb10f97434e84fe0cdbbccc4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 06:18:12 +0800
Subject: [PATCH 803/965] Update __init__.py

---
 web/admin/setup/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/setup/__init__.py b/web/admin/setup/__init__.py
index 4197f844f..f7eb6eab2 100644
--- a/web/admin/setup/__init__.py
+++ b/web/admin/setup/__init__.py
@@ -35,5 +35,5 @@ def init():
 	firewall_port = thisdb.getOption('setpu_auto_identify_firewall_port', default='no')
 	if firewall_port == 'no':
 		MwFirewall.instance().aIF()
-		thisdb.getOption('setpu_auto_identify_firewall_port', 'yes')
+		thisdb.setOption('setpu_auto_identify_firewall_port', 'yes')
 

From 154c482e67ad2d097af9848144082295f15d3490 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 14:55:50 +0800
Subject: [PATCH 804/965] Update compatibility.md

---
 compatibility.md | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/compatibility.md b/compatibility.md
index eeb065f1a..37b61457a 100644
--- a/compatibility.md
+++ b/compatibility.md
@@ -29,24 +29,24 @@ cd /www/server/mdserver-web/plugins/php/versions && bash all_test.sh
 
 
 
-| 系统名称 			|PHP53	|PHP54	|PHP55	|PHP56	|PHP70	|PHP71	|PHP72	|PHP73	|PHP74	|PHP80	|PHP81	|PHP82	|PHP83	|
-| ----------------- |-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|
-| CentOS 7.9 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| CentOS 8.4 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| CentOS 8 Stream 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| CentOS 9 Stream 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Debian 10.3 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Debian 11.3 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Debian 12 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Ubuntu 18.04 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Ubuntu 20.04 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Ubuntu 22.04 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Fedora 31 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Fedora 32 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| AlmaLinux 9 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| RockyLinux 8.6 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Arch Linux 	 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| openSUSE 15.4 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| 系统名称 			|PHP53	|PHP54	|PHP55	|PHP56	|PHP70	|PHP71	|PHP72	|PHP73	|PHP74	|PHP80	|PHP81	|PHP82	|PHP83	|PHP84	|
+| ----------------- |-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|
+| CentOS 7.9 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| CentOS 8.4 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| CentOS 8 Stream 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| CentOS 9 Stream 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Debian 10.3 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Debian 11.3 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Debian 12 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Ubuntu 18.04 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Ubuntu 20.04 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Ubuntu 22.04 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Fedora 31 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Fedora 32 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| AlmaLinux 9 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| RockyLinux 8.6 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Arch Linux 	 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| openSUSE 15.4 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
 
 
 

From a8b6ae4c21d36a3c7b6a649681aad9a9c19f34de Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 23:48:35 +0800
Subject: [PATCH 805/965] Update option.py

---
 web/admin/setup/option.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/setup/option.py b/web/admin/setup/option.py
index 7542f3791..0ec803f2a 100644
--- a/web/admin/setup/option.py
+++ b/web/admin/setup/option.py
@@ -16,7 +16,7 @@ import core.mw as mw
 import thisdb
 
 def init_option():
-    thisdb.setOption('title', '后羿面板')
+    thisdb.setOption('title', '夸父面板')
     thisdb.setOption('recycle_bin', 'open')
     thisdb.setOption('template', 'default')
 

From 1bee5e742999b117e46df3ab410d1e71ecd06c45 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 5 Dec 2024 23:48:54 +0800
Subject: [PATCH 806/965] Update option.py

---
 web/admin/setup/option.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/admin/setup/option.py b/web/admin/setup/option.py
index 0ec803f2a..b38a031fb 100644
--- a/web/admin/setup/option.py
+++ b/web/admin/setup/option.py
@@ -10,8 +10,6 @@
 
 import json
 
-from flask import request
-
 import core.mw as mw
 import thisdb
 

From 02e5f595fd46888d5746f941bacf299264b89131 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 6 Dec 2024 03:50:14 +0800
Subject: [PATCH 807/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index a85ba16a3..258190694 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -358,7 +358,7 @@ class nosqlMySQLCtr():
             return mw.returnData(False, msg)
 
         my_instance.execute("SET @sys.statement_truncate_len=4096")
-        data = my_instance.query("select query,db,last_seen,exec_count,max_latency,avg_latency from sys.statement_analysis order by exec_count desc, last_seen desc limit 10")
+        data = my_instance.query("select query,db,last_seen,exec_count,max_latency,avg_latency from sys.statement_analysis order by exec_count desc, last_seen desc limit 20")
         if data is None:
             return mw.returnData(False, "查询失败!")
         return mw.returnData(True, 'ok', data)

From 3394a8892fca2f69caeafc2215eca5c6c9b11d78 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 6 Dec 2024 04:17:11 +0800
Subject: [PATCH 808/965] update

---
 plugins/data_query/sql_mysql.py     |  8 ++++++++
 plugins/data_query/static/js/app.js | 10 +++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index 258190694..d69c2737b 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -361,6 +361,14 @@ class nosqlMySQLCtr():
         data = my_instance.query("select query,db,last_seen,exec_count,max_latency,avg_latency from sys.statement_analysis order by exec_count desc, last_seen desc limit 20")
         if data is None:
             return mw.returnData(False, "查询失败!")
+
+        filter_db = args['filter_db']
+        if filter_db == 'yes':
+            new_data = []
+            for x in data:
+                if x['db'] is not None:
+                    new_data.append(x)
+            return mw.returnData(True, 'ok', new_data)
         return mw.returnData(True, 'ok', data)
 
     # 查看重复或冗余的索引
diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index 9c59b95b4..69f9cbe78 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -274,7 +274,8 @@ function initTabMySQL(){
 function mysqlCommonFuncMysqlNSQL(){
     function renderSQL(){
         var sid = mysqlGetSid();
-        myPostCBN('get_topn_list',{'sid':sid} ,function(rdata){
+        var filter_db = $('#filter_db').is(':checked');
+        myPostCBN('get_topn_list',{'sid':sid,'filter_db':filter_db ? 'yes':'no'} ,function(rdata){
             var data = rdata.data;
             if (data['status']){
                 var items = data.data;
@@ -313,6 +314,13 @@ function mysqlCommonFuncMysqlNSQL(){
                         <label id="real_time_label" class="btswitch-btn" for="real_time_monitoring"></label>\
                     </div>\
                 </div>\
+                <div class="ss-text pull-left" style="padding-left:10px;">\
+                    <em>过滤数据库</em>\
+                    <div class="ssh-item">\
+                        <input class="btswitch btswitch-ios" id="filter_db" type="checkbox">\
+                        <label class="btswitch-btn" for="filter_db"></label>\
+                    </div>\
+                </div>\
             </div>\
             <hr />\
             <table class="table table-hover" id="topn_list">\

From f50be939f5b39b68dd7f5227e5d254300d247509 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 6 Dec 2024 04:17:29 +0800
Subject: [PATCH 809/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index 882a1a819..13402d1c1 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.22
+APP_SMALL_VERSION = 0.23
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From d75c729e290878e82365e231d25396fc8dedb2c3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 8 Dec 2024 22:41:10 +0800
Subject: [PATCH 810/965] =?UTF-8?q?re=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/gdrive/class/gdriveclient.py | 2 +-
 plugins/lvs/index.py                 | 2 +-
 plugins/php-yum/index.py             | 4 ++--
 plugins/system_safe/system_safe.py   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/gdrive/class/gdriveclient.py b/plugins/gdrive/class/gdriveclient.py
index 349098cf3..d71f1e446 100644
--- a/plugins/gdrive/class/gdriveclient.py
+++ b/plugins/gdrive/class/gdriveclient.py
@@ -215,7 +215,7 @@ class gdriveclient():
             print("data_type 类型错误!!!")
             exit(1)
 
-        file_regx = prefix_dict.get(data_type) + "_(.+)_20\d+_\d+\."
+        file_regx = prefix_dict.get(data_type) + r"_(.+)_20\d+_\d+\."
         sub_search = re.search(file_regx.lower(), file_name)
         sub_path_name = ""
         if sub_search:
diff --git a/plugins/lvs/index.py b/plugins/lvs/index.py
index e1f43e370..68683bd6c 100755
--- a/plugins/lvs/index.py
+++ b/plugins/lvs/index.py
@@ -154,7 +154,7 @@ def initdUinstall():
 def runLog():
     path = getConf()
     content = mw.readFile(path)
-    rep = 'log\s*=\s*(.*)'
+    rep = r'log\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0]
 
diff --git a/plugins/php-yum/index.py b/plugins/php-yum/index.py
index edae3a4b8..495332244 100755
--- a/plugins/php-yum/index.py
+++ b/plugins/php-yum/index.py
@@ -307,7 +307,7 @@ def getPhpConf(version):
     phpini = mw.readFile(getConf(version))
     result = []
     for g in gets:
-        rep = g['name'] + '\s*=\s*([0-9A-Za-z_& ~]+)(\s*;?|\r?\n)'
+        rep = g['name'] + r'\s*=\s*([0-9A-Za-z_& ~]+)(\s*;?|\r?\n)'
         tmp = re.search(rep, phpini)
         if not tmp:
             continue
@@ -326,7 +326,7 @@ def submitPhpConf(version):
     phpini = mw.readFile(filename)
     for g in gets:
         if g in args:
-            rep = g + '\s*=\s*(.+)\r?\n'
+            rep = g + r'\s*=\s*(.+)\r?\n'
             val = g + ' = ' + args[g] + '\n'
             phpini = re.sub(rep, val, phpini)
     mw.writeFile(filename, phpini)
diff --git a/plugins/system_safe/system_safe.py b/plugins/system_safe/system_safe.py
index d0f0352d1..62efb4e06 100755
--- a/plugins/system_safe/system_safe.py
+++ b/plugins/system_safe/system_safe.py
@@ -578,7 +578,7 @@ class App:
 
     # 转换时间格式
     def __to_date(self, date_str):
-        tmp = re.split('\s+', date_str)
+        tmp = re.split(r'\s+', date_str)
         s_date = str(datetime.now().year) + '-' + \
             self.__months.get(tmp[0]) + '-' + tmp[1] + ' ' + tmp[2]
         time_array = time.strptime(s_date, "%Y-%m-%d %H:%M:%S")

From c1a59d63fca1d795ad92b79d97a297a7ef9fe938 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 8 Dec 2024 22:43:55 +0800
Subject: [PATCH 811/965] =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=8A=B6=E6=80=81=EF=BC=8C=E6=8F=90=E9=AB=98?=
 =?UTF-8?q?=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 panel_task.py       |  29 +++++++++--
 web/utils/plugin.py | 120 ++++++++++++++++++++++++++++++++++++++------
 2 files changed, 130 insertions(+), 19 deletions(-)

diff --git a/panel_task.py b/panel_task.py
index 9f46ab710..a9abeaa62 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -106,7 +106,7 @@ def runPanelTask():
             if thisdb.getTaskUnexecutedCount() < 1:
                 os.remove(lock_file)
     except Exception as e:
-        pass
+        print('runPanelTask:',mw.getTracebackInfo())
 
 # 网站到期处理
 def siteEdateCheck():
@@ -122,7 +122,7 @@ def siteEdateCheck():
             MwSites.instance().stop(site['id'])
         thisdb.setOption('website_edate', now_time_ymd)
     except Exception as e:
-        pass
+        print('siteEdateCheck:',mw.getTracebackInfo())
 
 # 任务队列
 def startPanelTask():
@@ -131,6 +131,7 @@ def startPanelTask():
             runPanelTask()
             time.sleep(5)
     except Exception as e:
+        print('startPanelTask:',mw.getTracebackInfo())
         time.sleep(30)
         startPanelTask()
 
@@ -142,9 +143,26 @@ def systemTask():
             monitor.instance().run()
             time.sleep(5)
     except Exception as ex:
+        print('systemTask:',mw.getTracebackInfo())
         time.sleep(30)
         systemTask()
 
+
+def panelPluginStatusCheck():
+    # 系统监控任务
+    from  utils.plugin import plugin
+    try:
+        while True:
+            start_t = time.time()
+            plugin.instance().autoCachePluginStatus()
+            end_t = time.time()
+            print('cos:', end_t - start_t)
+            time.sleep(60)
+    except Exception as ex:
+        print('panelPluginStatusCheck:',mw.getTracebackInfo())
+        time.sleep(120)
+        panelPluginStatusCheck()
+
 # -------------------------------------- PHP监控 start --------------------------------------------- #
 # 502错误检查线程
 def check502Task():
@@ -226,7 +244,7 @@ def startPHPVersion(version):
         if os.path.exists(cgi):
             return True
     except Exception as e:
-        # print(mw.getTracebackInfo())
+        print('startPHPVersion:',mw.getTracebackInfo())
         mw.writeLog('PHP守护程序', '自动修复异常:'+str(e))
         return True
 
@@ -324,6 +342,11 @@ def run():
     oar = setDaemon(oar)
     oar.start()
 
+    # Panel Plugin Status Check
+    pps = threading.Thread(target=panelPluginStatusCheck)
+    pps = setDaemon(pps)
+    pps.start()
+
     # Panel Restart Start
     rps = threading.Thread(target=restartPanelService)
     rps = setDaemon(rps)
diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index 09a61c72e..507f63501 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -80,6 +80,9 @@ class plugin(object):
     __plugin_dir = 'plugins'
     __tasks = None
 
+    __plugin_status_cachekey = 'plugin_list_status'
+    __plugin_status_data = None
+
     # lock
     _instance_lock = threading.Lock()
 
@@ -128,9 +131,7 @@ class plugin(object):
                 except Exception as e:
                     print('getIndexList:', mw.getTracebackInfo())
 
-        # 使用gevent模式时,无法使用多进程
-        # plist = self.checkStatusMProcess(plist)
-        plist = self.checkStatusMThreads(plist)
+        plist = self.checkStatusMThreadsByCache(plist)
         return mw.returnData(True, 'ok', plist)
 
     def init(self):
@@ -570,6 +571,77 @@ class plugin(object):
         else:
             return False
 
+    # 检查插件状态
+    def checkStatusThreadsByCache(self, info, i):
+        # 初始化db
+        if not info['setup']:
+            return False
+
+        plugin_list_status = self.__plugin_status_data
+        cache_field = info['name']
+        if plugin_list_status is not None:
+            if cache_field in plugin_list_status:
+
+                print(cache_field,plugin_list_status[cache_field])
+                if plugin_list_status[cache_field]:
+                    return True
+                else: 
+                    return False
+
+        data = self.run(info['name'], 'status', info['setup_version'])
+        if data[0] == 'start':
+            return True
+        else:
+            return False
+
+    # 多线程检查插件状态[cache]
+    def checkStatusMThreadsByCache(self, info):
+        try:
+            self.__plugin_status_data = thisdb.getOptionByJson(self.__plugin_status_cachekey, default=None)
+            threads = []
+            ntmp_list = range(len(info))
+            for i in ntmp_list:
+                t = pg_thread(self.checkStatusThreadsByCache,(info[i], i))
+                threads.append(t)
+
+            for i in ntmp_list:
+                threads[i].start()
+            for i in ntmp_list:
+                threads[i].join()
+
+            for i in ntmp_list:
+                t = threads[i].getResult()
+                k = info[i]['name']
+                self.__plugin_status_data[k] = t
+                info[i]['status'] = t
+
+            thisdb.setOption(self.__plugin_status_cachekey, json.dumps(self.__plugin_status_data))
+        except Exception as e:
+            print(mw.getTracebackInfo())
+            print('checkStatusMThreadsByCache:', str(e))
+        return info
+
+    def autoCachePluginStatus(self):
+        info = []
+        for name in os.listdir(self.__plugin_dir):
+            if name.startswith('.'):
+                continue
+            t = self.getPluginList(name)
+            for index in range(len(t)):
+                info.append(t[index])
+
+        self.__plugin_status_data = {}
+        for x in info:
+            if not x['setup']:
+                continue
+            data = self.run(x['name'], 'status', x['setup_version'])
+            if data[0].strip() == 'start':
+                self.__plugin_status_data[x['name']] = True
+            else:
+                self.__plugin_status_data[x['name']] = False
+        thisdb.setOption(self.__plugin_status_cachekey, json.dumps(self.__plugin_status_data))
+        return True
+
     # 多线程检查插件状态
     def checkStatusMThreads(self, info):
         try:
@@ -600,7 +672,6 @@ class plugin(object):
         size = 10, 
     ):
         info = []
-
         # print(mw.getPluginDir())
         for name in os.listdir(self.__plugin_dir):
             if name.startswith('.'):
@@ -614,8 +685,7 @@ class plugin(object):
         _info = info[start:end]
 
         # print(info)
-
-        _info = self.checkStatusMThreads(_info)
+        _info = self.checkStatusMThreadsByCache(_info)
         return (_info, len(info))
 
     def getList(
@@ -625,11 +695,13 @@ class plugin(object):
         page = 1, 
         size  = 10, 
     ) -> object:
+        '''
         # print(type,keyword,page,size)
+        '''
         rdata = {}
         rdata['type'] = self.def_plugin_type
     
-        data = self.getAllPluginList(type,keyword, page, size)
+        data = self.getAllPluginList(type, keyword, page, size)
         rdata['data'] = data[0]
         rdata['list'] = mw.getPage({'count':data[1],'p':page,'tojs':'getSList','row':size})
         return rdata
@@ -704,13 +776,28 @@ class plugin(object):
         mw.execShell("rm -rf " + plugin_path)
         return mw.returnData(False, '安装失败!')
 
+    # 缓存[start|stop|status]
+    def runByCache(self, name, func, data):
+        ppos = mw.getServerDir()+'/'+name
+        if not os.path.exists(ppos):
+            return
+
+        
+        plugin_list_status = thisdb.getOptionByJson(self.__plugin_status_cachekey, default={})
+
+        print("plugin_list_status",plugin_list_status)
+        if name in plugin_list_status:
+            print("run op1:",plugin_list_status)
+            del(plugin_list_status[name])
+            print("run op2:",plugin_list_status)
+            thisdb.setOption(self.__plugin_status_cachekey, json.dumps(plugin_list_status))
+
     # shell/bash方式调用
     def run(self, name, func,
         version = '',
         args  = '',
         script  = 'index',
     ):
-
         path = self.__plugin_dir + '/' + name + '/' + script + '.py'
         if not os.path.exists(path):
             path = self.__plugin_dir + '/' + name + '/' + name + '.py'
@@ -725,6 +812,11 @@ class plugin(object):
             return ('', '')
         py_cmd = 'cd ' + mw.getPanelDir() + " && "+ py_cmd
         data = mw.execShell(py_cmd)
+
+        if mw.inArray(['start','stop'], func):
+            print('dddddrun',func)
+            self.runByCache(name,func, data[0].strip())
+
         # print(data)
         if mw.isDebugMode():
             print('run:', py_cmd)
@@ -737,26 +829,22 @@ class plugin(object):
         args = '',
         script = 'index',
     ):
-
         package = self.__plugin_dir + '/' + name
         if not os.path.exists(package):
             return (False, "插件不存在!")
         if not package in sys.path:
             sys.path.append(package)
 
-        eval_str = "__import__('" + script + "')." + func + '(' + args + ')'
-
+        cmd = "__import__('" + script + "')." + func + '(' + args + ')'
         if mw.isDebugMode():
-            print('callback', eval_str)
+            print('callback', cmd)
 
         data = None
         try:
-            data = eval(eval_str)
+            data = eval(cmd)
         except Exception as e:
             print(mw.getTracebackInfo())
-            return (False, mw.getTracebackInfo())
-        
-        
+            return (False, mw.getTracebackInfo())        
         return (True, data)
 
 

From 255d297d616b034fedbd9c3b0da36861107d61f0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 8 Dec 2024 23:00:03 +0800
Subject: [PATCH 812/965] Update plugin.py

---
 web/utils/plugin.py | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index 507f63501..c26e2e7b7 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -581,8 +581,7 @@ class plugin(object):
         cache_field = info['name']
         if plugin_list_status is not None:
             if cache_field in plugin_list_status:
-
-                print(cache_field,plugin_list_status[cache_field])
+                # print(cache_field,plugin_list_status[cache_field])
                 if plugin_list_status[cache_field]:
                     return True
                 else: 
@@ -776,21 +775,15 @@ class plugin(object):
         mw.execShell("rm -rf " + plugin_path)
         return mw.returnData(False, '安装失败!')
 
-    # 缓存[start|stop|status]
+    # [start|stop]操作,删除缓存!
     def runByCache(self, name, func, data):
         ppos = mw.getServerDir()+'/'+name
         if not os.path.exists(ppos):
             return
-
-        
-        plugin_list_status = thisdb.getOptionByJson(self.__plugin_status_cachekey, default={})
-
-        print("plugin_list_status",plugin_list_status)
-        if name in plugin_list_status:
-            print("run op1:",plugin_list_status)
-            del(plugin_list_status[name])
-            print("run op2:",plugin_list_status)
-            thisdb.setOption(self.__plugin_status_cachekey, json.dumps(plugin_list_status))
+        data = thisdb.getOptionByJson(self.__plugin_status_cachekey, default={})
+        if name in data:
+            del(data[name])
+            thisdb.setOption(self.__plugin_status_cachekey, json.dumps(data))
 
     # shell/bash方式调用
     def run(self, name, func,

From 679aefba8681da307b5c6f61b510b63bd1a4cc82 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 8 Dec 2024 23:00:42 +0800
Subject: [PATCH 813/965] Update plugin.py

---
 web/utils/plugin.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index c26e2e7b7..be2e89de5 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -581,7 +581,6 @@ class plugin(object):
         cache_field = info['name']
         if plugin_list_status is not None:
             if cache_field in plugin_list_status:
-                # print(cache_field,plugin_list_status[cache_field])
                 if plugin_list_status[cache_field]:
                     return True
                 else: 

From 49f45314d133a8345fbe03f274f3d6e6d4bb86df Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 8 Dec 2024 23:04:23 +0800
Subject: [PATCH 814/965] Update plugin.py

---
 web/utils/plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index be2e89de5..f4b5f7791 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -587,7 +587,7 @@ class plugin(object):
                     return False
 
         data = self.run(info['name'], 'status', info['setup_version'])
-        if data[0] == 'start':
+        if data[0].strip() == 'start':
             return True
         else:
             return False

From 3b436a15c1d7537177969a52a6e6c6777567e84f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 8 Dec 2024 23:04:34 +0800
Subject: [PATCH 815/965] Update plugin.py

---
 web/utils/plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index f4b5f7791..92fef8aee 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -566,7 +566,7 @@ class plugin(object):
         if not info['setup']:
             return False
         data = self.run(info['name'], 'status', info['setup_version'])
-        if data[0] == 'start':
+        if data[0].strip() == 'start':
             return True
         else:
             return False

From 33353dd2a3053913a1418897993e54997673532d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 8 Dec 2024 23:55:44 +0800
Subject: [PATCH 816/965] Update plugin.py

---
 web/utils/plugin.py | 73 ++++++++++++++++++++++++++-------------------
 1 file changed, 42 insertions(+), 31 deletions(-)

diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index 92fef8aee..0eb74a267 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -418,13 +418,13 @@ class plugin(object):
             data_t = data.copy()
             data_t['title'] = data_t['title'] + '-' + data['versions'][index]
             data_t['versions'] = data['versions'][index]
-            pg = self.getPluginInfo(data_t)
+            pg = self.makePluginInfo(data_t)
             plugins_info.append(pg)
 
         return plugins_info
 
     # 构造插件基本信息
-    def getPluginInfo(self, info):
+    def makePluginInfo(self, info):
         checks = ''
         path = ''
         coexist = False
@@ -502,7 +502,7 @@ class plugin(object):
             for index in range(len(data_t)):
                 plugins.append(data_t[index])
         else:
-            pg = self.getPluginInfo(data)
+            pg = self.makePluginInfo(data)
             plugins.append(pg)
         return plugins
 
@@ -514,7 +514,7 @@ class plugin(object):
                 if data_t[index]['setup']:
                     plugins.append(data_t[index])
         else:
-            pg = self.getPluginInfo(data)
+            pg = self.makePluginInfo(data)
             if pg['setup']:
                 plugins.append(pg)
         return plugins
@@ -536,30 +536,35 @@ class plugin(object):
             return self.makeCoexistDataInstalled(data)
         return plugins_t
 
+    def getPluginInfo(self, name):
+        info = {}
+        path = self.__plugin_dir + '/' + name
+        info_path = path + '/info.json'
+        if not os.path.exists(info_path):
+            return info
+        try:
+            data = json.loads(mw.readFile(info_path))
+            return data
+        except Exception as e:
+            return info
 
     def getPluginList(self, name,
         keyword = None,
         type = None,
     ):
-        info = []
-        path = self.__plugin_dir + '/' + name
-        info_path = path + '/info.json'
-        if not os.path.exists(info_path):
-            return info
-
-        try:
-            data = json.loads(mw.readFile(info_path))
-        except Exception as e:
-            return info
+        infos = []
+        data = self.getPluginInfo(name)
+        if data is None or len(data) == 0:
+            return infos
         
         # 判断是否搜索
         if keyword != '' and not self.searchKey(data, keyword):
-            return info
+            return infos
 
         plugin_t = self.makeCoexistList(data, type)
         for index in range(len(plugin_t)):
-            info.append(plugin_t[index])
-        return info
+            infos.append(plugin_t[index])
+        return infos
 
     # 检查插件状态
     def checkStatusThreads(self, info, i):
@@ -578,10 +583,13 @@ class plugin(object):
             return False
 
         plugin_list_status = self.__plugin_status_data
-        cache_field = info['name']
         if plugin_list_status is not None:
-            if cache_field in plugin_list_status:
-                if plugin_list_status[cache_field]:
+            k = info['name']
+            if 'coexist' in info and info['coexist']:
+                k = info['title']
+            # print(k)
+            if k in plugin_list_status:
+                if plugin_list_status[k]:
                     return True
                 else: 
                     return False
@@ -633,10 +641,13 @@ class plugin(object):
             if not x['setup']:
                 continue
             data = self.run(x['name'], 'status', x['setup_version'])
+            k = x['name']
+            if 'coexist' in x and x['coexist']:
+                k = x['title']
             if data[0].strip() == 'start':
-                self.__plugin_status_data[x['name']] = True
+                self.__plugin_status_data[k] = True
             else:
-                self.__plugin_status_data[x['name']] = False
+                self.__plugin_status_data[k] = False
         thisdb.setOption(self.__plugin_status_cachekey, json.dumps(self.__plugin_status_data))
         return True
 
@@ -670,7 +681,6 @@ class plugin(object):
         size = 10, 
     ):
         info = []
-        # print(mw.getPluginDir())
         for name in os.listdir(self.__plugin_dir):
             if name.startswith('.'):
                 continue
@@ -680,11 +690,10 @@ class plugin(object):
 
         start = (page - 1) * size
         end = start + size
-        _info = info[start:end]
+        x = info[start:end]
 
-        # print(info)
-        _info = self.checkStatusMThreadsByCache(_info)
-        return (_info, len(info))
+        x = self.checkStatusMThreadsByCache(x)
+        return (x, len(info))
 
     def getList(
         self,
@@ -775,13 +784,16 @@ class plugin(object):
         return mw.returnData(False, '安装失败!')
 
     # [start|stop]操作,删除缓存!
-    def runByCache(self, name, func, data):
+    def runByCache(self, name, func, version):
         ppos = mw.getServerDir()+'/'+name
         if not os.path.exists(ppos):
             return
         data = thisdb.getOptionByJson(self.__plugin_status_cachekey, default={})
+        info = self.getPluginInfo(name)
+        if 'coexist' in info and info['coexist']:
+            name = info['title'] + '-'+ version
         if name in data:
-            del(data[name])
+            del(data[name])            
             thisdb.setOption(self.__plugin_status_cachekey, json.dumps(data))
 
     # shell/bash方式调用
@@ -806,8 +818,7 @@ class plugin(object):
         data = mw.execShell(py_cmd)
 
         if mw.inArray(['start','stop'], func):
-            print('dddddrun',func)
-            self.runByCache(name,func, data[0].strip())
+            self.runByCache(name, func, version)
 
         # print(data)
         if mw.isDebugMode():

From a14c4b566e820422fe3bbe3aaf08ebe0ddb23cbc Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 00:05:34 +0800
Subject: [PATCH 817/965] update

---
 web/admin/system/system.py |  2 +-
 web/utils/system/main.py   | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/web/admin/system/system.py b/web/admin/system/system.py
index febe77bcc..e51256639 100644
--- a/web/admin/system/system.py
+++ b/web/admin/system/system.py
@@ -107,7 +107,7 @@ def restart():
 @blueprint.route('/restart_server', endpoint='restart_server', methods=['POST'])
 @panel_login_required
 def restart_server():
-    mw.restartMw()
+    mw.restartServer()
     return mw.returnData(True, '面板已重启!')
 
 # 设置
diff --git a/web/utils/system/main.py b/web/utils/system/main.py
index 8ef66d4e5..4528829f0 100644
--- a/web/utils/system/main.py
+++ b/web/utils/system/main.py
@@ -17,6 +17,22 @@ import psutil
 
 import core.mw as mw
 
+from threading import Thread
+from time import sleep
+
+def mw_async(f):
+    def wrapper(*args, **kwargs):
+        thr = Thread(target=f, args=args, kwargs=kwargs)
+        thr.start()
+    return wrapper
+
+@mw_async
+def restartServer():
+    if not mw.isRestart():
+        return mw.returnData(False, '请等待所有安装任务完成再执行!')
+    mw.execShell("sync && init 6 &")
+    return mw.returnData(True, '命令发送成功!')
+
 def getEnvInfo():
     data = {}
     data['status'] = True

From c4727b90dad8c5c5bb248cb03b731f507f583fd4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 00:08:37 +0800
Subject: [PATCH 818/965] Update system.py

---
 web/admin/system/system.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/admin/system/system.py b/web/admin/system/system.py
index e51256639..7abda4980 100644
--- a/web/admin/system/system.py
+++ b/web/admin/system/system.py
@@ -107,8 +107,7 @@ def restart():
 @blueprint.route('/restart_server', endpoint='restart_server', methods=['POST'])
 @panel_login_required
 def restart_server():
-    mw.restartServer()
-    return mw.returnData(True, '面板已重启!')
+    return mw.restartServer()
 
 # 设置
 @blueprint.route('/set_control', endpoint='set_control', methods=['POST'])

From 0671455b592c6e602c575a8f20bf865c0b4b3207 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 00:10:10 +0800
Subject: [PATCH 819/965] update

---
 web/admin/system/system.py |  2 +-
 web/utils/system/main.py   | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/web/admin/system/system.py b/web/admin/system/system.py
index 7abda4980..1de47baf5 100644
--- a/web/admin/system/system.py
+++ b/web/admin/system/system.py
@@ -107,7 +107,7 @@ def restart():
 @blueprint.route('/restart_server', endpoint='restart_server', methods=['POST'])
 @panel_login_required
 def restart_server():
-    return mw.restartServer()
+    return sys.restartServer()
 
 # 设置
 @blueprint.route('/set_control', endpoint='set_control', methods=['POST'])
diff --git a/web/utils/system/main.py b/web/utils/system/main.py
index 4528829f0..853e0717d 100644
--- a/web/utils/system/main.py
+++ b/web/utils/system/main.py
@@ -33,6 +33,16 @@ def restartServer():
     mw.execShell("sync && init 6 &")
     return mw.returnData(True, '命令发送成功!')
 
+def getPid(self, pname):
+    try:
+        pids = psutil.pids()
+        for pid in pids:
+            if psutil.Process(pid).name() == pname:
+                return True
+        return False
+    except:
+        return False
+
 def getEnvInfo():
     data = {}
     data['status'] = True

From 3501323a12c8a37b8d2e07c4986fdb8716a1d4f0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 00:17:51 +0800
Subject: [PATCH 820/965] Update system.py

---
 web/admin/system/system.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/admin/system/system.py b/web/admin/system/system.py
index 1de47baf5..c1eb5c357 100644
--- a/web/admin/system/system.py
+++ b/web/admin/system/system.py
@@ -107,7 +107,10 @@ def restart():
 @blueprint.route('/restart_server', endpoint='restart_server', methods=['POST'])
 @panel_login_required
 def restart_server():
-    return sys.restartServer()
+    if mw.isAppleSystem():
+        return mw.returnData(False, "开发环境不可重起")
+    sys.restartServer()
+    return mw.returnData(True, '正在重启服务器!')
 
 # 设置
 @blueprint.route('/set_control', endpoint='set_control', methods=['POST'])

From b69c986dcd3cdb68b509c0cb4df9727abc6fac61 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 00:18:03 +0800
Subject: [PATCH 821/965] Update system.py

---
 web/admin/system/system.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/system/system.py b/web/admin/system/system.py
index c1eb5c357..8135c3ce3 100644
--- a/web/admin/system/system.py
+++ b/web/admin/system/system.py
@@ -108,7 +108,7 @@ def restart():
 @panel_login_required
 def restart_server():
     if mw.isAppleSystem():
-        return mw.returnData(False, "开发环境不可重起")
+        return mw.returnData(False, "开发环境不可重起!")
     sys.restartServer()
     return mw.returnData(True, '正在重启服务器!')
 

From f8e3df36c82dc6cb7e7b786f1274d983154d9c6f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 00:36:09 +0800
Subject: [PATCH 822/965] Update file.py

---
 web/utils/file.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/utils/file.py b/web/utils/file.py
index 582898353..885834732 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -141,6 +141,7 @@ def uncompress(sfile, dfile, path):
         return mw.returnData(False, '文件解压失败!:' + str(e))
 
 def setBatchData(path, stype, access, user, data):
+    from admin import session
     if stype == '1' or stype == '2':
         session['selected'] = {
             'path': path,
@@ -154,7 +155,7 @@ def setBatchData(path, stype, access, user, data):
         for key in json.loads(data):
             try:
                 filename = path + '/' + key
-                if not self.checkDir(filename):
+                if not checkDir(filename):
                     return mw.returnData(False, 'FILE_DANGER')
                 os.system('chmod -R ' + access + " '" + filename + "'")
                 os.system('chown -R ' + user + ':' + user + " '" + filename + "'")

From 06d2b381b29eeb0d83590b2e9412ab243a10f110 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 00:38:19 +0800
Subject: [PATCH 823/965] Update files.py

---
 web/admin/files/files.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/admin/files/files.py b/web/admin/files/files.py
index 7e6f3edc6..cfac1c373 100644
--- a/web/admin/files/files.py
+++ b/web/admin/files/files.py
@@ -37,6 +37,8 @@ def index():
 @blueprint.route('/check_exists_files', endpoint='check_exists_files', methods=['POST'])
 @panel_login_required
 def check_exists_files():
+    from admin import session
+    
     dfile = request.form.get('dfile', '')
     filename = request.form.get('filename', '')
     data = []

From 892b1144e19ede0c5d773cf885badd0dd999502c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 00:39:41 +0800
Subject: [PATCH 824/965] Update files.py

---
 web/admin/files/files.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/admin/files/files.py b/web/admin/files/files.py
index cfac1c373..3ce963588 100644
--- a/web/admin/files/files.py
+++ b/web/admin/files/files.py
@@ -10,6 +10,7 @@
 
 import os
 import time
+import json
 
 from flask import Blueprint, render_template
 from flask import request
@@ -37,8 +38,6 @@ def index():
 @blueprint.route('/check_exists_files', endpoint='check_exists_files', methods=['POST'])
 @panel_login_required
 def check_exists_files():
-    from admin import session
-    
     dfile = request.form.get('dfile', '')
     filename = request.form.get('filename', '')
     data = []

From 66c8900a3062ab0c55c88fba8681ba5cf3505ec2 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 00:47:05 +0800
Subject: [PATCH 825/965] update

---
 web/admin/files/files.py |  9 ++++++++
 web/utils/file.py        | 48 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/web/admin/files/files.py b/web/admin/files/files.py
index 3ce963588..4eac52208 100644
--- a/web/admin/files/files.py
+++ b/web/admin/files/files.py
@@ -60,6 +60,15 @@ def check_exists_files():
             data.append(tmp)
     return mw.returnData(True, 'ok', data)
 
+
+# 粘贴内容
+@blueprint.route('/batch_paste', endpoint='batch_paste', methods=['POST'])
+@panel_login_required
+def batch_paste():
+    path = request.form.get('path', '')
+    stype = request.form.get('type', '')
+    return file.batchPaste(path, stype)
+
 # 获取文件内容
 @blueprint.route('/copy_file', endpoint='copy_file', methods=['POST'])
 @panel_login_required
diff --git a/web/utils/file.py b/web/utils/file.py
index 885834732..33cb47843 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -200,6 +200,54 @@ def setBatchData(path, stype, access, user, data):
         mw.writeLog('文件管理', '批量删除成功!')
         return mw.returnData(True, '批量删除成功！')
 
+def batchPaste(path, stype):
+    from admin import session
+    if not checkDir(path):
+        return mw.returnData(False, '请不要花样作死!')
+    i = 0
+    myfiles = json.loads(session['selected']['data'])
+    l = len(myfiles)
+    if stype == '1':
+        for key in myfiles:
+            i += 1
+            mw.writeSpeed(key, i, l)
+            try:
+
+                sfile = session['selected'][
+                    'path'] + '/' + key
+                dfile = path + '/' + key
+
+                if os.path.isdir(sfile):
+                    shutil.copytree(sfile, dfile)
+                else:
+                    shutil.copyfile(sfile, dfile)
+                stat = os.stat(sfile)
+                os.chown(dfile, stat.st_uid, stat.st_gid)
+            except:
+                continue
+        msg = mw.getInfo('从[{1}]批量复制到[{2}]成功',(session['selected']['path'], path,))
+        mw.writeLog('文件管理', msg)
+    else:
+        for key in myfiles:
+            try:
+                i += 1
+                mw.writeSpeed(key, i, l)
+
+                sfile = session['selected'][
+                    'path'] + '/' + key
+                dfile = path + '/' + key
+
+                shutil.move(sfile, dfile)
+            except:
+                continue
+        msg = mw.getInfo('从[{1}]批量移动到[{2}]成功',(session['selected']['path'], path,))
+        mw.writeLog('文件管理', msg)
+    mw.writeSpeed(None, 0, 0)
+    errorCount = len(myfiles) - i
+    del(session['selected'])
+    msg = mw.getInfo('批量操作成功[{1}],失败[{2}]', (str(i), str(errorCount)))
+    return mw.returnData(True, msg)
+
 
 def copyDir(src_file, dst_file):
     if not os.path.exists(src_file):

From 6858a827f99a7ad3545382dd63a141d7b14f9b9d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 00:53:02 +0800
Subject: [PATCH 826/965] update

---
 web/admin/files/files.py | 12 ++++++++++-
 web/utils/file.py        | 45 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/web/admin/files/files.py b/web/admin/files/files.py
index 4eac52208..8a6109e73 100644
--- a/web/admin/files/files.py
+++ b/web/admin/files/files.py
@@ -69,7 +69,17 @@ def batch_paste():
     stype = request.form.get('type', '')
     return file.batchPaste(path, stype)
 
-# 获取文件内容
+# 压缩文件
+@blueprint.route('/zip', endpoint='zip', methods=['POST'])
+@panel_login_required
+def zip():
+    sfile = request.form.get('sfile', '')
+    dfile = request.form.get('dfile', '')
+    stype = request.form.get('type', '')
+    path = request.form.get('path', '')
+    return file.zip(sfile, dfile, stype, path)
+
+# 复制文件内容
 @blueprint.route('/copy_file', endpoint='copy_file', methods=['POST'])
 @panel_login_required
 def copy_file():
diff --git a/web/utils/file.py b/web/utils/file.py
index 33cb47843..c3b593c1b 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -249,6 +249,51 @@ def batchPaste(path, stype):
     return mw.returnData(True, msg)
 
 
+def zip(sfile, dfile, stype, path):
+    if sfile.find(',') == -1:
+        if not os.path.exists(path + '/' + sfile):
+            return mw.returnData(False, '指定文件不存在!')
+
+    try:
+        tmps = mw.getPanelDir() + '/logs/panel_exec.log'
+        if stype == 'zip':
+            mw.execShell("cd '" + path + "' && zip '" + dfile +
+                         "' -r '" + sfile + "' > " + tmps + " 2>&1")
+        else:
+            sfiles = ''
+            for sfile in sfile.split(','):
+                if not sfile:
+                    continue
+                sfiles += " '" + sfile + "'"
+            mw.execShell("cd '" + path + "' && tar -zcvf '" + dfile + "' " + sfiles + " > " + tmps + " 2>&1")
+        setFileAccept(dfile)
+        mw.writeLog("文件管理", '文件[{1}]压缩[{2}]成功!', (sfile, dfile))
+        return mw.returnData(True, '文件压缩成功!')
+    except:
+        return mw.returnData(False, '文件压缩失败!')
+
+def unzip(sfile, dfile, stype, path):
+    if not os.path.exists(sfile):
+        return mw.returnData(False, '指定文件不存在!')
+
+    try:
+        tmps = mw.getPanelDir() + '/logs/panel_exec.log'
+        if stype == 'zip':
+            mw.execShell("cd " + path + " && unzip -o -d '" + dfile + "' '" + sfile + "' > " + tmps + " 2>&1 &")
+        else:
+            sfiles = ''
+            for sfile in sfile.split(','):
+                if not sfile:
+                    continue
+                sfiles += " '" + sfile + "'"
+            mw.execShell("cd " + path + " && tar -zxvf " + sfiles + " -C " + dfile + " > " + tmps + " 2>&1 &")
+
+        setFileAccept(dfile)
+        mw.writeLog("文件管理", '文件[{1}]解压[{2}]成功!', (sfile, dfile))
+        return mw.returnData(True, '文件解压成功!')
+    except:
+        return mw.returnData(False, '文件解压失败!')
+
 def copyDir(src_file, dst_file):
     if not os.path.exists(src_file):
         return mw.returnData(False, '指定目录不存在!')

From 83711db1c8bcfcf41a1bc4d89c5606a26ad7b755 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 01:00:01 +0800
Subject: [PATCH 827/965] update

---
 web/admin/files/files.py |  9 +++++++++
 web/utils/file.py        | 25 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/web/admin/files/files.py b/web/admin/files/files.py
index 8a6109e73..a9f93d711 100644
--- a/web/admin/files/files.py
+++ b/web/admin/files/files.py
@@ -79,6 +79,15 @@ def zip():
     path = request.form.get('path', '')
     return file.zip(sfile, dfile, stype, path)
 
+# 文件权限查看
+@blueprint.route('/file_access', endpoint='file_access', methods=['POST'])
+@panel_login_required
+def file_access():
+    filename = request.form.get('filename', '')
+    data = file.getAccess(filename)
+    data['sys_users'] = file.getSysUserList()
+    return data
+
 # 复制文件内容
 @blueprint.route('/copy_file', endpoint='copy_file', methods=['POST'])
 @panel_login_required
diff --git a/web/utils/file.py b/web/utils/file.py
index c3b593c1b..78445d516 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -294,6 +294,17 @@ def unzip(sfile, dfile, stype, path):
     except:
         return mw.returnData(False, '文件解压失败!')
 
+def getAccess(filename):
+    data = {}
+    try:
+        stat = os.stat(filename)
+        data['chmod'] = str(oct(stat.st_mode)[-3:])
+        data['chown'] = pwd.getpwuid(stat.st_uid).pw_name
+    except:
+        data['chmod'] = 755
+        data['chown'] = 'www'
+    return data
+
 def copyDir(src_file, dst_file):
     if not os.path.exists(src_file):
         return mw.returnData(False, '指定目录不存在!')
@@ -649,6 +660,20 @@ def getAccess(fname):
         data['chown'] = 'www'
     return data
 
+def getSysUserList():
+    pwd_file = '/etc/passwd'
+    if os.path.exists(pwd_file):
+        content = mw.readFile(pwd_file)
+        clist = content.split('\n')
+        sys_users = []
+        for line in clist:
+            if line.find(":")<0:
+                continue
+            lines = line.split(":",1)
+            sys_users.append(lines[0])
+        return sys_users
+    return ['root','mysql','www']
+
 def fileDelete(path):
     if not os.path.exists(path):
         return mw.returnData(False, '指定文件不存在!')

From eb8886b4eb914e2ebfd3565b5126a1cfb86cd620 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 01:04:30 +0800
Subject: [PATCH 828/965] update

---
 web/admin/files/files.py | 13 +++++++++++++
 web/utils/file.py        | 17 +++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/web/admin/files/files.py b/web/admin/files/files.py
index a9f93d711..e114061d6 100644
--- a/web/admin/files/files.py
+++ b/web/admin/files/files.py
@@ -88,6 +88,19 @@ def file_access():
     data['sys_users'] = file.getSysUserList()
     return data
 
+# 设置权限
+@blueprint.route('/set_file_access', endpoint='set_file_access', methods=['POST'])
+@panel_login_required
+def set_file_access():
+    if mw.isAppleSystem():
+        return mw.returnData(True, '开发机不设置!')
+
+    filename = request.form.get('filename', '')
+    user = request.form.get('user', '')
+    access = request.form.get('access', '755')
+    return file.setFileAccess(filename, user, access)
+
+
 # 复制文件内容
 @blueprint.route('/copy_file', endpoint='copy_file', methods=['POST'])
 @panel_login_required
diff --git a/web/utils/file.py b/web/utils/file.py
index 78445d516..99466dbb4 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -660,6 +660,23 @@ def getAccess(fname):
         data['chown'] = 'www'
     return data
 
+def setFileAccess(filename,user,access):
+    sall = '-R'
+    try:
+        if not self.checkDir(filename):
+            return mw.returnData(False, '请不要花样作死')
+
+        if not os.path.exists(filename):
+            return mw.returnData(False, '指定文件不存在!')
+
+        os.system('chmod ' + sall + ' ' + access + " '" + filename + "'")
+        os.system('chown ' + sall + ' ' + user + ':' + user + " '" + filename + "'")
+        msg = mw.getInfo('设置[{1}]权限为[{2}]所有者为[{3}]', (filename, access, user,))
+        mw.writeLog('文件管理', msg)
+        return mw.returnData(True, '设置成功!')
+    except:
+        return mw.returnData(False, '设置失败!')
+
 def getSysUserList():
     pwd_file = '/etc/passwd'
     if os.path.exists(pwd_file):

From 47569c475f7cce24b8ef6d495e14fcb7633589c9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 01:07:22 +0800
Subject: [PATCH 829/965] Update file.py

---
 web/utils/file.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/utils/file.py b/web/utils/file.py
index 99466dbb4..42244ba48 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -663,7 +663,7 @@ def getAccess(fname):
 def setFileAccess(filename,user,access):
     sall = '-R'
     try:
-        if not self.checkDir(filename):
+        if not checkDir(filename):
             return mw.returnData(False, '请不要花样作死')
 
         if not os.path.exists(filename):
@@ -674,8 +674,8 @@ def setFileAccess(filename,user,access):
         msg = mw.getInfo('设置[{1}]权限为[{2}]所有者为[{3}]', (filename, access, user,))
         mw.writeLog('文件管理', msg)
         return mw.returnData(True, '设置成功!')
-    except:
-        return mw.returnData(False, '设置失败!')
+    except Exception as e:
+        return mw.returnData(False, '设置失败!'+str(e))
 
 def getSysUserList():
     pwd_file = '/etc/passwd'

From 7bb7ce2ef36bae7f399bb29458056fec65438b52 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 01:36:51 +0800
Subject: [PATCH 830/965] Update panel_task.py

---
 panel_task.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/panel_task.py b/panel_task.py
index a9abeaa62..34dbbab97 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -156,7 +156,6 @@ def panelPluginStatusCheck():
             start_t = time.time()
             plugin.instance().autoCachePluginStatus()
             end_t = time.time()
-            print('cos:', end_t - start_t)
             time.sleep(60)
     except Exception as ex:
         print('panelPluginStatusCheck:',mw.getTracebackInfo())

From f0071b5e82a9f9c6037074f33d5ff7c53bec30c3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 15:52:21 +0800
Subject: [PATCH 831/965] Update panel_task.py

---
 panel_task.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/panel_task.py b/panel_task.py
index 34dbbab97..344637628 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -153,9 +153,9 @@ def panelPluginStatusCheck():
     from  utils.plugin import plugin
     try:
         while True:
-            start_t = time.time()
+            # start_t = time.time()
             plugin.instance().autoCachePluginStatus()
-            end_t = time.time()
+            # end_t = time.time()
             time.sleep(60)
     except Exception as ex:
         print('panelPluginStatusCheck:',mw.getTracebackInfo())

From 5684fc217f7f3daa3428130640861dd6341f170d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 15:57:26 +0800
Subject: [PATCH 832/965] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 9ada4c505..28d44a20b 100644
--- a/README.md
+++ b/README.md
@@ -116,6 +116,7 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 - PHP84正式版。
 - 加入alist插件。
 - 数据管理-常用命令。
+- 插件读取优化(加入缓存+定时检查状态)。
 - 常规更新。
 
 ### JSDelivr安装地址

From e55f79b9b8a7fd535bc2677ad0169014cec49b5f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 15:57:46 +0800
Subject: [PATCH 833/965] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 28d44a20b..81775665e 100644
--- a/README.md
+++ b/README.md
@@ -112,7 +112,7 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 
 ### 版本更新 0.18.0
 
-- 重新架构面面板。
+- 重新架构面板。
 - PHP84正式版。
 - 加入alist插件。
 - 数据管理-常用命令。

From 2e4fe6e434e2a2c7b742e4df7fdff4deaae48c1b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 17:28:34 +0800
Subject: [PATCH 834/965] Update site.py

---
 web/utils/site.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 56b0c333e..3b6b9af5f 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -2172,7 +2172,7 @@ location ^~ {from} {\n\
         top_domain =  s[last_index-1]+'.'+s[last_index]
         return top_domain
 
-    def createAcmeDns(self, site_name, domains, dnspai, wildcard_domain, force, renew):
+    def createAcmeDns(self, site_name, domains, email, dnspai, wildcard_domain, force, renew):
         dnsapi_option = thisdb.getOptionByJson('dnsapi', default={})
         if not dnspai in dnsapi_option:
             return mw.returnData(False, dnspai+'未设置')
@@ -2189,7 +2189,7 @@ location ^~ {from} {\n\
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin:%s
 export PATH
 ''' % (acme_dir,)
-
+            cmd += "acme.sh --register-account -m "+email+" \n"
             cmd += self.getDnsapiExportVar(dnsapi_data)
             if wildcard_domain == 'true':
                 top_domain = self.getDomainRootName(d)
@@ -2273,7 +2273,7 @@ export PATH
         if apply_type == 'file':
             return self.createAcmeFile(site_name, domains, email,force,renew)
         elif apply_type == 'dns':
-            return self.createAcmeDns(site_name, domains, dnspai, wildcard_domain,force, renew)
+            return self.createAcmeDns(site_name, domains, email, dnspai, wildcard_domain,force, renew)
         return mw.returnData(False, '异常请求')
 
     def createLet(self, site_name, domains, force, renew, apply_type, dnspai, email, wildcard_domain):

From 8e61c89bd3c8a14d07d5e94aea5cd109e93a0aee Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 17:31:25 +0800
Subject: [PATCH 835/965] Update site.py

---
 web/utils/site.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 3b6b9af5f..f4d9b6117 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -2248,13 +2248,16 @@ export PATH
         mw.restartWeb()
         return mw.returnData(True, '证书已更新!', result)
 
-    def createAcme(self, site_name, domains,force,renew, apply_type, dnspai, email, wildcard_domain):
+    def createAcme(self, site_name, domains, force, renew, apply_type, dnspai, email, wildcard_domain):
         domains = json.loads(domains)
         if len(domains) < 1:
             return mw.returnData(False, '请选择域名')
         if email.strip() != '':
             thisdb.setOption('ssl_email', email)
 
+        if email.strip() == '':
+            email = mw.getRandomString(10)+"."+mw.getRandomString(3) + '@google.com'
+
         # 检测acme是否安装
         acme_dir = mw.getAcmeDir()
         if not os.path.exists(acme_dir):

From 2bebf3503f1af52c4b4984583be36480bad68370 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 17:32:00 +0800
Subject: [PATCH 836/965] Update site.py

---
 web/utils/site.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index f4d9b6117..000b328f4 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -2256,7 +2256,7 @@ export PATH
             thisdb.setOption('ssl_email', email)
 
         if email.strip() == '':
-            email = mw.getRandomString(10)+"."+mw.getRandomString(3) + '@google.com'
+            email = mw.getRandomString(10)+"."+mw.getRandomString(3) + '@gmail.com'
 
         # 检测acme是否安装
         acme_dir = mw.getAcmeDir()

From 56c4710c55b9e53050e7d79ca366b593bfc1d295 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 17:37:16 +0800
Subject: [PATCH 837/965] Update site.py

---
 web/utils/site.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 000b328f4..a5068aec5 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -2200,9 +2200,9 @@ export PATH
 
             log_file = self.acmeLogFile()
             cmd +=  ' >> ' + log_file
-            print(cmd)
+            # print(cmd)
             result = mw.execShell(cmd)
-            print(result)
+            # print(result)
 
             # acme源的ssl证书
             src_path = mw.getAcmeDomainDir(d)

From 10dffd71f7cc0993abf414f0cb6e6388e0754a73 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 17:48:13 +0800
Subject: [PATCH 838/965] update

---
 web/thisdb/domain.py | 10 +++++-----
 web/utils/site.py    | 13 ++++++-------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/web/thisdb/domain.py b/web/thisdb/domain.py
index e78995cfb..799fc9202 100644
--- a/web/thisdb/domain.py
+++ b/web/thisdb/domain.py
@@ -20,19 +20,19 @@ def getDomainCountBySiteId(site_id):
     # .debug(True)
     return mw.M('domain').where("pid=?", (site_id,)).count()
 
-def addDomain(pid, name, port):
+def addDomain(site_id, name, port):
     now_time = mw.getDateFromNow()
     insert_data = {
-        'pid': pid,
+        'pid': site_id,
         'name': name,
         'port':port,
         'add_time': now_time,
     }
     return mw.M('domain').insert(insert_data)
-
-def getDomainByPid(pid):
+    
+def getDomainBySiteId(site_id):
     # .debug(True)
-    return mw.M('domain').field(__FIELD).where("pid=?", (pid,)).select()
+    return mw.M('domain').field(__FIELD).where("pid=?", (site_id,)).select()
     
 
 def deleteDomainId(domain_id):
diff --git a/web/utils/site.py b/web/utils/site.py
index a5068aec5..96899c308 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -585,8 +585,8 @@ class sites(object):
         return data
 
     # 获取域名列表
-    def getDomain(self, pid):
-        data =  thisdb.getDomainByPid(pid)
+    def getDomain(self, site_id):
+        data =  thisdb.getDomainBySiteId(site_id)
         return data
 
     # 获取日志内容
@@ -1065,7 +1065,7 @@ class sites(object):
                 data['none'] = False
         else:
             data['fix'] = 'gif|jpg|jpeg|png|bmp|swf|js|css|ttf|woff2'
-            domains = thisdb.getDomainByPid(site_id)
+            domains = thisdb.getDomainBySiteId(site_id)
             tmp = []
             for domain in domains:
                 tmp.append(domain['name'])
@@ -1711,8 +1711,6 @@ location ^~ {from} {\n\
 
     def getSsl(self, site_name, ssl_type):
 
-        path = self.sslDir + '/' + site_name
-
         file = self.getHostConf(site_name)
         content = mw.readFile(file)
 
@@ -1725,9 +1723,10 @@ location ^~ {from} {\n\
 
         to_https = self.isToHttps(site_name)
 
-        info = thisdb.getSitesByName(site_name)
-        domains = mw.M('domain').field('name').where("pid=?", (info['id'],)).select()
+        site_info = thisdb.getSitesByName(site_name)
+        domains = thisdb.getDomainBySiteId(site_info['id'])
 
+        path = self.sslDir + '/' + site_name
         csr_path = path + '/fullchain.pem'  # 生成证书路径
         key_path = path + '/privkey.pem'    # 密钥文件路径
 

From 4cc72c716439ac8a8e1204b0e999da75a833f12b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 18:01:25 +0800
Subject: [PATCH 839/965] update

---
 web/core/mw.py    |  2 +-
 web/utils/site.py | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/web/core/mw.py b/web/core/mw.py
index b3e56bc58..012922b50 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -322,7 +322,7 @@ def readFile(filename):
         fp.close()
         return fBody
     except Exception as e:
-        print(e)
+        print('readFile:',str(e))
         return False
 
 def writeFile(filename, content, mode='w+'):
diff --git a/web/utils/site.py b/web/utils/site.py
index 96899c308..b2f49e44f 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1703,8 +1703,6 @@ location ^~ {from} {\n\
         file = self.getHostConf(site_name)
         conf = mw.readFile(file)
         if conf:
-            # if conf.find('HTTP_TO_HTTPS_START') != -1:
-            #     return True
             if conf.find('$server_port !~ 443') != -1:
                 return True
         return False
@@ -1727,17 +1725,18 @@ location ^~ {from} {\n\
         domains = thisdb.getDomainBySiteId(site_info['id'])
 
         path = self.sslDir + '/' + site_name
-        csr_path = path + '/fullchain.pem'  # 生成证书路径
-        key_path = path + '/privkey.pem'    # 密钥文件路径
-
-        cert_data = None
         if ssl_type == 'lets':
-            csr_path = self.sslLetsDir + '/' + site_name + '/fullchain.pem'  # 生成证书路径
-            key_path = self.sslLetsDir + '/' + site_name + '/privkey.pem'    # 密钥文件路径
+            csr_path = self.sslLetsDir + '/' + site_name + '/fullchain.pem' # Let生成证书路径
+            key_path = self.sslLetsDir + '/' + site_name + '/privkey.pem'   # Let密钥文件路径
         elif ssl_type == 'acme':
-            acme_dir = mw.getAcmeDomainDir(site_name)
-            csr_path = acme_dir + '/fullchain.cer'              # ACME生成证书路径
-            key_path = acme_dir + '/' + site_name + '.key'      # ACME密钥文件路径
+            csr_path = path + '/fullchain.pem' 
+            key_path = path + '/privkey.pem'
+            # acme_dir = mw.getAcmeDomainDir(site_name)
+            # csr_path = acme_dir + '/fullchain.cer'            # ACME生成证书路径
+            # key_path = acme_dir + '/' + site_name + '.key'    # ACME密钥文件路径
+        else:
+            csr_path = path + '/fullchain.pem'                              # 生成证书路径
+            key_path = path + '/privkey.pem'                                # 密钥文件路径
 
         key = ''
         if os.path.exists(key_path):

From 7aa0bf59f219d8c349b1184f5fae6874a584e1c7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 18:07:31 +0800
Subject: [PATCH 840/965] Update site.py

---
 web/utils/site.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index b2f49e44f..88e3c8b09 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1708,7 +1708,6 @@ location ^~ {from} {\n\
         return False
 
     def getSsl(self, site_name, ssl_type):
-
         file = self.getHostConf(site_name)
         content = mw.readFile(file)
 
@@ -1900,27 +1899,27 @@ location ^~ {from} {\n\
             {"name":"dns_dp", "title":'dnspod/国内', 'key':'DP_Id:DP_Key','help':'DnsPod后台》用户中心》安全设置，开启API Token'},
             {"name":"dns_dpi", "title":'dnspod/国际', 'key':'DPI_Id:DPI_Key','help':'DnsPod后台》用户中心》安全设置，开启API Token'},
             {"name":"dns_tencent", "title":"腾讯云DNS", 'key':'Tencent_SecretId:Tencent_SecretKey', 'help':'腾讯云后台获取通行证'},
-            # {"name":"dns_gd", "title":'GoDaddy', 'key':'GD_Key:GD_Secret'},
+            {"name":"dns_gd", "title":'GoDaddy', 'key':'GD_Key:GD_Secret'},
             # {"name":"dns_pdns", "title":'PowerDNS', 'key':'PDNS_Url:PDNS_ServerId:PDNS_Token:PDNS_Ttl'},
             # {"name":"dns_lua", "title":'LuaDNS', 'key':'LUA_Key:LUA_Email'},
             # {"name":"dns_me", "title":'DNSMadeEasy', 'key':'ME_Key:ME_Secret'},
-            # {"name":"dns_aws", "title":'Amazon Route53', 'key':'AWS_ACCESS_KEY_ID:AWS_SECRET_ACCESS_KEY'},
+            {"name":"dns_aws", "title":'Amazon Route53', 'key':'AWS_ACCESS_KEY_ID:AWS_SECRET_ACCESS_KEY'},
             # {"name":"dns_ispconfig", "title":'ISPConfig', 'key':'ISPC_User:ISPC_Password:ISPC_Api:ISPC_Api_Insecure'},
             # {"name":"dns_ad", "title":'Alwaysdata', 'key':'AD_API_KEY'},
-            # {"name":"dns_linode_v4", "title":'Linode', 'key':'LINODE_V4_API_KEY'},
+            {"name":"dns_linode_v4", "title":'Linode', 'key':'LINODE_V4_API_KEY'},
             # {"name":"dns_freedns", "title":'FreeDNS', 'key':'FREEDNS_User:FREEDNS_Password'},
             # {"name":"dns_cyon", "title":'cyon.ch', 'key':'CY_Username:CY_Password:CY_OTP_Secret'},
             # {"name":"dns_gandi_livedns", "title":'LiveDNS', 'key':'GANDI_LIVEDNS_TOKEN'},
             # {"name":"dns_knot", "title":'Knot', 'key':'KNOT_SERVER:KNOT_KEY'},
-            # {"name":"dns_dgon", "title":'DigitalOcean', 'key':'DO_API_KEY'},
+            {"name":"dns_dgon", "title":'DigitalOcean', 'key':'DO_API_KEY'},
             # {"name":"dns_cloudns", "title":'ClouDNS.net', 'key':'CLOUDNS_SUB_AUTH_ID:CLOUDNS_AUTH_PASSWORD'},
-            # {"name":"dns_namesilo", "title":'Namesilo', 'key':'Namesilo_Key'},
-            # {"name":"dns_azure", "title":'Azure', 'key':'AZUREDNS_SUBSCRIPTIONID:AZUREDNS_TENANTID:AZUREDNS_APPID:AZUREDNS_CLIENTSECRET'},
+            {"name":"dns_namesilo", "title":'Namesilo', 'key':'Namesilo_Key'},
+            {"name":"dns_azure", "title":'Azure', 'key':'AZUREDNS_SUBSCRIPTIONID:AZUREDNS_TENANTID:AZUREDNS_APPID:AZUREDNS_CLIENTSECRET'},
             # {"name":"dns_selectel", "title":'selectel.com', 'key':'SL_Key'},
             # {"name":"dns_zonomi", "title":'zonomi.com', 'key':'ZM_Key'},
             # {"name":"dns_kinghost", "title":'KingHost', 'key':'KINGHOST_Username:KINGHOST_Password'},
             # {"name":"dns_zilore", "title":'Zilore', 'key':'Zilore_Key'},
-            # {"name":"dns_gcloud", "title":'Google Cloud DNS', 'key':'CLOUDSDK_ACTIVE_CONFIG_NAME'},
+            {"name":"dns_gcloud", "title":'Google Cloud DNS', 'key':'CLOUDSDK_ACTIVE_CONFIG_NAME'},
             # {"name":"dns_mydnsjp", "title":'MyDNS.JP', 'key':'MYDNSJP_MasterID:MYDNSJP_Password'},
             # {"name":"dns_doapi", "title":'do.de', 'key':'DO_LETOKEN'},
             # {"name":"dns_online", "title":'Online', 'key':'ONLINE_API_KEY'},

From d26e2fb06f095b3b67d8c4ed11ddee284d05fd4c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 18:08:15 +0800
Subject: [PATCH 841/965] Update site.py

---
 web/utils/site.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 88e3c8b09..30ce0e994 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1939,7 +1939,7 @@ location ^~ {from} {\n\
             data = {}
             if dname in dnsapi_data:
                 dnsapi_option[i]['data'] = dnsapi_data[dname]
-                dnsapi_option[i]['title'] = dnsapi_option[i]['title'] + '[已配置]'
+                dnsapi_option[i]['title'] = dnsapi_option[i]['title'] + ' *** [已配置]'
             else:
                 t = {}
                 for field in keys:

From 2e3d5fda4437b87ebfeea4a6dbc1694b511e8ca9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 18:21:58 +0800
Subject: [PATCH 842/965] Update site.py

---
 web/utils/site.py | 96 +++++++++++++++++++++++------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 30ce0e994..0f1d035d1 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -509,62 +509,62 @@ class sites(object):
     def setSslConf(self, site_name):
         file = self.getHostConf(site_name)
         conf = mw.readFile(file)
+        if not conf:
+            return mw.returnData(False, '站点[%s]配置异常!'.format(site_name))
 
         version = mw.getOpVer()
-
         keyPath = self.sslDir + '/' + site_name + '/privkey.pem'
         certPath = self.sslDir + '/' + site_name + '/fullchain.pem'
-        if conf:
-            if conf.find('ssl_certificate') == -1:
-                # ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE;
-                # add_header Alt-Svc 'h3=":443";ma=86400,h3-29=":443";ma=86400';
-                http3Header = """
-    add_header Strict-Transport-Security "max-age=63072000";
-    add_header Alt-Svc 'h3=":443";ma=86400';
+
+        if conf.find('ssl_certificate') == -1:
+            # ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE;
+            # add_header Alt-Svc 'h3=":443";ma=86400,h3-29=":443";ma=86400';
+            http3Header = """
+add_header Strict-Transport-Security "max-age=63072000";
+add_header Alt-Svc 'h3=":443";ma=86400';
 """
-                if not version.startswith('1.25') or version.startswith('1.27'):
-                    http3Header = '';
+            if not version.startswith('1.25') or version.startswith('1.27'):
+                http3Header = '';
 
-                sslStr = """#error_page 404/404.html;
-    ssl_certificate    %s;
-    ssl_certificate_key  %s;
-    ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
-    ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305;
-    ssl_prefer_server_ciphers on;
-    ssl_session_cache shared:SSL:10m;
-    ssl_session_timeout 10m;
-    %s
-    error_page 497  https://$host$request_uri;""" % (certPath, keyPath, http3Header)
-            if(conf.find('ssl_certificate') != -1):
-                return mw.returnData(True, 'SSL开启成功!')
+            sslStr = """#error_page 404/404.html;
+ssl_certificate    %s;
+ssl_certificate_key  %s;
+ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305;
+ssl_prefer_server_ciphers on;
+ssl_session_cache shared:SSL:10m;
+ssl_session_timeout 10m;
+%s
+error_page 497  https://$host$request_uri;""" % (certPath, keyPath, http3Header)
+        if(conf.find('ssl_certificate') != -1):
+            return mw.returnData(True, 'SSL开启成功!')
 
-            conf = conf.replace('#error_page 404/404.html;', sslStr)
+        conf = conf.replace('#error_page 404/404.html;', sslStr)
 
-            rep = r"listen\s+([0-9]+)\s*[default_server|reuseport]*;"
-            tmp = re.findall(rep, conf)
-            if not mw.inArray(tmp, '443'):
-                listen = re.search(rep, conf).group()
-                
-                if version.startswith('1.25') or version.startswith('1.27'):
-                    http_ssl = "\n\tlisten 443 ssl;"
-                    http_ssl = http_ssl + "\n\tlisten [::]:443 ssl;"
-                    http_ssl = http_ssl + "\n\thttp2 on;"
-                else:
-                    http_ssl = "\n\tlisten 443 ssl;"
-                    http_ssl = http_ssl + "\n\tlisten [::]:443 ssl;"
+        rep = r"listen\s+([0-9]+)\s*[default_server|reuseport]*;"
+        tmp = re.findall(rep, conf)
+        if not mw.inArray(tmp, '443'):
+            listen = re.search(rep, conf).group()
+            
+            if version.startswith('1.25') or version.startswith('1.27'):
+                http_ssl = "\n\tlisten 443 ssl;"
+                http_ssl = http_ssl + "\n\tlisten [::]:443 ssl;"
+                http_ssl = http_ssl + "\n\thttp2 on;"
+            else:
+                http_ssl = "\n\tlisten 443 ssl;"
+                http_ssl = http_ssl + "\n\tlisten [::]:443 ssl;"
 
 
-                conf = conf.replace(listen, listen + http_ssl)
-
-            mw.backFile(file)
-            mw.writeFile(file, conf)
-            isError = mw.checkWebConfig()
-            if(isError != True):
-                mw.restoreFile(file)
-                return mw.returnData(False, '证书错误: <br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>')
-
-        self.saveCert(keyPath, certPath)
+            conf = conf.replace(listen, listen + http_ssl)
 
+        mw.backFile(file)
+        mw.writeFile(file, conf)
+        isError = mw.checkWebConfig()
+        if not isError:
+            mw.restoreFile(file)
+            return mw.returnData(False, '证书错误: <br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>')
+    
+        self.saveCert(site_name, keyPath, certPath)
         msg = mw.getInfo('网站[{1}]开启SSL成功!', (site_name,))
         mw.writeLog('网站管理', msg)
 
@@ -1758,7 +1758,7 @@ location ^~ {from} {\n\
         }
         return mw.returnData(True, 'OK', data)
 
-    def saveCert(self, keyPath, certPath):
+    def saveCert(self, site_name, keyPath, certPath):
         try:
             certInfo = mw.getCertName(certPath)
             if not certInfo:
@@ -1787,7 +1787,7 @@ location ^~ {from} {\n\
                 keyPath = vpath + '/' + d + '/privkey.pem'
                 certPath = vpath + '/' + d + '/fullchain.pem'
                 if os.path.exists(keyPath) and os.path.exists(certPath):
-                    self.saveCert(keyPath, certPath)
+                    self.saveCert(d, keyPath, certPath)
 
                 mpath = vpath + '/' + d + '/info.json'
                 if not os.path.exists(mpath):
@@ -2172,7 +2172,7 @@ location ^~ {from} {\n\
     def createAcmeDns(self, site_name, domains, email, dnspai, wildcard_domain, force, renew):
         dnsapi_option = thisdb.getOptionByJson('dnsapi', default={})
         if not dnspai in dnsapi_option:
-            return mw.returnData(False, dnspai+'未设置')
+            return mw.returnData(False, '['+dnspai+']未设置!')
 
         dnsapi_data = dnsapi_option[dnspai]
         for k in dnsapi_data:

From 41a76e1ac6ffda2a7120274c07dffe85d4e2a45f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 18:22:39 +0800
Subject: [PATCH 843/965] Update site.py

---
 web/utils/site.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 0f1d035d1..9efafaae6 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1763,7 +1763,7 @@ location ^~ {from} {\n\
             certInfo = mw.getCertName(certPath)
             if not certInfo:
                 return mw.returnData(False, '证书解析失败!')
-            vpath = self.sslDir + '/' + certInfo['subject'].strip()
+            vpath = self.sslDir + '/' + site_name
             if not os.path.exists(vpath):
                 os.system('mkdir -p ' + vpath)
             mw.writeFile(vpath + '/privkey.pem', mw.readFile(keyPath))

From 5452ee3229832247ca55ce44a6f934aaf33e7ad8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 18:24:12 +0800
Subject: [PATCH 844/965] Update site.py

---
 web/utils/site.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 9efafaae6..f983e37dd 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1939,7 +1939,7 @@ location ^~ {from} {\n\
             data = {}
             if dname in dnsapi_data:
                 dnsapi_option[i]['data'] = dnsapi_data[dname]
-                dnsapi_option[i]['title'] = dnsapi_option[i]['title'] + ' *** [已配置]'
+                dnsapi_option[i]['title'] = dnsapi_option[i]['title'] + ' - [已配置]'
             else:
                 t = {}
                 for field in keys:

From f11b8637bb994fe3cf7d5c760a36a357d43e4edd Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 18:34:30 +0800
Subject: [PATCH 845/965] update

---
 web/admin/site/ssl.py | 16 ++++++++++++++++
 web/utils/site.py     | 28 ++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/web/admin/site/ssl.py b/web/admin/site/ssl.py
index a7cdd4bc4..5533ae972 100644
--- a/web/admin/site/ssl.py
+++ b/web/admin/site/ssl.py
@@ -81,6 +81,22 @@ def set_dnsapi():
     data = request.form.get('data')
     return MwSites.instance().setDnsapi(type,data)
 
+# 设置证书到站点
+@blueprint.route('/set_cert_to_site', endpoint='set_cert_to_site', methods=['GET','POST'])
+@panel_login_required
+def set_cert_to_site():
+    site_name = request.form.get('siteName', '')
+    cert_name = request.form.get('certName', '')
+    return MwSites.instance().setCertToSite(site_name, cert_name)
+
+
+@blueprint.route('/remove_cert', endpoint='remove_cert', methods=['GET','POST'])
+@panel_login_required
+def remove_cert():
+    cert_name = request.form.get('certName', '')
+    return MwSites.instance().removeCert(cert_name)
+
+
 
 
 
diff --git a/web/utils/site.py b/web/utils/site.py
index f983e37dd..92fdfbfa1 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -2356,6 +2356,34 @@ export PATH
         mw.restartWeb()
         return mw.returnData(data['status'], data['msg'], result)
 
+    def setCertToSite(self, site_name, cert_name):
+        certName = request.form.get('certName', '')
+        siteName = request.form.get('siteName', '')
+        try:
+            path = self.sslDir + '/' + site_name.strip()
+            if not os.path.exists(path):
+                return mw.returnData(False, '证书不存在!')
+
+            result = self.setSslConf(siteName)
+            if not result['status']:
+                return result
+
+            mw.restartWeb()
+            mw.writeLog('网站管理', '证书已部署!')
+            return mw.returnData(True, '证书已部署!')
+        except Exception as ex:
+            return mw.returnData(False, '设置错误:' + str(ex))
+
+    def removeCert(self, cert_name):
+        try:
+            path = self.sslDir + '/' + cert_name
+            if not os.path.exists(path):
+                return mw.returnData(False, '证书已不存在!')
+            os.system("rm -rf " + path)
+            return mw.returnData(True, '证书已删除!')
+        except Exception as ex:
+            return mw.returnData(False, '证书删除失败:'+str(ex))
+
     def getBackup(self,site_id,page=1,size=10):
         site_info = thisdb.getSitesById(site_id)
         info = thisdb.getBackupPage(site_id, page, size)

From 017d96872a1573c54102e7e8cdad67b2f666fa78 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 18:37:25 +0800
Subject: [PATCH 846/965] Update site.py

---
 web/utils/site.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 92fdfbfa1..ec2e6752f 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -2357,8 +2357,6 @@ export PATH
         return mw.returnData(data['status'], data['msg'], result)
 
     def setCertToSite(self, site_name, cert_name):
-        certName = request.form.get('certName', '')
-        siteName = request.form.get('siteName', '')
         try:
             path = self.sslDir + '/' + site_name.strip()
             if not os.path.exists(path):

From f13a0c68dcfaf310d36d76cb9c46e83405d621f5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 18:38:39 +0800
Subject: [PATCH 847/965] Update site.py

---
 web/utils/site.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index ec2e6752f..c208c0029 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -2362,7 +2362,7 @@ export PATH
             if not os.path.exists(path):
                 return mw.returnData(False, '证书不存在!')
 
-            result = self.setSslConf(siteName)
+            result = self.setSslConf(site_name)
             if not result['status']:
                 return result
 

From 6b7752e14afe4b374f3683fa10b7749eeb32bf4a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 18:45:20 +0800
Subject: [PATCH 848/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index d69c2737b..d69ce9dcb 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -8,11 +8,6 @@ import re
 import pymongo
 import json
 
-web_dir = os.getcwd() + "/web"
-if os.path.exists(web_dir):
-    sys.path.append(web_dir)
-    os.chdir(web_dir)
-
 import core.mw as mw
 
 def singleton(cls):

From 7b925e550446828d6fa50b192fe1d5a9290f8457 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 18:46:08 +0800
Subject: [PATCH 849/965] Update app.js

---
 plugins/data_query/static/js/app.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index 69f9cbe78..74d49f332 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -251,6 +251,7 @@ function initTabMySQL(){
     mysqlGetDbList();
 
     mysqlProcessList();
+    clearInterval(mysql_timer);
     var mysql_timer = setInterval(function(){
         var name = $('#mysql_list_tab .tab-nav span.on').data('name');
         mysqlRunMysqlTab(name);
@@ -261,7 +262,7 @@ function initTabMySQL(){
         }
     },2000);
 
-    $('#mysql_list_tab .tab-nav span').click(function(){
+    $('#mysql_list_tab .tab-nav span').unbind('click').click(function(){
         $('#mysql_list_tab .tab-nav span').removeClass('on');
         $(this).addClass('on');
         var name = $(this).data('name');

From 5427a2b1eec63799dbc2818c3d7e7342a2600f9b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 18:49:34 +0800
Subject: [PATCH 850/965] Update nosql_redis.py

---
 plugins/data_query/nosql_redis.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/plugins/data_query/nosql_redis.py b/plugins/data_query/nosql_redis.py
index 8a3e10f4a..e9935f211 100755
--- a/plugins/data_query/nosql_redis.py
+++ b/plugins/data_query/nosql_redis.py
@@ -14,10 +14,6 @@ if os.path.exists(web_dir):
 
 import core.mw as mw
 
-
-# def getPluginName():
-#     return 'data_query'
-
 def singleton(cls):
     _instance = {}
 
@@ -47,7 +43,8 @@ class nosqlRedis():
 
         if self.__DB_HOST in ['127.0.0.1', 'localhost']:
             redis_path = "{}/redis".format(mw.getServerDir())
-            if not os.path.exists(redis_path): return False
+            if not os.path.exists(redis_path):
+                return False
 
         if not self.__DB_LOCAL:
             self.__DB_PASS = self.__config['requirepass']
@@ -75,7 +72,7 @@ class nosqlRedis():
         keys = ["bind", "port", "timeout", "maxclients", "databases", "requirepass", "maxmemory"]
         for k in keys:
             v = ""
-            rep = "\n%s\s+(.+)" % k
+            rep = r"\n%s\s+(.+)" % k
             group = re.search(rep, redis_conf)
             if not group:
                 if k == "maxmemory":

From ca52d5bf6541287691782e438c321b20971dfd9a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 18:53:47 +0800
Subject: [PATCH 851/965] Update app.js

---
 plugins/data_query/static/js/app.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index 74d49f332..c3aa92542 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -249,8 +249,6 @@ function initTabMemcached(){
 
 function initTabMySQL(){
     mysqlGetDbList();
-
-    mysqlProcessList();
     clearInterval(mysql_timer);
     var mysql_timer = setInterval(function(){
         var name = $('#mysql_list_tab .tab-nav span.on').data('name');

From 973cbf4f9dc786380d3cf020a1b7e3bc94a2de62 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 19:20:06 +0800
Subject: [PATCH 852/965] update

---
 plugins/data_query/sql_mysql.py     | 25 +++++++++++++++++++++-
 plugins/data_query/static/js/app.js | 32 ++++++++++++++++++++++++++++-
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index d69ce9dcb..44c6436b4 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -38,7 +38,6 @@ class nosqlMySQL():
 
 
     def conn(self):
-
         if self.__DB_HOST in ['127.0.0.1', 'localhost']:
             my_path = "{}/mysql".format(mw.getServerDir())
             if not os.path.exists(my_path): return False
@@ -114,7 +113,22 @@ class nosqlMySQL():
         self.__DB_LOCAL = 1
         return self
 
+    def getServerList(self):
+        my_cnf_path = "{}/mysql/etc/my.cnf".format(mw.getServerDir())
+        data = []
 
+        local_mysql = "{}/mysql/etc/my.cnf".format(mw.getServerDir())
+        if os.path.exists(local_mysql):
+            data.append({'name':'本地服务器', 'val':'0'})
+
+        local_mysql_apt = "{}/mysql-apt/etc/my.conf".format(mw.getServerDir())
+        if os.path.exists(local_mysql_apt):
+            data.append({'name':'本地服务器[apt]', 'val':'apt'})
+
+        local_mysql_yum = "{}/mysql-yum/etc/my.conf".format(mw.getServerDir())
+        if os.path.exists(local_mysql_yum):
+            data.append({'name':'本地服务器[yum]', 'val':'yum'})
+        return mw.returnData(True, 'ok', data)
 
 @singleton
 class nosqlMySQLCtr():
@@ -122,6 +136,10 @@ class nosqlMySQLCtr():
     def __init__(self):
         pass
 
+    def getServerList(self, args):
+        instance = nosqlMySQL()
+        return instance.getServerList()
+
     def getInstanceBySid(self, sid = 0):
         instance = nosqlMySQL()
         return instance
@@ -626,6 +644,11 @@ class nosqlMySQLCtr():
             return mw.returnData(True, 'ok', msg)
 
 # ---------------------------------- run ----------------------------------
+
+def get_server_list(args):
+    t = nosqlMySQLCtr()
+    return t.getServerList(args)
+
 # 获取 mysql 列表
 def get_db_list(args):
     t = nosqlMySQLCtr()
diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index c3aa92542..2142caf22 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -247,10 +247,15 @@ function initTabMemcached(){
     });
 }
 
+var mysql_timer = null;
 function initTabMySQL(){
+
+    mysqlGetServerList();
+
     mysqlGetDbList();
     clearInterval(mysql_timer);
-    var mysql_timer = setInterval(function(){
+    mysqlProcessList();
+    mysql_timer = setInterval(function(){
         var name = $('#mysql_list_tab .tab-nav span.on').data('name');
         mysqlRunMysqlTab(name);
 
@@ -919,6 +924,31 @@ function mysqlInitField(f, data){
 }
 
 
+function mysqlGetServerList(call_func){
+    myPostCB('get_server_list', {}, function(rdata){
+        var rdata = rdata.data;
+        if (rdata.data.length != 0){
+            var items = rdata.data;
+            var content = '';
+            for (var i = 0; i < items.length; i++) {
+                var t = items[i];
+                if (i == 0){
+                    content += '<option value="'+t['val']+'" selected>'+t['name']+'</option>';
+                } else {
+                    content += '<option value="'+t['val']+'">'+t['name']+'</option>';
+                }
+            }
+            $('select[name=sid]').html(content);
+            if (typeof(call_func) == 'function'){
+                call_func();
+            }
+            closeInstallLayer();
+        } else {
+            showInstallLayer();
+        }
+    });
+}
+
 function mysqlGetDbList(){
     var sid = mysqlGetSid();
     myPostCB('get_db_list',{'sid':sid} ,function(rdata){

From 909b8a3f886e06a852fcbb3bb92908113257e86e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 19:25:55 +0800
Subject: [PATCH 853/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index 44c6436b4..9a2b51219 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -121,11 +121,11 @@ class nosqlMySQL():
         if os.path.exists(local_mysql):
             data.append({'name':'本地服务器', 'val':'0'})
 
-        local_mysql_apt = "{}/mysql-apt/etc/my.conf".format(mw.getServerDir())
+        local_mysql_apt = "{}/mysql-apt/etc/my.cnf".format(mw.getServerDir())
         if os.path.exists(local_mysql_apt):
             data.append({'name':'本地服务器[apt]', 'val':'apt'})
 
-        local_mysql_yum = "{}/mysql-yum/etc/my.conf".format(mw.getServerDir())
+        local_mysql_yum = "{}/mysql-yum/etc/my.cnf".format(mw.getServerDir())
         if os.path.exists(local_mysql_yum):
             data.append({'name':'本地服务器[yum]', 'val':'yum'})
         return mw.returnData(True, 'ok', data)

From 326179479c9abcacf49dfb4e4c6c3c55c58e28fc Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 19:30:57 +0800
Subject: [PATCH 854/965] Update app.js

---
 plugins/data_query/static/js/app.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index 2142caf22..fcd806da8 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -925,7 +925,7 @@ function mysqlInitField(f, data){
 
 
 function mysqlGetServerList(call_func){
-    myPostCB('get_server_list', {}, function(rdata){
+    myPostCBN('get_server_list', {}, function(rdata){
         var rdata = rdata.data;
         if (rdata.data.length != 0){
             var items = rdata.data;
@@ -938,7 +938,12 @@ function mysqlGetServerList(call_func){
                     content += '<option value="'+t['val']+'">'+t['name']+'</option>';
                 }
             }
-            $('select[name=sid]').html(content);
+
+
+            $('#mysql select[name=sid]').html(content);
+            $('#mysql select[name=sid]').change(function(){
+                mysqlGetDbList();
+            });
             if (typeof(call_func) == 'function'){
                 call_func();
             }
@@ -951,7 +956,7 @@ function mysqlGetServerList(call_func){
 
 function mysqlGetDbList(){
     var sid = mysqlGetSid();
-    myPostCB('get_db_list',{'sid':sid} ,function(rdata){
+    myPostCBN('get_db_list',{'sid':sid} ,function(rdata){
         if (rdata.data.status){
 
             var items = rdata.data.data['list'];
@@ -988,7 +993,7 @@ function mysqlGetTableList(p){
         return;
     }
 
-    myPostCB('get_table_list',{'sid':sid,'db':db} ,function(rdata){
+    myPostCBN('get_table_list',{'sid':sid,'db':db} ,function(rdata){
         if (rdata.data.status){
 
             var items = rdata.data.data['list'];

From e70fa6d257af74664aaa8a84931baf2159178e42 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 19:33:07 +0800
Subject: [PATCH 855/965] Update app.js

---
 plugins/data_query/static/js/app.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index fcd806da8..515beeec7 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -884,7 +884,8 @@ function mysqlRunMysqlTab(name){
 
 // ------------------------- mysql start -------------------------------
 function mysqlGetSid(){
-    return 0;
+    return $('#mysql select[name=sid]').val();
+    // return 0;
 }
 
 function mysqlGetDbName(){

From 834978adfdbeeef8e1efefb9be8c765eceaaff32 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 19:45:21 +0800
Subject: [PATCH 856/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 65 +++++++++++++++++----------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index 9a2b51219..7e62097de 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -34,8 +34,10 @@ class nosqlMySQL():
     __DB_LOCAL = None
 
     def __init__(self):
-        self.__config = self.get_options(None)
-
+        pass
+        
+    def setSid(self, sid):
+        self.__config = self.get_options(sid=sid)
 
     def conn(self):
         if self.__DB_HOST in ['127.0.0.1', 'localhost']:
@@ -43,7 +45,6 @@ class nosqlMySQL():
             if not os.path.exists(my_path): return False
 
         if not self.__DB_LOCAL:
-            # print(self.__config)
             self.__DB_PORT = int(self.__config['port'])
             self.__DB_USER = self.__config['username']
             self.__DB_PASS = self.__config['password']
@@ -63,41 +64,40 @@ class nosqlMySQL():
             self.__DB_ERR = mw.get_error_info()
         return False
 
-    def sqliteDb(self,dbname='databases'):
+    def sqliteDb(self, sid, dbname='databases'):
         my_root_path = mw.getServerDir() +'/mysql'
         name = 'mysql'
         conn = mw.M(dbname).dbPos(my_root_path, name)
         return conn
 
     # 获取配置项
-    def get_options(self, get=None):
+    def get_options(self, sid=None):
         result = {}
-
-
-        my_cnf_path = "{}/mysql/etc/my.cnf".format(mw.getServerDir())
-        my_content = mw.readFile(my_cnf_path)
-        if not my_content: return False
-
-        mysql_pass = self.sqliteDb('config').where('id=?', (1,)).getField('mysql_root')
-        result['password'] = mysql_pass
-        result['username'] = 'root'
-        keys = ["bind_ip", "port"]
-
+        result['socket'] = ''
+        result['port'] = 3306
         result['host'] = '127.0.0.1'
-        rep = r'port\s*=\s*(.*)'
+        result['username'] = 'root'
 
-        port_re = re.search(rep, my_content)
-        if port_re:
-            result['port'] = int(port_re.groups()[0].strip())
-        else:
-            result['port'] = 3306
+        if sid in ['mysql', 'mysql-apt', 'mysql-yum']:
+            my_cnf_path = "{}/{}/etc/my.cnf".format(mw.getServerDir(),sid)
 
-        socket_rep = r'socket\s*=\s*(.*)'
-        socket_re = re.search(socket_rep, my_content)
-        if socket_re:
-            result['socket'] = socket_re.groups()[0].strip()
-        else:
-            result['socket'] = ''
+            my_content = mw.readFile(my_cnf_path)
+            if not my_content: return False
+
+            mysql_pass = self.sqliteDb(sid,'config').where('id=?', (1,)).getField('mysql_root')
+            result['password'] = mysql_pass
+        
+            keys = ["bind_ip", "port"]
+
+            rep = r'port\s*=\s*(.*)'
+            port_re = re.search(rep, my_content)
+            if port_re:
+                result['port'] = int(port_re.groups()[0].strip())
+            socket_rep = r'socket\s*=\s*(.*)'
+            socket_re = re.search(socket_rep, my_content)
+            if socket_re:
+                result['socket'] = socket_re.groups()[0].strip()
+            
 
         return result
 
@@ -119,15 +119,15 @@ class nosqlMySQL():
 
         local_mysql = "{}/mysql/etc/my.cnf".format(mw.getServerDir())
         if os.path.exists(local_mysql):
-            data.append({'name':'本地服务器', 'val':'0'})
+            data.append({'name':'本地服务器', 'val':'mysql'})
 
         local_mysql_apt = "{}/mysql-apt/etc/my.cnf".format(mw.getServerDir())
         if os.path.exists(local_mysql_apt):
-            data.append({'name':'本地服务器[apt]', 'val':'apt'})
+            data.append({'name':'本地服务器[apt]', 'val':'mysql-apt'})
 
         local_mysql_yum = "{}/mysql-yum/etc/my.cnf".format(mw.getServerDir())
         if os.path.exists(local_mysql_yum):
-            data.append({'name':'本地服务器[yum]', 'val':'yum'})
+            data.append({'name':'本地服务器[yum]', 'val':'mysql-yum'})
         return mw.returnData(True, 'ok', data)
 
 @singleton
@@ -140,8 +140,9 @@ class nosqlMySQLCtr():
         instance = nosqlMySQL()
         return instance.getServerList()
 
-    def getInstanceBySid(self, sid = 0):
+    def getInstanceBySid(self, sid):
         instance = nosqlMySQL()
+        instance.setSid(sid)
         return instance
 
     def getDbList(self, args):

From fa7ad33474b0752630d9ba8e0904f2200882ecd0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 19:46:13 +0800
Subject: [PATCH 857/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index 7e62097de..616240ac3 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -81,20 +81,20 @@ class nosqlMySQL():
         if sid in ['mysql', 'mysql-apt', 'mysql-yum']:
             my_cnf_path = "{}/{}/etc/my.cnf".format(mw.getServerDir(),sid)
 
-            my_content = mw.readFile(my_cnf_path)
-            if not my_content: return False
+            mydb_content = mw.readFile(my_cnf_path)
+            if not mydb_content: return False
 
-            mysql_pass = self.sqliteDb(sid,'config').where('id=?', (1,)).getField('mysql_root')
+            mysql_pass = self.sqliteDb(sid, 'config').where('id=?', (1,)).getField('mysql_root')
             result['password'] = mysql_pass
         
             keys = ["bind_ip", "port"]
 
             rep = r'port\s*=\s*(.*)'
-            port_re = re.search(rep, my_content)
+            port_re = re.search(rep, mydb_content)
             if port_re:
                 result['port'] = int(port_re.groups()[0].strip())
             socket_rep = r'socket\s*=\s*(.*)'
-            socket_re = re.search(socket_rep, my_content)
+            socket_re = re.search(socket_rep, mydb_content)
             if socket_re:
                 result['socket'] = socket_re.groups()[0].strip()
             

From 6f9b9bbbc1007001860c3988ab530cc035736458 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 19:48:30 +0800
Subject: [PATCH 858/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index 616240ac3..3fd8b420e 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -64,10 +64,10 @@ class nosqlMySQL():
             self.__DB_ERR = mw.get_error_info()
         return False
 
-    def sqliteDb(self, sid, dbname='databases'):
-        my_root_path = mw.getServerDir() +'/mysql'
+    def sqliteDb(self, db_pos_name, dbname='databases'):
+        mydb_path = mw.getServerDir() +'/'+db_pos_name
         name = 'mysql'
-        conn = mw.M(dbname).dbPos(my_root_path, name)
+        conn = mw.M(dbname).dbPos(mydb_path, name)
         return conn
 
     # 获取配置项

From f86e30634dd01a3a14aeeca65e8ed21a146a0419 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 19:55:27 +0800
Subject: [PATCH 859/965] Update app.js

---
 plugins/data_query/static/js/app.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index 515beeec7..c9dd04208 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -250,11 +250,12 @@ function initTabMemcached(){
 var mysql_timer = null;
 function initTabMySQL(){
 
-    mysqlGetServerList();
+    mysqlGetServerList(function(){
+        mysqlGetDbList();
+        mysqlProcessList();
+    });
 
-    mysqlGetDbList();
-    clearInterval(mysql_timer);
-    mysqlProcessList();
+    clearInterval(mysql_timer);    
     mysql_timer = setInterval(function(){
         var name = $('#mysql_list_tab .tab-nav span.on').data('name');
         mysqlRunMysqlTab(name);

From 173aae22b426c6dd1937a72c146918823d949f4e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 19:59:01 +0800
Subject: [PATCH 860/965] Update app.js

---
 plugins/data_query/static/js/app.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index c9dd04208..bdb7e6c78 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -960,7 +960,6 @@ function mysqlGetDbList(){
     var sid = mysqlGetSid();
     myPostCBN('get_db_list',{'sid':sid} ,function(rdata){
         if (rdata.data.status){
-
             var items = rdata.data.data['list'];
             var content = '';
             for (var i = 0; i < items.length; i++) {
@@ -978,10 +977,6 @@ function mysqlGetDbList(){
             });
 
             mysqlGetTableList(1);
-
-            closeInstallLayer();
-        } else {
-            showInstallLayer();
         }
     });
 }

From 318cba0d437993321ea3f75f37a4973f4af136b6 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 20:07:41 +0800
Subject: [PATCH 861/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index 3fd8b420e..bd53f8bef 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -40,18 +40,12 @@ class nosqlMySQL():
         self.__config = self.get_options(sid=sid)
 
     def conn(self):
-        if self.__DB_HOST in ['127.0.0.1', 'localhost']:
-            my_path = "{}/mysql".format(mw.getServerDir())
-            if not os.path.exists(my_path): return False
-
-        if not self.__DB_LOCAL:
-            self.__DB_PORT = int(self.__config['port'])
-            self.__DB_USER = self.__config['username']
-            self.__DB_PASS = self.__config['password']
-            self.__DB_SOCKET = self.__config['socket']
+        self.__DB_PORT = int(self.__config['port'])
+        self.__DB_USER = self.__config['username']
+        self.__DB_PASS = self.__config['password']
+        self.__DB_SOCKET = self.__config['socket']
 
         try:
-
             db = mw.getMyORM()
             db.setPort(self.__DB_PORT)
             db.setPwd(self.__DB_PASS)
@@ -97,8 +91,6 @@ class nosqlMySQL():
             socket_re = re.search(socket_rep, mydb_content)
             if socket_re:
                 result['socket'] = socket_re.groups()[0].strip()
-            
-
         return result
 
     def set_host(self, host, port, name, username, password, prefix=''):

From d4f9f5bcfd26c19def93ab83c4cce2f4b71501fc Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 20:08:18 +0800
Subject: [PATCH 862/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index bd53f8bef..5f1560958 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -80,9 +80,7 @@ class nosqlMySQL():
 
             mysql_pass = self.sqliteDb(sid, 'config').where('id=?', (1,)).getField('mysql_root')
             result['password'] = mysql_pass
-        
-            keys = ["bind_ip", "port"]
-
+            
             rep = r'port\s*=\s*(.*)'
             port_re = re.search(rep, mydb_content)
             if port_re:

From 3fd55fd5ded7a2b78df1424ccff6a029f9cde217 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 20:11:02 +0800
Subject: [PATCH 863/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index 5f1560958..72f6f9f0e 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -80,7 +80,7 @@ class nosqlMySQL():
 
             mysql_pass = self.sqliteDb(sid, 'config').where('id=?', (1,)).getField('mysql_root')
             result['password'] = mysql_pass
-            
+
             rep = r'port\s*=\s*(.*)'
             port_re = re.search(rep, mydb_content)
             if port_re:
@@ -475,6 +475,12 @@ class nosqlMySQLCtr():
                     if IS_SIGNED == 1:
                         RESIDUAL_AUTO_INCREMENT = int(2147483647 - AUTO_INCREMENT)
 
+                if DATA_TYPE == 'mediumint':
+                    if IS_SIGNED == 0:
+                        RESIDUAL_AUTO_INCREMENT = int(16777215 - AUTO_INCREMENT)
+                    if IS_SIGNED == 1:
+                        RESIDUAL_AUTO_INCREMENT = int(8388607 - AUTO_INCREMENT)
+
                 if DATA_TYPE == 'bigint':
                     if IS_SIGNED == 0:
                         RESIDUAL_AUTO_INCREMENT = Decimal("18446744073709551615") - Decimal(AUTO_INCREMENT)

From 5554ff3350f84ec02f4dada48e419480c24692b4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 22:49:39 +0800
Subject: [PATCH 864/965] update

---
 plugins/php/versions/70/install.sh | 1 -
 plugins/php/versions/common/zip.sh | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/php/versions/70/install.sh b/plugins/php/versions/70/install.sh
index ebe243815..919a1e1ef 100755
--- a/plugins/php/versions/70/install.sh
+++ b/plugins/php/versions/70/install.sh
@@ -110,7 +110,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--enable-mysqlnd \
 	--with-mysqli=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
-	--enable-zip \
 	--enable-mbstring \
 	--enable-simplexml \
 	--enable-ftp \
diff --git a/plugins/php/versions/common/zip.sh b/plugins/php/versions/common/zip.sh
index ce0238147..fee49c090 100755
--- a/plugins/php/versions/common/zip.sh
+++ b/plugins/php/versions/common/zip.sh
@@ -44,7 +44,7 @@ if [ ! -d $serverPath/lib/libzip ];then
 	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
 fi
 
-export PKG_CONFIG_PATH=/www/server/lib/libzip/lib/pkgconfig
+export PKG_CONFIG_PATH=${serverPath}/lib/libzip/lib/pkgconfig
 
 Install_lib()
 {
@@ -65,8 +65,7 @@ Install_lib()
 		cd $sourcePath/php${version}/ext/${LIBNAME}
 		
 		$serverPath/php/$version/bin/phpize
-		./configure --with-php-config=$serverPath/php/$version/bin/php-config \
-		--with-zip
+		./configure --with-php-config=$serverPath/php/$version/bin/php-config --with-zip
 
 		make clean && make && make install && make clean
 

From 980129a8eca2308dd366b15c53938dc7c34e2617 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 22:58:19 +0800
Subject: [PATCH 865/965] Update phplib.conf

---
 plugins/php/versions/phplib.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/php/versions/phplib.conf b/plugins/php/versions/phplib.conf
index 73d4c7026..079fb5088 100755
--- a/plugins/php/versions/phplib.conf
+++ b/plugins/php/versions/phplib.conf
@@ -818,7 +818,6 @@
         "name": "zip",
         "versions": [
             "72",
-            "83"
         ],
         "type": "压缩",
         "msg": "压缩组件",

From 1119371bdb00d32c1a0693e159a91ce919908cb3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 22:58:25 +0800
Subject: [PATCH 866/965] Update phplib.conf

---
 plugins/php/versions/phplib.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/php/versions/phplib.conf b/plugins/php/versions/phplib.conf
index 079fb5088..79951450e 100755
--- a/plugins/php/versions/phplib.conf
+++ b/plugins/php/versions/phplib.conf
@@ -817,7 +817,7 @@
     {
         "name": "zip",
         "versions": [
-            "72",
+            "72"
         ],
         "type": "压缩",
         "msg": "压缩组件",

From 0a8b92132747da6a31b61b0d6081b22fd137a4f2 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 23:10:59 +0800
Subject: [PATCH 867/965] Update phplib.conf

---
 plugins/php/versions/phplib.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/php/versions/phplib.conf b/plugins/php/versions/phplib.conf
index 79951450e..77880e8c2 100755
--- a/plugins/php/versions/phplib.conf
+++ b/plugins/php/versions/phplib.conf
@@ -817,6 +817,7 @@
     {
         "name": "zip",
         "versions": [
+            "70",
             "72"
         ],
         "type": "压缩",

From fe53068055e2f3913c03a0e581199194ed5c5516 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 23:12:27 +0800
Subject: [PATCH 868/965] Update zip.sh

---
 plugins/php/versions/common/zip.sh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/plugins/php/versions/common/zip.sh b/plugins/php/versions/common/zip.sh
index fee49c090..1c4021502 100755
--- a/plugins/php/versions/common/zip.sh
+++ b/plugins/php/versions/common/zip.sh
@@ -2,8 +2,12 @@
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
 export PATH=$PATH:/opt/homebrew/bin
 
-curPath=`pwd`
+function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
+function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
+function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; }
+function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
+curPath=`pwd`
 appPath=$(dirname "$curPath")
 
 rootPath=$(dirname "$curPath")
@@ -19,12 +23,6 @@ version=$2
 LIBNAME=zip
 LIBV=0
 
-
-if [ "$version" -lt "72" ];then
-	echo "not need"
-	exit 1
-fi
-
 LIB_PATH_NAME=lib/php
 if [ -d $serverPath/php/${version}/lib64 ];then
 	LIB_PATH_NAME=lib64
@@ -46,6 +44,14 @@ fi
 
 export PKG_CONFIG_PATH=${serverPath}/lib/libzip/lib/pkgconfig
 
+# ZIP_OPTION='--with-zip'
+# libzip_version=`pkg-config libzip --modversion`
+# if version_lt "$libzip_version" "0.11.0" ;then
+# 	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
+# 	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
+# 	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
+# fi
+
 Install_lib()
 {
 

From 299b216c48a1c88a7095f866a97cf194c9b1ca1c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 23:15:39 +0800
Subject: [PATCH 869/965] Update phplib.conf

---
 plugins/php/versions/phplib.conf | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/php/versions/phplib.conf b/plugins/php/versions/phplib.conf
index 77880e8c2..cbcff68d0 100755
--- a/plugins/php/versions/phplib.conf
+++ b/plugins/php/versions/phplib.conf
@@ -817,8 +817,16 @@
     {
         "name": "zip",
         "versions": [
+            "52",
+            "53",
+            "54",
+            "55",
+            "56",
             "70",
-            "72"
+            "71",
+            "72",
+            "73",
+            "74"
         ],
         "type": "压缩",
         "msg": "压缩组件",

From 3206e62583cf48c74a6240f9c59ae9a9a12d7988 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 23:19:53 +0800
Subject: [PATCH 870/965] update

---
 plugins/php/versions/54/install.sh |  1 -
 plugins/php/versions/55/install.sh |  1 -
 plugins/php/versions/56/install.sh |  1 -
 plugins/php/versions/70/install.sh |  2 +-
 plugins/php/versions/71/install.sh |  1 -
 plugins/php/versions/72/install.sh |  1 -
 plugins/php/versions/73/install.sh | 15 +++++++--------
 plugins/php/versions/74/install.sh | 15 +++++++--------
 8 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/plugins/php/versions/54/install.sh b/plugins/php/versions/54/install.sh
index 58af0987f..fc3dd9393 100755
--- a/plugins/php/versions/54/install.sh
+++ b/plugins/php/versions/54/install.sh
@@ -117,7 +117,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--with-mysql=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
 	--with-mysqli=mysqlnd \
-	--enable-zip \
 	--enable-sockets \
 	--enable-ftp \
 	--enable-simplexml \
diff --git a/plugins/php/versions/55/install.sh b/plugins/php/versions/55/install.sh
index 59f5712c6..c625f903e 100755
--- a/plugins/php/versions/55/install.sh
+++ b/plugins/php/versions/55/install.sh
@@ -117,7 +117,6 @@ if [ ! -d $serverPath/php/${PHP_VER}  ];then
 	--with-mysql=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
 	--with-mysqli=mysqlnd \
-	--enable-zip \
 	--enable-simplexml \
 	--enable-sockets \
 	--enable-ftp \
diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh
index b26aa6606..8f2f20e05 100755
--- a/plugins/php/versions/56/install.sh
+++ b/plugins/php/versions/56/install.sh
@@ -126,7 +126,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--with-mysql=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
 	--with-mysqli=mysqlnd \
-	--enable-zip \
 	--enable-simplexml \
 	--enable-ftp \
 	--enable-sockets \
diff --git a/plugins/php/versions/70/install.sh b/plugins/php/versions/70/install.sh
index 919a1e1ef..328ef6ee5 100755
--- a/plugins/php/versions/70/install.sh
+++ b/plugins/php/versions/70/install.sh
@@ -106,10 +106,10 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--prefix=$serverPath/php/${PHP_VER} \
 	--exec-prefix=$serverPath/php/${PHP_VER} \
 	--with-config-file-path=$serverPath/php/${PHP_VER}/etc \
-	--with-zlib-dir=$serverPath/lib/zlib \
 	--enable-mysqlnd \
 	--with-mysqli=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
+	--with-zlib-dir=$serverPath/lib/zlib \
 	--enable-mbstring \
 	--enable-simplexml \
 	--enable-ftp \
diff --git a/plugins/php/versions/71/install.sh b/plugins/php/versions/71/install.sh
index 20bcb6c94..872491126 100755
--- a/plugins/php/versions/71/install.sh
+++ b/plugins/php/versions/71/install.sh
@@ -112,7 +112,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--enable-mysqlnd \
 	--with-mysqli=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
-	--enable-zip \
 	--enable-mbstring \
 	--enable-simplexml \
 	--enable-ftp \
diff --git a/plugins/php/versions/72/install.sh b/plugins/php/versions/72/install.sh
index 1cc80f08a..5ae7cc8d6 100755
--- a/plugins/php/versions/72/install.sh
+++ b/plugins/php/versions/72/install.sh
@@ -105,7 +105,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--enable-mysqlnd \
 	--with-mysqli=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
-	--with-libzip \
 	--enable-mbstring \
 	--enable-simplexml \
 	--enable-sockets \
diff --git a/plugins/php/versions/73/install.sh b/plugins/php/versions/73/install.sh
index 1900b0838..430e48c1c 100755
--- a/plugins/php/versions/73/install.sh
+++ b/plugins/php/versions/73/install.sh
@@ -62,13 +62,13 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 	mv $sourcePath/php/php-${version} $sourcePath/php/php${PHP_VER}
 fi
 
-ZIP_OPTION='--enable-zip'
-libzip_version=`pkg-config libzip --modversion`
-if [ "$?" != "0" ] || version_lt "$libzip_version" "0.11.0" ;then
-	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
-	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
-	ZIP_OPTION="--with-libzip=$serverPath/lib/libzip"
-fi
+# ZIP_OPTION='--enable-zip'
+# libzip_version=`pkg-config libzip --modversion`
+# if [ "$?" != "0" ] || version_lt "$libzip_version" "0.11.0" ;then
+# 	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
+# 	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
+# 	ZIP_OPTION="--with-libzip=$serverPath/lib/libzip"
+# fi
 
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then	
@@ -76,7 +76,6 @@ if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-pcre-dir=$(brew --prefix pcre2)"
 else
 	OPTIONS="${OPTIONS} --with-zlib-dir=$serverPath/lib/zlib"
-	OPTIONS="${OPTIONS} ${ZIP_OPTION}"
 	OPTIONS="${OPTIONS} --with-readline"
 fi
 
diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh
index 606cb7f90..e99d2c3aa 100755
--- a/plugins/php/versions/74/install.sh
+++ b/plugins/php/versions/74/install.sh
@@ -91,13 +91,13 @@ fi
 
 echo "$sourcePath/php/php${PHP_VER}"
 
-ZIP_OPTION='--with-zip'
-libzip_version=`pkg-config libzip --modversion`
-if version_lt "$libzip_version" "0.11.0" ;then
-	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
-	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
-	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
-fi
+# ZIP_OPTION='--with-zip'
+# libzip_version=`pkg-config libzip --modversion`
+# if version_lt "$libzip_version" "0.11.0" ;then
+# 	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
+# 	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
+# 	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
+# fi
 
 # ----- cpu start ------
 if [ -z "${cpuCore}" ]; then
@@ -134,7 +134,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--with-mysqli=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
 	--with-zlib-dir=$serverPath/lib/zlib \
-	$ZIP_OPTION \
 	--enable-ftp \
 	--enable-mbstring \
 	--enable-sockets \

From b18924174572fddaef2bd5d1b8f3ca32afc72af4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 23:25:45 +0800
Subject: [PATCH 871/965] update

---
 plugins/php/versions/52/install.sh  |  2 --
 plugins/php/versions/53/install.sh  |  2 --
 plugins/php/versions/54/install.sh  |  1 -
 plugins/php/versions/55/install.sh  |  1 -
 plugins/php/versions/56/install.sh  |  1 -
 plugins/php/versions/70/install.sh  |  1 -
 plugins/php/versions/71/install.sh  |  1 -
 plugins/php/versions/73/install.sh  |  5 -----
 plugins/php/versions/74/install.sh  |  6 ------
 plugins/php/versions/80/install.sh  | 22 +++++++---------------
 plugins/php/versions/81/install.sh  | 22 +++++++---------------
 plugins/php/versions/82/install.sh  | 22 +++++++---------------
 plugins/php/versions/83/install.sh  | 21 +++++++--------------
 plugins/php/versions/84/install.sh  | 22 ++++++++--------------
 plugins/php/versions/common/zlib.sh |  1 +
 15 files changed, 37 insertions(+), 93 deletions(-)

diff --git a/plugins/php/versions/52/install.sh b/plugins/php/versions/52/install.sh
index daf12c254..7516e0f04 100755
--- a/plugins/php/versions/52/install.sh
+++ b/plugins/php/versions/52/install.sh
@@ -105,8 +105,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--prefix=$serverPath/php/${PHP_VER} \
 	--exec-prefix=$serverPath/php/${PHP_VER} \
 	--with-config-file-path=$serverPath/php/${PHP_VER}/etc \
-	--with-zlib-dir=$serverPath/lib/zlib \
-	--enable-zip \
 	--enable-xml \
 	--enable-shared \
 	--with-mysql=mysqlnd \
diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh
index 151fafc88..0ee811212 100755
--- a/plugins/php/versions/53/install.sh
+++ b/plugins/php/versions/53/install.sh
@@ -109,12 +109,10 @@ if [ ! -d $serverPath/php/${PHP_VER}/bin ];then
 	--prefix=$serverPath/php/${PHP_VER} \
 	--exec-prefix=$serverPath/php/${PHP_VER} \
 	--with-config-file-path=$serverPath/php/${PHP_VER}/etc \
-	--with-zlib-dir=$serverPath/lib/zlib \
 	--enable-mysqlnd \
 	--with-mysql=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
 	--with-mysqli=mysqlnd \
-	--enable-zip \
 	--enable-exif \
 	--enable-hash \
 	--enable-libxml \
diff --git a/plugins/php/versions/54/install.sh b/plugins/php/versions/54/install.sh
index fc3dd9393..aa9d63726 100755
--- a/plugins/php/versions/54/install.sh
+++ b/plugins/php/versions/54/install.sh
@@ -112,7 +112,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--prefix=$serverPath/php/${PHP_VER} \
 	--exec-prefix=$serverPath/php/${PHP_VER} \
 	--with-config-file-path=$serverPath/php/${PHP_VER}/etc \
-	--with-zlib-dir=$serverPath/lib/zlib \
 	--enable-mysqlnd \
 	--with-mysql=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
diff --git a/plugins/php/versions/55/install.sh b/plugins/php/versions/55/install.sh
index c625f903e..03a472dc1 100755
--- a/plugins/php/versions/55/install.sh
+++ b/plugins/php/versions/55/install.sh
@@ -112,7 +112,6 @@ if [ ! -d $serverPath/php/${PHP_VER}  ];then
 	--prefix=$serverPath/php/${PHP_VER} \
 	--exec-prefix=$serverPath/php/${PHP_VER} \
 	--with-config-file-path=$serverPath/php/${PHP_VER}/etc \
-	--with-zlib-dir=$serverPath/lib/zlib \
 	--enable-mysqlnd \
 	--with-mysql=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh
index 8f2f20e05..9b1de0bab 100755
--- a/plugins/php/versions/56/install.sh
+++ b/plugins/php/versions/56/install.sh
@@ -121,7 +121,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--prefix=$serverPath/php/${PHP_VER} \
 	--exec-prefix=$serverPath/php/${PHP_VER} \
 	--with-config-file-path=$serverPath/php/56/etc \
-	--with-zlib-dir=$serverPath/lib/zlib \
 	--enable-mysqlnd \
 	--with-mysql=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
diff --git a/plugins/php/versions/70/install.sh b/plugins/php/versions/70/install.sh
index 328ef6ee5..26c0e9718 100755
--- a/plugins/php/versions/70/install.sh
+++ b/plugins/php/versions/70/install.sh
@@ -109,7 +109,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--enable-mysqlnd \
 	--with-mysqli=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
-	--with-zlib-dir=$serverPath/lib/zlib \
 	--enable-mbstring \
 	--enable-simplexml \
 	--enable-ftp \
diff --git a/plugins/php/versions/71/install.sh b/plugins/php/versions/71/install.sh
index 872491126..af94469a2 100755
--- a/plugins/php/versions/71/install.sh
+++ b/plugins/php/versions/71/install.sh
@@ -108,7 +108,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--prefix=$serverPath/php/${PHP_VER} \
 	--exec-prefix=$serverPath/php/${PHP_VER} \
 	--with-config-file-path=$serverPath/php/${PHP_VER}/etc \
-	--with-zlib-dir=$serverPath/lib/zlib \
 	--enable-mysqlnd \
 	--with-mysqli=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
diff --git a/plugins/php/versions/73/install.sh b/plugins/php/versions/73/install.sh
index 430e48c1c..a73e7a8fb 100755
--- a/plugins/php/versions/73/install.sh
+++ b/plugins/php/versions/73/install.sh
@@ -10,11 +10,6 @@ sourcePath=${serverPath}/source
 sysName=`uname`
 SYS_ARCH=`arch`
 
-function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
-function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
-function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; }
-function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
-
 version=7.3.33
 PHP_VER=73
 Install_php()
diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh
index e99d2c3aa..33e0415ef 100755
--- a/plugins/php/versions/74/install.sh
+++ b/plugins/php/versions/74/install.sh
@@ -9,11 +9,6 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
 
-function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
-function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
-function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; }
-function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
-
 version=7.4.26
 PHP_VER=74
 Install_php()
@@ -133,7 +128,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--enable-mysqlnd \
 	--with-mysqli=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
-	--with-zlib-dir=$serverPath/lib/zlib \
 	--enable-ftp \
 	--enable-mbstring \
 	--enable-sockets \
diff --git a/plugins/php/versions/80/install.sh b/plugins/php/versions/80/install.sh
index e9bacab5f..48c15b75d 100755
--- a/plugins/php/versions/80/install.sh
+++ b/plugins/php/versions/80/install.sh
@@ -9,12 +9,6 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
 
-function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
-function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
-function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; }
-function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
-
-
 version=8.0.30
 PHP_VER=80
 Install_php()
@@ -88,13 +82,13 @@ fi
 # fi
 
 
-ZIP_OPTION='--with-zip'
-libzip_version=`pkg-config libzip --modversion`
-if version_lt "$libzip_version" "0.11.0" ;then
-	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
-	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
-	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
-fi
+# ZIP_OPTION='--with-zip'
+# libzip_version=`pkg-config libzip --modversion`
+# if version_lt "$libzip_version" "0.11.0" ;then
+# 	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
+# 	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
+# 	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
+# fi
 
 
 # ----- cpu start ------
@@ -134,8 +128,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--enable-mysqlnd \
 	--with-mysqli=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
-	--with-zlib-dir=$serverPath/lib/zlib \
-	$ZIP_OPTION \
 	--enable-ftp \
 	--enable-mbstring \
 	--enable-sockets \
diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh
index 693975011..c77959699 100755
--- a/plugins/php/versions/81/install.sh
+++ b/plugins/php/versions/81/install.sh
@@ -9,12 +9,6 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
 
-function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
-function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
-function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; }
-function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
-
-
 version=8.1.31
 PHP_VER=81
 Install_php()
@@ -80,13 +74,13 @@ if [ "$?" == "0" ];then
 	OPTIONS="${OPTIONS} --with-password-argon2"
 fi
 
-ZIP_OPTION='--with-zip'
-libzip_version=`pkg-config libzip --modversion`
-if version_lt "$libzip_version" "0.11.0" ;then
-	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
-	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
-	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
-fi
+# ZIP_OPTION='--with-zip'
+# libzip_version=`pkg-config libzip --modversion`
+# if version_lt "$libzip_version" "0.11.0" ;then
+# 	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
+# 	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
+# 	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
+# fi
 
 # ----- cpu start ------
 if [ -z "${cpuCore}" ]; then
@@ -125,8 +119,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--enable-mysqlnd \
 	--with-mysqli=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
-	--with-zlib-dir=$serverPath/lib/zlib \
-	$ZIP_OPTION \
 	--enable-ftp \
 	--enable-mbstring \
 	--enable-sockets \
diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh
index a4c9b2edd..e0524e1a8 100755
--- a/plugins/php/versions/82/install.sh
+++ b/plugins/php/versions/82/install.sh
@@ -9,12 +9,6 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
 
-function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
-function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
-function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; }
-function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
-
-
 version=8.2.26
 PHP_VER=82
 Install_php()
@@ -108,13 +102,13 @@ else
 fi
 # ----- cpu end ------
 
-ZIP_OPTION='--with-zip'
-libzip_version=`pkg-config libzip --modversion`
-if version_lt "$libzip_version" "0.11.0" ;then
-	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
-	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
-	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
-fi
+# ZIP_OPTION='--with-zip'
+# libzip_version=`pkg-config libzip --modversion`
+# if version_lt "$libzip_version" "0.11.0" ;then
+# 	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
+# 	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
+# 	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
+# fi
 
 
 # echo "$sourcePath/php/php${PHP_VER}"
@@ -128,8 +122,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--enable-mysqlnd \
 	--with-mysqli=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
-	--with-zlib-dir=$serverPath/lib/zlib \
-	$ZIP_OPTION \
 	--enable-mbstring \
 	--enable-ftp \
 	--enable-sockets \
diff --git a/plugins/php/versions/83/install.sh b/plugins/php/versions/83/install.sh
index d4b8790aa..d9f3bc7b2 100755
--- a/plugins/php/versions/83/install.sh
+++ b/plugins/php/versions/83/install.sh
@@ -9,11 +9,6 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
 
-function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
-function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
-function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; }
-function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
-
 version=8.3.14
 PHP_VER=83
 Install_php()
@@ -107,13 +102,13 @@ else
 fi
 # ----- cpu end ------
 
-ZIP_OPTION='--with-zip'
-libzip_version=`pkg-config libzip --modversion`
-if version_lt "$libzip_version" "0.11.0" ;then
-	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
-	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
-	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
-fi
+# ZIP_OPTION='--with-zip'
+# libzip_version=`pkg-config libzip --modversion`
+# if version_lt "$libzip_version" "0.11.0" ;then
+# 	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
+# 	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
+# 	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
+# fi
 
 
 echo "$sourcePath/php/php${PHP_VER}"
@@ -128,8 +123,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--enable-mysqlnd \
 	--with-mysqli=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
-	--with-zlib-dir=$serverPath/lib/zlib \
-	$ZIP_OPTION \
 	--enable-mbstring \
 	--enable-ftp \
 	--enable-sockets \
diff --git a/plugins/php/versions/84/install.sh b/plugins/php/versions/84/install.sh
index 9e4e421e8..b565e9195 100755
--- a/plugins/php/versions/84/install.sh
+++ b/plugins/php/versions/84/install.sh
@@ -9,11 +9,6 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
 
-function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
-function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
-function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; }
-function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
-
 version=8.4.1
 PHP_VER=84
 Install_php()
@@ -96,17 +91,18 @@ else
 fi
 # ----- cpu end ------
 
-ZIP_OPTION='--with-zip'
-libzip_version=`pkg-config libzip --modversion`
-if version_lt "$libzip_version" "0.11.0" ;then
-	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
-	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
-	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
-fi
+# ZIP_OPTION='--with-zip'
+# libzip_version=`pkg-config libzip --modversion`
+# if version_lt "$libzip_version" "0.11.0" ;then
+# 	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
+# 	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
+# 	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
+# fi
 
 # OPTIONS="${OPTIONS} --enable-debug"
 # OPTIONS="${OPTIONS} --enable-dtrace"
 
+
 echo "$sourcePath/php/php${PHP_VER}"
 
 if [ ! -d $serverPath/php/${PHP_VER} ];then
@@ -119,8 +115,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--enable-mysqlnd \
 	--with-mysqli=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
-	--with-zlib-dir=$serverPath/lib/zlib \
-	$ZIP_OPTION \
 	--enable-mbstring \
 	--enable-ftp \
 	--enable-sockets \
diff --git a/plugins/php/versions/common/zlib.sh b/plugins/php/versions/common/zlib.sh
index 407923fcc..81291da52 100755
--- a/plugins/php/versions/common/zlib.sh
+++ b/plugins/php/versions/common/zlib.sh
@@ -34,6 +34,7 @@ else
 	BAK=''
 fi
 
+# --with-zlib-dir=$serverPath/lib/zlib
 Install_lib()
 {
 

From 93b39f4fb0526c6770c3ddbfe9403228f478a0e7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 23:28:34 +0800
Subject: [PATCH 872/965] Update phplib.conf

---
 plugins/php/versions/phplib.conf | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/php/versions/phplib.conf b/plugins/php/versions/phplib.conf
index cbcff68d0..6992c03e4 100755
--- a/plugins/php/versions/phplib.conf
+++ b/plugins/php/versions/phplib.conf
@@ -99,7 +99,7 @@
             "83",
             "84"
         ],
-        "type": "压缩库",
+        "type": "压缩",
         "msg": "压缩算法",
         "shell": "brotli.sh",
         "check": "brotli.so"
@@ -826,7 +826,12 @@
             "71",
             "72",
             "73",
-            "74"
+            "74",
+            "80",
+            "81",
+            "82",
+            "83",
+            "84"
         ],
         "type": "压缩",
         "msg": "压缩组件",

From 08aa864fa01a50cd3516af9bb1db02e666f40f38 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 9 Dec 2024 23:29:57 +0800
Subject: [PATCH 873/965] Update install.sh

---
 plugins/php/install.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/plugins/php/install.sh b/plugins/php/install.sh
index c90bdbc6b..821b4bb3e 100755
--- a/plugins/php/install.sh
+++ b/plugins/php/install.sh
@@ -76,13 +76,8 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php/${type} ];then
 	cd ${rootPath}/plugins/php/versions/common && bash redis.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash memcached.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash pcntl.sh install ${type}
-
-
-	
-
-	if [ "${type}" -gt "73" ];then
-		cd ${rootPath}/plugins/php/versions/common && bash zlib.sh install ${type}
-	fi
+	cd ${rootPath}/plugins/php/versions/common && bash zip.sh install ${type}
+	cd ${rootPath}/plugins/php/versions/common && bash zlib.sh install ${type}
 
 	echo "install PHP${type} extend end"
 

From f3006b55b329c247a97ca16f6c82e78dbf401724 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 00:02:06 +0800
Subject: [PATCH 874/965] Update phplib.conf

---
 plugins/php/versions/phplib.conf | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/php/versions/phplib.conf b/plugins/php/versions/phplib.conf
index 6992c03e4..98c978093 100755
--- a/plugins/php/versions/phplib.conf
+++ b/plugins/php/versions/phplib.conf
@@ -841,6 +841,15 @@
     {
         "name": "zlib",
         "versions": [
+            "52",
+            "53",
+            "54",
+            "55",
+            "56",
+            "70",
+            "71",
+            "72",
+            "73",
             "74",
             "80",
             "81",

From ec79bfc93bca74072f083c2338e38bc8b1b70c4d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 00:12:26 +0800
Subject: [PATCH 875/965] Update openssl.sh

---
 plugins/php/versions/common/openssl.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/php/versions/common/openssl.sh b/plugins/php/versions/common/openssl.sh
index b76a61535..60f447db6 100755
--- a/plugins/php/versions/common/openssl.sh
+++ b/plugins/php/versions/common/openssl.sh
@@ -54,7 +54,7 @@ Install_lib()
 		BREW_DIR=`which brew`
 		BREW_DIR=${BREW_DIR/\/bin\/brew/}
 
-		LIB_DEPEND_DIR=`brew info openssl@1.1 | grep ${BREW_DIR}/Cellar/openssl | cut -d \  -f 1 | awk 'END {print}'`
+		LIB_DEPEND_DIR=`brew info openssl@1.0 | grep ${BREW_DIR}/Cellar/openssl | cut -d \  -f 1 | awk 'END {print}'`
 		export PKG_CONFIG_PATH=$LIB_DEPEND_DIR/lib/pkgconfig
 	fi
 
@@ -87,7 +87,7 @@ Install_lib()
 		# otool -L /Users/midoks/Desktop/mwdev/server/php/83/lib/php/extensions/no-debug-non-zts-20230831/openssl.so 
 		# ldd /www/server/php/83/bin/php
 
-		if [ "$version" -lt "83" ] && [ "$sysName" == "Darwin" ];then
+		if [ "$version" -lt "84" ] && [ "$sysName" == "Darwin" ];then
 			BREW_DIR=`which brew`
 			BREW_DIR=${BREW_DIR/\/bin\/brew/}
 			LIB_DEPEND_DIR=`brew info openssl@1.0 | grep ${BREW_DIR}/Cellar/openssl@1.0 | cut -d \  -f 1 | awk 'END {print}'`

From ae342c71a79228510e176bfb18942e39d3e86195 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 00:27:47 +0800
Subject: [PATCH 876/965] Update public.js

---
 web/static/app/public.js | 50 ++++++++++------------------------------
 1 file changed, 12 insertions(+), 38 deletions(-)

diff --git a/web/static/app/public.js b/web/static/app/public.js
index 9d6b6675c..64bb24d41 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1410,8 +1410,9 @@ function getReloads() {
 		return
 	}
 	if(speed) {return;}
-	speed = setInterval(function() {
-		var mm = $(".bt-w-menu .bgw").html()
+
+	function renderRunTask(){
+		var mm = $(".bt-w-menu .bgw").html();
 		if(mm == undefined || mm.indexOf(lan.bt.task_list) == -1) {
 			clearInterval(speed);
 			speed = null;
@@ -1421,6 +1422,7 @@ function getReloads() {
 		a++;
 		$.post('/task/get_task_speed', '', function(h) {
 			if(h.task == undefined) {
+				$(".task_count").text(0);
 				$(".cmdlist").html('当前没有任务!');
 				return;
 			}
@@ -1470,7 +1472,12 @@ function getReloads() {
 				return;
 			}
 		},'json').error(function(){});
-	}, 3000);
+	}
+
+	renderRunTask();
+	speed = setInterval(function() {
+		renderRunTask();
+	}, 2000);
 }
 
 //检查选中项
@@ -1496,42 +1503,9 @@ function tasklist(a){
 	$(".taskcon").html(con);
 	a = a == undefined ? 1 : a;
 	$.post("/task/list", "tojs=getTaskList&table=tasks&limit=10&p=" + a, function(g) {
-		var e = "";
-		var b = "";
-		var c = "";
-		var f = false;
-		for(var d = 0; d < g.data.length; d++) {
-			switch(g.data[d].status) {
-				case "-1":
-					f = true;
-					if(g.data[d].type != "download") {
-						b = "<li>\
-							<span class='titlename'>" + g.data[d].name + "</span>\
-							<span class='state pull-right c6'>正在安装<img src='/static/img/ing.gif'> | <a class='btlink' href=\"javascript:removeTask(" + g.data[d].id + ")\">关闭</a></span>\
-							<span class='opencmd'></span><pre class='cmd'></pre>\
-						</li>";
-					} else {
-						b = "<li>\
-							<div class='line-progress' style='width:0%'></div><span class='titlename'>" + g.data[d].name + "<a id='speed' style='margin-left:130px;'>0.0M/12.5M</a></span>\
-							<span class='com-progress'>0%</span><span class='state'>下载中 <img src='/static/img/ing.gif'> | <a href=\"javascript:removeTask(" + g.data[d].id + ")\">关闭</a></span>\
-						</li>";
-					}
-					break;
-				case "0":
-					c += "<li>\
-						<span class='titlename'>" + g.data[d].name + "</span>\
-						<span class='state pull-right c6'>等待</span> | <a href=\"javascript:removeTask(" + g.data[d].id + ")\" class='btlink'>删除</a>\
-					</li>";
-					break;
-			}
-		}
-		
-		
-		// $(".task_count").text(g.count);
-		$(".cmdlist").html(b + c);
-		getReloads();
-		return f
+		$('.msg_count').html(g.count);
 	},'json');
+	getReloads();
 }
 
 function activeDisk() {

From d60e1291c8ffe97bfc4d6d463e039c14e9501565 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 00:35:02 +0800
Subject: [PATCH 877/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index 13402d1c1..cac25e934 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.23
+APP_SMALL_VERSION = 0.24
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From 2be356a8757d289e74a217a9731a2f0e42e39a5b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 02:05:33 +0800
Subject: [PATCH 878/965] Update readline.sh

---
 plugins/php/versions/common/readline.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/php/versions/common/readline.sh b/plugins/php/versions/common/readline.sh
index 422729cd8..6307b9805 100755
--- a/plugins/php/versions/common/readline.sh
+++ b/plugins/php/versions/common/readline.sh
@@ -65,6 +65,12 @@ Install_lib()
 
 		cd ${rootPath}/plugins/php/lib && /bin/bash libedit.sh
 		export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${serverPath}/lib/libedit/lib/pkgconfig
+
+
+		OPTIONS="$OPTIONS --with-libedit=${serverPath}/lib/libedit"
+
+		readlinelib=`pkg-config --path readline`
+		export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${serverPath}/lib/libedit/lib/pkgconfig
 		OPTIONS="$OPTIONS --with-libedit=${serverPath}/lib/libedit"
 		
 		cd $sourcePath/php${version}/ext/${LIBNAME}

From 65c303272c9aeb23b321fecbbd72d6b831753167 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 02:23:49 +0800
Subject: [PATCH 879/965] update

---
 plugins/php/versions/52/install.sh      |  2 ++
 plugins/php/versions/53/install.sh      |  9 ++++++---
 plugins/php/versions/54/install.sh      |  3 ++-
 plugins/php/versions/55/install.sh      |  3 ++-
 plugins/php/versions/56/install.sh      |  3 ++-
 plugins/php/versions/70/install.sh      |  2 ++
 plugins/php/versions/71/install.sh      |  2 ++
 plugins/php/versions/72/install.sh      |  8 ++++++--
 plugins/php/versions/73/install.sh      |  1 -
 plugins/php/versions/common/readline.sh | 11 ++++-------
 plugins/php/versions/phplib.conf        |  9 ---------
 11 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/plugins/php/versions/52/install.sh b/plugins/php/versions/52/install.sh
index 7516e0f04..816e3f940 100755
--- a/plugins/php/versions/52/install.sh
+++ b/plugins/php/versions/52/install.sh
@@ -85,6 +85,8 @@ fi
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
+else
+	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`
diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh
index 0ee811212..cf8d799be 100755
--- a/plugins/php/versions/53/install.sh
+++ b/plugins/php/versions/53/install.sh
@@ -66,9 +66,11 @@ fi
 # OPTIONS="${OPTIONS} --with-jpeg --with-jpeg-dir=/usr/lib"
 OPTIONS='--without-iconv'
 
-# if [ $sysName == 'Darwin' ]; then
-# 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
-# fi
+if [ $sysName == 'Darwin' ]; then
+	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
+else
+	OPTIONS="${OPTIONS} --with-readline"
+fi
 
 IS_64BIT=`getconf LONG_BIT`
 if [ "$IS_64BIT" == "64" ];then
@@ -113,6 +115,7 @@ if [ ! -d $serverPath/php/${PHP_VER}/bin ];then
 	--with-mysql=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
 	--with-mysqli=mysqlnd \
+	--enable-mbstring \
 	--enable-exif \
 	--enable-hash \
 	--enable-libxml \
diff --git a/plugins/php/versions/54/install.sh b/plugins/php/versions/54/install.sh
index aa9d63726..5c0012883 100755
--- a/plugins/php/versions/54/install.sh
+++ b/plugins/php/versions/54/install.sh
@@ -63,7 +63,7 @@ if [ $sysName == 'Darwin' ]; then
 	# OPTIONS="${OPTIONS} --with-pcre-dir=${serverPath}/lib/pcre"
 	# OPTIONS="${OPTIONS} --with-external-pcre=${serverPath}/lib/pcre"
 else
-	OPTIONS="${OPTIONS} --enable-mbstring"
+	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`
@@ -116,6 +116,7 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--with-mysql=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
 	--with-mysqli=mysqlnd \
+	--enable-mbstring \
 	--enable-sockets \
 	--enable-ftp \
 	--enable-simplexml \
diff --git a/plugins/php/versions/55/install.sh b/plugins/php/versions/55/install.sh
index 03a472dc1..4331d545e 100755
--- a/plugins/php/versions/55/install.sh
+++ b/plugins/php/versions/55/install.sh
@@ -61,7 +61,7 @@ OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
 else
-	OPTIONS="${OPTIONS} --enable-mbstring"
+	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`
@@ -116,6 +116,7 @@ if [ ! -d $serverPath/php/${PHP_VER}  ];then
 	--with-mysql=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
 	--with-mysqli=mysqlnd \
+	--enable-mbstring \
 	--enable-simplexml \
 	--enable-sockets \
 	--enable-ftp \
diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh
index 9b1de0bab..85259ac0b 100755
--- a/plugins/php/versions/56/install.sh
+++ b/plugins/php/versions/56/install.sh
@@ -65,7 +65,7 @@ if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
 	OPTIONS="${OPTIONS} --with-zlib-dir=$(brew --prefix zlib)"
 else
-	OPTIONS="${OPTIONS} --enable-mbstring"
+	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`
@@ -125,6 +125,7 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--with-mysql=mysqlnd \
 	--with-pdo-mysql=mysqlnd \
 	--with-mysqli=mysqlnd \
+	--enable-mbstring \
 	--enable-simplexml \
 	--enable-ftp \
 	--enable-sockets \
diff --git a/plugins/php/versions/70/install.sh b/plugins/php/versions/70/install.sh
index 26c0e9718..2225bc953 100755
--- a/plugins/php/versions/70/install.sh
+++ b/plugins/php/versions/70/install.sh
@@ -61,6 +61,8 @@ OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
 	# OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)"
+else
+	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`
diff --git a/plugins/php/versions/71/install.sh b/plugins/php/versions/71/install.sh
index af94469a2..9a1983fa9 100755
--- a/plugins/php/versions/71/install.sh
+++ b/plugins/php/versions/71/install.sh
@@ -62,6 +62,8 @@ OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
 	OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)"
+else
+	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`
diff --git a/plugins/php/versions/72/install.sh b/plugins/php/versions/72/install.sh
index 5ae7cc8d6..dbddba573 100755
--- a/plugins/php/versions/72/install.sh
+++ b/plugins/php/versions/72/install.sh
@@ -58,8 +58,12 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 fi
 
 OPTIONS='--without-iconv'
-OPTIONS="${OPTIONS} --with-zlib-dir=$serverPath/lib/zlib"
-
+if [ $sysName == 'Darwin' ]; then	
+	OPTIONS="${OPTIONS} --with-curl=$(brew --prefix curl)"
+	OPTIONS="${OPTIONS} --with-pcre-dir=$(brew --prefix pcre2)"
+else
+	OPTIONS="${OPTIONS} --with-readline"
+fi
 IS_64BIT=`getconf LONG_BIT`
 if [ "$IS_64BIT" == "64" ];then
 	OPTIONS="${OPTIONS} --with-libdir=lib64"
diff --git a/plugins/php/versions/73/install.sh b/plugins/php/versions/73/install.sh
index a73e7a8fb..c9a1b2ff6 100755
--- a/plugins/php/versions/73/install.sh
+++ b/plugins/php/versions/73/install.sh
@@ -70,7 +70,6 @@ if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-curl=$(brew --prefix curl)"
 	OPTIONS="${OPTIONS} --with-pcre-dir=$(brew --prefix pcre2)"
 else
-	OPTIONS="${OPTIONS} --with-zlib-dir=$serverPath/lib/zlib"
 	OPTIONS="${OPTIONS} --with-readline"
 fi
 
diff --git a/plugins/php/versions/common/readline.sh b/plugins/php/versions/common/readline.sh
index 6307b9805..71c13ad56 100755
--- a/plugins/php/versions/common/readline.sh
+++ b/plugins/php/versions/common/readline.sh
@@ -21,7 +21,10 @@ version=$2
 LIBNAME=readline
 LIBV=0
 
-
+if [ "$version" -lt "74" ];then
+	echo "not need"
+	exit 0
+fi
 
 LIB_PATH_NAME=lib/php
 if [ -d $serverPath/php/${version}/lib64 ];then
@@ -65,14 +68,8 @@ Install_lib()
 
 		cd ${rootPath}/plugins/php/lib && /bin/bash libedit.sh
 		export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${serverPath}/lib/libedit/lib/pkgconfig
-
-
 		OPTIONS="$OPTIONS --with-libedit=${serverPath}/lib/libedit"
 
-		readlinelib=`pkg-config --path readline`
-		export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${serverPath}/lib/libedit/lib/pkgconfig
-		OPTIONS="$OPTIONS --with-libedit=${serverPath}/lib/libedit"
-		
 		cd $sourcePath/php${version}/ext/${LIBNAME}
 		$serverPath/php/$version/bin/phpize
 		./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS
diff --git a/plugins/php/versions/phplib.conf b/plugins/php/versions/phplib.conf
index 98c978093..228cfa5d2 100755
--- a/plugins/php/versions/phplib.conf
+++ b/plugins/php/versions/phplib.conf
@@ -440,15 +440,6 @@
     {
         "name": "readline",
         "versions": [
-            "52",
-            "53",
-            "54",
-            "55",
-            "56",
-            "70",
-            "71",
-            "72",
-            "73",
             "74",
             "80",
             "81",

From e7e9379c09802067de1c1ff26fd012f627ed7685 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 02:30:07 +0800
Subject: [PATCH 880/965] update

---
 plugins/php/versions/73/install.sh |  4 ++--
 plugins/php/versions/74/install.sh | 13 +-----------
 plugins/php/versions/80/install.sh | 12 +----------
 plugins/php/versions/81/install.sh |  9 ---------
 plugins/php/versions/82/install.sh | 32 ------------------------------
 plugins/php/versions/83/install.sh | 10 ----------
 plugins/php/versions/84/install.sh | 11 +---------
 7 files changed, 5 insertions(+), 86 deletions(-)

diff --git a/plugins/php/versions/73/install.sh b/plugins/php/versions/73/install.sh
index c9a1b2ff6..eef39686d 100755
--- a/plugins/php/versions/73/install.sh
+++ b/plugins/php/versions/73/install.sh
@@ -106,8 +106,8 @@ fi
 # ----- cpu end ------
 
 if [ ! -d $serverPath/php/${PHP_VER} ];then
-	cd $sourcePath/php/php${PHP_VER} && ./configure \
-	--prefix=$serverPath/php/${PHP_VER} \
+	cd $sourcePath/php/php${PHP_VER}
+	./configure --prefix=$serverPath/php/${PHP_VER} \
 	--exec-prefix=$serverPath/php/${PHP_VER} \
 	--with-config-file-path=$serverPath/php/${PHP_VER}/etc \
 	--enable-mysqlnd \
diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh
index 33e0415ef..2520d135f 100755
--- a/plugins/php/versions/74/install.sh
+++ b/plugins/php/versions/74/install.sh
@@ -74,7 +74,6 @@ fi
 cd $sourcePath/php/php${PHP_VER}
 
 OPTIONS='--without-iconv'
-
 # if [ $sysName == 'Darwin' ]; then
 # 	OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)"
 # fi
@@ -84,16 +83,6 @@ if [ "$IS_64BIT" == "64" ];then
 	OPTIONS="${OPTIONS} --with-libdir=lib64"
 fi
 
-echo "$sourcePath/php/php${PHP_VER}"
-
-# ZIP_OPTION='--with-zip'
-# libzip_version=`pkg-config libzip --modversion`
-# if version_lt "$libzip_version" "0.11.0" ;then
-# 	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
-# 	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
-# 	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
-# fi
-
 # ----- cpu start ------
 if [ -z "${cpuCore}" ]; then
 	cpuCore="1"
@@ -118,9 +107,9 @@ else
 	cpuCore="1"
 fi
 # ----- cpu end ------
+
 if [ ! -d $serverPath/php/${PHP_VER} ];then
 	cd $sourcePath/php/php${PHP_VER} && make clean
-	# ./buildconf --force
 	./configure \
 	--prefix=$serverPath/php/${PHP_VER} \
 	--exec-prefix=$serverPath/php/${PHP_VER} \
diff --git a/plugins/php/versions/80/install.sh b/plugins/php/versions/80/install.sh
index 48c15b75d..9550c8bfa 100755
--- a/plugins/php/versions/80/install.sh
+++ b/plugins/php/versions/80/install.sh
@@ -81,16 +81,6 @@ fi
 # 	OPTIONS="${OPTIONS} --with-password-argon2"
 # fi
 
-
-# ZIP_OPTION='--with-zip'
-# libzip_version=`pkg-config libzip --modversion`
-# if version_lt "$libzip_version" "0.11.0" ;then
-# 	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
-# 	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
-# 	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
-# fi
-
-
 # ----- cpu start ------
 if [ -z "${cpuCore}" ]; then
 	cpuCore="1"
@@ -116,7 +106,7 @@ else
 fi
 # ----- cpu end ------
 
-echo "$sourcePath/php/php${PHP_VER}"
+# echo "$sourcePath/php/php${PHP_VER}"
 
 if [ ! -d $serverPath/php/${PHP_VER} ];then
 	cd $sourcePath/php/php${PHP_VER}
diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh
index c77959699..72714ac12 100755
--- a/plugins/php/versions/81/install.sh
+++ b/plugins/php/versions/81/install.sh
@@ -74,14 +74,6 @@ if [ "$?" == "0" ];then
 	OPTIONS="${OPTIONS} --with-password-argon2"
 fi
 
-# ZIP_OPTION='--with-zip'
-# libzip_version=`pkg-config libzip --modversion`
-# if version_lt "$libzip_version" "0.11.0" ;then
-# 	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
-# 	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
-# 	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
-# fi
-
 # ----- cpu start ------
 if [ -z "${cpuCore}" ]; then
 	cpuCore="1"
@@ -111,7 +103,6 @@ echo "$sourcePath/php/php${PHP_VER}"
 
 if [ ! -d $serverPath/php/${PHP_VER} ];then
 	cd $sourcePath/php/php${PHP_VER}
-	./buildconf --force
 	./configure \
 	--prefix=$serverPath/php/${PHP_VER} \
 	--exec-prefix=$serverPath/php/${PHP_VER} \
diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh
index e0524e1a8..6156f8411 100755
--- a/plugins/php/versions/82/install.sh
+++ b/plugins/php/versions/82/install.sh
@@ -102,19 +102,9 @@ else
 fi
 # ----- cpu end ------
 
-# ZIP_OPTION='--with-zip'
-# libzip_version=`pkg-config libzip --modversion`
-# if version_lt "$libzip_version" "0.11.0" ;then
-# 	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
-# 	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
-# 	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
-# fi
-
-
 # echo "$sourcePath/php/php${PHP_VER}"
 if [ ! -d $serverPath/php/${PHP_VER} ];then
 	cd $sourcePath/php/php${PHP_VER}
-	./buildconf --force
 	./configure \
 	--prefix=$serverPath/php/${PHP_VER} \
 	--exec-prefix=$serverPath/php/${PHP_VER} \
@@ -135,28 +125,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	echo "./configure \
-	--prefix=$serverPath/php/${PHP_VER} \
-	--exec-prefix=$serverPath/php/${PHP_VER} \
-	--with-config-file-path=$serverPath/php/${PHP_VER}/etc \
-	--enable-mysqlnd \
-	--with-mysqli=mysqlnd \
-	--with-pdo-mysql=mysqlnd \
-	--with-zlib-dir=$serverPath/lib/zlib \
-	$ZIP_OPTION \
-	--enable-mbstring \
-	--enable-ftp \
-	--enable-sockets \
-	--enable-simplexml \
-	--enable-soap \
-	--enable-posix \
-	--enable-sysvmsg \
-	--enable-sysvsem \
-	--enable-sysvshm \
-	--disable-intl \
-	--disable-fileinfo \
-	$OPTIONS \
-	--enable-fpm"
 	make clean && make -j${cpuCore} && make install && make clean
 
 	# rm -rf $sourcePath/php/php${PHP_VER}
diff --git a/plugins/php/versions/83/install.sh b/plugins/php/versions/83/install.sh
index d9f3bc7b2..aa072b049 100755
--- a/plugins/php/versions/83/install.sh
+++ b/plugins/php/versions/83/install.sh
@@ -102,20 +102,10 @@ else
 fi
 # ----- cpu end ------
 
-# ZIP_OPTION='--with-zip'
-# libzip_version=`pkg-config libzip --modversion`
-# if version_lt "$libzip_version" "0.11.0" ;then
-# 	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
-# 	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
-# 	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
-# fi
-
-
 echo "$sourcePath/php/php${PHP_VER}"
 
 if [ ! -d $serverPath/php/${PHP_VER} ];then
 	cd $sourcePath/php/php${PHP_VER}
-	# ./buildconf --force
 	./configure \
 	--prefix=$serverPath/php/${PHP_VER} \
 	--exec-prefix=$serverPath/php/${PHP_VER} \
diff --git a/plugins/php/versions/84/install.sh b/plugins/php/versions/84/install.sh
index b565e9195..67a481fb2 100755
--- a/plugins/php/versions/84/install.sh
+++ b/plugins/php/versions/84/install.sh
@@ -91,23 +91,14 @@ else
 fi
 # ----- cpu end ------
 
-# ZIP_OPTION='--with-zip'
-# libzip_version=`pkg-config libzip --modversion`
-# if version_lt "$libzip_version" "0.11.0" ;then
-# 	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
-# 	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
-# 	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
-# fi
-
 # OPTIONS="${OPTIONS} --enable-debug"
 # OPTIONS="${OPTIONS} --enable-dtrace"
 
-
 echo "$sourcePath/php/php${PHP_VER}"
 
 if [ ! -d $serverPath/php/${PHP_VER} ];then
 	cd $sourcePath/php/php${PHP_VER}
-	./buildconf --force
+	# ./buildconf --force
 	./configure \
 	--prefix=$serverPath/php/${PHP_VER} \
 	--exec-prefix=$serverPath/php/${PHP_VER} \

From ec4c3f3574c0b02c34999cb793e4b3d11c840188 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 02:52:35 +0800
Subject: [PATCH 881/965] Update public.js

---
 web/static/app/public.js | 142 +++++++++++++++++++--------------------
 1 file changed, 69 insertions(+), 73 deletions(-)

diff --git a/web/static/app/public.js b/web/static/app/public.js
index 64bb24d41..7e6275abf 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -267,40 +267,40 @@ function changePathCallback(default_dir, callback) {
 		shift: 5,
 		shadeClose: false,
 		content: "<div class='changepath'>\
-					<div class='path-top'>\
-						<button type='button' class='btn btn-default btn-sm' onclick='backFile()'>\
-							<span class='glyphicon glyphicon-share-alt'></span>返回\
-						</button>\
-						<div class='place' id='PathPlace'>当前路径：<span></span></div>\
-					</div>\
-					<div class='path-con'>\
-						<div class='path-con-left'>\
-							<dl><dt id='changecomlist' onclick='backMyComputer()'>计算机</dt></dl>\
-						</div>\
-						<div class='path-con-right'>\
-							<ul class='default' id='computerDefautl'></ul>\
-							<div class='file-list divtable'>\
-								<table class='table table-hover' style='border:0 none'>\
-									<thead>\
-										<tr class='file-list-head'>\
-											<th width='40%'>文件名</th>\
-											<th width='20%'>修改时间</th>\
-											<th width='10%'>权限</th>\
-											<th width='10%'>所有者</th>\
-											<th width='10%'></th>\
-										</tr>\
-									</thead>\
-									<tbody id='tbody' class='list-list'></tbody>\
-								</table>\
-							</div>\
-						</div>\
+			<div class='path-top'>\
+				<button type='button' class='btn btn-default btn-sm' onclick='backFile()'>\
+					<span class='glyphicon glyphicon-share-alt'></span>返回\
+				</button>\
+				<div class='place' id='PathPlace'>当前路径：<span></span></div>\
+			</div>\
+			<div class='path-con'>\
+				<div class='path-con-left'>\
+					<dl><dt id='changecomlist' onclick='backMyComputer()'>计算机</dt></dl>\
+				</div>\
+				<div class='path-con-right'>\
+					<ul class='default' id='computerDefautl'></ul>\
+					<div class='file-list divtable'>\
+						<table class='table table-hover' style='border:0 none'>\
+							<thead>\
+								<tr class='file-list-head'>\
+									<th width='40%'>文件名</th>\
+									<th width='20%'>修改时间</th>\
+									<th width='10%'>权限</th>\
+									<th width='10%'>所有者</th>\
+									<th width='10%'></th>\
+								</tr>\
+							</thead>\
+							<tbody id='tbody' class='list-list'></tbody>\
+						</table>\
 					</div>\
 				</div>\
-				<div class='getfile-btn' style='margin-top:0'>\
-					<button type='button' class='btn btn-default btn-sm pull-left' onclick='createFolder()'>新建文件夹</button>\
-					<button type='button' class='btn btn-danger btn-sm mr5 btn-close'>关闭</button>\
-					<button type='button' class='btn btn-success btn-sm btn-choose'>选择</button>\
-				</div>",
+			</div>\
+		</div>\
+		<div class='getfile-btn' style='margin-top:0'>\
+			<button type='button' class='btn btn-default btn-sm pull-left' onclick='createFolder()'>新建文件夹</button>\
+			<button type='button' class='btn btn-danger btn-sm mr5 btn-close'>关闭</button>\
+			<button type='button' class='btn btn-success btn-sm btn-choose'>选择</button>\
+		</div>",
 		success:function(layero,layer_index){
 			$('.btn-close').click(function(){
 				layer.close(layer_index);
@@ -332,38 +332,37 @@ function changePath(d) {
 		closeBtn: 1,
 		shift: 5,
 		shadeClose: false,
-		content: "\
-			<div class='changepath'>\
-				<div class='path-top'>\
-					<button type='button' class='btn btn-default btn-sm' onclick='backFile()'><span class='glyphicon glyphicon-share-alt'></span>返回</button>\
-					<div class='place' id='PathPlace'>当前路径：<span></span></div>\
-				</div>\
-				<div class='path-con'>\
-					<div class='path-con-left'><dl><dt id='changecomlist' onclick='backMyComputer()'>计算机</dt></dl></div>\
-					<div class='path-con-right'>\
-						<ul class='default' id='computerDefautl'></ul>\
-						<div class='file-list divtable'>\
-							<table class='table table-hover' style='border:0 none'>\
-								<thead>\
-									<tr class='file-list-head'>\
-										<th width='40%'>文件名</th>\
-										<th width='20%'>修改时间</th>\
-										<th width='10%'>权限</th>\
-										<th width='10%'>所有者</th>\
-										<th width='10%'></th>\
-									</tr>\
-								</thead>\
-								<tbody id='tbody' class='list-list'></tbody>\
-							</table>\
-						</div>\
+		content: "<div class='changepath'>\
+			<div class='path-top'>\
+				<button type='button' class='btn btn-default btn-sm' onclick='backFile()'><span class='glyphicon glyphicon-share-alt'></span>返回</button>\
+				<div class='place' id='PathPlace'>当前路径：<span></span></div>\
+			</div>\
+			<div class='path-con'>\
+				<div class='path-con-left'><dl><dt id='changecomlist' onclick='backMyComputer()'>计算机</dt></dl></div>\
+				<div class='path-con-right'>\
+					<ul class='default' id='computerDefautl'></ul>\
+					<div class='file-list divtable'>\
+						<table class='table table-hover' style='border:0 none'>\
+							<thead>\
+								<tr class='file-list-head'>\
+									<th width='40%'>文件名</th>\
+									<th width='20%'>修改时间</th>\
+									<th width='10%'>权限</th>\
+									<th width='10%'>所有者</th>\
+									<th width='10%'></th>\
+								</tr>\
+							</thead>\
+							<tbody id='tbody' class='list-list'></tbody>\
+						</table>\
 					</div>\
 				</div>\
 			</div>\
-			<div class='getfile-btn' style='margin-top:0'>\
-				<button type='button' class='btn btn-default btn-sm pull-left' onclick='createFolder()'>新建文件夹</button>\
-				<button type='button' class='btn btn-danger btn-sm mr5' onclick=\"layer.close(getCookie('changePath'))\">关闭</button>\
-				<button type='button' class='btn btn-success btn-sm' onclick='getfilePath()'>选择</button>\
-			</div>"
+		</div>\
+		<div class='getfile-btn' style='margin-top:0'>\
+			<button type='button' class='btn btn-default btn-sm pull-left' onclick='createFolder()'>新建文件夹</button>\
+			<button type='button' class='btn btn-danger btn-sm mr5' onclick=\"layer.close(getCookie('changePath'))\">关闭</button>\
+			<button type='button' class='btn btn-success btn-sm' onclick='getfilePath()'>选择</button>\
+		</div>"
 	});
 	setCookie("changePath", c);
 	var b = $("#" + d).val();
@@ -412,7 +411,7 @@ function getDiskList(b) {
 					<span class='glyphicon glyphicon-folder-open'></span>" + e + "</td><td>" + getLocalTime(g[2]) + "</td>\
 				<td>" + g[3] + "</td>\
 				<td>" + g[4] + "</td>\
-				<td><span class='delfile-btn' onclick=\"NewDelFile('" + h.path + "/" + g[0] + "')\">X</span></td>\
+				<td><span class='delfile-btn' onclick=\"newDelFile('" + h.path + "/" + g[0] + "')\">X</span></td>\
 			</tr>";
 		}
 		if(h.files != null && h.files != "") {
@@ -485,7 +484,7 @@ function createFolder() {
 	})
 }
 
-function NewDelFile(c) {
+function newDelFile(c) {
 	var a = $("#PathPlace").find("span").text();
 	newTxt = c.replace(new RegExp(/(\/\/)/g), "/");
 	var b = "path=" + newTxt + "&empty=True";
@@ -1339,6 +1338,7 @@ function getSFM(seconds, dateFormat = 'H:i:s') {
 
 function remind(a){
 	a = a == undefined ? 1 : a;
+	$(".taskcon").html('');
 	$.post("/task/list", "table=tasks&result=2,4,6,8&limit=10&p=" + a, function(g) {
 		var e = '';
 		var f = false;
@@ -1403,7 +1403,7 @@ function remind(a){
 function getReloads() {
 	var a = 0;
 	var mm = $(".bt-w-menu .bgw").html()
-	if(mm == undefined || mm.indexOf(lan.bt.task_list) == -1) {
+	if(mm == undefined || mm.indexOf('任务列表') == -1) {
 		clearInterval(speed);
 		a = 0;
 		speed = null;
@@ -1505,7 +1505,10 @@ function tasklist(a){
 	$.post("/task/list", "tojs=getTaskList&table=tasks&limit=10&p=" + a, function(g) {
 		$('.msg_count').html(g.count);
 	},'json');
-	getReloads();
+
+	setTimeout(function(){
+		getReloads();
+	},100);
 }
 
 function activeDisk() {
@@ -1560,13 +1563,6 @@ function scroll_handle(e){
 	$(this).find("thead").css({"transform":"translateY("+scrollTop+"px)","position":"relative","z-index":"1"});
 }
 
-
-$(function(){
-///
-setInterval(function(){check_login();},6000);
-///
-});
-
 function asyncLoadImage(obj, url){
 	
 	if (typeof(url) == 'undefined'){
@@ -2704,8 +2700,8 @@ function pluginStandAloneLogs(_name, version, func, _args, line){
 }
 /*** 其中功能,针对插件通过库使用 end ***/
 
-
 $(function() {
+	setInterval(function(){check_login();},6000);
 	autoHeight();
 });
 $(window).resize(function() {

From 5e6774ee63f16cb86496d063eadf8180e9516d8d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 02:52:44 +0800
Subject: [PATCH 882/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index cac25e934..7e83341d6 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.24
+APP_SMALL_VERSION = 0.25
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From e878f79ffc9d69769905491c1e9b73e33e07147d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 02:57:58 +0800
Subject: [PATCH 883/965] up

---
 plugins/php/versions/52/install.sh | 2 --
 plugins/php/versions/53/install.sh | 2 --
 2 files changed, 4 deletions(-)

diff --git a/plugins/php/versions/52/install.sh b/plugins/php/versions/52/install.sh
index 816e3f940..7516e0f04 100755
--- a/plugins/php/versions/52/install.sh
+++ b/plugins/php/versions/52/install.sh
@@ -85,8 +85,6 @@ fi
 OPTIONS='--without-iconv'
 if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
-else
-	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`
diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh
index cf8d799be..49906af25 100755
--- a/plugins/php/versions/53/install.sh
+++ b/plugins/php/versions/53/install.sh
@@ -68,8 +68,6 @@ OPTIONS='--without-iconv'
 
 if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
-else
-	OPTIONS="${OPTIONS} --with-readline"
 fi
 
 IS_64BIT=`getconf LONG_BIT`

From 47ce5e05bcb8d56268159741a8e828d7025feeb1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 03:10:48 +0800
Subject: [PATCH 884/965] Update plugin.py

---
 web/utils/plugin.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index 0eb74a267..32c13ec3c 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -314,7 +314,6 @@ class plugin(object):
 
     # 卸载插件
     def uninstall(self, name, version):
-        rundir = mw.getRunDir()
         if name.strip() == '':
             return mw.returnData(False, "缺少插件名称!", ())
 

From f2f02e4b1bf02b5a8db7d0d3f224aa469665b36f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 03:14:06 +0800
Subject: [PATCH 885/965] update

---
 panel_task.py  | 2 +-
 web/core/mw.py | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/panel_task.py b/panel_task.py
index 344637628..7aa3aa43f 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -30,7 +30,7 @@ import thisdb
 from admin import setup
 setup.init()
 
-g_log_file = mw.getPanelTaskLog()
+g_log_file = mw.getPanelTaskExecLog()
 if not os.path.exists(g_log_file):
     os.system("touch " + g_log_file)
 
diff --git a/web/core/mw.py b/web/core/mw.py
index 012922b50..35f2d940e 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -116,6 +116,9 @@ def getRecycleBinDir():
 def getPanelTaskLog():
     return getMWLogs() + '/panel_task.log'
 
+def getPanelTaskExecLog():
+    return getMWLogs() + '/panel_exec.log'
+
 def getWwwDir():
     import thisdb
     site_path = thisdb.getOption('site_path')

From 5dcf932a81666a263f93d4d2fee11e422129a5ec Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 03:15:26 +0800
Subject: [PATCH 886/965] Update __init__.py

---
 web/admin/task/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/task/__init__.py b/web/admin/task/__init__.py
index 8bbd78887..65107cab4 100644
--- a/web/admin/task/__init__.py
+++ b/web/admin/task/__init__.py
@@ -54,7 +54,7 @@ def get_task_speed():
     if row is None:
         return mw.returnData(False, '当前没有任务队列在执行-3!')
 
-    task_logfile = mw.getPanelTaskLog()
+    task_logfile = mw.getPanelTaskExecLog()
 
     data = {}
     data['name'] = row['name']

From 1bf02abc1dbe7cdd1f11e3bb8d0ba810bbc4e38e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 03:23:19 +0800
Subject: [PATCH 887/965] Update __init__.py

---
 web/admin/task/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/task/__init__.py b/web/admin/task/__init__.py
index 65107cab4..476a042b9 100644
--- a/web/admin/task/__init__.py
+++ b/web/admin/task/__init__.py
@@ -39,7 +39,7 @@ def list():
 @blueprint.route('/get_exec_log', endpoint='get_exec_log', methods=['POST'])
 @panel_login_required
 def get_exec_log():
-    file = mw.getPanelTaskLog()
+    file = mw.getPanelTaskExecLog()
     return mw.getLastLine(file, 100)
 
 

From 3f5b6a0b0073ab2ce5ba2841834d832d5b4dcb0c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 04:18:21 +0800
Subject: [PATCH 888/965] Update panel_bookmark.py

---
 web/admin/setting/panel_bookmark.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/web/admin/setting/panel_bookmark.py b/web/admin/setting/panel_bookmark.py
index 0a377712c..922269e8f 100644
--- a/web/admin/setting/panel_bookmark.py
+++ b/web/admin/setting/panel_bookmark.py
@@ -66,5 +66,23 @@ def del_panel_info():
     return mw.returnData(True, '删除成功!')
 
 
+# 设置面板域名
+@blueprint.route('/set_panel_info', endpoint='set_panel_info', methods=['POST'])
+@panel_login_required
+def set_panel_info():
+    title = request.form.get('title', '')
+    url = request.form.get('url', '')
+    username = request.form.get('username', '')
+    password = request.form.get('password', '')
+    panel_id = request.form.get('id', '')
+    # 校验是还是重复
+    isSave = mw.M('panel').where('(title=? OR url=?) AND id!=?', (title, url, panel_id)).count()
+    if isSave:
+        return mw.returnData(False, '备注或面板地址重复!')
 
+    # 更新到数据库
+    isRe = mw.M('panel').where('id=?', (panel_id,)).save('title,url,username,password', (title, url, username, password))
+    if isRe:
+        return mw.returnData(True, '修改成功!')
+    return mw.returnData(False, '修改失败!')
 

From f2c48317868a1e15a0e57442741b3a00f1e3916a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 04:29:32 +0800
Subject: [PATCH 889/965] update

---
 plugins/tgbot/startup/extend/push_ad.py         | 5 +++++
 plugins/tgbot/startup/extend/push_notice_msg.py | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/plugins/tgbot/startup/extend/push_ad.py b/plugins/tgbot/startup/extend/push_ad.py
index 38a51329e..495a82519 100644
--- a/plugins/tgbot/startup/extend/push_ad.py
+++ b/plugins/tgbot/startup/extend/push_ad.py
@@ -45,12 +45,17 @@ def send_msg(bot, tag='ad', trigger_time=300):
     mw.writeFile(lock_file, json.dumps(lock_data))
     # 信号只在一个周期内执行一次|end
 
+    # TTKCDN 无视移动墙/GFW/SNI阻断 TG第一性价比 | 10/m | @ssdpflood
     # https://t.me/gjgzs2022 ｜ 22/m | @GJ_gzs
     # https://zhaoziyuan1.cc | web | 15/m | 2m | next,12/15 ｜ @baleite
     # 综合包网/NG接口开户 | 28/m | 6m | next,4/28 | x
     # 实名认证/过人脸🕵️‍♀️各种账号处理✅ | 30/m| next,12/30 | @nngzs
     # 桃花资源采集| 13/m| next,1/13 | @xiaolizi1122
     keyboard = [
+        [
+            types.InlineKeyboardButton(
+                text="TTKCDN 无视移动墙/GFW/SNI阻断 TG第一性价比", url='https://t.me/ssdpflood')
+        ],
         [
             types.InlineKeyboardButton(
                 text="桃花资源采集🚀 ", url='https://thzy.me')
diff --git a/plugins/tgbot/startup/extend/push_notice_msg.py b/plugins/tgbot/startup/extend/push_notice_msg.py
index bf39fd2e4..42bc5a69f 100644
--- a/plugins/tgbot/startup/extend/push_notice_msg.py
+++ b/plugins/tgbot/startup/extend/push_notice_msg.py
@@ -54,12 +54,17 @@ def send_msg(bot, tag='ad', trigger_time=300):
     mw.writeFile(lock_file, json.dumps(lock_data))
     # 信号只在一个周期内执行一次|end
 
+    # TTKCDN 无视移动墙/GFW/SNI阻断 TG第一性价比 | 10/m | @ssdpflood
     # https://t.me/gjgzs2022 ｜ 22/m | @GJ_gzs
     # https://zhaoziyuan1.cc | web | 15/m | 2m | next,12/15 ｜ @baleite
     # 综合包网/NG接口开户 | 28/m | 6m | next,4/28 | x
     # 实名认证/过人脸🕵️‍♀️各种账号处理✅ | 30/m| next,12/30 | @nngzs
     # 桃花资源采集| 13/m| next,1/13 | @xiaolizi1122
     keyboard = [
+        [
+            types.InlineKeyboardButton(
+                text="TTKCDN 无视移动墙/GFW/SNI阻断 TG第一性价比", url='https://t.me/ssdpflood')
+        ],
         [
             types.InlineKeyboardButton(
                 text="桃花资源采集🚀 ", url='https://thzy.me')

From 9f2bc6e0e1db5d70aff702846fc817f8f09e6f90 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 05:30:44 +0800
Subject: [PATCH 890/965] Update phplib.conf

---
 plugins/php/versions/phplib.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/php/versions/phplib.conf b/plugins/php/versions/phplib.conf
index 228cfa5d2..9dd8efb0a 100755
--- a/plugins/php/versions/phplib.conf
+++ b/plugins/php/versions/phplib.conf
@@ -774,8 +774,7 @@
             "80",
             "81",
             "82",
-            "83",
-            "84"
+            "83"
         ],
         "type": "大数据",
         "msg": "SOLR全文搜索服务",

From f16dfd6819c2f24c2c01e5b0123220b9e0063ccc Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 14:22:59 +0800
Subject: [PATCH 891/965] update

---
 web/admin/site/ssl.py | 16 +++++++++++++++-
 web/utils/site.py     | 36 +++++++++++++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/web/admin/site/ssl.py b/web/admin/site/ssl.py
index 5533ae972..17e3895c0 100644
--- a/web/admin/site/ssl.py
+++ b/web/admin/site/ssl.py
@@ -89,13 +89,27 @@ def set_cert_to_site():
     cert_name = request.form.get('certName', '')
     return MwSites.instance().setCertToSite(site_name, cert_name)
 
-
+# 删除证书
 @blueprint.route('/remove_cert', endpoint='remove_cert', methods=['GET','POST'])
 @panel_login_required
 def remove_cert():
     cert_name = request.form.get('certName', '')
     return MwSites.instance().removeCert(cert_name)
 
+# 强制开启HTTPS
+@blueprint.route('/http_to_https', endpoint='http_to_https', methods=['GET','POST'])
+@panel_login_required
+def http_to_https():
+    site_name = request.form.get('siteName', '')
+    return MwSites.instance().httpToHttps(site_name)
+
+# 强制关闭HTTPS
+@blueprint.route('/close_to_https', endpoint='close_to_https', methods=['GET','POST'])
+@panel_login_required
+def close_to_https():
+    site_name = request.form.get('siteName', '')
+    return MwSites.instance().closeToHttps(site_name)
+
 
 
 
diff --git a/web/utils/site.py b/web/utils/site.py
index c208c0029..3be204b73 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1129,6 +1129,40 @@ error_page 497  https://$host$request_uri;""" % (certPath, keyPath, http3Header)
         data['phpversion'] = def_pver
         return data
 
+    def httpToHttps(self, site_name):
+        file = self.getHostConf(site_name)
+        conf = mw.readFile(file)
+        if not conf:
+            return mw.returnData(False, '站点[{}]配置异常!'.format(site_name))
+
+        if conf.find('ssl_certificate') == -1:
+            return mw.returnData(False, '当前未开启SSL')
+        to = "#error_page 404/404.html;\n\
+#HTTP_TO_HTTPS_START\n\
+if ($server_port !~ 443){\n\
+    rewrite ^(/.*)$ https://$host$1 permanent;\n\
+}\n\
+#HTTP_TO_HTTPS_END"
+        conf = conf.replace('#error_page 404/404.html;', to)
+        mw.writeFile(file, conf)
+
+        mw.restartWeb()
+        return mw.returnData(True, '设置成功!')
+
+    def closeToHttps(self, site_name):
+        file = self.getHostConf(site_name)
+        conf = mw.readFile(file)
+        if not conf:
+            return mw.returnData(False, '站点[{}]配置异常!'.format(site_name))
+        rep = r"\n\s*#HTTP_TO_HTTPS_START(.|\n){1,300}#HTTP_TO_HTTPS_END"
+        conf = re.sub(rep, '', conf)
+        rep = r"\s+if.+server_port.+\n.+\n\s+\s*}"
+        conf = re.sub(rep, '', conf)
+        mw.writeFile(file, conf)
+
+        mw.restartWeb()
+        return mw.returnData(True, '关闭HTTPS跳转成功!')
+
     def getIndex(self, site_id):
         info = thisdb.getSitesById(site_id)
         file = self.getHostConf(info['name'])
@@ -1158,7 +1192,7 @@ error_page 497  https://$host$request_uri;""" % (certPath, keyPath, http3Header)
             mw.writeFile(file, conf)
 
         mw.writeLog('网站管理', '站点[{1}]设置{2}成功', (siteName, index_l))
-        return mw.returnJson(True,  '设置成功!')
+        return mw.returnData(True,  '设置成功!')
 
     def getLimitNet(self, site_id):
         info = thisdb.getSitesById(site_id)

From a3022c7f806dcfefe920c5c0d9d2ecd70fd3dfd0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 14:24:40 +0800
Subject: [PATCH 892/965] Update site.py

---
 web/utils/site.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 3be204b73..8b2b51dca 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1138,11 +1138,11 @@ error_page 497  https://$host$request_uri;""" % (certPath, keyPath, http3Header)
         if conf.find('ssl_certificate') == -1:
             return mw.returnData(False, '当前未开启SSL')
         to = "#error_page 404/404.html;\n\
-#HTTP_TO_HTTPS_START\n\
-if ($server_port !~ 443){\n\
-    rewrite ^(/.*)$ https://$host$1 permanent;\n\
-}\n\
-#HTTP_TO_HTTPS_END"
+    #HTTP_TO_HTTPS_START\n\
+    if ($server_port !~ 443){\n\
+        rewrite ^(/.*)$ https://$host$1 permanent;\n\
+    }\n\
+    #HTTP_TO_HTTPS_END"
         conf = conf.replace('#error_page 404/404.html;', to)
         mw.writeFile(file, conf)
 

From a1b39dcff5ebf87b35e182aaf07e74a3fc760c15 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 14:26:02 +0800
Subject: [PATCH 893/965] Update site.py

---
 web/utils/site.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 8b2b51dca..e6bb1d61e 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -520,22 +520,22 @@ class sites(object):
             # ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE;
             # add_header Alt-Svc 'h3=":443";ma=86400,h3-29=":443";ma=86400';
             http3Header = """
-add_header Strict-Transport-Security "max-age=63072000";
-add_header Alt-Svc 'h3=":443";ma=86400';
+    add_header Strict-Transport-Security "max-age=63072000";
+    add_header Alt-Svc 'h3=":443";ma=86400';
 """
             if not version.startswith('1.25') or version.startswith('1.27'):
                 http3Header = '';
 
             sslStr = """#error_page 404/404.html;
-ssl_certificate    %s;
-ssl_certificate_key  %s;
-ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
-ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305;
-ssl_prefer_server_ciphers on;
-ssl_session_cache shared:SSL:10m;
-ssl_session_timeout 10m;
-%s
-error_page 497  https://$host$request_uri;""" % (certPath, keyPath, http3Header)
+    ssl_certificate    %s;
+    ssl_certificate_key  %s;
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+    ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305;
+    ssl_prefer_server_ciphers on;
+    ssl_session_cache shared:SSL:10m;
+    ssl_session_timeout 10m;
+    %s
+    error_page 497  https://$host$request_uri;""" % (certPath, keyPath, http3Header)
         if(conf.find('ssl_certificate') != -1):
             return mw.returnData(True, 'SSL开启成功!')
 
@@ -2462,7 +2462,7 @@ export PATH
     def getPhpVersion(self):
         phpVersions = ('00', '52', '53', '54', '55', '56',
                        '70', '71', '72', '73', '74', '80',
-                       '81', '82', '83', '84')
+                       '81', '82', '83', '84', '85')
         data = []
         for val in phpVersions:
             tmp = {}

From dd0c46286ca100a1f1e3bbc3373817af9edfde4e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 14:37:46 +0800
Subject: [PATCH 894/965] Update swoole.sh

---
 plugins/php/versions/common/swoole.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/php/versions/common/swoole.sh b/plugins/php/versions/common/swoole.sh
index d39e624aa..9e03436a1 100755
--- a/plugins/php/versions/common/swoole.sh
+++ b/plugins/php/versions/common/swoole.sh
@@ -15,7 +15,7 @@ actionType=$1
 version=$2
 
 LIBNAME=swoole
-LIBV=4.8.10
+LIBV=5.1.6
 
 if [ "$version" -lt "70" ];then
 	LIBV=1.10.1

From e28a7124a22dc08cbd50b5b6c9766f292e10853e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 14:39:03 +0800
Subject: [PATCH 895/965] Update yaf.sh

---
 plugins/php/versions/common/yaf.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/php/versions/common/yaf.sh b/plugins/php/versions/common/yaf.sh
index 5c1c2963f..179ea0a9c 100755
--- a/plugins/php/versions/common/yaf.sh
+++ b/plugins/php/versions/common/yaf.sh
@@ -16,7 +16,7 @@ version=$2
 
 sysName=`uname`
 LIBNAME=yaf
-LIBV=3.3.5
+LIBV=3.3.6
 
 if [ "$version" -lt "70" ];then
 	LIBV=2.3.5

From e544ba53b5e560bd563ba308e2a400f4cca520c3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 14:40:43 +0800
Subject: [PATCH 896/965] Update yaf.sh

---
 plugins/php/versions/common/yaf.sh | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/plugins/php/versions/common/yaf.sh b/plugins/php/versions/common/yaf.sh
index 179ea0a9c..5bb1af208 100755
--- a/plugins/php/versions/common/yaf.sh
+++ b/plugins/php/versions/common/yaf.sh
@@ -18,20 +18,11 @@ sysName=`uname`
 LIBNAME=yaf
 LIBV=3.3.6
 
-if [ "$version" -lt "70" ];then
+if [ "$version" -lt "70" ]; then
 	LIBV=2.3.5
-fi
-
-if [ "$version" -eq "70" ] || [ "$version" -eq "71" ];then
+elif [ "$version" -lt "74" ]; then
 	LIBV=3.2.5
-fi
-
-if [ "$version" -eq "72" ] || [ "$version" -eq "73" ];then
-	LIBV=3.2.5
-fi
-
-
-if [ "$version" -gt "74" ];then
+elif [ "$version" -lt "80" ]; then
 	LIBV=3.3.5
 fi
 

From 51eff5f671ee4b72feb3881a6f668ce9286f32c8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 14:43:32 +0800
Subject: [PATCH 897/965] Update yaml.sh

---
 plugins/php/versions/common/yaml.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/php/versions/common/yaml.sh b/plugins/php/versions/common/yaml.sh
index bd1347398..9c58704a5 100755
--- a/plugins/php/versions/common/yaml.sh
+++ b/plugins/php/versions/common/yaml.sh
@@ -16,7 +16,7 @@ version=$2
 
 sysName=`uname`
 LIBNAME=yaml
-LIBV=2.2.3
+LIBV=2.2.4
 
 LIB_PATH_NAME=lib/php
 if [ -d $serverPath/php/${version}/lib64 ];then

From ee13c8f51993d3d480f70c2a12f70bfbc056b607 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 14:44:52 +0800
Subject: [PATCH 898/965] Update solr.sh

---
 plugins/php/versions/common/solr.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/php/versions/common/solr.sh b/plugins/php/versions/common/solr.sh
index fc0241365..6a08af64f 100755
--- a/plugins/php/versions/common/solr.sh
+++ b/plugins/php/versions/common/solr.sh
@@ -12,7 +12,7 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source/php
 SYS_ARCH=`arch`
 LIBNAME=solr
-LIBV=2.6.0
+LIBV=2.7.0
 sysName=`uname`
 actionType=$1
 version=$2

From 3b0e624d9257986b51f87134f13c5f381cff1df1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 14:54:14 +0800
Subject: [PATCH 899/965] Update README.md

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 81775665e..52d4c9c2b 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,10 @@ Talk is cheap, show me the code.  -- linus
 - [兼容性测试报告](/compatibility.md)
 - [常用命令说明](/cmd.md) [ mw default ] [ mw update_dev ]
 
+### 特别赞助
+
+- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan1.cc)
+
 ### 主要插件介绍
 
 * OpenResty - 轻量级，占有内存少，并发能力强。
@@ -88,10 +92,6 @@ PHP[72-84]支持phpMyAdmin[5.2.1]
 - https://www.youtube.com/watch?v=2taa5K-Jmmw
 
 
-# 特别赞助
-
-- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan1.cc)
-
 # AD - VPS推荐 - 🙏
 
 - [ZZZ评测](https://www.zzzvps.com/)

From 069bef1f0da0b5e629c4f72c8888eaab18203f99 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 14:56:36 +0800
Subject: [PATCH 900/965] Update igbinary.sh

---
 plugins/php/versions/common/igbinary.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/php/versions/common/igbinary.sh b/plugins/php/versions/common/igbinary.sh
index 2ba49314d..5128c9e81 100755
--- a/plugins/php/versions/common/igbinary.sh
+++ b/plugins/php/versions/common/igbinary.sh
@@ -15,7 +15,7 @@ actionType=$1
 version=$2
 
 LIBNAME=igbinary
-LIBV=3.2.7
+LIBV=3.2.16
 
 if [ "$version" -lt "70" ];then
 	echo "not need"

From 3d319c7c765f23e59271f05ba90e9c3551032ce4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 15:17:22 +0800
Subject: [PATCH 901/965] update

---
 plugins/tgbot/startup/extend/push_ad.py         | 5 +++++
 plugins/tgbot/startup/extend/push_notice_msg.py | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/plugins/tgbot/startup/extend/push_ad.py b/plugins/tgbot/startup/extend/push_ad.py
index 495a82519..b1951c134 100644
--- a/plugins/tgbot/startup/extend/push_ad.py
+++ b/plugins/tgbot/startup/extend/push_ad.py
@@ -45,6 +45,7 @@ def send_msg(bot, tag='ad', trigger_time=300):
     mw.writeFile(lock_file, json.dumps(lock_data))
     # 信号只在一个周期内执行一次|end
 
+    # 跨链混币器Cce.Cash💰低手续费💰隔断溯源 | 10/m | @hu ge
     # TTKCDN 无视移动墙/GFW/SNI阻断 TG第一性价比 | 10/m | @ssdpflood
     # https://t.me/gjgzs2022 ｜ 22/m | @GJ_gzs
     # https://zhaoziyuan1.cc | web | 15/m | 2m | next,12/15 ｜ @baleite
@@ -52,6 +53,10 @@ def send_msg(bot, tag='ad', trigger_time=300):
     # 实名认证/过人脸🕵️‍♀️各种账号处理✅ | 30/m| next,12/30 | @nngzs
     # 桃花资源采集| 13/m| next,1/13 | @xiaolizi1122
     keyboard = [
+        [
+            types.InlineKeyboardButton(
+                text="跨链混币器Cce.Cash💰低手续费💰隔断溯源", url='https://cce.cash/#/main/home?MW')
+        ],
         [
             types.InlineKeyboardButton(
                 text="TTKCDN 无视移动墙/GFW/SNI阻断 TG第一性价比", url='https://t.me/ssdpflood')
diff --git a/plugins/tgbot/startup/extend/push_notice_msg.py b/plugins/tgbot/startup/extend/push_notice_msg.py
index 42bc5a69f..7956bbf51 100644
--- a/plugins/tgbot/startup/extend/push_notice_msg.py
+++ b/plugins/tgbot/startup/extend/push_notice_msg.py
@@ -54,6 +54,7 @@ def send_msg(bot, tag='ad', trigger_time=300):
     mw.writeFile(lock_file, json.dumps(lock_data))
     # 信号只在一个周期内执行一次|end
 
+    # 跨链混币器Cce.Cash💰低手续费💰隔断溯源 | 10/m | @hu ge
     # TTKCDN 无视移动墙/GFW/SNI阻断 TG第一性价比 | 10/m | @ssdpflood
     # https://t.me/gjgzs2022 ｜ 22/m | @GJ_gzs
     # https://zhaoziyuan1.cc | web | 15/m | 2m | next,12/15 ｜ @baleite
@@ -61,6 +62,10 @@ def send_msg(bot, tag='ad', trigger_time=300):
     # 实名认证/过人脸🕵️‍♀️各种账号处理✅ | 30/m| next,12/30 | @nngzs
     # 桃花资源采集| 13/m| next,1/13 | @xiaolizi1122
     keyboard = [
+        [
+            types.InlineKeyboardButton(
+                text="跨链混币器Cce.Cash💰低手续费💰隔断溯源", url='https://cce.cash/#/main/home?MW')
+        ],
         [
             types.InlineKeyboardButton(
                 text="TTKCDN 无视移动墙/GFW/SNI阻断 TG第一性价比", url='https://t.me/ssdpflood')

From fb15ca1d76407420423ce21209df30bd40823369 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 15:22:23 +0800
Subject: [PATCH 902/965] Update push_ad.py

---
 plugins/tgbot/startup/extend/push_ad.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/tgbot/startup/extend/push_ad.py b/plugins/tgbot/startup/extend/push_ad.py
index b1951c134..e12c42ffe 100644
--- a/plugins/tgbot/startup/extend/push_ad.py
+++ b/plugins/tgbot/startup/extend/push_ad.py
@@ -45,7 +45,7 @@ def send_msg(bot, tag='ad', trigger_time=300):
     mw.writeFile(lock_file, json.dumps(lock_data))
     # 信号只在一个周期内执行一次|end
 
-    # 跨链混币器Cce.Cash💰低手续费💰隔断溯源 | 10/m | @hu ge
+    # 跨链混币器Cce.Cash💰低手续费💰隔断溯源 | 10/m | next,6/10 | @hu ge
     # TTKCDN 无视移动墙/GFW/SNI阻断 TG第一性价比 | 10/m | @ssdpflood
     # https://t.me/gjgzs2022 ｜ 22/m | @GJ_gzs
     # https://zhaoziyuan1.cc | web | 15/m | 2m | next,12/15 ｜ @baleite

From a361c31c11e591597d83f95a8933893387fe9107 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 15:22:51 +0800
Subject: [PATCH 903/965] Update push_notice_msg.py

---
 plugins/tgbot/startup/extend/push_notice_msg.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/tgbot/startup/extend/push_notice_msg.py b/plugins/tgbot/startup/extend/push_notice_msg.py
index 7956bbf51..e86bd2349 100644
--- a/plugins/tgbot/startup/extend/push_notice_msg.py
+++ b/plugins/tgbot/startup/extend/push_notice_msg.py
@@ -54,7 +54,7 @@ def send_msg(bot, tag='ad', trigger_time=300):
     mw.writeFile(lock_file, json.dumps(lock_data))
     # 信号只在一个周期内执行一次|end
 
-    # 跨链混币器Cce.Cash💰低手续费💰隔断溯源 | 10/m | @hu ge
+    # 跨链混币器Cce.Cash💰低手续费💰隔断溯源 | 10/m | next,6/10 | @hu ge
     # TTKCDN 无视移动墙/GFW/SNI阻断 TG第一性价比 | 10/m | @ssdpflood
     # https://t.me/gjgzs2022 ｜ 22/m | @GJ_gzs
     # https://zhaoziyuan1.cc | web | 15/m | 2m | next,12/15 ｜ @baleite

From 452623a56ecb4edfd43e01c8a09c41387713d198 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 15:33:44 +0800
Subject: [PATCH 904/965] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 52d4c9c2b..b169f8225 100644
--- a/README.md
+++ b/README.md
@@ -117,6 +117,7 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 - 加入alist插件。
 - 数据管理-常用命令。
 - 插件读取优化(加入缓存+定时检查状态)。
+- 恢复面板书签。
 - 常规更新。
 
 ### JSDelivr安装地址

From fe6649a0a594f343ade544ba8e9ee5096f38ea45 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 15:51:15 +0800
Subject: [PATCH 905/965] update

---
 web/admin/firewall/__init__.py | 4 ++--
 web/utils/firewall.py          | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/admin/firewall/__init__.py b/web/admin/firewall/__init__.py
index 0e5fd77ea..d2eace702 100644
--- a/web/admin/firewall/__init__.py
+++ b/web/admin/firewall/__init__.py
@@ -53,8 +53,8 @@ def get_ssh_info():
 @blueprint.route('/set_ping', endpoint='set_ping', methods=['POST'])
 @panel_login_required
 def set_ping():
-    return MwFirewall.instance().setPing()
-
+    status = request.form.get('status')
+    return MwFirewall.instance().setPing(status)
 
 # 修改ssh端口
 @blueprint.route('/set_ssh_port', endpoint='set_ssh_port', methods=['POST'])
diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index dee7a4ddd..2dcb9f894 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -218,11 +218,10 @@ class Firewall(object):
             data['firewall_status'] = self.getFwStatus()
         return mw.getJson(data)
 
-    def setPing(self):
+    def setPing(self, status):
         if mw.isAppleSystem():
             return mw.returnData(True, '开发机不能操作!')
 
-        status = request.form.get('status')
         filename = '/etc/sysctl.conf'
         conf = mw.readFile(filename)
         if conf.find('net.ipv4.icmp_echo') != -1:

From baf56d71e95aabcaa4fd0a919eb81d3b36598d79 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 15:54:48 +0800
Subject: [PATCH 906/965] Update phplib.conf

---
 plugins/php/versions/phplib.conf | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/plugins/php/versions/phplib.conf b/plugins/php/versions/phplib.conf
index 9dd8efb0a..f81be4da5 100755
--- a/plugins/php/versions/phplib.conf
+++ b/plugins/php/versions/phplib.conf
@@ -586,8 +586,7 @@
             "80",
             "81",
             "82",
-            "83",
-            "84"
+            "83"
         ],
         "type": "调试器",
         "msg": "不多说,不了解的不要安装",
@@ -610,8 +609,7 @@
             "80",
             "81",
             "82",
-            "83",
-            "84"
+            "83"
         ],
         "type": "性能分析",
         "msg": "不多说,不了解的不要安装!",
@@ -633,8 +631,7 @@
             "80",
             "81",
             "82",
-            "83",
-            "84"
+            "83"
         ],
         "type": "通用扩展",
         "msg": "异步、并行、高性能网络通信引擎",
@@ -680,8 +677,7 @@
             "80",
             "81",
             "82",
-            "83",
-            "84"
+            "83"
         ],
         "type": "框架",
         "msg": "Yaf是一个C语言编写的PHP框架",
@@ -698,8 +694,7 @@
             "80",
             "81",
             "82",
-            "83",
-            "84"
+            "83"
         ],
         "type": "通用扩展",
         "msg": "YAML-1.1解析器和发射器",

From 2ae280e6c98e0e0d73174c31dcf93973e4340645 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 16:48:42 +0800
Subject: [PATCH 907/965] Update firewall.py

---
 web/utils/firewall.py | 47 +++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index 2dcb9f894..c0e8cee87 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -158,11 +158,6 @@ class Firewall(object):
     def getSshInfo(self):
         data = {}
 
-        file = '/etc/ssh/sshd_config'
-        conf = mw.readFile(file)
-        rep = r"#*Port\s+([0-9]+)\s*\n"
-        port = re.search(rep, conf).groups(0)[0]
-
         isPing = True
         try:
             if mw.isAppleSystem():
@@ -189,25 +184,33 @@ class Firewall(object):
         if ssh_status[0] != '':
             status = False
 
-        # 密码登陆配置检查
-        data['pass_prohibit_status'] = False
-        pass_rep = r"PasswordAuthentication\s+(\w*)\s*\n"
-        pass_status = re.search(pass_rep, conf)
-        if pass_status:
-            if pass_status and pass_status.groups(0)[0].strip() == 'no':
-                data['pass_prohibit_status'] = True
-        else:
-            data['pass_prohibit_status'] = True
 
-        # 密钥登陆配置检查
         data['pubkey_prohibit_status'] = False
-        pass_rep = r"PubkeyAuthentication\s+(\w*)\s*\n"
-        pass_status = re.search(pass_rep, conf)
-        if pass_status:
-            if pass_status and pass_status.groups(0)[0].strip() == 'no':
+        data['pass_prohibit_status'] = False
+        port = '22'
+        sshd_file = '/etc/ssh/sshd_config'
+        if  os.path.exists(sshd_file):
+            conf = mw.readFile(sshd_file)
+            rep = r"#*Port\s+([0-9]+)\s*\n"
+            port = re.search(rep, conf).groups(0)[0]
+
+            # 密码登陆配置检查
+            pass_rep = r"PasswordAuthentication\s+(\w*)\s*\n"
+            pass_status = re.search(pass_rep, conf)
+            if pass_status:
+                if pass_status and pass_status.groups(0)[0].strip() == 'no':
+                    data['pass_prohibit_status'] = True
+            else:
+                data['pass_prohibit_status'] = True
+
+            # 密钥登陆配置检查
+            pass_rep = r"PubkeyAuthentication\s+(\w*)\s*\n"
+            pass_status = re.search(pass_rep, conf)
+            if pass_status:
+                if pass_status and pass_status.groups(0)[0].strip() == 'no':
+                    data['pubkey_prohibit_status'] = True
+            else:
                 data['pubkey_prohibit_status'] = True
-        else:
-            data['pubkey_prohibit_status'] = True
 
         data['port'] = port
         data['status'] = status
@@ -216,7 +219,7 @@ class Firewall(object):
             data['firewall_status'] = False
         else:
             data['firewall_status'] = self.getFwStatus()
-        return mw.getJson(data)
+        return data
 
     def setPing(self, status):
         if mw.isAppleSystem():

From 18eee3f8e8501e89a785111d1ebd4afa54591564 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 16:49:12 +0800
Subject: [PATCH 908/965] Update firewall.py

---
 web/utils/firewall.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/utils/firewall.py b/web/utils/firewall.py
index c0e8cee87..655a58743 100644
--- a/web/utils/firewall.py
+++ b/web/utils/firewall.py
@@ -184,7 +184,6 @@ class Firewall(object):
         if ssh_status[0] != '':
             status = False
 
-
         data['pubkey_prohibit_status'] = False
         data['pass_prohibit_status'] = False
         port = '22'

From 1d0a4c371c3a7167dd38ec0a078c9453e48f717f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 17:42:51 +0800
Subject: [PATCH 909/965] update

---
 web/utils/site.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index e6bb1d61e..ec4545f79 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -1333,11 +1333,11 @@ class sites(object):
         mw.writeFile(vhost_file, content)
 
     # get redirect status
-    def setRedirect(self, siteName, site_from, to, type, r_type, keep_path):
-        if siteName == '' or site_from == '' or to == '' or type == '' or r_type == '':
+    def setRedirect(self, site_name, site_from, to, type, r_type, keep_path):
+        if site_name == '' or site_from == '' or to == '' or type == '' or r_type == '':
             return mw.returnData(False, "必填项不能为空!")
 
-        redirect_file = self.getRedirectDataPath(siteName)
+        redirect_file = self.getRedirectDataPath(site_name)
         content = mw.readFile(redirect_file) if os.path.exists(redirect_file) else ""
         data = json.loads(content) if content != "" else []
 
@@ -1347,11 +1347,11 @@ class sites(object):
 
         # check if domain exists in site
         if _type_code == 1:
-            pid = mw.M('domain').where("name=?", (_siteName,)).field('id,pid,name,port,addtime').select()
-            site_domain_lists = mw.M('domain').where("pid=?", (pid[0]['pid'],)).field('name').select()
+            domain_list = mw.M('domain').where("name=?", (site_name,)).field('id,pid,name,port,add_time').select()
+            site_domain_lists = mw.M('domain').where("pid=?", (domain_list[0]['pid'],)).field('name').select()
             found = False
             for item in site_domain_lists:
-                if item['name'] == _from:
+                if item['name'] == site_from:
                     found = True
                     break
             if found == False:
@@ -1370,14 +1370,14 @@ class sites(object):
         # domain
         else:
             if _keep_path == 1:
-                _to = "{}$request_uri".format(_to)
+                _to = "{}$request_uri".format(to)
 
             redirect_type = "301" if _type_code == 0 else "302"
             _if = "if ($host ~ '^{}')".format(site_from)
             _return = "return {} {}; ".format(redirect_type, to)
             file_content = _if + "{\r\n    " + _return + "\r\n}"
 
-        _id = mw.md5("{}+{}".format(file_content, siteName))
+        _id = mw.md5("{}+{}".format(file_content, site_name))
 
         # 防止规则重复
         for item in data:
@@ -1391,9 +1391,9 @@ class sites(object):
         # write data json file
         data.append({"r_from": site_from, "type": _type_code, "r_type": _type_code,"r_to": to, 'keep_path': _keep_path, 'id': _id})
         mw.writeFile(redirect_file, json.dumps(data))
-        mw.writeFile("{}/{}.conf".format(self.getRedirectPath(siteName), _id), file_content)
+        mw.writeFile("{}/{}.conf".format(self.getRedirectPath(site_name), _id), file_content)
 
-        self.operateRedirectConf(siteName, 'start')
+        self.operateRedirectConf(site_name, 'start')
         mw.restartWeb()
         return mw.returnData(True, "设置成功")
 

From 2b70534fb25ebf9b48ed0579b8057c3ccb7bce8d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 18:00:09 +0800
Subject: [PATCH 910/965] update

---
 plugins/php-apt/versions/common/brotli.sh | 94 +++++++++++++++++++++++
 plugins/php-apt/versions/phplib.conf      | 19 +++++
 2 files changed, 113 insertions(+)
 create mode 100755 plugins/php-apt/versions/common/brotli.sh

diff --git a/plugins/php-apt/versions/common/brotli.sh b/plugins/php-apt/versions/common/brotli.sh
new file mode 100755
index 000000000..0cfffab8a
--- /dev/null
+++ b/plugins/php-apt/versions/common/brotli.sh
@@ -0,0 +1,94 @@
+#!/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")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sourcePath=${serverPath}/source/php
+
+actionType=$1
+version=$2
+
+sysName=`uname`
+LIBNAME=brotli
+LIBV=0.15.2
+
+extVer=`bash $curPath/lib.sh $version`
+extFile=/usr/lib/php/${extVer}/${LIBNAME}.so
+
+if [ "$sysName" == "Darwin" ];then
+	BAK='_bak'
+else
+	BAK=''
+fi
+
+Install_lib()
+{
+
+	#cat /etc/php/${version}/fpm/conf.d/* | grep -v '^;' |tr -s '\n'
+	isInstall=`cat /etc/php/${version}/fpm/conf.d/* | grep -v '^;' |tr -s '\n' |grep "${LIBNAME}.so"`
+	if [ "${isInstall}" != "" ];then
+		echo "php-$version 已安装${LIBNAME},请选择其它版本!"
+		return
+	fi
+	
+	if [ ! -f "$extFile" ];then
+
+		php_lib=$sourcePath/php_lib
+		mkdir -p $php_lib
+		if [ ! -d $php_lib/${LIBNAME}-${LIBV} ];then
+			wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz
+			cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz
+		fi 
+		cd $php_lib/${LIBNAME}-${LIBV}
+
+		/usr/bin/phpize${version}
+		./configure --with-php-config=/usr/bin/php-config${version}
+		make && make install && make clean
+
+	fi
+	echo "$extFile checking ..."
+	if [ ! -f "$extFile" ];then
+		echo "ERROR!"
+		return;
+	fi
+
+	
+	echo  "" >> /etc/php/${version}/fpm/conf.d/${LIBNAME}.ini
+	echo  "[${LIBNAME}]" >> /etc/php/${version}/fpm/conf.d/${LIBNAME}.ini
+	echo  "extension=${LIBNAME}.so" >> /etc/php/${version}/fpm/conf.d/${LIBNAME}.ini
+	
+	systemctl restart php${version}-fpm 
+	echo '==========================================================='
+	echo 'successful!'
+}
+
+
+Uninstall_lib()
+{
+	if [ ! -f "/usr/bin/php-config${version}" ];then
+		echo "php-$version 未安装,请选择其它版本!"
+		return
+	fi
+
+	
+	if [ -f /etc/php/${version}/fpm/conf.d/${LIBNAME}.ini ];then
+		rm -rf /etc/php/${version}/fpm/conf.d/${LIBNAME}.ini
+		rm -rf $extFile
+	fi
+
+	systemctl restart php${version}-fpm 
+	echo '==============================================='
+	echo 'successful!'
+}
+
+
+if [ "$actionType" == 'install' ];then
+	Install_lib
+elif [ "$actionType" == 'uninstall' ];then
+	Uninstall_lib
+fi
\ No newline at end of file
diff --git a/plugins/php-apt/versions/phplib.conf b/plugins/php-apt/versions/phplib.conf
index 6060939eb..af51a02a1 100755
--- a/plugins/php-apt/versions/phplib.conf
+++ b/plugins/php-apt/versions/phplib.conf
@@ -198,6 +198,25 @@
         "shell": "mcrypt.sh",
         "check": "mcrypt"
     },
+    {
+        "name": "brotli",
+        "versions": [
+            "70",
+            "71",
+            "72",
+            "73",
+            "74",
+            "80",
+            "81",
+            "82",
+            "83",
+            "84"
+        ],
+        "type": "压缩",
+        "msg": "压缩算法",
+        "shell": "brotli.sh",
+        "check": "brotli.so"
+    },
     {
         "name": "bcmath",
         "versions": [

From 7973d369cc00ab3c40b3b9183e60967dec527615 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 18:05:43 +0800
Subject: [PATCH 911/965] update

---
 plugins/php-apt/index.py | 6 ++----
 plugins/php/index.py     | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/plugins/php-apt/index.py b/plugins/php-apt/index.py
index 33ed29553..5a2967a91 100755
--- a/plugins/php-apt/index.py
+++ b/plugins/php-apt/index.py
@@ -770,8 +770,7 @@ def getLibConf(version):
     phplib = json.loads(mw.readFile(libpath))
 
     libs = []
-    tasks = mw.M('tasks').where(
-        "status!=?", ('1',)).field('status,name').select()
+    tasks = mw.M('tasks').where("status!=?", ('1',)).field('status,name').select()
     for lib in phplib:
         lib['task'] = '1'
         for task in tasks:
@@ -814,8 +813,7 @@ def uninstallLib(version):
         return data[1]
 
     name = args['name']
-    execstr = "cd " + getPluginDir() + "/versions && /bin/bash common.sh " + \
-        version + ' uninstall ' + name
+    execstr = "cd " + getPluginDir() + "/versions && /bin/bash common.sh " + version + ' uninstall ' + name
 
     data = mw.execShell(execstr)
     # data[0] == '' and
diff --git a/plugins/php/index.py b/plugins/php/index.py
index 915d9915b..be3b7f287 100755
--- a/plugins/php/index.py
+++ b/plugins/php/index.py
@@ -939,8 +939,7 @@ def libConfCommon(version):
     phplib = json.loads(mw.readFile(libpath))
 
     libs = []
-    tasks = mw.M('tasks').where(
-        "status!=?", ('1',)).field('status,name').select()
+    tasks = mw.M('tasks').where("status!=?", ('1',)).field('status,name').select()
     for lib in phplib:
         lib['task'] = '1'
         for task in tasks:

From c0923f7d4fca769fd082f34213132c76a4b63d2c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 18:15:05 +0800
Subject: [PATCH 912/965] Update index.py

---
 plugins/php-apt/index.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/php-apt/index.py b/plugins/php-apt/index.py
index 5a2967a91..75647b2eb 100755
--- a/plugins/php-apt/index.py
+++ b/plugins/php-apt/index.py
@@ -762,8 +762,7 @@ def getLibConf(version):
         return mw.returnJson(False, '指定PHP版本不存在!')
 
     # phpini = mw.readFile(fname)
-    content = mw.execShell(
-        'cat /etc/php/' + version + '/fpm/conf.d/*' + " | grep -v '^;' |tr -s '\n'")
+    content = mw.execShell('cat /etc/php/' + version + '/fpm/conf.d/*' + " | grep -v '^;' |tr -s '\n'")
     content = content[0]
 
     libpath = getPluginDir() + '/versions/phplib.conf'
@@ -781,7 +780,7 @@ def getLibConf(version):
             if tmp1[0].lower() == lib['name'].lower():
                 lib['task'] = task['status']
                 lib['phpversions'] = []
-                lib['phpversions'].append(tmp1[1])
+                lib['phpversions'].append(tmp1[1].replace('.',''))
         if content.find(lib['check']) == -1:
             lib['status'] = False
         else:

From 3c54e7943be2aaf05523981b7e1a02346b8ea438 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 18:21:17 +0800
Subject: [PATCH 913/965] Update php.js

---
 plugins/php-apt/js/php.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/php-apt/js/php.js b/plugins/php-apt/js/php.js
index c19640a7b..23ee62e91 100755
--- a/plugins/php-apt/js/php.js
+++ b/plugins/php-apt/js/php.js
@@ -631,9 +631,9 @@ function phpLibConfig(version){
             }
 
             if (libs[i]['task'] == '-1' && libs[i].phpversions.indexOf(version) != -1) {
-                opt = '<a style="color:green;" href="javascript:messageBox();">安装</a>'
+                opt = '<a style="color:green;" href="javascript:messageBox();">安装中..</a>'
             } else if (libs[i]['task'] == '0' && libs[i].phpversions.indexOf(version) != -1) {
-                opt = '<a style="color:#C0C0C0;" href="javascript:messageBox();">等待安装...</a>'
+                opt = '<a style="color:#C0C0C0;" href="javascript:messageBox();">等待中..</a>'
             } else if (libs[i].status) {
                 opt = '<a style="color:red;" href="javascript:uninstallPHPLib(\'' + version + '\',\'' + libs[i].name + '\',\'' + libs[i].title + '\',' + '' + ');">卸载</a>'
             } else {

From 6cce658ea35b857d685e6c8a47aa808218736190 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 18:24:51 +0800
Subject: [PATCH 914/965] Update public.js

---
 web/static/app/public.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/web/static/app/public.js b/web/static/app/public.js
index 7e6275abf..e84cf547f 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1292,12 +1292,14 @@ function messageBox() {
 					<div class="taskcon"></div>\
 				</div>\
 			</div>\
-		</div>'
+		</div>',
+		success:function(){
+			$(".bt-w-menu p").click(function(){
+				$(this).addClass("bgw").siblings().removeClass("bgw");
+			});
+			tasklist();
+		}
 	});
-	$(".bt-w-menu p").click(function(){
-		$(this).addClass("bgw").siblings().removeClass("bgw");
-	});
-	tasklist();
 }
 
 //取执行日志

From 5ee9a6790e74cdf0f75e457598169f7e81730145 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 18:25:52 +0800
Subject: [PATCH 915/965] update

---
 web/static/app/public.js | 29 ++++++++++++++---------------
 web/version.py           |  2 +-
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/web/static/app/public.js b/web/static/app/public.js
index e84cf547f..409c3a05f 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1273,6 +1273,20 @@ function getSpeed(sele){
 	},'json');
 }
 
+function tasklist(a){
+	var con='<ul class="cmdlist"></ul>\
+		<span style="position:  fixed;bottom: 13px;">若任务长时间未执行，请尝试在首页点【重启面板】来重置任务队列</span>';
+	$(".taskcon").html(con);
+	a = a == undefined ? 1 : a;
+	$.post("/task/list", "tojs=getTaskList&table=tasks&limit=10&p=" + a, function(g) {
+		$('.msg_count').html(g.count);
+	},'json');
+
+	setTimeout(function(){
+		getReloads();
+	},100);
+}
+
 //消息盒子
 function messageBox() {
 	layer.open({
@@ -1498,21 +1512,6 @@ function RscheckSelect(){
 	},5);
 }
 
-
-function tasklist(a){
-	var con='<ul class="cmdlist"></ul>\
-		<span style="position:  fixed;bottom: 13px;">若任务长时间未执行，请尝试在首页点【重启面板】来重置任务队列</span>';
-	$(".taskcon").html(con);
-	a = a == undefined ? 1 : a;
-	$.post("/task/list", "tojs=getTaskList&table=tasks&limit=10&p=" + a, function(g) {
-		$('.msg_count').html(g.count);
-	},'json');
-
-	setTimeout(function(){
-		getReloads();
-	},100);
-}
-
 function activeDisk() {
 	var a = $("#PathPlace").find("span").text().substring(0, 1);
 	switch(a) {
diff --git a/web/version.py b/web/version.py
index 7e83341d6..6aac0bfe1 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.25
+APP_SMALL_VERSION = 0.26
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From 28988eff93ac1037df6f8b984db374542b708441 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 18:26:19 +0800
Subject: [PATCH 916/965] Update public.js

---
 web/static/app/public.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/web/static/app/public.js b/web/static/app/public.js
index 409c3a05f..2f18757e3 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1273,12 +1273,11 @@ function getSpeed(sele){
 	},'json');
 }
 
-function tasklist(a){
+function tasklist(){
 	var con='<ul class="cmdlist"></ul>\
 		<span style="position:  fixed;bottom: 13px;">若任务长时间未执行，请尝试在首页点【重启面板】来重置任务队列</span>';
 	$(".taskcon").html(con);
-	a = a == undefined ? 1 : a;
-	$.post("/task/list", "tojs=getTaskList&table=tasks&limit=10&p=" + a, function(g) {
+	$.post("/task/list", "tojs=getTaskList&table=tasks&limit=10&p=1", function(g) {
 		$('.msg_count').html(g.count);
 	},'json');
 

From 411174c07c042d76b7c4b5e285a6eb3ea902bfd7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 18:27:27 +0800
Subject: [PATCH 917/965] Update public.js

---
 web/static/app/public.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/static/app/public.js b/web/static/app/public.js
index 2f18757e3..9817b2fe8 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1276,9 +1276,9 @@ function getSpeed(sele){
 function tasklist(){
 	var con='<ul class="cmdlist"></ul>\
 		<span style="position:  fixed;bottom: 13px;">若任务长时间未执行，请尝试在首页点【重启面板】来重置任务队列</span>';
-	$(".taskcon").html(con);
+	$("#msg_box .taskcon").html(con);
 	$.post("/task/list", "tojs=getTaskList&table=tasks&limit=10&p=1", function(g) {
-		$('.msg_count').html(g.count);
+		$('#msg_box .msg_count').html(g.count);
 	},'json');
 
 	setTimeout(function(){
@@ -1295,7 +1295,7 @@ function messageBox() {
 		closeBtn: 1,
 		shadeClose: false,
 		content: '<div class="bt-form">\
-			<div class="bt-w-main">\
+			<div class="bt-w-main" id="msg_box">\
 				<div class="bt-w-menu">\
 					<p class="bgw" id="taskList" onclick="tasklist()">任务列表(<span class="task_count">0</span>)</p>\
 					<p onclick="remind()">消息列表(<span class="msg_count">0</span>)</p>\

From f78279a271cc3dc74ef665c0920fda3357785d4e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 18:34:21 +0800
Subject: [PATCH 918/965] update

---
 web/static/app/public.js | 8 +++-----
 web/version.py           | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/web/static/app/public.js b/web/static/app/public.js
index 9817b2fe8..032b79175 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1416,19 +1416,17 @@ function remind(a){
 }
 
 function getReloads() {
-	var a = 0;
-	var mm = $(".bt-w-menu .bgw").html()
+	var mm = $("#msg_box .bt-w-menu .bgw").html();
 	if(mm == undefined || mm.indexOf('任务列表') == -1) {
 		clearInterval(speed);
-		a = 0;
 		speed = null;
 		return
 	}
 	if(speed) {return;}
 
 	function renderRunTask(){
-		var mm = $(".bt-w-menu .bgw").html();
-		if(mm == undefined || mm.indexOf(lan.bt.task_list) == -1) {
+		var mm = $("#msg_box .bt-w-menu .bgw").html();
+		if(mm == undefined || mm.indexOf('任务列表') == -1) {
 			clearInterval(speed);
 			speed = null;
 			a = 0;
diff --git a/web/version.py b/web/version.py
index 6aac0bfe1..d52653f44 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.26
+APP_SMALL_VERSION = 0.27
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From 7816dbf2643351c07c14e07fc2808e949e4df834 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 18:35:57 +0800
Subject: [PATCH 919/965] Update public.js

---
 web/static/app/public.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/static/app/public.js b/web/static/app/public.js
index 032b79175..d2e028997 100755
--- a/web/static/app/public.js
+++ b/web/static/app/public.js
@@ -1432,7 +1432,6 @@ function getReloads() {
 			a = 0;
 			return
 		}
-		a++;
 		$.post('/task/get_task_speed', '', function(h) {
 			if(h.task == undefined) {
 				$(".task_count").text(0);

From ddd3d3a33a4471df1a601be7507765cf0a317024 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 18:36:04 +0800
Subject: [PATCH 920/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index d52653f44..3dd267508 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.27
+APP_SMALL_VERSION = 0.28
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From c66b9794eeee97ba46e41d24aa50875379fb0714 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 18:40:29 +0800
Subject: [PATCH 921/965] Update php.js

---
 plugins/php-apt/js/php.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/php-apt/js/php.js b/plugins/php-apt/js/php.js
index 23ee62e91..0fbab5484 100755
--- a/plugins/php-apt/js/php.js
+++ b/plugins/php-apt/js/php.js
@@ -631,9 +631,9 @@ function phpLibConfig(version){
             }
 
             if (libs[i]['task'] == '-1' && libs[i].phpversions.indexOf(version) != -1) {
-                opt = '<a style="color:green;" href="javascript:messageBox();">安装中..</a>'
+                opt = '<a style="color:green;" href="javascript:messageBox();">安装.</a>'
             } else if (libs[i]['task'] == '0' && libs[i].phpversions.indexOf(version) != -1) {
-                opt = '<a style="color:#C0C0C0;" href="javascript:messageBox();">等待中..</a>'
+                opt = '<a style="color:#C0C0C0;" href="javascript:messageBox();">等待.</a>'
             } else if (libs[i].status) {
                 opt = '<a style="color:red;" href="javascript:uninstallPHPLib(\'' + version + '\',\'' + libs[i].name + '\',\'' + libs[i].title + '\',' + '' + ');">卸载</a>'
             } else {

From 31cafa59abcc3ebe6bd7df55bc21ae8015b9919f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 18:50:06 +0800
Subject: [PATCH 922/965] Update index.py

---
 plugins/php-yum/index.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/php-yum/index.py b/plugins/php-yum/index.py
index 495332244..6f92b5572 100755
--- a/plugins/php-yum/index.py
+++ b/plugins/php-yum/index.py
@@ -739,7 +739,7 @@ def setDisableFunc(version):
 def getPhpinfo(version):
     stat = status(version)
     if stat == 'stop':
-        return 'PHP[' + version + ']未启动,不可访问!!!'
+        return 'PHP[' + version + ']未启动,不可访问!'
 
     sock_file = getFpmAddress(version)
     root_dir = mw.getFatherDir() + '/phpinfo'
@@ -771,8 +771,7 @@ def getLibConf(version):
     phplib = json.loads(mw.readFile(libpath))
 
     libs = []
-    tasks = mw.M('tasks').where(
-        "status!=?", ('1',)).field('status,name').select()
+    tasks = mw.M('tasks').where("status!=?", ('1',)).field('status,name').select()
     for lib in phplib:
         lib['task'] = '1'
         for task in tasks:

From d217ebfc4f550b83e2a18b70db63f5fb0317d7aa Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 19:05:09 +0800
Subject: [PATCH 923/965] Update php.js

---
 plugins/php-yum/js/php.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/php-yum/js/php.js b/plugins/php-yum/js/php.js
index 958fadb71..dc4c9d5e9 100755
--- a/plugins/php-yum/js/php.js
+++ b/plugins/php-yum/js/php.js
@@ -633,9 +633,9 @@ function phpLibConfig(version){
             }
 
             if (libs[i]['task'] == '-1' && libs[i].phpversions.indexOf(version) != -1) {
-                opt = '<a style="color:green;" href="javascript:messageBox();">安装</a>'
+                opt = '<a style="color:green;" href="javascript:messageBox();">安装.</a>'
             } else if (libs[i]['task'] == '0' && libs[i].phpversions.indexOf(version) != -1) {
-                opt = '<a style="color:#C0C0C0;" href="javascript:messageBox();">等待安装...</a>'
+                opt = '<a style="color:#C0C0C0;" href="javascript:messageBox();">等待.</a>'
             } else if (libs[i].status) {
                 opt = '<a style="color:red;" href="javascript:uninstallPHPLib(\'' + version + '\',\'' + libs[i].name + '\',\'' + libs[i].title + '\',' + '' + ');">卸载</a>'
             } else {

From a66bab02ab24a87bd164f6868f690ec9af20b04f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 19:20:19 +0800
Subject: [PATCH 924/965] update

---
 plugins/php-yum/versions/common/brotli.sh | 89 +++++++++++++++++++++++
 plugins/php-yum/versions/lib.sh           | 40 ++++++++--
 plugins/php-yum/versions/phplib.conf      | 19 +++++
 3 files changed, 143 insertions(+), 5 deletions(-)
 create mode 100755 plugins/php-yum/versions/common/brotli.sh

diff --git a/plugins/php-yum/versions/common/brotli.sh b/plugins/php-yum/versions/common/brotli.sh
new file mode 100755
index 000000000..bb294e42f
--- /dev/null
+++ b/plugins/php-yum/versions/common/brotli.sh
@@ -0,0 +1,89 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH=$PATH:/opt/homebrew/bin
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sourcePath=${serverPath}/source/php
+
+actionType=$1
+version=$2
+
+sysName=`uname`
+LIBNAME=brotli
+LIBV=0.15.2
+
+SORT_LIBNAME="10-${LIBNAME}"
+extVer=`bash $curPath/lib.sh $version`
+extFile=/opt/remi/php${version}/root/usr/lib64/php
+extSoFile=$extFile/modules/${LIBNAME}.so
+cfgDir=/etc/opt/remi/php${version}/php.d
+extIni=${cfgDir}/10-${LIBNAME}.ini
+
+if [ "$sysName" == "Darwin" ];then
+	BAK='_bak'
+else
+	BAK=''
+fi
+
+Install_lib()
+{
+
+	isInstall=`cat /etc/php/${version}/fpm/conf.d/* | grep -v '^;' |tr -s '\n' |grep "${LIBNAME}.so"`
+	if [ "${isInstall}" != "" ];then
+		echo "php-$version 已安装${LIBNAME},请选择其它版本!"
+		return
+	fi
+	
+	if [ ! -f "$extFile" ];then
+
+		php_lib=$sourcePath/php_lib
+		mkdir -p $php_lib
+		if [ ! -d $php_lib/${LIBNAME}-${LIBV} ];then
+			wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz
+			cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz
+		fi 
+		cd $php_lib/${LIBNAME}-${LIBV}
+
+		/opt/remi/php${version}/root/usr/bin/phpize
+		./configure --with-php-config=/usr/bin/php-config${version}
+		make && make install && make clean
+
+	fi
+	echo "$extFile checking ..."
+	if [ ! -f "$extFile" ];then
+		echo "ERROR!"
+		return;
+	fi
+	
+	cho  "" >> $extIni
+	echo  "[${LIBNAME}]" >> $extIni
+	echo "extension=${LIBNAME}.so" >> $extIni
+	
+	systemctl restart php${version}-fpm 
+	echo '==========================================================='
+	echo 'successful!'
+}
+
+
+Uninstall_lib()
+{	
+	if [ -f $extIni ];then
+		rm -rf $extIni
+	fi
+
+	systemctl restart php${version}-fpm 
+	echo '==============================================='
+	echo 'successful!'
+}
+
+
+if [ "$actionType" == 'install' ];then
+	Install_lib
+elif [ "$actionType" == 'uninstall' ];then
+	Uninstall_lib
+fi
\ No newline at end of file
diff --git a/plugins/php-yum/versions/lib.sh b/plugins/php-yum/versions/lib.sh
index ff3358fdc..f7a8a8eb9 100644
--- a/plugins/php-yum/versions/lib.sh
+++ b/plugins/php-yum/versions/lib.sh
@@ -22,8 +22,38 @@ if [ "$php_status" != "" ];then
 	systemctl ${action} php${version}-php-fpm
 fi
 
-# if [ -f $php_fpm_service_file ];then
-# 	systemctl ${action} php${version}-php-fpm
-# else
-# 	$serverPath/php/init.d/php${version} ${action}
-# fi
\ No newline at end of file
+#!/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")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+version=$1
+
+if [ "$version" == '5.6' ];then
+	echo '20131226'
+elif [[ "$version" == '7.0' ]]; then
+	echo '20151012'
+elif [[ "$version" == '7.1' ]]; then
+	echo '20160303'
+elif [[ "$version" == '7.2' ]]; then
+	echo '20170718'
+elif [[ "$version" == '7.3' ]]; then
+	echo '20180731'
+elif [[ "$version" == '7.4' ]]; then
+	echo '20190902'
+elif [[ "$version" == '8.0' ]]; then
+	echo '20200930'
+elif [[ "$version" == '8.1' ]]; then
+	echo '20210902'
+elif [[ "$version" == '8.2' ]]; then
+	echo '20220829'
+elif [[ "$version" == '8.3' ]]; then
+	echo '20230831'
+elif [[ "$version" == '8.4' ]]; then
+	echo '20240924'
+fi
\ No newline at end of file
diff --git a/plugins/php-yum/versions/phplib.conf b/plugins/php-yum/versions/phplib.conf
index 262ff5816..72b9f2fa0 100755
--- a/plugins/php-yum/versions/phplib.conf
+++ b/plugins/php-yum/versions/phplib.conf
@@ -183,6 +183,25 @@
         "shell": "mcrypt.sh",
         "check": "mcrypt"
     },
+    {
+        "name": "brotli",
+        "versions": [
+            "70",
+            "71",
+            "72",
+            "73",
+            "74",
+            "80",
+            "81",
+            "82",
+            "83",
+            "84"
+        ],
+        "type": "压缩",
+        "msg": "压缩算法",
+        "shell": "brotli.sh",
+        "check": "brotli.so"
+    },
     {
         "name": "bcmath",
         "versions": [

From 4e09a802b0fd9bf0577cdf7252384f0e6246483c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 19:31:15 +0800
Subject: [PATCH 925/965] update

---
 plugins/php-yum/install.sh                                   | 4 ++--
 plugins/php-yum/versions/common/{brotli.sh => bak_brotli.sh} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename plugins/php-yum/versions/common/{brotli.sh => bak_brotli.sh} (96%)

diff --git a/plugins/php-yum/install.sh b/plugins/php-yum/install.sh
index 49cc293d8..4ed4d994b 100755
--- a/plugins/php-yum/install.sh
+++ b/plugins/php-yum/install.sh
@@ -99,8 +99,8 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php-yum/${type} ];then
 	echo "install PHP-YUM[${type}] extend end"
 
 	#初始化 
-	cd ${rootPath} && python3 ${rootPath}/plugins/php-yum/index.py start ${type}
-	cd ${rootPath} && python3 ${rootPath}/plugins/php-yum/index.py initd_install ${type}
+	cd ${rootPath} && python3 plugins/php-yum/index.py start ${type}
+	cd ${rootPath} && python3 plugins/php-yum/index.py initd_install ${type}
 
 	if [ ! -f /usr/local/bin/composer ];then
 		cd /tmp
diff --git a/plugins/php-yum/versions/common/brotli.sh b/plugins/php-yum/versions/common/bak_brotli.sh
similarity index 96%
rename from plugins/php-yum/versions/common/brotli.sh
rename to plugins/php-yum/versions/common/bak_brotli.sh
index bb294e42f..a23a344b0 100755
--- a/plugins/php-yum/versions/common/brotli.sh
+++ b/plugins/php-yum/versions/common/bak_brotli.sh
@@ -50,7 +50,7 @@ Install_lib()
 		cd $php_lib/${LIBNAME}-${LIBV}
 
 		/opt/remi/php${version}/root/usr/bin/phpize
-		./configure --with-php-config=/usr/bin/php-config${version}
+		./configure --with-php-config=/opt/remi/php${version}/root/usr/bin/
 		make && make install && make clean
 
 	fi

From 055422bac9c7cdba2cf6c5b31489965849822fbe Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 19:56:26 +0800
Subject: [PATCH 926/965] update

---
 plugins/mysql-apt/index.py           |  6 +++---
 plugins/mysql-yum/index.py           | 14 +++++++-------
 plugins/mysql-yum/index_mysql_yum.py |  7 -------
 plugins/mysql/index.py               |  5 +++--
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/plugins/mysql-apt/index.py b/plugins/mysql-apt/index.py
index 187098fe3..7a4c242dd 100755
--- a/plugins/mysql-apt/index.py
+++ b/plugins/mysql-apt/index.py
@@ -3523,9 +3523,9 @@ def uninstallPreInspection(version):
     if mw.isDebugMode():
         return 'ok'
 
-    import plugins_api
-    plugins_api.plugins_api().removeIndex(getPluginName(), version)
-
+    from utils.plugin import plugin as MwPlugin
+    MwPlugin.instance().removeIndex(getPluginName(), version)
+    
     return "请手动删除MySQL[{}]<br/> rm -rf {}".format(version, getServerDir())
 
 if __name__ == "__main__":
diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py
index b24ca820e..4581ebd86 100755
--- a/plugins/mysql-yum/index.py
+++ b/plugins/mysql-yum/index.py
@@ -16,11 +16,11 @@ if os.path.exists(web_dir):
 
 import core.mw as mw
 
-if mw.isAppleSystem():
-    cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-    info = mw.execShell(cmd)
-    p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-    sys.path.append(p)
+# if mw.isAppleSystem():
+#     cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
+#     info = mw.execShell(cmd)
+#     p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
+#     sys.path.append(p)
 
 
 app_debug = False
@@ -3487,8 +3487,8 @@ def uninstallPreInspection(version):
     if mw.isDebugMode():
         return 'ok'
 
-    import plugins_api
-    plugins_api.plugins_api().removeIndex(getPluginName(), version)
+    from utils.plugin import plugin as MwPlugin
+    MwPlugin.instance().removeIndex(getPluginName(), version)
 
     return "请手动删除MySQL[{}]<br/> rm -rf {}".format(version, getServerDir())
 
diff --git a/plugins/mysql-yum/index_mysql_yum.py b/plugins/mysql-yum/index_mysql_yum.py
index 79e7bbf83..6c10d29f0 100644
--- a/plugins/mysql-yum/index_mysql_yum.py
+++ b/plugins/mysql-yum/index_mysql_yum.py
@@ -15,13 +15,6 @@ if os.path.exists(web_dir):
 
 import core.mw as mw
 
-if mw.isAppleSystem():
-    cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-    info = mw.execShell(cmd)
-    p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-    sys.path.append(p)
-
-
 app_debug = False
 if mw.isAppleSystem():
     app_debug = True
diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py
index 3b501cf7a..0cdc59f5c 100755
--- a/plugins/mysql/index.py
+++ b/plugins/mysql/index.py
@@ -3774,8 +3774,9 @@ def uninstallPreInspection(version):
     if mw.isDebugMode():
         return 'ok'
 
-    import plugins_api
-    plugins_api.plugins_api().removeIndex(getPluginName(), version)
+
+    from utils.plugin import plugin as MwPlugin
+    MwPlugin.instance().removeIndex(getPluginName(), version)
 
     return "请手动删除MySQL[{}]<br/> rm -rf {}".format(version, getServerDir())
 

From a04d24d4104147112ea033a0e02c9131cdaf17b4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 21:22:42 +0800
Subject: [PATCH 927/965] update

---
 plugins/tgbot/startup/extend/push_ad.py        | 18 +++++++++++++++++-
 .../tgbot/startup/extend/push_notice_msg.py    | 18 +++++++++++++++++-
 web/admin/dashboard/login.py                   |  4 ++++
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/plugins/tgbot/startup/extend/push_ad.py b/plugins/tgbot/startup/extend/push_ad.py
index e12c42ffe..9cf60810a 100644
--- a/plugins/tgbot/startup/extend/push_ad.py
+++ b/plugins/tgbot/startup/extend/push_ad.py
@@ -53,6 +53,22 @@ def send_msg(bot, tag='ad', trigger_time=300):
     # 实名认证/过人脸🕵️‍♀️各种账号处理✅ | 30/m| next,12/30 | @nngzs
     # 桃花资源采集| 13/m| next,1/13 | @xiaolizi1122
     keyboard = [
+        [
+            types.InlineKeyboardButton(
+                text="TTKCDN 性价比最高的商业CDN", url='https://t.me/ssdpflood')
+        ],
+        [
+            types.InlineKeyboardButton(
+                text="TTKCDN 过河南郑州/泉州等地区阻断", url='https://t.me/ssdpflood')
+        ],
+        [
+            types.InlineKeyboardButton(
+                text="TTKCDN 私人定制 属于你自己的独立CDN", url='https://t.me/ssdpflood')
+        ],
+        [
+            types.InlineKeyboardButton(
+                text="TTKCDN 全系主动防御 全球威胁情报网", url='https://t.me/ssdpflood')
+        ],
         [
             types.InlineKeyboardButton(
                 text="跨链混币器Cce.Cash💰低手续费💰隔断溯源", url='https://cce.cash/#/main/home?MW')
@@ -95,7 +111,7 @@ def send_msg(bot, tag='ad', trigger_time=300):
             types.InlineKeyboardButton(
                 text="@ME", url='tg://user?id=5568699210'),
             types.InlineKeyboardButton(
-                text="100RMB/M", url='tg://user?id=5568699210')
+                text="100RMB/M [已满]", url='tg://user?id=5568699210')
         ]
     ]
     markup = types.InlineKeyboardMarkup(keyboard)
diff --git a/plugins/tgbot/startup/extend/push_notice_msg.py b/plugins/tgbot/startup/extend/push_notice_msg.py
index e86bd2349..31819d42a 100644
--- a/plugins/tgbot/startup/extend/push_notice_msg.py
+++ b/plugins/tgbot/startup/extend/push_notice_msg.py
@@ -55,13 +55,29 @@ def send_msg(bot, tag='ad', trigger_time=300):
     # 信号只在一个周期内执行一次|end
 
     # 跨链混币器Cce.Cash💰低手续费💰隔断溯源 | 10/m | next,6/10 | @hu ge
-    # TTKCDN 无视移动墙/GFW/SNI阻断 TG第一性价比 | 10/m | @ssdpflood
+    # TTKCDN | 10/m | @ssdpflood
     # https://t.me/gjgzs2022 ｜ 22/m | @GJ_gzs
     # https://zhaoziyuan1.cc | web | 15/m | 2m | next,12/15 ｜ @baleite
     # 综合包网/NG接口开户 | 28/m | 6m | next,4/28 | x
     # 实名认证/过人脸🕵️‍♀️各种账号处理✅ | 30/m| next,12/30 | @nngzs
     # 桃花资源采集| 13/m| next,1/13 | @xiaolizi1122
     keyboard = [
+        [
+            types.InlineKeyboardButton(
+                text="TTKCDN 性价比最高的商业CDN", url='https://t.me/ssdpflood')
+        ],
+        [
+            types.InlineKeyboardButton(
+                text="TTKCDN 过河南郑州/泉州等地区阻断", url='https://t.me/ssdpflood')
+        ],
+        [
+            types.InlineKeyboardButton(
+                text="TTKCDN 私人定制 属于你自己的独立CDN", url='https://t.me/ssdpflood')
+        ],
+        [
+            types.InlineKeyboardButton(
+                text="TTKCDN 全系主动防御 全球威胁情报网", url='https://t.me/ssdpflood')
+        ],
         [
             types.InlineKeyboardButton(
                 text="跨链混币器Cce.Cash💰低手续费💰隔断溯源", url='https://cce.cash/#/main/home?MW')
diff --git a/web/admin/dashboard/login.py b/web/admin/dashboard/login.py
index f64837f9d..126502245 100644
--- a/web/admin/dashboard/login.py
+++ b/web/admin/dashboard/login.py
@@ -159,6 +159,10 @@ def verifyLogin():
 # 执行登录操作
 @blueprint.route('/do_login', endpoint='do_login', methods=['POST'])
 def do_login():
+    admin_close = thisdb.getOption('admin_close')
+    if admin_close == 'yes':
+        return mw.returnData(False, '面板已经关闭!')
+
     username = request.form.get('username', '').strip()
     password = request.form.get('password', '').strip()
     code = request.form.get('code', '').strip()

From 1da7d08887422ae4fa2082c6dc720bf6df836e73 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 21:27:30 +0800
Subject: [PATCH 928/965] update

---
 plugins/tgbot/startup/extend/push_ad.py         | 2 +-
 plugins/tgbot/startup/extend/push_notice_msg.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/tgbot/startup/extend/push_ad.py b/plugins/tgbot/startup/extend/push_ad.py
index 9cf60810a..b8b5839bc 100644
--- a/plugins/tgbot/startup/extend/push_ad.py
+++ b/plugins/tgbot/startup/extend/push_ad.py
@@ -111,7 +111,7 @@ def send_msg(bot, tag='ad', trigger_time=300):
             types.InlineKeyboardButton(
                 text="@ME", url='tg://user?id=5568699210'),
             types.InlineKeyboardButton(
-                text="100RMB/M [已满]", url='tg://user?id=5568699210')
+                text="100RMB/M[已满]", url='tg://user?id=5568699210')
         ]
     ]
     markup = types.InlineKeyboardMarkup(keyboard)
diff --git a/plugins/tgbot/startup/extend/push_notice_msg.py b/plugins/tgbot/startup/extend/push_notice_msg.py
index 31819d42a..1937ee2ac 100644
--- a/plugins/tgbot/startup/extend/push_notice_msg.py
+++ b/plugins/tgbot/startup/extend/push_notice_msg.py
@@ -55,7 +55,7 @@ def send_msg(bot, tag='ad', trigger_time=300):
     # 信号只在一个周期内执行一次|end
 
     # 跨链混币器Cce.Cash💰低手续费💰隔断溯源 | 10/m | next,6/10 | @hu ge
-    # TTKCDN | 10/m | @ssdpflood
+    # TTKCDN | 10/m | @ssdpflood | 5
     # https://t.me/gjgzs2022 ｜ 22/m | @GJ_gzs
     # https://zhaoziyuan1.cc | web | 15/m | 2m | next,12/15 ｜ @baleite
     # 综合包网/NG接口开户 | 28/m | 6m | next,4/28 | x
@@ -120,7 +120,7 @@ def send_msg(bot, tag='ad', trigger_time=300):
             types.InlineKeyboardButton(
                 text="@ME", url='tg://user?id=5568699210'),
             types.InlineKeyboardButton(
-                text="100RMB/M", url='tg://user?id=5568699210')
+                text="100RMB/M[已满]", url='tg://user?id=5568699210')
         ]
     ]
     markup = types.InlineKeyboardMarkup(keyboard)

From d00da44fcbad31e38f1f90ccb38d601ed2fd5c80 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 22:13:20 +0800
Subject: [PATCH 929/965] update

---
 panel_tools.py               | 18 +++++++++++++++++-
 scripts/init.d/mw.tpl        |  6 ++----
 web/admin/__init__.py        |  7 +++++++
 web/admin/dashboard/login.py | 18 ++++++++++++++----
 web/admin/setting/setting.py |  4 ++--
 5 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index 3c60456f7..9a0e6c9cc 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -57,6 +57,8 @@ def mwcli(mw_input=0):
         print("(11)     修改面板密码")
         print("(12)     修改面板用户名")
         print("(13)     显示面板错误日志")
+        print("(14)     关闭面板访问")
+        print("(15)     开启面板访问")
         print("(20)     关闭BasicAuth认证")
         print("(21)     解除域名绑定")
         print("(22)     解除面板SSL绑定")
@@ -80,7 +82,7 @@ def mwcli(mw_input=0):
             mw_input = 0
 
     nums = [
-        1, 2, 3, 4, 5, 10, 11, 12, 13,
+        1, 2, 3, 4, 5, 10, 11, 12, 13, 14, 15,
         20, 21, 22, 23, 24, 25, 26, 27, 28,
         100, 101, 
         200, 201
@@ -123,6 +125,20 @@ def mwcli(mw_input=0):
         set_panel_username(input_user.strip())
     elif mw_input == 13:
         os.system('tail -100 ' + panel_dir + '/logs/panel_error.log')
+    elif mw_input == 14:
+        admin_close = thisdb.getOption('admin_close')
+        if admin_close == 'no':
+            thisdb.setOption('admin_close', 'yes')
+            print("|-关闭面板访问成功!")
+        else:
+            print("|-已关闭面板访问!")
+    elif mw_input == 15:
+        admin_close = thisdb.getOption('admin_close')
+        if admin_close == 'yes':
+            thisdb.setOption('admin_close', 'no')
+            print("|-开启面板访问成功!")
+        else:
+            print("|-已开启面板访问!")
     elif mw_input == 20:
         basic_auth = thisdb.getOptionByJson('basic_auth', default={'open':False})
         if basic_auth['open']:
diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index 0f06f05e3..72e8f9183 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -206,14 +206,12 @@ mw_reload()
 }
 
 mw_close(){
-    echo 'True' > ${PANEL_DIR}/data/close.pl
+    cd ${PANEL_DIR} && python3 panel_tools.py cli 14
 }
 
 mw_open()
 {
-    if [ -f ${PANEL_DIR}/data/close.pl ];then
-        rm -rf ${PANEL_DIR}/data/close.pl
-    fi
+    cd ${PANEL_DIR} && python3 panel_tools.py cli 15
 }
 
 mw_unbind_domain()
diff --git a/web/admin/__init__.py b/web/admin/__init__.py
index 6f5c71c12..2277d5ca4 100644
--- a/web/admin/__init__.py
+++ b/web/admin/__init__.py
@@ -19,6 +19,7 @@ from datetime import timedelta
 
 from flask import Flask
 from flask import request
+from flask import redirect
 from flask import Response
 from flask import Flask, abort, current_app, session, url_for
 from flask import Blueprint, render_template
@@ -93,6 +94,12 @@ def sendAuthenticated():
 
 @app.before_request
 def requestCheck():
+
+    admin_close = thisdb.getOption('admin_close')
+    if admin_close == 'yes':
+        if not request.path.startswith('/close'):
+            return redirect('/close')
+
     config.APP_START_TIME=time.time()
     # 自定义basic auth认证
     if app.config['BASIC_AUTH_OPEN']:
diff --git a/web/admin/dashboard/login.py b/web/admin/dashboard/login.py
index 126502245..ef9cc9e5e 100644
--- a/web/admin/dashboard/login.py
+++ b/web/admin/dashboard/login.py
@@ -88,6 +88,7 @@ def login_temp_user(token):
 # 登录页: 当设置了安全路径,本页失效。
 @blueprint.route('/login')
 def login():
+    name = thisdb.getOption('template', default='default')
 
     # 临时登录功能
     token = request.args.get('tmp_token', '').strip()
@@ -103,13 +104,22 @@ def login():
 
     db_path = thisdb.getOption('admin_path')
     if db_path == '':
-        return render_template('default/login.html')
+        return render_template('%s/login.html' % name)
     else:
         unauthorized_status = thisdb.getOption('unauthorized_status')
         if unauthorized_status == '0':
-            return render_template('default/path.html')
+            return render_template('%s/path.html' % name)
         return Response(status=int(unauthorized_status))
 
+@blueprint.route('/close')
+def close():
+    name = thisdb.getOption('template', default='default')
+    admin_close = thisdb.getOption('admin_close')
+    if admin_close == 'no':
+        return redirect('/', code=302)
+    return render_template('%s/close.html' % name)
+
+
 # 验证码
 @blueprint.route('/code')
 def code():
@@ -179,7 +189,7 @@ def do_login():
 
             if login_cache_limit >= login_cache_count:
                 thisdb.setOption('admin_close', 'yes')
-                return mw.returnJson(False, '面板已经关闭!')
+                return mw.returnData(False, '面板已经关闭!')
 
             cache.set('login_cache_limit', login_cache_limit, timeout=10000)
             login_cache_limit = cache.get('login_cache_limit')
@@ -218,4 +228,4 @@ def do_login():
     session['overdue'] = int(time.time()) + 7 * 24 * 60 * 60
     
     thisdb.updateUserLoginTime()
-    return mw.returnJson(1, '登录成功,正在跳转...')
+    return mw.returnData(1, '登录成功,正在跳转...')
diff --git a/web/admin/setting/setting.py b/web/admin/setting/setting.py
index df1eee5fa..50b9808d1 100644
--- a/web/admin/setting/setting.py
+++ b/web/admin/setting/setting.py
@@ -177,9 +177,9 @@ def close_panel():
     admin_close = thisdb.getOption('admin_close',default='no')
     if admin_close == 'no':
         thisdb.setOption('admin_close','yes')
-        return mw.returnData(True, '开启面板成功!')
+        return mw.returnData(True, '关闭面板成功!')
     thisdb.setOption('admin_close','no')
-    return mw.returnData(True, '关闭面板成功!')
+    return mw.returnData(True, '开启面板成功!')
 
 # 设置IPV6状态
 @blueprint.route('/set_ipv6_status', endpoint='set_ipv6_status', methods=['POST'])

From 4b1d6acb77391e20312c8f29a5600c0025484315 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 22:17:21 +0800
Subject: [PATCH 930/965] Update panel_tools.py

---
 panel_tools.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/panel_tools.py b/panel_tools.py
index 9a0e6c9cc..b98c4e087 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -152,6 +152,8 @@ def mwcli(mw_input=0):
             thisdb.setOption('panel_domain', '')
             os.system(INIT_CMD + " unbind_domain")
             print("|-解除域名绑定成功")
+        else:
+            print("|-面板未绑定域名!")
     elif mw_input == 22:
         panel_ssl = thisdb.getOptionByJson('panel_ssl', default={'open':False})
         if panel_ssl['open']:
@@ -162,7 +164,7 @@ def mwcli(mw_input=0):
     elif mw_input == 23:
         listen_ipv6 = panel_dir + '/data/ipv6.pl'
         if not os.path.exists(listen_ipv6):
-            mw.writeFile(listen_ipv6,'True')
+            mw.writeFile(listen_ipv6, 'True')
             os.system(INIT_CMD + " restart")
             print("|-开启IPv6支持了")
         else:

From b0aa889a1fa4dc0b56d74dfcf8abbad53ebb017f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 22:25:59 +0800
Subject: [PATCH 931/965] Update setting.py

---
 web/admin/setting/setting.py | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/web/admin/setting/setting.py b/web/admin/setting/setting.py
index 50b9808d1..237a14d7a 100644
--- a/web/admin/setting/setting.py
+++ b/web/admin/setting/setting.py
@@ -11,6 +11,7 @@
 import re
 import json
 import os
+import time
 
 from flask import Blueprint, render_template
 from flask import request
@@ -211,6 +212,7 @@ def set_name():
     session['username'] = name1
     return mw.returnData(True, '用户修改成功!')
 
+# 设置面板密码
 @blueprint.route('/set_password', endpoint='set_password', methods=['POST'])
 @panel_login_required
 def set_password():
@@ -224,31 +226,24 @@ def set_password():
     thisdb.setUserPwdByName(session['username'], password1)
     return mw.returnData(True, '密码修改成功!')
 
-
-# 设置站点状态
+# 设置面板端口
 @blueprint.route('/set_port', endpoint='set_port', methods=['POST'])
 @panel_login_required
 def set_port():
     port = request.form.get('port', '')
     if port != mw.getHostPort():
-        import system_api
-        import firewall_api
+        from utils.firewall import Firewall as MwFirewall
 
         sysCfgDir = mw.systemdCfgDir()
         if os.path.exists(sysCfgDir + "/firewalld.service"):
-            if not firewall_api.firewall_api().getFwStatus():
+            if not MwFirewall.instance().getFwStatus():
                 return mw.returnData(False, 'firewalld必须先启动!')
 
-        # mw.setHostPort(port)
-
+        mw.setHostPort(port)
         msg = mw.getInfo('放行端口[{1}]成功', (port,))
         mw.writeLog("防火墙管理", msg)
-        addtime = time.strftime('%Y-%m-%d %X', time.localtime())
-        mw.M('firewall').add('port,ps,add_time', (port, "配置修改", add_time))
-
-        # firewall_api.firewall_api().addAcceptPort(port)
-        # firewall_api.firewall_api().firewallReload()
 
+        MwFirewall.instance().addAcceptPort(port, '配置修改', 'port')
         mw.restartMw()
 
     return mw.returnData(True, '端口保存成功!')

From 7996722f04df7332c50765c90c243adaefd3b0e9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 22:33:27 +0800
Subject: [PATCH 932/965] Update setting.py

---
 web/admin/setting/setting.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/setting/setting.py b/web/admin/setting/setting.py
index 237a14d7a..b0d3cca6d 100644
--- a/web/admin/setting/setting.py
+++ b/web/admin/setting/setting.py
@@ -243,7 +243,7 @@ def set_port():
         msg = mw.getInfo('放行端口[{1}]成功', (port,))
         mw.writeLog("防火墙管理", msg)
 
-        MwFirewall.instance().addAcceptPort(port, '配置修改', 'port')
+        MwFirewall.instance().addAcceptPort(port, 'PANEL端口-配置修改', 'port')
         mw.restartMw()
 
     return mw.returnData(True, '端口保存成功!')

From 4d9dd2633757fba0b9eee7d4bff9056244f77f8b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 23:22:07 +0800
Subject: [PATCH 933/965] Update panel_tools.py

---
 panel_tools.py | 71 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 27 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index b98c4e087..91b448c9a 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -41,38 +41,55 @@ def mw_input_cmd(msg):
         in_val = input(msg)
     return in_val
 
+def getRemainLen(cmd, max_length=100):
+    cmd_len = len(cmd)
+    cmd_u8_len = len(cmd.encode('utf-8'))
+    # print(cmd, cmd_u8_len, cmd_len, int((cmd_u8_len - cmd_len)/2+cmd_len))
+    return max_length-int((cmd_u8_len - cmd_len)/2+cmd_len)
 
 def mwcli(mw_input=0):
     panel_dir = mw.getPanelDir()
 
-    raw_tip = "======================================================"
+    raw_tip = "=================================================================="
     if not mw_input:
-        print("===============mdserver-web cli tools=================")
-        print("(1)      重启面板服务")
-        print("(2)      停止面板服务")
-        print("(3)      启动面板服务")
-        print("(4)      重载面板服务")
-        print("(5)      修改面板端口")
-        print("(10)     查看面板默认信息")
-        print("(11)     修改面板密码")
-        print("(12)     修改面板用户名")
-        print("(13)     显示面板错误日志")
-        print("(14)     关闭面板访问")
-        print("(15)     开启面板访问")
-        print("(20)     关闭BasicAuth认证")
-        print("(21)     解除域名绑定")
-        print("(22)     解除面板SSL绑定")
-        print("(23)     开启IPV6支持")
-        print("(24)     关闭IPV6支持")
-        print("(25)     开启防火墙SSH端口")
-        print("(26)     关闭二次验证")
-        print("(27)     查看防火墙信息")
-        print("(28)     自动识别防火墙端口到面板")
-        print("(100)    开启PHP52显示")
-        print("(101)    关闭PHP52显示")
-        print("(200)    切换Linux系统软件源")
-        print("(201)    简单速度测试")
-        print("(0)      取消")
+        print("=====================mdserver-web cli tools=======================")
+        cmd_list = [
+            '(1)    重启面板服务',
+            '(2)    停止面板服务',
+            '(3)    启动面板服务',
+            '(4)    重载面板服务',
+            '(5)    修改面板端口',
+            '(10)   查看面板默认信息',
+            '(11)   修改面板密码',
+            '(12)   修改面板用户名',
+            '(13)   显示面板错误日志',
+            '(14)   关闭面板访问',
+            '(15)   开启面板访问',
+            '(20)   关闭BasicAuth认证',
+            '(21)   解除域名绑定',
+            '(22)   解除面板SSL绑定',
+            '(23)   开启IPV6支持',
+            '(24)   关闭IPV6支持',
+            '(25)   开启防火墙SSH端口',
+            '(26)   关闭二次验证',
+            '(27)   查看防火墙信息',
+            '(28)   自动识别防火墙端口到面板',
+            '(100)  开启PHP52显示',
+            '(101)  关闭PHP52显示',
+            '(200)  切换Linux系统软件源',
+            '(201)  简单速度测试',
+            '(0)    取消'
+        ]
+        cmd_list_num = len(cmd_list)
+        for index in range(cmd_list_num):
+            cmd = cmd_list[index]
+            if index % 2 == 0:
+                if index == (cmd_list_num-1):
+                    print(cmd)
+                else:
+                    print(cmd + " " * getRemainLen(cmd, 40), end="")
+            if index % 2 == 1:
+                print(cmd)
         print(raw_tip)
         try:
             mw_input = input("请输入命令编号：")

From fcd747c4a5f89e55b56b4b44d6ee2a60eb361f48 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 23:22:54 +0800
Subject: [PATCH 934/965] Update panel_tools.py

---
 panel_tools.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index 91b448c9a..5edcdbca3 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -50,9 +50,9 @@ def getRemainLen(cmd, max_length=100):
 def mwcli(mw_input=0):
     panel_dir = mw.getPanelDir()
 
-    raw_tip = "=================================================================="
+    raw_tip = "===================================================================="
     if not mw_input:
-        print("=====================mdserver-web cli tools=======================")
+        print("======================mdserver-web cli tools========================")
         cmd_list = [
             '(1)    重启面板服务',
             '(2)    停止面板服务',

From 3fa51efd164ae6e59b45c53872db5744caf807a4 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 23:23:57 +0800
Subject: [PATCH 935/965] Update panel_tools.py

---
 panel_tools.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index 5edcdbca3..56c173d02 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -50,9 +50,9 @@ def getRemainLen(cmd, max_length=100):
 def mwcli(mw_input=0):
     panel_dir = mw.getPanelDir()
 
-    raw_tip = "===================================================================="
+    raw_tip = "========================================================================"
     if not mw_input:
-        print("======================mdserver-web cli tools========================")
+        print("========================mdserver-web cli tools==========================")
         cmd_list = [
             '(1)    重启面板服务',
             '(2)    停止面板服务',

From 18e59c9538f8c81f0d33cf077d74eeafd27be7cd Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 23:24:07 +0800
Subject: [PATCH 936/965] Update panel_tools.py

---
 panel_tools.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/panel_tools.py b/panel_tools.py
index 56c173d02..3e0a361f4 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -44,7 +44,6 @@ def mw_input_cmd(msg):
 def getRemainLen(cmd, max_length=100):
     cmd_len = len(cmd)
     cmd_u8_len = len(cmd.encode('utf-8'))
-    # print(cmd, cmd_u8_len, cmd_len, int((cmd_u8_len - cmd_len)/2+cmd_len))
     return max_length-int((cmd_u8_len - cmd_len)/2+cmd_len)
 
 def mwcli(mw_input=0):

From a4b1ca831e8da71665eb0d42ba8958f00f2d2f60 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 23:37:16 +0800
Subject: [PATCH 937/965] Update python-app-php.yml

---
 .github/workflows/python-app-php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-app-php.yml b/.github/workflows/python-app-php.yml
index 5e505ade1..251c25b0e 100644
--- a/.github/workflows/python-app-php.yml
+++ b/.github/workflows/python-app-php.yml
@@ -65,4 +65,4 @@ jobs:
     - name: Start DEBUG
       run: |
         cd web && gunicorn -c setting.py app:app
-        python3 panel_task.py &
+        cd web && python3 panel_task.py &

From 00ed75502b20aeff458a2364547ac701e4e66a3a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 23:55:14 +0800
Subject: [PATCH 938/965] Update python-app-php.yml

---
 .github/workflows/python-app-php.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/python-app-php.yml b/.github/workflows/python-app-php.yml
index 251c25b0e..4ccabfe4c 100644
--- a/.github/workflows/python-app-php.yml
+++ b/.github/workflows/python-app-php.yml
@@ -64,5 +64,5 @@ jobs:
         cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 81
     - name: Start DEBUG
       run: |
-        cd web && gunicorn -c setting.py app:app
-        cd web && python3 panel_task.py &
+        source /www/server/mdserver-web/bin/activate && cd web && gunicorn -c setting.py app:app
+        python3 panel_task.py &

From 93f895d4e4a330d4be067eaaf8bed4e9d4b28ff1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 11 Dec 2024 00:04:02 +0800
Subject: [PATCH 939/965] Update python-app-op.yml

---
 .github/workflows/python-app-op.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-app-op.yml b/.github/workflows/python-app-op.yml
index bab069fd1..d08596c69 100644
--- a/.github/workflows/python-app-op.yml
+++ b/.github/workflows/python-app-op.yml
@@ -34,5 +34,5 @@ jobs:
         cd /www/server/mdserver-web/plugins/openresty && sudo bash install.sh install 1.27.1
     - name: Start DEBUG
       run: |
-        cd web && gunicorn -c setting.py app:app
+        source /www/server/mdserver-web/bin/activate &&  cd web && gunicorn -c setting.py app:app
         python3 panel_task.py &

From 726cdd8dc778dc5a08692645e4398509db436121 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 11 Dec 2024 00:04:55 +0800
Subject: [PATCH 940/965] Update python-app-op.yml

---
 .github/workflows/python-app-op.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-app-op.yml b/.github/workflows/python-app-op.yml
index d08596c69..f96ad70c9 100644
--- a/.github/workflows/python-app-op.yml
+++ b/.github/workflows/python-app-op.yml
@@ -34,5 +34,5 @@ jobs:
         cd /www/server/mdserver-web/plugins/openresty && sudo bash install.sh install 1.27.1
     - name: Start DEBUG
       run: |
-        source /www/server/mdserver-web/bin/activate &&  cd web && gunicorn -c setting.py app:app
+        source /www/server/mdserver-web/bin/activate && cd web && gunicorn -c setting.py app:app
         python3 panel_task.py &

From c7d0744fa3396d45d0b51c4ad6286f203842ed1e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 11 Dec 2024 11:43:08 +0800
Subject: [PATCH 941/965] Update python-app-op.yml

---
 .github/workflows/python-app-op.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-app-op.yml b/.github/workflows/python-app-op.yml
index f96ad70c9..bd26948b7 100644
--- a/.github/workflows/python-app-op.yml
+++ b/.github/workflows/python-app-op.yml
@@ -35,4 +35,4 @@ jobs:
     - name: Start DEBUG
       run: |
         source /www/server/mdserver-web/bin/activate && cd web && gunicorn -c setting.py app:app
-        python3 panel_task.py &
+        cd /www/server/mdserver-web && python3 panel_task.py &

From 39bf6b811abf79255a9fccd2799159bdefcf9cb1 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 11 Dec 2024 12:01:43 +0800
Subject: [PATCH 942/965] Update python-app-php.yml

---
 .github/workflows/python-app-php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-app-php.yml b/.github/workflows/python-app-php.yml
index 4ccabfe4c..71796d15b 100644
--- a/.github/workflows/python-app-php.yml
+++ b/.github/workflows/python-app-php.yml
@@ -65,4 +65,4 @@ jobs:
     - name: Start DEBUG
       run: |
         source /www/server/mdserver-web/bin/activate && cd web && gunicorn -c setting.py app:app
-        python3 panel_task.py &
+        cd /www/server/mdserver-web && python3 panel_task.py &

From 864b5bb9856fa14e850c6a2f0a2f66ed75f65587 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 11 Dec 2024 12:10:42 +0800
Subject: [PATCH 943/965] Update panel_tools.py

---
 panel_tools.py | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/panel_tools.py b/panel_tools.py
index 3e0a361f4..3fe7829e5 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -126,14 +126,14 @@ def mwcli(mw_input=0):
             os.system(INIT_CMD + " restart_panel")
             os.system(INIT_CMD + " default")
         else:
-            print("|-端口范围在0-65536之间")
+            mw.echoInfo("端口范围在0-65536之间")
         return
     elif mw_input == 10:
         os.system(INIT_CMD + " default")
     elif mw_input == 11:
         input_pwd = mw_input_cmd("请输入新的面板密码：")
         if len(input_pwd.strip()) < 5:
-            print("|-错误，密码长度不能小于5位")
+            mw.echoInfo("错误，密码长度不能小于5位")
             return
         set_panel_pwd(input_pwd.strip(), True)
     elif mw_input == 12:
@@ -145,54 +145,54 @@ def mwcli(mw_input=0):
         admin_close = thisdb.getOption('admin_close')
         if admin_close == 'no':
             thisdb.setOption('admin_close', 'yes')
-            print("|-关闭面板访问成功!")
+            mw.echoInfo("关闭面板访问成功!")
         else:
-            print("|-已关闭面板访问!")
+            mw.echoInfo("已关闭面板访问!")
     elif mw_input == 15:
         admin_close = thisdb.getOption('admin_close')
         if admin_close == 'yes':
             thisdb.setOption('admin_close', 'no')
-            print("|-开启面板访问成功!")
+            mw.echoInfo("开启面板访问成功!")
         else:
-            print("|-已开启面板访问!")
+            mw.echoInfo("已开启面板访问!")
     elif mw_input == 20:
         basic_auth = thisdb.getOptionByJson('basic_auth', default={'open':False})
         if basic_auth['open']:
             basic_auth['open'] = False
             thisdb.setOption('basic_auth', json.dumps(basic_auth))
             os.system(INIT_CMD + " restart")
-            print("|-关闭basic_auth成功")
+            mw.echoInfo("关闭basic_auth成功")
     elif mw_input == 21:
         panel_domain = thisdb.getOption('panel_domain', default='')
         if panel_domain != '':
             thisdb.setOption('panel_domain', '')
             os.system(INIT_CMD + " unbind_domain")
-            print("|-解除域名绑定成功")
+            mw.echoInfo("解除域名绑定成功")
         else:
-            print("|-面板未绑定域名!")
+            mw.echoInfo("面板未绑定域名!")
     elif mw_input == 22:
         panel_ssl = thisdb.getOptionByJson('panel_ssl', default={'open':False})
         if panel_ssl['open']:
             panel_ssl['open'] = False
             thisdb.setOption('panel_ssl', json.dumps(panel_ssl))
             os.system(INIT_CMD + " unbind_ssl")
-            print("|-解除面板SSL绑定成功")
+            mw.echoInfo("解除面板SSL绑定成功")
     elif mw_input == 23:
         listen_ipv6 = panel_dir + '/data/ipv6.pl'
         if not os.path.exists(listen_ipv6):
             mw.writeFile(listen_ipv6, 'True')
             os.system(INIT_CMD + " restart")
-            print("|-开启IPv6支持了")
+            mw.echoInfo("开启IPv6支持了")
         else:
-            print("|-已开启IPv6支持!")
+            mw.echoInfo("已开启IPv6支持!")
     elif mw_input == 24:
         listen_ipv6 = panel_dir + '/data/ipv6.pl'
         if not os.path.exists(listen_ipv6):
-            print("|-已关闭IPv6支持!")
+            mw.echoInfo("已关闭IPv6支持!")
         else:
             os.remove(listen_ipv6)
             os.system(INIT_CMD + " restart")
-            print("|-关闭IPv6支持了")
+            mw.echoInfo("关闭IPv6支持了")
     elif mw_input == 25:
         open_ssh_port()
         print("|-已开启!")
@@ -201,9 +201,9 @@ def mwcli(mw_input=0):
         if two_step_verification['open']:
             two_step_verification['open'] = False
             thisdb.setOption('two_step_verification', json.dumps(two_step_verification))
-            print("|-关闭二次验证成功!")
+            mw.echoInfo("关闭二次验证成功!")
         else:
-            print("|-二次验证已关闭!")
+            mw.echoInfo("二次验证已关闭!")
     elif mw_input == 27:
         cmd = 'which ufw'
         run_cmd = False
@@ -253,7 +253,7 @@ def open_ssh_port():
     if ssh_port == '':
         ssh_port = '22'
 
-    print("|-SSH端口: "+ str(ssh_port))
+    mw.echoInfo("SSH端口: "+ str(ssh_port))
     MwFirewall.instance().addAcceptPort(ssh_port, 'SSH远程管理服务', 'port')
     return True
 
@@ -262,8 +262,8 @@ def set_panel_pwd(password, ncli=False):
     info = thisdb.getUserByRoot()
     thisdb.setUserByRoot(password=password)
     if ncli:
-        print("|-username: " + info['name'])
-        print("|-password: " + password)
+        mw.echoInfo("username: " + info['name'])
+        mw.echoInfo("password: " + password)
     else:
         print(username)
 
@@ -277,7 +277,7 @@ def show_panel_pwd():
         pwd = mw.readFile(defailt_pwd_file).strip()
 
     if mw.md5(pwd) == info['password']:
-        print('|-password: ' + pwd)
+        mw.echoInfo('password: ' + pwd)
         return
     print("*-password has been changed!")
 
@@ -290,21 +290,21 @@ def set_panel_username(username=None):
     # 随机面板用户名
     if username:
         if len(username) < 5:
-            print("|-错误，用户名长度不能少于5位")
+            mw.echoInfo("错误，用户名长度不能少于5位")
             return
         if username in ['admin', 'root']:
-            print("|-错误，不能使用过于简单的用户名")
+            mw.echoInfo("错误，不能使用过于简单的用户名")
             return
 
         thisdb.setUserByRoot(name=username)
-        print("|-username: %s" % username)
+        mw.echoInfo("username: %s" % username)
         return
 
     info = thisdb.getUserByRoot()
     if info['name'] == 'admin':
         username = mw.getRandomString(8).lower()
         thisdb.setUserByRoot(name=username)
-    print('|-username: ' + info['name'])
+    mw.echoInfo('username: ' + info['name'])
 
 
 def getServerIp():

From c3285f8b2ed577c4a1bd6d1808b110c1cb899886 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 11 Dec 2024 12:11:04 +0800
Subject: [PATCH 944/965] Update panel_tools.py

---
 panel_tools.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panel_tools.py b/panel_tools.py
index 3fe7829e5..786005d18 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -195,7 +195,7 @@ def mwcli(mw_input=0):
             mw.echoInfo("关闭IPv6支持了")
     elif mw_input == 25:
         open_ssh_port()
-        print("|-已开启!")
+        mw.echoInfo("已开启!")
     elif mw_input == 26:
         two_step_verification = thisdb.getOptionByJson('two_step_verification', default={'open':False})
         if two_step_verification['open']:

From adecec811eae7b01233f7fe4bf38b8fef0012d9a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 11 Dec 2024 13:35:10 +0800
Subject: [PATCH 945/965] Update Dockerfile

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 934a40943..c3fafd629 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -40,7 +40,7 @@ RUN apt update -y && \
 RUN cd /www/server/mdserver-web/plugins/php && \
     bash install.sh install 74 && \
     cd /www/server/mdserver-web/plugins/openresty && \
-    bash install.sh install 1.21.4.1 && \
+    bash install.sh install 1.21.4 && \
     cd /www/server/mdserver-web/plugins/mysql && \
     bash install.sh install 5.6 && \
     cd /www/server/mdserver-web/plugins/phpmyadmin && \

From e9d220b54df0a700dd2cbe69d7619a7a0f5843f2 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 11 Dec 2024 14:03:34 +0800
Subject: [PATCH 946/965] Update plugin.py

---
 web/utils/plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index 32c13ec3c..86afe1007 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -816,7 +816,7 @@ class plugin(object):
         py_cmd = 'cd ' + mw.getPanelDir() + " && "+ py_cmd
         data = mw.execShell(py_cmd)
 
-        if mw.inArray(['start','stop'], func):
+        if mw.inArray(['start','stop','reload'], func):
             self.runByCache(name, func, version)
 
         # print(data)

From 84c94365468890f0f8e1aa7bafdbfdd2053aa1be Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 11 Dec 2024 14:03:47 +0800
Subject: [PATCH 947/965] Update plugin.py

---
 web/utils/plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index 86afe1007..efae617f2 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -816,7 +816,7 @@ class plugin(object):
         py_cmd = 'cd ' + mw.getPanelDir() + " && "+ py_cmd
         data = mw.execShell(py_cmd)
 
-        if mw.inArray(['start','stop','reload'], func):
+        if mw.inArray(['start','stop','restart','reload'], func):
             self.runByCache(name, func, version)
 
         # print(data)

From 0bd476340a9ba8f41568489e4b79ea910a16e978 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 11 Dec 2024 14:26:01 +0800
Subject: [PATCH 948/965] Update install.sh

---
 plugins/webstats/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/webstats/install.sh b/plugins/webstats/install.sh
index 3545c87e7..cea3ccda9 100755
--- a/plugins/webstats/install.sh
+++ b/plugins/webstats/install.sh
@@ -48,7 +48,6 @@ Install_App()
 	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source/webstats
 	mkdir -p $serverPath/webstats
-	echo "${VERSION}" > $serverPath/webstats/version.pl
 
 	# 下载源码安装包
 	# curl -O $serverPath/source/webstats/lua-5.1.5.tar.gz https://www.lua.org/ftp/lua-5.1.5.tar.gz
@@ -132,10 +131,11 @@ Install_App()
 		cp -rf $serverPath/source/webstats/GeoLite2-City.mmdb $serverPath/webstats/GeoLite2-City.mmdb
 	fi
 
+	echo "${VERSION}" > $serverPath/webstats/version.pl
 	cd $rootPath && python3 plugins/webstats/index.py start
 
 	echo '网站统计安装完成'
-
+	
 	# delete install data
 	if [ -d $serverPath/source/webstats/lsqlite3_fsl09y ];then
 		rm -rf $serverPath/source/webstats/lsqlite3_fsl09y

From ccb02f14a678b61d83bb6dd83167f7007e721eb7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 11 Dec 2024 18:56:37 +0800
Subject: [PATCH 949/965] update

---
 plugins/webstats/index.py     |  6 ++++++
 plugins/webstats/info.json    |  5 +++--
 plugins/webstats/install.sh   |  6 +++---
 plugins/webstats/tool_task.py |  2 +-
 web/utils/plugin.py           | 17 +++++++++++------
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/plugins/webstats/index.py b/plugins/webstats/index.py
index 11fbfe40e..26e164152 100755
--- a/plugins/webstats/index.py
+++ b/plugins/webstats/index.py
@@ -1398,6 +1398,10 @@ def installPreInspection():
         return "请先安装OpenResty"
     return 'ok'
 
+def uninstallPreInspection():
+    stop()
+    return 'ok'
+
 if __name__ == "__main__":
     func = sys.argv[1]
     if func == 'status':
@@ -1412,6 +1416,8 @@ if __name__ == "__main__":
         print(reload())
     elif func == 'install_pre_inspection':
         print(installPreInspection())
+    elif func == 'uninstall_pre_inspection':
+        print(uninstallPreInspection())
     elif func == 'run_info':
         print(runInfo())
     elif func == 'get_global_conf':
diff --git a/plugins/webstats/info.json b/plugins/webstats/info.json
index 5623f449f..5d31a1cdc 100755
--- a/plugins/webstats/info.json
+++ b/plugins/webstats/info.json
@@ -16,10 +16,11 @@
 	"name": "webstats",
 	"title": "网站统计",
 	"shell": "install.sh",
-	"versions":["0.2.5"],
+	"versions":"0.2.5",
 	"tip": "soft",
 	"install_pre_inspection":true,
-	"checks": "server/webstats",
+	"uninstall_pre_inspection":true,
+	"checks": "server/webstats/version.pl",
 	"path": "server/webstats",
 	"display": 1,
 	"author": "midoks",
diff --git a/plugins/webstats/install.sh b/plugins/webstats/install.sh
index cea3ccda9..bbf82e3fd 100755
--- a/plugins/webstats/install.sh
+++ b/plugins/webstats/install.sh
@@ -130,12 +130,12 @@ Install_App()
 	if [ -f $serverPath/source/webstats/GeoLite2-City.mmdb ];then
 		cp -rf $serverPath/source/webstats/GeoLite2-City.mmdb $serverPath/webstats/GeoLite2-City.mmdb
 	fi
-
-	echo "${VERSION}" > $serverPath/webstats/version.pl
+	
 	cd $rootPath && python3 plugins/webstats/index.py start
+	echo "${VERSION}" > $serverPath/webstats/version.pl
 
 	echo '网站统计安装完成'
-	
+
 	# delete install data
 	if [ -d $serverPath/source/webstats/lsqlite3_fsl09y ];then
 		rm -rf $serverPath/source/webstats/lsqlite3_fsl09y
diff --git a/plugins/webstats/tool_task.py b/plugins/webstats/tool_task.py
index e1c1af25d..95f923e28 100644
--- a/plugins/webstats/tool_task.py
+++ b/plugins/webstats/tool_task.py
@@ -93,7 +93,7 @@ def removeBgTask():
             "id=?", (cfg["task_id"],)).find()
         if res and res["id"] == cfg["task_id"]:
             data = MwCrontab.instance().delete(cfg["task_id"])
-            if data[0]:
+            if data['status']:
                 # print(data[1])
                 cfg["task_id"] = -1
                 mw.writeFile(getTaskConf(), json.dumps(cfg))
diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index efae617f2..c52b518d0 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -481,11 +481,13 @@ class plugin(object):
         pInfo['setup'] = os.path.exists(pInfo['install_checks'])
 
 
-
         if coexist and pInfo['setup']:
             pInfo['setup_version'] = info['versions']
-        else:
-            pInfo['setup_version'] = self.getVersion(pInfo['install_checks'])
+        elif pInfo['setup']:
+            if os.path.isdir(pInfo['install_checks']):
+                pInfo['setup_version'] = self.getVersion(pInfo['install_checks'])
+            else:
+                pInfo['setup_version'] = mw.readFile(pInfo['install_checks']).strip()
 
         if 'install_pre_inspection' in info:
             pInfo['install_pre_inspection'] = info['install_pre_inspection']
@@ -792,7 +794,7 @@ class plugin(object):
         if 'coexist' in info and info['coexist']:
             name = info['title'] + '-'+ version
         if name in data:
-            del(data[name])            
+            del(data[name])
             thisdb.setOption(self.__plugin_status_cachekey, json.dumps(data))
 
     # shell/bash方式调用
@@ -801,6 +803,10 @@ class plugin(object):
         args  = '',
         script  = 'index',
     ):
+
+        if mw.inArray(['start','stop','restart','reload','uninstall_pre_inspection','install','uninstall'], func):
+            self.runByCache(name, func, version)
+
         path = self.__plugin_dir + '/' + name + '/' + script + '.py'
         if not os.path.exists(path):
             path = self.__plugin_dir + '/' + name + '/' + name + '.py'
@@ -816,8 +822,7 @@ class plugin(object):
         py_cmd = 'cd ' + mw.getPanelDir() + " && "+ py_cmd
         data = mw.execShell(py_cmd)
 
-        if mw.inArray(['start','stop','restart','reload'], func):
-            self.runByCache(name, func, version)
+        
 
         # print(data)
         if mw.isDebugMode():

From 6577b37b762a52a3a293ecfab6fadf506fe31f7e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 11 Dec 2024 18:56:53 +0800
Subject: [PATCH 950/965] Update plugin.py

---
 web/utils/plugin.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/utils/plugin.py b/web/utils/plugin.py
index c52b518d0..306941a12 100644
--- a/web/utils/plugin.py
+++ b/web/utils/plugin.py
@@ -822,8 +822,6 @@ class plugin(object):
         py_cmd = 'cd ' + mw.getPanelDir() + " && "+ py_cmd
         data = mw.execShell(py_cmd)
 
-        
-
         # print(data)
         if mw.isDebugMode():
             print('run:', py_cmd)

From 8a42898afe8b2a8c65d566d8229d9339def8a99d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 11 Dec 2024 19:54:31 +0800
Subject: [PATCH 951/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index 72f6f9f0e..814c88a4a 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -589,7 +589,9 @@ class nosqlMySQLCtr():
         if data['status']:
             pid_data = data['data']
             for x in pid_data:
-                my_instance.execute('kill %s' % x['processlist_id'])
+                cmd = 'kill %s' % x['processlist_id']
+                print(cmd)
+                my_instance.execute(cmd)
         return mw.returnData(True, '执行成功!')
 
     

From 4bf5fd712d547004ac9196a80fae18aa3e349a56 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 11 Dec 2024 20:15:42 +0800
Subject: [PATCH 952/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index 814c88a4a..3b8016ac3 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -590,7 +590,7 @@ class nosqlMySQLCtr():
             pid_data = data['data']
             for x in pid_data:
                 cmd = 'kill %s' % x['processlist_id']
-                print(cmd)
+                # print(cmd)
                 my_instance.execute(cmd)
         return mw.returnData(True, '执行成功!')
 

From 83a2ea9b4e7901fd57b2ddf7d51a102510591a89 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 12 Dec 2024 02:11:12 +0800
Subject: [PATCH 953/965] Update logs.py

---
 web/thisdb/logs.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/thisdb/logs.py b/web/thisdb/logs.py
index f08b7888c..2b1049111 100644
--- a/web/thisdb/logs.py
+++ b/web/thisdb/logs.py
@@ -15,6 +15,7 @@ import core.mw as mw
 
 def clearLog():
     mw.M('logs').where('id>?', (0,)).delete()
+    mw.M('logs').execute("update sqlite_sequence set seq=0 where name='logs'")
     return True
 
 def addLog(type, log, uid = 1) -> str:

From 1b42bafc49ea0d87329e75d50b4c549489929f29 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 12 Dec 2024 04:19:00 +0800
Subject: [PATCH 954/965] Update php.py

---
 web/admin/site/php.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin/site/php.py b/web/admin/site/php.py
index 8934185a0..8808e6b39 100644
--- a/web/admin/site/php.py
+++ b/web/admin/site/php.py
@@ -42,7 +42,7 @@ def get_cli_php_version():
         link_re = os.readlink(php_bin)
         for v in php_versions:
             if link_re.find(v['version']) != -1:
-                return mw.returnData({"select": v, "versions": php_versions})
+                return {"select": v, "versions": php_versions}
 
     return {"select": php_versions[0],"versions": php_versions}
 

From fc0b79f01824471ffd60e8e0871aa0be9ce375ff Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 12 Dec 2024 12:38:30 +0800
Subject: [PATCH 955/965] Update orm.py

---
 web/core/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/core/orm.py b/web/core/orm.py
index 16389c22e..f5a166996 100755
--- a/web/core/orm.py
+++ b/web/core/orm.py
@@ -129,7 +129,7 @@ class ORM:
     def query(self, sql):
         # 执行SQL语句返回数据集
         if not self.__Conn():
-            return self.__DB_ERR
+            return None
         try:
             self.__DB_CUR.execute(sql)
             result = self.__DB_CUR.fetchall()

From a5195956c2d74615c89746f5dfb1158acd29eeae Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 12 Dec 2024 12:41:55 +0800
Subject: [PATCH 956/965] Update sql_mysql.py

---
 plugins/data_query/sql_mysql.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index 3b8016ac3..6179f00e3 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -356,6 +356,9 @@ class nosqlMySQLCtr():
             return mw.returnData(False,'无法链接')
 
         is_performance_schema = my_instance.find("SELECT @@performance_schema")
+        if is_performance_schema is None:
+            return mw.returnData(False,'异常中断,重试!')
+
         if is_performance_schema["@@performance_schema"] == 0:
             msg = "performance_schema参数未开启。\n"
             msg += "在my.cnf配置文件里添加performance_schema=1，并重启mysqld进程生效。"

From db2aab88f4c3743c3c0252adecfb7d0a3196169d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 12 Dec 2024 17:43:26 +0800
Subject: [PATCH 957/965] Update site.py

---
 web/utils/site.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/utils/site.py b/web/utils/site.py
index ec4545f79..33eb03133 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -209,6 +209,8 @@ class sites(object):
             self.addDomain(site_id, self.siteName, domain)
 
         mw.restartWeb()
+
+        self.runHook('site_cb', 'add')
         return mw.returnData(True, '添加成功')
 
     def stop(self, site_id):
@@ -418,6 +420,8 @@ class sites(object):
 
         thisdb.deleteBindingBySiteId(site_id)
         mw.restartWeb()
+
+        self.runHook('site_cb', 'delete')
         return mw.returnData(True, '站点【%s】删除成功!' % webname)
 
     def nginxAddConf(self):

From 839fec3a792221fbb467529f0502288ba4d38a67 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 12 Dec 2024 22:15:39 +0800
Subject: [PATCH 958/965] Update index.py

---
 plugins/alist/index.py | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/plugins/alist/index.py b/plugins/alist/index.py
index 277920786..2e88b953c 100755
--- a/plugins/alist/index.py
+++ b/plugins/alist/index.py
@@ -5,6 +5,7 @@ import io
 import os
 import time
 import re
+import json
 
 web_dir = os.getcwd() + "/web"
 if os.path.exists(web_dir):
@@ -96,11 +97,33 @@ def readConfigTpl():
     content = contentReplace(content)
     return mw.returnJson(True, 'ok', content)
 
+def __release_port(port, ps = '开启端口'):
+    try:
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().addAcceptPort(port, ps, 'port')
+        return port
+    except Exception as e:
+        return "Release failed {}".format(e)
+
+def __delete_port(port):
+    try:
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().delAcceptPortCmd(port, 'tcp')
+        return port
+    except Exception as e:
+        return "Delete failed {}".format(e)
+
+
+def openPort():
+    content = mw.readFile(getConf())
+    data = json.loads(content)
+    http_port = data['scheme']['http_port']
+    __release_port(http_port, 'alist')
+    return True
 
 def status():
-    data = mw.execShell(
-        "ps aux|grep alist |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'")
-
+    cmd = "ps aux|grep alist |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'"
+    data = mw.execShell(cmd)
     if data[0] == '':
         return 'stop'
     return 'start'
@@ -128,6 +151,8 @@ def initDreplace():
         content = content.replace('{$SERVER_PATH}', service_path)
         mw.writeFile(file_bin, content)
         mw.execShell('chmod +x ' + file_bin)
+        openPort()
+        
 
     # systemd
     systemDir = mw.systemdCfgDir()
@@ -251,7 +276,6 @@ def clearCopyTask():
     return mw.returnJson(True, '清空成功并重启服务!')
 
 def homePage():
-    import json
     content = mw.readFile(getConf())
     data = json.loads(content)
     http_port = data['scheme']['http_port']

From 0edc306aa8b821f347267eb8457017d1b6f21914 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 12 Dec 2024 22:22:47 +0800
Subject: [PATCH 959/965] Update index.py

---
 plugins/alist/index.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/alist/index.py b/plugins/alist/index.py
index 2e88b953c..40388c8f4 100755
--- a/plugins/alist/index.py
+++ b/plugins/alist/index.py
@@ -151,7 +151,6 @@ def initDreplace():
         content = content.replace('{$SERVER_PATH}', service_path)
         mw.writeFile(file_bin, content)
         mw.execShell('chmod +x ' + file_bin)
-        openPort()
         
 
     # systemd
@@ -164,7 +163,8 @@ def initDreplace():
         se_content = se_content.replace('{$SERVER_PATH}', service_path)
         mw.writeFile(systemService, se_content)
         mw.execShell('systemctl daemon-reload')
-
+        time.sleep(1)
+        openPort()
     return file_bin
 
 

From c64287fd518f7ec43c15f711926e3a99c9c3c710 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 12 Dec 2024 22:23:05 +0800
Subject: [PATCH 960/965] Update index.py

---
 plugins/alist/index.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/alist/index.py b/plugins/alist/index.py
index 40388c8f4..c22f551f4 100755
--- a/plugins/alist/index.py
+++ b/plugins/alist/index.py
@@ -164,7 +164,6 @@ def initDreplace():
         mw.writeFile(systemService, se_content)
         mw.execShell('systemctl daemon-reload')
         time.sleep(1)
-        openPort()
     return file_bin
 
 

From 400ecfe690b795172ad9c8c3a0d5287d0c4688e0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 12 Dec 2024 22:23:45 +0800
Subject: [PATCH 961/965] Update alist.js

---
 plugins/alist/js/alist.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/alist/js/alist.js b/plugins/alist/js/alist.js
index f79fb51f6..e66b4438a 100755
--- a/plugins/alist/js/alist.js
+++ b/plugins/alist/js/alist.js
@@ -83,6 +83,7 @@ function alistReadme(){
  
 
     var readme = '<ul class="help-info-text c7">';
+    readme += '<li>手动开启默认端口:5244</li>';
     readme += '<li>默认admin:admin</li>';
     readme += '<li>手动改密码: cd /www/server/alist && ./alist admin set NEW_PASSWORD</li>';
     readme += '</ul>';

From e69136534bd6fc8198c1ac4de9d9864880cf4322 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 12 Dec 2024 23:00:41 +0800
Subject: [PATCH 962/965] Update install.sh

---
 plugins/php-guard/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/php-guard/install.sh b/plugins/php-guard/install.sh
index 2623847c8..b1edae490 100755
--- a/plugins/php-guard/install.sh
+++ b/plugins/php-guard/install.sh
@@ -9,12 +9,12 @@ serverPath=$(dirname "$rootPath")
 
 Install_pg()
 {
-	echo '卸载PHP守护中...'
+	echo '安装PHP守护中...'
 	echo 'True' > ${rootPath}/data/502Task.pl
 
 	mkdir -p $serverPath/php-guard
 	echo '1.0' > $serverPath/php-guard/version.pl	
-	echo '卸载PHP守护成功!!'
+	echo '安装PHP守护成功!!'
 }
 
 Uninstall_pg()

From cfea5d498f9dddb9322fd46cda2ed4f5a28c9268 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 12 Dec 2024 23:26:32 +0800
Subject: [PATCH 963/965] Update dashboard.py

---
 web/admin/dashboard/dashboard.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/web/admin/dashboard/dashboard.py b/web/admin/dashboard/dashboard.py
index 750e4a050..a769c1e0c 100644
--- a/web/admin/dashboard/dashboard.py
+++ b/web/admin/dashboard/dashboard.py
@@ -10,6 +10,8 @@
 
 import io
 import time
+import base64
+import json
 
 from flask import Blueprint, render_template
 from flask import make_response
@@ -37,9 +39,6 @@ def index():
 def admin_safe_path(path):
     login = request.args.get('login', '')
     if login != '':
-        import base64
-        import json
-        import time
         try:
             # print(login)
             login_str = base64.b64decode(login)

From c358954e6d301d9d168445c38b83fdb5174159bb Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 12 Dec 2024 23:27:19 +0800
Subject: [PATCH 964/965] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index 3dd267508..31ccc059f 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0.28
+APP_SMALL_VERSION = 0
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''

From 4b1db3d02f9dc077c5d504780de0895e05a8f565 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 12 Dec 2024 23:28:49 +0800
Subject: [PATCH 965/965] 0.18.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### 版本更新 0.18.0

- 重新架构面板。
- PHP84正式版。
- 加入alist插件。
- 数据管理-常用命令。
- 插件读取优化(加入缓存+定时检查状态)。
- 恢复面板书签。
- 常规更新。
---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index 31ccc059f..e78644ee3 100644
--- a/web/version.py
+++ b/web/version.py
@@ -15,7 +15,7 @@ APP_RELEASE = 0
 APP_REVISION = 18
 APP_SMALL_VERSION = 0
 
-# 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
+# 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布
 APP_SUFFIX = ''