diff --git a/app/command/CleanViteJs.php b/app/command/CleanViteJs.php index f99075b..dd1f357 100644 --- a/app/command/CleanViteJs.php +++ b/app/command/CleanViteJs.php @@ -120,7 +120,7 @@ class CleanViteJs extends Command $flag = true; } - if(strpos($file, '售后QQ群:')!==false){ //main + if(strpos($file, '论坛求助')!==false){ //main $code = $this->getExtendCode($file, '"微信公众号"', 1); $code = $this->getExtendFunction($file, $code); $start = strpos($file, $code) - 1; @@ -130,7 +130,7 @@ class CleanViteJs extends Command break; } } - $code = $this->getExtendCode($file, '"/other/customer-service.png"', 2); + $code = $this->getExtendCode($file, '"/other/customer-qrcode.png"', 2); $code = $this->getExtendFunction($file, $code); $end = strpos($file, $code)+strlen($code); $code = substr($file, $start, $end - $start); @@ -182,7 +182,7 @@ class CleanViteJs extends Command if(strpos($file, '"商用SSL证书"')!==false){ //site-ssl $code = $this->getExtendFunction($file, '"商用SSL证书"', '{', '}'); $file = str_replace($code, '', $file); - $code = $this->getExtendFunction($file, '"宝塔证书"', '{', '}'); + $code = $this->getExtendFunction($file, '"测试证书"', '{', '}'); $file = str_replace($code, '', $file); $code = $this->getExtendCode($file, '"购买商业证书"', 2); if($code){ @@ -201,7 +201,7 @@ class CleanViteJs extends Command if(strpos($file, '"商用SSL"')!==false){ //ssl $code = $this->getExtendFunction($file, '"商用SSL"', '{', '}'); $file = str_replace($code, '', $file); - $code = $this->getExtendFunction($file, '"宝塔证书"', '{', '}'); + $code = $this->getExtendFunction($file, '"测试证书"', '{', '}'); $file = str_replace($code, '', $file); $code = $this->getExtendCode($file, ',"联系客服"', 2, '[', ']'); if($code){ @@ -259,7 +259,7 @@ class CleanViteJs extends Command $file = str_replace($code, '[]', $file); $flag = true; } - $code = $this->getExtendFunction($file, '," 需求反馈 "'); + $code = $this->getExtendFunction($file, 'label:"需求反馈",', '{', '}'); if($code){ $file = str_replace($code, '', $file); $flag = true; diff --git a/app/script/convert.sh b/app/script/convert.sh index bdf3e3d..87ce531 100644 --- a/app/script/convert.sh +++ b/app/script/convert.sh @@ -1,14 +1,14 @@ #!/bin/bash -Linux_Version="9.4.0" +Linux_Version="9.5.0" Windows_Version="8.2.2" -Aapanel_Version="7.0.13" +Aapanel_Version="7.0.16" Btm_Version="2.3.0" FILES=( public/install/src/panel6.zip public/install/update/LinuxPanel-${Linux_Version}.zip -public/install/install_6.0.sh +public/install/install_panel.sh public/install/update_panel.sh public/install/update6.sh public/win/install/panel_update.py diff --git a/app/view/admin/plugins.html b/app/view/admin/plugins.html index 0fee771..695eee2 100644 --- a/app/view/admin/plugins.html +++ b/app/view/admin/plugins.html @@ -35,6 +35,7 @@ td{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width:340px;