update

app/script/convert.sh

@@ -2,7 +2,7 @@
 
 Linux_Version="7.9.9"
 Windows_Version="7.8.0"
-Btm_Version="2.0.9"
+Btm_Version="2.1.1"
 
 FILES=(
 public/install/src/panel6.zip

install.sql

@@ -18,7 +18,7 @@ INSERT INTO `cloud_config` (`key`, `value`) VALUES
 ('new_version_win', '7.8.0'),
 ('update_msg_win', '暂无更新日志'),
 ('update_date_win', '2022-12-08'),
-('new_version_btm', '2.0.8'),
+('new_version_btm', '2.1.1'),
 ('update_msg_btm', '暂无更新日志'),
 ('update_date_btm', '2023-03-31'),
 ('updateall_type', '0'),

public/install/install_btmonitor.sh

@@ -462,16 +462,24 @@ Start_Monitor(){
 	curl -sSO ${download_Url}/install/btmonitoragent.sh && bash btmonitoragent.sh https://127.0.0.1:806 $md5_pl
 	target_dir="/usr/local/btmonitoragent"
 	if [ ! -f "$target_dir/BT-MonitorAgent" ];then
-		echo "ERROR: 安装云监控被控端失败，正在尝试重新安装！"
+		tail -n 10 ${monitor_path}/logs/error.log
+		echo ""
+		ps aux|grep -v grep|grep ${monitor_path}
+		netstat -tulnp|grep ${panelPort}
+		/etc/init.d/btm restart
+		if [ "$?" -eq 0 ]; then
+			echo -e "\033[31m安装云监控被控端失败，正在尝试重新安装！\033[0m"
+			sleep 15
 			curl -sSO ${download_Url}/install/btmonitoragent.sh && bash btmonitoragent.sh https://127.0.0.1:806 $md5_pl
-            
 			if [ ! -f "$target_dir/BT-MonitorAgent" ];then
 				Red_Error "ERROR: 安装云监控被控端失败，请尝试重新安装！"
 			fi
+		else
+			Red_Error "ERROR: 安装云监控被控端失败，请尝试重新安装！"
+		fi
 	fi
 	/etc/init.d/btm restart > /dev/null 2>&1
 
-
 }
 
 Set_Firewall(){
@@ -708,9 +716,9 @@ Check_Sys_Write(){
         
         for dir in ${read_dir[@]}
         do
+            if [[ -d "$dir" ]]; then
                 touch $dir/btm_install_test_111.pl
                 state=$(echo $?)
-            #echo $state
                 if [[ "$state" != "0" ]];then
                     echo -e "\033[31m错误：检测到系统关键目录不可写! $read_dir \033[0m"
                     echo "1、如果安装了[宝塔系统加固]，请先临时关闭"
@@ -725,6 +733,7 @@ Check_Sys_Write(){
                 else
                     rm -f $dir/btm_install_test_111.pl
                 fi
+            fi
         done
 	fi
 }