README.md

@@ -5,7 +5,7 @@
 
 网站后台管理可一键同步宝塔官方的插件列表与增量更新插件包，还有云端使用记录、IP黑白名单、操作日志、定时任务等功能。
 
-本项目自带的宝塔安装包和更新包是7.9.5最新版，已修改适配此第三方云端，并且全开源，无so等加密文件。
+本项目自带 **宝塔Linux面板**、**宝塔Windows面板**、**aaPanel面板**、**宝塔云监控** 的最新版安装包和更新包，已修改适配此第三方云端，并且全开源，无.so等加密文件。
 
 觉得该项目不错的可以给个Star~
 
@@ -37,12 +37,22 @@
 - 在`定时任务设置`执行所显示的命令从宝塔官方获取最新的插件列表并批量下载插件包（增量更新）。当然你也可以去插件列表，一个一个点击下载。
 - 访问网站`/download`查看使用此第三方云端的一键安装脚本。
 
+## 更新方法
+
+- [下载最新版的Release包](https://github.com/flucont/btcloud/releases)
+- 上传覆盖除data文件夹以外的全部文件
+- 后台使用批量替换工具->获取最新插件列表->修改软件版本设置里面的版本号
+
 ## 其他
 
 - [Linux面板官方更新包修改记录](./wiki/update.md)
 
 - [Windows面板官方更新包修改记录](./wiki/updatewin.md)
 
+- [aaPanel面板官方更新包修改记录](./wiki/aapanel.md)
+
+- [宝塔云监控安装包修改记录](./wiki/btmonitor.md)
+
 - 宝塔面板官方版与此第三方云端版对比：
 
   |            | 官方版                                                       | 此第三方云端版                                     |

app/command/Clean.php

@@ -0,0 +1,77 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\command;
+
+use think\console\Command;
+use think\console\Input;
+use think\console\input\Argument;
+use think\console\input\Option;
+use think\console\Output;
+use think\facade\Db;
+use think\facade\Config;
+use app\lib\Plugins;
+
+class Clean extends Command
+{
+    protected function configure()
+    {
+        $this->setName('clean')
+            ->setDescription('the clean command');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        $res = Db::name('config')->cache('configs',0)->column('value','key');
+        Config::set($res, 'sys');
+        
+        if(config_get('bt_url')){
+            $this->clean_plugins($input, $output, 'Linux');
+        }
+        if(config_get('wbt_url')){
+            $this->clean_plugins($input, $output, 'Windows');
+        }
+
+        config_set('cleantime', date('Y-m-d H:i:s'));
+    }
+
+    private function clean_plugins(Input $input, Output $output, $os){
+        $data_dir = get_data_dir($os) . 'plugins/';
+        $file_list = [];
+        $json_arr = Plugins::get_plugin_list($os);
+        if(count($json_arr['list']) == 0) return;
+        foreach($json_arr['list'] as $plugin){
+            foreach($plugin['versions'] as $version){
+                $ver = $version['m_version'].'.'.$version['version'];
+                if(!isset($version['download'])){
+                    $file_list[] = $plugin['name'].'-'.$ver;
+                }
+            }
+        }
+
+        $count = 0;
+        $dir = opendir($data_dir.'package');
+        while(false !== ( $file = readdir($dir)) ) {
+            if($file == '.' || $file == '..') continue;
+            $name = str_replace('.zip', '', $file);
+            if(!in_array($name, $file_list)){
+                $filepath = $data_dir . 'package/' . $file;
+                unlink($filepath);
+                $count++;
+            }
+        }
+        $output->writeln($os.'成功清理'.$count.'个历史版本插件包');
+
+        $count = 0;
+        $dir = opendir($data_dir.'folder');
+        while(false !== ( $file = readdir($dir)) ) {
+            if($file == '.' || $file == '..') continue;
+            if(!in_array($file, $file_list)){
+                $filepath = $data_dir . 'folder/' . $file;
+                deleteDir($filepath);
+                $count++;
+            }
+        }
+        $output->writeln($os.'成功清理'.$count.'个历史版本插件目录');
+    }
+}

app/command/CleanViteJs.php

@@ -0,0 +1,386 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\command;
+
+use think\console\Command;
+use think\console\Input;
+use think\console\input\Argument;
+use think\console\input\Option;
+use think\console\Output;
+use think\facade\Db;
+use think\facade\Config;
+use app\lib\Plugins;
+
+class CleanViteJs extends Command
+{
+    protected function configure()
+    {
+        $this->setName('cleanvitejs')
+            ->addArgument('dir', Argument::REQUIRED, '/BTPanel/static/vite/js/路径')
+            ->setDescription('处理宝塔面板vite/js文件');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        $dir = trim($input->getArgument('dir'));
+        if(!file_exists($dir)){
+            $output->writeln('目录不存在');
+            return;
+        }
+        //$this->handlefile($dir.'/DockerImages.js');
+        $this->checkdir($dir);
+    }
+
+    private function getExtendCode($content, $part, $n = 1, $startChar = '{', $endChar = '}'){
+        if(!$part) return false;
+        $length = strlen($content);
+        $start = strpos($content, $part);
+        if($start===false)return false;
+        $end = $start+strlen($part);
+        $start--;
+        $c = 0;
+        for($i=$start;$i>=0;$i--){
+            if(substr($content,$i,1) == $startChar) $c++;
+            if(substr($content,$i,1) == $endChar) $c--;
+            if($c == $n){
+                $start = $i;
+                break;
+            }
+        }
+        $c = 0;
+        for($i=$end;$i<=$length;$i++){
+            if(substr($content,$i,1) == $endChar) $c++;
+            if(substr($content,$i,1) == $startChar) $c--;
+            if($c == $n){
+                $end = $i;
+                break;
+            }
+        }
+        return substr($content, $start, $end - $start + 1);
+    }
+    
+    private function getExtendFunction($content, $part, $startChar = '(', $endChar = ')'){
+        $code = $this->getExtendCode($content, $part, 1, $startChar, $endChar);
+        if(!$code) return false;
+        $start = strpos($content, $code) - 1;
+        $end = $start + strlen($code);
+        for($i=$start;$i>=0;$i--){
+            $char = substr($content,$i,1);
+            if(!ctype_alpha($char)&&$char!='_'){
+                $start = $i+1;
+                break;
+            }
+        }
+        if(substr($content,$start-1,1) == ',') $start--;
+        else if(substr($content,$end+1,1) == ',') $end++;
+        return substr($content, $start, $end - $start + 1);
+    }
+    
+    private function checkdir($basedir){
+        if($dh=opendir($basedir)){
+            while (($file=readdir($dh)) !== false){
+                if($file != '.' && $file != '..'){
+                    if(!is_dir($basedir.'/'.$file) && substr($file,-3)=='.js'){
+                        $this->handlefile($basedir.'/'.$file);
+                    }else if(!is_dir($basedir.'/'.$file) && substr($file,-4)=='.map'){
+                        unlink($basedir.'/'.$file);
+                    }
+                }
+            }
+            closedir($dh);
+        }
+    }
+
+    private function str_replace_once($needle, $replace, $haystack) {
+        $pos = strpos($haystack, $needle);
+        if ($pos === false) {
+            return $haystack;
+        }
+        return substr_replace($haystack, $replace, $pos, strlen($needle));
+    }
+    
+    private function handlefile($filepath){
+        //echo $filepath."\n";
+        $file = file_get_contents($filepath);
+        if(!$file)return;
+    
+        $flag = false;
+    
+        if(strpos($file, 'window.location.protocol.indexOf("https")>=0')!==false){ //index
+            $file = str_replace('window.location.protocol.indexOf("https")>=0', '!0', $file);
+            $code = $this->getExtendCode($file, 'isGetCoupon:', 2);
+            if($code){
+                $file = str_replace($code, '{}', $file);
+            }
+            $file = preg_replace('!recommendShow:\w+,!', 'recommendShow:!1,', $file, 1);
+            $code = $this->getExtendCode($file, '"打开需求反馈"', 1, '[', ']');
+            if($code){
+                $file = str_replace($code, '[]', $file);
+            }
+            $flag = true;
+        }
+
+        if(strpos($file, '"点击打开调查问卷"')!==false){ //index
+            $code = $this->getExtendCode($file, '"点击打开调查问卷"', 2);
+            if($code){
+                $file = str_replace($code, '{}', $file);
+            }
+            $flag = true;
+        }
+
+        if(strpos($file, '您有{0}个优惠券待领取')!==false){ //win-index
+            $code = $this->getExtendCode($file, 'isGetCoupon:', 2);
+            if($code){
+                $file = str_replace($code, '{}', $file);
+            }
+            $flag = true;
+        }
+    
+        if(strpos($file, '论坛求助')!==false && strpos($file, '"/other/customer-qrcode.png"')!==false){ //main
+            $code = $this->getExtendCode($file, '"微信公众号"', 1);
+            $code = $this->getExtendFunction($file, $code);
+            $start = strpos($file, $code) - 1;
+            for($i=$start;$i>=0;$i--){
+                if(substr($file,$i,1) == ','){
+                    $start = $i;
+                    break;
+                }
+            }
+            $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);
+            $file = str_replace($code, '', $file);
+            $flag = true;
+        }
+    
+        if(strpos($file, 'useNegotiate')!==false){ //utils
+            $code = $this->getExtendCode($file, 'createPeerConnection()', 1);
+            if($code){
+                $file = str_replace($code, '{}', $file);
+            }
+            $file = preg_replace('!computed\(\(\)=>"calc"===\w+\.\w+\.type\)!', '!1', $file);
+            $file = preg_replace('!computed\(\(\)=>"input"===\w+\.\w+\.type\)!', '!1', $file);
+            $file = preg_replace('!computed\(function\(\)\{return"calc"===\w+\.\w+\.type\}\)!', '!1', $file);
+            $file = preg_replace('!computed\(function\(\)\{return"input"===\w+\.\w+\.type\}\)!', '!1', $file);
+            $file = preg_replace('!computed\(\(\)=>\w+\.\w+\.type==="calc"\)!', '!1', $file);
+            $file = preg_replace('!computed\(\(\)=>\w+\.\w+\.type==="input"\)!', '!1', $file);
+            $file = preg_replace('!computed\(function\(\)\{return\w+\.\w+\.type==="calc"\}\)!', '!1', $file);
+            $file = preg_replace('!computed\(function\(\)\{return\w+\.\w+\.type==="input"\}\)!', '!1', $file);
+            $code = $this->getExtendCode($file, '"自动部署"', 2);
+            if($code){
+                $file = str_replace($code.',', '', $file);
+                $file = str_replace($code, '', $file);
+            }
+            $flag = true;
+        }
+
+        if(strpos($file, '"sqlserver管理"')!==false && strpos($file, '"iis管理"')!==false){ //win-utils
+            $file = preg_replace('!"calc"===\w+\.\w+\.type!', '!1', $file);
+            $file = preg_replace('!"input"===\w+\.\w+\.type!', '!1', $file);
+            $flag = true;
+        }
+    
+        if(strpos($file, '请冷静几秒钟，确认以下要删除的数据')!==false && strpos($file, '"计算结果："')!==false){ //site
+            $code = $this->getExtendCode($file, '"计算结果："', 1, '[', ']');
+            $code = $this->getExtendFunction($file, $code);
+            $file = str_replace($code, '', $file);
+            $file = preg_replace('!\w+\.sum===\w+\.addend1\+\w+\.addend2!', '!0', $file);
+            $file = preg_replace('!value=\!0,(\w+)\.value=5;!', 'value=!1,$1.value=0;', $file);
+            $flag = true;
+        }
+    
+        if(strpos($file, '"left-waf"')!==false && strpos($file, '"iconWaf"')!==false){ //site.table
+            $code = $this->getExtendCode($file, '"left-waf"');
+            $code = $this->getExtendCode($file, $code, 1, '[', ']');
+            $code = $this->getExtendFunction($file, $code);
+            $file = str_replace($code, '""', $file);
+            $flag = true;
+        }
+    
+        if(strpos($file, 'svgtofont-left-waf')!==false && strpos($file, '"iconWaf"')!==false){ //site.table
+            $code = $this->getExtendCode($file, 'svgtofont-left-waf');
+            $code = $this->getExtendCode($file, $code, 1, '[', ']');
+            $code = $this->getExtendFunction($file, $code);
+            $file = str_replace($code, '""', $file);
+            $flag = true;
+        }
+    
+        if(strpos($file, 'label:"商用SSL证书"')!==false){ //site-ssl
+            $code = $this->getExtendFunction($file, 'label:"商用SSL证书"', '{', '}');
+            $file = str_replace($code, '', $file);
+            $code = $this->getExtendFunction($file, 'label:"测试证书"', '{', '}');
+            if($code){
+                $file = str_replace($code, '', $file);
+            }
+            $code = $this->getExtendFunction($file, 'label:"宝塔证书"', '{', '}');
+            if($code){
+                $file = str_replace($code, '', $file);
+            }
+            $code = $this->getExtendCode($file, '"购买商业证书"', 2);
+            if($code){
+                $code2 = str_replace('"busSslList"', '"letsEncryptList"', $code);
+                $code2 = str_replace($this->getExtendFunction($code, '"购买商业证书"'), '', $code2);
+                $file = str_replace($code, $code2, $file);
+            }
+            $file = str_replace('.value="busSslList"', '.value="letsEncryptList"', $file);
+            $flag = true;
+        }
+        if(strpos($file, '"busSslList"')!==false && strpos($filepath, '/useStore')){ //site-ssl
+            $file = str_replace('"busSslList"', '"currentCertInfo"', $file);
+            $flag = true;
+        }
+
+        if(strpos($file, '"商用SSL"')!==false){ //ssl
+            $code = $this->getExtendFunction($file, '"商用SSL"', '{', '}');
+            $file = str_replace($code, '', $file);
+            $code = $this->getExtendFunction($file, '"宝塔证书"', '{', '}');
+            if($code){
+                $file = str_replace($code, '', $file);
+            }
+            for($i=0;$i<3;$i++){
+                $code = $this->getExtendCode($file, ',"联系客服"', 2, '[', ']');
+                if($code){
+                    $file = str_replace($code, '[]', $file);
+                }
+            }
+            $flag = true;
+        }
+        if(strpos($file, '"SSL-CERTIFICATE-STORE"')!==false){ //ssl
+            $file = str_replace('("ssl")', '("encrypt")', $file);
+            $flag = true;
+        }
+
+        if(strpos($file, '"商业证书"')!==false && strpos($file, 'name:"busSslList"')!==false && strpos($file, 'IIS配置')!==false){ //win-ssl
+            $code = $this->getExtendFunction($file, 'name:"busSslList"', '{', '}');
+            $file = str_replace($code, '', $file);
+            $code = $this->getExtendFunction($file, 'name:"trustAsiaList"', '{', '}');
+            $file = str_replace($code, '', $file);
+            $file = $this->str_replace_once('"busSslList"', '"currentCertInfo"', $file);
+            $flag = true;
+        }
+    
+        if(strpos($file, '如果您希望添加其它Docker应用')!==false){
+            $code = $this->getExtendCode($file, '如果您希望添加其它Docker应用', 1, '[', ']');
+            $code = $this->getExtendFunction($file, $code);
+            $file = str_replace($code, '', $file);
+            $flag = true;
+        }
+
+        if(strpos($file, '"recom-view"')!==false){ //soft
+            $code = $this->getExtendCode($file, '"recom-view"');
+            $code = $this->getExtendFunction($file, $code);
+            $file = str_replace($code, '', $file);
+            $flag = true;
+        }
+
+        if(strpos($file, '"打开插件文件目录"')!==false && strpos($file, '"(续费)"')!==false){ //soft.table
+            $code = $this->getExtendFunction($file, '"(续费)"');
+            $file = str_replace($code, '""', $file);
+            $code = $this->getExtendCode($file, 'activity_id:47', 2);
+            if($code){
+                $file = str_replace($code, '{}', $file);
+            }
+            $flag = true;
+        }
+
+        if(strpos($file, 'path:"register"')!==false){ //domain
+            $code = $this->getExtendCode($file, 'path:"register"');
+            $file = str_replace($code.',', '', $file);
+            $flag = true;
+        }
+
+        for($i=0;$i<5;$i++){
+            $code = $this->getExtendCode($file, ',"需求反馈"', 1, '[', ']');
+            if($code){
+                if(strpos($code, 'svgtofont-desired')){
+                    $file = str_replace($code, '[]', $file);
+                }else{
+                    $code = $this->getExtendFunction($code, ',"需求反馈"');
+                    $file = str_replace($code, '', $file);
+                }
+                $flag = true;
+            }
+        }
+        $code = $this->getExtendCode($file, '("需求反馈",-1)', 1, '[', ']');
+        if($code){
+            $file = str_replace($code, '[]', $file);
+            $flag = true;
+        }
+        $code = $this->getExtendCode($file, '(" 需求反馈 ",-1)', 1, '[', ']');
+        if($code){
+            $file = str_replace($code, '[]', $file);
+            $flag = true;
+        }
+        $code = $this->getExtendFunction($file, 'label:"需求反馈",', '{', '}');
+        if($code){
+            $file = str_replace($code, '', $file);
+            $flag = true;
+        }
+
+        if(strpos($file, '暂无搜索结果，<span class="text-primary cursor-pointer NpsDialog">提交需求反馈</span>')!==false){
+            $file = str_replace('暂无搜索结果，<span class="text-primary cursor-pointer NpsDialog">提交需求反馈</span>', '暂无搜索结果', $file);
+            $flag = true;
+        }
+
+        if(strpos($file, 'getReceiveCoupon()')!==false){ //aapanel-优惠券
+            $code = $this->getExtendCode($file, 'getReceiveCoupon()');
+            $file = str_replace($code, '{}', $file);
+            $flag = true;
+        }
+    
+        if(strpos($file, '"Site.DelSite.index_1"')!==false){ //aapanel-site
+            $code = $this->getExtendCode($file, '"Site.DelSite.index_10"', 3, '(', ')');
+            if($code){
+                $code = $this->getExtendFunction($file, $code);
+                $file = str_replace($code, '', $file);
+                $file = preg_replace('@\w+\.value!==\w+\.value\+\w+\.value@', '!1', $file);
+                $file = preg_replace('@null==\w+\.value\|\|null==\w+\.value@', '!1', $file);
+                $file = str_replace('disabled:!0', 'disabled:!1', $file);
+                $flag = true;
+            }
+        }
+    
+        if(strpos($file, '"Component.Confirm.index_4"')!==false){ //aapanel-public
+            $code = $this->getExtendCode($file, '"Component.Confirm.index_4"', 2, '(', ')');
+            if($code){
+                $code = $this->getExtendFunction($file, $code);
+                $file = str_replace($code, '', $file);
+                $file = preg_replace('@\w+\.value===\w+\.value\+\w+\.value@', '!0', $file);
+                $flag = true;
+            }
+            $code = $this->getExtendCode($file, '"Component.Confirm.index_1"', 1, '(', ')');
+            if($code){
+                $code = $this->getExtendFunction($file, $code);
+                $file = str_replace($code, '', $file);
+                $file = preg_replace('@\w+\.value===\w+\.value\?@', '!0?', $file);
+                $flag = true;
+            }
+        }
+        
+        if(strpos($file, '"Component.Feedback.index_7"')!==false){ //aapanel-需求反馈
+            $code = $this->getExtendCode($file, '"Component.Feedback.index_7"', 2);
+            if($code){
+                $code = $this->getExtendFunction($file, $code);
+                $file = str_replace($code, '', $file);
+                $flag = true;
+            }
+        }
+    
+        if(strpos($file, '"Soft.index_16"')!==false){ //aapanel-soft
+            $code = $this->getExtendCode($file, '"Soft.index_16"', 2);
+            if($code){
+                $file = str_replace($code, '{}', $file);
+                $flag = true;
+            }
+        }
+    
+        if(!$flag) return;
+        if(file_put_contents($filepath, $file)){
+            echo '文件：'.$filepath.' 处理成功'."\n";
+        }else{
+            echo '文件：'.$filepath.' 处理失败，可能无写入权限'."\n";
+        }
+    }
+}

app/command/DecryptFile.php

@@ -45,37 +45,34 @@ class DecryptFile extends Command
                 $output->writeln($e->getMessage());
             }
         }elseif($type == 'module'){
-            try{
+            $this->decode_module_file($output, $file);
-                $res = Plugins::decode_module_file($file);
-                if($res == 2){
-                    $output->writeln('文件解密失败！');
-                }elseif($res == 1){
-                    $output->writeln('文件解密成功！');
-                }
-            }catch(\Exception $e){
-                $output->writeln($e->getMessage());
-            }
         }elseif($type == 'classdir'){
             $file = rtrim($file, '/');
-            if(!file_exists($file.'/common.py')){
+            if(file_exists($file.'/common.py')){
+                $class_v = 1;
+            }elseif(file_exists($file.'/common_v2.py')){
+                $class_v = 2;
+            }else{
                 $output->writeln('当前路径非宝塔面板class目录');
                 return;
             }
-            $dirs = glob($file.'/*Model');
+            $dirs = glob($file.'/*Model'.($class_v == 2 ? 'V2' : ''));
             foreach($dirs as $dir){
                 if(!is_dir($dir))continue;
                 $files = glob($dir.'/*Model.py');
-                foreach($files as $file){
+                foreach($files as $filepath){
-                    try{
+                    $this->decode_module_file($output, $filepath);
-                        $res = Plugins::decode_module_file($file);
+                }
-                        if($res == 2){
+            }
-                            $output->writeln('文件解密失败：'.$file);
+            if($class_v == 2){
-                        }elseif($res == 1){
+                $filepath = $file.'/wp_toolkit/core.py';
-                            $output->writeln('文件解密成功：'.$file);
+                if(file_exists($filepath)){
-                        }
+                    $this->decode_module_file($output, $filepath);
-                    }catch(\Exception $e){
+                }
-                        $output->writeln($e->getMessage().'：'.$file);
+            }else{
-                    }
+                $filepath = $file.'/public/authorization.py';
+                if(file_exists($filepath)){
+                    $this->decode_module_file($output, $filepath);
                 }
             }
         }elseif($type == 'all'){
@@ -95,21 +92,24 @@ class DecryptFile extends Command
                     $this->scan_all_file($input, $output, $filepath);
                 }
                 elseif(substr($filepath, -3) == '.py') {
-                    try{
+                    $this->decode_module_file($output, $filepath);
-                        $res = Plugins::decode_module_file($filepath);
-                        if($res == 2){
-                            $output->writeln('文件解密失败：'.$filepath);
-                        }elseif($res == 1){
-                            $output->writeln('文件解密成功：'.$filepath);
-                        }
-                    }catch(\Exception $e){
-                        $output->writeln($e->getMessage().'：'.$filepath);
-                    }
                 }
             }
         }
         closedir($dir);
     }
 
+    private function decode_module_file(Output $output, $filepath){
+        try{
+            $res = Plugins::decode_module_file($filepath);
+            if($res == 2){
+                $output->writeln('文件解密失败：'.$filepath);
+            }elseif($res == 1){
+                $output->writeln('文件解密成功：'.$filepath);
+            }
+        }catch(\Exception $e){
+            $output->writeln($e->getMessage().'：'.$filepath);
+        }
+    }
     
 }

app/command/UpdateAll.php

@@ -25,12 +25,15 @@ class UpdateAll extends Command
         $res = Db::name('config')->cache('configs',0)->column('value','key');
         Config::set($res, 'sys');
         
-        if(config_get('bt_url')){
+        if(!config_get('bt_type') && config_get('bt_url') || config_get('bt_type')==1 && config_get('bt_surl')){
             $this->process_plugins($input, $output, 'Linux');
         }
-        if(config_get('wbt_url')){
+        if(!config_get('wbt_type') && config_get('wbt_url') || config_get('wbt_type')==1 && config_get('wbt_surl')){
             $this->process_plugins($input, $output, 'Windows');
         }
+        if(!config_get('enbt_type') && config_get('enbt_url') || config_get('enbt_type')==1 && config_get('enbt_surl')){
+            $this->process_plugins($input, $output, 'en');
+        }
 
         config_set('runtime', date('Y-m-d H:i:s'));
     }
@@ -43,12 +46,19 @@ class UpdateAll extends Command
 
         $count = 0;
 
-        $type = intval(config_get($os=='Windows'?'updateall_type_win':'updateall_type'));
+        if($os=='Windows'){
+            $type = intval(config_get('updateall_type_win'));
+        }elseif($os=='en'){
+            $type = intval(config_get('updateall_type_en'));
+        }else{
+            $type = intval(config_get('updateall_type'));
+        }
 
         $json_arr = Plugins::get_plugin_list($os);
         //循环下载缺少的插件
         foreach($json_arr['list'] as $plugin){
             if($type == 0 && ($plugin['type']==8 || $plugin['type']==12) || $type == 1 && $plugin['type']==12 || $plugin['type']==10 || $plugin['type']==5) continue;
+            if(in_array($plugin['name'], \app\lib\BtPlugins::$skip_plugins)) continue;
 
             foreach($plugin['versions'] as $version){
                 $ver = $version['m_version'].'.'.$version['version'];
@@ -103,16 +113,4 @@ class UpdateAll extends Command
             return false;
         }
     }
-
-    private function download_plugin_image(Input $input, Output $output, $fname){
-        try{
-            Plugins::download_plugin_other($fname);
-            $output->writeln('下载图片: '.$fname.' 成功');
-            return true;
-        }catch(\Exception $e){
-            $output->writeln($fname.'  '.$e->getMessage());
-            errorlog($fname.'  '.$e->getMessage());
-            return false;
-        }
-    }
 }

app/common.php

@@ -3,7 +3,13 @@
 use think\facade\Db;
 
 function get_data_dir($os = 'Linux'){
-	return app()->getRootPath().'data/'.($os == 'Windows' ? 'win/' : '');
+	if($os == 'en'){
+		return app()->getRootPath().'data/en/';
+	}elseif($os == 'Windows'){
+		return app()->getRootPath().'data/win/';
+	}else{
+		return app()->getRootPath().'data/';
+	}
 }
 
 
@@ -180,8 +186,144 @@ function checkIfActive($string) {
 		return null;
 }
 
+function checkDomain($domain){
+	if(empty($domain) || !preg_match('/^[-$a-z0-9_*.]{2,512}$/i', $domain) || (stripos($domain, '.') === false) || substr($domain, -1) == '.' || substr($domain, 0 ,1) == '.' || substr($domain, 0 ,1) == '*' && substr($domain, 1 ,1) != '.' || substr_count($domain, '*')>1 || strpos($domain, '*')>0 || strlen($domain)<4) return false;
+	return true;
+}
+
 function errorlog($msg){
 	$handle = fopen(app()->getRootPath()."record.txt", 'a');
 	fwrite($handle, date('Y-m-d H:i:s')."\t".$msg."\r\n");
 	fclose($handle);
 }
+
+function licenseEncrypt($data, $key){
+	$iv = substr($key, 0, 16);
+	return openssl_encrypt($data, 'AES-256-CBC', $key, 0, $iv);
+}
+
+function licenseDecrypt($data, $key){
+	$iv = substr($key, 0, 16);
+	return openssl_decrypt($data, 'AES-256-CBC', $key, 0, $iv);
+}
+
+function generateKeyPairs(){
+	$pkey_dir = app()->getRootPath().'data/config/';
+	$public_key_path = $pkey_dir.'public_key.pem';
+	$private_key_path = $pkey_dir.'private_key.pem';
+	if(file_exists($public_key_path) && file_exists($private_key_path)){
+		return [file_get_contents($public_key_path), file_get_contents($private_key_path)];
+	}
+	$pkey_config = ['private_key_bits'=>4096];
+	$pkey_res = openssl_pkey_new($pkey_config);
+	$private_key = '';
+	openssl_pkey_export($pkey_res, $private_key, null, $pkey_config);
+	$pkey_details = openssl_pkey_get_details($pkey_res);
+	if(!$pkey_details) return false;
+	$public_key = $pkey_details['key'];
+	file_put_contents($public_key_path, $public_key);
+	file_put_contents($private_key_path, $private_key);
+	return [$public_key, $private_key];
+}
+
+function pemToBase64($pem){
+    $lines = explode("\n", $pem);
+    $encoded = '';
+    foreach ($lines as $line) {
+        if (trim($line) != '' && strpos($line, '-----BEGIN') === false && strpos($line, '-----END') === false) {
+            $encoded .= trim($line);
+        }
+    }
+    return $encoded;
+}
+
+function makeSelfSignSSL(string $commonName, array $domainList, $validity = 3650){
+	// 加载 CA 证书和私钥
+	$dir = app()->getBasePath().'script/';
+	$caCert = file_get_contents($dir.'ca.crt');
+	$caPrivateKey = file_get_contents($dir.'ca.key');
+
+	$opensslConfigFile = sys_get_temp_dir().'/openssl'.time().mt_rand(1000, 9999).'.cnf';
+	$opensslConfigContent = <<<EOF
+[req]
+req_extensions = extension_section
+x509_extensions	= extension_section
+distinguished_name = dn
+
+[dn]
+
+[extension_section]
+basicConstraints = CA:FALSE
+keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+subjectAltName = @alt_names
+
+[alt_names]
+EOF;
+	$ip_index = 1;
+	$dns_index = 1;
+	foreach ($domainList as $value) {
+		if(empty($value)) continue;
+		if(filter_var($value, FILTER_VALIDATE_IP)){
+			$opensslConfigContent .= sprintf("\nIP.%d = %s", $ip_index, $value);
+			$ip_index++;
+		}else{
+			$opensslConfigContent .= sprintf("\nDNS.%d = %s", $dns_index, $value);
+			$dns_index++;
+		}
+	}
+
+	if(!file_put_contents($opensslConfigFile, $opensslConfigContent)) return false;
+
+	// 生成域名证书的私钥和 CSR
+	$domainPrivateKey = openssl_pkey_new([
+		'private_key_bits' => 2048,
+		'private_key_type' => OPENSSL_KEYTYPE_RSA,
+	]);
+	if(!$domainPrivateKey) return false;
+
+	$csrConfig = ['digest_alg' => 'sha256', 'config' => $opensslConfigFile];
+
+	$domainCsr = openssl_csr_new([
+		'commonName' => $commonName
+	], $domainPrivateKey, $csrConfig);
+	if(!$domainCsr) return false;
+
+	// 生成域名证书
+	$domainCertificate = openssl_csr_sign($domainCsr, $caCert, $caPrivateKey, $validity, $csrConfig);
+	if(!$domainCertificate) return false;
+
+	// 导出域名证书
+	openssl_x509_export($domainCertificate, $certificate);
+	openssl_pkey_export($domainPrivateKey, $privateKey);
+	$certificate .= $caCert;
+
+	unlink($opensslConfigFile);
+
+	return ['cert' => $certificate, 'key' => $privateKey];
+}
+
+function deleteDir($dir){
+	$rd = opendir($dir);
+	if (!$rd) {
+		return false;
+	}
+
+	while (($file = readdir($rd)) !== false) {
+		if ($file == '.' || $file == '..') {
+			continue;
+		}
+
+		$file = $dir . '/' . $file;
+
+		if (is_dir($file)) {
+			deleteDir($file);
+		}
+		else {
+			unlink($file);
+		}
+	}
+
+	closedir($rd);
+	rmdir($dir);
+	return true;
+}

app/controller/Admin.php

@@ -100,6 +100,7 @@ class Admin extends BaseController
         View::assign('conf', config('sys'));
         $runtime = Db::name('config')->where('key','runtime')->value('value') ?? '<font color="red">未运行</font>';
         View::assign('runtime', $runtime);
+        View::assign('is_user_www', isset($_SERVER['USER']) && $_SERVER['USER'] == 'www');
         return view();
     }
 
@@ -129,20 +130,48 @@ class Admin extends BaseController
     }
 
     public function testbturl(){
-        $bt_url = input('post.bt_url');
+        $bt_type = input('post.bt_type/d');
-        $bt_key = input('post.bt_key');
+        
-        if(!$bt_url || !$bt_key)return json(['code'=>-1, 'msg'=>'参数不能为空']);
+        if($bt_type == 1){
-        $btapi = new Btapi($bt_url, $bt_key);
+            $bt_surl = input('post.bt_surl');
-        $result = $btapi->get_config();
+            if(!$bt_surl)return json(['code'=>-1, 'msg'=>'参数不能为空']);
-        if($result && isset($result['status']) && ($result['status']==1 || isset($result['sites_path']))){
+            $res = get_curl($bt_surl . 'api/SetupCount');
-            $result = $btapi->get_user_info();
+            if(strpos($res, 'ok')!==false){
-            if($result && isset($result['username'])){
+                return json(['code'=>0, 'msg'=>'第三方云端连接测试成功！']);
-                return json(['code'=>0, 'msg'=>'面板连接测试成功！']);
             }else{
-                return json(['code'=>-1, 'msg'=>'面板连接测试成功，但未安装专用插件']);
+                return json(['code'=>-1, 'msg'=>'第三方云端连接测试失败']);
             }
         }else{
-            return json(['code'=>-1, 'msg'=>isset($result['msg'])?$result['msg']:'面板地址无法连接']);
+            $bt_url = input('post.bt_url');
+            $bt_key = input('post.bt_key');
+            $os = input('post.os');
+            if(!$bt_url || !$bt_key)return json(['code'=>-1, 'msg'=>'参数不能为空']);
+            $btapi = new Btapi($bt_url, $bt_key);
+            if ($os == 'win') {
+                $result = $btapi->get_config_go();
+                if($result && isset($result['config'])){
+                    $result = $btapi->get_user_info();
+                    if($result && isset($result['username'])){
+                        return json(['code'=>0, 'msg'=>'面板连接测试成功！']);
+                    }else{
+                        return json(['code'=>-1, 'msg'=>'面板连接测试成功，但未安装专用插件/未登录账号']);
+                    }
+                }else{
+                    return json(['code'=>-1, 'msg'=>isset($result['msg'])?$result['msg']:'面板地址无法连接']);
+                }
+            } else {
+                $result = $btapi->get_config();
+                if($result && isset($result['status']) && ($result['status']==1 || isset($result['sites_path']))){
+                    $result = $btapi->get_user_info();
+                    if($result && isset($result['username'])){
+                        return json(['code'=>0, 'msg'=>'面板连接测试成功！']);
+                    }else{
+                        return json(['code'=>-1, 'msg'=>'面板连接测试成功，但未安装专用插件/未登录账号']);
+                    }
+                }else{
+                    return json(['code'=>-1, 'msg'=>isset($result['msg'])?$result['msg']:'面板地址无法连接']);
+                }
+            }
         }
     }
 
@@ -151,10 +180,12 @@ class Admin extends BaseController
         $json_arr = Plugins::get_plugin_list();
         if($json_arr){
             foreach($json_arr['type'] as $type){
+                if($type['title'] == '一键部署') continue;
                 $typelist[$type['id']] = $type['title'];
             }
         }
         View::assign('typelist', $typelist);
+        View::assign('skip_plugins', \app\lib\BtPlugins::$skip_plugins);
         return view();
     }
 
@@ -163,6 +194,20 @@ class Admin extends BaseController
         $json_arr = Plugins::get_plugin_list('Windows');
         if($json_arr){
             foreach($json_arr['type'] as $type){
+                if($type['title'] == '一键部署') continue;
+                $typelist[$type['id']] = $type['title'];
+            }
+        }
+        View::assign('typelist', $typelist);
+        return view();
+    }
+
+    public function pluginsen(){
+        $typelist = [];
+        $json_arr = Plugins::get_plugin_list('en');
+        if($json_arr){
+            foreach($json_arr['type'] as $type){
+                if($type['title'] == '一键部署') continue;
                 $typelist[$type['id']] = $type['title'];
             }
         }
@@ -211,7 +256,7 @@ class Admin extends BaseController
                 'name' => $plugin['name'],
                 'title' => $plugin['title'],
                 'type' => $plugin['type'],
-                'typename' => $typelist[$plugin['type']],
+                'typename' => isset($typelist[$plugin['type']]) ? $typelist[$plugin['type']] : '未知',
                 'desc' => str_replace('target="_blank"','target="_blank" rel="noopener noreferrer"',$plugin['ps']),
                 'price' => $plugin['price'],
                 'author' => isset($plugin['author']) ? $plugin['author'] : '官方',
@@ -385,4 +430,37 @@ class Admin extends BaseController
         Cache::clear();
         return json(['code'=>0,'msg'=>'succ']);
     }
+
+    public function ssl(){
+        if(request()->isAjax()){
+            $domain_list = input('post.domain_list', null, 'trim');
+            $common_name = input('post.common_name', null, 'trim');
+            $validity = input('post.validity/d');
+            if(empty($domain_list) || empty($validity)){
+                return json(['code'=>-1, 'msg'=>'参数不能为空']);
+            }
+            $array = explode("\n", $domain_list);
+            $domain_list = [];
+            foreach($array as $domain){
+                $domain = trim($domain);
+                if(empty($domain)) continue;
+                if(!checkDomain($domain)) return json(['code'=>-1, 'msg'=>'域名或IP格式不正确:'.$domain]);
+                $domain_list[] = $domain;
+            }
+            if(empty($domain_list)) return json(['code'=>-1, 'msg'=>'域名列表不能为空']);
+            if(empty($common_name)) $common_name = $domain_list[0];
+            $result = makeSelfSignSSL($common_name, $domain_list, $validity);
+            if(!$result){
+                return json(['code'=>-1, 'msg'=>'生成证书失败']);
+            }
+            return json(['code'=>0, 'msg'=>'生成证书成功', 'cert'=>$result['cert'], 'key'=>$result['key']]);
+        }
+
+        $dir = app()->getBasePath().'script/';
+        $ssl_path = app()->getRootPath().'public/ssl/baota_root.pfx';
+        $ssl_path_mac = app()->getRootPath().'public/ssl/baota_root.crt';
+        $isca = file_exists($dir.'ca.crt') && file_exists($dir.'ca.key') && file_exists($ssl_path) && file_exists($ssl_path_mac);
+        View::assign('isca', $isca);
+        return view();
+    }
 }

app/controller/Api.php

@@ -2,6 +2,7 @@
 namespace app\controller;
 
 use think\facade\Db;
+use think\facade\Cache;
 use app\BaseController;
 use app\lib\Plugins;
 
@@ -10,7 +11,7 @@ class Api extends BaseController
 
     //获取插件列表
     public function get_plugin_list(){
-        if(!$this->checklist()) return '';
+        if(!$this->checklist()) return json('你的服务器被禁止使用此云端');
         $record = Db::name('record')->where('ip',$this->clientip)->find();
         if($record){
             Db::name('record')->where('id',$record['id'])->update(['usetime'=>date("Y-m-d H:i:s")]);
@@ -18,49 +19,83 @@ class Api extends BaseController
             Db::name('record')->insert(['ip'=>$this->clientip, 'addtime'=>date("Y-m-d H:i:s"), 'usetime'=>date("Y-m-d H:i:s")]);
         }
         $json_arr = Plugins::get_plugin_list();
-        if(!$json_arr) return json((object)[]);
+        if(!$json_arr) $json_arr = (object)[];
         return json($json_arr);
     }
 
     //获取插件列表(win)
     public function get_plugin_list_win(){
-        if(!$this->checklist()) return '';
+        if(!$this->checklist()) return json('你的服务器被禁止使用此云端');
+        $os_version = input('post.os_version');
+        $serverid = input('post.serverid');
+        $uid = input('post.uid');
         $record = Db::name('record')->where('ip',$this->clientip)->find();
         if($record){
             Db::name('record')->where('id',$record['id'])->update(['usetime'=>date("Y-m-d H:i:s")]);
         }else{
             Db::name('record')->insert(['ip'=>$this->clientip, 'addtime'=>date("Y-m-d H:i:s"), 'usetime'=>date("Y-m-d H:i:s")]);
         }
-        $json_file = get_data_dir('Windows').'config/plugin_list.json';
+        $json_arr = Plugins::get_plugin_list('Windows');
-        if(file_exists($json_file)){
+        if(!$json_arr) $json_arr = (object)[];
-            $data = file_get_contents($json_file);
+        if($os_version == 'windows_go'){
-            $json_arr = json_decode($data, true);
+            return Plugins::encrypt_plugin_list($json_arr, $serverid, $uid);
-            if($json_arr){
-                return json($json_arr);
-            }
         }
-        return json((object)[]);
+        return json($json_arr);
+    }
+
+    //获取插件列表(aapanel)
+    public function get_plugin_list_en(){
+        if(!$this->checklist()) return json('你的服务器被禁止使用此云端');
+        $record = Db::name('record')->where('ip',$this->clientip)->find();
+        if($record){
+            Db::name('record')->where('id',$record['id'])->update(['usetime'=>date("Y-m-d H:i:s")]);
+        }else{
+            Db::name('record')->insert(['ip'=>$this->clientip, 'addtime'=>date("Y-m-d H:i:s"), 'usetime'=>date("Y-m-d H:i:s")]);
+        }
+        $json_arr = Plugins::get_plugin_list('en');
+        if(!$json_arr) $json_arr = (object)[];
+        return json($json_arr);
     }
 
     //下载插件包
     public function download_plugin(){
-        $plugin_name = input('post.name');
+        $plugin_name = input('param.name');
-        $version = input('post.version');
+        $version = input('param.version');
-        $os = input('post.os');
+        $os = input('param.os');
         if(!$plugin_name || !$version){
-            return '参数不能为空';
+            return json(['status'=>false, 'msg'=>'参数不能为空']);
         }
         if(!in_array($os,['Windows','Linux'])) $os = 'Linux';
         if(!preg_match('/^[a-zA-Z0-9_]+$/', $plugin_name) || !preg_match('/^[0-9.]+$/', $version)){
-            return '参数不正确';
+            return json(['status'=>false, 'msg'=>'参数不正确']);
         }
-        if(!$this->checklist()) '你的服务器被禁止使用此云端';
+        if(!$this->checklist()) return json(['status'=>false, 'msg'=>'你的服务器被禁止使用此云端']);
         $filepath = get_data_dir($os).'plugins/package/'.$plugin_name.'-'.$version.'.zip';
         if(file_exists($filepath)){
             $filename = $plugin_name.'.zip';
             $this->output_file($filepath, $filename);
         }else{
-            return '云端不存在该插件包';
+            return json(['status'=>false, 'msg'=>'云端不存在该插件包']);
+        }
+    }
+
+    //下载插件包aapanel
+    public function download_plugin_en(){
+        $plugin_name = input('param.name');
+        $version = input('param.version');
+        if(!$plugin_name || !$version){
+            return json(['status'=>false, 'msg'=>'参数不能为空']);
+        }
+        if(!preg_match('/^[a-zA-Z0-9_]+$/', $plugin_name) || !preg_match('/^[0-9.]+$/', $version)){
+            return json(['status'=>false, 'msg'=>'参数不正确']);
+        }
+        if(!$this->checklist()) return json(['status'=>false, 'msg'=>'你的服务器被禁止使用此云端']);
+        $filepath = get_data_dir('en').'plugins/package/'.$plugin_name.'-'.$version.'.zip';
+        if(file_exists($filepath)){
+            $filename = $plugin_name.'.zip';
+            $this->output_file($filepath, $filename);
+        }else{
+            return json(['status'=>false, 'msg'=>'云端不存在该插件包']);
         }
     }
 
@@ -70,25 +105,27 @@ class Api extends BaseController
         $version = input('post.version');
         $os = input('post.os');
         if(!$plugin_name || !$version){
-            return '参数不能为空';
+            return json(['status'=>false, 'msg'=>'参数不能为空']);
         }
         if(!in_array($os,['Windows','Linux'])) $os = 'Linux';
         if(!preg_match('/^[a-zA-Z0-9_]+$/', $plugin_name) || !preg_match('/^[0-9.]+$/', $version)){
-            return '参数不正确';
+            return json(['status'=>false, 'msg'=>'参数不正确']);
         }
-        if(!$this->checklist()) '你的服务器被禁止使用此云端';
+        if(!$this->checklist()) return json(['status'=>false, 'msg'=>'你的服务器被禁止使用此云端']);
-        $filepath = get_data_dir($os).'plugins/main/'.$plugin_name.'-'.$version.'.dat';
+        $filepath = get_data_dir($os).'plugins/package/'.$plugin_name.'-'.$version.'.zip';
-        if(file_exists($filepath)){
+        $mainfilepath = get_data_dir($os).'plugins/folder/'.$plugin_name.'-'.$version.'/'.$plugin_name.'/'.$plugin_name.'_main.py';
+        if(file_exists($mainfilepath)){
             $filename = $plugin_name.'_main.py';
-            $this->output_file($filepath, $filename);
+            $this->output_file($mainfilepath, $filename);
-        }else{
+        }elseif(file_exists($filepath)){
-            $filepath = get_data_dir($os).'plugins/folder/'.$plugin_name.'-'.$version.'/'.$plugin_name.'/'.$plugin_name.'_main.py';
+            $zip = new \ZipArchive;
-            if(file_exists($filepath)){
+            if ($zip->open($filepath) === true){
-                $filename = $plugin_name.'_main.py';
+                echo $zip->getFromName($plugin_name.'/'.$plugin_name.'_main.py');
-                $this->output_file($filepath, $filename);
             }else{
-                return '云端不存在该插件主文件';
+                return json(['status'=>false, 'msg'=>'插件包解压缩失败']);
             }
+        }else{
+            return json(['status'=>false, 'msg'=>'云端不存在该插件主文件']);
         }
     }
 
@@ -96,7 +133,10 @@ class Api extends BaseController
     public function download_plugin_other(){
         $fname = input('get.fname');
         if(!$fname){
-            return json(['status'=>false, 'msg'=>'参数不能为空']);
+            $fname = input('get.filename');
+            if(!$fname){
+                return json(['status'=>false, 'msg'=>'参数不能为空']);
+            }
         }
         if(strpos(dirname($fname),'.')!==false)return json(['status'=>false, 'msg'=>'参数不正确']);
         if(!$this->checklist()) return json(['status'=>false, 'msg'=>'你的服务器被禁止使用此云端']);
@@ -109,6 +149,36 @@ class Api extends BaseController
         }
     }
 
+    public function get_plugin_auth(){
+        $productids = ["8","9","10","11","12","13","14","15","16","17","18","19","20","22","23","24","25","26","28","32","33","42","44","45","47","55","65","69","75","82","83","85","90","91","97","99","101","107","108","110","118","121","127","128","132","135","136","140","143","144","151","154","156","161","163","167","173","179","183","185","190","192","195","197","200","201","202","203","204","205","206","207","208","212","213","214","215","216","217","218","219","220","221","222","223","224","225","226","227","228","229","230","231","232","233","234","235","236","237","238","239","241","243","244","245","246","247","248","249","250","251","252","253","254","255","256","257","258","259","261","262","263","264","265","266","267","268","269","270","271","272","273","274","275","276","277","278","279","280","281","282","283","284","285","286","287","289","292","293","295","296","297","298","299","300","301","302","303","304","305","306","307","308","309","310","311","312","313","314","315","316","317","318","319","320","321","322","323","324","325","326","327","328","329","330","331","332","334","335","336","337","338","339","340","341","342","343","344","345","346","347","348","349","350","351","352","353","354","355","356","357","358","359","360","361","362","363","364","365","366","368","369","371","372","373","374","375","376","377","378","379","380","381","382","383","384","385","386","387","388","389","390","391","392","393","394","397","398","400","401","406","408","409","411","413","415","419","423","425","427","429","430","1111111","100000001","100000005","100000007","100000008","100000009","100000010","100000012","100000014","100000015","100000016","100000017","100000035","100000036","100000039","100000040","100000041","100000042","100000045","100000053","100000054","100000056","100000057","100000058","100000059","100000062","100000063","100000067","100000069","100000070","100000076","100000077","100000078","100000079","100000080","100000084","100000085","100000088","100000089","100000090","100000091","100000092","100000093","100000094","100000095","100000096","100000097","100000098"];
+        $os_version = input('post.os_version');
+        $address = input('post.address','');
+        $uid = input('post.uid','');
+        $username = input('post.username','');
+        $serverid = input('post.serverid','');
+        $mac = input('post.mac','');
+        $data = ['ip'=>$address, 'uid'=>$uid, 'username'=>$username, 'serverid'=>$serverid, 'lasttime'=>time(), 'pro'=>-1, 'skey'=>'', 'ltd'=>strtotime('+10 year'), 'list'=>[]];
+        foreach($productids as $pid){
+            $data['list'][$pid] = strtotime('+10 year');
+        }
+        return Plugins::encrypt_plugin_list($data, $serverid, $uid);
+    }
+
+    public function get_plugin_auth_win(){
+        $productids = ["49","50","51","52","53","54","56","57","58","59","60","61","67","68","72","76","80","84","88","89","92","93","119","120","133","134","137","138","139","142","145","146","150","168","169","170","172","176","184","396","404","414","420","422","424","426","428","100000001","100000018","100000019","100000024","100000026","100000027","100000028","100000031","100000039","100000043","100000047","100000048","100000049","100000051","100000052","100000060","100000061","100000064","100000067","100000075"];
+        $os_version = input('post.os_version');
+        $address = input('post.address','');
+        $uid = input('post.uid','');
+        $username = input('post.username','');
+        $serverid = input('post.serverid','');
+        $mac = input('post.mac','');
+        $data = ['ip'=>$address, 'uid'=>$uid, 'username'=>$username, 'serverid'=>$serverid, 'lasttime'=>time(), 'pro'=>-1, 'skey'=>'', 'ltd'=>strtotime('+10 year'), 'list'=>[]];
+        foreach($productids as $pid){
+            $data['list'][$pid] = strtotime('+10 year');
+        }
+        return Plugins::encrypt_plugin_list($data, $serverid, $uid);
+    }
+
     public function get_update_logs(){
         $type = input('get.type');
         if($type == 'Windows'){
@@ -143,6 +213,39 @@ class Api extends BaseController
         return $version;
     }
 
+    public function get_version_en(){
+        $version = config_get('new_version_en');
+        return $version;
+    }
+
+    public function get_panel_version(){
+        $version = config_get('new_version');
+        $file = app()->getRootPath().'public/install/update/LinuxPanel-'.$version.'.zip';
+        $hash = hash_file('sha256', $file);
+        $data = [
+            'version' => $version,
+            'hash' => $hash,
+            'update_time' => filemtime($file),
+        ];
+        return json($data);
+    }
+
+    public function get_panel_version_v2(){
+        $version = config_get('new_version');
+        $down_url = request()->root(true).'/install/update/LinuxPanel-'.$version.'.zip';
+        $data = [
+            'OfficialVersion' => [
+                'version' => $version,
+                'downUrl' => $down_url,
+                'updateMsg' => config_get('update_msg'),
+                'uptime' => config_get('update_date'),
+            ],
+            'OfficialVersionLatest' => [],
+            'AccountVersion' => [],
+        ];
+        return json($data);
+    }
+
     //安装统计
     public function setup_count(){
         return 'ok';
@@ -197,6 +300,28 @@ class Api extends BaseController
         return json($data);
     }
 
+    //检测更新(aapanel)
+    public function check_update_en(){
+        $version = config_get('new_version_en');
+        $down_url = request()->root(true).'/install/update/LinuxPanel_EN-'.$version.'.zip';
+        $data = [
+            'force' => false,
+            'version' => $version,
+            'downUrl' => $down_url,
+            'updateMsg' => config_get('update_msg_en'),
+            'uptime' => config_get('update_date_en'),
+            'is_beta' => 0,
+            'btb' => '',
+            'beta' => [
+                'version' => $version,
+                'downUrl' => $down_url,
+                'updateMsg' => config_get('update_msg_en'),
+                'uptime' => config_get('update_date_en'),
+            ]
+        ];
+        return json($data);
+    }
+
     //宝塔云监控获取最新版本
     public function btm_latest_version(){
         $data = [
@@ -219,6 +344,69 @@ class Api extends BaseController
         return json($data);
     }
 
+    //宝塔云WAF最新版本
+    public function btwaf_latest_version(){
+        $type = input('?post.type') ? input('post.type') : 0;
+        if($type == 1){
+            $data = [
+                'version' => '1.1',
+                'description' => '暂无更新日志',
+                'create_time' => 1705315163,
+            ];
+        }else{
+            $data = [
+                'version' => '3.0',
+                'description' => '暂无更新日志',
+                'create_time' => 1705315163,
+            ];
+        }
+        $data = bin2hex(json_encode($data));
+        return json(['status'=>true,'err_no'=>0,'msg'=>'获取成功','data'=>$data]);
+    }
+
+    //宝塔云控版本信息
+    public function cloudc_version_info(){
+        return json(['status'=>true,'msg'=>'获取成功','data'=>[
+            'version' => '1.0.5',
+            'download' => '',
+            'uptime' => '2025/06/16',
+            'upmsg' => '暂无更新日志'
+        ]]);
+    }
+
+    //宝塔云控版本信息
+    public function cloudc_get_version(){
+        return json(['status'=>true,'msg'=>'','oid'=>'','data'=>[
+            'officialVersion' => [
+                'version' => '1.0.5',
+                'download' => '',
+                'uptime' => '2025/06/16',
+                'updateMsg' => '暂无更新日志'
+            ],
+        ]]);
+    }
+
+    //宝塔云控授权信息
+    public function cloudc_order_status(){
+        $data = [
+            'status' => true,
+            'msg' => '获取成功',
+            'oid' => '',
+            'data' => [
+                'id' => 1,
+                'address' => real_ip(),
+                'buytime' => time(),
+                'endtime' => time() + 86400 * 3650,
+                'num' => 9999,
+                'max_num' => 9999,
+                'pid' => 100000023,
+                'renew_price' => 0,
+                'state' => 1,
+            ]
+        ];
+        return json($data);
+    }
+
     //获取内测版更新日志
     public function get_beta_logs(){
         return json(['beta_ps'=>'当前暂无内测版', 'list'=>[]]);
@@ -281,35 +469,67 @@ class Api extends BaseController
 
     //绑定账号
     public function get_auth_token(){
-        if(!$_POST['data']) return json(['status'=>false, 'msg'=>'参数不能为空']);
+        if(!input('?post.data')) return json(['status'=>false, 'msg'=>'参数不能为空']);
-        $reqData = hex2bin($_POST['data']);
+        $reqData = hex2bin(input('post.data'));
         parse_str($reqData, $arr);
         $serverid = $arr['serverid'];
-        $userinfo = ['uid'=>1, 'username'=>'Administrator', 'address'=>'127.0.0.1', 'serverid'=>$serverid, 'access_key'=>random(32), 'secret_key'=>random(48), 'ukey'=>md5(time()), 'state'=>1];
+        $userinfo = ['uid'=>1, 'username'=>'Administrator', 'address'=>'127.0.0.1', 'serverid'=>$serverid, 'access_key'=>random(48), 'secret_key'=>random(48), 'ukey'=>md5(time()), 'state'=>1];
-        $data = bin2hex(urlencode(json_encode($userinfo)));
+        $data = bin2hex(json_encode($userinfo));
         return json(['status'=>true, 'msg'=>'登录成功！', 'data'=>$data]);
     }
 
     //绑定账号新
     public function authorization_login(){
-        if(!$_POST['data']) return json(['status'=>false, 'msg'=>'参数不能为空']);
+        if(!input('?post.data')) return json(['status'=>false, 'msg'=>'参数不能为空']);
-        $reqData = hex2bin($_POST['data']);
+        $reqData = hex2bin(input('post.data'));
         parse_str($reqData, $arr);
         $serverid = $arr['serverid'];
-        $userinfo = ['uid'=>1, 'username'=>'Administrator', 'ip'=>'127.0.0.1', 'server_id'=>$serverid, 'access_key'=>random(32), 'secret_key'=>random(48)];
+        $userinfo = ['uid'=>1, 'username'=>'Administrator', 'ip'=>'127.0.0.1', 'server_id'=>$serverid, 'access_key'=>random(48), 'secret_key'=>random(48)];
-        $data = bin2hex(urlencode(json_encode($userinfo)));
+        $data = bin2hex(json_encode($userinfo));
-        return json(['status'=>true, 'msg'=>'登录成功！', 'data'=>$data]);
+        return json(['status'=>true, 'err_no'=>0, 'msg'=>'账号绑定成功', 'data'=>$data]);
     }
 
     //刷新授权信息
     public function authorization_info(){
-        if(!$_POST['data']) return json(['status'=>false, 'msg'=>'参数不能为空']);
+        if(!input('?post.data')) return json(['status'=>false, 'msg'=>'参数不能为空']);
-        $reqData = hex2bin($_POST['data']);
+        $reqData = hex2bin(input('post.data'));
         parse_str($reqData, $arr);
         $id = isset($arr['id'])&&$arr['id']>0?$arr['id']:1;
         $userinfo = ['id'=>$id, 'product'=>$arr['product'], 'status'=>2, 'clients'=>9999, 'durations'=>0, 'end_time'=>strtotime('+10 year')];
-        $data = bin2hex(urlencode(json_encode($userinfo)));
+        $data = bin2hex(json_encode($userinfo));
-        return json(['status'=>true, 'data'=>$data]);
+        return json(['status'=>true, 'err_no'=>0, 'data'=>$data]);
+    }
+
+    //刷新授权信息
+    public function update_license(){
+        if(!input('?post.data')) return json(['status'=>false, 'msg'=>'参数不能为空']);
+        $reqData = hex2bin(input('post.data'));
+        parse_str($reqData, $arr);
+        if(!isset($arr['product']) || !isset($arr['serverid'])) return json(['status'=>false, 'msg'=>'缺少参数']);
+
+        $license_data = ['product'=>$arr['product'], 'uid'=>random(32), 'phone'=>'138****8888', 'auth_id'=>random(32), 'server_id'=>substr($arr['serverid'], 0, 32), 'auth'=>['apis'=>[], 'menu'=>[], 'extra'=>['type'=>3,'location'=>-1,'smart_cc'=>-1,'site'=>0]], 'pages'=>[], 'end_time'=>strtotime('+10 year')];
+        $json = json_encode($license_data);
+
+        [$public_key, $private_key] = generateKeyPairs();
+        $public_key = pemToBase64($public_key);
+
+        $key1 = random(32);
+        $key2 = substr($public_key, 0, 32);
+        $encrypted1 = licenseEncrypt($json, $key1);
+        $encrypted2 = licenseEncrypt($key1, $key2);
+        $sign_data = $encrypted1.'.'.$encrypted2;
+        openssl_sign($sign_data, $signature, $private_key, OPENSSL_ALGO_SHA256);
+        $signature = base64_encode($signature);
+
+        $license = base64_encode($sign_data.'.'.$signature);
+        $data = bin2hex(json_encode(['public_key'=>$public_key, 'license'=>$license]));
+        return json(['status'=>true, 'err_no'=>0, 'msg'=>'授权获取成功', 'data'=>$data]);
+    }
+
+    public function is_obtained_btw_trial(){
+        $data = ['is_obtained'=>0];
+        $data = bin2hex(json_encode($data));
+        return json(['status'=>true, 'err_no'=>0, 'data'=>$data, 'msg'=>'检测成功']);
     }
 
     //一键部署列表
@@ -326,6 +546,51 @@ class Api extends BaseController
         return json(['status'=>true, 'msg'=>'', 'data'=>$data]);
     }
     
+    //获取堡塔云WAF恶意IP库
+    public function get_malicious_ip_list()
+    {
+        $cacheKey = 'malicious_ip_list';
+    
+        // 尝试从缓存获取
+        if (Cache::has($cacheKey)) {
+            return json(json_decode(Cache::get($cacheKey), true));
+        }
+        $url = 'https://api.bt.cn/bt_waf/get_malicious_ip';
+        $postData = json_encode([
+            'x_bt_token' => 'MzI3YjAzOGQ3Yjk3NjUxYjVlMDkyMGFm'
+        ]);
+
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_POST, 1);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $postData);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, [
+            'Content-Type: application/json',
+            'Content-Length: ' . strlen($postData)
+        ]);
+
+        $response = curl_exec($ch);
+        if (curl_errno($ch)) {
+            return json(['status'=>true, 'msg'=>'', 'data'=>bin2hex('[]')]);
+        }
+        curl_close($ch);
+        Cache::set($cacheKey, $response, 86400); //缓存一天
+
+        return json(json_decode($response, true));
+    }
+
+    public function get_ip_info(){
+        $ip = input('post.ip');
+        $data = [];
+        $url = 'https://www.bt.cn/api/ip/info_json';
+        $post = http_build_query(['ip'=>$ip]);
+        $response = get_curl($url, $post);
+        $arr = json_decode($response, true);
+        if($arr) $data = $arr;
+        return json($data);
+    }
+
     public function return_success(){
         return json(['status'=>true, 'msg'=>1, 'data'=>(object)[]]);
     }
@@ -334,6 +599,10 @@ class Api extends BaseController
         return json(['status'=>false, 'msg'=>'不支持当前操作']);
     }
 
+    public function return_error2(){
+        return json(['success'=>false, 'res'=>'不支持当前操作']);
+    }
+    
     public function return_empty(){
         return '';
     }
@@ -346,6 +615,73 @@ class Api extends BaseController
         return json(['page'=>"<div><span class='Pcurrent'>1</span><span class='Pnumber'>1/0</span><span class='Pline'>从1-1000条</span><span class='Pcount'>共计0条数据</span></div>", 'data'=>[]]);
     }
 
+    public function nps_check(){
+        return json(['err_no'=>0, 'success'=>true, 'res'=>true, 'nonce'=>time()]);
+    }
+
+    public function nps_questions(){
+        return json(['err_no'=>0, 'success'=>true, 'res'=>[], 'nonce'=>time()]);
+    }
+
+    public function nps_submit(){
+        return json(['err_no'=>0, 'success'=>true, 'res'=>'Success', 'nonce'=>time()]);
+    }
+
+    public function get_user_give_away(){
+        return json(['no_exceed_limit'=>false, 'user_give'=>true]);
+    }
+
+    //获取所有蜘蛛IP列表
+    public function btwaf_getspiders(){
+        try{
+            $result = Plugins::btwaf_getspiders();
+            return json($result);
+        }catch(\Exception $e){
+            return json(['status'=>false, 'msg'=>$e->getMessage()]);
+        }
+    }
+
+    //分类获取蜘蛛IP列表
+    public function get_spider(){
+        $type = input('get.spider/d');
+        if(!$type) return json([]);
+        $result = Plugins::get_spider($type);
+        return json($result);
+    }
+    
+    //获取堡塔恶意情报IP库
+    public function btwaf_getmalicious(){
+        try{
+            $result = Plugins::btwaf_getmalicious();
+            return json($result);
+        }catch(\Exception $e){
+            return json(['success'=>false, 'res'=>$e->getMessage()]);
+        }
+    }
+
+    //检查是否国内IP
+    public function check_cnip(){
+        $clientip = bindec(decbin(ip2long($this->clientip)));
+        $json_file = app()->getBasePath().'lib/cn.json';
+        $arr = json_decode(file_get_contents($json_file), true);
+        if(!$arr) return 'False';
+        foreach($arr as $ip_arr){
+            if($clientip >= $ip_arr[0] && $clientip <= $ip_arr[1]){
+                return 'True';
+            }
+        }
+        return 'False';
+    }
+
+    //邮件配额
+    public function email_user_surplus(){
+        $data = [
+            'free' => ['surplus' => '120000', 'total' => '120000', 'used' => '0'],
+            'period' => ['surplus' => '2000000', 'total' => '2000000', 'used' => '0'],
+        ];
+        return json(['success'=>true, 'msg'=>'获取成功', 'res'=>$data]);
+    }
+
     //检查黑白名单
     private function checklist(){
         if(config_get('whitelist') == 1){
@@ -384,4 +720,48 @@ class Api extends BaseController
         fclose($handle);
         exit;
     }
+
+    public function logerror(){
+        $content = date('Y-m-d H:i:s')."\r\n";
+        $content.=$_SERVER['REQUEST_METHOD'].' '.$_SERVER['REQUEST_URI']."\r\n";
+        if($_SERVER['REQUEST_METHOD'] == 'POST'){
+            $content.=file_get_contents('php://input')."\r\n";
+        }
+        $handle = fopen(app()->getRootPath()."record.txt", 'a');
+        fwrite($handle, $content."\r\n");
+        fclose($handle);
+        return json(['status'=>false, 'msg'=>'不支持当前操作']);
+    }
+
+    //生成自签名SSL证书
+    public function bt_cert(){
+        $data = input('post.data');
+        $param = json_decode($data, true);
+        if(!$param || !isset($param['action']) || !isset($param['domain'])) return json(['status'=>false, 'msg'=>'参数错误']);
+
+        $dir = app()->getBasePath().'script/';
+        $ssl_path = app()->getRootPath().'public/ssl/baota_root.pfx';
+        $isca = file_exists($dir.'ca.crt') && file_exists($dir.'ca.key') && file_exists($ssl_path);
+        if(!$isca) return json(['status'=>false, 'msg'=>'CA证书不存在']);
+
+        if($param['action'] == 'get_domain_cert'){
+            if(!$this->checklist()) return json(['status'=>false, 'msg'=>'你的服务器被禁止使用此云端']);
+            $domain = $param['domain'];
+            if(empty($domain)) return json(['status'=>false, 'msg'=>'域名不能为空']);
+            $domain_list = explode(',', $domain);
+            foreach($domain_list as $d){
+                if(!checkDomain($d)) return json(['status'=>false, 'msg'=>'域名或IP格式不正确:'.$d]);
+            }
+            $common_name = $domain_list[0];
+            $validity = 3650;
+            $result = makeSelfSignSSL($common_name, $domain_list, $validity);
+            if(!$result){
+                return json(['status'=>false, 'msg'=>'生成证书失败']);
+            }
+            $ca_pfx = base64_encode(file_get_contents($ssl_path));
+            return json(['status'=>true, 'msg'=>'生成证书成功', 'cert'=>$result['cert'], 'key'=>$result['key'], 'pfx'=>$ca_pfx, 'password'=>'']);
+        }else{
+            return json(['status'=>false, 'msg'=>'不支持当前操作']);
+        }
+    }
 }

app/controller/Index.php

@@ -8,13 +8,13 @@ class Index extends BaseController
 {
     public function index()
     {
-        return 'Server is ok';
+        return '';
     }
 
     public function download()
     {
         if(config_get('download_page') == '0' && !request()->islogin){
-            return redirect('/admin/login');
+            return 'need login';
         }
         View::assign('siteurl', request()->root(true));
         return view();

app/lib/BtPlugins.php

@@ -0,0 +1,308 @@
+<?php
+
+namespace app\lib;
+
+use Exception;
+use ZipArchive;
+
+class BtPlugins
+{
+    private $btapi;
+    private $os;
+
+    //需屏蔽的插件名称列表
+    public static $block_plugins = ['dns', 'bt_boce', 'ssl_verify', 'firewall', 'KylinOperatingSystem', 'KingdeeApusicDistributedCache', 'BorlandCacheServer', 'GBase8s', 'KingdeeApusicLoadBalancer', 'BorlandWebServer'];
+    public static $skip_plugins = ['php_filter', 'enterprise_backup', 'tamper_drive'];
+
+    public function __construct($os){
+        $this->os = $os;
+        if($os == 'en'){
+            $bt_url = config_get('enbt_url');
+            $bt_key = config_get('enbt_key');
+        }elseif($os == 'Windows'){
+            $bt_url = config_get('wbt_url');
+            $bt_key = config_get('wbt_key');
+        }else{
+            $bt_url = config_get('bt_url');
+            $bt_key = config_get('bt_key');
+        }
+        if(!$bt_url || !$bt_key) throw new Exception('请先配置好宝塔面板接口信息');
+        $this->btapi = new Btapi($bt_url, $bt_key);
+    }
+
+    //获取插件列表
+    public function get_plugin_list(){
+        $result = $this->btapi->get_plugin_list();
+        if($result && isset($result['list']) && isset($result['type'])){
+            if(empty($result['list']) || empty($result['type'])){
+                throw new Exception('获取插件列表失败：插件列表为空');
+            }
+            $newlist = [];
+            foreach($result['list'] as $item){
+                if(!in_array($item['name'], self::$block_plugins)) $newlist[] = $item;
+            }
+            $result['list'] = $newlist;
+            return $result;
+        }else{
+            throw new Exception('获取插件列表失败：'.(isset($result['msg'])?$result['msg']:'面板连接失败'));
+        }
+    }
+
+    //下载插件（自动判断是否第三方）
+    public function download_plugin($plugin_name, $version, $plugin_info){
+        if($plugin_info['type'] == 10 && isset($plugin_info['versions'][0]['download'])){
+            if($plugin_info['price'] == 0){
+                $this->btapi->create_plugin_other_order($plugin_info['id']);
+            }
+            $fname = $plugin_info['versions'][0]['download'];
+            $filemd5 = $plugin_info['versions'][0]['md5'];
+            $this->download_plugin_other($fname, $filemd5);
+            if(isset($plugin_info['min_image']) && strpos($plugin_info['min_image'], 'fname=')){
+                $fname = substr($plugin_info['min_image'], strpos($plugin_info['min_image'], '?fname=')+7);
+                $this->download_plugin_other($fname);
+            }
+        }else{
+            $this->download_plugin_package($plugin_name, $version);
+        }
+    }
+
+    //下载插件包
+    private function download_plugin_package($plugin_name, $version){
+        $filepath = get_data_dir($this->os).'plugins/package/'.$plugin_name.'-'.$version.'.zip';
+        $result = $this->btapi->get_plugin_filename($plugin_name, $version);
+        if($result && isset($result['status'])){
+            if($result['status'] == true){
+                $filename = $result['filename'];
+                $this->download_file($filename, $filepath);
+                if(file_exists($filepath)){
+                    $zip = new ZipArchive;
+                    if ($zip->open($filepath) === true)
+                    {
+                        $plugins_dir = get_data_dir($this->os).'plugins/folder/'.$plugin_name.'-'.$version;
+                        $zip->extractTo($plugins_dir, $plugin_name.'/'.$plugin_name.'_main.py');
+                        $zip->close();
+                        $main_filepath = $plugins_dir.'/'.$plugin_name.'/'.$plugin_name.'_main.py';
+                        if(file_exists($main_filepath) && filesize($main_filepath)>10){
+                            if(!strpos(file_get_contents($main_filepath), 'import ')){ //加密py文件，需要解密
+                                $this->decode_plugin_main($plugin_name, $version, $main_filepath);
+                                $this->noauth_plugin_main($main_filepath);
+                                $zip->open($filepath, ZipArchive::CREATE);
+                                $zip->addFile($main_filepath, $plugin_name.'/'.$plugin_name.'_main.py');
+                                $zip->close();
+                            }
+                        }
+                        deleteDir($plugins_dir);
+                    }else{
+                        unlink($filepath);
+                        throw new Exception('插件包解压缩失败');
+                    }
+                    return true;
+                }else{
+                    throw new Exception('下载插件包失败，本地文件不存在');
+                }
+            }else{
+                throw new Exception('下载插件包失败：'.($result['msg']?$result['msg']:'未知错误'));
+            }
+        }else{
+            throw new Exception('下载插件包失败，接口返回错误');
+        }
+    }
+
+    //下载插件主程序文件
+    public function download_plugin_main($plugin_name, $version){
+        $filepath = get_data_dir($this->os).'plugins/main/'.$plugin_name.'-'.$version.'.dat';
+        $result = $this->btapi->get_plugin_main_filename($plugin_name, $version);
+        if($result && isset($result['status'])){
+            if($result['status'] == true){
+                $filename = $result['filename'];
+                $this->download_file($filename, $filepath);
+                if(file_exists($filepath)){
+                    return true;
+                }else{
+                    throw new Exception('下载插件主程序文件失败，本地文件不存在');
+                }
+            }else{
+                throw new Exception('下载插件主程序文件失败：'.($result['msg']?$result['msg']:'未知错误'));
+            }
+        }else{
+            throw new Exception('下载插件主程序文件失败，接口返回错误');
+        }
+    }
+
+    //解密并下载插件主程序文件
+    private function decode_plugin_main($plugin_name, $version, $main_filepath){
+        if($this->decode_plugin_main_local($main_filepath)) return true;
+        $result = $this->btapi->get_decode_plugin_main($plugin_name, $version);
+        if($result && isset($result['status'])){
+            if($result['status'] == true){
+                $filename = $result['filename'];
+                $this->download_file($filename, $main_filepath);
+                return true;
+            }else{
+                throw new Exception('解密插件主程序文件失败：'.($result['msg']?$result['msg']:'未知错误'));
+            }
+        }else{
+            throw new Exception('解密插件主程序文件失败，接口返回错误');
+        }
+    }
+
+    //本地解密插件主程序文件
+    public function decode_plugin_main_local($main_filepath){
+        $userinfo = $this->btapi->get_user_info();
+        if(isset($userinfo['uid'])){
+            $src = file_get_contents($main_filepath);
+            if($src===false)throw new Exception('文件打开失败');
+            if(!$src || strpos($src, 'import ')!==false)return true;
+            $uid = $userinfo['uid'];
+            $serverid = $userinfo['serverid'];
+            $key = md5(substr($serverid, 10, 16).$uid.$serverid);
+            $iv = md5($key.$serverid);
+            $key = substr($key, 8, 16);
+            $iv = substr($iv, 8, 16);
+            $data_arr = explode("\n", $src);
+            $de_text = '';
+            foreach($data_arr as $data){
+                $data = trim($data);
+                if(!empty($data)){
+                    $tmp = openssl_decrypt($data, 'aes-128-cbc', $key, 0, $iv);
+                    if($tmp !== false) $de_text .= $tmp;
+                }
+            }
+            if(!empty($de_text) && strpos($de_text, 'import ')!==false){
+                file_put_contents($main_filepath, $de_text);
+                return true;
+            }
+            return false;
+        }else{
+            throw new Exception('解密插件主程序文件失败，获取用户信息失败');
+        }
+    }
+
+    //去除插件主程序文件授权校验
+    private function noauth_plugin_main($main_filepath){
+        $data = file_get_contents($main_filepath);
+        if(!$data) return false;
+
+        $data = str_replace('\'http://www.bt.cn/api/panel/get_soft_list_test', 'public.GetConfigValue(\'home\')+\'/api/panel/get_soft_list_test', $data);
+        $data = str_replace('\'https://www.bt.cn/api/panel/get_soft_list_test', 'public.GetConfigValue(\'home\')+\'/api/panel/get_soft_list_test', $data);
+        $data = str_replace('\'http://www.bt.cn/api/panel/get_soft_list', 'public.GetConfigValue(\'home\')+\'/api/panel/get_soft_list', $data);
+        $data = str_replace('\'https://www.bt.cn/api/panel/get_soft_list', 'public.GetConfigValue(\'home\')+\'/api/panel/get_soft_list', $data);
+        $data = str_replace('\'http://www.bt.cn/api/panel/notpro', 'public.GetConfigValue(\'home\')+\'/api/panel/notpro', $data);
+        $data = str_replace('\'https://www.bt.cn/api/panel/notpro', 'public.GetConfigValue(\'home\')+\'/api/panel/notpro', $data);
+
+        $data = str_replace('\'http://www.bt.cn/api/wpanel/get_soft_list_test', 'public.GetConfigValue(\'home\')+\'/api/wpanel/get_soft_list_test', $data);
+        $data = str_replace('\'https://www.bt.cn/api/wpanel/get_soft_list_test', 'public.GetConfigValue(\'home\')+\'/api/wpanel/get_soft_list_test', $data);
+        $data = str_replace('\'http://www.bt.cn/api/wpanel/get_soft_list', 'public.GetConfigValue(\'home\')+\'/api/wpanel/get_soft_list', $data);
+        $data = str_replace('\'https://www.bt.cn/api/wpanel/get_soft_list', 'public.GetConfigValue(\'home\')+\'/api/wpanel/get_soft_list', $data);
+        $data = str_replace('\'http://www.bt.cn/api/wpanel/notpro', 'public.GetConfigValue(\'home\')+\'/api/wpanel/notpro', $data);
+        $data = str_replace('\'https://www.bt.cn/api/wpanel/notpro', 'public.GetConfigValue(\'home\')+\'/api/wpanel/notpro', $data);
+
+        $data = str_replace('"https://www.bt.cn/api/bt_waf/get_malicious', 'public.GetConfigValue(\'home\')+"/api/bt_waf/get_malicious', $data);
+        $data = str_replace('\'http://www.bt.cn/api/bt_waf/getSpiders', 'public.GetConfigValue(\'home\')+\'/api/bt_waf/getSpiders', $data);
+        $data = str_replace('\'https://www.bt.cn/api/bt_waf/getSpiders', 'public.GetConfigValue(\'home\')+\'/api/bt_waf/getSpiders', $data);
+        $data = str_replace('\'http://www.bt.cn/api/bt_waf/addSpider', 'public.GetConfigValue(\'home\')+\'/api/bt_waf/addSpider', $data);
+        $data = str_replace('\'https://www.bt.cn/api/bt_waf/addSpider', 'public.GetConfigValue(\'home\')+\'/api/bt_waf/addSpider', $data);
+        $data = str_replace('\'https://www.bt.cn/api/bt_waf/getVulScanInfoList', 'public.GetConfigValue(\'home\')+\'/api/bt_waf/getVulScanInfoList', $data);
+        $data = str_replace('\'https://www.bt.cn/api/bt_waf/reportInterceptFail', 'public.GetConfigValue(\'home\')+\'/api/bt_waf/reportInterceptFail', $data);
+        $data = str_replace('"https://www.bt.cn/api/bt_waf/reportInterceptFail', 'public.GetConfigValue(\'home\')+"/api/bt_waf/reportInterceptFail', $data);
+        $data = str_replace('\'https://www.bt.cn/api/v2/contact/nps/questions', 'public.GetConfigValue(\'home\')+\'/panel/notpro', $data);
+        $data = str_replace('\'https://www.bt.cn/api/v2/contact/nps/submit', 'public.GetConfigValue(\'home\')+\'/panel/notpro', $data);
+        $data = str_replace('\'http://www.bt.cn/api/Auth', 'public.GetConfigValue(\'home\')+\'/api/Auth', $data);
+        $data = str_replace('\'https://www.bt.cn/api/Auth', 'public.GetConfigValue(\'home\')+\'/api/Auth', $data);
+
+        $data = str_replace('\'https://brandnew.aapanel.com/api/panel/getSoftList', 'public.OfficialApiBase()+\'/api/panel/getSoftList', $data);
+
+        file_put_contents($main_filepath, $data);
+    }
+
+    //下载插件其他文件
+    private function download_plugin_other($fname, $filemd5 = null){
+        $filepath = get_data_dir().'plugins/other/'.$fname;
+        @mkdir(dirname($filepath), 0777, true);
+        $result = $this->btapi->get_plugin_other_filename($fname);
+        if($result && isset($result['status'])){
+            if($result['status'] == true){
+                $filename = $result['filename'];
+                $this->download_file($filename, $filepath);
+                if(file_exists($filepath)){
+                    if($filemd5 && md5_file($filepath) != $filemd5){
+                        $msg = filesize($filepath) < 300 ? file_get_contents($filepath) : '插件文件MD5校验失败';
+                        @unlink($filepath);
+                        throw new Exception($msg);
+                    }
+                    return true;
+                }else{
+                    throw new Exception('下载插件文件失败，本地文件不存在');
+                }
+            }else{
+                throw new Exception('下载插件文件失败：'.($result['msg']?$result['msg']:'未知错误'));
+            }
+        }else{
+            throw new Exception('下载插件文件失败，接口返回错误');
+        }
+    }
+
+    //下载文件
+    private function download_file($filename, $filepath){
+        try{
+            $this->btapi->download($filename, $filepath);
+        }catch(Exception $e){
+            @unlink($filepath);
+            //宝塔bug小文件下载失败，改用base64下载
+            $result = $this->btapi->get_file($filename);
+            if($result && isset($result['status']) && $result['status']==true){
+                $filedata = base64_decode($result['data']);
+                if(strlen($filedata) < 4096 && substr($filedata,0,1)=='{' && substr($filedata,-1,1)=='}'){
+                    $arr = json_decode($filedata, true);
+                    if($arr){
+                        throw new Exception('获取文件失败：'.($arr['msg']?$arr['msg']:'未知错误'));
+                    }
+                }
+                if(!$filedata){
+                    throw new Exception('获取文件失败：文件内容为空');
+                }
+                file_put_contents($filepath, $filedata);
+            }elseif($result){
+                throw new Exception('获取文件失败：'.($result['msg']?$result['msg']:'未知错误'));
+            }else{
+                throw new Exception('获取文件失败：未知错误');
+            }
+        }
+    }
+
+    //获取一键部署列表
+    public function get_deplist(){
+        $result = $this->btapi->get_deplist();
+        if($result && isset($result['list']) && isset($result['type'])){
+            if(empty($result['list']) || empty($result['type'])){
+                throw new Exception('获取一键部署列表失败：一键部署列表为空');
+            }
+            return $result;
+        }else{
+            throw new Exception('获取一键部署列表失败：'.(isset($result['msg'])?$result['msg']:'面板连接失败'));
+        }
+    }
+
+    //获取蜘蛛IP列表
+    public function btwaf_getspiders(){
+        $result = $this->btapi->btwaf_getspiders();
+        if(isset($result['status']) && $result['status']){
+            return $result['data'];
+        }else{
+            throw new Exception(isset($result['msg'])?$result['msg']:'获取失败');
+        }
+    }
+
+    //获取堡塔恶意情报IP库
+    public function btwaf_getmalicious(){
+        $result = $this->btapi->btwaf_getmalicious();
+        if(isset($result['success'])){
+            return $result;
+        }elseif(isset($result['msg'])){
+            throw new Exception($result['msg']);
+        }else{
+            throw new Exception(isset($result['res'])?$result['res']:'获取失败');
+        }
+    }
+
+}

app/lib/Btapi.php

@@ -26,6 +26,17 @@ class Btapi
       	return $data;
 	}
 
+	public function get_config_go(){
+		$url = $this->BT_PANEL.'/panel/get_config';
+		
+		$p_data = $this->GetKeyData();
+		
+		$result = $this->curl($url,$p_data);
+		
+		$data = json_decode($result,true);
+      	return $data;
+	}
+
 	//获取已登录用户信息
 	public function get_user_info(){
 		$url = $this->BT_PANEL.'/plugin?action=a&name=kaixin&s=get_user_info';
@@ -157,6 +168,31 @@ class Btapi
       	return $data;
 	}
 
+	//BTWAF-获取蜘蛛列表
+	public function btwaf_getspiders(){
+		$url = $this->BT_PANEL.'/plugin?action=a&name=kaixin&s=btwaf_getspiders';
+		
+		$p_data = $this->GetKeyData();
+		
+		$result = $this->curl($url,$p_data);
+		$result = str_replace("\u0000", '', $result);
+		
+		$data = json_decode($result,true);
+      	return $data;
+	}
+
+	//BTWAF-获取堡塔恶意情报IP库
+	public function btwaf_getmalicious(){
+		$url = $this->BT_PANEL.'/plugin?action=a&name=kaixin&s=btwaf_getmalicious';
+		
+		$p_data = $this->GetKeyData();
+		
+		$result = $this->curl($url,$p_data);
+		
+		$data = json_decode($result,true);
+      	return $data;
+	}
+	
 
   	private function GetKeyData(){
   		$now_time = time();

app/lib/Plugins.php

@@ -9,52 +9,73 @@ class Plugins
 {
 
     private static function get_btapi($os){
-        if($os == 'Windows'){
+        if(self::is_third($os)){
-            $bt_url = config_get('wbt_url');
+            return new ThirdPlugins($os);
-            $bt_key = config_get('wbt_key');
         }else{
-            $bt_url = config_get('bt_url');
+            return new BtPlugins($os);
-            $bt_key = config_get('bt_key');
         }
-        if(!$bt_url || !$bt_key) throw new Exception('请先配置好宝塔面板接口信息');
+    }
-        $btapi = new Btapi($bt_url, $bt_key);
+
-        return $btapi;
+    private static function is_third($os){
+        if($os == 'en'){
+            $type = config_get('enbt_type');
+        }elseif($os == 'Windows'){
+            $type = config_get('wbt_type');
+        }else{
+            $type = config_get('bt_type');
+        }
+        return $type == 1;
     }
 
     //刷新插件列表
     public static function refresh_plugin_list($os = 'Linux'){
         $btapi = self::get_btapi($os);
         $result = $btapi->get_plugin_list();
-        if($result && isset($result['list']) && isset($result['type'])){
+        self::save_plugin_list($result, $os);
-            if(empty($result['list']) || empty($result['type'])){
-                throw new Exception('获取插件列表失败：插件列表为空');
-            }
-            self::save_plugin_list($result, $os);
-        }else{
-            throw new Exception('获取插件列表失败：'.(isset($result['msg'])?$result['msg']:'面板连接失败'));
-        }
     }
 
     //保存插件列表
     private static function save_plugin_list($data, $os){
         $data['ip'] = '127.0.0.1';
-        $data['serverid'] = '';
+        if($os == 'en'){
-        $data['beta'] = 0;
+            $data['serverId'] = '';
-        $data['uid'] = 1;
+            $data['aln'] = self::get_aln();
-        $data['skey'] = '';
+            $data['pro'] = 0;
-        $list = [];
+            $data['pro_authorization_sn'] = '0';
-        foreach($data['list'] as $plugin){
+            if(!empty($data['authorization_map'])){
-            if(isset($plugin['endtime'])) $plugin['endtime'] = 0;
+                foreach($data['authorization_map'] as $code => &$plugin){
-            $list[] = $plugin;
+                    if($code != '0' && isset($plugin['end_time'])) $plugin['end_time'] = 0;
+                }
+            }
+            if(isset($data['expansions']['mail'])){
+                $data['expansions']['mail']['total'] = 2000000;
+                $data['expansions']['mail']['available'] = 2000000;
+            }
+        }else{
+            $data['serverid'] = '';
+            $data['aln'] = self::get_aln();
+            $data['beta'] = 0;
+            $data['uid'] = 1;
+            $data['skey'] = '';
+            $data['pro'] = -1;
+            $data['ltd'] = strtotime('+10 year');
+        }
+        foreach($data['list'] as &$plugin){
+            if(isset($plugin['endtime'])) $plugin['endtime'] = 0;
         }
-        $data['list'] = $list;
-        $data['ltd'] = strtotime('+10 year');
         $json_file = get_data_dir($os).'config/plugin_list.json';
         if(!file_put_contents($json_file, json_encode($data))){
             throw new Exception('保存插件列表失败，文件无写入权限');
         }
     }
 
+    //多账号数量
+    private static function get_aln($count = '9999'){
+        $key = 'FB8upo8XMgP5by54';
+        $iv = 'lOrrq3lNEURZNdK7';
+        return openssl_encrypt($count, 'aes-128-cbc', $key, 0, $iv);
+    }
+
     //获取插件列表
     public static function get_plugin_list($os = 'Linux'){
         $json_file = get_data_dir($os).'config/plugin_list.json';
@@ -84,136 +105,23 @@ class Plugins
     public static function download_plugin($plugin_name, $version, $os = 'Linux'){
         $plugin_info = Plugins::get_plugin_info($plugin_name, $os);
         if(!$plugin_info) throw new Exception('未找到该插件信息');
-        if($plugin_info['type'] == 10 && isset($plugin_info['versions'][0]['download'])){
-            if($plugin_info['price'] == 0){
-                $btapi = self::get_btapi($os);
-                $btapi->create_plugin_other_order($plugin_info['id']);
-            }
-            $fname = $plugin_info['versions'][0]['download'];
-            $filemd5 = $plugin_info['versions'][0]['md5'];
-            Plugins::download_plugin_other($fname, $filemd5, $os);
-            if(isset($plugin_info['min_image']) && strpos($plugin_info['min_image'], 'fname=')){
-                $fname = substr($plugin_info['min_image'], strpos($plugin_info['min_image'], '?fname=')+7);
-                Plugins::download_plugin_other($fname, null, $os);
-            }
-        }else{
-            Plugins::download_plugin_package($plugin_name, $version, $os);
-        }
-    }
-
-    //下载插件包
-    public static function download_plugin_package($plugin_name, $version, $os = 'Linux'){
-        $filepath = get_data_dir($os).'plugins/package/'.$plugin_name.'-'.$version.'.zip';
         $btapi = self::get_btapi($os);
-        $result = $btapi->get_plugin_filename($plugin_name, $version);
+        $btapi->download_plugin($plugin_name, $version, $plugin_info);
-        if($result && isset($result['status'])){
-            if($result['status'] == true){
-                $filename = $result['filename'];
-                self::download_file($btapi, $filename, $filepath);
-                if(file_exists($filepath)){
-                    $zip = new ZipArchive;
-                    if ($zip->open($filepath) === true)
-                    {
-                        $zip->extractTo(get_data_dir($os).'plugins/folder/'.$plugin_name.'-'.$version);
-                        $zip->close();
-                        $main_filepath = get_data_dir($os).'plugins/folder/'.$plugin_name.'-'.$version.'/'.$plugin_name.'/'.$plugin_name.'_main.py';
-                        if(file_exists($main_filepath) && filesize($main_filepath)>10){
-                            if(!strpos(file_get_contents($main_filepath), 'import ')){ //加密py文件，需要解密
-                                self::decode_plugin_main($plugin_name, $version, $main_filepath, $os);
-                                self::noauth_plugin_main($main_filepath);
-                                $zip->open($filepath, ZipArchive::CREATE);
-                                $zip->addFile($main_filepath, $plugin_name.'/'.$plugin_name.'_main.py');
-                                $zip->close();
-                            }
-                        }
-                    }else{
-                        throw new Exception('插件包解压缩失败');
-                    }
-                    return true;
-                }else{
-                    throw new Exception('下载插件包失败，本地文件不存在');
-                }
-            }else{
-                throw new Exception('下载插件包失败：'.($result['msg']?$result['msg']:'未知错误'));
-            }
-        }else{
-            throw new Exception('下载插件包失败，接口返回错误');
-        }
     }
 
     //下载插件主程序文件
     public static function download_plugin_main($plugin_name, $version, $os = 'Linux'){
-        $filepath = get_data_dir($os).'plugins/main/'.$plugin_name.'-'.$version.'.dat';
         $btapi = self::get_btapi($os);
-        $result = $btapi->get_plugin_main_filename($plugin_name, $version);
+        $btapi->download_plugin_main($plugin_name, $version);
-        if($result && isset($result['status'])){
-            if($result['status'] == true){
-                $filename = $result['filename'];
-                self::download_file($btapi, $filename, $filepath);
-                if(file_exists($filepath)){
-                    return true;
-                }else{
-                    throw new Exception('下载插件主程序文件失败，本地文件不存在');
-                }
-            }else{
-                throw new Exception('下载插件主程序文件失败：'.($result['msg']?$result['msg']:'未知错误'));
-            }
-        }else{
-            throw new Exception('下载插件主程序文件失败，接口返回错误');
-        }
-    }
-
-    //解密并下载插件主程序文件
-    public static function decode_plugin_main($plugin_name, $version, $main_filepath, $os = 'Linux'){
-        if(self::decode_plugin_main_local($main_filepath, $os)) return true;
-        $btapi = self::get_btapi($os);
-        $result = $btapi->get_decode_plugin_main($plugin_name, $version);
-        if($result && isset($result['status'])){
-            if($result['status'] == true){
-                $filename = $result['filename'];
-                self::download_file($btapi, $filename, $main_filepath);
-                return true;
-            }else{
-                throw new Exception('解密插件主程序文件失败：'.($result['msg']?$result['msg']:'未知错误'));
-            }
-        }else{
-            throw new Exception('解密插件主程序文件失败，接口返回错误');
-        }
     }
 
     //本地解密插件主程序文件
     public static function decode_plugin_main_local($main_filepath, $os = 'Linux'){
-        $btapi = self::get_btapi($os);
+        $btapi = new BtPlugins($os);
-        $userinfo = $btapi->get_user_info();
+        return $btapi->decode_plugin_main_local($main_filepath);
-        if(isset($userinfo['uid'])){
-            $src = file_get_contents($main_filepath);
-            if($src===false)throw new Exception('文件打开失败');
-            if(!$src || strpos($src, 'import ')!==false)return true;
-            $uid = $userinfo['uid'];
-            $serverid = $userinfo['serverid'];
-            $key = md5(substr($serverid, 10, 16).$uid.$serverid);
-            $iv = md5($key.$serverid);
-            $key = substr($key, 8, 16);
-            $iv = substr($iv, 8, 16);
-            $data_arr = explode("\n", $src);
-            $de_text = '';
-            foreach($data_arr as $data){
-                $data = trim($data);
-                if(!empty($data) && strlen($data)!=24){
-                    $tmp = openssl_decrypt($data, 'aes-128-cbc', $key, 0, $iv);
-                    if($tmp) $de_text .= $tmp;
-                }
-            }
-            if(!empty($de_text) && strpos($de_text, 'import ')!==false){
-                file_put_contents($main_filepath, $de_text);
-                return true;
-            }
-            return false;
-        }else{
-            throw new Exception('解密插件主程序文件失败，获取用户信息失败');
-        }
     }
 
+    //本地解密模块文件
     public static function decode_module_file($filepath){
         $src = file_get_contents($filepath);
         if($src===false)throw new Exception('文件打开失败');
@@ -226,7 +134,7 @@ class Plugins
             $data = trim($data);
             if(!empty($data)){
                 $tmp = openssl_decrypt($data, 'aes-128-cbc', $key, 0, $iv);
-                if($tmp) $de_text .= $tmp;
+                if($tmp !== false) $de_text .= $tmp;
             }
         }
         if(!empty($de_text) && strpos($de_text, 'import ')!==false){
@@ -236,98 +144,13 @@ class Plugins
         return 2;
     }
 
-    //去除插件主程序文件授权校验
-    public static function noauth_plugin_main($main_filepath){
-        $data = file_get_contents($main_filepath);
-        if(!$data) return false;
-
-        $data = str_replace('\'http://www.bt.cn/api/panel/get_soft_list_test', 'public.GetConfigValue(\'home\')+\'/api/panel/get_soft_list_test', $data);
-        $data = str_replace('\'https://www.bt.cn/api/panel/get_soft_list_test', 'public.GetConfigValue(\'home\')+\'/api/panel/get_soft_list_test', $data);
-        $data = str_replace('\'http://www.bt.cn/api/panel/get_soft_list', 'public.GetConfigValue(\'home\')+\'/api/panel/get_soft_list', $data);
-        $data = str_replace('\'https://www.bt.cn/api/panel/get_soft_list', 'public.GetConfigValue(\'home\')+\'/api/panel/get_soft_list', $data);
-        $data = str_replace('\'http://www.bt.cn/api/panel/notpro', 'public.GetConfigValue(\'home\')+\'/api/panel/notpro', $data);
-        $data = str_replace('\'https://www.bt.cn/api/panel/notpro', 'public.GetConfigValue(\'home\')+\'/api/panel/notpro', $data);
-
-        $data = str_replace('\'http://www.bt.cn/api/wpanel/get_soft_list_test', 'public.GetConfigValue(\'home\')+\'/api/wpanel/get_soft_list_test', $data);
-        $data = str_replace('\'https://www.bt.cn/api/wpanel/get_soft_list_test', 'public.GetConfigValue(\'home\')+\'/api/wpanel/get_soft_list_test', $data);
-        $data = str_replace('\'http://www.bt.cn/api/wpanel/get_soft_list', 'public.GetConfigValue(\'home\')+\'/api/wpanel/get_soft_list', $data);
-        $data = str_replace('\'https://www.bt.cn/api/wpanel/get_soft_list', 'public.GetConfigValue(\'home\')+\'/api/wpanel/get_soft_list', $data);
-        $data = str_replace('\'http://www.bt.cn/api/wpanel/notpro', 'public.GetConfigValue(\'home\')+\'/api/wpanel/notpro', $data);
-        $data = str_replace('\'https://www.bt.cn/api/wpanel/notpro', 'public.GetConfigValue(\'home\')+\'/api/wpanel/notpro', $data);
-
-        file_put_contents($main_filepath, $data);
-    }
-
-    //下载插件其他文件
-    public static function download_plugin_other($fname, $filemd5 = null, $os = 'Linux'){
-        $filepath = get_data_dir().'plugins/other/'.$fname;
-        @mkdir(dirname($filepath), 0777, true);
-        $btapi = self::get_btapi($os);
-        $result = $btapi->get_plugin_other_filename($fname);
-        if($result && isset($result['status'])){
-            if($result['status'] == true){
-                $filename = $result['filename'];
-                self::download_file($btapi, $filename, $filepath);
-                if(file_exists($filepath)){
-                    if($filemd5 && md5_file($filepath) != $filemd5){
-                        $msg = filesize($filepath) < 300 ? file_get_contents($filepath) : '插件文件MD5校验失败';
-                        @unlink($filepath);
-                        throw new Exception($msg);
-                    }
-                    return true;
-                }else{
-                    throw new Exception('下载插件文件失败，本地文件不存在');
-                }
-            }else{
-                throw new Exception('下载插件文件失败：'.($result['msg']?$result['msg']:'未知错误'));
-            }
-        }else{
-            throw new Exception('下载插件文件失败，接口返回错误');
-        }
-    }
-
-    //下载文件
-    private static function download_file($btapi, $filename, $filepath){
-        try{
-            $btapi->download($filename, $filepath);
-        }catch(Exception $e){
-            @unlink($filepath);
-            //宝塔bug小文件下载失败，改用base64下载
-            $result = $btapi->get_file($filename);
-            if($result && isset($result['status']) && $result['status']==true){
-                $filedata = base64_decode($result['data']);
-                if(strlen($filedata) < 4096 && substr($filedata,0,1)=='{' && substr($filedata,-1,1)=='}'){
-                    $arr = json_decode($filedata, true);
-                    if($arr){
-                        throw new Exception('获取文件失败：'.($arr['msg']?$arr['msg']:'未知错误'));
-                    }
-                }
-                if(!$filedata){
-                    throw new Exception('获取文件失败：文件内容为空');
-                }
-                file_put_contents($filepath, $filedata);
-            }elseif($result){
-                throw new Exception('获取文件失败：'.($result['msg']?$result['msg']:'未知错误'));
-            }else{
-                throw new Exception('获取文件失败：未知错误');
-            }
-        }
-    }
-
     //刷新一键部署列表
     public static function refresh_deplist($os = 'Linux'){
         $btapi = self::get_btapi($os);
         $result = $btapi->get_deplist();
-        if($result && isset($result['list']) && isset($result['type'])){
+        $json_file = get_data_dir($os).'config/deployment_list.json';
-            if(empty($result['list']) || empty($result['type'])){
+        if(!file_put_contents($json_file, json_encode($result))){
-                throw new Exception('获取一键部署列表失败：一键部署列表为空');
+            throw new Exception('保存一键部署列表失败，文件无写入权限');
-            }
-            $json_file = get_data_dir($os).'config/deployment_list.json';
-            if(!file_put_contents($json_file, json_encode($result))){
-                throw new Exception('保存一键部署列表失败，文件无写入权限');
-            }
-        }else{
-            throw new Exception('获取一键部署列表失败：'.(isset($result['msg'])?$result['msg']:'面板连接失败'));
         }
     }
 
@@ -344,4 +167,52 @@ class Plugins
         return false;
     }
 
+    //获取蜘蛛IP列表
+    public static function btwaf_getspiders(){
+        $result = cache('btwaf_getspiders');
+        if($result){
+            return $result;
+        }
+        $btapi = self::get_btapi('Linux');
+        $result = $btapi->btwaf_getspiders();
+        cache('btwaf_getspiders', $result, 3600 * 24 * 3);
+        return $result;
+    }
+
+    //分类获取蜘蛛IP列表
+    public static function get_spider($type){
+        $result = cache('get_spider_'.$type);
+        if($result){
+            return $result;
+        }
+        $url = 'https://www.bt.cn/api/panel/get_spider?spider='.$type;
+        $data = get_curl($url);
+        $result = json_decode($data, true);
+        if(!$result) return [];
+        cache('get_spider_'.$type, $result, 3600 * 24);
+        return $result;
+    }
+
+    //获取堡塔恶意情报IP库
+    public static function btwaf_getmalicious(){
+        $btapi = self::get_btapi('Linux');
+        $result = $btapi->btwaf_getmalicious();
+        return $result;
+    }
+
+    //加密插件列表
+    public static function encrypt_plugin_list($list, $server_id, $uid){
+        $data = json_encode($list);
+        $block_size = 51200;
+        $key = md5(substr($server_id, 10, 16) . $uid . $server_id);
+        $iv = md5($key . $server_id);
+        $key = substr($key, 8, 16);
+        $iv = substr($iv, 8, 16);
+        $encrypted_content = '';
+        foreach (str_split($data, $block_size) as $block) {
+            $encrypted_content .= openssl_encrypt($block, 'aes-128-cbc', $key, 0, $iv) . "\n";
+        }
+        return $encrypted_content;
+    }
+
 }

app/lib/ThirdPlugins.php

@@ -0,0 +1,226 @@
+<?php
+
+namespace app\lib;
+
+use Exception;
+use ZipArchive;
+
+class ThirdPlugins
+{
+    private $url;
+    private $os;
+
+    public function __construct($os)
+    {
+        $this->os = $os;
+        if($os == 'en'){
+            $url = config_get('enbt_surl');
+        }elseif($os == 'Windows'){
+            $url = config_get('wbt_surl');
+        }else{
+            $url = config_get('bt_surl');
+        }
+        if(!$url) throw new Exception('请先配置好第三方云端首页URL');
+        $this->url = $url;
+    }
+
+    //获取插件列表
+    public function get_plugin_list()
+    {
+        if($this->os == 'en'){
+            $url = $this->url . 'api/panel/getSoftListEn';
+        }elseif($this->os == 'Windows'){
+            $url = $this->url . 'api/wpanel/get_soft_list';
+        }else{
+            $url = $this->url . 'api/panel/get_soft_list';
+        }
+        $res = $this->curl($url);
+        $result = json_decode($res, true);
+        if($result && isset($result['list']) && isset($result['type'])){
+            if(empty($result['list']) || empty($result['type'])){
+                throw new Exception('获取插件列表失败：插件列表为空');
+            }
+            return $result;
+        }else{
+            throw new Exception('获取插件列表失败：'.(isset($result['msg'])?$result['msg']:'第三方云端连接失败'));
+        }
+    }
+
+    //下载插件（自动判断是否第三方）
+    public function download_plugin($plugin_name, $version, $plugin_info){
+        if($plugin_info['type'] == 10 && isset($plugin_info['versions'][0]['download'])){
+            $fname = $plugin_info['versions'][0]['download'];
+            $filemd5 = $plugin_info['versions'][0]['md5'];
+            $this->download_plugin_other($fname, $filemd5);
+            if(isset($plugin_info['min_image']) && strpos($plugin_info['min_image'], 'fname=')){
+                $fname = substr($plugin_info['min_image'], strpos($plugin_info['min_image'], '?fname=')+7);
+                $this->download_plugin_other($fname);
+            }
+        }else{
+            $this->download_plugin_package($plugin_name, $version);
+        }
+    }
+
+    //下载插件包
+    private function download_plugin_package($plugin_name, $version){
+        $filepath = get_data_dir($this->os).'plugins/package/'.$plugin_name.'-'.$version.'.zip';
+
+        $url = $this->url . 'down/download_plugin';
+        $post = ['name'=>$plugin_name, 'version'=>$version, 'os'=>$this->os];
+        $this->curl_download($url, $post, $filepath);
+
+        if(file_exists($filepath)){
+            $handle = fopen($filepath, "rb");
+            $file_head = fread($handle, 4);
+            fclose($handle);
+            if(bin2hex($file_head) === '504b0304'){
+                $zip = new ZipArchive;
+                if ($zip->open($filepath) === true)
+                {
+                    $zip->close();
+                    return true;
+                }else{
+                    @unlink($filepath);
+                    throw new Exception('插件包解压缩失败');
+                }
+            }else{
+                $handle = fopen($filepath, "rb");
+                $errmsg = htmlspecialchars(fgets($handle));
+                fclose($handle);
+                @unlink($filepath);
+                throw new Exception('下载插件包失败：'.($errmsg?$errmsg:'未知错误'));
+            }
+        }else{
+            throw new Exception('下载插件包失败，本地文件不存在');
+        }
+    }
+
+    //下载插件主程序文件
+    public function download_plugin_main($plugin_name, $version){
+        $filepath = get_data_dir($this->os).'plugins/main/'.$plugin_name.'-'.$version.'.dat';
+
+        $url = $this->url . 'down/download_plugin_main';
+        $post = ['name'=>$plugin_name, 'version'=>$version, 'os'=>$this->os];
+        $this->curl_download($url, $post, $filepath);
+
+        if(file_exists($filepath)){
+            $line = count(file($filepath));
+            if($line > 3) return true;
+
+            $handle = fopen($filepath, "rb");
+            $errmsg = htmlspecialchars(fgets($handle));
+            fclose($handle);
+            @unlink($filepath);
+            throw new Exception('下载插件主程序文件失败：'.($errmsg?$errmsg:'未知错误'));
+        }else{
+            throw new Exception('下载插件主程序文件失败，本地文件不存在');
+        }
+    }
+
+    //下载插件其他文件
+    private function download_plugin_other($fname, $filemd5 = null){
+        $filepath = get_data_dir().'plugins/other/'.$fname;
+        @mkdir(dirname($filepath), 0777, true);
+
+        $url = $this->url . 'api/Pluginother/get_file?fname='.urlencode($fname);
+        $this->curl_download($url, false, $filepath);
+
+        if(file_exists($filepath)){
+            $handle = fopen($filepath, "rb");
+            $file_head = fread($handle, 15);
+            fclose($handle);
+            if($file_head === '{"status":false'){
+                $res = file_get_contents($filepath);
+                $result = json_decode($res, true);
+                @unlink($filepath);
+                throw new Exception('下载插件文件失败：'.($result?$result['msg']:'未知错误'));
+            }
+            if($filemd5 && md5_file($filepath) != $filemd5){
+                $msg = filesize($filepath) < 300 ? file_get_contents($filepath) : '插件文件MD5校验失败';
+                @unlink($filepath);
+                throw new Exception($msg);
+            }
+            return true;
+        }else{
+            throw new Exception('下载插件文件失败，本地文件不存在');
+        }
+    }
+
+    //获取一键部署列表
+    public function get_deplist(){
+        $url = $this->url . 'api/panel/get_deplist';
+        $post = ['os' => $this->os];
+        $res = $this->curl($url, http_build_query($post));
+        $result = json_decode($res, true);
+        if($result && isset($result['list']) && isset($result['type'])){
+            if(empty($result['list']) || empty($result['type'])){
+                throw new Exception('获取一键部署列表失败：一键部署列表为空');
+            }
+            return $result;
+        }else{
+            throw new Exception('获取一键部署列表失败：'.(isset($result['msg'])?$result['msg']:'第三方云端连接失败'));
+        }
+    }
+
+    //获取蜘蛛IP列表
+    public function btwaf_getspiders(){
+        $url = $this->url . 'api/bt_waf/getSpiders';
+        $res = $this->curl($url);
+        $result = json_decode($res, true);
+        if(isset($result['status']) && !$result['status']){
+            throw new Exception(isset($result['msg'])?$result['msg']:'获取失败');
+        }else{
+            return $result;
+        }
+    }
+
+    //获取堡塔恶意情报IP库
+    public function btwaf_getmalicious(){
+        $url = $this->url . 'api/bt_waf/get_malicious';
+        $res = $this->curl($url);
+        $result = json_decode($res, true);
+        if(isset($result['success'])){
+            return $result;
+        }else{
+            throw new Exception(isset($result['res'])?$result['res']:'获取失败');
+        }
+    }
+
+    private function curl($url, $post = 0){
+        $ua = "Mozilla/5.0 (BtCloud; ".request()->root(true).")";
+        return get_curl($url, $post, 0, 0, 0, $ua);
+    }
+
+    private function curl_download($url, $post, $localpath, $timeout = 300)
+    {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+		$fp = fopen($localpath, 'w+');
+		curl_setopt($ch, CURLOPT_FILE, $fp);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (BtCloud; ".request()->root(true).")");
+        if($post){
+            curl_setopt($ch, CURLOPT_POST, 1);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
+        }
+        curl_exec($ch);
+		if (curl_errno($ch)) {
+			$message = curl_error($ch);
+			curl_close($ch);
+			fclose($fp);
+			throw new Exception('下载文件失败：'.$message);
+		}
+		$httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		if($httpcode>299){
+			curl_close($ch);
+			fclose($fp);
+			throw new Exception('下载文件失败：HTTPCODE-'.$httpcode);
+		}
+        curl_close($ch);
+		fclose($fp);
+        return true;
+    }
+
+}

app/middleware/LoadConfig.php

@@ -5,6 +5,7 @@ namespace app\middleware;
 
 use think\facade\Db;
 use think\facade\Config;
+use think\facade\View;
 
 class LoadConfig
 {
@@ -31,6 +32,7 @@ class LoadConfig
         $res = Db::name('config')->cache('configs',0)->column('value','key');
         Config::set($res, 'sys');
 
+        View::assign('cdnpublic', 'https://s4.zstatic.net/ajax/libs/');
         return $next($request)->header([
             'Cache-Control' => 'no-store, no-cache, must-revalidate',
             'Pragma' => 'no-cache',

app/script/cacert.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+OPENSSL_CHECK=$(which openssl)
+if [ "$?" != "0" ]; then
+	echo "未安装OpenSSL"
+	exit 1
+fi
+
+if [ ! -f ca.key ] && [ ! -f ca.crt ]; then
+	openssl genrsa -out ca.key 2048
+	openssl req -new -x509 -utf8 -days 3650 -extensions v3_ca -subj "/C=CN/O=宝塔面板/CN=宝塔面板" -key ca.key -out ca.crt
+fi
+
+openssl genrsa -out server.key 2048
+openssl req -new -nodes -key server.key -subj "/C=CN/O=BTPanel/CN=BTPanel" -out server.csr
+openssl x509 -req -in server.csr -CA ca.crt -CAkey ca.key -CAcreateserial -out server.crt -days 3650 -extensions req_ext
+
+cat ca.crt >> server.crt
+
+openssl pkcs12 -export -out baota_root.pfx -inkey server.key -in server.crt -password pass:
+if [ "$?" != "0" ]; then
+	echo "生成CA根证书失败"
+	exit 1
+fi
+
+mkdir -p ../../public/ssl
+\cp baota_root.pfx ../../public/ssl/baota_root.pfx
+\cp ca.crt ../../public/ssl/baota_root.crt
+rm -f server.crt server.key server.csr
+
+echo "生成CA根证书成功"

app/script/convert.sh

@@ -1,23 +1,27 @@
 #!/bin/bash
 
-Linux_Version="7.9.7"
+Linux_Version="11.5.0"
-Windows_Version="7.8.0"
+Windows_Version="8.2.2"
-Btm_Version="1.0.11"
+Aapanel_Version="7.0.25"
+Btm_Version="2.3.3"
 
 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
-public/win/panel/panel_${Windows_Version}.zip
-public/win/panel/data/api.py
 public/win/panel/data/setup.py
 public/install/src/bt-monitor-${Btm_Version}.zip
 public/install/install_btmonitor.sh
 public/install/update_btmonitor.sh
+public/install/src/panel_7_en.zip
+public/install/update/LinuxPanel_EN-${Aapanel_Version}.zip
+public/install/install_7.0_en.sh
+public/install/update_7.x_en.sh
 )
+PL_FILE="public/install/update/LinuxPanel-${Linux_Version}.pl"
 
 DIR=$1
 SITEURL=$2
@@ -75,6 +79,10 @@ do
 	fi
 done
 
+HASH=$(sha256sum "${DIR}public/install/update/LinuxPanel-${Linux_Version}.zip" | awk '{print $1}')
+TIMESTAMP=$(date +%s)
+printf '{"hash": "%s", "update_time": "%s"}' "$HASH" "$TIMESTAMP" > "${DIR}${PL_FILE}"
+
 echo "=========================="
 echo "处理完成"
 echo "=========================="

app/view/admin/deplist.html

@@ -16,7 +16,7 @@
 	</div>
 </div>
 </div>
-<script src="//cdn.staticfile.org/layer/3.5.1/layer.js"></script>
+<script src="{$cdnpublic}layer/3.5.1/layer.js"></script>
 <script>
 function refresh_deplist(os){
     var confirm = layer.confirm('是否确定从宝塔官方获取最新一键部署列表？', {

app/view/admin/layout.html

@@ -5,15 +5,15 @@
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
   <title>{block name="title"}标题{/block}</title>
-  <link href="//cdn.staticfile.org/twitter-bootstrap/3.4.1/css/bootstrap.min.css" rel="stylesheet" />
+  <link href="{$cdnpublic}twitter-bootstrap/3.4.1/css/bootstrap.min.css" rel="stylesheet" />
-  <link href="//cdn.staticfile.org/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" />
+  <link href="{$cdnpublic}font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" />
   <link href="/static/css/bootstrap-table.css" rel="stylesheet" />
-  <script src="//cdn.staticfile.org/modernizr/2.8.3/modernizr.min.js"></script>
+  <script src="{$cdnpublic}modernizr/2.8.3/modernizr.min.js"></script>
-  <script src="//cdn.staticfile.org/jquery/2.1.4/jquery.min.js"></script>
+  <script src="{$cdnpublic}jquery/2.1.4/jquery.min.js"></script>
-  <script src="//cdn.staticfile.org/twitter-bootstrap/3.4.1/js/bootstrap.min.js"></script>
+  <script src="{$cdnpublic}twitter-bootstrap/3.4.1/js/bootstrap.min.js"></script>
   <!--[if lt IE 9]>
-    <script src="//cdn.staticfile.org/html5shiv/3.7.3/html5shiv.min.js"></script>
+    <script src="{$cdnpublic}html5shiv/3.7.3/html5shiv.min.js"></script>
-    <script src="//cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <script src="{$cdnpublic}respond.js/1.4.2/respond.min.js"></script>
   <![endif]-->
 </head>
 <body>
@@ -27,18 +27,19 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="./">宝塔第三方云端管理中心</a>
+        <a class="navbar-brand" href="/admin">宝塔第三方云端管理中心</a>
       </div><!-- /.navbar-header -->
       <div id="navbar" class="collapse navbar-collapse">
         <ul class="nav navbar-nav navbar-right">
           <li class="{:checkIfActive('index')}">
             <a href="/admin"><i class="fa fa-home"></i> 后台首页</a>
           </li>
-          <li class="{:checkIfActive('plugins,pluginswin,deplist')}">
+          <li class="{:checkIfActive('plugins,pluginswin,pluginsen,deplist')}">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cubes"></i> 插件列表<b class="caret"></b></a>
             <ul class="dropdown-menu">
               <li class="{:checkIfActive('plugins')}"><a href="/admin/plugins">Linux面板</a></li>
               <li class="{:checkIfActive('pluginswin')}"><a href="/admin/pluginswin">Windows面板</a></li>
+              <li class="{:checkIfActive('pluginsen')}"><a href="/admin/pluginsen">aaPanel面板</a></li>
               <li class="{:checkIfActive('deplist')}"><a href="/admin/deplist">一键部署列表</a></li>
             </ul>
           </li>
@@ -51,13 +52,17 @@
           <li class="{:checkIfActive('log')}">
             <a href="/admin/log"><i class="fa fa-calendar"></i> 操作日志</a>
           </li>
+          <li class="{:checkIfActive('ssl')}">
+            <a href="/admin/ssl"><i class="fa fa-expeditedssl"></i> 自签SSL</a>
+          </li>
           <li class="{:checkIfActive('set')}">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i> 系统设置<b
                 class="caret"></b></a>
             <ul class="dropdown-menu">
-              <li><a href="/admin/set">系统基本设置</a></li>
+              <li><a href="/admin/set">软件版本设置</a></li>
-              <li><a href="/admin/set/mod/task">定时任务设置</a></li>
+              <li><a href="/admin/set/mod/api">面板接口设置</a></li>
-              <li><a href="/admin/set/mod/tools">批量替换工具</a></li>
+              <li><a href="/admin/set/mod/task">自动更新插件设置</a></li>
+              <li><a href="/admin/set/mod/tools">替换与清理工具</a></li>
               <li><a href="/admin/set/mod/account">管理账号设置</a></li>
             </ul>
           </li>

app/view/admin/list.html

@@ -31,9 +31,9 @@
 	<input type="text" class="form-control" name="ip" placeholder="服务器IP">
   </div>
   <div class="form-group">
-	<button class="btn btn-primary" type="submit"><i class="fa fa-search"></i>搜索</button>&nbsp;
+	<button class="btn btn-primary" type="submit"><i class="fa fa-search"></i> 搜索</button>&nbsp;
-	<a href="javascript:searchClear()" class="btn btn-default"><i class="fa fa-repeat"></i>重置</a>&nbsp;
+	<a href="javascript:searchClear()" class="btn btn-default"><i class="fa fa-repeat"></i> 重置</a>&nbsp;
-	<a href="javascript:add_item()" class="btn btn-success"><i class="fa fa-plus"></i>添加</a>&nbsp;
+	<a href="javascript:add_item()" class="btn btn-success"><i class="fa fa-plus"></i> 添加</a>&nbsp;
   </div>
 </form>
 </div>
@@ -42,9 +42,9 @@
 	  </table>
 	</div>
   </div>
-<script src="//cdn.staticfile.org/layer/3.5.1/layer.js"></script>
+<script src="{$cdnpublic}layer/3.5.1/layer.js"></script>
-<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/bootstrap-table.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.19.1/bootstrap-table.min.js"></script>
-<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.19.1/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
 <script src="/static/js/custom.js"></script>
 <script>
 function setEnable(id,enable) {

app/view/admin/log.html

@@ -13,8 +13,8 @@
 	<input type="text" class="form-control" name="action" placeholder="操作类型">
   </div>
   <div class="form-group">
-	<button class="btn btn-primary" type="submit"><i class="fa fa-search"></i>搜索</button>&nbsp;
+	<button class="btn btn-primary" type="submit"><i class="fa fa-search"></i> 搜索</button>&nbsp;
-	<a href="javascript:searchClear()" class="btn btn-default"><i class="fa fa-repeat"></i>重置</a>&nbsp;
+	<a href="javascript:searchClear()" class="btn btn-default"><i class="fa fa-repeat"></i> 重置</a>&nbsp;
   </div>
 </form>
 </div>
@@ -23,9 +23,9 @@
 	  </table>
 	</div>
   </div>
-<script src="//cdn.staticfile.org/layer/3.5.1/layer.js"></script>
+<script src="{$cdnpublic}layer/3.5.1/layer.js"></script>
-<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/bootstrap-table.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.19.1/bootstrap-table.min.js"></script>
-<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.19.1/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
 <script src="/static/js/custom.js"></script>
 <script>
 

app/view/admin/login.html

@@ -5,12 +5,12 @@
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1"/>
   <title>管理员登录</title>
-  <link href="//cdn.staticfile.org/twitter-bootstrap/3.4.1/css/bootstrap.min.css" rel="stylesheet"/>
+  <link href="{$cdnpublic}twitter-bootstrap/3.4.1/css/bootstrap.min.css" rel="stylesheet"/>
-  <script src="//cdn.staticfile.org/modernizr/2.8.3/modernizr.min.js"></script>
+  <script src="{$cdnpublic}modernizr/2.8.3/modernizr.min.js"></script>
-  <script src="//cdn.staticfile.org/jquery/2.1.4/jquery.min.js"></script>
+  <script src="{$cdnpublic}jquery/2.1.4/jquery.min.js"></script>
   <!--[if lt IE 9]>
-    <script src="//cdn.staticfile.org/html5shiv/3.7.3/html5shiv.min.js"></script>
+    <script src="{$cdnpublic}html5shiv/3.7.3/html5shiv.min.js"></script>
-    <script src="//cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <script src="{$cdnpublic}respond.js/1.4.2/respond.min.js"></script>
   <![endif]-->
 </head>
 <body>
@@ -23,7 +23,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="./">宝塔第三方云端管理中心</a>
+        <a class="navbar-brand" href="./">Cloud</a>
       </div><!-- /.navbar-header -->
       <div id="navbar" class="collapse navbar-collapse">
         <ul class="nav navbar-nav navbar-right">
@@ -63,7 +63,7 @@
       </div>
     </div>
   </div>
-<script src="//cdn.staticfile.org/layer/3.5.1/layer.js"></script>
+<script src="{$cdnpublic}layer/3.5.1/layer.js"></script>
 <script>
 function submitlogin(){
     var user = $("input[name='user']").val();

app/view/admin/plugins.html

@@ -35,7 +35,7 @@ td{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width:340px;
 			<div class="modal-body">
 				<p>“版本与状态”一列中，红色的按钮代表本地不存在该版本插件包，需要点击下载；绿色的按钮代表已存在。</p>
                 <p>官方插件包本地存储路径是/data/plugins/package/软件标识-版本号.zip，第三方插件包路径是/data/plugins/other/other/，对于部分包含二次验证的插件可以自行修改。</p>
-                <p>点击【重新获取】按钮会从宝塔官方获取最新插件列表，但是插件包需要手动点击下载。如果需要批量下载插件包，可查看<a href="/admin/set/mod/task">定时任务设置</a></p>
+                <p>若对接的服务器网速较慢，可能会导致下载失败，提示"服务器错误"，可稍等一会，进入对接服务器/tmp/plugins目录下载插件包，将_改成-，并上传到本站/data/plugins/package目录下。</p>
 			</div>
 			<div class="modal-footer">
 				<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
@@ -57,10 +57,11 @@ td{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width:340px;
     {foreach $typelist as $k=>$v}<option value="{$k}">{$v}</option>{/foreach} </select>
   </div>
   <div class="form-group">
-	<button class="btn btn-primary" type="submit"><i class="fa fa-search"></i>搜索</button>&nbsp;
+	<button class="btn btn-primary" type="submit"><i class="fa fa-search"></i> 搜索</button>&nbsp;
-	<a href="javascript:searchClear()" class="btn btn-default"><i class="fa fa-repeat"></i>重置</a>&nbsp;
+	<a href="javascript:searchClear()" class="btn btn-default"><i class="fa fa-repeat"></i> 重置</a>&nbsp;
-    <a href="javascript:refresh_plugins()" class="btn btn-success"><i class="fa fa-refresh"></i>重新获取</a>&nbsp;
+    <a href="javascript:refresh_plugins()" class="btn btn-success"><i class="fa fa-refresh"></i> 刷新列表</a>&nbsp;
-    <button type="button" class="btn btn-default" data-toggle="modal" data-target="#help"><i class="fa fa-info-circle"></i>帮助</button>
+    <a href="javascript:download_plugins()" class="btn btn-warning" id="batch_down" style="display:none;"><i class="fa fa-download"></i> 批量下载</a>&nbsp;
+    <button type="button" class="btn btn-default" data-toggle="modal" data-target="#help"><i class="fa fa-info-circle"></i> 帮助</button>
   </div>
 </form>
 </div>
@@ -69,12 +70,12 @@ td{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width:340px;
 	  </table>
 	</div>
   </div>
-<script src="//cdn.staticfile.org/layer/3.5.1/layer.js"></script>
+<script src="{$cdnpublic}layer/3.5.1/layer.js"></script>
-<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/bootstrap-table.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.19.1/bootstrap-table.min.js"></script>
-<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.19.1/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
 <script src="/static/js/custom.js"></script>
 <script>
-
+var skip_plugins = {:json_encode($skip_plugins)};
 function download_version(name, version, status){
     if(status == true){
         var confirm = layer.confirm('是否确定重新下载'+version+'版本插件包？', {
@@ -139,6 +140,53 @@ function refresh_plugins(){
     });
 }
 
+function download_plugins(){
+    var confirm = layer.confirm('批量下载当前分类下未下载的插件包', {
+        btn: ['确定','取消']
+    }, function(){
+        layer.close(confirm)
+        $.downloadCount = 0;
+        $.preDownloadCount = $.preDownload.length;
+        download_item();
+    }, function(){
+        layer.close(confirm)
+    });
+}
+
+function download_item(){
+    if($.preDownload.length == 0){
+        layer.alert('成功下载'+$.downloadCount+'个插件包！', {icon:1}, function(){layer.closeAll();searchSubmit();});
+        return;
+    }
+    var plugin = $.preDownload[0];
+    if(skip_plugins.indexOf(plugin.name) != -1){
+        $.preDownload.shift();
+		download_item();
+        return;
+    }
+    $.downloadCount++;
+    var ii = layer.msg('['+$.downloadCount+'/'+$.preDownloadCount+']正在下载'+plugin.name+'-'+plugin.version, {icon: 16, shade:0.1, time: 0});
+    $.ajax({
+		type : 'POST',
+		url : '/admin/download_plugin',
+        data: { name:plugin.name, version:plugin.version},
+		dataType : 'json',
+		success : function(data) {
+            layer.close(ii)
+			if(data.code == 0){
+                $.preDownload.shift();
+				download_item();
+			}else{
+				layer.alert(data.msg, {icon:2});
+			}
+		},
+		error:function(data){
+            layer.close(ii)
+			layer.msg('服务器错误', {icon:2});
+		}
+	});
+}
+
 function searchByType(type){
     $("input[name=keyword]").val('');
     $("select[name=type]").val(type);
@@ -208,6 +256,26 @@ $(document).ready(function(){
 				}
 			},
 		],
+        onLoadSuccess: function(data){
+            $.preDownload = [];
+            var type = $("select[name=type] option:selected").text();
+            if(type != '全部插件' && type != '运行环境' && type != '第三方应用'){
+                $("#batch_down").show();
+                if(data.length > 0){
+                    $.each(data, function(index, plugin){
+                        if(plugin.versions.length > 0){
+                            $.each(plugin.versions, function(index, version){
+                                if(!version.status){
+                                    $.preDownload.push({name:plugin.name, version:version.version})
+                                }
+                            });
+                        }
+                    });
+                }
+            }else{
+                $("#batch_down").hide();
+            }
+        }
 	})
 })
 </script>

app/view/admin/pluginsen.html

@@ -0,0 +1,276 @@
+{extend name="admin/layout" /}
+{block name="title"}插件列表{/block}
+{block name="main"}
+<style>
+td{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width:340px;}
+.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
+}
+</style>
+<div class="modal fade" id="help" tabindex="-1" role="dialog">
+	<div class="modal-dialog" role="document">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+					<span aria-hidden="true">&times;</span>
+				</button>
+				<h4 class="modal-title">帮助</h4>
+			</div>
+			<div class="modal-body">
+				<p>“版本与状态”一列中，红色的按钮代表本地不存在该版本插件包，需要点击下载；绿色的按钮代表已存在。</p>
+                <p>官方插件包本地存储路径是/data/en/plugins/package/软件标识-版本号.zip，第三方插件包路径是/data/plugins/other/other/，对于部分包含二次验证的插件可以自行修改。</p>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+			</div>
+		</div>
+	</div>
+</div>
+<div class="container" style="padding-top:70px;">
+	<div class="col-xs-12 center-block" style="float: none;">
+
+<div id="searchToolbar">
+<form onsubmit="return searchSubmit()" method="GET" class="form-inline">
+  <div class="form-group">
+    <label>搜索</label>
+	<input type="text" class="form-control" name="keyword" placeholder="应用名称">
+  </div>
+  <div class="form-group">
+	<select name="type" class="form-control"><option value="0">全部插件</option>
+    {foreach $typelist as $k=>$v}<option value="{$k}">{$v}</option>{/foreach} </select>
+  </div>
+  <div class="form-group">
+	<button class="btn btn-primary" type="submit"><i class="fa fa-search"></i> 搜索</button>&nbsp;
+	<a href="javascript:searchClear()" class="btn btn-default"><i class="fa fa-repeat"></i> 重置</a>&nbsp;
+    <a href="javascript:refresh_plugins()" class="btn btn-success"><i class="fa fa-refresh"></i> 刷新列表</a>&nbsp;
+    <a href="javascript:download_plugins()" class="btn btn-warning" id="batch_down" style="display:none;"><i class="fa fa-download"></i> 批量下载</a>&nbsp;
+    <button type="button" class="btn btn-default" data-toggle="modal" data-target="#help"><i class="fa fa-info-circle"></i> 帮助</button>
+  </div>
+</form>
+</div>
+
+      <table id="listTable">
+	  </table>
+	</div>
+  </div>
+<script src="{$cdnpublic}layer/3.5.1/layer.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.19.1/bootstrap-table.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.19.1/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
+<script src="/static/js/custom.js"></script>
+<script>
+
+function download_version(name, version, status){
+    if(status == true){
+        var confirm = layer.confirm('是否确定重新下载'+version+'版本插件包？', {
+            btn: ['确定','取消']
+        }, function(){
+            download_plugin(name, version)
+        }, function(){
+            layer.close(confirm)
+        });
+    }else{
+        download_plugin(name, version)
+    }
+}
+
+function download_plugin(name, version){
+    var ii = layer.msg('正在下载，请稍候...', {icon: 16, shade:0.1, time: 0});
+    $.ajax({
+		type : 'POST',
+		url : '/admin/download_plugin',
+        data: { name:name, version:version, os:'en'},
+		dataType : 'json',
+		success : function(data) {
+            layer.close(ii)
+			if(data.code == 0){
+				layer.alert(data.msg, {icon:1}, function(){layer.closeAll();searchSubmit();});
+			}else{
+				layer.alert(data.msg, {icon:2});
+			}
+		},
+		error:function(data){
+            layer.close(ii)
+			layer.msg('服务器错误', {icon:2});
+		}
+	});
+}
+
+function refresh_plugins(){
+    var confirm = layer.confirm('是否确定从宝塔官方获取最新插件列表？', {
+        btn: ['确定','取消']
+    }, function(){
+        layer.close(confirm)
+        var ii = layer.msg('正在获取插件列表，请稍候...', {icon: 16, shade:0.1, time: 0});
+        $.ajax({
+            type : 'GET',
+            url : '/admin/refresh_plugins?os=en',
+            dataType : 'json',
+            success : function(data) {
+                layer.close(ii)
+                if(data.code == 0){
+                    layer.alert(data.msg, {icon:1}, function(){layer.closeAll();searchSubmit();});
+                }else{
+                    layer.alert(data.msg, {icon:2});
+                }
+            },
+            error:function(data){
+                layer.close(ii)
+                layer.msg('服务器错误', {icon:2});
+            }
+        });
+    }, function(){
+        layer.close(confirm)
+    });
+}
+
+function download_plugins(){
+    var confirm = layer.confirm('批量下载当前分类下未下载的插件包', {
+        btn: ['确定','取消']
+    }, function(){
+        layer.close(confirm)
+        $.downloadCount = 0;
+        $.preDownloadCount = $.preDownload.length;
+        download_item();
+    }, function(){
+        layer.close(confirm)
+    });
+}
+
+function download_item(){
+    if($.preDownload.length == 0){
+        layer.alert('成功下载'+$.downloadCount+'个插件包！', {icon:1}, function(){layer.closeAll();searchSubmit();});
+        return;
+    }
+    $.downloadCount++;
+    var plugin = $.preDownload[0];
+    var ii = layer.msg('['+$.downloadCount+'/'+$.preDownloadCount+']正在下载'+plugin.name+'-'+plugin.version, {icon: 16, shade:0.1, time: 0});
+    $.ajax({
+		type : 'POST',
+		url : '/admin/download_plugin',
+        data: { name:plugin.name, version:plugin.version, os:'en'},
+		dataType : 'json',
+		success : function(data) {
+            layer.close(ii)
+			if(data.code == 0){
+                $.preDownload.shift();
+				download_item();
+			}else{
+				layer.alert(data.msg, {icon:2});
+			}
+		},
+		error:function(data){
+            layer.close(ii)
+			layer.msg('服务器错误', {icon:2});
+		}
+	});
+}
+
+function searchByType(type){
+    $("input[name=keyword]").val('');
+    $("select[name=type]").val(type);
+    searchSubmit()
+}
+
+$(document).ready(function(){
+	updateToolbar();
+	const defaultPageSize = 20;
+
+	$("#listTable").bootstrapTable({
+		url: '/admin/plugins_data?os=en',
+		pageNumber: 1,
+		pageSize: 15,
+        sidePagination: 'client',
+		classes: 'table table-striped table-hover table-bottom-border',
+		columns: [
+			{
+				field: 'name',
+				title: '软件标识',
+				formatter: function(value, row, index) {
+					return '<b>'+value+'</b>';
+				}
+			},
+			{
+				field: 'title',
+				title: '软件名称'
+			},
+            {
+				field: 'type',
+				title: '软件分类',
+				formatter: function(value, row, index) {
+					return '<a href="javascript:searchByType('+value+')" title="查看该分类下的插件">'+row.typename+'</a>';
+				}
+			},
+			{
+				field: 'desc',
+				title: '说明',
+			},
+			{
+				field: 'price',
+				title: '价格',
+				formatter: function(value, row, index) {
+					return value > 0 ? '<span style="color:#fc6d26">￥'+value+'</span>' : '免费';
+				}
+			},
+			{
+				field: 'author',
+				title: '开发商'
+			},
+			{
+				field: 'versions',
+				title: '版本与状态',
+				formatter: function(value, row, index) {
+                    var html = '';
+                    if(row.type == 5 || row.name == 'mail_sys' || row.name == 'dns_manager'){
+                        html += '<a href="javascript:" class="btn btn-xs btn-success" disabled>无需下载</a>';
+                    }else{
+                        $.each(value, function(index,item){
+                            if(item.status)
+                                html += '<a href="javascript:download_version(\''+row.name+'\',\''+item.version+'\','+item.status+')" class="btn btn-xs btn-success">'+item.version+'</a>&nbsp;';
+                            else
+                                html += '<a href="javascript:download_version(\''+row.name+'\',\''+item.version+'\','+item.status+')" class="btn btn-xs btn-danger">'+item.version+'</a>&nbsp;';
+                        })
+                    }
+                    return html
+				}
+			},
+		],
+        onLoadSuccess: function(data){
+            $.preDownload = [];
+            var type = $("select[name=type] option:selected").text();
+            if(type != '全部插件' && type != '运行环境' && type != '第三方应用'){
+                $("#batch_down").show();
+                if(data.length > 0){
+                    $.each(data, function(index, plugin){
+                        if(plugin.versions.length > 0 && plugin.name!='mail_sys' && plugin.name!='dns_manager'){
+                            $.each(plugin.versions, function(index, version){
+                                if(!version.status){
+                                    $.preDownload.push({name:plugin.name, version:version.version})
+                                }
+                            });
+                        }
+                    });
+                }
+            }else{
+                $("#batch_down").hide();
+            }
+        }
+	})
+})
+</script>
+{/block}

app/view/admin/pluginswin.html

@@ -35,7 +35,6 @@ td{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width:340px;
 			<div class="modal-body">
 				<p>“版本与状态”一列中，红色的按钮代表本地不存在该版本插件包，需要点击下载；绿色的按钮代表已存在。</p>
                 <p>官方插件包本地存储路径是/data/win/plugins/package/软件标识-版本号.zip，第三方插件包路径是/data/plugins/other/other/，对于部分包含二次验证的插件可以自行修改。</p>
-                <p>点击【重新获取】按钮会从宝塔官方获取最新插件列表，但是插件包需要手动点击下载。如果需要批量下载插件包，可查看<a href="/admin/set/mod/task">定时任务设置</a></p>
 			</div>
 			<div class="modal-footer">
 				<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
@@ -57,10 +56,11 @@ td{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width:340px;
     {foreach $typelist as $k=>$v}<option value="{$k}">{$v}</option>{/foreach} </select>
   </div>
   <div class="form-group">
-	<button class="btn btn-primary" type="submit"><i class="fa fa-search"></i>搜索</button>&nbsp;
+	<button class="btn btn-primary" type="submit"><i class="fa fa-search"></i> 搜索</button>&nbsp;
-	<a href="javascript:searchClear()" class="btn btn-default"><i class="fa fa-repeat"></i>重置</a>&nbsp;
+	<a href="javascript:searchClear()" class="btn btn-default"><i class="fa fa-repeat"></i> 重置</a>&nbsp;
-    <a href="javascript:refresh_plugins()" class="btn btn-success"><i class="fa fa-refresh"></i>重新获取</a>&nbsp;
+    <a href="javascript:refresh_plugins()" class="btn btn-success"><i class="fa fa-refresh"></i> 刷新列表</a>&nbsp;
-    <button type="button" class="btn btn-default" data-toggle="modal" data-target="#help"><i class="fa fa-info-circle"></i>帮助</button>
+    <a href="javascript:download_plugins()" class="btn btn-warning" id="batch_down" style="display:none;"><i class="fa fa-download"></i> 批量下载</a>&nbsp;
+    <button type="button" class="btn btn-default" data-toggle="modal" data-target="#help"><i class="fa fa-info-circle"></i> 帮助</button>
   </div>
 </form>
 </div>
@@ -69,9 +69,9 @@ td{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width:340px;
 	  </table>
 	</div>
   </div>
-<script src="//cdn.staticfile.org/layer/3.5.1/layer.js"></script>
+<script src="{$cdnpublic}layer/3.5.1/layer.js"></script>
-<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/bootstrap-table.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.19.1/bootstrap-table.min.js"></script>
-<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.19.1/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
 <script src="/static/js/custom.js"></script>
 <script>
 
@@ -139,6 +139,48 @@ function refresh_plugins(){
     });
 }
 
+function download_plugins(){
+    var confirm = layer.confirm('批量下载当前分类下未下载的插件包', {
+        btn: ['确定','取消']
+    }, function(){
+        layer.close(confirm)
+        $.downloadCount = 0;
+        $.preDownloadCount = $.preDownload.length;
+        download_item();
+    }, function(){
+        layer.close(confirm)
+    });
+}
+
+function download_item(){
+    if($.preDownload.length == 0){
+        layer.alert('成功下载'+$.downloadCount+'个插件包！', {icon:1}, function(){layer.closeAll();searchSubmit();});
+        return;
+    }
+    $.downloadCount++;
+    var plugin = $.preDownload[0];
+    var ii = layer.msg('['+$.downloadCount+'/'+$.preDownloadCount+']正在下载'+plugin.name+'-'+plugin.version, {icon: 16, shade:0.1, time: 0});
+    $.ajax({
+		type : 'POST',
+		url : '/admin/download_plugin',
+        data: { name:plugin.name, version:plugin.version, os:'Windows'},
+		dataType : 'json',
+		success : function(data) {
+            layer.close(ii)
+			if(data.code == 0){
+                $.preDownload.shift();
+				download_item();
+			}else{
+				layer.alert(data.msg, {icon:2});
+			}
+		},
+		error:function(data){
+            layer.close(ii)
+			layer.msg('服务器错误', {icon:2});
+		}
+	});
+}
+
 function searchByType(type){
     $("input[name=keyword]").val('');
     $("select[name=type]").val(type);
@@ -208,6 +250,26 @@ $(document).ready(function(){
 				}
 			},
 		],
+        onLoadSuccess: function(data){
+            $.preDownload = [];
+            var type = $("select[name=type] option:selected").text();
+            if(type != '全部插件' && type != '运行环境' && type != '第三方应用'){
+                $("#batch_down").show();
+                if(data.length > 0){
+                    $.each(data, function(index, plugin){
+                        if(plugin.versions.length > 0){
+                            $.each(plugin.versions, function(index, version){
+                                if(!version.status){
+                                    $.preDownload.push({name:plugin.name, version:version.version})
+                                }
+                            });
+                        }
+                    });
+                }
+            }else{
+                $("#batch_down").hide();
+            }
+        }
 	})
 })
 </script>

app/view/admin/record.html

@@ -13,8 +13,8 @@
 	<input type="text" class="form-control" name="ip" placeholder="服务器IP">
   </div>
   <div class="form-group">
-	<button class="btn btn-primary" type="submit"><i class="fa fa-search"></i>搜索</button>&nbsp;
+	<button class="btn btn-primary" type="submit"><i class="fa fa-search"></i> 搜索</button>&nbsp;
-	<a href="javascript:searchClear()" class="btn btn-default"><i class="fa fa-repeat"></i>重置</a>&nbsp;
+	<a href="javascript:searchClear()" class="btn btn-default"><i class="fa fa-repeat"></i> 重置</a>&nbsp;
   </div>
 </form>
 </div>
@@ -23,9 +23,9 @@
 	  </table>
 	</div>
   </div>
-<script src="//cdn.staticfile.org/layer/3.5.1/layer.js"></script>
+<script src="{$cdnpublic}layer/3.5.1/layer.js"></script>
-<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/bootstrap-table.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.19.1/bootstrap-table.min.js"></script>
-<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.19.1/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
 <script src="/static/js/custom.js"></script>
 <script>
 

app/view/admin/set.html

@@ -4,7 +4,7 @@
 <div class="container" style="padding-top:70px;">
 {if $mod=='sys'}
 <div class="col-sm-12 col-md-6 center-block">
-<div class="panel panel-primary">
+<div class="panel panel-success">
 <div class="panel-heading"><h3 class="panel-title">系统基本设置</h3></div>
 <div class="panel-body">
   <form onsubmit="return saveSetting(this)" method="post" class="form" role="form">
@@ -18,6 +18,16 @@
 	  <select class="form-control" name="download_page" default="{:config_get('download_page')}"><option value="0">关闭</option><option value="1">开启</option></select>
       <font color="green">页面地址：<a href="/download" target="_blank">/download</a>，开启后可以公开访问，否则只能管理员访问</font>
 	</div>
+	<div class="form-group text-center">
+	  <input type="submit" name="submit" value="保存" class="btn btn-success btn-block"/>
+	</div>
+  </form>
+</div>
+</div>
+<div class="panel panel-info">
+<div class="panel-heading"><h3 class="panel-title">Linux面板版本设置</h3></div>
+<div class="panel-body">
+  <form onsubmit="return saveSetting(this)" method="post" class="form" role="form">
     <div class="form-group">
       <label>宝塔Linux面板最新版本号：</label>
       <input type="text" name="new_version" value="{:config_get('new_version')}" class="form-control"/>
@@ -33,6 +43,16 @@
       <input type="date" name="update_date" value="{:config_get('update_date')}" class="form-control"/>
 	  <font color="green">用于检测更新接口返回</font>
     </div>
+	<div class="form-group text-center">
+	  <input type="submit" name="submit" value="保存" class="btn btn-success btn-block"/>
+	</div>
+  </form>
+</div>
+</div>
+<div class="panel panel-info">
+<div class="panel-heading"><h3 class="panel-title">Windows面板版本设置</h3></div>
+<div class="panel-body">
+  <form onsubmit="return saveSetting(this)" method="post" class="form" role="form">
 	<div class="form-group">
       <label>宝塔Windows面板最新版本号：</label>
       <input type="text" name="new_version_win" value="{:config_get('new_version_win')}" class="form-control"/>
@@ -48,6 +68,18 @@
       <input type="date" name="update_date_win" value="{:config_get('update_date_win')}" class="form-control"/>
 	  <font color="green">用于检测更新接口返回</font>
     </div>
+	<div class="form-group text-center">
+	  <input type="submit" name="submit" value="保存" class="btn btn-success btn-block"/>
+	</div>
+  </form>
+</div>
+</div>
+</div>
+<div class="col-sm-12 col-md-6 center-block">
+<div class="panel panel-info">
+<div class="panel-heading"><h3 class="panel-title">云监控版本设置</h3></div>
+<div class="panel-body">
+  <form onsubmit="return saveSetting(this)" method="post" class="form" role="form">
 	<div class="form-group">
       <label>宝塔云监控最新版本号：</label>
       <input type="text" name="new_version_btm" value="{:config_get('new_version_btm')}" class="form-control"/>
@@ -67,13 +99,44 @@
   </form>
 </div>
 </div>
+<div class="panel panel-info">
+<div class="panel-heading"><h3 class="panel-title">aaPanel面板版本设置</h3></div>
+<div class="panel-body">
+  <form onsubmit="return saveSetting(this)" method="post" class="form" role="form">
+    <div class="form-group">
+      <label>aaPanel面板最新版本号：</label>
+      <input type="text" name="new_version_en" value="{:config_get('new_version_en')}" class="form-control"/>
+      <font color="green">用于一键更新脚本获取最新版本号，以及检测更新接口。并确保已在/public/install/update/放置对应版本更新包</font>
+    </div>
+	<div class="form-group">
+      <label>aaPanel面板更新日志：</label>
+      <textarea class="form-control" name="update_msg_en" rows="5" placeholder="支持HTML代码">{:config_get('update_msg_en')}</textarea>
+      <font color="green">用于检测更新接口返回</font>
+    </div>
+	<div class="form-group">
+      <label>aaPanel面板更新日期：</label>
+      <input type="date" name="update_date_en" value="{:config_get('update_date_en')}" class="form-control"/>
+	  <font color="green">用于检测更新接口返回</font>
+    </div>
+	<div class="form-group text-center">
+	  <input type="submit" name="submit" value="保存" class="btn btn-success btn-block"/>
+	</div>
+  </form>
 </div>
+</div>
+</div>
+{elseif $mod=='api'}
 <div class="col-sm-12 col-md-6 center-block">
-<div class="panel panel-primary">
+<div class="panel panel-info">
 <div class="panel-heading"><h3 class="panel-title">宝塔Linux面板接口设置</h3></div>
 <div class="panel-body">
   <form onsubmit="return saveSetting(this)" method="post" class="form" role="form">
-    <p>以下宝塔面板请使用官方最新脚本安装并绑定账号，用于获取最新插件列表及插件包</p>
+	<div class="form-group">
+	  <label>对接方式：</label><br/>
+	  <select class="form-control" name="bt_type" default="{:config_get('bt_type')}"><option value="0">对接宝塔面板接口</option><option value="1">对接其他第三方云端</option></select>
+	</div><hr/>
+	<div id="bt_type_0" style="{if config_get('bt_type')==1}display:none;{/if}">
+    <p>以下宝塔面板请使用官方最新脚本安装并绑定账号，用于获取插件列表及插件包</p>
     <p><a href="/static/file/kaixin.zip">下载专用插件(Linux)</a>，在面板【软件商店】->【第三方应用】，点击【导入插件】，导入该专用插件。</p>
 	<div class="form-group">
 	  <label>宝塔面板URL：</label><br/>
@@ -84,6 +147,14 @@
 	  <label>宝塔面板接口密钥：</label>
 	  <input type="text" name="bt_key" value="{:config_get('bt_key')}" class="form-control"/>
 	</div>
+	</div>
+	<div id="bt_type_1" style="{if !config_get('bt_type')}display:none;{/if}">
+	<div class="form-group">
+	  <label>第三方云端首页URL：</label><br/>
+	  <input type="text" name="bt_surl" value="{:config_get('bt_surl')}" class="form-control"/>
+      <font color="green">填写规则如：<u>http://www.example.com/</u> ，必须以/结尾</font>
+	</div>
+	</div>
 	<div class="form-group text-center">
       <button type="button" class="btn btn-info btn-block" id="testbturl">测试连接</button>
 	  <input type="submit" name="submit" value="保存" class="btn btn-success btn-block"/>
@@ -91,12 +162,19 @@
   </form>
 </div>
 </div>
-<div class="panel panel-primary">
+</div>
+<div class="col-sm-12 col-md-6 center-block">
+<div class="panel panel-info">
 <div class="panel-heading"><h3 class="panel-title">宝塔Windows面板接口设置</h3></div>
 <div class="panel-body">
   <form onsubmit="return saveSetting(this)" method="post" class="form" role="form">
-    <p>以下宝塔面板请使用官方最新脚本安装并绑定账号，用于获取最新插件列表及插件包</p>
+	<div class="form-group">
-    <p><a href="/static/file/win/kaixin.zip">下载专用插件(Win)</a>，在面板【软件商店】->【第三方应用】，点击【导入插件】，导入该专用插件。</p>
+	  <label>对接方式：</label><br/>
+	  <select class="form-control" name="wbt_type" default="{:config_get('wbt_type')}"><option value="0">对接宝塔面板接口</option><option value="1">对接其他第三方云端</option></select>
+	</div><hr/>
+	<div id="wbt_type_0" style="{if config_get('wbt_type')==1}display:none;{/if}">
+    <p>以下宝塔面板请使用官方最新脚本安装并绑定账号，用于获取插件列表及插件包</p>
+    <p><a href="/static/file/win/kaixin.zip">下载专用插件(Win)</a>，上传到 /BtSoft/panel/plugin/ 解压，即可在软件商店已安装列表看到。</p>
 	<div class="form-group">
 	  <label>宝塔面板URL：</label><br/>
 	  <input type="text" name="wbt_url" value="{:config_get('wbt_url')}" class="form-control"/>
@@ -106,6 +184,14 @@
 	  <label>宝塔面板接口密钥：</label>
 	  <input type="text" name="wbt_key" value="{:config_get('wbt_key')}" class="form-control"/>
 	</div>
+	</div>
+	<div id="wbt_type_1" style="{if !config_get('wbt_type')}display:none;{/if}">
+	<div class="form-group">
+	  <label>第三方云端首页URL：</label><br/>
+	  <input type="text" name="wbt_surl" value="{:config_get('wbt_surl')}" class="form-control"/>
+      <font color="green">填写规则如：<u>http://www.example.com/</u> ，必须以/结尾</font>
+	</div>
+	</div>
 	<div class="form-group text-center">
       <button type="button" class="btn btn-info btn-block" id="testbturl2">测试连接</button>
 	  <input type="submit" name="submit" value="保存" class="btn btn-success btn-block"/>
@@ -114,14 +200,80 @@
 </div>
 </div>
 </div>
+<div class="col-sm-12 col-md-6 center-block">
+<div class="panel panel-info">
+<div class="panel-heading"><h3 class="panel-title">aaPanel面板接口设置</h3></div>
+<div class="panel-body">
+  <form onsubmit="return saveSetting(this)" method="post" class="form" role="form">
+	<div class="form-group">
+	  <label>对接方式：</label><br/>
+	  <select class="form-control" name="enbt_type" default="{:config_get('enbt_type')}"><option value="0">对接aaPanel面板接口</option><option value="1">对接其他第三方云端</option></select>
+	</div><hr/>
+	<div id="enbt_type_0" style="{if config_get('enbt_type')==1}display:none;{/if}">
+    <p>以下aaPanel面板请使用官方最新脚本安装并绑定账号，用于获取插件列表及插件包</p>
+    <p><a href="/static/file/en/kaixin.zip">下载专用插件(aaPanel)</a>，在面板【软件商店】->【第三方应用】，点击【导入插件】，导入该专用插件。</p>
+	<div class="form-group">
+	  <label>aaPanel面板URL：</label><br/>
+	  <input type="text" name="enbt_url" value="{:config_get('enbt_url')}" class="form-control"/>
+      <font color="green">填写规则如：<u>http://192.168.1.1:8888</u> ，不要带其他后缀</font>
+	</div>
+	<div class="form-group">
+	  <label>aaPanel面板接口密钥：</label>
+	  <input type="text" name="enbt_key" value="{:config_get('enbt_key')}" class="form-control"/>
+	</div>
+	</div>
+	<div id="enbt_type_1" style="{if !config_get('enbt_type')}display:none;{/if}">
+	<div class="form-group">
+	  <label>第三方云端首页URL：</label><br/>
+	  <input type="text" name="enbt_surl" value="{:config_get('enbt_surl')}" class="form-control"/>
+      <font color="green">填写规则如：<u>http://www.example.com/</u> ，必须以/结尾</font>
+	</div>
+	</div>
+	<div class="form-group text-center">
+      <button type="button" class="btn btn-info btn-block" id="testbturl3">测试连接</button>
+	  <input type="submit" name="submit" value="保存" class="btn btn-success btn-block"/>
+	</div>
+  </form>
+</div>
+</div>
+</div>
+<script>
+$("select[name='bt_type']").change(function(){
+	if($(this).val() == 1){
+		$("#bt_type_0").hide();
+		$("#bt_type_1").show();
+	}else{
+		$("#bt_type_0").show();
+		$("#bt_type_1").hide();
+	}
+});
+$("select[name='wbt_type']").change(function(){
+	if($(this).val() == 1){
+		$("#wbt_type_0").hide();
+		$("#wbt_type_1").show();
+	}else{
+		$("#wbt_type_0").show();
+		$("#wbt_type_1").hide();
+	}
+});
+$("select[name='enbt_type']").change(function(){
+	if($(this).val() == 1){
+		$("#enbt_type_0").hide();
+		$("#enbt_type_1").show();
+	}else{
+		$("#enbt_type_0").show();
+		$("#enbt_type_1").hide();
+	}
+});
+</script>
 {elseif $mod=='task'}
 <div class="col-sm-12 col-md-6 center-block">
 <div class="panel panel-success">
-<div class="panel-heading"><h3 class="panel-title">定时任务说明</h3></div>
+<div class="panel-heading"><h3 class="panel-title">自动更新插件说明</h3></div>
 <div class="panel-body">
   <form onsubmit="return saveSetting(this)" method="post" class="form" role="form">
     <div class="alert alert-info">使用以下命令可以从宝塔官方获取最新的插件列表并批量下载插件包（增量更新）。<br/>你也可以将此命令添加到crontab以使此云端的插件保持最新，建议1天执行1次。</div>
-	<div class="alert alert-danger">使用命令执行之后，可能会导致 /data 目录下文件权限不对，后台插件列表下载插件覆盖会报错，需要手动循环设置 /data 目录权限。</div>
+	{if $is_user_www}<div class="alert alert-danger">注：计划任务执行用户必须选择www用户</div>{/if}
     <div class="alert alert-warning">上次运行时间：{$runtime|raw}</div>
     <div class="list-group-item">php {:app()->getRootPath()}think updateall</div><br/>
   </form>
@@ -130,7 +282,7 @@
 </div>
 <div class="col-sm-12 col-md-6 center-block">
 <div class="panel panel-info">
-<div class="panel-heading"><h3 class="panel-title">定时任务设置</h3></div>
+<div class="panel-heading"><h3 class="panel-title">自动更新插件设置</h3></div>
 <div class="panel-body">
   <form onsubmit="return saveSetting(this)" method="post" class="form" role="form">
 	<div class="form-group">
@@ -141,6 +293,10 @@
 	  <label>Windows面板批量下载插件范围：</label><br/>
 	  <select class="form-control" name="updateall_type_win" default="{:config_get('updateall_type_win')}"><option value="0">仅免费插件</option><option value="1">免费插件+专业版插件</option><option value="2">免费插件+专业版插件+企业版插件</option></select><font color="green">（批量下载不包含所有第三方插件，第三方插件需要去手动下载。）</font>
 	</div>
+	<div class="form-group">
+		<label>aaPanel面板批量下载插件范围：</label><br/>
+		<select class="form-control" name="updateall_type_en" default="{:config_get('updateall_type_en')}"><option value="0">仅免费插件</option><option value="1">免费插件+专业版插件</option><option value="2">免费插件+专业版插件+企业版插件</option></select><font color="green">（批量下载不包含所有第三方插件，第三方插件需要去手动下载。）</font>
+	</div>
 	<div class="form-group text-center">
 	  <input type="submit" name="submit" value="保存" class="btn btn-success btn-block"/>
 	</div>
@@ -188,8 +344,17 @@
   </form>
 </div>
 </div>
+<div class="panel panel-primary">
+	<div class="panel-heading"><h3 class="panel-title">清理旧版本插件工具</h3></div>
+	<div class="panel-body">
+	  <form onsubmit="return saveAccount(this)" method="post" class="form" role="form">
+		<div class="alert alert-info" style="word-break:break-all;">使用以下命令可清理旧版本的插件文件，以释放空间占用。</div>
+		<div class="list-group-item" style="word-break:break-all;">php {:app()->getRootPath()}think clean</div><br/>
+	  </form>
+	</div>
+</div>
 {/if}
-<script src="//cdn.staticfile.org/layer/3.5.1/layer.js"></script>
+<script src="{$cdnpublic}layer/3.5.1/layer.js"></script>
 <script>
 $(document).ready(function(){
 	var items = $("select[default]");
@@ -197,22 +362,35 @@ $(document).ready(function(){
 		$(items[i]).val($(items[i]).attr("default")||0);
 	}
     $("#testbturl").click(function(){
-        var bt_url = $("input[name=bt_url]").val();
+		var bt_type = $("select[name=bt_type]").val();
-        var bt_key = $("input[name=bt_key]").val();
+		if(bt_type == '1'){
-        if(bt_url == ''){
+			var bt_surl = $("input[name=bt_surl]").val();
-            layer.alert('宝塔面板URL不能为空');return;
+			if(bt_surl == ''){
-        }
+				layer.alert('第三方云端URL不能为空');return;
-        if(bt_url.indexOf('http://')==-1 && bt_url.indexOf('https://')==-1){
+			}
-            layer.alert('宝塔面板URL不正确');return;
+			if(bt_surl.indexOf('http://')==-1 && bt_surl.indexOf('https://')==-1){
-        }
+				layer.alert('第三方云端URL不正确');return;
-        if(bt_key == ''){
+			}
-            layer.alert('宝塔面板接口密钥不能为空');return;
+			var postdata = {bt_type:bt_type, bt_surl:bt_surl};
-        }
+		}else{
+			var bt_url = $("input[name=bt_url]").val();
+			var bt_key = $("input[name=bt_key]").val();
+			if(bt_url == ''){
+				layer.alert('宝塔面板URL不能为空');return;
+			}
+			if(bt_url.indexOf('http://')==-1 && bt_url.indexOf('https://')==-1){
+				layer.alert('宝塔面板URL不正确');return;
+			}
+			if(bt_key == ''){
+				layer.alert('宝塔面板接口密钥不能为空');return;
+			}
+			var postdata = {os:'linux', bt_type:bt_type, bt_url:bt_url, bt_key:bt_key};
+		}
         var ii = layer.load(2, {shade:[0.1,'#fff']});
         $.ajax({
             type : 'POST',
             url : '/admin/testbturl',
-            data : {bt_url:bt_url, bt_key:bt_key},
+            data : postdata,
             dataType : 'json',
             success : function(data) {
                 layer.close(ii);
@@ -229,22 +407,80 @@ $(document).ready(function(){
         });
     })
 	$("#testbturl2").click(function(){
-        var wbt_url = $("input[name=wbt_url]").val();
+		var wbt_type = $("select[name=wbt_type]").val();
-        var wbt_key = $("input[name=wbt_key]").val();
+		if(wbt_type == '1'){
-        if(wbt_url == ''){
+			var wbt_surl = $("input[name=wbt_surl]").val();
-            layer.alert('宝塔面板URL不能为空');return;
+			if(wbt_surl == ''){
-        }
+				layer.alert('第三方云端URL不能为空');return;
-        if(wbt_url.indexOf('http://')==-1 && wbt_url.indexOf('https://')==-1){
+			}
-            layer.alert('宝塔面板URL不正确');return;
+			if(wbt_surl.indexOf('http://')==-1 && wbt_surl.indexOf('https://')==-1){
-        }
+				layer.alert('第三方云端URL不正确');return;
-        if(wbt_key == ''){
+			}
-            layer.alert('宝塔面板接口密钥不能为空');return;
+			var postdata = {bt_type:wbt_type, bt_surl:wbt_surl};
-        }
+		}else{
+			var wbt_url = $("input[name=wbt_url]").val();
+			var wbt_key = $("input[name=wbt_key]").val();
+			if(wbt_url == ''){
+				layer.alert('宝塔面板URL不能为空');return;
+			}
+			if(wbt_url.indexOf('http://')==-1 && wbt_url.indexOf('https://')==-1){
+				layer.alert('宝塔面板URL不正确');return;
+			}
+			if(wbt_key == ''){
+				layer.alert('宝塔面板接口密钥不能为空');return;
+			}
+			var postdata = {os:'win', bt_type:wbt_type, bt_url:wbt_url, bt_key:wbt_key};
+		}
         var ii = layer.load(2, {shade:[0.1,'#fff']});
         $.ajax({
             type : 'POST',
             url : '/admin/testbturl',
-            data : {bt_url:wbt_url, bt_key:wbt_key},
+            data : postdata,
+            dataType : 'json',
+            success : function(data) {
+                layer.close(ii);
+                if(data.code == 0){
+                    layer.msg(data.msg, {icon: 1, time:1000})
+                }else{
+                    layer.alert(data.msg, {icon: 2})
+                }
+            },
+            error:function(data){
+                layer.close(ii);
+                layer.msg('服务器错误');
+            }
+        });
+    })
+	$("#testbturl3").click(function(){
+		var enbt_type = $("select[name=enbt_type]").val();
+		if(enbt_type == '1'){
+			var enbt_surl = $("input[name=enbt_surl]").val();
+			if(enbt_surl == ''){
+				layer.alert('第三方云端URL不能为空');return;
+			}
+			if(enbt_surl.indexOf('http://')==-1 && enbt_surl.indexOf('https://')==-1){
+				layer.alert('第三方云端URL不正确');return;
+			}
+			var postdata = {bt_type:enbt_type, bt_surl:enbt_surl};
+		}else{
+			var enbt_url = $("input[name=enbt_url]").val();
+			var enbt_key = $("input[name=enbt_key]").val();
+			if(enbt_url == ''){
+				layer.alert('宝塔面板URL不能为空');return;
+			}
+			if(enbt_url.indexOf('http://')==-1 && enbt_url.indexOf('https://')==-1){
+				layer.alert('宝塔面板URL不正确');return;
+			}
+			if(enbt_key == ''){
+				layer.alert('宝塔面板接口密钥不能为空');return;
+			}
+			var postdata = {os:'en', bt_type:enbt_type, bt_url:enbt_url, bt_key:enbt_key};
+		}
+        var ii = layer.load(2, {shade:[0.1,'#fff']});
+        $.ajax({
+            type : 'POST',
+            url : '/admin/testbturl',
+            data : postdata,
             dataType : 'json',
             success : function(data) {
                 layer.close(ii);

app/view/admin/ssl.html

@@ -0,0 +1,86 @@
+{extend name="admin/layout" /}
+{block name="title"}自签名SSL证书生成{/block}
+{block name="main"}
+<style>
+.control-label[is-required]:before {
+    content: "*";
+    color: #f56c6c;
+    margin-right: 4px;
+}
+</style>
+<div class="container" style="padding-top:70px;">
+<div class="col-sm-12 col-md-10 col-lg-8 center-block" style="float: none;">
+<div class="panel panel-primary">
+<div class="panel-heading"><h3 class="panel-title">自签名SSL证书生成</h3></div>
+<div class="panel-body">
+    {if $isca}
+    <div class="alert alert-warning" style="word-break:break-all;">下载CA证书并导入，可解决浏览器不安全提醒。<br/>Windows：<a href="/ssl/baota_root.pfx">baota_root.pfx</a>（密码为空），Mac/Linux：<a href="/ssl/baota_root.crt">baota_root.crt</a></div>
+  <form onsubmit="return makeSSL(this)" method="post" class="form" role="form">
+	<div class="form-group">
+      <label is-required="true" class="control-label">域名列表：</label>
+      <textarea class="form-control" name="domain_list" rows="6" placeholder="每行一个域名/IP，支持通配符" required></textarea>
+    </div>
+	<div class="form-group">
+      <label class="control-label">通用名称：</label>
+      <input type="text" name="common_name" value="" placeholder="留空则为域名列表第一个域名" class="form-control"/>
+    </div>
+    <div class="form-group">
+      <label is-required="true" class="control-label">有效天数：</label>
+      <input type="number" name="validity" value="3650" class="form-control" required/>
+    </div>
+	<div class="form-group text-center">
+	  <input type="submit" name="submit" value="生成自签名证书" class="btn btn-success btn-block"/>
+	</div>
+    <div class="form-group row" id="result" style="display:none;">
+        <div class="col-md-6">
+            <label class="control-label">SSL证书：</label>
+            <textarea class="form-control" name="ssl_cert" rows="5" onclick="copy(this)" title="点击复制"></textarea>
+        </div>
+        <div class="col-md-6">
+            <label class="control-label">SSL证书私钥：</label>
+            <textarea class="form-control" name="ssl_key" rows="5" onclick="copy(this)" title="点击复制"></textarea>
+        </div>
+    </div>
+  </form>
+    {else}
+    <div class="alert alert-danger" role="alert">你还没有生成CA证书，无法生成SSL证书！</div>
+    <div class="alert alert-info" style="word-break:break-all;">执行以下命令，生成自签名CA证书。然后，可通过接口或当前页面生成SSL证书，用于面板访问。</div>
+    <div class="list-group-item" style="word-break:break-all;">cd {:app()->getRootPath()}app/script && chmod +x cacert.sh && ./cacert.sh</div><br/>
+    {/if}
+</div>
+</div>
+<script src="{$cdnpublic}layer/3.5.1/layer.js"></script>
+<script>
+function makeSSL(obj){
+    var ii = layer.load(2, {shade:[0.1,'#fff']});
+	$.ajax({
+		type : 'POST',
+		url : '/admin/ssl',
+		data : $(obj).serialize(),
+		dataType : 'json',
+		success : function(data) {
+			layer.close(ii);
+			if(data.code == 0){
+                $("textarea[name='ssl_cert']").val(data.cert);
+                $("textarea[name='ssl_key']").val(data.key);
+                $("#result").show();
+                layer.msg('SSL证书生成成功', {icon:1, time:800});
+			}else{
+				layer.alert(data.msg, {icon: 2})
+			}
+		},
+		error:function(data){
+            layer.close(ii);
+			layer.msg('服务器错误');
+		}
+	});
+    return false;
+}
+function copy(obj){
+    if($(obj).val() == '') return;
+    $(obj).select();
+    document.execCommand("Copy");
+    layer.msg('复制成功', {icon:1, time:500});
+}
+</script>
+{/block}

app/view/index/download.html

@@ -43,7 +43,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="install-box windows">
+					{if config_get('new_version_win')}<div class="install-box windows">
 						<div class="img">
 							<img src="/static/images/prd_2_03.png">
 						</div>
@@ -60,23 +60,37 @@
 								<a class="btn" href="javascript:;" id="goInstallWindows">查看安装方法</a>
 							</div>
 						</div>
-					</div>
+					</div>{/if}
 				</div>
-				{if config_get('new_version_btm')}<div class="disflex flex_lrcenter mt_30 install-list">
+				{if config_get('new_version_btm') || config_get('new_version_en')}<div class="disflex flex_lrcenter mt_30 install-list">
-					<div class="install-box monitor">
+					{if config_get('new_version_win')}<div class="install-box monitor">
 						<div class="img">
-							<img src="/static/images/bt_monitor.png" />
+							<img src="/static/images/bt_monitor.png" style="height: 96px;"/>
 						</div>
 						<div class="cont">
 							<div class="top">
-								<div class="title">堡塔云监控</div>
+								<div class="title">云安全监控</div>
-								<div class="desc">多服务监控和异常告警通知</div>
+								<div class="desc">多机跨平台安全管理和监控</div>
 							</div>
 							<div class="bottom">
 								<a class="btn" href="javascript:;" id="goInstallMonitor">查看安装脚本</a>
 							</div>
 						</div>
-					</div>
+					</div>{/if}
+					{if config_get('new_version_en')}<div class="install-box monitor">
+						<div class="img">
+							<img src="/static/images/aapanel.png" style="height: 96px;"/>
+						</div>
+						<div class="cont">
+							<div class="top">
+								<div class="title">aaPanel {:config_get('new_version_en')}</div>
+								<div class="desc">宝塔面板国际版</div>
+							</div>
+							<div class="bottom">
+								<a class="btn" href="javascript:;" id="goInstallAaPanel">查看安装脚本</a>
+							</div>
+						</div>
+					</div>{/if}
 				</div>{/if}
 			</div>
 		</div>
@@ -96,15 +110,15 @@
 			<div class="install-code">
 				<span class="osname">Centos安装脚本</span>
 				<div class="code-cont">
-					<div class="command" title="点击复制Centos安装脚本">yum install -y wget && wget -O install.sh {$siteurl}/install/install_6.0.sh && sh install.sh</div>
+					<div class="command" title="点击复制Centos安装脚本">yum install -y wget && wget -O install.sh {$siteurl}/install/install_panel.sh && sh install.sh</div>
-					<span class="ico-copy" title="点击复制Centos安装脚本" data-clipboard-text="yum install -y wget && wget -O install.sh {$siteurl}/install/install_6.0.sh && sh install.sh">复制</span>
+					<span class="ico-copy" title="点击复制Centos安装脚本" data-clipboard-text="yum install -y wget && wget -O install.sh {$siteurl}/install/install_panel.sh && sh install.sh">复制</span>
 				</div>
 			</div>
 			<div class="install-code">
 				<span class="osname">Ubuntu/Debian安装脚本</span>
 				<div class="code-cont">
-					<div class="command" title="点击复制Ubuntu/Debian安装脚本">wget -O install.sh {$siteurl}/install/install_6.0.sh && bash install.sh</div>
+					<div class="command" title="点击复制Ubuntu/Debian安装脚本">wget -O install.sh {$siteurl}/install/install_panel.sh && bash install.sh</div>
-					<span class="ico-copy" title="点击复制Ubuntu/Debian安装脚本" data-clipboard-text="wget -O install.sh {$siteurl}/install/install_6.0.sh && bash install.sh">复制</span>
+					<span class="ico-copy" title="点击复制Ubuntu/Debian安装脚本" data-clipboard-text="wget -O install.sh {$siteurl}/install/install_panel.sh && bash install.sh">复制</span>
 				</div>
 			</div>
 			<div class="install-code">
@@ -121,31 +135,33 @@
 			</div>
 		</div>
 	</div>
+	{if config_get('new_version_win')}
 	<div class="d4" id="instal-windows" style="background-color: #edf6ef;">
 		<div class="wrap">
 			<div class="wrap-title">
 				<div class="text">Windows面板{:config_get('new_version_win')}安装方法</div>
 			</div>
 			<div class="desc">
-				<p>1、使用<a class="link" href="https://download.bt.cn/win/panel/BtSoft.zip" target="_blank" rel="noreferrer">官方安装程序</a>进行安装，安装完先不要进入面板。</p>
+				<p>1、使用<a class="link" href="https://download.bt.cn/win/panel/go/BtSoft.exe" target="_blank" rel="noreferrer">官方安装程序</a>进行安装，安装完先不要进入面板。</p>
 				<p>2、在命令提示符（cmd）输入以下一键更新命令，然后重启面板。</p>
+				<p>3、打开面板后，绑定账号时输入任意账号密码即可。</p>
 			</div>
 			<div class="install-code">
 				<div class="code-cont">
-					<div class="command" title="点击复制一键更新命令">wget {$siteurl}/win/panel/data/setup.py -O C:/update.py && &quot;C:\Program Files\python\python.exe&quot; C:/update.py update_panel {:config_get('new_version_win')}</div>
+					<div class="command" title="点击复制一键更新命令">wget {$siteurl}/win/install/panel_update.py -O C:/update.py && &quot;C:\Program Files\python\python.exe&quot; C:/update.py {:config_get('new_version_win')}</div>
-					<span class="ico-copy" title="点击复制一键更新命令" data-clipboard-text="wget {$siteurl}/win/panel/data/setup.py -O C:/update.py && &quot;C:\Program Files\python\python.exe&quot; C:/update.py update_panel {:config_get('new_version_win')}">复制</span>
+					<span class="ico-copy" title="点击复制一键更新命令" data-clipboard-text="wget {$siteurl}/win/install/panel_update.py -O C:/update.py && &quot;C:\Program Files\python\python.exe&quot; C:/update.py {:config_get('new_version_win')}">复制</span>
 				</div>
 			</div>
 			<div class="tips" style="color: orangered; font-weight: 700">
-				<p>注意：仅支持Windows Server 2008 R2/2012/2016/2019/2022，64位系统（中文简体），且未安装其它环境</p>
+				<p>注意：支持Windows Server 2012/Windows 8及以上系统，且未安装其它环境</p>
 			</div>
 		</div>
-	</div>
+	</div>{/if}
 	{if config_get('new_version_btm')}
 	<div class="d4" id="instal-monitor">
 		<div class="wrap">
 			<div class="wrap-title">
-				<div class="text" style="margin-right: 12px;">堡塔云监控{:config_get('new_version_btm')}安装脚本</div>
+				<div class="text" style="margin-right: 12px;">云安全监控{:config_get('new_version_btm')}安装脚本</div>
 			</div>
 			<div class="desc">
 				使用 SSH 连接工具，如
@@ -153,21 +169,46 @@
 				连接到您的 Linux 服务器后，根据系统执行相应命令开始安装：
 			</div>
 			<div class="install-code">
-				<span class="osname">堡塔云监控安装脚本</span>
+				<span class="osname">云安全监控安装脚本</span>
 				<div class="code-cont">
 					<div class="command" title="点击复制安装脚本">curl -sS {$siteurl}/install/install_btmonitor.sh -o /tmp/install_btmonitor.sh && bash /tmp/install_btmonitor.sh</div>
 					<span class="ico-copy" title="点击复制安装脚本" data-clipboard-text="curl -sS {$siteurl}/install/install_btmonitor.sh -o /tmp/install_btmonitor.sh && bash /tmp/install_btmonitor.sh">复制</span>
 				</div>
 			</div>
 			<div class="install-code">
-				<span class="osname">堡塔云监控更新脚本</span>
+				<span class="osname">云安全监控更新脚本</span>
 				<div class="code-cont">
 					<div class="command" title="点击复制更新脚本">curl {$siteurl}/install/update_btmonitor.sh|bash</div>
 					<span class="ico-copy" title="点击复制更新脚本" data-clipboard-text="curl {$siteurl}/install/update_btmonitor.sh|bash">复制</span>
 				</div>
 			</div>
 			<div class="tips" style="color: orangered; font-weight: 700">
-				<p>注意：推荐使用Chrome、火狐、edge浏览器，国产浏览器（极速模式）</p>
+				<p>注意：安装完成后推荐使用Chrome、火狐、edge浏览器，国产浏览器（极速模式）访问登录系统</p>
+			</div>
+		</div>
+	</div>{/if}
+	{if config_get('new_version_en')}
+	<div class="d4" id="instal-aapanel" style="background-color: #edf6ef;">
+		<div class="wrap">
+			<div class="wrap-title">
+				<div class="text">aaPanel {:config_get('new_version_en')} install script</div>
+			</div>
+			<div class="desc">
+				<p>It is recommended that you use Ubuntu22.04 to install aaPanel</p>
+			</div>
+			<div class="install-code">
+				<span class="osname">Instarll script</span>
+				<div class="code-cont">
+					<div class="command" title="Copy successfully, please paste it to the server installation">URL={$siteurl}/install/install_7.0_en.sh && if [ -f /usr/bin/curl ];then curl -ksSO $URL ;else wget -O install_7.0_en.sh $URL;fi;bash install_7.0_en.sh</div>
+					<span class="ico-copy" title="Copy successfully, please paste it to the server installation" data-clipboard-text="URL={$siteurl}/install/install_7.0_en.sh && if [ -f /usr/bin/curl ];then curl -ksSO $URL ;else wget -O install_7.0_en.sh $URL;fi;bash install_7.0_en.sh">复制</span>
+				</div>
+			</div>
+			<div class="install-code">
+				<span class="osname">Upgrade script</span>
+				<div class="code-cont">
+					<div class="command" title="Copy successfully, please paste it to the server installation">curl {$siteurl}/install/update_7.x_en.sh|bash</div>
+					<span class="ico-copy" title="Copy successfully, please paste it to the server installation" data-clipboard-text="curl {$siteurl}/install/update_7.x_en.sh|bash">复制</span>
+				</div>
 			</div>
 		</div>
 	</div>{/if}
@@ -193,10 +234,10 @@
 			</div>
 		</div>
 		 
-		<script src="//cdn.staticfile.org/jquery/3.6.0/jquery.min.js" type="text/javascript" charset="utf-8"></script>
+		<script src="{$cdnpublic}jquery/3.6.0/jquery.min.js" type="text/javascript" charset="utf-8"></script>
-		<script src="//cdn.staticfile.org/layer/3.5.1/layer.js" type="text/javascript" charset="utf-8"></script>
+		<script src="{$cdnpublic}layer/3.5.1/layer.js" type="text/javascript" charset="utf-8"></script>
 		
-<script type="text/javascript" src="//cdn.staticfile.org/clipboard.js/1.7.1/clipboard.min.js"></script>
+<script type="text/javascript" src="{$cdnpublic}clipboard.js/1.7.1/clipboard.min.js"></script>
 <script type="text/javascript" src="/static/js/dx.js"></script>
 <script>
 	$(function () {
@@ -236,6 +277,10 @@
 			scrollTop('#instal-monitor');
 		});
 
+		$('#goInstallAaPanel').click(function () {
+			scrollTop('#instal-aapanel');
+		});
+
 		function GetRequest() {
 			var url = location.search;
 			//获取url中"?"符后的字串

app/view/install/index.html

@@ -217,7 +217,7 @@
         </form>
     </div>
 </div>
-<script src="//cdn.staticfile.org/jquery/2.1.4/jquery.min.js"></script>
+<script src="//lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/jquery/2.1.4/jquery.min.js"></script>
 <script>
     $(function () {
         $('form').on('submit', function (e) {

config/console.php

@@ -7,5 +7,7 @@ return [
     'commands' => [
         'updateall' => 'app\command\UpdateAll',
         'decrypt' => 'app\command\DecryptFile',
+        'clean' => 'app\command\Clean',
+        'cleanvitejs' => 'app\command\CleanViteJs',
     ],
 ];

install.sql

@@ -1,7 +1,7 @@
 DROP TABLE IF EXISTS `cloud_config`;
 CREATE TABLE `cloud_config` (
   `key` varchar(32) NOT NULL,
-  `value` varchar(255) DEFAULT NULL,
+  `value` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`key`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
@@ -12,15 +12,18 @@ INSERT INTO `cloud_config` (`key`, `value`) VALUES
 ('bt_key', ''),
 ('whitelist', '0'),
 ('download_page', '1'),
-('new_version', '7.9.7'),
+('new_version', '11.5.0'),
 ('update_msg', '暂无更新日志'),
-('update_date', '2022-12-21'),
+('update_date', '2026-01-19'),
-('new_version_win', '7.8.0'),
+('new_version_win', '8.5.1'),
 ('update_msg_win', '暂无更新日志'),
-('update_date_win', '2022-12-08'),
+('update_date_win', '2026-01-19'),
-('new_version_btm', '1.0.11'),
+('new_version_en', '7.0.25'),
+('update_msg_en', '暂无更新日志'),
+('update_date_en', '2025-09-10'),
+('new_version_btm', '2.3.3'),
 ('update_msg_btm', '暂无更新日志'),
-('update_date_btm', '2022-12-06'),
+('update_date_btm', '2025-08-12'),
 ('updateall_type', '0'),
 ('syskey', 'UqP94LtI8eWAIgCP');
 
@@ -28,7 +31,7 @@ INSERT INTO `cloud_config` (`key`, `value`) VALUES
 DROP TABLE IF EXISTS `cloud_black`;
 CREATE TABLE `cloud_black` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `ip` varchar(20) NOT NULL,
+  `ip` varchar(50) NOT NULL,
   `enable` tinyint(1) NOT NULL DEFAULT '1',
   `addtime` datetime NOT NULL,
   PRIMARY KEY (`id`),
@@ -38,7 +41,7 @@ CREATE TABLE `cloud_black` (
 DROP TABLE IF EXISTS `cloud_white`;
 CREATE TABLE `cloud_white` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `ip` varchar(20) NOT NULL,
+  `ip` varchar(50) NOT NULL,
   `enable` tinyint(1) NOT NULL DEFAULT '1',
   `addtime` datetime NOT NULL,
   PRIMARY KEY (`id`),
@@ -48,7 +51,7 @@ CREATE TABLE `cloud_white` (
 DROP TABLE IF EXISTS `cloud_record`;
 CREATE TABLE `cloud_record` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `ip` varchar(20) NOT NULL,
+  `ip` varchar(50) NOT NULL,
   `addtime` datetime NOT NULL,
   `usetime` datetime NOT NULL,
   PRIMARY KEY (`id`),

public/install/install_6.0.sh

@@ -1,950 +0,0 @@
-#!/bin/bash
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
-export PATH
-LANG=en_US.UTF-8
-
-Btapi_Url='http://www.example.com'
-Check_Api=$(curl -Ss --connect-timeout 5 -m 2 $Btapi_Url/api/SetupCount)
-if [ "$Check_Api" != 'ok' ];then
-	Red_Error "此宝塔第三方云端无法连接，因此安装过程已中止！";
-fi
-
-if [ $(whoami) != "root" ];then
-	echo "请使用root权限执行宝塔安装命令！"
-	exit 1;
-fi
-
-is64bit=$(getconf LONG_BIT)
-if [ "${is64bit}" != '64' ];then
-	Red_Error "抱歉, 当前面板版本不支持32位系统, 请使用64位系统或安装宝塔5.9!";
-fi
-
-Centos6Check=$(cat /etc/redhat-release | grep ' 6.' | grep -iE 'centos|Red Hat')
-if [ "${Centos6Check}" ];then
-	echo "Centos6不支持安装宝塔面板，请更换Centos7/8安装宝塔面板"
-	exit 1
-fi 
-
-UbuntuCheck=$(cat /etc/issue|grep Ubuntu|awk '{print $2}'|cut -f 1 -d '.')
-if [ "${UbuntuCheck}" ] && [ "${UbuntuCheck}" -lt "16" ];then
-	echo "Ubuntu ${UbuntuCheck}不支持安装宝塔面板，建议更换Ubuntu18/20安装宝塔面板"
-	exit 1
-fi
-
-cd ~
-setup_path="/www"
-python_bin=$setup_path/server/panel/pyenv/bin/python
-cpu_cpunt=$(cat /proc/cpuinfo|grep processor|wc -l)
-
-if [ "$1" ];then
-	IDC_CODE=$1
-fi
-
-GetSysInfo(){
-	if [ -s "/etc/redhat-release" ];then
-		SYS_VERSION=$(cat /etc/redhat-release)
-	elif [ -s "/etc/issue" ]; then
-		SYS_VERSION=$(cat /etc/issue)
-	fi
-	SYS_INFO=$(uname -a)
-	SYS_BIT=$(getconf LONG_BIT)
-	MEM_TOTAL=$(free -m|grep Mem|awk '{print $2}')
-	CPU_INFO=$(getconf _NPROCESSORS_ONLN)
-
-	echo -e ${SYS_VERSION}
-	echo -e Bit:${SYS_BIT} Mem:${MEM_TOTAL}M Core:${CPU_INFO}
-	echo -e ${SYS_INFO}
-
-	if [ -z "${os_version}" ];then
-		echo -e "============================================"
-		echo -e "检测到为非常用系统安装,建议更换至Centos-7或Debian-10+或Ubuntu-20+系统安装宝塔面板"
-		echo -e "详情请查看系统兼容表：https://docs.qq.com/sheet/DUm54VUtyTVNlc21H?tab=BB08J2"
-		echo -e "特殊情况可通过以下联系方式寻求安装协助情况"
-	fi
-
-	is64bit=$(getconf LONG_BIT)
-	if [ "${is64bit}" == '32' ];then
-		echo -e "宝塔面板不支持32位系统进行安装，请使用64位系统/服务器架构进行安装宝塔"
-		exit 1
-	fi
-
-	S390X_CHECK=$(uname -a|grep s390x)
-	if [ "${S390X_CHECK}" ];then
-		echo -e "宝塔面板不支持s390x架构进行安装，请使用64位系统/服务器架构进行安装宝塔"
-		exit 1
-	fi
-
-	echo -e "============================================"
-	echo -e "请截图以上报错信息发帖至论坛www.bt.cn/bbs求助"
-}
-Red_Error(){
-	echo '=================================================';
-	printf '\033[1;31;40m%b\033[0m\n' "$@";
-	GetSysInfo
-	exit 1;
-}
-Lock_Clear(){
-	if [ -f "/etc/bt_crack.pl" ];then
-		chattr -R -ia /www
-		chattr -ia /etc/init.d/bt
-		\cp -rpa /www/backup/panel/vhost/* /www/server/panel/vhost/
-		mv /www/server/panel/BTPanel/__init__.bak /www/server/panel/BTPanel/__init__.py
-		rm -f /etc/bt_crack.pl
-	fi
-}
-Install_Check(){
-	if [ "${INSTALL_FORCE}" ];then
-		return
-	fi
-	echo -e "----------------------------------------------------"
-	echo -e "检查已有其他Web/mysql环境，安装宝塔可能影响现有站点及数据"
-	echo -e "Web/mysql service is alreday installed,Can't install panel"
-	echo -e "----------------------------------------------------"
-	echo -e "已知风险/Enter yes to force installation"
-	read -p "输入yes强制安装: " yes;
-	if [ "$yes" != "yes" ];then
-		echo -e "------------"
-		echo "取消安装"
-		exit;
-	fi
-	INSTALL_FORCE="true"
-}
-System_Check(){
-	MYSQLD_CHECK=$(ps -ef |grep mysqld|grep -v grep|grep -v /www/server/mysql)
-	PHP_CHECK=$(ps -ef|grep php-fpm|grep master|grep -v /www/server/php)
-	NGINX_CHECK=$(ps -ef|grep nginx|grep master|grep -v /www/server/nginx)
-	HTTPD_CHECK=$(ps -ef |grep -E 'httpd|apache'|grep -v /www/server/apache|grep -v grep)
-	if [ "${PHP_CHECK}" ] || [ "${MYSQLD_CHECK}" ] || [ "${NGINX_CHECK}" ] || [ "${HTTPD_CHECK}" ];then
-		Install_Check
-	fi
-}
-Set_Ssl(){
-    echo -e ""
-    echo -e "----------------------------------------------------------------------"
-    echo -e "为了您的面板使用安全，建议您开启面板SSL，开启后请使用https访问宝塔面板"
-    echo -e "输入y回车即开启面板SSL并进行下一步安装"
-    echo -e "输入n回车跳过面板SSL配置，直接进行安装"
-    echo -e "10秒后将跳过SSL配置，直接进行面板安装"
-    echo -e "----------------------------------------------------------------------"
-    echo -e ""
-    read -t 10 -p "是否确定开启面板SSL ? (y/n): " yes
-
-    if [ $? != 0 ];then
-        SET_SSL=false
-    else
-        case "$yes" in
-            y)
-                SET_SSL=true
-                ;;
-            n)
-                SET_SSL=false
-				rm -f /www/server/panel/data/ssl.pl
-                ;;
-            *)
-                Set_Ssl
-        esac
-    fi
-}
-Get_Pack_Manager(){
-	if [ -f "/usr/bin/yum" ] && [ -d "/etc/yum.repos.d" ]; then
-		PM="yum"
-	elif [ -f "/usr/bin/apt-get" ] && [ -f "/usr/bin/dpkg" ]; then
-		PM="apt-get"		
-	fi
-}
-Auto_Swap()
-{
-	swap=$(free |grep Swap|awk '{print $2}')
-	if [ "${swap}" -gt 1 ];then
-		echo "Swap total sizse: $swap";
-		return;
-	fi
-	if [ ! -d /www ];then
-		mkdir /www
-	fi
-	swapFile="/www/swap"
-	dd if=/dev/zero of=$swapFile bs=1M count=1025
-	mkswap -f $swapFile
-	swapon $swapFile
-	echo "$swapFile    swap    swap    defaults    0 0" >> /etc/fstab
-	swap=`free |grep Swap|awk '{print $2}'`
-	if [ $swap -gt 1 ];then
-		echo "Swap total sizse: $swap";
-		return;
-	fi
-	
-	sed -i "/\/www\/swap/d" /etc/fstab
-	rm -f $swapFile
-}
-Service_Add(){
-	if [ "${PM}" == "yum" ] || [ "${PM}" == "dnf" ]; then
-		chkconfig --add bt
-		chkconfig --level 2345 bt on
-		Centos9Check=$(cat /etc/redhat-release |grep ' 9')
-		if [ "${Centos9Check}" ];then
-            wget -O /usr/lib/systemd/system/btpanel.service ${download_Url}/init/systemd/btpanel.service
-			systemctl enable btpanel
-		fi		
-	elif [ "${PM}" == "apt-get" ]; then
-		update-rc.d bt defaults
-	fi 
-}
-Set_Centos_Repo(){
-	HUAWEI_CHECK=$(cat /etc/motd |grep "Huawei Cloud")
-	if [ "${HUAWEI_CHECK}" ] && [ "${is64bit}" == "64" ];then
-		\cp -rpa /etc/yum.repos.d/ /etc/yumBak
-		sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*.repo
-		sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.epel.cloud|g' /etc/yum.repos.d/CentOS-*.repo
-		rm -f /etc/yum.repos.d/epel.repo
-		rm -f /etc/yum.repos.d/epel-*
-	fi
-	ALIYUN_CHECK=$(cat /etc/motd|grep "Alibaba Cloud ")
-	if [  "${ALIYUN_CHECK}" ] && [ "${is64bit}" == "64" ] && [ ! -f "/etc/yum.repos.d/Centos-vault-8.5.2111.repo" ];then
-		rename '.repo' '.repo.bak' /etc/yum.repos.d/*.repo
-		wget https://mirrors.aliyun.com/repo/Centos-vault-8.5.2111.repo -O /etc/yum.repos.d/Centos-vault-8.5.2111.repo
-		wget https://mirrors.aliyun.com/repo/epel-archive-8.repo -O /etc/yum.repos.d/epel-archive-8.repo
-		sed -i 's/mirrors.cloud.aliyuncs.com/url_tmp/g'  /etc/yum.repos.d/Centos-vault-8.5.2111.repo &&  sed -i 's/mirrors.aliyun.com/mirrors.cloud.aliyuncs.com/g' /etc/yum.repos.d/Centos-vault-8.5.2111.repo && sed -i 's/url_tmp/mirrors.aliyun.com/g' /etc/yum.repos.d/Centos-vault-8.5.2111.repo
-		sed -i 's/mirrors.aliyun.com/mirrors.cloud.aliyuncs.com/g' /etc/yum.repos.d/epel-archive-8.repo
-	fi
-	MIRROR_CHECK=$(cat /etc/yum.repos.d/CentOS-Linux-AppStream.repo |grep "[^#]mirror.centos.org")
-	if [ "${MIRROR_CHECK}" ] && [ "${is64bit}" == "64" ];then
-		\cp -rpa /etc/yum.repos.d/ /etc/yumBak
-		sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*.repo
-		sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.epel.cloud|g' /etc/yum.repos.d/CentOS-*.repo
-	fi
-}
-get_node_url(){
-	if [ ! -f /bin/curl ];then
-		if [ "${PM}" = "yum" ]; then
-			yum install curl -y
-		elif [ "${PM}" = "apt-get" ]; then
-			apt-get install curl -y
-		fi
-	fi
-
-	if [ -f "/www/node.pl" ];then
-		download_Url=$(cat /www/node.pl)
-		echo "Download node: $download_Url";
-		echo '---------------------------------------------';
-		return
-	fi
-	
-	echo '---------------------------------------------';
-	echo "Selected download node...";
-	nodes=(https://dg2.bt.cn https://dg1.bt.cn https://download.bt.cn);
-
-	if [ "$1" ];then
-		nodes=($(echo ${nodes[*]}|sed "s#${1}##"))
-	fi
-
-	tmp_file1=/dev/shm/net_test1.pl
-	tmp_file2=/dev/shm/net_test2.pl
-	[ -f "${tmp_file1}" ] && rm -f ${tmp_file1}
-	[ -f "${tmp_file2}" ] && rm -f ${tmp_file2}
-	touch $tmp_file1
-	touch $tmp_file2
-	for node in ${nodes[@]};
-	do
-		NODE_CHECK=$(curl --connect-timeout 3 -m 3 2>/dev/null -w "%{http_code} %{time_total}" ${node}/net_test|xargs)
-		RES=$(echo ${NODE_CHECK}|awk '{print $1}')
-		NODE_STATUS=$(echo ${NODE_CHECK}|awk '{print $2}')
-		TIME_TOTAL=$(echo ${NODE_CHECK}|awk '{print $3 * 1000 - 500 }'|cut -d '.' -f 1)
-		if [ "${NODE_STATUS}" == "200" ];then
-			if [ $TIME_TOTAL -lt 100 ];then
-				if [ $RES -ge 1500 ];then
-					echo "$RES $node" >> $tmp_file1
-				fi
-			else
-				if [ $RES -ge 1500 ];then
-					echo "$TIME_TOTAL $node" >> $tmp_file2
-				fi
-			fi
-
-			i=$(($i+1))
-			if [ $TIME_TOTAL -lt 100 ];then
-				if [ $RES -ge 3000 ];then
-					break;
-				fi
-			fi	
-		fi
-	done
-
-	NODE_URL=$(cat $tmp_file1|sort -r -g -t " " -k 1|head -n 1|awk '{print $2}')
-	if [ -z "$NODE_URL" ];then
-		NODE_URL=$(cat $tmp_file2|sort -g -t " " -k 1|head -n 1|awk '{print $2}')
-		if [ -z "$NODE_URL" ];then
-			NODE_URL='https://download.bt.cn';
-		fi
-	fi
-	rm -f $tmp_file1
-	rm -f $tmp_file2
-	download_Url=$NODE_URL
-	echo "Download node: $download_Url";
-	echo '---------------------------------------------';
-}
-Remove_Package(){
-	local PackageNmae=$1
-	if [ "${PM}" == "yum" ];then
-		isPackage=$(rpm -q ${PackageNmae}|grep "not installed")
-		if [ -z "${isPackage}" ];then
-			yum remove ${PackageNmae} -y
-		fi 
-	elif [ "${PM}" == "apt-get" ];then
-		isPackage=$(dpkg -l|grep ${PackageNmae})
-		if [ "${PackageNmae}" ];then
-			apt-get remove ${PackageNmae} -y
-		fi
-	fi
-}
-Install_RPM_Pack(){
-	yumPath=/etc/yum.conf
-	Centos8Check=$(cat /etc/redhat-release | grep ' 8.' | grep -iE 'centos|Red Hat')
-	if [ "${Centos8Check}" ];then
-		Set_Centos_Repo
-	fi	
-	isExc=$(cat $yumPath|grep httpd)
-	if [ "$isExc" = "" ];then
-		echo "exclude=httpd nginx php mysql mairadb python-psutil python2-psutil" >> $yumPath
-	fi
-
-	#SYS_TYPE=$(uname -a|grep x86_64)
-	#yumBaseUrl=$(cat /etc/yum.repos.d/CentOS-Base.repo|grep baseurl=http|cut -d '=' -f 2|cut -d '$' -f 1|head -n 1)
-	#[ "${yumBaseUrl}" ] && checkYumRepo=$(curl --connect-timeout 5 --head -s -o /dev/null -w %{http_code} ${yumBaseUrl})	
-	#if [ "${checkYumRepo}" != "200" ] && [ "${SYS_TYPE}" ];then
-	#	curl -Ss --connect-timeout 3 -m 60 http://download.bt.cn/install/yumRepo_select.sh|bash
-	#fi
-	
-	#尝试同步时间(从bt.cn)
-	echo 'Synchronizing system time...'
-	getBtTime=$(curl -sS --connect-timeout 3 -m 60 http://www.bt.cn/api/index/get_time)
-	if [ "${getBtTime}" ];then	
-		date -s "$(date -d @$getBtTime +"%Y-%m-%d %H:%M:%S")"
-	fi
-
-	if [ -z "${Centos8Check}" ]; then
-		yum install ntp -y
-		rm -rf /etc/localtime
-		ln -s /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-
-		#尝试同步国际时间(从ntp服务器)
-		ntpdate 0.asia.pool.ntp.org
-		setenforce 0
-	fi
-
-	startTime=`date +%s`
-
-	sed -i 's/SELINUX=enforcing/SELINUX=disabled/' /etc/selinux/config
-	#yum remove -y python-requests python3-requests python-greenlet python3-greenlet
-	yumPacks="libcurl-devel wget tar gcc make zip unzip openssl openssl-devel gcc libxml2 libxml2-devel libxslt* zlib zlib-devel libjpeg-devel libpng-devel libwebp libwebp-devel freetype freetype-devel lsof pcre pcre-devel vixie-cron crontabs icu libicu-devel c-ares libffi-devel bzip2-devel ncurses-devel sqlite-devel readline-devel tk-devel gdbm-devel db4-devel libpcap-devel xz-devel qrencode"
-	yum install -y ${yumPacks}
-
-	for yumPack in ${yumPacks}
-	do
-		rpmPack=$(rpm -q ${yumPack})
-		packCheck=$(echo ${rpmPack}|grep not)
-		if [ "${packCheck}" ]; then
-			yum install ${yumPack} -y
-		fi
-	done
-	if [ -f "/usr/bin/dnf" ]; then
-		dnf install -y redhat-rpm-config
-	fi
-
-	ALI_OS=$(cat /etc/redhat-release |grep "Alibaba Cloud Linux release 3")
-	if [ -z "${ALI_OS}" ];then 
-		yum install epel-release -y
-	fi
-}
-Install_Deb_Pack(){
-	ln -sf bash /bin/sh
-	UBUNTU_22=$(cat /etc/issue|grep "Ubuntu 22")
-	if [ "${UBUNTU_22}" ];then
-		apt-get remove needrestart -y
-	fi
-	ALIYUN_CHECK=$(cat /etc/motd|grep "Alibaba Cloud ")
-	if [ "${ALIYUN_CHECK}" ] && [ "${UBUNTU_22}" ];then
-		apt-get remove libicu70 -y
-	fi
-	apt-get update -y
-	apt-get install bash -y
-	if [ -f "/usr/bin/bash" ];then
-		ln -sf /usr/bin/bash /bin/sh
-	fi
-	apt-get install ruby -y
-	apt-get install lsb-release -y
-	#apt-get install ntp ntpdate -y
-	#/etc/init.d/ntp stop
-	#update-rc.d ntp remove
-	#cat >>~/.profile<<EOF
-	#TZ='Asia/Shanghai'; export TZ
-	#EOF
-	#rm -rf /etc/localtime
-	#cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-	#echo 'Synchronizing system time...'
-	#ntpdate 0.asia.pool.ntp.org
-	#apt-get upgrade -y
-	LIBCURL_VER=$(dpkg -l|grep libcurl4|awk '{print $3}')
-	if [ "${LIBCURL_VER}" == "7.68.0-1ubuntu2.8" ];then
-		apt-get remove libcurl4 -y
-		apt-get install curl -y
-	fi
-
-	debPacks="wget curl libcurl4-openssl-dev gcc make zip unzip tar openssl libssl-dev gcc libxml2 libxml2-dev zlib1g zlib1g-dev libjpeg-dev libpng-dev lsof libpcre3 libpcre3-dev cron net-tools swig build-essential libffi-dev libbz2-dev libncurses-dev libsqlite3-dev libreadline-dev tk-dev libgdbm-dev libdb-dev libdb++-dev libpcap-dev xz-utils git qrencode";
-	apt-get install -y $debPacks --force-yes
-
-	for debPack in ${debPacks}
-	do
-		packCheck=$(dpkg -l|grep ${debPack})
-		if [ "$?" -ne "0" ] ;then
-			apt-get install -y $debPack
-		fi
-	done
-
-	if [ ! -d '/etc/letsencrypt' ];then
-		mkdir -p /etc/letsencryp
-		mkdir -p /var/spool/cron
-		if [ ! -f '/var/spool/cron/crontabs/root' ];then
-			echo '' > /var/spool/cron/crontabs/root
-			chmod 600 /var/spool/cron/crontabs/root
-		fi	
-	fi
-}
-Get_Versions(){
-	redhat_version_file="/etc/redhat-release"
-	deb_version_file="/etc/issue"
-	if [ -f $redhat_version_file ];then
-		os_type='el'
-		is_aliyunos=$(cat $redhat_version_file|grep Aliyun)
-		if [ "$is_aliyunos" != "" ];then
-			return
-		fi
-		os_version=$(cat $redhat_version_file|grep CentOS|grep -Eo '([0-9]+\.)+[0-9]+'|grep -Eo '^[0-9]')
-		if [ "${os_version}" = "5" ];then
-			os_version=""
-		fi
-		if [ -z "${os_version}" ];then
-			os_version=$(cat /etc/redhat-release |grep Stream|grep -oE 8)
-		fi
-	else
-		os_type='ubuntu'
-		os_version=$(cat $deb_version_file|grep Ubuntu|grep -Eo '([0-9]+\.)+[0-9]+'|grep -Eo '^[0-9]+')
-		if [ "${os_version}" = "" ];then
-			os_type='debian'
-			os_version=$(cat $deb_version_file|grep Debian|grep -Eo '([0-9]+\.)+[0-9]+'|grep -Eo '[0-9]+')
-			if [ "${os_version}" = "" ];then
-				os_version=$(cat $deb_version_file|grep Debian|grep -Eo '[0-9]+')
-			fi
-			if [ "${os_version}" = "8" ];then
-				os_version=""
-			fi
-			if [ "${is64bit}" = '32' ];then
-				os_version=""
-			fi
-		else
-			if [ "$os_version" = "14" ];then
-				os_version=""
-			fi
-			if [ "$os_version" = "12" ];then
-				os_version=""
-			fi
-			if [ "$os_version" = "19" ];then
-				os_version=""
-			fi
-			if [ "$os_version" = "21" ];then
-				os_version=""
-			fi
-			if [ "$os_version" = "20" ];then
-				os_version2004=$(cat /etc/issue|grep 20.04)
-				if [ -z "${os_version2004}" ];then
-					os_version=""
-				fi
-			fi
-		fi
-	fi
-}
-Install_Python_Lib(){
-	curl -Ss --connect-timeout 3 -m 60 $download_Url/install/pip_select.sh|bash
-	pyenv_path="/www/server/panel"
-	if [ -f $pyenv_path/pyenv/bin/python ];then
-	 	is_ssl=$($python_bin -c "import ssl" 2>&1|grep cannot)
-		$pyenv_path/pyenv/bin/python3.7 -V
-		if [ $? -eq 0 ] && [ -z "${is_ssl}" ];then
-			chmod -R 700 $pyenv_path/pyenv/bin
-			is_package=$($python_bin -m psutil 2>&1|grep package)
-			if [ "$is_package" = "" ];then
-				wget -O $pyenv_path/pyenv/pip.txt $download_Url/install/pyenv/pip.txt -T 5
-				$pyenv_path/pyenv/bin/pip install -U pip
-				$pyenv_path/pyenv/bin/pip install -U setuptools==65.5.0
-				$pyenv_path/pyenv/bin/pip install -r $pyenv_path/pyenv/pip.txt
-			fi
-			source $pyenv_path/pyenv/bin/activate
-			chmod -R 700 $pyenv_path/pyenv/bin
-			return
-		else
-			rm -rf $pyenv_path/pyenv
-		fi
-	fi
-
-	is_loongarch64=$(uname -a|grep loongarch64)
-	if [ "$is_loongarch64" != "" ] && [ -f "/usr/bin/yum" ];then
-		yumPacks="python3-devel python3-pip python3-psutil python3-gevent python3-pyOpenSSL python3-paramiko python3-flask python3-rsa python3-requests python3-six python3-websocket-client"
-		yum install -y ${yumPacks}
-		for yumPack in ${yumPacks}
-		do
-			rpmPack=$(rpm -q ${yumPack})
-			packCheck=$(echo ${rpmPack}|grep not)
-			if [ "${packCheck}" ]; then
-				yum install ${yumPack} -y
-			fi
-		done
-
-		pip3 install -U pip
-		pip3 install Pillow psutil pyinotify pycryptodome upyun oss2 pymysql qrcode qiniu redis pymongo Cython configparser cos-python-sdk-v5 supervisor gevent-websocket pyopenssl
-		pip3 install flask==1.1.4
-		pip3 install Pillow -U
-
-		pyenv_bin=/www/server/panel/pyenv/bin
-		mkdir -p $pyenv_bin
-		ln -sf /usr/local/bin/pip3 $pyenv_bin/pip
-		ln -sf /usr/local/bin/pip3 $pyenv_bin/pip3
-		ln -sf /usr/local/bin/pip3 $pyenv_bin/pip3.7
-
-		if [ -f "/usr/bin/python3.7" ];then
-			ln -sf /usr/bin/python3.7 $pyenv_bin/python
-			ln -sf /usr/bin/python3.7 $pyenv_bin/python3
-			ln -sf /usr/bin/python3.7 $pyenv_bin/python3.7
-		elif [ -f "/usr/bin/python3.6"  ]; then
-			ln -sf /usr/bin/python3.6 $pyenv_bin/python
-			ln -sf /usr/bin/python3.6 $pyenv_bin/python3
-			ln -sf /usr/bin/python3.6 $pyenv_bin/python3.7
-		fi
-
-		echo > $pyenv_bin/activate
-
-		return
-	fi
-
-	py_version="3.7.8"
-	mkdir -p $pyenv_path
-	echo "True" > /www/disk.pl
-	if [ ! -w /www/disk.pl ];then
-		Red_Error "ERROR: Install python env fielded." "ERROR: /www目录无法写入，请检查目录/用户/磁盘权限！"
-	fi
-	os_type='el'
-	os_version='7'
-	is_export_openssl=0
-	Get_Versions
-
-	echo "OS: $os_type - $os_version"
-	is_aarch64=$(uname -a|grep aarch64)
-	if [ "$is_aarch64" != "" ];then
-		is64bit="aarch64"
-	fi
-	
-	if [ -f "/www/server/panel/pymake.pl" ];then
-		os_version=""
-		rm -f /www/server/panel/pymake.pl
-	fi	
-
-	if [ "${os_version}" != "" ];then
-		pyenv_file="/www/pyenv.tar.gz"
-		wget -O $pyenv_file $download_Url/install/pyenv/pyenv-${os_type}${os_version}-x${is64bit}.tar.gz -T 10
-		if [ "$?" != "0" ];then
-			get_node_url $download_Url
-			wget -O $pyenv_file $download_Url/install/pyenv/pyenv-${os_type}${os_version}-x${is64bit}.tar.gz -T 10
-		fi
-		tmp_size=$(du -b $pyenv_file|awk '{print $1}')
-		if [ $tmp_size -lt 703460 ];then
-			rm -f $pyenv_file
-			echo "ERROR: Download python env fielded."
-		else
-			echo "Install python env..."
-			tar zxvf $pyenv_file -C $pyenv_path/ > /dev/null
-			chmod -R 700 $pyenv_path/pyenv/bin
-			if [ ! -f $pyenv_path/pyenv/bin/python ];then
-				rm -f $pyenv_file
-				Red_Error "ERROR: Install python env fielded." "ERROR: 下载宝塔运行环境失败，请尝试重新安装！" 
-			fi
-			$pyenv_path/pyenv/bin/python3.7 -V
-			if [ $? -eq 0 ];then
-				rm -f $pyenv_file
-				ln -sf $pyenv_path/pyenv/bin/pip3.7 /usr/bin/btpip
-				ln -sf $pyenv_path/pyenv/bin/python3.7 /usr/bin/btpython
-				source $pyenv_path/pyenv/bin/activate
-				return
-			else
-				rm -f $pyenv_file
-				rm -rf $pyenv_path/pyenv
-			fi
-		fi
-	fi
-
-	cd /www
-	python_src='/www/python_src.tar.xz'
-	python_src_path="/www/Python-${py_version}"
-	wget -O $python_src $download_Url/src/Python-${py_version}.tar.xz -T 5
-	tmp_size=$(du -b $python_src|awk '{print $1}')
-	if [ $tmp_size -lt 10703460 ];then
-		rm -f $python_src
-		Red_Error "ERROR: Download python source code fielded." "ERROR: 下载宝塔运行环境失败，请尝试重新安装！"
-	fi
-	tar xvf $python_src
-	rm -f $python_src
-	cd $python_src_path
-	./configure --prefix=$pyenv_path/pyenv
-	make -j$cpu_cpunt
-	make install
-	if [ ! -f $pyenv_path/pyenv/bin/python3.7 ];then
-		rm -rf $python_src_path
-		Red_Error "ERROR: Make python env fielded." "ERROR: 编译宝塔运行环境失败！"
-	fi
-	cd ~
-	rm -rf $python_src_path
-	wget -O $pyenv_path/pyenv/bin/activate $download_Url/install/pyenv/activate.panel -T 5
-	wget -O $pyenv_path/pyenv/pip.txt $download_Url/install/pyenv/pip-3.7.8.txt -T 5
-	ln -sf $pyenv_path/pyenv/bin/pip3.7 $pyenv_path/pyenv/bin/pip
-	ln -sf $pyenv_path/pyenv/bin/python3.7 $pyenv_path/pyenv/bin/python
-	ln -sf $pyenv_path/pyenv/bin/pip3.7 /usr/bin/btpip
-	ln -sf $pyenv_path/pyenv/bin/python3.7 /usr/bin/btpython
-	chmod -R 700 $pyenv_path/pyenv/bin
-	$pyenv_path/pyenv/bin/pip install -U pip
-	$pyenv_path/pyenv/bin/pip install -U setuptools==65.5.0
-	$pyenv_path/pyenv/bin/pip install -U wheel==0.34.2 
-	$pyenv_path/pyenv/bin/pip install -r $pyenv_path/pyenv/pip.txt
-	source $pyenv_path/pyenv/bin/activate
-
-	is_gevent=$($python_bin -m gevent 2>&1|grep -oE package)
-	is_psutil=$($python_bin -m psutil 2>&1|grep -oE package)
-	if [ "${is_gevent}" != "${is_psutil}" ];then
-		Red_Error "ERROR: psutil/gevent install failed!"
-	fi
-}
-Install_Bt(){
-	panelPort="8888"
-	if [ -f ${setup_path}/server/panel/data/port.pl ];then
-		panelPort=$(cat ${setup_path}/server/panel/data/port.pl)
-	else
-		panelPort=$(expr $RANDOM % 55535 + 10000)
-	fi
-	mkdir -p ${setup_path}/server/panel/logs
-	mkdir -p ${setup_path}/server/panel/vhost/apache
-	mkdir -p ${setup_path}/server/panel/vhost/nginx
-	mkdir -p ${setup_path}/server/panel/vhost/rewrite
-	mkdir -p ${setup_path}/server/panel/install
-	mkdir -p /www/server
-	mkdir -p /www/wwwroot
-	mkdir -p /www/wwwlogs
-	mkdir -p /www/backup/database
-	mkdir -p /www/backup/site
-
-	if [ ! -d "/etc/init.d" ];then
-		mkdir -p /etc/init.d
-	fi
-
-	if [ -f "/etc/init.d/bt" ]; then
-		/etc/init.d/bt stop
-		sleep 1
-	fi
-
-	wget -O /etc/init.d/bt ${download_Url}/install/src/bt6.init -T 10
-	wget -O /www/server/panel/install/public.sh ${Btapi_Url}/install/public.sh -T 10
-	wget -O panel.zip ${Btapi_Url}/install/src/panel6.zip -T 10
-
-	if [ -f "${setup_path}/server/panel/data/default.db" ];then
-		if [ -d "/${setup_path}/server/panel/old_data" ];then
-			rm -rf ${setup_path}/server/panel/old_data
-		fi
-		mkdir -p ${setup_path}/server/panel/old_data
-		d_format=$(date +"%Y%m%d_%H%M%S")
-		\cp -arf ${setup_path}/server/panel/data/default.db ${setup_path}/server/panel/data/default_backup_${d_format}.db
-		mv -f ${setup_path}/server/panel/data/default.db ${setup_path}/server/panel/old_data/default.db
-		mv -f ${setup_path}/server/panel/data/system.db ${setup_path}/server/panel/old_data/system.db
-		mv -f ${setup_path}/server/panel/data/port.pl ${setup_path}/server/panel/old_data/port.pl
-		mv -f ${setup_path}/server/panel/data/admin_path.pl ${setup_path}/server/panel/old_data/admin_path.pl
-	fi
-
-	if [ ! -f "/usr/bin/unzip" ]; then
-		if [ "${PM}" = "yum" ]; then
-			yum install unzip -y
-		elif [ "${PM}" = "apt-get" ]; then
-			apt-get update
-			apt-get install unzip -y
-		fi
-	fi
-
-	unzip -o panel.zip -d ${setup_path}/server/ > /dev/null
-
-	if [ -d "${setup_path}/server/panel/old_data" ];then
-		mv -f ${setup_path}/server/panel/old_data/default.db ${setup_path}/server/panel/data/default.db
-		mv -f ${setup_path}/server/panel/old_data/system.db ${setup_path}/server/panel/data/system.db
-		mv -f ${setup_path}/server/panel/old_data/port.pl ${setup_path}/server/panel/data/port.pl
-		mv -f ${setup_path}/server/panel/old_data/admin_path.pl ${setup_path}/server/panel/data/admin_path.pl
-		if [ -d "/${setup_path}/server/panel/old_data" ];then
-			rm -rf ${setup_path}/server/panel/old_data
-		fi
-	fi
-
-	if [ ! -f ${setup_path}/server/panel/tools.py ] || [ ! -f ${setup_path}/server/panel/BT-Panel ];then
-		ls -lh panel.zip
-		Red_Error "ERROR: Failed to download, please try install again!" "ERROR: 下载宝塔失败，请尝试重新安装！"
-	fi
-
-	rm -f panel.zip
-	rm -f ${setup_path}/server/panel/class/*.pyc
-	rm -f ${setup_path}/server/panel/*.pyc
-
-	chmod +x /etc/init.d/bt
-	chmod -R 600 ${setup_path}/server/panel
-	chmod -R +x ${setup_path}/server/panel/script
-	ln -sf /etc/init.d/bt /usr/bin/bt
-	echo "${panelPort}" > ${setup_path}/server/panel/data/port.pl
-	wget -O /etc/init.d/bt ${download_Url}/install/src/bt7.init -T 10
-	wget -O /www/server/panel/init.sh ${download_Url}/install/src/bt7.init -T 10
-	wget -O /www/server/panel/data/softList.conf ${download_Url}/install/conf/softList.conf
-
-	rm -f /www/server/panel/class/*.so
-	if [ ! -f /www/server/panel/data/not_workorder.pl ]; then
-		echo "True" > /www/server/panel/data/not_workorder.pl
-	fi
-	if [ ! -f /www/server/panel/data/userInfo.json ]; then
-		echo "{\"uid\":1,\"username\":\"Administrator\",\"address\":\"127.0.0.1\",\"serverid\":\"1\",\"access_key\":\"test\",\"secret_key\":\"123456\",\"ukey\":\"123456\",\"state\":1}" > /www/server/panel/data/userInfo.json
-	fi
-}
-Set_Bt_Panel(){
-	Run_User="www"
-	wwwUser=$(cat /etc/passwd|cut -d ":" -f 1|grep ^www$)
-	if [ "${wwwUser}" != "www" ];then
-		groupadd ${Run_User}
-		useradd -s /sbin/nologin -g ${Run_User} ${Run_User}
-	fi
-
-	password=$(cat /dev/urandom | head -n 16 | md5sum | head -c 8)
-	sleep 1
-	admin_auth="/www/server/panel/data/admin_path.pl"
-	if [ ! -f ${admin_auth} ];then
-		auth_path=$(cat /dev/urandom | head -n 16 | md5sum | head -c 8)
-		echo "/${auth_path}" > ${admin_auth}
-	fi
-	auth_path=$(cat /dev/urandom | head -n 16 | md5sum | head -c 8)
-	echo "/${auth_path}" > ${admin_auth}
-	chmod -R 700 $pyenv_path/pyenv/bin
-	/www/server/panel/pyenv/bin/pip3 install pymongo
-	/www/server/panel/pyenv/bin/pip3 install psycopg2-binary
-	/www/server/panel/pyenv/bin/pip3 install flask -U
-	/www/server/panel/pyenv/bin/pip3 install flask-sock
-	auth_path=$(cat ${admin_auth})
-	cd ${setup_path}/server/panel/
-	if [ "$SET_SSL" == true ]; then
-        btpip install -I pyOpenSSl
-        btpython /www/server/panel/tools.py ssl
-    fi
-	/etc/init.d/bt start
-	$python_bin -m py_compile tools.py
-	$python_bin tools.py username
-	username=$($python_bin tools.py panel ${password})
-	cd ~
-	echo "${password}" > ${setup_path}/server/panel/default.pl
-	chmod 600 ${setup_path}/server/panel/default.pl
-	sleep 3
-	/etc/init.d/bt restart 	
-	sleep 3
-	isStart=$(ps aux |grep 'BT-Panel'|grep -v grep|awk '{print $2}')
-	LOCAL_CURL=$(curl 127.0.0.1:${panelPort}/login 2>&1 |grep -i html)
-	if [ -z "${isStart}" ] && [ -z "${LOCAL_CURL}" ];then
-		/etc/init.d/bt 22
-		cd /www/server/panel/pyenv/bin
-		touch t.pl
-		ls -al python3.7 python
-		lsattr python3.7 python
-		Red_Error "ERROR: The BT-Panel service startup failed." "ERROR: 宝塔启动失败"
-	fi
-}
-Set_Firewall(){
-	sshPort=$(cat /etc/ssh/sshd_config | grep 'Port '|awk '{print $2}')
-	if [ "${PM}" = "apt-get" ]; then
-		apt-get install -y ufw
-		if [ -f "/usr/sbin/ufw" ];then
-			ufw allow 20/tcp
-			ufw allow 21/tcp
-			ufw allow 22/tcp
-			ufw allow 80/tcp
-			ufw allow 443/tcp
-			ufw allow 888/tcp
-			ufw allow ${panelPort}/tcp
-			ufw allow ${sshPort}/tcp
-			ufw allow 39000:40000/tcp
-			ufw_status=`ufw status`
-			echo y|ufw enable
-			ufw default deny
-			ufw reload
-		fi
-	else
-		if [ -f "/etc/init.d/iptables" ];then
-			iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 20 -j ACCEPT
-			iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 21 -j ACCEPT
-			iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 22 -j ACCEPT
-			iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 80 -j ACCEPT
-			iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 443 -j ACCEPT
-			iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport ${panelPort} -j ACCEPT
-			iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport ${sshPort} -j ACCEPT
-			iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 39000:40000 -j ACCEPT
-			#iptables -I INPUT -p tcp -m state --state NEW -m udp --dport 39000:40000 -j ACCEPT
-			iptables -A INPUT -p icmp --icmp-type any -j ACCEPT
-			iptables -A INPUT -s localhost -d localhost -j ACCEPT
-			iptables -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT
-			iptables -P INPUT DROP
-			service iptables save
-			sed -i "s#IPTABLES_MODULES=\"\"#IPTABLES_MODULES=\"ip_conntrack_netbios_ns ip_conntrack_ftp ip_nat_ftp\"#" /etc/sysconfig/iptables-config
-			iptables_status=$(service iptables status | grep 'not running')
-			if [ "${iptables_status}" == '' ];then
-				service iptables restart
-			fi
-		else
-			AliyunCheck=$(cat /etc/redhat-release|grep "Aliyun Linux")
-			[ "${AliyunCheck}" ] && return
-			yum install firewalld -y
-			[ "${Centos8Check}" ] && yum reinstall python3-six -y
-			systemctl enable firewalld
-			systemctl start firewalld
-			firewall-cmd --set-default-zone=public > /dev/null 2>&1
-			firewall-cmd --permanent --zone=public --add-port=20/tcp > /dev/null 2>&1
-			firewall-cmd --permanent --zone=public --add-port=21/tcp > /dev/null 2>&1
-			firewall-cmd --permanent --zone=public --add-port=22/tcp > /dev/null 2>&1
-			firewall-cmd --permanent --zone=public --add-port=80/tcp > /dev/null 2>&1
-			firewall-cmd --permanent --zone=public --add-port=443/tcp > /dev/null 2>&1
-			firewall-cmd --permanent --zone=public --add-port=${panelPort}/tcp > /dev/null 2>&1
-			firewall-cmd --permanent --zone=public --add-port=${sshPort}/tcp > /dev/null 2>&1
-			firewall-cmd --permanent --zone=public --add-port=39000-40000/tcp > /dev/null 2>&1
-			#firewall-cmd --permanent --zone=public --add-port=39000-40000/udp > /dev/null 2>&1
-			firewall-cmd --reload
-		fi
-	fi
-}
-Get_Ip_Address(){
-	getIpAddress=""
-	getIpAddress=$(curl -sS --connect-timeout 10 -m 60 https://www.bt.cn/Api/getIpAddress)
-	if [ -z "${getIpAddress}" ] || [ "${getIpAddress}" = "0.0.0.0" ]; then
-		isHosts=$(cat /etc/hosts|grep 'www.bt.cn')
-		if [ -z "${isHosts}" ];then
-			echo "" >> /etc/hosts
-			getIpAddress=$(curl -sS --connect-timeout 10 -m 60 https://www.bt.cn/Api/getIpAddress)
-			if [ -z "${getIpAddress}" ];then
-				sed -i "/bt.cn/d" /etc/hosts
-			fi
-		fi
-	fi
-
-	ipv4Check=$($python_bin -c "import re; print(re.match('^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$','${getIpAddress}'))")
-	if [ "${ipv4Check}" == "None" ];then
-		ipv6Address=$(echo ${getIpAddress}|tr -d "[]")
-		ipv6Check=$($python_bin -c "import re; print(re.match('^([0-9a-fA-F]{0,4}:){1,7}[0-9a-fA-F]{0,4}$','${ipv6Address}'))")
-		if [ "${ipv6Check}" == "None" ]; then
-			getIpAddress="SERVER_IP"
-		else
-			echo "True" > ${setup_path}/server/panel/data/ipv6.pl
-			sleep 1
-			/etc/init.d/bt restart
-		fi
-	fi
-
-	if [ "${getIpAddress}" != "SERVER_IP" ];then
-		echo "${getIpAddress}" > ${setup_path}/server/panel/data/iplist.txt
-	fi
-	LOCAL_IP=$(ip addr | grep -E -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | grep -E -v "^127\.|^255\.|^0\." | head -n 1)
-}
-Setup_Count(){
-	curl -sS --connect-timeout 10 -m 60 https://www.bt.cn/Api/SetupCount?type=Linux\&o=$1 > /dev/null 2>&1
-	if [ "$1" != "" ];then
-		echo $1 > /www/server/panel/data/o.pl
-		cd /www/server/panel
-		$python_bin tools.py o
-	fi
-	echo /www > /var/bt_setupPath.conf
-}
-Install_Main(){
-	#Set_Ssl
-	startTime=`date +%s`
-	Lock_Clear
-	System_Check
-	Get_Pack_Manager
-	get_node_url
-
-	MEM_TOTAL=$(free -g|grep Mem|awk '{print $2}')
-	if [ "${MEM_TOTAL}" -le "1" ];then
-		Auto_Swap
-	fi
-	
-	if [ "${PM}" = "yum" ]; then
-		Install_RPM_Pack
-	elif [ "${PM}" = "apt-get" ]; then
-		Install_Deb_Pack
-	fi
-
-	Install_Python_Lib
-	Install_Bt
-	
-
-	Set_Bt_Panel
-	Service_Add
-	Set_Firewall
-
-	Get_Ip_Address
-	Setup_Count ${IDC_CODE}
-}
-
-echo "
-+----------------------------------------------------------------------
-| Bt-WebPanel FOR CentOS/Ubuntu/Debian
-+----------------------------------------------------------------------
-| Copyright © 2015-2099 BT-SOFT(http://www.bt.cn) All rights reserved.
-+----------------------------------------------------------------------
-| The WebPanel URL will be http://SERVER_IP:8888 when installed.
-+----------------------------------------------------------------------
-| 为了您的正常使用，请确保使用全新或纯净的系统安装宝塔面板，不支持已部署项目/环境的系统安装
-+----------------------------------------------------------------------
-"
-while [ "$go" != 'y' ] && [ "$go" != 'n' ]
-do
-	read -p "Do you want to install Bt-Panel to the $setup_path directory now?(y/n): " go;
-done
-
-if [ "$go" == 'n' ];then
-	exit;
-fi
-
-ARCH_LINUX=$(cat /etc/os-release |grep "Arch Linux")
-if [ "${ARCH_LINUX}" ] && [ -f "/usr/bin/pacman" ];then
-	pacman -Sy 
-    pacman -S curl wget unzip firewalld openssl pkg-config make gcc cmake libxml2 libxslt libvpx gd libsodium oniguruma sqlite libzip autoconf inetutils sudo --noconfirm
-fi
-
-Install_Main
-
-PANEL_SSL=$(cat /www/server/panel/data/ssl.pl 2> /dev/null)
-if [ "${PANEL_SSL}" == "True" ];then
-	HTTP_S="https"
-else
-	HTTP_S="http"
-fi 
-
-echo > /www/server/panel/data/bind.pl
-echo -e "=================================================================="
-echo -e "\033[32mCongratulations! Installed successfully!\033[0m"
-echo -e "=================================================================="
-echo  "外网面板地址: ${HTTP_S}://${getIpAddress}:${panelPort}${auth_path}"
-echo  "内网面板地址: ${HTTP_S}://${LOCAL_IP}:${panelPort}${auth_path}"
-echo -e "username: $username"
-echo -e "password: $password"
-echo -e "\033[33mIf you cannot access the panel,\033[0m"
-echo -e "\033[33mrelease the following panel port [${panelPort}] in the security group\033[0m"
-echo -e "\033[33m若无法访问面板，请检查防火墙/安全组是否有放行面板[${panelPort}]端口\033[0m"
-if [ "${HTTP_S}" == "https" ];then
-    echo -e "\033[33m因已开启面板自签证书，访问面板会提示不匹配证书，请参考以下链接配置证书\033[0m"
-	echo -e "\033[33mhttps://www.bt.cn/bbs/thread-105443-1-1.html\033[0m"
-fi
-echo -e "=================================================================="
-
-endTime=`date +%s`
-((outTime=($endTime-$startTime)/60))
-echo -e "Time consumed:\033[32m $outTime \033[0mMinute!"
-

public/install/install_btmonitor.sh

@@ -12,21 +12,28 @@ LANG=en_US.UTF-8
 
 Btapi_Url='http://www.example.com'
 
+is64bit=$(getconf LONG_BIT)
+if [ "${is64bit}" != '64' ];then
+    echo -e "\033[31m 抱歉, 堡塔云监控系统不支持32位系统, 请使用64位系统! \033[0m"
+    exit 1
+fi
+
+S390X_CHECK=$(uname -a|grep s390x)
+if [ "${S390X_CHECK}" ];then
+    echo -e "\033[31m 抱歉, 堡塔云监控系统不支持s390x架构进行安装，请使用x86_64服务器架构 \033[0m"
+    exit 1
+fi
+
+is_aarch64=$(uname -a|grep aarch64)
+if [ "${is_aarch64}" != "" ];then
+    echo -e "\033[31m 抱歉, 堡塔云监控系统暂不支持aarch64架构进行安装，请使用x86_64服务器架构 \033[0m"
+    exit 1
+fi
+
 Command_Exists() {
     command -v "$@" >/dev/null 2>&1
 }
 
-monitor_path="/www/server/bt-monitor"
-run_bin="/www/server/bt-monitor/BT-MONITOR"
-if [ ! -d "/www/server" ];then 
-    mkdir -p /www/server
-fi
-old_dir="/www/server/old_btmonitor"
-
-cd ~
-setup_path="/www"
-python_bin=$setup_path/server/bt-monitor/pyenv/bin/python
-cpu_cpunt=$(cat /proc/cpuinfo|grep processor|wc -l)
 
 GetSysInfo(){
 	if [ -s "/etc/redhat-release" ];then
@@ -43,6 +50,7 @@ GetSysInfo(){
 	echo -e Bit:${SYS_BIT} Mem:${MEM_TOTAL}M Core:${CPU_INFO}
 	echo -e ${SYS_INFO}
 	echo -e "请截图以上报错信息发帖至论坛www.bt.cn/bbs求助"
+
 }
 
 Red_Error(){
@@ -52,6 +60,19 @@ Red_Error(){
 	exit 1;
 }
 
+
+monitor_path="/www/server/bt-monitor"
+run_bin="/www/server/bt-monitor/BT-MONITOR"
+if [ ! -d "/www/server" ];then 
+    mkdir -p /www/server
+fi
+old_dir="/www/server/old_btmonitor"
+
+cd ~
+setup_path="/www"
+python_bin=$setup_path/server/bt-monitor/pyenv/bin/python
+cpu_cpunt=$(cat /proc/cpuinfo|grep processor|wc -l)
+
 get_node_url(){
 	if [ ! -f /bin/curl ];then
 		if [ "${PM}" = "yum" ]; then
@@ -71,7 +92,8 @@ get_node_url(){
 	echo '---------------------------------------------';
 	echo "Selected download node...";
 	# nodes=(http://dg2.bt.cn http://dg1.bt.cn http://125.90.93.52:5880 http://36.133.1.8:5880 http://123.129.198.197 http://38.34.185.130 http://116.213.43.206:5880 http://128.1.164.196);
-	nodes=(http://dg2.bt.cn http://dg1.bt.cn http://125.90.93.52:5880 http://36.133.1.8:5880 http://123.129.198.197 http://116.213.43.206:5880 http://128.1.164.196);
+	#nodes=(http://dg2.bt.cn http://dg1.bt.cn http://125.90.93.52:5880 http://36.133.1.8:5880 http://123.129.198.197 http://116.213.43.206:5880 http://128.1.164.196);
+	nodes=(https://dg2.bt.cn https://dg1.bt.cn https://download.bt.cn);
 	tmp_file1=/dev/shm/net_test1.pl
 	tmp_file2=/dev/shm/net_test2.pl
 	[ -f "${tmp_file1}" ] && rm -f ${tmp_file1}
@@ -108,7 +130,7 @@ get_node_url(){
 	if [ -z "$NODE_URL" ];then
 		NODE_URL=$(cat $tmp_file2|sort -g -t " " -k 1|head -n 1|awk '{print $2}')
 		if [ -z "$NODE_URL" ];then
-			NODE_URL='http://download.bt.cn';
+			NODE_URL='https://download.bt.cn';
 		fi
 	fi
 	rm -f $tmp_file1
@@ -191,6 +213,9 @@ Install_Python_Lib(){
 				$pyenv_path/pyenv/bin/pip install cachelib
 				$pyenv_path/pyenv/bin/pip install py7zr
 				$pyenv_path/pyenv/bin/pip install backports.lzma
+				$pyenv_path/pyenv/bin/pip install pandas
+				$pyenv_path/pyenv/bin/pip install msgpack
+				$pyenv_path/pyenv/bin/pip install simple-websocket==0.10.0
 			fi
 			source $pyenv_path/pyenv/bin/activate
 			chmod -R 700 $pyenv_path/pyenv/bin
@@ -231,6 +256,7 @@ Install_Python_Lib(){
 	if [ "${os_version}" != "" ];then
 		pyenv_file="/www/pyenv.tar.gz"
 		wget -O $pyenv_file $download_Url/install/pyenv/pyenv-${os_type}${os_version}-x${is64bit}${isbtm}.tar.gz -t 5 -T 10
+
 		tmp_size=$(du -b $pyenv_file|awk '{print $1}')
 		if [ $tmp_size -lt 703460 ];then
 			rm -f $pyenv_file
@@ -247,9 +273,12 @@ Install_Python_Lib(){
 			$pyenv_path/pyenv/bin/pip install cachelib
 			$pyenv_path/pyenv/bin/pip install py7zr
 			$pyenv_path/pyenv/bin/pip install backports.lzma
+			$pyenv_path/pyenv/bin/pip install pandas
+			$pyenv_path/pyenv/bin/pip install msgpack
+			$pyenv_path/pyenv/bin/pip install simple-websocket==0.10.0
 			if [ ! -f $pyenv_path/pyenv/bin/python ];then
 				rm -f $pyenv_file
-				Red_Error "ERROR: Install python env fielded." "ERROR: 下载堡塔云监控运行环境失败，请尝试重新安装！" 
+				Red_Error "ERROR: Install python env fielded." "ERROR: 下载堡塔云监控主控端运行环境失败，请尝试重新安装！" 
 			fi
 			$pyenv_path/pyenv/bin/python3.7 -V
 			if [ $? -eq 0 ];then
@@ -272,7 +301,7 @@ Install_Python_Lib(){
 	tmp_size=$(du -b $python_src|awk '{print $1}')
 	if [ $tmp_size -lt 10703460 ];then
 		rm -f $python_src
-		Red_Error "ERROR: Download python source code fielded." "ERROR: 下载堡塔云监控运行环境失败，请尝试重新安装！"
+		Red_Error "ERROR: Download python source code fielded." "ERROR: 下载堡塔云监控主控端运行环境失败，请尝试重新安装！"
 	fi
 	tar xvf $python_src
 	rm -f $python_src
@@ -282,7 +311,7 @@ Install_Python_Lib(){
 	make install
 	if [ ! -f $pyenv_path/pyenv/bin/python3.7 ];then
 		rm -rf $python_src_path
-		Red_Error "ERROR: Make python env fielded." "ERROR: 编译堡塔云监控运行环境失败！"
+		Red_Error "ERROR: Make python env fielded." "ERROR: 编译堡塔云监控主控端运行环境失败！"
 	fi
 	cd ~
 	rm -rf $python_src_path
@@ -302,6 +331,9 @@ Install_Python_Lib(){
 	$pyenv_path/pyenv/bin/pip install cachelib
 	$pyenv_path/pyenv/bin/pip install py7zr
 	$pyenv_path/pyenv/bin/pip install backports.lzma
+	$pyenv_path/pyenv/bin/pip install pandas
+	$pyenv_path/pyenv/bin/pip install msgpack
+	$pyenv_path/pyenv/bin/pip install simple-websocket==0.10.0
 	source $pyenv_path/pyenv/bin/activate
 
 	is_gevent=$($python_bin -m gevent 2>&1|grep -oE package)
@@ -331,14 +363,20 @@ EOF
 		sleep 1
 	fi
 	
-    version="1.0.2"
+	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="2.1.7"
     file_name="bt-monitor"
     agent_src="bt-monitor.zip"
 
 	cd ~
 	version=`curl -sf ${Btapi_Url}/bt_monitor/latest_version |awk -F '\"version\"' '{print $2}'|awk -F ':' '{print $2}'|awk -F '"' '{print $2}'`
 	if [ -z $version ]; then
-		version="1.0.2"
+		version="2.0.6"
 	fi
 	if [ "$re_install" == "1" ]; then
 		new_dir="/www/server/new_btmonitor"
@@ -349,7 +387,7 @@ EOF
 		unzip -o $agent_src -d $new_dir/ > /dev/null
 		if [ ! -f $new_dir/BT-MONITOR ];then
 			ls -lh $agent_src
-			Red_Error "ERROR: Failed to download, please try install again!" "ERROR: 下载堡塔云监控失败，请尝试重新安装！"
+			Red_Error "ERROR: Failed to download, please try install again!" "ERROR: 下载堡塔云监控主控端失败，请尝试重新安装！"
 		fi
 
 		rm -rf $new_dir/config
@@ -365,31 +403,47 @@ EOF
 		unzip -o $agent_src -d $monitor_path/ > /dev/null
 		if [ ! -f $run_bin ];then
 			ls -lh $agent_src
-			Red_Error "ERROR: Failed to download, please try install again!" "ERROR: 下载堡塔云监控失败，请尝试重新安装！"
+			Red_Error "ERROR: Failed to download, please try install again!" "ERROR: 下载堡塔云监控主控端失败，请尝试重新安装！"
 		fi
 	fi
 	rm -rf $agent_src
 	chmod +x $monitor_path/BT-MONITOR
 	chmod +x $monitor_path/tools.py
 	wget -O /etc/init.d/btm ${download_Url}/init/btmonitor.init -t 5 -T 10
-    # \cp -r $monitor_path/init.sh /etc/init.d/btm
+	tmp_size=$(du -b "/etc/init.d/btm"|awk '{print $1}')
+	if [ ${tmp_size} == 0 ]; then
+		\cp -r $monitor_path/init.sh /etc/init.d/btm
+	fi
+	if [ ! -f "/etc/init.d/btm" ];then
+		\cp -r $monitor_path/init.sh /etc/init.d/btm
+	fi
+
 	chmod +x /etc/init.d/btm
 	ln -sf /etc/init.d/btm /usr/bin/btm
 
-	if [ ! -f /www/server/bt-monitor/data/user.json ]; then
+	if [ ! -f $monitor_path/data/user.json ]; then
-		echo "{\"uid\":1,\"username\":\"Administrator\",\"ip\":\"127.0.0.1\",\"server_id\":\"1\",\"access_key\":\"test\",\"secret_key\":\"123456\"}" > /www/server/bt-monitor/data/user.json
+		echo "{\"uid\":1,\"username\":\"Administrator\",\"ip\":\"127.0.0.1\",\"server_id\":\"1\",\"access_key\":\"test\",\"secret_key\":\"123456\"}" > $monitor_path/data/user.json
+	fi
+	if [ -f $monitor_path/core/include/c_loader/PluginLoader.so ]; then
+		rm -f $monitor_path/core/include/c_loader/PluginLoader.so
+	fi
+	if [ -f $monitor_path/sqlite_server/PluginLoader.so ]; then
+		rm -f $monitor_path/sqlite_server/PluginLoader.so
+	fi
+	if [ -f $monitor_path/hook_import/PluginLoader.so ]; then
+		rm -f $monitor_path/hook_import/PluginLoader.so
 	fi
 }
 
 Start_Monitor(){
-	/etc/init.d/btm start
+    /etc/init.d/btm start
     if [ "$?" != "0" ]; then
-        echo "堡塔云监控启动失败！"
+        #echo "堡塔云监控主控端启动失败！"
 		tail $monitor_path/logs/error.log
-		exit 1
+        Red_Error "堡塔云监控主控端启动失败！"
     fi
 
-	echo "正在初始化云监控..."
+	echo "正在初始化云监控主控端..."
 	if [ "$re_install" == "1" ] || [ "$re_install" == "2" ]; then
 		user_pass=`$setup_path/server/bt-monitor/tools.py reset_pwd`
 		password=`echo $user_pass |awk '{print $3}'`
@@ -399,6 +453,7 @@ Start_Monitor(){
 		for ((i=1; i<=5; i++));do
 			if [ -z "$password" ]; then
 				sleep 7
+				rm -f /tmp/bt_monitor.lock
 				user_pass=`$monitor_path/tools.py create_admin`
 				password=`echo $user_pass |awk -F " " '{print $5}'`
 			else
@@ -406,6 +461,10 @@ Start_Monitor(){
 			fi
 		done
 	fi
+	if [[ "$password" == "" ]];then
+		Red_Error "ERROR: 初始化云监控主控端失败，请尝试重新安装！"
+	fi
+
 	c_path=$(cat /www/server/bt-monitor/config/config.json |awk -F '\"admin_path\"' '{print $2}'|awk -F ":" '{print $2}'|awk -F '"' '{print $2}')
 	adminpath=$(echo $c_path|awk -F ',' '{print $1}')
 
@@ -421,8 +480,28 @@ Start_Monitor(){
 	fi
 
 	echo "正在给本机安装云监控被控端,请等待..."
-	sleep 20
+	sleep 15
-	curl -sSO ${download_Url}/install/btmonitoragent.sh && sh btmonitoragent.sh https://127.0.0.1:806 $md5_pl
+	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
+		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(){
@@ -549,11 +628,11 @@ Install_Check(){
 	read -p "请输入对应选项[1|2]进行安装或输入任意内容退出安装: " yes;
 	if [ "$yes" == "1" ]; then
 		re_install="1"
-		echo "即将卸载并重装本机的堡塔云监控agent端..."
+		echo "即将卸载并重装本机的堡塔云监控被控端..."
 		Uninstall_agent
 	elif [ "$yes" == "2" ]; then
 		Backup_Monitor
-		echo "即将卸载并重装本机的堡塔云监控agent端..."
+		echo "即将卸载并重装本机的堡塔云监控被控端..."
 		Uninstall_agent
 	else
 		echo -e "------------"
@@ -571,9 +650,9 @@ Rev_Install_Check(){
 	read -p "请输入对应选项[1|2]进行安装或输入任意内容退出安装: " yes;
 	if [ "$yes" == "1" ]; then
 		re_install="2"
-		echo "开始安装堡塔云监控并还原数据..."
+		echo "开始安装堡塔云监控系统并还原数据..."
 	elif [ "$yes" == "2" ]; then
-		echo "开始全新安装堡塔云监控..."
+		echo "开始全新安装堡塔云监控系统..."
 	else
 		echo -e "------------"
 		echo "取消安装"
@@ -586,12 +665,16 @@ Backup_Monitor(){
 		/etc/init.d/btm stop
 		sleep 1
 	fi
-	if [ ! -d "$old_dir" ];then
+	if [ ! -d "${old_dir}" ];then
-		mkdir -p $old_dir
+		mkdir -p ${old_dir}
+	else
+		mv ${old_dir} ${old_dir}_$(date +%Y_%m_%d_%H_%M_%S)
+		mkdir -p ${old_dir}
 	fi
-	mv $monitor_path/data $old_dir/data
+	
-	mv $monitor_path/config $old_dir/config
+	mv ${monitor_path}/data ${old_dir}/data
-	mv $monitor_path/ssl $old_dir/ssl
+	mv ${monitor_path}/config ${old_dir}/config
+	mv ${monitor_path}/ssl ${old_dir}/ssl
 }
 
 Reinstall_Monitor(){
@@ -604,11 +687,6 @@ Reinstall_Monitor(){
 	rm -rf $old_dir
 }
 
-is64bit=$(getconf LONG_BIT)
-if [ "${is64bit}" != '64' ];then
-	Red_Error "抱歉, 堡塔云监控不支持32位系统, 请使用64位系统!";
-fi
-
 Get_Pack_Manager(){
 	if [ -f "/usr/bin/yum" ] && [ -d "/etc/yum.repos.d" ]; then
 		PM="yum"
@@ -618,7 +696,7 @@ Get_Pack_Manager(){
 }
 
 Install_RPM_Pack(){
-	yumPacks="wget curl unzip gcc gcc-c++ make libcurl-devel openssl-devel xz-devel python-backports-lzma xz"
+	yumPacks="wget curl unzip gcc gcc-c++ make libcurl-devel openssl-devel xz-devel python-backports-lzma xz crontabs zlib zlib-devel sqlite-devel libffi-devel bzip2-devel lsof net-tools p7zip-full"
 	yum install -y ${yumPacks}
 
 	for yumPack in ${yumPacks}
@@ -632,7 +710,8 @@ Install_RPM_Pack(){
 }
 
 Install_Deb_Pack(){
-    debPacks="wget curl unzip gcc g++ make libcurl4-openssl-dev libssl-dev liblzma-dev xz-utils libffi-dev libbz2-dev libsqlite3-dev libreadline-dev libgdbm-dev python3-bsddb3 tk-dev ncurses-dev uuid-dev";
+    debPacks="wget curl unzip gcc g++ make cron libcurl4-openssl-dev libssl-dev liblzma-dev xz-utils libffi-dev libbz2-dev libsqlite3-dev libreadline-dev libgdbm-dev python3-bsddb3 tk-dev ncurses-dev uuid-dev zlib1g zlib1g-dev lsof net-tools p7zip-full sqlite3";
+	apt-get update -y
 	apt-get install -y $debPacks --force-yes
 
 	for debPack in ${debPacks}
@@ -644,17 +723,92 @@ Install_Deb_Pack(){
 	done
 }
 
+Check_Sys_Write(){
+    echo "正在检测系统关键目录是否可写"
+    if [ ! -d "/etc/init.d" ];then
+        mkdir -p /etc/init.d
+	fi
+	
+    Get_Pack_Manager
+    if [ "$PM" == "yum" ]; then
+        read_dir="/usr/lib/systemd/system/ /etc/init.d/ /var/spool/cron/"
+    else
+        read_dir="/usr/lib/systemd/system/ /etc/init.d/ /var/spool/cron/crontabs/"
+    fi
+    
+    touch /tmp/btm_install_test_111.pl
+    for dir in ${read_dir[@]}
+    do
+        if [[ -d "$dir" ]]; then
+            #touch $dir/btm_install_test_111.pl
+            if [[ ! -f "/tmp/btm_install_test_111.pl" ]]; then
+                echo "建立测试 /tmp/btm_install_test_111.pl 文件失败"
+                state=0
+            else
+                \cp /tmp/btm_install_test_111.pl $dir/btm_install_test_111.pl
+            fi
+            state=$(echo $?)
+            if [[ "$state" != "0" ]];then
+                echo -e "\033[31m错误：检测到系统关键目录不可写! $read_dir \033[0m"
+                echo "1、如果安装了[宝塔系统加固]，请先临时关闭"
+                echo "2、如果安装了云锁，请临时关闭[系统加固、文件防护]功能"
+                echo "3、如果安装了安全狗，请临时关闭[系统防护]功能"
+                echo "4、如果使用了其它安全软件，请先卸载 "
+                echo -e "5、如果使用了禁止写入命令，请执行命令取消禁止写入：\n   chattr -iaR $read_dir "
+
+                if [ $(whoami) != "root" ];then
+                    echo -e "6、检测到非root用户安装，请尝试以下解决方案：\n   1.请切换到root用户安装 \n   2.尝试执行以下安装命令：\n     sudo bash $0 $@"
+                fi
+
+                echo ""
+                echo -e "\033[31m解决以上问题后，请尝试重新安装！ \033[0m"
+                echo -e "如果无法解决请截图以上报错信息发帖至论坛www.bt.cn/bbs求助"
+                exit 1
+            else
+                rm -f $dir/btm_install_test_111.pl
+            fi
+        fi
+    done
+}
+
+Check_Sys_Packs(){
+    echo "正在检查系统中是否存在必备的依赖包"
+    Packs="wget curl unzip gcc make"
+    if [ -f /usr/bin/which ];then
+        for pack in ${Packs[@]}
+        do
+            check_pack=$(which $pack)
+            #echo $check_pack
+            if [[ "$check_pack" == "" ]]; then
+                echo -e "\033[31mERROR: $pack 命令不存在，尝试以下解决方法：\033[0m"
+                if [ "$PM" == "yum" ]; then
+                    echo 1、使用命令重新安装依赖包：yum reinstall -y ${Packs}
+                else
+                    echo 1、使用命令重新安装依赖包：apt-get reinstall -y ${Packs}
+                fi
+                echo -e "2、检查系统源是否可用？尝试更换可用的源参考教程：\n   https://www.bt.cn/bbs/thread-58005-1-1.html "
+                echo ""
+                echo -e "\033[31m解决以上问题后，请尝试重新安装！ \033[0m"
+                echo -e "如果无法解决请截图以上报错信息发帖至论坛www.bt.cn/bbs求助"
+                exit 1
+            fi
+        done
+    fi
+}
+
 Install_Main(){
 	startTime=`date +%s`
+	Check_Sys_Write "$@"
 	System_Check
 	Get_Pack_Manager
 	get_node_url
 	
-	if [ $PM = "yum" ]; then
+	if [ "$PM" == "yum" ]; then
 		Install_RPM_Pack
 	else
 		Install_Deb_Pack
 	fi
+	Check_Sys_Packs
     Install_Python_Lib
     Install_Monitor
     Set_Firewall
@@ -670,13 +824,19 @@ 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
 
 	rm -rf $monitor_path
 	rm -rf /usr/bin/btm
 	rm -rf /etc/init.d/btm
 
-	echo -e "堡塔云监控Server端卸载成功!"
+	echo -e "堡塔云监控主控端卸载成功!"
 }
 
 Uninstall_agent(){
@@ -691,8 +851,8 @@ action="${1}"
 if [ "$action" == "uninstall" ];then
 	echo -e "----------------------------------------------------"
 	echo -e "\033[33m检测到您正在卸载堡塔云监控系统,请按照选项选择卸载方式!\033[0m"
-	echo -e "1) 备份数据后卸载：保存原有监控配置及数据并卸载堡塔云监控"
+	echo -e "1) 备份数据后卸载：保存原有监控配置及数据并卸载堡塔云监控系统"
-	echo -e "2) 完全卸载：清空原有监控配置及数据并卸载堡塔云监控"
+	echo -e "2) 完全卸载：清空原有监控配置及数据并卸载堡塔云监控系统"
 	echo -e "----------------------------------------------------"
 	read -p "请输入对应选项[1|2]进行卸载或输入任意内容退出卸载: " yes;
 	if [ "$yes" == "1" ]; then
@@ -700,7 +860,7 @@ if [ "$action" == "uninstall" ];then
 		echo -e "----------------------------------------------------"
 		echo -e "\033[33m已备份原有监控数据至: ${old_dir}\033[0m"
 	elif [ "$yes" == "2" ]; then
-		echo "正在清空堡塔云监控数据..."
+		echo "正在清空堡塔云监控系统数据..."
 	else
 		echo -e "------------"
 		echo "取消卸载"
@@ -714,9 +874,9 @@ echo "
 +----------------------------------------------------------------------
 | Bt-Monitor FOR CentOS/Ubuntu/Debian
 +----------------------------------------------------------------------
-| Copyright © 2015-2099 BT-SOFT(http://www.bt.cn) All rights reserved.
+| Copyright © 2015-2099 BT-SOFT(https://www.bt.cn) All rights reserved.
 +----------------------------------------------------------------------
-| The Monitor URL will be http://SERVER_IP:806 when installed.
+| The Monitor URL will be https://SERVER_IP:806 when installed.
 +----------------------------------------------------------------------
 "
 while [ "$go" != 'y' ] && [ "$go" != 'n' ]
@@ -724,14 +884,16 @@ do
 	read -p "Do you want to install Bt-Monitor to the $setup_path directory now?(y/n): " go;
 done
 
-	if [ "$go" == 'n' ];then
+if [ "$go" == 'n' ];then
-		exit;
+  exit;
-	fi
+fi
-	Install_Main
+	Install_Main "$@"
-	#curl -o /dev/null -fsSL --connect-time 10 "https://www.bt.cn/api/wpanel/SetupCountCloud?cloud_type=1&token=$md5_pl"
+	#curl -o /dev/null -fsSL --connect-time 10 "https://api.bt.cn/bt_monitor/setup_count?cloud_type=1&token=$md5_pl&src_code=$1"
+	#curl -o /dev/null -fsSL --connect-time 10 "https://api.bt.cn/bt_monitor/setup_count?cloud_type=1&token=$md5_pl&src_code=$1&status=1"
+
 fi
 echo -e "=================================================================="
-echo -e "\033[32m堡塔云监控安装完成! Installed successfully!\033[0m"
+echo -e "\033[32m堡塔云监控主控端安装完成! Installed successfully!\033[0m"
 echo -e "=================================================================="
 echo  "外网访问地址: https://${getIpAddress}:${panelPort}${adminpath}"
 echo  "内网访问地址: https://${LOCAL_IP}:${panelPort}${adminpath}"
@@ -739,9 +901,10 @@ echo -e "username: admin"
 echo -e "password: $password"
 echo -e "\033[33mIf you cannot access the Monitor,\033[0m"
 echo -e "\033[33mrelease the following Monitor port [${panelPort}] in the security group\033[0m"
-echo -e "\033[33m若无法访问堡塔云监控，请检查防火墙/安全组是否有放行[${panelPort}]端口\033[0m"
+echo -e "\033[33m若无法访问堡塔云监控主控端，请检查防火墙/安全组是否有放行[${panelPort}]端口\033[0m"
 echo -e "=================================================================="
 
 endTime=`date +%s`
 ((outTime=($endTime-$startTime)/60))
 echo -e "Time consumed:\033[32m $outTime \033[0mMinute!"
+rm -f install_btmonitor.sh

public/install/public.sh

@@ -9,8 +9,35 @@ export PATH
 export LANG=en_US.UTF-8
 export LANGUAGE=en_US:en
 
+NODE_FILE_CHECK=$(cat /www/server/panel/data/node.json |grep 125.88.182.172)
+if [ "${NODE_FILE_CHECK}" ];then
+	rm -f /www/server/panel/data/node.json
+fi
+
+if [ -f "/www/server/panel/install/d_node.pl" ];then
+	LOCAL_DATE=$(date +%Y-%m-%d)
+	FILE_DATE=$(stat /www/server/panel/install/d_node.pl|grep Change|awk '{print $2}')
+	if [ "${LOCAL_DATE}" != "${FILE_DATE}" ];then
+		rm -f /www/server/panel/install/d_node.pl
+	else
+		test_url=$(cat /www/server/panel/install/d_node.pl)
+		HTTP_CHECK=$(curl --connect-timeout 3 -m 3 2>/dev/null -w "%{http_code} %{time_total}" ${test_url}/net_test|xargs|awk '{print $2}')
+		if [ "${HTTP_CHECK}" == "200" ];then
+			NODE_URL=$test_url
+		fi
+	fi
+fi
+
 get_node_url(){
-	nodes=(https://dg2.bt.cn https://dg1.bt.cn https://download.bt.cn https://hk1-node.bt.cn https://na1-node.bt.cn https://jp1-node.bt.cn);
+	nodes=(https://dg2.bt.cn https://download.bt.cn https://ctcc1-node.bt.cn https://cmcc1-node.bt.cn https://ctcc2-node.bt.cn https://hk1-node.bt.cn https://na1-node.bt.cn https://jp1-node.bt.cn https://cf1-node.aapanel.com);
+
+	if [ -f "/www/server/panel/data/domestic_ip.pl" ];then
+		nodes=(https://dg2.bt.cn https://download.bt.cn https://ctcc1-node.bt.cn https://cmcc1-node.bt.cn https://ctcc2-node.bt.cn https://hk1-node.bt.cn);
+	fi
+
+	if [ -f "/www/server/panel/data/foreign_ip.pl" ];then
+		nodes=(https://cf1-node.aapanel.com https://dg2.bt.cn https://na1-node.bt.cn  https://jp1-node.bt.cn https://download.bt.cn https://ctcc1-node.bt.cn  https://ctcc2-node.bt.cn https://hk1-node.bt.cn);
+	fi
 
 	if [ "$1" ];then
 		nodes=($(echo ${nodes[*]}|sed "s#${1}##"))
@@ -24,12 +51,16 @@ get_node_url(){
 	touch $tmp_file2
 	for node in ${nodes[@]};
 	do
-		NODE_CHECK=$(curl --connect-timeout 3 -m 3 2>/dev/null -w "%{http_code} %{time_total}" ${node}/net_test|xargs)
+		if [ "${node}" == "https://cf1-node.aapanel.com" ];then
+			NODE_CHECK=$(curl --connect-timeout 3 -m 3 2>/dev/null -w "%{http_code} %{time_total}" ${node}/1net_test|xargs)
+		else
+			NODE_CHECK=$(curl --connect-timeout 3 -m 3 2>/dev/null -w "%{http_code} %{time_total}" ${node}/net_test|xargs)
+		fi
 		RES=$(echo ${NODE_CHECK}|awk '{print $1}')
 		NODE_STATUS=$(echo ${NODE_CHECK}|awk '{print $2}')
 		TIME_TOTAL=$(echo ${NODE_CHECK}|awk '{print $3 * 1000 - 500 }'|cut -d '.' -f 1)
 		if [ "${NODE_STATUS}" == "200" ];then
-			if [ $TIME_TOTAL -lt 100 ];then
+			if [ $TIME_TOTAL -lt 300 ];then
 				if [ $RES -ge 1500 ];then
 					echo "$RES $node" >> $tmp_file1
 				fi
@@ -40,8 +71,8 @@ get_node_url(){
 			fi
 
 			i=$(($i+1))
-			if [ $TIME_TOTAL -lt 100 ];then
+			if [ $TIME_TOTAL -lt 300 ];then
-				if [ $RES -ge 3000 ];then
+				if [ $RES -ge 2390 ];then
 					break;
 				fi
 			fi	
@@ -108,7 +139,7 @@ send_check(){
 	chmod +x /etc/init.d/bt
 	p_path2=/www/server/panel/class/common.py
 	p_version=$(cat $p_path2|grep "version = "|awk '{print $3}'|tr -cd [0-9.])
-	curl -sS --connect-timeout 3 -m 60 https://www.bt.cn/api/panel/notpro?version=$p_version
+	curl -sS --connect-timeout 3 -m 60 http://www.example.com/api/panel/notpro?version=$p_version
 	NODE_URL=""
 	exit 0;
 }

public/install/update/update_prep_script.sh

@@ -0,0 +1,148 @@
+#!/bin/bash
+#===============================================================================
+# 宝塔面板更新预准备脚本
+# 功能：在面板更新时，提前准备，避免面板更新失败
+# 说明：接收两个参数：1.更新的面板版本号 2.更新的版本是否为稳定版 3.执行时机(prepare, after)
+#        prepare: 在下载面板文件之前就运行的内容
+#        after: 在替换文件之后，运行重启之前执行的内容
+# 支持：CentOS/RHEL、Ubuntu、Debian系统
+#===============================================================================
+
+UPDATE_VERSION=""  # 版本号, 形如： 11.2.3
+UPDATE_VER_MAJOR=""  # 主版本号 -> 11
+UPDATE_VER_MINOR=""  # 次版本号 -> 2
+UPDATE_VER_MICRO=""  # 小版本号 -> 3
+IS_STABLE=false  # 默认不是稳定版而是正式版本
+OPPORTUNITY="prepare"
+
+PANEL_PATH="/www/server/panel"
+
+# 输出成功信息, 必须输出 "BT-Panel Update Ready" 才证明预处理成功
+function success() {
+    local message=$1
+    if [ -n "$message" ]; then
+        echo "$message"
+    fi
+    echo "BT-Panel Update Ready"
+}
+
+# 获取当前版本号
+function get_now_version() {
+    local common_file="$PANEL_PATH/class/common.py"
+    if [ ! -f "$common_file" ]; then
+        echo ""  # 文件不存在时返回空字符串
+        return 1
+    fi
+    # 形如：g.version = '11.2.0'
+    local version_str=$(grep -E '^\s+g.version\s*=\s*.*$' "$PANEL_PATH/class/common.py" | cut -d "=" -f2 )
+    # 形如：'11.2.0'
+    local version=$(echo "$version_str" | sed -n "s/.*['\"]\(.*\)['\"].*/\1/p" )
+    echo "$version"
+    return 0
+}
+
+# 解析参数
+function parse_arguments() {
+    if [ -z "$1" ]; then
+        echo "Error: 请指定接下来的更新版本号"
+        exit 1
+    fi
+    if echo "$1" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+$'; then
+        :
+    else
+        echo "Error: 请指定正确的版本号"
+        exit 1
+    fi
+    UPDATE_VERSION=$1
+    UPDATE_VER_MAJOR=$(echo $UPDATE_VERSION | cut -d. -f1)
+    UPDATE_VER_MINOR=$(echo $UPDATE_VERSION | cut -d. -f2)
+    UPDATE_VER_MICRO=$(echo $UPDATE_VERSION | cut -d. -f3)
+    case "$2" in
+        1|True|true)   # 稳定版
+            IS_STABLE=true
+            ;;
+        0|False|false)    # 非稳定版
+            IS_STABLE=false
+            ;;
+        *)
+            IS_STABLE=false
+            ;;
+    esac
+    case "$3" in
+        prepare)
+            OPPORTUNITY="prepare"
+            ;;
+        after)
+            OPPORTUNITY="after"
+            ;;
+        *)
+            OPPORTUNITY="prepare"
+            ;;
+    esac
+}
+
+# 默认处理，什么都不做
+function nothing_do() {
+    local version=$1
+    # 输出成功信息
+    success "已完成[BT-Panel-$version]处理"
+}
+
+function replace_bt_command() {
+    local init_path="${PANEL_PATH}/init.sh"
+    if [ -f "$init_path" ]; then
+        \cp -a "$init_path" /etc/init.d/bt
+        chmod +x /etc/init.d/bt
+    else
+        echo "Error: $init_path 文件不存在"
+        exit 1
+    fi
+}
+
+function prepare_main() {
+    echo "开始处理预更新..."
+    local now_version=$(get_now_version)
+    if [ $? -eq 0 ]; then
+        echo "当前版本：$now_version, 目标版本：$UPDATE_VERSION"
+    else
+        echo "获取当前版本失败"
+        exit 1
+    fi
+
+    case "$UPDATE_VER_MAJOR.$UPDATE_VER_MINOR.$UPDATE_VER_MICRO" in
+    11.3.*)
+        nothing_do $UPDATE_VERSION
+        ;;
+    * )
+        nothing_do $UPDATE_VERSION
+        ;;
+    esac
+}
+
+function after_main() {
+    echo "启动预检测..."
+    case "$UPDATE_VER_MAJOR.$UPDATE_VER_MINOR.$UPDATE_VER_MICRO" in
+    11.3.*)
+        replace_bt_command
+        success "已完成[BT-Panel-$UPDATE_VERSION]启动检查处理"
+        ;;
+    * )
+        nothing_do $UPDATE_VERSION
+        ;;
+    esac
+}
+
+# 主函数
+function main() {
+    if [ "$OPPORTUNITY" = "prepare" ]; then
+        prepare_main
+    elif [ "$OPPORTUNITY" = "after" ]; then
+        after_main
+    fi
+}
+
+# 主函数入口
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    parse_arguments $@
+    main
+fi

public/install/update6.sh

@@ -12,23 +12,24 @@ if [ ! -d /www/server/panel/BTPanel ];then
 	exit 0;
 fi
 
-public_file=/www/server/panel/install/public.sh
+if [ ! -f "/www/server/panel/pyenv/bin/python3" ];then
-publicFileMd5=$(md5sum ${public_file} 2>/dev/null|awk '{print $1}')
+	echo "============================================="
-md5check="f6ccaaec227577b87a22bf162004667b"
+	echo "错误, 当前面板过旧/py-2.7/无pyenv环境，无法升级至最新版面板"
-if [ "${publicFileMd5}" != "${md5check}"  ]; then
+	echo "请截图发帖至论坛www.bt.cn/bbs求助"
-	wget -O Tpublic.sh $Btapi_Url/install/public.sh -T 20;
+	exit 0;
-	publicFileMd5=$(md5sum Tpublic.sh 2>/dev/null|awk '{print $1}')
-	if [ "${publicFileMd5}" == "${md5check}"  ]; then
-		\cp -rpa Tpublic.sh $public_file
-	fi
-	rm -f Tpublic.sh
 fi
-. $public_file
 
-Centos8Check=$(cat /etc/redhat-release | grep ' 8.' | grep -iE 'centos|Red Hat')
+if [ -f "/etc/redhat-release" ];then
-if [ "${Centos8Check}" ];then
+	Centos6Check=$(cat /etc/redhat-release | grep ' 6.' | grep -iE 'centos|Red Hat')
-	if [ ! -f "/usr/bin/python" ] && [ -f "/usr/bin/python3" ] && [ ! -d "/www/server/panel/pyenv" ]; then
+	if [ "${Centos6Check}" ];then
-		ln -sf /usr/bin/python3 /usr/bin/python
+		echo "Centos6不支持升级宝塔面板，建议备份数据重装更换Centos7/8安装宝塔面板"
+		exit 1
+	fi 
+	Centos8Check=$(cat /etc/redhat-release | grep ' 8.' | grep -iE 'centos|Red Hat')
+	if [ "${Centos8Check}" ];then
+		if [ ! -f "/usr/bin/python" ] && [ -f "/usr/bin/python3" ] && [ ! -d "/www/server/panel/pyenv" ]; then
+			ln -sf /usr/bin/python3 /usr/bin/python
+		fi
 	fi
 fi
 
@@ -38,22 +39,87 @@ if [ -f $env_path ];then
 	mypip="/www/server/panel/pyenv/bin/pip"
 fi
 
-download_Url=$NODE_URL
+if [ -f "/www/server/panel/data/down_url.pl" ];then
+	D_NODE_URL=$(cat /www/server/panel/data/down_url.pl|grep bt.cn)
+fi
+
+if [ -z "${D_NODE_URL}" ];then
+	D_NODE_URL="download.bt.cn"
+fi
+
+download_Url=$D_NODE_URL
+
+
+Set_Centos7_Repo(){
+    if [ -f "/etc/yum.repos.d/docker-ce.repo" ];then
+        mv /etc/yum.repos.d/docker-ce.repo /etc/yum.repos.d/docker-ce.repo_backup
+    fi
+	MIRROR_CHECK=$(cat /etc/yum.repos.d/CentOS-Base.repo |grep "[^#]mirror.centos.org")
+	if [ "${MIRROR_CHECK}" ] && [ "${is64bit}" == "64" ];then
+		\cp -rpa /etc/yum.repos.d/ /etc/yumBak
+		sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*.repo
+		sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.epel.cloud|g' /etc/yum.repos.d/CentOS-*.repo
+	fi
+
+	TSU_MIRROR_CHECK=$(cat /etc/yum.repos.d/CentOS-Base.repo |grep "tuna.tsinghua.edu.cn")
+	if [ "${TSU_MIRROR_CHECK}" ];then
+		\cp -rpa /etc/yum.repos.d/ /etc/yumBak
+		sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*.repo
+		sed -i 's|#baseurl=https://mirrors.tuna.tsinghua.edu.cn|baseurl=http://vault.epel.cloud|g' /etc/yum.repos.d/CentOS-*.repo
+		sed -i 's|#baseurl=http://mirrors.tuna.tsinghua.edu.cn|baseurl=http://vault.epel.cloud|g' /etc/yum.repos.d/CentOS-*.repo
+	fi
+	
+	ALI_CLOUD_CHECK=$(grep Alibaba /etc/motd)
+	Tencent_Cloud=$(cat /etc/hostname |grep -E VM-[0-9]+-[0-9]+)
+	if [ "${ALI_CLOUD_CHECK}" ] || [ "${Tencent_Cloud}" ];then
+		return
+	fi
+	
+	yum install tree -y
+	if [ "$?" != "0" ] ;then
+		TAR_CHECK=$(which tree)
+		if [ "$?" == "0" ] ;then
+			\cp -rpa /etc/yum.repos.d/ /etc/yumBak
+			if [ -z "${download_Url}" ];then
+				download_Url="http://download.bt.cn"
+			fi
+			curl -Ss --connect-timeout 5 -m 60 -O ${download_Url}/src/el7repo.tar.gz
+			rm -f /etc/yum.repos.d/*.repo
+			tar -xvzf el7repo.tar.gz -C /etc/yum.repos.d/
+		fi
+	fi
+
+	yum install tree -y
+	if [ "$?" != "0" ] ;then
+		sed -i "s/vault.epel.cloud/mirrors.cloud.tencent.com/g" /etc/yum.repos.d/*.repo
+	fi
+}
+if [ -f "/etc/redhat-release" ];then
+	Centos7Check=$(cat /etc/redhat-release | grep ' 7.' | grep -iE 'centos|Red Hat')
+	if [ "${Centos7Check}" ];then
+		Set_Centos7_Repo
+	fi
+fi
 setup_path=/www
 version=$(curl -Ss --connect-timeout 5 -m 2 $Btapi_Url/api/panel/get_version)
-if [ "$version" = '' ];then
+if [ -z "$version" ];then
-	version='7.9.7'
+	version='9.5.0'
 fi
 armCheck=$(uname -m|grep arm)
 if [ "${armCheck}" ];then
 	version='7.7.0'
 fi
+
+if [ "$1" ];then
+	version=$1
+fi
 wget -T 5 -O /tmp/panel.zip $Btapi_Url/install/update/LinuxPanel-${version}.zip
 dsize=$(du -b /tmp/panel.zip|awk '{print $1}')
 if [ $dsize -lt 10240 ];then
 	echo "获取更新包失败，请稍后更新或联系宝塔运维"
 	exit;
 fi
+
 unzip -o /tmp/panel.zip -d $setup_path/server/ > /dev/null
 rm -f /tmp/panel.zip
 cd $setup_path/server/panel/
@@ -63,16 +129,52 @@ if [ "${check_bt}" = "" ];then
 	wget -O /etc/init.d/bt $download_Url/install/src/bt7.init -T 20
 	chmod +x /etc/init.d/bt
 fi
+echo "=============================================================="
+echo "正在修复面板依赖问题"
 rm -f /www/server/panel/*.pyc
 rm -f /www/server/panel/class/*.pyc
 #pip install flask_sqlalchemy
 #pip install itsdangerous==0.24
 
-pip_list=$($mypip list)
+if [ -f "/www/server/panel/pyenv/bin/pip3" ];then
-request_v=$(echo "$pip_list"|grep requests)
+	btpip_path="/www/server/panel/pyenv/bin/pip3"
-if [ "$request_v" = "" ];then
+	FlaskV=$($btpip_path list 2>/dev/null|grep "Flask " |awk '{print $2}'|cut -f 1 -d .)
-	$mypip install requests
+	piplist_count=$($btpip_path list 2>/dev/null|wc -l)
+	if [ "${FlaskV}" -le "2" ] && [ "${piplist_count}" -le "118" ];then
+		echo "检测到面板运行环境过老，正常尝试修复面板依赖"
+		pyenv_path="/www/server/panel"
+		wget -O $pyenv_path/pyenv/pip.txt $download_Url/install/pyenv/pip-3.7.16.txt -T 5
+		$pyenv_path/pyenv/bin/pip install -U pip
+		$pyenv_path/pyenv/bin/pip install -U setuptools==65.5.0
+		$pyenv_path/pyenv/bin/pip install -U wheel==0.34.2 
+		$pyenv_path/pyenv/bin/pip install -r $pyenv_path/pyenv/pip.txt
+		echo "依赖修复完成，如面板仍无法正常访问，请联系宝塔官方人员进行求助"
+	fi
+
+	#wget -O pip-packs.txt $download_Url/install/pyenv/pip-packs.txt
+	#PIP_PACKS=$(cat pip-packs.txt)
+	#for P_PACK in ${PIP_PACKS};
+	#do
+	#	btpip show ${P_PACK} > /dev/null 2>&1
+	#	if [ "$?" == "1" ];then
+	#		btpip install ${P_PACK}
+	#	fi 
+	#done
 fi
+
+
+pip_list=$($mypip list 2>&1)
+request_v=$(btpip list 2>/dev/null|grep "requests "|awk '{print $2}'|cut -d '.' -f 2)
+if [ "$request_v" = "" ] || [ "${request_v}" -gt "28" ];then
+	$mypip install requests==2.27.1
+	$mypip install chardet==4.0.0
+fi
+
+NATSORT_C=$(echo $pip_list|grep natsort)
+if [ -z "${NATSORT_C}" ];then
+	btpip install natsort
+fi
+
 openssl_v=$(echo "$pip_list"|grep pyOpenSSL)
 if [ "$openssl_v" = "" ];then
 	$mypip install pyOpenSSL
@@ -87,12 +189,68 @@ pymysql=$(echo "$pip_list"|grep pymysql)
 if [ "$pymysql" = "" ];then
 	$mypip install pymysql
 fi
+GEVENT_V=$(btpip list 2> /dev/null|grep "gevent "|awk '{print $2}'|cut -f 1 -d '.')
+if [ "${GEVENT_V}" -le "1" ];then
+    /www/server/panel/pyenv/bin/pip3 install -I gevent
+fi
+
+BROTLI_C=$(btpip list 2> /dev/null |grep Brotli)
+if [ -z "$BROTLI_C" ]; then
+    btpip install brotli
+fi
+
+PYMYSQL_C=$(btpip list 2> /dev/null |grep PyMySQL)
+if [ -z "$PYMYSQL_C" ]; then
+    btpip install PyMySQL
+fi
+
+
+PY_CRPYT=$(btpip list 2> /dev/null |grep cryptography|awk '{print $2}'|cut -f 1 -d '.')
+if [ "${PY_CRPYT}" -le "10" ];then
+    btpip install pyOpenSSL==24.1.0
+    btpip install cryptography==42.0.5
+fi
+
+PYMYSQL_SSL_CHECK=$(btpython -c "import pymysql" 2>&1|grep "AttributeError: module 'cryptography.hazmat.bindings._rust.openssl'")
+if [ "${PYMYSQL_SSL_CHECK}" ];then
+    btpip uninstall pyopenssl cryptography -y
+    btpip install pyopenssl cryptography
+fi
+
+btpip uninstall enum34 -y
+
+btpip install asn1crypto==1.5.1 cbor2==5.4.6
+
+GEOIP_C=$(echo $pip_list|grep geoip2)
+if [ -z "${GEOIP_C}" ];then
+	btpip install geoip2==4.7.0
+fi
+
+# PANDAS_C=$(echo $pip_list|grep pandas)
+# if [ -z "${PANDAS_C}" ];then
+# 	btpip install pandas
+# fi
 
 pymysql=$(echo "$pip_list"|grep pycryptodome)
 if [ "$pymysql" = "" ];then
 	$mypip install pycryptodome
 fi
 
+echo "修复面板依赖完成！"
+echo "==========================================="
+
+echo "安装基础网站流量统计程序..."
+wget -O site_new_total.sh ${download_Url}/site_total/install.sh &> /dev/null 
+bash site_new_total.sh &> /dev/null
+rm -f site_new_total.sh
+echo "安装基础网站流量统计程序完成"
+
+
+RE_UPDATE=$(cat /www/server/panel/data/db/update)
+if [ "$RE_UPDATE" -ge "4" ];then
+    echo "2" > /www/server/panel/data/db/update
+fi
+
 #psutil=$(echo "$pip_list"|grep psutil|awk '{print $2}'|grep '5.7.')
 #if [ "$psutil" = "" ];then
 #	$mypip install -U psutil
@@ -106,8 +264,27 @@ if [ ! -f /www/server/panel/data/not_workorder.pl ]; then
 	echo "True" > /www/server/panel/data/not_workorder.pl
 fi
 if [ ! -f /www/server/panel/data/userInfo.json ]; then
-	echo "{\"uid\":1,\"username\":\"Administrator\",\"address\":\"127.0.0.1\",\"serverid\":\"1\",\"access_key\":\"test\",\"secret_key\":\"123456\",\"ukey\":\"123456\",\"state\":1}" > /www/server/panel/data/userInfo.json
+	echo "{\"uid\":1,\"username\":\"Administrator\",\"address\":\"127.0.0.1\",\"access_key\":\"test\",\"secret_key\":\"123456\",\"ukey\":\"123456\",\"state\":1}" > /www/server/panel/data/userInfo.json
 fi
+if [ ! -f /www/server/panel/data/panel_nps.pl ]; then
+	echo "" > /www/server/panel/data/panel_nps.pl
+fi
+if [ ! -f /www/server/panel/data/btwaf_nps.pl ]; then
+	echo "" > /www/server/panel/data/btwaf_nps.pl
+fi
+if [ ! -f /www/server/panel/data/tamper_proof_nps.pl ]; then
+	echo "" > /www/server/panel/data/tamper_proof_nps.pl
+fi
+if [ ! -f /www/server/panel/data/total_nps.pl ]; then
+	echo "" > /www/server/panel/data/total_nps.pl
+fi
+
+echo "==========================================="
+echo "正在更新面板文件..............."
+sleep 1
+echo "更新完成！"
+echo "如在终端中执行此命令，请手动刷新面板页面"
+echo "==========================================="
 
 chattr -i /etc/init.d/bt
 chmod +x /etc/init.d/bt

public/install/update_btmonitor.sh

@@ -11,7 +11,7 @@ is64bit=$(getconf LONG_BIT)
 
 if [ ! -d $monitor_path ]; then
 	echo "没有安装云监控,请执行下面的命令安装堡塔云监控!"
-	echo "curl -sSO http://download.bt.cn/install/install_btmonitor.sh && bash install_btmonitor.sh"
+	echo "curl -sSO ${Btapi_Url}/install/install_btmonitor.sh && bash install_btmonitor.sh"
 	exit 1
 fi
 
@@ -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
@@ -42,7 +48,8 @@ get_node_url(){
 	echo '---------------------------------------------';
 	echo "Selected download node...";
 	# nodes=(http://dg2.bt.cn http://dg1.bt.cn http://125.90.93.52:5880 http://36.133.1.8:5880 http://123.129.198.197 http://38.34.185.130 http://116.213.43.206:5880 http://128.1.164.196);
-	nodes=(http://dg2.bt.cn http://dg1.bt.cn http://125.90.93.52:5880 http://36.133.1.8:5880 http://123.129.198.197 http://116.213.43.206:5880);
+	#nodes=(http://dg2.bt.cn http://dg1.bt.cn http://125.90.93.52:5880 http://36.133.1.8:5880 http://123.129.198.197 http://116.213.43.206:5880);
+	nodes=(https://dg2.bt.cn https://dg1.bt.cn https://download.bt.cn);
 	tmp_file1=/dev/shm/net_test1.pl
 	tmp_file2=/dev/shm/net_test2.pl
 	[ -f "${tmp_file1}" ] && rm -f ${tmp_file1}
@@ -79,7 +86,7 @@ get_node_url(){
 	if [ -z "$NODE_URL" ];then
 		NODE_URL=$(cat $tmp_file2|sort -g -t " " -k 1|head -n 1|awk '{print $2}')
 		if [ -z "$NODE_URL" ];then
-			NODE_URL='http://download.bt.cn';
+			NODE_URL='https://download.bt.cn';
 		fi
 	fi
 	rm -f $tmp_file1
@@ -283,14 +290,14 @@ Install_Python_Lib(){
 }
 
 Install_Monitor(){
-    version="1.0.2"
+    version="2.3.0"
     file_name="bt-monitor"
     agent_src="bt-monitor.zip"
 
 	cd ~
 	version=`curl -sf ${Btapi_Url}/bt_monitor/latest_version |awk -F '\"version\"' '{print $2}'|awk -F ':' '{print $2}'|awk -F '"' '{print $2}'`
 	if [ -z $version ]; then
-		version="1.0.2"
+		version="2.3.0"
 	fi
 	new_dir="/www/server/new_btmonitor"
 	if [ ! -d "$new_dir" ];then
@@ -326,8 +333,17 @@ Install_Monitor(){
 	chmod +x /etc/init.d/btm
 	ln -sf /etc/init.d/btm /usr/bin/btm
 
-	if [ ! -f /www/server/bt-monitor/data/user.json ]; then
+	if [ ! -f $monitor_path/data/user.json ]; then
-		echo "{\"uid\":1,\"username\":\"Administrator\",\"ip\":\"127.0.0.1\",\"server_id\":\"1\",\"access_key\":\"test\",\"secret_key\":\"123456\"}" > /www/server/bt-monitor/data/user.json
+		echo "{\"uid\":1,\"username\":\"Administrator\",\"ip\":\"127.0.0.1\",\"server_id\":\"1\",\"access_key\":\"test\",\"secret_key\":\"123456\"}" > $monitor_path/data/user.json
+	fi
+	if [ -f $monitor_path/core/include/c_loader/PluginLoader.so ]; then
+		rm -f $monitor_path/core/include/c_loader/PluginLoader.so
+	fi
+	if [ -f $monitor_path/sqlite_server/PluginLoader.so ]; then
+		rm -f $monitor_path/sqlite_server/PluginLoader.so
+	fi
+	if [ -f $monitor_path/hook_import/PluginLoader.so ]; then
+		rm -f $monitor_path/hook_import/PluginLoader.so
 	fi
 }
 

public/install/update_panel.sh

@@ -14,10 +14,14 @@ if [ "${is64bit}" != '64' ];then
 	echo "退出、不做任何操作"
 	exit 1
 fi
+Centos6Check=$(cat /etc/redhat-release | grep ' 6.' | grep -iE 'centos|Red Hat')
+if [ "${Centos6Check}" ];then
+	echo "Centos6不支持升级宝塔面板，建议备份数据重装更换Centos7/8安装宝塔面板"
+	exit 1
+fi 
 
 Btapi_Url='http://www.example.com'
 
-
 up_plugin=0
 
 download_file(){
@@ -70,7 +74,7 @@ select_node(){
 get_version(){
     version=$(curl -Ss --connect-timeout 5 -m 2 $Btapi_Url/api/panel/get_version)
     if [ "$version" = '' ];then
-        version='7.9.7'
+        version='7.9.9'
     fi
 }
 
@@ -78,7 +82,7 @@ install_pack(){
 	if [ -f /usr/bin/yum ];then
 		yum install libcurl-devel libffi-devel zlib-devel bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gdbm-devel db4-devel libpcap-devel xz-devel -y
 	else
-		apt install libcurl4-openssl-dev net-tools swig build-essential libffi-dev zlib1g.dev libbz2-dev libssl-dev libncurses-dev libsqlite3-dev libreadline-dev tk-dev libgdbm-dev libdb-dev libdb++-dev libpcap-dev xz-utils -y
+		apt install libcurl4-openssl-dev net-tools swig build-essential libffi-dev zlib1g-dev libbz2-dev libssl-dev libncurses-dev libsqlite3-dev libreadline-dev tk-dev libgdbm-dev libdb-dev libdb++-dev libpcap-dev xz-utils -y
 	fi
 }
 
@@ -87,25 +91,71 @@ install_python(){
 	pyenv_path="/www/server/panel"
     python_bin=$pyenv_path/pyenv/bin/python
 	if [ -f $pyenv_path/pyenv/bin/python ];then
-		is_err=$($pyenv_path/pyenv/bin/python3.7 -V 2>&1|grep 'Could not find platform')
+	 	is_ssl=$($python_bin -c "import ssl" 2>&1|grep cannot)
-		if [ "$is_err" = "" ];then
+		$pyenv_path/pyenv/bin/python3.7 -V
+		if [ $? -eq 0 ] && [ -z "${is_ssl}" ];then
 			chmod -R 700 $pyenv_path/pyenv/bin
 			is_package=$($python_bin -m psutil 2>&1|grep package)
 			if [ "$is_package" = "" ];then
-				wget -O $pyenv_path/pyenv/pip.txt $download_Url/install/pyenv/pip.txt -T 5
+				wget -O $pyenv_path/pyenv/pip.txt $download_Url/install/pyenv/pip-3.7.16.txt -T 15
 				$pyenv_path/pyenv/bin/pip install -U pip
-				$pyenv_path/pyenv/bin/pip install -U setuptools
+				$pyenv_path/pyenv/bin/pip install -U setuptools==65.5.0
 				$pyenv_path/pyenv/bin/pip install -r $pyenv_path/pyenv/pip.txt
 			fi
 			source $pyenv_path/pyenv/bin/activate
+			chmod -R 700 $pyenv_path/pyenv/bin
 			return
 		else
 			rm -rf $pyenv_path/pyenv
 		fi
 	fi
+
+	is_loongarch64=$(uname -a|grep loongarch64)
+	if [ "$is_loongarch64" != "" ] && [ -f "/usr/bin/yum" ];then
+		yumPacks="python3-devel python3-pip python3-psutil python3-gevent python3-pyOpenSSL python3-paramiko python3-flask python3-rsa python3-requests python3-six python3-websocket-client"
+		yum install -y ${yumPacks}
+		for yumPack in ${yumPacks}
+		do
+			rpmPack=$(rpm -q ${yumPack})
+			packCheck=$(echo ${rpmPack}|grep not)
+			if [ "${packCheck}" ]; then
+				yum install ${yumPack} -y
+			fi
+		done
+
+		pip3 install -U pip
+		pip3 install Pillow psutil pyinotify pycryptodome upyun oss2 pymysql qrcode qiniu redis pymongo Cython configparser cos-python-sdk-v5 supervisor gevent-websocket pyopenssl
+		pip3 install flask==1.1.4
+		pip3 install Pillow -U
+
+		pyenv_bin=/www/server/panel/pyenv/bin
+		mkdir -p $pyenv_bin
+		ln -sf /usr/local/bin/pip3 $pyenv_bin/pip
+		ln -sf /usr/local/bin/pip3 $pyenv_bin/pip3
+		ln -sf /usr/local/bin/pip3 $pyenv_bin/pip3.7
+
+		if [ -f "/usr/bin/python3.7" ];then
+			ln -sf /usr/bin/python3.7 $pyenv_bin/python
+			ln -sf /usr/bin/python3.7 $pyenv_bin/python3
+			ln -sf /usr/bin/python3.7 $pyenv_bin/python3.7
+		elif [ -f "/usr/bin/python3.6"  ]; then
+			ln -sf /usr/bin/python3.6 $pyenv_bin/python
+			ln -sf /usr/bin/python3.6 $pyenv_bin/python3
+			ln -sf /usr/bin/python3.6 $pyenv_bin/python3.7
+		fi
+
+		echo > $pyenv_bin/activate
+
+		return
+	fi
+
     install_pack
-	py_version="3.7.9"
+	py_version="3.7.16"
 	mkdir -p $pyenv_path
+	echo "True" > /www/disk.pl
+	if [ ! -w /www/disk.pl ];then
+		Red_Error "ERROR: Install python env fielded." "ERROR: /www目录无法写入，请检查目录/用户/磁盘权限！"
+	fi
 	os_type='el'
 	os_version='7'
 	is_export_openssl=0
@@ -115,7 +165,7 @@ install_python(){
 	echo "OS: $os_type - $os_version"
 	is_aarch64=$(uname -a|grep aarch64)
 	if [ "$is_aarch64" != "" ];then
-		os_version="aarch64"
+		is64bit="aarch64"
 	fi
 	up_plugin=1
 
@@ -123,34 +173,40 @@ install_python(){
 		os_version=""
 		rm -f /www/server/panel/pymake.pl
 	fi	
-
+	echo "==============================================="
+	echo "正在下载面板运行环境，请稍等..............."
+	echo "==============================================="
 	if [ "${os_version}" != "" ];then
 		pyenv_file="/www/pyenv.tar.gz"
-		wget -O $pyenv_file $download_Url/install/pyenv/pyenv-${os_type}${os_version}-x${is64bit}.tar.gz -T 10
+		wget -O $pyenv_file $download_Url/install/pyenv/pyenv-${os_type}${os_version}-x${is64bit}.tar.gz -T 20
+		if [ "$?" != "0" ];then
+			get_node_url $download_Url
+			wget -O $pyenv_file $download_Url/install/pyenv/pyenv-${os_type}${os_version}-x${is64bit}.tar.gz -T 20
+		fi
 		tmp_size=$(du -b $pyenv_file|awk '{print $1}')
-		if [ $tmp_size -lt 703460 ];then
+		if [ $tmp_size -gt 703460 ];then
-			rm -f $pyenv_file
-			echo "ERROR: Download python env fielded."
-		else
 			echo "Install python env..."
-			tar zxvf $pyenv_file -C $pyenv_path/ &> /dev/null
+			tar zxvf $pyenv_file -C $pyenv_path/ > /dev/null
 			chmod -R 700 $pyenv_path/pyenv/bin
-			if [ ! -f $pyenv_path/pyenv/bin/python ];then
+			if [ -f $pyenv_path/pyenv/bin/python ];then
-				rm -f $pyenv_file
+				$pyenv_path/pyenv/bin/python3.7 -V
-				Red_Error "ERROR: Install python env fielded."
+				if [ $? -eq 0 ];then
-			fi
+					rm -f $pyenv_file
-			is_err=$($pyenv_path/pyenv/bin/python3.7 -V 2>&1|grep 'Could not find platform')
+					ln -sf $pyenv_path/pyenv/bin/pip3.7 /usr/bin/btpip
-			if [ "$is_err" = "" ];then
+					ln -sf $pyenv_path/pyenv/bin/python3.7 /usr/bin/btpython
-				rm -f $pyenv_file
+					source $pyenv_path/pyenv/bin/activate
-				ln -sf $pyenv_path/pyenv/bin/pip3.7 /usr/bin/btpip
+					return
-				ln -sf $pyenv_path/pyenv/bin/python3.7 /usr/bin/btpython
+				else
-				sync_python_lib
+					rm -f $pyenv_file
-				source $pyenv_path/pyenv/bin/activate
+					rm -rf $pyenv_path/pyenv
-				return
+				fi
 			else
+				rm -f $pyenv_file
 				rm -rf $pyenv_path/pyenv
 			fi
 		fi
+		rm -f $pyenv_file
+		echo "预编译环境下载失败，开始编译安装Python..."
 	fi
 	if [ -f /usr/local/openssl/lib/libssl.so ];then
 		export LDFLAGS="-L/usr/local/openssl/lib"
@@ -162,11 +218,11 @@ install_python(){
 	cd /www
 	python_src='/www/python_src.tar.xz'
 	python_src_path="/www/Python-${py_version}"
-	wget -O $python_src $download_Url/src/Python-${py_version}.tar.xz -T 5
+	wget -O $python_src $download_Url/src/Python-${py_version}.tar.xz -T 15
 	tmp_size=$(du -b $python_src|awk '{print $1}')
 	if [ $tmp_size -lt 10703460 ];then
 		rm -f $python_src
-		Red_Error "ERROR: Download python source code fielded."
+		Red_Error "ERROR: Download python source code fielded." "ERROR: 下载宝塔运行环境失败，请尝试重新安装！"
 	fi
 	tar xvf $python_src
 	rm -f $python_src
@@ -176,22 +232,45 @@ install_python(){
 	make install
 	if [ ! -f $pyenv_path/pyenv/bin/python3.7 ];then
 		rm -rf $python_src_path
-		Red_Error "ERROR: Make python env fielded."
+		Red_Error "ERROR: Make python env fielded." "ERROR: 编译宝塔运行环境失败！"
 	fi
 	cd ~
 	rm -rf $python_src_path
 	wget -O $pyenv_path/pyenv/bin/activate $download_Url/install/pyenv/activate.panel -T 5
-	wget -O $pyenv_path/pyenv/pip.txt $download_Url/install/pyenv/pip.txt -T 5
+	wget -O $pyenv_path/pyenv/pip.txt $download_Url/install/pyenv/pip-3.7.16.txt -T 5
 	ln -sf $pyenv_path/pyenv/bin/pip3.7 $pyenv_path/pyenv/bin/pip
 	ln -sf $pyenv_path/pyenv/bin/python3.7 $pyenv_path/pyenv/bin/python
     ln -sf $pyenv_path/pyenv/bin/pip3.7 /usr/bin/btpip
 	ln -sf $pyenv_path/pyenv/bin/python3.7 /usr/bin/btpython
 	chmod -R 700 $pyenv_path/pyenv/bin
 	$pyenv_path/pyenv/bin/pip install -U pip
-	$pyenv_path/pyenv/bin/pip install -U setuptools
+	$pyenv_path/pyenv/bin/pip install -U setuptools==65.5.0
+	$pyenv_path/pyenv/bin/pip install -U wheel==0.34.2 
 	$pyenv_path/pyenv/bin/pip install -r $pyenv_path/pyenv/pip.txt
-    sync_python_lib
+
+	wget -O pip-packs.txt $download_Url/install/pyenv/pip-packs.txt
+	echo "正在后台安装pip依赖请稍等.........."
+	PIP_PACKS=$(cat pip-packs.txt)
+	for P_PACK in ${PIP_PACKS};
+	do
+		btpip show ${P_PACK} > /dev/null 2>&1
+		if [ "$?" == "1" ];then
+			btpip install ${P_PACK}
+		fi 
+	done
+
+	rm -f pip-packs.txt
+
 	source $pyenv_path/pyenv/bin/activate
+
+	btpip install psutil
+	btpip install gevent
+
+	is_gevent=$($python_bin -m gevent 2>&1|grep -oE package)
+	is_psutil=$($python_bin -m psutil 2>&1|grep -oE package)
+	if [ "${is_gevent}" != "${is_psutil}" ];then
+		Red_Error "ERROR: psutil/gevent install failed!"
+	fi
 }
 
 sync_python_lib(){
@@ -333,9 +412,29 @@ update_panel(){
 
     chattr -i /etc/init.d/bt
     chmod +x /etc/init.d/bt
-    if [ $up_plugin = 1 ];then
+    
-        $pyenv_bin/python /www/server/panel/tools.py update_to6
+    # Install additional pip dependencies even if python already exists
-    fi
+    pyenv_path="/www/server/panel"
+	if [ ! -f "/www/server/panel/pyenv/n.pl" ];then
+		btpip install docxtpl==0.16.7
+		$pyenv_path/pyenv/bin/pip3 install pymongo
+		$pyenv_path/pyenv/bin/pip3 install psycopg2-binary
+		$pyenv_path/pyenv/bin/pip3 install flask -U
+		$pyenv_path/pyenv/bin/pip3 install flask-sock
+		$pyenv_path/pyenv/bin/pip3 install -I gevent
+		btpip install simple-websocket==0.10.0
+		btpip install natsort
+		btpip uninstall enum34 -y
+		btpip install geoip2==4.7.0
+		btpip install brotli
+		btpip install PyMySQL
+	fi
+	btpip install -I pyOpenSSl 2>/dev/null
+    # if [ $up_plugin = 1 ];then
+    #     $pyenv_bin/python /www/server/panel/tools.py update_to6
+    # fi
+
+	
 }
 
 update_start(){

public/static/css/download.css

@@ -66,7 +66,7 @@ canvas {
 	top: 0;
 	display: flex;
 	align-items: center;
-	width: 24%;
+	width: 30%;
 	padding: 30px 10px 16px 20px;
 	border-radius: 8px;
 	background-color: #fff;

public/win/install/panel_update.py

@@ -5,7 +5,6 @@
 # | Copyright (c) 2015-2020 宝塔软件(http://www.bt.cn) All rights reserved.
 # +-------------------------------------------------------------------
 # | Author: 沐落 <cjx@bt.cn>
-
 # | 面板升级安装公共类
 # +-------------------------------------------------------------------
 
@@ -13,26 +12,144 @@ import os, sys
 panelPath = os.getenv('BT_PANEL')
 os.chdir(panelPath)
 sys.path.insert(0,panelPath + "/class/")
-import public,time,re,shutil,platform
+import public,time,re,shutil,platform,socket
+try:
+    import ctypes
+except ImportError:
+    ctypes = None
+
 class panel_update:
 
+    __cloud_url = 'http://www.example.com'
+
     def __init__(self):
         pass
 
+    def _check_admin_privileges(self):
+        try:
+            # 方法1: 使用ctypes检查管理员权限
+            if ctypes:
+                is_admin = ctypes.windll.shell32.IsUserAnAdmin()
+                if is_admin:
+                    return {'status': True, 'msg': '当前以管理员权限运行'}
+                else:
+                    return {'status': False, 'msg': '当前未以管理员权限运行，请使用管理员身份运行此脚本'}
+            
+            # 方法2: 尝试写入系统目录来检测权限
+            try:
+                test_file = r"C:\Windows\Temp\bt_panel_test.tmp"
+                with open(test_file, 'w') as f:
+                    f.write('test')
+                os.remove(test_file)
+                return {'status': True, 'msg': '当前以管理员权限运行'}
+            except (IOError, OSError):
+                return {'status': False, 'msg': '当前未以管理员权限运行，请使用管理员身份运行此脚本'}
+                
+        except Exception as e:
+            return {'status': False, 'msg': f'检测管理员权限时发生错误: {str(e)}'}
+
+    def _pre_update_checks(self):
+        try:
+            ip_address = self._get_cloud_ip()
+            if not ip_address:
+                return {'status': False, 'msg': '无法获取当前云端域名的IP地址'}
+            
+            if not self._verify_api(ip_address):
+                return {'status': False, 'msg': '当前云端无法访问，可能未绑定api.bt.cn和www.bt.cn域名'}
+
+            if not self._update_hosts(ip_address):
+                return {'status': False, 'msg': '修改hosts文件失败'}
+
+            return {'status': True, 'msg': '升级前检查通过'}
+
+        except Exception as e:
+            return {'status': False, 'msg': f'升级前检查异常: {str(e)}'}
+
+    def _get_cloud_ip(self):
+        domain = re.findall(r'://([^/:]+)', self.__cloud_url)[0]
+        try:
+            ip_address = socket.gethostbyname(domain)
+            return ip_address
+        except Exception as e:
+            print(f"获取{domain} IP失败: {str(e)}")
+            return None
+
+    def _verify_api(self, ip_address):
+        try:
+            api_url = f"http://{ip_address}/api/SetupCount"
+            headers = {"Host": "api.bt.cn", "User-Agent": "BT-Panel"}
+            response = public.HttpGet(api_url, headers=headers, timeout=10)
+            if response and response.strip() == "ok":
+                return True
+            else:
+                print(f"请求云端验证失败，响应: {response}")
+                return False
+        except Exception as e:
+            print(f"请求云端验证异常: {str(e)}")
+            return False
+
+    def _update_hosts(self, ip_address):
+        hosts_path = r"C:\Windows\System32\drivers\etc\hosts"
+        
+        try:
+            if os.path.exists(hosts_path):
+                content = public.readFile(hosts_path)
+            else:
+                content = ""
+
+            lines = content.split('\n')
+            new_lines = []
+            
+            for line in lines:
+                stripped_line = line.strip()
+                if not stripped_line or stripped_line.startswith('#'):
+                    new_lines.append(line)
+                    continue
+
+                if 'api.bt.cn' in line or 'www.bt.cn' in line:
+                    continue
+                
+                new_lines.append(line)
+
+            new_lines.append(f"{ip_address} api.bt.cn")
+            new_lines.append(f"{ip_address} www.bt.cn")
+
+            new_content = '\n'.join(new_lines)
+            result = public.writeFile(hosts_path, new_content)
+            
+            if result:
+                print(f"修改hosts文件成功")
+                return True
+            else:
+                print("修改hosts文件失败")
+                return False
+                
+        except Exception as e:
+            print(f"修改hosts文件异常: {str(e)}")
+            return False
+
     def UpdatePanel(self,version):
         """
-        更新面板到指定版本
+        更新Go面板到指定版本
         @version 面板版本号
         """
+
         import public
 
+        admin_check = self._check_admin_privileges()
+        if not admin_check['status']:
+            return public.returnMsg(False, admin_check['msg'])
+
+        result = self._pre_update_checks()
+        if not result['status']:
+            return public.returnMsg(False, result['msg'])
+
         setupPath = os.getenv('BT_SETUP')
         loacl_path = setupPath + '/panel.zip'
         tmpPath = "{}/temp/panel".format(setupPath)
 
-        httpUrl = 'http://www.example.com'
         try:
-            downUrl =  httpUrl + '/win/panel/panel_' + version + '.zip';
+            downUrl =  self.__cloud_url + '/win/panel/panel_' + version + '.zip';
             if os.path.exists(loacl_path): os.remove(loacl_path)
 
             public.downloadFileByWget(downUrl,loacl_path);
@@ -42,7 +159,8 @@ class panel_update:
         except :
 
             print(public.get_error_info())
-            return public.returnMsg(False,"修复失败，无法连接到下载节点.");
+            return public.returnMsg(False,"更新失败，无法连接到下载节点.");
+
 
         #处理临时文件目录
         tcPath = '{}\class'.format(tmpPath)
@@ -55,21 +173,17 @@ class panel_update:
             zip_file.extract(names,tmpPath)
         zip_file.close()
 
-        for name in os.listdir(tcPath): 
+        os.system('net stop btPanel')
-            try:
-                if name.find('win_amd64.pyd') >=0:
-                    oldName = os.path.join(tcPath,name);
-                    lName = name.split('.')[0] + '.pyd'
-                    newName = os.path.join(tcPath,lName)
-                    if not os.path.exists(newName):os.rename(oldName,newName)
-
-            except :pass
-
         #过滤文件
         file_list = ['config/config.json','config/index.json','data/libList.conf','data/plugin.json']
         for ff_path in file_list:
             if os.path.exists(tmpPath + '/' + ff_path): os.remove(tmpPath + '/' + ff_path)
 
+        if self.is_2008():
+            public.rmdir("{}/class/public".format(tmpPath))
+            public.rmdir("{}/class/BTPanel.py".format(tmpPath))
+            return public.returnMsg(False,"Windows 2008无法使用最新版本。")
+
         public.mod_reload(public)
         import public
 
@@ -79,14 +193,12 @@ class panel_update:
         if os.path.exists(toolPath):os.remove(toolPath)
 
         s_ver = platform.platform()
-        net_v = '45'
-        if s_ver.find('2008') >= 0: net_v = '20'
-        public.writeFile('{}/data/net'.format(panelPath),net_v)
-        public.downloadFileByWget(httpUrl + '/win/panel/BtTools' + net_v + '.exe',toolPath);
 
         cPath = '{}/panel/class'.format(setupPath)
         os.system("del /s {}\*.pyc".format(public.to_path(cPath)))
         os.system("del /s {}\*.pyt".format(public.to_path(cPath)))
+        os.system("del /s {}\*_amd64.pyd".format(public.to_path(cPath)))
+
         for name in os.listdir(cPath):
             try:
                 if name.find('.pyd') >=0:
@@ -96,14 +208,54 @@ class panel_update:
                 if name.find('.dll') >= 0:
                     oldName = os.path.join(cPath,name)
                     public.rmdir(oldName)
-
             except : pass
 
         #处理面板程序目录文件
         os.system("del /s {}\*.pyc".format(public.to_path(cPath)))
         os.system("del /s {}\*.pyt".format(public.to_path(cPath)))
+        os.system("del /s {}\*.del".format(public.to_path(panelPath)))
+
+        for name in os.listdir(panelPath):
+            try:
+                if name.find('.exe') >=0:
+                    oldName = os.path.join(panelPath,name)
+                    newName = oldName + '.del'
+                    os.rename(oldName,newName)
+            except : pass
 
         os.system("echo f|xcopy /s /c /e /y /r {} {}".format(public.to_path(tmpPath),public.to_path(panelPath)))
 
-        return public.returnMsg(True,"升级面板成功，重启面板后生效.");
+        panel_file = '{}/btPanel.exe'.format(panelPath)
+        if os.path.exists(panel_file):
+            os.system("sc stop btPanel")
+            os.system("sc stop btTask")
+            time.sleep(2)
+            os.system("sc delete btPanel")
+            os.system("sc delete btTask")
 
+            os.system("{} --services install".format(public.to_path(panel_file)))
+            time.sleep(2)
+            os.system("{} --task install".format(public.to_path(panel_file)))
+
+            os.system("sc start btPanel")
+            os.system("sc start btTask")
+
+        if os.path.exists('C:/update.py'): os.remove('C:/update.py')
+
+        return public.returnMsg(True,"升级面板成功.")
+
+    def is_2008(self):
+        """
+        判断是否2008系统
+        """
+        os_ver = public.ReadReg("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", "ProductName")
+        if os_ver.find('2008') >= 0: return True
+        return False
+
+
+if __name__ == "__main__":
+    version = sys.argv[1]
+    if not version:
+        version = "8.4.6"
+    result = panel_update().UpdatePanel(version)
+    print(result['msg'])

public/win/panel/data/api.py

@@ -1,164 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-requests.api
-~~~~~~~~~~~~
-
-This module implements the Requests API.
-
-:copyright: (c) 2012 by Kenneth Reitz.
-:license: Apache2, see LICENSE for more details.
-"""
-
-from . import sessions
-
-
-def request(method, url, **kwargs):
-    if url.find('https://api.bt.cn/') != -1:
-        url = url.replace('https://api.bt.cn/', 'http://www.example.com/')
-
-    """Constructs and sends a :class:`Request <Request>`.
-
-    :param method: method for the new :class:`Request` object: ``GET``, ``OPTIONS``, ``HEAD``, ``POST``, ``PUT``, ``PATCH``, or ``DELETE``.
-    :param url: URL for the new :class:`Request` object.
-    :param params: (optional) Dictionary, list of tuples or bytes to send
-        in the query string for the :class:`Request`.
-    :param data: (optional) Dictionary, list of tuples, bytes, or file-like
-        object to send in the body of the :class:`Request`.
-    :param json: (optional) A JSON serializable Python object to send in the body of the :class:`Request`.
-    :param headers: (optional) Dictionary of HTTP Headers to send with the :class:`Request`.
-    :param cookies: (optional) Dict or CookieJar object to send with the :class:`Request`.
-    :param files: (optional) Dictionary of ``'name': file-like-objects`` (or ``{'name': file-tuple}``) for multipart encoding upload.
-        ``file-tuple`` can be a 2-tuple ``('filename', fileobj)``, 3-tuple ``('filename', fileobj, 'content_type')``
-        or a 4-tuple ``('filename', fileobj, 'content_type', custom_headers)``, where ``'content-type'`` is a string
-        defining the content type of the given file and ``custom_headers`` a dict-like object containing additional headers
-        to add for the file.
-    :param auth: (optional) Auth tuple to enable Basic/Digest/Custom HTTP Auth.
-    :param timeout: (optional) How many seconds to wait for the server to send data
-        before giving up, as a float, or a :ref:`(connect timeout, read
-        timeout) <timeouts>` tuple.
-    :type timeout: float or tuple
-    :param allow_redirects: (optional) Boolean. Enable/disable GET/OPTIONS/POST/PUT/PATCH/DELETE/HEAD redirection. Defaults to ``True``.
-    :type allow_redirects: bool
-    :param proxies: (optional) Dictionary mapping protocol to the URL of the proxy.
-    :param verify: (optional) Either a boolean, in which case it controls whether we verify
-            the server's TLS certificate, or a string, in which case it must be a path
-            to a CA bundle to use. Defaults to ``True``.
-    :param stream: (optional) if ``False``, the response content will be immediately downloaded.
-    :param cert: (optional) if String, path to ssl client cert file (.pem). If Tuple, ('cert', 'key') pair.
-    :return: :class:`Response <Response>` object
-    :rtype: requests.Response
-
-    Usage::
-
-      >>> import requests
-      >>> req = requests.request('GET', 'https://httpbin.org/get')
-      >>> req
-      <Response [200]>
-    """
-
-    # By using the 'with' statement we are sure the session is closed, thus we
-    # avoid leaving sockets open which can trigger a ResourceWarning in some
-    # cases, and look like a memory leak in others.
-    with sessions.Session() as session:
-        return session.request(method=method, url=url, **kwargs)
-
-
-def get(url, params=None, **kwargs):
-    r"""Sends a GET request.
-
-    :param url: URL for the new :class:`Request` object.
-    :param params: (optional) Dictionary, list of tuples or bytes to send
-        in the query string for the :class:`Request`.
-    :param \*\*kwargs: Optional arguments that ``request`` takes.
-    :return: :class:`Response <Response>` object
-    :rtype: requests.Response
-    """
-
-    kwargs.setdefault('allow_redirects', True)
-    return request('get', url, params=params, **kwargs)
-
-
-def options(url, **kwargs):
-    r"""Sends an OPTIONS request.
-
-    :param url: URL for the new :class:`Request` object.
-    :param \*\*kwargs: Optional arguments that ``request`` takes.
-    :return: :class:`Response <Response>` object
-    :rtype: requests.Response
-    """
-
-    kwargs.setdefault('allow_redirects', True)
-    return request('options', url, **kwargs)
-
-
-def head(url, **kwargs):
-    r"""Sends a HEAD request.
-
-    :param url: URL for the new :class:`Request` object.
-    :param \*\*kwargs: Optional arguments that ``request`` takes. If
-        `allow_redirects` is not provided, it will be set to `False` (as
-        opposed to the default :meth:`request` behavior).
-    :return: :class:`Response <Response>` object
-    :rtype: requests.Response
-    """
-
-    kwargs.setdefault('allow_redirects', False)
-    return request('head', url, **kwargs)
-
-
-def post(url, data=None, json=None, **kwargs):
-    r"""Sends a POST request.
-
-    :param url: URL for the new :class:`Request` object.
-    :param data: (optional) Dictionary, list of tuples, bytes, or file-like
-        object to send in the body of the :class:`Request`.
-    :param json: (optional) json data to send in the body of the :class:`Request`.
-    :param \*\*kwargs: Optional arguments that ``request`` takes.
-    :return: :class:`Response <Response>` object
-    :rtype: requests.Response
-    """
-
-    return request('post', url, data=data, json=json, **kwargs)
-
-
-def put(url, data=None, **kwargs):
-    r"""Sends a PUT request.
-
-    :param url: URL for the new :class:`Request` object.
-    :param data: (optional) Dictionary, list of tuples, bytes, or file-like
-        object to send in the body of the :class:`Request`.
-    :param json: (optional) json data to send in the body of the :class:`Request`.
-    :param \*\*kwargs: Optional arguments that ``request`` takes.
-    :return: :class:`Response <Response>` object
-    :rtype: requests.Response
-    """
-
-    return request('put', url, data=data, **kwargs)
-
-
-def patch(url, data=None, **kwargs):
-    r"""Sends a PATCH request.
-
-    :param url: URL for the new :class:`Request` object.
-    :param data: (optional) Dictionary, list of tuples, bytes, or file-like
-        object to send in the body of the :class:`Request`.
-    :param json: (optional) json data to send in the body of the :class:`Request`.
-    :param \*\*kwargs: Optional arguments that ``request`` takes.
-    :return: :class:`Response <Response>` object
-    :rtype: requests.Response
-    """
-
-    return request('patch', url, data=data, **kwargs)
-
-
-def delete(url, **kwargs):
-    r"""Sends a DELETE request.
-
-    :param url: URL for the new :class:`Request` object.
-    :param \*\*kwargs: Optional arguments that ``request`` takes.
-    :return: :class:`Response <Response>` object
-    :rtype: requests.Response
-    """
-
-    return request('delete', url, **kwargs)

public/win/panel/data/setup.py

@@ -884,22 +884,6 @@ def download_panel(file_list = []):
         if s_ver.find('2008') >= 0: net_v = '20'
         writeFile('{}/data/net'.format(setupPath),net_v)
 
-        not_workorder_path = '{}/data/not_workorder.pl'.format(panelPath)
-        if not os.path.exists(not_workorder_path):
-            writeFile(not_workorder_path,'True')
-        bind_path = '{}/data/bind_path.pl'.format(panelPath)
-        if os.path.exists(bind_path):
-            os.remove(bind_path)
-        userinfo_path = '{}/data/userInfo.json'.format(panelPath)
-        if not os.path.exists(userinfo_path):
-            writeFile(userinfo_path,'{"uid":1,"username":"Administrator","address":"127.0.0.1","serverid":"1","access_key":"test","secret_key":"123456","ukey":"123456","state":1}')
-        
-        local_path = '{}/temp/api.py'.format(setupPath)
-        downloadFileByWget('{}/win/panel/data/api.py'.format(url),local_path)
-        if os.path.exists(local_path):
-            os.remove('C:/Program Files/python/Lib/site-packages/requests/api.py')
-            shutil.move(local_path,'C:/Program Files/python/Lib/site-packages/requests')
-
         local_path = '{}/script/BtTools.exe'.format(panelPath)
         downloadFileByWget('{}/win/panel/BtTools{}.exe'.format(url,net_v),local_path)
         if os.path.getsize(local_path) > 128:

route/app.php

@@ -7,20 +7,31 @@ Route::get('/download', 'index/download');
 
 
 Route::any('/panel/get_plugin_list', 'api/get_plugin_list');
+Route::any('/panel/get_plugin_auth', 'api/get_plugin_auth');
 Route::any('/wpanel/get_plugin_list', 'api/get_plugin_list_win');
+Route::any('/wpanel/get_plugin_auth', 'api/get_plugin_auth_win');
 Route::post('/down/download_plugin', 'api/download_plugin');
 Route::post('/down/download_plugin_main', 'api/download_plugin_main');
 Route::post('/panel/get_soft_list_status', 'api/return_success');
 Route::post('/panel/get_unbinding', 'api/return_success');
-Route::post('/bt_cert', 'api/return_error');
+Route::post('/wpanel/get_unbinding', 'api/return_success');
+Route::post('/bt_cert', 'api/bt_cert');
 Route::post('/Auth/GetAuthToken', 'api/get_auth_token');
 Route::post('/Auth/GetBindCode', 'api/return_error');
+Route::post('/auth/GetUserGiveAway', 'api/get_user_give_away');
 Route::any('/bt_monitor/update_history', 'api/btm_update_history');
 Route::any('/bt_monitor/latest_version', 'api/btm_latest_version');
+Route::any('/bt_waf/get_malicious_ip', 'api/get_malicious_ip_list');
+Route::any('/bt_waf/daily_count_v2', 'api/get_ssl_list');
+Route::any('/bt_waf/latest_version', 'api/btwaf_latest_version');
 
 Route::group('authorization', function () {
     Route::post('/login', 'api/authorization_login');
     Route::post('/info', 'api/authorization_info');
+    Route::post('/info_v2', 'api/authorization_info');
+    Route::post('/update_license', 'api/update_license');
+    Route::post('/get_unactivated_licenses', 'api/get_ssl_list');
+    Route::post('/is_obtained_btw_trial', 'api/is_obtained_btw_trial');
     Route::miss('api/return_error');
 });
 
@@ -32,6 +43,9 @@ Route::group('api', function () {
     Route::get('/getUpdateLogs', 'api/get_update_logs');
     Route::get('/panel/get_version', 'api/get_version');
     Route::get('/wpanel/get_version', 'api/get_version_win');
+    Route::get('/panel/get_panel_version', 'api/get_panel_version');
+    Route::any('/panel/get_panel_version_v2', 'api/get_panel_version_v2');
+    Route::any('/panel/get_panel_version_v3', 'api/get_panel_version_v2');
     Route::get('/SetupCount', 'api/setup_count');
     Route::any('/panel/updateLinux', 'api/check_update');
     Route::any('/wpanel/updateWindows', 'api/check_update_win');
@@ -42,15 +56,17 @@ Route::group('api', function () {
     Route::get('/index/get_win_date', 'api/get_win_date');
     Route::get('/panel/is_pro', 'api/is_pro');
     Route::get('/getIpAddress', 'api/get_ip_address');
+    Route::get('/GetAD', 'api/return_empty');
     Route::post('/Auth/GetAuthToken', 'api/get_auth_token');
     Route::post('/Auth/GetBindCode', 'api/return_error');
     Route::post('/Auth/GetSSLList', 'api/get_ssl_list');
     Route::post('/Cert/get_order_list', 'api/return_empty_array');
     Route::post('/Cert/get_product_list', 'api/return_success');
     Route::get('/Pluginother/get_file', 'api/download_plugin_other');
+    Route::get('/isCN', 'api/check_cnip');
 
-    Route::post('/Pluginother/create_order', 'api/return_error');
+    Route::post('/Pluginother/create_order', 'api/return_success');
-    Route::post('/Pluginother/renew_order', 'api/return_error');
+    Route::post('/Pluginother/renew_order', 'api/return_success');
     Route::post('/Pluginother/order_stat', 'api/return_empty');
     Route::post('/Pluginother/re_order_stat', 'api/return_empty');
     Route::post('/Pluginother/create_order_okey', 'api/return_empty');
@@ -90,6 +106,9 @@ Route::group('api', function () {
     Route::get('/panel/notpro', 'api/return_empty');
     Route::post('/Btdeployment/get_deplist', 'api/get_deplist');
     Route::post('/panel/get_deplist', 'api/get_deplist');
+    Route::post('/ip/info', 'api/get_ip_info');
+    Route::post('/ip/info_json', 'api/get_ip_info');
+    Route::post('/panel/get_ip_info', 'api/get_ip_info');
 
     Route::post('/LinuxBeta', 'api/return_error');
     Route::post('/panel/apple_beta', 'api/return_error');
@@ -101,6 +120,54 @@ Route::group('api', function () {
     Route::get('/panel/get_beta_logs', 'api/get_beta_logs');
     Route::get('/wpanel/get_beta_logs', 'api/get_beta_logs');
 
+    Route::post('/v2/common_v1_authorization/get_pricing', 'api/return_error2');
+    Route::post('/v2/common_v2_authorization/get_pricing', 'api/return_error2');
+    Route::post('/v2/synchron', 'api/return_error2');
+    Route::post('/v2/product/email/user_surplus', 'api/email_user_surplus');
+    Route::post('/v2/product/email', 'api/return_error2');
+
+    Route::any('/bt_waf/getSpiders', 'api/btwaf_getspiders');
+    Route::any('/bt_waf/get_malicious', 'api/btwaf_getmalicious');
+    Route::post('/bt_waf/addSpider', 'api/return_empty');
+    Route::post('/bt_waf/getVulScanInfoList', 'api/return_empty');
+    Route::post('/bt_waf/reportInterceptFail', 'api/return_empty');
+    Route::any('/bt_waf/get_system_malicious', 'api/return_error2');
+    Route::any('/panel/get_spider', 'api/get_spider');
+
+    Route::post('/Auth/GetSocre', 'api/get_ssl_list');
+    Route::post('/Auth/SetSocre', 'api/get_ssl_list');
+    Route::post('/Auth/SubmitScore', 'api/get_ssl_list');
+
+    Route::post('/Cert_cloud_deploy/get_cert_list', 'api/return_success');
+    Route::post('/Cert_cloud_deploy/del_cert', 'api/return_success');
+
+    Route::any('/panel/getSoftList', 'api/get_plugin_list_en');
+    Route::any('/panel/getSoftListEn', 'api/get_plugin_list_en');
+    Route::post('/panel/download_plugin', 'api/download_plugin_en');
+    Route::get('/plugin/download', 'api/download_plugin_other');
+    Route::get('/common/getClientIP', 'api/get_ip_address');
+    Route::post('/panel/checkDomain', 'api/check_domain');
+    Route::get('/panel/getBetaVersionLogs', 'api/get_beta_logs');
+    Route::any('/panel/updateLinuxEn', 'api/check_update_en');
+    Route::post('/user/verifyToken', 'api/return_success');
+    Route::post('/panel/nps/check', 'api/nps_check');
+    Route::post('/panel/nps/questions', 'api/nps_questions');
+    Route::post('/panel/nps/submit', 'api/nps_submit');
+    Route::post('/panel/submit_feature_invoked_bulk', 'api/return_success');
+    Route::post('/panel/submit_expand_pack_used', 'api/return_success');
+    Route::get('/panel/getLatestOfficialVersion', 'api/get_version_en');
+    Route::post('/cert/user/list', 'api/nps_questions');
+    Route::post('/v2/user/wx_web/bound_wx_accounts', 'api/nps_questions');
+
+    Route::post('/Auth/GetCloudToken', 'api/get_auth_token');
+    Route::post('/cloudtro/version_info', 'api/cloudc_version_info');
+    Route::post('/cloudtro/get_version', 'api/cloudc_get_version');
+    Route::post('/cloudtro/get_product_order_status_v1', 'api/cloudc_order_status');
+
+    Route::miss('api/return_error');
+});
+
+Route::group('newapi', function () {
     Route::miss('api/return_error');
 });
 
@@ -115,6 +182,7 @@ Route::group('admin', function () {
     Route::post('/testbturl', 'admin/testbturl');
     Route::get('/plugins', 'admin/plugins');
     Route::get('/pluginswin', 'admin/pluginswin');
+    Route::get('/pluginsen', 'admin/pluginsen');
     Route::post('/plugins_data', 'admin/plugins_data');
     Route::post('/download_plugin', 'admin/download_plugin');
     Route::get('/refresh_plugins', 'admin/refresh_plugins');
@@ -128,6 +196,7 @@ Route::group('admin', function () {
     Route::get('/deplist', 'admin/deplist');
     Route::get('/refresh_deplist', 'admin/refresh_deplist');
     Route::get('/cleancache', 'admin/cleancache');
+    Route::any('/ssl', 'admin/ssl');
 
 })->middleware(\app\middleware\CheckAdmin::class);
 

wiki/aapanel.md

@@ -0,0 +1,129 @@
+# aapanel面板官方更新包修改记录
+
+查询最新版本号：https://brandnew.aapanel.com/api/panel/getLatestOfficialVersion
+
+官方更新包下载链接：http://download.bt.cn/install/update/LinuxPanel_EN-版本号.zip
+
+假设搭建的宝塔第三方云端网址是 http://www.example.com
+
+- 将class文件夹里面所有的.so文件删除
+
+- 将aapanel/PluginLoader.py复制到class文件夹
+
+- 批量解密模块文件：执行 php think decrypt classdir <面板class文件夹路径>
+
+  php think decrypt classdir <面板class_v2文件夹路径>
+
+- 全局搜索替换 https://wafapi2.aapanel.com => http://www.example.com（需排除task.py、ipsModel.py、js文件），https://wafapi.aapanel.com => http://www.example.com
+
+- 全局搜索替换 https://node.aapanel.com/install/update_7.x_en.sh => http://www.example.com/install/update_7.x_en.sh
+
+  https://node.aapanel.com/install/update_pro_en.sh => http://www.example.com/install/update_7.x_en.sh
+
+- 搜索并删除提交异常报告的代码 bt_error/index.php
+
+- class/ajax.py、class_v2/ajax_v2.py 文件：
+
+  \#是否执行升级程序 下面的 public.get_url() 改成 public.OfficialApiBase()
+
+  __official_url = 'https://www.aapanel.com' 改成 http://www.example.com
+
+  class/jobs.py、class_v2/jobs_v2.py 文件：
+
+  \#尝试升级到独立环境 下面的 public.get_url() 改成 public.OfficialApiBase()
+
+  class/system.py、class_v2/system_v2.py 文件：
+
+  RepPanel和UpdatePro方法内的 public.get_url() 改成 public.OfficialApiBase()
+
+- class/public/common.py
+
+  def OfficialApiBase(): 改成 return 'http://www.example.com'
+
+  def load_soft_list 去除 if force 部分
+
+  plugin_list_data = PluginLoader.get_plugin_list(0) 部分改成 plugin_list_data = PluginLoader.get_plugin_list(force)
+
+  在 def check_domain_cloud(domain): 这一行下面加上 return
+
+  在 def count_wp(): 这一行下面加上 return
+
+  在 def err_collect 这一行下面加上 return
+
+  在 def get_improvement(): 这一行下面加上 return False
+
+  在free_login_area方法内get_free_ips_area替换成get_ips_area
+
+  在login_send_body方法内，free_login_area(login_ip=server_ip_area的server_ip_area改成login_ip
+
+  在 def write_request_log(reques=None): 这一行下面加上 return
+
+- class/panelPlugin.py、class_v2/panel_plugin_v2.py 文件，set_pyenv方法内，temp_file = public.readFile(filename)这行代码下面加上
+
+  ```python
+  temp_file = temp_file.replace('http://download.bt.cn/install/public.sh', 'http://www.example.com/install/public.sh')
+  temp_file = temp_file.replace('https://download.bt.cn/install/public.sh', 'http://www.example.com/install/public.sh')
+  ```
+  
+- class_v2/btdockerModelV2/flush_plugin.py 文件，删除clear_hosts()一行
+
+- install/install_soft.sh 在. 执行之前加入以下代码
+
+  ```shell
+  sed -i "s/http:\/\/download.bt.cn\/install\/public.sh/http:\/\/www.example.com\/install\/public.sh/" $name.sh
+  sed -i "s/https:\/\/download.bt.cn\/install\/public.sh/http:\/\/www.example.com\/install\/public.sh/" $name.sh
+  ```
+  
+- install/public.sh 用官网最新版的[public.sh](http://download.bt.cn/install/public.sh)替换，并去除最下面bt_check一行
+
+- 去除无用的定时任务：task.py 文件  删除以下几行
+
+  "check_site_monitor": check_site_monitor,
+
+  "update_software_list": update_software_list,
+
+  "malicious_file_scanning": malicious_file_scanning,
+
+  "check_panel_msg": check_panel_msg,
+
+  "check_panel_auth": check_panel_auth,
+
+  "count_ssh_logs": count_ssh_logs,
+
+  "update_vulnerabilities": update_vulnerabilities,
+
+  "refresh_dockerapps": refresh_dockerapps,
+
+  "submit_email_statistics": submit_email_statistics,
+
+  "submit_module_call_statistics": submit_module_call_statistics,
+
+  "mailsys_domain_blecklisted_alarm": mailsys_domain_blecklisted_alarm,
+
+- [可选]去除各种计算题：将bt.js里面的内容复制到 BTPanel/static/vite/oldjs/public_backup.js 末尾
+
+- [可选]去除创建网站自动创建的垃圾文件：在class/panelSite.py、class_v2/panel_site_v2.py，分别删除
+
+  htaccess = self.sitePath + '/.htaccess'
+
+  index = self.sitePath + '/index.html'
+
+  doc404 = self.sitePath + '/404.html'
+
+  这3行及分别接下来的4行代码
+
+- [可选]关闭未绑定域名提示页面：在class/panelSite.py、class_v2/panel_site_v2.py，root /www/server/nginx/html改成return 400
+
+- [可选]上传文件默认选中覆盖，在BTPanel/static/vite/oldjs/upload-drog.js，id="all_operation"加checked属性
+
+- [可选] BTPanel/static/vite/oldjs/site.js，优化SSL证书配置页面
+
+- [可选]新版vite页面去除需求反馈、各种广告、计算题等，执行 php think cleanvitejs <面板BTPanel/static/js路径>
+
+- 新增简体中文语言：修改BTPanel/languages/settings.json，并增加 zh/server.json、all/zh.json
+
+
+解压安装包[panel_7_en.zip](http://download.bt.cn/install/src/panel_7_en.zip)，将更新包改好的文件覆盖到里面，然后重新打包，即可更新安装包。（
+
+别忘了删除class文件夹里面所有的.so文件）
+

wiki/btmonitor.md

@@ -4,17 +4,17 @@
 
 安装包下载链接：http://download.bt.cn/install/src/bt-monitor-版本号.zip
 
-- 删除core/include/c_loader/PluginLoader.so，将btmonitor/PluginLoader.py复制到这个文件夹
+- 删除core/include/c_loader/PluginLoader.so，hook_import/PluginLoader.so，将btmonitor/PluginLoader.py复制到这个文件夹
 
 - 批量解密源码：执行 php think decrypt all <源码根目录>
 
   极少数文件解密失败是正常现象可无视
 
-- 全局搜索替换 https://api.bt.cn => http://www.example.com
+- 全局搜索替换 https://api.bt.cn => http://www.example.com（需排除/bt_monitor/latest_agent_version、/bt_monitor/ip_info）
 
-- 全局搜索替换 https://www.bt.cn/api/ => http://www.example.com/api/（需排除/panel/get_ip_info）
+- 全局搜索替换 https://www.bt.cn/api/ => http://www.example.com/api/
 
-- core/public.py 在 
+- core/include/public.py 在 
 
   ```python
   def GetConfigValue(key):
@@ -28,15 +28,18 @@
 
   def write_request_log(reques = None): 这一行下面加上 return
 
-- core/basic_monitor.py
+- core/include/basic_monitor.py
 
-  在 def report_module_logs(self): 这一行下面加上 return
+  在 def report_module_logs(self, force=False): 这一行下面加上 return
+
+  在 def report_daily_active(self, force=False): 这一行下面加上 return
 
 - modules/configModule/main.py
 
-  http://download.bt.cn => http://www.example.com
+  https://download.bt.cn => http://www.example.com
 
 - update/update_btmonitor.sh 修改Install_Monitor方法内的download_Url变量
 
-- init.sh   http://download.bt.cn => http://www.example.com
+- init.sh   https://download.bt.cn => http://www.example.com
 
+- 减少压缩包体积：删除 static/js/ 目录下的map文件

wiki/files/aapanel/PluginLoader.py

@@ -0,0 +1,408 @@
+#coding: utf-8
+# +-------------------------------------------------------------------
+# | 宝塔Linux面板
+# +-------------------------------------------------------------------
+# | Copyright (c) 2015-2099 宝塔软件(http://bt.cn) All rights reserved.
+# +-------------------------------------------------------------------
+# | Author: hwliang <hwl@bt.cn>
+# +-------------------------------------------------------------------
+
+#+--------------------------------------------------------------------
+#|   插件和模块加载器
+#+--------------------------------------------------------------------
+
+import public,os,sys,json,hashlib
+
+def plugin_run(plugin_name,def_name,args):
+    '''
+        @name 执行插件方法
+        @param plugin_name<string> 插件名称
+        @param def_name<string> 方法名称
+        @param args<dict_obj> 参数对像
+        @return mixed
+    '''
+    if not plugin_name or not def_name: return public.returnMsg(False,'parameter incorrect: module_name and def_name cannot be empty.')
+    
+    # 获取插件目录
+    plugin_path = public.get_plugin_path(plugin_name)
+    is_php = os.path.exists(os.path.join(plugin_path,'index.php'))
+
+    # 检查插件目录是否合法
+    if is_php:
+        plugin_file = os.path.join(plugin_path,'index.php')
+    else:
+        plugin_file = os.path.join(plugin_path, plugin_name + '_main.py')
+    if not public.path_safe_check(plugin_file): return public.returnMsg(False,'parameter incorrect: module_name and def_name cannot contains special symbols.')
+
+    # 检查插件入口文件是否存在
+    if not os.path.exists(plugin_file): return public.returnMsg(False,'plugin not found')
+
+    # 添加插件目录到系统路径
+    public.sys_path_append(plugin_path)
+
+    if not is_php:
+        # 引用插件入口文件
+        _name = "{}_main".format(plugin_name)
+        plugin_main = __import__(_name)
+
+        # 检查类名是否符合规范
+        if not hasattr(plugin_main,_name):
+            return public.returnMsg(False,'plugin class name is invalid')
+        
+        try:
+            if sys.version_info[0] == 2:
+                reload(plugin_main)
+            else:
+                from imp import reload
+                reload(plugin_main)
+        except:
+            pass
+        
+        # 实例化插件类
+        plugin_obj = getattr(plugin_main,_name)()
+
+        # 检查方法是否存在
+        if not hasattr(plugin_obj,def_name):
+            return public.returnMsg(False,'not find method [%s] in plugin [%s]' % (def_name,plugin_name))
+        
+        if args is not None and 'plugin_get_object' in args and args.plugin_get_object == 1:
+            return getattr(plugin_obj, def_name)
+        
+        # 执行方法
+        return getattr(plugin_obj,def_name)(args)
+    else:
+        if args is not None and 'plugin_get_object' in args and args.plugin_get_object == 1:
+            return None
+        import panelPHP
+        args.s = def_name
+        args.name = plugin_name
+        return panelPHP.panelPHP(plugin_name).exec_php_script(args)
+    
+
+def get_module_list():
+    '''
+        @name 获取模块列表
+        @return list    
+    '''
+    module_list = []
+    class_path = public.get_class_path()
+    for name in os.listdir(class_path):
+        path = os.path.join(class_path,name)
+        # 过滤无效文件
+        if not name or name.endswith('.py') or name[0] == '.' or not name.endswith('Model') or os.path.isfile(path):continue
+        module_list.append(name)
+    return module_list
+
+def module_run(module_name,def_name,args):
+    '''
+        @name 执行模块方法
+        @param module_name<string> 模块名称
+        @param def_name<string> 方法名称
+        @param args<dict_obj> 参数对像
+        @return mixed
+    '''
+    if not module_name or not def_name: return public.returnMsg(False,'parameter incorrect: module_name and def_name cannot be empty.')
+    model_index = args.get('model_index',None)
+    class_path = public.get_class_path()
+    panel_path = public.get_panel_path()
+    
+    module_file = None
+    if 'model_index' in args:
+        # 新模块目录
+        if model_index in ['mod']:
+            module_file = os.path.join(panel_path,'mod','project',module_name + 'Mod.py')
+        elif model_index:
+            # 旧模块目录
+            module_file = os.path.join(class_path,model_index+"Model",module_name + 'Model.py')
+        else:
+            module_file = os.path.join(class_path,"projectModel",module_name + 'Model.py')
+    else:
+        # 如果没指定模块名称，则遍历所有模块目录
+        module_list = get_module_list()
+        for name in module_list:
+            module_file = os.path.join(class_path,name,module_name + 'Model.py')
+            if os.path.exists(module_file): break
+    
+    # 判断模块入口文件是否存在
+    if not os.path.exists(module_file):
+        return public.returnMsg(False,'module file [%s] not exist' % module_name)
+    
+    # 判断模块路径是否合法
+    if not public.path_safe_check(module_file):
+        return public.returnMsg(False,'parameter incorrect: module_name and def_name cannot contains special symbols.')
+    
+    def_object = public.get_script_object(module_file)
+    if not def_object: return public.returnMsg(False,'module [%s] not found' % module_name)
+
+    # 模块实例化并返回方法对象
+    try:
+        run_object = getattr(def_object.main(),def_name,None)
+    except:
+        return public.returnMsg(False,'module [%s] failed to instance class' % module_name)
+    if not run_object: return public.returnMsg(False,'not found method [%s] in module [%s]' % (def_name,module_name))
+
+    if 'module_get_object' in args and args.module_get_object == 1:
+        return run_object
+    
+    # 执行方法
+    result = run_object(args)
+    return result
+    
+
+def get_plugin_list(upgrade_force = False):
+    '''
+        @name 获取插件列表
+        @param upgrade_force<bool> 是否强制重新获取列表
+        @return dict
+    '''
+
+    api_root_url = public.OfficialApiBase()
+    api_url = api_root_url+ '/api/panel/getSoftListEn'
+    panel_path = public.get_panel_path()
+    data_path = os.path.join(panel_path,'data')
+
+    if not os.path.exists(data_path):
+        os.makedirs(data_path,384)
+
+    plugin_list = {}
+    plugin_list_file = os.path.join(data_path,'plugin_list.json')
+    if os.path.exists(plugin_list_file) and not upgrade_force:
+        plugin_list_body = public.readFile(plugin_list_file)
+        try:
+            plugin_list = json.loads(plugin_list_body)
+        except:
+            plugin_list = {}
+    
+    if not os.path.exists(plugin_list_file) or upgrade_force or not plugin_list:
+        try:
+            res = public.HttpGet(api_url)
+        except Exception as ex:
+            raise public.error_conn_cloud(str(ex))
+        if not res: raise Exception(False,'failed to get soft list')
+
+        plugin_list = json.loads(res)
+        if type(plugin_list)!=dict or 'list' not in plugin_list:
+            if type(plugin_list)==str:
+                raise Exception(plugin_list)
+            else:
+                raise Exception('failed to parse soft list')
+        content = json.dumps(plugin_list)
+        public.writeFile(plugin_list_file,content)
+
+        plugin_bin_file = os.path.join(data_path,'plugin_bin.pl')
+        encode_content = __encode_plugin_list(content)
+        if encode_content:
+            public.writeFile(plugin_bin_file,encode_content)
+
+    return plugin_list
+
+def __encode_plugin_list(content):
+    try:
+        userInfo = public.get_user_info()
+        if not userInfo or 'server_id' not in userInfo: return None
+        block_size = 51200
+        uid = str(userInfo['uid'])
+        server_id = userInfo['server_id']
+        key = server_id[10:26] + uid + server_id
+        key = hashlib.md5(key.encode()).hexdigest()
+        iv = key + server_id
+        iv = hashlib.md5(iv.encode()).hexdigest()
+        key = key[8:24]
+        iv = iv[8:24]
+        blocks = [content[i:i + block_size] for i in range(0, len(content), block_size)]
+        encrypted_content = ''
+        for block in blocks:
+            encrypted_content += __aes_encrypt(block, key, iv) + '\n'
+        return encrypted_content
+    except:
+        pass
+    return None
+
+def get_module(filename):
+    if not filename: return public.returnMsg(False,'parameter error: get_module(filename<str>)')
+    if filename[0:2] == './': return public.returnMsg(False,'filename cannot be relative path.')
+    if not public.path_safe_check(filename): return public.returnMsg(False,'filename cannot contains special symbols.')
+    if not os.path.exists(filename): return public.returnMsg(False,'file does not exist')
+    return __get_class_module(filename)
+
+def __get_class_module(filename):
+    _obj = sys.modules.get(filename, None)
+    if _obj: return _obj
+    _code = public.readFile(filename)
+    if _code.find('import') == -1:
+        en_arr = _code.split('\n')
+        de_text = ''
+        for data in en_arr:
+            data = str.strip(data)
+            if not data: continue
+            de_text += __aes_decrypt_module(data)
+        _code = de_text
+    if not _code or _code.find('import') == -1:
+        return public.returnMsg(False,'load failed: decode error')
+    _code_object = compile(_code, filename, 'exec')
+    from types import ModuleType
+    _obj = sys.modules.setdefault(filename, ModuleType(filename))
+    _obj.__file__ = filename
+    _obj.__package__ = ''
+    exec(_code_object, _obj.__dict__)
+    return _obj
+
+def start_total():
+    '''
+        @name 启动统计服务
+        @return dict
+    '''
+    pass
+
+def get_soft_list(args):
+    '''
+        @name 获取软件列表
+        @param args<dict_obj> 参数对像
+        @return dict
+    '''
+    pass
+
+def db_encrypt(data):
+    '''
+        @name 数据库加密
+        @param args<dict_obj> 参数对像
+        @return dict
+    '''
+    try:
+        key = __get_db_sgin()
+        iv = __get_db_iv()
+        str_arr = data.split('\n')
+        res_str = ''
+        for data in str_arr:
+            if not data: continue
+            res_str += __aes_encrypt(data, key, iv)
+    except:
+        res_str = data
+    result = {
+        'status' : True,
+        'msg' : res_str
+    }
+    return result
+
+def db_decrypt(data):
+    '''
+        @name 数据库解密
+        @param args<dict_obj> 参数对像
+        @return dict
+    '''
+    try:
+        key = __get_db_sgin()
+        iv = __get_db_iv()
+        str_arr = data.split('\n')
+        res_str = ''
+        for data in str_arr:
+            if not data: continue
+            res_str += __aes_decrypt(data, key, iv)
+    except:
+        res_str = data
+    result = {
+        'status' : True,
+        'msg' : res_str
+    }
+    return result
+
+def __get_db_sgin():
+    keystr = '3gP7+k_7lSNg3$+Fj!PKW+6$KYgHtw#R'
+    key = ''
+    for i in range(31):
+        if i & 1 == 0:
+            key += keystr[i]
+    return key
+
+def __get_db_iv():
+    div_file = "{}/data/div.pl".format(public.get_panel_path())
+    if not os.path.exists(div_file):
+        str = public.GetRandomString(16)
+        str = __aes_encrypt_module(str)
+        div = public.get_div(str)
+        public.WriteFile(div_file, div)
+    if os.path.exists(div_file):
+        div = public.ReadFile(div_file)
+        div = __aes_decrypt_module(div)
+    else:
+        keystr = '4jHCpBOFzL4*piTn^-4IHBhj-OL!fGlB'
+        div = ''
+        for i in range(31):
+            if i & 1 == 0:
+                div += keystr[i]
+    return div
+
+def __aes_encrypt_module(data):
+    key = 'Z2B87NEAS2BkxTrh'
+    iv = 'WwadH66EGWpeeTT6'
+    return __aes_encrypt(data, key, iv)
+
+def __aes_decrypt_module(data):
+    key = 'Z2B87NEAS2BkxTrh'
+    iv = 'WwadH66EGWpeeTT6'
+    return __aes_decrypt(data, key, iv)
+
+def __aes_decrypt(data, key, iv):
+    from Crypto.Cipher import AES
+    import base64
+    encodebytes = base64.decodebytes(data.encode('utf-8'))
+    aes = AES.new(key.encode('utf-8'), AES.MODE_CBC, iv.encode('utf-8'))
+    de_text = aes.decrypt(encodebytes)
+    unpad = lambda s: s[0:-s[-1]]
+    de_text = unpad(de_text)
+    return de_text.decode('utf-8')
+
+def __aes_encrypt(data, key, iv):
+    from Crypto.Cipher import AES
+    import base64
+    data = (lambda s: s + (16 - len(s) % 16) * chr(16 - len(s) % 16).encode('utf-8'))(data.encode('utf-8'))
+    aes = AES.new(key.encode('utf8'), AES.MODE_CBC, iv.encode('utf8'))
+    encryptedbytes = aes.encrypt(data)
+    en_text = base64.b64encode(encryptedbytes)
+    return en_text.decode('utf-8')
+
+def plugin_end():
+    '''
+        @name 插件到期处理
+        @return dict
+    '''
+    pass
+
+def daemon_task():
+    '''
+        @name 后台任务守护
+        @return dict
+    '''
+    pass
+
+def daemon_panel():
+    '''
+        @name 面板守护
+        @return dict
+    '''
+    pass
+
+def flush_auth_key():
+    '''
+        @name 刷新授权密钥
+        @return dict
+    '''
+    pass
+
+def get_auth_state():
+    '''
+        @name 获取授权状态
+        @return 返回：0.免费版 1.专业版 2.企业版 -1.获取失败
+    '''
+    try:
+        softList = get_plugin_list()
+        if softList['ltd'] > -1:
+            return 2
+        elif softList['pro'] > -1:
+            return 1
+        else:
+            return 0
+    except:
+        return -1
+
+ 

wiki/files/aapanel/bt.js

@@ -0,0 +1,83 @@
+/*
+ *宝塔面板去除各种计算题与延时等待
+*/
+if("undefined" != typeof bt && bt.hasOwnProperty("show_confirm")){
+    bt.show_confirm = function(title, msg, fun, error) {
+        layer.open({
+            type: 1,
+            title: title,
+            area: "350px",
+            closeBtn: 2,
+            shadeClose: true,
+            btn: [lan['public'].ok, lan['public'].cancel],
+            content: "<div class='bt-form webDelete pd20'>\
+                    <p>" + msg + "</p>" + (error || '') + "\
+                </div>",
+            yes: function (index, layero) {
+                layer.close(index);
+                if (fun) fun();
+            }
+        });
+    }
+}
+if("undefined" != typeof bt && bt.hasOwnProperty("prompt_confirm")){
+    bt.prompt_confirm = function (title, msg, callback) {
+        layer.open({
+            type: 1,
+            title: title,
+            area: "480px",
+            closeBtn: 2,
+            btn: ['OK', 'Cancel'],
+            content: "<div class='bt-form promptDelete pd20'>\
+                <p>" + msg + "</p>\
+                </div>",
+            yes: function (layers, index) {
+                layer.close(layers)
+                if (callback) callback()
+            }
+        });
+    }
+}
+if("undefined" != typeof bt && bt.hasOwnProperty("compute_confirm")){
+    bt.compute_confirm = function (config, callback) {
+        layer.open({
+            type: 1,
+            title: config.title,
+            area: '430px',
+            closeBtn: 2,
+            shadeClose: true,
+            btn: [lan['public'].ok, lan['public'].cancel],
+            content:
+                '<div class="bt-form hint_confirm pd30">\
+          <div class="hint_title">\
+            <i class="hint-confirm-icon"></i>\
+            <div class="hint_con">' +
+                config.msg +
+                '</div>\
+          </div>\
+      </div>',
+            yes: function (layers, index) {
+                layer.close(layers)
+                if (callback) callback()
+            }
+        });
+    }
+}
+function SafeMessage(j, h, g, f) {
+    if (f == undefined)  f = '';
+    var mess = layer.open({
+        type: 1,
+        title: j,
+        area: "350px",
+        closeBtn: 2,
+        shadeClose: true,
+        content: "<div class='bt-form webDelete pd20 pb70'><p>" + h + "</p>" + f + "<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>"
+    });
+    $(".bt-cancel").click(function(){
+        layer.close(mess);
+    });
+    $("#toSubmit").click(function() {
+        layer.close(mess);
+        g();
+    })
+}

wiki/files/btmonitor/PluginLoader.py

@@ -1,47 +1,46 @@
 #coding: utf-8
 import os,sys,json
-import core.include.public as public
 
 #执行模块方法(模块名,方法名,参数)
 def module_run(module_name, def_name, def_args):
-    if not module_name or not def_name: return public.returnMsg(False,'模块名称和模块方法名称不能为空!')
+    if not module_name or not def_name: return returnMsg(False,'模块名称和模块方法名称不能为空!')
-    if not path_check(module_name) or not path_check(def_name): return public.returnMsg(False,'模块名或方法名不能包含特殊符号!')
+    if not path_check(module_name) or not path_check(def_name): return returnMsg(False,'模块名或方法名不能包含特殊符号!')
 
-    panel_path = public.get_panel_path()
+    panel_path = get_panel_path()
     filename = "{}/modules/{}Module/{}Module.py".format(panel_path,module_name,module_name)
     if not os.path.exists(filename):
         filename = "{}/modules/{}Module/main.py".format(panel_path,module_name)
         if not os.path.exists(filename):
             filename = "{}/plugin/{}/main.py".format(panel_path,module_name)
             if not os.path.exists(filename):
-                filename = "{}/plugin/{}Module/{}Plugin.py".format(panel_path,module_name,module_name)
+                filename = "{}/plugin/{}/{}Plugin.py".format(panel_path,module_name,module_name)
                 if not os.path.exists(filename):
-                    return public.returnMsg(False,'指定模块或插件不存在')
+                    return returnMsg(False,'指定模块或插件不存在')
 
-    _obj = public.get_script_object(filename)
+    _obj = get_script_object(filename)
-    if not _obj: return public.returnMsg(False,'模块加载失败: %s' % module_name)
+    if not _obj: return returnMsg(False,'模块加载失败: %s' % module_name)
     if hasattr(_obj, "items") and hasattr(_obj, "setdefault"):
         return _obj
     
     class_name = "main"
     if not hasattr(_obj, class_name):
-        return public.returnMsg(False,'找不到入口类: %s' % class_name)
+        return returnMsg(False,'找不到入口类: %s' % class_name)
     
     class_obj = getattr(_obj,class_name, None)
     if not class_obj:
-        return public.returnMsg(False,'获取入口类失败' % module_name)
+        return returnMsg(False,'获取入口类失败' % module_name)
 
     try:
         class_func = class_obj()
     except:
-        return public.returnMsg(False,'模块入口实例化失败' % module_name)
+        return returnMsg(False,'模块入口实例化失败' % module_name)
 
     if not hasattr(class_func, def_name):
-        return public.returnMsg(False,'在[%s]模块中找不到[%s]方法' % (class_name,def_name))
+        return returnMsg(False,'在[%s]模块中找不到[%s]方法' % (class_name,def_name))
     
     def_func = getattr(class_func, def_name, None)
     if not def_func:
-        return public.returnMsg(False,'获取方法失败')
+        return returnMsg(False,'获取方法失败')
 
     if 'module_get_object' in def_args:
         return def_func
@@ -51,9 +50,49 @@ def module_run(module_name, def_name, def_args):
 
 #获取指定模块对象(文件全路径)
 def get_module(filename):
-    if not filename: return public.returnMsg(False,'模块路径不能为空!')
+    if not filename: return returnMsg(False,'模块路径不能为空!')
-    if "./" in filename: return public.returnMsg(False,'模块路径不能为相对路径')
+    if "./" in filename: return returnMsg(False,'模块路径不能为相对路径')
-    return public.get_script_object(filename)
+    return get_script_object(filename)
+
+def get_panel_path():
+    return '/www/server/bt-monitor'
+
+def returnMsg(status,msg,args = ()):
+    return {'status':status,'msg':msg}
+
+def get_script_object(filename):
+    _obj =  sys.modules.get(filename,None)
+    if _obj: return _obj
+    from types import ModuleType
+    _obj = sys.modules.setdefault(filename, ModuleType(filename))
+    _code = readFile(filename)
+    _code_object = compile(_code,filename, 'exec')
+    _obj.__file__ = filename
+    _obj.__package__ = ''
+    exec(_code_object, _obj.__dict__)
+    return _obj
+
+def readFile(filename,mode = 'r'):
+    import os
+    if not os.path.exists(filename): return False
+    fp = None
+    try:
+        fp = open(filename, mode)
+        f_body = fp.read()
+    except Exception as ex:
+        if sys.version_info[0] != 2:
+            try:
+                fp = open(filename, mode,encoding="utf-8")
+                f_body = fp.read()
+            except:
+                fp = open(filename, mode,encoding="GBK")
+                f_body = fp.read()
+        else:
+            return False
+    finally:
+        if fp and not fp.closed:
+            fp.close()
+    return f_body
 
 #检查路径是否合法
 def path_check(path):

wiki/files/linux/PluginLoader.py

@@ -1,27 +1,391 @@
 #coding: utf-8
-import public,os,sys,json
+# +-------------------------------------------------------------------
+# | 宝塔Linux面板
+# +-------------------------------------------------------------------
+# | Copyright (c) 2015-2099 宝塔软件(http://bt.cn) All rights reserved.
+# +-------------------------------------------------------------------
+# | Author: hwliang <hwl@bt.cn>
+# +-------------------------------------------------------------------
+
+#+--------------------------------------------------------------------
+#|   插件和模块加载器
+#+--------------------------------------------------------------------
+
+import public,os,sys,json,hashlib
+
+def plugin_run(plugin_name,def_name,args):
+    '''
+        @name 执行插件方法
+        @param plugin_name<string> 插件名称
+        @param def_name<string> 方法名称
+        @param args<dict_obj> 参数对像
+        @return mixed
+    '''
+    if not plugin_name or not def_name: return public.returnMsg(False,'插件名称和插件方法名称不能为空!')
+    
+    # 获取插件目录
+    plugin_path = public.get_plugin_path(plugin_name)
+    is_php = os.path.exists(os.path.join(plugin_path,'index.php'))
+
+    # 检查插件目录是否合法
+    if is_php:
+        plugin_file = os.path.join(plugin_path,'index.php')
+    else:
+        plugin_file = os.path.join(plugin_path, plugin_name + '_main.py')
+    if not public.path_safe_check(plugin_file): return public.returnMsg(False,'插件路径不合法')
+
+    # 检查插件入口文件是否存在
+    if not os.path.exists(plugin_file): return public.returnMsg(False,'指定插件入口文件不存在')
+
+    # 添加插件目录到系统路径
+    public.sys_path_append(plugin_path)
+
+    if not is_php:
+        # 引用插件入口文件
+        _name = "{}_main".format(plugin_name)
+        plugin_main = __import__(_name)
+
+        # 检查类名是否符合规范
+        if not hasattr(plugin_main,_name):
+            return public.returnMsg(False,'指定插件入口文件不符合规范')
+        
+        try:
+            if sys.version_info[0] == 2:
+                reload(plugin_main)
+            else:
+                from imp import reload
+                reload(plugin_main)
+        except:
+            pass
+        
+        # 实例化插件类
+        plugin_obj = getattr(plugin_main,_name)()
+
+        # 检查方法是否存在
+        if not hasattr(plugin_obj,def_name):
+            return public.returnMsg(False,'在[%s]插件中找不到[%s]方法' % (plugin_name,def_name))
+        
+        if args is not None and 'plugin_get_object' in args and args.plugin_get_object == 1:
+            return getattr(plugin_obj, def_name)
+        
+        # 执行方法
+        return getattr(plugin_obj,def_name)(args)
+    else:
+        if args is not None and 'plugin_get_object' in args and args.plugin_get_object == 1:
+            return None
+        import panelPHP
+        args.s = def_name
+        args.name = plugin_name
+        return panelPHP.panelPHP(plugin_name).exec_php_script(args)
+    
+
+def get_module_list():
+    '''
+        @name 获取模块列表
+        @return list    
+    '''
+    module_list = []
+    class_path = public.get_class_path()
+    for name in os.listdir(class_path):
+        path = os.path.join(class_path,name)
+        # 过滤无效文件
+        if not name or name.endswith('.py') or name[0] == '.' or not name.endswith('Model') or os.path.isfile(path):continue
+        module_list.append(name)
+    return module_list
+
+def module_run(module_name,def_name,args):
+    '''
+        @name 执行模块方法
+        @param module_name<string> 模块名称
+        @param def_name<string> 方法名称
+        @param args<dict_obj> 参数对像
+        @return mixed
+    '''
+    if not module_name or not def_name: return public.returnMsg(False,'模块名称和模块方法名称不能为空!')
+    model_index = args.get('model_index',None)
+    class_path = public.get_class_path()
+    panel_path = public.get_panel_path()
+    
+    module_file = None
+    if 'model_index' in args:
+        # 新模块目录
+        if model_index in ['mod']:
+            module_file = os.path.join(panel_path,'mod','project',module_name + 'Mod.py')
+        elif model_index:
+            # 旧模块目录
+            module_file = os.path.join(class_path,model_index+"Model",module_name + 'Model.py')
+        else:
+            module_file = os.path.join(class_path,"projectModel",module_name + 'Model.py')
+    else:
+        # 如果没指定模块名称，则遍历所有模块目录
+        module_list = get_module_list()
+        for name in module_list:
+            module_file = os.path.join(class_path,name,module_name + 'Model.py')
+            if os.path.exists(module_file): break
+    
+    # 判断模块入口文件是否存在
+    if not os.path.exists(module_file):
+        return public.returnMsg(False,'模块[%s]不存在' % module_name)
+    
+    # 判断模块路径是否合法
+    if not public.path_safe_check(module_file):
+        return public.returnMsg(False,'模块路径不合法')
+    
+    def_object = public.get_script_object(module_file)
+    if not def_object: return public.returnMsg(False,'模块[%s]不存在' % module_name)
+
+    # 模块实例化并返回方法对象
+    try:
+        run_object = getattr(def_object.main(),def_name,None)
+    except:
+        return public.returnMsg(False,'模块[%s]入口实例化失败' % module_name)
+    if not run_object: return public.returnMsg(False,'在[%s]模块中找不到[%s]方法' % (module_name,def_name))
+
+    if 'module_get_object' in args and args.module_get_object == 1:
+        return run_object
+    
+    # 执行方法
+    result = run_object(args)
+    return result
+    
+def get_module(filename: str):
+    '''
+        @name 获取模块对象
+        @param filename<string> 模块文件名
+        @return object
+    '''
+    if not filename: return None
+    
+    if filename[0:2] == './':
+        return public.returnMsg(False,'不能是相对路径')
+    
+    if not public.path_safe_check(filename):
+        return public.returnMsg(False,'模块路径不合法')
+
+    if not os.path.exists(filename):
+        return public.returnMsg(False,'模块文件不存在' % filename)
+    
+    def_object = public.get_script_object(filename)
+    if not def_object: return public.returnMsg(False,'模块[%s]不存在' % filename)
+
+    return def_object.main()
+
+def get_plugin_list(upgrade_force = False):
+    '''
+        @name 获取插件列表
+        @param upgrade_force<bool> 是否强制重新获取列表
+        @return dict
+    '''
 
-#获取插件列表(0/1)
-def get_plugin_list(force = 0):
     api_root_url = 'https://api.bt.cn'
     api_url = api_root_url+ '/panel/get_plugin_list'
-    cache_file = 'data/plugin_list.json'
+    panel_path = public.get_panel_path()
+    data_path = os.path.join(panel_path,'data')
 
-    if force==0 and os.path.exists(cache_file):
+    if not os.path.exists(data_path):
-        jsonData = public.readFile(cache_file)
+        os.makedirs(data_path,384)
-        softList = json.loads(jsonData)
+
-    else:
+    plugin_list = {}
+    plugin_list_file = os.path.join(data_path,'plugin_list.json')
+    if os.path.exists(plugin_list_file) and not upgrade_force:
+        plugin_list_body = public.readFile(plugin_list_file)
         try:
-            jsonData = public.HttpGet(api_url)
+            plugin_list = json.loads(plugin_list_body)
+        except:
+            plugin_list = {}
+    
+    if not os.path.exists(plugin_list_file) or upgrade_force or not plugin_list:
+        try:
+            res = public.HttpGet(api_url)
         except Exception as ex:
             raise public.error_conn_cloud(str(ex))
-        softList = json.loads(jsonData)
+        if not res: raise Exception(False,'云端插件列表获取失败')
-        if type(softList)!=dict or 'list' not in softList: raise Exception('云端插件列表获取失败')
+
-        public.writeFile(cache_file, jsonData)
+        plugin_list = json.loads(res)
-    return softList
+        if type(plugin_list)!=dict or 'list' not in plugin_list:
+            if type(plugin_list)==str:
+                raise Exception(plugin_list)
+            else:
+                raise Exception('云端插件列表获取失败')
+        content = json.dumps(plugin_list)
+        public.writeFile(plugin_list_file,content)
+
+        plugin_bin_file = os.path.join(data_path,'plugin_bin.pl')
+        encode_content = __encode_plugin_list(content)
+        if encode_content:
+            public.writeFile(plugin_bin_file,encode_content)
+        
+    return plugin_list
+
+def __encode_plugin_list(content):
+    try:
+        userInfo = public.get_user_info()
+        if not userInfo or 'serverid' not in userInfo: return None
+        block_size = 51200
+        uid = str(userInfo['uid'])
+        server_id = userInfo['serverid']
+        key = server_id[10:26] + uid + server_id
+        key = hashlib.md5(key.encode()).hexdigest()
+        iv = key + server_id
+        iv = hashlib.md5(iv.encode()).hexdigest()
+        key = key[8:24]
+        iv = iv[8:24]
+        blocks = [content[i:i + block_size] for i in range(0, len(content), block_size)]
+        encrypted_content = ''
+        for block in blocks:
+            encrypted_content += __aes_encrypt(block, key, iv) + '\n'
+        return encrypted_content
+    except:
+        pass
+    return None
+
+def start_total():
+    '''
+        @name 启动统计服务
+        @return dict
+    '''
+    pass
+
+def get_soft_list(args):
+    '''
+        @name 获取软件列表
+        @param args<dict_obj> 参数对像
+        @return dict
+    '''
+    pass
+
+def db_encrypt(data):
+    '''
+        @name 数据库加密
+        @param args<dict_obj> 参数对像
+        @return dict
+    '''
+    try:
+        key = __get_db_sgin()
+        iv = __get_db_iv()
+        str_arr = data.split('\n')
+        res_str = ''
+        for data in str_arr:
+            if not data: continue
+            res_str += __aes_encrypt(data, key, iv)
+    except:
+        res_str = data
+    result = {
+        'status' : True,
+        'msg' : res_str
+    }
+    return result
+
+def db_decrypt(data):
+    '''
+        @name 数据库解密
+        @param args<dict_obj> 参数对像
+        @return dict
+    '''
+    try:
+        key = __get_db_sgin()
+        iv = __get_db_iv()
+        str_arr = data.split('\n')
+        res_str = ''
+        for data in str_arr:
+            if not data: continue
+            res_str += __aes_decrypt(data, key, iv)
+    except:
+        res_str = data
+    result = {
+        'status' : True,
+        'msg' : res_str
+    }
+    return result
+
+def __get_db_sgin():
+    keystr = '3gP7+k_7lSNg3$+Fj!PKW+6$KYgHtw#R'
+    key = ''
+    for i in range(31):
+        if i & 1 == 0:
+            key += keystr[i]
+    return key
+
+def __get_db_iv():
+    div_file = "{}/data/div.pl".format(public.get_panel_path())
+    if not os.path.exists(div_file):
+        str = public.GetRandomString(16)
+        str = __aes_encrypt_module(str)
+        div = public.get_div(str)
+        public.WriteFile(div_file, div)
+    if os.path.exists(div_file):
+        div = public.ReadFile(div_file)
+        div = __aes_decrypt_module(div)
+    else:
+        keystr = '4jHCpBOFzL4*piTn^-4IHBhj-OL!fGlB'
+        div = ''
+        for i in range(31):
+            if i & 1 == 0:
+                div += keystr[i]
+    return div
+
+def __aes_encrypt_module(data):
+    key = 'Z2B87NEAS2BkxTrh'
+    iv = 'WwadH66EGWpeeTT6'
+    return __aes_encrypt(data, key, iv)
+
+def __aes_decrypt_module(data):
+    key = 'Z2B87NEAS2BkxTrh'
+    iv = 'WwadH66EGWpeeTT6'
+    return __aes_decrypt(data, key, iv)
+
+def __aes_decrypt(data, key, iv):
+    from Crypto.Cipher import AES
+    import base64
+    encodebytes = base64.decodebytes(data.encode('utf-8'))
+    aes = AES.new(key.encode('utf-8'), AES.MODE_CBC, iv.encode('utf-8'))
+    de_text = aes.decrypt(encodebytes)
+    unpad = lambda s: s[0:-s[-1]]
+    de_text = unpad(de_text)
+    return de_text.decode('utf-8')
+
+def __aes_encrypt(data, key, iv):
+    from Crypto.Cipher import AES
+    import base64
+    data = (lambda s: s + (16 - len(s) % 16) * chr(16 - len(s) % 16).encode('utf-8'))(data.encode('utf-8'))
+    aes = AES.new(key.encode('utf8'), AES.MODE_CBC, iv.encode('utf8'))
+    encryptedbytes = aes.encrypt(data)
+    en_text = base64.b64encode(encryptedbytes)
+    return en_text.decode('utf-8')
+
+def plugin_end():
+    '''
+        @name 插件到期处理
+        @return dict
+    '''
+    pass
+
+def daemon_task():
+    '''
+        @name 后台任务守护
+        @return dict
+    '''
+    pass
+
+def daemon_panel():
+    '''
+        @name 面板守护
+        @return dict
+    '''
+    pass
+
+def flush_auth_key():
+    '''
+        @name 刷新授权密钥
+        @return dict
+    '''
+    pass
 
-#获取授权状态() 返回：0.免费版 1.专业版 2.企业版 -1.获取失败
 def get_auth_state():
+    '''
+        @name 获取授权状态
+        @return 返回：0.免费版 1.专业版 2.企业版 -1.获取失败
+    '''
     try:
         softList = get_plugin_list()
         if softList['ltd'] > -1:
@@ -33,90 +397,4 @@ def get_auth_state():
     except:
         return -1
 
-#执行插件方法(插件名,方法名,参数)
-def plugin_run(plugin_name, def_name, args):
-    if not plugin_name or not def_name: return public.returnMsg(False,'插件名称和插件方法名称不能为空!')
-    if not path_check(plugin_name) or not path_check(def_name): return public.returnMsg(False,'插件名或方法名不能包含特殊符号!')
-    p_path = public.get_plugin_path(plugin_name)
-    if not os.path.exists(p_path + '/index.php') and not os.path.exists(p_path + '/%s_main.py' % plugin_name): return public.returnMsg(False,'插件不存在!')
  
-    is_php = os.path.exists(p_path + '/index.php')
-    if not is_php:
-        public.package_path_append(p_path)
-        plugin_main = __import__(plugin_name + '_main')
-        try:
-            if sys.version_info[0] == 2:
-                reload(plugin_main)
-            else:
-                from imp import reload
-                reload(plugin_main)
-        except:
-            pass
-        plu = eval('plugin_main.' + plugin_name + '_main()')
-        if not hasattr(plu, def_name):
-            return public.returnMsg(False,'在[%s]插件中找不到[%s]方法' % (plugin_name,def_name))
-
-    if 'plugin_get_object' in args and args.plugin_get_object == 1:
-        if not is_php:
-            return getattr(plu, def_name)
-        else:
-            return None
-    else:
-        if not is_php:
-            data = eval('plu.' + def_name + '(args)')
-        else:
-            import panelPHP
-            args.s = def_name
-            args.name = plugin_name
-            data = panelPHP.panelPHP(plugin_name).exec_php_script(args)
-        return data
-
-#执行模块方法(模块名,方法名,参数)
-def module_run(mod_name, def_name, args):
-    if not mod_name or not def_name: return public.returnMsg(False,'模块名称和模块方法名称不能为空!')
-    if not path_check(mod_name) or not path_check(def_name): return public.returnMsg(False,'模块名或方法名不能包含特殊符号!')
-
-    if 'model_index' in args:
-        if args.model_index:
-            mod_file = "{}/{}Model/{}Model.py".format(public.get_class_path(),args.model_index,mod_name)
-        else:
-            mod_file = "{}/projectModel/{}Model.py".format(public.get_class_path(),mod_name)
-    else:
-        module_list = get_module_list()
-        for module_dir in module_list:
-            mod_file = "{}/{}/{}Model.py".format(public.get_class_path(),module_dir,mod_name)
-            if os.path.exists(mod_file): break
-
-    if not os.path.exists(mod_file):
-        return public.returnMsg(False,'模块[%s]不存在' % mod_name)
-
-    def_object = public.get_script_object(mod_file)
-    if not def_object: return public.returnMsg(False,'模块[%s]不存在!' % mod_name)
-    try:
-        run_object = getattr(def_object.main(),def_name,None)
-    except:
-        return public.returnMsg(False,'模块入口实例化失败' % mod_name)
-    if not run_object: return public.returnMsg(False,'在[%s]模块中找不到[%s]方法' % (mod_name,def_name))
-    if 'module_get_object' in args and args.module_get_object == 1:
-        return run_object
-    result = run_object(args)
-    return result
-
-#获取模块文件夹列表
-def get_module_list():
-    list = []
-    class_path = public.get_class_path()
-    f_list = os.listdir(class_path)
-    for fname in f_list:
-        f_path = class_path+'/'+fname
-        if os.path.isdir(f_path) and len(fname) > 6 and fname.find('.') == -1 and fname.find('Model') != -1:
-            list.append(fname)
-    return list
-
-#检查路径是否合法
-def path_check(path):
-    list = ["./","..",",",";",":","?","'","\"","<",">","|","\\","\n","\r","\t","\b","\a","\f","\v","*","%","&","$","#","@","!","~","`","^","(",")","+","=","{","}","[","]"]
-    for i in path:
-        if i in list:
-            return False
-    return True

wiki/files/linux/bt.js

@@ -11,8 +11,8 @@ if("undefined" != typeof bt && bt.hasOwnProperty("show_confirm")){
             shadeClose: true,
             btn: [lan['public'].ok, lan['public'].cancel],
             content: "<div class='bt-form webDelete pd20'>\
-					<p style='font-size:13px;word-break: break-all;margin-bottom: 5px;'>" + msg + "</p>" + (error || '') + "\
+                    <p style='font-size:13px;word-break: break-all;margin-bottom: 5px;'>" + msg + "</p>" + (error || '') + "\
-				</div>",
+                </div>",
             yes: function (index, layero) {
                 layer.close(index);
                 if (callback) callback();
@@ -29,8 +29,8 @@ if("undefined" != typeof bt && bt.hasOwnProperty("prompt_confirm")){
             closeBtn: 2,
             btn: ['确认', '取消'],
             content: "<div class='bt-form promptDelete pd20'>\
-            	<p>" + msg + "</p>\
+                <p>" + msg + "</p>\
-            	</div>",
+                </div>",
             yes: function (layers, index) {
                 layer.close(layers)
                 if (callback) callback()
@@ -38,396 +38,73 @@ if("undefined" != typeof bt && bt.hasOwnProperty("prompt_confirm")){
         });
     }
 }
-if("undefined" != typeof database && database.hasOwnProperty("del_database")){
+if("undefined" != typeof bt && bt.hasOwnProperty("compute_confirm")){
-    database.del_database = function (wid, dbname, obj, callback) {
+    bt.compute_confirm = function (config, callback) {
-        var is_db_type = false, del_data = []
-        if (typeof wid === 'object') {
-            del_data = wid
-            is_db_type = wid.some(function (item) {
-                return item.db_type > 0
-            })
-            var ids = [];
-            for (var i = 0; i < wid.length; i++) {
-                ids.push(wid[i].id);
-            }
-            wid = ids
-        }
-        var type = $('.database-pos .tabs-item.active').data('type'),
-            title = '',
-            tips = '';
-        title = typeof dbname === "function" ? '批量删除数据库' : '删除数据库 - [ ' + dbname + ' ]';
-        tips = is_db_type || !recycle_bin_db_open || type !== 'mysql' ? '<span class="color-red">当前列表存在彻底删除后无法恢复的数据库</span>，请仔细查看列表，以防误删，是否继续操作？' : '当前列表数据库将迁移至数据库回收站，如需彻底删除请前往数据库回收站，是否继续操作？'
-        var arrs = wid instanceof Array ? wid : [wid]
-        var ids = JSON.stringify(arrs),
-            countDown = 9;
-        if (arrs.length == 1) countDown = 4
-        var loadT = bt.load('正在检测数据库数据信息，请稍候...'),
-            param = { url: 'database/' + bt.data.db_tab_name + '/check_del_data', data: { data: JSON.stringify({ ids: ids }) } }
-        if (bt.data.db_tab_name == 'mysql') param = { url: 'database?action=check_del_data', data: { ids: ids } }
-        bt_tools.send(param, function (res) {
-            loadT.close()
-            layer.open({
-                type: 1,
-                title: title,
-                area: '740px',
-                skin: 'verify_site_layer_info',
-                closeBtn: 2,
-                shadeClose: true,
-                content: '<div class="check_delete_site_main hint_confirm pd30">' +
-                    "<div class='hint_title'>\
-                <i class=\'hint-confirm-icon\'></i>\
-                <div class=\'hint_con\'>"+ tips + "</div>\
-              </div>"+
-                    '<div id="check_layer_content" class="ptb15">' +
-                    '</div>' +
-                    '<div class="check_layer_message">' +
-                    (is_db_type ? '<span class="color-red">注意：远程数据库暂不支持数据库回收站，选中的数据库将彻底删除</span><br>' : '') +
-                    (!recycle_bin_db_open ? '<span class="color-red">风险操作：当前数据库回收站未开启，删除数据库将永久消失</span><br>' : '')
-                    + '<span class="color-red">请仔细阅读以上要删除信息，防止数据库被误删</span></div>' +
-                    '</div>',
-                btn: ['下一步', lan.public.cancel],
-                success: function (layers) {
-                    setTimeout(function () { $(layers).css('top', ($(window).height() - $(layers).height()) / 2); }, 50)
-                    var rdata = res.data,
-                        newTime = parseInt(new Date().getTime() / 1000),
-                        t_icon = ' <span class="glyphicon glyphicon-info-sign" style="color: red;width:15px;height: 15px;;vertical-align: middle;"></span>';
-                    for (var j = 0; j < rdata.length; j++) {
-                        for (var i = 0; i < del_data.length; i++) {
-                            if (rdata[j].id == del_data[i].id) {
-                                var is_time_rule = (newTime - rdata[j].st_time) > (86400 * 30) && (rdata[j].total > 1024 * 10),
-                                    is_database_rule = res.db_size <= rdata[j].total,
-                                    database_time = bt.format_data(rdata[j].st_time, 'yyyy-MM-dd'),
-                                    database_size = bt.format_size(rdata[j].total);
-                                var f_size = database_size
-                                var t_size = '注意：此数据库较大，可能为重要数据，请谨慎操作.\n数据库：' + database_size;
-                                if (rdata[j].total < 2048) t_size = '注意事项：当前数据库不为空，可能为重要数据，请谨慎操作.\n数据库：' + database_size;
-                                if (rdata[j].total === 0) t_size = '';
-                                rdata[j]['t_size'] = t_size
-                                rdata[j]['f_size'] = f_size
-                                rdata[j]['database_time'] = database_time
-                                rdata[j]['is_time_rule'] = is_time_rule
-                                rdata[j]['is_database_rule'] = is_database_rule
-                                rdata[j]['db_type'] = del_data[i].db_type
-                                rdata[j]['conn_config'] = del_data[i].conn_config
-                            }
-                        }
-                    }
-                    var filterData = rdata.filter(function (el) {
-                        return ids.indexOf(el.id) != -1
-                    })
-                    bt_tools.table({
-                        el: '#check_layer_content',
-                        data: filterData,
-                        height: '300px',
-                        column: [
-                            { fid: 'name', title: '数据库名称' },
-                            {
-                                title: '数据库大小', template: function (row) {
-                                    return '<span class="' + (row.is_database_rule ? 'warning' : '') + '" style="width: 110px;" title="' + row.t_size + '">' + row.f_size + (row.is_database_rule ? t_icon : '') + '</span>'
-                                }
-                            },
-                            {
-                                title: '数据库位置', template: function (row) {
-                                    var type_column = '-'
-                                    switch (row.db_type) {
-                                        case 0:
-                                            type_column = '本地数据库'
-                                            break;
-                                        case 1:
-                                        case 2:
-                                            type_column = '远程数据库'
-                                            break;
-                                    }
-                                    return '<span style="width: 110px;" title="' + type_column + '">' + type_column + '</span>'
-                                }
-                            },
-                            {
-                                title: '创建时间', template: function (row) {
-                                    return '<span ' + (is_time_rule && row.total != 0 ? 'class="warning"' : '') + ' title="' + (row.is_time_rule && row.total != 0 ? '重要：此数据库创建时间较早，可能为重要数据，请谨慎操作.' : '') + '时间：' + row.database_time + '">' + row.database_time + '</span>'
-                                }
-                            },
-                            {
-                                title: '删除结果', align: 'right', template: function (row, index, ev, _that) {
-                                    var _html = ''
-                                    switch (row.db_type) {
-                                        case 0:
-                                            _html = type !== 'mysql' ? '彻底删除' : (!recycle_bin_db_open ? '彻底删除' : '移至回收站')
-                                            break;
-                                        case 1:
-                                        case 2:
-                                            _html = '彻底删除'
-                                            break;
-                                    }
-                                    return '<span style="width: 110px;" class="' + (_html === '彻底删除' ? 'warning' + (row.db_type > 0 ? ' remote_database' : '') : '') + '">' + _html + '</span>'
-                                }
-                            }
-                        ],
-                        success: function () {
-                            $('#check_layer_content').find('.glyphicon-info-sign').click(function (e) {
-                                var msg = $(this).parent().prop('title')
-                                msg = msg.replace('数据库：','<br>数据库：')
-                                layer.tips(msg, $(this).parent(), { tips: [1, 'red'], time: 3000 })
-                                $(document).click(function (ev) {
-                                  layer.closeAll('tips');
-                                  $(this).unbind('click');
-                                  ev.stopPropagation();
-                                  ev.preventDefault();
-                                });
-                                e.stopPropagation();
-                                e.preventDefault();
-                            });
-                            if ($('.remote_database').length) {
-                                $('.remote_database').each(function (index, el) {
-                                    var id = $(el).parent().parent().parent().index()
-                                    $('#check_layer_content tbody tr').eq(id).css('background-color', '#ff00000a')
-                                })
-                            }
-                        }
-                    })
-                },
-                yes: function (indes, layers) {
-                    title = typeof dbname === "function" ? '二次验证信息，批量删除数据库' : '二次验证信息，删除数据库 - [ ' + dbname + ' ]';
-                    if (type !== 'mysql') {
-                        tips = '<span class="color-red">当前数据库暂不支持数据库回收站，删除后将无法恢复</span>，此操作不可逆，是否继续操作？';
-                    } else {
-                        tips = is_db_type ? '<span class="color-red">远程数据库不支持数据库回收站，删除后将无法恢复</span>，此操作不可逆，是否继续操作？' : recycle_bin_db_open ? '删除后如需彻底删除请前往数据库回收站，是否继续操作？' : '删除后可能会影响业务使用，此操作不可逆，是否继续操作？'
-                    }
-                    layer.open({
-                        type: 1,
-                        title: title,
-                        icon: 0,
-                        skin: 'delete_site_layer',
-                        area: "530px",
-                        closeBtn: 2,
-                        shadeClose: true,
-                        content: "<div class=\'bt-form webDelete hint_confirm pd30\' id=\'site_delete_form\'>" +
-                            "<div class='hint_title'>\
-                      <i class=\'hint-confirm-icon\'></i>\
-                      <div class=\'hint_con\'>"+ tips + "</div>\
-                    </div>"+
-                            "<div style=\'color:red;margin:18px 0 18px 18px;font-size:14px;font-weight: bold;\'>注意：数据无价，请谨慎操作！！！" + (type === 'mysql' && !recycle_bin_db_open ? '<br>风险操作：当前数据库回收站未开启，删除数据库将永久消失！' : '') + "</div>"+
-                            "</div>",
-                        btn: ['确认删除', '取消删除'],
-                        yes: function (indexs) {
-                            var data = {
-                                id: wid,
-                                name: dbname
-                            };
-                            if (typeof dbname === "function") {
-                                delete data.id;
-                                delete data.name;
-                            }
-                            layer.close(indexs)
-                            layer.close(indes)
-                            if (typeof dbname === "function") {
-                                dbname(data)
-                            } else {
-                                data.id = data.id[0]
-                                bt.database.del_database(data, function (rdata) {
-                                    layer.closeAll()
-                                    if (callback) callback(rdata);
-                                    bt.msg(rdata);
-                                })
-                            }
-                        }
-                    })
-                }
-            })
-        })
-    }
-}
-if("undefined" != typeof site && site.hasOwnProperty("del_site")){
-    site.del_site = function (wid, wname, callback) {
-        title = typeof wname === "function" ? '批量删除站点' : '删除站点 [ ' + wname + ' ]';
         layer.open({
             type: 1,
-            title: title,
+            title: config.title,
-            icon: 0,
+            area: '430px',
-            skin: 'delete_site_layer',
-            area: "440px",
             closeBtn: 2,
             shadeClose: true,
-            content: "<div class=\'bt-form webDelete pd30\' id=\'site_delete_form\'>" +
+            btn: [lan['public'].ok, lan['public'].cancel],
-                '<i class="layui-layer-ico layui-layer-ico0"></i>' +
+            content:
-                "<div class=\'f13 check_title\'>是否要删除关联的FTP、数据库、站点目录！</div>" +
+                '<div class="bt-form hint_confirm pd30">\
-                "<div class=\"check_type_group\">" +
+          <div class="hint_title">\
-                "<label><input type=\"checkbox\" name=\"ftp\"><span>FTP</span></label>" +
+            <i class="hint-confirm-icon"></i>\
-                "<label><input type=\"checkbox\" name=\"database\"><span>数据库</span>" + (!recycle_bin_db_open ? '<span class="glyphicon glyphicon-info-sign" style="color: red"></span>' : '') + "</label>" +
+            <div class="hint_con">' +
-                "<label><input type=\"checkbox\"  name=\"path\"><span>站点目录</span>" + (!recycle_bin_open ? '<span class="glyphicon glyphicon-info-sign" style="color: red"></span>' : '') + "</label>" +
+                config.msg +
-                "</div>" +
+                '</div>\
-                "</div>",
+          </div>\
-            btn: [lan.public.ok, lan.public.cancel],
+      </div>',
-            success: function (layers, indexs) {
+            yes: function (layers, index) {
-                $(layers).find('.check_type_group label').hover(function () {
+                layer.close(layers)
-                    var name = $(this).find('input').attr('name');
+                if (callback) callback()
-                    if (name === 'database' && !recycle_bin_db_open) {
+            }
-                        layer.tips('风险操作：当前数据库回收站未开启，删除数据库将永久消失！', this, { tips: [1, 'red'], time: 0 })
+        });
-                    } else if (name === 'path' && !recycle_bin_open) {
+    }
-                        layer.tips('风险操作：当前文件回收站未开启，删除站点目录将永久消失！', this, { tips: [1, 'red'], time: 0 })
+}
-                    }
+if("undefined" != typeof bt && bt.hasOwnProperty("input_confirm")){
-                }, function () {
+    bt.input_confirm = function (config, callback) {
-                    layer.closeAll('tips');
+        layer.open({
-                });
+            type: 1,
+            title: config.title,
+            area: '430px',
+            closeBtn: 2,
+            shadeClose: true,
+            btn: [lan['public'].ok, lan['public'].cancel],
+            content:
+                '<div class="bt-form hint_confirm pd30">\
+                    <div class="hint_title">\
+                        <i class="hint-confirm-icon"></i>\
+                        <div class="hint_con">' +
+                config.msg +
+                '</div>\
+                    </div>\
+            </div>',
+            yes: function (layers, index) {
+                layer.close(layers);
+                if (callback) callback();
             },
-            yes: function (indexs) {
+        });
-                var data = { id: wid, webname: wname };
+    }
-                $('#site_delete_form input[type=checkbox]').each(function (index, item) {
+}
-                    if ($(item).is(':checked')) data[$(item).attr('name')] = 1
+if(window.hasOwnProperty("SafeMessage")){
-                })
+    window.SafeMessage = function(j, h, g, f) {
-                var is_database = data.hasOwnProperty('database'), is_path = data.hasOwnProperty('path'), is_ftp = data.hasOwnProperty('ftp');
+        if (f == undefined)  f = '';
-                if ((!is_database && !is_path) && (!is_ftp || is_ftp)) {
+        var mess = layer.open({
-                    if (typeof wname === "function") {
+            type: 1,
-                        wname(data)
+            title: j,
-                        return false;
+            area: "350px",
-                    }
+            closeBtn: 2,
-                    bt.site.del_site(data, function (rdata) {
+            shadeClose: true,
-                        layer.close(indexs);
+            content: "<div class='bt-form webDelete pd20 pb70'><p>" + h + "</p>" + f + "<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>"
-                        if (callback) callback(rdata);
+        });
-                        bt.msg(rdata);
+        $(".bt-cancel").click(function(){
-                    })
+            layer.close(mess);
-                    return false
+        });
-                }
+        $("#toSubmit").click(function() {
-                if (typeof wname === "function") {
+            layer.close(mess);
-                    delete data.id;
+            g();
-                    delete data.webname;
-                }
-                layer.close(indexs)
-                var ids = JSON.stringify(wid instanceof Array ? wid : [wid]), countDown = typeof wname === 'string' ? 4 : 9;
-                title = typeof wname === "function" ? '二次验证信息，批量删除站点' : '二次验证信息，删除站点 [ ' + wname + ' ]';
-                var loadT = bt.load('正在检测站点数据信息，请稍候...')
-                bt.send('check_del_data', 'site/check_del_data', { ids: ids }, function (res) {
-                    loadT.close()
-                    layer.open({
-                        type: 1,
-                        title: title,
-                        closeBtn: 2,
-                        skin: 'verify_site_layer_info',
-                        area: '740px',
-                        content: '<div class="check_delete_site_main pd30">' +
-                            '<i class="layui-layer-ico layui-layer-ico0"></i>' +
-                            '<div class="check_layer_title">堡塔温馨提示您，请冷静几秒钟，确认以下要删除的数据。</div>' +
-                            '<div class="check_layer_content">' +
-                            '<div class="check_layer_item">' +
-                            '<div class="check_layer_site"></div>' +
-                            '<div class="check_layer_database"></div>' +
-                            '</div>' +
-                            '</div>' +
-                            '<div class="check_layer_error ' + (is_database && data['database'] && !recycle_bin_db_open ? '' : 'hide') + '"><span class="glyphicon glyphicon-info-sign"></span>风险事项：当前未开启数据库回收站功能，删除数据库后，数据库将永久消失！</div>' +
-                            '<div class="check_layer_error ' + (is_path && data['path'] && !recycle_bin_open ? '' : 'hide') + '"><span class="glyphicon glyphicon-info-sign"></span>风险事项：当前未开启文件回收站功能，删除站点目录后，站点目录将永久消失！</div>' +
-                            '<div class="check_layer_message"><span style="color:red">注意：请仔细阅读以上要删除信息，防止网站数据被误删</span></div>' +
-                            '</div>',
-                        // recycle_bin_db_open &&
-                        // recycle_bin_open &&
-                        btn: ['确认删除', '取消删除'],
-                        success: function (layers) {
-                            var html = '', rdata = res.data;
-                            for (var i = 0; i < rdata.length; i++) {
-                                var item = rdata[i], newTime = parseInt(new Date().getTime() / 1000),
-                                    t_icon = '<span class="glyphicon glyphicon-info-sign" style="color: red;width:15px;height: 15px;;vertical-align: middle;"></span>';
-
-                                site_html = (function (item) {
-                                    if (!is_path) return ''
-                                    var is_time_rule = (newTime - item.st_time) > (86400 * 30) && (item.total > 1024 * 10),
-                                        is_path_rule = res.file_size <= item.total,
-                                        dir_time = bt.format_data(item.st_time, 'yyyy-MM-dd'),
-                                        dir_size = bt.format_size(item.total);
-
-                                    var f_html = '<i ' + (is_path_rule ? 'class="warning"' : '') + ' style = "vertical-align: middle;" > ' + (item.limit ? '大于50MB' : dir_size) + '</i> ' + (is_path_rule ? t_icon : '');
-                                    var f_title = (is_path_rule ? '注意：此目录较大，可能为重要数据，请谨慎操作.\n' : '') + '目录：' + item.path + '(' + (item.limit ? '大于' : '') + dir_size + ')';
-
-                                    return '<div class="check_layer_site">' +
-                                        '<span title="站点：' + item.name + '">站点名：' + item.name + '</span>' +
-                                        '<span title="' + f_title + '" >目录：<span style="vertical-align: middle;max-width: 160px;width: auto;">' + item.path + '</span> (' + f_html + ')</span>' +
-                                        '<span title="' + (is_time_rule ? '注意：此站点创建时间较早，可能为重要数据，请谨慎操作.\n' : '') + '时间：' + dir_time + '">创建时间：<i ' + (is_time_rule ? 'class="warning"' : '') + '>' + dir_time + '</i></span>' +
-                                        '</div>'
-                                }(item)),
-                                    database_html = (function (item) {
-                                        if (!is_database || !item.database) return '';
-                                        var is_time_rule = (newTime - item.st_time) > (86400 * 30) && (item.total > 1024 * 10),
-                                            is_database_rule = res.db_size <= item.database.total,
-                                            database_time = bt.format_data(item.database.st_time, 'yyyy-MM-dd'),
-                                            database_size = bt.format_size(item.database.total);
-
-                                        var f_size = '<i ' + (is_database_rule ? 'class="warning"' : '') + ' style = "vertical-align: middle;" > ' + database_size + '</i> ' + (is_database_rule ? t_icon : '');
-                                        var t_size = '注意：此数据库较大，可能为重要数据，请谨慎操作.\n数据库：' + database_size;
-
-                                        return '<div class="check_layer_database">' +
-                                            '<span title="数据库：' + item.database.name + '">数据库：' + item.database.name + '</span>' +
-                                            '<span title="' + t_size + '">大小：' + f_size + '</span>' +
-                                            '<span title="' + (is_time_rule && item.database.total != 0 ? '重要：此数据库创建时间较早，可能为重要数据，请谨慎操作.' : '') + '时间：' + database_time + '">创建时间：<i ' + (is_time_rule && item.database.total != 0 ? 'class="warning"' : '') + '>' + database_time + '</i></span>' +
-                                            '</div>'
-                                    }(item))
-                                if ((site_html + database_html) !== '') html += '<div class="check_layer_item">' + site_html + database_html + '</div>';
-                            }
-                            if (html === '') html = '<div style="text-align: center;width: 100%;height: 100%;line-height: 300px;font-size: 15px;">无数据</div>'
-                            $('.check_layer_content').html(html)
-                        },
-                        yes: function (indes, layers) {
-                            if (typeof wname === "function") {
-                                wname(data)
-                            } else {
-                                bt.site.del_site(data, function (rdata) {
-                                    layer.closeAll()
-                                    if (rdata.status) site.get_list();
-                                    if (callback) callback(rdata);
-                                    bt.msg(rdata);
-                                })
-                            }
-                        }
-                    })
-                })
-            }
         })
     }
 }
-if("undefined" != typeof bt && bt.hasOwnProperty("firewall") && bt.firewall.hasOwnProperty("add_accept_port")){
-    bt.firewall.add_accept_port = function(type, port, ps, callback) {
-        var action = "AddDropAddress";
-        if (type == 'port') {
-            ports = port.split(':');
-            if (port.indexOf('-') != -1) ports = port.split('-');
-            for (var i = 0; i < ports.length; i++) {
-                if (!bt.check_port(ports[i])) {
-                    layer.msg('可用端口范围：1-65535', { icon: 2 });
-                    // layer.msg(lan.firewall.port_err, {
-                    //   icon: 5
-                    // });
-                    return;
-                }
-            }
-            action = "AddAcceptPort";
-        }
-
-        loading = bt.load();
-        bt.send(action, 'firewall/' + action, { port: port, type: type, ps: ps }, function(rdata) {
-            loading.close();
-            if (callback) callback(rdata);
-        })
-    }
-}
-function SafeMessage(j, h, g, f) {
-	if(f == undefined) {
-		f = ""
-	}
-	var mess = layer.open({
-		type: 1,
-		title: j,
-		area: "350px",
-		closeBtn: 2,
-		shadeClose: true,
-		content: "<div class='bt-form webDelete pd20 pb70'><p>" + h + "</p>" + f + "<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>"
-	});
-	$(".bt-cancel").click(function(){
-		layer.close(mess);
-	});
-	$("#toSubmit").click(function() {
-		layer.close(mess);
-		g();
-	})
-}
-$(document).ready(function () {
-    if($('#updata_pro_info').length>0){
-        $('#updata_pro_info').html('');
-        bt.set_cookie('productPurchase', 1);
-    }
-})

wiki/files/win/PluginLoader.py

@@ -16,7 +16,11 @@ def get_plugin_list(force = 0):
         except Exception as ex:
             raise public.error_conn_cloud(str(ex))
         softList = json.loads(jsonData)
-        if type(softList)!=dict or 'list' not in softList: raise Exception('云端插件列表获取失败')
+        if type(softList)!=dict or 'list' not in softList:
+            if type(softList)==str:
+                raise Exception(softList)
+            else:
+                raise Exception('云端插件列表获取失败')
         public.writeFile(cache_file, jsonData)
     return softList
 

wiki/files/win/bt.js

@@ -41,6 +41,56 @@ if("undefined" != typeof bt && bt.hasOwnProperty("prompt_confirm")){
         });
     }
 }
+if("undefined" != typeof bt && bt.hasOwnProperty("compute_confirm")){
+    bt.compute_confirm = function (config, callback) {
+		layer.open({
+			type: 1,
+			title: config.title,
+			area: '430px',
+			closeBtn: 2,
+			shadeClose: true,
+			btn: [lan['public'].ok, lan['public'].cancel],
+			content:
+				'<div class="bt-form hint_confirm pd30">\
+          <div class="hint_title">\
+            <i class="hint-confirm-icon"></i>\
+            <div class="hint_con">' +
+				config.msg +
+				'</div>\
+          </div>\
+      </div>',
+			yes: function (layers, index) {
+                layer.close(layers)
+                if (callback) callback()
+            }
+		});
+	}
+}
+if("undefined" != typeof bt && bt.hasOwnProperty("input_confirm")){
+    bt.input_confirm = function (config, callback) {
+		layer.open({
+			type: 1,
+			title: config.title,
+			area: '430px',
+			closeBtn: 2,
+			shadeClose: true,
+			btn: [lan['public'].ok, lan['public'].cancel],
+			content:
+				'<div class="bt-form hint_confirm pd30">\
+						<div class="hint_title">\
+							<i class="hint-confirm-icon"></i>\
+							<div class="hint_con">' +
+				config.msg +
+				'</div>\
+						</div>\
+				</div>',
+			yes: function (layers, index) {
+                layer.close(layers);
+                if (callback) callback();
+			},
+		});
+	}
+}
 if("undefined" != typeof database && database.hasOwnProperty("del_database")){
     database.del_database = function (wid, dbname,obj, callback) {
         var title = '',

wiki/update.md

@@ -14,11 +14,21 @@
 
 - 全局搜索替换 https://api.bt.cn => http://www.example.com
 
-- 全局搜索替换 https://www.bt.cn/api/ => http://www.example.com/api/（需排除clearModel.py、scanningModel.py、ipsModel.py）
+- 全局搜索替换 https://www.bt.cn/api/ => http://www.example.com/api/（需排除clearModel.py、scanningModel.py、ipsModel.py、domainMod.py、js文件）
+
+- 全局搜索替换 http://www.bt.cn/api/ => http://www.example.com/api/（需排除js文件）
+
+- 全局搜索替换 https://www.bt.cn/newapi/ => http://www.example.com/newapi/
 
 - 全局搜索替换 https://download.bt.cn/install/update6.sh => http://www.example.com/install/update6.sh
 
-- class/ajax.py 文件 \#是否执行升级程序 下面的 public.get_url() 改成 public.GetConfigValue('home')
+  http://download.bt.cn/install/update6.sh => http://www.example.com/install/update6.sh
+
+  http://download.bt.cn/install/update/ => http://www.example.com/install/update/
+
+- 搜索并删除提交异常报告的代码 bt_error/index.php
+
+- class/ajax.py 文件 \# 是否执行升级程序 下面的 public.get_url() 改成 public.GetConfigValue('home')
 
   class/jobs.py 文件 \#尝试升级到独立环境 下面的 public.get_url() 改成 public.GetConfigValue('home')
 
@@ -40,50 +50,74 @@
 
   在 def check_domain_cloud(domain): 这一行下面加上 return
 
+  在 def err_collect 这一行下面加上 return
+
   在 def get_improvement(): 这一行下面加上 return False
 
   在free_login_area方法内get_free_ips_area替换成get_ips_area
 
-- class/panelPlugin.py 文件，download_icon方法内替换 public.GetConfigValue('home') => 'https://www.bt.cn'
+  在get_free_ip_info方法内，获取IP的部分改成res = get_ips_area([address])
 
-  删除public.total_keyword(get.query)这一行
+  在login_send_body方法内，free_login_area(login_ip=server_ip_area的server_ip_area改成login_ip
 
-  set_pyenv方法内，temp_file = public.readFile(filename)这行代码下面加上
+- class/panelPlugin.py 文件
+
+  __set_pyenv方法内，temp_file = public.readFile(filename)这行代码下面加上
 
   ```python
-  temp_file = temp_file.replace('wget -O Tpublic.sh', '#wget -O Tpublic.sh')
-  temp_file = temp_file.replace('\cp -rpa Tpublic.sh', '#\cp -rpa Tpublic.sh')
   temp_file = temp_file.replace('http://download.bt.cn/install/public.sh', 'http://www.example.com/install/public.sh')
   temp_file = temp_file.replace('https://download.bt.cn/install/public.sh', 'http://www.example.com/install/public.sh')
   ```
   
-- install/install_soft.sh 在bash执行之前加入以下代码
+  def check_status(self, softInfo): 方法最后一行加上
+  
+  ```python
+  if 'endtime' in softInfo:
+              softInfo['endtime'] = time.time() + 86400 * 3650
+  ```
+  
+  plugin_bin.pl 改成 plugin_list.json
+  
+  删除 public.total_keyword(get.query)
+  
+  删除 public.run_thread(self.get_cloud_list_status, args=(get,))
+  
+  删除 public.run_thread(self.is_verify_unbinding, args=(get,))
+  
+- class/plugin_deployment.py 文件，__setup_php_environment方法和GetJarPath方法内替换 public.GetConfigValue('home') => 'https://www.bt.cn'
+
+- class/config.py 文件，get_nps方法内data['nps'] = False改成True，get_nps_new方法下面加上 return public.returnMsg(False, "获取问卷失败")
+
+  def err_collection(self, get): 这一行下面加上 return public.returnMsg(True, "OK")
+
+- class/push/site_push.py 文件，'https://www.bt.cn' => 'http://www.example.com'
+
+- script/flush_plugin.py 文件，删除clear_hosts()一行
+
+- script/reload_check.py 文件，在第2行插入sys.exit()
+
+- script/local_fix.sh 文件，${D_NODE_URL}替换成www.example.com
+
+- script/upgrade_panel_optimized.py 文件，def get_home_node(url): 下面加上return url
+
+- install/install_soft.sh 在. 执行之前加入以下代码
 
   ```shell
-  sed -i "s/http:\/\/download.bt.cn\/install\/public.sh/http:\/\/www.example.com\/install\/public.sh/" lib.sh
+  sed -i "s/http:\/\/download.bt.cn\/install\/public.sh/http:\/\/www.example.com\/install\/public.sh/" $name.sh
-  sed -i "s/https:\/\/download.bt.cn\/install\/public.sh/http:\/\/www.example.com\/install\/public.sh/" lib.sh
+  sed -i "s/https:\/\/download.bt.cn\/install\/public.sh/http:\/\/www.example.com\/install\/public.sh/" $name.sh
-  sed -i "/wget -O Tpublic.sh/d" $name.sh
   ```
   
 - install/public.sh 用官网最新版的[public.sh](http://download.bt.cn/install/public.sh)替换，并去除最下面bt_check一行
 
 - 去除无用的定时任务：task.py 文件  删除以下几行
 
-  "update_software_list": update_software_list,
+  check_panel_msg,
 
-  "check_panel_msg": check_panel_msg,
+  refresh_domain_cache,
 
-  PluginLoader.daemon_panel()
+  task_ssh_error_count,
 
-- 去除WebRTC连接：BTPanel/static/js/public.js  删除stun.start();这一行
+- [可选]去除各种计算题：复制bt.js到 BTPanel/static/ ，在 BTPanel/templates/default/software.html 的 \<script\>window.vite_public_request_token 前面加入
-
-- 去除首页广告：BTPanel/static/js/index.js 文件删除最下面index.recommend_paid_version()这一行
-
-- 去除首页自动检测更新，避免频繁请求云端：BTPanel/static/js/index.js 文件注释掉bt.system.check_update这一段代码外的setTimeout
-
-- 去除内页广告：BTPanel/templates/default/layout.html 删除getPaymentStatus();这一行
-
-- [可选]去除各种计算题：复制bt.js到 BTPanel/static/ ，在 BTPanel/templates/default/layout.html 的\</body\>前面加入
 
   ```javascript
   <script src="/static/bt.js"></script>
@@ -91,20 +125,24 @@
 
 - [可选]去除创建网站自动创建的垃圾文件：在class/panelSite.py，分别删除
 
-  htaccess = self.sitePath+'/.htaccess'
+  htaccess = self.sitePath + '/.htaccess'
 
-  index = self.sitePath+'/index.html'
+  index = self.sitePath + '/index.html'
 
-  doc404 = self.sitePath+'/404.html'
+  doc404 = self.sitePath + '/404.html'
 
   这3行及分别接下来的4行代码
 
+  def get_view_title_content(self, get): 下面加上 return public.returnMsg(True, '')
+
 - [可选]关闭未绑定域名提示页面：在class/panelSite.py，root /www/server/nginx/html改成return 400
 
-- [可选]关闭自动生成访问日志：在 BTPanel/\_\_init\_\_.py  删除public.write_request_log()这一行
+- [可选]关闭自动生成访问日志：在 BTPanel/\_\_init\_\_.py  删除public.write_request_log这一行
+
+- [可选]新版vite页面去除需求反馈、各种广告、计算题等，执行 php think cleanvitejs <面板BTPanel/static/js路径>
 
 
-解压安装包panel6.zip，将更新包改好的文件覆盖到里面，然后重新打包，即可更新安装包。（
+解压安装包[panel6.zip](http://download.bt.cn/install/src/panel6.zip)，将更新包改好的文件覆盖到里面，然后重新打包，即可更新安装包。（
 
 别忘了删除class文件夹里面所有的.so文件）
 

wiki/updatewin.md

@@ -4,75 +4,7 @@
 
 官方更新包下载链接：http://download.bt.cn/win/panel/panel_版本号.zip
 
-假设搭建的宝塔第三方云端网址是 http://www.example.com
+- 使用16进制编辑器打开btPanel.exe，将 https://api.bt.cn 替换成 http://api.bt.cn/ ，将 https://www.bt.cn 替换成 http://www.bt.cn/ ，然后将api.bt.cn替换成任意其他域名，将第二个www.bt.cn替换成任意其他域名。
-
+- 批量解密模块文件：执行 php think decrypt classdir <面板class文件夹路径>
-Windows版宝塔由于加密文件太多，无法全部解密，因此无法做到全开源。
+- 新版vite页面去除需求反馈、各种广告、计算题等，执行 php think cleanvitejs <面板assets/static/js路径>
-
-- 删除PluginLoader.pyd，将win/PluginLoader.py复制到class文件夹
-
-- 全局搜索替换 https://api.bt.cn => http://www.example.com
-
-- 全局搜索替换 https://www.bt.cn/api/ => http://www.example.com/api/（需排除ipsModel.py）
-
-- 全局搜索替换 http://www.bt.cn/api/ => http://www.example.com/api/
-
-- 全局搜索替换 http://download.bt.cn/win/panel/data/setup.py => http://www.example.com/win/panel/data/setup.py
-
-- class/panel_update.py 文件 public.get_url() =>  'http://www.example.com'
-
-- class/public.py 在 
-
-  ```python
-  def GetConfigValue(key):
-  ```
-
-  这一行下面加上
-
-  ```python
-  if key == 'home': return 'http://www.example.com'
-  ```
-
-  在 def is_bind(): 这一行下面加上 return True
-
-  在 def check_domain_cloud(domain): 这一行下面加上 return
-
-  在 get_update_file() 方法里面 get_url() => GetConfigValue('home')
-
-- class/plugin_deployment.py 文件 get_icon 和 SetupPackage 方法内，替换 public.GetConfigValue('home') => 'https://www.bt.cn'
-
-- 去除无用的定时任务：task.py 文件
-
-  删除 p = threading.Thread(target=check_files_panel) 以及下面2行
-
-  删除 p = threading.Thread(target=check_panel_msg) 以及下面2行
-
-  删除 p = threading.Thread(target=update_software_list) 以及下面2行
-
-- 去除面板日志上报：script/site_task.py 文件
-
-  - 删除最下面 logs_analysis() 这1行
-
-- 去除首页广告：BTPanel/static/js/index.js 文件删除最下面index.recommend_paid_version()这一行以及index.consultancy_services()这一行
-
-- 去除首页自动检测更新，避免频繁请求云端：BTPanel/static/js/index.js 文件注释掉bt.system.check_update这一段代码外的setTimeout
-
-- 去除内页广告：BTPanel/templates/default/layout.html 删除getPaymentStatus();这一行
-
-- [可选]去除各种计算题：复制win/bt.js到 BTPanel/static/ ，在 BTPanel/templates/default/layout.html 的尾部加入
-
-  ```javascript
-  <script src="/static/bt.js"></script>
-  ```
-
-- [可选]去除创建网站自动创建的垃圾文件：class/panelSite.py 文件
-
-  删除 htaccess = self.sitePath + '/.htaccess' 以及下面2行
-
-  删除 index = self.sitePath + '/index.html' 以及下面6行
-
-  删除 doc404 = self.sitePath + '/404.html' 以及下面6行
-
-  删除 if not os.path.exists(self.sitePath + '/.htaccess') 这一行
-
-- [可选]关闭自动生成访问日志：在 BTPanel/\_\_init\_\_.py  删除public.write_request_log()这一行