diff --git a/app/script/convert.sh b/app/script/convert.sh index 22f376f..e2d5c94 100644 --- a/app/script/convert.sh +++ b/app/script/convert.sh @@ -2,7 +2,7 @@ Linux_Version="7.9.8" Windows_Version="7.8.0" -Btm_Version="1.0.11" +Btm_Version="1.0.12" FILES=( public/install/src/panel6.zip diff --git a/public/install/install_btmonitor.sh b/public/install/install_btmonitor.sh index 0cdf2ae..a9a5673 100644 --- a/public/install/install_btmonitor.sh +++ b/public/install/install_btmonitor.sh @@ -330,6 +330,12 @@ EOF /etc/init.d/btm stop sleep 1 fi + + if [ -f "/www/server/bt-monitor/sqlite-server.sh" ]; then + chmod +x /www/server/bt-monitor/sqlite-server.sh + /www/server/bt-monitor/sqlite-server.sh stop + sleep 1 + fi version="1.0.2" file_name="bt-monitor" @@ -669,6 +675,12 @@ Install_Main(){ Uninstall_Monitor(){ pkill BT-MONITOR /etc/init.d/btm stop + + if [ -f "/www/server/bt-monitor/sqlite-server.sh" ]; then + chmod +x /www/server/bt-monitor/sqlite-server.sh + /www/server/bt-monitor/sqlite-server.sh stop + sleep 1 + fi Service_Del diff --git a/public/install/src/bt-monitor-1.0.11.zip b/public/install/src/bt-monitor-1.0.12.zip similarity index 78% rename from public/install/src/bt-monitor-1.0.11.zip rename to public/install/src/bt-monitor-1.0.12.zip index 05278a2..27d6472 100644 Binary files a/public/install/src/bt-monitor-1.0.11.zip and b/public/install/src/bt-monitor-1.0.12.zip differ diff --git a/public/install/src/panel6.zip b/public/install/src/panel6.zip index 1962fbf..af647db 100644 Binary files a/public/install/src/panel6.zip and b/public/install/src/panel6.zip differ diff --git a/public/install/update/LinuxPanel-7.9.8.zip b/public/install/update/LinuxPanel-7.9.8.zip index becd859..b16921c 100644 Binary files a/public/install/update/LinuxPanel-7.9.8.zip and b/public/install/update/LinuxPanel-7.9.8.zip differ diff --git a/public/install/update_btmonitor.sh b/public/install/update_btmonitor.sh index b34b9a4..caeff47 100644 --- a/public/install/update_btmonitor.sh +++ b/public/install/update_btmonitor.sh @@ -23,6 +23,12 @@ if [ -f "/etc/init.d/btm" ]; then sleep 1 fi +if [ -f "/www/server/bt-monitor/sqlite-server.sh" ]; then + chmod +x /www/server/bt-monitor/sqlite-server.sh + /www/server/bt-monitor/sqlite-server.sh stop + sleep 1 +fi + get_node_url(){ if [ ! -f /bin/curl ];then if [ "${PM}" = "yum" ]; then diff --git a/wiki/btmonitor.md b/wiki/btmonitor.md index 0365cc9..b47218b 100644 --- a/wiki/btmonitor.md +++ b/wiki/btmonitor.md @@ -40,3 +40,5 @@ - init.sh http://download.bt.cn => http://www.example.com +- 根目录BT-MONITOR 取消第一个CreateSSL方法定义的注释,删除第二个CreateSSL方法定义 + diff --git a/wiki/update.md b/wiki/update.md index d4d7044..4f5c9b0 100644 --- a/wiki/update.md +++ b/wiki/update.md @@ -57,6 +57,8 @@ temp_file = temp_file.replace('https://download.bt.cn/install/public.sh', 'http://www.example.com/install/public.sh') ``` +- class/plugin_deployment.py 文件,SetupPackage方法内替换 public.GetConfigValue('home') => 'https://www.bt.cn' + - install/install_soft.sh 在bash执行之前加入以下代码 ```shell