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
-		curl -sSO ${download_Url}/install/btmonitoragent.sh && bash btmonitoragent.sh https://127.0.0.1:806 $md5_pl
+		echo ""
-            
+		ps aux|grep -v grep|grep ${monitor_path}
-		if [ ! -f "$target_dir/BT-MonitorAgent" ];then
+		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,22 +716,23 @@ Check_Sys_Write(){
         
         for dir in ${read_dir[@]}
         do
-            touch $dir/btm_install_test_111.pl
+            if [[ -d "$dir" ]]; then
-            state=$(echo $?)
+                touch $dir/btm_install_test_111.pl
-            #echo $state
+                state=$(echo $?)
-            if [[ "$state" != "0" ]];then
+                if [[ "$state" != "0" ]];then
-                echo -e "\033[31m错误：检测到系统关键目录不可写! $read_dir \033[0m"
+                    echo -e "\033[31m错误：检测到系统关键目录不可写! $read_dir \033[0m"
-                echo "1、如果安装了[宝塔系统加固]，请先临时关闭"
+                    echo "1、如果安装了[宝塔系统加固]，请先临时关闭"
-                echo "2、如果安装了云锁，请临时关闭[系统加固]功能"
+                    echo "2、如果安装了云锁，请临时关闭[系统加固]功能"
-                echo "3、如果安装了安全狗，请临时关闭[系统防护]功能"
+                    echo "3、如果安装了安全狗，请临时关闭[系统防护]功能"
-                echo "4、如果使用了其它安全软件，请先卸载 "
+                    echo "4、如果使用了其它安全软件，请先卸载 "
-                echo -e "5、如果使用了禁止写入命令，请执行命令取消禁止写入：\n   chattr -iaR $read_dir "
+                    echo -e "5、如果使用了禁止写入命令，请执行命令取消禁止写入：\n   chattr -iaR $read_dir "
-                echo ""
+                    echo ""
-                echo -e "\033[31m解决以上问题后，请尝试重新安装！ \033[0m"
+                    echo -e "\033[31m解决以上问题后，请尝试重新安装！ \033[0m"
-                echo -e "如果无法解决请截图以上报错信息发帖至论坛www.bt.cn/bbs求助"
+                    echo -e "如果无法解决请截图以上报错信息发帖至论坛www.bt.cn/bbs求助"
-                exit 1
+                    exit 1
-            else
+                else
-                rm -f $dir/btm_install_test_111.pl
+                    rm -f $dir/btm_install_test_111.pl
+                fi
             fi
         done
 	fi